From c012b79c04357b2d606d07853d73fc1c049617b8 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Aug 2020 12:06:25 +0300
Subject: [PATCH 01/29] mympd: init at 6.8.1

---
 pkgs/applications/audio/mympd/default.nix | 53 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  3 ++
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/audio/mympd/default.nix

diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix
new file mode 100644
index 000000000000..5c8c5e7c7bff
--- /dev/null
+++ b/pkgs/applications/audio/mympd/default.nix
@@ -0,0 +1,53 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, mpd_clientlib
+, openssl
+, lua5_3
+, libid3tag
+, flac
+, mongoose
+}:
+
+stdenv.mkDerivation rec {
+  pname = "mympd";
+  version = "6.8.1";
+
+  src = fetchFromGitHub {
+    owner = "jcorporation";
+    repo = "myMPD";
+    rev = "v${version}";
+    sha256 = "dIGg2mLxN6XBDH3GFXtF7nB9a/zf/qMlPCvIulFRXn8=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+  ];
+  buildInputs = [
+    mpd_clientlib
+    openssl
+    lua5_3
+    libid3tag
+    flac
+  ];
+
+  cmakeFlags = [
+    "-DENABLE_LUA=ON"
+    # Otherwise, it tries to parse $out/etc/mympd.conf on startup.
+    "-DCMAKE_INSTALL_SYSCONFDIR=/etc"
+    # similarly here
+    "-DCMAKE_INSTALL_LOCALSTATEDIR=/var/lib/mympd"
+  ];
+  # See https://github.com/jcorporation/myMPD/issues/315
+  hardeningDisable = [ "strictoverflow" ];
+
+  meta = {
+    homepage = "https://jcorporation.github.io/mympd";
+    description = "A standalone and mobile friendly web mpd client with a tiny footprint and advanced features";
+    maintainers = [ stdenv.lib.maintainers.doronbehar ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d97b6d880076..0362dd367cf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22556,6 +22556,9 @@ in
 
   ympd = callPackage ../applications/audio/ympd { };
 
+  # a somewhat more maintained fork of ympd
+  mympd = callPackage ../applications/audio/mympd { };
+
   nload = callPackage ../applications/networking/nload { };
 
   normalize = callPackage ../applications/audio/normalize { };

From 0309973b82e43873ca2bdeab5f525ca86525c734 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Tue, 1 Dec 2020 23:47:01 +0000
Subject: [PATCH 02/29] xorg.xorgserver: 1.20.9 -> 1.20.10

https://lists.x.org/archives/xorg-announce/2020-December/003067.html
https://lists.x.org/archives/xorg-announce/2020-December/003066.html
---
 pkgs/servers/x11/xorg/default.nix   |  6 +++---
 pkgs/servers/x11/xorg/overrides.nix | 10 ----------
 pkgs/servers/x11/xorg/tarballs.list |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 92b6df3ef43f..020ceb65e9f6 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
-    name = "xorg-server-1.20.9";
+    name = "xorg-server-1.20.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2";
-      sha256 = "0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2";
+      url = "mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2";
+      sha256 = "16bwrf0ag41l7jbrllbix8z6avc5yimga7ihvq4ch3a5hb020x4p";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c9d48c9de9f1..02dfb7ee1f55 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -630,16 +630,6 @@ self: super:
         propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
           udev
         ];
-        # patchPhase is not working, this is a hack but we can remove it in the next xorg-server release
-        preConfigure = let
-          # https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
-          headerFix = fetchpatch {
-            url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/919f1f46fc67dae93b2b3f278fcbfc77af34ec58.patch";
-            sha256 = "0w48rdpl01v0c97n9zdxhf929y76r1f6rqkfs9mfygkz3xcmrfsq";
-          };
-        in ''
-          patch -p1 < ${headerFix}
-        '';
         prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
           export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"
         '';
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 70b76c7a6a28..7d01af8307e4 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2

From 6b3b62ee5e7e29577f47c464b04b8b88631bb47b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 4 Dec 2020 15:22:37 +0000
Subject: [PATCH 03/29] kubie: 0.11.0 -> 0.11.1

---
 pkgs/development/tools/kubie/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix
index 316be0b2fc01..cae76669ab42 100644
--- a/pkgs/development/tools/kubie/default.nix
+++ b/pkgs/development/tools/kubie/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kubie";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "sbstp";
     repo = "kubie";
-    sha256 = "0862f582i08h80pm6igmi00qsacl5b9jaahh50l2i3905k7rxf5s";
+    sha256 = "0q21qd9fhchggby18gzyvds517n9vq7b1rr0gmzik4036ykg1lm2";
   };
 
-  cargoSha256 = "1b0nl4nwjza52madrfsmwivxxvz18b53kynv2fbsbh3zzbrm5fj1";
+  cargoSha256 = "0dp4prv8c2a6mxl7wskpc65qlfjphdxshb4q2bswqa5i21h8r534";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 34f083c35ff990de18295f8ef56d3ac62972c198 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 4 Dec 2020 15:41:56 +0000
Subject: [PATCH 04/29] liblouis: 3.15.0 -> 3.16.1

---
 pkgs/development/libraries/liblouis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index c394e3dc4d54..d29cbf6a7195 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "liblouis";
-  version = "3.15.0";
+  version = "3.16.1";
 
   src = fetchFromGitHub {
     owner = "liblouis";
     repo = "liblouis";
     rev = "v${version}";
-    sha256 = "1ljy5xsy7vf2r0ix0d7bqcr6qvr6897f8madsx9zlm1mrj31n5px";
+    sha256 = "0q9ixy8cjgd2d2lzxgkfd4chzr5j1bz783mg10pnwviyg6k630m5";
   };
 
   outputs = [ "out" "dev" "man" "info" "doc" ];

From 577e615d6088daedb4ca1c1b6ff7a9fe836a229e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 4 Dec 2020 17:49:17 +0000
Subject: [PATCH 05/29] navidrome: 0.38.0 -> 0.39.0

---
 pkgs/servers/misc/navidrome/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix
index a31d7a9c6d88..9df7ad827f0a 100644
--- a/pkgs/servers/misc/navidrome/default.nix
+++ b/pkgs/servers/misc/navidrome/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "navidrome";
-  version = "0.38.0";
+  version = "0.39.0";
 
   src = fetchurl {
     url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz";
-    sha256 = "01fkzsvdz1b43m8glxl01vw7d19w5fglk9x1rj5bab8fgrx149w8";
+    sha256 = "0ngqlb9d8xml0vnjsn6vpi02sjqldsiirlrzfncrh3hlcrhk4fcn";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From e505956b94815fa8ddab510d720d92c2467503c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 4 Dec 2020 18:19:54 +0000
Subject: [PATCH 06/29] nvtop: 1.0.0 -> 1.1.0

---
 pkgs/tools/system/nvtop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix
index 59636fb5dc80..1b826e6fab4f 100644
--- a/pkgs/tools/system/nvtop/default.nix
+++ b/pkgs/tools/system/nvtop/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nvtop";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "Syllo";
     repo = "nvtop";
     rev = version;
-    sha256 = "1b6yz54xddip1r0k8cbqg41dpyhds18fj29bj3yf40xvysklb0f4";
+    sha256 = "1h24ppdz7l6l0znwbgir49f7r1fshzjavc6i5j33c6bvr318dpqb";
   };
 
   cmakeFlags = [

From beb83591fb32bbf3f327fdebe5c178ab230257bf Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 4 Dec 2020 19:20:14 +0100
Subject: [PATCH 07/29] chromiumBeta: 87.0.4280.66 -> 88.0.4324.27

---
 .../networking/browsers/chromium/upstream-info.json  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 3832f8c032b3..22647b0fff5f 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,15 +18,15 @@
     }
   },
   "beta": {
-    "version": "87.0.4280.66",
-    "sha256": "0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19",
-    "sha256bin64": "15n01jia8sxv3a7vfbla40rq45x54pyksg0kg14bm0br6m3n65pz",
+    "version": "88.0.4324.27",
+    "sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc",
+    "sha256bin64": "0qf2j1j3p94s724rwh8fydpjn88cs9yxxhjf5axvqwi7q3h35cfx",
     "deps": {
       "gn": {
-        "version": "2020-09-09",
+        "version": "2020-11-05",
         "url": "https://gn.googlesource.com/gn",
-        "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
-        "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
+        "rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
+        "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
       }
     }
   },

From f4419dd9707119e4d4e1d0c5cc5743ca36a85ae2 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 4 Dec 2020 19:20:38 +0100
Subject: [PATCH 08/29] chromiumDev: 88.0.4324.27 -> 89.0.4343.0

---
 .../networking/browsers/chromium/upstream-info.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 22647b0fff5f..6343dd4b2468 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -31,9 +31,9 @@
     }
   },
   "dev": {
-    "version": "88.0.4324.27",
-    "sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc",
-    "sha256bin64": "0ax27j42167yyx90h5k6ra898kn626w5cvgmafm3al9kyfsx36m4",
+    "version": "89.0.4343.0",
+    "sha256": "0jmc1l0lysl5zax98fjhzsfq3c1sqh3n3xscidafflx362wcfpwa",
+    "sha256bin64": "1v6xik8kf531y0g5xj0c8szjmak0qvh77kwkw7p7hqxqmnwwp06d",
     "deps": {
       "gn": {
         "version": "2020-11-05",

From b0e8e8365b0c5b992109344fd843f59c76910ca0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 4 Dec 2020 19:24:46 +0000
Subject: [PATCH 09/29] osu-lazer: 2020.1128.0 -> 2020.1204.0

---
 pkgs/games/osu-lazer/default.nix |  4 +-
 pkgs/games/osu-lazer/deps.nix    | 79 +++++++++++++-------------------
 2 files changed, 34 insertions(+), 49 deletions(-)

diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix
index f41d684d83f5..b0a99e1dc246 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@@ -13,13 +13,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "osu-lazer";
-  version = "2020.1128.0";
+  version = "2020.1204.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     rev = version;
-    sha256 = "0qf1lvzd668zd405ll3bdbk91xdyr2l9qg42ph93vjcnmrs2jqic";
+    sha256 = "1yr9rkkmm15lgbfbrvpyp0d66i5v2xs39abw8yv6qlf70qh4bsg5";
   };
 
   patches = [ ./bypass-tamper-detection.patch ];
diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix
index 4272a816a58a..8a24f0b1bdbb 100644
--- a/pkgs/games/osu-lazer/deps.nix
+++ b/pkgs/games/osu-lazer/deps.nix
@@ -1,8 +1,8 @@
 { fetchNuGet }: [
   (fetchNuGet {
     name = "Dapper";
-    version = "2.0.35";
-    sha256 = "0465i2p5kjj0hmadyw0xrpn43zpc4bnbid9mg561739fyjyjwmfm";
+    version = "2.0.78";
+    sha256 = "13xgi8prsa3y67hx644yflamwakjv8vsk5m15v407clsl2r4g0bp";
   })
   (fetchNuGet {
     name = "DeltaCompressionDotNet";
@@ -16,8 +16,8 @@
   })
   (fetchNuGet {
     name = "DiscordRichPresence";
-    version = "1.0.150";
-    sha256 = "0qmbi4sccia3w80q8xfvj3bw62nvz047wq198n2b2aflkf47bq79";
+    version = "1.0.166";
+    sha256 = "019rz0br8hamydmdrgzcc6280jfhm4i4ix27jh66a7h37alvdi3a";
   })
   (fetchNuGet {
     name = "FFmpeg.AutoGen";
@@ -261,8 +261,8 @@
   })
   (fetchNuGet {
     name = "JetBrains.Annotations";
-    version = "2020.1.0";
-    sha256 = "13fqcr6bs4x9rn0mpx110xl5apwh8ds1h0lx208znrm178ywqm8y";
+    version = "2020.3.0";
+    sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2";
   })
   (fetchNuGet {
     name = "ManagedBass";
@@ -574,11 +574,6 @@
     version = "3.1.9";
     sha256 = "0538fvjz9c27nvc6kv83b0912qvc71wz2w60svl0mscj86ds49wc";
   })
-  (fetchNuGet {
-    name = "Microsoft.Net.Compilers.Toolset";
-    version = "3.1.0";
-    sha256 = "1csf8hgwvyxjlxdygacrk3pp0xkzydc1kvsv68cxy8h7gd62k0w0";
-  })
   (fetchNuGet {
     name = "Microsoft.NetCore.Analyzers";
     version = "3.3.1";
@@ -601,13 +596,13 @@
   })
   (fetchNuGet {
     name = "Microsoft.NETCore.Platforms";
-    version = "3.1.0";
-    sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j";
+    version = "3.1.1";
+    sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987";
   })
   (fetchNuGet {
     name = "Microsoft.NETCore.Platforms";
-    version = "3.1.1";
-    sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987";
+    version = "5.0.0";
+    sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc";
   })
   (fetchNuGet {
     name = "Microsoft.NETCore.Targets";
@@ -636,8 +631,8 @@
   })
   (fetchNuGet {
     name = "Microsoft.Win32.Registry";
-    version = "4.7.0";
-    sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs";
+    version = "5.0.0";
+    sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n";
   })
   (fetchNuGet {
     name = "Mono.Cecil";
@@ -681,8 +676,8 @@
   })
   (fetchNuGet {
     name = "ppy.osu.Framework";
-    version = "2020.1127.0";
-    sha256 = "05vxdkw5z7bylj8dyw52lxf3g12mmvdifwvwlgz00v6ybkxr455j";
+    version = "2020.1203.0";
+    sha256 = "0xk1l09gm39z1739a7bgykj2bkg6lgxx72ds9s7qmbc6nrkr7jwj";
   })
   (fetchNuGet {
     name = "ppy.osu.Framework.NativeLibs";
@@ -691,8 +686,8 @@
   })
   (fetchNuGet {
     name = "ppy.osu.Game.Resources";
-    version = "2020.1030.0";
-    sha256 = "1sxip1m5y7c5jblf9br8f0i5yhv0qjpidv9w6bbdxiy29mfwnz6d";
+    version = "2020.1202.0";
+    sha256 = "1m5156gkyyhf52ii6y7yqmsgpwcxn6zgji3nnyny6lk9glmc9vvs";
   })
   (fetchNuGet {
     name = "ppy.osuTK.NS20";
@@ -701,8 +696,8 @@
   })
   (fetchNuGet {
     name = "ppy.SDL2-CS";
-    version = "1.0.40";
-    sha256 = "1pvc154nqdbhn0rm6id0710yh72wvd2s5xmqxx3935h1jxrjgk8s";
+    version = "1.0.53";
+    sha256 = "0x52pq6xdg4qcgi8cnqlijifqjpszbi8z4nkmsym0xgd9m5bmd7k";
   })
   (fetchNuGet {
     name = "ppy.squirrel.windows";
@@ -816,8 +811,8 @@
   })
   (fetchNuGet {
     name = "Sentry";
-    version = "2.1.6";
-    sha256 = "0vc45p1arxwifv5fb6lzkqqxlsvm4i0xmpq2vc73vbjqzydd2phm";
+    version = "2.1.8";
+    sha256 = "1ii62ynihr4j2v2agjizk38kfz3m9bdijkks9k7ydhcq1bcz7jbn";
   })
   (fetchNuGet {
     name = "Sentry.PlatformAbstractions";
@@ -826,8 +821,8 @@
   })
   (fetchNuGet {
     name = "Sentry.Protocol";
-    version = "2.1.6";
-    sha256 = "0qc18kc9d7f0s6hmnpji3sbz0z09kdgg4fwh55rrmpfgr3w851s7";
+    version = "2.1.8";
+    sha256 = "04baw4yxc5lbcl83sfcdyjg5225719bf3sxpa3kjmhf58bjr143l";
   })
   (fetchNuGet {
     name = "SharpCompress";
@@ -844,15 +839,10 @@
     version = "2.0.0";
     sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0";
   })
-  (fetchNuGet {
-    name = "SixLabors.Core";
-    version = "1.0.0-beta0008";
-    sha256 = "1yqcv5d2igsrmi9hf8xzikn0fms47skqpr552yzbj4z4wnraahaw";
-  })
   (fetchNuGet {
     name = "SixLabors.ImageSharp";
-    version = "1.0.0-beta0007";
-    sha256 = "1k3hrp26imyqjarkrcsrhvamlmynzv6cakzq68yx69c0h8lmscaf";
+    version = "1.0.2";
+    sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj";
   })
   (fetchNuGet {
     name = "Splat";
@@ -919,11 +909,6 @@
     version = "4.4.0";
     sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19";
   })
-  (fetchNuGet {
-    name = "System.Buffers";
-    version = "4.5.0";
-    sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c";
-  })
   (fetchNuGet {
     name = "System.Buffers";
     version = "4.5.1";
@@ -971,8 +956,8 @@
   })
   (fetchNuGet {
     name = "System.ComponentModel.Annotations";
-    version = "4.7.0";
-    sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z";
+    version = "5.0.0";
+    sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j";
   })
   (fetchNuGet {
     name = "System.Composition";
@@ -1151,8 +1136,8 @@
   })
   (fetchNuGet {
     name = "System.IO.Packaging";
-    version = "4.7.0";
-    sha256 = "1vivvf158ilcpp6bq70zyafimi0lng546b34csmjb09k19wgxpiv";
+    version = "5.0.0";
+    sha256 = "08l85pi8jy65las973szqdnir2awxp0r16h21c0bgrz19gxhs11n";
   })
   (fetchNuGet {
     name = "System.IO.Pipelines";
@@ -1436,8 +1421,8 @@
   })
   (fetchNuGet {
     name = "System.Security.AccessControl";
-    version = "4.7.0";
-    sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz";
+    version = "5.0.0";
+    sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r";
   })
   (fetchNuGet {
     name = "System.Security.Cryptography.Algorithms";
@@ -1511,8 +1496,8 @@
   })
   (fetchNuGet {
     name = "System.Security.Principal.Windows";
-    version = "4.7.0";
-    sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d";
+    version = "5.0.0";
+    sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8";
   })
   (fetchNuGet {
     name = "System.Text.Encoding";

From 02589710ba47160d4cb801ffe5d9270bec071da4 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 4 Dec 2020 14:53:56 +0100
Subject: [PATCH 10/29] ocamlPackages.mirage*: 3.10.0 -> 3.10.1

---
 pkgs/development/ocaml-modules/mirage/runtime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix
index 700065ba8e0b..50121ad62802 100644
--- a/pkgs/development/ocaml-modules/mirage/runtime.nix
+++ b/pkgs/development/ocaml-modules/mirage/runtime.nix
@@ -3,7 +3,7 @@
 
 buildDunePackage rec {
   pname = "mirage-runtime";
-  version = "3.10.0";
+  version = "3.10.1";
 
   useDune2 = true;
 
@@ -11,7 +11,7 @@ buildDunePackage rec {
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz";
-    sha256 = "01nq358bilsvvwrvyavc5gik1csjljn4rb3k8yx94gxvbj5vx4h2";
+    sha256 = "1glmsz2znhfkk4w6d6nsr7q5jqvivhmi8zwagzw2d8pah0c8bhm4";
   };
 
   propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ];

From 4a5cb363ae9cbbf6520fb0b403e84de144ecf83c Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@gmail.com>
Date: Fri, 4 Dec 2020 19:35:27 +0000
Subject: [PATCH 11/29] lib/strings: fix typo in example

The example refers to a snake_case function name but Nix uses camelCase
function names.  This ensures the example is correct for the given
function.
---
 lib/strings.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 2fd8479290d2..6d393145eee0 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -593,9 +593,9 @@ rec {
      standard GNU Autoconf scripts.
 
      Example:
-       with_Feature true "shared" "foo"
+       withFeatureAs true "shared" "foo"
        => "--with-shared=foo"
-       with_Feature false "shared" (throw "ignored")
+       withFeatureAs false "shared" (throw "ignored")
        => "--without-shared"
   */
   withFeatureAs = with_: feat: value: withFeature with_ feat + optionalString with_ "=${value}";

From ff9d4cc09bebc4e0b762a7e5b68fe1a6dc1b6c19 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Fri, 4 Dec 2020 19:38:22 +0000
Subject: [PATCH 12/29] factorio-experimental, factorio-headless-experimental:
 1.1.4 -> 1.1.5

---
 pkgs/games/factorio/versions.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json
index b82652d21c10..b4c905450355 100644
--- a/pkgs/games/factorio/versions.json
+++ b/pkgs/games/factorio/versions.json
@@ -2,12 +2,12 @@
   "x86_64-linux": {
     "alpha": {
       "experimental": {
-        "name": "factorio_alpha_x64-1.1.4.tar.xz",
+        "name": "factorio_alpha_x64-1.1.5.tar.xz",
         "needsAuth": true,
-        "sha256": "0gg10pk0qb44iizwvlzndjr2xkygqzaxmhp9bam7gz86b5cxs0cl",
+        "sha256": "17hm62mhldms41wv0vv2bzg8zg1mg7ga61h3yzw9dfvic661khmp",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.4/alpha/linux64",
-        "version": "1.1.4"
+        "url": "https://factorio.com/get-download/1.1.5/alpha/linux64",
+        "version": "1.1.5"
       },
       "stable": {
         "name": "factorio_alpha_x64-1.0.0.tar.xz",
@@ -38,12 +38,12 @@
     },
     "headless": {
       "experimental": {
-        "name": "factorio_headless_x64-1.1.4.tar.xz",
+        "name": "factorio_headless_x64-1.1.5.tar.xz",
         "needsAuth": false,
-        "sha256": "085lpblysh126y38z01f358xcpwmx1a6hcjlc66aw5ff6bp36yq8",
+        "sha256": "1s4ajj8kkz1q5rivv2q6c8ii73nxa11g4fs6hic3r43l52n89ml1",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.4/headless/linux64",
-        "version": "1.1.4"
+        "url": "https://factorio.com/get-download/1.1.5/headless/linux64",
+        "version": "1.1.5"
       },
       "stable": {
         "name": "factorio_headless_x64-1.0.0.tar.xz",

From ad19f4c1880fb82854ae2eb20c58eccc368d4b19 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Dec 2020 11:49:44 +0100
Subject: [PATCH 13/29] Stackage Nightly 2020-12-04

---
 .../configuration-hackage2nix.yaml            | 359 +++++++++---------
 1 file changed, 182 insertions(+), 177 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 93c4daac2247..05eac570c231 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -76,7 +76,7 @@ default-package-overrides:
   # haskell-language-server 0.5.0.0 doesn't accept newer versions
   - fourmolu ==0.2.*
   - refinery ==0.2.*
-  # Stackage Nightly 2020-11-23
+  # Stackage Nightly 2020-12-04
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
@@ -215,18 +215,18 @@ default-package-overrides:
   - ansi-terminal ==0.10.3
   - ansi-wl-pprint ==0.6.9
   - ANum ==0.2.0.2
-  - ap-normalize ==0.1.0.0
   - apecs ==0.9.2
   - apecs-gloss ==0.2.4
   - apecs-physics ==0.4.4
   - api-field-json-th ==0.1.0.2
-  - app-settings ==0.2.0.12
+  - ap-normalize ==0.1.0.0
   - appar ==0.1.8
   - appendmap ==0.1.5
   - apply-refact ==0.8.2.1
   - apportionment ==0.0.0.3
   - approximate ==0.3.2
   - approximate-equality ==1.1.0.2
+  - app-settings ==0.2.0.12
   - arbor-lru-cache ==0.1.1.1
   - arbor-postgres ==0.0.5
   - arithmoi ==0.11.0.1
@@ -235,12 +235,12 @@ default-package-overrides:
   - ascii ==1.0.0.2
   - ascii-case ==1.0.0.2
   - ascii-char ==1.0.0.2
+  - asciidiagram ==1.3.3.3
   - ascii-group ==1.0.0.2
   - ascii-predicates ==1.0.0.2
   - ascii-progress ==0.3.3.0
   - ascii-superset ==1.0.0.2
   - ascii-th ==1.0.0.2
-  - asciidiagram ==1.3.3.3
   - asif ==6.0.4
   - asn1-encoding ==0.9.6
   - asn1-parse ==0.9.5
@@ -268,19 +268,14 @@ default-package-overrides:
   - authenticate ==1.3.5
   - authenticate-oauth ==1.6.0.1
   - auto ==0.4.3.1
-  - auto-update ==0.1.6
   - autoexporter ==1.1.19
+  - auto-update ==0.1.6
   - avers ==0.0.17.1
   - avro ==0.5.2.0
   - aws-cloudfront-signed-cookies ==0.2.0.6
   - backtracking ==0.1.0
   - bank-holidays-england ==0.2.0.6
   - barbies ==2.0.2.0
-  - base-compat ==0.11.2
-  - base-compat-batteries ==0.11.2
-  - base-orphans ==0.8.3
-  - base-prelude ==1.4
-  - base-unicode-symbols ==0.2.4.2
   - base16 ==0.3.0.1
   - base16-bytestring ==0.1.1.7
   - base16-lens ==0.1.3.0
@@ -294,7 +289,12 @@ default-package-overrides:
   - base64-bytestring-type ==1.0.1
   - base64-lens ==0.3.0
   - base64-string ==0.2
+  - base-compat ==0.11.2
+  - base-compat-batteries ==0.11.2
   - basement ==0.0.11
+  - base-orphans ==0.8.3
+  - base-prelude ==1.4
+  - base-unicode-symbols ==0.2.4.2
   - basic-prelude ==0.7.0
   - bazel-runfiles ==0.12
   - bbdb ==0.8
@@ -307,10 +307,11 @@ default-package-overrides:
   - bibtex ==0.1.0.6
   - bifunctors ==5.5.8
   - bimap ==0.4.0
-  - bimap-server ==0.1.0.1
   - bimaps ==0.1.0.2
+  - bimap-server ==0.1.0.1
   - bin ==0.1
   - binary-conduit ==1.3.1
+  - binaryen ==0.0.5.0
   - binary-ext ==2.0.4
   - binary-ieee754 ==0.1.0.0
   - binary-instances ==1.0.0.1
@@ -321,7 +322,6 @@ default-package-overrides:
   - binary-search ==1.0.0.3
   - binary-shared ==0.8.3
   - binary-tagged ==0.3
-  - binaryen ==0.0.5.0
   - bindings-DSL ==1.0.25
   - bindings-GLFW ==3.3.2.0
   - bindings-libzip ==1.0.1
@@ -329,8 +329,8 @@ default-package-overrides:
   - bins ==0.1.2.0
   - bitarray ==0.0.1.1
   - bits ==0.5.2
-  - bits-extra ==0.0.2.0
   - bitset-word8 ==0.1.1.2
+  - bits-extra ==0.0.2.0
   - bitvec ==1.0.3.0
   - blake2 ==0.3.0
   - blanks ==0.5.0
@@ -355,8 +355,8 @@ default-package-overrides:
   - boring ==0.1.3
   - both ==0.1.1.1
   - bound ==2.0.2
-  - bounded-queue ==1.0.0
   - BoundedChan ==1.0.3.0
+  - bounded-queue ==1.0.0
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.5
@@ -373,10 +373,10 @@ default-package-overrides:
   - butcher ==1.3.3.2
   - bv ==0.5
   - bv-little ==1.1.1
-  - byte-count-reader ==0.10.1.2
-  - byte-order ==0.1.2.0
   - byteable ==0.1.1
+  - byte-count-reader ==0.10.1.2
   - bytedump ==1.0
+  - byte-order ==0.1.2.0
   - byteorder ==1.0.4
   - bytes ==0.17
   - byteset ==0.1.1.0
@@ -386,13 +386,12 @@ default-package-overrides:
   - bytestring-mmap ==0.2.2
   - bytestring-strict-builder ==0.4.5.3
   - bytestring-to-vector ==0.3.0.1
-  - bytestring-tree-builder ==0.2.7.5
+  - bytestring-tree-builder ==0.2.7.7
   - bz2 ==1.0.1.0
   - bzlib ==0.5.1.0
   - bzlib-conduit ==0.3.0.2
   - c14n ==0.1.0.1
   - c2hs ==0.28.6
-  - ca-province-codes ==1.0.0.0
   - cabal-debian ==5.1
   - cabal-doctest ==1.0.8
   - cabal-file ==0.1.1
@@ -404,12 +403,13 @@ default-package-overrides:
   - calendar-recycling ==0.0.0.1
   - call-stack ==0.2.0
   - can-i-haz ==0.3.1.0
+  - ca-province-codes ==1.0.0.0
   - cardano-coin-selection ==1.0.1
   - carray ==0.1.6.8
   - casa-client ==0.0.1
   - casa-types ==0.0.1
-  - case-insensitive ==1.2.1.0
   - cased ==0.1.0.0
+  - case-insensitive ==1.2.1.0
   - cases ==0.1.4
   - casing ==0.1.4.1
   - cassava ==0.5.2.0
@@ -468,12 +468,12 @@ default-package-overrides:
   - cmark-gfm ==0.2.2
   - cmark-lucid ==0.1.0.0
   - cmdargs ==0.10.20
+  - codec-beam ==0.2.0
+  - codec-rpm ==0.2.2
+  - code-page ==0.2
   - co-log ==0.4.0.1
   - co-log-concurrent ==0.5.0.0
   - co-log-core ==0.2.1.1
-  - code-page ==0.2
-  - codec-beam ==0.2.0
-  - codec-rpm ==0.2.2
   - Color ==0.3.0
   - colorful-monoids ==0.2.1.3
   - colorize-haskell ==1.0.1
@@ -508,7 +508,7 @@ default-package-overrides:
   - concurrent-split ==0.0.1.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
-  - conduit ==1.3.3
+  - conduit ==1.3.4
   - conduit-algorithms ==0.0.11.0
   - conduit-combinators ==1.3.0
   - conduit-concurrent-map ==0.1.1
@@ -519,8 +519,8 @@ default-package-overrides:
   - conferer-hspec ==0.4.0.1
   - conferer-source-json ==0.4.0.1
   - conferer-warp ==0.4.0.1
-  - config-ini ==0.2.4.0
   - ConfigFile ==1.1.4
+  - config-ini ==0.2.4.0
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
   - configurator-pg ==0.2.5
@@ -528,8 +528,8 @@ default-package-overrides:
   - connection-pool ==0.2.2
   - console-style ==0.0.2.1
   - constraint ==0.1.4.0
-  - constraint-tuples ==0.1.2
   - constraints ==0.12
+  - constraint-tuples ==0.1.2
   - construct ==0.3
   - contravariant ==1.5.2
   - contravariant-extras ==0.3.5.2
@@ -556,13 +556,8 @@ default-package-overrides:
   - cron ==0.7.0
   - crypto-api ==0.13.3
   - crypto-cipher-types ==0.0.9
-  - crypto-enigma ==0.1.1.6
-  - crypto-numbers ==0.2.7
-  - crypto-pubkey ==0.2.8
-  - crypto-pubkey-types ==0.4.3
-  - crypto-random ==0.0.9
-  - crypto-random-api ==0.2.0
   - cryptocompare ==0.1.2
+  - crypto-enigma ==0.1.1.6
   - cryptohash ==0.11.9
   - cryptohash-cryptoapi ==0.1.4
   - cryptohash-md5 ==0.11.100.1
@@ -571,6 +566,11 @@ default-package-overrides:
   - cryptonite ==0.27
   - cryptonite-conduit ==0.2.2
   - cryptonite-openssl ==0.7
+  - crypto-numbers ==0.2.7
+  - crypto-pubkey ==0.2.8
+  - crypto-pubkey-types ==0.4.3
+  - crypto-random ==0.0.9
+  - crypto-random-api ==0.2.0
   - csp ==1.4.0
   - css-syntax ==0.1.0.0
   - css-text ==0.1.3.0
@@ -607,11 +607,12 @@ default-package-overrides:
   - data-default-instances-dlist ==0.0.1
   - data-default-instances-old-locale ==0.0.1
   - data-diverse ==4.7.0.0
+  - datadog ==0.2.5.0
   - data-dword ==0.3.2
   - data-endian ==0.1.1
   - data-fix ==0.3.0
   - data-forest ==0.1.0.8
-  - data-has ==0.3.0.0
+  - data-has ==0.4.0.0
   - data-hash ==0.2.0.1
   - data-interval ==2.0.1
   - data-inttrie ==0.1.4
@@ -625,7 +626,6 @@ default-package-overrides:
   - data-reify ==0.6.3
   - data-serializer ==0.3.4.1
   - data-textual ==0.3.0.3
-  - datadog ==0.2.5.0
   - dataurl ==0.1.0.0
   - DAV ==1.3.4
   - DBFunctor ==0.1.1.1
@@ -639,13 +639,13 @@ default-package-overrides:
   - declarative ==0.5.3
   - deepseq-generics ==0.2.0.0
   - deepseq-instances ==0.1.0.1
-  - deferred-folds ==0.9.11
+  - deferred-folds ==0.9.15
   - dejafu ==2.4.0.0
   - dense-linear-algebra ==0.1.0.0
   - depq ==0.4.1.0
   - deque ==0.4.3
-  - derive-topdown ==0.0.2.2
   - deriveJsonNoPrefix ==0.1.0.1
+  - derive-topdown ==0.0.2.2
   - deriving-aeson ==0.2.6
   - deriving-compat ==0.5.10
   - derulo ==1.0.9
@@ -654,17 +654,17 @@ default-package-overrides:
   - dhall-json ==1.7.3
   - dhall-lsp-server ==1.0.11
   - dhall-yaml ==1.2.3
-  - di-core ==1.0.4
-  - di-monad ==1.3.1
   - diagrams-solve ==0.1.2
   - dialogflow-fulfillment ==0.1.1.3
+  - di-core ==1.0.4
   - dictionary-sharing ==0.1.0.0
   - Diff ==0.4.0
   - digest ==0.0.1.2
   - digits ==0.3.1
   - dimensional ==1.3
-  - direct-sqlite ==2.3.26
+  - di-monad ==1.3.1
   - directory-tree ==0.12.1
+  - direct-sqlite ==2.3.26
   - dirichlet ==0.1.0.0
   - discount ==0.1.1
   - disk-free-space ==0.1.0.1
@@ -676,16 +676,16 @@ default-package-overrides:
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
   - dns ==4.0.1
-  - do-list ==1.0.1
-  - do-notation ==0.1.0.2
   - dockerfile ==0.2.0
   - doclayout ==0.3
-  - doctemplates ==0.8.2
+  - doctemplates ==0.8.3
   - doctest ==0.16.3
   - doctest-discover ==0.2.0.0
   - doctest-exitcode-stdio ==0.0
   - doctest-lib ==0.1
   - doldol ==0.4.1.2
+  - do-list ==1.0.1
+  - do-notation ==0.1.0.2
   - dotenv ==0.8.0.7
   - dotgen ==0.4.3
   - dotnet-timespan ==0.0.1.0
@@ -724,10 +724,10 @@ default-package-overrides:
   - elerea ==2.9.0
   - elf ==0.30
   - eliminators ==0.7
+  - elm2nix ==0.2.1
   - elm-bridge ==0.6.1
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
-  - elm2nix ==0.2.1
   - elynx ==0.5.0
   - elynx-markov ==0.5.0
   - elynx-nexus ==0.5.0
@@ -739,9 +739,9 @@ default-package-overrides:
   - enclosed-exceptions ==1.0.3
   - ENIG ==0.0.1.0
   - entropy ==0.4.1.6
-  - enum-subset-generate ==0.1.0.0
   - enummapset ==0.6.0.3
   - enumset ==0.0.5
+  - enum-subset-generate ==0.1.0.0
   - envelope ==0.2.2.0
   - envy ==2.1.0.0
   - epub-metadata ==4.5
@@ -760,24 +760,24 @@ default-package-overrides:
   - essence-of-live-coding-quickcheck ==0.2.4
   - etc ==0.4.1.0
   - eve ==0.1.9.0
-  - event-list ==0.1.2
   - eventful-core ==0.2.0
   - eventful-test-helpers ==0.2.0
+  - event-list ==0.1.2
   - eventstore ==1.4.1
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.9
   - exact-pi ==0.5.0.1
   - exception-hierarchy ==0.1.0.4
   - exception-mtl ==0.4.0.1
+  - exceptions ==0.10.4
   - exception-transformers ==0.4.0.9
   - exception-via ==0.1.0.0
-  - exceptions ==0.10.4
   - executable-path ==0.0.3.1
   - exit-codes ==1.0.0
   - exomizer ==1.0.0
-  - exp-pairs ==0.2.1.0
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.10
+  - exp-pairs ==0.2.1.0
   - express ==0.1.3
   - extended-reals ==0.2.4.0
   - extensible-effects ==5.0.0.1
@@ -804,10 +804,10 @@ default-package-overrides:
   - fgl ==5.7.0.3
   - file-embed ==0.0.13.0
   - file-embed-lzma ==0
-  - file-modules ==0.1.2.4
-  - file-path-th ==0.1.0.0
   - filelock ==0.1.1.5
   - filemanip ==0.3.6.3
+  - file-modules ==0.1.2.4
+  - file-path-th ==0.1.0.0
   - filepattern ==0.1.2
   - fileplow ==0.1.0.0
   - filtrable ==0.1.4.0
@@ -837,8 +837,8 @@ default-package-overrides:
   - fn ==0.3.0.2
   - focus ==1.0.1.4
   - focuslist ==0.1.0.2
-  - fold-debounce ==0.2.0.9
   - foldable1 ==0.1.0.0
+  - fold-debounce ==0.2.0.9
   - foldl ==1.4.10
   - folds ==0.7.5
   - follow-file ==0.0.3
@@ -852,10 +852,10 @@ default-package-overrides:
   - foundation ==0.0.25
   - free ==5.1.4
   - free-categories ==0.2.0.2
-  - free-vl ==0.1.4
   - freenect ==1.2.1
   - freer-simple ==1.2.1.1
   - freetype2 ==0.2.0
+  - free-vl ==0.1.4
   - friendly-time ==0.4.1
   - from-sum ==0.2.3.0
   - frontmatter ==0.1.0.2
@@ -871,8 +871,8 @@ default-package-overrides:
   - fuzzcheck ==0.1.1
   - fuzzy ==0.1.0.0
   - fuzzy-dates ==0.1.1.2
-  - fuzzy-time ==0.1.0.0
   - fuzzyset ==0.2.0
+  - fuzzy-time ==0.1.0.0
   - gauge ==0.2.5
   - gd ==3000.7.3
   - gdp ==0.0.3.0
@@ -887,8 +887,8 @@ default-package-overrides:
   - generic-lens-core ==2.0.0.0
   - generic-monoid ==0.1.0.1
   - generic-optics ==2.0.0.0
-  - generic-random ==1.3.0.1
   - GenericPretty ==1.2.2
+  - generic-random ==1.3.0.1
   - generics-sop ==0.5.1.0
   - generics-sop-lens ==0.2.0.1
   - geniplate-mirror ==0.7.7
@@ -922,6 +922,9 @@ default-package-overrides:
   - ghc-core ==0.5.6
   - ghc-events ==0.14.0
   - ghc-exactprint ==0.6.3.3
+  - ghcid ==0.8.7
+  - ghci-hexcalc ==0.1.1.0
+  - ghcjs-codemirror ==0.0.0.2
   - ghc-lib ==8.10.2.20200916
   - ghc-lib-parser ==8.10.2.20200916
   - ghc-lib-parser-ex ==8.10.0.16
@@ -936,9 +939,6 @@ default-package-overrides:
   - ghc-typelits-knownnat ==0.7.3
   - ghc-typelits-natnormalise ==0.7.2
   - ghc-typelits-presburger ==0.3.0.1
-  - ghci-hexcalc ==0.1.1.0
-  - ghcid ==0.8.7
-  - ghcjs-codemirror ==0.0.0.2
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.22
   - gi-cairo ==1.0.24
@@ -951,15 +951,14 @@ default-package-overrides:
   - gi-gdkx11 ==3.0.10
   - gi-gio ==2.0.27
   - gi-glib ==2.0.24
-  - gi-gobject ==2.0.24
+  - gi-gobject ==2.0.25
   - gi-graphene ==1.0.2
   - gi-gtk ==3.0.36
   - gi-gtk-hs ==0.3.9
   - gi-harfbuzz ==0.0.3
-  - gi-pango ==1.0.23
-  - gi-xlib ==2.0.9
   - ginger ==0.10.1.0
   - gingersnap ==0.3.1.0
+  - gi-pango ==1.0.23
   - githash ==0.1.5.0
   - github ==0.26
   - github-release ==1.3.5
@@ -968,6 +967,7 @@ default-package-overrides:
   - github-webhooks ==0.15.0
   - gitlab-haskell ==0.2.3
   - gitrev ==1.3.1
+  - gi-xlib ==2.0.9
   - gl ==0.9
   - glabrous ==2.0.2
   - GLFW-b ==3.3.0.0
@@ -982,11 +982,11 @@ default-package-overrides:
   - gothic ==0.1.5
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
-  - graph-wrapper ==0.2.6.0
   - graphite ==0.10.0.1
   - graphql-client ==1.1.0
   - graphs ==0.7.1
   - graphviz ==2999.20.1.0
+  - graph-wrapper ==0.2.6.0
   - gravatar ==0.8.0
   - groom ==0.1.2.1
   - group-by-date ==0.1.0.3
@@ -1014,8 +1014,8 @@ default-package-overrides:
   - hashmap ==1.3.3
   - hashtables ==1.2.4.1
   - haskeline ==0.8.1.0
-  - haskell-gi ==0.24.5
-  - haskell-gi-base ==0.24.4
+  - haskell-gi ==0.24.7
+  - haskell-gi-base ==0.24.5
   - haskell-gi-overloading ==1.0
   - haskell-import-graph ==1.0.4
   - haskell-lexer ==1.1
@@ -1040,7 +1040,7 @@ default-package-overrides:
   - hdaemonize ==0.5.6
   - HDBC ==2.4.0.3
   - HDBC-session ==0.1.2.0
-  - headroom ==0.3.1.0
+  - headroom ==0.3.2.0
   - heap ==1.0.4
   - heaps ==0.3.6.1
   - hebrew-time ==0.1.2
@@ -1050,7 +1050,7 @@ default-package-overrides:
   - hedgehog-fakedata ==0.0.1.3
   - hedgehog-fn ==1.0
   - hedgehog-quickcheck ==0.1.1
-  - hedis ==0.12.15
+  - hedis ==0.13.1
   - hedn ==0.3.0.2
   - here ==1.2.13
   - heredoc ==0.2.0.0
@@ -1064,9 +1064,9 @@ default-package-overrides:
   - hgeometry ==0.11.0.0
   - hgeometry-combinatorial ==0.11.0.0
   - hgrev ==0.2.6
-  - hi-file-parser ==0.1.0.0
   - hidapi ==0.1.5
   - hie-bios ==0.7.1
+  - hi-file-parser ==0.1.0.0
   - higher-leveldb ==0.6.0.0
   - highlighting-kate ==0.6.4
   - hinfo ==0.0.3.0
@@ -1088,6 +1088,7 @@ default-package-overrides:
   - hnix-store-core ==0.2.0.0
   - hnock ==0.4.0
   - hoauth2 ==1.16.0
+  - hocon ==0.1.0.4
   - hOpenPGP ==2.9.5
   - hopenpgp-tools ==0.23.3
   - hopfli ==0.2.2.1
@@ -1103,16 +1104,15 @@ default-package-overrides:
   - hpc-lcov ==1.0.1
   - hprotoc ==2.4.17
   - hruby ==0.3.8
-  - hs-bibutils ==6.10.0.0
-  - hs-functors ==0.1.7.1
-  - hs-GeoIP ==0.3
-  - hs-php-session ==0.0.9.3
   - hsass ==0.8.0
+  - hs-bibutils ==6.10.0.0
   - hsc2hs ==0.68.7
   - hscolour ==1.24.4
   - hsdns ==1.8
   - hsebaysdk ==0.4.1.0
   - hsemail ==2.2.1
+  - hs-functors ==0.1.7.1
+  - hs-GeoIP ==0.3
   - hsini ==0.5.1.2
   - hsinstall ==2.6
   - HSlippyMap ==3.0.1
@@ -1145,6 +1145,7 @@ default-package-overrides:
   - hspec-tables ==0.0.1
   - hspec-wai ==0.10.1
   - hspec-wai-json ==0.10.1
+  - hs-php-session ==0.0.9.3
   - hsshellscript ==3.4.5
   - HStringTemplate ==0.8.7
   - HSvm ==0.1.1.3.22
@@ -1157,6 +1158,7 @@ default-package-overrides:
   - html-entities ==1.1.4.3
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
+  - http2 ==2.0.5
   - HTTP ==4000.3.15
   - http-api-data ==0.4.1.1
   - http-client ==0.6.4.1
@@ -1168,14 +1170,13 @@ default-package-overrides:
   - http-date ==0.0.10
   - http-directory ==0.1.8
   - http-download ==0.2.0.0
+  - httpd-shed ==0.4.1.1
   - http-link-header ==1.0.3.1
   - http-media ==0.8.0.0
   - http-query ==0.1.0
   - http-reverse-proxy ==0.6.0
   - http-streams ==0.8.7.2
   - http-types ==0.12.3
-  - http2 ==2.0.5
-  - httpd-shed ==0.4.1.1
   - human-readable-duration ==0.2.1.4
   - HUnit ==1.6.1.0
   - HUnit-approx ==1.1.1.1
@@ -1188,6 +1189,7 @@ default-package-overrides:
   - hw-conduit-merges ==0.2.1.0
   - hw-diagnostics ==0.0.1.0
   - hw-dsv ==0.4.1.0
+  - hweblib ==0.6.3
   - hw-eliasfano ==0.1.2.0
   - hw-excess ==0.2.3.0
   - hw-fingertree ==0.1.2.0
@@ -1200,7 +1202,7 @@ default-package-overrides:
   - hw-json-simd ==0.1.1.0
   - hw-json-simple-cursor ==0.1.1.0
   - hw-json-standard-cursor ==0.2.3.1
-  - hw-kafka-client ==3.1.2
+  - hw-kafka-client ==4.0.0
   - hw-mquery ==0.2.1.0
   - hw-packed-vector ==0.2.1.0
   - hw-parser ==0.1.1.0
@@ -1212,7 +1214,6 @@ default-package-overrides:
   - hw-string-parse ==0.0.0.4
   - hw-succinct ==0.1.0.1
   - hw-xml ==0.5.1.0
-  - hweblib ==0.6.3
   - hxt ==9.3.1.18
   - hxt-charproperties ==9.4.0.0
   - hxt-css ==0.1.0.3
@@ -1293,13 +1294,13 @@ default-package-overrides:
   - iso3166-country-codes ==0.20140203.8
   - iso639 ==0.1.0.3
   - iso8601-time ==0.1.5
-  - it-has ==0.2.0.0
   - iterable ==3.0
-  - ix-shapable ==0.1.0
+  - it-has ==0.2.0.0
   - ixset-typed ==0.5
   - ixset-typed-binary-instance ==0.1.0.2
   - ixset-typed-conversions ==0.1.2.0
   - ixset-typed-hashable-instance ==0.1.0.2
+  - ix-shapable ==0.1.0
   - jack ==0.7.1.4
   - jalaali ==1.0.0.0
   - jira-wiki-markup ==1.3.2
@@ -1310,9 +1311,9 @@ default-package-overrides:
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
   - json-feed ==1.0.11
+  - jsonpath ==0.2.0.0
   - json-rpc ==1.0.3
   - json-rpc-generic ==0.2.1.5
-  - jsonpath ==0.2.0.0
   - JuicyPixels ==3.3.5
   - JuicyPixels-blurhash ==0.1.0.3
   - JuicyPixels-extra ==0.4.1
@@ -1388,9 +1389,9 @@ default-package-overrides:
   - libyaml ==0.1.2
   - LibZip ==1.0.1
   - life-sync ==1.1.1.0
-  - lift-generics ==0.2
   - lifted-async ==0.10.1.2
   - lifted-base ==0.2.3.12
+  - lift-generics ==0.2
   - line ==4.0.1
   - linear ==1.21.3
   - linear-circuit ==0.1.0.2
@@ -1399,11 +1400,11 @@ default-package-overrides:
   - linux-namespaces ==0.1.3.0
   - liquid-fixpoint ==0.8.10.2
   - List ==0.6.2
+  - ListLike ==4.7.2
   - list-predicate ==0.1.0.1
+  - listsafe ==0.1.0.1
   - list-singleton ==1.0.0.4
   - list-t ==1.0.4
-  - ListLike ==4.7.2
-  - listsafe ==0.1.0.1
   - ListTree ==0.2.3
   - little-logger ==0.3.1
   - little-rio ==0.2.2
@@ -1435,20 +1436,20 @@ default-package-overrides:
   - machines ==0.7.1
   - magic ==1.1
   - magico ==0.0.2.1
-  - main-tester ==0.2.0.1
   - mainland-pretty ==0.7.0.1
+  - main-tester ==0.2.0.1
   - makefile ==1.1.0.0
   - managed ==1.0.8
   - MapWith ==0.2.0.0
   - markdown ==0.1.17.4
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
-  - massiv ==0.5.6.0
+  - massiv ==0.5.7.0
   - massiv-io ==0.4.0.0
   - massiv-test ==0.1.5
+  - mathexpr ==0.3.0.0
   - math-extras ==0.1.1.0
   - math-functions ==0.3.4.1
-  - mathexpr ==0.3.0.0
   - matplotlib ==0.7.5
   - matrices ==0.5.0
   - matrix ==0.3.6.1
@@ -1460,9 +1461,9 @@ default-package-overrides:
   - mbox-utility ==0.0.3.1
   - mcmc ==0.3.0
   - mcmc-types ==1.0.3
-  - med-module ==0.1.2.1
   - medea ==1.2.0
   - median-stream ==0.7.0.0
+  - med-module ==0.1.2.1
   - megaparsec ==9.0.1
   - megaparsec-tests ==9.0.1
   - membrain ==0.0.0.2
@@ -1491,12 +1492,12 @@ default-package-overrides:
   - mime-mail ==0.5.0
   - mime-mail-ses ==0.4.3
   - mime-types ==0.1.0.9
-  - min-max-pqueue ==0.1.0.2
   - mini-egison ==1.0.0
   - minimal-configuration ==0.1.4
   - minimorph ==0.3.0.0
   - minio-hs ==1.5.3
   - miniutter ==0.5.1.1
+  - min-max-pqueue ==0.1.0.2
   - mintty ==0.1.2
   - missing-foreign ==0.1.1
   - MissingH ==1.4.3.0
@@ -1518,36 +1519,36 @@ default-package-overrides:
   - monad-control-aligned ==0.0.1.1
   - monad-coroutine ==0.9.0.4
   - monad-extras ==0.6.0
+  - monadic-arrays ==0.2.2
   - monad-journal ==0.8.1
-  - monad-logger ==0.3.35
+  - monadlist ==0.0.2
+  - monad-logger ==0.3.36
   - monad-logger-json ==0.1.0.0
   - monad-logger-prefix ==0.1.11
   - monad-loops ==0.4.3
   - monad-memo ==0.5.3
   - monad-metrics ==0.2.1.4
   - monad-par ==0.3.5
-  - monad-par-extras ==0.3.3
   - monad-parallel ==0.7.2.3
+  - monad-par-extras ==0.3.3
   - monad-peel ==0.2.1.2
   - monad-primitive ==0.1
   - monad-products ==4.0.1
+  - MonadPrompt ==1.0.0.5
+  - MonadRandom ==0.5.2
   - monad-resumption ==0.1.4.0
   - monad-skeleton ==0.1.5
   - monad-st ==0.2.4.1
+  - monads-tf ==0.1.0.3
   - monad-time ==0.3.1.0
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.1
-  - monadic-arrays ==0.2.2
-  - monadlist ==0.0.2
-  - MonadPrompt ==1.0.0.5
-  - MonadRandom ==0.5.2
-  - monads-tf ==0.1.0.3
   - mongoDB ==2.7.0.0
+  - monoid-subclasses ==1.0.1
+  - monoid-transformer ==0.0.4
   - mono-traversable ==1.0.15.1
   - mono-traversable-instances ==0.1.1.0
   - mono-traversable-keys ==0.1.0
-  - monoid-subclasses ==1.0.1
-  - monoid-transformer ==0.0.4
   - more-containers ==0.2.2.0
   - morpheus-graphql ==0.16.0
   - morpheus-graphql-client ==0.16.0
@@ -1560,14 +1561,14 @@ default-package-overrides:
   - mpi-hs-cereal ==0.1.0.0
   - mtl-compat ==0.2.2
   - mtl-prelude ==2.0.3.1
-  - multi-containers ==0.1.1
   - multiarg ==0.30.0.10
+  - multi-containers ==0.1.1
   - multimap ==1.2.1
   - multipart ==0.2.1
   - multiset ==0.3.4.3
   - multistate ==0.8.0.3
-  - murmur-hash ==0.1.0.9
   - murmur3 ==1.0.4
+  - murmur-hash ==0.1.0.9
   - MusicBrainz ==0.4.1
   - mustache ==2.3.1
   - mutable-containers ==0.3.4
@@ -1615,16 +1616,16 @@ default-package-overrides:
   - nicify-lib ==1.0.1
   - NineP ==0.0.2.1
   - nix-paths ==1.0.1
-  - no-value ==1.0.0.0
-  - non-empty ==0.3.2
-  - non-empty-sequence ==0.2.0.4
-  - non-negative ==0.1.2
   - nonce ==1.0.7
   - nondeterminism ==1.4
+  - non-empty ==0.3.2
   - nonempty-containers ==0.3.4.1
-  - nonempty-vector ==0.2.1.0
   - nonemptymap ==0.0.6.0
+  - non-empty-sequence ==0.2.0.4
+  - nonempty-vector ==0.2.1.0
+  - non-negative ==0.1.2
   - not-gloss ==0.7.7.0
+  - no-value ==1.0.0.0
   - nowdoc ==0.1.1.0
   - nqe ==0.6.3
   - nri-env-parser ==0.1.0.2
@@ -1640,9 +1641,9 @@ default-package-overrides:
   - nvim-hs ==2.1.0.4
   - nvim-hs-contrib ==2.0.0.0
   - nvim-hs-ghcid ==2.0.0.0
-  - o-clock ==1.2.0
   - oauthenticated ==0.2.1.0
   - ObjectName ==1.1.0.1
+  - o-clock ==1.2.0
   - odbc ==0.2.2
   - oeis2 ==1.0.4
   - ofx ==0.4.4.0
@@ -1655,9 +1656,9 @@ default-package-overrides:
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.7.1.0
-  - open-browser ==0.2.1.0
   - OpenAL ==1.7.0.5
   - openapi3 ==3.0.0.1
+  - open-browser ==0.2.1.0
   - openexr-write ==0.1.0.2
   - OpenGL ==3.0.3.0
   - OpenGLRaw ==3.3.4.0
@@ -1736,15 +1737,15 @@ default-package-overrides:
   - persistent ==2.10.5.3
   - persistent-documentation ==0.1.0.2
   - persistent-mysql ==2.10.2.3
-  - persistent-pagination ==0.1.1.1
+  - persistent-pagination ==0.1.1.2
   - persistent-postgresql ==2.10.1.2
-  - persistent-qq ==2.9.2
+  - persistent-qq ==2.9.2.1
   - persistent-sqlite ==2.10.6.2
   - persistent-template ==2.8.2.3
   - persistent-typed-db ==0.1.0.1
   - pg-harness-client ==0.6.0
-  - pg-transact ==0.3.1.1
   - pgp-wordlist ==0.1.0.3
+  - pg-transact ==0.3.1.1
   - phantom-state ==0.2.1.2
   - pid1 ==0.1.2.0
   - pipes ==4.3.14
@@ -1782,36 +1783,36 @@ default-package-overrides:
   - port-utils ==0.2.1.0
   - posix-paths ==0.2.1.6
   - possibly ==1.0.0.0
-  - post-mess-age ==0.2.1.0
   - postgres-options ==0.2.0.0
-  - postgresql-binary ==0.12.3.1
+  - postgresql-binary ==0.12.3.3
   - postgresql-libpq ==0.9.4.3
   - postgresql-libpq-notify ==0.2.0.0
   - postgresql-orm ==0.5.1
   - postgresql-simple ==0.6.3
   - postgresql-typed ==0.6.1.2
   - postgrest ==7.0.1
+  - post-mess-age ==0.2.1.0
   - pptable ==0.3.0.0
   - pqueue ==1.4.1.3
   - prairie ==0.0.1.0
   - prefix-units ==0.2.0
   - prelude-compat ==0.0.0.2
   - prelude-safeenum ==0.1.1.2
+  - prettyclass ==1.0.0.0
   - pretty-class ==1.0.1.1
   - pretty-diff ==0.2.0.3
   - pretty-hex ==1.1
-  - pretty-relative-time ==0.2.0.0
-  - pretty-show ==1.10
-  - pretty-simple ==3.3.0.0
-  - pretty-sop ==0.2.0.3
-  - pretty-terminal ==0.1.0.0
-  - prettyclass ==1.0.0.0
   - prettyprinter ==1.6.2
   - prettyprinter-ansi-terminal ==1.1.2
   - prettyprinter-compat-annotated-wl-pprint ==1
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
   - prettyprinter-compat-wl-pprint ==1.0.0.1
   - prettyprinter-convert-ansi-wl-pprint ==1.1.1
+  - pretty-relative-time ==0.2.0.0
+  - pretty-show ==1.10
+  - pretty-simple ==3.3.0.0
+  - pretty-sop ==0.2.0.3
+  - pretty-terminal ==0.1.0.0
   - primes ==0.2.1.0
   - primitive ==0.7.1.0
   - primitive-addr ==0.1.0.2
@@ -1825,21 +1826,14 @@ default-package-overrides:
   - product-profunctors ==0.11.0.1
   - profiterole ==0.1
   - profunctors ==5.5.2
-  - project-template ==0.2.1.0
   - projectroot ==0.2.0.1
+  - project-template ==0.2.1.0
   - prometheus ==2.2.2
   - prometheus-client ==1.0.1
   - prometheus-wai-middleware ==1.0.1.0
   - promises ==0.3
   - prompt ==0.1.1.2
   - prospect ==0.1.0.0
-  - proto-lens ==0.7.0.0
-  - proto-lens-arbitrary ==0.1.2.9
-  - proto-lens-optparse ==0.1.1.7
-  - proto-lens-protobuf-types ==0.7.0.0
-  - proto-lens-protoc ==0.7.0.0
-  - proto-lens-runtime ==0.7.0.0
-  - proto-lens-setup ==0.4.0.4
   - proto3-wire ==1.1.0
   - protobuf ==0.2.1.3
   - protobuf-simple ==0.1.1.0
@@ -1847,6 +1841,13 @@ default-package-overrides:
   - protocol-buffers-descriptor ==2.4.17
   - protocol-radius ==0.0.1.1
   - protocol-radius-test ==0.1.0.1
+  - proto-lens ==0.7.0.0
+  - proto-lens-arbitrary ==0.1.2.9
+  - proto-lens-optparse ==0.1.1.7
+  - proto-lens-protobuf-types ==0.7.0.0
+  - proto-lens-protoc ==0.7.0.0
+  - proto-lens-runtime ==0.7.0.0
+  - proto-lens-setup ==0.4.0.4
   - protolude ==0.3.0
   - proxied ==0.3.1
   - psqueues ==0.2.7.2
@@ -1892,38 +1893,37 @@ default-package-overrides:
   - random-source ==0.3.0.8
   - random-tree ==0.6.0.5
   - range ==0.3.0.2
-  - range-set-list ==0.1.3.1
   - Ranged-sets ==0.4.0
+  - range-set-list ==0.1.3.1
   - rank1dynamic ==0.4.1
   - rank2classes ==1.4.1
   - Rasterific ==0.7.5.3
   - rasterific-svg ==0.3.3.2
-  - rate-limit ==1.4.2
   - ratel ==1.0.12
+  - rate-limit ==1.4.2
   - ratel-wai ==1.1.3
   - rattle ==0.2
-  - raw-strings-qq ==1.1
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
+  - raw-strings-qq ==1.1
   - rcu ==0.2.4
   - rdf ==0.1.0.4
   - rdtsc ==1.3.0.1
   - re2 ==0.3
+  - readable ==0.3.1
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
-  - readable ==0.3.1
   - reanimate ==1.1.2.1
   - reanimate-svg ==0.13.0.0
   - rebase ==1.6.1
   - record-dot-preprocessor ==0.2.7
   - record-hasfield ==1.0
-  - record-wrangler ==0.1.1.0
   - records-sop ==0.1.0.3
+  - record-wrangler ==0.1.1.0
   - recursion-schemes ==5.2.1
   - reducers ==3.12.3
-  - ref-fd ==0.4.0.2
-  - ref-tf ==0.4.0.2
   - refact ==0.3.0.2
+  - ref-fd ==0.4.0.2
   - refined ==0.6.1
   - reflection ==2.1.6
   - reform ==0.2.7.4
@@ -1931,6 +1931,7 @@ default-package-overrides:
   - reform-hamlet ==0.0.5.3
   - reform-happstack ==0.2.5.4
   - RefSerialize ==0.4.0
+  - ref-tf ==0.4.0.2
   - regex ==1.1.0.0
   - regex-applicative ==0.3.4
   - regex-applicative-text ==0.1.0.1
@@ -1955,13 +1956,14 @@ default-package-overrides:
   - replace-attoparsec ==1.4.2.0
   - replace-megaparsec ==1.4.3.0
   - repline ==0.4.0.0
-  - req ==3.7.0
+  - req ==3.8.0
   - req-conduit ==1.0.0
   - rerebase ==1.6.1
   - resistor-cube ==0.0.1.2
   - resolv ==0.1.2.0
   - resource-pool ==0.2.3.2
   - resourcet ==1.2.4.2
+  - resourcet-pool ==0.1.0.0
   - result ==0.2.6.0
   - rethinkdb-client-driver ==0.0.25
   - retry ==0.8.1.2
@@ -1987,15 +1989,15 @@ default-package-overrides:
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.6
   - safe ==0.3.19
+  - safecopy ==0.10.3
   - safe-decimal ==0.2.0.0
   - safe-exceptions ==0.1.7.1
   - safe-foldable ==0.1.0.0
+  - safeio ==0.0.5.0
   - safe-json ==1.1.1
   - safe-money ==0.9
-  - safe-tensor ==0.2.1.0
-  - safecopy ==0.10.3
-  - safeio ==0.0.5.0
   - SafeSemaphore ==0.10.1
+  - safe-tensor ==0.2.1.0
   - salak ==0.3.6
   - salak-yaml ==0.3.5.3
   - saltine ==0.1.1.0
@@ -2033,8 +2035,8 @@ default-package-overrides:
   - semigroupoid-extras ==5
   - semigroupoids ==5.3.4
   - semigroups ==0.19.1
-  - semiring-simple ==1.0.0.1
   - semirings ==0.5.4
+  - semiring-simple ==1.0.0.1
   - semver ==0.4.0.1
   - sendfile ==0.7.11.1
   - seqalign ==0.2.0.4
@@ -2051,18 +2053,20 @@ default-package-overrides:
   - servant-conduit ==0.15.1
   - servant-docs ==0.11.8
   - servant-errors ==0.1.6.0
+  - servant-exceptions ==0.2.1
+  - servant-exceptions-server ==0.2.1
   - servant-foreign ==0.15.3
   - servant-github-webhook ==0.4.2.0
   - servant-http-streams ==0.18.2
   - servant-machines ==0.15.1
   - servant-multipart ==0.12
-  - servant-openapi3 ==2.0.1.0
+  - servant-openapi3 ==2.0.1.1
   - servant-pipes ==0.15.2
   - servant-rawm ==1.0.0.0
   - servant-server ==0.18.2
   - servant-swagger ==1.1.10
-  - servant-swagger-ui ==0.3.4.3.36.1
-  - servant-swagger-ui-core ==0.3.3
+  - servant-swagger-ui ==0.3.4.3.37.2
+  - servant-swagger-ui-core ==0.3.4
   - serverless-haskell ==0.12.4
   - serversession ==1.0.1
   - serversession-frontend-wai ==1.0
@@ -2078,9 +2082,9 @@ default-package-overrides:
   - shared-memory ==0.2.0.0
   - shell-conduit ==5.0.0
   - shell-escape ==0.2.0
-  - shell-utility ==0.1
   - shellmet ==0.0.3.1
   - shelltestrunner ==1.9
+  - shell-utility ==0.1
   - shelly ==1.9.0
   - shikensu ==0.3.11
   - should-not-typecheck ==2.1.0
@@ -2109,8 +2113,8 @@ default-package-overrides:
   - skein ==1.0.9.4
   - skews ==0.1.0.3
   - skip-var ==0.1.1.0
-  - skylighting ==0.10.0.3
-  - skylighting-core ==0.10.0.3
+  - skylighting ==0.10.1
+  - skylighting-core ==0.10.1
   - slack-api ==0.12
   - slack-progressbar ==0.1.0.1
   - slist ==0.1.1.0
@@ -2150,16 +2154,16 @@ default-package-overrides:
   - splitmix ==0.0.5
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.8
-  - sql-words ==0.1.6.4
   - sqlcli ==0.2.2.0
   - sqlcli-odbc ==0.2.0.1
   - sqlite-simple ==0.4.18.0
+  - sql-words ==0.1.6.4
   - squeal-postgresql ==0.7.0.1
   - squeather ==0.4.0.0
   - srcloc ==0.5.1.2
   - stache ==2.2.0
-  - stack-templatizer ==0.1.0.2
   - stackcollapse-ghc ==0.0.1.3
+  - stack-templatizer ==0.1.0.2
   - stateref ==0.3
   - StateVar ==1.2
   - static-text ==0.2.0.6
@@ -2174,16 +2178,16 @@ default-package-overrides:
   - stm-extras ==0.1.0.3
   - stm-hamt ==1.2.0.4
   - stm-lifted ==2.5.0.0
-  - stm-split ==0.0.2.1
   - STMonadTrans ==0.4.4
+  - stm-split ==0.0.2.1
   - stopwatch ==0.1.0.6
   - storable-complex ==0.2.3.0
   - storable-endian ==0.2.6
   - storable-record ==0.0.5
   - storable-tuple ==0.0.3.3
   - storablevector ==0.2.13.1
-  - store ==0.7.7
-  - store-core ==0.4.4.3
+  - store ==0.7.8
+  - store-core ==0.4.4.4
   - store-streaming ==0.2.0.3
   - stratosphere ==0.59.1
   - streaming ==0.2.3.0
@@ -2196,6 +2200,7 @@ default-package-overrides:
   - strict-list ==0.1.5
   - strict-tuple ==0.1.4
   - strict-tuple-lens ==0.1.0.1
+  - stringbuilder ==0.5.1
   - string-class ==0.1.7.0
   - string-combinators ==0.6.0.5
   - string-conv ==0.1.2
@@ -2203,9 +2208,8 @@ default-package-overrides:
   - string-interpolate ==0.3.0.2
   - string-qq ==0.0.4
   - string-random ==0.1.3.0
-  - string-transform ==1.1.1
-  - stringbuilder ==0.5.1
   - stringsearch ==0.3.6.6
+  - string-transform ==1.1.1
   - stripe-concepts ==1.0.2.4
   - stripe-core ==2.6.2
   - stripe-haskell ==2.6.2
@@ -2230,10 +2234,10 @@ default-package-overrides:
   - symmetry-operations-symbols ==0.0.2.1
   - sysinfo ==0.1.1
   - system-argv0 ==0.1.1
+  - systemd ==2.3.0
   - system-fileio ==0.3.16.4
   - system-filepath ==0.4.14
   - system-info ==0.5.1
-  - systemd ==2.3.0
   - tabular ==0.2.2.8
   - tagchup ==0.4.1.1
   - tagged ==0.8.6
@@ -2256,6 +2260,7 @@ default-package-overrides:
   - tasty-hedgehog ==1.0.0.2
   - tasty-hspec ==1.1.6
   - tasty-hunit ==0.10.0.2
+  - tasty-hunit-compat ==0.2
   - tasty-kat ==0.0.3
   - tasty-leancheck ==0.0.1
   - tasty-lua ==0.2.3.1
@@ -2296,6 +2301,7 @@ default-package-overrides:
   - text-icu ==0.7.0.1
   - text-latin1 ==0.3.1
   - text-ldap ==0.1.1.13
+  - textlocal ==0.1.0.5
   - text-manipulate ==0.2.0.1
   - text-metrics ==0.3.0
   - text-postgresql ==0.0.3.1
@@ -2306,9 +2312,8 @@ default-package-overrides:
   - text-show ==3.9
   - text-show-instances ==3.8.4
   - text-zipper ==0.10.1
-  - textlocal ==0.1.0.5
-  - tf-random ==0.5
   - tfp ==1.0.1.1
+  - tf-random ==0.5
   - th-abstraction ==0.4.0.0
   - th-bang-compat ==0.0.1.0
   - th-compat ==0.1
@@ -2316,6 +2321,10 @@ default-package-overrides:
   - th-data-compat ==0.1.0.0
   - th-desugar ==1.11
   - th-env ==0.1.0.2
+  - these ==1.1.1.1
+  - these-lens ==1.0.1.1
+  - these-optics ==1.0.1.1
+  - these-skinny ==0.7.4
   - th-expand-syns ==0.4.6.0
   - th-extras ==0.0.0.4
   - th-lift ==0.8.2
@@ -2323,37 +2332,33 @@ default-package-overrides:
   - th-nowq ==0.1.0.5
   - th-orphans ==0.13.11
   - th-printf ==0.7
-  - th-reify-compat ==0.0.1.5
-  - th-reify-many ==0.1.9
-  - th-strict-compat ==0.1.0.1
-  - th-test-utils ==1.1.0
-  - th-utilities ==0.2.4.0
-  - these ==1.1.1.1
-  - these-lens ==1.0.1.1
-  - these-optics ==1.0.1.1
-  - these-skinny ==0.7.4
   - thread-hierarchy ==0.3.0.2
   - thread-local-storage ==0.2
-  - thread-supervisor ==0.2.0.0
   - threads ==0.5.1.6
+  - thread-supervisor ==0.2.0.0
   - threepenny-gui ==0.9.0.0
+  - th-reify-compat ==0.0.1.5
+  - th-reify-many ==0.1.9
   - throttle-io-stream ==0.2.0.1
   - through-text ==0.1.0.0
   - throwable-exceptions ==0.1.0.9
+  - th-strict-compat ==0.1.0.1
+  - th-test-utils ==1.1.0
+  - th-utilities ==0.2.4.1
   - thyme ==0.3.5.5
   - tidal ==1.6.1
   - tile ==0.3.0.0
   - time-compat ==1.9.4
+  - timeit ==2.0
+  - timelens ==0.2.0.2
   - time-lens ==0.4.0.2
   - time-locale-compat ==0.1.1.5
   - time-locale-vietnamese ==1.0.0.0
   - time-manager ==0.0.0
   - time-parsers ==0.1.2.1
-  - time-units ==1.0.0
-  - timeit ==2.0
-  - timelens ==0.2.0.2
-  - timer-wheel ==0.3.0
   - timerep ==2.0.1.0
+  - timer-wheel ==0.3.0
+  - time-units ==1.0.0
   - timezone-olson ==0.2.0
   - timezone-series ==0.1.9
   - tinylog ==0.15.0
@@ -2388,10 +2393,13 @@ default-package-overrides:
   - ttl-hashtables ==1.4.1.0
   - ttrie ==0.1.2.1
   - tuple ==0.3.0.2
+  - tuples-homogenous-h98 ==0.1.1.0
   - tuple-sop ==0.3.1.0
   - tuple-th ==0.2.5
-  - tuples-homogenous-h98 ==0.1.1.0
   - turtle ==1.5.20
+  - TypeCompose ==0.9.14
+  - typed-process ==0.2.6.0
+  - typed-uuid ==0.0.0.2
   - type-equality ==1
   - type-errors ==0.2.0.0
   - type-errors-pretty ==0.0.1.1
@@ -2405,17 +2413,14 @@ default-package-overrides:
   - type-of-html ==1.6.1.2
   - type-of-html-static ==0.1.0.2
   - type-operators ==0.2.0.0
-  - type-spec ==0.4.0.0
-  - TypeCompose ==0.9.14
-  - typed-process ==0.2.6.0
-  - typed-uuid ==0.0.0.2
   - typerep-map ==0.3.3.0
+  - type-spec ==0.4.0.0
   - tzdata ==0.2.20201021.0
   - ua-parser ==0.7.5.1
   - uglymemo ==0.1.0.1
   - ulid ==0.3.0.0
   - unagi-chan ==0.4.1.3
-  - unbounded-delays ==0.1.1.0
+  - unbounded-delays ==0.1.1.1
   - unboxed-ref ==0.4.0.0
   - unboxing-vector ==0.2.0.0
   - uncaught-exception ==0.1.0
@@ -2511,7 +2516,7 @@ default-package-overrides:
   - wai-cors ==0.2.7
   - wai-enforce-https ==0.0.2.1
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.1.2
+  - wai-extra ==3.1.3
   - wai-feature-flags ==0.1.0.1
   - wai-handler-launch ==3.0.3.1
   - wai-logger ==2.3.6
@@ -2547,18 +2552,18 @@ default-package-overrides:
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
   - witch ==0.0.0.3
-  - with-location ==0.1.0
-  - with-utf8 ==1.0.2.1
   - witherable-class ==0
   - within ==0.2.0.1
+  - with-location ==0.1.0
+  - with-utf8 ==1.0.2.1
   - wizards ==1.0.3
   - wl-pprint-annotated ==0.1.0.1
   - wl-pprint-console ==0.1.0.2
   - wl-pprint-text ==1.2.0.1
-  - word-trie ==0.3.0
-  - word-wrap ==0.4.1
   - word24 ==2.0.1
   - word8 ==0.1.3
+  - word-trie ==0.3.0
+  - word-wrap ==0.4.1
   - world-peace ==1.0.2.0
   - wrap ==0.0.0
   - wreq ==0.5.3.2
@@ -2586,6 +2591,7 @@ default-package-overrides:
   - xml-basic ==0.1.3.1
   - xml-conduit ==1.9.0.0
   - xml-conduit-writer ==0.1.1.2
+  - xmlgen ==0.6.2.2
   - xml-hamlet ==0.5.0.1
   - xml-helpers ==1.0.0
   - xml-indexed-cursor ==0.1.1.0
@@ -2594,7 +2600,6 @@ default-package-overrides:
   - xml-to-json ==2.0.1
   - xml-to-json-fast ==2.0.0
   - xml-types ==0.3.8
-  - xmlgen ==0.6.2.2
   - xmonad ==0.15
   - xmonad-contrib ==0.16
   - xmonad-extras ==0.15.2
@@ -2602,7 +2607,6 @@ default-package-overrides:
   - xxhash-ffi ==0.2.0.0
   - yaml ==0.11.5.0
   - yamlparse-applicative ==0.1.0.2
-  - yes-precure5-command ==5.5.3
   - yesod ==1.6.1.0
   - yesod-auth ==1.6.10.1
   - yesod-auth-hashdb ==1.7.1.5
@@ -2615,8 +2619,9 @@ default-package-overrides:
   - yesod-persistent ==1.6.0.5
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.1.0
-  - yesod-test ==1.6.10
+  - yesod-test ==1.6.11
   - yesod-websockets ==0.3.0.2
+  - yes-precure5-command ==5.5.3
   - yi-rope ==0.11
   - yjsvg ==0.2.0.1
   - yjtools ==0.9.18
@@ -2631,9 +2636,9 @@ default-package-overrides:
   - zio ==0.1.0.2
   - zip ==1.6.0
   - zip-archive ==0.4.1
-  - zip-stream ==0.2.0.1
   - zipper-extra ==0.1.3.2
   - zippers ==0.3
+  - zip-stream ==0.2.0.1
   - zlib ==0.6.2.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1

From c5e7cd6c680df82333474a72ed542919a2f11dbd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Dec 2020 20:24:52 +0100
Subject: [PATCH 14/29] hackage2nix: update list of broken builds to avoid
 evaluation errors

---
 .../haskell-modules/configuration-common.nix  |  3 --
 .../configuration-hackage2nix.yaml            | 49 +++++++++++++++----
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 272332e33eab..fd460db7533c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -442,9 +442,6 @@ self: super: {
   rematch = dontCheck super.rematch;            # https://github.com/tcrayford/rematch/issues/5
   rematch-text = dontCheck super.rematch-text;  # https://github.com/tcrayford/rematch/issues/6
 
-  # Should not appear in nixpkgs yet (broken anyway)
-  yarn2nix = throw "yarn2nix is not yet packaged for nixpkgs. See https://github.com/Profpatsch/yarn2nix#yarn2nix";
-
   # no haddock since this is an umbrella package.
   cloud-haskell = dontHaddock super.cloud-haskell;
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 05eac570c231..e61d2aa8879f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3379,8 +3379,8 @@ broken-packages:
   - base64-conduit
   - baserock-schema
   - basex-client
-  - basic
   - BASIC
+  - basic
   - baskell
   - batchd
   - battlenet
@@ -3528,6 +3528,7 @@ broken-packages:
   - BirdPP
   - birds-of-paradise
   - bisect-binary
+  - bishbosh
   - bit-array
   - bit-stream
   - bitcoin-address
@@ -3900,8 +3901,8 @@ broken-packages:
   - chatwork
   - cheapskate-terminal
   - check-pvp
-  - checked
   - Checked
+  - checked
   - checkmate
   - chell-quickcheck
   - chessIO
@@ -3995,6 +3996,7 @@ broken-packages:
   - cli-extras
   - cli-git
   - cli-nix
+  - clickhouse-haskell
   - clif
   - clifford
   - clifm
@@ -4359,8 +4361,8 @@ broken-packages:
   - damnpacket
   - Dangerous
   - danibot
-  - dao
   - Dao
+  - dao
   - dapi
   - darcs-benchmark
   - darcs-beta
@@ -4538,6 +4540,7 @@ broken-packages:
   - derive-gadt
   - derive-IG
   - derive-monoid
+  - derive-storable-plugin
   - derive-trie
   - derp-lib
   - describe
@@ -4806,11 +4809,13 @@ broken-packages:
   - ecma262
   - ecu
   - eddie
+  - ede
   - edenmodules
   - edenskel
   - edentv
   - edge
   - edges
+  - edis
   - edit
   - edit-lenses
   - editable
@@ -4891,6 +4896,7 @@ broken-packages:
   - enumfun
   - EnumMap
   - enummapmap
+  - env-extra
   - env-parser
   - envstatus
   - epanet-haskell
@@ -5011,8 +5017,9 @@ broken-packages:
   - f-ree-hack-cheats-free-v-bucks-generator
   - Facebook-Password-Hacker-Online-Latest-Version
   - faceted
-  - facts
+  - factory
   - Facts
+  - facts
   - factual-api
   - fadno
   - fadno-braids
@@ -5137,6 +5144,7 @@ broken-packages:
   - first-class-instances
   - firstify
   - FirstOrderTheory
+  - fishfood
   - fit
   - fits-parse
   - fitsio
@@ -5164,6 +5172,7 @@ broken-packages:
   - flamethrower
   - flamingra
   - flashblast
+  - flat
   - flat-maybe
   - flatbuffers
   - flay
@@ -5569,6 +5578,7 @@ broken-packages:
   - gloss-export
   - gloss-game
   - gloss-sodium
+  - glpk-headers
   - glpk-hs
   - gltf-codec
   - glue
@@ -6158,8 +6168,8 @@ broken-packages:
   - hdaemonize-buildfix
   - hdbc-aeson
   - HDBC-mysql
-  - hdbc-postgresql-hstore
   - HDBC-postgresql-hstore
+  - hdbc-postgresql-hstore
   - hdbi
   - hdbi-conduit
   - hdbi-postgresql
@@ -6203,6 +6213,7 @@ broken-packages:
   - hedgehog-servant
   - Hedi
   - hedis-config
+  - hedis-namespace
   - hedis-pile
   - hedis-simple
   - hedis-tags
@@ -6380,9 +6391,11 @@ broken-packages:
   - hlibfam
   - HList
   - hlivy
-  - hlogger
   - HLogger
+  - hlogger
   - hlongurl
+  - hlrdb
+  - hlrdb-core
   - hls
   - hls-brittany
   - hlwm
@@ -7221,6 +7234,7 @@ broken-packages:
   - keera-hails-reactive-yampa
   - keera-hails-reactivelenses
   - keera-hails-reactivevalues
+  - kempe
   - kerry
   - Ketchup
   - keter
@@ -7793,8 +7807,8 @@ broken-packages:
   - mecab
   - mech
   - Mecha
-  - mechs
   - Mechs
+  - mechs
   - mediabus
   - mediabus-fdk-aac
   - mediabus-rtp
@@ -8324,6 +8338,7 @@ broken-packages:
   - numeric-ranges
   - numerical
   - numhask-array
+  - numhask-free
   - numhask-hedgehog
   - numhask-histogram
   - numhask-prelude
@@ -8500,6 +8515,7 @@ broken-packages:
   - pandoc-crossref
   - pandoc-csv2table
   - pandoc-filter-graphviz
+  - pandoc-filter-indent
   - pandoc-include
   - pandoc-include-code
   - pandoc-japanese-filters
@@ -8667,6 +8683,7 @@ broken-packages:
   - peyotls
   - peyotls-codec
   - pez
+  - pg-extras
   - pg-harness
   - pg-harness-server
   - pg-recorder
@@ -8802,6 +8819,7 @@ broken-packages:
   - polysemy-methodology
   - polysemy-methodology-composite
   - polysemy-optics
+  - polysemy-path
   - polysemy-RandomFu
   - polysemy-resume
   - polysemy-test
@@ -8974,6 +8992,7 @@ broken-packages:
   - prosidy
   - prosidyc
   - prosper
+  - proteaaudio
   - proteome
   - proto-lens-combinators
   - proto-lens-descriptors
@@ -9437,7 +9456,11 @@ broken-packages:
   - rocksdb-haskell
   - roku-api
   - rollbar
+  - rollbar-cli
+  - rollbar-client
   - rollbar-hs
+  - rollbar-wai
+  - rollbar-yesod
   - roller
   - RollingDirectory
   - ron-rdt
@@ -9702,6 +9725,7 @@ broken-packages:
   - servant-openapi3
   - servant-pagination
   - servant-pandoc
+  - servant-polysemy
   - servant-pool
   - servant-postgresql
   - servant-proto-lens
@@ -9926,6 +9950,7 @@ broken-packages:
   - Smooth
   - smsaero
   - smt-lib
+  - smt2-parser
   - SmtLib
   - smtlib2
   - smtlib2-debug
@@ -10094,6 +10119,7 @@ broken-packages:
   - sqlvalue-list
   - sqsd-local
   - squeal-postgresql
+  - squeeze
   - sr-extra
   - srcinst
   - sscan
@@ -10181,6 +10207,7 @@ broken-packages:
   - stmcontrol
   - stochastic
   - StockholmAlignment
+  - stocks
   - Stomp
   - storable
   - storable-static-array
@@ -10362,8 +10389,8 @@ broken-packages:
   - table
   - table-tennis
   - tableaux
-  - tables
   - Tables
+  - tables
   - tablestorage
   - Tablify
   - tabloid
@@ -10633,8 +10660,8 @@ broken-packages:
   - tonatona-servant
   - too-many-cells
   - toodles
-  - top
   - Top
+  - top
   - topkata
   - torch
   - TORCS
@@ -10888,6 +10915,7 @@ broken-packages:
   - uploadcare
   - upskirt
   - urbit-airlock
+  - urbit-api
   - ureader
   - urembed
   - uri
@@ -11155,6 +11183,7 @@ broken-packages:
   - WEditor
   - WEditorBrick
   - WEditorHyphen
+  - weekdaze
   - weighted
   - weighted-regexp
   - welshy
@@ -11343,6 +11372,7 @@ broken-packages:
   - yam-datasource
   - yam-logger
   - yam-redis
+  - yam-servant
   - yam-transaction
   - yam-transaction-odbc
   - yam-web
@@ -11363,6 +11393,7 @@ broken-packages:
   - yaop
   - yap
   - yarn-lock
+  - yarn2nix
   - yarr
   - yarr-image-io
   - yavie

From 130c356e5f5f5c6b982fb1d682f1d8403642e201 Mon Sep 17 00:00:00 2001
From: Jappie Klooster <jappieklooster@hotmail.com>
Date: Mon, 30 Nov 2020 09:17:33 +0100
Subject: [PATCH 15/29] haskell-xmpp: 2.0.1 Mark unbroken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e61d2aa8879f..4e0a2ced2c4c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -6015,7 +6015,6 @@ broken-packages:
   - haskell-type-exts
   - haskell-typescript
   - haskell-tyrant
-  - haskell-xmpp
   - haskell2010
   - haskell2020
   - haskell98

From 9c7e9439efde763eb3cac072328c0947dfa3e8e8 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nvd1234@gmail.com>
Date: Wed, 2 Dec 2020 11:29:39 +0000
Subject: [PATCH 16/29] haskellPackages.arithmoi: mark as not broken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4e0a2ced2c4c..f09f9a66762b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3199,7 +3199,6 @@ broken-packages:
   - arion
   - arith-encode
   - arithmetic-circuits
-  - arithmoi
   - armada
   - armor
   - arpa

From 25f91f0abd2b13321b01845e7f3d143cac63978d Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nvd1234@gmail.com>
Date: Wed, 2 Dec 2020 11:29:53 +0000
Subject: [PATCH 17/29] haskellPackages.arith-encode: mark as not broken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f09f9a66762b..1803a9cead0b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3197,7 +3197,6 @@ broken-packages:
   - arguedit
   - ariadne
   - arion
-  - arith-encode
   - arithmetic-circuits
   - armada
   - armor

From efa9bddecfe3362662ac63dcfea332f2fc19a5c0 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nvd1234@gmail.com>
Date: Wed, 2 Dec 2020 12:03:13 +0000
Subject: [PATCH 18/29] haskellPackages.enumeration: mark as not broken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 1803a9cead0b..b874d80a2531 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4887,7 +4887,6 @@ broken-packages:
   - EnumContainers
   - enumerate
   - enumerate-function
-  - enumeration
   - enumerator
   - enumerator-fd
   - enumerator-tf

From 1a6a2bb4d31fba9087d6ec0c00f72b0353cb48c5 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nvd1234@gmail.com>
Date: Wed, 2 Dec 2020 12:04:09 +0000
Subject: [PATCH 19/29] haskellPackages.cantor-pairing: mark as not broken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b874d80a2531..5e6148749514 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3795,7 +3795,6 @@ broken-packages:
   - canteven-log
   - canteven-parsedate
   - cantor
-  - cantor-pairing
   - cao
   - cap
   - Capabilities

From bc2c06cfd1b9ae78e0f22497fade5474f7865ef9 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nvd1234@gmail.com>
Date: Wed, 2 Dec 2020 12:05:43 +0000
Subject: [PATCH 20/29] haskellPackages.quadratic-irrational: mark as not
 broken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5e6148749514..021f54e2a83c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -9067,7 +9067,6 @@ broken-packages:
   - qtah-generator
   - qtah-qt5
   - QuadEdge
-  - quadratic-irrational
   - QuadTree
   - quantfin
   - quantification

From b6cb88dd20b7a808901d1c447c63946052a55944 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nvd1234@gmail.com>
Date: Wed, 2 Dec 2020 12:09:50 +0000
Subject: [PATCH 21/29] haskellPackages.cyclotomic: mark as unbroken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 021f54e2a83c..ff485620e5ef 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4349,7 +4349,6 @@ broken-packages:
   - custom-prelude
   - CV
   - cv-combinators
-  - cyclotomic
   - cypher
   - d-bus
   - d3js

From 3e71b42c3cfeff33b580e348caeb854828696eab Mon Sep 17 00:00:00 2001
From: Artur Cygan <arczicygan@gmail.com>
Date: Sun, 29 Nov 2020 00:08:39 +0100
Subject: [PATCH 22/29] haskellPackages.hevm: unbreak

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ff485620e5ef..8aa931028a9d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -6251,7 +6251,6 @@ broken-packages:
   - heterolist
   - hetris
   - heukarya
-  - hevm
   - hevolisa
   - hevolisa-dph
   - hex-text
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 0a08fb89cbfa..530e2707a2a9 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -830,4 +830,7 @@ self: super: builtins.intersectAttrs super {
       export HOME=$TMPDIR
     '';
   });
+
+  # tests depend on a specific version of solc
+  hevm = dontCheck (doJailbreak super.hevm);
 }

From 5d2288ea46855fd419032c788cac980160896a2f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Nov 2020 02:30:31 +0100
Subject: [PATCH 23/29] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.5-30-g2441a43 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/acab62431f4881e6914257daa86dc80c854efe80.
---
 .../haskell-modules/hackage-packages.nix      | 1693 ++++++++++-------
 1 file changed, 973 insertions(+), 720 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 154c9ec14cb7..85711a041b5b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -20659,8 +20659,8 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "VulkanMemoryAllocator";
-       version = "0.3.10";
-       sha256 = "16m08h11c8wwi159ppn698m60nk54k4dgxa2di2j02g58l16pmcn";
+       version = "0.3.11";
+       sha256 = "0xlw2znk6lzblc9iv13fiy2zxngglc9ylzb1lj6qcfdnbi1sr9n0";
        libraryHaskellDepends = [
          base bytestring transformers vector vulkan
        ];
@@ -24062,8 +24062,8 @@ self: {
      }:
      mkDerivation {
        pname = "advent-of-code-api";
-       version = "0.2.7.0";
-       sha256 = "0a1h2kwmfnhs1sj7wmnc4hgfwq45d8xl2ah0s6432k13v8lfpxwr";
+       version = "0.2.7.1";
+       sha256 = "1amm7gvr04ndfw6b0jxy8wsa35lqbfb85wp9bn9kycd8qp6vq9cs";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath
          finite-typelits http-api-data http-client http-client-tls
@@ -24084,8 +24084,8 @@ self: {
      }:
      mkDerivation {
        pname = "advent-of-code-ocr";
-       version = "0.1.0.0";
-       sha256 = "03qak7hic0kbmxz7krq5z2a8ah6z7pzr7r3sybd5h778m4sgvdca";
+       version = "0.1.1.0";
+       sha256 = "0kzmm901yz262dblwv1wxf86h1jm8m2x1ky1gqvj03lck598fqz7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -24589,8 +24589,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-injector";
-       version = "1.1.4.0";
-       sha256 = "1q8wv9xdw8nw504dxplb3ibskfjqbawmv2694sjwg5cvi8d7fvkn";
+       version = "1.1.5.0";
+       sha256 = "0hg853hhbvmqa6yj0xg8naxdrbs2n3lzld0jrbmfmccjqcfzarx4";
        libraryHaskellDepends = [
          aeson base bifunctors deepseq hashable lens servant-docs swagger2
          text unordered-containers
@@ -31931,8 +31931,8 @@ self: {
      }:
      mkDerivation {
        pname = "arch-hs";
-       version = "0.4.0.0";
-       sha256 = "022vvznfqkia0w6s6wc586cbzj3l6yabkf73bx2biy8axsls2g4p";
+       version = "0.5.0.0";
+       sha256 = "04w0b8ivwrm1g0qg0pym7qap4ggzv6ng9x6jy5k2nnbmpck07597";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32385,8 +32385,6 @@ self: {
        ];
        description = "A practical arithmetic encoding (aka Godel numbering) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arithmatic" = callPackage
@@ -32491,8 +32489,6 @@ self: {
        ];
        description = "Efficient basic number-theoretic functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arity-generic-liftA" = callPackage
@@ -38622,8 +38618,8 @@ self: {
      }:
      mkDerivation {
        pname = "beam-automigrate";
-       version = "0.1.0.1";
-       sha256 = "0sjp09wfp6qlrbl6w8ddwngsnrwvp225msqgnv0l1x4nwxia5kpz";
+       version = "0.1.1.0";
+       sha256 = "14h8zbxyrkhajjbhjmdib9s99xv0bmar4s6gb4mpqkvhakj7a76n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41735,6 +41731,8 @@ self: {
        ];
        description = "Plays chess";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bit-array" = callPackage
@@ -43063,6 +43061,8 @@ self: {
        pname = "blaze-colonnade";
        version = "1.2.2.1";
        sha256 = "1wh0q72qv2s6a42i13lqb94i0b5bgmqwqw7d5xy89dc76j0ncd2d";
+       revision = "1";
+       editedCabalFile = "0b8imj6i3map53b3j9i7rz9wc65s10qd4hndpq6nik2xd6shdip3";
        libraryHaskellDepends = [
          base blaze-html blaze-markup colonnade profunctors text
        ];
@@ -44788,8 +44788,8 @@ self: {
      }:
      mkDerivation {
        pname = "box-socket";
-       version = "0.1.1";
-       sha256 = "162c3rnr5h5a8sixwnsbvf6fdbghsxx1ckvgdn4pd4b5xfa287j0";
+       version = "0.1.2";
+       sha256 = "0ybv8amph38s2yz8qpwjrn7428d09ikl7d5ljqkbivydripg6ybc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44800,7 +44800,7 @@ self: {
          base box concurrency generic-lens lens numhask optparse-generic
        ];
        testHaskellDepends = [ base doctest numhask ];
-       description = "See readme.md";
+       description = "Box websockets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -47248,8 +47248,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytestring-tree-builder";
-       version = "0.2.7.5";
-       sha256 = "0mja4hfqn2p73hslsabgxmsj9i0990p217882ydb479vpdvy74m4";
+       version = "0.2.7.7";
+       sha256 = "193nryzgbjij6md84i2w2jhpsgsqz94g71744wj45qr2gzivyxfb";
        libraryHaskellDepends = [ base base-prelude bytestring text ];
        testHaskellDepends = [
          base-prelude bytestring QuickCheck quickcheck-instances tasty
@@ -49473,8 +49473,8 @@ self: {
      }:
      mkDerivation {
        pname = "calamity";
-       version = "0.1.22.0";
-       sha256 = "0cmv24r5ay34v50rfdp7rakhzrs0fx079nncfq4xi5j4mm484dna";
+       version = "0.1.22.1";
+       sha256 = "0mwpggxkag3l4ql75yhp5a0mpmwah44a9rqpsln0ds405jydjw92";
        libraryHaskellDepends = [
          aeson async base bytestring colour concurrent-extra containers
          data-default-class data-flags deepseq deque df1 di-core di-polysemy
@@ -49990,8 +49990,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Convert data to and from a natural number representation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cao" = callPackage
@@ -53069,33 +53067,31 @@ self: {
   "chessIO" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, containers
      , directory, extra, file-embed, haskeline, megaparsec, MonadRandom
-     , mtl, o-clock, optparse-applicative, parallel, parser-combinators
-     , prettyprinter, process, random, stm, text, time
-     , unordered-containers, vector
+     , mtl, o-clock, optparse-applicative, parallel, prettyprinter
+     , process, random, stm, text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "chessIO";
-       version = "0.4.0.0";
-       sha256 = "0166hrzpw9hcbcgckyf966nvjyf6caa1h3sdi923m9y32924p65v";
+       version = "0.5.0.0";
+       sha256 = "14di8x8r7q2sjwipx8crgr0bcy3qhr58knf6paqkfqsxc3iynr0h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base binary bytestring containers file-embed megaparsec
-         MonadRandom o-clock parser-combinators prettyprinter process random
-         stm text unordered-containers vector
+         attoparsec base binary bytestring containers extra file-embed
+         megaparsec MonadRandom o-clock prettyprinter process random stm
+         text unordered-containers vector
        ];
        executableHaskellDepends = [
          attoparsec base binary bytestring containers extra file-embed
          haskeline megaparsec MonadRandom mtl o-clock optparse-applicative
-         parser-combinators prettyprinter process random stm text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         attoparsec base binary bytestring containers directory file-embed
-         megaparsec MonadRandom o-clock parallel parser-combinators
          prettyprinter process random stm text time unordered-containers
          vector
        ];
+       testHaskellDepends = [
+         attoparsec base binary bytestring containers directory extra
+         file-embed megaparsec MonadRandom o-clock parallel prettyprinter
+         process random stm text time unordered-containers vector
+       ];
        description = "Basic chess library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54098,19 +54094,21 @@ self: {
 
   "circular" = callPackage
     ({ mkDerivation, aeson, base, criterion, hspec, hspec-discover
-     , QuickCheck, quickcheck-instances, vector
+     , primitive, QuickCheck, quickcheck-instances, vector
      }:
      mkDerivation {
        pname = "circular";
-       version = "0.1.1";
-       sha256 = "0kj9sfal78k0ba5djq10xddy2h8lq0grf5cknwcr96j555nlwhk9";
-       libraryHaskellDepends = [ aeson base vector ];
+       version = "0.3.1";
+       sha256 = "14fyhqyqv08yml0bsxpjqv3x1alnwdsp9yx5f035vwp9p1mh7rll";
+       libraryHaskellDepends = [ aeson base primitive vector ];
        testHaskellDepends = [
-         aeson base hspec hspec-discover QuickCheck quickcheck-instances
-         vector
+         aeson base hspec hspec-discover primitive QuickCheck
+         quickcheck-instances vector
        ];
        testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [ aeson base criterion vector ];
+       benchmarkHaskellDepends = [
+         aeson base criterion primitive vector
+       ];
        description = "Circular fixed-sized mutable vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55446,6 +55444,44 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clickhouse-haskell" = callPackage
+    ({ mkDerivation, aeson, array, async, attoparsec, base, binary
+     , bytestring, bytestring-to-vector, call-stack, containers
+     , data-default-class, data-dword, exceptions, filepath, hashable
+     , hashmap, haxl, hspec, http-client, HUnit, io-streams, monad-loops
+     , monad-parallel, mtl, network, network-ip, network-simple, parsec
+     , QuickCheck, resource-pool, split, streaming-commons, text, time
+     , transformers, tz, unix-time, unordered-containers, uri-encode
+     , uuid, vector, word8
+     }:
+     mkDerivation {
+       pname = "clickhouse-haskell";
+       version = "0.1.2.0";
+       sha256 = "0mys7l7sncrdwd673p0s4ls3ir5i26kcjl7x0hpd9a4ms8y04fxx";
+       libraryHaskellDepends = [
+         aeson array async attoparsec base binary bytestring
+         bytestring-to-vector call-stack containers data-default-class
+         data-dword exceptions filepath hashable hashmap haxl http-client
+         io-streams monad-loops monad-parallel mtl network network-ip
+         network-simple parsec resource-pool split streaming-commons text
+         time transformers tz unix-time unordered-containers uri-encode uuid
+         vector word8
+       ];
+       testHaskellDepends = [
+         aeson array async attoparsec base binary bytestring
+         bytestring-to-vector call-stack containers data-default-class
+         data-dword exceptions filepath hashable hashmap haxl hspec
+         http-client HUnit io-streams monad-loops monad-parallel mtl network
+         network-ip network-simple parsec QuickCheck resource-pool split
+         streaming-commons text time transformers tz unix-time
+         unordered-containers uri-encode uuid vector word8
+       ];
+       description = "A Haskell library as database client for Clickhouse";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "clientsession" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cereal
      , cipher-aes, containers, cprng-aes, crypto-api, crypto-random
@@ -60120,34 +60156,6 @@ self: {
      }) {};
 
   "conduit" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , exceptions, filepath, gauge, hspec, kan-extensions
-     , mono-traversable, mtl, mwc-random, primitive, QuickCheck
-     , resourcet, safe, silently, split, text, transformers, unix
-     , unliftio, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "conduit";
-       version = "1.3.3";
-       sha256 = "0jv3j1dc7iswi3kljn9y3jq7rn2aiq9d1vkn2xdpirc519ckxfnl";
-       libraryHaskellDepends = [
-         base bytestring directory exceptions filepath mono-traversable mtl
-         primitive resourcet text transformers unix unliftio-core vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory exceptions filepath hspec
-         mono-traversable mtl QuickCheck resourcet safe silently split text
-         transformers unliftio vector
-       ];
-       benchmarkHaskellDepends = [
-         base containers deepseq gauge hspec kan-extensions mwc-random
-         transformers vector
-       ];
-       description = "Streaming data processing library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit_1_3_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, gauge, hspec, kan-extensions
      , mono-traversable, mtl, mwc-random, primitive, QuickCheck
@@ -60173,7 +60181,6 @@ self: {
        ];
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-algorithms" = callPackage
@@ -61020,10 +61027,8 @@ self: {
      }:
      mkDerivation {
        pname = "config-value";
-       version = "0.8";
-       sha256 = "1l2w2ylxx9d48pjnc9490kisawz48mf038f108g3zvb0j3iz9vyn";
-       revision = "1";
-       editedCabalFile = "0s121lvv1bv658ig1r3gdkf37wjyvgy958ll1497r8hsc6y73f4m";
+       version = "0.8.1";
+       sha256 = "086jv01a737547w6x9w1951vq0p7mx6vqw9ifw5kcs5nvhj5rx2q";
        libraryHaskellDepends = [ array base containers pretty text ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [ base text ];
@@ -65656,8 +65661,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-catalog";
-       version = "0.7.3";
-       sha256 = "18xn06drza3pwyhidlkr478hvn8ss93f3f30wmfrh79ngabip4kp";
+       version = "0.7.4";
+       sha256 = "1ca70yk13b239383q9d8fwc4qd6jm22dqinfhasd88b4iv9p46h8";
        libraryHaskellDepends = [
          base csound-expression csound-sampler sharc-timbre transformers
        ];
@@ -65665,6 +65670,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "csound-controllers" = callPackage
+    ({ mkDerivation, base, csound-expression }:
+     mkDerivation {
+       pname = "csound-controllers";
+       version = "0.1.1.0";
+       sha256 = "1p2fa00djwyrv7fdrngawmk3r41q6a4mlsqgdm4qajmivbj0sg9m";
+       libraryHaskellDepends = [ base csound-expression ];
+       testHaskellDepends = [ base csound-expression ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "csound-expression" = callPackage
     ({ mkDerivation, base, Boolean, colour, containers
      , csound-expression-dynamic, csound-expression-opcodes
@@ -65673,8 +65689,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression";
-       version = "5.3.3";
-       sha256 = "0g6djh3ijvka6hkw4nhb7vhhyl4i268rdxvnwmm6ayg6a8kg8p0g";
+       version = "5.3.4";
+       sha256 = "0v5mv2yhw114y7hixh3qjy88sfrry7xfyzkwwk1dpwnq8yycp0ir";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
@@ -65691,8 +65707,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-dynamic";
-       version = "0.3.5";
-       sha256 = "07xykqpym48bvvs7sa0m12psahsn7z245cd89akv9flkgwjwaa29";
+       version = "0.3.6";
+       sha256 = "1s4gyn4rpkpfpb0glbb39hnzkw9vr4his3s4a4azx894cymyhzg0";
        libraryHaskellDepends = [
          array base Boolean containers data-default data-fix data-fix-cse
          deriving-compat hashable transformers wl-pprint
@@ -65707,8 +65723,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-opcodes";
-       version = "0.0.4.0";
-       sha256 = "1rzkv24xppysmx20x453wzxfapkic99c98jqzpf2iyfyny1qya2w";
+       version = "0.0.5.0";
+       sha256 = "1qif8nx3652883zf84w4d0l2lzlbrk9n25rn4i5mxcmlv9px06ha";
        libraryHaskellDepends = [
          base csound-expression-dynamic csound-expression-typed transformers
        ];
@@ -65724,8 +65740,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-typed";
-       version = "0.2.3.1";
-       sha256 = "02zd41sz1y8qfchdyhgiddi6s1p5081nr5haq04qdmbz5bgpdmbq";
+       version = "0.2.4";
+       sha256 = "1hqmwlgx0dcci7z76w4i5xcq10c4jigzbm7fvf0xxwffmhf6j752";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
@@ -65740,8 +65756,8 @@ self: {
     ({ mkDerivation, base, csound-expression, transformers }:
      mkDerivation {
        pname = "csound-sampler";
-       version = "0.0.9.0";
-       sha256 = "0vvsqbnd1yjwijz4g0y9av6d20m73b5swln4v7gna3jd16mrg2k1";
+       version = "0.0.10.0";
+       sha256 = "0mi7w39adkn5l1h05arfap3c0ddb8j65wv96i3jrswpc3ljf3b2y";
        libraryHaskellDepends = [ base csound-expression transformers ];
        description = "A musical sampler based on Csound";
        license = stdenv.lib.licenses.bsd3;
@@ -66831,8 +66847,6 @@ self: {
        ];
        description = "A subfield of the complex numbers for exact calculation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cypher" = callPackage
@@ -68425,8 +68439,8 @@ self: {
     ({ mkDerivation, base, criterion, transformers }:
      mkDerivation {
        pname = "data-has";
-       version = "0.3.0.0";
-       sha256 = "0ybkm9zvl0l60f44p80fislbdmwwhavqz31wymnikjsyc01x899w";
+       version = "0.4.0.0";
+       sha256 = "1zkjn2m4s59h09i3kgqxr45xw8kr34d1f2fxanac1c7y8242vdbz";
        libraryHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion transformers ];
        description = "Simple extensible product";
@@ -71057,28 +71071,6 @@ self: {
      }) {};
 
   "deferred-folds" = callPackage
-    ({ mkDerivation, base, bytestring, containers, foldl, hashable
-     , primitive, QuickCheck, quickcheck-instances, rerebase, tasty
-     , tasty-hunit, tasty-quickcheck, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "deferred-folds";
-       version = "0.9.11";
-       sha256 = "02j1akzjdi73l7adlhv49sln5saq2j53pziqwzw6zw0bsf53q00k";
-       libraryHaskellDepends = [
-         base bytestring containers foldl hashable primitive transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
-         tasty-quickcheck
-       ];
-       description = "Abstractions over deferred folds";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "deferred-folds_0_9_15" = callPackage
     ({ mkDerivation, base, bytestring, containers, foldl, hashable
      , primitive, QuickCheck, quickcheck-instances, rerebase, tasty
      , tasty-hunit, tasty-quickcheck, text, transformers
@@ -71098,7 +71090,6 @@ self: {
        ];
        description = "Abstractions over deferred folds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-base" = callPackage
@@ -71952,8 +71943,8 @@ self: {
     ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck }:
      mkDerivation {
        pname = "derive-storable";
-       version = "0.2.0.0";
-       sha256 = "0cr13ydc3p5zsrzimha4xkaj5hmf2bj3hylzjh2llgcgi2l8vc53";
+       version = "0.3.0.0";
+       sha256 = "1qxf729wmvcszw9bs2w9h7ww9sh55576hvalpg0qp6l3zlp3f4sq";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
@@ -71967,10 +71958,8 @@ self: {
      }:
      mkDerivation {
        pname = "derive-storable-plugin";
-       version = "0.2.3.0";
-       sha256 = "0yr9s33drw5l4ckqipqpmgrsrnm18yr4742mmyjqm3x7wai7d99q";
-       revision = "1";
-       editedCabalFile = "0wrynvd305bk3mvm9rbs9vrfb65yhiy2s83r8hs690r1vsw4mdkj";
+       version = "0.2.3.1";
+       sha256 = "1g2i2l97jldw9yv10dbcbaq54lz1k1aajhxr28m7fgjwf2mry3gi";
        libraryHaskellDepends = [ base derive-storable ghc ghci ];
        testHaskellDepends = [
          base derive-storable ghc ghci hspec QuickCheck
@@ -71980,6 +71969,8 @@ self: {
        ];
        description = "GHC core plugin supporting the derive-storable package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive-topdown" = callPackage
@@ -72590,6 +72581,8 @@ self: {
        pname = "dhall";
        version = "1.36.0";
        sha256 = "014bdxmrcxzc2yrk838fxbz521714fk3a7c6idb9065wrfzch1wj";
+       revision = "1";
+       editedCabalFile = "1561i0rv0qx4mizwg1k04qynwdz6gsx4fifps9415rwdfki6dyxw";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -76992,8 +76985,8 @@ self: {
      }:
      mkDerivation {
        pname = "doctemplates";
-       version = "0.8.2";
-       sha256 = "14xymm4lp0nfbm2y8jcyaisb52mrwjz40dz5n5c8m48rkqqb4qzl";
+       version = "0.8.3";
+       sha256 = "0pzzcy2f1ysnqzkv14h7x9dp9ywf5rn5k8cvwwwvlg6sjizgvfpd";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers doclayout filepath HsYAML mtl parsec safe
@@ -80075,29 +80068,36 @@ self: {
      }) {};
 
   "ede" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors
-     , bytestring, comonad, directory, double-conversion, filepath, free
-     , lens, mtl, parsers, scientific, semigroups, tasty, tasty-golden
-     , text, text-format, text-manipulate, trifecta
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
+     , comonad, directory, filepath, free, lens, mtl
+     , optparse-applicative, parsers, prettyprinter
+     , prettyprinter-ansi-terminal, scientific, tasty, tasty-golden
+     , text, text-manipulate, trifecta, unordered-containers, vector
      }:
      mkDerivation {
        pname = "ede";
-       version = "0.2.9";
-       sha256 = "0gvs9kyq4xyz11x5cqmr7vnh4d1vany36rfpmm4dg23w3yj36fab";
+       version = "0.3.2.0";
+       sha256 = "1y78l8b6wnl621nlfm3jwf9qskfnyd4ian1sxjsmk2jw22z1yp4d";
+       isLibrary = true;
+       isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson ansi-wl-pprint base bifunctors bytestring comonad directory
-         double-conversion filepath free lens mtl parsers scientific
-         semigroups text text-format text-manipulate trifecta
-         unordered-containers vector
+         aeson base bytestring comonad directory filepath free lens mtl
+         parsers prettyprinter prettyprinter-ansi-terminal scientific text
+         text-manipulate trifecta unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring optparse-applicative prettyprinter
+         prettyprinter-ansi-terminal text
        ];
        testHaskellDepends = [
-         aeson base bifunctors bytestring directory tasty tasty-golden text
+         aeson base bifunctors bytestring directory filepath tasty
+         tasty-golden text
        ];
        description = "Templating language with similar syntax and features to Liquid or Jinja2";
-       license = "unknown";
+       license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edenmodules" = callPackage
@@ -80217,6 +80217,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal hedis ];
        description = "Statically typechecked client for Redis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edit" = callPackage
@@ -82762,8 +82764,6 @@ self: {
        testHaskellDepends = [ arith-encode base binary HUnit-Plus ];
        description = "A practical API for building recursive enumeration procedures and enumerating datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumerator" = callPackage
@@ -82921,6 +82921,8 @@ self: {
        ];
        description = "Safe helpers for accessing and modifying environment variables";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "env-locale" = callPackage
@@ -83581,13 +83583,24 @@ self: {
     ({ mkDerivation, base, containers, text }:
      mkDerivation {
        pname = "error-or";
-       version = "0.1.0.0";
-       sha256 = "1bpazb078xfbylzpzh9dq3p3fgddpizv118n31papi0fr7xddrli";
+       version = "0.1.1.0";
+       sha256 = "0xh47kyzdyycvi6dxlw736zsa4pxplh9ariw7p2mcr64rx2r77cl";
        libraryHaskellDepends = [ base containers text ];
        description = "Composable, hierarchical errors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "error-or-utils" = callPackage
+    ({ mkDerivation, base, containers, error-or, text }:
+     mkDerivation {
+       pname = "error-or-utils";
+       version = "0.1.1";
+       sha256 = "14n5h69wknns3b6ij8avdijwlpwykalkpvx2q57cg6zv0ywnvmwz";
+       libraryHaskellDepends = [ base containers error-or text ];
+       description = "Utilities using ErrorOr datatype";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "error-util" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -86765,6 +86778,8 @@ self: {
        ];
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "facts" = callPackage
@@ -90055,6 +90070,8 @@ self: {
        ];
        description = "Calculates file-size frequency-distribution";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fit" = callPackage
@@ -90792,6 +90809,8 @@ self: {
        ];
        description = "Principled and efficient bit-oriented binary serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flat-maybe" = callPackage
@@ -94117,8 +94136,8 @@ self: {
     ({ mkDerivation, base, bifunctors, lens, optparse-applicative }:
      mkDerivation {
        pname = "friendly";
-       version = "0.1.0.1";
-       sha256 = "0860zmvlccdnjycmjr4wmi8ighps9dig5zik8hpj2h3z208ph8qp";
+       version = "0.1.0.2";
+       sha256 = "18j9nw76rwsikf5wyv33mw04mn4xmdnk757c26zfbcx8rkcwjqzn";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -98579,8 +98598,8 @@ self: {
      }:
      mkDerivation {
        pname = "geos";
-       version = "0.3.0";
-       sha256 = "1nv4x881ds6492lq1r14fd6isfb65b0cpxvgh6gpy5l0wyyap1gp";
+       version = "0.4.1";
+       sha256 = "1b6dp3vzp8jpgdzkqzfyjk8n26w8jb06adp77qzfbjmik0lw8b03";
        libraryHaskellDepends = [
          base bytestring mtl transformers vector
        ];
@@ -100921,25 +100940,6 @@ self: {
      }) {inherit (pkgs) glib;};
 
   "gi-gobject" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-gobject";
-       version = "2.0.24";
-       sha256 = "1i19s7pcs3gnhhyif8y3j7hngmdzfqbgaw52j8dvrz7w11fbx9sj";
-       setupHaskellDepends = [ base Cabal gi-glib haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       description = "GObject bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-gobject_2_0_25" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -100956,7 +100956,6 @@ self: {
        libraryPkgconfigDepends = [ glib ];
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-graphene" = callPackage
@@ -103895,6 +103894,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Low-level Haskell bindings to GLPK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) glpk;};
 
   "glpk-hs" = callPackage
@@ -112601,6 +112602,8 @@ self: {
        pname = "hakyll";
        version = "4.13.4.1";
        sha256 = "1z9k3029bjyxy2aqmqr6gzsva50154y4bfxqkmsjgl38lx3s6kk9";
+       revision = "1";
+       editedCabalFile = "1hv80gqq50zz791620lgdvkspspii0z59ngj7la69cdw2739cc5g";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -116405,28 +116408,6 @@ self: {
      }) {};
 
   "haskell-gi" = callPackage
-    ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal
-     , cabal-doctest, containers, directory, doctest, filepath, glib
-     , gobject-introspection, haskell-gi-base, mtl, pretty-show, process
-     , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit
-     }:
-     mkDerivation {
-       pname = "haskell-gi";
-       version = "0.24.5";
-       sha256 = "0cb7qbi92zgqv9nx0v6pggw3lwv931hpph2jnrbmr1vl7sz48rqn";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         ansi-terminal attoparsec base bytestring Cabal containers directory
-         filepath haskell-gi-base mtl pretty-show process regex-tdfa safe
-         text transformers xdg-basedir xml-conduit
-       ];
-       libraryPkgconfigDepends = [ glib gobject-introspection ];
-       testHaskellDepends = [ base doctest process ];
-       description = "Generate Haskell bindings for GObject Introspection capable libraries";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
-
-  "haskell-gi_0_24_7" = callPackage
     ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal
      , cabal-doctest, containers, directory, doctest, filepath, glib
      , gobject-introspection, haskell-gi-base, mtl, pretty-show, process
@@ -116446,22 +116427,9 @@ self: {
        testHaskellDepends = [ base doctest process ];
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
 
   "haskell-gi-base" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib, text }:
-     mkDerivation {
-       pname = "haskell-gi-base";
-       version = "0.24.4";
-       sha256 = "1xdl2pfpk30h4649avh0ms6gq9dij3yxpfxn6kwxyjcsxdggzmdg";
-       libraryHaskellDepends = [ base bytestring containers text ];
-       libraryPkgconfigDepends = [ glib ];
-       description = "Foundation for libraries generated by haskell-gi";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "haskell-gi-base_0_24_5" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
@@ -116471,7 +116439,6 @@ self: {
        libraryPkgconfigDepends = [ glib ];
        description = "Foundation for libraries generated by haskell-gi";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "haskell-gi-overloading" = callPackage
@@ -117927,8 +117894,6 @@ self: {
        executableToolDepends = [ hspec-discover ];
        description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell2010" = callPackage
@@ -118718,8 +118683,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-core";
-       version = "0.17.3";
-       sha256 = "070z3qf4jgczl42dbmrfl0pcva9ddv59ygknw2yzlbablkhb160j";
+       version = "0.17.5";
+       sha256 = "1isfxzn5gz7py469mh9m6jd430w9alp0x8b75rymd3sp2ihwc3mz";
        libraryHaskellDepends = [
          aeson array base base16-bytestring bytestring cereal conduit
          containers cryptonite deepseq entropy hashable hspec memory mtl
@@ -118856,8 +118821,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.38.3";
-       sha256 = "1131smwdfbyw6y3mk3nsnsgkky0sd4zxjmlzzdp5g3b8s9859vwh";
+       version = "0.38.4";
+       sha256 = "1kiqib85rblq9y8mz5fsiqv4w9i5bzqj6h62yxd7riigc82h10g3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121940,32 +121905,6 @@ self: {
      }) {};
 
   "headroom" = callPackage
-    ({ mkDerivation, aeson, base, data-default-class, doctest, either
-     , file-embed, hspec, microlens, microlens-th, mustache
-     , optparse-applicative, pcre-heavy, pcre-light, QuickCheck, rio
-     , template-haskell, time, yaml
-     }:
-     mkDerivation {
-       pname = "headroom";
-       version = "0.3.1.0";
-       sha256 = "0md8yzjq92xc9pq9h8a78irgyka23ck7nlhdbdyfnm2f490fx2yw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base data-default-class either file-embed microlens
-         microlens-th mustache optparse-applicative pcre-heavy pcre-light
-         rio template-haskell time yaml
-       ];
-       executableHaskellDepends = [ base optparse-applicative rio ];
-       testHaskellDepends = [
-         aeson base doctest hspec optparse-applicative pcre-light QuickCheck
-         rio time
-       ];
-       description = "License Header Manager";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "headroom_0_3_2_0" = callPackage
     ({ mkDerivation, aeson, base, data-default-class, doctest, either
      , file-embed, hspec, hspec-discover, microlens, microlens-th
      , mustache, optparse-applicative, pcre-heavy, pcre-light
@@ -121990,7 +121929,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "License Header Manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heap" = callPackage
@@ -122037,15 +121975,17 @@ self: {
      }) {};
 
   "heapsize" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, ghc-heap, hashable
-     , primitive, unordered-containers
+    ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-heap
+     , hashable, hashtables, primitive, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "heapsize";
-       version = "0.1";
-       sha256 = "0cmzmz6f572is70sp79fxriywl5d19rcb8c32x22c2yazyl6c6d9";
+       version = "0.3.0";
+       sha256 = "14i4yfk8qfpkcajb9h500dx4s5mqnpvfnyh1v3rp8pxcb93ffgc1";
        libraryHaskellDepends = [
-         base deepseq ghc-heap hashable primitive unordered-containers
+         base deepseq exceptions ghc-heap hashable hashtables primitive
+         transformers unordered-containers
        ];
        benchmarkHaskellDepends = [ base criterion deepseq primitive ];
        description = "Determine the size of runtime data structures";
@@ -122562,8 +122502,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.12.15";
-       sha256 = "0zkavyx4nbdrwl5sywl2rn9lmakpfw2jgs8sjqzjsnnkbk62i33j";
+       version = "0.13.1";
+       sha256 = "1x1hm0cw0ccx3zcwirs5m3fkbvqc2mcyn5pvsx5fczzpnwzj4d2g";
        libraryHaskellDepends = [
          async base bytestring bytestring-lexing deepseq errors exceptions
          HTTP mtl network network-uri resource-pool scanner stm text time
@@ -122634,6 +122574,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedis-pile" = callPackage
@@ -123805,8 +123747,8 @@ self: {
   "hevm" = callPackage
     ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base
      , base16-bytestring, binary, brick, bytestring, cereal, containers
-     , cryptonite, data-dword, deepseq, directory, ff, fgl, filepath
-     , free, haskeline, here, HUnit, lens, lens-aeson, megaparsec
+     , cryptonite, data-dword, deepseq, directory, fgl, filepath, free
+     , haskeline, here, HUnit, lens, lens-aeson, libff, megaparsec
      , memory, monad-par, mtl, multiset, operational, optparse-generic
      , process, QuickCheck, quickcheck-text, regex-tdfa, restless-git
      , rosezipper, s-cargot, sbv, scientific, secp256k1, semver-range
@@ -123831,7 +123773,7 @@ self: {
          time transformers tree-view unordered-containers vector vty
          witherable wreq
        ];
-       librarySystemDepends = [ ff secp256k1 ];
+       librarySystemDepends = [ libff secp256k1 ];
        executableHaskellDepends = [
          aeson ansi-wl-pprint async base base16-bytestring binary brick
          bytestring containers cryptonite data-dword deepseq directory
@@ -123847,9 +123789,7 @@ self: {
        testSystemDepends = [ secp256k1 ];
        description = "Ethereum virtual machine evaluator";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {ff = null; inherit (pkgs) secp256k1;};
+     }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;};
 
   "hevolisa" = callPackage
     ({ mkDerivation, base, bytestring, cairo, filepath, haskell98 }:
@@ -126036,15 +125976,15 @@ self: {
 
   "hinterface" = callPackage
     ({ mkDerivation, array, async, base, binary, bytestring, containers
-     , cryptonite, deepseq, exceptions, hspec, lifted-async, lifted-base
-     , memory, monad-control, monad-logger, mtl, network, QuickCheck
-     , random, resourcet, safe-exceptions, stm, text, transformers
-     , transformers-base, vector
+     , cryptonite, deepseq, exceptions, hspec, hspec-discover
+     , lifted-async, lifted-base, memory, monad-control, monad-logger
+     , mtl, network, QuickCheck, random, resourcet, safe-exceptions, stm
+     , text, transformers, transformers-base, vector
      }:
      mkDerivation {
        pname = "hinterface";
-       version = "2.0.0";
-       sha256 = "1n1mp34s0ks7hkd2ddhfva9pbjwkciy1jjmqznmca244xg095yia";
+       version = "2.0.1";
+       sha256 = "0gxzkw1acvw8awmc5c52wxxhg7qda5sr0kh7g6ywy20xw231glf4";
        libraryHaskellDepends = [
          array async base binary bytestring containers cryptonite deepseq
          exceptions lifted-async lifted-base memory monad-control
@@ -126055,6 +125995,7 @@ self: {
          async base binary bytestring hspec monad-logger QuickCheck
          transformers vector
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Haskell / Erlang interoperability library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127461,6 +127402,8 @@ self: {
        ];
        description = "High-level Redis Database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hlrdb-core" = callPackage
@@ -127479,6 +127422,8 @@ self: {
        ];
        description = "High-level Redis Database Core API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hls" = callPackage
@@ -128326,24 +128271,52 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "hnix-store-core_0_3_0_1" = callPackage
+    ({ mkDerivation, algebraic-graphs, attoparsec, base
+     , base16-bytestring, base64-bytestring, binary, bytestring, cereal
+     , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256
+     , cryptohash-sha512, directory, filepath, hashable, io-streams
+     , lifted-base, monad-control, mtl, nix-derivation, process
+     , process-extras, saltine, tasty, tasty-discover, tasty-golden
+     , tasty-hspec, tasty-hunit, tasty-quickcheck, temporary, text, time
+     , unix, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hnix-store-core";
+       version = "0.3.0.1";
+       sha256 = "186r0z8csvj7ly9ag9lpvc6nm4x3hzx18rdc1jxzavaavcpdpn00";
+       libraryHaskellDepends = [
+         algebraic-graphs attoparsec base base16-bytestring
+         base64-bytestring binary bytestring cereal containers
+         cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
+         directory filepath hashable lifted-base monad-control mtl
+         nix-derivation saltine text time unix unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base16-bytestring base64-bytestring binary
+         bytestring containers directory filepath io-streams process
+         process-extras tasty tasty-discover tasty-golden tasty-hspec
+         tasty-hunit tasty-quickcheck temporary text unix
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Core effects for interacting with the Nix store";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hnix-store-remote" = callPackage
-    ({ mkDerivation, base, base64-bytestring, binary, bytestring
-     , containers, hnix-store-core, mtl, network, pretty-simple, text
-     , unix, unordered-containers
+    ({ mkDerivation, attoparsec, base, binary, bytestring, containers
+     , filepath, hnix-store-core, mtl, network, nix-derivation, text
+     , time, unix, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hnix-store-remote";
-       version = "0.1.0.0";
-       sha256 = "04dmql5235z05hq36wnbgc3sk0izqryv7n8dh8r3dq2j87zvv3y8";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.3.0.0";
+       sha256 = "0spvbix7m70v95fvkcs0vxas8nmwpjh4lfaglyvw1ijkf71xn9gl";
        libraryHaskellDepends = [
-         base base64-bytestring binary bytestring containers hnix-store-core
-         mtl network text unix unordered-containers
-       ];
-       executableHaskellDepends = [
-         base bytestring hnix-store-core mtl pretty-simple
-         unordered-containers
+         attoparsec base binary bytestring containers filepath
+         hnix-store-core mtl network nix-derivation text time unix
+         unordered-containers vector
        ];
        description = "Remote hnix store";
        license = stdenv.lib.licenses.asl20;
@@ -128551,8 +128524,8 @@ self: {
      }:
      mkDerivation {
        pname = "hobbits";
-       version = "1.3";
-       sha256 = "1w8bz1z747dd7vh110iynmsq5n0a84zw1gk7jcxfwl5lpfrqz97s";
+       version = "1.3.1";
+       sha256 = "0jpm65s2f0fz5ipppryy2k8qja2ijmfd56a65z5k0hsx4j93ipva";
        libraryHaskellDepends = [
          base containers deepseq haskell-src-exts haskell-src-meta mtl syb
          tagged template-haskell th-expand-syns transformers vector
@@ -128630,12 +128603,9 @@ self: {
     ({ mkDerivation, base, hspec, MissingH, parsec, split }:
      mkDerivation {
        pname = "hocon";
-       version = "0.1.0.1";
-       sha256 = "06xk118q1f5cik98w3swqw61nc7skx0bvf7mj8iyji8wm6sb1p1w";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.1.0.4";
+       sha256 = "1wncdrqrvd2dhzrnsizxx95h022wmlnw9i9yjgn9k2j6yl7j1iiz";
        libraryHaskellDepends = [ base hspec MissingH parsec split ];
-       executableHaskellDepends = [ base hspec MissingH parsec split ];
        testHaskellDepends = [ base hspec MissingH parsec split ];
        description = "Small library for typesafe's configuration specification";
        license = stdenv.lib.licenses.bsd3;
@@ -128820,8 +128790,8 @@ self: {
        pname = "hoist-error";
        version = "0.2.1.0";
        sha256 = "028lczd80nhj3yj5dq9qixzdzkyisl34qpi6bb28r8b9nj2i2nss";
-       revision = "3";
-       editedCabalFile = "1g80simnv15dqlch83mgn6yj8z93g0wpj0y1xz53p4dvafs18zlc";
+       revision = "4";
+       editedCabalFile = "1xp8l236gflh5njl3s8f0d2ahqypks70pfjnawskc0fcnl818qpa";
        libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
        license = stdenv.lib.licenses.mit;
@@ -131272,8 +131242,8 @@ self: {
      }:
      mkDerivation {
        pname = "hriemann";
-       version = "0.3.3.3";
-       sha256 = "0xxdzbx5wqmz62k8jka2k896sdz49j2aqivmcic9fsrar5inalyp";
+       version = "0.3.3.4";
+       sha256 = "0hgnpxldj4wag582h0qnf0nchjxbdmd6ydl8xadi278wpv0hdqnw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137146,6 +137116,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-conduit_2_3_7_4" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+     , case-insensitive, conduit, conduit-extra, connection, cookie
+     , data-default-class, hspec, http-client, http-client-tls
+     , http-types, HUnit, mtl, network, resourcet, streaming-commons
+     , temporary, text, time, tls, transformers, unliftio, unliftio-core
+     , utf8-string, wai, wai-conduit, warp, warp-tls
+     }:
+     mkDerivation {
+       pname = "http-conduit";
+       version = "2.3.7.4";
+       sha256 = "1mbaasmxx90gzfirwn8lmjpwj34gf1dk9y3m9mm88rzmy3s6czbb";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit conduit-extra http-client
+         http-client-tls http-types mtl resourcet transformers unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson base blaze-builder bytestring case-insensitive conduit
+         conduit-extra connection cookie data-default-class hspec
+         http-client http-types HUnit network resourcet streaming-commons
+         temporary text time tls transformers unliftio utf8-string wai
+         wai-conduit warp warp-tls
+       ];
+       doCheck = false;
+       description = "HTTP client package with conduit interface and HTTPS support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-conduit-browser" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , case-insensitive, conduit, containers, cookie, data-default
@@ -139483,8 +139482,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "3.1.2";
-       sha256 = "1yqzh9cvs9yr88wa0r26izd35hg2vfzqvzxbx0l6c1apgc3m7hd6";
+       version = "4.0.0";
+       sha256 = "0cwiaxri121lh713sisy9mka0h6z2ip82hzqbyzqj1dnljkqry9c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143033,8 +143032,8 @@ self: {
      }:
      mkDerivation {
        pname = "implicit-hie";
-       version = "0.1.2.4";
-       sha256 = "1jjw64pdz3jgd4jys1rg95bhrjyiizjdi0rwwqldc27a7misd2ca";
+       version = "0.1.2.5";
+       sha256 = "0jgnsbd38gw20h1lv39bh3n9bhawkjq90ajalgjyy5pih434mphf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143061,8 +143060,8 @@ self: {
      }:
      mkDerivation {
        pname = "implicit-hie-cradle";
-       version = "0.3.0.0";
-       sha256 = "0zbgqx7dzkpsf6pnxvfrkgl2v70vvm5h4by65m7yi73qjxrcghd1";
+       version = "0.3.0.2";
+       sha256 = "185pisgqp95zkpcksqiwiyghmg01cvfa7g6wzc31004mwwb114ih";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers directory extra
          filepath hie-bios hslogger implicit-hie process temporary text time
@@ -143277,6 +143276,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "inbox" = callPackage
+    ({ mkDerivation, async, base, error-or, text, time }:
+     mkDerivation {
+       pname = "inbox";
+       version = "0.1.0";
+       sha256 = "12012di97775da8ijv0qjwaxls36kvly0j7nvqqj15ai3kf9yarq";
+       libraryHaskellDepends = [ async base error-or text time ];
+       description = "Inbox for asychronous messages";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "inc-ref" = callPackage
     ({ mkDerivation, base, stm }:
      mkDerivation {
@@ -144226,17 +144236,20 @@ self: {
   "inline-java" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, criterion, deepseq
      , directory, filepath, ghc, hspec, jni, jvm, language-java, mtl
-     , process, singletons, template-haskell, temporary, text
+     , process, QuickCheck, quickcheck-unicode, singletons
+     , template-haskell, temporary, text, vector
      }:
      mkDerivation {
        pname = "inline-java";
-       version = "0.9.1";
-       sha256 = "12p59gf4dk4q00zpjwp0bzgljfa0nhr32x5schg0hj9bgsj6c6pk";
+       version = "0.10.0";
+       sha256 = "0rs2rw21y0yc0h4c1rz25qblk39flkg19fwjz87s6l0ly1hvcrm5";
        libraryHaskellDepends = [
          base bytestring Cabal directory filepath ghc jni jvm language-java
          mtl process template-haskell temporary text
        ];
-       testHaskellDepends = [ base hspec jni jvm text ];
+       testHaskellDepends = [
+         base hspec jni jvm QuickCheck quickcheck-unicode text vector
+       ];
        benchmarkHaskellDepends = [
          base criterion deepseq jni jvm singletons
        ];
@@ -144742,8 +144755,6 @@ self: {
        ];
        description = "Integer roots and perfect powers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "integer-simple" = callPackage
@@ -145315,13 +145326,13 @@ self: {
   "intricacy" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , crypto-api, crypto-pubkey-types, cryptohash, directory, filepath
-     , hscurses, mtl, network-fancy, random, RSA, safe, SDL, SDL-gfx
-     , SDL-mixer, SDL-ttf, stm, time, transformers, vector
+     , hscurses, mtl, ncurses, network-fancy, random, RSA, safe, SDL
+     , SDL-gfx, SDL-mixer, SDL-ttf, stm, time, transformers, vector
      }:
      mkDerivation {
        pname = "intricacy";
-       version = "0.7.2";
-       sha256 = "0iv79rlgi7xi5l0a530m8vniba5jnn45hddwfrrm9yyfvpfgx1sw";
+       version = "0.7.2.3";
+       sha256 = "1651ivbk4iiwhy5hwwhc8s2dgfxdm9f4hswfxkdb06yp7i6y2pyj";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -145331,9 +145342,10 @@ self: {
          network-fancy random RSA safe SDL SDL-gfx SDL-mixer SDL-ttf stm
          time transformers vector
        ];
+       executablePkgconfigDepends = [ ncurses ];
        description = "A game of competitive puzzle-design";
        license = stdenv.lib.licenses.gpl3;
-     }) {};
+     }) {inherit (pkgs) ncurses;};
 
   "intrinsic-superclasses" = callPackage
     ({ mkDerivation, base, containers, haskell-src-meta, mtl
@@ -147134,8 +147146,8 @@ self: {
        pname = "iterm-show";
        version = "0.1.0.1";
        sha256 = "1wlrn6q3v5a4pqmk3a3syir7szq97g658s1bzrq5p65frs7i7daw";
-       revision = "1";
-       editedCabalFile = "1xyb5dj53vl4nf2a68zda95lz0fr987rghvh3610bmrgr8hg3y02";
+       revision = "2";
+       editedCabalFile = "0qz82j4gz226qhqhmami40ws6r8rlwf0l22hilzk1n4x00bvcdm7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base base64-bytestring bytestring ];
@@ -147152,6 +147164,8 @@ self: {
        pname = "iterm-show-JuicyPixels";
        version = "0.1.0.0";
        sha256 = "1r4if1izanpz7kc2hl8vcn6iz7p0sk5dqq8rxvrpclcx3dklhh6z";
+       revision = "1";
+       editedCabalFile = "0pd14gfdpd12h1vlrk3dfg5vxlpd1jv2zi32nxic7p09wz59dkpk";
        libraryHaskellDepends = [ base iterm-show JuicyPixels ];
        description = "Orphan Show instances for JuciyPixels image types";
        license = stdenv.lib.licenses.bsd3;
@@ -147167,6 +147181,8 @@ self: {
        pname = "iterm-show-diagrams";
        version = "0.1.0.0";
        sha256 = "1szan9v24d8fksxcw3fqvzppf49664xm5y1zdk9yv007r5pfxr4c";
+       revision = "1";
+       editedCabalFile = "0yfc7phc2566mc7cqbin2px2l22nfg0xssf0vp0xkd4zqchji453";
        libraryHaskellDepends = [
          base diagrams-lib diagrams-rasterific iterm-show JuicyPixels
        ];
@@ -148463,16 +148479,17 @@ self: {
      }) {};
 
   "jni" = callPackage
-    ({ mkDerivation, base, bytestring, choice, constraints, containers
-     , cpphs, deepseq, hspec, inline-c, jdk, singletons
+    ({ mkDerivation, async, base, bytestring, choice, constraints
+     , containers, cpphs, deepseq, hspec, inline-c, jdk, singletons, stm
+     , text
      }:
      mkDerivation {
        pname = "jni";
-       version = "0.7.0";
-       sha256 = "0dznaw0aqkmmymabws4dg7d71acgj72gfn5r587bi5gq0x86sgr3";
+       version = "0.8.0";
+       sha256 = "0m94p2zx877snh3imwcdnwa8ajfb76cg2rjgjx3pan508ham1h5i";
        libraryHaskellDepends = [
-         base bytestring choice constraints containers deepseq inline-c
-         singletons
+         async base bytestring choice constraints containers deepseq
+         inline-c singletons stm text
        ];
        librarySystemDepends = [ jdk ];
        libraryToolDepends = [ cpphs ];
@@ -149227,6 +149244,8 @@ self: {
        pname = "json-directory";
        version = "0.1.0.1";
        sha256 = "145z46hh3ba3g7niwv9kf5djfv3xa1q5fmwadi629h7grfij0rr3";
+       revision = "1";
+       editedCabalFile = "193f2vndgfhhb26yq15nai22cmzdlcypby8bbyy93hyidr7rd981";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -150384,18 +150403,20 @@ self: {
 
   "jvm" = callPackage
     ({ mkDerivation, base, bytestring, choice, constraints, criterion
-     , deepseq, distributed-closure, exceptions, hspec, jni, singletons
-     , template-haskell, text, vector
+     , deepseq, distributed-closure, exceptions, hspec, jni, QuickCheck
+     , quickcheck-text, singletons, template-haskell, text, vector
      }:
      mkDerivation {
        pname = "jvm";
-       version = "0.5.0";
-       sha256 = "18n0b5bvy5hhq5x4ynbxa3zbqbh4z5isvzgg9h6hgs7366jyrqhf";
+       version = "0.6.0";
+       sha256 = "119davscv5mrw2mnlrklx8hbjrc7lhf5a9jphdnnxs6bywi8i2zm";
        libraryHaskellDepends = [
          base bytestring choice constraints distributed-closure exceptions
          jni singletons template-haskell text vector
        ];
-       testHaskellDepends = [ base bytestring hspec jni text ];
+       testHaskellDepends = [
+         base bytestring hspec jni QuickCheck quickcheck-text text
+       ];
        benchmarkHaskellDepends = [
          base criterion deepseq jni singletons text
        ];
@@ -150412,15 +150433,15 @@ self: {
      }:
      mkDerivation {
        pname = "jvm-batching";
-       version = "0.1.2";
-       sha256 = "1if6yklllgja48bhaqggvmhsx5klbscx2clq37am7vapic5gydai";
+       version = "0.2.0";
+       sha256 = "19z0db10y181n4adkz23cmly0q4zp953zh6f3r7rmxcd78758pbk";
        setupHaskellDepends = [ base Cabal inline-java ];
        libraryHaskellDepends = [
          base bytestring distributed-closure inline-java jni jvm singletons
          text vector
        ];
        testHaskellDepends = [
-         base bytestring hspec inline-java jvm text vector
+         base bytestring hspec inline-java jni jvm text vector
        ];
        benchmarkHaskellDepends = [
          base criterion deepseq jvm split vector
@@ -150490,14 +150511,16 @@ self: {
      }:
      mkDerivation {
        pname = "jvm-streaming";
-       version = "0.3.2";
-       sha256 = "16qr1wb8ria2n26irpirfvgr43ibhjfypxbyvzc0vwi941m7np4m";
+       version = "0.4.0";
+       sha256 = "0k8y6kvbymmjlr3bvgcws0z2hwdznyr3b3alkwsjag49lsgp21sd";
        setupHaskellDepends = [ base Cabal inline-java jvm-batching ];
        libraryHaskellDepends = [
          base distributed-closure inline-java jni jvm jvm-batching
          singletons streaming vector
        ];
-       testHaskellDepends = [ base hspec inline-java jvm streaming text ];
+       testHaskellDepends = [
+         base hspec inline-java jni jvm streaming text
+       ];
        benchmarkHaskellDepends = [
          base criterion deepseq jvm streaming text vector
        ];
@@ -151885,6 +151908,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "kempe" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, composition-prelude
+     , containers, criterion, deepseq, extra, filepath, happy, microlens
+     , microlens-mtl, mtl, optparse-applicative, prettyprinter, process
+     , tasty, tasty-golden, tasty-hunit, temporary, text, transformers
+     }:
+     mkDerivation {
+       pname = "kempe";
+       version = "0.1.0.1";
+       sha256 = "0wnjljwnwy9qq575v493y2dsbimks3plbsripfrjph0ldpianrdm";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base bytestring composition-prelude containers deepseq extra
+         microlens microlens-mtl mtl prettyprinter process temporary text
+         transformers
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [ base optparse-applicative ];
+       testHaskellDepends = [
+         base bytestring deepseq filepath prettyprinter process tasty
+         tasty-golden tasty-hunit temporary
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion prettyprinter text
+       ];
+       doHaddock = false;
+       description = "Kempe compiler";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "kerry" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , errors, hedgehog, hedgehog-corpus, mmorph, mtl, process
@@ -151909,6 +151966,27 @@ self: {
        broken = true;
      }) {};
 
+  "kesha" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , cryptohash-md5, cryptohash-sha1, cryptohash-sha256, directory
+     , filepath, hspec, process, QuickCheck, temporary, text
+     }:
+     mkDerivation {
+       pname = "kesha";
+       version = "0.1.0.1";
+       sha256 = "1pcr284hcbswfh2bfx1ga0wz135ffzcn9g52am1ig6ayfb0b589c";
+       libraryHaskellDepends = [
+         base binary bytestring containers cryptohash-md5 cryptohash-sha1
+         cryptohash-sha256 directory filepath text
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory filepath hspec process
+         QuickCheck temporary
+       ];
+       description = "Haskell implementation of nix-hash";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "keter" = callPackage
     ({ mkDerivation, aeson, array, async, attoparsec, base
      , blaze-builder, bytestring, case-insensitive, conduit
@@ -152214,14 +152292,14 @@ self: {
      }) {};
 
   "ki" = callPackage
-    ({ mkDerivation, atomic-primops, base, concurrency, containers
-     , dejafu, stm
-     }:
+    ({ mkDerivation, base, concurrency, containers, dejafu, stm }:
      mkDerivation {
        pname = "ki";
-       version = "0.1.0";
-       sha256 = "0lzr9i3zrg3qw9pvkp4scy7p5qi2g2x8kvz6h7sph4k61f78kfxg";
-       libraryHaskellDepends = [ atomic-primops base containers stm ];
+       version = "0.1.0.1";
+       sha256 = "16hw0y7r76gqhn3qnr8ac49yr1xq33g6rcfh8zxgkg59zf5bl35a";
+       revision = "1";
+       editedCabalFile = "03j64ya9n2ck6ddqk3dsvghnnqq6pfc6l9q4xj9ir8ry5cgxhrqp";
+       libraryHaskellDepends = [ base containers stm ];
        testHaskellDepends = [ base concurrency dejafu stm ];
        description = "A lightweight, structured concurrency library";
        license = stdenv.lib.licenses.bsd3;
@@ -152937,8 +153015,8 @@ self: {
      }:
      mkDerivation {
        pname = "kubernetes-client";
-       version = "0.3.1.0";
-       sha256 = "1ys3b143wckkgc7wjwfilkvr35j7as775p2d2riqkjpfi88kh301";
+       version = "0.3.2.0";
+       sha256 = "1z7ic3kqskbn59q9kifn3glnnnbaixcb7rhahw115i6s8yqql9rk";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring connection
          containers data-default-class either filepath hoauth2 http-client
@@ -154555,8 +154633,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-dickinson";
-       version = "1.4.1.1";
-       sha256 = "0bc3qzhyip8dq7w8gf3wxlrlfd8swd1n6y6nbj2pnp7710jj8gb9";
+       version = "1.4.1.2";
+       sha256 = "0z6bri73gprs485pjhwvwd37p9lfqvy15k9ws5p4178m538bxmmq";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -163395,8 +163473,8 @@ self: {
      }:
      mkDerivation {
        pname = "lorentz";
-       version = "0.7.1";
-       sha256 = "0qqlbpvifh4n6w8b4brc9fybvaxx8aahj9da6y16zlxlf3n6jbv5";
+       version = "0.8.0";
+       sha256 = "1mzpi5vx18vi06bd5jkpixws01in69jqvg6hkzc7mxn75cw8gb34";
        libraryHaskellDepends = [
          aeson-pretty base bimap bytestring constraints containers
          data-default first-class-families fmt interpolate lens morley
@@ -164179,8 +164257,8 @@ self: {
      }:
      mkDerivation {
        pname = "lumberjack";
-       version = "0.1.0.2";
-       sha256 = "1qixhfalj22zgfmg3q0jk7ci4nafdwbhrbpgiwzjmah11219jib1";
+       version = "0.1.0.3";
+       sha256 = "03y9v9ajh89ffacmnq0zfb83dyk6gd72msln7kksb69kkgcizd96";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165358,21 +165436,21 @@ self: {
      }) {};
 
   "mail-pool" = callPackage
-    ({ mkDerivation, base, HaskellNet, HaskellNet-SSL, microlens
+    ({ mkDerivation, aeson, base, HaskellNet, HaskellNet-SSL, microlens
      , mime-mail, network, optparse-applicative, resource-pool, time
      }:
      mkDerivation {
        pname = "mail-pool";
-       version = "2.1.0";
-       sha256 = "1cjl7y6djiwr94h6vhrmwjv381xp89y8hv1zmbzz8fy0dywsiyiz";
+       version = "2.2.3";
+       sha256 = "1pqizx02p2iiqkl4kg3izkg477bh69jrk75insbfw30k3ay3g330";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base HaskellNet HaskellNet-SSL microlens mime-mail network
+         aeson base HaskellNet HaskellNet-SSL microlens mime-mail network
          optparse-applicative resource-pool time
        ];
        executableHaskellDepends = [
-         base HaskellNet HaskellNet-SSL microlens mime-mail network
+         aeson base HaskellNet HaskellNet-SSL microlens mime-mail network
          optparse-applicative resource-pool time
        ];
        description = "Preconfigured email connection pool on top of smtp";
@@ -166835,28 +166913,6 @@ self: {
      }) {};
 
   "massiv" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class, deepseq
-     , doctest, exceptions, mersenne-random-pure64, primitive
-     , QuickCheck, random, scheduler, splitmix, template-haskell
-     , unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "massiv";
-       version = "0.5.6.0";
-       sha256 = "13vzprqhyjz1qvsq6b29d8h9xgsrifbpbs2c5cw702hi7mw5zjhp";
-       libraryHaskellDepends = [
-         base bytestring data-default-class deepseq exceptions primitive
-         scheduler unliftio-core vector
-       ];
-       testHaskellDepends = [
-         base doctest mersenne-random-pure64 QuickCheck random splitmix
-         template-haskell
-       ];
-       description = "Massiv (Массив) is an Array Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "massiv_0_5_7_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, deepseq
      , doctest, exceptions, mersenne-random-pure64, primitive
      , QuickCheck, random, scheduler, splitmix, template-haskell
@@ -166876,7 +166932,6 @@ self: {
        ];
        description = "Massiv (Массив) is an Array Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "massiv-io" = callPackage
@@ -168797,8 +168852,8 @@ self: {
        pname = "meminfo";
        version = "0.2.0.0";
        sha256 = "1mxk57qr4d1k6sz4qld09d61nc15hixggc5klfj5xr0n8rw1za3x";
-       revision = "1";
-       editedCabalFile = "10r7ji1xb8zv7a1ilyp626chly9y8m1i67adxqrj8lwgkqxpl8nk";
+       revision = "2";
+       editedCabalFile = "0i6znbcw4yyf8jzkixx5dxbklzfnh79hmywvwwamdmjgi39akpi5";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "Library for reading `/proc/meminfo`";
        license = stdenv.lib.licenses.bsd3;
@@ -171876,8 +171931,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmsyn7h";
-       version = "0.8.0.0";
-       sha256 = "0mj96p3f96brv7cw3mkigngxnmqcn9r1yfghdx1jplrw5wycy80j";
+       version = "0.8.1.0";
+       sha256 = "0n1rs92cgand8sb7597ph18dmrxf5czkrx5wx90qi58w7m1fqh9p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -172048,6 +172103,28 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "mock-time" = callPackage
+    ({ mkDerivation, base, error-or, error-or-utils, exceptions, inbox
+     , mtl, primitive, QuickCheck, resourcet, stm, tasty, tasty-hunit
+     , tasty-quickcheck, time, unliftio-core
+     }:
+     mkDerivation {
+       pname = "mock-time";
+       version = "0.1.0";
+       sha256 = "0fwnlkg3kbi7qh43ycymxxywsh8cw5f5km0ni4plf63k931y40jg";
+       libraryHaskellDepends = [
+         base error-or exceptions mtl primitive resourcet stm time
+         unliftio-core
+       ];
+       testHaskellDepends = [
+         base error-or error-or-utils exceptions inbox mtl primitive
+         QuickCheck resourcet stm tasty tasty-hunit tasty-quickcheck time
+         unliftio-core
+       ];
+       description = "Mock time in tests";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mockazo" = callPackage
     ({ mkDerivation, base, constraints, hspec, multistate, relude
      , template-haskell
@@ -173013,27 +173090,6 @@ self: {
      }) {};
 
   "monad-logger" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , exceptions, fast-logger, lifted-base, monad-control, monad-loops
-     , mtl, resourcet, stm, stm-chans, template-haskell, text
-     , transformers, transformers-base, transformers-compat
-     , unliftio-core
-     }:
-     mkDerivation {
-       pname = "monad-logger";
-       version = "0.3.35";
-       sha256 = "1mrwwv3h3wy84kgphwn6ahjzxab0bzgzzbqla1c3jx02xl9x3q72";
-       libraryHaskellDepends = [
-         base bytestring conduit conduit-extra exceptions fast-logger
-         lifted-base monad-control monad-loops mtl resourcet stm stm-chans
-         template-haskell text transformers transformers-base
-         transformers-compat unliftio-core
-       ];
-       description = "A class of monads which can log messages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "monad-logger_0_3_36" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , exceptions, fast-logger, lifted-base, monad-control, monad-loops
      , mtl, resourcet, stm, stm-chans, template-haskell, text
@@ -173052,7 +173108,24 @@ self: {
        ];
        description = "A class of monads which can log messages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "monad-logger-extras" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, hsyslog
+     , monad-logger, mtl
+     }:
+     mkDerivation {
+       pname = "monad-logger-extras";
+       version = "0.1.1.1";
+       sha256 = "1zxwvaqw6ihhg945hr4ysk66prhbh00i6qipig44nx65fcwh835b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring hsyslog monad-logger mtl
+       ];
+       executableHaskellDepends = [ base monad-logger ];
+       description = "Utilities for composing loggers, coloring output, plus a few orphan instances";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "monad-logger-json" = callPackage
@@ -174754,15 +174827,16 @@ self: {
      , cryptonite, data-default, first-class-families, fmt
      , generic-deriving, gitrev, haskeline, hex-text, interpolate, lens
      , megaparsec, memory, morley-prelude, mtl, named
-     , optparse-applicative, parser-combinators, pretty-simple
-     , semigroups, show-type, singletons, syb, template-haskell, text
-     , th-lift, th-lift-instances, time, timerep, transformers-compat
-     , unordered-containers, vector, vinyl, with-utf8, wl-pprint-text
+     , optparse-applicative, parser-combinators, scientific, semigroups
+     , show-type, singletons, syb, template-haskell, text
+     , text-manipulate, th-lift, th-lift-instances, time, timerep
+     , uncaught-exception, unordered-containers, vector, vinyl
+     , with-utf8, wl-pprint-text
      }:
      mkDerivation {
        pname = "morley";
-       version = "1.9";
-       sha256 = "17fkh2dbi79lgc61nj9v0fyj26n7lzsj824nvi94q0f9qi6ifk5j";
+       version = "1.10.0";
+       sha256 = "08mj8jzrbqqzn3vr5hlpbzhgik3i3544xn5inm28j40vhlahvmzk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -174770,15 +174844,14 @@ self: {
          bytestring constraints containers cryptonite data-default
          first-class-families fmt generic-deriving gitrev hex-text
          interpolate lens megaparsec memory morley-prelude mtl named
-         optparse-applicative parser-combinators semigroups show-type
-         singletons syb template-haskell text th-lift th-lift-instances time
-         timerep transformers-compat unordered-containers vector vinyl
-         with-utf8 wl-pprint-text
+         optparse-applicative parser-combinators scientific semigroups
+         show-type singletons syb template-haskell text text-manipulate
+         th-lift th-lift-instances time timerep uncaught-exception
+         unordered-containers vector vinyl with-utf8 wl-pprint-text
        ];
        executableHaskellDepends = [
          aeson base bytestring data-default fmt haskeline megaparsec
-         morley-prelude named optparse-applicative pretty-simple text vinyl
-         with-utf8
+         morley-prelude named optparse-applicative text vinyl with-utf8
        ];
        description = "Developer tools for the Michelson Language";
        license = stdenv.lib.licenses.mit;
@@ -180705,6 +180778,8 @@ self: {
        pname = "network";
        version = "3.1.2.1";
        sha256 = "0jlx8dls0h95znpcb66bd95k4mp3aaa733h89pq5ymyb8m29bapw";
+       revision = "1";
+       editedCabalFile = "12swsygnsnyvfjm3p9b6z8jh8vbw3q5akmggacsvr4fdm2p6v38q";
        libraryHaskellDepends = [ base bytestring deepseq directory ];
        testHaskellDepends = [
          base bytestring directory hspec HUnit QuickCheck temporary
@@ -180816,8 +180891,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-arbitrary";
-       version = "0.6.0.0";
-       sha256 = "0yj93r7p4nbfwhklxb7wgkaq1bfl7qjqmn3q0qlxlghbb2xhmmh1";
+       version = "0.7.0.0";
+       sha256 = "0n3c9hm8p404diksx23l4afa7i4lcl92m2zp2aw4zy8n9vhpz8sv";
        libraryHaskellDepends = [
          base bytestring http-media http-types network-uri QuickCheck
        ];
@@ -182200,8 +182275,8 @@ self: {
      }:
      mkDerivation {
        pname = "newtype-zoo";
-       version = "1.2.0.0";
-       sha256 = "12p2nyjpvbqjc7p6jd59ggl37jlg5rh9z8y1bxy4w98m47p8lj31";
+       version = "1.2.1.0";
+       sha256 = "0zb4fm6c3m88xk76lr1d6b5yhnx45mb77m0srhq43r168rhk69d7";
        libraryHaskellDepends = [
          base comonad data-default deepseq pointed profunctors QuickCheck
          random
@@ -182351,20 +182426,20 @@ self: {
      }) {};
 
   "ngx-export-tools-extra" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, array, base, base64, binary
-     , bytestring, case-insensitive, containers, ede
-     , enclosed-exceptions, http-client, http-types, network, ngx-export
-     , ngx-export-tools, safe, snap-core, snap-server, template-haskell
+    ({ mkDerivation, aeson, array, base, base64, binary, bytestring
+     , case-insensitive, containers, ede, enclosed-exceptions
+     , http-client, http-types, network, ngx-export, ngx-export-tools
+     , prettyprinter, safe, snap-core, snap-server, template-haskell
      , text, time, trifecta, unordered-containers
      }:
      mkDerivation {
        pname = "ngx-export-tools-extra";
-       version = "0.5.9.0";
-       sha256 = "073zzhrv9g7q8miqxws79h2hiqi3yssyb7smsb1mrx4y1rsmq4ss";
+       version = "0.6.0.1";
+       sha256 = "0xgnjriq9c3r9vpnkm0ldjqghss9ahjzk8ckrwq59bmdhns3fvx9";
        libraryHaskellDepends = [
-         aeson ansi-wl-pprint array base base64 binary bytestring
-         case-insensitive containers ede enclosed-exceptions http-client
-         http-types network ngx-export ngx-export-tools safe snap-core
+         aeson array base base64 binary bytestring case-insensitive
+         containers ede enclosed-exceptions http-client http-types network
+         ngx-export ngx-export-tools prettyprinter safe snap-core
          snap-server template-haskell text time trifecta
          unordered-containers
        ];
@@ -182732,6 +182807,8 @@ self: {
        pname = "nix-freeze-tree";
        version = "0.1.0.0";
        sha256 = "06l323g6qx87lbs9hbmnjr0b40f548w8496p7pihxrla1kb2v31x";
+       revision = "1";
+       editedCabalFile = "1lhhaaisiaj9hsifn5nv3mmkp10cn3szal3gsn4dx2j0h23b4f3p";
        isLibrary = false;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183806,17 +183883,17 @@ self: {
 
   "nothunks" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc-heap, ghc-prim
-     , hedgehog, random, tasty, tasty-hedgehog, text, time, vector
+     , hedgehog, random, stm, tasty, tasty-hedgehog, text, time, vector
      }:
      mkDerivation {
        pname = "nothunks";
-       version = "0.1.1.0";
-       sha256 = "1nnkdzr3ffhy7yqi068ay3p1bc0g0lmpyps3pqf0267vcx8lf8zn";
+       version = "0.1.2";
+       sha256 = "0z9calmdw4bk4cdwrfq5nkxxks2f82q59i7kv6lnsgwyl4nqvg2y";
        libraryHaskellDepends = [
-         base bytestring containers ghc-heap text time vector
+         base bytestring containers ghc-heap stm text time vector
        ];
        testHaskellDepends = [
-         base containers ghc-prim hedgehog random tasty tasty-hedgehog
+         base containers ghc-prim hedgehog random stm tasty tasty-hedgehog
        ];
        description = "Examine values for unexpected thunks";
        license = stdenv.lib.licenses.mit;
@@ -184236,11 +184313,11 @@ self: {
     ({ mkDerivation, base, vector }:
      mkDerivation {
        pname = "nuha";
-       version = "0.2.0.0";
-       sha256 = "1xcxr7nq8k2lj3xl3h3p2d4wn4zqjzy5bwc8pixl3nf5q57nz3gi";
+       version = "0.3.0.0";
+       sha256 = "15lb19gj146zkq2bgpp03jscw5bb3xys1yylvla5sqrnjqjw5r1d";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base vector ];
-       description = "Multidimensional arrays, Linear algebra";
+       description = "Multidimensional arrays, Linear algebra, Numerical analysis";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -184667,14 +184744,16 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-free";
-       version = "0.0.1";
-       sha256 = "1n786zg3sbc9zjr4972b837p459qx8yc1jqh0qlq1yw50yd9ic79";
+       version = "0.0.3";
+       sha256 = "1agfha5bxiq153jgknjriawyirbcw3ksbhb88y3v55wqjcwyqfiy";
        libraryHaskellDepends = [
          attoparsec base containers free numhask text
        ];
        testHaskellDepends = [ base doctest numhask ];
-       description = "See readme.md";
+       description = "numerical free algebras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numhask-hedgehog" = callPackage
@@ -189819,6 +189898,35 @@ self: {
        broken = true;
      }) {};
 
+  "pandoc-filter-indent" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup
+     , ghc-syntax-highlighter, HaTeX, optics-core, optics-th
+     , pandoc-types, text
+     }:
+     mkDerivation {
+       pname = "pandoc-filter-indent";
+       version = "0.2.1.0";
+       sha256 = "1jc5a977490jfqnhvqzg5zqs22r10x094mfqd26ynqq9fx7pa580";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup ghc-syntax-highlighter HaTeX
+         optics-core optics-th pandoc-types text
+       ];
+       executableHaskellDepends = [
+         base blaze-html blaze-markup ghc-syntax-highlighter HaTeX
+         optics-core optics-th pandoc-types text
+       ];
+       testHaskellDepends = [
+         base blaze-html blaze-markup ghc-syntax-highlighter HaTeX
+         optics-core optics-th pandoc-types text
+       ];
+       description = "Pandoc filter formatting Haskell code fragments using GHC lexer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "pandoc-highlighting-extensions" = callPackage
     ({ mkDerivation, base, data-default-class, pandoc, skylighting-core
      , skylighting-extensions, skylighting-modding, text
@@ -193242,8 +193350,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdftotext";
-       version = "0.1.0.0";
-       sha256 = "01zdcggm5p52j7bwimfhk5x5mjnbpz4iz8g5jq3lnnc3ddd0ab6y";
+       version = "0.1.0.1";
+       sha256 = "0nilgv9w6i59h99w89q0jimmximpwn62i22z67gi2834bhdaqmn7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring text ];
@@ -194617,8 +194725,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-pagination";
-       version = "0.1.1.1";
-       sha256 = "03rxynxj2xx25l1zy42f06649m57blpx4inadb2a4dgz62zzyk5q";
+       version = "0.1.1.2";
+       sha256 = "16p89c4rjwak7slb7rmzn0qyap2vg3ayis8q3lkxl0k7a609pf5h";
        libraryHaskellDepends = [
          base conduit esqueleto foldl microlens mtl persistent
        ];
@@ -194730,8 +194838,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-qq";
-       version = "2.9.2";
-       sha256 = "1nks3b420g447i3bvlpf3f41ry8jkfkl60m9yl48vyxgbpcjq523";
+       version = "2.9.2.1";
+       sha256 = "0gnwkrjyh9fkli35qp0mvivbsycz58ng26z6rfqv377hgrjsvjiq";
        libraryHaskellDepends = [
          base haskell-src-meta mtl persistent template-haskell text
        ];
@@ -195021,6 +195129,8 @@ self: {
        pname = "persistent-typed-db";
        version = "0.1.0.1";
        sha256 = "07yjzxg5yfxv1zbp5pkrvj8nrsxyhy4n11zgmd0q9g186q6283qn";
+       revision = "1";
+       editedCabalFile = "15qqrxjg00xvn9ffdj0yk3zxw5snn91379zzhzzv3kd9w1b25zg0";
        libraryHaskellDepends = [
          aeson base bytestring conduit http-api-data monad-logger
          path-pieces persistent persistent-template resource-pool resourcet
@@ -195035,6 +195145,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "persistent-typed-db_0_1_0_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec
+     , http-api-data, monad-logger, path-pieces, persistent
+     , persistent-template, resource-pool, resourcet, template-haskell
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "persistent-typed-db";
+       version = "0.1.0.2";
+       sha256 = "1pdhdb29b7gyaw3kh1vr76dyr7gvwpx9ymib17fzfsxks6s76dxc";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit http-api-data monad-logger
+         path-pieces persistent persistent-template resource-pool resourcet
+         template-haskell text transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conduit esqueleto hspec http-api-data
+         monad-logger path-pieces persistent persistent-template
+         resource-pool resourcet template-haskell text transformers
+       ];
+       description = "Type safe access to multiple database schemata";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent-vector" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, QuickCheck
      , test-framework, test-framework-quickcheck2, transformers
@@ -195207,6 +195342,24 @@ self: {
        broken = true;
      }) {};
 
+  "pg-extras" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, postgresql-simple
+     , raw-strings-qq, text, time
+     }:
+     mkDerivation {
+       pname = "pg-extras";
+       version = "0.0.1";
+       sha256 = "00vakhrq42y9zdib0qhwm8af2vs3ghhfwjmydipdhsimlk1xzlfg";
+       libraryHaskellDepends = [
+         base bytestring postgresql-simple raw-strings-qq text time
+       ];
+       testHaskellDepends = [ base HUnit text ];
+       description = "PostgreSQL database performance insights";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "pg-harness" = callPackage
     ({ mkDerivation, async, base, bytestring, HTTP, ini
      , postgresql-simple, random, scotty, text, transformers
@@ -195782,8 +195935,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-common";
-       version = "0.3.0.0";
-       sha256 = "1l5czk3ncwbv324k96gyc77lx8nvxxqpqggbyxw18wrwpmyn46i8";
+       version = "0.3.4.0";
+       sha256 = "1cf2k35jljcbyzyfz85nsxjzh5wdiipm9sa558gky26yz1h3n54x";
        libraryHaskellDepends = [
          base phonetic-languages-permutations subG subG-instances vector
        ];
@@ -195791,6 +195944,40 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "phonetic-languages-simplified-lists-examples" = callPackage
+    ({ mkDerivation, base, heaps, mmsyn2, parallel
+     , phonetic-languages-constraints, phonetic-languages-permutations
+     , phonetic-languages-plus, phonetic-languages-rhythmicity
+     , phonetic-languages-simplified-common
+     , phonetic-languages-simplified-properties-lists
+     , phonetic-languages-ukrainian, print-info, subG
+     , ukrainian-phonetics-basic, uniqueness-periods-vector-filters
+     , uniqueness-periods-vector-stats, vector
+     }:
+     mkDerivation {
+       pname = "phonetic-languages-simplified-lists-examples";
+       version = "0.4.0.0";
+       sha256 = "18n45cz6x8lh8pphnipp24xjjf8j5h6kskmkr6x4l5y5qi13ld4x";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base heaps mmsyn2 phonetic-languages-constraints
+         phonetic-languages-simplified-common
+         phonetic-languages-simplified-properties-lists vector
+       ];
+       executableHaskellDepends = [
+         base heaps mmsyn2 parallel phonetic-languages-constraints
+         phonetic-languages-permutations phonetic-languages-plus
+         phonetic-languages-rhythmicity phonetic-languages-simplified-common
+         phonetic-languages-simplified-properties-lists
+         phonetic-languages-ukrainian print-info subG
+         ukrainian-phonetics-basic uniqueness-periods-vector-filters
+         uniqueness-periods-vector-stats vector
+       ];
+       description = "Simplified and somewhat optimized version of the phonetic-languages-examples";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "phonetic-languages-simplified-properties-lists" = callPackage
     ({ mkDerivation, base, phonetic-languages-rhythmicity
      , phonetic-languages-simplified-common, ukrainian-phonetics-basic
@@ -195798,8 +195985,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-properties-lists";
-       version = "0.1.3.1";
-       sha256 = "1cbai5vi33fp7l3vpd4n0adjh0dbazhy7sms7716zd7vi4b2zm6s";
+       version = "0.3.0.0";
+       sha256 = "094fyljkvfi2snj41j00xqflhabnsp5hn50xp6dvmpcr12k6nvs0";
        libraryHaskellDepends = [
          base phonetic-languages-rhythmicity
          phonetic-languages-simplified-common ukrainian-phonetics-basic
@@ -195813,8 +196000,8 @@ self: {
     ({ mkDerivation, base, mmsyn2, mmsyn5, vector }:
      mkDerivation {
        pname = "phonetic-languages-ukrainian";
-       version = "0.2.3.0";
-       sha256 = "0dn81mzqjp7fj5cvv0w1lp72mla5hqzdrbsk0ad22wz43hpvrl1l";
+       version = "0.3.0.0";
+       sha256 = "1z9frcwvy9njq1flk3hd2n4z8l4ad7f248w8h1pgjl1fbz6fv9dc";
        libraryHaskellDepends = [ base mmsyn2 mmsyn5 vector ];
        description = "Prepares Ukrainian text to be used as a phonetic language text";
        license = stdenv.lib.licenses.mit;
@@ -199487,12 +199674,16 @@ self: {
      }) {};
 
   "polysemy-extra" = callPackage
-    ({ mkDerivation, base, containers, polysemy, polysemy-zoo }:
+    ({ mkDerivation, base, containers, exceptions, extra, polysemy
+     , polysemy-zoo
+     }:
      mkDerivation {
        pname = "polysemy-extra";
-       version = "0.1.6.1";
-       sha256 = "1x588nsfnfjwzgcpngj5cm4pb27x5shpvy7yzgkvzihcy1nw0vz5";
-       libraryHaskellDepends = [ base containers polysemy polysemy-zoo ];
+       version = "0.1.7.0";
+       sha256 = "1cr4gmsxf07754gz1jlv8jr7a4zgs9w5v3s8g8hz1lhps090cdf4";
+       libraryHaskellDepends = [
+         base containers exceptions extra polysemy polysemy-zoo
+       ];
        description = "Extra Input and Output functions for polysemy..";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -199626,18 +199817,20 @@ self: {
      }) {};
 
   "polysemy-path" = callPackage
-    ({ mkDerivation, base, path, polysemy, polysemy-plugin
-     , polysemy-zoo
+    ({ mkDerivation, base, path, polysemy, polysemy-extra
+     , polysemy-plugin
      }:
      mkDerivation {
        pname = "polysemy-path";
-       version = "0.0.1.0";
-       sha256 = "12iw6qq1pigvvb0bnbkxz7gdmr4z609vqdsn5sxzh5va02dn1r57";
+       version = "0.2.0.0";
+       sha256 = "0p5ylp8758zkhlgqrhq6v6fli03q9gmak7bzkw1czrxwdshkv0gi";
        libraryHaskellDepends = [
-         base path polysemy polysemy-plugin polysemy-zoo
+         base path polysemy polysemy-extra polysemy-plugin
        ];
        description = "Polysemy versions of Path functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-plugin" = callPackage
@@ -199669,8 +199862,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-resume";
-       version = "0.1.0.0";
-       sha256 = "1zpnwrhpb89kg5r3qxbyshpz8sgrfx7p8y0cix3xb70gcb8kf6jj";
+       version = "0.1.0.1";
+       sha256 = "1pgirh7sz1lx45pkss1a4w7xgy7gcxmm7i2vz9hf0z7qdj9wfn8i";
        libraryHaskellDepends = [
          base polysemy polysemy-plugin relude transformers
        ];
@@ -199687,21 +199880,21 @@ self: {
   "polysemy-test" = callPackage
     ({ mkDerivation, base, containers, either, hedgehog, path, path-io
      , polysemy, polysemy-plugin, relude, string-interpolate, tasty
-     , tasty-hedgehog, text, transformers
+     , tasty-hedgehog, template-haskell, text, transformers
      }:
      mkDerivation {
        pname = "polysemy-test";
-       version = "0.3.0.1";
-       sha256 = "0xy5ax03qy7936jxhbx3wi341z8r00bmjifha83izgi664hzb5fs";
+       version = "0.3.0.2";
+       sha256 = "16xkg6iwb7ms3k7mbrwa152izgs520x6jvc5bwp9pl0mk70qx3nw";
        libraryHaskellDepends = [
          base containers either hedgehog path path-io polysemy
-         polysemy-plugin relude string-interpolate tasty tasty-hedgehog text
-         transformers
+         polysemy-plugin relude string-interpolate tasty tasty-hedgehog
+         template-haskell text transformers
        ];
        testHaskellDepends = [
          base containers either hedgehog path path-io polysemy
-         polysemy-plugin relude string-interpolate tasty tasty-hedgehog text
-         transformers
+         polysemy-plugin relude string-interpolate tasty tasty-hedgehog
+         template-haskell text transformers
        ];
        description = "Polysemy effects for testing";
        license = "BSD-2-Clause-Patent";
@@ -199717,8 +199910,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-time";
-       version = "0.1.0.0";
-       sha256 = "1sdi8a2swqy8d2bmkmd2zxr968bzmkz4q07b2qw7840sq8q4bp6f";
+       version = "0.1.1.0";
+       sha256 = "1az7mf2jvd0vhsjpswa37rxrj760n5n3vhxpb4rlx28g8nx2jmkj";
        libraryHaskellDepends = [
          aeson base composition containers data-default either polysemy
          relude string-interpolate template-haskell text time torsor
@@ -200852,35 +201045,6 @@ self: {
      }) {};
 
   "postgresql-binary" = callPackage
-    ({ mkDerivation, aeson, base, base-prelude, binary-parser
-     , bytestring, bytestring-strict-builder, containers, conversion
-     , conversion-bytestring, conversion-text, criterion, json-ast
-     , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck
-     , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, transformers, unordered-containers
-     , uuid, vector
-     }:
-     mkDerivation {
-       pname = "postgresql-binary";
-       version = "0.12.3.1";
-       sha256 = "0frdyhzdrfnrqmf15all0g817p7i6asj46hzk87rw52qbfiyag2v";
-       libraryHaskellDepends = [
-         aeson base base-prelude binary-parser bytestring
-         bytestring-strict-builder containers loch-th network-ip
-         placeholders scientific text time transformers unordered-containers
-         uuid vector
-       ];
-       testHaskellDepends = [
-         aeson conversion conversion-bytestring conversion-text json-ast
-         loch-th network-ip placeholders postgresql-libpq QuickCheck
-         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ criterion rerebase ];
-       description = "Encoders and decoders for the PostgreSQL's binary format";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "postgresql-binary_0_12_3_3" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, bytestring-strict-builder, containers, conversion
      , conversion-bytestring, conversion-text, criterion, json-ast
@@ -200907,7 +201071,6 @@ self: {
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-common" = callPackage
@@ -204974,16 +205137,16 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, cassava, containers
      , generic-random, mongoDB, mtl, persistent, persistent-mongoDB
      , QuickCheck, quickcheck-instances, safe-exceptions, scientific
-     , swagger2, text, time, vector
+     , swagger2, text, time, uuid, vector
      }:
      mkDerivation {
        pname = "prolude";
-       version = "0.0.0.11";
-       sha256 = "0y9x5layrwd1na7rzrpc9syngcpg4h5cyd6lgg10xvbjkxqjz19v";
+       version = "0.0.0.12";
+       sha256 = "09z9716pjyxzpqn3qc0zsi9mz03vf1qnb1q5bcf66bvb1kfj0phw";
        libraryHaskellDepends = [
          aeson base bytestring cassava containers generic-random mongoDB mtl
          persistent persistent-mongoDB QuickCheck quickcheck-instances
-         safe-exceptions scientific swagger2 text time vector
+         safe-exceptions scientific swagger2 text time uuid vector
        ];
        description = "ITProTV's custom prelude";
        license = stdenv.lib.licenses.mit;
@@ -205390,19 +205553,41 @@ self: {
      }) {};
 
   "proteaaudio" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }:
+    ({ mkDerivation, base, bytestring, c2hs, libpulse, libpulse-simple
+     , libpulseaudio
+     }:
      mkDerivation {
        pname = "proteaaudio";
-       version = "0.8.0";
-       sha256 = "0fwanb1i4cq7352kci3wxkb5nyi5cm6298r559faw1bfyj2lmfbh";
+       version = "0.9.0";
+       sha256 = "0y1vvcy0rdiraphi6c9i1xsw5zwdqsw0id40xhgvk37va36ryl3p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ libpulseaudio ];
+       libraryPkgconfigDepends = [ libpulse libpulse-simple ];
        libraryToolDepends = [ c2hs ];
        description = "Simple audio library for Windows, Linux, OSX";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libpulseaudio;};
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {libpulse = null; libpulse-simple = null; 
+         inherit (pkgs) libpulseaudio;};
+
+  "proteaaudio-sdl" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, SDL2 }:
+     mkDerivation {
+       pname = "proteaaudio-sdl";
+       version = "0.9.0";
+       sha256 = "0ksdb89phsdjjq5q043wvqi3swibfd1840180jg3m8wj3zcy5g3k";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ SDL2 ];
+       libraryPkgconfigDepends = [ SDL2 ];
+       libraryToolDepends = [ c2hs ];
+       description = "Simple audio library for SDL";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) SDL2;};
 
   "proteome" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
@@ -207988,8 +208173,6 @@ self: {
        ];
        description = "An implementation of quadratic irrationals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quandl-api" = callPackage
@@ -209534,8 +209717,8 @@ self: {
      }:
      mkDerivation {
        pname = "r-glpk-phonetic-languages-ukrainian-durations";
-       version = "0.2.1.0";
-       sha256 = "0g3xw2a9id28wpvs868xjjmx2hh17876fiwpzjzngcjijr5351b4";
+       version = "0.2.2.0";
+       sha256 = "1svwml88hfnpdgbnny8nzga9gxnmgjggnkks8gz9dplcf8w1w39d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -210183,8 +210366,8 @@ self: {
        pname = "random";
        version = "1.2.0";
        sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4";
-       revision = "2";
-       editedCabalFile = "1pjpv8rzbwhr881ayxbvz4filvx3qkdx13pa21407p5fiyf208a3";
+       revision = "3";
+       editedCabalFile = "04hrdpc4h35dqbwyc4vfp2hw7wsr6b121f3rm8l94j11kli4108y";
        libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ];
        testHaskellDepends = [
          base bytestring containers doctest mwc-random primitive smallcheck
@@ -212181,8 +212364,8 @@ self: {
      }:
      mkDerivation {
        pname = "readme-lhs";
-       version = "0.8.0";
-       sha256 = "1yircw8xhrzj40y6026bjb8jx7mm3zkkss7bzvbph1vbpgcazsc4";
+       version = "0.8.1";
+       sha256 = "08ah0sbi4km40izgvfmc745zp03n8kkd830mbwga6xk69hm9q821";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -214789,6 +214972,8 @@ self: {
        pname = "regex-wrapper";
        version = "0.1.0.1";
        sha256 = "0ibkdd5xpilzm5qngn01csrin6ial1hhjzgpi3wjv6krlswdil34";
+       revision = "1";
+       editedCabalFile = "1ickvkpvxpqbj5fwhf3jajkp90b2sc3vz3l5sqyi7v4xj2bx8m6m";
        libraryHaskellDepends = [
          aeson base bytestring containers hashable regex-tdfa string-conv
          text
@@ -216217,6 +216402,23 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "replace-megaparsec_1_4_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, megaparsec
+     , parser-combinators, text
+     }:
+     mkDerivation {
+       pname = "replace-megaparsec";
+       version = "1.4.4.0";
+       sha256 = "1nlbs01ghm6gllkc7chv06hdrwlb94cipcwcx84wzasdqdzvcdl1";
+       libraryHaskellDepends = [
+         base bytestring megaparsec parser-combinators text
+       ];
+       testHaskellDepends = [ base bytestring Cabal megaparsec text ];
+       description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "replica" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, Diff
      , file-embed, http-types, QuickCheck, quickcheck-instances
@@ -216425,37 +216627,6 @@ self: {
      }) {};
 
   "req" = callPackage
-    ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
-     , bytestring, case-insensitive, connection, exceptions, hspec
-     , hspec-core, hspec-discover, http-api-data, http-client
-     , http-client-tls, http-types, modern-uri, monad-control, mtl
-     , QuickCheck, retry, template-haskell, text, time, transformers
-     , transformers-base, unliftio-core, unordered-containers
-     }:
-     mkDerivation {
-       pname = "req";
-       version = "3.7.0";
-       sha256 = "1ajak1845dx5vzc7mb5wyh6rilggnm0y5bh93f955zby1mr3mhi1";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson authenticate-oauth base blaze-builder bytestring
-         case-insensitive connection exceptions http-api-data http-client
-         http-client-tls http-types modern-uri monad-control mtl retry
-         template-haskell text time transformers transformers-base
-         unliftio-core
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder bytestring case-insensitive hspec
-         hspec-core http-client http-types modern-uri monad-control mtl
-         QuickCheck retry template-haskell text time unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       doCheck = false;
-       description = "Easy-to-use, type-safe, expandable, high-level HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "req_3_8_0" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
      , bytestring, case-insensitive, connection, exceptions, hspec
      , hspec-core, hspec-discover, http-api-data, http-client
@@ -216484,7 +216655,6 @@ self: {
        doCheck = false;
        description = "Easy-to-use, type-safe, expandable, high-level HTTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "req-conduit" = callPackage
@@ -217918,6 +218088,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rhbzquery" = callPackage
+    ({ mkDerivation, base, bytestring, config-ini, directory
+     , email-validate, extra, filepath, http-types, optparse-applicative
+     , simple-cmd, simple-cmd-args, text
+     }:
+     mkDerivation {
+       pname = "rhbzquery";
+       version = "0.1.1";
+       sha256 = "0nlh81cmkfsjgsmrrrcbf51vzmni1ddrhb8dzzxk9a8s76ybmcks";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring config-ini directory email-validate extra filepath
+         http-types optparse-applicative simple-cmd simple-cmd-args text
+       ];
+       testHaskellDepends = [ base simple-cmd ];
+       description = "Bugzilla query tool";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rhine" = callPackage
     ({ mkDerivation, base, containers, deepseq, dunai, free
      , MonadRandom, random, simple-affine-space, time, transformers
@@ -218343,8 +218533,8 @@ self: {
      }:
      mkDerivation {
        pname = "ring-buffers";
-       version = "0.1.1";
-       sha256 = "1xzvbygwp4zqz1nsbmb70062grzqw3jdwgbaaxn7hgirinims64h";
+       version = "0.2";
+       sha256 = "1bbmc8hasi8ralqzmfg2wq3bqa4qabjjlb9wm3csx2kdlhp4v15y";
        libraryHaskellDepends = [
          base contiguous primitive primitive-unlifted semirings
        ];
@@ -219170,6 +219360,50 @@ self: {
        broken = true;
      }) {};
 
+  "rollbar-cli" = callPackage
+    ({ mkDerivation, base, optparse-applicative, rollbar-client }:
+     mkDerivation {
+       pname = "rollbar-cli";
+       version = "0.1.0";
+       sha256 = "1fspvwhgng251m5paps2nj3x73c1bms4s9y202nbdnil0wb1wdlf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base optparse-applicative rollbar-client
+       ];
+       executableHaskellDepends = [ base rollbar-client ];
+       testHaskellDepends = [ base ];
+       description = "Simple CLI tool to perform commons tasks such as tracking deploys";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "rollbar-client" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, exceptions
+     , hspec, hspec-discover, mtl, process, req, text
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "rollbar-client";
+       version = "0.1.0";
+       sha256 = "18ca2mrvl7kn226jnrv2yaqwanx6spf0sg034asp5bwnhn15fvb9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring directory exceptions mtl process req text
+         unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         aeson base hspec mtl text unordered-containers yaml
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Core library to communicate with Rollbar API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "rollbar-hs" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , hostname, hspec, hspec-golden-aeson, http-client, http-conduit
@@ -219194,6 +219428,55 @@ self: {
        broken = true;
      }) {};
 
+  "rollbar-wai" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive, hspec
+     , hspec-discover, http-types, mtl, process, req, rollbar-client
+     , text, unordered-containers, wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "rollbar-wai";
+       version = "0.1.0";
+       sha256 = "19a1pngqprnmpl4547vssbha4nzjj9930ln4qyv8yk4skqkvny4j";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive http-types rollbar-client
+         text unordered-containers wai wai-extra
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-types mtl process req rollbar-client text
+         unordered-containers wai warp
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Provides error reporting capabilities to WAI based applications through Rollbar API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "rollbar-yesod" = callPackage
+    ({ mkDerivation, base, hspec, hspec-discover, rollbar-client
+     , rollbar-wai, unliftio, wai, yesod-core, yesod-test
+     }:
+     mkDerivation {
+       pname = "rollbar-yesod";
+       version = "0.1.0";
+       sha256 = "1azz0braw91mcw3gibixgpa6bd6z76k8q742qzai3xz1pivdf09f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base rollbar-client rollbar-wai unliftio wai yesod-core
+       ];
+       testHaskellDepends = [
+         base hspec rollbar-client wai yesod-core yesod-test
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Provides error reporting capabilities to Yesod applications through Rollbar API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "roller" = callPackage
     ({ mkDerivation, base, optparse-applicative, random
      , regex-applicative
@@ -219963,8 +220246,8 @@ self: {
      }:
      mkDerivation {
        pname = "rrule";
-       version = "0.1.0.0";
-       sha256 = "0059rrvvfrcsycc8aczayphscviidrq8ig3j4x3ln3xjfscq2l2l";
+       version = "0.1.1";
+       sha256 = "0xb0yf0p5r7szb7zxlcc95d22f49s9ql671f1lmvjvzg1jkmsvva";
        libraryHaskellDepends = [
          base megaparsec parser-combinators text time
        ];
@@ -227135,36 +227418,6 @@ self: {
      }) {};
 
   "servant-openapi3" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
-     , Cabal, cabal-doctest, directory, doctest, filepath, hspec
-     , hspec-discover, http-media, insert-ordered-containers, lens
-     , lens-aeson, openapi3, QuickCheck, servant, singleton-bool
-     , template-haskell, text, time, unordered-containers, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "servant-openapi3";
-       version = "2.0.1.0";
-       sha256 = "14mfa7l3rqjmqp89x9gny5sy3c1w41czkyx7qp1d8dz1y4qi4ipf";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base-compat bytestring hspec http-media
-         insert-ordered-containers lens openapi3 QuickCheck servant
-         singleton-bool text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base base-compat directory doctest filepath hspec lens
-         lens-aeson openapi3 QuickCheck servant template-haskell text time
-         utf8-string vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "servant-openapi3_2_0_1_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , Cabal, cabal-doctest, directory, doctest, filepath, hspec
      , hspec-discover, http-media, insert-ordered-containers, lens
@@ -227269,6 +227522,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-polysemy" = callPackage
+    ({ mkDerivation, base, deepseq, http-client, http-client-tls, lens
+     , mtl, polysemy, polysemy-plugin, polysemy-zoo, servant-client
+     , servant-server, servant-swagger, servant-swagger-ui, swagger2
+     , text, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-polysemy";
+       version = "0.1.0";
+       sha256 = "1isk401bi31s8ldb14cw0bchr3lwjmm2aslrrl3hg21dsr0qfk4y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base deepseq http-client http-client-tls mtl polysemy
+         polysemy-plugin polysemy-zoo servant-client servant-server wai warp
+       ];
+       executableHaskellDepends = [
+         base deepseq http-client http-client-tls lens mtl polysemy
+         polysemy-plugin polysemy-zoo servant-client servant-server
+         servant-swagger servant-swagger-ui swagger2 text wai warp
+       ];
+       description = "Utilities for using servant in a polysemy stack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "servant-pool" = callPackage
     ({ mkDerivation, base, resource-pool, servant, time }:
      mkDerivation {
@@ -227972,8 +228252,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-swagger-ui";
-       version = "0.3.4.3.36.1";
-       sha256 = "0j66ci53mlv1v57xg0hx6sm876i7yj99v573zizgb497c747dy8n";
+       version = "0.3.4.3.37.2";
+       sha256 = "1kx8i2x3ffbwbjh2i2ljha2cl6vfj1fcad9wkmc9ll9mbj6cpl8v";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -227989,10 +228269,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-swagger-ui-core";
-       version = "0.3.3";
-       sha256 = "0gpdjnclbjjr6gwc0gyx1d4w06cjf6z5b2ngjfcgbn885wqllwh3";
-       revision = "4";
-       editedCabalFile = "1kj72caf8skcl25bfw4nh7kj7hh33wd55sggsd474di57wi9j2c4";
+       version = "0.3.4";
+       sha256 = "05vi74kgsf3yhkbw9cjl1zxs5swhh9jib6bwqf1h11cg0nr5i8ab";
        libraryHaskellDepends = [
          base blaze-markup bytestring http-media servant servant-blaze
          servant-server swagger2 text transformers transformers-compat
@@ -233038,28 +233316,6 @@ self: {
      }) {};
 
   "skylighting" = callPackage
-    ({ mkDerivation, base, binary, blaze-html, bytestring, containers
-     , directory, filepath, pretty-show, skylighting-core, text
-     }:
-     mkDerivation {
-       pname = "skylighting";
-       version = "0.10.0.3";
-       sha256 = "1fzcvhkzrzf0rlic61fjbz7n9vfxjyc45kn57pw48qdl77shqhga";
-       configureFlags = [ "-fexecutable" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers skylighting-core
-       ];
-       executableHaskellDepends = [
-         base blaze-html bytestring containers directory filepath
-         pretty-show text
-       ];
-       description = "syntax highlighting library";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "skylighting_0_10_1" = callPackage
     ({ mkDerivation, base, binary, blaze-html, bytestring, containers
      , directory, filepath, pretty-show, skylighting-core, text
      }:
@@ -233079,41 +233335,9 @@ self: {
        ];
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skylighting-core" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
-     , base64-bytestring, binary, blaze-html, bytestring
-     , case-insensitive, colour, containers, criterion, Diff, directory
-     , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random, safe
-     , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text
-     , transformers, utf8-string
-     }:
-     mkDerivation {
-       pname = "skylighting-core";
-       version = "0.10.0.3";
-       sha256 = "1c2r0gsy4c5l6m3w0i3zzv1fvaaqzn2636sd0mmzd9a8ncsgyzf6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal attoparsec base base64-bytestring binary
-         blaze-html bytestring case-insensitive colour containers directory
-         filepath hxt mtl safe text transformers utf8-string
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers Diff directory filepath HUnit
-         pretty-show QuickCheck random tasty tasty-golden tasty-hunit
-         tasty-quickcheck text utf8-string
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion directory filepath text
-       ];
-       description = "syntax highlighting library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "skylighting-core_0_10_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, criterion, Diff, directory
@@ -233142,7 +233366,6 @@ self: {
        ];
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skylighting-extensions" = callPackage
@@ -234241,6 +234464,20 @@ self: {
        broken = true;
      }) {};
 
+  "smt2-parser" = callPackage
+    ({ mkDerivation, base, HUnit, parsec, text }:
+     mkDerivation {
+       pname = "smt2-parser";
+       version = "0.1.0.0";
+       sha256 = "025v77ck9cn0pgfbf2fgqf18bpr1h2gn6szsnmh5q1n4hi961v6m";
+       libraryHaskellDepends = [ base parsec text ];
+       testHaskellDepends = [ base HUnit parsec text ];
+       description = "A Haskell parser for SMT-LIB version 2.6";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "smtLib" = callPackage
     ({ mkDerivation, base, pretty }:
      mkDerivation {
@@ -238663,6 +238900,8 @@ self: {
        ];
        description = "A file-packing application";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sr-extra" = callPackage
@@ -239201,8 +239440,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack-all";
-       version = "0.1";
-       sha256 = "0gn20y7lyfpzzxg296rb4fd6nn1v0p3al6x1q78bdyhixjgk2plc";
+       version = "0.1.1";
+       sha256 = "0b81f6v18dyd5zia6drqn3jqncj3sp8cscrhlrcwvbljs1j8fd0j";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -241484,6 +241723,8 @@ self: {
        testHaskellDepends = [ base bytestring HUnit ];
        description = "Library for the IEX Trading API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stomp-conduit" = callPackage
@@ -241714,8 +241955,8 @@ self: {
      }:
      mkDerivation {
        pname = "store";
-       version = "0.7.7";
-       sha256 = "152blmvnp8k0bh9bw6ddzmb2rhs0a36v1k0fza39n88sldx504s3";
+       version = "0.7.8";
+       sha256 = "0z312r0gwz0mzkpqal5vbcz5drdfwrnjnxfwfc594q2x7s8idiz3";
        libraryHaskellDepends = [
          array async base base-orphans base64-bytestring bifunctors
          bytestring containers contravariant cryptohash deepseq directory
@@ -241754,8 +241995,8 @@ self: {
      }:
      mkDerivation {
        pname = "store-core";
-       version = "0.4.4.3";
-       sha256 = "1b0fpv8wdp9lcvqplls548xrh336cb1m617fzd0ysbzqhhg5r3fv";
+       version = "0.4.4.4";
+       sha256 = "0h21wp51phbwk9ajblqaqzx1hk9c58gkihmycjn0hj299kxly80y";
        libraryHaskellDepends = [
          base bytestring ghc-prim primitive text transformers
        ];
@@ -247336,10 +247577,8 @@ self: {
      }:
      mkDerivation {
        pname = "taffybar";
-       version = "3.2.2";
-       sha256 = "02b6rmsb89c1h7fr81ljbij30pnl8z4dz6xz367g7a2b9hwq42gz";
-       revision = "1";
-       editedCabalFile = "0284vnzvgpjjh95p67k2b5476npa52hs8g55fvlvlcx487zpc1sc";
+       version = "3.2.3";
+       sha256 = "0c5w030b289qy05pzs1bx3sd23sxxdm44605hs4ibzffaf0pr7b0";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -252093,6 +252332,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-manipulate_0_3_0_0" = callPackage
+    ({ mkDerivation, base, criterion, tasty, tasty-hunit, text }:
+     mkDerivation {
+       pname = "text-manipulate";
+       version = "0.3.0.0";
+       sha256 = "0pmzp38m3r0k6ps97b1wqplxlgvvlaid09x53jl3gxng0fwq910a";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base tasty tasty-hunit text ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Case conversion, word boundary manipulation, and textual subjugation";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-markup" = callPackage
     ({ mkDerivation, base, containers, QuickCheck, quickcheck-text
      , tasty, tasty-quickcheck, text
@@ -253346,8 +253599,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-utilities";
-       version = "0.2.4.0";
-       sha256 = "1c3idsx9fyh9n4d969mibxsyfb2nmivwm65zap3hyl40bnldc39l";
+       version = "0.2.4.1";
+       sha256 = "1k3dlhhgxc4bnzb13qysbvb41vx6fxf26grs2fjm2s3h65sghqxd";
        libraryHaskellDepends = [
          base bytestring containers directory filepath primitive syb
          template-haskell text th-orphans
@@ -254488,6 +254741,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "time-compat_1_9_5" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit
+     , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time
+     }:
+     mkDerivation {
+       pname = "time-compat";
+       version = "1.9.5";
+       sha256 = "19p3056i6kh8lgcdsnwsh8pj80xyi23kmw9n7hmdacczs5kv49ii";
+       libraryHaskellDepends = [ base base-orphans deepseq time ];
+       testHaskellDepends = [
+         base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit
+         tasty-quickcheck time
+       ];
+       description = "Compatibility package for time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "time-extras" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -259751,10 +260022,8 @@ self: {
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.2.1";
-       sha256 = "0b277whd3jywb6w0gkaijmzadpwabmyxvxyg6fmsysq1kp3isrnm";
-       revision = "1";
-       editedCabalFile = "0ca923bxx8aj6qzm0nvxvh1zmzqw34jv4xmnrjy1lfyndg0qg9vj";
+       version = "1.0.2.2";
+       sha256 = "1sl4pld3jig1m26alhj4s96ff43v3g00wxzrng4yhb76d88z0ipw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -262284,8 +262553,8 @@ self: {
     ({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }:
      mkDerivation {
        pname = "ukrainian-phonetics-basic";
-       version = "0.3.1.2";
-       sha256 = "0a4fdf64wv23kpnmz0jggm7vc0iazzsv8kpip3qjpnyfq2yqw06r";
+       version = "0.3.2.0";
+       sha256 = "16w4dggl61jh93rqq0czb3lpbq9cf4kxih5c0i5mbrjcxn50cdqg";
        libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ];
        description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
        license = stdenv.lib.licenses.mit;
@@ -262489,17 +262758,6 @@ self: {
      }) {};
 
   "unbounded-delays" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "unbounded-delays";
-       version = "0.1.1.0";
-       sha256 = "1ir9fghbrc214c97bwafk5ck6cacxz1pdnq4i18p604d1b8zg9wa";
-       libraryHaskellDepends = [ base ];
-       description = "Unbounded thread delays and timeouts";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unbounded-delays_0_1_1_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "unbounded-delays";
@@ -262508,7 +262766,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unbounded thread delays and timeouts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unbounded-delays-units" = callPackage
@@ -264667,6 +264924,24 @@ self: {
        broken = true;
      }) {};
 
+  "urbit-api" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
+     , http-client, modern-uri, req, req-conduit, text, uuid
+     }:
+     mkDerivation {
+       pname = "urbit-api";
+       version = "0.2.0.0";
+       sha256 = "01kv1zi2w6qkl00hj43bpahcsws499rqdvyj8d8cy6pzrbnydrqc";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit conduit-extra http-client modern-uri
+         req req-conduit text uuid
+       ];
+       description = "Talk to Urbit from Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "urbit-hob" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, hspec
      , hspec-core, murmur3, QuickCheck, text, vector
@@ -265984,18 +266259,18 @@ self: {
      }) {};
 
   "uusi" = callPackage
-    ({ mkDerivation, base, Cabal, filepath, HUnit, microlens
+    ({ mkDerivation, base, Cabal, directory, filepath, HUnit, microlens
      , microlens-th, text
      }:
      mkDerivation {
        pname = "uusi";
-       version = "0.2.1.0";
-       sha256 = "11r7p2g4pkxd57xvnbids3r6gwr76ar8c2kpdvpi9jlp01p0rfbm";
+       version = "0.3.1.0";
+       sha256 = "14n2n62lcaxfljxxdk6pw14liksfa77jj8zby5magdnsx2jzkb5i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal microlens microlens-th text ];
        executableHaskellDepends = [
-         base Cabal filepath microlens microlens-th text
+         base Cabal directory filepath microlens microlens-th text
        ];
        testHaskellDepends = [
          base Cabal HUnit microlens microlens-th text
@@ -268933,8 +269208,8 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "vulkan";
-       version = "3.7";
-       sha256 = "1d2fdlgnzrjhd59niw0qm4qiqa8zcpjxj340r82018n06w4v5vsy";
+       version = "3.8";
+       sha256 = "08d48q6wml8bh28s39zk12hi6760xmn92qdb9zk7y3h896i8v15s";
        libraryHaskellDepends = [ base bytestring transformers vector ];
        librarySystemDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
@@ -268956,19 +269231,20 @@ self: {
      }) {};
 
   "vulkan-utils" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest
-     , extra, file-embed, filepath, resourcet, template-haskell
-     , temporary, text, transformers, typed-process, vector, vulkan
+    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers
+     , dependent-map, dependent-sum, doctest, extra, file-embed
+     , filepath, resourcet, template-haskell, temporary, text
+     , transformers, typed-process, unordered-containers, vector, vulkan
      }:
      mkDerivation {
        pname = "vulkan-utils";
-       version = "0.3";
-       sha256 = "1q5qy4ah75xq4imr28i97f07qmbwaaisb7zc25ms6vr0cz4ijg7w";
+       version = "0.4";
+       sha256 = "0r7byk8i59qnvkaqvkr5kdw9spwni6g6pyspgwzabhvky6n2mang";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         base bytestring extra file-embed filepath resourcet
-         template-haskell temporary text transformers typed-process vector
-         vulkan
+         base bytestring containers dependent-map dependent-sum extra
+         file-embed filepath resourcet template-haskell temporary text
+         transformers typed-process unordered-containers vector vulkan
        ];
        testHaskellDepends = [ base doctest ];
        description = "Utils for the vulkan package";
@@ -269355,35 +269631,6 @@ self: {
      }) {};
 
   "wai-extra" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
-     , bytestring, call-stack, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, http2, HUnit, iproute, network, old-locale, resourcet
-     , streaming-commons, text, time, transformers, unix, unix-compat
-     , vault, void, wai, wai-logger, word8, zlib
-     }:
-     mkDerivation {
-       pname = "wai-extra";
-       version = "3.1.2";
-       sha256 = "03aszasb9508jy7dpazay89cy1zs4p5g0n08zjhsl8c47rap16ks";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base base64-bytestring bytestring call-stack
-         case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types http2 HUnit iproute network
-         old-locale resourcet streaming-commons text time transformers unix
-         unix-compat vault void wai wai-logger word8 zlib
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive cookie fast-logger hspec
-         http-types http2 HUnit resourcet text time transformers wai zlib
-       ];
-       description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-extra_3_1_3" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , bytestring, call-stack, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -269410,7 +269657,6 @@ self: {
        ];
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-feature-flags" = callPackage
@@ -271692,22 +271938,23 @@ self: {
   "web-rep" = callPackage
     ({ mkDerivation, attoparsec, base, box, box-socket, clay
      , concurrency, doctest, generic-lens, interpolatedstring-perl6
-     , language-javascript, lens, lucid, mtl, numhask, optparse-generic
-     , scotty, tasty, tasty-hspec, text, transformers
+     , language-javascript, lens, lucid, mtl, network-simple, numhask
+     , optparse-generic, scotty, tasty, tasty-hspec, text, transformers
      , unordered-containers, wai-middleware-static, wai-websockets
      , websockets
      }:
      mkDerivation {
        pname = "web-rep";
-       version = "0.7.0";
-       sha256 = "1045b19rjs1hgw92kq8z6wzm7jmx8k73ad9z4m2vzv1jwjhbgin4";
+       version = "0.7.2";
+       sha256 = "1h6krrm412b9374778jg33gdmk6ig0sp06yk68h5prjdgy6shmww";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base box box-socket clay concurrency generic-lens
-         interpolatedstring-perl6 language-javascript lens lucid mtl numhask
-         scotty text transformers unordered-containers wai-middleware-static
-         wai-websockets websockets
+         interpolatedstring-perl6 language-javascript lens lucid mtl
+         network-simple numhask scotty text transformers
+         unordered-containers wai-middleware-static wai-websockets
+         websockets
        ];
        executableHaskellDepends = [ base numhask optparse-generic ];
        testHaskellDepends = [
@@ -272771,6 +273018,8 @@ self: {
        ];
        description = "A school-timetable problem-solver";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "weigh" = callPackage
@@ -274996,6 +275245,8 @@ self: {
        pname = "wshterm";
        version = "0.1.0.1";
        sha256 = "09gxc8i4j236yvmvr31w3l05k0d1pqjgm6i88yn7hw16anjn23qq";
+       revision = "1";
+       editedCabalFile = "0f2w2f0mnv8mc5l5bj1vl76bs03s640ssn57ri2fk3235lklnwmh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -275625,13 +275876,13 @@ self: {
   "xcffib" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , directory, either, filemanip, filepath, HUnit, language-python
-     , mtl, optparse-applicative, semigroups, split, test-framework
+     , mtl, optparse-applicative, split, test-framework
      , test-framework-hunit, xcb-types
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.10.0";
-       sha256 = "163fiyppb40xd4wibvjkya86630hlhn1ij0i5xlc547gazawhz4a";
+       version = "0.11.1";
+       sha256 = "18xwliqcba0ia4p64gxiqd0pvkg3r3ylsmn3mywa5p43x1dji481";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -275640,8 +275891,7 @@ self: {
        ];
        executableHaskellDepends = [
          attoparsec base bytestring containers directory either filemanip
-         filepath language-python mtl optparse-applicative semigroups split
-         xcb-types
+         filepath language-python mtl optparse-applicative split xcb-types
        ];
        testHaskellDepends = [
          base filepath HUnit language-python test-framework
@@ -277053,8 +277303,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.36";
-       sha256 = "0kqnadgsqn7m3zw2vk22ssf4aw67rij9l1lpjfsnv2qw0m5apsdl";
+       version = "0.37";
+       sha256 = "0bjjja73ip7c1s8r3j3dimzm2j17sx38nsh51nl3axf4z5pbif74";
        configureFlags = [
          "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
          "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
@@ -277081,7 +277331,7 @@ self: {
          filepath hspec mtl old-locale parsec parsec-numbers process
          regex-compat stm temporary time transformers unix X11
        ];
-       benchmarkHaskellDepends = [ base gauge mtl ];
+       benchmarkHaskellDepends = [ base gauge mtl time ];
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
@@ -278119,6 +278369,8 @@ self: {
          servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-transaction" = callPackage
@@ -278744,6 +278996,8 @@ self: {
        ];
        description = "Convert yarn.lock files to nix expressions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yarr" = callPackage
@@ -280992,19 +281246,18 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , bytestring, case-insensitive, conduit, containers, cookie, hspec
      , hspec-core, html-conduit, http-types, HUnit, memory, network
-     , pretty-show, semigroups, text, time, transformers, unliftio
-     , unliftio-core, wai, wai-extra, xml-conduit, xml-types, yesod-core
-     , yesod-form
+     , pretty-show, text, time, transformers, unliftio, unliftio-core
+     , wai, wai-extra, xml-conduit, xml-types, yesod-core, yesod-form
      }:
      mkDerivation {
        pname = "yesod-test";
-       version = "1.6.10";
-       sha256 = "0vw6yg5b22a6flbl822z23k0l23as5mmxjcdnj2zgjjv5i713yfx";
+       version = "1.6.11";
+       sha256 = "1h3bggs5z5ixriy8agj9f2ms5vfcbp7a3bwr3rpfkfrckwypj6hp";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          case-insensitive conduit containers cookie hspec-core html-conduit
-         http-types HUnit memory network pretty-show semigroups text time
-         transformers wai wai-extra xml-conduit xml-types yesod-core
+         http-types HUnit memory network pretty-show text time transformers
+         wai wai-extra xml-conduit xml-types yesod-core
        ];
        testHaskellDepends = [
          base bytestring containers cookie hspec html-conduit http-types

From 0e31884bef9f07fd7b15c85f43d4b14b790e7528 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nvd1234@gmail.com>
Date: Wed, 2 Dec 2020 11:19:44 +0000
Subject: [PATCH 24/29] haskellPackages.integer-root: don't check

The test-suite depends on smallcheck 1.1 but we package 1.2

This is fixed in the upstream repository but the fix hasn't been released yet
---
 pkgs/development/haskell-modules/configuration-common.nix       | 1 +
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index fd460db7533c..a3387a2ae384 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -327,6 +327,7 @@ self: super: {
   http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105
   ihaskell = dontCheck super.ihaskell;
   influxdb = dontCheck super.influxdb;
+  integer-roots = dontCheck super.integer-roots; # requires an old version of smallcheck, will be fixed in > 1.0
   itanium-abi = dontCheck super.itanium-abi;
   katt = dontCheck super.katt;
   language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8aa931028a9d..e4ee9c1cb351 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -6980,7 +6980,6 @@ broken-packages:
   - int-multimap
   - intcode
   - integer-pure
-  - integer-roots
   - integreat
   - intel-aes
   - intensional-datatys

From 6b02cc17e9a52c1d0f0744eabc1c4492f7a748fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Dec 2020 20:20:53 +0100
Subject: [PATCH 25/29] haskell: drop the obsolete 'unbuildable' meta package

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a3387a2ae384..aa8212f167b1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -38,11 +38,6 @@ self: super: {
   ghcjs-base = null;
   ghcjs-prim = null;
 
-  # Some packages add this (non-existent) dependency to express that they
-  # cannot compile in a given configuration. Win32 does this, for example, when
-  # compiled on Linux. We provide the name to avoid evaluation errors.
-  unbuildable = throw "package depends on meta package 'unbuildable'";
-
   # enable using a local hoogle with extra packagages in the database
   # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }"
   # $ hoogle server

From 8e2abd0fa9129f7263926217f24bdd788fceb3da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Dec 2020 20:21:44 +0100
Subject: [PATCH 26/29] haskell: drop the obsolete 'multi-ghc-travis' meta
 package

---
 pkgs/development/haskell-modules/non-hackage-packages.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index c79673a28646..30f00cc6ea2c 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -7,9 +7,6 @@
 # files.
 self: super: {
 
-  multi-ghc-travis = throw ("haskellPackages.multi-ghc-travis has been renamed"
-    + " to haskell-ci, which is now on hackage");
-
   dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { };
 
   # https://github.com/channable/vaultenv/issues/1

From 0e0b2c8030d2dd72d3522c2f63e5632ee94e3ccf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 4 Dec 2020 20:29:25 +0000
Subject: [PATCH 27/29] postsrsd: 1.7 -> 1.8

---
 pkgs/servers/mail/postsrsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix
index 5a543ed8ba3d..3929ffbafc62 100644
--- a/pkgs/servers/mail/postsrsd/default.nix
+++ b/pkgs/servers/mail/postsrsd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "postsrsd";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchFromGitHub {
     owner = "roehling";
     repo = "postsrsd";
     rev = version;
-    sha256 = "11yr557m60a62m4wxi20lr8kmagjrgndmnwlxzr241bwb20ba96x";
+    sha256 = "1f10ac7bkphvjjh2xzzz5c0x97njx20yd8wvl99isqfsyyc2lhm7";
   };
 
   cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" ];

From 9b7113f43703e1f3a839c825c368615566ca7b5d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Dec 2020 22:26:28 +0100
Subject: [PATCH 28/29] all-cabal-hashes: update to Hackage at
 2020-12-04T10:00:55Z

---
 pkgs/data/misc/hackage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 3c9a531ab62f..9f21ca1eeb7b 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/59ba02b3424684458764210fa9e32ca08e516db2.tar.gz";
-  sha256 = "0m4scz6b7xg7kisy6zlnw258pkfksmzzppw9gp0g6rdl0cxly239";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/a82d2463451cfd47772b3fb331b1a0e8386675ef.tar.gz";
+  sha256 = "0l2h2z0982nmw3kq9r6ppwgs7ar4bda9c808mc2nkcyfmcnkdl6w";
 }

From 40440b2209ed82520194ca40010b7cb3a65e233a Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 4 Dec 2020 14:23:49 +0100
Subject: [PATCH 29/29] ocamlPackages.tls: 0.12.6 -> 0.12.7

---
 pkgs/development/ocaml-modules/tls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix
index 375c2de27e0e..5aa3ecb0bf17 100644
--- a/pkgs/development/ocaml-modules/tls/default.nix
+++ b/pkgs/development/ocaml-modules/tls/default.nix
@@ -6,12 +6,12 @@
 buildDunePackage rec {
   minimumOCamlVersion = "4.08";
 
-  version = "0.12.6";
+  version = "0.12.7";
   pname = "tls";
 
   src = fetchurl {
     url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz";
-    sha256 = "14b2289nhb65qm8wrw51y8qgz5ysn8hcbrj5plznd1pdzl46zxc9";
+    sha256 = "1c7hmcpcxn1bfa9cavqzriv7py2q7xfbdpb7kh1kb3j1qjap17dc";
   };
 
   useDune2 = true;