From bccb0ee3db61c44e6a68a5c0d9ee4364320af415 Mon Sep 17 00:00:00 2001
From: Louis Bettens <louis@bettens.info>
Date: Mon, 25 Jan 2021 18:21:08 +0100
Subject: [PATCH 01/31] oraclejdk8: 8u271 -> 8u281

---
 pkgs/development/compilers/oraclejdk/jdk8-linux.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
index 01d1ee8e980..206df75b9eb 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
@@ -1,10 +1,10 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "271";
-  sha256.i686-linux = "nC1bRTDj0BPWqClLCfNIqdUn9HywUF8Z/pIV9Kq3LG0=";
-  sha256.x86_64-linux = "66eSamg7tlxvThxQLOYkNGxCsA+1Ux3ropbyVgtFLHg=";
-  sha256.armv7l-linux = "YZKX0iUf7yqUBUhlpHtVdYw6DBEu7E/pbfcVfK7HMxM=";
-  sha256.aarch64-linux = "bFRGnfmYIdXz5b/I8wlA/YiGXhCm/cVoOAU+Hlu4F0I=";
+  patchVersion = "281";
+  sha256.i686-linux = "/yEY5O6MYNyjS5YSGZtgydb8th6jHQLNvI9tNPIh3+0=";
+  sha256.x86_64-linux = "hejH2nJIx0UPsQVWeniEHQlzWXhQd2wkpSf+sC7z5YY=";
+  sha256.armv7l-linux = "oXbW8hZxesDqwV79ANB4SdnS71O51ZApKbQhqq4i/EM=";
+  sha256.aarch64-linux = "oFH3TeIzVsFk6IZcDEHVDVJC7dSbGcwhdUH/WUXSNDM=";
   jceName = "jce_policy-8.zip";
   sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w";
 }

From 0b4d5b741baa91f583496acf9b135d00f87834cb Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 26 Jan 2021 19:17:30 +0100
Subject: [PATCH 02/31] nixos/test/dnscrypt-wrapper: fix test

The test was broken by the inclusion of the default dnscrypt-proxy
configuration in e4c49db6.
---
 nixos/tests/dnscrypt-wrapper/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/dnscrypt-wrapper/default.nix b/nixos/tests/dnscrypt-wrapper/default.nix
index d5c09172308..1bdd064e113 100644
--- a/nixos/tests/dnscrypt-wrapper/default.nix
+++ b/nixos/tests/dnscrypt-wrapper/default.nix
@@ -31,6 +31,7 @@ import ../make-test-python.nix ({ pkgs, ... }: {
 
     client = { lib, ... }:
       { services.dnscrypt-proxy2.enable = true;
+        services.dnscrypt-proxy2.upstreamDefaults = false;
         services.dnscrypt-proxy2.settings = {
           server_names = [ "server" ];
           static.server.stamp = "sdns://AQAAAAAAAAAAEDE5Mi4xNjguMS4xOjUzNTMgFEHYOv0SCKSuqR5CDYa7-58cCBuXO2_5uTSVU9wNQF0WMi5kbnNjcnlwdC1jZXJ0LnNlcnZlcg";

From a2498eabe243c17ab546806b41336fa4bb0d79ab Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Thu, 28 Jan 2021 10:51:54 +0100
Subject: [PATCH 03/31] rdma-core: 33.0 -> 33.1

---
 pkgs/os-specific/linux/rdma-core/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index b001ce966a9..ad9deeb7a8c 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -4,7 +4,7 @@
 } :
 
 let
-  version = "33.0";
+  version = "33.1";
 
 in stdenv.mkDerivation {
   pname = "rdma-core";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
     owner = "linux-rdma";
     repo = "rdma-core";
     rev = "v${version}";
-    sha256 = "04q4z95nxxxjc674qnbwn19bv18nl3x7xwp6aql17h1cw3gdmhw4";
+    sha256 = "1p97r8ngfx1d9aq8p3f027323m7kgmk30kfrikf3jlkpr30rksbv";
   };
 
   nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ];
@@ -46,7 +46,7 @@ in stdenv.mkDerivation {
   meta = with lib; {
     description = "RDMA Core Userspace Libraries and Daemons";
     homepage = "https://github.com/linux-rdma/rdma-core";
-    license = licenses.gpl2;
+    license = licenses.gpl2Only;
     platforms = platforms.linux;
     maintainers = with maintainers; [ markuskowa ];
   };

From 123045a57056b997165be4963cbf62120a967fec Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek@galowicz.de>
Date: Mon, 25 Jan 2021 16:59:46 +0100
Subject: [PATCH 04/31] lib/attrsets: add cartesianProductOfSets function

---
 doc/functions/library/attrsets.xml | 39 +++++++++++++++++
 lib/attrsets.nix                   | 19 ++++++++-
 lib/default.nix                    |  2 +-
 lib/tests/misc.nix                 | 67 ++++++++++++++++++++++++++++++
 4 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index 3c5823c2589..7ef0d16624c 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -1711,4 +1711,43 @@ recursiveUpdate
   </example>
  </section>
 
+ <section xml:id="function-library-lib.attrsets.cartesianProductOfSets">
+  <title><function>lib.attrsets.cartesianProductOfSets</function></title>
+
+  <subtitle><literal>cartesianProductOfSets :: AttrSet -> [ AttrSet ]</literal>
+  </subtitle>
+
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.cartesianProductOfSets" />
+
+  <para>
+    Return the cartesian product of attribute set value combinations.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>set</varname>
+    </term>
+    <listitem>
+     <para>
+      An attribute set with attributes that carry lists of values.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.cartesianProductOfSets-example">
+   <title>Creating the cartesian product of a list of attribute values</title>
+<programlisting><![CDATA[
+cartesianProductOfSets { a = [ 1 2 ]; b = [ 10 20 ]; }
+=> [
+     { a = 1; b = 10; }
+     { a = 1; b = 20; }
+     { a = 2; b = 10; }
+     { a = 2; b = 20; }
+   ]
+]]></programlisting>
+  </example>
+ </section>
+
 </section>
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index d91d7a0cd47..0ce3aaeca45 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -183,6 +183,24 @@ rec {
     else
       [];
 
+  /* Return the cartesian product of attribute set value combinations.
+
+    Example:
+      cartesianProductOfSets { a = [ 1 2 ]; b = [ 10 20 ]; }
+      => [
+           { a = 1; b = 10; }
+           { a = 1; b = 20; }
+           { a = 2; b = 10; }
+           { a = 2; b = 20; }
+         ]
+  */
+  cartesianProductOfSets = attrsOfLists:
+    lib.foldl' (listOfAttrs: attrName:
+      concatMap (attrs:
+        map (listValue: attrs // { ${attrName} = listValue; }) attrsOfLists.${attrName}
+      ) listOfAttrs
+    ) [{}] (attrNames attrsOfLists);
+
 
   /* Utility function that creates a {name, value} pair as expected by
      builtins.listToAttrs.
@@ -493,5 +511,4 @@ rec {
   zipWithNames = zipAttrsWithNames;
   zip = builtins.trace
     "lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith;
-
 }
diff --git a/lib/default.nix b/lib/default.nix
index 803f1f76564..50320669e28 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -78,7 +78,7 @@ let
       zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
       recursiveUpdate matchAttrs overrideExisting getOutput getBin
       getLib getDev getMan chooseDevOutputs zipWithNames zip
-      recurseIntoAttrs dontRecurseIntoAttrs;
+      recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets;
     inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1
       concatMap flatten remove findSingle findFirst any all count
       optional optionals toList range partition zipListsWith zipLists
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 35a5801c724..0d249968402 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -660,4 +660,71 @@ runTests {
     expected = [ [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ];
   };
 
+  testCartesianProductOfEmptySet = {
+    expr = cartesianProductOfSets {};
+    expected = [ {} ];
+  };
+
+  testCartesianProductOfOneSet = {
+    expr = cartesianProductOfSets { a = [ 1 2 3 ]; };
+    expected = [ { a = 1; } { a = 2; } { a = 3; } ];
+  };
+
+  testCartesianProductOfTwoSets = {
+    expr = cartesianProductOfSets { a = [ 1 ]; b = [ 10 20 ]; };
+    expected = [
+      { a = 1; b = 10; }
+      { a = 1; b = 20; }
+    ];
+  };
+
+  testCartesianProductOfTwoSetsWithOneEmpty = {
+    expr = cartesianProductOfSets { a = [ ]; b = [ 10 20 ]; };
+    expected = [ ];
+  };
+
+  testCartesianProductOfThreeSets = {
+    expr = cartesianProductOfSets {
+      a = [   1   2   3 ];
+      b = [  10  20  30 ];
+      c = [ 100 200 300 ];
+    };
+    expected = [
+      { a = 1; b = 10; c = 100; }
+      { a = 1; b = 10; c = 200; }
+      { a = 1; b = 10; c = 300; }
+
+      { a = 1; b = 20; c = 100; }
+      { a = 1; b = 20; c = 200; }
+      { a = 1; b = 20; c = 300; }
+
+      { a = 1; b = 30; c = 100; }
+      { a = 1; b = 30; c = 200; }
+      { a = 1; b = 30; c = 300; }
+
+      { a = 2; b = 10; c = 100; }
+      { a = 2; b = 10; c = 200; }
+      { a = 2; b = 10; c = 300; }
+
+      { a = 2; b = 20; c = 100; }
+      { a = 2; b = 20; c = 200; }
+      { a = 2; b = 20; c = 300; }
+
+      { a = 2; b = 30; c = 100; }
+      { a = 2; b = 30; c = 200; }
+      { a = 2; b = 30; c = 300; }
+
+      { a = 3; b = 10; c = 100; }
+      { a = 3; b = 10; c = 200; }
+      { a = 3; b = 10; c = 300; }
+
+      { a = 3; b = 20; c = 100; }
+      { a = 3; b = 20; c = 200; }
+      { a = 3; b = 20; c = 300; }
+
+      { a = 3; b = 30; c = 100; }
+      { a = 3; b = 30; c = 200; }
+      { a = 3; b = 30; c = 300; }
+    ];
+  };
 }

From 001ba3934e329a457d26c4f45e666b2091c7dd80 Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek@galowicz.de>
Date: Thu, 28 Jan 2021 23:03:02 +0100
Subject: [PATCH 05/31] Use lib.cartesianProducOfSets where lib.crossLists was
 used

---
 nixos/modules/services/x11/display-managers/default.nix | 6 +++---
 nixos/tests/predictable-interface-names.nix             | 8 ++++++--
 pkgs/os-specific/solo5/default.nix                      | 9 +++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 6945a241f92..9fdbe753dad 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -444,8 +444,8 @@ in
       in
         # We will generate every possible pair of WM and DM.
         concatLists (
-          crossLists
-            (dm: wm: let
+            builtins.map
+            ({dm, wm}: let
               sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}";
               script = xsession dm wm;
               desktopNames = if dm ? desktopNames
@@ -472,7 +472,7 @@ in
                   providedSessions = [ sessionName ];
                 })
             )
-            [dms wms]
+            (cartesianProductOfSets { dm = dms; wm = wms; })
           );
 
     # Make xsessions and wayland sessions available in XDG_DATA_DIRS
diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix
index bab091d57ac..c0b472638a1 100644
--- a/nixos/tests/predictable-interface-names.nix
+++ b/nixos/tests/predictable-interface-names.nix
@@ -5,7 +5,11 @@
 
 let
   inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
-in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
+  testCombinations = pkgs.lib.cartesianProductOfSets {
+    predictable = [true false];
+    withNetworkd = [true false];
+  };
+in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd }: {
   name = pkgs.lib.optionalString (!predictable) "un" + "predictable"
        + pkgs.lib.optionalString withNetworkd "Networkd";
   value = makeTest {
@@ -30,4 +34,4 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
       machine.${if predictable then "fail" else "succeed"}("ip link show eth0")
     '';
   };
-}) [[true false] [true false]])
+}) testCombinations)
diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix
index 2dbeca98051..19d1aa3b5eb 100644
--- a/pkgs/os-specific/solo5/default.nix
+++ b/pkgs/os-specific/solo5/default.nix
@@ -50,10 +50,11 @@ in stdenv.mkDerivation {
     homepage = "https://github.com/solo5/solo5";
     license = licenses.isc;
     maintainers = [ maintainers.ehmry ];
-    platforms = lib.crossLists (arch: os: "${arch}-${os}") [
-      [ "aarch64" "x86_64" ]
-      [ "freebsd" "genode" "linux" "openbsd" ]
-    ];
+    platforms = builtins.map ({arch, os}: "${arch}-${os}")
+      (cartesianProductOfSets {
+        arch = [ "aarch64" "x86_64" ];
+        os = [ "freebsd" "genode" "linux" "openbsd" ];
+      });
   };
 
 }

From 577d58a8e01aead5eb237d39a6d7df1fb7aa00c4 Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek@galowicz.de>
Date: Thu, 28 Jan 2021 08:51:21 +0100
Subject: [PATCH 06/31] Deprecate lib.crossLists

---
 lib/lists.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 06cee2eb112..56af4d9daa1 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -629,7 +629,9 @@ rec {
       crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]]
       => [ "13" "14" "23" "24" ]
   */
-  crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f];
+  crossLists = builtins.trace
+    "lib.crossLists is deprecated, use lib.cartesianProductOfSets instead"
+    (f: foldl (fs: args: concatMap (f: map f args) fs) [f]);
 
 
   /* Remove duplicate elements from the list. O(n^2) complexity.

From 37893aabaac1e3d27ee19d5acde9408b07733f24 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 29 Jan 2021 11:28:25 +0100
Subject: [PATCH 07/31] fuzzel: 1.4.1 -> 1.5.0

---
 pkgs/applications/misc/fuzzel/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix
index 337d68b4b20..85c0bbd0d69 100644
--- a/pkgs/applications/misc/fuzzel/default.nix
+++ b/pkgs/applications/misc/fuzzel/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, lib, fetchgit, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, scdoc, git, tllist, fcft}:
+{ stdenv, lib, fetchzip, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, scdoc, git, tllist, fcft}:
 
 stdenv.mkDerivation rec {
   pname = "fuzzel";
-  version = "1.4.2";
+  version = "1.5.0";
 
-  src = fetchgit {
-    url = "https://codeberg.org/dnkl/fuzzel";
-    rev = version;
-    sha256 = "0c0p9spklzmy9f7abz3mvw0vp6zgnk3ns1i6ks95ljjb3kqy9vs2";
+  src = fetchzip {
+    url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz";
+    sha256 = "091vlhj1kirdy5p3qza9hwhj7js3ci5xxvlp9d7as9bwlh58w2lw";
   };
 
   nativeBuildInputs = [ pkg-config meson ninja scdoc git ];

From 7ca845b58660520d074ae3dc02e3a90906f91102 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Fri, 29 Jan 2021 07:18:40 -0500
Subject: [PATCH 08/31] pulumi-bin: 2.18.2 -> 2.19.0

---
 pkgs/tools/admin/pulumi/data.nix  | 58 +++++++++++++++----------------
 pkgs/tools/admin/pulumi/update.sh | 14 ++++----
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix
index 135f6dcca4f..0498b56dcf5 100644
--- a/pkgs/tools/admin/pulumi/data.nix
+++ b/pkgs/tools/admin/pulumi/data.nix
@@ -1,20 +1,20 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "2.18.2";
+  version = "2.19.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v2.18.2-linux-x64.tar.gz";
-        sha256 = "0ya8b77qjda5z6bkik2yxq30wi1753mgkbcshd3x8f4wkb7kvj3w";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-linux-x64.tar.gz";
+        sha256 = "0641inzkbgrjarc7jdmi0iryx4swjh1ayf0j15ais3yij7jq4da2";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-linux-amd64.tar.gz";
         sha256 = "1jrv87r55m1kzl48zs5vh83v2kh011gm4dha80ijqjhryx0a94jy";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.0-linux-amd64.tar.gz";
-        sha256 = "1q9jz3p784x8k56an6hg9nazz44hlhdg9fawx6n0zrp6mh34kpsp";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-linux-amd64.tar.gz";
+        sha256 = "0yfrpih5q2hfj2555y26l1pqs22idh4hqn20gy310kg12r303hwk";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-linux-amd64.tar.gz";
@@ -33,16 +33,16 @@
         sha256 = "19cpq6hwj862wmfcfx732j66wjkfjnxjrqj4bgxpgah62hrl5lh2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.1-linux-amd64.tar.gz";
-        sha256 = "1582h37z0971pd7xp6ss7r7742068pkbh2k5q8jj6ii3d7rwbbp1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-linux-amd64.tar.gz";
+        sha256 = "0mb6ddidyk3g1ayk8y0ypb262fyv584w5cicvjc5r9670a1d2rcv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.8.0-linux-amd64.tar.gz";
-        sha256 = "1an0i997bpnkf19zbgfjyl2h7sm21xsc564x6zwcg67sxcjaal0w";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-linux-amd64.tar.gz";
+        sha256 = "1b5m2620s4bqq6zlagki3w4fzph3lc5192falv8ick4rgbv714nb";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.0-linux-amd64.tar.gz";
-        sha256 = "0sglafpi7fjcrgky0a7xfra28ps55bb88mdi695i905ic8y071wa";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-linux-amd64.tar.gz";
+        sha256 = "10cmnsxpiy7bfxyrpwfqn5kgpijlkxrhfah40wd82j3j2b7wy33j";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-linux-amd64.tar.gz";
@@ -53,8 +53,8 @@
         sha256 = "0fi8qxv6ladpapb6j0w7zqk0hxj56iy1131dsipzkkx4p1jfg27r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.7-linux-amd64.tar.gz";
-        sha256 = "1x0j93y65687qh2k62ks61q2rjdlr06kkhas07w82x36xl6r30h1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-linux-amd64.tar.gz";
+        sha256 = "0ah0yhwf79dgk7biifnapz0366mm5a54rlqf8hffn13czqnc3qbq";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-linux-amd64.tar.gz";
@@ -81,8 +81,8 @@
         sha256 = "0jpv94kzsa794ds5bjj6j3pj1wxqicavpxjnycfa5cm8w71kmlsh";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.1-linux-amd64.tar.gz";
-        sha256 = "0saavajpnn5rx70n7rzfymrx8v17jf99n1zz20zgrhww67s3p2l6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-linux-amd64.tar.gz";
+        sha256 = "069sq8lkw4n7ykh2b2fsaggxxr4731riyy9i15idffa52d1kkiq6";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-linux-amd64.tar.gz";
@@ -91,16 +91,16 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v2.18.2-darwin-x64.tar.gz";
-        sha256 = "0rrmiplwml864s6rsxmb0zprd8qnf6ss92hgay9xnr6bxs6gl8w2";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-darwin-x64.tar.gz";
+        sha256 = "02wd0h5aq53zjy18xzbkv7nnl097ja0m783gsgrs1wdlqblwpqyw";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-darwin-amd64.tar.gz";
         sha256 = "1rqx2dyx3anmlv74whs587rs1bgyssqxfjzrx1cfpfnnnj5rkmry";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.0-darwin-amd64.tar.gz";
-        sha256 = "0jxsh5af08sjj21ff484n1a9dylhmf02gzagw6r8x6lh247l5qp2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-darwin-amd64.tar.gz";
+        sha256 = "1j4czx1iqfm95y14isl1sqwvsw690h9y0xf2jpynp2ygmc3szrkr";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-darwin-amd64.tar.gz";
@@ -119,16 +119,16 @@
         sha256 = "0kyw1csyzvkbzqxrgpf4d2zgydysd4mfb07igjv19m3f7gs8jhr9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.1-darwin-amd64.tar.gz";
-        sha256 = "06q9pysql611p24padz6cz2fhf14bqkw7li504479sbnsxqk3g0s";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-darwin-amd64.tar.gz";
+        sha256 = "122cf7v12vzv1szi9adcccakbs3hs23qsjbykjrhwmk8hw21g4kb";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.8.0-darwin-amd64.tar.gz";
-        sha256 = "1x59xfzfgk02fmddbpvjk4cy8pnbgc65qwz9w70q59pyzyxl050s";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-darwin-amd64.tar.gz";
+        sha256 = "11w4ykh846byg05jxnddm6ln901pms8n5g0q5gj3ldfjrfl1cn2q";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.0-darwin-amd64.tar.gz";
-        sha256 = "0c9m036s690vrspklg1dxa6rnyqbfpspjn6lm64wj1w75qk9z746";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-darwin-amd64.tar.gz";
+        sha256 = "1apaaa76dq53ppnmh4xi55zsrx1mwbnnsby63ymjw9xhdkc1sah6";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-darwin-amd64.tar.gz";
@@ -139,8 +139,8 @@
         sha256 = "05h8adn3q7nnhn75vircrnr9nxf15pf82n9gvz5rbq0hsdivh3l2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.7-darwin-amd64.tar.gz";
-        sha256 = "1nvgvk2awimllmy0yj69250w06hy64zcml5mhn5i9i2zyhmnwb6q";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-darwin-amd64.tar.gz";
+        sha256 = "01xspqk3hzvrhka9nsxal8pwji3hm5qgkn49jjnk1cy01hy7s78q";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-darwin-amd64.tar.gz";
@@ -167,8 +167,8 @@
         sha256 = "0d578hqkhwlhx50k9qpw7ixjyy1p2fd6cywj86s870jzgl8zh4fv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.1-darwin-amd64.tar.gz";
-        sha256 = "12nfk2pc380gnkblrviwyijr9ff5h1xv2ybv6frdczfd1kdjf9ar";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-darwin-amd64.tar.gz";
+        sha256 = "1qkh8hg7nplv0slq2xark57l547z63fy1l6zvrcblrqsqfw5zybv";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-darwin-amd64.tar.gz";
diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh
index e3422214abe..c1a0e631016 100755
--- a/pkgs/tools/admin/pulumi/update.sh
+++ b/pkgs/tools/admin/pulumi/update.sh
@@ -3,30 +3,30 @@
 
 # Version of Pulumi from
 # https://www.pulumi.com/docs/get-started/install/versions/
-VERSION="2.18.2"
+VERSION="2.19.0"
 
 # Grab latest release ${VERSION} from
 # https://github.com/pulumi/pulumi-${NAME}/releases
 plugins=(
     "auth0=1.5.2"
-    "aws=3.25.0"
+    "aws=3.25.1"
     "cloudflare=2.11.1"
     "consul=2.7.0"
     "datadog=2.15.0"
     "digitalocean=3.3.0"
-    "docker=2.6.1"
-    "gcp=4.8.0"
-    "github=2.5.0"
+    "docker=2.7.0"
+    "gcp=4.9.0"
+    "github=2.5.1"
     "gitlab=3.5.0"
     "hcloud=0.5.1"
-    "kubernetes=2.7.7"
+    "kubernetes=2.7.8"
     "mailgun=2.3.2"
     "mysql=2.3.3"
     "openstack=2.11.0"
     "packet=3.2.2"
     "postgresql=2.5.3"
     "random=3.0.1"
-    "vault=3.2.1"
+    "vault=3.3.0"
     "vsphere=2.11.4"
 )
 

From 898b36188c95243fe364b55d2e2af2962ced44e0 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <cloud@standard.ai>
Date: Fri, 29 Jan 2021 07:18:49 -0500
Subject: [PATCH 09/31] pulumi-bin: add cpcloud as maintainer

---
 pkgs/tools/admin/pulumi/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index 231bdc09965..89fee3e6160 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -32,6 +32,7 @@ in stdenv.mkDerivation {
       ghuntley
       peterromfeldhk
       jlesquembre
+      cpcloud
     ];
   };
 }

From 91c6a4648ead499a9c2493a2688f3b0253b2d1e9 Mon Sep 17 00:00:00 2001
From: Louis Bettens <louis@bettens.info>
Date: Fri, 29 Jan 2021 16:09:02 +0100
Subject: [PATCH 10/31] processing: fix build

---
 pkgs/applications/graphics/processing/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
index 434f9fab88d..2e61e40b01f 100644
--- a/pkgs/applications/graphics/processing/default.nix
+++ b/pkgs/applications/graphics/processing/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
   pname = "processing";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "0cvv8jda9y8qnfcsziasyv3w7h3w22q78ihr23cm4an63ghxci58";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "oraclejdk-8u281-compat.patch";
+      url = "https://github.com/processing/processing/commit/7e176876173c93e3a00a922e7ae37951366d1761.patch";
+      sha256 = "g+zwpoIVgw7Sp6QWW3vyPZ/fKHk+o/YCY6xnrX8IGKo=";
+    })
+  ];
+
   nativeBuildInputs = [ ant rsync makeWrapper ];
   buildInputs = [ jdk ];
 

From efef175c196497eccf6aa0506092f40c9e688524 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 29 Jan 2021 16:59:45 +0000
Subject: [PATCH 11/31] evince: 3.38.0 -> 3.38.1

---
 pkgs/desktops/gnome-3/core/evince/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 77b8b8977d1..4a1a305d127 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -43,13 +43,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evince";
-  version = "3.38.0";
+  version = "3.38.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0j0ry0y9qi1mlm7dcjwrmrw45s1225ri8sv0s9vb8ibm85x8kpr6";
+    sha256 = "APbWaJzCLePABb2H1MLr9yAGTLjcahiHgW+LfggrLmM=";
   };
 
   postPatch = ''

From 529e80db911b5cafd270aaa0d326a9ea937043ea Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 29 Jan 2021 18:28:50 +0100
Subject: [PATCH 12/31] pythonPackages.hwi: reintroduce dropped dependencies

partial revert of 863d89b767c4de7d6a87b77a2b13d74177b2f201
---
 pkgs/development/python-modules/hwi/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix
index 7c34235a190..d3b7d5c8566 100644
--- a/pkgs/development/python-modules/hwi/default.nix
+++ b/pkgs/development/python-modules/hwi/default.nix
@@ -2,11 +2,14 @@
 , buildPythonPackage
 , fetchFromGitHub
 , bitbox02
+, btchip
+, ckcc-protocol
 , ecdsa
 , hidapi
 , libusb1
 , mnemonic
 , pyaes
+, trezor
 , pythonAtLeast
 }:
 
@@ -31,11 +34,14 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     bitbox02
+    btchip
+    ckcc-protocol
     ecdsa
     hidapi
     libusb1
     mnemonic
     pyaes
+    trezor
   ];
 
   # tests require to clone quite a few firmwares

From 8f0820c79de7a80952368f11c61d8f72da379c49 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 29 Jan 2021 18:47:38 +0000
Subject: [PATCH 13/31] feh: 3.6.2 -> 3.6.3

---
 pkgs/applications/graphics/feh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 739b6ae5d1b..fac3dbb5534 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -7,11 +7,11 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "feh";
-  version = "3.6.2";
+  version = "3.6.3";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
-    sha256 = "0d66qz9h37pk8h10bc918hbv3j364vyni934rlw2j951s5wznj8n";
+    sha256 = "sha256-Q3Qg838RYU4AjQZuKjve/Px4FEyCEpmLK6zdXSHqI7Q=";
   };
 
   outputs = [ "out" "man" "doc" ];

From f10d197ef83a3ca052cdb307abede92b27908352 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 29 Jan 2021 11:57:48 -0500
Subject: [PATCH 14/31] linux: 5.11-rc3 -> 5.11-rc5

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 5210e3ed7a8..1ed116cdfde 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.11-rc3";
+  version = "5.11-rc5";
   extraMeta.branch = "5.11";
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "15dfgvicp7s9xqaa3w8lmfffzyjsqrq1fa2gs1a8awzs5rxgsn61";
+    sha256 = "029nps41nrym5qz9lq832cys4rai04ig5xp9ddvrpazzh0lfnr4q";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 2fd163f1bad61b032f13bc3a94878dbbc2cf88dc Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 29 Jan 2021 20:05:48 +0100
Subject: [PATCH 15/31] foot: 1.6.2 -> 1.6.3

---
 pkgs/applications/terminal-emulators/foot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix
index 2b79c5362de..b9a8316794a 100644
--- a/pkgs/applications/terminal-emulators/foot/default.nix
+++ b/pkgs/applications/terminal-emulators/foot/default.nix
@@ -21,7 +21,7 @@
 }:
 
 let
-  version = "1.6.2";
+  version = "1.6.3";
 
   # build stimuli file for PGO build and the script to generate it
   # independently of the foot's build, so we can cache the result
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";
-    sha256 = "08i3jmjky5s2nnc0c95c009cym91rs4sj4876sr4xnlkb7ab4812";
+    sha256 = "0rm7w29wf3gipf69qf7s42qw8857z74gsigrpz9g6vvd1x58f03m";
   };
 
   nativeBuildInputs = [

From 9e904c74d3f4ac75b14352e0badf5fa7f527c903 Mon Sep 17 00:00:00 2001
From: Florian Engel <florianengel39@gmail.com>
Date: Fri, 29 Jan 2021 20:43:56 +0100
Subject: [PATCH 16/31] monetdb: 11.39.7 -> 11.39.11

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

diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index ca284330b30..80033e406ee 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "monetdb";
-  version = "11.39.7";
+  version = "11.39.11";
 
   src = fetchurl {
     url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
-    sha256 = "0qb2hlz42400diahmsbflfjmfnzd5slm6761xhgvh8s4rjfqm21w";
+    sha256 = "1b70r4b5m0r0xpy7i76xx0xsmwagsjdcp5j6nqfjcyn1m65ydzvs";
   };
 
   postPatch = ''

From f3b7bf47b08073c07cd2396c5daf1f9836d4c892 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Jan 2021 13:02:13 +0100
Subject: [PATCH 17/31] Stackage Nightly 2021-01-29

---
 .../configuration-hackage2nix.yaml            | 394 +++++++++---------
 1 file changed, 201 insertions(+), 193 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 1587e1dba61..5481f21ac8e 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 2021-01-20
+  # Stackage Nightly 2021-01-29
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
@@ -215,33 +215,33 @@ 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.5
   - api-field-json-th ==0.1.0.2
   - api-maker ==0.1.0.0
-  - ap-normalize ==0.1.0.0
+  - app-settings ==0.2.0.12
   - appar ==0.1.8
   - appendmap ==0.1.5
   - apply-refact ==0.9.0.0
   - 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
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
-  - ascii ==1.0.0.2
+  - ascii ==1.0.1.0
   - ascii-case ==1.0.0.2
-  - ascii-char ==1.0.0.2
-  - asciidiagram ==1.3.3.3
+  - ascii-char ==1.0.0.6
   - 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-superset ==1.0.1.0
   - 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
@@ -269,8 +269,8 @@ default-package-overrides:
   - authenticate ==1.3.5
   - authenticate-oauth ==1.6.0.1
   - auto ==0.4.3.1
-  - autoexporter ==1.1.19
   - auto-update ==0.1.6
+  - autoexporter ==1.1.19
   - avers ==0.0.17.1
   - avro ==0.5.2.0
   - aws-cloudfront-signed-cookies ==0.2.0.6
@@ -278,6 +278,11 @@ default-package-overrides:
   - 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.4
+  - 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
@@ -286,17 +291,12 @@ default-package-overrides:
   - base32string ==0.9.1
   - base58-bytestring ==0.1.0
   - base58string ==0.10.0
-  - base64 ==0.4.2.2
+  - base64 ==0.4.2.3
   - base64-bytestring ==1.1.0.0
   - 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.4
-  - 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,10 @@ default-package-overrides:
   - benchpress ==0.2.2.15
   - between ==0.11.0.0
   - bibtex ==0.1.0.6
-  - bifunctors ==5.5.9
+  - bifunctors ==5.5.10
   - bimap ==0.4.0
-  - bimaps ==0.1.0.2
   - bimap-server ==0.1.0.1
+  - bimaps ==0.1.0.2
   - bin ==0.1
   - binary-conduit ==1.3.1
   - binary-ext ==2.0.4
@@ -330,8 +330,8 @@ default-package-overrides:
   - bins ==0.1.2.0
   - bitarray ==0.0.1.1
   - bits ==0.5.2
-  - bitset-word8 ==0.1.1.2
   - bits-extra ==0.0.2.0
+  - bitset-word8 ==0.1.1.2
   - bitvec ==1.0.3.0
   - bitwise-enum ==1.0.0.3
   - blake2 ==0.3.0
@@ -357,12 +357,12 @@ default-package-overrides:
   - boring ==0.1.3
   - both ==0.1.1.1
   - bound ==2.0.2
-  - BoundedChan ==1.0.3.0
   - bounded-queue ==1.0.0
+  - BoundedChan ==1.0.3.0
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.5
-  - brick ==0.58.1
+  - brick ==0.59
   - broadcast-chan ==0.2.1.1
   - bsb-http-chunked ==0.0.0.4
   - bson ==0.4.0.1
@@ -376,10 +376,10 @@ default-package-overrides:
   - butcher ==1.3.3.2
   - bv ==0.5
   - bv-little ==1.1.1
-  - byteable ==0.1.1
   - byte-count-reader ==0.10.1.2
-  - bytedump ==1.0
   - byte-order ==0.1.2.0
+  - byteable ==0.1.1
+  - bytedump ==1.0
   - byteorder ==1.0.4
   - bytes ==0.17
   - byteset ==0.1.1.0
@@ -395,6 +395,8 @@ default-package-overrides:
   - bzlib-conduit ==0.3.0.2
   - c14n ==0.1.0.1
   - c2hs ==0.28.7
+  - ca-province-codes ==1.0.0.0
+  - cabal-debian ==5.1
   - cabal-doctest ==1.0.8
   - cabal-file ==0.1.1
   - cabal-flatpak ==0.1.0.2
@@ -405,13 +407,12 @@ 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
-  - cased ==0.1.0.0
   - case-insensitive ==1.2.1.0
+  - cased ==0.1.0.0
   - cases ==0.1.4
   - casing ==0.1.4.1
   - cassava ==0.5.2.0
@@ -435,7 +436,7 @@ default-package-overrides:
   - charsetdetect-ae ==1.1.0.4
   - Chart ==1.9.3
   - chaselev-deque ==0.5.0.5
-  - ChasingBottoms ==1.3.1.9
+  - ChasingBottoms ==1.3.1.10
   - cheapskate ==0.1.1.2
   - cheapskate-highlight ==0.1.0.0
   - cheapskate-lucid ==0.1.0.0
@@ -472,12 +473,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
@@ -523,8 +524,8 @@ default-package-overrides:
   - conferer-aeson ==1.0.0.0
   - conferer-hspec ==1.0.0.0
   - conferer-warp ==1.0.0.0
-  - ConfigFile ==1.1.4
   - config-ini ==0.2.4.0
+  - ConfigFile ==1.1.4
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
   - configurator-pg ==0.2.5
@@ -532,12 +533,13 @@ default-package-overrides:
   - connection-pool ==0.2.2
   - console-style ==0.0.2.1
   - constraint ==0.1.4.0
-  - constraints ==0.12
   - constraint-tuples ==0.1.2
+  - constraints ==0.12
   - construct ==0.3
   - contravariant ==1.5.3
   - contravariant-extras ==0.3.5.2
   - control-bool ==0.2.1
+  - control-dsl ==0.2.1.3
   - control-monad-free ==0.6.2
   - control-monad-omega ==0.3.2
   - convertible ==1.1.1.0
@@ -560,21 +562,21 @@ default-package-overrides:
   - cron ==0.7.0
   - crypto-api ==0.13.3
   - crypto-cipher-types ==0.0.9
-  - 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
-  - cryptohash-sha1 ==0.11.100.1
-  - cryptohash-sha256 ==0.11.101.0
-  - 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
+  - cryptocompare ==0.1.2
+  - cryptohash ==0.11.9
+  - cryptohash-cryptoapi ==0.1.4
+  - cryptohash-md5 ==0.11.100.1
+  - cryptohash-sha1 ==0.11.100.1
+  - cryptohash-sha256 ==0.11.102.0
+  - cryptonite ==0.27
+  - cryptonite-conduit ==0.2.2
+  - cryptonite-openssl ==0.7
   - csp ==1.4.0
   - css-syntax ==0.1.0.0
   - css-text ==0.1.3.0
@@ -611,7 +613,6 @@ 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
@@ -630,6 +631,7 @@ 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
@@ -648,38 +650,40 @@ default-package-overrides:
   - dense-linear-algebra ==0.1.0.0
   - depq ==0.4.1.0
   - deque ==0.4.3
-  - deriveJsonNoPrefix ==0.1.0.1
   - derive-topdown ==0.0.2.2
+  - deriveJsonNoPrefix ==0.1.0.1
   - deriving-aeson ==0.2.6
   - deriving-compat ==0.5.10
   - derulo ==1.0.9
-  - dhall ==1.37.1
-  - dhall-bash ==1.0.35
-  - dhall-json ==1.7.4
-  - dhall-lsp-server ==1.0.12
-  - dhall-yaml ==1.2.4
+  - dhall ==1.38.0
+  - dhall-bash ==1.0.36
+  - dhall-json ==1.7.5
+  - dhall-lsp-server ==1.0.13
+  - dhall-yaml ==1.2.5
+  - 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
-  - di-monad ==1.3.1
-  - directory-tree ==0.12.1
   - direct-sqlite ==2.3.26
+  - directory-tree ==0.12.1
   - dirichlet ==0.1.0.2
   - discount ==0.1.1
   - disk-free-space ==0.1.0.1
   - distributed-closure ==0.4.2.0
   - distribution-opensuse ==1.1.1
   - distributive ==0.6.2.1
-  - dl-fedora ==0.7.5
+  - dl-fedora ==0.7.6
   - dlist ==0.8.0.8
   - 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.9
@@ -688,8 +692,6 @@ default-package-overrides:
   - 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
   - dot ==0.3
   - dotenv ==0.8.0.7
   - dotgen ==0.4.3
@@ -729,10 +731,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.1
   - elynx-markov ==0.5.0.1
   - elynx-nexus ==0.5.0.1
@@ -744,16 +746,16 @@ 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
   - envparse ==0.4.1
   - envy ==2.1.0.0
   - epub-metadata ==4.5
   - eq ==4.2.1
   - equal-files ==0.0.5.3
-  - equational-reasoning ==0.6.0.4
+  - equational-reasoning ==0.7.0.0
   - equivalence ==0.3.5
   - erf ==2.0.0.0
   - error-or ==0.1.2.0
@@ -768,25 +770,25 @@ 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
   - experimenter ==0.1.0.4
   - 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
@@ -813,10 +815,10 @@ default-package-overrides:
   - fgl ==5.7.0.3
   - file-embed ==0.0.13.0
   - file-embed-lzma ==0
-  - filelock ==0.1.1.5
-  - filemanip ==0.3.6.3
   - file-modules ==0.1.2.4
   - file-path-th ==0.1.0.0
+  - filelock ==0.1.1.5
+  - filemanip ==0.3.6.3
   - filepattern ==0.1.2
   - fileplow ==0.1.0.0
   - filtrable ==0.1.4.0
@@ -846,9 +848,9 @@ default-package-overrides:
   - fn ==0.3.0.2
   - focus ==1.0.2
   - focuslist ==0.1.0.2
-  - foldable1 ==0.1.0.0
   - fold-debounce ==0.2.0.9
   - fold-debounce-conduit ==0.2.0.5
+  - foldable1 ==0.1.0.0
   - foldl ==1.4.10
   - folds ==0.7.5
   - follow-file ==0.0.3
@@ -862,10 +864,10 @@ default-package-overrides:
   - foundation ==0.0.25
   - free ==5.1.5
   - 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
@@ -876,13 +878,13 @@ default-package-overrides:
   - funcmp ==1.9
   - function-builder ==0.3.0.1
   - functor-classes-compat ==1
-  - fusion-plugin ==0.2.1
+  - fusion-plugin ==0.2.2
   - fusion-plugin-types ==0.1.0
   - fuzzcheck ==0.1.1
   - fuzzy ==0.1.0.0
   - fuzzy-dates ==0.1.1.2
-  - fuzzyset ==0.2.0
   - fuzzy-time ==0.1.0.0
+  - fuzzyset ==0.2.0
   - gauge ==0.2.5
   - gd ==3000.7.3
   - gdp ==0.0.3.0
@@ -897,8 +899,8 @@ default-package-overrides:
   - generic-lens-core ==2.0.0.0
   - generic-monoid ==0.1.0.1
   - generic-optics ==2.0.0.0
-  - GenericPretty ==1.2.2
   - generic-random ==1.3.0.1
+  - GenericPretty ==1.2.2
   - generics-sop ==0.5.1.0
   - generics-sop-lens ==0.2.0.1
   - geniplate-mirror ==0.7.7
@@ -932,9 +934,6 @@ default-package-overrides:
   - ghc-core ==0.5.6
   - ghc-events ==0.15.1
   - 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.3.20201220
   - ghc-lib-parser ==8.10.3.20201220
   - ghc-lib-parser-ex ==8.10.0.17
@@ -948,7 +947,10 @@ default-package-overrides:
   - ghc-typelits-extra ==0.4.2
   - ghc-typelits-knownnat ==0.7.4
   - ghc-typelits-natnormalise ==0.7.3
-  - ghc-typelits-presburger ==0.5.0.0
+  - ghc-typelits-presburger ==0.5.2.0
+  - 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
@@ -966,9 +968,10 @@ default-package-overrides:
   - 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
@@ -977,7 +980,6 @@ default-package-overrides:
   - github-webhooks ==0.15.0
   - gitlab-haskell ==0.2.5
   - gitrev ==1.3.1
-  - gi-xlib ==2.0.9
   - gl ==0.9
   - glabrous ==2.0.2
   - GLFW-b ==3.3.0.0
@@ -992,11 +994,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
   - greskell ==1.2.0.0
   - greskell-core ==0.1.3.5
@@ -1011,7 +1013,7 @@ default-package-overrides:
   - hackage-db ==2.1.0
   - hackage-security ==0.6.0.1
   - haddock-library ==1.9.0
-  - hadolint ==1.19.0
+  - hadolint ==1.20.0
   - hadoop-streaming ==0.2.0.3
   - hakyll-convert ==0.3.0.3
   - half ==0.3.1
@@ -1022,6 +1024,7 @@ default-package-overrides:
   - happstack-server ==7.7.0
   - happy ==1.20.0
   - HasBigDecimal ==0.1.1
+  - hasbolt ==0.1.4.4
   - hashable ==1.3.0.0
   - hashable-time ==0.2.0.2
   - hashids ==1.0.2.4
@@ -1037,6 +1040,7 @@ default-package-overrides:
   - haskell-lsp ==0.22.0.0
   - haskell-lsp-types ==0.22.0.0
   - haskell-names ==0.9.9
+  - haskell-src ==1.0.3.1
   - haskell-src-exts ==1.23.1
   - haskell-src-exts-util ==0.2.5
   - haskell-src-meta ==0.8.5
@@ -1064,7 +1068,7 @@ default-package-overrides:
   - hedgehog-fakedata ==0.0.1.3
   - hedgehog-fn ==1.0
   - hedgehog-quickcheck ==0.1.1
-  - hedis ==0.14.0
+  - hedis ==0.14.1
   - hedn ==0.3.0.2
   - here ==1.2.13
   - heredoc ==0.2.0.0
@@ -1078,9 +1082,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.2
-  - hi-file-parser ==0.1.0.0
   - higher-leveldb ==0.6.0.0
   - highlighting-kate ==0.6.4
   - hinfo ==0.0.3.0
@@ -1119,15 +1123,16 @@ default-package-overrides:
   - hpc-lcov ==1.0.1
   - hprotoc ==2.4.17
   - hruby ==0.3.8
-  - hsass ==0.8.0
   - 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
   - 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
@@ -1154,14 +1159,13 @@ default-package-overrides:
   - hspec-hedgehog ==0.0.1.2
   - hspec-leancheck ==0.0.4
   - hspec-megaparsec ==2.2.0
-  - hspec-meta ==2.6.0
+  - hspec-meta ==2.7.8
   - hspec-need-env ==0.1.0.5
   - hspec-parsec ==0
   - hspec-smallcheck ==0.5.2
   - 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
@@ -1169,12 +1173,12 @@ default-package-overrides:
   - HsYAML-aeson ==0.2.0.0
   - hsyslog ==5.0.2
   - htaglib ==1.2.0
+  - HTF ==0.14.0.5
   - html ==1.0.1.2
   - html-conduit ==1.3.2.1
   - 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
@@ -1186,13 +1190,14 @@ 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
@@ -1205,7 +1210,6 @@ 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
@@ -1218,7 +1222,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 ==4.0.1
+  - hw-kafka-client ==4.0.2
   - hw-mquery ==0.2.1.0
   - hw-packed-vector ==0.2.1.0
   - hw-parser ==0.1.1.0
@@ -1230,6 +1234,7 @@ 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
@@ -1313,26 +1318,26 @@ default-package-overrides:
   - iso3166-country-codes ==0.20140203.8
   - iso639 ==0.1.0.3
   - iso8601-time ==0.1.5
-  - iterable ==3.0
   - it-has ==0.2.0.0
+  - iterable ==3.0
+  - ix-shapable ==0.1.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
   - jose ==0.8.4
-  - jose-jwt ==0.8.0
+  - jose-jwt ==0.9.0
   - js-chart ==2.9.4.1
   - js-dgtable ==0.5.2
   - 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
@@ -1406,14 +1411,14 @@ default-package-overrides:
   - libgit ==0.3.1
   - libgraph ==1.14
   - libjwt-typed ==0.2
-  - libmpd ==0.9.3.0
+  - libmpd ==0.10.0.0
   - liboath-hs ==0.0.1.2
   - 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
@@ -1422,11 +1427,11 @@ default-package-overrides:
   - linux-namespaces ==0.1.3.0
   - liquid-fixpoint ==0.8.10.2
   - List ==0.6.2
-  - ListLike ==4.7.4
   - 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.4
+  - listsafe ==0.1.0.1
   - ListTree ==0.2.3
   - little-logger ==0.3.1
   - little-rio ==0.2.2
@@ -1459,22 +1464,22 @@ default-package-overrides:
   - machines ==0.7.1
   - magic ==1.1
   - magico ==0.0.2.1
-  - mainland-pretty ==0.7.0.1
   - main-tester ==0.2.0.1
+  - mainland-pretty ==0.7.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.1
   - markov-chain ==0.0.3.4
-  - massiv ==0.5.9.0
-  - massiv-io ==0.4.0.0
+  - massiv ==0.6.0.0
+  - massiv-io ==0.4.1.0
   - massiv-persist ==0.1.0.0
   - massiv-serialise ==0.1.0.0
-  - massiv-test ==0.1.6
-  - mathexpr ==0.3.0.0
+  - massiv-test ==0.1.6.1
   - 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
@@ -1486,9 +1491,9 @@ default-package-overrides:
   - mbox-utility ==0.0.3.1
   - mcmc ==0.4.0.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
@@ -1517,16 +1522,16 @@ 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
-  - mixed-types-num ==0.4.0.2
+  - mixed-types-num ==0.4.1
   - mltool ==0.2.0.1
   - mmap ==0.5.9
   - mmark ==0.0.7.2
@@ -1534,8 +1539,8 @@ default-package-overrides:
   - mmark-ext ==0.2.1.2
   - mmorph ==1.1.3
   - mnist-idx ==0.1.2.8
-  - mockery ==0.3.5
   - mock-time ==0.1.0
+  - mockery ==0.3.5
   - mod ==0.1.2.1
   - model ==0.5
   - modern-uri ==0.3.3.0
@@ -1545,9 +1550,7 @@ 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
-  - monadlist ==0.0.2
   - monad-logger ==0.3.36
   - monad-logger-json ==0.1.0.0
   - monad-logger-logstash ==0.1.0.0
@@ -1556,26 +1559,28 @@ default-package-overrides:
   - monad-memo ==0.5.3
   - monad-metrics ==0.2.2.0
   - monad-par ==0.3.5
-  - monad-parallel ==0.7.2.3
   - monad-par-extras ==0.3.3
+  - monad-parallel ==0.7.2.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
@@ -1588,14 +1593,14 @@ default-package-overrides:
   - mpi-hs-cereal ==0.1.0.0
   - mtl-compat ==0.2.2
   - mtl-prelude ==2.0.3.1
-  - multiarg ==0.30.0.10
   - multi-containers ==0.1.1
+  - multiarg ==0.30.0.10
   - multimap ==1.2.1
   - multipart ==0.2.1
   - multiset ==0.3.4.3
   - multistate ==0.8.0.3
-  - murmur3 ==1.0.4
   - murmur-hash ==0.1.0.9
+  - murmur3 ==1.0.4
   - MusicBrainz ==0.4.1
   - mustache ==2.3.1
   - mutable-containers ==0.3.4
@@ -1643,16 +1648,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
-  - nonemptymap ==0.0.6.0
-  - non-empty-sequence ==0.2.0.4
   - nonempty-vector ==0.2.1.0
-  - non-negative ==0.1.2
+  - nonemptymap ==0.0.6.0
   - 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.3
@@ -1668,9 +1673,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.1
   - oauthenticated ==0.2.1.0
   - ObjectName ==1.1.0.1
-  - o-clock ==1.2.0.1
   - odbc ==0.2.2
   - oeis2 ==1.0.4
   - ofx ==0.4.4.0
@@ -1683,9 +1688,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.1.0
-  - open-browser ==0.2.1.0
   - openexr-write ==0.1.0.2
   - OpenGL ==3.0.3.0
   - OpenGLRaw ==3.3.4.0
@@ -1749,10 +1754,10 @@ default-package-overrides:
   - pattern-arrows ==0.0.2
   - pava ==0.1.1.0
   - pcg-random ==0.1.3.7
-  - pcre2 ==1.1.4
   - pcre-heavy ==1.0.0.2
   - pcre-light ==0.4.1.0
   - pcre-utils ==0.1.8.1.1
+  - pcre2 ==1.1.4
   - pdfinfo ==1.5.4
   - peano ==0.1.0.1
   - pem ==0.2.4
@@ -1774,8 +1779,8 @@ default-package-overrides:
   - persistent-test ==2.0.3.5
   - persistent-typed-db ==0.1.0.2
   - pg-harness-client ==0.6.0
-  - pgp-wordlist ==0.1.0.3
   - pg-transact ==0.3.1.1
+  - pgp-wordlist ==0.1.0.3
   - phantom-state ==0.2.1.2
   - pid1 ==0.1.2.0
   - pinboard ==0.10.2.0
@@ -1814,6 +1819,7 @@ 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.3
   - postgresql-libpq ==0.9.4.3
@@ -1822,28 +1828,27 @@ default-package-overrides:
   - postgresql-simple ==0.6.4
   - 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 ==4.0.0.0
+  - pretty-sop ==0.2.0.3
+  - pretty-terminal ==0.1.0.0
+  - prettyclass ==1.0.0.0
   - prettyprinter ==1.7.0
   - prettyprinter-ansi-terminal ==1.1.2
   - prettyprinter-compat-annotated-wl-pprint ==1.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 ==4.0.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
@@ -1857,14 +1862,20 @@ default-package-overrides:
   - product-profunctors ==0.11.0.1
   - profiterole ==0.1
   - profunctors ==5.5.2
-  - projectroot ==0.2.0.1
   - project-template ==0.2.1.0
+  - projectroot ==0.2.0.1
   - 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-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
@@ -1872,12 +1883,6 @@ 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-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
@@ -1886,7 +1891,7 @@ default-package-overrides:
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.14.0.0
   - pushbullet-types ==0.4.1.0
-  - pusher-http-haskell ==2.0.0.2
+  - pusher-http-haskell ==2.0.0.3
   - pvar ==1.0.0.0
   - PyF ==0.9.0.2
   - qchas ==1.1.0.1
@@ -1924,37 +1929,38 @@ default-package-overrides:
   - random-source ==0.3.0.8
   - random-tree ==0.6.0.5
   - range ==0.3.0.2
-  - Ranged-sets ==0.4.0
   - range-set-list ==0.1.3.1
+  - Ranged-sets ==0.4.0
   - rank1dynamic ==0.4.1
   - rank2classes ==1.4.1
   - Rasterific ==0.7.5.3
   - rasterific-svg ==0.3.3.2
-  - ratel ==1.0.12
   - rate-limit ==1.4.2
+  - ratel ==1.0.12
   - 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.3.2
   - reanimate-svg ==0.13.0.0
   - rebase ==1.6.1
   - record-dot-preprocessor ==0.2.7
   - record-hasfield ==1.0
-  - records-sop ==0.1.0.3
   - record-wrangler ==0.1.1.0
+  - records-sop ==0.1.0.3
   - recursion-schemes ==5.2.1
   - reducers ==3.12.3
-  - refact ==0.3.0.2
   - ref-fd ==0.4.0.2
+  - ref-tf ==0.4.0.2
+  - refact ==0.3.0.2
   - refined ==0.6.1
   - reflection ==2.1.6
   - reform ==0.2.7.4
@@ -1962,7 +1968,6 @@ 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
@@ -1987,7 +1992,7 @@ default-package-overrides:
   - replace-attoparsec ==1.4.4.0
   - replace-megaparsec ==1.4.4.0
   - repline ==0.4.0.0
-  - req ==3.8.0
+  - req ==3.9.0
   - req-conduit ==1.0.0
   - rerebase ==1.6.1
   - resistor-cube ==0.0.1.2
@@ -2004,7 +2009,7 @@ default-package-overrides:
   - rhine ==0.7.0
   - rhine-gloss ==0.7.0
   - rigel-viz ==0.2.0.0
-  - rio ==0.1.19.0
+  - rio ==0.1.20.0
   - rio-orphans ==0.1.1.0
   - rio-prettyprint ==0.1.1.0
   - roc-id ==0.1.0.0
@@ -2020,15 +2025,15 @@ default-package-overrides:
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.6
   - safe ==0.3.19
-  - safecopy ==0.10.3.1
   - 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.1
   - safe-money ==0.9
-  - SafeSemaphore ==0.10.1
   - safe-tensor ==0.2.1.0
+  - safecopy ==0.10.3.1
+  - safeio ==0.0.5.0
+  - SafeSemaphore ==0.10.1
   - salak ==0.3.6
   - salak-yaml ==0.3.5.3
   - saltine ==0.1.1.1
@@ -2066,14 +2071,14 @@ default-package-overrides:
   - semigroupoid-extras ==5
   - semigroupoids ==5.3.5
   - semigroups ==0.19.1
-  - semirings ==0.6
   - semiring-simple ==1.0.0.1
+  - semirings ==0.6
   - semver ==0.4.0.1
   - sendfile ==0.7.11.1
   - seqalign ==0.2.0.4
   - seqid ==0.6.2
   - seqid-streams ==0.7.2
-  - sequence-formats ==1.5.1.4
+  - sequence-formats ==1.5.2
   - sequenceTools ==1.4.0.5
   - serf ==0.1.1.0
   - serialise ==0.2.3.0
@@ -2113,11 +2118,12 @@ 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
+  - shortcut-links ==0.5.1.1
   - should-not-typecheck ==2.1.0
   - show-combinators ==0.2.0.0
   - siggy-chardust ==1.0.0
@@ -2185,16 +2191,16 @@ default-package-overrides:
   - splitmix ==0.1.0.3
   - 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.6.0.0
   - srcloc ==0.5.1.2
   - stache ==2.2.0
-  - stackcollapse-ghc ==0.0.1.3
   - stack-templatizer ==0.1.0.2
+  - stackcollapse-ghc ==0.0.1.3
   - stateref ==0.3
   - StateVar ==1.2.1
   - static-text ==0.2.0.6
@@ -2209,8 +2215,8 @@ default-package-overrides:
   - stm-extras ==0.1.0.3
   - stm-hamt ==1.2.0.4
   - stm-lifted ==2.5.0.0
-  - STMonadTrans ==0.4.5
   - stm-split ==0.0.2.1
+  - STMonadTrans ==0.4.5
   - stopwatch ==0.1.0.6
   - storable-complex ==0.2.3.0
   - storable-endian ==0.2.6
@@ -2231,7 +2237,6 @@ 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
@@ -2239,8 +2244,9 @@ default-package-overrides:
   - string-interpolate ==0.3.0.2
   - string-qq ==0.0.4
   - string-random ==0.1.4.0
-  - stringsearch ==0.3.6.6
   - string-transform ==1.1.1
+  - stringbuilder ==0.5.1
+  - stringsearch ==0.3.6.6
   - stripe-concepts ==1.0.2.4
   - stripe-core ==2.6.2
   - stripe-haskell ==2.6.2
@@ -2259,16 +2265,16 @@ default-package-overrides:
   - swagger2 ==2.6
   - sweet-egison ==0.1.1.3
   - swish ==0.10.0.4
-  - syb ==0.7.1
+  - syb ==0.7.2.1
   - symbol ==0.2.4
   - symengine ==0.1.2.0
   - 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
   - taffybar ==3.2.3
   - tagchup ==0.4.1.1
@@ -2290,7 +2296,7 @@ default-package-overrides:
   - tasty-expected-failure ==0.12.2
   - tasty-focus ==1.0.1
   - tasty-golden ==2.3.3.2
-  - tasty-hedgehog ==1.0.0.2
+  - tasty-hedgehog ==1.0.1.0
   - tasty-hspec ==1.1.6
   - tasty-hunit ==0.10.0.3
   - tasty-hunit-compat ==0.2.0.1
@@ -2300,6 +2306,7 @@ default-package-overrides:
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.10.1.2
   - tasty-rerun ==1.1.18
+  - tasty-silver ==3.1.15
   - tasty-smallcheck ==0.8.2
   - tasty-test-reporter ==0.1.1.4
   - tasty-th ==0.1.7
@@ -2313,7 +2320,7 @@ default-package-overrides:
   - temporary-rc ==1.2.0.3
   - temporary-resourcet ==0.1.0.1
   - tensorflow-test ==0.1.0.0
-  - tensors ==0.1.4
+  - tensors ==0.1.5
   - termbox ==0.3.0
   - terminal-progress-bar ==0.4.1
   - terminal-size ==0.3.2.1
@@ -2333,7 +2340,6 @@ 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
@@ -2344,8 +2350,9 @@ default-package-overrides:
   - text-show ==3.9
   - text-show-instances ==3.8.4
   - text-zipper ==0.11
-  - tfp ==1.0.1.1
+  - textlocal ==0.1.0.5
   - tf-random ==0.5
+  - tfp ==1.0.1.1
   - th-abstraction ==0.4.2.0
   - th-bang-compat ==0.0.1.0
   - th-compat ==0.1
@@ -2353,10 +2360,6 @@ 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
@@ -2364,33 +2367,37 @@ default-package-overrides:
   - th-nowq ==0.1.0.5
   - th-orphans ==0.13.11
   - th-printf ==0.7
-  - thread-hierarchy ==0.3.0.2
-  - thread-local-storage ==0.2
-  - 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
+  - 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
+  - threepenny-gui ==0.9.0.0
+  - throttle-io-stream ==0.2.0.1
+  - through-text ==0.1.0.0
+  - throwable-exceptions ==0.1.0.9
   - thyme ==0.3.5.5
   - tidal ==1.6.1
   - tile ==0.3.0.0
   - time-compat ==1.9.5
-  - 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
-  - timerep ==2.0.1.0
-  - timer-wheel ==0.3.0
   - time-units ==1.0.0
+  - timeit ==2.0
+  - timelens ==0.2.0.2
+  - timer-wheel ==0.3.0
+  - timerep ==2.0.1.0
   - timezone-olson ==0.2.0
   - timezone-series ==0.1.9
   - tinylog ==0.15.0
@@ -2425,13 +2432,10 @@ 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
@@ -2445,8 +2449,12 @@ default-package-overrides:
   - type-of-html ==1.6.1.2
   - type-of-html-static ==0.1.0.2
   - type-operators ==0.2.0.0
-  - typerep-map ==0.3.3.0
   - type-spec ==0.4.0.0
+  - typecheck-plugin-nat-simple ==0.1.0.2
+  - TypeCompose ==0.9.14
+  - typed-process ==0.2.6.0
+  - typed-uuid ==0.0.0.2
+  - typerep-map ==0.3.3.0
   - tzdata ==0.2.20201021.0
   - ua-parser ==0.7.5.1
   - uglymemo ==0.1.0.1
@@ -2479,11 +2487,11 @@ default-package-overrides:
   - universe-instances-trans ==1.1
   - universe-reverse-instances ==1.1.1
   - universe-some ==1.2.1
-  - universum ==1.5.0
+  - universum ==1.7.2
   - unix-bytestring ==0.3.7.3
-  - unix-compat ==0.5.2
+  - unix-compat ==0.5.3
   - unix-time ==0.4.7
-  - unliftio ==0.2.13.1
+  - unliftio ==0.2.14
   - unliftio-core ==0.2.0.1
   - unliftio-pool ==0.2.1.1
   - unlit ==0.4.0.0
@@ -2533,7 +2541,7 @@ default-package-overrides:
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.7
   - verbosity ==0.4.0.0
-  - versions ==4.0.1
+  - versions ==4.0.2
   - vformat ==0.14.1.0
   - vformat-aeson ==0.1.0.1
   - vformat-time ==0.1.0.0
@@ -2585,18 +2593,18 @@ default-package-overrides:
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
   - witch ==0.0.0.4
-  - witherable-class ==0
-  - within ==0.2.0.1
   - with-location ==0.1.0
   - with-utf8 ==1.0.2.1
+  - witherable-class ==0
+  - within ==0.2.0.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
-  - word24 ==2.0.1
-  - word8 ==0.1.3
   - word-trie ==0.3.0
   - word-wrap ==0.4.1
+  - word24 ==2.0.1
+  - word8 ==0.1.3
   - world-peace ==1.0.2.0
   - wrap ==0.0.0
   - wreq ==0.5.3.2
@@ -2623,7 +2631,6 @@ 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-html-qq ==0.1.0.1
@@ -2633,13 +2640,15 @@ 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
+  - xmonad-extras ==0.15.3
   - xss-sanitize ==0.3.6
   - 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
@@ -2657,7 +2666,6 @@ default-package-overrides:
   - yesod-static ==1.6.1.0
   - yesod-test ==1.6.12
   - 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
@@ -2672,9 +2680,9 @@ default-package-overrides:
   - zio ==0.1.0.2
   - zip ==1.7.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 22e3d5e9dbb57de6ef54857071a1dcee46577c2b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Jan 2021 20:59:07 +0100
Subject: [PATCH 18/31] hackage2nix: update list of broken builds to fix
 evaluation on Hydra

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5481f21ac8e..fa18d7507db 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3297,6 +3297,7 @@ broken-packages:
   - atomic-primops-foreign
   - atomic-primops-vector
   - atomo
+  - atp
   - atp-haskell
   - ats-pkg
   - ats-setup
@@ -4958,6 +4959,7 @@ broken-packages:
   - envstatus
   - epanet-haskell
   - epass
+  - ephemeral
   - epi-sim
   - epic
   - epoll

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

This update was generated by hackage2nix v2.16.0-10-gabc66d1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/f8773aba1736a7929a7262fdd6217be67f679c98.
---
 .../haskell-modules/hackage-packages.nix      | 1302 ++++++++++-------
 1 file changed, 742 insertions(+), 560 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1c760b056e0..cfd4a5eac64 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3115,24 +3115,6 @@ self: {
      }) {};
 
   "ChasingBottoms" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
-     , syb
-     }:
-     mkDerivation {
-       pname = "ChasingBottoms";
-       version = "1.3.1.9";
-       sha256 = "1acsmvdwsgry0i0qhmz0img71gq97wikmn9zgbqppl4n8a1d7bvh";
-       libraryHaskellDepends = [
-         base containers mtl QuickCheck random syb
-       ];
-       testHaskellDepends = [
-         array base containers mtl QuickCheck random syb
-       ];
-       description = "For testing partial and infinite values";
-       license = lib.licenses.mit;
-     }) {};
-
-  "ChasingBottoms_1_3_1_10" = callPackage
     ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
      , syb
      }:
@@ -3148,7 +3130,6 @@ self: {
        ];
        description = "For testing partial and infinite values";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "CheatSheet" = callPackage
@@ -9382,8 +9363,8 @@ self: {
      }:
      mkDerivation {
        pname = "HTF";
-       version = "0.14.0.3";
-       sha256 = "138gh5a2nx25czhp9qpaav2lq7ff142q4n6sbkrglfsyn48rifqp";
+       version = "0.14.0.5";
+       sha256 = "1hgkymgb8v3f5s7i8nn01iml8mqvah4iyqiqcflj3ffbjb93v1zd";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal process ];
@@ -11956,6 +11937,17 @@ self: {
        broken = true;
      }) {};
 
+  "Kawaii-Parser" = callPackage
+    ({ mkDerivation, base, containers, mtl }:
+     mkDerivation {
+       pname = "Kawaii-Parser";
+       version = "0.0.0";
+       sha256 = "163rh1vciljl35wc5wrcr1ky2vb536pv6hhnl3r97mfjc9c9k2wm";
+       libraryHaskellDepends = [ base containers mtl ];
+       description = "A simple parsing library";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "KdTree" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -12891,7 +12883,7 @@ self: {
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) openmpi;};
+     }) {openmpi = null;};
 
   "LogicGrowsOnTrees-network" = callPackage
     ({ mkDerivation, base, cereal, cmdtheline, composition, containers
@@ -18383,8 +18375,8 @@ self: {
      }:
      mkDerivation {
        pname = "Shpadoinkle-backend-snabbdom";
-       version = "0.3.0.0";
-       sha256 = "0ff87nxa7ff3j400k5a65in8jj00m6bk46pmana0a8k1d7ln7fsk";
+       version = "0.3.0.1";
+       sha256 = "0452znn1q558n1dy52j493y7f9lml57cnqbmdmqv28zq12sxpypm";
        libraryHaskellDepends = [
          base exceptions file-embed ghcjs-dom jsaddle monad-control mtl
          Shpadoinkle text transformers-base unliftio
@@ -21932,20 +21924,20 @@ self: {
      }) {inherit (pkgs) readline;};
 
   "Z-Data" = callPackage
-    ({ mkDerivation, base, Cabal, case-insensitive, containers, deepseq
-     , ghc-prim, hashable, hspec, hspec-discover, HUnit, integer-gmp
-     , primitive, QuickCheck, quickcheck-instances, scientific, tagged
-     , template-haskell, time, unordered-containers
+    ({ mkDerivation, base, bytestring, Cabal, case-insensitive
+     , containers, deepseq, ghc-prim, hashable, hspec, hspec-discover
+     , HUnit, integer-gmp, primitive, QuickCheck, quickcheck-instances
+     , scientific, tagged, template-haskell, time, unordered-containers
      }:
      mkDerivation {
        pname = "Z-Data";
-       version = "0.4.0.0";
-       sha256 = "0vgphl16hq35cs12rvx663bxn88h4hx25digwy6h0yrc0j2yj9ls";
+       version = "0.5.0.0";
+       sha256 = "07yx0mh1h0p5qsw0sn20mcz542h5dh3p6l3nbzqrjvdpp22s27h0";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
-         base case-insensitive containers deepseq ghc-prim hashable
-         integer-gmp primitive QuickCheck scientific tagged template-haskell
-         time unordered-containers
+         base bytestring case-insensitive containers deepseq ghc-prim
+         hashable integer-gmp primitive QuickCheck scientific tagged
+         template-haskell time unordered-containers
        ];
        testHaskellDepends = [
          base containers hashable hspec HUnit integer-gmp primitive
@@ -33283,8 +33275,8 @@ self: {
      }:
      mkDerivation {
        pname = "ascii";
-       version = "1.0.0.2";
-       sha256 = "13v1zpll4x72ib5pwrs01kkhw5yc5xq8aazwm9zfni9452sw3r3w";
+       version = "1.0.1.0";
+       sha256 = "0px41v49i3czchlv09dnbivlrk1zci4b2mg0xkrp6nwyzb9z4xyr";
        libraryHaskellDepends = [
          ascii-case ascii-char ascii-group ascii-predicates ascii-superset
          ascii-th base bytestring data-ascii text
@@ -33323,8 +33315,8 @@ self: {
     ({ mkDerivation, base, hashable }:
      mkDerivation {
        pname = "ascii-char";
-       version = "1.0.0.2";
-       sha256 = "0pglcppji9irbz0fjc6hb1fv7qjbjcii6k4qdv389l7kbb77w318";
+       version = "1.0.0.6";
+       sha256 = "049xccazgjb1zzqbzpgcw77hsl5j3j8l7f0268wxjy87il3wfnx3";
        libraryHaskellDepends = [ base hashable ];
        description = "A Char type representing an ASCII character";
        license = lib.licenses.asl20;
@@ -33442,8 +33434,8 @@ self: {
     ({ mkDerivation, ascii-char, base, bytestring, hashable, text }:
      mkDerivation {
        pname = "ascii-superset";
-       version = "1.0.0.2";
-       sha256 = "1wanvb18h1jlf33f6zr7l1swvagdhw5w3554fsvjq1dm37nygd5m";
+       version = "1.0.1.0";
+       sha256 = "1d4yfcy8yr6zimpv8mq8lsf8sd85rg4m8x7l81lr6wan2wx54gh6";
        libraryHaskellDepends = [
          ascii-char base bytestring hashable text
        ];
@@ -34654,6 +34646,26 @@ self: {
        broken = true;
      }) {};
 
+  "atp" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, containers, generic-random
+     , mtl, process, QuickCheck, text, tptp
+     }:
+     mkDerivation {
+       pname = "atp";
+       version = "0.1.0.0";
+       sha256 = "0n71mch62mkqn4ibq6n0k26fxk0rl63j7rzj4wpc038awjgxcfr8";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base containers mtl process text tptp
+       ];
+       testHaskellDepends = [
+         base containers generic-random mtl QuickCheck text
+       ];
+       description = "Interface to automated theorem provers";
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "atp-haskell" = callPackage
     ({ mkDerivation, applicative-extras, base, containers, extra, HUnit
      , mtl, parsec, pretty, template-haskell, time
@@ -35726,8 +35738,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
-       revision = "38";
-       editedCabalFile = "0jbvk8azs2x63cfxbppa67qg27zirgash448g7vmf07jqb8405cb";
+       revision = "39";
+       editedCabalFile = "1y77mk83yap8yx5wlybpr06wwy3qvmq0svqc4c6dfyvjd9wjvsdv";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -36473,6 +36485,19 @@ self: {
        broken = true;
      }) {};
 
+  "aws-larpi" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, modern-uri, req, text }:
+     mkDerivation {
+       pname = "aws-larpi";
+       version = "0.1.0.0";
+       sha256 = "04z5wcvkcvq961zc9pg79k6340vgm6rdws6lfjysl5jrwr5sfxg9";
+       libraryHaskellDepends = [
+         aeson base bytestring modern-uri req text
+       ];
+       description = "Package Haskell functions for easy use on AWS Lambda";
+       license = lib.licenses.mit;
+     }) {};
+
   "aws-mfa-credentials" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, amazonka-sts, base
      , exceptions, filelock, filepath, freer-effects, ini, lens
@@ -38107,10 +38132,8 @@ self: {
      }:
      mkDerivation {
        pname = "base64";
-       version = "0.4.2.2";
-       sha256 = "05ins0i1561d4gfz6h7fxx8pj8i1qkskz8dgh8pfxa1llzmr856i";
-       revision = "1";
-       editedCabalFile = "1rlvmg18f2d2rdyzvvzk0is4073j5arx9qirgvshjx67kic2lzqm";
+       version = "0.4.2.3";
+       sha256 = "1hdqswxhgjrg8akl5v99hbm02gkpagsbx4i7fxbzdys1k0bj3gxw";
        libraryHaskellDepends = [
          base bytestring deepseq ghc-byteorder text text-short
        ];
@@ -38122,7 +38145,7 @@ self: {
          base base64-bytestring bytestring criterion deepseq
          random-bytestring text
        ];
-       description = "Fast RFC 4648-compliant Base64 encoding";
+       description = "A modern RFC 4648-compliant Base64 library";
        license = lib.licenses.bsd3;
      }) {};
 
@@ -39906,28 +39929,6 @@ self: {
      }) {};
 
   "bifunctors" = callPackage
-    ({ mkDerivation, base, base-orphans, comonad, containers, hspec
-     , hspec-discover, QuickCheck, tagged, template-haskell
-     , th-abstraction, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "bifunctors";
-       version = "5.5.9";
-       sha256 = "0c0zm9n085a6zna91yq9c14xwpwi72wn9xlsgzpza9r9bmy5jv05";
-       libraryHaskellDepends = [
-         base base-orphans comonad containers tagged template-haskell
-         th-abstraction transformers
-       ];
-       testHaskellDepends = [
-         base hspec QuickCheck template-haskell transformers
-         transformers-compat
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Bifunctors";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "bifunctors_5_5_10" = callPackage
     ({ mkDerivation, base, base-orphans, comonad, containers, hspec
      , hspec-discover, QuickCheck, tagged, template-haskell
      , th-abstraction, transformers, transformers-compat
@@ -39947,7 +39948,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bifunctors";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bighugethesaurus" = callPackage
@@ -45110,7 +45110,7 @@ self: {
      }) {};
 
   "box" = callPackage
-    ({ mkDerivation, attoparsec, base, comonad, concurrency
+    ({ mkDerivation, attoparsec, base, comonad, concurrency, containers
      , contravariant, dejafu, doctest, exceptions, generic-lens, lens
      , mmorph, mtl, numhask, numhask-space, optparse-generic
      , profunctors, random, text, time, transformers, transformers-base
@@ -45118,18 +45118,18 @@ self: {
      }:
      mkDerivation {
        pname = "box";
-       version = "0.6.2";
-       sha256 = "1mwmz97s8mvan8fn8ps0gnzsidar1ygjfkgrcjglfklh5bmm8823";
+       version = "0.6.3";
+       sha256 = "1qdl8n9icp8v8hpk4jd3gsg8wrr469q4y6h6p1h6n6f899rwpv5c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base comonad concurrency contravariant exceptions lens
-         mmorph numhask numhask-space profunctors text time transformers
-         transformers-base
+         attoparsec base comonad concurrency containers contravariant
+         exceptions lens mmorph numhask numhask-space profunctors text time
+         transformers transformers-base
        ];
        executableHaskellDepends = [
-         base concurrency dejafu exceptions generic-lens lens mtl numhask
-         optparse-generic random text transformers websockets
+         base concurrency containers dejafu exceptions generic-lens lens mtl
+         numhask optparse-generic random text transformers websockets
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "boxes";
@@ -45404,8 +45404,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.58.1";
-       sha256 = "0qsmj4469avxmbh7210msjwvz7fa98axxvf7198x0hb2y7vdpcz5";
+       version = "0.59";
+       sha256 = "1nkx7b6688ba0h8kw8xzqamj9zpdjyrdpmg8h18v3l03hw5jcszf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47183,8 +47183,8 @@ self: {
      }:
      mkDerivation {
        pname = "byteslice";
-       version = "0.2.4.0";
-       sha256 = "0f2dw5kf9gg41ns5hb0aarrv24yqv9cdzgl9hgdcf8jj5j3qj6di";
+       version = "0.2.5.0";
+       sha256 = "0sl5jbfni6sx6srlfdpj0cb0pjw38cf3fyxsnaldbap2wfd3ncyr";
        libraryHaskellDepends = [
          base bytestring primitive primitive-addr primitive-unlifted run-st
          tuples vector
@@ -48054,8 +48054,8 @@ self: {
      }:
      mkDerivation {
        pname = "cab";
-       version = "0.2.18";
-       sha256 = "0ic1ivxiv217ls4g38q5dwrb8sbsrzvdm6c0idv9ancpjmm8k8jl";
+       version = "0.2.19";
+       sha256 = "0rn8b8fydrm8ad0va0pg016y5ph3dc0xashg0rqfjhzv8kwzlkzk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53563,8 +53563,8 @@ self: {
      }:
      mkDerivation {
        pname = "cherry-core-alpha";
-       version = "0.4.0.0";
-       sha256 = "1rrmglzxvfq67ymgy7jifx8rgk33qq82vrcsbaqwcsjc95c3kfdx";
+       version = "0.5.0.0";
+       sha256 = "018ad2angm8n6dfw0sz3bamg38vzgv7j97vfpiidd575mf89imkn";
        libraryHaskellDepends = [
          aeson async base base64-bytestring binary bytestring
          case-insensitive containers directory ghc-prim http-client
@@ -54705,8 +54705,8 @@ self: {
      }:
      mkDerivation {
        pname = "citeproc";
-       version = "0.3.0.4";
-       sha256 = "13rx1919hnk26jpnqcdfqmd8hkvhg8504aq7abiyxy0diy28mvz7";
+       version = "0.3.0.5";
+       sha256 = "18ybi21fmw9rkd4m74dgy1cf3i9l79bpalm79427kass8mv4wpia";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63791,8 +63791,8 @@ self: {
      }:
      mkDerivation {
        pname = "cornea";
-       version = "0.3.0.1";
-       sha256 = "0kdj6ii6k8x9i87vgfl2cjlwkj4vls09w781xab6ix7h264asi71";
+       version = "0.3.1.2";
+       sha256 = "04iika5r5w3347w87b8whwrxym5nzvgl5pr76fpxw78fwvi1nvzk";
        libraryHaskellDepends = [
          base-noprelude either lens lifted-base monad-control mtl relude
          template-haskell th-abstraction transformers
@@ -65975,14 +65975,13 @@ self: {
 
   "cryptohash-sha256" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, criterion
-     , SHA, tasty, tasty-hunit, tasty-quickcheck
+     , cryptohash-sha256-pure, SHA, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptohash-sha256";
-       version = "0.11.101.0";
-       sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj";
-       revision = "4";
-       editedCabalFile = "00p6sx2n1pzykm3my68hjfk8l66g66rh7inrfcnkd5mhilqdcqxr";
+       version = "0.11.102.0";
+       sha256 = "0685s4hfighzywvvn05cfff5bl2xz3wq0pfncv6zca4iba3ykmla";
+       configureFlags = [ "-fuse-cbits" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -65990,10 +65989,14 @@ self: {
          base base16-bytestring bytestring SHA tasty tasty-hunit
          tasty-quickcheck
        ];
-       benchmarkHaskellDepends = [ base bytestring criterion ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion cryptohash-sha256-pure SHA
+       ];
        description = "Fast, pure and practical SHA-256 implementation";
        license = lib.licenses.bsd3;
-     }) {};
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {cryptohash-sha256-pure = null;};
 
   "cryptohash-sha512" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, criterion
@@ -66130,6 +66133,29 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "cryptonite_0_28" = callPackage
+    ({ mkDerivation, base, basement, bytestring, deepseq, gauge
+     , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
+     , tasty-kat, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "cryptonite";
+       version = "0.28";
+       sha256 = "1nx568qv25dxhbii7lzf1hbv0dyz95z715mmxjnnrkgpwdm8ibbl";
+       libraryHaskellDepends = [
+         base basement bytestring deepseq ghc-prim integer-gmp memory
+       ];
+       testHaskellDepends = [
+         base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring deepseq gauge memory random
+       ];
+       description = "Cryptography Primitives sink";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "cryptonite-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty
@@ -70654,6 +70680,34 @@ self: {
        license = lib.licenses.asl20;
      }) {};
 
+  "dbus_1_2_18" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, conduit, containers
+     , criterion, deepseq, directory, exceptions, extra, filepath, lens
+     , network, parsec, process, QuickCheck, random, resourcet, split
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+     , th-lift, transformers, unix, vector, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "dbus";
+       version = "1.2.18";
+       sha256 = "15ggmggzgzf0xmj80rj14dyk83vra6yzm5pm92psnc4spn213p73";
+       libraryHaskellDepends = [
+         base bytestring cereal conduit containers deepseq exceptions
+         filepath lens network parsec random split template-haskell text
+         th-lift transformers unix vector xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring cereal containers directory extra filepath network
+         parsec process QuickCheck random resourcet tasty tasty-hunit
+         tasty-quickcheck text transformers unix vector
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       doCheck = false;
+       description = "A client library for the D-Bus IPC system";
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "dbus-client" = callPackage
     ({ mkDerivation, base, containers, dbus-core, monads-tf, text
      , transformers
@@ -72212,8 +72266,8 @@ self: {
      }:
      mkDerivation {
        pname = "dep-t";
-       version = "0.1.0.2";
-       sha256 = "0vzf37gmhvpv43xybzn7lms0jgl12ch7mz04a05a1arn3ljh89c9";
+       version = "0.1.3.0";
+       sha256 = "1bzf2czbml949an6gffc7jh898ba2axfh87phnrla0595x7nrx21";
        libraryHaskellDepends = [ base mtl transformers unliftio-core ];
        testHaskellDepends = [
          base mtl rank2classes tasty tasty-hunit template-haskell
@@ -72223,6 +72277,23 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "dep-t-advice" = callPackage
+    ({ mkDerivation, base, dep-t, doctest, mtl, rank2classes, sop-core
+     , tasty, tasty-hunit, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "dep-t-advice";
+       version = "0.3.0.0";
+       sha256 = "00nqf37x877s5arkwv55cki068gpgq64yns4qhp039az2mfr4g9q";
+       libraryHaskellDepends = [ base dep-t sop-core ];
+       testHaskellDepends = [
+         base dep-t doctest mtl rank2classes sop-core tasty tasty-hunit
+         template-haskell transformers
+       ];
+       description = "Giving good advice to functions in a DepT environment";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "dependency" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, containers
      , criterion, deepseq, hspec, microlens
@@ -73284,10 +73355,10 @@ self: {
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.37.1";
-       sha256 = "16qpasw41wcgbi9ljrs43dn2ajw25yipm8kxri6v5fwj3gyzj24d";
+       version = "1.38.0";
+       sha256 = "0ifxi9i7ply640s2cgljjczvmblgz0ryp2p9yxgng3qm5ai58229";
        revision = "1";
-       editedCabalFile = "11sjra0k7sdy0xcbhlxvjjpd4h7ki9dcrndcpaq71qlgdql32w24";
+       editedCabalFile = "067hh41cnmjskf3y3kzlwsisw6v5bh9mbmhg5jfapm1y5xp6gw9r";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -73327,8 +73398,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.35";
-       sha256 = "0v7br83m3zhz4pa98yrzbikkvldgrprjq0z5amimjsk8lcdmpq8k";
+       version = "1.0.36";
+       sha256 = "0hg45xjl1pcla9xbds40qrxcx2h6b4ysw8kbx8hpnaqaazr2jrw0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73370,10 +73441,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-docs";
-       version = "1.0.3";
-       sha256 = "0cinkgcihn15zws18nff42lcpmzv4cg7k8wxmcwa93k7qvw01i2p";
-       revision = "1";
-       editedCabalFile = "1wzwfgv6bpgjq0day372gyxg9vrcmkf5sbzvm0lv4p39z0qcgpna";
+       version = "1.0.4";
+       sha256 = "0x6x5b9kh0in35jsgj2dghyxsqjdjrw7s9kngyjcn7v2ycklcifl";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -73437,10 +73506,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.7.4";
-       sha256 = "1qzlv7wvap1ivgv7fi9ikqa9nm9z9kbbca5zvddh3njcdk6i73n9";
-       revision = "1";
-       editedCabalFile = "0njh1c7c4dcm5ya4w79mf11m5v9gnacyd7lrz7j4ipk4wdgwinvi";
+       version = "1.7.5";
+       sha256 = "1fpkp8xkcw2abcigypyl0ji6910jyshlqwhf48yfwn6dsgbyw6iy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73488,10 +73555,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-lsp-server";
-       version = "1.0.12";
-       sha256 = "0gp9pa3pdm49ya6awdi1qjbycxdihz2z11mzmfnr5m2gf0vrjzpp";
-       revision = "2";
-       editedCabalFile = "0nn30rkmdxacankwvmagfxaha6532ikwpz7w18s27xw4qpkhp6v9";
+       version = "1.0.13";
+       sha256 = "0cj51xdmpp0w7ndzbz4yn882agvhbnsss3myqlhfi4y91lb8f1ak";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73515,10 +73580,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.1.19";
-       sha256 = "0w3vxqn1h39f17mg246ydxni02civ3fm85s0wi4ks6iy1ng4dw0a";
-       revision = "1";
-       editedCabalFile = "0m0xpxc7nm962b0vkw7i88dnwihjza82cybqjzjk24dgp8v48cqs";
+       version = "1.1.20";
+       sha256 = "14d9icvgmrphnbjjwlskh88p7vgphgb0xqd91p217bf2xhl9k2xd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73542,10 +73605,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-nixpkgs";
-       version = "1.0.3";
-       sha256 = "03apykbil3x3j7ndapfgmf39p7l62d1lrn2ad1m6k5xqnd8nqlxf";
-       revision = "1";
-       editedCabalFile = "1wqh5l2rydb2ag1k514p3p8dq19m3mbv6i2cha4xr8ykwcwbwi0j";
+       version = "1.0.4";
+       sha256 = "0yr7z17dvmr1zipk29fmzm46myxxsz514587n6a7h00c56dyvnc3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -73559,6 +73620,24 @@ self: {
        broken = true;
      }) {};
 
+  "dhall-recursive-adt" = callPackage
+    ({ mkDerivation, base, data-fix, dhall, either, hedgehog
+     , neat-interpolation, recursion-schemes, tasty, tasty-hedgehog
+     , tasty-hunit
+     }:
+     mkDerivation {
+       pname = "dhall-recursive-adt";
+       version = "0.1.0.0";
+       sha256 = "01wk6xsakbhsx14s59f0rj32mlccgxgc29a3n5d3b923yd5w64zm";
+       libraryHaskellDepends = [ base data-fix dhall recursion-schemes ];
+       testHaskellDepends = [
+         base dhall either hedgehog neat-interpolation recursion-schemes
+         tasty tasty-hedgehog tasty-hunit
+       ];
+       description = "Convert recursive ADTs from and to Dhall";
+       license = lib.licenses.cc0;
+     }) {};
+
   "dhall-text" = callPackage
     ({ mkDerivation, base, dhall, optparse-applicative, text }:
      mkDerivation {
@@ -73616,10 +73695,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-yaml";
-       version = "1.2.4";
-       sha256 = "0xm1dsim5x83k6kp5g9yv08ixf6l4p2mm666m4vsylx98y5nwmag";
-       revision = "1";
-       editedCabalFile = "1mmsymbj57r49kj520f9hrw9bk80y29p3av68b1hmrcaiixqs87a";
+       version = "1.2.5";
+       sha256 = "0fax4p85344yrzk1l21j042mm02p0idp396vkq71x3dpiniq0mwf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -76987,28 +77064,6 @@ self: {
      }) {};
 
   "dl-fedora" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath
-     , http-directory, http-types, optparse-applicative, regex-posix
-     , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs
-     }:
-     mkDerivation {
-       pname = "dl-fedora";
-       version = "0.7.5";
-       sha256 = "1x4gdnb2k1ywvaniif7j2lsbavadaghvcpbdnms3x13s4cg18lyh";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring directory filepath http-directory http-types
-         optparse-applicative regex-posix simple-cmd simple-cmd-args text
-         time unix xdg-userdirs
-       ];
-       description = "Fedora image download tool";
-       license = lib.licenses.gpl3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "dl-fedora_0_7_6" = callPackage
     ({ mkDerivation, base, bytestring, directory, extra, filepath
      , http-directory, http-types, optparse-applicative, regex-posix
      , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs
@@ -78109,8 +78164,8 @@ self: {
      }:
      mkDerivation {
        pname = "dom-lt";
-       version = "0.2.2";
-       sha256 = "0hf0wf4fl671awf87f0r7r4a57cgm88x666081c0wy16qchahffw";
+       version = "0.2.2.1";
+       sha256 = "1gaavi6fqzsl5di889880m110a1hrlylbjckm6bg24sv8nn96glp";
        libraryHaskellDepends = [ array base containers ];
        testHaskellDepends = [ base containers HUnit ];
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
@@ -78940,8 +78995,8 @@ self: {
      }:
      mkDerivation {
        pname = "drifter";
-       version = "0.2.4";
-       sha256 = "012x67lncwlrf2kjmfki4lz3sclpj1gjf7wyszagwm523grp1qly";
+       version = "0.3.0";
+       sha256 = "079y7yzws7lghgazkc7qprz43q4bv0qjnxh7rmcrrwfs5acm1x34";
        libraryHaskellDepends = [ base containers fgl text ];
        testHaskellDepends = [
          base tasty tasty-hunit tasty-quickcheck text
@@ -82407,8 +82462,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-street";
-       version = "0.1.0.3";
-       sha256 = "106qaw496kry8rcjyz4nwfn4i4pgygjw6zvfnqrld52mdqjbyxbv";
+       version = "0.1.0.4";
+       sha256 = "1dnpzc70qznbm3f678lxzkfbyihcqhlg185db09q64aj20hls5d6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83848,6 +83903,30 @@ self: {
        broken = true;
      }) {};
 
+  "ephemeral" = callPackage
+    ({ mkDerivation, attoparsec, base, box, box-csv, chart-svg
+     , concurrency, doctest, lens, lucid, mealy, microlens, moo
+     , mwc-probability, numhask, numhask-array, numhask-space, primitive
+     , profunctors, random, text, time, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "ephemeral";
+       version = "0.0.1";
+       sha256 = "1xxdifw1mcyfgz4749z136xqxmxbm26v0x0yk8238wm08i80y8fy";
+       libraryHaskellDepends = [
+         attoparsec base box box-csv chart-svg concurrency lens lucid mealy
+         microlens moo mwc-probability numhask numhask-array numhask-space
+         primitive profunctors random text time transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [ base doctest numhask ];
+       description = "See readme.md";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "epi-sim" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, hspec
      , mwc-random, primitive, statistics, trifecta, vector
@@ -84032,8 +84111,8 @@ self: {
      }:
      mkDerivation {
        pname = "equational-reasoning";
-       version = "0.6.0.4";
-       sha256 = "1dv9di6p7pqmxys9c2d3rv36qhafgji0rxf52v0240zvfqhg8wn4";
+       version = "0.7.0.0";
+       sha256 = "0l6gyq43byh6cy2pblb9a4qjy7w5k9maa97c076dxlsf53myj01h";
        libraryHaskellDepends = [
          base containers template-haskell th-desugar void
        ];
@@ -86312,26 +86391,24 @@ self: {
 
   "exh" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , exceptions, hspec, html-conduit, http-client, http-client-tls
-     , http-conduit, lens, megaparsec, monad-control, monad-time, mtl
-     , quickjs-hs, retry, text, time, transformers, transformers-base
-     , xml-conduit, xml-lens
+     , hspec, html-conduit, http-client, http-client-tls, in-other-words
+     , language-javascript, megaparsec, optics-core, optics-th, text
+     , time, transformers, xml-conduit, xml-optics
      }:
      mkDerivation {
        pname = "exh";
-       version = "0.2.0";
-       sha256 = "1pka39mzzbvxl0d60115hwyg2vgpznf1kk7z97p4k2m8kf2b668z";
+       version = "1.0.0";
+       sha256 = "0s5br96spx4v67mvl09w4kpcwvps65zp6qx5qpvrq63a0ncclp7l";
        libraryHaskellDepends = [
-         aeson base bytestring conduit containers exceptions html-conduit
-         http-client http-client-tls http-conduit lens megaparsec
-         monad-control monad-time mtl quickjs-hs retry text time
-         transformers transformers-base xml-conduit xml-lens
+         aeson base bytestring conduit containers html-conduit http-client
+         in-other-words language-javascript megaparsec optics-core optics-th
+         text time transformers xml-conduit xml-optics
        ];
        testHaskellDepends = [
-         aeson base bytestring conduit containers exceptions hspec
-         html-conduit http-client http-client-tls http-conduit lens
-         megaparsec monad-control monad-time mtl quickjs-hs retry text time
-         transformers transformers-base xml-conduit xml-lens
+         aeson base bytestring conduit containers hspec html-conduit
+         http-client http-client-tls in-other-words language-javascript
+         megaparsec optics-core optics-th text time transformers xml-conduit
+         xml-optics
        ];
        description = "A library for crawling exhentai";
        license = lib.licenses.bsd3;
@@ -90771,6 +90848,22 @@ self: {
        license = lib.licenses.gpl3Plus;
      }) {};
 
+  "finite" = callPackage
+    ({ mkDerivation, array, base, Cabal, containers, hashable
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "finite";
+       version = "1.4.1.2";
+       sha256 = "10hnqz4klgrpfbvla07h8yghpv22bsyijf0cibfzwl9j779vb4nc";
+       libraryHaskellDepends = [
+         array base containers hashable QuickCheck template-haskell
+       ];
+       testHaskellDepends = [ base Cabal hashable QuickCheck ];
+       description = "Finite ranges via types";
+       license = lib.licenses.mit;
+     }) {};
+
   "finite-field" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, primes
      , QuickCheck, singletons, tasty, tasty-hunit, tasty-quickcheck
@@ -93148,8 +93241,8 @@ self: {
     ({ mkDerivation, base, foma }:
      mkDerivation {
        pname = "foma";
-       version = "0.1.1.0";
-       sha256 = "1aiy4bizzx5g87lvlx8xy24rxvzh093mlaavxkcr542fq9ki8yb3";
+       version = "0.1.2.0";
+       sha256 = "1g9wy1zn0mi2lgfpprhh8q5sy0cvf5pbk2yrkr2911pn7g00jdc4";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ foma ];
        description = "Simple Haskell bindings for Foma";
@@ -96514,14 +96607,14 @@ self: {
      }:
      mkDerivation {
        pname = "fusion-plugin";
-       version = "0.2.1";
-       sha256 = "08v43q428s6nw3diqaasdr0c9arrzvzvldcybj8wp2r66aw613ic";
+       version = "0.2.2";
+       sha256 = "1d7avmbrqgvp9c4jyrlw344hml29f3vy5m5fgyrsd1z3g4fymakb";
        libraryHaskellDepends = [
          base containers directory filepath fusion-plugin-types ghc syb time
          transformers
        ];
        description = "GHC plugin to make stream fusion more predictable";
-       license = lib.licenses.bsd3;
+       license = lib.licenses.asl20;
      }) {};
 
   "fusion-plugin-types" = callPackage
@@ -96537,31 +96630,31 @@ self: {
 
   "futhark" = callPackage
     ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary
-     , blaze-html, bytestring, cmark-gfm, containers, directory
-     , directory-tree, dlist, file-embed, filepath, free, gitrev, happy
-     , haskeline, language-c-quote, mainland-pretty, megaparsec, mtl
-     , neat-interpolation, parallel, parser-combinators, pcg-random
-     , process, process-extras, QuickCheck, regex-tdfa, sexp-grammar
-     , srcloc, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     , temporary, terminal-size, text, time, transformers
-     , unordered-containers, utf8-string, vector
-     , vector-binary-instances, versions, zip-archive, zlib
+     , blaze-html, bytestring, bytestring-to-vector, cmark-gfm
+     , containers, directory, directory-tree, dlist, file-embed
+     , filepath, free, gitrev, happy, haskeline, language-c-quote
+     , mainland-pretty, megaparsec, mtl, neat-interpolation, parallel
+     , parser-combinators, pcg-random, process, process-extras
+     , QuickCheck, regex-tdfa, sexp-grammar, srcloc, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, temporary, terminal-size
+     , text, time, transformers, unordered-containers, utf8-string
+     , vector, vector-binary-instances, versions, zip-archive, zlib
      }:
      mkDerivation {
        pname = "futhark";
-       version = "0.18.5";
-       sha256 = "1v81b2snf5famnm8fx3kbqcsrqb80kb29yk98lvljiflnq5bkmb4";
+       version = "0.18.6";
+       sha256 = "0bp837b6myis5kvyy0rg3py01fcyyj7qws7kqvci3mjyi9x57k7w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-terminal array base binary blaze-html bytestring
-         cmark-gfm containers directory directory-tree dlist file-embed
-         filepath free gitrev haskeline language-c-quote mainland-pretty
-         megaparsec mtl neat-interpolation parallel pcg-random process
-         process-extras regex-tdfa sexp-grammar srcloc template-haskell
-         temporary terminal-size text time transformers unordered-containers
-         utf8-string vector vector-binary-instances versions zip-archive
-         zlib
+         bytestring-to-vector cmark-gfm containers directory directory-tree
+         dlist file-embed filepath free gitrev haskeline language-c-quote
+         mainland-pretty megaparsec mtl neat-interpolation parallel
+         pcg-random process process-extras regex-tdfa sexp-grammar srcloc
+         template-haskell temporary terminal-size text time transformers
+         unordered-containers utf8-string vector vector-binary-instances
+         versions zip-archive zlib
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base text ];
@@ -98280,6 +98373,25 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "generic-lens_2_1_0_0" = callPackage
+    ({ mkDerivation, base, doctest, generic-lens-core, HUnit
+     , inspection-testing, lens, profunctors, text
+     }:
+     mkDerivation {
+       pname = "generic-lens";
+       version = "2.1.0.0";
+       sha256 = "1qxabrbzgd32i2fv40qw4f44akvfs1impjvcs5pqn409q9zz6kfd";
+       libraryHaskellDepends = [
+         base generic-lens-core profunctors text
+       ];
+       testHaskellDepends = [
+         base doctest HUnit inspection-testing lens profunctors
+       ];
+       description = "Generically derive traversals, lenses and prisms";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "generic-lens-core" = callPackage
     ({ mkDerivation, base, indexed-profunctors, text }:
      mkDerivation {
@@ -98291,6 +98403,18 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "generic-lens-core_2_1_0_0" = callPackage
+    ({ mkDerivation, base, indexed-profunctors, text }:
+     mkDerivation {
+       pname = "generic-lens-core";
+       version = "2.1.0.0";
+       sha256 = "0ja72rn7f7a24bmgqb6rds1ic78jffy2dzrb7sx8gy3ld5mlg135";
+       libraryHaskellDepends = [ base indexed-profunctors text ];
+       description = "Generically derive traversals, lenses and prisms";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "generic-lens-labels" = callPackage
     ({ mkDerivation, base, generic-lens }:
      mkDerivation {
@@ -98394,6 +98518,25 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "generic-optics_2_1_0_0" = callPackage
+    ({ mkDerivation, base, doctest, generic-lens-core, HUnit
+     , inspection-testing, optics-core, text
+     }:
+     mkDerivation {
+       pname = "generic-optics";
+       version = "2.1.0.0";
+       sha256 = "04szdpcaxiaw9n1cry020mcrcirypfq3qxwr7h8h34b2mffvnl25";
+       libraryHaskellDepends = [
+         base generic-lens-core optics-core text
+       ];
+       testHaskellDepends = [
+         base doctest HUnit inspection-testing optics-core
+       ];
+       description = "Generically derive traversals, lenses and prisms";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "generic-optics-lite" = callPackage
     ({ mkDerivation, base, generic-lens-lite, optics-core }:
      mkDerivation {
@@ -99684,7 +99827,7 @@ self: {
          sed -i "s|\"-s\"|\"\"|" ./Setup.hs
          sed -i "s|numJobs (bf bi)++||" ./Setup.hs
        '';
-       preBuild = "export LD_LIBRARY_PATH=`pwd`/dist/build\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH";
+       preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH'';
        description = "Grammatical Framework";
        license = "unknown";
        hydraPlatforms = lib.platforms.none;
@@ -99950,8 +100093,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-dump-core";
-       version = "0.1.1.0";
-       sha256 = "0mksk6qhsnjd19yx79nw3dygfsfkyq52mdywikg21s67j8d4dxv5";
+       version = "0.1.2.0";
+       sha256 = "0yv811iyjx4iklj44bhipmiwlxl8bx27866i32icnl5ds86ws7la";
        libraryHaskellDepends = [
          base bytestring directory filepath ghc serialise text
        ];
@@ -99989,13 +100132,13 @@ self: {
 
   "ghc-dump-util" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, ghc-dump-core
-     , hashable, optparse-applicative, regex-tdfa, regex-tdfa-text
-     , serialise, text, unordered-containers
+     , hashable, optparse-applicative, regex-tdfa, serialise, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "ghc-dump-util";
-       version = "0.1.1.0";
-       sha256 = "0x93y0ymf3fl977j3c3liz1c52q5b2fw5h1ivsw3dazpmrm62n7m";
+       version = "0.1.2.0";
+       sha256 = "1j85mscsc1g647r4d3v72lqclsi8bw174di6w9n24x0bq3rqskxi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100004,9 +100147,8 @@ self: {
        ];
        executableHaskellDepends = [
          ansi-wl-pprint base ghc-dump-core optparse-applicative regex-tdfa
-         regex-tdfa-text
        ];
-       description = "Handy tools for working with @ghc-dump@ dumps";
+       description = "Handy tools for working with ghc-dump dumps";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
        broken = true;
@@ -100928,8 +101070,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-presburger";
-       version = "0.5.0.0";
-       sha256 = "12v42xav9mvhkkzbfbrjcm2b3hk6vr3j6ra8qn9ji1jfzvin88wl";
+       version = "0.5.2.0";
+       sha256 = "0ny7paq8ykc4ycag1dlb9mlpv17dh9a6csh22abj6bls5rx4iljr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103026,8 +103168,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "8.20201129";
-       sha256 = "10fxl5215x0hqhmwd387xpzgvz4w190lylwr0rihxhy5mwdvf943";
+       version = "8.20210127";
+       sha256 = "1hsmaw70lfza1g5j6b9zbwqkkr374m18p7qb4nl952pj42a46vv3";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -104948,8 +105090,8 @@ self: {
      }:
      mkDerivation {
        pname = "glpk-hs";
-       version = "0.7";
-       sha256 = "0cbdlidq14hmhndlgxid4gdzyg0jlm5habp5389xl3zkbmm2hni9";
+       version = "0.8";
+       sha256 = "0zmf5f9klc7adcrmmf9nxrbqh97bx8l6wazsbyx6idymj6brz0qp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers deepseq gasp mtl ];
@@ -104970,8 +105112,8 @@ self: {
      }:
      mkDerivation {
        pname = "gltf-codec";
-       version = "0.1.0.1";
-       sha256 = "0qdwk4ygvhdp4x8bkw101b50wc8zfb6bb54zpxaxkmva40hcv2c2";
+       version = "0.1.0.2";
+       sha256 = "07zf9lzin22clixmvgvam6h995jfq2wzqz4498qv60jlcj88zzmh";
        libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring scientific text
          unordered-containers vector
@@ -105431,8 +105573,8 @@ self: {
      }:
      mkDerivation {
        pname = "goatee";
-       version = "0.3.1.3";
-       sha256 = "16nsgb1gf7mn35pchigrankl8q7p6cvgsxzbb3ab93jqm8kjxmyn";
+       version = "0.4.0";
+       sha256 = "1nbdqmln6v6r3kdj8vxv4dm903vaxh97mlg19fg8yihm00cbpipd";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers mtl parsec template-haskell
@@ -105450,8 +105592,8 @@ self: {
      }:
      mkDerivation {
        pname = "goatee-gtk";
-       version = "0.3.1.3";
-       sha256 = "0sp819fzgflsfj1glgdmw2qhb97rzdy6nargdmwvaxfay925p8aw";
+       version = "0.4.0";
+       sha256 = "1iffzqmzxxa9aplvnncdj9lc3nvdi8rbnnyl0cb7irhyj7k21k5i";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -112060,8 +112202,8 @@ self: {
      }:
      mkDerivation {
        pname = "hablog";
-       version = "0.7.1";
-       sha256 = "1nn88hpp1q1y96px18qvc9q6gq51dl6m1m9hiipr64a6rngryxiy";
+       version = "0.8.0";
+       sha256 = "0w3mcc06gzrjfyailr9lb4niydfx7gp1pcwizyh87qkhrgxcpnk7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113193,8 +113335,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.19.0";
-       sha256 = "0idvjk0nz9m28qcbkzcs2mjrbx543jj0gh8hj0s0lnj3nlpk0b46";
+       version = "1.20.0";
+       sha256 = "1wb2q26najfmmgvj35wvinvip4l1d3k5mazrang4cr3ch8v1nv6w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117692,6 +117834,56 @@ self: {
        broken = true;
      }) {};
 
+  "haskell-language-server" = callPackage
+    ({ mkDerivation, aeson, base, binary, blaze-markup, brittany
+     , bytestring, containers, data-default, deepseq, directory, extra
+     , filepath, floskell, fourmolu, ghc, ghc-boot-th, ghc-paths, ghcide
+     , gitrev, hashable, haskell-lsp, hie-bios, hls-class-plugin
+     , hls-eval-plugin, hls-explicit-imports-plugin, hls-hlint-plugin
+     , hls-plugin-api, hls-retrie-plugin, hls-tactics-plugin, hslogger
+     , hspec, hspec-core, hspec-expectations, lens, lsp-test, mtl
+     , optparse-applicative, optparse-simple, ormolu, process
+     , regex-tdfa, safe-exceptions, shake, stm, stylish-haskell, tasty
+     , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit
+     , tasty-rerun, temporary, text, transformers, unordered-containers
+     , with-utf8, yaml
+     }:
+     mkDerivation {
+       pname = "haskell-language-server";
+       version = "0.8.0.0";
+       sha256 = "0s02llij5qb1z3na43zg51p5r80jpgwxkdv4mzi6m5xb7pppax42";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers data-default directory extra filepath ghc ghcide
+         gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative
+         optparse-simple process shake text unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson base binary brittany bytestring containers deepseq directory
+         extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide
+         gitrev hashable haskell-lsp hie-bios hls-class-plugin
+         hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin
+         hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens
+         mtl optparse-applicative optparse-simple ormolu process regex-tdfa
+         safe-exceptions shake stylish-haskell temporary text transformers
+         unordered-containers with-utf8
+       ];
+       testHaskellDepends = [
+         aeson base blaze-markup bytestring containers data-default
+         directory extra filepath haskell-lsp hie-bios hls-plugin-api
+         hslogger hspec hspec-core hspec-expectations lens lsp-test process
+         stm tasty tasty-ant-xml tasty-expected-failure tasty-golden
+         tasty-hunit tasty-rerun temporary text transformers
+         unordered-containers yaml
+       ];
+       testToolDepends = [ ghcide ];
+       description = "LSP server for GHC";
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "haskell-lexer" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -117893,7 +118085,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Distributed parallel programming in Haskell using MPI";
        license = lib.licenses.bsd3;
-     }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;};
+     }) {open-pal = null; open-rte = null; openmpi = null;};
 
   "haskell-names" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
@@ -118275,8 +118467,8 @@ self: {
        pname = "haskell-src";
        version = "1.0.3.1";
        sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746";
-       revision = "1";
-       editedCabalFile = "1li6czcs54wnij6qnvpx6f66iiw023pggb3zl3jvp74qqflcf5sg";
+       revision = "2";
+       editedCabalFile = "1qrhcyr0y7j8la3970pg80w3h3pprsp3nisgg1l41wfsr2m7smnf";
        libraryHaskellDepends = [ array base pretty syb ];
        libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
@@ -123659,31 +123851,6 @@ self: {
      }) {};
 
   "hedis" = callPackage
-    ({ mkDerivation, async, base, bytestring, bytestring-lexing
-     , containers, deepseq, doctest, errors, exceptions, HTTP, HUnit
-     , mtl, network, network-uri, resource-pool, scanner, stm
-     , test-framework, test-framework-hunit, text, time, tls
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hedis";
-       version = "0.14.0";
-       sha256 = "114k87mi7manyqa90vjjjlfbdwpg3g3dxiwc16v2zyrw56n28mfv";
-       libraryHaskellDepends = [
-         async base bytestring bytestring-lexing containers deepseq errors
-         exceptions HTTP mtl network network-uri resource-pool scanner stm
-         text time tls unordered-containers vector
-       ];
-       testHaskellDepends = [
-         async base bytestring doctest HUnit mtl stm test-framework
-         test-framework-hunit text time
-       ];
-       benchmarkHaskellDepends = [ base mtl time ];
-       description = "Client library for the Redis datastore: supports full command set, pipelining";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "hedis_0_14_1" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , containers, deepseq, doctest, errors, exceptions, HTTP, HUnit
      , mtl, network, network-uri, resource-pool, scanner, stm
@@ -123706,7 +123873,6 @@ self: {
        benchmarkHaskellDepends = [ base mtl time ];
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hedis-config" = callPackage
@@ -126397,8 +126563,8 @@ self: {
      }:
      mkDerivation {
        pname = "hiedb";
-       version = "0.3.0.0";
-       sha256 = "1g2dzprxja8isw4irgbh8aabzr9iswb9szpn5nwnvbkzkabfqabd";
+       version = "0.3.0.1";
+       sha256 = "1ci68q5r42rarmj12vrmggnj7c7jb8sw3wnmzrq2gn7vqhrr05jc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126570,18 +126736,21 @@ self: {
      }) {};
 
   "higgledy" = callPackage
-    ({ mkDerivation, barbies, base, doctest, generic-lens, hspec, lens
-     , markdown-unlit, named, QuickCheck
+    ({ mkDerivation, barbies, base, base-compat, Cabal, cabal-doctest
+     , doctest, generic-lens, generic-lens-core, hspec, lens
+     , markdown-unlit, named, QuickCheck, template-haskell
      }:
      mkDerivation {
        pname = "higgledy";
-       version = "0.3.1.0";
-       sha256 = "0az05c14l7k9nsfkh4qwpqf1dwlnapgkf5s1v6yfr1rjba0r4bmw";
+       version = "0.4.1.0";
+       sha256 = "1z67vip2appsl4f2qf70pqdnyjp6byaa4n3x8scp1aa94hg1xj3h";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         barbies base generic-lens named QuickCheck
+         barbies base generic-lens generic-lens-core named QuickCheck
        ];
        testHaskellDepends = [
-         barbies base doctest hspec lens named QuickCheck
+         barbies base base-compat doctest hspec lens named QuickCheck
+         template-haskell
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Partial types as a type constructor";
@@ -128350,8 +128519,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-stockquotes";
-       version = "0.1.0.0";
-       sha256 = "19xn7rzrg4nw1dfdfm1hn7k0wdwrw8416rn28inkbkbn1f9mqgk5";
+       version = "0.1.1.0";
+       sha256 = "1srgl70zsixbfgmh22psg7q4wqfiay2jiybyvml42iv712n7z8xx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128869,6 +129038,32 @@ self: {
        license = lib.licenses.asl20;
      }) {};
 
+  "hls-tactics-plugin" = callPackage
+    ({ mkDerivation, aeson, base, checkers, containers, deepseq
+     , directory, extra, filepath, fingertree, generic-lens, ghc
+     , ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide, haskell-lsp
+     , hie-bios, hls-plugin-api, hspec, hspec-discover, lens, mtl
+     , QuickCheck, refinery, retrie, shake, syb, text, transformers
+     }:
+     mkDerivation {
+       pname = "hls-tactics-plugin";
+       version = "0.5.1.0";
+       sha256 = "150hbhdj0rxiyslqfvwzqiyyc0pdvkbfjizv33ldbq8gmwn6lf52";
+       libraryHaskellDepends = [
+         aeson base containers deepseq directory extra filepath fingertree
+         generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide
+         haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text
+         transformers
+       ];
+       testHaskellDepends = [
+         base checkers containers ghc hie-bios hls-plugin-api hspec mtl
+         QuickCheck
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Tactics plugin for Haskell Language Server";
+       license = lib.licenses.asl20;
+     }) {};
+
   "hlwm" = callPackage
     ({ mkDerivation, base, stm, transformers, unix, X11 }:
      mkDerivation {
@@ -135840,6 +136035,8 @@ self: {
        pname = "hspec-core";
        version = "2.7.8";
        sha256 = "10c7avvjcrpy3nrf5xng4177nmxvz0gmc83h7qlnljcp3rkimbvd";
+       revision = "1";
+       editedCabalFile = "0hjp0lq7lg5a12ym43jprx7rc4c8mcd8gh7whpgpn5qmp9z4hyyg";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -136147,27 +136344,24 @@ self: {
 
   "hspec-meta" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
-     , deepseq, directory, filepath, hspec-expectations, HUnit
-     , QuickCheck, quickcheck-io, random, setenv, stm, time
-     , transformers
+     , deepseq, directory, filepath, QuickCheck, quickcheck-io, random
+     , setenv, stm, time, transformers
      }:
      mkDerivation {
        pname = "hspec-meta";
-       version = "2.6.0";
-       sha256 = "1n1a4633wfivylglji8920f67mx7qz8j4q58n8p7dxk6yg4h3mz6";
-       revision = "1";
-       editedCabalFile = "1qh3j6mhlz2bvdk8qc5fa4nqh93q4vqnvxmqqisg4agacnvyp4b2";
+       version = "2.7.8";
+       sha256 = "0sfj0n2hy1r8ifysgbcmfdygcd7vyzr13ldkcp0l2ml337f8j0si";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
-         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
-         setenv stm time transformers
+         filepath QuickCheck quickcheck-io random setenv stm time
+         transformers
        ];
        executableHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
-         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
-         setenv stm time transformers
+         filepath QuickCheck quickcheck-io random setenv stm time
+         transformers
        ];
        description = "A version of Hspec which is used to test Hspec itself";
        license = lib.licenses.mit;
@@ -139721,32 +139915,33 @@ self: {
      }) {};
 
   "hum" = callPackage
-    ({ mkDerivation, base, brick, bytestring, containers, directory
-     , filepath, lens, libmpd, mtl, relude, template-haskell, text
-     , text-zipper, time, transformers, vector, vty, witherable-class
+    ({ mkDerivation, array, base, brick, bytestring, containers
+     , directory, filepath, lens, libmpd, mtl, regex-tdfa, relude
+     , template-haskell, text, text-zipper, time, transformers, vector
+     , vty, witherable
      }:
      mkDerivation {
        pname = "hum";
-       version = "0.1.0.0";
-       sha256 = "06zyjg2i0kk4wnzrcax7rff710rpafqwz4rv75wq09vr65wvvj1y";
+       version = "0.2.0.0";
+       sha256 = "144b1161rvlmayklvgm7cajs0jz5bhlbcgrq288pvymlyl4f962b";
        revision = "1";
-       editedCabalFile = "1y0lhdjjv780jlrr0kdnqbk1w8117g765cnvqd98k112z31p2l8i";
+       editedCabalFile = "07d19lqi5djdsda976qr1w8ps535dxxjsp0lr43b62cinw2ssnki";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base brick bytestring containers directory filepath lens libmpd mtl
-         relude template-haskell text text-zipper time transformers vector
-         vty witherable-class
+         array base brick bytestring containers directory filepath lens
+         libmpd mtl regex-tdfa relude template-haskell text text-zipper time
+         transformers vector vty witherable
        ];
        executableHaskellDepends = [
-         base brick bytestring containers directory filepath lens libmpd mtl
-         relude template-haskell text text-zipper time transformers vector
-         vty witherable-class
+         array base brick bytestring containers directory filepath lens
+         libmpd mtl regex-tdfa relude template-haskell text text-zipper time
+         transformers vector vty witherable
        ];
        testHaskellDepends = [
-         base brick bytestring containers directory filepath lens libmpd mtl
-         relude template-haskell text text-zipper time transformers vector
-         vty witherable-class
+         array base brick bytestring containers directory filepath lens
+         libmpd mtl regex-tdfa relude template-haskell text text-zipper time
+         transformers vector vty witherable
        ];
        description = "A TUI MPD client, inspired by ncmpcpp";
        license = lib.licenses.gpl2Plus;
@@ -140934,30 +141129,6 @@ self: {
      }) {};
 
   "hw-kafka-client" = callPackage
-    ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers
-     , either, hspec, hspec-discover, monad-loops, rdkafka, text
-     , transformers, unix
-     }:
-     mkDerivation {
-       pname = "hw-kafka-client";
-       version = "4.0.1";
-       sha256 = "05ahw4cdp5kk5j4rbjf1bdvivg3nhiaaf68p902mp8jcbh7fz9sf";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bifunctors bytestring containers text transformers unix
-       ];
-       librarySystemDepends = [ rdkafka ];
-       libraryToolDepends = [ c2hs ];
-       testHaskellDepends = [
-         base bifunctors bytestring containers either hspec monad-loops text
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Kafka bindings for Haskell";
-       license = lib.licenses.mit;
-     }) {inherit (pkgs) rdkafka;};
-
-  "hw-kafka-client_4_0_2" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers
      , either, hspec, hspec-discover, monad-loops, rdkafka, text
      , transformers, unix
@@ -140979,7 +141150,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Kafka bindings for Haskell";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) rdkafka;};
 
   "hw-kafka-conduit" = callPackage
@@ -145972,8 +146142,8 @@ self: {
      }:
      mkDerivation {
        pname = "instana-haskell-trace-sdk";
-       version = "0.3.0.0";
-       sha256 = "0dy947230ing6mv4xvd8ahiwfhkz557n2mrvi86whns8jbb71nbv";
+       version = "0.4.0.0";
+       sha256 = "0cg1i7whiwg07zsby5zr3q3pqg24js3zvrd2rwlpfvqx1pkf3qxh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -147413,8 +147583,8 @@ self: {
      }:
      mkDerivation {
        pname = "ip";
-       version = "1.7.2";
-       sha256 = "10jcqc7x48kfslyahl9i4pb1qmjfg1fjznc5w7kl9kx2cxivbwig";
+       version = "1.7.3";
+       sha256 = "0xcn9la0c2illw53xn8m2w2jpfi9yivzl2w54l62cj2fn7l9l5cf";
        libraryHaskellDepends = [
          aeson attoparsec base bytebuild byteslice bytesmith bytestring
          deepseq hashable natural-arithmetic primitive text text-short
@@ -150212,22 +150382,22 @@ self: {
 
   "jose-jwt" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
-     , containers, criterion, cryptonite, doctest, either, hspec, HUnit
-     , memory, mtl, QuickCheck, text, time, transformers
-     , transformers-compat, unordered-containers, vector
+     , containers, criterion, cryptonite, hspec, HUnit, memory, mtl
+     , QuickCheck, text, time, transformers, transformers-compat
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "jose-jwt";
-       version = "0.8.0";
-       sha256 = "1hmnkmbhmw78k35g3h3b016p0b4rrax9s8izp5xfrsqqxkl9ic2g";
+       version = "0.9.0";
+       sha256 = "1dnkyzs7kk2lxz2kj3x6v8w1lypsr0rppyn78s7w5sr89y924752";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal containers cryptonite
-         either memory mtl text time transformers transformers-compat
+         memory mtl text time transformers transformers-compat
          unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base bytestring cryptonite doctest either hspec HUnit memory
-         mtl QuickCheck text unordered-containers vector
+         aeson base bytestring cryptonite hspec HUnit memory mtl QuickCheck
+         text unordered-containers vector
        ];
        benchmarkHaskellDepends = [ base bytestring criterion cryptonite ];
        description = "JSON Object Signing and Encryption Library";
@@ -151162,8 +151332,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-sop";
-       version = "0.2.0.4";
-       sha256 = "0q1p15whyyzpggfnqm4vy9p8l12xlxmnc4d82ykxl8rxzhbjkh0i";
+       version = "0.2.0.5";
+       sha256 = "1sdc2ywdra75nqlc5829f0clfi91fdqyrcmik1nrxrdnxr4yzhvh";
        libraryHaskellDepends = [
          aeson base generics-sop lens-sop tagged text time transformers
          unordered-containers vector
@@ -160111,13 +160281,13 @@ self: {
 
   "libmpd" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
-     , data-default-class, filepath, hspec, mtl, network, QuickCheck
-     , safe-exceptions, text, time, unix, utf8-string
+     , data-default-class, filepath, hspec, hspec-discover, mtl, network
+     , QuickCheck, safe-exceptions, text, time, unix, utf8-string
      }:
      mkDerivation {
        pname = "libmpd";
-       version = "0.9.3.0";
-       sha256 = "08bi0m7kxh2ppkabq5vsx1cwz3i1y4y7w4j0g1hi9q9raml6y0y9";
+       version = "0.10.0.0";
+       sha256 = "088vlir0n3wps2p5ydgyx51p41nfjcm2v02sszpyjj3c8z7f4qkh";
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class filepath
          mtl network safe-exceptions text time utf8-string
@@ -160127,6 +160297,7 @@ self: {
          hspec mtl network QuickCheck safe-exceptions text time unix
          utf8-string
        ];
+       testToolDepends = [ hspec-discover ];
        description = "An MPD client library";
        license = lib.licenses.mit;
      }) {};
@@ -161302,6 +161473,8 @@ self: {
        pname = "linear";
        version = "1.21.3";
        sha256 = "12gn571cfchrj9zir30c86vib3ppjia5908di21pnsfy6dmw6994";
+       revision = "1";
+       editedCabalFile = "17cbb44yyfcxz9fybv05yxli8gdfka415dwrp7vh804q7qxs5vna";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          adjunctions base base-orphans binary bytes cereal containers
@@ -161317,6 +161490,33 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "linear_1_21_4" = callPackage
+    ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes
+     , bytestring, cereal, containers, deepseq, distributive, ghc-prim
+     , hashable, HUnit, lens, random, reflection, semigroupoids
+     , semigroups, simple-reflect, tagged, template-haskell
+     , test-framework, test-framework-hunit, transformers
+     , transformers-compat, unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "linear";
+       version = "1.21.4";
+       sha256 = "019dsw4xqcmz8g0hanc3xsl0k1pqzxkhp9jz1sf12mqsgs6jj0zr";
+       libraryHaskellDepends = [
+         adjunctions base base-orphans binary bytes cereal containers
+         deepseq distributive ghc-prim hashable lens random reflection
+         semigroupoids semigroups tagged template-haskell transformers
+         transformers-compat unordered-containers vector void
+       ];
+       testHaskellDepends = [
+         base binary bytestring deepseq HUnit reflection simple-reflect
+         test-framework test-framework-hunit vector
+       ];
+       description = "Linear Algebra";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "linear-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, Cabal, cabal-doctest
      , distributive, doctest, lens, linear
@@ -165102,8 +165302,8 @@ self: {
      }:
      mkDerivation {
        pname = "lorentz";
-       version = "0.9.0";
-       sha256 = "195z7kx7jv0118pbashbc441sf69xag5q43jwkdyf53cmvnxqcwq";
+       version = "0.9.1";
+       sha256 = "1f4rf4q6gfiz55qlfpkzk19nq6fw92ri3a1smyv4r55i50jr07rm";
        libraryHaskellDepends = [
          aeson-pretty base bimap bytestring constraints containers
          data-default first-class-families fmt interpolate lens morley
@@ -165408,7 +165608,7 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "lsp-test_0_11_0_7" = callPackage
+  "lsp-test_0_12_0_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
      , bytestring, conduit, conduit-parse, containers, data-default
      , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl
@@ -165417,8 +165617,8 @@ self: {
      }:
      mkDerivation {
        pname = "lsp-test";
-       version = "0.11.0.7";
-       sha256 = "01var9nm3kpw65jaz4rvky35ibrpfjyhfas9bi8avrw1vh2ybkcn";
+       version = "0.12.0.0";
+       sha256 = "1zc43j7xyfxv2i9vinx82yhkrr6m4gz46jwn9p39k76ld6j8nzpd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -168564,18 +168764,17 @@ 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, base, bytestring, deepseq, doctest, exceptions
+     , mersenne-random-pure64, primitive, QuickCheck, random, scheduler
+     , splitmix, template-haskell, unliftio-core, vector
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.5.9.0";
-       sha256 = "11i527mnyznpyqwr61cr3jhx4xs3y8m7948mqp6rwkis6lnvl2ms";
+       version = "0.6.0.0";
+       sha256 = "12p3gcrz3nwry99xhxfrz51aiswm5ira2hyxl4q1g3jfi8vwgcd0";
        libraryHaskellDepends = [
-         base bytestring data-default-class deepseq exceptions primitive
-         scheduler unliftio-core vector
+         base bytestring deepseq exceptions primitive scheduler
+         unliftio-core vector
        ];
        testHaskellDepends = [
          base doctest mersenne-random-pure64 QuickCheck random splitmix
@@ -168593,8 +168792,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv-io";
-       version = "0.4.0.0";
-       sha256 = "18q09pz563jp8lmnvmcynmhrk6pmqxr8whlcp6f9kilkzy7hzy9k";
+       version = "0.4.1.0";
+       sha256 = "1g20n4h1x03i7q36a6d65v2ylmrr6m8s2g91jnpx1lj7a91hc5c7";
        libraryHaskellDepends = [
          base bytestring Color data-default-class deepseq exceptions
          filepath JuicyPixels massiv netpbm unliftio vector
@@ -168676,8 +168875,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv-test";
-       version = "0.1.6";
-       sha256 = "1cg41rkk19jyvkkx3nkd10lq738cg5kv29nrzwxqcm5v308av38i";
+       version = "0.1.6.1";
+       sha256 = "0f2f401flik0sj1wqlzghhr0dxbz2lyvlb4ij38n3m2vgpkgkd57";
        libraryHaskellDepends = [
          base bytestring data-default-class deepseq exceptions hspec massiv
          primitive QuickCheck scheduler unliftio vector
@@ -169870,19 +170069,19 @@ self: {
      }) {};
 
   "mealy" = callPackage
-    ({ mkDerivation, adjunctions, backprop, base, containers, doctest
-     , folds, generic-lens, hmatrix, lens, mwc-probability, mwc-random
-     , numhask, numhask-array, primitive, profunctors, tdigest, text
-     , vector, vector-algorithms
+    ({ mkDerivation, adjunctions, base, containers, doctest, folds
+     , generic-lens, lens, matrix, mwc-probability, numhask
+     , numhask-array, primitive, profunctors, tdigest, text, vector
+     , vector-algorithms
      }:
      mkDerivation {
        pname = "mealy";
-       version = "0.0.1";
-       sha256 = "0z7hf1blzhgrjmrf7s2dpgmg73157j476g17i7m52zgfgq4vmym9";
+       version = "0.0.3";
+       sha256 = "0gv4vi8ppbrhi8j2xwhnw96sybs2ci2ja6s37ggv4g0lxbxin17m";
        libraryHaskellDepends = [
-         adjunctions backprop base containers folds generic-lens hmatrix
-         lens mwc-probability mwc-random numhask numhask-array primitive
-         profunctors tdigest text vector vector-algorithms
+         adjunctions base containers folds generic-lens lens matrix
+         mwc-probability numhask numhask-array primitive profunctors tdigest
+         text vector vector-algorithms
        ];
        testHaskellDepends = [ base doctest numhask ];
        description = "See readme.md";
@@ -173328,23 +173527,6 @@ self: {
      }) {};
 
   "mixed-types-num" = callPackage
-    ({ mkDerivation, base, hspec, hspec-smallcheck, mtl, QuickCheck
-     , smallcheck, template-haskell
-     }:
-     mkDerivation {
-       pname = "mixed-types-num";
-       version = "0.4.0.2";
-       sha256 = "0kirxpnmwwnbxamwpzrxyx69n482xhifqpr5id73pfni7lrd126p";
-       libraryHaskellDepends = [
-         base hspec hspec-smallcheck mtl QuickCheck smallcheck
-         template-haskell
-       ];
-       testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ];
-       description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "mixed-types-num_0_4_1" = callPackage
     ({ mkDerivation, base, hspec, hspec-smallcheck, mtl, QuickCheck
      , smallcheck, template-haskell
      }:
@@ -173359,7 +173541,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ];
        description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mixpanel-client" = callPackage
@@ -176628,8 +176809,8 @@ self: {
      }:
      mkDerivation {
        pname = "morley";
-       version = "1.11.1";
-       sha256 = "04gvyfhn84p5dns28h1cfn68fpz7zwsavwvay27b3yfbzd8i1z31";
+       version = "1.12.0";
+       sha256 = "0cfmcrasf2cfirsa6xb1aznj75bwnzmiy9irirk1i9p2bx4aqy5m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -178070,8 +178251,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-graphql";
-       version = "0.5.0.0";
-       sha256 = "0idlxja65gv2whaln7snrqa87yfm7dc3pqwnq6qhmxwvm1npbjqk";
+       version = "0.5.0.1";
+       sha256 = "1mcm8db1q0sjzxyjhxd140l966vq6yh8hj1p2xx8yzqmagsfv7kx";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -178260,8 +178441,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-protobuf";
-       version = "0.4.1.0";
-       sha256 = "1sx9943y1z213fx5gasw78xz7zgxk33lfnx16918ls5jxma40igh";
+       version = "0.4.2.0";
+       sha256 = "07mgld1cmpynhdih7ppki8xw85zpknv0ipn7fvn79bj53s0nx6vg";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -179551,8 +179732,8 @@ self: {
      }:
      mkDerivation {
        pname = "musicScroll";
-       version = "0.3.1.0";
-       sha256 = "0ssf841r00zgy8h1l2041hs936mpsqpp4nwr3v6w4b5bva2p9jhn";
+       version = "0.3.2.1";
+       sha256 = "0q6hglv26qpy1prx4is0jbhgb9xsxkpxbknyah9mcfn7c52cx0c0";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -180798,9 +180979,12 @@ self: {
     ({ mkDerivation, base, named, servant }:
      mkDerivation {
        pname = "named-servant";
-       version = "0.2.0";
-       sha256 = "0ixpm43sgir02a9y8i7rvalxh6h7vlcwgi2hmis0lq0w8pmw5m53";
+       version = "0.3.0";
+       sha256 = "14a55ww538c39wmacazdchrinc098yw9kbv44z4dw1739zhsghb6";
+       revision = "1";
+       editedCabalFile = "1xrbz9vhb61wkjb1amswvpb9sfslg1258vqlm880angc18i3dyi7";
        libraryHaskellDepends = [ base named servant ];
+       description = "support records and named (from the named package) parameters in servant";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
        broken = true;
@@ -180812,8 +180996,10 @@ self: {
      }:
      mkDerivation {
        pname = "named-servant-client";
-       version = "0.2.0";
-       sha256 = "1yklvwdrf74m0ipsvn0b88slmhidri6f4n7jz7njz5i594qg7zdn";
+       version = "0.3.0";
+       sha256 = "1ilzhvdvspd8wddv6yypvl6whbzsa3pzqz2a8ikmk0l3vkskv60d";
+       revision = "1";
+       editedCabalFile = "19frg1vj2zzibdrbmxdmjfas31z5hwhy7kjkk28vm20y51h4lir3";
        libraryHaskellDepends = [
          base named named-servant servant servant-client-core
        ];
@@ -180829,8 +181015,10 @@ self: {
      }:
      mkDerivation {
        pname = "named-servant-server";
-       version = "0.2.0";
-       sha256 = "03mqkkf3l6abml6w5p04389c7haya7bp637vvaq43z0cxgpxs4mp";
+       version = "0.3.0";
+       sha256 = "14v1sgfz6agsbiy2938chy0vi4j4jd1swdhwb9g2yg068m3262k3";
+       revision = "1";
+       editedCabalFile = "0880w18l18hjnrpf0j4z0rd98waai3431gzakqm53zh8zs75lcll";
        libraryHaskellDepends = [
          base named named-servant servant servant-server text
        ];
@@ -181949,8 +182137,8 @@ self: {
      }:
      mkDerivation {
        pname = "net-mqtt";
-       version = "0.7.0.1";
-       sha256 = "0gfym6fv92afbv1b126bnviw3qh4m9dim9q046kbh4h5sxah61ab";
+       version = "0.7.1.0";
+       sha256 = "1l19hmc3623gsx1yv0wcbgcy22p549zyrvfv44khzd45fl3fxfb7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184608,17 +184796,17 @@ self: {
      }) {};
 
   "nix-diff" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, Diff, mtl
+    ({ mkDerivation, attoparsec, base, containers, Diff, directory, mtl
      , nix-derivation, optparse-applicative, text, unix, vector
      }:
      mkDerivation {
        pname = "nix-diff";
-       version = "1.0.10";
-       sha256 = "0lcm4s28c4dgry3r1wj5zmb59izfi6vvyivxkpgyv9fhqmyiid4c";
+       version = "1.0.11";
+       sha256 = "0pi0nqhv48f90ls40whifw1lcld5sw3hcrz7kzy14s4sc6ln9543";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         attoparsec base containers Diff mtl nix-derivation
+         attoparsec base containers Diff directory mtl nix-derivation
          optparse-applicative text unix vector
        ];
        description = "Explain why two Nix derivations differ";
@@ -191598,8 +191786,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.11.3.2";
-       sha256 = "1p4l6h9wpsfqxvziwx4vvsq02jdwwwqq92gvrdxi4ad2q7nlgivr";
+       version = "2.11.4";
+       sha256 = "1x8s6gidcij81vcxhj3pday484dyxn3d5s9sz0rh3nfml80cgkyk";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -193055,8 +193243,8 @@ self: {
      }:
      mkDerivation {
        pname = "parameterized-utils";
-       version = "2.1.1";
-       sha256 = "18z0ykpvr7m8ffqpqwnclnyifig61n9l41w3hn39f37455z1dy39";
+       version = "2.1.2.0";
+       sha256 = "0ksyhlg8vmrmdayzi2zpb33xggb7mv7vgbm6kgzr0knxbh3nm7jc";
        libraryHaskellDepends = [
          base base-orphans constraints containers deepseq ghc-prim hashable
          hashtables lens mtl template-haskell text th-abstraction vector
@@ -196632,8 +196820,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-odbc";
-       version = "0.2.1.0";
-       sha256 = "058nmmqnl1pz7cyvfnbgid3kqbfl95g9xqgxs00z5fbkz5kwg5rl";
+       version = "0.2.1.1";
+       sha256 = "1c44mq7y20s0xk88azp2aa5wv8kn7g1blw987rp0chb03mljkwja";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -197805,13 +197993,13 @@ self: {
      , phonetic-languages-simplified-base
      , phonetic-languages-simplified-examples-common
      , phonetic-languages-simplified-properties-array
-     , phonetic-languages-ukrainian-array, print-info, subG
+     , phonetic-languages-ukrainian-array, subG
      , ukrainian-phonetics-basic-array, uniqueness-periods-vector-stats
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-examples-array";
-       version = "0.2.2.0";
-       sha256 = "1b8i9kgybidiczlpwyb2grgkxgyscdnldfpj75snwnpyyw40qlfs";
+       version = "0.3.0.0";
+       sha256 = "17akng54rj8mn4ic9h1a806b03nqsigkyjggfskf4k1z9x84hdf4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -197833,7 +198021,7 @@ self: {
          phonetic-languages-rhythmicity phonetic-languages-simplified-base
          phonetic-languages-simplified-examples-common
          phonetic-languages-simplified-properties-array
-         phonetic-languages-ukrainian-array print-info subG
+         phonetic-languages-ukrainian-array subG
          ukrainian-phonetics-basic-array uniqueness-periods-vector-stats
        ];
        description = "Helps to create Ukrainian texts with the given phonetic properties";
@@ -197900,8 +198088,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-properties-array";
-       version = "0.1.1.0";
-       sha256 = "0ildphgb5dd2s5hc4nr7ii9q9dzm0qa7vc2j4yjcis72jjzjx6nd";
+       version = "0.1.2.0";
+       sha256 = "1vxjq0ki7slmgp1sq481srnqzcy8sazl0c2vqdkyz0hsx5hi8lyv";
        libraryHaskellDepends = [
          base phonetic-languages-rhythmicity
          phonetic-languages-simplified-base ukrainian-phonetics-basic-array
@@ -204486,10 +204674,8 @@ self: {
     ({ mkDerivation, adjunctions, base, deepseq, lens, mtl }:
      mkDerivation {
        pname = "predicate-transformers";
-       version = "0.7.0.2";
-       sha256 = "0wkd7xz3d4sifx9cxm9rnjskhxrbdyqpdspi0sa6jr1ckmq25zpf";
-       revision = "1";
-       editedCabalFile = "1b02l2fdfxvlsvhcmkpsp0vzc0igsd0nrb64yb7af5a7z08cc9c0";
+       version = "0.7.0.3";
+       sha256 = "0ipbl4wq95z61h7jd0x5jv5m01vw69v6qqif4nwx9wp7mjfdp7z0";
        libraryHaskellDepends = [ adjunctions base deepseq lens mtl ];
        description = "A library for writing predicates and transformations over predicates in Haskell";
        license = lib.licenses.bsd3;
@@ -205518,15 +205704,22 @@ self: {
      }) {};
 
   "primal" = callPackage
-    ({ mkDerivation, base, deepseq, doctest, template-haskell
-     , transformers
+    ({ mkDerivation, array, atomic-primops, base, bytestring, criterion
+     , deepseq, doctest, hspec, QuickCheck, quickcheck-classes-base
+     , template-haskell, transformers, unliftio
      }:
      mkDerivation {
        pname = "primal";
-       version = "0.2.0.0";
-       sha256 = "1vr6rrg4hapivlny2bi47swhm2rwjdzrsxz4r97d4gdydr5vphln";
-       libraryHaskellDepends = [ base deepseq transformers ];
-       testHaskellDepends = [ base doctest template-haskell ];
+       version = "0.3.0.0";
+       sha256 = "17rq3azyw7lg6svspv5jbj4x474yb75rzgqxr5s6dfa597djkhqc";
+       libraryHaskellDepends = [ array base deepseq transformers ];
+       testHaskellDepends = [
+         base bytestring deepseq doctest hspec QuickCheck
+         quickcheck-classes-base template-haskell
+       ];
+       benchmarkHaskellDepends = [
+         atomic-primops base criterion unliftio
+       ];
        description = "Primeval world of Haskell";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -205539,8 +205732,8 @@ self: {
      }:
      mkDerivation {
        pname = "primal-memory";
-       version = "0.2.0.0";
-       sha256 = "00yw3m0bjgm3pns60clfy6g905ylwkipw82rwqx3aacgny1hbjy0";
+       version = "0.3.0.0";
+       sha256 = "0dkx0n8rfagb942h4xfycq9gpk3d670jzd6dn4hzj5v58zriw0ip";
        libraryHaskellDepends = [ base bytestring deepseq primal text ];
        testHaskellDepends = [
          base bytestring doctest primal QuickCheck template-haskell
@@ -206209,14 +206402,14 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "process_1_6_10_0" = callPackage
+  "process_1_6_11_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, filepath
      , unix
      }:
      mkDerivation {
        pname = "process";
-       version = "1.6.10.0";
-       sha256 = "01c50qhrsvymbifa3lzyq6g4hmj6jl3awjp1jmbhdkmfdfaq3v16";
+       version = "1.6.11.0";
+       sha256 = "0nv8c2hnx1l6xls6b61l8sm7j250qfbj1fjj5n6m15ppk9f0d9jd";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
@@ -209361,8 +209554,8 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "2.0.0.2";
-       sha256 = "0ci2wg0y3762n1in8jyw1dpjljdynhl4bfp9506kfkc6ym9j2q1a";
+       version = "2.0.0.3";
+       sha256 = "0h53y0jxk1nyqwyr4f0nry0gl64s1w8ay15fips4drql37apbq1v";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptonite hashable
          http-client http-client-tls http-types memory text time
@@ -218652,10 +218845,8 @@ self: {
      }:
      mkDerivation {
        pname = "req";
-       version = "3.8.0";
-       sha256 = "1qd0bawdxig6sldlhqgj8cpkzfy7da9yy0wkvzs6mps6yk14kbap";
-       revision = "1";
-       editedCabalFile = "1gkd25bg87r0dr8rb04r3scjfm66v88905490fiy4x1826gj9cv0";
+       version = "3.9.0";
+       sha256 = "1hapa7f6n6xzw43w6zka3x8hp546h992axm6m8rcxl042j9p95b3";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
@@ -219014,6 +219205,8 @@ self: {
        pname = "resolv";
        version = "0.1.2.0";
        sha256 = "0wa6wsh6i52q4ah2z0hgzlks325kigch4yniz0y15nw4skxbm8l1";
+       revision = "1";
+       editedCabalFile = "19pm4cg28viyl7r0viz4wfmm9w4nqxkjlb6kknfqcajjqmdacqad";
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring containers
        ];
@@ -220585,8 +220778,8 @@ self: {
      }:
      mkDerivation {
        pname = "rio";
-       version = "0.1.19.0";
-       sha256 = "04kvpirwz86pj7izaa0la601xyqnqzsspg43z10vxnc1whjp5rsm";
+       version = "0.1.20.0";
+       sha256 = "0x5b5c0y97b5n1lvbcsqlkhbv4nbbznx1w1fp3a17a03pz7qf61s";
        libraryHaskellDepends = [
          base bytestring containers deepseq directory exceptions filepath
          hashable microlens microlens-mtl mtl primitive process text time
@@ -220724,8 +220917,8 @@ self: {
      }:
      mkDerivation {
        pname = "risc386";
-       version = "0.0.20130719";
-       sha256 = "0i0fkg4vys3n31jwazrajirywxmk7idjv2kz3nlb8kwriqc6d723";
+       version = "0.0.20210125";
+       sha256 = "0fc551nvmqgl1sj3c45bwjzc9ksqbwg17dzkipyyzdrgi1shawn2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers mtl pretty ];
@@ -226473,8 +226666,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "seclib";
-       version = "1.1.0.2";
-       sha256 = "0jbgdd3mh126c3n0sblvd7rbcnnzrfyfajrj9xcsj7zi7jqvs8nw";
+       version = "1.1.0.3";
+       sha256 = "1ikkjxnl7p3gdzf7fsx9bakd9j6xg5wm5rgyz0n8f2n4nx0r04db";
        libraryHaskellDepends = [ base ];
        description = "A simple library for static information-flow security in Haskell";
        license = lib.licenses.bsd3;
@@ -227667,29 +227860,6 @@ self: {
      }) {};
 
   "sequence-formats" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, errors
-     , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec
-     , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers
-     , vector
-     }:
-     mkDerivation {
-       pname = "sequence-formats";
-       version = "1.5.1.4";
-       sha256 = "0qcs8lvv8dww6w9iyca4snxrr3hcjd14kafz59gxmbhx9q8zl8mz";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers errors exceptions foldl
-         lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe
-         transformers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers foldl hspec pipes pipes-safe tasty
-         tasty-hunit transformers vector
-       ];
-       description = "A package with basic parsing utilities for several Bioinformatic data formats";
-       license = lib.licenses.gpl3;
-     }) {};
-
-  "sequence-formats_1_5_2" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, errors
      , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec
      , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers
@@ -227710,7 +227880,6 @@ self: {
        ];
        description = "A package with basic parsing utilities for several Bioinformatic data formats";
        license = lib.licenses.gpl3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sequenceTools" = callPackage
@@ -232963,8 +233132,8 @@ self: {
     ({ mkDerivation, base, doctest, text }:
      mkDerivation {
        pname = "shortcut-links";
-       version = "0.5.1.0";
-       sha256 = "0gi3w7hh261nc2bmcwvagbgdazllk50sxn4vpzdhc2wb046mcida";
+       version = "0.5.1.1";
+       sha256 = "0567igvyl43fa06h7dq2lww0ing00n24xgmd25vhgx6kvnawnb90";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base doctest ];
        description = "Link shortcuts for use in text markup";
@@ -239764,8 +239933,8 @@ self: {
      }:
      mkDerivation {
        pname = "spdx-license";
-       version = "0.1.0";
-       sha256 = "17ksd29w4qv4vpk6wcah4xr15sjx1fcz7mcwqb6r7kqqmw7jqp7y";
+       version = "0.1.1";
+       sha256 = "1zl21x5qmzpj7y7vcv8brwcf4b1rjb8yy4aih8v5igic6d1a8jyw";
        libraryHaskellDepends = [
          base containers megaparsec regex-tdfa string-interpolate text
        ];
@@ -246495,6 +246664,8 @@ self: {
        pname = "stylist";
        version = "2.4.0.0";
        sha256 = "0nkz6jnfx7si473lz0b907lq6zjpw2apbcph61s2aw44j5zgdg96";
+       revision = "1";
+       editedCabalFile = "18amb2sbp4qh2lszc21vpvnyqsbsy7s9396ivkcw7dmg7hljvk9a";
        libraryHaskellDepends = [
          async base css-syntax hashable network-uri regex-tdfa text
          unordered-containers
@@ -247366,10 +247537,8 @@ self: {
      }:
      mkDerivation {
        pname = "supervisors";
-       version = "0.2.0.0";
-       sha256 = "0q6r211sbb9dyrplr61xajbwcfvz7z93401mhqxhw3pz55vyrg8i";
-       revision = "2";
-       editedCabalFile = "0pnxmbw3wb0dcbhpl583ffd991iv3zy4xf6xi5z3qhn5qh8nrmz1";
+       version = "0.2.1.0";
+       sha256 = "146nrqi8bjdvarz8i689ympid5d9jbrcm0bdv0q8jxi9zvwb3gvq";
        libraryHaskellDepends = [
          async base containers safe-exceptions stm
        ];
@@ -248026,20 +248195,6 @@ self: {
      }) {};
 
   "syb" = callPackage
-    ({ mkDerivation, base, containers, HUnit, mtl }:
-     mkDerivation {
-       pname = "syb";
-       version = "0.7.1";
-       sha256 = "0077vxzyi9ppbphi2ialac3p376k49qly1kskdgf57wdwix9qjp0";
-       revision = "1";
-       editedCabalFile = "0rgxzwnbwawi8visnpq74s51n0qi9rzgnxsm2bdmi4vwfn3lb6w0";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base containers HUnit mtl ];
-       description = "Scrap Your Boilerplate";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "syb_0_7_2_1" = callPackage
     ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }:
      mkDerivation {
        pname = "syb";
@@ -248049,7 +248204,6 @@ self: {
        testHaskellDepends = [ base containers mtl tasty tasty-hunit ];
        description = "Scrap Your Boilerplate";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "syb-extras" = callPackage
@@ -251217,10 +251371,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-hedgehog";
-       version = "1.0.0.2";
-       sha256 = "1vsv3m6brhshpqm8qixz97m7h0nx67cj6ira4cngbk7mf5rqylv5";
-       revision = "6";
-       editedCabalFile = "12s7jgz14j32h62mgs4qbypqlpwjly1bk2hgrwqi9w3cjsskqk88";
+       version = "1.0.1.0";
+       sha256 = "0vkmhqfydyxbvjjbwvwn0q1f1a2dl9wmhz0s7020frpzwqcjwm5b";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
@@ -251562,6 +251714,33 @@ self: {
      }) {};
 
   "tasty-silver" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
+     , deepseq, directory, filepath, mtl, optparse-applicative, process
+     , process-extras, regex-tdfa, semigroups, stm, tagged, tasty
+     , tasty-hunit, temporary, text, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-silver";
+       version = "3.1.15";
+       sha256 = "07iiaw5q5jb6bxm5ys1s6bliw0qxsqp100awzxwkwfia03i1iz8z";
+       revision = "1";
+       editedCabalFile = "1pxwixy274w0z99zsx0aywcxcajnpgan3qri81mr1wb6afxrq8d6";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring containers deepseq directory
+         filepath mtl optparse-applicative process process-extras regex-tdfa
+         semigroups stm tagged tasty temporary text
+       ];
+       testHaskellDepends = [
+         base directory filepath process tasty tasty-hunit temporary
+         transformers
+       ];
+       description = "A fancy test runner, including support for golden tests";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tasty-silver_3_2_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
      , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
@@ -252414,15 +252593,15 @@ self: {
   "telegraph" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, deriving-aeson
      , generic-data-surgery, http-client, http-client-tls, http-conduit
-     , in-other-words, mtl, text
+     , in-other-words, mtl, optics-th, text
      }:
      mkDerivation {
        pname = "telegraph";
-       version = "1.0.0";
-       sha256 = "1s3k3psva95lka5zqzylh20k3s7bqmsg22l43r1jzrkldlaqkh3n";
+       version = "1.1.1";
+       sha256 = "031p8qpz7gw86qy8iy5syp9g074ksfvkqv0rmv52hn2y1489hzng";
        libraryHaskellDepends = [
          aeson base bytestring conduit deriving-aeson generic-data-surgery
-         http-client http-conduit in-other-words mtl text
+         http-client http-conduit in-other-words mtl optics-th text
        ];
        testHaskellDepends = [
          base http-client http-client-tls in-other-words
@@ -253180,10 +253359,8 @@ self: {
      }:
      mkDerivation {
        pname = "tensors";
-       version = "0.1.4";
-       sha256 = "1wiq38px85ypnfpvbr3hcawrag457z0jvd4jr1bh7jf6qw6jqpfn";
-       revision = "1";
-       editedCabalFile = "0a96iw75ylygbjdlab5dj3dkkqamd2k1g2nfy6w7ly6j7rq6f84p";
+       version = "0.1.5";
+       sha256 = "181jiffwp3varv9xzb8if22lwwi1vhhgqf7hai373vn2yavk5wal";
        libraryHaskellDepends = [ base deepseq vector ];
        testHaskellDepends = [
          base deepseq hspec QuickCheck reflection vector
@@ -256922,6 +257099,29 @@ self: {
        license = lib.licenses.gpl3;
      }) {};
 
+  "tidal_1_7" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, clock, colour
+     , containers, criterion, deepseq, hosc, microspec, network, parsec
+     , primitive, random, text, transformers, vector, weigh
+     }:
+     mkDerivation {
+       pname = "tidal";
+       version = "1.7";
+       sha256 = "1kqk9ny1fvgzkmv0kiprbi7l5pwmwkz8f7zycyksqxb6wkrs3v1k";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bifunctors bytestring clock colour containers deepseq hosc
+         network parsec primitive random text transformers vector
+       ];
+       testHaskellDepends = [
+         base containers deepseq hosc microspec parsec
+       ];
+       benchmarkHaskellDepends = [ base criterion weigh ];
+       description = "Pattern language for improvised music";
+       license = lib.licenses.gpl3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "tidal-midi" = callPackage
     ({ mkDerivation, base, containers, PortMidi, tidal, time
      , transformers
@@ -263943,8 +264143,8 @@ self: {
     ({ mkDerivation, base, containers, ghc }:
      mkDerivation {
        pname = "typecheck-plugin-nat-simple";
-       version = "0.1.0.1";
-       sha256 = "1d35zj6gi3h9ybgvdi16x1lrjg0fgn8lhi36ia04f56qmsc3bk4j";
+       version = "0.1.0.2";
+       sha256 = "1hdp2n8n75lr1rjn99nwrqgzh3xay18lkjm8sjv36bwavvbw9p90";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers ghc ];
        testHaskellDepends = [ base containers ghc ];
@@ -265105,8 +265305,8 @@ self: {
     ({ mkDerivation, base, bytestring, mmsyn2-array, mmsyn5 }:
      mkDerivation {
        pname = "ukrainian-phonetics-basic-array";
-       version = "0.1.1.0";
-       sha256 = "1v5nzcnyrkhz5r2igxdp07ac506p0nnmjiskxxil5rzhab9zf8kn";
+       version = "0.1.2.0";
+       sha256 = "1a1crwz47vrrqr3bydzhknacmv5yafrpc33417mmp68qqhccdc23";
        libraryHaskellDepends = [ base bytestring mmsyn2-array mmsyn5 ];
        description = "A library to work with the basic Ukrainian phonetics and syllable segmentation";
        license = lib.licenses.mit;
@@ -266576,32 +266776,6 @@ self: {
      }) {};
 
   "universum" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, doctest
-     , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
-     , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
-     , text, transformers, unordered-containers, utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "universum";
-       version = "1.5.0";
-       sha256 = "17rzi17k2wj3p6dzd0dggzgyhh0c2mma4znkci1hqcihwr6rrljk";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq ghc-prim hashable microlens
-         microlens-mtl mtl safe-exceptions stm text transformers
-         unordered-containers utf8-string vector
-       ];
-       testHaskellDepends = [
-         base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
-         utf8-string
-       ];
-       benchmarkHaskellDepends = [
-         base containers gauge unordered-containers
-       ];
-       description = "Custom prelude used in Serokell";
-       license = lib.licenses.mit;
-     }) {};
-
-  "universum_1_7_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, doctest
      , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
      , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
@@ -266624,7 +266798,6 @@ self: {
        ];
        description = "Custom prelude used in Serokell";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unix_2_7_2_2" = callPackage
@@ -266633,8 +266806,8 @@ self: {
        pname = "unix";
        version = "2.7.2.2";
        sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq";
-       revision = "5";
-       editedCabalFile = "1hfpipkxmkr0fgjz1i4mm0ah1s7bgb28yb8sjn32rafj4lzszn2m";
+       revision = "6";
+       editedCabalFile = "1wjy6cr4ls9gaisbq97knkw4rzk7aavcwvl4szx1vs7dbrfzrf6x";
        libraryHaskellDepends = [ base bytestring time ];
        description = "POSIX functionality";
        license = lib.licenses.bsd3;
@@ -266653,19 +266826,6 @@ self: {
      }) {};
 
   "unix-compat" = callPackage
-    ({ mkDerivation, base, unix }:
-     mkDerivation {
-       pname = "unix-compat";
-       version = "0.5.2";
-       sha256 = "1a8brv9fax76b1fymslzyghwa6ma8yijiyyhn12msl3i5x24x6k5";
-       revision = "1";
-       editedCabalFile = "1yx38asvjaxxlfs8lpbq0dwd84ynhgi7hw91rn32i1hsmz7yn22m";
-       libraryHaskellDepends = [ base unix ];
-       description = "Portable POSIX-compatibility layer";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "unix-compat_0_5_3" = callPackage
     ({ mkDerivation, base, unix }:
      mkDerivation {
        pname = "unix-compat";
@@ -266674,7 +266834,6 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "Portable POSIX-compatibility layer";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unix-fcntl" = callPackage
@@ -266843,8 +267002,8 @@ self: {
      }:
      mkDerivation {
        pname = "unliftio";
-       version = "0.2.13.1";
-       sha256 = "08q00kqg934y9cpj18kcgzcw3a2wgs6kjvgldgvr2a3vndwn95m0";
+       version = "0.2.14";
+       sha256 = "0gwifnzfcpjhzch06vkx1jkl7jf6j844grd4frl7w513bipb7w0r";
        libraryHaskellDepends = [
          async base bytestring deepseq directory filepath process stm time
          transformers unix unliftio-core
@@ -270007,6 +270166,25 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "vector_0_12_2_0" = callPackage
+    ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit
+     , primitive, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "vector";
+       version = "0.12.2.0";
+       sha256 = "0l3bs8zvw1da9gzqkmavj9vrcxv8hdv9zfw1yqzk6nbqr220paqp";
+       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
+       testHaskellDepends = [
+         base base-orphans HUnit primitive QuickCheck random tasty
+         tasty-hunit tasty-quickcheck template-haskell transformers
+       ];
+       description = "Efficient Arrays";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "vector-algorithms" = callPackage
     ({ mkDerivation, base, bytestring, containers, mwc-random
      , primitive, QuickCheck, vector
@@ -270122,8 +270300,8 @@ self: {
      }:
      mkDerivation {
        pname = "vector-circular";
-       version = "0.1.2";
-       sha256 = "1605yf9q8v6w8kxgsw5g9gmj39w23gzal3qf0mlssr4ay2psvg7y";
+       version = "0.1.3";
+       sha256 = "0xz2ih8x7a5731bbirhmkl7hyarzijnwgvj8zm9wxs1nky8yjyb7";
        libraryHaskellDepends = [
          base deepseq nonempty-vector primitive semigroupoids
          template-haskell vector
@@ -270798,8 +270976,8 @@ self: {
      }:
      mkDerivation {
        pname = "versions";
-       version = "4.0.1";
-       sha256 = "1s8bnxq3asq4wwgbsfvhkl6yih1sic9v8ylimcxwnvmdlh5ks58a";
+       version = "4.0.2";
+       sha256 = "1m7nyjqd0cyxnli5f7rbk1wrh6h7dk65i67k6xp787npf7hi6gdf";
        libraryHaskellDepends = [
          base deepseq hashable megaparsec parser-combinators text
        ];
@@ -270913,29 +271091,31 @@ self: {
      }) {};
 
   "vgrep" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, cabal-file-th
-     , containers, directory, doctest, fingertree, generic-deriving
-     , lens, lifted-base, mmorph, mtl, pipes, pipes-concurrency, process
-     , QuickCheck, stm, tasty, tasty-quickcheck, template-haskell, text
-     , transformers, unix, vty, yaml
+    ({ mkDerivation, aeson, async, attoparsec, base, containers
+     , directory, doctest, fingertree, generic-deriving, lifted-base
+     , microlens-mtl, microlens-platform, mmorph, mtl, pipes
+     , pipes-concurrency, process, QuickCheck, stm, tasty
+     , tasty-quickcheck, template-haskell, text, transformers, unix, vty
+     , yaml
      }:
      mkDerivation {
        pname = "vgrep";
-       version = "0.2.2.0";
-       sha256 = "11kcf59c1raqj4mwwjhr9435sqilgxgmryq1kimgra2j64ldyl3k";
+       version = "0.2.3.0";
+       sha256 = "1zzzmvhqcvgvni96b1zzqjwpmlncsjd08sqllrbp4d4a7j43b9g5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson async attoparsec base containers directory fingertree
-         generic-deriving lens lifted-base mmorph mtl pipes
-         pipes-concurrency process stm text transformers unix vty yaml
+         generic-deriving lifted-base microlens-mtl microlens-platform
+         mmorph mtl pipes pipes-concurrency process stm text transformers
+         unix vty yaml
        ];
        executableHaskellDepends = [
-         async base cabal-file-th containers directory lens mtl pipes
-         pipes-concurrency process template-haskell text vty
+         async base containers directory microlens-platform mtl pipes
+         pipes-concurrency process template-haskell text unix vty
        ];
        testHaskellDepends = [
-         base containers doctest lens QuickCheck tasty tasty-quickcheck text
+         base containers doctest QuickCheck tasty tasty-quickcheck text
        ];
        description = "A pager for grep";
        license = lib.licenses.bsd3;
@@ -275383,8 +275563,8 @@ self: {
        pname = "webp";
        version = "0.1.0.0";
        sha256 = "153icv3911drnjkii2b0csdq3ksavmxpz26zm9xcp24kfbsr6gvk";
-       revision = "1";
-       editedCabalFile = "1gh6k398c8kq9h0cikggcy9jppnw0234c28sy5ikdiir1i0db1p3";
+       revision = "2";
+       editedCabalFile = "0ycp16b2fb4x3h6rs4j2wywy7la1b7ri3419p8mnpf1ipmq6d1vk";
        libraryHaskellDepends = [ base bytestring JuicyPixels vector ];
        libraryPkgconfigDepends = [ libwebp ];
        libraryToolDepends = [ c2hs ];
@@ -279282,6 +279462,8 @@ self: {
        pname = "xml-conduit-stylist";
        version = "2.3.0.0";
        sha256 = "15iznb6xpas8044p03w3vll4vv7zwpcbbrh59ywwjr8m45659p4w";
+       revision = "1";
+       editedCabalFile = "0ydqjrk5q3zzgrwk9cqcjlk3vafzcnxjvb7p74ywm5wfnhmfvmyn";
        libraryHaskellDepends = [
          base containers css-syntax network-uri stylist text
          unordered-containers xml-conduit
@@ -279356,8 +279538,8 @@ self: {
     ({ mkDerivation, base, mtl, transformers, xml }:
      mkDerivation {
        pname = "xml-extractors";
-       version = "0.4.0.2";
-       sha256 = "0ivzl1ikijrbz5mi75rxa340dxf7ilyzlxzka25si91jmjq0a9xa";
+       version = "0.4.0.3";
+       sha256 = "0g1f5yhzipwyny0yrsns03l024yphz8978w05xfk09f5vkrfxb0w";
        libraryHaskellDepends = [ base mtl transformers xml ];
        description = "Extension to the xml package to extract data from parsed xml";
        license = lib.licenses.bsd3;
@@ -280175,8 +280357,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad-extras";
-       version = "0.15.2";
-       sha256 = "1p20zc5k0s05ic2jjx01x0mx88y369dvq2ad43sfjbyf95msi7ls";
+       version = "0.15.3";
+       sha256 = "0nh8v057fjdr3lnx7mdbifw153z6nirx36zfsjz8lc6p45ik0qs9";
        configureFlags = [
          "-f-with_hlist" "-fwith_parsec" "-fwith_split"
        ];

From 5abc9ec3a0796bd5f291488e5b6583015cf9a417 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Jan 2021 13:01:18 +0100
Subject: [PATCH 20/31] haskell-language-server: update overrides to the latest
 version of lsp-test

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4c161c453c5..8d8adb181a5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1417,7 +1417,7 @@ self: super: {
   # https://github.com/haskell/haskell-language-server/issues/610
   # https://github.com/haskell/haskell-language-server/issues/611
   haskell-language-server = dontCheck (super.haskell-language-server.override {
-    lsp-test = dontCheck self.lsp-test_0_11_0_7;
+    lsp-test = dontCheck self.lsp-test_0_12_0_0;
     fourmolu = self.fourmolu_0_3_0_0;
   });
   # 2021-01-20
@@ -1430,7 +1430,7 @@ self: super: {
   # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
   ghcide = doDistribute (unmarkBroken (dontCheck
   (super.ghcide_0_7_0_0.override {
-    lsp-test = dontCheck self.lsp-test_0_11_0_7;
+    lsp-test = dontCheck self.lsp-test_0_12_0_0;
   })));
   refinery = doDistribute super.refinery_0_3_0_0;
   data-tree-print = doJailbreak super.data-tree-print;

From 51dd1502bbc5458add684a4d8b613d8f9a52cd76 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Jan 2021 20:26:52 +0100
Subject: [PATCH 21/31] Drop obsolete override for pandoc; the test suite has
 been fixed.

---
 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 8d8adb181a5..8cc58b9a27f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1377,11 +1377,6 @@ self: super: {
   # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
   pandoc-citeproc = doJailbreak super.pandoc-citeproc;
 
-  # 2021-01-17: Tests are broken because of a version mismatch.
-  # See here: https://github.com/jgm/pandoc/issues/7035
-  # This problem is fixed on master. Remove override when this assert fails.
-  pandoc = assert super.pandoc.version == "2.11.3.2"; dontCheck super.pandoc;
-
   # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
   domain-auth = dontCheck super.domain-auth;
 

From 5726a50602828e042f3ad77b2c7eb757234d4862 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Jan 2021 20:32:16 +0100
Subject: [PATCH 22/31] git-annex: update sha256 hash for the new 8.20210127
 version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8cc58b9a27f..72492d2140e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -64,7 +64,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "0w71kbz127fcli24sxsvd48l5xamwamjwhr18x9alam5cldqkkz1";
+      sha256 = "1m9jfr5b0qwajwwmvcq02263bmnqgcqvpdr06sdwlfz3sxsjfp8r";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

From 1afc215a089164caed3ab970a98d9582c211b8a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Jan 2021 20:37:09 +0100
Subject: [PATCH 23/31] haskell-language-server: don't use the latest version
 of lsp-test for building yet

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 72492d2140e..948a95e0831 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1412,7 +1412,7 @@ self: super: {
   # https://github.com/haskell/haskell-language-server/issues/610
   # https://github.com/haskell/haskell-language-server/issues/611
   haskell-language-server = dontCheck (super.haskell-language-server.override {
-    lsp-test = dontCheck self.lsp-test_0_12_0_0;
+    lsp-test = dontCheck self.lsp-test;
     fourmolu = self.fourmolu_0_3_0_0;
   });
   # 2021-01-20
@@ -1421,12 +1421,10 @@ self: super: {
   apply-refact = super.apply-refact_0_8_2_1;
 
   fourmolu = dontCheck super.fourmolu;
+
   # 1. test requires internet
   # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
-  ghcide = doDistribute (unmarkBroken (dontCheck
-  (super.ghcide_0_7_0_0.override {
-    lsp-test = dontCheck self.lsp-test_0_12_0_0;
-  })));
+  ghcide = doDistribute (unmarkBroken (dontCheck (super.ghcide_0_7_0_0.override { lsp-test = dontCheck self.lsp-test; })));
   refinery = doDistribute super.refinery_0_3_0_0;
   data-tree-print = doJailbreak super.data-tree-print;
 

From 02bf6b02306b740c5599465fd730cf50dc97ac5c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Jan 2021 20:37:49 +0100
Subject: [PATCH 24/31] cryptohash-sha256: the package is marked broken by
 hackage2nix, but it actually compiles fine

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 948a95e0831..1144ee0f823 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -815,8 +815,9 @@ self: super: {
   # https://github.com/haskell-hvr/cryptohash-sha512/pull/5#issuecomment-752796913
   cryptohash-sha512 = dontCheck (doJailbreak super.cryptohash-sha512);
 
-  # Depends on tasty < 1.x, which we don't have.
-  cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
+  # https://github.com/haskell-hvr/cryptohash-sha256/issues/11
+  # Jailbreak is necessary to break out of tasty < 1.x dependency.
+  cryptohash-sha256 = markUnbroken (doJailbreak super.cryptohash-sha256);
 
   # Needs tasty-quickcheck ==0.8.*, which we don't have.
   cryptohash-sha1 = doJailbreak super.cryptohash-sha1;

From e2c0897eba5c56e17d9671bd909ed5173b4115a6 Mon Sep 17 00:00:00 2001
From: Jeff Slight <jslight90@gmail.com>
Date: Fri, 29 Jan 2021 12:13:59 -0800
Subject: [PATCH 25/31] gitlab: 13.7.1 -> 13.7.4 (#108720)

---
 .../applications/version-management/gitlab/data.json | 12 ++++++------
 .../version-management/gitlab/gitaly/default.nix     |  4 ++--
 .../gitlab/gitlab-workhorse/default.nix              |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index c6d4401fde4..9ea6d241060 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
 {
-  "version": "13.7.1",
-  "repo_hash": "13bbi9ps6z8q9di9gni2ckydgfk7pxkaqf0wgx8gfwm80sc7s0km",
+  "version": "13.7.4",
+  "repo_hash": "1ggx76k6941rhccsd585p4h5k4zb87yvg0pmpzhwhh2q4ma2sywm",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v13.7.1-ee",
+  "rev": "v13.7.4-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "13.7.1",
-    "GITLAB_PAGES_VERSION": "1.32.0",
+    "GITALY_SERVER_VERSION": "13.7.4",
+    "GITLAB_PAGES_VERSION": "1.34.0",
     "GITLAB_SHELL_VERSION": "13.14.0",
-    "GITLAB_WORKHORSE_VERSION": "8.58.0"
+    "GITLAB_WORKHORSE_VERSION": "8.58.2"
   }
 }
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index d61c97f9bb1..1b96307457c 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -33,14 +33,14 @@ let
       };
   };
 in buildGoModule rec {
-  version = "13.7.1";
+  version = "13.7.4";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "1zmjll7sdan8kc7bq5vjaiyqwzlh5zmx1g4ql4dqmnwscpn1avjb";
+    sha256 = "1inb7xlv8admzy9q1bgxccbrhks0mmc8lng356h39crj5sgaqkmg";
   };
 
   vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 883753616c9..3e292632d4c 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,13 +3,13 @@
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "8.58.0";
+  version = "8.58.2";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "1642vxxqnpccjzfls3vz4l62kvksk6irwv1dhjcxv1cppbr9hz80";
+    sha256 = "1ks8rla6hm618dxhr41x1ckzk3jxv0f7vl2547f7f1fl3zqna1zp";
   };
 
   vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5";

From 34a21d6f217317d8f9765d4985b0f5f98f5cf349 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Jan 2021 21:25:04 +0100
Subject: [PATCH 26/31] all-cabal-hashes: update to Hackage at
 2021-01-29T18:57:29Z

---
 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 551610c5ad5..581d897702f 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/214ceb3bed92d49a0dffc6c2d8d21b1d0bcc7c25.tar.gz";
-  sha256 = "1m8rm46w9xc8z8dvjg3i0bqpx9630i6ff681dp445q8wv7ji9y2v";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f8773aba1736a7929a7262fdd6217be67f679c98.tar.gz";
+  sha256 = "1flmp0r1isgp8mf85iwiwps6sa3wczb6k0zphprhnvbi2dzg9x87";
 }

From 61fef16594538411b1b24f9bf86e15fb11bde445 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <teto@users.noreply.github.com>
Date: Fri, 29 Jan 2021 21:51:30 +0100
Subject: [PATCH 27/31] vimPlugins.minimap-vim: init at 2021-01-04 (#111150)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/overrides.nix    | 10 ++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 3 files changed, 23 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 7808d346a14..c3743bd67d1 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2302,6 +2302,18 @@ let
     meta.homepage = "https://github.com/vim-scripts/mayansmoke/";
   };
 
+  minimap-vim = buildVimPluginFrom2Nix {
+    pname = "minimap-vim";
+    version = "2021-01-04";
+    src = fetchFromGitHub {
+      owner = "wfxr";
+      repo = "minimap.vim";
+      rev = "3e9ba8aae59441ed82b50b186f608e03aecb4f0e";
+      sha256 = "1z264hr0vbsdc0ffaiflzq952xv4h1g55i08dnlifvpizhqbalv6";
+    };
+    meta.homepage = "https://github.com/wfxr/minimap.vim/";
+  };
+
   mkdx = buildVimPluginFrom2Nix {
     pname = "mkdx";
     version = "2021-01-28";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index fd77676949c..6fefca59271 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -15,6 +15,7 @@
 , nodePackages
 , dasht
 , sqlite
+, code-minimap
 
 # deoplete-khard dependency
 , khard
@@ -243,6 +244,15 @@ self: super: {
     dependencies = with super; [ webapi-vim ];
   });
 
+  minimap-vim = super.minimap-vim.overrideAttrs(old: {
+    preFixup = ''
+      substituteInPlace $out/share/vim-plugins/minimap-vim/plugin/minimap.vim \
+        --replace "code-minimap" "${code-minimap}/bin/code-minimap"
+      substituteInPlace $out/share/vim-plugins/minimap-vim/bin/minimap_generator.sh \
+        --replace "code-minimap" "${code-minimap}/bin/code-minimap"
+    '';
+  });
+
   meson = buildVimPluginFrom2Nix {
     inherit (meson) pname version src;
     preInstall = "cd data/syntax-highlighting/vim";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index c6a153ac80e..02ff84b4618 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -677,6 +677,7 @@ wbthomason/packer.nvim
 weirongxu/coc-explorer
 wellle/targets.vim
 wellle/tmux-complete.vim
+wfxr/minimap.vim
 whonore/Coqtail
 will133/vim-dirdiff
 wincent/command-t

From 2b66bbd84570fcccfae4bbce0fd101c723bb92a0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 28 Jan 2021 21:04:08 +0100
Subject: [PATCH 28/31] tdesktop: 2.5.1 -> 2.5.7

---
 .../instant-messengers/telegram/tdesktop/default.nix     | 6 +++---
 .../instant-messengers/telegram/tdesktop/tg_owt.nix      | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 20da2a65dc2..0f219286744 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -22,12 +22,12 @@ let
 
 in mkDerivation rec {
   pname = "telegram-desktop";
-  version = "2.5.1";
+  version = "2.5.7";
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "1qpap599h2c4hlmr00k82r6138ym4zqrbfpvm97gm97adn3mxk7i";
+    sha256 = "1f6jsdm1kzf8l5zlbmvqz6xa771v2zc9fa92gn8s6d4nb83zr77b";
   };
 
   postPatch = ''
@@ -44,7 +44,7 @@ in mkDerivation rec {
   nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ];
 
   buildInputs = [
-    qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash
+    qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash
     dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
     tl-expected hunspell
     tg_owt
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
index 2853418da0e..b5a6579db57 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
@@ -3,8 +3,8 @@
 }:
 
 let
-  rev = "6eaebec41b34a0a0d98f02892d0cfe6bbcbc0a39";
-  sha256 = "0dbc36j09jmxvznal55hi3qrfyvj4y0ila6347nav9skcmk8fm64";
+  rev = "be23804afce3bb2e80a1d57a7c1318c71b82b7de";
+  sha256 = "0avdxkig8z1ainzyxkm9vmlvkyqbjalwb4h9s9kcail82mnldnhc";
 
 in stdenv.mkDerivation {
   pname = "tg_owt";
@@ -25,5 +25,10 @@ in stdenv.mkDerivation {
     libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf
   ];
 
+  cmakeFlags = [
+    # Building as a shared library isn't officially supported and currently broken:
+    "-DBUILD_SHARED_LIBS=OFF"
+  ];
+
   meta.license = lib.licenses.bsd3;
 }

From 3ee091f951745ef8447665663a9165054de82c66 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Fri, 29 Jan 2021 02:30:04 +0100
Subject: [PATCH 29/31] =?UTF-8?q?osrm-backend:=205.23.0=20=E2=86=92=205.24?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/servers/osrm-backend/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index b76210dd905..c3ca8baaf7c 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -2,18 +2,17 @@
 
 stdenv.mkDerivation rec {
   pname = "osrm-backend";
-  version = "5.23.0";
+  version = "5.24.0";
 
   src = fetchFromGitHub {
     owner  = "Project-OSRM";
     repo   = "osrm-backend";
     rev = "v${version}";
-    sha256 = "sha256-FWfrdnpdx4YPa9l7bPc6QNyqyNvrikdeADSZIixX5vE=";
+    sha256 = "sha256-Srqe6XIF9Fs869Dp25+63ikgO7YlyT0IUJr0qMxunao=";
   };
 
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=pessimizing-move" "-Wno-error=redundant-move" ];
-
   nativeBuildInputs = [ cmake pkg-config ];
+
   buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ];
 
   postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles";

From 19ac92915a78719a1776923c33c9ab3498c38d11 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 30 Jan 2021 00:41:05 +0100
Subject: [PATCH 30/31] tdesktop: 2.5.7 -> 2.5.8

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 0f219286744..7a3638d94f3 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -22,12 +22,12 @@ let
 
 in mkDerivation rec {
   pname = "telegram-desktop";
-  version = "2.5.7";
+  version = "2.5.8";
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "1f6jsdm1kzf8l5zlbmvqz6xa771v2zc9fa92gn8s6d4nb83zr77b";
+    sha256 = "0zj1g24fi4m84p6zj9yk55v8sbhn0jdpdhp33y12d2msz0qwp2cw";
   };
 
   postPatch = ''

From a61c57ae5c9394f9e63913943da547279c23cb2e Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Fri, 29 Jan 2021 18:44:12 -0500
Subject: [PATCH 31/31] spotify: use default libgcrypt / libpng

Instead of overriding `libgcrypt` with the (insecure) `libgcrypt_1_5`
and `libpng` with `libpng12`, use the defaults for those two packages.

Built and checked on my NixOS desktop machine because @dotlambda said he
wouldn't check proprietary software in #111215.

`spotify` was changed to use `libgcrypt_1_5` instead of `libgcrypt` in
commit 165cb05ea5f42866a5b38521a8266f10045d48b2 by @monocell in PR #8157
to address #8156, which found that:

> the current spotify client seems to depend on `libgcrypt.so.11`.
> Pretending with libgcrypt.so.20 produces an error like:
>     ... libgcrypt.so.11: version `GCRYPT_1.2' not found ...

Given that the relevant Spotify client is more than 5 years old, I don't
think we have to worry about this any more. :)

This commit helps #106203, but doesn't close it because `libgcrypt_1_5`
is still used in `staruml`.
---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f823ee0f8be..bec49463f9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24818,8 +24818,6 @@ in
   };
 
   spotify-unwrapped = callPackage ../applications/audio/spotify {
-    libgcrypt = libgcrypt_1_5;
-    libpng = libpng12;
     curl = curl.override {
       sslSupport = false; gnutlsSupport = true;
     };