From 6bfdb6b6bc6304f55a8e235095cde90e6d51eff9 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 1 Mar 2021 08:55:29 +0100
Subject: [PATCH 001/143] brltty: 6.1 -> 6.3

---
 pkgs/tools/misc/brltty/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix
index b71740c325a..8a48835748b 100644
--- a/pkgs/tools/misc/brltty/default.nix
+++ b/pkgs/tools/misc/brltty/default.nix
@@ -6,11 +6,12 @@ assert alsaSupport -> alsaLib != null;
 assert systemdSupport -> systemd != null;
 
 stdenv.mkDerivation rec {
-  name = "brltty-6.1";
+  pname = "brltty";
+  version = "6.3";
 
   src = fetchurl {
-    url = "http://brltty.com/archive/${name}.tar.gz";
-    sha256 = "0nk54chr7z2w579vyiak9xk2avhnvrx7x2l5sk8nyw2zplchkx9q";
+    url = "https://brltty.app/archive/${pname}-${version}.tar.gz";
+    sha256 = "14psxwlvgyi2fj1zh8rfykyjcjaya8xa7yg574bxd8y8n49n8hvb";
   };
 
   nativeBuildInputs = [ pkg-config python3.pkgs.cython ];
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
       It drives the braille display, and provides complete screen review functionality.
       Some speech capability has also been incorporated.
     '';
-    homepage = "http://www.brltty.com/";
+    homepage = "https://brltty.app";
     license = lib.licenses.gpl2;
     maintainers = [ lib.maintainers.bramd ];
     platforms = lib.platforms.all;

From ba27976cf1345c578664377ab479d1c9bf06c383 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 1 Mar 2021 09:00:02 +0100
Subject: [PATCH 002/143] brltty: fix ambiguous license in meta

---
 pkgs/tools/misc/brltty/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix
index 8a48835748b..d39a0ef4102 100644
--- a/pkgs/tools/misc/brltty/default.nix
+++ b/pkgs/tools/misc/brltty/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       Some speech capability has also been incorporated.
     '';
     homepage = "https://brltty.app";
-    license = lib.licenses.gpl2;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ lib.maintainers.bramd ];
     platforms = lib.platforms.all;
   };

From 6d1d1fc6915de56a6324d0f2ff7c97cdaf2c5b2a Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 1 Mar 2021 08:57:03 +0100
Subject: [PATCH 003/143] brltty: install systemd,udev,polkit files

---
 pkgs/tools/misc/brltty/default.nix | 51 +++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix
index d39a0ef4102..90bcc0092d3 100644
--- a/pkgs/tools/misc/brltty/default.nix
+++ b/pkgs/tools/misc/brltty/default.nix
@@ -1,4 +1,5 @@
 { lib, stdenv, fetchurl, pkg-config, python3, bluez
+, tcl, acl, kmod, coreutils, shadow
 , alsaSupport ? stdenv.isLinux, alsaLib ? null
 , systemdSupport ? stdenv.isLinux, systemd ? null }:
 
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "14psxwlvgyi2fj1zh8rfykyjcjaya8xa7yg574bxd8y8n49n8hvb";
   };
 
-  nativeBuildInputs = [ pkg-config python3.pkgs.cython ];
+  nativeBuildInputs = [ pkg-config python3.pkgs.cython tcl ];
   buildInputs = [ bluez ]
     ++ lib.optional alsaSupport alsaLib
     ++ lib.optional systemdSupport systemd;
@@ -33,11 +34,53 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.all;
   };
 
-  makeFlags = [ "PYTHON_PREFIX=$(out)" ];
-
-  preConfigurePhases = [ "preConfigure" ];
+  makeFlags = [
+    "PYTHON_PREFIX=$(out)"
+    "SYSTEMD_UNITS_DIRECTORY=$(out)/lib/systemd/system"
+    "SYSTEMD_USERS_DIRECTORY=$(out)/lib/sysusers.d"
+    "SYSTEMD_FILES_DIRECTORY=$(out)/lib/tmpfiles.d"
+    "UDEV_LIBRARY_DIRECTORY=$(out)/lib/udev"
+    "POLKIT_POLICY_DIR=$(out)/share/polkit-1/actions"
+    "POLKIT_RULE_DIR=$(out)/share/polkit-1/rules.d"
+  ];
+  configureFlags = [
+    "--with-writable-directory=/run/brltty"
+    "--with-updatable-directory=/var/lib/brltty"
+    "--with-api-socket-path=/var/lib/BrlAPI"
+  ];
+  installFlags = [ "install-systemd" "install-udev" "install-polkit" ];
 
   preConfigure = ''
     substituteInPlace configure --replace /sbin/ldconfig ldconfig
+
+    # Some script needs a working tclsh shebang
+    patchShebangs .
+
+    # Skip impure operations
+    substituteInPlace Programs/Makefile.in    \
+      --replace install-writable-directory "" \
+      --replace install-apisoc-directory ""   \
+      --replace install-api-key ""
+  '';
+
+  postInstall = ''
+    # Rewrite absolute paths
+    substituteInPlace $out/bin/brltty-mkuser \
+      --replace '/sbin/nologin' '${shadow}/bin/nologin'
+    (
+      cd $out/lib
+      substituteInPlace systemd/system/brltty@.service \
+        --replace '/usr/lib' "$out/lib" \
+        --replace '/sbin/modprobe' '${kmod}/bin/modprobe'
+      substituteInPlace systemd/system/brltty-device@.service \
+        --replace '/usr/bin/true' '${coreutils}/bin/true'
+      substituteInPlace udev/rules.d/90-brltty-uinput.rules \
+        --replace '/usr/bin/setfacl' '${acl}/bin/setfacl'
+      substituteInPlace tmpfiles.d/brltty.conf \
+        --replace "$out/etc" '/etc'
+
+      # Remove unused commands from udev rules
+      sed '/initctl/d' -i udev/rules.d/90-brltty-device.rules
+    )
   '';
 }

From 6fc8d59b3375de3feb7095a8ef9360beacc78c44 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 1 Mar 2021 18:04:07 +0100
Subject: [PATCH 004/143] brltty: remove asserts for optional features

Assertions can break overriding a package, see issue #73102.
---
 pkgs/tools/misc/brltty/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix
index 90bcc0092d3..e6999fed08a 100644
--- a/pkgs/tools/misc/brltty/default.nix
+++ b/pkgs/tools/misc/brltty/default.nix
@@ -1,10 +1,8 @@
 { lib, stdenv, fetchurl, pkg-config, python3, bluez
 , tcl, acl, kmod, coreutils, shadow
-, alsaSupport ? stdenv.isLinux, alsaLib ? null
-, systemdSupport ? stdenv.isLinux, systemd ? null }:
-
-assert alsaSupport -> alsaLib != null;
-assert systemdSupport -> systemd != null;
+, alsaSupport ? stdenv.isLinux, alsaLib
+, systemdSupport ? stdenv.isLinux, systemd
+}:
 
 stdenv.mkDerivation rec {
   pname = "brltty";

From 13375265e4be43cb23773aed0e810fc0e314ee78 Mon Sep 17 00:00:00 2001
From: Bram <bram@bramd.nl>
Date: Sat, 3 Apr 2021 22:15:33 +0200
Subject: [PATCH 005/143] brltty: fix systemd-wrapper script

- Use absolute paths to logger and udev.
- Pass the absolute path to the brltty binary to the wrapper.
- Include generic USB devices in udev rules.
- Remove pulse-access group from systemd unit and sysusers.
---
 pkgs/tools/misc/brltty/default.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix
index e6999fed08a..c3bdbca7a59 100644
--- a/pkgs/tools/misc/brltty/default.nix
+++ b/pkgs/tools/misc/brltty/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkg-config, python3, bluez
-, tcl, acl, kmod, coreutils, shadow
+, tcl, acl, kmod, coreutils, shadow, util-linux, udev
 , alsaSupport ? stdenv.isLinux, alsaLib
 , systemdSupport ? stdenv.isLinux, systemd
 }:
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
     "SYSTEMD_USERS_DIRECTORY=$(out)/lib/sysusers.d"
     "SYSTEMD_FILES_DIRECTORY=$(out)/lib/tmpfiles.d"
     "UDEV_LIBRARY_DIRECTORY=$(out)/lib/udev"
+    "UDEV_RULES_TYPE=all"
     "POLKIT_POLICY_DIR=$(out)/share/polkit-1/actions"
     "POLKIT_RULE_DIR=$(out)/share/polkit-1/rules.d"
   ];
@@ -70,6 +71,8 @@ stdenv.mkDerivation rec {
       substituteInPlace systemd/system/brltty@.service \
         --replace '/usr/lib' "$out/lib" \
         --replace '/sbin/modprobe' '${kmod}/bin/modprobe'
+      # Ensure the systemd-wrapper script uses the correct path to the brltty binary
+      sed "/^Environment=\"BRLTTY_EXECUTABLE_ARGUMENTS.*/a Environment=\"BRLTTY_EXECUTABLE_PATH=$out/bin/brltty\"" -i systemd/system/brltty@.service
       substituteInPlace systemd/system/brltty-device@.service \
         --replace '/usr/bin/true' '${coreutils}/bin/true'
       substituteInPlace udev/rules.d/90-brltty-uinput.rules \
@@ -79,6 +82,14 @@ stdenv.mkDerivation rec {
 
       # Remove unused commands from udev rules
       sed '/initctl/d' -i udev/rules.d/90-brltty-device.rules
-    )
+      # Remove pulse-access group from systemd unit and sysusers
+      substituteInPlace systemd/system/brltty@.service \
+        --replace 'SupplementaryGroups=pulse-access' '# SupplementaryGroups=pulse-access'
+      substituteInPlace sysusers.d/brltty.conf \
+        --replace 'm brltty pulse-access' '# m brltty pulse-access'
+     )
+     substituteInPlace $out/libexec/brltty/systemd-wrapper \
+       --replace 'logger' "${util-linux}/bin/logger" \
+       --replace 'udevadm' "${udev}/bin/udevadm"
   '';
 }

From da2923b4f82ae5636ad3632ff841732c25f91557 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 1 Mar 2021 12:11:22 +0100
Subject: [PATCH 006/143] nixos/brltty: use upstream units

Upstream has been providing a very thoroughly designed set of systemd units,
udev and polkit rules. With these the brltty daemon is activated
asynchronously via udev, runs as a dedicated user with runtime and state
directories set up using systemd-tmpfiles.

This is much better than the current unit, which runs a single instance
as root and pulls in systemd-udev-settle to wait for the hardware.
---
 nixos/modules/services/hardware/brltty.nix | 57 ++++++++++++----------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/nixos/modules/services/hardware/brltty.nix b/nixos/modules/services/hardware/brltty.nix
index 1266e8f81e5..73056017532 100644
--- a/nixos/modules/services/hardware/brltty.nix
+++ b/nixos/modules/services/hardware/brltty.nix
@@ -5,6 +5,19 @@ with lib;
 let
   cfg = config.services.brltty;
 
+  targets = [
+    "default.target" "multi-user.target"
+    "rescue.target" "emergency.target"
+  ];
+
+  genApiKey = pkgs.writers.writeDash "generate-brlapi-key" ''
+    if ! test -f /etc/brlapi.key; then
+      echo -n generating brlapi key...
+      ${pkgs.brltty}/bin/brltty-genkey -f /etc/brlapi.key
+      echo done
+    fi
+  '';
+
 in {
 
   options = {
@@ -18,33 +31,27 @@ in {
   };
 
   config = mkIf cfg.enable {
-
-    systemd.services.brltty = {
-      description = "Braille Device Support";
-      unitConfig = {
-        Documentation = "http://mielke.cc/brltty/";
-        DefaultDependencies = "no";
-        RequiresMountsFor = "${pkgs.brltty}/var/lib/brltty";
-      };
-      serviceConfig = {
-        ExecStart = "${pkgs.brltty}/bin/brltty --no-daemon";
-        Type = "notify";
-        TimeoutStartSec = 5;
-        TimeoutStopSec = 10;
-        Restart = "always";
-        RestartSec = 30;
-        Nice = -10;
-        OOMScoreAdjust = -900;
-        ProtectHome = "read-only";
-        ProtectSystem = "full";
-        SystemCallArchitectures = "native";
-      };
-      wants = [ "systemd-udev-settle.service" ];
-      after = [ "local-fs.target" "systemd-udev-settle.service" ];
-      before = [ "sysinit.target" ];
-      wantedBy = [ "sysinit.target" ];
+    users.users.brltty = {
+      description = "BRLTTY daemon user";
+      group = "brltty";
+    };
+    users.groups = {
+      brltty = { };
+      brlapi = { };
     };
 
+    systemd.services."brltty@".serviceConfig =
+      { ExecStartPre = "!${genApiKey}"; };
+
+    # Install all upstream-provided files
+    systemd.packages = [ pkgs.brltty ];
+    systemd.tmpfiles.packages = [ pkgs.brltty ];
+    services.udev.packages = [ pkgs.brltty ];
+    environment.systemPackages = [ pkgs.brltty ];
+
+    # Add missing WantedBys (see issue #81138)
+    systemd.paths.brltty.wantedBy = targets;
+    systemd.paths."brltty@".wantedBy = targets;
   };
 
 }

From 0df579f0b90b32a4f36eae5158c37078a3144f0a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Apr 2021 22:01:26 +0200
Subject: [PATCH 007/143] all-cabal-hashes: update to Hackage at
 2021-04-30T19:36:25Z

---
 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 429470f2bf3..d8599c50b1d 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/1aad60ed9679a7597f3fc3515a0fe26fdb896e55.tar.gz";
-  sha256 = "0a7lm1ki8rz7m13x4zxlr1nkd93227xgmxbhvsmrj9fa4nc5bvyy";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/d202e2aff06500ede787ed63544476f6d41e9eb7.tar.gz";
+  sha256 = "00hmclrhr3a2h9vshsl909g0zgymlamx491lkhwr5kgb3qx9sfh2";
 }

From 0906a9383498ee122261f66a47a89de946fc102a Mon Sep 17 00:00:00 2001
From: Niko Pavlinek <niko.pavlinek@gmail.com>
Date: Fri, 30 Apr 2021 23:29:58 +0200
Subject: [PATCH 008/143] haskellPackages.pam: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3965d4cfce8..1a16ce11479 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1790,4 +1790,7 @@ self: super: {
     excludes = ["test/buildtest"];
   });
 
+  # workaround for https://github.com/peti/distribution-nixpkgs/issues/9
+  pam = super.pam.override { inherit (pkgs) pam; };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 21d5934eed5..bf7121f180a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8806,7 +8806,6 @@ broken-packages:
   - Paillier
   - pairing
   - palette
-  - pam
   - pan-os-syslog
   - panda
   - pandoc-citeproc

From c3af83f893cda60c7fd67b3fc5a1085dd5617adc Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 1 May 2021 13:31:26 +0200
Subject: [PATCH 009/143] haskellPackages.database-class-id: unbreak

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1a16ce11479..73ef9fd84dc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1793,4 +1793,8 @@ self: super: {
   # workaround for https://github.com/peti/distribution-nixpkgs/issues/9
   pam = super.pam.override { inherit (pkgs) pam; };
 
+  # Too strict version bounds on base:
+  # https://github.com/obsidiansystems/database-id/issues/1
+  database-id-class = doJailbreak super.database-id-class;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index bf7121f180a..aa880f69ecb 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4649,7 +4649,6 @@ broken-packages:
   - data-util
   - data-validation
   - data-variant
-  - database-id-class
   - database-id-groundhog
   - database-study
   - datadog

From ee30de13b7730342a2bfe720c5877b6abf361172 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 1 May 2021 10:11:08 +0200
Subject: [PATCH 010/143] haskellPackages.hyahtzee: un-mark as broken

Release 0.5 un-broke the package.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index aa880f69ecb..b0a366dc5ed 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7090,7 +7090,6 @@ broken-packages:
   - hxt-pickle-utils
   - hxthelper
   - hxweb
-  - hyahtzee
   - hyakko
   - hybrid
   - hydra-hs

From f3f84855e8fa9b190a14f49c5c6db9e816e72c10 Mon Sep 17 00:00:00 2001
From: hyperfekt <git@hyperfekt.net>
Date: Mon, 4 May 2020 01:01:57 +0200
Subject: [PATCH 011/143] 
 maintainers/scripts/haskell/regenerate-hackage-packages.sh: init

Introduces a script that can be used to update the Nix expressions for

the Haskell package set. In service of that, also

- introduces cabal2nix-latest, which pins the hackage2nix version used

- changes all-cabal-hashes to use fetchFromGitHub

- adds update-hackage.sh & update-cabal2nix-latest.sh & update-stackage.sh maintainer scripts
---
 .../haskell/regenerate-hackage-packages.sh    | 20 ++++++++
 .../haskell/update-cabal2nix-latest.sh        | 17 +++++++
 maintainers/scripts/haskell/update-hackage.sh | 21 ++++++++
 .../scripts/haskell/update-stackage.sh        | 51 +++++++++++++++++++
 pkgs/data/misc/hackage/default.nix            | 10 ++--
 pkgs/data/misc/hackage/pin.json               |  5 ++
 .../haskell-modules/cabal2nix-latest.nix      | 40 +++++++++++++++
 .../haskell-modules/configuration-common.nix  |  4 ++
 .../haskell-modules/hackage-packages.nix      | 34 ++++++++-----
 .../haskell-modules/non-hackage-packages.nix  |  4 ++
 10 files changed, 189 insertions(+), 17 deletions(-)
 create mode 100755 maintainers/scripts/haskell/regenerate-hackage-packages.sh
 create mode 100755 maintainers/scripts/haskell/update-cabal2nix-latest.sh
 create mode 100755 maintainers/scripts/haskell/update-hackage.sh
 create mode 100755 maintainers/scripts/haskell/update-stackage.sh
 create mode 100644 pkgs/data/misc/hackage/pin.json
 create mode 100644 pkgs/development/haskell-modules/cabal2nix-latest.nix

diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
new file mode 100755
index 00000000000..79b93f5b7cb
--- /dev/null
+++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
@@ -0,0 +1,20 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-latest -I nixpkgs=.
+
+# This script is used to regenerate nixpkgs' Haskell package set, using a tool
+# called hackage2nix. hackage2nix looks at
+# pkgs/development/haskell-modules/configuration-hackage2nix.yaml and generates
+# a Nix expression for package version specified there, using the Cabal files
+# from the Hackage database (available under all-cabal-hashes) and its
+# companion tool cabal2nix.
+#
+# Related scripts are update-hackage.sh, for updating the snapshot of the
+# Hackage database used by hackage2nix, and update-cabal2nix-latest.sh,
+# for updating the version of hackage2nix used to perform this task.
+
+set -euo pipefail
+
+extractionDerivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"'
+unpacked_hackage="$(nix-build -E "$extractionDerivation" --no-out-link)"
+
+hackage2nix --hackage "$unpacked_hackage" --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) --nixpkgs "$PWD" --config pkgs/development/haskell-modules/configuration-hackage2nix.yaml
diff --git a/maintainers/scripts/haskell/update-cabal2nix-latest.sh b/maintainers/scripts/haskell/update-cabal2nix-latest.sh
new file mode 100755
index 00000000000..1f22bb1792f
--- /dev/null
+++ b/maintainers/scripts/haskell/update-cabal2nix-latest.sh
@@ -0,0 +1,17 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-latest -I nixpkgs=.
+
+# Updates cabal2nix-latest to the latest master of the nixos/cabal2nix repository.
+# See regenerate-hackage-packages.sh for details on the purpose of this script.
+
+set -euo pipefail
+
+# fetch current master HEAD from Github
+head_info="$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/NixOS/cabal2nix/branches/master)"
+# extract commit hash
+commit="$(jq -r .commit.sha <<< "$head_info")"
+# extract commit timestamp and convert to date
+date="$(date "--date=$(jq -r .commit.commit.committer.date <<< "$head_info")" +%F)"
+# generate nix expression from cabal file, replacing the version with the commit date
+echo '# This file defines cabal2nix-latest, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-latest.nix
+cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-latest.nix
diff --git a/maintainers/scripts/haskell/update-hackage.sh b/maintainers/scripts/haskell/update-hackage.sh
new file mode 100755
index 00000000000..de4b3bc0448
--- /dev/null
+++ b/maintainers/scripts/haskell/update-hackage.sh
@@ -0,0 +1,21 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p nix curl jq nix-prefetch-github -I nixpkgs=.
+
+# See regenerate-hackage-packages.sh for details on the purpose of this script.
+
+set -euo pipefail
+
+pin_file=pkgs/data/misc/hackage/pin.json
+current_commit="$(jq -r .commit $pin_file)"
+head_commit="$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/commercialhaskell/all-cabal-hashes/branches/hackage | jq -r .commit.sha)"
+
+if [ "$current_commit" != "$head_commit" ]; then
+   url="https://github.com/commercialhaskell/all-cabal-hashes/archive/$head_commit.tar.gz"
+   hash="$(nix-prefetch-url "$url")"
+   jq -n \
+     --arg commit "$head_commit" \
+     --arg hash "$hash" \
+     --arg url "$url" \
+     '{commit: $commit, url: $url, sha256: $hash}' \
+     > $pin_file
+fi
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
new file mode 100755
index 00000000000..0e08c02bc2c
--- /dev/null
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -0,0 +1,51 @@
+#! /usr/bin/env bash
+
+set -eu -o pipefail
+
+tmpfile=$(mktemp "update-stackage.XXXXXXX")
+# shellcheck disable=SC2064
+trap "rm ${tmpfile} ${tmpfile}.new" 0
+
+curl -L -s "https://stackage.org/nightly/cabal.config" >"$tmpfile"
+version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.nightly-//p" "$tmpfile")
+
+# Create a simple yaml version of the file.
+sed -r \
+    -e '/^--/d' \
+    -e 's|^constraints:||' \
+    -e 's|^ +|  - |' \
+    -e 's|,$||' \
+    -e '/installed$/d' \
+    -e '/^$/d' \
+    < "${tmpfile}" | sort --ignore-case >"${tmpfile}.new"
+
+# Drop restrictions on some tools where we always want the latest version.
+sed -r \
+    -e '/ cabal-install /d' \
+    -e '/ cabal2nix /d' \
+    -e '/ cabal2spec /d' \
+    -e '/ distribution-nixpkgs /d' \
+    -e '/ git-annex /d' \
+    -e '/ hindent /d' \
+    -e '/ hledger/d' \
+    -e '/ hlint /d' \
+    -e '/ hoogle /d' \
+    -e '/ hopenssl /d' \
+    -e '/ jailbreak-cabal /d' \
+    -e '/ json-autotype/d' \
+    -e '/ language-nix /d' \
+    -e '/ shake /d' \
+    -e '/ ShellCheck /d' \
+    -e '/ stack /d' \
+    -e '/ weeder /d' \
+    < "${tmpfile}.new" > "${tmpfile}"
+
+# Drop the previous configuration ...
+# shellcheck disable=SC1004
+sed -e '/  # Stackage Nightly/,/^$/c \TODO\
+'   -i pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+
+# ... and replace it with the new one.
+sed -e "/TODO/r $tmpfile" \
+    -e "s/TODO/  # Stackage Nightly $version/" \
+    -i pkgs/development/haskell-modules/configuration-hackage2nix.yaml
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index d8599c50b1d..e559281303d 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,10 @@
+# Hackage database snapshot, used by maintainers/scripts/regenerate-hackage-packages.sh
+# and callHackage
 { fetchurl }:
-
+let
+  pin = builtins.fromJSON (builtins.readFile ./pin.json);
+in
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/d202e2aff06500ede787ed63544476f6d41e9eb7.tar.gz";
-  sha256 = "00hmclrhr3a2h9vshsl909g0zgymlamx491lkhwr5kgb3qx9sfh2";
+  inherit (pin) url sha256;
+  passthru.updateScript = ../../../../maintainers/scripts/haskell/update-hackage.sh;
 }
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
new file mode 100644
index 00000000000..f0aef7f5a1c
--- /dev/null
+++ b/pkgs/data/misc/hackage/pin.json
@@ -0,0 +1,5 @@
+{
+  "commit": "f04ff9179e228b67aee1241fe8c6508f91e92fb5",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f04ff9179e228b67aee1241fe8c6508f91e92fb5.tar.gz",
+  "sha256": "11k786zcj21hgjxd2fvfshllxdl1z252x01wvfs16wp66n720wly"
+}
diff --git a/pkgs/development/haskell-modules/cabal2nix-latest.nix b/pkgs/development/haskell-modules/cabal2nix-latest.nix
new file mode 100644
index 00000000000..75c9de963a0
--- /dev/null
+++ b/pkgs/development/haskell-modules/cabal2nix-latest.nix
@@ -0,0 +1,40 @@
+# This file defines cabal2nix-latest, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.
+{ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
+, containers, deepseq, directory, distribution-nixpkgs, fetchzip
+, filepath, hackage-db, hopenssl, hpack, language-nix, lens, lib
+, monad-par, monad-par-extras, mtl, optparse-applicative, pretty
+, process, split, tasty, tasty-golden, text, time, transformers
+, yaml
+}:
+mkDerivation {
+  pname = "cabal2nix";
+  version = "2021-05-01";
+  src = fetchzip {
+    url = "https://github.com/NixOS/cabal2nix/archive/849a3507c849e3e2331efbc5ebe391b70a215ddc.tar.gz";
+    sha256 = "0g91d2bd72l3kkykc47a2raymvgw6427n7cg9ayzvrpldkd0silc";
+  };
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    aeson ansi-wl-pprint base bytestring Cabal containers deepseq
+    directory distribution-nixpkgs filepath hackage-db hopenssl hpack
+    language-nix lens optparse-applicative pretty process split text
+    time transformers yaml
+  ];
+  executableHaskellDepends = [
+    aeson base bytestring Cabal containers directory
+    distribution-nixpkgs filepath hopenssl language-nix lens monad-par
+    monad-par-extras mtl optparse-applicative pretty
+  ];
+  testHaskellDepends = [
+    base Cabal containers directory filepath language-nix lens pretty
+    process tasty tasty-golden
+  ];
+  preCheck = ''
+    export PATH="$PWD/dist/build/cabal2nix:$PATH"
+    export HOME="$TMPDIR/home"
+  '';
+  homepage = "https://github.com/nixos/cabal2nix#readme";
+  description = "Convert Cabal files into Nix build instructions";
+  license = lib.licenses.bsd3;
+}
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 73ef9fd84dc..3b6f5f3ef5e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1797,4 +1797,8 @@ self: super: {
   # https://github.com/obsidiansystems/database-id/issues/1
   database-id-class = doJailbreak super.database-id-class;
 
+  cabal2nix-latest = overrideCabal super.cabal2nix-latest {
+    passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-latest.sh;
+  };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6fa8f733558..86b75b58e1a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -58220,8 +58220,8 @@ self: {
      }:
      mkDerivation {
        pname = "code-conjure";
-       version = "0.1.0";
-       sha256 = "0zagchakak4mrdpgy23d2wfb357dc6fn78fpcjs1ik025wmldy88";
+       version = "0.1.2";
+       sha256 = "14xgpax596wd66kan1nj043n9f4wwn34rr77hgj6wir9aygx9sla";
        libraryHaskellDepends = [
          base express leancheck speculate template-haskell
        ];
@@ -70946,8 +70946,6 @@ self: {
        libraryHaskellDepends = [ aeson base ];
        description = "Class for types with a database id";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "database-id-groundhog" = callPackage
@@ -88332,6 +88330,20 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "express_0_1_8" = callPackage
+    ({ mkDerivation, base, leancheck, template-haskell }:
+     mkDerivation {
+       pname = "express";
+       version = "0.1.8";
+       sha256 = "1g586cv6j79w40bmagqi156rjv09k1whhvpg67p0f707hbq1ph0a";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base leancheck ];
+       benchmarkHaskellDepends = [ base leancheck ];
+       description = "Dynamically-typed expressions involving applications and variables";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "expression-parser" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -145141,8 +145153,6 @@ self: {
        executableHaskellDepends = [ base containers HUnit random ];
        description = "A Yahtzee game implementation in Haskell";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyakko" = callPackage
@@ -195775,8 +195785,6 @@ self: {
        platforms = [
          "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
        ];
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {pam = null;};
 
   "pan-os-syslog" = callPackage
@@ -244539,17 +244547,15 @@ self: {
 
   "sockets-and-pipes" = callPackage
     ({ mkDerivation, aeson, ascii, async, base, blaze-html, bytestring
-     , containers, network, safe-exceptions, stm, text, time
+     , containers, network, pipes, safe-exceptions, stm, text, time
      }:
      mkDerivation {
        pname = "sockets-and-pipes";
-       version = "0.1";
-       sha256 = "02xc2kddcz93d9yqdchml0yh9gypcx64315baj766adgf8np42nv";
-       revision = "4";
-       editedCabalFile = "1lv2zpyblqryr59ii3zvwi5f06vxsgnla1xa14rardhncs36fa8r";
+       version = "0.2";
+       sha256 = "13xc6f525la66k76y515r0dwjqh583zl7z1k4z1w6hraim6kg95v";
        libraryHaskellDepends = [
          aeson ascii async base blaze-html bytestring containers network
-         safe-exceptions stm text time
+         pipes safe-exceptions stm text time
        ];
        description = "Support for the Sockets and Pipes book";
        license = lib.licenses.asl20;
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index 86123d8a70f..7c3c43fd9dc 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -11,6 +11,10 @@ self: super: {
 
   ldgallery-compiler = self.callPackage ../../tools/graphics/ldgallery/compiler { };
 
+  # Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated
+  # from the latest master instead of the current version on Hackage.
+  cabal2nix-latest = self.callPackage ./cabal2nix-latest.nix { };
+
   # https://github.com/channable/vaultenv/issues/1
   vaultenv = self.callPackage ../tools/haskell/vaultenv { };
 

From 10b771c61a02fc9db2047e880388ac9dcefe8f8c Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 1 May 2021 13:24:25 +0200
Subject: [PATCH 012/143] tests.haskell*: move into tests.haskell set

This will make it easier to add all haskell related tests to the haskell
hydra jobset without updating a list of tests in two places.
---
 pkgs/test/default.nix                                       | 3 +--
 pkgs/test/haskell/default.nix                               | 6 ++++++
 .../documentationTarball}/default.nix                       | 0
 .../test/{haskell-shellFor => haskell/shellFor}/default.nix | 0
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/test/haskell/default.nix
 rename pkgs/test/{haskell-documentationTarball => haskell/documentationTarball}/default.nix (100%)
 rename pkgs/test/{haskell-shellFor => haskell/shellFor}/default.nix (100%)

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index b24fc539c93..89656dde292 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -22,8 +22,7 @@ with pkgs;
   cc-wrapper-libcxx-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.libcxxStdenv; };
   stdenv-inputs = callPackage ./stdenv-inputs { };
 
-  haskell-shellFor = callPackage ./haskell-shellFor { };
-  haskell-documentationTarball = callPackage ./haskell-documentationTarball { };
+  haskell = callPackage ./haskell { };
 
   cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
   cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
diff --git a/pkgs/test/haskell/default.nix b/pkgs/test/haskell/default.nix
new file mode 100644
index 00000000000..8171f929311
--- /dev/null
+++ b/pkgs/test/haskell/default.nix
@@ -0,0 +1,6 @@
+{ lib, callPackage }:
+
+lib.recurseIntoAttrs {
+  shellFor = callPackage ./shellFor { };
+  documentationTarball = callPackage ./documentationTarball { };
+}
diff --git a/pkgs/test/haskell-documentationTarball/default.nix b/pkgs/test/haskell/documentationTarball/default.nix
similarity index 100%
rename from pkgs/test/haskell-documentationTarball/default.nix
rename to pkgs/test/haskell/documentationTarball/default.nix
diff --git a/pkgs/test/haskell-shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix
similarity index 100%
rename from pkgs/test/haskell-shellFor/default.nix
rename to pkgs/test/haskell/shellFor/default.nix

From 9a0dc0fa3e19a360d28c8b102611feafad52afbd Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 1 May 2021 13:25:13 +0200
Subject: [PATCH 013/143] tests.haskell.shellFor: replace database-id-class
 with linear

Contrary to database-id-class, linear is part of stackage and actively
maintained, so the test is less likely to fail due to version
constraint issues as it is currently.
---
 pkgs/test/haskell/shellFor/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix
index 9d13e1112cc..eeab231df40 100644
--- a/pkgs/test/haskell/shellFor/default.nix
+++ b/pkgs/test/haskell/shellFor/default.nix
@@ -1,22 +1,22 @@
 { lib, haskellPackages, cabal-install }:
 
 (haskellPackages.shellFor {
-  packages = p: [ p.database-id-class p.constraints ];
+  packages = p: [ p.constraints p.linear ];
   nativeBuildInputs = [ cabal-install ];
   phases = [ "unpackPhase" "buildPhase" "installPhase" ];
   unpackPhase = ''
     sourceRoot=$(pwd)/scratch
     mkdir -p "$sourceRoot"
     cd "$sourceRoot"
-    tar -xf ${haskellPackages.database-id-class.src}
     tar -xf ${haskellPackages.constraints.src}
-    cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints*"} cabal.project
+    tar -xf ${haskellPackages.linear.src}
+    cp ${builtins.toFile "cabal.project" "packages: constraints* linear*"} cabal.project
   '';
   buildPhase = ''
     export HOME=$(mktemp -d)
     mkdir -p $HOME/.cabal
     touch $HOME/.cabal/config
-    cabal v2-build --offline --verbose database-id-class constraints --ghc-options="-O0 -j$NIX_BUILD_CORES"
+    cabal v2-build --offline --verbose constraints linear --ghc-options="-O0 -j$NIX_BUILD_CORES"
   '';
   installPhase = ''
     touch $out

From 1bfa5e12913a04404d777a31fed5d4c5743865e6 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 1 May 2021 13:36:24 +0200
Subject: [PATCH 014/143] tests.haskell.shellFor: use writeText instead of
 toFile

---
 pkgs/test/haskell/shellFor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix
index eeab231df40..37ad2e90d89 100644
--- a/pkgs/test/haskell/shellFor/default.nix
+++ b/pkgs/test/haskell/shellFor/default.nix
@@ -1,4 +1,4 @@
-{ lib, haskellPackages, cabal-install }:
+{ lib, writeText, haskellPackages, cabal-install }:
 
 (haskellPackages.shellFor {
   packages = p: [ p.constraints p.linear ];
@@ -10,7 +10,7 @@
     cd "$sourceRoot"
     tar -xf ${haskellPackages.constraints.src}
     tar -xf ${haskellPackages.linear.src}
-    cp ${builtins.toFile "cabal.project" "packages: constraints* linear*"} cabal.project
+    cp ${writeText "cabal.project" "packages: constraints* linear*"} cabal.project
   '';
   buildPhase = ''
     export HOME=$(mktemp -d)

From 598adfc53ca39e05b4bb51bcdd508abef1fdaf97 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 1 May 2021 13:33:24 +0200
Subject: [PATCH 015/143] CODEOWNERS: notify for haskell specific tests

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index fc116b32d5f..8c971b3921d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -84,6 +84,7 @@
 /pkgs/development/haskell-modules/default.nix	      @cdepillabout @sternenseemann
 /pkgs/development/haskell-modules/generic-builder.nix @cdepillabout @sternenseemann
 /pkgs/development/haskell-modules/hoogle.nix	      @cdepillabout @sternenseemann
+/pkgs/test/haskell	@cdepillabout @sternenseemann
 
 # Perl
 /pkgs/development/interpreters/perl @volth @stigtsp

From 111151c4bc57287ef449eb4f06083d6aedccaa19 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 1 May 2021 13:40:03 +0200
Subject: [PATCH 016/143] labeler: tag haskell tests as topic: haskell

---
 .github/labeler.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 1b0392692ed..b9b9954a2be 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -54,6 +54,7 @@
   - pkgs/development/haskell-modules/**/*
   - pkgs/development/tools/haskell/**/*
   - pkgs/top-level/haskell-packages.nix
+  - pkgs/test/haskell/**/*
 
 "6.topic: kernel":
   - pkgs/build-support/kernel/**/*

From d725ac794286e3464d80f5bce69da98ff4b2ebbf Mon Sep 17 00:00:00 2001
From: Isaac Shapira <fresheyeball@protonmail.com>
Date: Fri, 23 Apr 2021 13:55:38 -0600
Subject: [PATCH 017/143] Add haskell.lib.setBuiltTarget, and support non
 library compiling of a single target

---
 .../haskell-modules/generic-builder.nix       |  7 ++++-
 pkgs/development/haskell-modules/lib.nix      | 10 +++++++
 pkgs/test/haskell/default.nix                 |  1 +
 pkgs/test/haskell/setBuildTarget/Bar.hs       |  4 +++
 pkgs/test/haskell/setBuildTarget/Foo.hs       |  4 +++
 pkgs/test/haskell/setBuildTarget/Setup.hs     |  2 ++
 pkgs/test/haskell/setBuildTarget/default.nix  | 26 +++++++++++++++++++
 .../haskell-setBuildTarget.cabal              | 16 ++++++++++++
 8 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/test/haskell/setBuildTarget/Bar.hs
 create mode 100644 pkgs/test/haskell/setBuildTarget/Foo.hs
 create mode 100644 pkgs/test/haskell/setBuildTarget/Setup.hs
 create mode 100644 pkgs/test/haskell/setBuildTarget/default.nix
 create mode 100644 pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index faf80da0c7d..2f9127e30f3 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -464,7 +464,12 @@ stdenv.mkDerivation ({
   installPhase = ''
     runHook preInstall
 
-    ${if !isLibrary then "${setupCommand} install" else ''
+    ${if !isLibrary && buildTarget == "" then "${setupCommand} install"
+      # ^^ if the project is not a library, and no build target is specified, we can just use "install".
+      else if !isLibrary then "${setupCommand} copy ${buildTarget}"
+      # ^^ if the project is not a library, and we have a build target, then use "copy" to install
+      # just the target specified; "install" will error here, since not all targets have been built.
+    else ''
       ${setupCommand} copy
       local packageConfDir="$out/lib/${ghc.name}/package.conf.d"
       local packageConfFile="$packageConfDir/${pname}-${version}.conf"
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 1537cd6466c..682953c3ce9 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -196,6 +196,16 @@ rec {
   appendPatch = drv: x: appendPatches drv [x];
   appendPatches = drv: xs: overrideCabal drv (drv: { patches = (drv.patches or []) ++ xs; });
 
+  /* Set a specific build target instead of compiling all targets in the package.
+   * For example, imagine we have a .cabal file with a library, and 2 executables "dev" and "server".
+   * We can build only "server" and not wait on the compilation of "dev" by useing setBuildTarget as follows:
+   *
+   *   setBuildTarget (callCabal2nix "thePackageName" thePackageSrc {}) "server"
+   *
+   */
+  setBuildTargets = drv: xs: overrideCabal drv (drv: { buildTarget = lib.concatStringsSep " " xs; });
+  setBuildTarget = drv: x: setBuildTargets drv [x];
+
   doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; });
   dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; });
 
diff --git a/pkgs/test/haskell/default.nix b/pkgs/test/haskell/default.nix
index 8171f929311..eb389f4051f 100644
--- a/pkgs/test/haskell/default.nix
+++ b/pkgs/test/haskell/default.nix
@@ -3,4 +3,5 @@
 lib.recurseIntoAttrs {
   shellFor = callPackage ./shellFor { };
   documentationTarball = callPackage ./documentationTarball { };
+  setBuildTarget = callPackage ./setBuildTarget { };
 }
diff --git a/pkgs/test/haskell/setBuildTarget/Bar.hs b/pkgs/test/haskell/setBuildTarget/Bar.hs
new file mode 100644
index 00000000000..010014082c7
--- /dev/null
+++ b/pkgs/test/haskell/setBuildTarget/Bar.hs
@@ -0,0 +1,4 @@
+module Main where
+
+main :: IO ()
+main = putStrLn "Hello, Bar!"
diff --git a/pkgs/test/haskell/setBuildTarget/Foo.hs b/pkgs/test/haskell/setBuildTarget/Foo.hs
new file mode 100644
index 00000000000..fec7bb11fe6
--- /dev/null
+++ b/pkgs/test/haskell/setBuildTarget/Foo.hs
@@ -0,0 +1,4 @@
+module Main where
+
+main :: IO ()
+main = putStrLn "Hello, Foo!"
diff --git a/pkgs/test/haskell/setBuildTarget/Setup.hs b/pkgs/test/haskell/setBuildTarget/Setup.hs
new file mode 100644
index 00000000000..9a994af677b
--- /dev/null
+++ b/pkgs/test/haskell/setBuildTarget/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix
new file mode 100644
index 00000000000..161cecd9ec3
--- /dev/null
+++ b/pkgs/test/haskell/setBuildTarget/default.nix
@@ -0,0 +1,26 @@
+{ pkgs, haskellPackages }: with pkgs.haskell.lib;
+
+
+let
+  drv     = haskellPackages.callCabal2nix "haskell-setBuildTarget" ./. {};
+  test    = target: excluded:
+
+    let only = setBuildTarget drv target;
+    in ''
+         if [[ ! -f "${only}/bin/${target}" ]]; then
+           echo "${target} was not built"
+           exit 1
+         fi
+
+         if [[ -f "${only}/bin/${excluded}" ]]; then
+           echo "${excluded} was built, when it should not have been"
+           exit 1
+         fi
+     '';
+
+in pkgs.runCommand "test haskell.lib.setBuildTarget" {} ''
+  ${test "foo" "bar"}
+  ${test "bar" "foo"}
+  touch "$out"
+''
+
diff --git a/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal b/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal
new file mode 100644
index 00000000000..7395e139451
--- /dev/null
+++ b/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal
@@ -0,0 +1,16 @@
+cabal-version:       >=1.10
+name:                haskell-setBuildTarget
+version:             0.1.0.0
+author:              Isaac Shapira
+maintainer:          fresheyeball@protonmail.com
+build-type:          Simple
+
+executable foo
+  main-is:             Foo.hs
+  build-depends:       base
+  default-language:    Haskell2010
+
+executable bar
+  main-is:             Bar.hs
+  build-depends:       base
+  default-language:    Haskell2010

From ba354d5ad802cdba3bf3d7436385020fa07a30b9 Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Sun, 25 Apr 2021 16:16:25 +0900
Subject: [PATCH 018/143] haskell.lib.setBuildTargets: fix spelling in doc
 string

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

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 682953c3ce9..b0d036e0e3e 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -198,7 +198,7 @@ rec {
 
   /* Set a specific build target instead of compiling all targets in the package.
    * For example, imagine we have a .cabal file with a library, and 2 executables "dev" and "server".
-   * We can build only "server" and not wait on the compilation of "dev" by useing setBuildTarget as follows:
+   * We can build only "server" and not wait on the compilation of "dev" by using setBuildTarget as follows:
    *
    *   setBuildTarget (callCabal2nix "thePackageName" thePackageSrc {}) "server"
    *

From 88d9f2419e58b1570e0fed5d9a871f72b9423855 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Fri, 30 Apr 2021 12:12:07 +0900
Subject: [PATCH 019/143] tests.haskell-setBuildTarget: inline haskell package
 def to avoid IFD

---
 pkgs/test/haskell/setBuildTarget/default.nix | 22 +++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix
index 161cecd9ec3..b1335e2a74c 100644
--- a/pkgs/test/haskell/setBuildTarget/default.nix
+++ b/pkgs/test/haskell/setBuildTarget/default.nix
@@ -1,11 +1,23 @@
-{ pkgs, haskellPackages }: with pkgs.haskell.lib;
-
+{ pkgs, haskellPackages }:
 
 let
-  drv     = haskellPackages.callCabal2nix "haskell-setBuildTarget" ./. {};
-  test    = target: excluded:
+  # This can be regenerated by running `cabal2nix .` in the current directory.
+  pkgDef =
+    { mkDerivation, base, lib }:
+      mkDerivation {
+        pname = "haskell-setBuildTarget";
+        version = "0.1.0.0";
+        src = ./.;
+        isLibrary = false;
+        isExecutable = true;
+        executableHaskellDepends = [ base ];
+        license = lib.licenses.bsd3;
+      };
 
-    let only = setBuildTarget drv target;
+  drv = haskellPackages.callPackage pkgDef {};
+
+  test  = target: excluded:
+    let only = pkgs.haskell.lib.setBuildTarget drv target;
     in ''
          if [[ ! -f "${only}/bin/${target}" ]]; then
            echo "${target} was not built"

From 95908a23cbda57449a29d8c62f230e097f00a8af Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 2 May 2021 14:50:37 +0200
Subject: [PATCH 020/143] CODEOWNERS: Haskell files. Add maralorn, declutter

---
 .github/CODEOWNERS | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8c971b3921d..ce3062ec440 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -79,12 +79,9 @@
 /pkgs/development/tools/poetry2nix @adisbladis
 
 # Haskell
-/pkgs/development/compilers/ghc                       @cdepillabout @sternenseemann
-/pkgs/development/haskell-modules		      @cdepillabout @sternenseemann
-/pkgs/development/haskell-modules/default.nix	      @cdepillabout @sternenseemann
-/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout @sternenseemann
-/pkgs/development/haskell-modules/hoogle.nix	      @cdepillabout @sternenseemann
-/pkgs/test/haskell	@cdepillabout @sternenseemann
+/pkgs/development/compilers/ghc    @cdepillabout @sternenseemann @maralorn
+/pkgs/development/haskell-modules  @cdepillabout @sternenseemann @maralorn
+/pkgs/test/haskell                 @cdepillabout @sternenseemann @maralorn
 
 # Perl
 /pkgs/development/interpreters/perl @volth @stigtsp

From 4b907c88918a2e08ce69a3db777af522391102af Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Tue, 16 Mar 2021 19:43:47 +0700
Subject: [PATCH 021/143] mmv: 1.01b -> 2.0

---
 pkgs/tools/misc/mmv/default.nix | 53 +++++++++++----------------------
 1 file changed, 17 insertions(+), 36 deletions(-)

diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix
index ed45c268203..8c242a5c83e 100644
--- a/pkgs/tools/misc/mmv/default.nix
+++ b/pkgs/tools/misc/mmv/default.nix
@@ -1,49 +1,30 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, gengetopt, m4, gnupg
+, git, perl, autoconf, automake, help2man, boehmgc }:
 
 stdenv.mkDerivation rec {
   pname = "mmv";
-  version = "1.01b";
+  version = "2.0";
 
-  src = fetchurl {
-    url = "mirror://debian/pool/main/m/mmv/mmv_${version}.orig.tar.gz";
-    sha256 = "0399c027ea1e51fd607266c1e33573866d4db89f64a74be8b4a1d2d1ff1fdeef";
+  src = fetchFromGitHub {
+    owner = "rrthomas";
+    repo = "mmv";
+    rev = "v${version}";
+    sha256 = "sha256-MmxDk3PBtvK/thrh6x67M+nMdCDlOQQHkREqLmzF2Mk=";
+    fetchSubmodules = true;
   };
 
-  hardeningDisable = [ "format" ];
-
-  patches = [
-    # Use Debian patched version, as upstream is no longer maintained and it
-    # contains a _lot_ of fixes.
-    (fetchurl {
-      url = "mirror://debian/pool/main/m/mmv/mmv_${version}-15.diff.gz";
-      sha256 = "9ad3e3d47510f816b4a18bae04ea75913588eec92248182f85dd09bc5ad2df13";
-    })
-  ];
-
-  postPatch = ''
-    sed -i \
-      -e 's/^\s*LDFLAGS\s*=\s*-s\s*-N/LDFLAGS = -s/' \
-      -e "s|/usr/bin|$out/bin|" \
-      -e "s|/usr/man|$out/share/man|" \
-      Makefile
+  preConfigure = ''
+    ./bootstrap
   '';
 
-  preInstall = ''
-    mkdir -p "$out/bin" "$out/share/man/man1"
-  '';
-
-  postInstall = ''
-    for variant in mcp mad mln
-    do
-      ln -s mmv "$out/bin/$variant"
-      ln -s mmv.1 "$out/share/man/man1/$variant.1"
-    done
-  '';
+  nativeBuildInputs = [ gengetopt m4 git gnupg perl autoconf automake help2man pkg-config ];
+  buildInputs = [ boehmgc ];
 
   meta = {
-    homepage = "http://linux.maruhn.com/sec/mmv.html";
+    homepage = "https://github.com/rrthomas/mmv";
     description = "Utility for wildcard renaming, copying, etc";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ siraben ];
   };
 }

From d48f259ec7e4e161f66d3c52d4c1166ca893b3ce Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Mon, 3 May 2021 15:14:49 +0900
Subject: [PATCH 022/143] CODEOWNERS: make sure all Haskell files are present

---
 .github/CODEOWNERS  | 9 ++++++---
 .github/labeler.yml | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ce3062ec440..6cde8c6fde0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -79,9 +79,12 @@
 /pkgs/development/tools/poetry2nix @adisbladis
 
 # Haskell
-/pkgs/development/compilers/ghc    @cdepillabout @sternenseemann @maralorn
-/pkgs/development/haskell-modules  @cdepillabout @sternenseemann @maralorn
-/pkgs/test/haskell                 @cdepillabout @sternenseemann @maralorn
+/doc/languages-frameworks/haskell.section.md  @cdepillabout @sternenseemann @maralorn
+/maintainers/scripts/haskell                  @cdepillabout @sternenseemann @maralorn
+/pkgs/development/compilers/ghc               @cdepillabout @sternenseemann @maralorn
+/pkgs/development/haskell-modules             @cdepillabout @sternenseemann @maralorn
+/pkgs/test/haskell                            @cdepillabout @sternenseemann @maralorn
+/pkgs/top-level/haskell-packages.nix          @cdepillabout @sternenseemann @maralorn
 
 # Perl
 /pkgs/development/interpreters/perl @volth @stigtsp
diff --git a/.github/labeler.yml b/.github/labeler.yml
index b9b9954a2be..ef95fe66832 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -50,11 +50,12 @@
 
 "6.topic: haskell":
   - doc/languages-frameworks/haskell.section.md
+  - maintainers/scripts/haskell/**/*
   - pkgs/development/compilers/ghc/**/*
   - pkgs/development/haskell-modules/**/*
   - pkgs/development/tools/haskell/**/*
-  - pkgs/top-level/haskell-packages.nix
   - pkgs/test/haskell/**/*
+  - pkgs/top-level/haskell-packages.nix
 
 "6.topic: kernel":
   - pkgs/build-support/kernel/**/*

From 9a2e728831c82af61f89058cf876205250b28ae5 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 2 May 2021 13:07:49 +0200
Subject: [PATCH 023/143] ghcWithPackages: set withLLVM if hostPlatform is not
 x86_64

We also don't add LLVM on PowerPC as GHC should have the ability to
generate native code for that platform itself.

Resolves #116235.
---
 pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 0e566aa2e6e..fdcd40fc99b 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, ghc, llvmPackages, packages, symlinkJoin, makeWrapper
-, withLLVM ? false
+, withLLVM ? !(stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isPowerPC)
 , postBuild ? ""
 , ghcLibdir ? null # only used by ghcjs, when resolving plugins
 }:

From 387387aa20d40acdd94a8e693a108d723f8cd018 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 2 May 2021 09:59:48 +0200
Subject: [PATCH 024/143] lib/maintainers: add haskell team

---
 maintainers/team-list.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 1318ac2a586..39a7231a9ee 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -96,6 +96,15 @@ with lib.maintainers; {
     scope = "Maintain GNOME desktop environment and platform.";
   };
 
+  haskell = {
+    members = [
+      maralorn
+      cdepillabout
+      sternenseemann
+    ];
+    scope = "Maintain Haskell packages and infrastructure.";
+  };
+
   home-assistant = {
     members = [
       fab

From ef9631e5232f43973c37e7664dd814f96bef1cc4 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 1 May 2021 18:00:40 +0200
Subject: [PATCH 025/143] pkgs/top-level: init expression for haskell-updates
 jobset

release-haskell.nix is intended to be a replacement for
https://github.com/peti/ci/blob/master/haskell-nixpkgs.nix
which is currently the main expression for the haskell-updates jobset
on hydra (in the nixpkgs project).

It has the same jobs as the old haskell-nixpkgs.nix file:

* haskellPackages.*
* haskell.compiler.*
* Some extra haskell packages for certain compilers

The following jobs are new:

* tests.haskell.*
* A manually maintained list of top-level haskell packages (most of them
  using justStaticExecutables)
* An aggregate job which is intended to aid merging the haskell-updates
  branch: It holds an arbitrary list of haskell-related packages and
  tests we intend have working at all times. This is still somewhat
  incomplete and should be extendend in the future.

Additionally a lot of refactoring has been done and some unnecessary
code has been eliminated. Due to the increased set of jobs and my
ideas of convenience however, the code size has grown overall.
I've tried document the individual parts and would be happy about
feedback in general.

One future improvement could be making adding top-level haskell packages
more convenient and adding them all to the aggregate job automatically.
---
 .github/CODEOWNERS                 |   1 +
 .github/labeler.yml                |   1 +
 pkgs/top-level/release-haskell.nix | 201 +++++++++++++++++++++++++++++
 3 files changed, 203 insertions(+)
 create mode 100644 pkgs/top-level/release-haskell.nix

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6cde8c6fde0..256abac7b41 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -84,6 +84,7 @@
 /pkgs/development/compilers/ghc               @cdepillabout @sternenseemann @maralorn
 /pkgs/development/haskell-modules             @cdepillabout @sternenseemann @maralorn
 /pkgs/test/haskell                            @cdepillabout @sternenseemann @maralorn
+/pkgs/top-level/release-haskell.nix           @cdepillabout @sternenseemann @maralorn
 /pkgs/top-level/haskell-packages.nix          @cdepillabout @sternenseemann @maralorn
 
 # Perl
diff --git a/.github/labeler.yml b/.github/labeler.yml
index ef95fe66832..3637d05f48b 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -56,6 +56,7 @@
   - pkgs/development/tools/haskell/**/*
   - pkgs/test/haskell/**/*
   - pkgs/top-level/haskell-packages.nix
+  - pkgs/top-level/release-haskell.nix
 
 "6.topic: kernel":
   - pkgs/build-support/kernel/**/*
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
new file mode 100644
index 00000000000..ac89af71b51
--- /dev/null
+++ b/pkgs/top-level/release-haskell.nix
@@ -0,0 +1,201 @@
+/*
+  To debug this expression you can use `hydra-eval-jobs` from
+  `pkgs.hydra-unstable` which prints the jobset description
+  to `stdout`:
+
+  $ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix
+*/
+{ supportedSystems ? [ "x86_64-linux" ] }:
+
+let
+
+  releaseLib = import ./release-lib.nix {
+    inherit supportedSystems;
+  };
+
+  inherit (releaseLib)
+    pkgs
+    packagePlatforms
+    mapTestOn
+    aggregate
+    ;
+
+  inherit (pkgs) lib;
+
+  # helper function which traverses a (nested) set
+  # of derivations produced by mapTestOn and flattens
+  # it to a list of derivations suitable to be passed
+  # to `releaseTools.aggregate` as constituents.
+  accumulateDerivations = jobList:
+    lib.concatMap (
+      attrs:
+        if lib.isDerivation attrs
+        then [ attrs ]
+        else if lib.isAttrs attrs
+        then accumulateDerivations (lib.attrValues attrs)
+        else []
+    ) jobList;
+
+  # names of all subsets of `pkgs.haskell.packages`
+  compilerNames = lib.mapAttrs (name: _: name) pkgs.haskell.packages;
+
+  # list of all compilers to test specific packages on
+  all = with compilerNames; [
+    ghc884
+    ghc8104
+    ghc901
+  ];
+
+  # packagePlatforms applied to `haskell.packages.*`
+  compilerPlatforms = lib.mapAttrs
+    (_: v: packagePlatforms v)
+    pkgs.haskell.packages;
+
+  # This function lets you specify specific packages
+  # which are to be tested on a list of specific GHC
+  # versions and returns a job set for all specified
+  # combinations. See `jobs` below for an example.
+  versionedCompilerJobs = config: mapTestOn {
+    haskell.packages =
+      (lib.mapAttrs (
+        ghc: jobs:
+        lib.filterAttrs (
+          jobName: platforms:
+          lib.elem ghc (config."${jobName}" or [])
+        ) jobs
+      ) compilerPlatforms);
+  };
+
+  # hydra jobs for `pkgs` of which we import a subset of
+  pkgsPlatforms = packagePlatforms pkgs // {
+    gitAndTools = packagePlatforms pkgs.gitAndTools;
+  };
+
+  jobs = mapTestOn {
+    haskellPackages = packagePlatforms pkgs.haskellPackages;
+    haskell.compiler = packagePlatforms pkgs.haskell.compiler;
+
+    tests.haskell = packagePlatforms pkgs.tests.haskell;
+
+    # top-level haskell packages
+    inherit (pkgsPlatforms)
+      bench
+      cabal-install
+      cabal2nix
+      cachix
+      darcs
+      dhall
+      dhall-bash
+      dhall-docs
+      dhall-lsp-server
+      dhall-json
+      dhall-nix
+      dhall-text
+      elm2nix
+      fffuu
+      futhark
+      glirc
+      hadolint
+      haskell-ci
+      haskell-language-server
+      hasura-graphql-engine
+      hinit
+      hledger
+      hledger-iadd
+      hledger-interest
+      hledger-ui
+      hledger-web
+      hlint
+      hpack
+      icepeak
+      koka
+      krank
+      madlang
+      matterhorn
+      neuron-notes
+      niv
+      nix-delegate
+      nix-deploy
+      nix-diff
+      nix-linter
+      nix-output-monitor
+      nix-tree
+      nixfmt
+      pandoc
+      place-cursor-at
+      shake
+      shellcheck
+      spacecookie
+      splot
+      stack
+      stack2nix
+      stutter
+      stylish-haskell
+      taskell
+      tweet-hs
+      update-nix-fetchgit
+      uuagc
+      wstunnel
+      ;
+
+    gitAndTools.git-annex = pkgsPlatforms.gitAndTools.git-annex;
+  } // versionedCompilerJobs {
+    # Packages which should be checked on more than the
+    # default GHC version. This list can be used to test
+    # the state of the package set with newer compilers
+    # and to confirm that critical packages for the
+    # package sets (like Cabal, jailbreak-cabal) are
+    # working as expected.
+    cabal-install = all;
+    Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ];
+    funcmp = all;
+    haskell-language-server = all;
+    hoogle = all;
+    hsdns = all;
+    jailbreak-cabal = all;
+    language-nix = all;
+    nix-paths = all;
+    titlecase = all;
+  } // {
+    mergeable = pkgs.releaseTools.aggregate {
+      name = "haskell-updates-mergeable";
+      meta = {
+        description = ''
+          Critical haskell packages that should work at all times,
+          serves as minimum requirement for an update merge
+        '';
+        maintainers = lib.teams.haskell.members;
+      };
+      constituents = accumulateDerivations [
+        # haskell specific tests
+        jobs.tests.haskell
+        # important top-level packages
+        jobs.cabal-install
+        jobs.cabal2nix
+        jobs.cachix
+        jobs.darcs
+        jobs.haskell-language-server
+        jobs.hledger
+        jobs.hledger-ui
+        jobs.hpack
+        jobs.niv
+        jobs.pandoc
+        jobs.stack
+        jobs.stylish-haskell
+        # important haskell (library) packages
+        jobs.haskellPackages.cabal-plan
+        jobs.haskellPackages.distribution-nixpkgs
+        jobs.haskellPackages.hackage-db
+        jobs.haskellPackages.policeman
+        jobs.haskellPackages.xmonad
+        jobs.haskellPackages.xmonad-contrib
+        # haskell packages maintained by @peti
+        # imported from the old hydra jobset
+        jobs.haskellPackages.hopenssl
+        jobs.haskellPackages.hsemail
+        jobs.haskellPackages.hsyslog
+      ];
+    };
+  };
+
+in jobs

From 233682cf1e5b06f2d31df3657172690fbda5372d Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 1 May 2021 23:37:42 +0200
Subject: [PATCH 026/143] pkgs/release-haskell.nix: add aggregate job of all
 pkgs with maintainers

---
 pkgs/top-level/release-haskell.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index ac89af71b51..bf09485fa0d 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -71,6 +71,12 @@ let
     gitAndTools = packagePlatforms pkgs.gitAndTools;
   };
 
+  # names of packages in an attribute set that are maintained
+  maintainedPkgNames = set: builtins.attrNames
+    (lib.filterAttrs (
+      _: v: builtins.length (v.meta.maintainers or []) > 0
+    ) set);
+
   jobs = mapTestOn {
     haskellPackages = packagePlatforms pkgs.haskellPackages;
     haskell.compiler = packagePlatforms pkgs.haskell.compiler;
@@ -196,6 +202,17 @@ let
         jobs.haskellPackages.hsyslog
       ];
     };
+    maintained = pkgs.releaseTools.aggregate {
+      name = "maintained-haskell-packages";
+      meta = {
+        description = "Aggregate jobset of all haskell packages with a maintainer";
+        maintainers = lib.teams.haskell.members;
+      };
+      constituents = accumulateDerivations
+        (builtins.map
+          (name: jobs.haskellPackages."${name}")
+          (maintainedPkgNames pkgs.haskellPackages));
+    };
   };
 
 in jobs

From 752f4a2069d99120edeb4623152601a05e4ee772 Mon Sep 17 00:00:00 2001
From: Matt Christ <matt@christ.systems>
Date: Mon, 3 May 2021 14:57:27 -0500
Subject: [PATCH 027/143] emacs pkgs: update melpa recipes

---
 .../emacs-modes/recipes-archive-melpa.json    | 4273 +++++++++--------
 1 file changed, 2319 insertions(+), 1954 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index b24f79ed260..974b4aa1a41 100644
--- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -34,8 +34,8 @@
     20201121,
     1210
    ],
-   "commit": "996f822a7c6a7ff7caf49ee537e92c0d01be1f9c",
-   "sha256": "0fij6gz4188g7dr3gip1w5bc1947j45gf2xc2xl8gyg6hb9c7ycq"
+   "commit": "eb4d1ec4b667040429aa496838f758823dc55788",
+   "sha256": "0llngx5ccy2v2ppbydg8nmkz4fpv5vz8knj5i7bq2mvf6rsid8jx"
   },
   "stable": {
    "version": [
@@ -198,19 +198,19 @@
   "repo": "ymarco/auto-activating-snippets",
   "unstable": {
    "version": [
-    20210316,
-    2027
+    20210417,
+    1134
    ],
-   "commit": "e2b3edafd7aafa8c47833a70984d7404c607626c",
-   "sha256": "0xg651vfjnq5dywg855wf7ld34gnfspql4b0b0413kydhh15fmxi"
+   "commit": "3076cefea0f6ae9d7757f13c27b5602e007b58ec",
+   "sha256": "1psy6qpqxh6dm2ix7pwqdcq0rbiy6hyd830g76jk4wvj4spm5rpf"
   },
   "stable": {
    "version": [
-    0,
-    2
+    1,
+    0
    ],
-   "commit": "ffafc54e02475b9e7f7bcbe1d8ed3f11bcb4b542",
-   "sha256": "054sfzvm1ihaxy4hnhl424y5py8k7wi73rb0lqvbi4v8iphihzhr"
+   "commit": "3076cefea0f6ae9d7757f13c27b5602e007b58ec",
+   "sha256": "1psy6qpqxh6dm2ix7pwqdcq0rbiy6hyd830g76jk4wvj4spm5rpf"
   }
  },
  {
@@ -310,8 +310,8 @@
     "flymake",
     "maude-mode"
    ],
-   "commit": "c9b7a2af3232aad8a51138194544c9a427cf46ca",
-   "sha256": "0h8assjgwwcgnqhlndsc86z9lc1nzlglhvhzxdnkz2ksk90n85q1"
+   "commit": "3b332ec1e941874f220897e5c0e0a6df762ca28d",
+   "sha256": "0m7v87w2akdpgr360gyjiw0p5sc6ms3y9bccwi9j4jz4gnlix6l5"
   },
   "stable": {
    "version": [
@@ -510,15 +510,15 @@
   "repo": "atilaneves/ac-dcd",
   "unstable": {
    "version": [
-    20210329,
-    1928
+    20210428,
+    1556
    ],
    "deps": [
     "auto-complete",
     "flycheck-dmd-dub"
    ],
-   "commit": "56cdead8c9d2ca64db1f24c59d005ba8b3780bd5",
-   "sha256": "1z38mg76376xac3rnamzhhmx4h4yzn89xycx7kk51vkcjffjzvg6"
+   "commit": "56d9817159acdebdbb3d5499c7e9379d29af0cd4",
+   "sha256": "0p5cjs156ac1x3fsxnb4kc6bd4z09kdkwkyav9ryw5nkrdzv0bd6"
   },
   "stable": {
    "version": [
@@ -1603,11 +1603,11 @@
   "repo": "ianpan870102/acme-emacs-theme",
   "unstable": {
    "version": [
-    20200724,
-    1833
+    20210430,
+    302
    ],
-   "commit": "e416ec678be72eb1aed3de3d88a8a9e3ee7315ca",
-   "sha256": "0y98il3gsnhm586hr1qdmif4r6v1987fzl82wgx75g8kiy5shbrj"
+   "commit": "7c408d111c5e451ecb8fdd5f76cf7d8074aec793",
+   "sha256": "16qxspzlf0bvw36ff4qnrn5p7mc5sf923ba0ar04cr87bfqgyak4"
   },
   "stable": {
    "version": [
@@ -1918,8 +1918,8 @@
     "annotation",
     "eri"
    ],
-   "commit": "3e079614f2b4810ff5920ae69a389da91c855217",
-   "sha256": "1jn0kp33b77lskhi02d0jm0rpcgxhrpxdj82bmr7vi7m199p5jn0"
+   "commit": "26d473648853255a6a46d9dedff66df7f644c42f",
+   "sha256": "18yz278724ydvkdpcwiszfx4lg40bqbwq78268pr5mg0wif0y4q6"
   },
   "stable": {
    "version": [
@@ -2015,11 +2015,11 @@
   "url": "https://bitbucket.org/agriggio/ahg",
   "unstable": {
    "version": [
-    20200304,
-    741
+    20210412,
+    847
    ],
-   "commit": "0ece48646ef7a8c813005934cc13f984b9998707",
-   "sha256": "0ypck79bmv4pa8l555kgij69jbpkv4fz9w91qs30lacjmrj0nha5"
+   "commit": "77bc2a628df006dcd2dc359ac12acdf8091a1356",
+   "sha256": "1wmvz9d40aznqh2y078v8k7n3l66m48vnf873vifi8rwg6158kqh"
   }
  },
  {
@@ -2378,11 +2378,11 @@
   "repo": "domtronn/all-the-icons.el",
   "unstable": {
    "version": [
-    20210411,
-    1650
+    20210425,
+    1035
    ],
-   "commit": "07a4f7315bf5dd609f95e18390a9707b5a29fe9c",
-   "sha256": "0z0bqs2cqwndkjaiv301l1n4i1g7h6v89cl95inilfxxkyxhbzig"
+   "commit": "7a1225826798622d5dbe416b1d5e0a6fba8c19d7",
+   "sha256": "1h85cbr4bnianwk77f6g5k7phcrq5cw8fqxxd6b7x396ffn2pmgm"
   },
   "stable": {
    "version": [
@@ -2405,14 +2405,14 @@
   "repo": "wyuenho/all-the-icons-dired",
   "unstable": {
    "version": [
-    20210411,
-    1226
+    20210422,
+    921
    ],
    "deps": [
     "all-the-icons"
    ],
-   "commit": "07f035d2f6df4f1e840572784a96f5b407a74680",
-   "sha256": "134p5wz5jgbwfri6ihwf4p8xxbdmwwzpkklxn195gl46r2zqnnwx"
+   "commit": "a294f45ec2c338e1255ae2dd98b19f3f143204e6",
+   "sha256": "1m3gqsgybx57qhdlswbn92cnsz9w10sqfzs2lnja63hzwzwxjg92"
   }
  },
  {
@@ -2517,15 +2517,15 @@
   "stable": {
    "version": [
     1,
-    4,
-    1
+    5,
+    0
    ],
    "deps": [
     "all-the-icons",
     "ivy-rich"
    ],
-   "commit": "e918b23d55313a7464d8cb5d45eb917249638e32",
-   "sha256": "1wz3dgn8cggdkijzm7qf13g3s9gmz6v895bjck7sdhmr5mbr28a4"
+   "commit": "7f8249ac92321a81d3db11e56888e569988b51d5",
+   "sha256": "1fwih9qidv0wkqrcsngcainw8b5bxcbk15g5a0p5dpl6hqcxj3rz"
   }
  },
  {
@@ -3104,11 +3104,11 @@
   "repo": "bastibe/annotate.el",
   "unstable": {
    "version": [
-    20210322,
-    1739
+    20210429,
+    1258
    ],
-   "commit": "54ac759facadacbfea5c1e7c2975e2da6434cdda",
-   "sha256": "18pr4bympwl6c2a1bsk4s8ixg4l7ykcxfh1bk42vvbcqnbmvd7dw"
+   "commit": "ff3a0089e0a2d64803a152bdb126fd7d3de5dbc9",
+   "sha256": "0c54yjrf33fx9v0m2gh67gjnwzjb5s7b5s3f4g6aic7s052ywmix"
   },
   "stable": {
    "version": [
@@ -3146,8 +3146,8 @@
     20200914,
     644
    ],
-   "commit": "3e079614f2b4810ff5920ae69a389da91c855217",
-   "sha256": "1jn0kp33b77lskhi02d0jm0rpcgxhrpxdj82bmr7vi7m199p5jn0"
+   "commit": "26d473648853255a6a46d9dedff66df7f644c42f",
+   "sha256": "18yz278724ydvkdpcwiszfx4lg40bqbwq78268pr5mg0wif0y4q6"
   },
   "stable": {
    "version": [
@@ -3468,11 +3468,11 @@
   "repo": "dieter-wilhelm/apdl-mode",
   "unstable": {
    "version": [
-    20201024,
-    1900
+    20210423,
+    1115
    ],
-   "commit": "178af26baac72890fca1904aa9e9c90bc1668a4c",
-   "sha256": "1mkhjp9i4zhbxj72915g6b976dz7jmzyn2ma9x6n85psi3v7ldk1"
+   "commit": "5e9de43494cc307a3b43b0eebf774c03670a4582",
+   "sha256": "00lz9mcxcmlgnnbc05b49arxa2fcckjhsxdcqi66v66zn9h8kr13"
   },
   "stable": {
    "version": [
@@ -4031,11 +4031,11 @@
   "repo": "jwiegley/emacs-async",
   "unstable": {
    "version": [
-    20210117,
-    718
+    20210501,
+    1527
    ],
-   "commit": "d7e7f79ee42311a0187aa2ab4f4e2f8843fa28da",
-   "sha256": "11r6jzqyywgzxmpq2z97j3ni5b1sv6z5lrjmkqip396bxmw9zxm1"
+   "commit": "9a8cd0c3d5c120bfa03187c54dba6e33f6e3ca19",
+   "sha256": "1s2gdilaf38m2dg6nm4kcz5n4n455a9127pl4cbz9lg7mp3l2pg5"
   },
   "stable": {
    "version": [
@@ -4237,8 +4237,8 @@
   "repo": "jyp/attrap",
   "unstable": {
    "version": [
-    20210407,
-    1826
+    20210426,
+    1348
    ],
    "deps": [
     "dash",
@@ -4246,8 +4246,8 @@
     "flycheck",
     "s"
    ],
-   "commit": "4b088698ec81f7cd0f715b30e280b37e3881b91d",
-   "sha256": "1jil04a69fx946vh6f81x3ki84jmmdfz7g3c9v4phddz58clb1sb"
+   "commit": "a5bc695af27349ae6fe4541a581e6fd449d2a026",
+   "sha256": "06j1cpqmplh1xy5aal8fk7r8s42jf3zlk92mh3lll9knx81xix9q"
   },
   "stable": {
    "version": [
@@ -4413,6 +4413,21 @@
    "sha256": "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28"
   }
  },
+ {
+  "ename": "auth-source-kwallet",
+  "commit": "047cc780e55a0f574afaf7fa0d94c31ed86cb57f",
+  "sha256": "1fz63fdfw3cm8k59nxnbsaiylbs0nn5f250fwwfh51bknrqj3vin",
+  "fetcher": "github",
+  "repo": "vaartis/auth-source-kwallet",
+  "unstable": {
+   "version": [
+    20210421,
+    1504
+   ],
+   "commit": "c2abee6ada13d7332725bd700ad76da8aebea530",
+   "sha256": "1w43mlfslvmqabnm76j0bhkdsb4a2iwwidhm83qqrjpj08cq3ldj"
+  }
+ },
  {
   "ename": "auth-source-pass",
   "commit": "6e63342b442794ead4d8bed803b0924d9cd26dc4",
@@ -4424,8 +4439,8 @@
     20210210,
     1908
    ],
-   "commit": "468bba286fc20d739ed7724ec884357907ac8bda",
-   "sha256": "1pazl19rd4fvnfi9i2ssaygby5pw2a821aysy8jswsij57lw40dy"
+   "commit": "fa8b964494c1ef42035fad340ff5f29fcdbed21c",
+   "sha256": "0fn30iy1jy0kh09652a0fn7zg93cf3xvs2bz28lml7knj2hbqi2r"
   },
   "stable": {
    "version": [
@@ -5008,11 +5023,11 @@
   "repo": "jcs-elpa/auto-rename-tag",
   "unstable": {
    "version": [
-    20201012,
-    630
+    20210418,
+    1758
    ],
-   "commit": "88c5236280ff8212ff5c74f3e2e654c1a288dbf2",
-   "sha256": "0q584zrqyz8cc8ib5rll44qvf30xsrjnmdz7yipzqjbvciv6kh7g"
+   "commit": "8dbf13b344f6d5eba5c4876b18905d30b3118bb9",
+   "sha256": "1nlwg78d60w6xjpqhrc49nxxvjaxj07wb036rb5jsng9yb6r94m9"
   },
   "stable": {
    "version": [
@@ -5079,26 +5094,26 @@
   "repo": "ncaq/auto-sudoedit",
   "unstable": {
    "version": [
-    20200427,
-    635
+    20210502,
+    1103
    ],
    "deps": [
     "f"
    ],
-   "commit": "0ad8247fdd0f1d747cd1ff73adb6b5efcecc7f3b",
-   "sha256": "10p0hc95j382km8655pqld9wxg10j1f36czzppkdd6a55cxarv9f"
+   "commit": "54a7f295e6b1eecbcc86741aaf5d72e404b43bce",
+   "sha256": "1rhdvrj2rjbvl7vkb0wcp6krqxcaigl7jk9z8yvhx6s4cm2qli6q"
   },
   "stable": {
    "version": [
     1,
-    0,
+    1,
     0
    ],
    "deps": [
     "f"
    ],
-   "commit": "0ad8247fdd0f1d747cd1ff73adb6b5efcecc7f3b",
-   "sha256": "10p0hc95j382km8655pqld9wxg10j1f36czzppkdd6a55cxarv9f"
+   "commit": "738fd22452f00fa05daf200f997cb5db2531a211",
+   "sha256": "1rhdvrj2rjbvl7vkb0wcp6krqxcaigl7jk9z8yvhx6s4cm2qli6q"
   }
  },
  {
@@ -5216,14 +5231,14 @@
   "url": "https://git.sr.ht/~zge/autocrypt",
   "unstable": {
    "version": [
-    20210411,
-    1759
+    20210412,
+    1127
    ],
    "deps": [
     "cl-generic"
    ],
-   "commit": "39c06eb4020c38de8f282340449691210cc23bb8",
-   "sha256": "0gvdjgfnisx1acy5jmzs82yngmnmiimq1ralbvw9a28knlsdbnig"
+   "commit": "5b55f8d37545e9c441788627c17e350d7edf4055",
+   "sha256": "0b06xnjkgwjpxl96mdi674pmvdaiwncifi1a30wxhl1dwr7kr084"
   }
  },
  {
@@ -5272,36 +5287,6 @@
    "sha256": "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85"
   }
  },
- {
-  "ename": "autopair",
-  "commit": "4150455d424326667390f72f6edd22b274d9fa01",
-  "sha256": "0l2ypsj3dkasm0lj9jmnaqjs3rv97ldfw8cmayv77mzfd6lhjmh3",
-  "fetcher": "github",
-  "repo": "joaotavora/autopair",
-  "unstable": {
-   "version": [
-    20160304,
-    1237
-   ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "2b6d72bccb0ebba6e7e711528872b898b0c65b0a",
-   "sha256": "09p56vi5zgm2djglimwyhv4n4gyydjndzn46vg9qzzlxvvmw66i1"
-  },
-  "stable": {
-   "version": [
-    0,
-    6,
-    1
-   ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "2d1eb81d12f71248ad305e70cceddf08d4fe2b39",
-   "sha256": "0g6kd1r0wizamw26bhp5jkvpsd98rcybkfchc622b9v5b89a07nq"
-  }
- },
  {
   "ename": "autotest",
   "commit": "5fc2c4a590cbeccfb43003972a78f5d76ec4a9e7",
@@ -5313,8 +5298,8 @@
     20190331,
     2230
    ],
-   "commit": "74e1fcbeca25734235afec9c6a4d0cf73736b62c",
-   "sha256": "0yrcsr4360v222klahbccfq3vb4kp5xdsibydwircv36xhxplzq3"
+   "commit": "2d76365d2aa13543121d5c623df465adb68b76f7",
+   "sha256": "1n247g5dq73rkxf0wys5lsbvma44y5qlh577s3rcx7l0yrylwdry"
   }
  },
  {
@@ -5457,8 +5442,8 @@
     "avy",
     "embark"
    ],
-   "commit": "a005eef82a63950927a68a5ef79b33d25245687b",
-   "sha256": "1dy01y87bqjddsdjqhmp6m144azn72yswsj0prywm5alxypck9lg"
+   "commit": "05aa11bca37db1751c86fe78f784741be5b1a066",
+   "sha256": "1nnrn6dd248l6ngvgjjniqkahlwz45y3n50nw555a67pmi88grh9"
   },
   "stable": {
    "version": [
@@ -6830,14 +6815,14 @@
   "repo": "cpitclaudel/biblio.el",
   "unstable": {
    "version": [
-    20200416,
-    1407
+    20210418,
+    406
    ],
    "deps": [
     "biblio-core"
    ],
-   "commit": "242c3f3ac1198b1e969e2a34d6348354a9d83345",
-   "sha256": "0m1ih8p7s3335wah1wzaiipqphvjd88nyig582ja3ra6xkvazf00"
+   "commit": "517ec18f00f91b61481214b178f7ae0b8fbc499b",
+   "sha256": "0m5vpyj6312rc3xq8lrr1g2hyl26adzwvjxb3jqrm7bvqvs4i5zp"
   },
   "stable": {
    "version": [
@@ -6877,16 +6862,16 @@
   "repo": "cpitclaudel/biblio.el",
   "unstable": {
    "version": [
-    20210311,
-    2310
+    20210418,
+    406
    ],
    "deps": [
     "dash",
     "let-alist",
     "seq"
    ],
-   "commit": "242c3f3ac1198b1e969e2a34d6348354a9d83345",
-   "sha256": "0m1ih8p7s3335wah1wzaiipqphvjd88nyig582ja3ra6xkvazf00"
+   "commit": "517ec18f00f91b61481214b178f7ae0b8fbc499b",
+   "sha256": "0m5vpyj6312rc3xq8lrr1g2hyl26adzwvjxb3jqrm7bvqvs4i5zp"
   },
   "stable": {
    "version": [
@@ -6917,8 +6902,8 @@
     "a",
     "pdf-tools"
    ],
-   "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f",
-   "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q"
+   "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984",
+   "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b"
   }
  },
  {
@@ -6966,14 +6951,25 @@
   "repo": "bdarcus/bibtex-actions",
   "unstable": {
    "version": [
-    20210411,
-    1846
+    20210503,
+    1214
    ],
    "deps": [
     "bibtex-completion"
    ],
-   "commit": "516cbdb63810bcb571e41436e2c568c328fc8980",
-   "sha256": "0n3byfv1khn2lr9c1r619gc52993hf01nwl5c7ih7nmrr5q3rckk"
+   "commit": "149f9aefd2fc90e32f25a0b290e975da55ab8fe6",
+   "sha256": "16264is954pdh0jvnjw057sdccl297w1v8r9wg39raljl44vzr44"
+  },
+  "stable": {
+   "version": [
+    0,
+    4
+   ],
+   "deps": [
+    "bibtex-completion"
+   ],
+   "commit": "c18b1ad05168597a3cbaee67775d15d2ebb737f4",
+   "sha256": "0x45wq2nw753dz6694li3f0zmjm0rljmrr5rvj2qrhgqldlwn6zn"
   }
  },
  {
@@ -6995,8 +6991,8 @@
     "parsebib",
     "s"
    ],
-   "commit": "9870333cdd4a54b309e2709af647cda6f4070a42",
-   "sha256": "02cpg60hif4rz6va2ynh3wc9dwj0nyig4fa0l6jchmzz8v2zvf86"
+   "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e",
+   "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik"
   },
   "stable": {
    "version": [
@@ -7201,8 +7197,8 @@
    "deps": [
     "seq"
    ],
-   "commit": "9cec78c685dbca51ab9d1014eb535a541083effc",
-   "sha256": "065cqvdjdb5w60b7ga7q51920ib5vpz63zq9s68q0fjwb55q3k8z"
+   "commit": "52f1c11b01a5f7e7a470a73dec4c3335dea4124b",
+   "sha256": "00kjjr28bvimbdhg016n0g6ws1lix87c1bic1xb3nk0bvnbkpwfp"
   },
   "stable": {
    "version": [
@@ -7609,11 +7605,11 @@
   "repo": "joodland/bm",
   "unstable": {
    "version": [
-    20201116,
-    2341
+    20210421,
+    1351
    ],
-   "commit": "dc69eb6e431151d3942cb812b7161e6f23c28c07",
-   "sha256": "0gxj8m8q4md1kaay5ymsyynw5990apnqxa6lw73y8w1py785drmn"
+   "commit": "9a31c61f44e6f1033ca43bd7f3eb33ffdb2ca595",
+   "sha256": "0iizqcbxm8yjv1fz2lhn23vbyzmmc8g6xazk0glv9mrldmmppgn5"
   },
   "stable": {
    "version": [
@@ -7658,8 +7654,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "d88eef69ae66ea1ffa21a65317afe84c9ddb0814",
-   "sha256": "1bci2w8drwgcli9hqg55izaxpwq4fvqdigvlrfc0524s7021ij24"
+   "commit": "2d1ee12f3ba6e75841066bf429d7bf836d4b89d7",
+   "sha256": "1hls8463fl8ndbfry1x4pimx2fz1b9zl3b6wfgcrb3jw3p4ys86x"
   },
   "stable": {
    "version": [
@@ -7840,8 +7836,8 @@
   "repo": "jyp/boon",
   "unstable": {
    "version": [
-    20210323,
-    1341
+    20210413,
+    1322
    ],
    "deps": [
     "dash",
@@ -7849,8 +7845,8 @@
     "multiple-cursors",
     "pcre2el"
    ],
-   "commit": "17a7a9219a5a9b7156f58f7f30227fc2b79b6020",
-   "sha256": "1jcvz9vy5sz9bysrlg2b9d3732zab8hmg8hg5ghwjx5kgxl2yfzh"
+   "commit": "a4f2d2caaf2d7a0adf36c19ea20a79dcfa129cad",
+   "sha256": "1m3yw1i6c5j3fswbcyrk95qa7azq26bgzc7zcmjncx23idijhfpf"
   },
   "stable": {
    "version": [
@@ -8068,25 +8064,25 @@
   "url": "https://bitbucket.org/MikeWoolley/brf-mode",
   "unstable": {
    "version": [
-    20210325,
-    2154
+    20210501,
+    1723
    ],
    "deps": [
     "fringe-helper"
    ],
-   "commit": "733a44bc491d9d28f9eefc2550616e97b1419cee",
-   "sha256": "0dfd3w3g31fjzqvzn57xw3whr60fy8yj8hnga8b4n9698dihw0bn"
+   "commit": "9d6b6797c465589ca39a1020d7af5775f5ddc801",
+   "sha256": "1jpsrsc4qi2yiwxccdagxz1gj9fgzaxnd5fszgdmwvsgzqwfasvh"
   },
   "stable": {
    "version": [
     1,
-    19
+    20
    ],
    "deps": [
     "fringe-helper"
    ],
-   "commit": "0024b1a276c43fde0d85011b51b5aaf1f201da64",
-   "sha256": "1nnhb0vyx5f3f7h2fsg2p7656kcsk7ahrndxrhs7a77svnr426lb"
+   "commit": "9d6b6797c465589ca39a1020d7af5775f5ddc801",
+   "sha256": "1jpsrsc4qi2yiwxccdagxz1gj9fgzaxnd5fszgdmwvsgzqwfasvh"
   }
  },
  {
@@ -9634,15 +9630,14 @@
   "repo": "kwrooijen/cargo.el",
   "unstable": {
    "version": [
-    20210327,
-    1821
+    20210422,
+    657
    ],
    "deps": [
-    "markdown-mode",
-    "rust-mode"
+    "markdown-mode"
    ],
-   "commit": "4846373bf1ed6268f1a1d9f9c489f8740351d8bb",
-   "sha256": "0y4wxddjp055kisv7yx6zs9bzggw65b08aa1g3y0vlaafrps8bga"
+   "commit": "0174599fd1c1b429042c7ca67c3d45f07441a43d",
+   "sha256": "0qm6cgzsr86s1rcvqpv8x5b3r1v7nq7z8il8ci4vlw9hk0wg65a2"
   },
   "stable": {
    "version": [
@@ -9729,8 +9724,8 @@
   "repo": "cask/cask",
   "unstable": {
    "version": [
-    20210410,
-    2057
+    20210424,
+    125
    ],
    "deps": [
     "ansi",
@@ -9741,27 +9736,26 @@
     "s",
     "shut-up"
    ],
-   "commit": "dce91052dc8fae386a1898fd88d554b5cb527fdc",
-   "sha256": "1j853gbdc50s1csvsi2a0f6i2vakgnd8afb97qkkj5alpwq8883p"
+   "commit": "81edfa78428fd2d9689507fd4d3b13c24cd99323",
+   "sha256": "071biqz1fv3rzjbn9xprpazk65xfl78hzhf2gdvz944pks3rhdfi"
   },
   "stable": {
    "version": [
     0,
     8,
-    6
+    7
    ],
    "deps": [
     "ansi",
     "cl-lib",
-    "dash",
     "epl",
     "f",
     "package-build",
     "s",
     "shut-up"
    ],
-   "commit": "610894d57f467a55fb146ade4d6f8173e4e9579b",
-   "sha256": "1y12m5sjgws4a4bikr8d1ccysy55j7xx3cp1qii4pw62bkf9y2bq"
+   "commit": "9600dd9a341c61ac006c0a44912e13f3810f3c54",
+   "sha256": "0aqc3p7i00rbdgj2cjil71c8wqq9ard637fnpdq1ny6wnb8kblm7"
   }
  },
  {
@@ -9937,11 +9931,11 @@
   "repo": "skk-dev/ddskk",
   "unstable": {
    "version": [
-    20210403,
-    1958
+    20210501,
+    820
    ],
-   "commit": "a266f70eb99ffb657b7821c2e1de49f5184a59ed",
-   "sha256": "0j1gcsi40yrfy9saqjdhxnwsvmqf32l9mnwfvhbbfxm82ddhwxnk"
+   "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614",
+   "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq"
   }
  },
  {
@@ -9989,8 +9983,8 @@
     20200904,
     1431
    ],
-   "commit": "a266f70eb99ffb657b7821c2e1de49f5184a59ed",
-   "sha256": "0j1gcsi40yrfy9saqjdhxnwsvmqf32l9mnwfvhbbfxm82ddhwxnk"
+   "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614",
+   "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq"
   }
  },
  {
@@ -10124,15 +10118,15 @@
   "repo": "ema2159/centaur-tabs",
   "unstable": {
    "version": [
-    20210309,
-    1822
+    20210420,
+    1415
    ],
    "deps": [
     "cl-lib",
     "powerline"
    ],
-   "commit": "df972095135de90b47413190f61ec4f5af33f9f1",
-   "sha256": "0is51bc9zd9lr0y59md2ci4ddlfylp5jb9hwyll9r6j8gn3lrzza"
+   "commit": "51f28d03936aef5237f14bc08b2ae26949ecef0f",
+   "sha256": "13cg8ds0dkrw26ln4qi7yfb4gdbcavky6ykyhx49ph0gzinjhd3b"
   },
   "stable": {
    "version": [
@@ -10259,8 +10253,8 @@
     20171115,
     2108
    ],
-   "commit": "02478862ea707ed51223c1d5d2d8cd8d61d2915d",
-   "sha256": "0vf94pkd2slwkrgv93yqh2qb2y72bzya9nq5gmqd0g08nb6kdmjx"
+   "commit": "0c75766aa79f1f744011a1bddd8659e3631177dc",
+   "sha256": "1crww8asa1cxknmbdf46xjm7rlxzss5wqzn5bza5f2wwj5mw9gpj"
   },
   "stable": {
    "version": [
@@ -10994,8 +10988,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20210408,
-    1212
+    20210422,
+    802
    ],
    "deps": [
     "clojure-mode",
@@ -11006,14 +11000,15 @@
     "sesman",
     "spinner"
    ],
-   "commit": "fd2bb0c64eb3590cffa91188644d1e40fbbc634b",
-   "sha256": "0mhscf5cpcqs68c863ns6rbjwr1p71wb7kp80ds5qzar8x2k2qwn"
+   "commit": "68bc5e393929561a00e2d20e83fd01df37214af2",
+   "sha256": "0kyliz2vz240g381qkgkyjxh3i9f016a7x4plf2jcw2y5rmqspxl"
   },
   "stable": {
    "version": [
+    1,
     1,
     0,
-    0
+    1
    ],
    "deps": [
     "clojure-mode",
@@ -11024,8 +11019,8 @@
     "sesman",
     "spinner"
    ],
-   "commit": "140b062e62165e536dcdb878a00f492a1d5b3518",
-   "sha256": "143kh9k34yk0g6kdlkma6g432kmb2r9r1lhyq4irsw6d3vaql7dj"
+   "commit": "45f6125301fbbe69333dc450804ce8ecdd611539",
+   "sha256": "1kf4056bga3cr40mm812m21r9mi0r30gn9v3jil3q6yhb5bm1gcl"
   }
  },
  {
@@ -11198,14 +11193,14 @@
   "repo": "jorgenschaefer/circe",
   "unstable": {
    "version": [
-    20210323,
-    1704
+    20210423,
+    746
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "e67e2d1149ebf3e79cd2162e78802af3ed5f82da",
-   "sha256": "0jrpa8kndq2v69nr9jva970q0n3662x2g0chg89nd2d3gbv693mw"
+   "commit": "2f70aa236878d9c3726c31d6ba922e2d7076951d",
+   "sha256": "1fi0qc8qbcgkjjvi5iysifammqcc6nwcrwjhwi713zykd5cir180"
   },
   "stable": {
    "version": [
@@ -11600,14 +11595,14 @@
   "repo": "redguardtoo/cliphist",
   "unstable": {
    "version": [
-    20210301,
-    748
+    20210426,
+    245
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "1ef50459fa6044c4d571cec0009368948bcf5fc5",
-   "sha256": "0xba2gxwy1y8zl9nvga186873icvwfi0yan3qbw2vdkpzry5ifhk"
+   "commit": "0d02d72fb63453ff5623b26234a63f66090da7ac",
+   "sha256": "033z367nmfh6mc1k8kv2m3xsxjw44hnvgiai2n7fp4h9jdv5j8h8"
   },
   "stable": {
    "version": [
@@ -11705,8 +11700,8 @@
   "repo": "clojure-emacs/clj-refactor.el",
   "unstable": {
    "version": [
-    20210407,
-    724
+    20210413,
+    733
    ],
    "deps": [
     "cider",
@@ -11719,8 +11714,8 @@
     "seq",
     "yasnippet"
    ],
-   "commit": "9f88174878d62e3906be5b04b8ba7788e6ca4570",
-   "sha256": "155lhb3myzxpxnnp257p3rxhgw9xmr3l2h39gj23q5sr0hhsnm5s"
+   "commit": "f50fb242ba0ff8526746ae0ffeb19b9a535c00b2",
+   "sha256": "0ajnc3x7fy9mlgdrfq1p1hvafcisvdnilh9vv0h5s091qkvv3hp9"
   },
   "stable": {
    "version": [
@@ -11967,11 +11962,11 @@
   "repo": "clojure-emacs/clojure-mode",
   "unstable": {
    "version": [
-    20210322,
-    704
+    20210502,
+    824
    ],
-   "commit": "a14671e03c867c9d759ee9e59cdc5cecbf271245",
-   "sha256": "1jnqwcspm7c3v33wywvm605hsf6vp29ym3smy2jaq8j5vwywi8k3"
+   "commit": "8280e4479c89b0f7958d34febafd6932e5a2b3d3",
+   "sha256": "0w84cc0s8mgh7zx2qdi6csvxzq436p0cnmkbg8zfcwwpp4x6ncb8"
   },
   "stable": {
    "version": [
@@ -11997,8 +11992,8 @@
    "deps": [
     "clojure-mode"
    ],
-   "commit": "a14671e03c867c9d759ee9e59cdc5cecbf271245",
-   "sha256": "1jnqwcspm7c3v33wywvm605hsf6vp29ym3smy2jaq8j5vwywi8k3"
+   "commit": "8280e4479c89b0f7958d34febafd6932e5a2b3d3",
+   "sha256": "0w84cc0s8mgh7zx2qdi6csvxzq436p0cnmkbg8zfcwwpp4x6ncb8"
   },
   "stable": {
    "version": [
@@ -12300,19 +12295,17 @@
     20210104,
     1831
    ],
-   "commit": "b1c739ad8bcacae6d66d88514102dcd4423c2dcb",
-   "sha256": "1jwkscld38b6b6f4w3hw1m9dgdvcvbbwwfx2dd5v7548mp3wpxrj"
+   "commit": "4e5893b658b1c360c1b2d9413dbd66b2b02dbacc",
+   "sha256": "0ywi74q3csqvn9pb53gcvz5bg9xc94nnq1nbmzsmhf8yj7lrlkcm"
   },
   "stable": {
    "version": [
     3,
     20,
-    0,
-    -1,
-    5
+    2
    ],
-   "commit": "fab7fe7ef5a5462952297611c1dd668a603e3a36",
-   "sha256": "12v6v1hpw0ykkikj4qid3m4m7sb164rgpx6fxin4hvsm20pjcrd4"
+   "commit": "1ad4501ae97fb6c6deab096ff0ac7e03d554e26d",
+   "sha256": "0zr4zbbd1zng0v3mj8kql0ci2w18p4izjfq7hh6g5adq6l7ckfhm"
   }
  },
  {
@@ -13271,11 +13264,11 @@
   "repo": "company-mode/company-mode",
   "unstable": {
    "version": [
-    20210411,
-    2221
+    20210503,
+    1211
    ],
-   "commit": "4037e82cf82b459b6a1d8529f2a3bb3e310fbdf7",
-   "sha256": "0hqm4529cng2zwj5nlm9b5k1yngf0viywmrq7k052g3fpx21b4l2"
+   "commit": "dbb5d8cac2d7b854e883b381c7504e227a7185eb",
+   "sha256": "0f31pjgnagq1jv557i0pifsjgp12zm7j2k2qjgf3j64j470ffr99"
   },
   "stable": {
    "version": [
@@ -13516,8 +13509,8 @@
   "repo": "cpitclaudel/company-coq",
   "unstable": {
    "version": [
-    20210324,
-    1603
+    20210420,
+    215
    ],
    "deps": [
     "cl-lib",
@@ -13526,7 +13519,7 @@
     "dash",
     "yasnippet"
    ],
-   "commit": "7423ee253951a439b2491e1cd2ea8bb876d25cb7",
+   "commit": "6a23da61e4008f54cf1b713f8b8bffd37887e172",
    "sha256": "15rd9ga4ydhl6ljzdg26a3kcaqlhaygp67507wrrf8j3801ivks4"
   },
   "stable": {
@@ -13690,15 +13683,15 @@
   "repo": "dunn/company-emoji",
   "unstable": {
    "version": [
-    20201212,
-    2325
+    20210427,
+    2151
    ],
    "deps": [
     "cl-lib",
     "company"
    ],
-   "commit": "4ba7dc60ba67f736e698a5fa0b754b866f36a646",
-   "sha256": "1rhf2hr345953mkn52i58aiq8j16ps2ckapd5f7jxmhkcpzxxfhk"
+   "commit": "90594eb58b20fb937cfd4e946efcc446ee630e6f",
+   "sha256": "08dx812vg92bkwp0ham40rv3x9648x7y5bmbvphcc71s9knfgxcz"
   },
   "stable": {
    "version": [
@@ -14041,8 +14034,8 @@
     "lean-mode",
     "s"
    ],
-   "commit": "5a2a36356e73c74a42e49fad19a71f4f12929a90",
-   "sha256": "18lswxxwvp85yzg1kc9vxn4dpmxmj40j6g64c8ns83nb7hw9lszg"
+   "commit": "bf32bb97930ed67c5cbe0fe3d4a69dedcf68be44",
+   "sha256": "1bkv5zs38ijawvavbba0fdf2flb6fiwici3qi99ws8wvwhnbkws2"
   }
  },
  {
@@ -14455,15 +14448,15 @@
   "repo": "tumashu/company-posframe",
   "unstable": {
    "version": [
-    20210331,
-    325
+    20210419,
+    607
    ],
    "deps": [
     "company",
     "posframe"
    ],
-   "commit": "a28f38213a2a30ce68fdb0b124cadc68ebbcb24f",
-   "sha256": "1ys40y62c0aqs8nlyhnkahb67slh0i4dpvxvj8mcvcmp68aiih3f"
+   "commit": "c7a820a35ff132aaec53c81e05afc829de39eb68",
+   "sha256": "0fyc7c4r4jfa5y0x9lfcqlx0qazg1d4il5p0bdw4hdcpjd2h26ys"
   },
   "stable": {
    "version": [
@@ -14494,8 +14487,8 @@
     "company",
     "prescient"
    ],
-   "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4",
-   "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w"
+   "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4",
+   "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n"
   },
   "stable": {
    "version": [
@@ -14621,15 +14614,15 @@
   "repo": "TheBB/company-reftex",
   "unstable": {
    "version": [
-    20201116,
-    1605
+    20210418,
+    1316
    ],
    "deps": [
     "company",
     "s"
    ],
-   "commit": "291c283c8a015fd7cbaa99f836e1a721f1e2c832",
-   "sha256": "0qwmjqcpi10lwsrppifjyr041hmgqb86nxpb970rb1m3n9p5rnk0"
+   "commit": "42eb98c6504e65989635d95ab81b65b9d5798e76",
+   "sha256": "0x5zhhy70cdhbark2vm364bazg2mbwlhy7123qyq02knsjdwwqrl"
   }
  },
  {
@@ -14775,17 +14768,16 @@
   "repo": "nathankot/company-sourcekit",
   "unstable": {
    "version": [
-    20170126,
-    1153
+    20210430,
+    2155
    ],
    "deps": [
     "company",
     "dash",
-    "dash-functional",
     "sourcekit"
    ],
-   "commit": "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781",
-   "sha256": "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n"
+   "commit": "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c",
+   "sha256": "18pv1hcilj7kndr7a29jjskp21khh1sd0wy01h8y8y9mf70kikg6"
   },
   "stable": {
    "version": [
@@ -15162,11 +15154,11 @@
   "repo": "muffinmad/emacs-completions-frame",
   "unstable": {
    "version": [
-    20201123,
-    1213
+    20210430,
+    640
    ],
-   "commit": "95e0845fdac5412a511ca15b12189ed9487a64a7",
-   "sha256": "1mz7dxa4bhay4h2kh1f4g4dwsfswidlhiy11s4a6l3zjqjj8hklb"
+   "commit": "860e5b97730df7ef5c34584ad164bc69c561db84",
+   "sha256": "026qzq1ddk1acqsgbsd2nk2g5gm9ml2sq31rnsdapzaj4rxa192w"
   }
  },
  {
@@ -15467,19 +15459,19 @@
   "repo": "minad/consult",
   "unstable": {
    "version": [
-    20210411,
-    2120
+    20210503,
+    1638
    ],
-   "commit": "812204b647b1f45cc9d04d7d2f565061940f5e70",
-   "sha256": "11jpmswhx5x69wsrl5mg9wmxm49hqkdn2r9swz9z7hikk7485mx8"
+   "commit": "665a3105d5cbe6c44a270c1009e74d4fcad9d6d4",
+   "sha256": "163kfs042gq9kisra23g27zwval6jyl8yanr7y2s1rx185m2z6yb"
   },
   "stable": {
    "version": [
     0,
-    6
+    7
    ],
-   "commit": "3184edd6ccf9cfb300511feb297b9012ce902bbe",
-   "sha256": "09n3q3dyi83s4fk4z7csnjicbxd69ws4zp4371c1lbxcvvq2fdnd"
+   "commit": "7480f020e57036ef14c2fda1d83c830583b2a53b",
+   "sha256": "1kzwybp87srckd1238drdcn9h7jyyqz9pzcwvw3ld8bgyyrwsxkj"
   }
  },
  {
@@ -15490,27 +15482,60 @@
   "repo": "minad/consult",
   "unstable": {
    "version": [
-    20210410,
-    1355
+    20210429,
+    1158
    ],
    "deps": [
     "consult",
     "flycheck"
    ],
-   "commit": "812204b647b1f45cc9d04d7d2f565061940f5e70",
-   "sha256": "11jpmswhx5x69wsrl5mg9wmxm49hqkdn2r9swz9z7hikk7485mx8"
+   "commit": "665a3105d5cbe6c44a270c1009e74d4fcad9d6d4",
+   "sha256": "163kfs042gq9kisra23g27zwval6jyl8yanr7y2s1rx185m2z6yb"
   },
   "stable": {
    "version": [
     0,
-    6
+    7
    ],
    "deps": [
     "consult",
     "flycheck"
    ],
-   "commit": "3184edd6ccf9cfb300511feb297b9012ce902bbe",
-   "sha256": "09n3q3dyi83s4fk4z7csnjicbxd69ws4zp4371c1lbxcvvq2fdnd"
+   "commit": "7480f020e57036ef14c2fda1d83c830583b2a53b",
+   "sha256": "1kzwybp87srckd1238drdcn9h7jyyqz9pzcwvw3ld8bgyyrwsxkj"
+  }
+ },
+ {
+  "ename": "consult-lsp",
+  "commit": "c2d4a871be8f52fcfd24c3823382a983d9dcce46",
+  "sha256": "0qrillb8yg8lzilbf40y8c9jpf8jyhfdry2xp6d9mlfnkrdc1qr0",
+  "fetcher": "github",
+  "repo": "gagbo/consult-lsp",
+  "unstable": {
+   "version": [
+    20210428,
+    1515
+   ],
+   "deps": [
+    "consult",
+    "f",
+    "lsp-mode"
+   ],
+   "commit": "12989949cc21a1173206f688d56a1e798073a4c3",
+   "sha256": "0g3bpi53x6gr9631kzidbv4596bvdbxlr8y84ln40iwx5j8w6s7p"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
+   ],
+   "deps": [
+    "consult",
+    "f",
+    "lsp-mode"
+   ],
+   "commit": "c4c0426b58946578ac1806a60258d2b275d5b524",
+   "sha256": "11lrnv5ssiwwdvdib05nz070yc3w9lfcqikgnl3bq8gbcrm9zjf4"
   }
  },
  {
@@ -15895,15 +15920,15 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20210404,
-    1716
+    20210423,
+    1127
    ],
    "deps": [
     "ivy",
     "swiper"
    ],
-   "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245",
-   "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36"
+   "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc",
+   "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8"
   },
   "stable": {
    "version": [
@@ -16207,14 +16232,32 @@
   "stable": {
    "version": [
     1,
-    0,
-    0
+    1
    ],
    "deps": [
+    "ivy",
     "swiper"
    ],
-   "commit": "33d709f5b73a68093ec9414c774844d5f4983aee",
-   "sha256": "120i4j4bw3v1ybcwrfpn0v7jphhk7hhlp738m60fck97p9lwfyy0"
+   "commit": "8cadd2e96470402ede4881b4e955872976443689",
+   "sha256": "1chfrzkqfsw1rlwkb3k7v827fwipg0cish22rr3sxxydxr7kysx5"
+  }
+ },
+ {
+  "ename": "counsel-mairix",
+  "commit": "2ca80edc78250911b84e806f750d5474e7d93e86",
+  "sha256": "1i535x0xw9sj602l70sabg6y5mxzff5wlr0gpfqw9by5g7q79w95",
+  "fetcher": "git",
+  "url": "https://git.sr.ht/~ane/counsel-mairix",
+  "unstable": {
+   "version": [
+    20210422,
+    649
+   ],
+   "deps": [
+    "ivy"
+   ],
+   "commit": "39fa2ad10a5f899cb3f3275f9a6ebd166c51216a",
+   "sha256": "1z5qn9k68413jr946dy53l02zk2b1qx6wl5w3gp0jh34i3b6yk2y"
   }
  },
  {
@@ -16546,6 +16589,21 @@
    "sha256": "1qf1s0997n6bfx50bd0jln25p7z6y8pfibijnbqcg2011xmv5dqh"
   }
  },
+ {
+  "ename": "cowsay",
+  "commit": "1731327f28b2b47285a526b3ddd322d5b4a862e8",
+  "sha256": "0f2iq8jd2w5bcsv4yksyj7l50g9yvi28dhjx29dyxlywbj0nqz98",
+  "fetcher": "github",
+  "repo": "lassik/emacs-cowsay",
+  "unstable": {
+   "version": [
+    20210430,
+    1625
+   ],
+   "commit": "690b4d2c18bbe1a19169b03260b13c663f4f3d96",
+   "sha256": "0yhxmk07jnj0v40dxpywr1yhlj9srid0n6ds13y4zvih5prrmlms"
+  }
+ },
  {
   "ename": "cp5022x",
   "commit": "761fcb0ff07d9746d68e9946c8b46e50c67cd1d8",
@@ -17258,11 +17316,11 @@
   "repo": "raxod502/ctrlf",
   "unstable": {
    "version": [
-    20210404,
-    1704
+    20210418,
+    2044
    ],
-   "commit": "45026a8655fb170004959f83b984589224cc156e",
-   "sha256": "0ij830jpkrp29rrpapmr9cglnjsdiycp3j620sd10s069wavbmcr"
+   "commit": "dbe83710d06bc39315f1455f6f21479f3747c0aa",
+   "sha256": "0nl7mh1i9pw039gd0ma6xrv499aw2vs3a1fm1bxz71hh13jmbd4c"
   },
   "stable": {
    "version": [
@@ -17463,11 +17521,11 @@
   "repo": "lassik/emacs-currency-convert",
   "unstable": {
    "version": [
-    20201017,
-    1817
+    20210427,
+    2032
    ],
-   "commit": "0b12614956085444d73c47bc308c02cef0f64f97",
-   "sha256": "0abpkcn2mcg0c4nycannwz9skvl6w7zgvbh1rx30qw0wl0i5svdm"
+   "commit": "12805ea66aa8421de5eedda39d23f709de634460",
+   "sha256": "1p304k3s0iawsrlpndc9vrjxm1vv4nlkv0fb51x8pmcqw5ivy1dg"
   }
  },
  {
@@ -17488,10 +17546,10 @@
    "version": [
     1,
     0,
-    3
+    4
    ],
-   "commit": "2d7c5547e4b0da361b1533d2ff30e3f62f4b682c",
-   "sha256": "1d1mz0j51i09g2fn25iik7wk0cc9i6ps8qviik73fy7ivvxjn0vp"
+   "commit": "d82441c85773bec2bc41eb3c5778659f0be31a61",
+   "sha256": "0qi40qgya3k028sgmqhqslgdfkxq9iv3wpzhz6x87j0xqv32jd55"
   }
  },
  {
@@ -17690,17 +17748,17 @@
     20190111,
     2150
    ],
-   "commit": "8cef4203124241911f63dc171f5536665f324507",
-   "sha256": "0qm605xkr294yrmrkzsqq9bhdqyg9nxiwxwg1br6hzcj01wvgjqf"
+   "commit": "2f493526d09ac8fa3d195bee14a3c9df5e649041",
+   "sha256": "03qrqppfv3hjabq3ycinkq8ngx5cdx0kixwygk2z9n6pc9n3gsfa"
   },
   "stable": {
    "version": [
     0,
     29,
-    22
+    23
    ],
-   "commit": "3e470fcc3a4e9a33b66d5db6ab761c773888a1ea",
-   "sha256": "1fbi0ladg9c37hw3js72i72nza8hfjzm5c8w95c6bmzsl22lszwi"
+   "commit": "17670781083e3ccfedb1af4adcec614d4599eef9",
+   "sha256": "1yri0ay0p3p80h9ypq692470y1b99y4hk468zqlmfzb87yv8vv7j"
   }
  },
  {
@@ -17842,11 +17900,11 @@
   "repo": "rails-to-cosmos/danneskjold-theme",
   "unstable": {
    "version": [
-    20210407,
-    1942
+    20210429,
+    657
    ],
-   "commit": "cd45635155aa6bae941156043217ce11531deca9",
-   "sha256": "1j2fr8gcy5pxzvaf3xh9z2k6bsdbw5z0a2ciys1zy8629sfx6w83"
+   "commit": "e4d1f2c76245fe9d0d07133a841e789d139df28d",
+   "sha256": "1ii3cgf4hlclwaraisxksv98mmhajx517i60p1cgd7vapznn2b6v"
   }
  },
  {
@@ -17898,8 +17956,8 @@
   "repo": "emacs-lsp/dap-mode",
   "unstable": {
    "version": [
-    20210405,
-    1739
+    20210425,
+    1933
    ],
    "deps": [
     "bui",
@@ -17911,8 +17969,8 @@
     "posframe",
     "s"
    ],
-   "commit": "2cb49bb2ec22a7d6d4fd403bd4e2cc468f512501",
-   "sha256": "0zymjabd6xpsdy3jr72rag8dmd7c1hsr1d973yjmvwj1awh9d0dd"
+   "commit": "e8fe25768c44ba005e0ff51a0d781ba1693e60a0",
+   "sha256": "1xjv8fdm7byrwfzw45zhq33s8nbkh6ad1fj04506x2dyiklpp0n1"
   },
   "stable": {
    "version": [
@@ -18268,14 +18326,14 @@
   "repo": "emacs-dashboard/emacs-dashboard",
   "unstable": {
    "version": [
-    20210325,
-    757
+    20210427,
+    705
    ],
    "deps": [
     "page-break-lines"
    ],
-   "commit": "00f1dc84d3fbaf439d23645aa531eee59e28f688",
-   "sha256": "0afn7p79na8351gimmjrj2z4y3slyvsrinm8gx7qphflz2a13m2z"
+   "commit": "9983aa0838ce5a2219ef4b674e6b37de41b5b585",
+   "sha256": "1mi1jn5gknvs7xjgj2v4dcq7z1a7xknksgfqi66bby7cl6cr3hqd"
   },
   "stable": {
    "version": [
@@ -18614,8 +18672,8 @@
     "ccc",
     "cdb"
    ],
-   "commit": "a266f70eb99ffb657b7821c2e1de49f5184a59ed",
-   "sha256": "0j1gcsi40yrfy9saqjdhxnwsvmqf32l9mnwfvhbbfxm82ddhwxnk"
+   "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614",
+   "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq"
   }
  },
  {
@@ -18839,11 +18897,11 @@
   "repo": "ideasman42/emacs-default-font-presets",
   "unstable": {
    "version": [
-    20201227,
-    2319
+    20210418,
+    924
    ],
-   "commit": "e5aad0510139cca42b37614d3599951ac0a28ccc",
-   "sha256": "0kp3ngmdwip7c4c9mvw1l04p13gjjfaigwdiaycbzd5jzlgdh6rq"
+   "commit": "81ef9d54000617ce98c40b4627eca64e076ff11d",
+   "sha256": "14l1m8jaqranj01fr040l2g560gbpbnd4sha4x4rcs2gc99sjqxx"
   }
  },
  {
@@ -19498,8 +19556,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "8f4c2358ac00e32d261f7e77b29af60adfdf0e41",
-   "sha256": "1grd6pzbirdq42qcwxis3q97cxlx6r3m20lqg0lb77vk6k75y619"
+   "commit": "b39c08c8d08d5c58b5b2a76214e0872984e1ae7d",
+   "sha256": "1hw6c7v6n229p8bz829b3nfzdg7afrxdn4rblgk39q1wl04v4cd5"
   },
   "stable": {
    "version": [
@@ -20233,11 +20291,11 @@
   "repo": "thomp/dired-launch",
   "unstable": {
    "version": [
-    20200430,
-    1625
+    20210416,
+    1954
    ],
-   "commit": "95a411f6d4bb5eec4ef8fdbba9f038ddf60da81f",
-   "sha256": "0rz8d9lj2zbipz6cwrlw2a3z9y4rybbmz73h73l1i7fjg9q1kqm4"
+   "commit": "2a946c72473b3d2e4a7c3827298f54c2b9f3edc2",
+   "sha256": "1l63il1a0x7clb44wgir8zig0g7acanq830721ss7c2qwzg69rl2"
   }
  },
  {
@@ -20491,14 +20549,14 @@
   "repo": "jojojames/dired-sidebar",
   "unstable": {
    "version": [
-    20210301,
-    2158
+    20210411,
+    2315
    ],
    "deps": [
     "dired-subtree"
    ],
-   "commit": "92e7f77ec65c2089d75edb63ca312f55e3033be0",
-   "sha256": "0ad9r63jp257z95jb5537nbw64q6shdg4m5cmlx8asb7fp2wgsf8"
+   "commit": "79d8187da373b573a2d5385ca868553bb73e0005",
+   "sha256": "0b1f6ddhn8z4q790d370zhyqrn4mlqk7i6901sld52m14zigd72j"
   },
   "stable": {
    "version": [
@@ -20603,6 +20661,25 @@
    "sha256": "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2"
   }
  },
+ {
+  "ename": "dired-view-data",
+  "commit": "4a3f94025604a6efc529891d4bc78293f0a11a98",
+  "sha256": "00gc7qa278nfyxhpx9h765m62i1g6z5ambcg0kgksl8k0571xqj3",
+  "fetcher": "github",
+  "repo": "ShuguangSun/dired-view-data",
+  "unstable": {
+   "version": [
+    20210430,
+    156
+   ],
+   "deps": [
+    "ess",
+    "ess-view-data"
+   ],
+   "commit": "3bb4e135486b2166b81fd4f5684bea27fd13081f",
+   "sha256": "08xsnsqjqxkx53j207hhxps3d9m9cq7d441yi7rpiq9qq7qkpy87"
+  }
+ },
  {
   "ename": "diredc",
   "commit": "abaea37c792e6593665dc536e8803e0f591f7359",
@@ -20611,11 +20688,14 @@
   "repo": "Boruch-Baum/emacs-diredc",
   "unstable": {
    "version": [
-    20210316,
-    1841
+    20210428,
+    247
    ],
-   "commit": "dd945de3e0c66a164f003a96d473376b58fc6dc7",
-   "sha256": "1d4rdrc827nnb9p56la1sd9nzwjbxbnr8fgmcgardlz3qw97j3q1"
+   "deps": [
+    "key-assist"
+   ],
+   "commit": "7651b1dcc98cbc37f5e4d0992a27d1f96279900c",
+   "sha256": "0y59z1651g0jsvrzjq4nx5i7r1rqrhgas6bplwlw60sb6ygqijpy"
   },
   "stable": {
    "version": [
@@ -20680,14 +20760,14 @@
   "repo": "wbolster/emacs-direnv",
   "unstable": {
    "version": [
-    20210117,
-    1213
+    20210419,
+    1851
    ],
    "deps": [
     "dash"
    ],
-   "commit": "381176f301dea8414a5a395c0d6546507838f6ce",
-   "sha256": "0hmj5m3wiqwdmjzxbzkf4sg8gaswdv5rv6jqgqvz3h9sm17fnps7"
+   "commit": "4b94393a9adf677c7c037215e233eef5fbca553d",
+   "sha256": "14whrhi6hgzadrw9z9k2sh2800483xs1h611avz4x68c8d2jfj5k"
   },
   "stable": {
    "version": [
@@ -21661,14 +21741,14 @@
   "repo": "jcs-elpa/docstr",
   "unstable": {
    "version": [
-    20210410,
-    1249
+    20210417,
+    1315
    ],
    "deps": [
     "s"
    ],
-   "commit": "67a219425d1fe9a29ad3beae0677d5ca0047bd53",
-   "sha256": "0irqfn5cxb8gkxvdmikmjz2j9km6k7057r7yw5aypgaxm89a404x"
+   "commit": "c14485468439056bcfc6a0862fe35fa8d787d34a",
+   "sha256": "198vqmhyasilxgz2lwn7y3a0g885ws3pyhvvj80wy7n4ml8mfdr4"
   },
   "stable": {
    "version": [
@@ -21810,21 +21890,21 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20210330,
-    1522
+    20210501,
+    1628
    ],
    "deps": [
     "all-the-icons",
     "dash",
     "shrink-path"
    ],
-   "commit": "669cac3839271f84ccfed06eddaad206224ca831",
-   "sha256": "1p5w5qbz6dgsk1dcy4fspdqwh03h4cxs175ng6zm6590dk0xs5bb"
+   "commit": "12f1ab19b9d1ad8bfea2986b60c527be0425c9f1",
+   "sha256": "01xh5jdy7csa09i0lz76xqh6x21dklhmmavvvwba9mzq387nijp3"
   },
   "stable": {
    "version": [
     3,
-    0,
+    1,
     0
    ],
    "deps": [
@@ -21832,8 +21912,8 @@
     "dash",
     "shrink-path"
    ],
-   "commit": "b44955841a301f4930b054e912fa4c1a700d426d",
-   "sha256": "08m75rl5i812pa87zcsjvb4mm3jjhpwzgx9mf2m7sxj807airz5d"
+   "commit": "92f141f91a87664104ffb17177b01b9fcc706744",
+   "sha256": "0flxjyzccqv8yyk6iaxmcb3m47khy6ck3vffnfdkqs5lckm9c31s"
   }
  },
  {
@@ -21863,14 +21943,14 @@
   "repo": "hlissner/emacs-doom-themes",
   "unstable": {
    "version": [
-    20210322,
-    1750
+    20210503,
+    1730
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "4199e74db170200995ee8dfbb55ffae004d6e219",
-   "sha256": "0vfhnywww560rf0b7h2gc9w4x4738xwq12c8qi9y267110zg62mz"
+   "commit": "cdfbf878bae788b8d4a983c19e3ab3b1d39cfdea",
+   "sha256": "1swlfbsrmjjzfybl17jvnyqwcxdabqp33zda1cdsdy6hgrmrm9x3"
   },
   "stable": {
    "version": [
@@ -22114,11 +22194,11 @@
   "repo": "dracula/emacs",
   "unstable": {
    "version": [
-    20210220,
-    1358
+    20210502,
+    1743
    ],
-   "commit": "b5e50ed1e30ee054fb6a0827e78382b038e83c46",
-   "sha256": "0bdlcvx95r0hwxpvdfac6xjcs59jn4mi29yny7bjz3x463czidcy"
+   "commit": "0a76928fdb49d1cf65b10c706ae0e1bbc779effb",
+   "sha256": "0a1jvcgzrp38xwa3rx7h7c5j5gcdgncfjgsjz8vcfnhckcj5zmzn"
   },
   "stable": {
    "version": [
@@ -22196,6 +22276,21 @@
    "sha256": "1ynjxfvx8b6rq6d4gm1sl96rmlk5pi8j5s1rd1y0p8x2lwqcfv77"
   }
  },
+ {
+  "ename": "dream-theme",
+  "commit": "21d32adebc711ffcff2633c5ec4ba4fe58dcb0b5",
+  "sha256": "1lbfassmf2b6ibi3szp5p1q57nabj133bgwfnlf21svhb85zax05",
+  "fetcher": "github",
+  "repo": "djcb/dream-theme",
+  "unstable": {
+   "version": [
+    20210419,
+    605
+   ],
+   "commit": "0c27f05544b90e41338f79ea923044b358a323c6",
+   "sha256": "1dnfisa6smrnjxm6yvb3w57skz4i8akigvzr8lsh1zr7by821wl0"
+  }
+ },
  {
   "ename": "drill-instructor-AZIK-force",
   "commit": "fb5ee8a113b98e8df8368c5e17c6d762decf8f5b",
@@ -22377,11 +22472,11 @@
   "repo": "jscheid/dtrt-indent",
   "unstable": {
    "version": [
-    20210307,
-    2140
+    20210423,
+    745
    ],
-   "commit": "37529fc7a98564164c87103e5107a6dca32b0e44",
-   "sha256": "1h2j25b6qayydl841zwbh73fw1177xgskrqm27cqmfx0bcpx7qq3"
+   "commit": "9714f2c5f1c9b7c21e732df8c15a870a88caba84",
+   "sha256": "1aygba84si1g8kx12hscwa6m3c3946r0vbk93p9izib9fkbgngw6"
   },
   "stable": {
    "version": [
@@ -22467,8 +22562,8 @@
     "popup",
     "s"
    ],
-   "commit": "8bc195000e17ce6c72755a8fb55ca0fcd36add76",
-   "sha256": "0dc31yy4r41nwwv57dzbd6zgwddizqh4q4qagpqx645l509s7k7i"
+   "commit": "8f70acbe164553b225476fed55019ecddcf0bbd6",
+   "sha256": "08g417yf4byhhldvcbkmhrlm7iaylkv0cbcg1c701dyfngxn01y2"
   },
   "stable": {
    "version": [
@@ -22512,17 +22607,35 @@
     20210213,
     757
    ],
-   "commit": "65404cf973aa7ffc0e9dd7d05c9dd3709c7db2d4",
-   "sha256": "13v4i59f0m5syjz49g5xh4nnr7k2wck0nf0pc5hgsv6g61gkpwvj"
+   "commit": "07ca7ccf8ecaad2fb153fbd2ccfda3aeb9d3d5e2",
+   "sha256": "0kw3bvzvwn6hfa981qn13b3lmm74dwhrllssbs1wyf1fsx0x77ag"
   },
   "stable": {
    "version": [
     2,
     8,
-    4
+    5
    ],
-   "commit": "b6a3f66fb15378fc7170e94778f4d2c0b142ad92",
-   "sha256": "1p3r197cfb96675n2s7mbggndqspcxxmk9lkncirixm3k7ww36l1"
+   "commit": "e84ba5230f6afacb12f022937138a752f1c301b6",
+   "sha256": "0a1jj6njzsfjgklsirs6a79079wg4jhy6n888vg3dgp44awwq5jn"
+  }
+ },
+ {
+  "ename": "dune-format",
+  "commit": "9158dc00e15f573e09d311f1389413d6168d7e07",
+  "sha256": "19kqy05hnzywc8hspv9vh5b7rcgv23rhzay5pcixsy464glxhnj6",
+  "fetcher": "github",
+  "repo": "purcell/dune-format-el",
+  "unstable": {
+   "version": [
+    20210411,
+    2348
+   ],
+   "deps": [
+    "reformatter"
+   ],
+   "commit": "22af9fcf75eea577a39fc315fd9bcaa709fb4e1c",
+   "sha256": "0r0329x8r55ivnc6n16hi3rw3556xza5sdw2a06vk17pyiaskf1z"
   }
  },
  {
@@ -22572,11 +22685,11 @@
   "stable": {
    "version": [
     1,
-    0,
-    1
+    1,
+    0
    ],
-   "commit": "66d92f592b35fd168f23d7c58d698a1ed2dcaa0a",
-   "sha256": "1pfz1wwrdpdkd29309dryy7ficl1h1rfmgv7fbpy9p33vs9mdi9p"
+   "commit": "61c5718ba64ace4c9e29de18aa2690ecc3f0f258",
+   "sha256": "14nd544ispfj165ys6lv9bpy41p9j8kf4lwy73qigr4c7qlf43by"
   }
  },
  {
@@ -22587,14 +22700,14 @@
   "repo": "harsman/dyalog-mode",
   "unstable": {
    "version": [
-    20200822,
-    1536
+    20210413,
+    810
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "f42e49b9dd7ab41f08361185cc25509f19b949a8",
-   "sha256": "1cqaa12pycwiv4cj100n8326f3yg59xgww3lk2l6x7841n7g7szm"
+   "commit": "697a84194766708d2607e8ba48a552e383c6523e",
+   "sha256": "1afcfqf9z1d67va9cdi2fxpr1l1nrgkksxh5g7h8ggqkml2ks8hn"
   }
  },
  {
@@ -22654,11 +22767,11 @@
   "repo": "zellerin/dynamic-graphs",
   "unstable": {
    "version": [
-    20200902,
-    1238
+    20210430,
+    352
    ],
-   "commit": "ba3fdf2cf0e5e1e952a1961a03dfb7f61a4ab0e7",
-   "sha256": "0cyngkba93swhgklh88r5czlvimc0pa9blg02cwz3mjwj5r558bl"
+   "commit": "f7239e381de56af5d6ff8e0d6ab31a78d3e3da58",
+   "sha256": "1v3p0ycm3yh8gvpbr96ml89470piam25qyhrwrkin228k17949br"
   }
  },
  {
@@ -22700,6 +22813,24 @@
    "sha256": "0qs7gqjl6ilwwmd21663345az6766j7h1pv7wvd2kyh24yfs1xkj"
   }
  },
+ {
+  "ename": "dyncloze",
+  "commit": "4725983cb1d5d2c5ad1dda162050973516196323",
+  "sha256": "173z9skkmpmjw0h5z1dcdlplihjz9yszn1h20p53w9sicif58i1c",
+  "fetcher": "github",
+  "repo": "ahyatt/emacs-dyncloze",
+  "unstable": {
+   "version": [
+    20210405,
+    212
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "38aac1a38017a707b4c539a7932cc8f6cd8f1a77",
+   "sha256": "05i0a1680a79xvawa93iip10ln6bkrnvzqh3a2lica4hfx0hsi0x"
+  }
+ },
  {
   "ename": "e2ansi",
   "commit": "5e655a3fdfae80ea120cdb2ce84dd4fd36f9a71e",
@@ -23183,26 +23314,26 @@
   "repo": "joostkremers/ebib",
   "unstable": {
    "version": [
-    20210407,
-    2146
+    20210503,
+    1412
    ],
    "deps": [
     "parsebib"
    ],
-   "commit": "bd1c9dcda79f734f6302e7c81ee0f13106a3a9e1",
-   "sha256": "1bd6hqiq178h1z8x0hjyrxg6l0h2inkzmrg6fadfj3ly1hbs5157"
+   "commit": "3142de8d64789c611e553667cac3bb84428d004c",
+   "sha256": "1xgpdw0sxl2c9dn6x6fk0rqpqlqxsjlj0vyag611blj600br7dqr"
   },
   "stable": {
    "version": [
     2,
-    30,
+    32,
     1
    ],
    "deps": [
     "parsebib"
    ],
-   "commit": "6a3351c4bee70517facf0eac457a17a1efc21144",
-   "sha256": "0ppp6a8qyllh1kjrh8fa8dvhv98wnq0w742mzh8gahkjbrsjdwcj"
+   "commit": "3142de8d64789c611e553667cac3bb84428d004c",
+   "sha256": "1xgpdw0sxl2c9dn6x6fk0rqpqlqxsjlj0vyag611blj600br7dqr"
   }
  },
  {
@@ -24031,8 +24162,8 @@
   "repo": "joaotavora/eglot",
   "unstable": {
    "version": [
-    20210410,
-    1942
+    20210430,
+    832
    ],
    "deps": [
     "eldoc",
@@ -24041,8 +24172,8 @@
     "project",
     "xref"
    ],
-   "commit": "8a5598d06a0539492ec30fc90201a263ea6a03e6",
-   "sha256": "0jlqskw08zlqhckhz64w2c0a14kk100lmnadwf4li5h2b2clmr7l"
+   "commit": "3f1ad3bd1bf6c2ccef61c3ca606ef69962ae6e55",
+   "sha256": "0532fd44lb913qpx6h6hdmk1gsmj3klwh2l41vkwc7vwqsb0rg23"
   },
   "stable": {
    "version": [
@@ -24099,28 +24230,28 @@
   "repo": "non-Jedi/eglot-jl",
   "unstable": {
    "version": [
-    20200726,
-    741
+    20210415,
+    1207
    ],
    "deps": [
     "eglot",
     "julia-mode"
    ],
-   "commit": "84cff9d6ef1643f3eac6c9d620cc1e380a9847d9",
-   "sha256": "1g3k3ym0hx97dk3sv1kz3vq0p1s1zw6r34ynhwm31y954miwyvm4"
+   "commit": "49f170e01c5a107c2cb662c00544d827eaa2c4d8",
+   "sha256": "1bmp517zfsspxlj0k67q15ladiphjha45zgnq3djs631mvr9bfaw"
   },
   "stable": {
    "version": [
     2,
     1,
-    0
+    1
    ],
    "deps": [
     "eglot",
     "julia-mode"
    ],
-   "commit": "84cff9d6ef1643f3eac6c9d620cc1e380a9847d9",
-   "sha256": "1g3k3ym0hx97dk3sv1kz3vq0p1s1zw6r34ynhwm31y954miwyvm4"
+   "commit": "49f170e01c5a107c2cb662c00544d827eaa2c4d8",
+   "sha256": "1bmp517zfsspxlj0k67q15ladiphjha45zgnq3djs631mvr9bfaw"
   }
  },
  {
@@ -24192,8 +24323,8 @@
   "repo": "millejoh/emacs-ipython-notebook",
   "unstable": {
    "version": [
-    20210330,
-    1531
+    20210429,
+    1630
    ],
    "deps": [
     "anaphora",
@@ -24204,8 +24335,8 @@
     "websocket",
     "with-editor"
    ],
-   "commit": "608c3cbfd58a626aab3cea6aa5b31d8a4032cf10",
-   "sha256": "103sg5wzzr7zp0x181nardc8r63cyx1f7s1l5drig5dwzp4dnd60"
+   "commit": "d33e04da06421813cdffed6af18e5379f7399c07",
+   "sha256": "0b365lx7sv95k52w8k6zyz5nbs7v7br04mhn9r5xm126a8gcb285"
   },
   "stable": {
    "version": [
@@ -24371,8 +24502,8 @@
     20200912,
     1653
    ],
-   "commit": "84dd1837f9ac80a329ab0c2de6859777f445f8ff",
-   "sha256": "098x17hg9dc28s7g50mxhv6m6fgch1xp1di7rplkg7w1dfphpc5a"
+   "commit": "d76ac84ae9670de7bf7725b362cafe86688771f9",
+   "sha256": "18x4qj75bh45b0dirp3jpw1zqni8xfqqh1q13q6b5ncy1nhvm4gl"
   },
   "stable": {
    "version": [
@@ -24702,11 +24833,11 @@
   "repo": "Mstrodl/elcord",
   "unstable": {
    "version": [
-    20210323,
-    2234
+    20210416,
+    1333
    ],
-   "commit": "25531186c10b74a10ee24990f9e967296cc70342",
-   "sha256": "14lk3whvj45ilb7mv60dfpxhbw3jsddglz0mq5vhdgy6n8wkcpa9"
+   "commit": "6608e0392b46324fc09a5b5f4457c15ac1394f80",
+   "sha256": "0mr6xx1bwpfn24x6vbrzd482scz6mrdmgdrk03ixwlspaqmancdm"
   }
  },
  {
@@ -24751,20 +24882,19 @@
   "repo": "doublep/eldev",
   "unstable": {
    "version": [
-    20210410,
-    1721
+    20210425,
+    2011
    ],
-   "commit": "635744890ba2d55d9569a66cb72b13870418a513",
-   "sha256": "1hlsnd9ppw18p0kbjgf2g5xwikipjkzzqcvql63pn9ds5zr1gn6q"
+   "commit": "7256b1b953fd8bf09acc840354e3a28e63fd1ba6",
+   "sha256": "0491iq2ia76lm4sn9q4ks74qfn4wwzrj66mz4hck3962h8iabydz"
   },
   "stable": {
    "version": [
     0,
-    8,
-    1
+    9
    ],
-   "commit": "c4f9b7ff4d12c59cc80b4a67f856601ba7cff2cd",
-   "sha256": "19s45hdhcg5l608awfxvmhd61xzp7dd5pvviv89xzzksx74l1188"
+   "commit": "70612cead889bb763f7b353aa2ecf67577da344c",
+   "sha256": "1m067l3wf7dx2qya4mw1ngvl266ln26ngac3vkswxj9l3s69mqjn"
   }
  },
  {
@@ -24893,6 +25023,21 @@
    "sha256": "0s4y1319sr4xc0k6h2zhzzxsx2kc3pc2m6saah18y4kip0hjyhr8"
   }
  },
+ {
+  "ename": "electric-cursor",
+  "commit": "639747f3e5b2f8753478826a69b27727e1738d04",
+  "sha256": "12rlgyp9r4dgp0mid95rx0p5ygpxjzhvlxkmidlzakyirc1i0jlw",
+  "fetcher": "github",
+  "repo": "duckwork/electric-cursor",
+  "unstable": {
+   "version": [
+    20210501,
+    2107
+   ],
+   "commit": "e20c6f6e85c020e472ef05b12af7a12bbae65dbf",
+   "sha256": "0x1bhpb86bhkyyg28w81jw124l6zcbbqmf8i3fx28sc14q4y1gsd"
+  }
+ },
  {
   "ename": "electric-operator",
   "commit": "906cdf8647524bb76f644373cf8b65397d9053a5",
@@ -24932,11 +25077,11 @@
   "repo": "xwl/electric-spacing",
   "unstable": {
    "version": [
-    20210313,
-    1118
+    20210430,
+    1714
    ],
-   "commit": "fb1437a3386f55440abdbe7c107c86e5b028bdc5",
-   "sha256": "00pmp1596p24i7pasmm080aly8ifinp9hbvia2l4jf8mbfg2ndlw"
+   "commit": "800e09af7b0cd5d78d22f857dbce10fb080637df",
+   "sha256": "0ykndvbbx8rvaxppmkngyrzp1x6fghj9xv55i847kpzx1c6gs4fc"
   }
  },
  {
@@ -25121,15 +25266,15 @@
   "repo": "fasheng/elfeed-protocol",
   "unstable": {
    "version": [
-    20210401,
-    100
+    20210430,
+    846
    ],
    "deps": [
     "cl-lib",
     "elfeed"
    ],
-   "commit": "2b2aaf2f3b92e7c27827e0f280598cb52db558e0",
-   "sha256": "1nffhs0mnc0j87wfk6siw3zaj6p1dm1hxz55p54v9895x8c5bakv"
+   "commit": "5e17d4280f5f8019c3f8962a710c9b3e633f41ff",
+   "sha256": "0kv6svwg1h0wcj7z89xs20a9wns7v67af9m9rir3m8f47iyy70gr"
   },
   "stable": {
    "version": [
@@ -25153,26 +25298,26 @@
   "repo": "sp1ff/elfeed-score",
   "unstable": {
    "version": [
-    20210302,
-    2051
+    20210429,
+    1337
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "f59cbc38c83007e160722347c8cb5438d5fe13a0",
-   "sha256": "07xid0a31ghknbfwj8dxzbqkg4sfayjhlqvp17p2bzlf1mj0zjyd"
+   "commit": "8c694d0feb33dca66d9a8d88f9aaa6e7ded472ea",
+   "sha256": "0lcpj2vp947kbfk6fq7xz7j71mcpjs9086pqh690w4mzv1253gra"
   },
   "stable": {
    "version": [
     0,
     7,
-    7
+    8
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "f59cbc38c83007e160722347c8cb5438d5fe13a0",
-   "sha256": "07xid0a31ghknbfwj8dxzbqkg4sfayjhlqvp17p2bzlf1mj0zjyd"
+   "commit": "8c694d0feb33dca66d9a8d88f9aaa6e7ded472ea",
+   "sha256": "0lcpj2vp947kbfk6fq7xz7j71mcpjs9086pqh690w4mzv1253gra"
   }
  },
  {
@@ -25866,20 +26011,20 @@
   "repo": "redguardtoo/elpa-mirror",
   "unstable": {
    "version": [
-    20210325,
-    1219
+    20210414,
+    208
    ],
-   "commit": "2d50b2861ab0ba6a2a518de44823869fb4b14dfc",
-   "sha256": "0x0sfim9l5xl4fysy61w7migf504ynnmnraiwisdxl9bap7iraw9"
+   "commit": "944c79d654739ae83c8003b2b483e393589eee3f",
+   "sha256": "1i1f8l66arwsl6yh9wfn63lnjnb4ifrqhhvnakrmhqckxrs009lm"
   },
   "stable": {
    "version": [
     2,
     1,
-    4
+    6
    ],
-   "commit": "47f194c77830946c66bc6ffecdecadc5a3191402",
-   "sha256": "00c33b0k5rw66xbzv1ggz1ai1yaqa705vqb25b54sirwr0s37wly"
+   "commit": "abc8d7b7de12e4eb06efa2dbb1cc77a714f14479",
+   "sha256": "0p5jbdbl7bmx94fj7qyqqsy0clvkzjgczbgvhx4ay9wyq83wdaav"
   }
  },
  {
@@ -26242,11 +26387,11 @@
   "repo": "emacscollective/elx",
   "unstable": {
    "version": [
-    20210228,
-    2103
+    20210426,
+    1933
    ],
-   "commit": "de9d42c86fc3e71239492f64bf4ed7325b056363",
-   "sha256": "0778izaq1hjcc9i7d0v3p9xb08y6bwj9brcmpyd2yj3lfajbhxdx"
+   "commit": "95fe33007c663bc22ac60b6969551e07ce6cfa10",
+   "sha256": "0b2757m8zgdnb8vr21593ih5bq0cz0asy0i1x6sjr6mpd3sgysf9"
   },
   "stable": {
    "version": [
@@ -26266,14 +26411,14 @@
   "repo": "tecosaur/emacs-everywhere",
   "unstable": {
    "version": [
-    20210303,
-    1507
+    20210422,
+    1053
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "99997af93310128cc95b8ddceacb448daed2403a",
-   "sha256": "03syfvwsbrrmghdav3xkmpjvdfh1q1qr880a6f6wkri9iazg021g"
+   "commit": "64ba2e3f3096f48928f7be06ed690069b96add22",
+   "sha256": "1cjzrckbxcl1ahhnnk78778yxsrhwb725cwjbx6i8y6jxwbddpqj"
   }
  },
  {
@@ -26563,11 +26708,11 @@
   "repo": "oantolin/embark",
   "unstable": {
    "version": [
-    20210411,
-    1954
+    20210430,
+    1740
    ],
-   "commit": "a005eef82a63950927a68a5ef79b33d25245687b",
-   "sha256": "1dy01y87bqjddsdjqhmp6m144azn72yswsj0prywm5alxypck9lg"
+   "commit": "05aa11bca37db1751c86fe78f784741be5b1a066",
+   "sha256": "1nnrn6dd248l6ngvgjjniqkahlwz45y3n50nw555a67pmi88grh9"
   },
   "stable": {
    "version": [
@@ -26593,8 +26738,8 @@
     "consult",
     "embark"
    ],
-   "commit": "a005eef82a63950927a68a5ef79b33d25245687b",
-   "sha256": "1dy01y87bqjddsdjqhmp6m144azn72yswsj0prywm5alxypck9lg"
+   "commit": "05aa11bca37db1751c86fe78f784741be5b1a066",
+   "sha256": "1nnrn6dd248l6ngvgjjniqkahlwz45y3n50nw555a67pmi88grh9"
   },
   "stable": {
    "version": [
@@ -26761,27 +26906,28 @@
   "url": "https://git.savannah.gnu.org/git/emms.git",
   "unstable": {
    "version": [
-    20210407,
-    1604
+    20210503,
+    1629
    ],
    "deps": [
     "cl-lib",
+    "nadvice",
     "seq"
    ],
-   "commit": "f79343bf03f6ece09638ec27eeb831c0abe59667",
-   "sha256": "1ki2hd38fxvd4112bhgfifr3raar3yz345h9hya7dn8aw9hscr14"
+   "commit": "b0173b6b4c5b66a4706cb82c9b50a179bf159a0f",
+   "sha256": "1scppj8wkiml4dgsg4540hdd8mv9ghcp2r17b647az0ccxwp73qm"
   },
   "stable": {
    "version": [
-    6,
-    3
+    7,
+    1
    ],
    "deps": [
     "cl-lib",
     "seq"
    ],
-   "commit": "a2738fe1a9013f641eeba31300e828e88b468b14",
-   "sha256": "0r2krmrhmwqcw3sdmy7z9rw4l222ja4jz8an8av11qjhpacr8v98"
+   "commit": "e1247af518d0d983d889d5ba60bbde38431d0c68",
+   "sha256": "17ny15p26nl29k2jis4kslh85cryljb151p71w5886rf3abr58pb"
   }
  },
  {
@@ -27486,6 +27632,19 @@
    ],
    "commit": "99d3a4b6973d5b09864e0af7425a61f99c19b90a",
    "sha256": "0k6isn6szbwc6jc7kzfq82p8w737z7iyn2yi9aqf6j54a6xa5aka"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "deps": [
+    "dash",
+    "s"
+   ],
+   "commit": "0d5d80dd0c76f0d46a3565d940a2b0ed955dfd0a",
+   "sha256": "0bfab8yh2r08vqgnk81avw9n46fda5jb4fcm0h2y8f1lv6jgnfy0"
   }
  },
  {
@@ -27820,24 +27979,6 @@
    "sha256": "0k3gp4c74g5awk7v9lzb6py3dvf59nggh6dw7530cswxb6kg2psa"
   }
  },
- {
-  "ename": "erc-status-sidebar",
-  "commit": "29631de8ec4140a8e35cc500902b58115faa3955",
-  "sha256": "04qh70ih74vbavq7ccwj1ixpd8s3g8rck9bxv6zhm1yv34bslw5d",
-  "fetcher": "github",
-  "repo": "drewbarbs/erc-status-sidebar",
-  "unstable": {
-   "version": [
-    20200907,
-    1307
-   ],
-   "deps": [
-    "seq"
-   ],
-   "commit": "87210a3ccc16a86e6b5992744b68daabed3b2d11",
-   "sha256": "1gb8lzsi3clbass40sllfwf8akzlgb2k93wqlw1lf4gfb9shx08v"
-  }
- },
  {
   "ename": "erc-terminal-notifier",
   "commit": "f2ba978b1ba63fac3b7f1e9776ddc3b054455ac4",
@@ -28152,8 +28293,8 @@
     20200914,
     644
    ],
-   "commit": "3e079614f2b4810ff5920ae69a389da91c855217",
-   "sha256": "1jn0kp33b77lskhi02d0jm0rpcgxhrpxdj82bmr7vi7m199p5jn0"
+   "commit": "26d473648853255a6a46d9dedff66df7f644c42f",
+   "sha256": "18yz278724ydvkdpcwiszfx4lg40bqbwq78268pr5mg0wif0y4q6"
   },
   "stable": {
    "version": [
@@ -28177,18 +28318,18 @@
     20210315,
     1640
    ],
-   "commit": "165f8fe9354aaf23c166b5c54f352b3024da9bd3",
-   "sha256": "102dbzpfcysq7pinli2jcdff1mxh2af0s79qmia1wfm8jmzh0zhf"
+   "commit": "ed2aee59bd43ff1cd0ac29a9b4bc2ecd5ba6ebdc",
+   "sha256": "1148di7jk8ayq07ck4zd0wxrw90iigrwzg2j9xmjh8skddh0yihd"
   },
   "stable": {
    "version": [
     24,
     0,
     -1,
-    1
+    3
    ],
-   "commit": "655bd1a27673720bcee187e9fd9f07d739860ad3",
-   "sha256": "00k0x24diq2z24582bjk65c07ky1kf5h1zihs06ndl782i5cqjfa"
+   "commit": "dd36117cca61bfd2554bf7980b170f76bbf92278",
+   "sha256": "0sq6kzs8zsvv9anmrjv85sy2m1yvysjfn9fmyf0m7ffx648lwv4n"
   }
  },
  {
@@ -28199,14 +28340,14 @@
   "repo": "k32/erlstack-mode",
   "unstable": {
    "version": [
-    20190812,
-    1117
+    20210419,
+    1917
    ],
    "deps": [
     "dash"
    ],
-   "commit": "d0a67fb6f91cef02376e71b4b4669b071ebd9737",
-   "sha256": "10b77q2qwwlvj56g9yd6d9lkmk184mjf6x3067vvqs40xiv9bsgl"
+   "commit": "ca264bca24cdaa8b2bac57882716f03f633e42b0",
+   "sha256": "0541q21srscy8x7w4f8vbag1nsjksv9i1wi6sq5xjqnrl0piyv4k"
   },
   "stable": {
    "version": [
@@ -28757,11 +28898,11 @@
   "repo": "akreisher/eshell-syntax-highlighting",
   "unstable": {
    "version": [
-    20210223,
-    936
+    20210429,
+    413
    ],
-   "commit": "eeace52ebb2c730f3665fb235017cd57dc6050a2",
-   "sha256": "1anlan2ldvx0qzj44dhb44flcs3h0d57v79qzn21jpy4d0y0m3kq"
+   "commit": "32d2568ebeb42553a30dda77e03c0e2ec8854199",
+   "sha256": "0my99472i5zdlhcv95jhfv58ph28gaw159p2llp4wv13acryin56"
   },
   "stable": {
    "version": [
@@ -29040,11 +29181,11 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20210403,
-    520
+    20210414,
+    2354
    ],
-   "commit": "b501beec408b66e2f2a8c4f3117e0c84ee1b0262",
-   "sha256": "03rd1qp9d8br36cynxm73ajac0f2kyyjnffnciix3vf7w5lpsily"
+   "commit": "1782c6730a8fadcf4c162c7aac4329d4e28259b6",
+   "sha256": "0whjmvxxpx55cndngmky04kbfhcxamb7h3nhaclklm5sjlbc16qa"
   },
   "stable": {
    "version": [
@@ -29245,8 +29386,8 @@
     "cl-lib",
     "s"
    ],
-   "commit": "fa1413737b8d5173a4db8c18d8de9ac798365d53",
-   "sha256": "1barvpcxw9v0gy16drcrmq2izmasm0icahnzrpyzdfnvcmvp3al7"
+   "commit": "5169dd7fc8765a7377b0ab93aa63b7f0f934689a",
+   "sha256": "0mn9pffw7kzdzwv3jkhygdkmlqax9fsrbjznbck90ydiv095fmp6"
   },
   "stable": {
    "version": [
@@ -29283,10 +29424,14 @@
    "version": [
     0,
     3,
-    5
+    7
    ],
-   "commit": "68efaa4a7e9841b9bf2b80ea4841ee07d7bd68f9",
-   "sha256": "16jn404vfmsvm12wrf8iczqlgdf2iycbxrvalvzxnm2gr5dfzp7z"
+   "deps": [
+    "cl-lib",
+    "kv"
+   ],
+   "commit": "9f96449f6059cb75491dc812ddeb1b6200ec6740",
+   "sha256": "1xzxmgsg0j72sf1vjh9gjswz3c29js0kqhm7r3jrqrh3a5agdnml"
   }
  },
  {
@@ -29374,8 +29519,8 @@
     "f",
     "xterm-color"
    ],
-   "commit": "05fdbd336a888a0f4068578a6d385d8bf812a4e8",
-   "sha256": "0ln1agcgr607n5akm0ax659g11kfbik7cq8ssnqpr3z7riiv95dm"
+   "commit": "c9cfccef03e730f7ab2b407aada3df15ace1fe32",
+   "sha256": "1ip1mcry2mryr3gzina16c7m2pw71klx1ldbfv8w7rv8fsx2dsma"
   },
   "stable": {
    "version": [
@@ -29630,15 +29775,15 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20210411,
-    2050
+    20210424,
+    1855
    ],
    "deps": [
     "cl-lib",
     "goto-chg"
    ],
-   "commit": "d998a8195e404b01e2ea62a455c3dec74d0823c3",
-   "sha256": "0d4839nqdhr858nzb2cqj3wak2g8ynm5l8ak3467p1k9sn4d487a"
+   "commit": "adb551dc36492c74ea6c2a75a85465c6bbbc1cf2",
+   "sha256": "090q0dcy019clrs3nkp68ljcfk1dggzlhl7x8dsvd1bb6a8phn67"
   },
   "stable": {
    "version": [
@@ -29832,15 +29977,15 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20210401,
-    1012
+    20210424,
+    2326
    ],
    "deps": [
     "annalist",
     "evil"
    ],
-   "commit": "f2be91297029ae002d15e23510f9f686d848d7a8",
-   "sha256": "0ikb3ic84bxj9rzvkjhcvzgiwjpwmhfi6xli5yh03li7qdqsg5j5"
+   "commit": "09b165d4c2ecac66224f674966c920c25d20f3f6",
+   "sha256": "1gj4ds110kx10bgxxflin7ghj3bcyll8pv2h4cqkp9wv79f7plam"
   },
   "stable": {
    "version": [
@@ -29949,15 +30094,15 @@
   "repo": "cute-jumper/evil-embrace.el",
   "unstable": {
    "version": [
-    20160519,
-    1829
+    20210418,
+    2038
    ],
    "deps": [
     "embrace",
     "evil-surround"
    ],
-   "commit": "4379adea032b25e359d01a36301b4a5afdd0d1b7",
-   "sha256": "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a"
+   "commit": "464e8ec52ff78edf3c9060143fc375f6ce5f275f",
+   "sha256": "1bga1idxj8mg5xpl7k4ymwaniyba2x13lf8yihyh713s5238fdmd"
   },
   "stable": {
    "version": [
@@ -30411,13 +30556,13 @@
    "version": [
     2,
     3,
-    10
+    11
    ],
    "deps": [
     "evil"
    ],
-   "commit": "b24a7232a2de114cb09774111c2ff8462451894f",
-   "sha256": "14nrc46290q54y7wv25251f2kqc0z8i9byl09xkgjijqldl9vdxa"
+   "commit": "a0c5bd1fe89119b94ffb0a266d2969434e7ec4c1",
+   "sha256": "1990g1b6v0i7jaiv35bdssdn601rjifzg4fy9s3sxk0drqm1xiss"
   }
  },
  {
@@ -30657,14 +30802,14 @@
   "repo": "mamapanda/evil-owl",
   "unstable": {
    "version": [
-    20210408,
-    32
+    20210416,
+    1700
    ],
    "deps": [
     "evil"
    ],
-   "commit": "949ab1331ed9ff65d04930b215e033ef19f3696e",
-   "sha256": "1nkqxpzczlpw7yn8jjr9lqs2izdbw86x7nz0y67x9yy49aj19v6q"
+   "commit": "a41a6d28e26052b25f3d21da37ccf1d8fde1e6aa",
+   "sha256": "15yp158krz3znixgxgcblmsfh0dbxc6bf7fig8757vnmjcwlpqrv"
   },
   "stable": {
    "version": [
@@ -31155,8 +31300,8 @@
    "deps": [
     "evil"
    ],
-   "commit": "d998a8195e404b01e2ea62a455c3dec74d0823c3",
-   "sha256": "0d4839nqdhr858nzb2cqj3wak2g8ynm5l8ak3467p1k9sn4d487a"
+   "commit": "adb551dc36492c74ea6c2a75a85465c6bbbc1cf2",
+   "sha256": "090q0dcy019clrs3nkp68ljcfk1dggzlhl7x8dsvd1bb6a8phn67"
   },
   "stable": {
    "version": [
@@ -31186,8 +31331,8 @@
     "auctex",
     "evil"
    ],
-   "commit": "5f0d6fb11bce66d32c27c765e93557f6ca89cc7d",
-   "sha256": "1856liiy75w3r6s5ss6hnzcrypymfp6fpnw0i6ybrw351fkw4k9w"
+   "commit": "c0b8a9215bba6844487f2a678ea85a0a6e1da825",
+   "sha256": "1vkdq4cf4q3ngdx0f6yx9mgrjm63i8bx7hxa73d9gkbbplkkkjw5"
   },
   "stable": {
    "version": [
@@ -32140,39 +32285,30 @@
   "repo": "tumashu/exwm-x",
   "unstable": {
    "version": [
-    20210411,
-    1120
+    20210419,
+    950
    ],
    "deps": [
     "async",
-    "bind-key",
     "cl-lib",
-    "counsel",
-    "exwm",
-    "ivy",
-    "swiper",
-    "switch-window"
+    "exwm"
    ],
-   "commit": "7bc7a930998117a714cf1f2940dcab12bcac9b73",
-   "sha256": "1zs2sixp77q6dd9pdsk3w4y3nj1iz8j74q7nn5rsdmk0ja8i9sws"
+   "commit": "2ab026f407b011a8e8380c889990e85e69cb3a4e",
+   "sha256": "05jilbhpbbqbgpxhy11yadmal4gsh8bh1fffxkz8b5k8dpajc634"
   },
   "stable": {
    "version": [
-    1,
-    9,
-    0
+    2,
+    0,
+    2
    ],
    "deps": [
-    "bind-key",
+    "async",
     "cl-lib",
-    "counsel",
-    "exwm",
-    "ivy",
-    "swiper",
-    "switch-window"
+    "exwm"
    ],
-   "commit": "88c8b70be678ce0e9fa31e191ffd3f76bbfee61f",
-   "sha256": "03l3dl7s1qys1kkh40rm1sfx7axy1b8sf5f6nyksj9ps6d30p5i4"
+   "commit": "8fd00a0ca586e1c80d08209919f1414b448bc228",
+   "sha256": "0h248mma7kky30jr9bbhmp95wchl2cx5p6kh0gxmzpbc247dn2cc"
   }
  },
  {
@@ -32447,19 +32583,19 @@
   "repo": "WJCFerguson/emacs-faff-theme",
   "unstable": {
    "version": [
-    20210331,
-    233
+    20210427,
+    2150
    ],
-   "commit": "ef7efae7a86979e9267f9a600ef1482e0f6a2aa3",
-   "sha256": "0dl9i2l8186ir56v9vx32rw30pj9xgd7zhf24y6sqfjxn80hkdz8"
+   "commit": "7b994f27c798a6cd528af25bccbba28e27e6adcf",
+   "sha256": "0m826s1hll6gjr7y665kix7rnyghdrwi7rga57s158vgg0j345wy"
   },
   "stable": {
    "version": [
     2,
-    17
+    19
    ],
-   "commit": "2db5c559ca7356189083fb698a053bb1fee922a9",
-   "sha256": "1gk2dxmxv0sgkng7zgakz0gq9i0zh3wrwzsi785s338vjyypwm3g"
+   "commit": "7b994f27c798a6cd528af25bccbba28e27e6adcf",
+   "sha256": "0m826s1hll6gjr7y665kix7rnyghdrwi7rga57s158vgg0j345wy"
   }
  },
  {
@@ -32926,11 +33062,7 @@
     1942
    ],
    "commit": "59ab02344f569069b9899a3a5ffdca4a30093df4",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 262 ms\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 704 ms\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 1035 ms\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 2286 ms\nerror: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503\n"
-   ]
+   "sha256": "1vh6n2sg89g43sidymk22wjzjh71wgbajshhh7y3f6zf8xs94mmz"
   },
   "stable": {
    "version": [
@@ -33072,9 +33204,20 @@
   "ename": "filetree",
   "commit": "b4714ecde7200de934165d8e3b7f94ab5d711fa6",
   "sha256": "0d8ryxq7xa95av36fc25dxrrdxbm69iik22q52fjl9pzivrzlz58",
-  "error": "Not in archive",
   "fetcher": "github",
-  "repo": "knpatel401/filetree"
+  "repo": "knpatel401/filetree",
+  "unstable": {
+   "version": [
+    20210405,
+    524
+   ],
+   "deps": [
+    "dash",
+    "helm"
+   ],
+   "commit": "1328a624847886f8f92dfaf13fb6d73ba3d5d7a6",
+   "sha256": "1zvv3h6c488v8wqnw71inz4s6ag3bnpnsqm1k20n9kwsfqysr1rf"
+  }
  },
  {
   "ename": "fill-column-indicator",
@@ -33233,11 +33376,11 @@
   "repo": "ShuguangSun/find-dupes-dired",
   "unstable": {
    "version": [
-    20210204,
-    49
+    20210426,
+    835
    ],
-   "commit": "3c9783589e43717b682c9e37dd229839735402e8",
-   "sha256": "1wd7n08cf1mnd7czca3mcsfyh4nlkl36arhc3lnh7lzi98nyd0zv"
+   "commit": "af56f75afc240d8121c8944a614a272be811830c",
+   "sha256": "151c9hvsb5bnprn7kf3g23igazkw9l7xvzizikifizfabay9wi2h"
   },
   "stable": {
    "version": [
@@ -33256,20 +33399,20 @@
   "repo": "redguardtoo/find-file-in-project",
   "unstable": {
    "version": [
-    20210323,
-    118
+    20210427,
+    1205
    ],
-   "commit": "595c6ac9d5e5b2dc138b472a40bc85c7f20a56c0",
-   "sha256": "1fqg4jg3x7vrcap46vbncazzjaj6yan57rdmi2n8xbhmw3jcc8z9"
+   "commit": "3bf010d2be073d499de5ffdaa98f48bf8a3dd21e",
+   "sha256": "0zpckqcx4fbjni1f0c6wzi1356ab06j33himfgkhvyl1bn4w5jna"
   },
   "stable": {
    "version": [
     6,
     0,
-    3
+    7
    ],
-   "commit": "6a6328c59a96b09e771cbcc5f4188f20d0757aca",
-   "sha256": "17l5b9nibhfymyndppq0avbdr2rh20527fyr1q5i1c3xkn4d6wvp"
+   "commit": "2f44af320b4e62053c5b6b523f69a8f16eaaa1c9",
+   "sha256": "1qkfijqr839y605ssyalr2v9n6b86hr64mxikc96lx6nzdyjyyl0"
   }
  },
  {
@@ -34346,14 +34489,14 @@
   "repo": "leotaku/flycheck-aspell",
   "unstable": {
    "version": [
-    20210213,
-    1822
+    20210411,
+    2342
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "8cd2e747c3f3c1a0879f66b42db090b2878af508",
-   "sha256": "0m6s8kjk1xpr9pp1s7r39mmm5ry2sa05ync3vjr4kr2m7s5fqchh"
+   "commit": "74fa2837fd667235121a12eba43aa1675a58c0ec",
+   "sha256": "0kgib5igj4ngr589v57k3pwk5v8an33v9mdw5g8kxlsiw7ibr3xk"
   }
  },
  {
@@ -34895,15 +35038,15 @@
   "repo": "atilaneves/flycheck-dmd-dub",
   "unstable": {
    "version": [
-    20210329,
-    1926
+    20210412,
+    1608
    ],
    "deps": [
     "f",
     "flycheck"
    ],
-   "commit": "0799b16872829405e9da4e806ffffa42ad51fa36",
-   "sha256": "07jip6x59h439m714kx0fs6xfqi9p7yfl47js2py0q51hr51k2ij"
+   "commit": "818bfed45ac8597b6ad568c71eb9428138a125c8",
+   "sha256": "19xgj1z1b6m30syq2ps99v1gk76prmvh27nqj83nbqz57nqa0vjb"
   },
   "stable": {
    "version": [
@@ -35012,14 +35155,14 @@
   "repo": "lbolla/emacs-flycheck-elixir",
   "unstable": {
    "version": [
-    20180810,
-    642
+    20210413,
+    612
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "11998d7e3e63a33453e934d25b3673f7c558e579",
-   "sha256": "1hdbg0hvb6hwzjma9mxy0h888c8j2z4g38gwixrdixzbw5727r75"
+   "commit": "b57a77a21d6cf9621b3387831cba34135c4fa35d",
+   "sha256": "10y2z3w2hjycy0hx8zbhma88i2v9fs5xs7pwz3k56jnv95ipjmpy"
   }
  },
  {
@@ -35256,8 +35399,8 @@
     "flycheck",
     "grammarly"
    ],
-   "commit": "192109f43ca5508709a49875ff5f99c25b7f1696",
-   "sha256": "0ymnypijbivncjncs57dsn096wjccl7vwslv2pa8fl9hjl4y34r0"
+   "commit": "8321fc98a0809cad17e37ca924d364423c37b8c0",
+   "sha256": "1pga651wnvw3czqshn731nx0cdaf157v7v1c5n7kh95lc2r3jmn3"
   },
   "stable": {
    "version": [
@@ -35767,8 +35910,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "a285d849e6e227b79bef98f575ecfa43a70661da",
-   "sha256": "1wdv7iv3lmrpxxdas1p3grkpi08c4ipjfg170nfd2fy9nhr8iy38"
+   "commit": "2f5f7502c1e422c1df5b347b8142d67d5cd5caa7",
+   "sha256": "11bhblr96s8a19sb7lnzrwgihqjcwdnajxr6kiplgqd0wsh2h07v"
   },
   "stable": {
    "version": [
@@ -36081,8 +36224,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "039a6c9d0324208d4f4b006693c16248fcf5519b",
-   "sha256": "1sr1n7gv5n22w018z5nxfnknjqmk2lc8h2flv4d2f23aihlss9h3"
+   "commit": "ca00e018ecb9ebea4dde7f17eadb95d755ea88ab",
+   "sha256": "0j2klnv15v2gqnly5vgdrdrkccsza9mwz5c87i6qgnfawmnsh32d"
   },
   "stable": {
    "version": [
@@ -36269,14 +36412,14 @@
   "repo": "msherry/flycheck-pycheckers",
   "unstable": {
    "version": [
-    20200828,
-    1814
+    20210414,
+    2023
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "e8ce874eea4bba13aead8eb8e0262e94fb51f25e",
-   "sha256": "0i98viqm5plifaw3qdf2sxnk70l32qnkr82gl6j561vqhycxjq40"
+   "commit": "771fb9a66223287fcd4998b5f6d32d8c602bd91c",
+   "sha256": "1p4fys8hb89dfqqrzrwqdglxxm50g4x5na2hgzvkq1n0ss617rdj"
   },
   "stable": {
    "version": [
@@ -36843,11 +36986,11 @@
   "repo": "leotaku/flycheck-aspell",
   "unstable": {
    "version": [
-    20210213,
-    1822
+    20210411,
+    2342
    ],
-   "commit": "8cd2e747c3f3c1a0879f66b42db090b2878af508",
-   "sha256": "0m6s8kjk1xpr9pp1s7r39mmm5ry2sa05ync3vjr4kr2m7s5fqchh"
+   "commit": "74fa2837fd667235121a12eba43aa1675a58c0ec",
+   "sha256": "0kgib5igj4ngr589v57k3pwk5v8an33v9mdw5g8kxlsiw7ibr3xk"
   }
  },
  {
@@ -37149,8 +37292,8 @@
    "deps": [
     "grammarly"
    ],
-   "commit": "f09caa56254e6c639993afba29f5a4b8b9f9c73e",
-   "sha256": "0djjxnmy2bkkc6nyl5iq3axnp0marpzpnb8cgh79w1fch300avrf"
+   "commit": "bc7c7e74013816ea06463ff85627bdc08ad60d9a",
+   "sha256": "0yj0mqyg0c87kvxz21y0wmfx97lwvym6qm3sdppgkff5fwppyj91"
   },
   "stable": {
    "version": [
@@ -38455,8 +38598,8 @@
     20191004,
     1850
    ],
-   "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f",
-   "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q"
+   "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984",
+   "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b"
   }
  },
  {
@@ -38533,8 +38676,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20210406,
-    1356
+    20210426,
+    2126
    ],
    "deps": [
     "closql",
@@ -38546,8 +38689,8 @@
     "markdown-mode",
     "transient"
    ],
-   "commit": "ab3be5a703f319e6de7e76ed292d20deb60cb2d7",
-   "sha256": "1flpxzmxyz94vl0y2mw437nmcsls1fncapa75kqnbbcf641nidhy"
+   "commit": "aa5891178aa67d61ec17069375c07ca989f5741e",
+   "sha256": "07rxs00kk3xmk97i24rf7nbmcfdpa949j351ijcp3pdadinlijzw"
   },
   "stable": {
    "version": [
@@ -38602,15 +38745,15 @@
   "repo": "lassik/emacs-format-all-the-code",
   "unstable": {
    "version": [
-    20210315,
-    640
+    20210413,
+    802
    ],
    "deps": [
     "inheritenv",
     "language-id"
    ],
-   "commit": "94239d35944830ce009d01ac3369e0d61f9723c2",
-   "sha256": "1q27yr916vhk0ah1406vs540f8hpp8bca1f118xwhyj1fw3yrbaw"
+   "commit": "eb5906c7070b667432194da3991daf21f24b516a",
+   "sha256": "02i9qijkwzwjcl52ivzhcjamsiygdxn62gdkb9v511036vv4dqff"
   },
   "stable": {
    "version": [
@@ -38747,14 +38890,14 @@
   "repo": "rnkn/fountain-mode",
   "unstable": {
    "version": [
-    20210411,
-    1308
+    20210425,
+    335
    ],
    "deps": [
     "seq"
    ],
-   "commit": "3416d8cbf17af8b6f9118ae1963f203bf9b2509d",
-   "sha256": "1a9w6l46fs3dq52vih5dlm3163iy3dghz08d7c5xfg17c1b98yg8"
+   "commit": "7bee756bab352ecd93253343988bb274645cd10b",
+   "sha256": "062kp05x2iy0i5ni1viz2r26dnnvlh7wr7lk7pz1qrjh0qqqzi58"
   },
   "stable": {
    "version": [
@@ -39037,8 +39180,8 @@
     20210201,
     731
    ],
-   "commit": "752fe042ba3153473cd149875388c8dd9b4a8a26",
-   "sha256": "0x4sp6n6dksa8vps465i8sqvdzacr7hrxd4jlxj9gqkcspalrjgy"
+   "commit": "d5dc811fc892d78e042394bb4a1342dea2480b5c",
+   "sha256": "0n1w3rycc5cpqvhw6d1dzkwjdy1xx7bps7d994l4hcpdfx5c25lx"
   },
   "stable": {
    "version": [
@@ -39371,8 +39514,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "43dfeb07bd3932f9d42c2b964413001cf32f0d50",
-   "sha256": "16an39w1ycbw90d6l0d2mcvyndah1j21b2jf7iwnqipwsac9f1qm"
+   "commit": "ee4f57c0d0b5bd3fb8277b3bdced55540743162a",
+   "sha256": "1n89wjlsli7krb4fs8ln55wms5386xky4n2zm7k6457bhbh54fvn"
   },
   "stable": {
    "version": [
@@ -39971,23 +40114,19 @@
   "repo": "emacs-geiser/geiser",
   "unstable": {
    "version": [
-    20210410,
-    2304
+    20210428,
+    1942
    ],
-   "commit": "aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 278 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 535 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 1141 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 2003 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503\n"
-   ]
+   "commit": "70c3d6d5d247836b2d9d988f204ce804ae5db67d",
+   "sha256": "16jqni4s2yxszhkbb83fkgflygbxzx01cmq2qq40p4ihbvwm0gb0"
   },
   "stable": {
    "version": [
     0,
-    12
+    16
    ],
-   "commit": "adc5c4ab5ff33cf94cb3fcd892bb9503b5fa2aa2",
-   "sha256": "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08"
+   "commit": "803dfeb9414ed7b99c5d567170f32c97cafa1114",
+   "sha256": "16jqni4s2yxszhkbb83fkgflygbxzx01cmq2qq40p4ihbvwm0gb0"
   }
  },
  {
@@ -39998,18 +40137,25 @@
   "repo": "emacs-geiser/chez",
   "unstable": {
    "version": [
-    20210405,
-    1922
+    20210421,
+    120
    ],
    "deps": [
     "geiser"
    ],
-   "commit": "4cb7f2667ea1c53da53f0144910fbbd67bccbf4d",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 257 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 677 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 1142 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 2316 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503\n"
-   ]
+   "commit": "03da1c17253856d8713bc5a25140cb5002c9c188",
+   "sha256": "0cc1z5z5cpvxa5f3n8kvms0wxlybzcg4l1bh3rwv1l1sb0lk1xzx"
+  },
+  "stable": {
+   "version": [
+    0,
+    16
+   ],
+   "deps": [
+    "geiser"
+   ],
+   "commit": "03da1c17253856d8713bc5a25140cb5002c9c188",
+   "sha256": "0cc1z5z5cpvxa5f3n8kvms0wxlybzcg4l1bh3rwv1l1sb0lk1xzx"
   }
  },
  {
@@ -40020,18 +40166,25 @@
   "repo": "emacs-geiser/chibi",
   "unstable": {
    "version": [
-    20210405,
-    1924
+    20210421,
+    123
    ],
    "deps": [
     "geiser"
    ],
-   "commit": "54e7f384618c73d8fb675b5289d443a8ee3e4dc8",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 250 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 530 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 1321 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 2133 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503\n"
-   ]
+   "commit": "6f59291d8d1dc92ffd3f53f919d8cab4bf50b7d3",
+   "sha256": "0r92iay5cw7jqyd8cy2mm02y0sl89flp4asbz6ca9l818micphfn"
+  },
+  "stable": {
+   "version": [
+    0,
+    16
+   ],
+   "deps": [
+    "geiser"
+   ],
+   "commit": "6f59291d8d1dc92ffd3f53f919d8cab4bf50b7d3",
+   "sha256": "0r92iay5cw7jqyd8cy2mm02y0sl89flp4asbz6ca9l818micphfn"
   }
  },
  {
@@ -40042,18 +40195,25 @@
   "repo": "emacs-geiser/chicken",
   "unstable": {
    "version": [
-    20210405,
-    1931
+    20210421,
+    127
    ],
    "deps": [
     "geiser"
    ],
-   "commit": "47be5b43b35d3bf35b0f668b4c08715ea41fb97d",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 302 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 546 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 1206 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 2316 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503\n"
-   ]
+   "commit": "ceab39c89607f55cba88e5606ba5eb37c7df5260",
+   "sha256": "0klssx0vhj48868p36nkn22qh2k4188gpvi3c2pjk9lb7d5356xj"
+  },
+  "stable": {
+   "version": [
+    0,
+    16
+   ],
+   "deps": [
+    "geiser"
+   ],
+   "commit": "ceab39c89607f55cba88e5606ba5eb37c7df5260",
+   "sha256": "0klssx0vhj48868p36nkn22qh2k4188gpvi3c2pjk9lb7d5356xj"
   }
  },
  {
@@ -40064,18 +40224,25 @@
   "repo": "emacs-geiser/gambit",
   "unstable": {
    "version": [
-    20210405,
-    1925
+    20210421,
+    124
    ],
    "deps": [
     "geiser"
    ],
-   "commit": "0ee4156640988497779345452c3aa0417356e606",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 251 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 559 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 1131 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 2010 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503\n"
-   ]
+   "commit": "3294c944d1c3b79db44ed14b133129fec454bd60",
+   "sha256": "1vwr0iv7pznr7n6j76i90n306mhq5pxdj8b2f7l5mb32m442w2w9"
+  },
+  "stable": {
+   "version": [
+    0,
+    16
+   ],
+   "deps": [
+    "geiser"
+   ],
+   "commit": "3294c944d1c3b79db44ed14b133129fec454bd60",
+   "sha256": "1vwr0iv7pznr7n6j76i90n306mhq5pxdj8b2f7l5mb32m442w2w9"
   }
  },
  {
@@ -40098,14 +40265,10 @@
   "stable": {
    "version": [
     0,
-    0,
-    2
+    14
    ],
-   "deps": [
-    "geiser"
-   ],
-   "commit": "9e7ed54e5629f759660569bc7efc3d75dbabbc5f",
-   "sha256": "0rxncnzx7qgcpvc8nz0sd8r0hwrplazzraahdwhbpq0q6z8ywqgg"
+   "commit": "362f1d1189c090ece8b94f6a51680f74b1ff40f9",
+   "sha256": "1gsvl0r6r385lkv0z4gkxirz9as6k0ghmk402zsyz8gvdpl0f3jw"
   }
  },
  {
@@ -40116,36 +40279,54 @@
   "repo": "emacs-geiser/guile",
   "unstable": {
    "version": [
-    20210405,
-    1917
+    20210421,
+    118
    ],
    "deps": [
     "geiser"
    ],
-   "commit": "93ef7101fdfcc7eac6f465b4b9788c384a323c14",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 250 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 632 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 1153 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 2774 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503\n"
-   ]
+   "commit": "700ac985c1c729ba1005a0a076c683e9f781526f",
+   "sha256": "0bp70i8505rd0nwl44h9n9swnvqahr2fkhnv3q6020p1hgkjvdjs"
+  },
+  "stable": {
+   "version": [
+    0,
+    16
+   ],
+   "deps": [
+    "geiser"
+   ],
+   "commit": "700ac985c1c729ba1005a0a076c683e9f781526f",
+   "sha256": "0bp70i8505rd0nwl44h9n9swnvqahr2fkhnv3q6020p1hgkjvdjs"
   }
  },
  {
   "ename": "geiser-kawa",
-  "commit": "68690d6b011c95197af6b5a87cc21c4dbe97ff00",
-  "sha256": "0gzzab0v93vd9n14s1bya0frf3dagh0gbwg1an4mapg7gjz9ffdg",
+  "commit": "8e3f52b2b0dbd2ace92ec33caa3afc51e5c5e5cf",
+  "sha256": "0rvcpcf8znbndzm481a3477dw61rih1ifj3z2pwv33z6al6lwlh4",
   "fetcher": "gitlab",
-  "repo": "spellcard199/geiser-kawa",
+  "repo": "emacs-geiser/kawa",
   "unstable": {
    "version": [
-    20200507,
-    1305
+    20210427,
+    1626
    ],
    "deps": [
     "geiser"
    ],
-   "commit": "b96c008e9c3b8dc210d8b536ee7b76b8690c8af6",
-   "sha256": "0j2djjgfd4hd2k60ymgxzpsy52ks6hxpd4rr81z5nh9fdg9axhrs"
+   "commit": "3d999a33deedd62dae60f3f7cedfbdb715587ea7",
+   "sha256": "1i4ywb4ggq884p2lbpmp6y53l8ys5ajma7sk21zxi1jx28nb01nm"
+  },
+  "stable": {
+   "version": [
+    0,
+    14
+   ],
+   "deps": [
+    "geiser"
+   ],
+   "commit": "f76b53dbc1465dbd799e29bdcd2be34cc1603f50",
+   "sha256": "1i4ywb4ggq884p2lbpmp6y53l8ys5ajma7sk21zxi1jx28nb01nm"
   }
  },
  {
@@ -40163,11 +40344,18 @@
     "geiser"
    ],
    "commit": "d17394f577aaa2854a74a1a0039cb8f73378b400",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 286 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 541 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 1159 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 2059 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503\n"
-   ]
+   "sha256": "0w80ifs5d49ss81j34lnq91x2sbkc44i2xswkcwx23rh62p4jvyc"
+  },
+  "stable": {
+   "version": [
+    0,
+    14
+   ],
+   "deps": [
+    "geiser"
+   ],
+   "commit": "d17394f577aaa2854a74a1a0039cb8f73378b400",
+   "sha256": "0w80ifs5d49ss81j34lnq91x2sbkc44i2xswkcwx23rh62p4jvyc"
   }
  },
  {
@@ -40178,18 +40366,54 @@
   "repo": "emacs-geiser/racket",
   "unstable": {
    "version": [
-    20210405,
-    1929
+    20210421,
+    125
    ],
    "deps": [
     "geiser"
    ],
-   "commit": "a87fd449cc6c7b0b17a0b08268e78d3f038f3351",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 346 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 544 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 1082 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 2114 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503\n"
-   ]
+   "commit": "22e56ce80389544d3872cf4beb4008fb514b2218",
+   "sha256": "1aqsvmk1hi7kc3j4h8xlza7c6rwm71v98fv5wpw8kmyj9vsp49wx"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "deps": [
+    "geiser"
+   ],
+   "commit": "42376b74ae0ad84d02c26560dfd9181493dcccd7",
+   "sha256": "1aqsvmk1hi7kc3j4h8xlza7c6rwm71v98fv5wpw8kmyj9vsp49wx"
+  }
+ },
+ {
+  "ename": "geiser-stklos",
+  "commit": "6530db79aafe4ac4cefa01f77a8cc1e259385171",
+  "sha256": "0bbxxxvzp4dd22lrlmg0lnishvqj1pcm82scds27nrkzrcdycs8s",
+  "fetcher": "gitlab",
+  "repo": "emacs-geiser/stklos",
+  "unstable": {
+   "version": [
+    20210503,
+    944
+   ],
+   "deps": [
+    "geiser"
+   ],
+   "commit": "0e3a0570354c03c0cfa25da82fb34ad2e81c1981",
+   "sha256": "1g31cibl88g1vjfvw4z80ywxpnxy5lijhs754qdcnx36maragh07"
+  },
+  "stable": {
+   "version": [
+    1,
+    6
+   ],
+   "deps": [
+    "geiser"
+   ],
+   "commit": "0e3a0570354c03c0cfa25da82fb34ad2e81c1981",
+   "sha256": "1g31cibl88g1vjfvw4z80ywxpnxy5lijhs754qdcnx36maragh07"
   }
  },
  {
@@ -40358,8 +40582,8 @@
     "magit",
     "s"
    ],
-   "commit": "63ca93be02f830f8d65905ebde72d60a2280687a",
-   "sha256": "08s7q7br8a68gs7w55g6i4g0d6ky2mksl1ws8iigiavkh64sihkb"
+   "commit": "6a90e7233dccc2f997af2cd5c896c8d72d3c3a76",
+   "sha256": "1nmgngxgzbp1l4av6vb6fgl2nbizsffv51qnki8yaycl1f3cmrg9"
   }
  },
  {
@@ -40617,28 +40841,28 @@
   "repo": "magit/ghub",
   "unstable": {
    "version": [
-    20210327,
-    1647
+    20210427,
+    1239
    ],
    "deps": [
     "let-alist",
     "treepy"
    ],
-   "commit": "2273c3b49a08cde0498b3b2cfae6c764629a4c93",
-   "sha256": "1pg46ycllg900cd8q5bsgv9b9mcc0bm0z5g2bw9gf5nnbw556jla"
+   "commit": "d6e6b0666104f3896d05d2b03d08d84d9dca096f",
+   "sha256": "04ifyn8pkhg6lhlikxfgj6fcnz33mgr6x24y72754szc105irb0s"
   },
   "stable": {
    "version": [
     3,
     5,
-    1
+    2
    ],
    "deps": [
     "let-alist",
     "treepy"
    ],
-   "commit": "5fae5e31586a11a2025168030e0eb3876502611c",
-   "sha256": "0i19h9zl8wky1296f0d7dcx9dpfmfixinnaf4l1w1bf4p2xmyfiw"
+   "commit": "d6e6b0666104f3896d05d2b03d08d84d9dca096f",
+   "sha256": "04ifyn8pkhg6lhlikxfgj6fcnz33mgr6x24y72754szc105irb0s"
   }
  },
  {
@@ -40684,19 +40908,15 @@
     656
    ],
    "commit": "fa81e915c256271fa10b807a2935d5eaa4700dff",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 272 ms\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 546 ms\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 1078 ms\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 2648 ms\nerror: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503\n"
-   ]
+   "sha256": "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh"
   },
   "stable": {
    "version": [
     1,
-    1
+    2
    ],
-   "commit": "9522f7e41d07b59afe21e28abbf186f78be3eab6",
-   "sha256": "1g1by8lvf8c9vzm4wwsi5kp285kaj0ahsl54048ympin4pi0njw9"
+   "commit": "fa81e915c256271fa10b807a2935d5eaa4700dff",
+   "sha256": "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh"
   }
  },
  {
@@ -40995,8 +41215,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "5882df245d3388cd6f443bc11df219a838104df2",
-   "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h"
+   "commit": "471c63d92ce22b8ea653f821bc1893ecea324d4d",
+   "sha256": "1qx9164hcrs5k6bq4vpymma6b3g6c14c9zq9y5g9csfnjxmjwnjw"
   },
   "stable": {
    "version": [
@@ -41206,16 +41426,16 @@
   "repo": "akirak/git-identity.el",
   "unstable": {
    "version": [
-    20201223,
-    948
+    20210430,
+    1603
    ],
    "deps": [
     "dash",
     "f",
     "hydra"
    ],
-   "commit": "1c35e1693bbb7de41a8aac820a080a7299c13c17",
-   "sha256": "136j6gbpg8qx6ry1ryh4aal41b3c8pz7g2xisyipjj6p9lmykvqi"
+   "commit": "24360718c1666a246a39aadc8a251faa8578cc66",
+   "sha256": "129xv2ddgdkc9ipkxvwprkwp245x1zq2r75liv31x8x4g4i4305i"
   },
   "stable": {
    "version": [
@@ -41480,20 +41700,20 @@
   "repo": "magit/git-modes",
   "unstable": {
    "version": [
-    20180318,
-    1956
+    20210426,
+    2132
    ],
-   "commit": "14adca24eb6b0b4e311ad144c5d41972c6b044b2",
-   "sha256": "1z3xyjlbxni98hqdnd46lg89dcmcaqjsv73wv16ia4z6lrkhv5dp"
+   "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1",
+   "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6"
   },
   "stable": {
    "version": [
     1,
-    2,
-    8
+    3,
+    0
    ],
-   "commit": "55468314a5f6b77d2c96be62c7005ac94545e217",
-   "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72"
+   "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1",
+   "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6"
   }
  },
  {
@@ -41528,20 +41748,20 @@
   "repo": "magit/git-modes",
   "unstable": {
    "version": [
-    20180318,
-    1956
+    20210426,
+    2132
    ],
-   "commit": "14adca24eb6b0b4e311ad144c5d41972c6b044b2",
-   "sha256": "1z3xyjlbxni98hqdnd46lg89dcmcaqjsv73wv16ia4z6lrkhv5dp"
+   "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1",
+   "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6"
   },
   "stable": {
    "version": [
     1,
-    2,
-    8
+    3,
+    0
    ],
-   "commit": "55468314a5f6b77d2c96be62c7005ac94545e217",
-   "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72"
+   "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1",
+   "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6"
   }
  },
  {
@@ -41816,20 +42036,20 @@
   "repo": "magit/git-modes",
   "unstable": {
    "version": [
-    20180318,
-    1956
+    20210426,
+    2132
    ],
-   "commit": "14adca24eb6b0b4e311ad144c5d41972c6b044b2",
-   "sha256": "1z3xyjlbxni98hqdnd46lg89dcmcaqjsv73wv16ia4z6lrkhv5dp"
+   "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1",
+   "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6"
   },
   "stable": {
    "version": [
     1,
-    2,
-    8
+    3,
+    0
    ],
-   "commit": "55468314a5f6b77d2c96be62c7005ac94545e217",
-   "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72"
+   "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1",
+   "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6"
   }
  },
  {
@@ -41978,26 +42198,26 @@
   "repo": "TxGVNN/gitlab-pipeline",
   "unstable": {
    "version": [
-    20210322,
-    439
+    20210430,
+    151
    ],
    "deps": [
     "ghub"
    ],
-   "commit": "089400ac1d411a2b58cf1a64f28911079d5c898f",
-   "sha256": "0zck5488fswqcl7ahknm6nan5al8db73p2jbxnwcv2cxcia81qza"
+   "commit": "0a07b64e402fa1e25423f8f6ed38b35ff09159d9",
+   "sha256": "1611nday1mxkkjjwcz62bvl8863vlkl4bq4vf3wj6p237m4ai3ks"
   },
   "stable": {
    "version": [
     1,
-    0,
+    1,
     0
    ],
    "deps": [
     "ghub"
    ],
-   "commit": "ecb3a2277f6a1c7fed73f9381834724c143c85da",
-   "sha256": "1nqrim3fpgf5npzl14sd0h6dlhi925hns2f75l4arrhbcjgcn984"
+   "commit": "078f72d52e840907aa4c568468ce25758f20eb15",
+   "sha256": "0y2dkw7dwk1g4q0z1bjycj7sv47pvna6h7kwh8padn5l4fiy0hkd"
   }
  },
  {
@@ -43528,11 +43748,11 @@
   "stable": {
    "version": [
     0,
-    3,
+    4,
     0
    ],
-   "commit": "a4e80bbf83872fa6c8ace5197693d2f81c4ff1cd",
-   "sha256": "0bh3wbaiavz033isgl0m7crjhfsb0gxsgsnh54aph7pdrffci0r6"
+   "commit": "fb01f121c4c77db3e6750303894d57b31e410b14",
+   "sha256": "0jz4p6xa8nb36g96a8pbhpc4l16jzwryddlw2c442vmkngwy9s1j"
   }
  },
  {
@@ -43561,8 +43781,8 @@
     20180130,
     1736
    ],
-   "commit": "845e4f9a15a794071457e74c1fa99be2c68d75fe",
-   "sha256": "130bjw6bpizf0wq48d8n1cvgpdrq31d8ryd6wmah8a5vbwnczf6y"
+   "commit": "15fddd2eaf0fd656434b9ea72b374b29ffec7344",
+   "sha256": "0wya5sp4a4w2kg4c2pl26lpyxh8fvsmapry2sn8r996cd8lkdkra"
   }
  },
  {
@@ -43921,14 +44141,14 @@
     "magit-popup",
     "s"
    ],
-   "commit": "52c75aa6b3d8eeacfede11b314e20514ca7c75a4",
-   "sha256": "1a2nzbxhqwpjxfm4sr1l2pyjxhvfwd3ralxmldgsdpssqx64lvsn"
+   "commit": "82b771e4e219cd826d73291913eb2291ff2d8bfd",
+   "sha256": "0dprikwq6cna3zrgl7l706p4rhccn2sdp42ynbsza2kaiyz4ar7a"
   },
   "stable": {
    "version": [
     0,
-    24,
-    1
+    25,
+    0
    ],
    "deps": [
     "dash",
@@ -43936,8 +44156,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "f49dcf5ec6e16562de30674b36b18e6bdcd47411",
-   "sha256": "1slw2pawlcx9zfvsazsir2kj32g30b80c7a0yiqyrd7cv1hjnr8g"
+   "commit": "bb0307eb84ae981cfca7fc8d680821a2c2be3c6d",
+   "sha256": "0jwfk4kqz8jzxlhdihb0wvyiza1zfwcwr2p9frk0cw50p6fjqbs6"
   }
  },
  {
@@ -44156,8 +44376,8 @@
     "s",
     "websocket"
    ],
-   "commit": "e11a5a67307f05e08812be190b23460a1bf97687",
-   "sha256": "10ral5vipq3jvg3l8l2vgia97dpsjzkjvidp63n5z6mpjdwblka1"
+   "commit": "175e68d7ce9fd4c44d1eb808954cf0ba66b59599",
+   "sha256": "1ylynb295p5c26ayb8kdxqfbj9z61vinnd6bdlwsynr1wncbwyy4"
   },
   "stable": {
    "version": [
@@ -44534,11 +44754,11 @@
   "repo": "seagle0128/grip-mode",
   "unstable": {
    "version": [
-    20200725,
-    725
+    20210428,
+    1052
    ],
-   "commit": "98d566db769b865f102a0c6802a08ebce8ae5e7f",
-   "sha256": "0dh0a2msrbr31lzrp9b0xrp78g4h02qcsxjjzgmqyb6fqzhbr3kd"
+   "commit": "28552059c4643f571ef0883ad543270a48241572",
+   "sha256": "00prmjyfcnslb8b2gynlsrg80z6ns6jjyj87qniwj0rfmbfnh0qa"
   },
   "stable": {
    "version": [
@@ -44878,8 +45098,8 @@
     20200416,
     2136
    ],
-   "commit": "4462a5ab071ec001734e92d1ac2e5fa9721b94bd",
-   "sha256": "0v2h846k9xv47am66nv4piqhvn74xijhp2bq84v3wpls4msvfk70"
+   "commit": "fa0609b93f1ece777c0593529870390f21f5a788",
+   "sha256": "0aclxzxsh0ixibnw86d8gcyq5yzbfqzmz02rh2djk7l27yg50f10"
   },
   "stable": {
    "version": [
@@ -45606,11 +45826,11 @@
   "repo": "haskell/haskell-mode",
   "unstable": {
    "version": [
-    20210407,
-    214
+    20210502,
+    155
    ],
-   "commit": "426e28bbee7853734664d75a7e5f960c6c15ee67",
-   "sha256": "01qrrbb2rgr780xna4a1ncv92y8af76kvj0hjdl3qa1mdn0ypc3j"
+   "commit": "886795c15036d566aeced66f9508ae61ec0287ec",
+   "sha256": "1m8wlm12n32kv9pfxsz0xlpzmwn6icwyjj5fansq9v212wawq2b8"
   },
   "stable": {
    "version": [
@@ -45940,16 +46160,16 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20210409,
-    1016
+    20210426,
+    551
    ],
    "deps": [
     "async",
     "helm-core",
     "popup"
    ],
-   "commit": "4f16ec21f5ac4d0b9e36768c27abd453a959388d",
-   "sha256": "07v5gr61pvm5nh8xfi79i7ps6hjicm07zkg98m14z424dc8x6kl4"
+   "commit": "f680fcc9e771e4e798e4d2fa9aaf3708337c9289",
+   "sha256": "0rfjqcv53m7ccar7j51wfnxq6dnh75c44lxlnhaqg6i6a17gjd15"
   },
   "stable": {
    "version": [
@@ -46242,8 +46462,8 @@
     "cl-lib",
     "helm"
    ],
-   "commit": "9870333cdd4a54b309e2709af647cda6f4070a42",
-   "sha256": "02cpg60hif4rz6va2ynh3wc9dwj0nyig4fa0l6jchmzz8v2zvf86"
+   "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e",
+   "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik"
   },
   "stable": {
    "version": [
@@ -46848,14 +47068,14 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20210324,
-    1445
+    20210425,
+    1928
    ],
    "deps": [
     "async"
    ],
-   "commit": "4f16ec21f5ac4d0b9e36768c27abd453a959388d",
-   "sha256": "07v5gr61pvm5nh8xfi79i7ps6hjicm07zkg98m14z424dc8x6kl4"
+   "commit": "f680fcc9e771e4e798e4d2fa9aaf3708337c9289",
+   "sha256": "0rfjqcv53m7ccar7j51wfnxq6dnh75c44lxlnhaqg6i6a17gjd15"
   },
   "stable": {
    "version": [
@@ -48391,8 +48611,8 @@
     "helm",
     "lean-mode"
    ],
-   "commit": "5a2a36356e73c74a42e49fad19a71f4f12929a90",
-   "sha256": "18lswxxwvp85yzg1kc9vxn4dpmxmj40j6g64c8ns83nb7hw9lszg"
+   "commit": "bf32bb97930ed67c5cbe0fe3d4a69dedcf68be44",
+   "sha256": "1bkv5zs38ijawvavbba0fdf2flb6fiwici3qi99ws8wvwhnbkws2"
   }
  },
  {
@@ -48538,16 +48758,16 @@
   "repo": "emacs-lsp/helm-lsp",
   "unstable": {
    "version": [
-    20210226,
-    2027
+    20210419,
+    2014
    ],
    "deps": [
     "dash",
     "helm",
     "lsp-mode"
    ],
-   "commit": "74a02f89088484c42ffc184ece338b73abd4d6f6",
-   "sha256": "1p130xj03wh3pqwf1bb3xl86pqnv1kpmn90mwfg0g52jwl0grv6b"
+   "commit": "c2c6974dadfac459b1a69a1217441283874cea92",
+   "sha256": "0xpz9qrcbxknnncqf0hw7hs9k6sv9dckzsf081k2zmsks3l5qh4p"
   },
   "stable": {
    "version": [
@@ -49210,15 +49430,15 @@
   "repo": "tumashu/helm-posframe",
   "unstable": {
    "version": [
-    20200512,
-    1146
+    20210412,
+    1147
    ],
    "deps": [
     "helm",
     "posframe"
    ],
-   "commit": "b107e64eedef6292c49d590f30d320c29b64190b",
-   "sha256": "09y98ij4wkqh771ahwi3b7nsg6yb2b69n94v3ad41kp4q0c2rscd"
+   "commit": "2412e5b3c584c7683982a7e9cfa10a67427f2567",
+   "sha256": "0k4lmgvrxm4lswafc3fb8aab3ax0gnkkq64vg3vmiry85kih2cqb"
   }
  },
  {
@@ -50170,14 +50390,14 @@
   "repo": "emacsorphanage/helm-swoop",
   "unstable": {
    "version": [
-    20200814,
-    448
+    20210426,
+    547
    ],
    "deps": [
     "helm"
    ],
-   "commit": "1f7d3cf0d742b199e4ce13fcb8b19c977a44611e",
-   "sha256": "1r03d3ivmi0r5knsrlfx2cq5jljjl36h2l5n0mbs3sc6iad9wz20"
+   "commit": "1b3285791f1dc1fde548fe67aec07214d698fd57",
+   "sha256": "0wgi7pk2s4syi3fc8l60zcnz34f8ik9y558la0d5ryci4fssrl7i"
   },
   "stable": {
    "version": [
@@ -51037,10 +51257,10 @@
    "version": [
     0,
     1,
-    5
+    6
    ],
-   "commit": "9cc03c7136b56c04ea053fbe08a3a4a6af26b90e",
-   "sha256": "08czwa165rnd5z0dwwdddn7zi5w63sdk31l47bj0598kbly01n7r"
+   "commit": "4420bdda419875dacb065468aafe273b2022580e",
+   "sha256": "0a9nn1jnbgv93kz1iz5iay34d0p7lkpd8ic619ysk8qcksc0yn2i"
   }
  },
  {
@@ -51195,23 +51415,20 @@
   "url": "https://git.sr.ht/~tsdh/highlight-parentheses.el",
   "unstable": {
    "version": [
-    20210410,
-    1932
+    20210420,
+    1924
    ],
-   "commit": "fdabfda5f6300f8dd4d2a62c49359605798cc001",
-   "sha256": "0x833ahd5m4rlqrgr7n5xj477vbs7mmp267in22hw0cxi9aan08q"
+   "commit": "891538de31524956136e1419e1206af0c8befe02",
+   "sha256": "08l5gb73ibs1mmfifnks5gxrcg8x8azw9g10jj2f8vn8viwwa7m0"
   },
   "stable": {
    "version": [
     2,
     0,
-    0
+    2
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "e18f2c2b240d7586ff7ffdc2881079e2dd8944ca",
-   "sha256": "1agdsqn3g18s9nicp23mlwvshxqskkbfzs9lgjmzxsa5628rxixc"
+   "commit": "fdabfda5f6300f8dd4d2a62c49359605798cc001",
+   "sha256": "0x833ahd5m4rlqrgr7n5xj477vbs7mmp267in22hw0cxi9aan08q"
   }
  },
  {
@@ -51604,6 +51821,21 @@
    "sha256": "0fwb64ja5ij97308pnd7g6l5mascavcp7jcar8igxv9yyqnw6pfi"
   }
  },
+ {
+  "ename": "hl-prog-extra",
+  "commit": "d4ababc787d4dd173c65cc1b4b4a0fc0bb6e6d07",
+  "sha256": "1dgjskhz1jq01j19dmy8d3fzrg1d8jzrycdsxmkjlc2h05285wkg",
+  "fetcher": "gitlab",
+  "repo": "ideasman42/emacs-hl-prog-extra",
+  "unstable": {
+   "version": [
+    20210422,
+    56
+   ],
+   "commit": "42dee82058e49a7eae5490af2b6b4147600e87ed",
+   "sha256": "1csvhvjzhq1w9384i9n78qv8x0c2y8mdqig6fa2k5qi84cgsh8zp"
+  }
+ },
  {
   "ename": "hl-sentence",
   "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487",
@@ -51634,11 +51866,11 @@
   "repo": "tarsius/hl-todo",
   "unstable": {
    "version": [
-    20210117,
-    1140
+    20210503,
+    1419
    ],
-   "commit": "4d18ccde596aef84ef278aa60144390ab41f0046",
-   "sha256": "0r9yz485g393yh4nh1a8nqhk1yxjapq2dzjs3l13ld34hql776yc"
+   "commit": "d83f28ed95c04adf764acc6bd6faaa5f8ecfaea0",
+   "sha256": "1b864qf7n195sw3pkyp905px9p90cdacax74464if8n06l5m57a0"
   },
   "stable": {
    "version": [
@@ -52412,11 +52644,11 @@
   "repo": "humanoid-colors/emacs-humanoid-themes",
   "unstable": {
    "version": [
-    20210106,
-    2120
+    20210422,
+    1351
    ],
-   "commit": "c1f9989bcecd1d93a2d7469d6b5c812bd35fe0f3",
-   "sha256": "180hj0ww30kjr4nrnlp5r59xr6qpi7xhw19cp91syqhclzylkpqr"
+   "commit": "1ce4f09af216f5bb643454da1a3f66beb4a26a55",
+   "sha256": "0f1aqkd9vxf32mafpd7hdbkj9wy5g4y2gqqlvgpy7j50iqkdcm5h"
   }
  },
  {
@@ -52984,11 +53216,11 @@
   "repo": "oantolin/icomplete-vertical",
   "unstable": {
    "version": [
-    20210411,
-    1913
+    20210424,
+    1811
    ],
-   "commit": "a258ff1033dd3d3cb894a039ac13ff3a85b96f57",
-   "sha256": "1r6cpq6nm3hhxhim4i0alcwmrvq17n7gh5dri9lfpcq6c7wqf0qi"
+   "commit": "d7ab5e5de18a027375666755e6610ea26c35ac16",
+   "sha256": "1jkykgf56091w2xb4mgnrfprarbjkqlmac3d388f9ckmiiyyqyrp"
   },
   "stable": {
    "version": [
@@ -53846,11 +54078,11 @@
   "repo": "QiangF/imbot",
   "unstable": {
    "version": [
-    20210319,
-    126
+    20210423,
+    731
    ],
-   "commit": "0fdc71bfa66ecc1f8a54cdcd2458eb47eab41ecd",
-   "sha256": "1ibd9i75x6gb0nprbdi0giklllfwsmvghi3fm19qm7hiw3kg9j3m"
+   "commit": "01bf1e1101ac9cd34bfda7016ce0f82f97a3de35",
+   "sha256": "08w76awwg1g7n67b2rvbwg0i366zshqnhvlp6zyfagjg2bz5gdmf"
   }
  },
  {
@@ -53915,11 +54147,11 @@
   "repo": "bmag/imenu-list",
   "unstable": {
    "version": [
-    20210411,
-    1703
+    20210420,
+    1200
    ],
-   "commit": "1447cdc8c0268e332fb4adc0c643702245d31bde",
-   "sha256": "1fhfxwwf622mjl3slnzyj0zzmbx15qhq6xv8p7fpw88dx1dki113"
+   "commit": "76f2335ee6f2f066d87fe4e4729219d70c9bc70d",
+   "sha256": "0b7q6h7ky7n20w1p471fmnwyfmc59c9ihgnl72m11dnciiz325wa"
   },
   "stable": {
    "version": [
@@ -54089,8 +54321,8 @@
    "deps": [
     "impatient-mode"
    ],
-   "commit": "9ad16da9f78ae242b0a6fb1de388d5f4f1264207",
-   "sha256": "0h665wxnz3l97dxgk2rw3v0sdhb2lr30iqmf4q304wk7ljxg6lig"
+   "commit": "60ae30d07b857c074e2918680805cb37249de0ad",
+   "sha256": "0brj34ijgsgkbawp097wjwiaka2b082aypl5pal0298mpk97zxq0"
   },
   "stable": {
    "version": [
@@ -54418,8 +54650,8 @@
    "deps": [
     "clojure-mode"
    ],
-   "commit": "c3ff2f40fdcedf3357cde868c278474767b65adb",
-   "sha256": "0ljxpjhm3v0wb851zfqvkr5cv4hblg29rz3a5lw48jwz9ijpapq9"
+   "commit": "a2cebf5362fe583538dda8dcf6348a8d73b462a2",
+   "sha256": "0sfn6x08i7sd2k6z4swpd8hxaab3ly0gfyapcaq768chi0grr0gw"
   },
   "stable": {
    "version": [
@@ -54511,11 +54743,11 @@
   "repo": "nonsequitur/inf-ruby",
   "unstable": {
    "version": [
-    20210314,
-    123
+    20210427,
+    1755
    ],
-   "commit": "c6990a60c740b2d69495e34e95b29f13014b3cde",
-   "sha256": "05nz7hvly47n7d945gdb1x8xgzla5r9k629if81rgjh99w24dpgc"
+   "commit": "92d5d122fa172bc49b5ec9ee1891aa9c84805c92",
+   "sha256": "1dn8wml7jwf3dx2nbkjpf2v6k88apiin8wqmz4yix5d2k3x2qm46"
   },
   "stable": {
    "version": [
@@ -54564,11 +54796,11 @@
   "repo": "dakra/info-beamer.el",
   "unstable": {
    "version": [
-    20180604,
-    2122
+    20210427,
+    1033
    ],
-   "commit": "97db34d23cb05b23e50c15875ee84f5d3236e0db",
-   "sha256": "0z1cya3mhgh5ibj3dgwzii1fkbzsq7zjjzg6hfdv3pd4a7722qlx"
+   "commit": "6b4cc29f1aec72d8e23b2c25a99cdd84e6cdc92b",
+   "sha256": "064igpiip1b037rs32z8w1g3w7rywyhabi1h92p1zkx3gjlqgpp2"
   },
   "stable": {
    "version": [
@@ -54860,11 +55092,11 @@
   "repo": "ideasman42/emacs-inkpot-theme",
   "unstable": {
    "version": [
-    20210109,
-    1112
+    20210427,
+    1337
    ],
-   "commit": "e8ae7b2345b8b21dd866fc043906ceecd40832c7",
-   "sha256": "19fxqb6x05480wa4dp4mv2a6cw5sgc8bsm3syqpbhmflymfvxnsy"
+   "commit": "7c3a0a76fa00db41a4d3d990cc98a1c6b088df3d",
+   "sha256": "17x0afwfcr4k0nmliqajswmvaiglk1xl33r3j215w214xp6dqrp2"
   }
  },
  {
@@ -55123,30 +55355,6 @@
    "sha256": "1vmaj14k5idx1ykkp1yl0b9qr4fimwagz7p6c00xi9klvjsx566y"
   }
  },
- {
-  "ename": "interleave",
-  "commit": "6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2",
-  "sha256": "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy",
-  "fetcher": "github",
-  "repo": "rudolfochrist/interleave",
-  "unstable": {
-   "version": [
-    20191129,
-    958
-   ],
-   "commit": "e1791a96a2633a9f5ea99fc0a20ebacedcefdaaa",
-   "sha256": "1biysf8cqfw4q7d2dnlisviign3n5knvrb0g6zdalzv8pnd1cxqr"
-  },
-  "stable": {
-   "version": [
-    1,
-    1,
-    0
-   ],
-   "commit": "6b28363eac939227c6cdc8a73a1d3ea5b002442d",
-   "sha256": "1qs6j9cz152wfy54c5d1a558l0df6wxv3djlvfl2mx58wf0sk73h"
-  }
- },
  {
   "ename": "interval-list",
   "commit": "afee0fed80f4fa444116b12653c034d760f5f1fb",
@@ -55713,11 +55921,11 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20210404,
-    1241
+    20210503,
+    1143
    ],
-   "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245",
-   "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36"
+   "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc",
+   "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8"
   },
   "stable": {
    "version": [
@@ -55744,8 +55952,8 @@
     "avy",
     "ivy"
    ],
-   "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245",
-   "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36"
+   "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc",
+   "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8"
   },
   "stable": {
    "version": [
@@ -55777,8 +55985,8 @@
     "cl-lib",
     "swiper"
    ],
-   "commit": "9870333cdd4a54b309e2709af647cda6f4070a42",
-   "sha256": "02cpg60hif4rz6va2ynh3wc9dwj0nyig4fa0l6jchmzz8v2zvf86"
+   "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e",
+   "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik"
   },
   "stable": {
    "version": [
@@ -55847,16 +56055,16 @@
   "repo": "jixiuf/ivy-dired-history",
   "unstable": {
    "version": [
-    20170626,
-    556
+    20210418,
+    1444
    ],
    "deps": [
     "cl-lib",
     "counsel",
     "ivy"
    ],
-   "commit": "c9c67ea1ee5e68443f0e6006ba162d6c8d868b69",
-   "sha256": "1lim9zi57w011df5zppb18yjkaxkgfy796pc6i01p4dl32x0rpfv"
+   "commit": "1ffa9b705c52a9d5b03c97150addb4f746c08380",
+   "sha256": "1li8vh94w1mkwqbh1f0i1mmv5advrbh1183vpjc2zbmmk02pynkf"
   },
   "stable": {
    "version": [
@@ -56112,8 +56320,8 @@
     "hydra",
     "ivy"
    ],
-   "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245",
-   "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36"
+   "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc",
+   "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8"
   },
   "stable": {
    "version": [
@@ -56156,28 +56364,30 @@
   "repo": "ROCKTAKEY/ivy-migemo",
   "unstable": {
    "version": [
-    20210206,
-    919
+    20210425,
+    613
    ],
    "deps": [
     "ivy",
-    "migemo"
+    "migemo",
+    "nadvice"
    ],
-   "commit": "9cdf3823b3303d69c0c77dfee91136817da12aea",
-   "sha256": "0nxk1i208zm6p666920gh1nmrfhfqglhgs07b5ir4b7mz3m5caab"
+   "commit": "a2ce15abe6a30fae63ed457ab25a80455704f28e",
+   "sha256": "18j3h2ndrw92gpbd9q5ji6q8qrwqmzw2xw8yds8f0fd8aybkw8zz"
   },
   "stable": {
    "version": [
     1,
-    1,
+    4,
     0
    ],
    "deps": [
     "ivy",
-    "migemo"
+    "migemo",
+    "nadvice"
    ],
-   "commit": "fc4f44750466ba9385e3313c85adf83a8e55a1fa",
-   "sha256": "0lax72js89k5g007ra6ngy9gnphny4bgjggnl9d3j3mizw9cynvn"
+   "commit": "2d44f7bbc1eb5f95162db889b889488b65bc0042",
+   "sha256": "14jmxg56w6jxz9i4wllbr18c25ximdrbi8w4qcc8lxr9yjlakl15"
   }
  },
  {
@@ -56279,15 +56489,15 @@
   "repo": "tumashu/ivy-posframe",
   "unstable": {
    "version": [
-    20210410,
-    530
+    20210426,
+    2144
    ],
    "deps": [
     "ivy",
     "posframe"
    ],
-   "commit": "7f1ab7890040c4b8dc4e9645c824cd35210e1121",
-   "sha256": "053irrmqvlzs7597grsq0fn06w3apqkgma45xv5pfb2wqin2kx2w"
+   "commit": "084cc59ea2cd62afaa51445ada3d00404749a541",
+   "sha256": "170z5akdwxzrn0b4cbk6v8a3dqz229b7pj9n0534y1a7ydvcyv9h"
   },
   "stable": {
    "version": [
@@ -56311,15 +56521,15 @@
   "repo": "raxod502/prescient.el",
   "unstable": {
    "version": [
-    20210227,
-    600
+    20210425,
+    1720
    ],
    "deps": [
     "ivy",
     "prescient"
    ],
-   "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4",
-   "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w"
+   "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4",
+   "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n"
   },
   "stable": {
    "version": [
@@ -57059,8 +57269,8 @@
     "auto-complete",
     "jedi-core"
    ],
-   "commit": "3a9c503c35359d6bca6ff90c384c104c8743cdab",
-   "sha256": "1rx3qiicgg9p0chbfx8v1aypk93p6r5wlkia0b2sqr796r7xdn35"
+   "commit": "e942a0e410cbb2a214c9cb30aaf0e47eb0895b78",
+   "sha256": "1c4nqgg1w2qv0mhpi6hhz3xr5kk4bbxc951fhik6dpi2c2w8p73s"
   },
   "stable": {
    "version": [
@@ -57084,16 +57294,16 @@
   "repo": "tkf/emacs-jedi",
   "unstable": {
    "version": [
-    20210202,
-    856
+    20210503,
+    1315
    ],
    "deps": [
     "cl-lib",
     "epc",
     "python-environment"
    ],
-   "commit": "3a9c503c35359d6bca6ff90c384c104c8743cdab",
-   "sha256": "1rx3qiicgg9p0chbfx8v1aypk93p6r5wlkia0b2sqr796r7xdn35"
+   "commit": "e942a0e410cbb2a214c9cb30aaf0e47eb0895b78",
+   "sha256": "1c4nqgg1w2qv0mhpi6hhz3xr5kk4bbxc951fhik6dpi2c2w8p73s"
   },
   "stable": {
    "version": [
@@ -57325,8 +57535,8 @@
     20200927,
     1317
    ],
-   "commit": "7a934115238d7b80df230a5ba7a70d866bc18c66",
-   "sha256": "087fj39m7gmi3bx2q983afal3738rc5zxnfs4d4c72z065z7gsss"
+   "commit": "b9b3c39743be5aeba17d4d8e5d379613451ddec6",
+   "sha256": "1j3dxj4cr26vir226zb84zn0jsjwnhz02xb60a69jv4k1wcl6bq9"
   },
   "stable": {
    "version": [
@@ -57829,14 +58039,14 @@
   "repo": "mooz/js2-mode",
   "unstable": {
    "version": [
-    20201220,
-    1718
+    20210414,
+    2241
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "29979e5f3301796ba606759e39ee0b1b6a2a24f3",
-   "sha256": "1pvdzinxfd3b08d92cf5v0fk88dzlyw5r5g3hablh6gcfc9i57xx"
+   "commit": "b891edecedf30be6321e2f109fdfeb25b0edad27",
+   "sha256": "179vkwr57nibc148b961g1aim052v65qsva44imxibkm9h0n32w9"
   },
   "stable": {
    "version": [
@@ -58369,7 +58579,7 @@
     0,
     0,
     -1,
-    5
+    6
    ],
    "deps": [
     "dash",
@@ -58378,8 +58588,8 @@
     "spinner",
     "vterm"
    ],
-   "commit": "34498596550b0f819106db8dd6e80dd01332c345",
-   "sha256": "05hrvidpgsinvq7n56c3kfk23x561djchsa10vybjk027fqfvlwb"
+   "commit": "03b4296ba7151963eb3c850f3314b02644101f51",
+   "sha256": "1jgs0pz8bzqg8116kyw3z7jwbf6karrl89ks028q091ylc00nm8b"
   }
  },
  {
@@ -58396,19 +58606,19 @@
    "deps": [
     "vterm"
    ],
-   "commit": "b8a749f19bef179c58068d3fa5cd53c3db5d1ecf",
-   "sha256": "1bp3dc915zq1qd7zycz8bdjq4pz172r3zbzjn8k4rsw0lz9j6w88"
+   "commit": "d57448466c11833d4fd67f5dbbea9cb9a07a74e2",
+   "sha256": "0v7l4jxq71vcw3sjs476smbw9ln6xfrq7n3vzw26apzkrplizqyy"
   },
   "stable": {
    "version": [
     0,
-    11
+    13
    ],
    "deps": [
     "vterm"
    ],
-   "commit": "06ee45bffb6e711278a7af5207899d2b4316706c",
-   "sha256": "1zwhbwm285gqy9bfhlaaa9wp3lz959i3d1s41msl70jxbrnjz7pw"
+   "commit": "b8a749f19bef179c58068d3fa5cd53c3db5d1ecf",
+   "sha256": "1bp3dc915zq1qd7zycz8bdjq4pz172r3zbzjn8k4rsw0lz9j6w88"
   }
  },
  {
@@ -58543,8 +58753,8 @@
   "repo": "nnicandro/emacs-jupyter",
   "unstable": {
    "version": [
-    20210407,
-    212
+    20210422,
+    1451
    ],
    "deps": [
     "cl-lib",
@@ -58552,8 +58762,8 @@
     "websocket",
     "zmq"
    ],
-   "commit": "7735d2b8fb32434992467f0d4d9d59c1a1a5dc0c",
-   "sha256": "12q70b249yygqr30l1vhgxzlbfxkcil9xaixzj8zy3xbd3vsjdns"
+   "commit": "1f0612eb936d36abab0f27b09cca691e81fc6e74",
+   "sha256": "1mpch20iahijlgwg8bjpjg7bm9hd2wyskqbknafw8jkwyj7dvng2"
   },
   "stable": {
    "version": [
@@ -58633,14 +58843,14 @@
   "repo": "TxGVNN/emacs-k8s-mode",
   "unstable": {
    "version": [
-    20210219,
-    1317
+    20210414,
+    1543
    ],
    "deps": [
     "yaml-mode"
    ],
-   "commit": "0df142ac98bcd072dd7017053c9c9c476345aeef",
-   "sha256": "1nxcp1hq9d1j7whfak60j4dmzsfmq2mgmdxxvlj3az7p7vannd2v"
+   "commit": "14f08627d5bc320fee5bd9926e9aabe6956f514e",
+   "sha256": "1rfglmslhv3i71fgsqs8gjcnkff06lnp0b9s182rsnfz29dnzd1a"
   },
   "stable": {
    "version": [
@@ -58924,28 +59134,28 @@
   "repo": "ogdenwebb/emacs-kaolin-themes",
   "unstable": {
    "version": [
-    20210403,
-    749
+    20210503,
+    1257
    ],
    "deps": [
     "autothemer",
     "cl-lib"
    ],
-   "commit": "367429c39e330cf2b87e8af0ca7c8883baa21ea3",
-   "sha256": "0hj21jmkcsjv7rxpfq6n77jsmm894rfgsdn80qymh6nyxznq93ym"
+   "commit": "28da5f50aa1ebe72f6b4e5bac1abeb720821a716",
+   "sha256": "0dg64wb9827wx0ax995hx4jhmxh5mn918zawasjwzi3dl92q7llb"
   },
   "stable": {
    "version": [
     1,
     6,
-    2
+    4
    ],
    "deps": [
     "autothemer",
     "cl-lib"
    ],
-   "commit": "5694f27f6e17bf2d840fa04728d392b5df77e20c",
-   "sha256": "1c5hdr654f012lj3ssxsavbnij0i109nykwcsgl2c2pb9yxqr5rw"
+   "commit": "c50bc11fdd42dc98ff806d1fc7cd94619c0ab7bb",
+   "sha256": "08ypmv43vjk1l409n894jxplnja6nicn2k3qwhwaf9qxhz0yxpjr"
   }
  },
  {
@@ -59122,11 +59332,11 @@
   "repo": "Boruch-Baum/emacs-key-assist",
   "unstable": {
    "version": [
-    20201109,
-    1358
+    20210415,
+    227
    ],
-   "commit": "7fd89c306c975a1fa3ab16ba7a4d3b102130a868",
-   "sha256": "1m1p3iydn5s3dlmjv751ligbwxkg472rhcbk80q2y1lnwjsnbhdy"
+   "commit": "fae7ce265db3bcfd1c6153eb051afd8789e61a4b",
+   "sha256": "16gi43wgqqjqljnmjwap8lng1p4davv8prvpip034qw9v6vjmm2p"
   },
   "stable": {
    "version": [
@@ -59709,8 +59919,8 @@
     20210318,
     2106
    ],
-   "commit": "53b655b0ef4bdfe8bf81a2bef8f09179a4917076",
-   "sha256": "095z6dkqz6iw28ighqbl2c60i6bm6qyrkxl93yg9b31cd6yzlzin"
+   "commit": "c2b75c587abdc9594e69ef3f5069bd4920bb60e4",
+   "sha256": "16za2j07sdmb2r1r8fcpa45c66n6af41if5bnpk3maqvf1hm21zd"
   },
   "stable": {
    "version": [
@@ -60252,28 +60462,29 @@
   "repo": "tecosaur/LaTeX-auto-activating-snippets",
   "unstable": {
    "version": [
-    20210327,
-    1230
+    20210417,
+    1141
    ],
    "deps": [
     "aas",
     "auctex",
     "yasnippet"
    ],
-   "commit": "654ea30aa0263e85891ddcabc0b7a0f0144b9e27",
-   "sha256": "1z5pw9xhp4gh156n9n3yq92zm6z8gw2ik7nfrvgnip2v3yr31pfb"
+   "commit": "e9bc939237bed4ce50d3d403120f7206c835ea4a",
+   "sha256": "1z2r52x9fsjm1y2m8n0fm9ymd0dx798iw5b3x79fkhnrrw4wfq0s"
   },
   "stable": {
    "version": [
-    0,
-    2
+    1,
+    0
    ],
    "deps": [
     "aas",
+    "auctex",
     "yasnippet"
    ],
-   "commit": "94be7523159ee261077a33094775c7f73218a900",
-   "sha256": "0qyj4xwsxhn78akkv08ka9k47aa3jssd4mgws7ccbnqj68fv78gg"
+   "commit": "e9bc939237bed4ce50d3d403120f7206c835ea4a",
+   "sha256": "1z2r52x9fsjm1y2m8n0fm9ymd0dx798iw5b3x79fkhnrrw4wfq0s"
   }
  },
  {
@@ -60361,8 +60572,8 @@
     "highlight",
     "math-symbol-lists"
    ],
-   "commit": "8609ec2101777362f45df493c593e0e125fe0824",
-   "sha256": "142v2yccbh5aiwy6xzxnz9656p9zj3j2vmmyy70x7vxn2jair3bl"
+   "commit": "74a47238ce1d2d86a3a62c5e8100a6198e73564b",
+   "sha256": "13cm2sgr9jkdjs649jlh4qsvi9fnma0qs48xbp2r5b29mnd4axrx"
   }
  },
  {
@@ -60974,14 +61185,14 @@
   "repo": "conao3/leaf-tree.el",
   "unstable": {
    "version": [
-    20200412,
-    2355
+    20210503,
+    531
    ],
    "deps": [
     "imenu-list"
    ],
-   "commit": "22f6c116cf1465c28d4a35d8a4587a8b614be175",
-   "sha256": "1bgjhrpq6a239v8vfi6i9qcbyrg76mpy4yykkb5da8hlp23idwy7"
+   "commit": "8126baf45c881fd4a692c2d74f9cc2eb15170401",
+   "sha256": "1vb5id0y9002yabkxijfi0l8vbibbd863kq4qk3gqax9dgbld481"
   },
   "stable": {
    "version": [
@@ -61004,8 +61215,8 @@
   "repo": "leanprover/lean-mode",
   "unstable": {
    "version": [
-    20210406,
-    1038
+    20210502,
+    2049
    ],
    "deps": [
     "dash",
@@ -61013,8 +61224,8 @@
     "flycheck",
     "s"
    ],
-   "commit": "5a2a36356e73c74a42e49fad19a71f4f12929a90",
-   "sha256": "18lswxxwvp85yzg1kc9vxn4dpmxmj40j6g64c8ns83nb7hw9lszg"
+   "commit": "bf32bb97930ed67c5cbe0fe3d4a69dedcf68be44",
+   "sha256": "1bkv5zs38ijawvavbba0fdf2flb6fiwici3qi99ws8wvwhnbkws2"
   }
  },
  {
@@ -61080,14 +61291,14 @@
   "repo": "DamienCassou/ledger-import",
   "unstable": {
    "version": [
-    20210108,
-    728
+    20210419,
+    818
    ],
    "deps": [
     "ledger-mode"
    ],
-   "commit": "d1eda3ccafbfabbcc51be364146e31450f11745f",
-   "sha256": "0w6qgqmcv1nyrgjqrb1ah4wj94rn7zn00g0kib4vmc83wcnmyrjb"
+   "commit": "f77adf79ce67524c3e08546448ac88ea1a665b64",
+   "sha256": "1zgv3sxg1dwg7dgy0cl5df6nkxp79cg906hskxsdx6yfplxvi4px"
   },
   "stable": {
    "version": [
@@ -61110,11 +61321,11 @@
   "repo": "ledger/ledger-mode",
   "unstable": {
    "version": [
-    20210329,
-    2024
+    20210429,
+    134
    ],
-   "commit": "3b0fa5c22bd196dbe31a19f4b2ebbdf8f4081b20",
-   "sha256": "1igg1dmsn90crggm11xnlhrc36szr3dfc4463dn65cagwlck3g3k"
+   "commit": "58a2bf57af9289daeaac6892fa4008ea8255b205",
+   "sha256": "0sbyagz93yvr1a0y7k0nki7030drr27i3nqhwflsdrl0hy4f9iwr"
   },
   "stable": {
    "version": [
@@ -61423,8 +61634,8 @@
     20201007,
     2214
    ],
-   "commit": "5677410abffa1d1bc66b867be8918f1423fd586b",
-   "sha256": "1lcyd7gh2d72vx47dh375d50qcf7xnx888xrx76yc5zfx2df4p80"
+   "commit": "dbfd16af065b12d2dbce26ff1fbad151765243fd",
+   "sha256": "00dbbyx4m32j7qw2b83p7hx7z2ydixv8zr04l0bzalnnm34yb38s"
   },
   "stable": {
    "version": [
@@ -61670,21 +61881,17 @@
     20210303,
     1751
    ],
-   "commit": "d029f4d1738dad616df1a56b570cdf1e725cd967",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 286 ms\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 612 ms\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 1232 ms\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 2325 ms\nerror: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503\n"
-   ]
+   "commit": "09e4da2dd9f6f1ecf5e1f19b9cd7566c465c05fd",
+   "sha256": "070fq9drdb6b4zbkc6qvkd99qjy0nw3x3nlrr13xzg51lpbmzi3d"
   },
   "stable": {
    "version": [
     0,
-    12,
+    15,
     0
    ],
-   "commit": "70d42b3922d152e8be946c2415151d0551b591d4",
-   "sha256": "17k0v1nfcsq5kdfk05cdkh8nbbi5bqniydqcr6whzw3aawnjryyc"
+   "commit": "3c816a579cde789d9d6dd0a387577d4a997bfe3c",
+   "sha256": "070fq9drdb6b4zbkc6qvkd99qjy0nw3x3nlrr13xzg51lpbmzi3d"
   }
  },
  {
@@ -61695,14 +61902,15 @@
   "repo": "jcs-elpa/line-reminder",
   "unstable": {
    "version": [
-    20210216,
-    1451
+    20210426,
+    1859
    ],
    "deps": [
+    "fringe-helper",
     "indicators"
    ],
-   "commit": "bc488bbdba2172629183891758cfa9466a64182f",
-   "sha256": "1993rwd9bgr1lqxgxzwp6h2r57ljsbjh5r08f57jaalanjp4iq55"
+   "commit": "8c9f824b1dc67c8489afef05b06d9525b29dab00",
+   "sha256": "0qr7qvcl6rlsagim3y71im24z85l3f7cvj39r0g77mnhm733z9m3"
   },
   "stable": {
    "version": [
@@ -62361,11 +62569,11 @@
   "repo": "jingtaozf/literate-elisp",
   "unstable": {
    "version": [
-    20210318,
-    350
+    20210424,
+    918
    ],
-   "commit": "6979fc6369d55519d52ca1e8f7d80d73ce54c383",
-   "sha256": "180lsghxcjrn21c79jl7g9kkvd4lf4xabgbwbqlck7barfj256jv"
+   "commit": "3e00b497711ac78f0ac26669e35f375451f6711a",
+   "sha256": "0gpg60xr86qx2ib5q9ig5pi9lmhk5vjsb7fh5g6kifvsch31cry3"
   },
   "stable": {
    "version": [
@@ -62458,20 +62666,20 @@
   "repo": "donkirkby/live-py-plugin",
   "unstable": {
    "version": [
-    20210411,
-    244
+    20210413,
+    205
    ],
-   "commit": "23b4308caddf02cc0312ebe4d971e3bfab22f3f8",
-   "sha256": "1zfqdbbknjdg73g1jdy758dln6hgi1rq6j0xpyasyasj169j1nxh"
+   "commit": "d799d074300aa7f1d78024167513a2316cffc204",
+   "sha256": "0dcz2npdf51284wq3c2sw7cq9r9z13irx9y06qi1xaxxv0p4r7z2"
   },
   "stable": {
    "version": [
     4,
-    3,
+    4,
     0
    ],
-   "commit": "c6d3d34bae62f1d5e986625db74f2076af258900",
-   "sha256": "1d022chhib61ghrf847f2w9baqiscpp1s2qvj9i84zmk7bndjvag"
+   "commit": "26d51013e75ddedd5eb8600a0a3dd035319f9d3f",
+   "sha256": "10p4ijx4l56ikb10416bmdwfxbcyqfa29kk1nf48gibxyvdlwdby"
   }
  },
  {
@@ -63090,8 +63298,8 @@
   "repo": "emacs-lsp/lsp-dart",
   "unstable": {
    "version": [
-    20210406,
-    2012
+    20210501,
+    2348
    ],
    "deps": [
     "dap-mode",
@@ -63102,14 +63310,14 @@
     "lsp-treemacs",
     "pkg-info"
    ],
-   "commit": "10e309acc31648ec9bf7ffeef0fc2ad16b2a8584",
-   "sha256": "1wm0lxllazfxrrv4cgalcnsf7g88g1cwz7b69dxfgirlcybcw9il"
+   "commit": "257d881ceda1c91d681787a9cd71d1831cda173c",
+   "sha256": "1lf8xs1z4y6a6kywykraiz0w7nqlrq9ibwwr4zpgn0bqh5fbgy5q"
   },
   "stable": {
    "version": [
     1,
     18,
-    0
+    2
    ],
    "deps": [
     "dap-mode",
@@ -63120,8 +63328,8 @@
     "lsp-treemacs",
     "pkg-info"
    ],
-   "commit": "f3b70ec0e6adf3a51e15f9a3effb182c2363493d",
-   "sha256": "0iyp844wnvxjrp860dgkr10qrfsaj2rcssj8dv93hhv8pg91fhsk"
+   "commit": "40a86d6547c5625980201f6f772f0d28d09d1aa7",
+   "sha256": "0gwx4i4plb836hkmzvp1krx9n7vn39as3lzpmbfbnpcwny45aj3k"
   }
  },
  {
@@ -63183,8 +63391,8 @@
   "repo": "emacs-grammarly/lsp-grammarly",
   "unstable": {
    "version": [
-    20210404,
-    645
+    20210418,
+    1806
    ],
    "deps": [
     "grammarly",
@@ -63193,25 +63401,24 @@
     "request",
     "s"
    ],
-   "commit": "aa2e70eec5755651ed6c9d9f4063542634760c91",
-   "sha256": "0qisz5117ifravbwvnaq2ci62v3sxl2dd1bd9giacscvshx2hw2c"
+   "commit": "aff219380a7d192a37c8c25823b6bfc816bae825",
+   "sha256": "0ghqmay00r7lfmqx57r5kkldkgr4r20fb5xqh3i440wjdw8m3i3p"
   },
   "stable": {
    "version": [
     0,
     2,
-    1
+    2
    ],
    "deps": [
     "grammarly",
     "ht",
-    "keytar",
     "lsp-mode",
     "request",
     "s"
    ],
-   "commit": "739a7efc7de6e2b0eca9e72268790431a0fb3185",
-   "sha256": "1ksa685ggp9z0zndscwy9azxjibxd9l79qzvh50i7mz4x9xzdjbd"
+   "commit": "984037557b7e445183453faffc965fbe56df12f2",
+   "sha256": "12q3j0sgsgm73m3i0sw72dzkqa55zn0dbqjgp0g2wryhfhg0zq1p"
   }
  },
  {
@@ -63292,8 +63499,8 @@
   "repo": "emacs-lsp/lsp-java",
   "unstable": {
    "version": [
-    20210309,
-    1856
+    20210501,
+    500
    ],
    "deps": [
     "dap-mode",
@@ -63305,8 +63512,8 @@
     "request",
     "treemacs"
    ],
-   "commit": "542aaf16d6d3a410b0e41861d80f3fd6b5be7bb9",
-   "sha256": "07kpx8gx9v9v6zhpl7kyg3q4dgpkxk1n089cn1hdxr5vapw7xac9"
+   "commit": "9685334086c0b09d2bb16f631fb368f4ce931764",
+   "sha256": "0lzwwamdlyynq6lybhzcg8w7hmyraz7nhawk4nib0nfjawkr9jxm"
   },
   "stable": {
    "version": [
@@ -63355,26 +63562,26 @@
   "repo": "fredcamps/lsp-jedi",
   "unstable": {
    "version": [
-    20200812,
-    1826
+    20210419,
+    2007
    ],
    "deps": [
     "lsp-mode"
    ],
-   "commit": "10c782261b20ad459f5d2785592c4f46f7088126",
-   "sha256": "0rip6fq5mwk2lsa0wwr573mx4myqvc8a7v4mqalmqxgwzcv9w7vb"
+   "commit": "a6a6dcfbab69caee0b88dbe4244772e0bea5531a",
+   "sha256": "0l2dawi7avzb9i1wfff4kdfbz9s7vp4443y7x3va0jrsn3v33485"
   },
   "stable": {
    "version": [
+    1,
     0,
-    0,
-    1
+    0
    ],
    "deps": [
     "lsp-mode"
    ],
-   "commit": "10c782261b20ad459f5d2785592c4f46f7088126",
-   "sha256": "0rip6fq5mwk2lsa0wwr573mx4myqvc8a7v4mqalmqxgwzcv9w7vb"
+   "commit": "a6a6dcfbab69caee0b88dbe4244772e0bea5531a",
+   "sha256": "0l2dawi7avzb9i1wfff4kdfbz9s7vp4443y7x3va0jrsn3v33485"
   }
  },
  {
@@ -63398,15 +63605,15 @@
   "stable": {
    "version": [
     0,
-    3,
+    4,
     0
    ],
    "deps": [
     "julia-mode",
     "lsp-mode"
    ],
-   "commit": "72e26d0c1d34e3dd16ff6427af883bd0136015d3",
-   "sha256": "0f4zmvn13x468p6vpfixx3ghlrygdgdyx8xpb7nx232pv38156dn"
+   "commit": "81f7de5b9fe8e8e0e1e3a3ccc677f052edad140d",
+   "sha256": "1hwkx5ssix2si7jpsbfcg1i65v3z265l39158qjm31cxf8pk52dw"
   }
  },
  {
@@ -63447,8 +63654,8 @@
   "repo": "emacs-lsp/lsp-metals",
   "unstable": {
    "version": [
-    20210410,
-    615
+    20210426,
+    739
    ],
    "deps": [
     "dap-mode",
@@ -63457,28 +63664,30 @@
     "ht",
     "lsp-mode",
     "lsp-treemacs",
+    "scala-mode",
     "treemacs"
    ],
-   "commit": "a603e9ec3d5f926774a8facb045f33eaa6df9037",
-   "sha256": "1pxfvmkk64v0sd7ghwj3dmhf7bbfh8wk2apxvckdq76l1wrd8izs"
+   "commit": "5aea52dfe08b8f5936ea3982be6c25339f652eba",
+   "sha256": "0ca5xq1l3lscx36pcdnpy2axgyikjrl18naqr140kr1y500sy37s"
   },
   "stable": {
    "version": [
     1,
-    1,
+    2,
     0
    ],
    "deps": [
     "dap-mode",
     "dash",
-    "dash-functional",
     "f",
     "ht",
     "lsp-mode",
+    "lsp-treemacs",
+    "scala-mode",
     "treemacs"
    ],
-   "commit": "efefcc0e936ec463f0d19b6cae7c8336dcd186e4",
-   "sha256": "01396r17ipmp0s5k5njm8m4vqw0g1sj9rq6dpkxv7wbad1c4izmx"
+   "commit": "5aea52dfe08b8f5936ea3982be6c25339f652eba",
+   "sha256": "0ca5xq1l3lscx36pcdnpy2axgyikjrl18naqr140kr1y500sy37s"
   }
  },
  {
@@ -63489,8 +63698,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20210410,
-    1801
+    20210503,
+    1350
    ],
    "deps": [
     "dash",
@@ -63500,8 +63709,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "65fb3e8d071406c4596dcc13e3f0230e1f730ec6",
-   "sha256": "1cdhgmqzg9dj491jqwfnqjdjkl4ki3gkpfn386mb5hwfl5aiv5pf"
+   "commit": "b2606d928222556552fab59a12da72e1fcbce6ed",
+   "sha256": "1yifkqhi42awvmdlq4253qn1cq8mcsrdpaz79y04jpd1a4i2wz10"
   },
   "stable": {
    "version": [
@@ -63649,16 +63858,16 @@
   "repo": "emacs-lsp/lsp-pyright",
   "unstable": {
    "version": [
-    20210220,
-    1714
+    20210430,
+    323
    ],
    "deps": [
     "dash",
     "ht",
     "lsp-mode"
    ],
-   "commit": "65fb14128127fb1ddf68dd4cb3140d6c7911a093",
-   "sha256": "0qhs4cv01b7aqq5r6bk91xgwsp8yg1bpn68xk90iirsxlgfb1ffq"
+   "commit": "6163527b4801c0e521d5d2e1d6ba90b8774ec946",
+   "sha256": "1c0d6cnk8w9zgq17c8aw22vvlrr38nm2gixddwcsxhkzb1gg06cf"
   }
  },
  {
@@ -63751,14 +63960,14 @@
   "repo": "merrickluo/lsp-tailwindcss",
   "unstable": {
    "version": [
-    20210330,
-    323
+    20210414,
+    855
    ],
    "deps": [
     "lsp-mode"
    ],
-   "commit": "5df10c36d3162982f5100b8c66af957dd05712cf",
-   "sha256": "0vl5gajg1w5qrzafvkqrbkb9dlja4ina2i3gs6pfv1jrn473h8p7"
+   "commit": "b95e0e2db9e1561719c7f7815e7787fe71392871",
+   "sha256": "0a0746sjq40jxgpqdv3iixwvf97fnpj8wfyy88cxg2w6sf72scdl"
   }
  },
  {
@@ -63769,8 +63978,8 @@
   "repo": "emacs-lsp/lsp-treemacs",
   "unstable": {
    "version": [
-    20210411,
-    1507
+    20210502,
+    1804
    ],
    "deps": [
     "dash",
@@ -63779,8 +63988,8 @@
     "lsp-mode",
     "treemacs"
    ],
-   "commit": "4cfb46d7fe69cc537a8a86389c5d8d9fd3fbfabe",
-   "sha256": "0ca20xdmk0c5w3hpimly6pl355sjvzjaq3nwfaw3p6qr9sx1sy9w"
+   "commit": "b07868740d6f7d364e496048cee00bce10a6ab33",
+   "sha256": "1g8qkk6g67myz8rjvwa7iysrj0xpf0kcwrcdvf4dkc3rgh3kzm2v"
   },
   "stable": {
    "version": [
@@ -64279,8 +64488,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20210411,
-    2036
+    20210430,
+    404
    ],
    "deps": [
     "dash",
@@ -64288,8 +64497,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "5882df245d3388cd6f443bc11df219a838104df2",
-   "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h"
+   "commit": "471c63d92ce22b8ea653f821bc1893ecea324d4d",
+   "sha256": "1qx9164hcrs5k6bq4vpymma6b3g6c14c9zq9y5g9csfnjxmjwnjw"
   },
   "stable": {
    "version": [
@@ -64469,14 +64678,15 @@
   "repo": "emacsorphanage/magit-gerrit",
   "unstable": {
    "version": [
-    20160226,
-    930
+    20210414,
+    1334
    ],
    "deps": [
-    "magit"
+    "magit",
+    "transient"
    ],
-   "commit": "ece6f369694aca17f3ac166ed2801b432acfe20d",
-   "sha256": "0mms0gxv9a3ns8lk5k2wjibm3088y1cmpr3axjdh6ppv7r5wdvii"
+   "commit": "31f5ce30e374716818df7deb0cdbf462ef67e679",
+   "sha256": "08pwdjknd7407922w7gli76ji87zqj9j87sinhzjc38cnlhvm77n"
   },
   "stable": {
    "version": [
@@ -64635,8 +64845,8 @@
     "libgit",
     "magit"
    ],
-   "commit": "5882df245d3388cd6f443bc11df219a838104df2",
-   "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h"
+   "commit": "471c63d92ce22b8ea653f821bc1893ecea324d4d",
+   "sha256": "1qx9164hcrs5k6bq4vpymma6b3g6c14c9zq9y5g9csfnjxmjwnjw"
   }
  },
  {
@@ -64790,8 +65000,8 @@
    "deps": [
     "dash"
    ],
-   "commit": "5882df245d3388cd6f443bc11df219a838104df2",
-   "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h"
+   "commit": "471c63d92ce22b8ea653f821bc1893ecea324d4d",
+   "sha256": "1qx9164hcrs5k6bq4vpymma6b3g6c14c9zq9y5g9csfnjxmjwnjw"
   },
   "stable": {
    "version": [
@@ -64835,26 +65045,28 @@
   "repo": "emacsorphanage/magit-svn",
   "unstable": {
    "version": [
-    20190821,
-    1455
+    20210426,
+    2114
    ],
    "deps": [
-    "magit"
+    "magit",
+    "transient"
    ],
-   "commit": "2cff1a30a30f2b3963342a7d185ec13fc12279c3",
-   "sha256": "0c4bn9wjjwb0f6hzh7d6vz33lrf75kal62329drzmbh1sla2s3h3"
+   "commit": "350493217afdb7637564e089f475909adecd9208",
+   "sha256": "1v1y4fir1plz4kj0cvkcd29wibli4dw7vp4fmbxq4df76d8iy8yd"
   },
   "stable": {
    "version": [
     2,
     2,
-    2
+    3
    ],
    "deps": [
-    "magit"
+    "magit",
+    "transient"
    ],
-   "commit": "99601f47f47a421576809595ca7463fd010760b1",
-   "sha256": "00lsfkmsz26pz1paqn73skgx747250vc2pa0n8n0h7ywxj9dkzvb"
+   "commit": "350493217afdb7637564e089f475909adecd9208",
+   "sha256": "1v1y4fir1plz4kj0cvkcd29wibli4dw7vp4fmbxq4df76d8iy8yd"
   }
  },
  {
@@ -64865,14 +65077,14 @@
   "repo": "magit/magit-tbdiff",
   "unstable": {
    "version": [
-    20210327,
-    350
+    20210503,
+    340
    ],
    "deps": [
     "magit"
    ],
-   "commit": "99cb9c0501f0f1ea7ec3ebf0fb398f3d36cddafb",
-   "sha256": "189c4hrgbrwx44nidf4xv30yyb2y7lid57by0fn9hyi21nbk2gmx"
+   "commit": "3958523f3e76254b19efd3f32b0a968685fce185",
+   "sha256": "13va4wviimkpw67p52nl8zv6sb9f738r47yk1xlf4fh0yd48bsj6"
   },
   "stable": {
    "version": [
@@ -65580,19 +65792,19 @@
   "repo": "minad/marginalia",
   "unstable": {
    "version": [
-    20210409,
-    2305
+    20210430,
+    1736
    ],
-   "commit": "668265af921285c726b2239dae32459bd1064d03",
-   "sha256": "1kl516mzcpdam787x5k55s0crspacvxnz2zqz5m32b13xl2pr847"
+   "commit": "d1b836db16cb693293a2cb7064e5cf9df625df2a",
+   "sha256": "02zbxkzsd7166vpkqv16kmlbxpg7l0xnf784wjay1ngkh55ihvdq"
   },
   "stable": {
    "version": [
     0,
-    4
+    5
    ],
-   "commit": "e741b243b30f6cfe85e568cc551acff9a1e5e74f",
-   "sha256": "0piwzxp1zmwp876kyca0xcgyxgn8bn4wh5fnn88dkvdzi8mcgmkh"
+   "commit": "5126ba6244e13e3e2cf608e7f3955377bcbd8c04",
+   "sha256": "07vfidgq9am07zz2ydhdifmp4jmgs9jn5l1nfqiyp16sd1br6czj"
   }
  },
  {
@@ -65700,11 +65912,11 @@
   "repo": "jrblevin/markdown-mode",
   "unstable": {
    "version": [
-    20210405,
-    1349
+    20210429,
+    1605
    ],
-   "commit": "ac9ea26b941eef512a3c206375a6404625c229ed",
-   "sha256": "0nszqrx6nfdzlib3w6l5pmzmgnrwzmvzlz7hv46x4iqzyxjg2jsn"
+   "commit": "94c65e2de2e10b7f3a5e72d412c64ab83b2b1a5e",
+   "sha256": "1lbxr6g53sz0nd3za44m6ixs6770zkdayihrm1bq2ip2xidl4kh7"
   },
   "stable": {
    "version": [
@@ -66650,16 +66862,16 @@
   "repo": "DogLooksGood/meow",
   "unstable": {
    "version": [
-    20210410,
-    1837
+    20210427,
+    438
    ],
    "deps": [
     "cl-lib",
     "dash",
     "s"
    ],
-   "commit": "6eb10d223fb7e0d87ac7ab7063fdb3951934e94c",
-   "sha256": "0b1s51yfklm52j2g0gnrwdahr1jql1fv93sn7inm5c1ygx3agc7c"
+   "commit": "e05a81e3793e370f04f414de8cb52948fe38e606",
+   "sha256": "1svw39xa9i7j0qiwbzjhw5lbcnqf7ipjz0dk29jhkxjzkk41qspk"
   }
  },
  {
@@ -66673,16 +66885,18 @@
     20210408,
     1014
    ],
-   "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3",
-   "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8"
+   "commit": "08e24475ec498105993a3e47bf032c088fe2e302",
+   "sha256": "1j01ym40y3x83rq2fiqs9vwv06sqrwynsm4qz6z1dgfmaavd7h6m"
   },
   "stable": {
    "version": [
     4,
-    1
+    2,
+    -4,
+    412
    ],
-   "commit": "ab02f60994c81166820791b5f465f467d752b8dc",
-   "sha256": "1lsrn6739736gr72c83hnxdynqmvjbs8pq3spb74v39k7xixmh99"
+   "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c",
+   "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1"
   }
  },
  {
@@ -66700,8 +66914,22 @@
     "auto-complete",
     "merlin"
    ],
-   "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3",
-   "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8"
+   "commit": "08e24475ec498105993a3e47bf032c088fe2e302",
+   "sha256": "1j01ym40y3x83rq2fiqs9vwv06sqrwynsm4qz6z1dgfmaavd7h6m"
+  },
+  "stable": {
+   "version": [
+    4,
+    2,
+    -4,
+    412
+   ],
+   "deps": [
+    "auto-complete",
+    "merlin"
+   ],
+   "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c",
+   "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1"
   }
  },
  {
@@ -66719,8 +66947,22 @@
     "company",
     "merlin"
    ],
-   "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3",
-   "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8"
+   "commit": "08e24475ec498105993a3e47bf032c088fe2e302",
+   "sha256": "1j01ym40y3x83rq2fiqs9vwv06sqrwynsm4qz6z1dgfmaavd7h6m"
+  },
+  "stable": {
+   "version": [
+    4,
+    2,
+    -4,
+    412
+   ],
+   "deps": [
+    "company",
+    "merlin"
+   ],
+   "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c",
+   "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1"
   }
  },
  {
@@ -66767,8 +67009,22 @@
     "iedit",
     "merlin"
    ],
-   "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3",
-   "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8"
+   "commit": "08e24475ec498105993a3e47bf032c088fe2e302",
+   "sha256": "1j01ym40y3x83rq2fiqs9vwv06sqrwynsm4qz6z1dgfmaavd7h6m"
+  },
+  "stable": {
+   "version": [
+    4,
+    2,
+    -4,
+    412
+   ],
+   "deps": [
+    "iedit",
+    "merlin"
+   ],
+   "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c",
+   "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1"
   }
  },
  {
@@ -66963,20 +67219,20 @@
   "repo": "org2blog/org2blog",
   "unstable": {
    "version": [
-    20191018,
-    242
+    20210422,
+    326
    ],
-   "commit": "c7f72a87952ed16323fce968462af897235f1719",
-   "sha256": "0v8zkzai5gfzng9dpkikwf60rvsr1148y5nb7hw65961xms855s4"
+   "commit": "c1b386f3522054f063f4ac60730397ed1f724478",
+   "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q"
   },
   "stable": {
    "version": [
     1,
     1,
-    10
+    11
    ],
-   "commit": "19aa8a17428d6ee42f54e464c26eeab17a6478ab",
-   "sha256": "198ahgxji0kh6ynygrrdvllj9fwcqrnma4sd8msj2aq18xij9glr"
+   "commit": "c1b386f3522054f063f4ac60730397ed1f724478",
+   "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q"
   }
  },
  {
@@ -67020,11 +67276,11 @@
   "repo": "kazu-yamamoto/Mew",
   "unstable": {
    "version": [
-    20210131,
-    740
+    20210416,
+    33
    ],
-   "commit": "8c6bc6bf9562beb74b3b4fda47b2fe473139eb1c",
-   "sha256": "0bf30kkrmi0qw8i0viv1dnvrd52a66rp6vcklidrnv4dh5b782n8"
+   "commit": "380d6059fa9f102e736969d086749980820a9e0e",
+   "sha256": "03fxicfl7yvxj6ac636544km1khhmrjqi97r0smwqfxvlm2gs037"
   },
   "stable": {
    "version": [
@@ -67089,11 +67345,11 @@
   "repo": "purpleidea/mgmt",
   "unstable": {
    "version": [
-    20200104,
-    108
+    20210131,
+    2152
    ],
-   "commit": "76ede10e0a0433d8aae6b3b4e132ca9dcce5ca75",
-   "sha256": "1n6avpk8ggpjqiin1qrwc3g1rjgq902cgks1kfd2r82bkri2sq1q"
+   "commit": "48fa796ab1669dc275b8c99238fff6c83ad2fcc6",
+   "sha256": "0rn7ahpj2kjkmy7gq4fj0n99af70xxxykyjqsza1nnizxfgmrpwj"
   },
   "stable": {
    "version": [
@@ -67643,11 +67899,7 @@
     1900
    ],
    "commit": "519e05f74825abf04b7d2e0e38ec040d013a125a",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 301 ms\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 515 ms\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 1011 ms\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 2434 ms\nerror: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503\n"
-   ]
+   "sha256": "1yf21gm4ziplmgx8yn7jqq45mwfiindbrman7fc5b9ifq78x9ryn"
   },
   "stable": {
    "version": [
@@ -68010,8 +68262,8 @@
     20210215,
     2345
    ],
-   "commit": "02b1da6278e43cc9cc0356110cc6bfbb37eb8241",
-   "sha256": "0ky330b2sfbzkbxbfp9b21hdywsjw26bllspglz08hrbni7jmry8"
+   "commit": "8454a5ef404c6f4fe954a10da6ce4fd4311decfa",
+   "sha256": "01aq4bgris8v7q0yfyz1928q4rh9mba3b799zw2df8slqiigbf8i"
   }
  },
  {
@@ -68118,24 +68370,20 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20210411,
-    751
+    20210503,
+    743
    ],
-   "commit": "3c9b98f61e9b781f756ac7a329005156406cae5a",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 250 ms\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 595 ms\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 1101 ms\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 2792 ms\nerror: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503\n"
-   ]
+   "commit": "29fd33c19442c0be605830f0e01fc6789e2fa9a7",
+   "sha256": "0d3i07g8sxg30llzx519ph3qp4bx0vk0xy80sxhy5vra2l30ihlj"
   },
   "stable": {
    "version": [
     1,
-    2,
-    3
+    3,
+    0
    ],
-   "commit": "0a36239baf908585cdf32c6188eb86713d9bf6c6",
-   "sha256": "1l392hz6zs6wg06x2zxnk7s0h5cpmvbkcynh68gjmqjj84l7mqrk"
+   "commit": "69248a97c9da98de786891215ab6baafcc44a55d",
+   "sha256": "0d3i07g8sxg30llzx519ph3qp4bx0vk0xy80sxhy5vra2l30ihlj"
   }
  },
  {
@@ -68170,11 +68418,11 @@
   "repo": "sergiruiztrepat/molar-mass",
   "unstable": {
    "version": [
-    20210324,
-    1832
+    20210426,
+    1754
    ],
-   "commit": "5b7d1d0004d27580e980fe8532658cd09174342e",
-   "sha256": "18s2np5wflbg0y6ffnjcbljyh3b5qsnjkma6dcl3razfr55mzmgn"
+   "commit": "27d3a305a9efe3ae8b57ec52cc644c219d0952eb",
+   "sha256": "09kmfq2klh446zdwnxa51z2i39f7p8f8f2wzcz874sm8nf10vszh"
   }
  },
  {
@@ -68290,11 +68538,11 @@
   "repo": "ananthakumaran/monky",
   "unstable": {
    "version": [
-    20201226,
-    1950
+    20210417,
+    12
    ],
-   "commit": "e04632277ef24acacc029ae29db1fadc458ae83b",
-   "sha256": "0xzn9fgxvbpgx5wky8vdhd3bw7hy6h6hngx7l8a0qspg560r7hz1"
+   "commit": "72c7cd21b7b995c476e938fd0b92a494aa25c3a7",
+   "sha256": "03khwadd3x3s9wrggdfjj8cff0nr64fj6hzc9yqbn2baxfkgrn8l"
   },
   "stable": {
    "version": [
@@ -68502,11 +68750,11 @@
   "stable": {
    "version": [
     1,
-    5,
+    6,
     0
    ],
-   "commit": "d0076ea22b2afc4c3faeea2138e836b1c8f08988",
-   "sha256": "0hz525xmv6kslss3yn8ibj6bi2xp442knad0030px7giia6y1pf6"
+   "commit": "f94cf84138a81212ffe856599834f7824a1b6e95",
+   "sha256": "0rdvcv8hwrxxbb9s8sfx5331a08kdk28x8chnnq3pj58pxqvagy3"
   }
  },
  {
@@ -68828,8 +69076,8 @@
     20210306,
     1053
    ],
-   "commit": "1ddec765e033d22079627dc14a06a204134e1b28",
-   "sha256": "0is1il0xws1k31p67s4xvpql7qm4rrv23fj2szdmfdds9f7qpp18"
+   "commit": "fc187dafa37aa9d3d9493c5506eb9089bf4eb884",
+   "sha256": "0zc81gyvp1aqjy21i298wgji4am32cmwb0ahz66ixxlz0f4zi8pz"
   },
   "stable": {
    "version": [
@@ -69426,27 +69674,31 @@
   "repo": "mihaiolteanu/mugur",
   "unstable": {
    "version": [
-    20200831,
-    702
+    20210428,
+    730
    ],
    "deps": [
     "anaphora",
+    "cl-lib",
+    "dash",
     "s"
    ],
-   "commit": "34dfba027bf11e4cca2c547ce80b73d7324c7ba6",
-   "sha256": "011qr9jc90arg3y8y49hjmv94968ym81a36db0dvxyf08hspz006"
+   "commit": "0381bda4cc6f8634131bbc0e5c3efe548703b0fb",
+   "sha256": "1k8g6xb8iw9i4dq30mm1x0534bhby93pvfbrzc2qc8lvakza6n7l"
   },
   "stable": {
    "version": [
-    1,
+    2,
     0
    ],
    "deps": [
     "anaphora",
+    "cl-lib",
+    "dash",
     "s"
    ],
-   "commit": "34dfba027bf11e4cca2c547ce80b73d7324c7ba6",
-   "sha256": "011qr9jc90arg3y8y49hjmv94968ym81a36db0dvxyf08hspz006"
+   "commit": "b8ebfd18a579b834d062082a8018f73561a0cde1",
+   "sha256": "0a7yd9y6nfyxz9qc84yrn8ii2z6359vhj8if3bx6b0hi8g03m4xl"
   }
  },
  {
@@ -69680,8 +69932,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "7b13b03c995e13ad86e499d40ec49c4dc281f889",
-   "sha256": "1fysnjbh0dai1bzx4122fp4qhbyn82m8hh3smd0xhwphjwrbnl57"
+   "commit": "616fbdd3696f99d85660ad57ebbb0c44d6c7f426",
+   "sha256": "10raq8p881zzz7si3wfpcgdnwyl8y7y9rgw28akyigjyq8knl6kf"
   },
   "stable": {
    "version": [
@@ -71117,8 +71369,8 @@
     20210318,
     1654
    ],
-   "commit": "a4d9d69442c9edac3f2cacabd2a7401dbefe7ff3",
-   "sha256": "1h828cxjacfqlhm719w2kwh91i0r1lai6wswpp7wp21wvvp28v5r"
+   "commit": "7e9ad5a617a26641988445503e235c68fa21b611",
+   "sha256": "1wy06kphgljlcnl55qx5g8hzcv9bnfrrp22pfsxpyawlrmmgxp1j"
   }
  },
  {
@@ -71247,6 +71499,21 @@
    "sha256": "1bqlhkxg0faddhvxx909dq46dxdxk4mdyhdpww92dmzgxdpq38sx"
   }
  },
+ {
+  "ename": "nix-modeline",
+  "commit": "6257a28862614c40db5ca933338e69faf7999eab",
+  "sha256": "0c3hr7l3d7qz83hgf3d4i171aya36qmfyvc5qzq7x0qdhiwavjpz",
+  "fetcher": "github",
+  "repo": "ocelot-project/nix-modeline",
+  "unstable": {
+   "version": [
+    20210405,
+    742
+   ],
+   "commit": "611ec73a72aac156511e9e3e61ee413ade9af5c1",
+   "sha256": "0jgzji627lfc4l4lnpv0j4570b4n89jn5a7p9s7c8xhww5w04z1i"
+  }
+ },
  {
   "ename": "nix-sandbox",
   "commit": "66be755a6566e8c0cfb5aafa50de29b434023c7a",
@@ -71387,26 +71654,6 @@
    "sha256": "0h00ghr5sipayfxz7ykzy7bg1p1vkbwxl5xch3x0h8j2cp1dqc3d"
   }
  },
- {
-  "ename": "nm",
-  "commit": "cdad6565e83dd79db538d3b6a45e932864246da2",
-  "sha256": "004rjbrkc7jalbd8ih170sy97w2g16k3whqrqwywh09pzrzb05kw",
-  "fetcher": "github",
-  "repo": "tjim/nevermore",
-  "unstable": {
-   "version": [
-    20151110,
-    1910
-   ],
-   "deps": [
-    "company",
-    "notmuch",
-    "peg"
-   ],
-   "commit": "5a3f29174b3a4b2b2e7a700a862f3b16a942687e",
-   "sha256": "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak"
-  }
- },
  {
   "ename": "nndiscourse",
   "commit": "1d6a236cd3ff51f2d4cfca114b2791c8ac7411e8",
@@ -71541,13 +71788,13 @@
    "version": [
     1,
     2,
-    1
+    2
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "96ed5b8ecad8bcdcd212aacd9957276be3cf128e",
-   "sha256": "00chkzpjcdll907vpzfzmf9p3jprisnr8i0h1x5gixidwbfc2whi"
+   "commit": "57357e15643158b4e0d9b3b4f70a82f5fc73178a",
+   "sha256": "1kbbbx1agzcxc5n1b6cavdx3wjxz6mgi9rafja8mk8cyaaiz0rkd"
   }
  },
  {
@@ -71837,17 +72084,16 @@
     20210205,
     1412
    ],
-   "commit": "1459217e17e94277495c5c644b5a4ca1651c9452",
-   "sha256": "1p1g816ansbq388pqclckcjs0cgl38p0gc77rrgmab3mccdvib2r"
+   "commit": "63413a5563450bdedee4c077f2f998578e75083a",
+   "sha256": "0n6z9858l5yp89dv9y494f1xvs52rxr8qacn4rj3fm2n6h0v63p8"
   },
   "stable": {
    "version": [
     0,
-    31,
-    4
+    32
    ],
-   "commit": "3a3208bb7b8bfca1c0bcaa5b45b6ef71aa768612",
-   "sha256": "04q9zwy6mpck82zk70xnx2knh2jmqhf676703kjw0fbvdrzw9qik"
+   "commit": "5fe92332f2dcff460dea1f2aa78717d1954df62c",
+   "sha256": "1sgjjcc53ys8pspblbif24min5gg7l71xakhrvmb4xniw4rg2qx6"
   }
  },
  {
@@ -71917,26 +72163,26 @@
   "url": "https://git.sr.ht/~tarsius/notmuch-maildir",
   "unstable": {
    "version": [
-    20201028,
-    1330
+    20210416,
+    1043
    ],
    "deps": [
     "notmuch"
    ],
-   "commit": "9f3e8bbce4c8c6cd80fb71b92d315d4f3334b450",
-   "sha256": "1rrd3ymc7k8irq1w4496h4whks7lnfam7ibfwgcra074ligfrs4p"
+   "commit": "e34c470521e83c3100f0d6eb9e7402ae35e19321",
+   "sha256": "0pmikf1djkr07067nkgmdcxyn7l7ibswx6qlnai8v1v51f9h1g9q"
   },
   "stable": {
    "version": [
     0,
-    1,
+    2,
     0
    ],
    "deps": [
     "notmuch"
    ],
-   "commit": "8c641d9688f20262c9dac59901aaecd2a21525d7",
-   "sha256": "1nh7vkxhwb2cmm8g7gxh3rc6lcfqlhsbf82vi3lsbdq008p1b3kh"
+   "commit": "e34c470521e83c3100f0d6eb9e7402ae35e19321",
+   "sha256": "0pmikf1djkr07067nkgmdcxyn7l7ibswx6qlnai8v1v51f9h1g9q"
   }
  },
  {
@@ -71961,14 +72207,14 @@
    "version": [
     0,
     3,
-    3
+    4
    ],
    "deps": [
     "dash",
     "esxml"
    ],
-   "commit": "0ece7ccbf79c074a3e4fbad1d1fa06647093f8e4",
-   "sha256": "116klnjyggwfwvs9nqhpv97m00k63q6lg41ph41kywsqkfy42dlk"
+   "commit": "b3c7cc28e95fe25ce7b443e5f49e2e45360944a3",
+   "sha256": "0va9xjrq30cv5kb59a4rq5mcm83ggnv774r8spmskff3hj8012wf"
   }
  },
  {
@@ -72131,6 +72377,18 @@
    ],
    "commit": "a5508d9958c2148c04ec32d7b3a9f72423e4b0aa",
    "sha256": "1d1snvxbdv0mh48jmi6dx0yr4hmblcq1aajxb1z56714702ycdgj"
+  },
+  "stable": {
+   "version": [
+    0,
+    9,
+    0
+   ],
+   "deps": [
+    "org-roam"
+   ],
+   "commit": "c150603a25445d65b7b08d658793a6019fd763ea",
+   "sha256": "0qip0vhyvif5az7zph1m41gwamz84v01ay9qzicydzbizhzp4n5i"
   }
  },
  {
@@ -72531,16 +72789,16 @@
   "repo": "astahlman/ob-async",
   "unstable": {
    "version": [
-    20200921,
-    205
+    20210428,
+    2052
    ],
    "deps": [
     "async",
     "dash",
     "org"
    ],
-   "commit": "de1cd6c93242a4cb8773bbe115b7be3d4dd6b97e",
-   "sha256": "12n6fvjiwkf02aypvj5zrbjrxhz2p0rcq2k3mfz5ravyarpvrybp"
+   "commit": "9aac486073f5c356ada20e716571be33a350a982",
+   "sha256": "0k0jcha7cckj8dc2cc1a6m2yhagsl5bmlnr3p8x3g8ij1axk533h"
   },
   "stable": {
    "version": [
@@ -72583,11 +72841,11 @@
   "repo": "corpix/ob-blockdiag.el",
   "unstable": {
    "version": [
-    20190720,
-    1858
+    20210412,
+    1541
    ],
-   "commit": "272fafcf3bc37f9de41b11beb6a33e0dbf0a1909",
-   "sha256": "0gi7vnh5fchbjb7hp7yi08z2vqkmhjrg64ssir358qxqambxvrxb"
+   "commit": "c3794bf7bdb8fdb3db90db41619dda4e7d3dd7b9",
+   "sha256": "14lw5y8djl9ff71layshz4rrmknp4kisv9lak26d9lh1l2z69fi6"
   },
   "stable": {
    "version": [
@@ -72858,28 +73116,28 @@
   "repo": "frederic-santos/ob-ess-julia",
   "unstable": {
    "version": [
-    20201109,
-    911
+    20210414,
+    1444
    ],
    "deps": [
     "ess",
     "julia-mode"
    ],
-   "commit": "b97ebf19c3d68ff946584e78ab7943f8a691ebe5",
-   "sha256": "1g9p3i6iwhgh6wj1k326lswms59nx4n1dyb7rr1qia1d0y3k1zym"
+   "commit": "147e9e7fe55c41dd77171417e92af40db3530b84",
+   "sha256": "00wplflc4pp0ffhnkya19cqm3ihz8mybfj2ywk3ii2d9x08kjnp3"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    3
    ],
    "deps": [
     "ess",
     "julia-mode"
    ],
-   "commit": "337df3eefd85c01020fe08eae3ddcf3ec3e4ac2d",
-   "sha256": "0pk4b6zg08nacds129frk3qwn0mlm4sg03gihyn42fd8iq16mjzf"
+   "commit": "147e9e7fe55c41dd77171417e92af40db3530b84",
+   "sha256": "00wplflc4pp0ffhnkya19cqm3ihz8mybfj2ywk3ii2d9x08kjnp3"
   }
  },
  {
@@ -73030,6 +73288,35 @@
    "sha256": "1a10fc2jk37ni5sjjvf87s5nyaz2a6h2mlj5dxh4dhv5sd3bb85p"
   }
  },
+ {
+  "ename": "ob-julia-vterm",
+  "commit": "6e5f9703d8d4f9e5272db5be2c2bd89dfd27f32a",
+  "sha256": "0bkjqln8pi6j0lq5ch68v2r2rb2zbdch3g63kqjwskadgsypgfpj",
+  "fetcher": "github",
+  "repo": "shg/ob-julia-vterm.el",
+  "unstable": {
+   "version": [
+    20210418,
+    2306
+   ],
+   "deps": [
+    "julia-vterm"
+   ],
+   "commit": "3e7ff901687c320869c5e17e3273185af68e8cd6",
+   "sha256": "0i155p3k2xf0p00xazqjw4llylb13svgad9a9m6as6lcvrvc0zsp"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
+   ],
+   "deps": [
+    "julia-vterm"
+   ],
+   "commit": "5893d75cdb9e687b98b99b3675165f4edf0083a6",
+   "sha256": "12ya7dn7fd0szm6pi68f7h4cyb5cy56cfs43nl9f4v8v2qvlyh5y"
+  }
+ },
  {
   "ename": "ob-kotlin",
   "commit": "7aa74d349eb55aafddfc4327b6160ae2da80d689",
@@ -73596,17 +73883,17 @@
     20201204,
     945
    ],
-   "commit": "fd078c3a37cb679dfffe890995a4e6a1f63ece15",
-   "sha256": "0vq3nnjk76i947wjmfddbr1fs6m8dkddlrqcdsvsf2xw2xfpsfvs"
+   "commit": "876682f6deef7306d7b16322464cc5ad05193494",
+   "sha256": "1jrf8jlp18pnwk99x2181b01mjgk3p6jj2ik29n5sqdg9p5q8czy"
   },
   "stable": {
    "version": [
     0,
-    17,
+    18,
     0
    ],
-   "commit": "bfd6bbe95c614d1d982244c4fd0ba494275d2245",
-   "sha256": "0vy69sjl184czpwbhcbgzyh8kgj6n3jq8ckllcbwic859aq8lqvn"
+   "commit": "3697f0f92854a681fd1156fe4f6fb97d060da1d8",
+   "sha256": "0n6363km8xr81pvyk453n6h2mb0256c5yxw3p1li4dn83f3lwxr1"
   }
  },
  {
@@ -73790,30 +74077,26 @@
   "repo": "oer/oer-reveal",
   "unstable": {
    "version": [
-    20210405,
-    820
+    20210418,
+    707
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "1150feb761047e241af1c5e67333665e729a4a63",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 298 ms\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 617 ms\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 1257 ms\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 2660 ms\nerror: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503\n"
-   ]
+   "commit": "9f13380845c9eb69c45ad23888709cce0060d14d",
+   "sha256": "1r0l93w5lwczwl6p65yd2agvx46r06pf4znpvgcv3sg473f6hvj1"
   },
   "stable": {
    "version": [
     3,
-    17,
-    0
+    18,
+    3
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "e880c4f65ad20e22ab845fc2918ca74cc37bf39a",
-   "sha256": "197fn08xhk6cbvi4hqf51v40x0ki5n8h1896g3bpl4fasfy5zicp"
+   "commit": "9f13380845c9eb69c45ad23888709cce0060d14d",
+   "sha256": "1r0l93w5lwczwl6p65yd2agvx46r06pf4znpvgcv3sg473f6hvj1"
   }
  },
  {
@@ -73918,20 +74201,20 @@
   "repo": "rnkn/olivetti",
   "unstable": {
    "version": [
-    20210202,
-    709
+    20210503,
+    850
    ],
-   "commit": "61d26644fd9dd2d45b80b9b82f5f930ed17530d0",
-   "sha256": "1nvnahwjqs9i2cinkpwg689lg134wp7l6f9f1k1jwn0dh1amqmvp"
+   "commit": "6f6c935dabe669a95196e459c0e516d31c711e45",
+   "sha256": "07jssr5v4l20dg24m15wbjzzfn8icnypx0k04d0zqyvmzz8hwkvg"
   },
   "stable": {
    "version": [
     1,
     11,
-    3
+    4
    ],
-   "commit": "a2dbd3dc4e7000fec29febbd089cd4558a7322b9",
-   "sha256": "0zcph7l0hxisbvsyzb1dw3paq5a5sjp5lrq5nq9zggvgc6zvx7sh"
+   "commit": "6902410cd857385a3c1aa20ba391901a78d2740b",
+   "sha256": "1pw1zc0pdwwi9dv8fypfxgn6xbfvm88qzhss880lspialff1wcxn"
   }
  },
  {
@@ -74370,6 +74653,29 @@
    "sha256": "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h"
   }
  },
+ {
+  "ename": "openfoam",
+  "commit": "f184e09d370d563852da2028b9c2546d6fc162c0",
+  "sha256": "09i02kqgw3mqvwzj4p23p66rpy30ziz4gxczs8p47l6ilw5j69rz",
+  "fetcher": "github",
+  "repo": "ralph-schleicher/emacs-openfoam",
+  "unstable": {
+   "version": [
+    20210502,
+    1738
+   ],
+   "commit": "6447c666d7446865860f1490856373d1de4a11fe",
+   "sha256": "02sc61gnn25pfc38shi8ybmg8d4228vk2lyffxj7pszxz6sjya92"
+  },
+  "stable": {
+   "version": [
+    0,
+    11
+   ],
+   "commit": "2c77f46ec7bd4bd8fde694a7b009ec42730199aa",
+   "sha256": "02sc61gnn25pfc38shi8ybmg8d4228vk2lyffxj7pszxz6sjya92"
+  }
+ },
  {
   "ename": "opensource",
   "commit": "ec4255a403e912a14a7013ea96f554d3588dfc30",
@@ -74674,14 +74980,14 @@
   "repo": "awth13/org-appear",
   "unstable": {
    "version": [
-    20210401,
-    2114
+    20210427,
+    819
    ],
    "deps": [
     "org"
    ],
-   "commit": "2380562fbec8a17ec193891da755a502a2ccd252",
-   "sha256": "14b1x446zwdsqy8lvmz3iw1byaq1rn92v19ib5zyk18g9lf9ma7i"
+   "commit": "6ee49875f8bdefafbde849f5628d673e9740cf8c",
+   "sha256": "0qsl273qd2cc4nvv0zhsd8wn8kaw3swq6l577rkh4r6iwkqci5gf"
   }
  },
  {
@@ -74883,8 +75189,8 @@
   "stable": {
    "version": [
     0,
-    2,
-    21
+    3,
+    0
    ],
    "deps": [
     "dash",
@@ -74894,8 +75200,8 @@
     "org",
     "s"
    ],
-   "commit": "a88d39e364757594c6b3830cc36f342ee0d1b8ab",
-   "sha256": "1axzhb9k1i8l9rksk14bb04v4q4mx498f5psnalxwvn0563ngs5r"
+   "commit": "9f4ec4a981bfc5eebff993c3ad49a4bed26aebd1",
+   "sha256": "1sgckvpjdaig9r2clcvs6ckgf2kx7amikkpq26y30jbnfnbskf0v"
   }
  },
  {
@@ -75337,16 +75643,16 @@
   "repo": "phillord/org-drill",
   "unstable": {
    "version": [
-    20200412,
-    1812
+    20210427,
+    2003
    ],
    "deps": [
     "org",
     "persist",
     "seq"
    ],
-   "commit": "35c1ce349949cc213f3076799211210f49431850",
-   "sha256": "06hc98z4sml7jrwm5zvbsw5x6q5jpa335almzkh6h85g1p8syfsn"
+   "commit": "bf8fe812d44a3ce3e84361fb39b8ef28ca10fd0c",
+   "sha256": "079x6rcz50rpw0vdq5q2kjpixz95k9f3j9dwk91r5111vvr428w3"
   },
   "stable": {
    "version": [
@@ -75456,14 +75762,14 @@
   "repo": "eschulte/org-ehtml",
   "unstable": {
    "version": [
-    20150506,
-    2358
+    20210428,
+    1547
    ],
    "deps": [
     "web-server"
    ],
-   "commit": "9df85de1a0fe1e7b2d6c000777c1a0c0217f92d0",
-   "sha256": "0kqvwqmwnwg2h7r38fpjg6qlkcj9v8011df8nmsgs1w1mfdvnjsq"
+   "commit": "b4f97edf4150870b84d7ee8508088c0d375eaa83",
+   "sha256": "124fq9k7qmjvn5hp9i2b4xmrm9z18zhbc9j1rv68wpdqf0kqxkcd"
   }
  },
  {
@@ -75580,11 +75886,11 @@
   "repo": "harrybournis/org-fancy-priorities",
   "unstable": {
    "version": [
-    20180328,
-    2331
+    20210427,
+    900
    ],
-   "commit": "819bb993b71e7253cefef7047306ab4e0f9d0a86",
-   "sha256": "13cyzlx0415i953prq6ch7r5iy23c1pz116bdxi5yqags4igh4wv"
+   "commit": "44532ab8c25eb2c0028eecca7acd9e8ea8e2ff30",
+   "sha256": "1cvlyq5p505vx9gcqgvhj7qan1qhq859c2fv7a44kfs0093cb9fz"
   }
  },
  {
@@ -75625,8 +75931,8 @@
   "repo": "kidd/org-gcal.el",
   "unstable": {
    "version": [
-    20210407,
-    57
+    20210421,
+    2203
    ],
    "deps": [
     "alert",
@@ -75634,8 +75940,8 @@
     "request",
     "request-deferred"
    ],
-   "commit": "161465b9448a6413466f1dfe77844f5591fbdeae",
-   "sha256": "0pwi537cg1yb76bwx2sn1w8vkjgsjq38f7lbqvd159g9rbng7v21"
+   "commit": "4c2616a4f85adc77b91aa054bb10e76b06f706d5",
+   "sha256": "0isw9inxbdrf5rwqhjasbbz8av9sn56nwz7xxksr69nk5mv7zm17"
   },
   "stable": {
    "version": [
@@ -75752,8 +76058,8 @@
     "org-agenda-property",
     "org-edna"
    ],
-   "commit": "8d7acda24a00ef94fd14a4e2ebe2606009eb46e9",
-   "sha256": "1h9gfy2assjl2l9dfyp40ypkdm541cisx84vnapjnr6i1bxsvdck"
+   "commit": "034edc545335ecc0da20b4f1bb4aa9f048454afe",
+   "sha256": "0yhnrz7kcq81842sv7zf58fqc6wiy4ckcjyqy8m6bn2z6rwpj655"
   },
   "stable": {
    "version": [
@@ -75792,15 +76098,15 @@
   "stable": {
    "version": [
     1,
-    5,
-    7
+    6,
+    0
    ],
    "deps": [
     "dash",
     "org"
    ],
-   "commit": "0877bd57f95ad96a342505a6ecef0c15977f6bd6",
-   "sha256": "02q343sznbw1ma9zcxnpa7sy37s85ph9phpg479pfz5c51kji09h"
+   "commit": "2cb87624238281b438cda67ed375c56403524489",
+   "sha256": "1xmbrrp1zyvij18v3rqmini6w9i6v7dl4fp103ph6wznav8x0jbl"
   }
  },
  {
@@ -75850,15 +76156,15 @@
    "version": [
     7,
     1,
-    6
+    7
    ],
    "deps": [
     "dash",
     "org",
     "s"
    ],
-   "commit": "47dda7d3dce11e8ab9a3847f8c6a1cbb8345f861",
-   "sha256": "1s1y0xlin1yx716awzbq6lvzz5c3c5i9qvacgm006bypg8qlmz1a"
+   "commit": "47805bb8dc681872f3ad5dc74711938978d5c7f2",
+   "sha256": "0iiw798clq6hmml6fs60wwd38c4rzvxrdv4xr57innj06cja4dvy"
   }
  },
  {
@@ -75875,8 +76181,8 @@
    "deps": [
     "org"
    ],
-   "commit": "f9a3321712626d2f43a8849203ceb089cf8233b1",
-   "sha256": "195bzlfqf91f7prv4xh1x1p5xnyygr0mzwqxbsw2apc0haaz6ajk"
+   "commit": "b2dfbf41efac55edacde8a8a6bd0275418de6454",
+   "sha256": "1gs62qjllsz23qbs9zq767c8xxvxwknl1x6r4ixx9090j7bsrhpd"
   },
   "stable": {
    "version": [
@@ -76149,14 +76455,14 @@
   "repo": "dfeich/org-listcruncher",
   "unstable": {
    "version": [
-    20210304,
-    1602
+    20210503,
+    802
    ],
    "deps": [
     "seq"
    ],
-   "commit": "b0269843f317b6715dbde8a4e955aac9c38cbdb6",
-   "sha256": "1ywwngjqfvppxbb0dghqzr0kg9dxyqidjgjrh4ncc0zc9iamcx2w"
+   "commit": "50c06445a837c6677da035f72dbe0f973d9e10a7",
+   "sha256": "1nw5wd781a5nh5csvsr6ycjpji66k8vkvw8z1sfa0p8xsbln9rk9"
   }
  },
  {
@@ -76264,15 +76570,15 @@
    "version": [
     5,
     6,
-    1
+    2
    ],
    "deps": [
     "dash",
     "org",
     "s"
    ],
-   "commit": "4fe1f194a8eba00858b78d611ad8a7f14392722d",
-   "sha256": "1p1k5zmc0dklbvnck0zhsxqmndask822ikaa40d1ik105w1vx3bz"
+   "commit": "5aeed6d0f7f878b20483975200df43b6fc7f32f9",
+   "sha256": "102lrlf25i30xbpszr1mh6mkxd6wwgbwg32dafccxm4dmj3v9hqq"
   }
  },
  {
@@ -76325,14 +76631,14 @@
   "repo": "jeremy-compostella/org-msg",
   "unstable": {
    "version": [
-    20210409,
-    1813
+    20210429,
+    59
    ],
    "deps": [
     "htmlize"
    ],
-   "commit": "e57af9c057d97d14536cef08aca7a19bdf194830",
-   "sha256": "19m1y686jppl1j7ibigw1h6n518swgdcfgrk84r1nvd7x83vd8v0"
+   "commit": "d9a690eeca64231159cd0f3f0ee214619858490e",
+   "sha256": "1fr8nw4pxbhml1ly1wx5glybgdh5g1g87aivzmjddycdsfcx2zqi"
   }
  },
  {
@@ -77030,24 +77336,20 @@
     "org"
    ],
    "commit": "4d8a63cba537705f4ecf3f45838e3cfc83fa2369",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 327 ms\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 591 ms\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 1200 ms\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 2118 ms\nerror: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503\n"
-   ]
+   "sha256": "0y45g2d868ayl9igzdxzbfzw8n5qymzsdm9d3giwnlchqfrp987y"
   },
   "stable": {
    "version": [
     3,
-    7,
-    0
+    8,
+    1
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "d404eb13d9e34354c081870ebdd69711937682b3",
-   "sha256": "1vzn0l8ig4rzh5h8j7kxn8kslqrij97qqv98fbnlwmrw4z87v8dr"
+   "commit": "4d8a63cba537705f4ecf3f45838e3cfc83fa2369",
+   "sha256": "0y45g2d868ayl9igzdxzbfzw8n5qymzsdm9d3giwnlchqfrp987y"
   }
  },
  {
@@ -77301,8 +77603,8 @@
   "repo": "org-roam/org-roam",
   "unstable": {
    "version": [
-    20210411,
-    650
+    20210502,
+    1936
    ],
    "deps": [
     "dash",
@@ -77312,14 +77614,14 @@
     "org",
     "s"
    ],
-   "commit": "997ddcbf4b0373bb449d09f1db6cf5de6983de5e",
-   "sha256": "0dh325syjn1dkblydbdxqqy24pbyk4h3rcmr8506lycyz1xg2m2k"
+   "commit": "d2e933cc3e4f5ee843bfca9525a30eb395c60990",
+   "sha256": "09fbbji67ipfw1xn2960v9pwc6xm6w9z10j3c343f9a02aqyjwif"
   },
   "stable": {
    "version": [
     1,
     2,
-    3
+    4
    ],
    "deps": [
     "dash",
@@ -77329,8 +77631,8 @@
     "org",
     "s"
    ],
-   "commit": "cc01cf346e2d832f78694320947e0788c92f49b9",
-   "sha256": "0n8c0yxqb62i39kn0d5x83s96vwc0nbg0sx5hplffnbkfbj88bba"
+   "commit": "9065f6a999b98d4b495e3d8fa1fa4424eddd25a8",
+   "sha256": "10jrnjq65lpg1x8d7lqc537yai9m6pdnfbzwr87fcyv6f8yii8xn"
   }
  },
  {
@@ -77432,8 +77734,8 @@
   "repo": "tyler-dodge/org-runbook",
   "unstable": {
    "version": [
-    20210102,
-    1627
+    20210502,
+    1732
    ],
    "deps": [
     "dash",
@@ -77444,8 +77746,8 @@
     "s",
     "seq"
    ],
-   "commit": "a05dcf6b9674406a9d616b53b4f199a3f87b3f2a",
-   "sha256": "0bj91c8zz804zclhl5ay8k2sjw9pi9mrkrjcmcs2h36klcb1x4qn"
+   "commit": "3206b4ea40614ba87a1b12f66ad0f84354bcdafb",
+   "sha256": "0b2gs6hm8k25539m7hxbhh5jza37mdfv3z763r130fxj3b646v01"
   },
   "stable": {
    "version": [
@@ -77639,7 +77941,7 @@
    "version": [
     3,
     0,
-    0
+    2
    ],
    "deps": [
     "dash",
@@ -77647,8 +77949,8 @@
     "org-ml",
     "s"
    ],
-   "commit": "1cc854e814f86bc35f536563837a97a832a06122",
-   "sha256": "1wp3d3b1wdw8v5drwbrfxrbq8psf82bs9cwjin2psfgb4n1166dy"
+   "commit": "40c8870b2ab93dde33994f46c0531b3978e25fde",
+   "sha256": "05c1hgzq69lnw59x1w5bybrdhnyli8d9pzjczixklrrahmx4ig8k"
   }
  },
  {
@@ -78325,11 +78627,11 @@
   "repo": "cadadr/elisp",
   "unstable": {
    "version": [
-    20200919,
-    1348
+    20210414,
+    1844
    ],
-   "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f",
-   "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q"
+   "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984",
+   "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b"
   }
  },
  {
@@ -78508,8 +78810,8 @@
   "repo": "org2blog/org2blog",
   "unstable": {
    "version": [
-    20200817,
-    1842
+    20210422,
+    339
    ],
    "deps": [
     "htmlize",
@@ -78517,14 +78819,14 @@
     "metaweblog",
     "xml-rpc"
    ],
-   "commit": "c7f72a87952ed16323fce968462af897235f1719",
-   "sha256": "0v8zkzai5gfzng9dpkikwf60rvsr1148y5nb7hw65961xms855s4"
+   "commit": "c1b386f3522054f063f4ac60730397ed1f724478",
+   "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q"
   },
   "stable": {
    "version": [
     1,
     1,
-    10
+    11
    ],
    "deps": [
     "htmlize",
@@ -78532,8 +78834,8 @@
     "metaweblog",
     "xml-rpc"
    ],
-   "commit": "19aa8a17428d6ee42f54e464c26eeab17a6478ab",
-   "sha256": "198ahgxji0kh6ynygrrdvllj9fwcqrnma4sd8msj2aq18xij9glr"
+   "commit": "c1b386f3522054f063f4ac60730397ed1f724478",
+   "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q"
   }
  },
  {
@@ -78757,15 +79059,15 @@
   "repo": "magit/orgit",
   "unstable": {
    "version": [
-    20210309,
-    1906
+    20210426,
+    1746
    ],
    "deps": [
     "magit",
     "org"
    ],
-   "commit": "609fd0ccfb5268704b5bc7d7ac1014d4960b9707",
-   "sha256": "00rmp5pbn7bn4mrfzlkh9dc5m80qw72bs5jxdss9sk38v1gvxbr3"
+   "commit": "e8db8dc74106dfabe316e63cc9032dd7bb9bc598",
+   "sha256": "0dqinq1n78mjll3agiqif2rxz8ikdz4qr88hxhrwbl4222dlaagz"
   },
   "stable": {
    "version": [
@@ -78789,8 +79091,8 @@
   "repo": "magit/orgit-forge",
   "unstable": {
    "version": [
-    20200621,
-    2144
+    20210426,
+    2145
    ],
    "deps": [
     "forge",
@@ -78798,8 +79100,8 @@
     "org",
     "orgit"
    ],
-   "commit": "051d92661ef12b67ffadb231324806d87d1e6a54",
-   "sha256": "0x8wmqp9x2c7qv0ipj2rvjf7bc7z0pn8s253gjxpxmakz3l8wnyk"
+   "commit": "f7c1a83efbebad3c533259a3256c85012e2d13f4",
+   "sha256": "0xc070ykg5dnq1di4912ckhyw70c68lw43b2s06b5cg20ka79i6h"
   },
   "stable": {
    "version": [
@@ -79276,19 +79578,20 @@
   "repo": "emacsorphanage/osx-trash",
   "unstable": {
    "version": [
-    20160520,
-    1300
+    20210419,
+    2229
    ],
-   "commit": "0f1dc052d0a750b8c75f14530a4897f5d4324b4e",
-   "sha256": "0f4md49175iyrgzv4pijf7qbxyddcm2yscrrlh91pg410la7fysk"
+   "commit": "af74a2055a15bf4182d8196600f7decd66eec634",
+   "sha256": "09960kif9gnfmic4iyv9d28577j6zsiji9fdrxcnhh6586hz70ri"
   },
   "stable": {
    "version": [
     0,
-    2
+    2,
+    1
    ],
-   "commit": "529619b84d21e18a38ec5255eb40f6b8ede38b2a",
-   "sha256": "1n44wdffkw14si9kb7bpkp6d9cjwjrvksfh22y9549dhs1vav6qq"
+   "commit": "af74a2055a15bf4182d8196600f7decd66eec634",
+   "sha256": "09960kif9gnfmic4iyv9d28577j6zsiji9fdrxcnhh6586hz70ri"
   }
  },
  {
@@ -79633,8 +79936,8 @@
    "deps": [
     "org"
    ],
-   "commit": "e931362e641f97d17dc738d22bb461e54045786d",
-   "sha256": "045kci7xvlp0kg8gmplnybc7ydv66hkl88dxgd113ac7ipf9zir7"
+   "commit": "efb74df1179702e19ce531f84993ac5b5039075f",
+   "sha256": "0sxwbqk6sm8qfpbcxhclin21k6xx5286df57rr0m72xrqqpdsw1p"
   }
  },
  {
@@ -79829,8 +80132,8 @@
    "deps": [
     "org"
    ],
-   "commit": "7a93b0f4b3e8e240d9451f1fa5704acfc494e9aa",
-   "sha256": "0dvhc559r9jhc8d91mv5an3vfklrfyfrpr32dqvphgk1i85kqvw4"
+   "commit": "be7fbd9f164d8937b2628719e21e8e6b4827e638",
+   "sha256": "1p074q7w3j1n98zzsmq2xb9kwbm7bb4lg8yss4q3rv9rkrrz7dk9"
   },
   "stable": {
    "version": [
@@ -80157,14 +80460,14 @@
   "repo": "DarkBuffalo/ox-report",
   "unstable": {
    "version": [
-    20210219,
-    2023
+    20210430,
+    1212
    ],
    "deps": [
     "org-msg"
    ],
-   "commit": "7e135fb51f252ab1ec5a31e05a1c7e638b656b85",
-   "sha256": "1lg00p7nr3y5wjm7r53c93gx0ycqjgsrj4w5jxw6fzrdacqdnsz9"
+   "commit": "1e730396b8b7aa5101b3e3f538d6d4c15514f415",
+   "sha256": "1firb26xnci1qprb4v4p3cp9vnmmp5bvsm3154gy0n2jr0hzvbjj"
   },
   "stable": {
    "version": [
@@ -80617,14 +80920,14 @@
   "repo": "melpa/package-build",
   "unstable": {
    "version": [
-    20210318,
-    1411
+    20210421,
+    1333
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "0f13dd6655f6d4ff71b77c6d2c93727e5f43b254",
-   "sha256": "0l4qwz2s63r26y5v02yrpncjdiyspw7pill0bjjlcawvxffykw9i"
+   "commit": "b4eec13201093070a12f37396afce83eb6771df5",
+   "sha256": "1kr9iwsrpxbalhjz91pqplwkb44msdl2qv4rwsbapz8z8hs4xzji"
   },
   "stable": {
    "version": [
@@ -80661,15 +80964,15 @@
   "repo": "purcell/package-lint",
   "unstable": {
    "version": [
-    20210326,
-    241
+    20210425,
+    3
    ],
    "deps": [
     "cl-lib",
     "let-alist"
    ],
-   "commit": "16e589114cc1f2514d95a58d53e1ae7c2ce941b4",
-   "sha256": "03bcnxd39r9k63zwb6gnqrhs0q629izakj2hmhk83hiy1131v7jl"
+   "commit": "bc6c0577c0c87c43095955f8210b221bb759f103",
+   "sha256": "0rg51c0nj6fcxf4lcbfh0l997s08g3k19jxmsms5xj26aavp9zj2"
   },
   "stable": {
    "version": [
@@ -80698,8 +81001,8 @@
    "deps": [
     "package-lint"
    ],
-   "commit": "16e589114cc1f2514d95a58d53e1ae7c2ce941b4",
-   "sha256": "03bcnxd39r9k63zwb6gnqrhs0q629izakj2hmhk83hiy1131v7jl"
+   "commit": "bc6c0577c0c87c43095955f8210b221bb759f103",
+   "sha256": "0rg51c0nj6fcxf4lcbfh0l997s08g3k19jxmsms5xj26aavp9zj2"
   },
   "stable": {
    "version": [
@@ -81128,8 +81431,8 @@
     20200510,
     5
    ],
-   "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f",
-   "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q"
+   "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984",
+   "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b"
   }
  },
  {
@@ -81357,11 +81660,11 @@
   "repo": "justinbarclay/parinfer-rust-mode",
   "unstable": {
    "version": [
-    20210325,
-    1714
+    20210413,
+    2
    ],
-   "commit": "a92e39e86ec24fbc536c68765b4af6f4c6ff24c5",
-   "sha256": "1l4xvyx4r7ld7d8k18x4khagiivp5a7m647zv7fvg7ivhkq2crqd"
+   "commit": "c2c1bbec6cc7dad4f546868aa07609b8d58a78f8",
+   "sha256": "0az4qp118vsqzgsl87wgszzq91qzqkpabifd8qrr2li3sizsn049"
   },
   "stable": {
    "version": [
@@ -81644,11 +81947,11 @@
   "repo": "vandrlexay/emacs-password-genarator",
   "unstable": {
    "version": [
-    20210327,
-    1140
+    20210425,
+    2227
    ],
-   "commit": "de391a83e6a11f810f0141b7b4758dd978478234",
-   "sha256": "10yh56jlvnn01swb4pfq2gqpj2shxfp716fzij8c2c0hi52rgnbz"
+   "commit": "c1da9790d594bc745cdbcc8003153e408aa92a5f",
+   "sha256": "0nwfdf5ik7d11l2h2fg4pszifv3fncpxjzs933gj91mvjy2wrw98"
   }
  },
  {
@@ -82618,13 +82921,13 @@
   "stable": {
    "version": [
     2,
-    14
+    15
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2f2b59e693f08b8d9c81062fca25e6076b6e7f8d",
-   "sha256": "04r5h5zs5r6s22p5ynhpr860r2r552z9pyf4kbabfg1gz9jag7yp"
+   "commit": "dd2a380ac71edf1321a6462f14668baf99879e80",
+   "sha256": "0l9i7ky25d9ii04w2brgxc8dk2rky50naba8lbfqi7hcc34z8pp6"
   }
  },
  {
@@ -83065,11 +83368,11 @@
   "repo": "emacs-php/php-mode",
   "unstable": {
    "version": [
-    20210310,
-    1724
+    20210430,
+    1507
    ],
-   "commit": "a2bca9be4c34a9dc38393602cb2708df24587838",
-   "sha256": "1rc67f3jzjhqykcn16s2ibviibxmr7b9y2c20hdwg49r41ax4f9v"
+   "commit": "209913f8ce0f18898625b41e0094a99ce8accd0d",
+   "sha256": "048rnzhxsgq6vi4d64826ma1rkxsz42qbbppwqx7wiqj4nnmxshw"
   },
   "stable": {
    "version": [
@@ -83525,11 +83828,11 @@
   "repo": "EricCrosson/pine-script-mode",
   "unstable": {
    "version": [
-    20181110,
-    151
+    20210420,
+    1249
    ],
-   "commit": "f7892d373e30df0b2e8d2191e4ddb2064a92dd3c",
-   "sha256": "1zxmc2l41h28rl058lrfr8c26hjzqmp37ii8r29mpsm03hsw30fh"
+   "commit": "72d0cb20cc5c5dff363a08318ac7045f4a5f43e3",
+   "sha256": "0ry1gd1vgwnr7skalc39baqbffb5vq4bkpy5bnr2sprgj6p4mxvc"
   },
   "stable": {
    "version": [
@@ -83928,26 +84231,28 @@
   "repo": "ZachMassia/PlatformIO-Mode",
   "unstable": {
    "version": [
-    20161210,
-    1339
+    20210501,
+    1057
    ],
    "deps": [
+    "async",
     "projectile"
    ],
-   "commit": "1466aed132a77f48fcb31938d64abb1a1e58ec42",
-   "sha256": "1lfkp7df8as9gspynkyhz4dbm95kbngyba1ymg6ql67adyv79v1i"
+   "commit": "e7bde6fec31b57ffe1c0a98cd29477d5baea30f3",
+   "sha256": "0ian50v9vaz7kqzn20bhqadq50h0l3zhjkmniinpz4q9klh7drh9"
   },
   "stable": {
    "version": [
     0,
-    2,
-    2
+    3,
+    0
    ],
    "deps": [
+    "async",
     "projectile"
    ],
-   "commit": "470a80c1d764a6e1680a2b41ca5a847869a07a27",
-   "sha256": "1nznbkl06cdq4pyqmvkp9jynsjibn0fd6ai4mggz6ggcwzcixbf0"
+   "commit": "e7bde6fec31b57ffe1c0a98cd29477d5baea30f3",
+   "sha256": "0ian50v9vaz7kqzn20bhqadq50h0l3zhjkmniinpz4q9klh7drh9"
   }
  },
  {
@@ -84764,14 +85069,14 @@
   "repo": "polymode/poly-rst",
   "unstable": {
    "version": [
-    20200316,
-    1315
+    20210418,
+    1009
    ],
    "deps": [
     "polymode"
    ],
-   "commit": "8530f56fbdce01bcf4004839ff54e4156282c2b5",
-   "sha256": "088wzagwxpf2j67wb1i6agqfa944sahh2fm8my2m50spbbd9ymhl"
+   "commit": "e71f2ae6a00683cdb8006f953e5db0673043e144",
+   "sha256": "1jhj1hrb998p9n6bjfdnmsinf0rd5wspm9gwsrdb0k6il897h7lf"
   },
   "stable": {
    "version": [
@@ -84875,11 +85180,11 @@
   "repo": "polymode/polymode",
   "unstable": {
    "version": [
-    20200606,
-    1106
+    20210413,
+    2004
    ],
-   "commit": "9f4fa7971634f560e83d44b30aefc4d76d261943",
-   "sha256": "1dp3688kj89r2ywv4zwrji2qv1b0y1cj3dwhzxx1ihb9vx0bjwjn"
+   "commit": "b50ec54097d279bde6567ee3ba8a22471f466ec0",
+   "sha256": "0q2vjvz72m3nrnpck4hl059cjgcf2jdw2rl9h8fxyvbllyj0733f"
   },
   "stable": {
    "version": [
@@ -85000,8 +85305,8 @@
     "yafolding",
     "yasnippet"
    ],
-   "commit": "91ca19b2a93029a393f8873e273777b553d308e1",
-   "sha256": "07sn00k8krsb0bikbbypznvwrk13k4jdk6d66iai0a66s9dr84ys"
+   "commit": "3c011744e81263dab6a4b20e96ad1d290ef9d320",
+   "sha256": "15ach67d9n8csbsabm6lhmhli9f397pjpf6vk1rn59bfqrhdakmn"
   },
   "stable": {
    "version": [
@@ -85178,15 +85483,16 @@
   "stable": {
    "version": [
     0,
-    6
+    6,
+    1
    ],
    "deps": [
     "dash",
     "flx-ido",
     "popup"
    ],
-   "commit": "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09",
-   "sha256": "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8"
+   "commit": "b00c4d503cbbaf01c136b1647329e6a6257d012c",
+   "sha256": "0q081lw6zqzpbmscpk1yzyfpalr9ld5qwh962dwwy04rc5f0aq3s"
   }
  },
  {
@@ -85337,11 +85643,11 @@
   "repo": "tumashu/posframe",
   "unstable": {
    "version": [
-    20210410,
-    528
+    20210423,
+    220
    ],
-   "commit": "ae3c4ddfce698f4e24a0fcab938267e41e74da90",
-   "sha256": "1agzfliz6vk9zwvl0gm074xwzlywqrhkva9nz3d3581cjfanxqd1"
+   "commit": "739d8fd1081bdd0d20dee9e437d64df58747b871",
+   "sha256": "1hapg4dwrpa1ffkx8s3pialkh9zsh3r5jxk076c750k9rdwl3q4m"
   },
   "stable": {
    "version": [
@@ -85432,14 +85738,14 @@
   "repo": "milkypostman/powerline",
   "unstable": {
    "version": [
-    20210317,
-    110
+    20210428,
+    1229
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "cfff1cfe63793ea1a8bcfcae50c296558384cf08",
-   "sha256": "12s3mp2dyslq1ilah64gpz7a2j0ca9yls7wvj9kcmjca1931s8s3"
+   "commit": "346de84be53cae3663b4e2512222c279933846d4",
+   "sha256": "00yy96a1rqcpbkvbn1hmb1pz5i7l0pwb2bqyxcc8qry7rkmvw7gy"
   },
   "stable": {
    "version": [
@@ -85620,11 +85926,11 @@
   "repo": "raxod502/prescient.el",
   "unstable": {
    "version": [
-    20210411,
-    2007
+    20210425,
+    1720
    ],
-   "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4",
-   "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w"
+   "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4",
+   "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n"
   },
   "stable": {
    "version": [
@@ -86253,14 +86559,14 @@
   "repo": "bbatsov/projectile",
   "unstable": {
    "version": [
-    20210407,
-    707
+    20210503,
+    738
    ],
    "deps": [
     "pkg-info"
    ],
-   "commit": "513228f473910128efcad13f46dfc22a74976675",
-   "sha256": "19yblhr88affwmlrfmf3bi7wypf2abgy56xfxgisvwx5d5xi6v25"
+   "commit": "4126799d94b6a9a4db22976d2dd6625323221359",
+   "sha256": "1wxv2fv680s89iz9dcxdz36l3mk9icspahh8s4mska7vi607qpzd"
   },
   "stable": {
    "version": [
@@ -86522,16 +86828,16 @@
   "repo": "waymondo/projector.el",
   "unstable": {
    "version": [
-    20190703,
-    1418
+    20210421,
+    1728
    ],
    "deps": [
     "alert",
     "cl-lib",
     "projectile"
    ],
-   "commit": "bad51a81fbcae9aabe47dafc2499ba27cd7308be",
-   "sha256": "0xiwn58wqm15kvbx0pi2zmh8gc1f06zncxki03bwry4nfpqxr2d0"
+   "commit": "7bbee0ef70817d52339119d4517dbbcbab930de6",
+   "sha256": "0zmng37fl8df1d3i66fbkjssv0x0hq74x68p1j01gb8sfayw4dgf"
   }
  },
  {
@@ -86664,11 +86970,11 @@
   "repo": "ProofGeneral/PG",
   "unstable": {
    "version": [
-    20210408,
-    1454
+    20210502,
+    1922
    ],
-   "commit": "d0acb626eba17023c55b002921870d60e48527a5",
-   "sha256": "0yn66lxx906nry53dr7msjfha2i85yiq2zw8g25d7y1f3mhjsjpz"
+   "commit": "c3505218ebb9b5c575b537c0f15736497a6c5700",
+   "sha256": "1vpmymgar4qn6zlkfwycrdp91iy86m6xhl43rd6awp6gh25b882g"
   },
   "stable": {
    "version": [
@@ -86771,19 +87077,19 @@
     20200619,
     1742
    ],
-   "commit": "ee04809540c098718121e092107fbc0abc231725",
-   "sha256": "053j9j2axr2x7837xcvfgmdl3ddbw2px3fzflbna52fnk9bh2wkc"
+   "commit": "5e84a6169cf0f9716c9285c95c860bcb355dbdc1",
+   "sha256": "0ixs95c1f98kmkq8kjv6mv0sj9phgqlb39imjzrn4mg4w92bilfn"
   },
   "stable": {
    "version": [
-    4,
-    0,
+    3,
+    16,
     0,
     -1,
-    2
+    1
    ],
-   "commit": "6c61c1e63b9be3c36db6bed19032dfc0d63aadda",
-   "sha256": "1910pnpy0mfzqga4mv52ybjfbxrbdflgb6nsh2vbpbpsv4jl58dq"
+   "commit": "7689f00ba8d1e818f2a8e7a4bf24577d9ccd5d84",
+   "sha256": "0r5k78m23jhcxxzhi2x6zz3dpglfx75f1zmkmdwpgc9y64kscckb"
   }
  },
  {
@@ -87627,15 +87933,15 @@
   "repo": "tumashu/pyim",
   "unstable": {
    "version": [
-    20210319,
-    1102
+    20210428,
+    2307
    ],
    "deps": [
     "async",
     "xr"
    ],
-   "commit": "f48c3edee78ba5f020bcb42830db99a14761f176",
-   "sha256": "1ld3bqvfrda6fa4dv3g0wilznrdrsv544sr370sn3a9xlmy4fwp9"
+   "commit": "9e9cee799e95f53bf2d0462260c70ce8f59ddf4d",
+   "sha256": "1yjvf6h7rr7f3h6sdk95w3c2709c7jh6dfnfb7p9y1aw18ar9pvc"
   },
   "stable": {
    "version": [
@@ -87675,21 +87981,39 @@
   }
  },
  {
-  "ename": "pyim-cangjie5dict",
-  "commit": "abad9b91bcf2dd29255a98ddcfd4b17d8847ecd5",
-  "sha256": "13sbbiqqpdplm36pa3zyqakbvlkvh7wvm7pmn0li6hnm56dwydg8",
+  "ename": "pyim-cangjiedict",
+  "commit": "a82ac773bb9bc36727314d1eb5a75610ec9ca694",
+  "sha256": "0ma99y1ijpdqrmypmj108ny7bfj9ylryav7hj7dnp9gj4b1bhxhh",
   "fetcher": "github",
-  "repo": "p1uxtar/pyim-cangjie5dict",
+  "repo": "p1uxtar/pyim-cangjiedict",
   "unstable": {
    "version": [
-    20170730,
-    246
+    20210429,
+    930
    ],
    "deps": [
     "pyim"
    ],
-   "commit": "c8618590780b818db1a67a29bc47c5d25903517a",
-   "sha256": "0p49h2kn8wy3b51zahzyc1cy24h3b44cg5yjpmv4w23dhsr4zlz8"
+   "commit": "87f3f9447750e74cdf9525d97621c56deafb2bbf",
+   "sha256": "0pk03gfrfhj2r82ghnr840bqr0ix14nhnl7hwg1g1v89jkphps84"
+  }
+ },
+ {
+  "ename": "pyim-smzmdict",
+  "commit": "8bad2e8162f5a44bdbe1117efa31133ae7814489",
+  "sha256": "104kxd8d2b7rch0pfsdz5w98rskx1sl6fx0lqspcilir9k9my1cc",
+  "fetcher": "github",
+  "repo": "p1uxtar/pyim-smzmdict",
+  "unstable": {
+   "version": [
+    20210429,
+    216
+   ],
+   "deps": [
+    "pyim"
+   ],
+   "commit": "9bfb8713543332a05c1d76fe755ab82b5ccbba51",
+   "sha256": "0s4s5rhrbpxlp7fimqd36pnbqpdpcfd12r5xxfrcni91f1apzlns"
   }
  },
  {
@@ -87700,14 +88024,14 @@
   "repo": "tumashu/pyim-wbdict",
   "unstable": {
    "version": [
-    20210111,
-    923
+    20210428,
+    558
    ],
    "deps": [
     "pyim"
    ],
-   "commit": "62a1bd8b6070463e872137cf8eba50122b180e2c",
-   "sha256": "03zh5sdqc32q8an8k59csc95sczcs38ganxrg3lp2i2vn5ykza7h"
+   "commit": "24ac59a7b622d1a50ecdc69f9944bd39838de22c",
+   "sha256": "0apnf289jzfz5bmn7acq9lf13nf05phncvhc3cz9milax834c3l4"
   },
   "stable": {
    "version": [
@@ -87779,8 +88103,17 @@
     20210411,
     1931
    ],
-   "commit": "38d15c98316359c7b0b190f2245a3b2e2bf62109",
-   "sha256": "1iipx981kz25iznb2p90a3cag71abw6np96r0mf99g44z8ghaapd"
+   "commit": "7cffd7ffeeaa64f57c7b617036d6d1ffd8756745",
+   "sha256": "080k3bm741338nj5d1f3rn9zn9pwaffbbgbyd20pmqh881v37m4m"
+  },
+  "stable": {
+   "version": [
+    2,
+    8,
+    2
+   ],
+   "commit": "091cb92314dc701f10390136da78fbbb362e892e",
+   "sha256": "13qiv3v8yc2b7sfvizlnx6xcam7yjicdkfjw00q50s5xqmali22p"
   }
  },
  {
@@ -87826,15 +88159,15 @@
   "repo": "dakra/pyramid.el",
   "unstable": {
    "version": [
-    20181212,
-    1204
+    20210427,
+    1032
    ],
    "deps": [
     "pythonic",
     "tablist"
    ],
-   "commit": "f0687b8aee3e685b55e2c66b16211e02ac5f9d94",
-   "sha256": "18kqqdk7yifcjmn11jgsqxvzr6izcgify1d8gm504sxw2qqc3q0i"
+   "commit": "66f54f4a9cc9fa81edf768ab433d5b3c5517363c",
+   "sha256": "0sijy6nk46yw21j49x5n93za2zjzqqrfmjm7dz3z3gj7jknk27i9"
   },
   "stable": {
    "version": [
@@ -88025,20 +88358,16 @@
     800
    ],
    "commit": "710ffadeb43136d400de0a4c9e4a94c8b7ff36f0",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 326 ms\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 558 ms\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 1272 ms\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 2702 ms\nerror: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503\n"
-   ]
+   "sha256": "1vym8nlpwv9ym7yixldjxp999b26a9pr4z0pka28fldxykfccwq0"
   },
   "stable": {
    "version": [
     6,
-    2,
-    3
+    3,
+    0
    ],
-   "commit": "a0a534639bc6142c2c2f44bd7ca5878ad5f79518",
-   "sha256": "0sj2hfjwpcdg9djsgl3y5aa3gnvl4s87477x6a9d14m11db3p7ml"
+   "commit": "906b0a107f7bcfe6e32bcfedb977e6f0f99fda59",
+   "sha256": "1vym8nlpwv9ym7yixldjxp999b26a9pr4z0pka28fldxykfccwq0"
   }
  },
  {
@@ -88371,8 +88700,8 @@
     "leaf",
     "quelpa"
    ],
-   "commit": "eacc544b93f6fdc3be69a6ffbf960380a63fc715",
-   "sha256": "0ka2qk1y7byrq4rbmyhr06kfgc76afpmpdcxk3nf4g3krgi778dw"
+   "commit": "cc13df4a6c6cdf1dea558be5b6e99b6e8d8b4065",
+   "sha256": "0jiwdz1psfkha17by281ii0adjschld0hwl439bawgvzpw1a0zi2"
   },
   "stable": {
    "version": [
@@ -88742,11 +89071,11 @@
   "repo": "istib/rainbow-blocks",
   "unstable": {
    "version": [
-    20171025,
-    1438
+    20210412,
+    1937
    ],
-   "commit": "dd435d7bb34ff6f162a5f315df308b90b7e9f842",
-   "sha256": "06yfb3i7wzvqrhkb61zib9xvpb5i00s4frizkzff66im05k0n795"
+   "commit": "ae5c11cd3dc64039c5e65c9f1804aceba5b3b209",
+   "sha256": "17ar9k2352h6cnvcknq945lna3illln87r1vf4ll1aa798azizpb"
   },
   "stable": {
    "version": [
@@ -88866,26 +89195,26 @@
   "repo": "Raku/raku-mode",
   "unstable": {
    "version": [
-    20200902,
-    2139
+    20210412,
+    2342
    ],
    "deps": [
     "pkg-info"
    ],
-   "commit": "8a6e17f1749c084251d19c3d58b9c1495891db6d",
-   "sha256": "1nxv5x9ywm9zzzl69ssvvxf0lphjqjfazf5qcd3qpv4w5rqa1s3b"
+   "commit": "7496ad3a03bed613c259405ec8839ae02950fdb1",
+   "sha256": "002pkw4wx6l64c1apg6n1psq4ckp9129yj3xqkjp68ji5nz2l3bw"
   },
   "stable": {
    "version": [
     0,
-    1,
+    2,
     0
    ],
    "deps": [
     "pkg-info"
    ],
-   "commit": "e0639c89a3a29e9196e298951da6c3a79fb944e8",
-   "sha256": "02zn1sm86srwdzdkhw53ll0h41a9hwh6c8lan72530zysjrm4x1i"
+   "commit": "7496ad3a03bed613c259405ec8839ae02950fdb1",
+   "sha256": "002pkw4wx6l64c1apg6n1psq4ckp9129yj3xqkjp68ji5nz2l3bw"
   }
  },
  {
@@ -89045,6 +89374,30 @@
    "sha256": "09c6v4lnv6vm2cckbdpx2fdi9xkz9l68qvhx35vaawxhrkgvypzp"
   }
  },
+ {
+  "ename": "rbs-mode",
+  "commit": "c8bd3d8bf771c4d5d45cf1e00a08d54941924357",
+  "sha256": "0cdd7sypbpgr9j5ydj17pqgdb2rfm2563rwyvi0p2k2xd305bcgb",
+  "fetcher": "github",
+  "repo": "ybiquitous/rbs-mode",
+  "unstable": {
+   "version": [
+    20210430,
+    135
+   ],
+   "commit": "fd766a943d5f1f0624e10ffce096b9aaba14a5f4",
+   "sha256": "1gl5wqdyaqvdv0557idycfzgr5gvzvlv11jwccq43v6dmvydam15"
+  },
+  "stable": {
+   "version": [
+    0,
+    3,
+    1
+   ],
+   "commit": "ad36bb138cec7396f029821d0cf755a8bc663260",
+   "sha256": "143wz47446dahp5zx9vvhjrqjadzgz4apzlvwhdbs7dgs8bgs7r7"
+  }
+ },
  {
   "ename": "rbt",
   "commit": "ca7241985be1e8a26a454b8136a537040b7ae801",
@@ -89183,14 +89536,14 @@
   "repo": "aaron-em/rcirc-styles.el",
   "unstable": {
    "version": [
-    20160207,
-    250
+    20210414,
+    1712
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "f313bf6a7470bed314b27c7a40558cb787d7bc67",
-   "sha256": "1kwn33rxaqik5jls66c2indvswhwmxdmd60n7a1h9siqm5qhy9d6"
+   "commit": "dd06ec5fa455131788bbc885fcfaaec16b08f13b",
+   "sha256": "116qvavvw72vkahknb7g7w7knaximw3m1pq6hic7h13xj8xqxz2w"
   },
   "stable": {
    "version": [
@@ -89266,14 +89619,14 @@
   "repo": "johnmastro/react-snippets.el",
   "unstable": {
    "version": [
-    20181002,
-    1046
+    20210430,
+    1510
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "87ccb640d265fe799583ab55605b84d113223694",
-   "sha256": "0zs78mn37ngy86blmp2xfy7jr5p0s6r0qq6z3z924amrhy5bwdqc"
+   "commit": "9d0a1bb90ac36c689cded48b661e81d4544fd719",
+   "sha256": "15vnybyvz18scladfqy1qj6vrwx1ac38ra8ymdg938aayvl57354"
   },
   "stable": {
    "version": [
@@ -89348,16 +89701,16 @@
   "repo": "realgud/realgud",
   "unstable": {
    "version": [
-    20210411,
-    1241
+    20210420,
+    953
    ],
    "deps": [
     "load-relative",
     "loc-changes",
     "test-simple"
    ],
-   "commit": "a854b8d4344e4606e77c7e73cc414991e53253d5",
-   "sha256": "0f5av8ldmh54cmqzniifl853mz9mdg6wn3i0wbm7v1m6d79nli88"
+   "commit": "962b5af40c8970d09581613d67b1a5d99eaa39e7",
+   "sha256": "1rpc0viymnm5jdrl16nmvsz0y8wnca03l0nhllwidyvazbf4x5zl"
   },
   "stable": {
    "version": [
@@ -89440,15 +89793,15 @@
   "repo": "realgud/realgud-lldb",
   "unstable": {
    "version": [
-    20190912,
-    1335
+    20210417,
+    1434
    ],
    "deps": [
     "load-relative",
     "realgud"
    ],
-   "commit": "47cb0178fdde50a9d9151ab45806b41007cd758a",
-   "sha256": "11vaiq7c4iaypsgs4x4sdfycjailba36qh0pwgdprmiyf8swy8hq"
+   "commit": "abffd0d2d23f6c87be5dc5d36e948af92de5df86",
+   "sha256": "1zjrjgs9vjaqsf5h9sxw1pf2f9sfngx1gxp37lb8myan52qmhlz1"
   },
   "stable": {
    "version": [
@@ -89744,11 +90097,11 @@
   "repo": "ncaq/recentf-remove-sudo-tramp-prefix",
   "unstable": {
    "version": [
-    20180205,
-    556
+    20210502,
+    436
    ],
-   "commit": "84bbac534cb114d8d11b86790435b65d36e99e68",
-   "sha256": "0lnnh28qax4qk9n9sng7sgb0w0mnjc8abnch3bd0ba9g5x28z8bx"
+   "commit": "82e788e2c8a6834ca3db7696d5e90ccabede7587",
+   "sha256": "197a4xskmv88rbl9pdznvc5gfxskfp3zrl9larjdn5fxpiy5jmcb"
   }
  },
  {
@@ -89807,15 +90160,11 @@
   "repo": "ideasman42/emacs-recomplete",
   "unstable": {
    "version": [
-    20210404,
-    716
+    20210418,
+    925
    ],
-   "commit": "802c85b02d99bce4cf540ed4b716eaa39df45c4a",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 301 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 505 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 1324 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 2228 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503\n"
-   ]
+   "commit": "ef800da3ff3112baa71ad20e84c752f7a56c90b9",
+   "sha256": "18m8djkbyykb6cxqayl2v3ap206jkng3w8ah6qr4bixqynkx4yg1"
   }
  },
  {
@@ -90768,8 +91117,8 @@
     20200901,
     1442
    ],
-   "commit": "abc307b965bf6720bc466281f2e204cd5ce37dc3",
-   "sha256": "0dv9was6ycwwyfabr8z71wcc3hbqnxgwbdqkdkx0iaccq2xyj07b"
+   "commit": "a97dcc486a54d947aa15eeaedaccb3481f14fd85",
+   "sha256": "0qxwmza21ys5ln8pb441a38sxm2gl29s46sf8hpyzaxcjvc6blvl"
   }
  },
  {
@@ -90787,8 +91136,8 @@
     "helm",
     "restclient"
    ],
-   "commit": "abc307b965bf6720bc466281f2e204cd5ce37dc3",
-   "sha256": "0dv9was6ycwwyfabr8z71wcc3hbqnxgwbdqkdkx0iaccq2xyj07b"
+   "commit": "a97dcc486a54d947aa15eeaedaccb3481f14fd85",
+   "sha256": "0qxwmza21ys5ln8pb441a38sxm2gl29s46sf8hpyzaxcjvc6blvl"
   }
  },
  {
@@ -90799,25 +91148,25 @@
   "repo": "simenheg/restclient-test.el",
   "unstable": {
    "version": [
-    20180106,
-    2046
+    20210422,
+    1815
    ],
    "deps": [
     "restclient"
    ],
-   "commit": "4518561bc9661fedacb6fb352e9677207f45c418",
-   "sha256": "0hbilpn77w0vykga9p4dkwaygipyna7mwn24y2kwfcahcr39pqjb"
+   "commit": "3c6661d087526510a04ea9de421c5869a1a1d061",
+   "sha256": "0bpvxv8bc671pa0sm4v8pqyla3i99y05mgpbgcjd8pdsfhiwjw7j"
   },
   "stable": {
    "version": [
     0,
-    2
+    3
    ],
    "deps": [
     "restclient"
    ],
-   "commit": "a21e41b905b423e762eeb4da3a236c8b1aea8c49",
-   "sha256": "1lan49723rpzg1q7w8x3iggazwl4zirq5l8nhpb8m5hmg21a4kih"
+   "commit": "3c6661d087526510a04ea9de421c5869a1a1d061",
+   "sha256": "0bpvxv8bc671pa0sm4v8pqyla3i99y05mgpbgcjd8pdsfhiwjw7j"
   }
  },
  {
@@ -91203,6 +91552,15 @@
    ],
    "commit": "d0cc3599129db735c23abe74d0876286a2fd6b6a",
    "sha256": "1g0na5zjsy4600jzi5zr752nggndbwkr6ihxcmq1w82w0b3600rv"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "commit": "9df603a5c63ae38ec776e27dc93d3618e2b0fabe",
+   "sha256": "1qp338v1cwlikkzclbnxy2i4g2lad88qc6aakmla9f8x22gvlpi1"
   }
  },
  {
@@ -91428,14 +91786,14 @@
   "repo": "dgutov/robe",
   "unstable": {
    "version": [
-    20210328,
-    1228
+    20210413,
+    2202
    ],
    "deps": [
     "inf-ruby"
    ],
-   "commit": "0bc2645d140f65215a42f2b9365f1983cc949c6c",
-   "sha256": "0ff8zminjpgyi2lp2pmjh7cc7bgb15hii2r89zmy5xkq47slr2j4"
+   "commit": "dcde67f020d0efff35b6db9863e4687c08f1b421",
+   "sha256": "17ssr9144lnk48iyb3qn797whmvs2s526svfgs554k7bc0vl2j6x"
   },
   "stable": {
    "version": [
@@ -91458,11 +91816,11 @@
   "repo": "kopoli/robot-mode",
   "unstable": {
    "version": [
-    20201208,
-    1959
+    20210425,
+    1925
    ],
-   "commit": "e8ca45ea811a4c6758fa1a086d8f89b8812653ca",
-   "sha256": "0iji80p1llvp93s42cgyffx0py9j1kjk3bjycajcy1hxsha240xl"
+   "commit": "e7e9c4d4750d048ad771fa735621ad813fa9c128",
+   "sha256": "127lydk66n90ih39q8gxzb44rss2xllb7bn3ygxrf5m5vvl9w5rj"
   }
  },
  {
@@ -92191,11 +92549,11 @@
   "repo": "rust-lang/rust-mode",
   "unstable": {
    "version": [
-    20210226,
-    1106
+    20210423,
+    1157
    ],
-   "commit": "e9e9e32c4f82a9b895543c120b327ab5536ec42b",
-   "sha256": "0f63lms4arkqj6161v2787dgfra23a01vi82s9dcylk9z6bqyz4v"
+   "commit": "494d59f92cbe12533eb89b202fc4f5342afcd543",
+   "sha256": "1g9hch2h3lqdx7ffabikl2ss98akhfpw5las6g5qwyj1l2lcrjbr"
   },
   "stable": {
    "version": [
@@ -92238,22 +92596,22 @@
   "repo": "brotzeit/rustic",
   "unstable": {
    "version": [
-    20210328,
-    1426
+    20210502,
+    1646
    ],
    "deps": [
     "dash",
     "f",
-    "ht",
     "let-alist",
     "markdown-mode",
+    "project",
     "s",
     "seq",
     "spinner",
     "xterm-color"
    ],
-   "commit": "07d4d9af2c169d6cce6e2117628dfa3192937fb0",
-   "sha256": "1hv059nac1czpv367bs42qqw8lf6phpbzbiyk90n6mq996cinwrq"
+   "commit": "ed68fd3bb410869e1a4ce3943b5913ea88d9b509",
+   "sha256": "0896m5ajlq90pp7ds6iw7plqkffm6k01v3rfqfhb3qwd92nxgcf0"
   }
  },
  {
@@ -92672,8 +93030,8 @@
    "deps": [
     "cider"
    ],
-   "commit": "27f35778de9509067716a7bed14306787334a589",
-   "sha256": "01a6cvk3ycg0z1qg30rqsnx49drmdfpgd78mhf2m6avvagzf8l9s"
+   "commit": "c813d94ee8d0a85dd33d0c5dbae832c24cf37e4f",
+   "sha256": "0r0c6h7nikb4181a06bs88sqnqa68jw2f550q2zz34khl7zpr2s6"
   },
   "stable": {
    "version": [
@@ -92696,11 +93054,11 @@
   "repo": "hvesalai/emacs-sbt-mode",
   "unstable": {
    "version": [
-    20210409,
-    1528
+    20210416,
+    1845
    ],
-   "commit": "9a6a8e47b657adeada41c445c9fcda301dbdb9b3",
-   "sha256": "1h8iqamz5crflhjpxfzgjxspwwkks8cp9m3bf4b42jqsffqkypnb"
+   "commit": "e29464a82bf706ef921f4e0052ce04fc74c34c84",
+   "sha256": "1r6n1hcpcy6icy8qs98gafqavmwx4z6v4rnknvrfnnynmrv2ajvr"
   },
   "stable": {
    "version": [
@@ -92723,8 +93081,8 @@
     20200830,
     301
    ],
-   "commit": "5078c5c5e22f509338d20b7ae448b2bbe02e08f9",
-   "sha256": "03brsgbhsaynjc8xp5wpmla6cf0v4r7qc5hg0jdbp2ihnwp17i2f"
+   "commit": "d9d4a9757b4616df755c2219dfcff451f4e3c0a2",
+   "sha256": "0i8p8y2c8dvrm5a5vk1a6vf6cgfyc3ah58w095qn94mjgcdg026m"
   }
  },
  {
@@ -92753,11 +93111,11 @@
   "repo": "hvesalai/emacs-scala-mode",
   "unstable": {
    "version": [
-    20210409,
-    1441
+    20210414,
+    1126
    ],
-   "commit": "6966328dbfcbd1dfb166ff46e5deb9a68379cdf1",
-   "sha256": "0pmix0km9b7r28jxh31ig1h5j9vvvz4871irzlavzn7kl3qiqwgw"
+   "commit": "598cb680f321d9609295aa9b4679040cc703b602",
+   "sha256": "0ryr6jhl0irhaii6cz9nlly8rn4c6h5pnax6xzn9iszl8f7xgphs"
   },
   "stable": {
    "version": [
@@ -93107,11 +93465,11 @@
   "repo": "ideasman42/emacs-scroll-on-drag",
   "unstable": {
    "version": [
-    20201013,
-    123
+    20210418,
+    1318
    ],
-   "commit": "ad94790492d0d66686f3457cea1caeba8bbbdc51",
-   "sha256": "1b725iz5xhqki33jydq9vrxvrbfraxq2q79jdbrjy548rbsxzyjf"
+   "commit": "157637ba6b6cbe7a21c57f9eefb8a94fffa0085e",
+   "sha256": "195ckjmh65z4qg1afs5acz66r6xvc2g91mfnncz12kv7p8bxwrxx"
   }
  },
  {
@@ -93122,11 +93480,11 @@
   "repo": "ideasman42/emacs-scroll-on-jump",
   "unstable": {
    "version": [
-    20210103,
-    2120
+    20210426,
+    1226
    ],
-   "commit": "69c86542a148222a7571506a2515fc52529d209d",
-   "sha256": "00qddxcax55pmfai7083w08mgz6c3876jb5p7fas4j5h417c09yb"
+   "commit": "30dc5f5e50fa702eb65756304f0fe406daec2397",
+   "sha256": "02w52rcs8gkf58yig55wn6198b7g6zy6ppp5mjh7k1l07cf2kmay"
   }
  },
  {
@@ -93527,11 +93885,11 @@
   "repo": "raxod502/selectrum",
   "unstable": {
    "version": [
-    20210411,
-    1153
+    20210423,
+    1822
    ],
-   "commit": "35665560c217fc7c39ec7ef006edc6d556a4d3cf",
-   "sha256": "1w2iiparzs88z2zg8ylqdidgn6qb73x68hjl53yfqqgvrz8krs2f"
+   "commit": "c68c7f6c21877b09734a8543fee363cf2fbbecf4",
+   "sha256": "1g8y6wkmn8j5gjd37i344xmyln6x13jlry9pxdwq3kwkwzkznznm"
   },
   "stable": {
    "version": [
@@ -93550,15 +93908,15 @@
   "repo": "raxod502/prescient.el",
   "unstable": {
    "version": [
-    20210411,
-    2007
+    20210425,
+    1720
    ],
    "deps": [
     "prescient",
     "selectrum"
    ],
-   "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4",
-   "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w"
+   "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4",
+   "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n"
   },
   "stable": {
    "version": [
@@ -93735,15 +94093,28 @@
   "repo": "twlz0ne/separedit.el",
   "unstable": {
    "version": [
-    20210403,
-    1354
+    20210420,
+    1527
    ],
    "deps": [
     "dash",
     "edit-indirect"
    ],
-   "commit": "588a5dba2b38e57b88870efbc0cd2482202f28c8",
-   "sha256": "1m3kb6lvdr8manvlvi2avhba94lw16lvxy9p7vksk1gsmdmkgc0j"
+   "commit": "424b0f260a1bca20cd9359c42a0bc64a1a5e1928",
+   "sha256": "1i85mbnh6ijycsgxiknzvkimxag72cxg8asg3d1g4bakv3gp32rr"
+  },
+  "stable": {
+   "version": [
+    0,
+    3,
+    0
+   ],
+   "deps": [
+    "dash",
+    "edit-indirect"
+   ],
+   "commit": "424b0f260a1bca20cd9359c42a0bc64a1a5e1928",
+   "sha256": "1i85mbnh6ijycsgxiknzvkimxag72cxg8asg3d1g4bakv3gp32rr"
   }
  },
  {
@@ -93754,11 +94125,11 @@
   "repo": "brannala/sequed",
   "unstable": {
    "version": [
-    20210315,
-    2012
+    20210417,
+    28
    ],
-   "commit": "50c5dca413a12fe2d8a89eae833f10967c2f38d2",
-   "sha256": "16hsjk04xw88ddr2gbwlb4v8didqmk7ffwphp1iqy3a02wf4kif6"
+   "commit": "b28e20bf3e0ec7c56c705632e38ab842083d9c49",
+   "sha256": "09bw3kjr32z8hlhrczl8i3h4yavdcmfx6bk7qxsyhn1f0vmskh03"
   }
  },
  {
@@ -94211,21 +94582,6 @@
    "sha256": "1fw2qn88b84v0fkaigyyipyvvhhllkw1s1h6fgv2xl2h19i8r0gd"
   }
  },
- {
-  "ename": "shell-command",
-  "commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1",
-  "sha256": "01nviashfr64wm78zi3vrqrqdqgsamp76d9kasxv0b7fqmfx7yjk",
-  "fetcher": "github",
-  "repo": "emacsorphanage/shell-command",
-  "unstable": {
-   "version": [
-    20090830,
-    1040
-   ],
-   "commit": "7e22125f746ce9ffbe9b0282d62f4b4bbbe672bd",
-   "sha256": "1my2i26a03z8xyyacsnl5wdylnbhhvazn23bpy639d3l4x4l7jzw"
-  }
- },
  {
   "ename": "shell-current-directory",
   "commit": "edcb78c3491a5999b39a40087b7f991c2b737e30",
@@ -94331,11 +94687,11 @@
   "repo": "DamienCassou/shell-switcher",
   "unstable": {
    "version": [
-    20161029,
-    552
+    20210501,
+    604
    ],
-   "commit": "28a7f753dd7addd2933510526f52620cb5a22048",
-   "sha256": "1x7rrf56hjasciim8rj29vfngwis4pr3mhclvxd4sbmhz9y66wm0"
+   "commit": "b16b4bdb54d807c5557f3fe95491bc611741eb37",
+   "sha256": "03fmryw522lh31jnrab8kclzzj3b1v0lr105a5qqalqh4srj6nq3"
   },
   "stable": {
    "version": [
@@ -94531,8 +94887,8 @@
     20210329,
     149
    ],
-   "commit": "8bab3dc89d36b55ba26ae5941f294c57805d24b2",
-   "sha256": "15kp2lsfci6p8wkrda12m4vf12p13xd9x5rh3ypc6yvz1snypgyy"
+   "commit": "a395147050674ff88f03a6ac354a84ccbdc23f1e",
+   "sha256": "1gpbmnfxc5z2nm03d5989z8mb91wlq8788vvsl9kf2yl8s4fg5a0"
   }
  },
  {
@@ -94718,15 +95074,15 @@
   "repo": "chenyanming/shrface",
   "unstable": {
    "version": [
-    20210321,
-    844
+    20210502,
+    1350
    ],
    "deps": [
     "language-detection",
     "org"
    ],
-   "commit": "a73268705e3558ee91dc05674c5c3bed7fe28202",
-   "sha256": "1jjs0pclv0ya4d65wzafkvgb7lmg7f13jj0pihs1ch507fyiw3gp"
+   "commit": "fb0fee03dfbebc21f2b9ce142764d04479cfaa58",
+   "sha256": "1m3kf8730brldx6l59xv92m9946aqb2b42pgjj8bl0l1x757ijk5"
   },
   "stable": {
    "version": [
@@ -94927,11 +95283,11 @@
   "repo": "rnkn/side-notes",
   "unstable": {
    "version": [
-    20210201,
-    724
+    20210502,
+    935
    ],
-   "commit": "3993e8de44c141420efbec3cdb4c5620b862a200",
-   "sha256": "1ivm2xr7mc8hp7g1l6l3a4mm5byn2cp7m6bv2g222997xbpk0il5"
+   "commit": "ca73cec33880322c5bbab407825d502d87f4cf0f",
+   "sha256": "1qnrk8kib4rndgbljqxq7cmskgxwcc9d8wdbdr3mgkgbg08xv5gq"
   },
   "stable": {
    "version": [
@@ -95575,15 +95931,15 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20210214,
-    2243
+    20210430,
+    1239
    ],
    "deps": [
     "cl-lib",
     "macrostep"
    ],
-   "commit": "68c58c0194ff03cd147fcec99f0ee90ba9178875",
-   "sha256": "0lammq7116hm79nldxlghi978m7bldccfdc9vy1rlfjj4mhnrlq0"
+   "commit": "a4c9c4cc5318fa0f023089755f81f2d2d2281d9b",
+   "sha256": "1ah15zagmsd65qfiwspcb0l2frza05iq4dw7hcrdlyqpx5rmhpd9"
   },
   "stable": {
    "version": [
@@ -95638,28 +95994,28 @@
   "repo": "cl-docker-images/slime-docker",
   "unstable": {
    "version": [
-    20210124,
-    2145
+    20210426,
+    1422
    ],
    "deps": [
     "docker-tramp",
     "slime"
    ],
-   "commit": "903470fe3860402794a4f268c1efffd44a30f273",
-   "sha256": "089yskdbkr7k25sns5vms7f0hqdbpnjg3ih95nhia1nghxcqj482"
+   "commit": "c7d073720f2bd8e9f72a20309fff2afa4c4e798d",
+   "sha256": "03jm0964qqggqia2fkvqgrx8r4knj1qgqr8vimr0x4q2j73lj12a"
   },
   "stable": {
    "version": [
     0,
     8,
-    2
+    3
    ],
    "deps": [
     "docker-tramp",
     "slime"
    ],
-   "commit": "903470fe3860402794a4f268c1efffd44a30f273",
-   "sha256": "089yskdbkr7k25sns5vms7f0hqdbpnjg3ih95nhia1nghxcqj482"
+   "commit": "c7d073720f2bd8e9f72a20309fff2afa4c4e798d",
+   "sha256": "03jm0964qqggqia2fkvqgrx8r4knj1qgqr8vimr0x4q2j73lj12a"
   }
  },
  {
@@ -96007,11 +96363,11 @@
   "repo": "malsyned/smart-dash",
   "unstable": {
    "version": [
-    20201202,
-    1616
+    20210427,
+    1709
    ],
-   "commit": "b4a298572e7acc3f39a908997fdcfa356bac0591",
-   "sha256": "1lkld9g53064wz2m3xxpjpf8vs75fa8kxxnvgpipvzq55sl1j9v7"
+   "commit": "bc740889dd81e7dc8a90a33d1f075f21aba9b2d3",
+   "sha256": "0kadfyvvzfk66d5k263j8cykqh9lbwrdqizs2mag6ahnadpahhyy"
   }
  },
  {
@@ -96100,14 +96456,14 @@
   "repo": "Malabarba/smart-mode-line",
   "unstable": {
    "version": [
-    20190527,
-    1156
+    20210428,
+    1641
    ],
    "deps": [
     "rich-minority"
    ],
-   "commit": "999be065b195f2eddb4e1b629f99038d832d44b7",
-   "sha256": "0jyvyn7pkqvyyv1rga3i10f4cwfbb0miacbib8lsrrhayrnal186"
+   "commit": "744ee1a9479a7901cedd6f0d59e6c6c86b20a78d",
+   "sha256": "18bf6f5yd8gympf5z8fs904qnjjdijapxpincjbpiyb2429yb34a"
   },
   "stable": {
    "version": [
@@ -96154,8 +96510,8 @@
     "powerline",
     "smart-mode-line"
    ],
-   "commit": "999be065b195f2eddb4e1b629f99038d832d44b7",
-   "sha256": "0jyvyn7pkqvyyv1rga3i10f4cwfbb0miacbib8lsrrhayrnal186"
+   "commit": "744ee1a9479a7901cedd6f0d59e6c6c86b20a78d",
+   "sha256": "18bf6f5yd8gympf5z8fs904qnjjdijapxpincjbpiyb2429yb34a"
   },
   "stable": {
    "version": [
@@ -96778,15 +97134,15 @@
   "repo": "SpringHan/sniem",
   "unstable": {
    "version": [
-    20210410,
-    1115
+    20210503,
+    659
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "7518cf3e1d6ca67e9ee8d9d1e930e1866f460c92",
-   "sha256": "05ncmknzrqsx8l3c1r3lm4b810m6hnrixbbzkik2brnyzqpqfphj"
+   "commit": "aef9dcb8b007c59525100fb989c7f8fc6dec71cf",
+   "sha256": "10fp0wlwla4y94kvl5ajk3jxvcr9k01y2s1f7q3fj1lr31zh7c6f"
   }
  },
  {
@@ -97178,11 +97534,11 @@
   "repo": "mssola/soria",
   "unstable": {
    "version": [
-    20210201,
-    1830
+    20210426,
+    1433
    ],
-   "commit": "f765f193ccaf4ad438e1d9be842efd2f4394efa4",
-   "sha256": "1p6kzsci8hgccpjcy6swwa6yk741l6ay48rb35gmf03j04abszm0"
+   "commit": "12d3472e6823ff1bdc1591984367e2ed769afcb7",
+   "sha256": "1vyg73svawi8g1mq6v5y5g9hw0vnks2nhbwdkbn6d53b7bcr0hpx"
   },
   "stable": {
    "version": [
@@ -97381,16 +97737,15 @@
   "repo": "nathankot/company-sourcekit",
   "unstable": {
    "version": [
-    20180101,
-    834
+    20210430,
+    2155
    ],
    "deps": [
     "dash",
-    "dash-functional",
     "request"
    ],
-   "commit": "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781",
-   "sha256": "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n"
+   "commit": "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c",
+   "sha256": "18pv1hcilj7kndr7a29jjskp21khh1sd0wy01h8y8y9mf70kikg6"
   },
   "stable": {
    "version": [
@@ -97706,11 +98061,11 @@
   "repo": "condy0919/spdx.el",
   "unstable": {
    "version": [
-    20210306,
-    1600
+    20210415,
+    1821
    ],
-   "commit": "b9f49bab9551e8ca1232582acffdd0a90aaa35f3",
-   "sha256": "0k9dlkxns8yhv1yzfjlr5gkfc26ihhqjfsjchqg9fvfxqnd39pic"
+   "commit": "86c223a2db529768fd815dc0635ed432c1a215e8",
+   "sha256": "1bz6186w83xmajnw489dc1la7b6gly9vrp40mh58gknk5fjdx86w"
   }
  },
  {
@@ -97837,15 +98192,11 @@
   "repo": "ideasman42/emacs-spell-fu",
   "unstable": {
    "version": [
-    20210328,
-    413
+    20210415,
+    1326
    ],
-   "commit": "c566ed568aae0a73202a51e97a73c5e4af0053d2",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 265 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 703 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 1251 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 2299 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503\n"
-   ]
+   "commit": "fae15427a1027e5eafdff7e5627cd399f73dbc37",
+   "sha256": "05xarav1dw4315rh4qchvf6p9vsdyg09nm9rc6k657n4r8ip725c"
   }
  },
  {
@@ -98429,11 +98780,11 @@
   "repo": "srfi-explorations/emacs-srfi",
   "unstable": {
    "version": [
-    20210325,
-    445
+    20210502,
+    1549
    ],
-   "commit": "633a0ff419438987f6271ff5a5da26307950a3cd",
-   "sha256": "070p4wyphhm7115afvq7lhxkb69c7l7fz3q5nkwbpjsdp5s8isns"
+   "commit": "688d55eeaedef9f95a123db130bfb456c94c587d",
+   "sha256": "0n633q3jv0l2klxf590lp9a3dy0wpmh37xl0fii9afsvaydrdww7"
   },
   "stable": {
    "version": [
@@ -98546,11 +98897,11 @@
   "repo": "jhgorrell/ssh-config-mode-el",
   "unstable": {
    "version": [
-    20210401,
-    243
+    20210428,
+    1752
    ],
-   "commit": "6d4f8d12c6a7e7ff776271f3656be5f3ba5a784e",
-   "sha256": "1pxpm24rlrrdzmy129c6naz9zxfsjrk6hgx3qcizd25kq86sfy4g"
+   "commit": "4e5c9bf04394438a6256ea7b320df3b0ed129fe6",
+   "sha256": "19ls9cm4bswxp5zfwxf7mdpf0gcmnpqi8vzyw94j5hmakx89l3kz"
   }
  },
  {
@@ -98857,16 +99208,16 @@
     20200606,
     1308
    ],
-   "commit": "6af99af232c90d1629ac71be500eef2241245c81",
-   "sha256": "03wl804pacmzr2gjdz6ssq0l03hs68hadlgjdn6hinp2k0r90pxw"
+   "commit": "68f949852ab7f0e8bb52c6a6fc2ece2a74ded824",
+   "sha256": "129mms7gd0kxqcg3gb2rp5f61420ldlhb0iwslkm7iv64kbxzww1"
   },
   "stable": {
    "version": [
     1,
-    0
+    1
    ],
-   "commit": "11aa5944459e464a96f41d934e23da5320c13333",
-   "sha256": "0nc388hi362rks9q60yvs2gbbf9v6qp031c0linv29wdqvavwva1"
+   "commit": "68f949852ab7f0e8bb52c6a6fc2ece2a74ded824",
+   "sha256": "129mms7gd0kxqcg3gb2rp5f61420ldlhb0iwslkm7iv64kbxzww1"
   }
  },
  {
@@ -98907,11 +99258,11 @@
   "repo": "motform/stimmung-themes",
   "unstable": {
    "version": [
-    20210331,
-    1140
+    20210430,
+    839
    ],
-   "commit": "0dc71ec178c3dab8973c90758fa730c70df01554",
-   "sha256": "0glp3h5anrsvm89zs99gdyp3rpc0g41va30nxw5pn02yv7cqz7hd"
+   "commit": "eac0f54da5ff116622a6448b68057b45c337f2de",
+   "sha256": "0b7glyq3z98vi7f79zg0phqm6ibc30lq2m4mwy22gg0941rr2zja"
   }
  },
  {
@@ -99339,30 +99690,6 @@
    "sha256": "1d4yda1vv1sfjc36b5aaf811jmlcifc8labglmkx1xvjmc7bggsp"
   }
  },
- {
-  "ename": "sudden-death",
-  "commit": "3f20f389a2d7ddf49ca64d945b41584a7c120faf",
-  "sha256": "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh",
-  "fetcher": "github",
-  "repo": "yewton/sudden-death.el",
-  "unstable": {
-   "version": [
-    20180217,
-    23
-   ],
-   "commit": "791a63d3f4df192e71f4232a9a4c5588f4b43dfb",
-   "sha256": "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps"
-  },
-  "stable": {
-   "version": [
-    0,
-    2,
-    1
-   ],
-   "commit": "791a63d3f4df192e71f4232a9a4c5588f4b43dfb",
-   "sha256": "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps"
-  }
- },
  {
   "ename": "sudo-edit",
   "commit": "3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e",
@@ -99783,6 +100110,36 @@
    "sha256": "1d45yanqk4w0idqwkrwig1dl22wr820k11r3gynv7an643k4wngp"
   }
  },
+ {
+  "ename": "sway",
+  "commit": "4c2d1eec09d5f69fbec99c6d190cc78882d8a74c",
+  "sha256": "00jysn6x6n54xpj6vwrp582p001bjbkjilqs4gsxs5r829cr3zyw",
+  "fetcher": "github",
+  "repo": "thblt/sway.el",
+  "unstable": {
+   "version": [
+    20210501,
+    2201
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "8a4d9cc1a469efa707cf67b57b752f28547e331e",
+   "sha256": "0x5w3f07dsgbl7qlcqpmpm3831lrv5jx59g7xnv25giwc3w21d2d"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    4
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "8a4d9cc1a469efa707cf67b57b752f28547e331e",
+   "sha256": "0x5w3f07dsgbl7qlcqpmpm3831lrv5jx59g7xnv25giwc3w21d2d"
+  }
+ },
  {
   "ename": "sweet-theme",
   "commit": "a149448c38504bdf6f782a10cb1440da9102990f",
@@ -99855,15 +100212,15 @@
   "stable": {
    "version": [
     0,
-    2
+    3
    ],
    "deps": [
     "dash",
     "lsp-mode",
     "swift-mode"
    ],
-   "commit": "661e6fe419948419da4abf916b193b331b80a3be",
-   "sha256": "08w9h12y54aj2q6k48p9fglacppb5mlqh18h43n45hd7rcph3j93"
+   "commit": "ed36ea3d8cd80159f7f90b144c4503411b74ae3e",
+   "sha256": "0bcrnslqhgz122mv6br6w848a3x3g4jkz1pkdpb4726xssfzz8zk"
   }
  },
  {
@@ -99880,20 +100237,20 @@
    "deps": [
     "seq"
    ],
-   "commit": "fd3c824c3622aef4ad29983667f34ebad91e9f69",
-   "sha256": "1s60j7778n8vl53capi1bs5mbb1g2vwaaa4y7wdv6ajrlxh95a5x"
+   "commit": "ad12a3025156873995318b6a0480cd2459063bf7",
+   "sha256": "1cr484b8pixnk9rk2046wiq7i05r3sr6wmk0qiad1vibzlynz83q"
   },
   "stable": {
    "version": [
     8,
-    1,
-    1
+    2,
+    0
    ],
    "deps": [
     "seq"
    ],
-   "commit": "e65a80a659c74d0a62b00dff183a0f7fc8385ce1",
-   "sha256": "18i6m2zys0nc9j29f7bkzjcfp7rcaycr473ykhprsfikfcgwkj3y"
+   "commit": "fd3c824c3622aef4ad29983667f34ebad91e9f69",
+   "sha256": "1s60j7778n8vl53capi1bs5mbb1g2vwaaa4y7wdv6ajrlxh95a5x"
   }
  },
  {
@@ -99904,8 +100261,8 @@
   "repo": "michael.sanders/swift-playground-mode",
   "unstable": {
    "version": [
-    20190730,
-    1707
+    20190717,
+    2223
    ],
    "deps": [
     "seq"
@@ -99964,8 +100321,8 @@
    "deps": [
     "ivy"
    ],
-   "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245",
-   "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36"
+   "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc",
+   "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8"
   },
   "stable": {
    "version": [
@@ -100225,14 +100582,14 @@
   "repo": "wolray/symbol-overlay",
   "unstable": {
    "version": [
-    20210118,
-    807
+    20210422,
+    2110
    ],
    "deps": [
     "seq"
    ],
-   "commit": "5bcd6d7e3f3b6501ccec3e6c378f33f7e7488c99",
-   "sha256": "10n0871xzycifyqp73xnbqmrgy60imlb26yhm3p6vfj3d84mg1b2"
+   "commit": "4231a36e39b7393d639e9cdef19f311d780deeab",
+   "sha256": "0q2x39s3g5kmjf5q47qpqcnzdscnj112dfd7qqb2z0iq0sh2nbrd"
   },
   "stable": {
    "version": [
@@ -100280,8 +100637,8 @@
   "repo": "countvajhula/symex.el",
   "unstable": {
    "version": [
-    20210408,
-    1839
+    20210416,
+    353
    ],
    "deps": [
     "evil",
@@ -100293,8 +100650,8 @@
     "seq",
     "undo-tree"
    ],
-   "commit": "feaf6d847bbff6642cd3c4926899eee3cbac261b",
-   "sha256": "1k4b8aqwglgavj3rsjj0macmppjsgb5ykpl388434crn067rlfpz"
+   "commit": "3af93352a522bf8b88841a0d7114789a11741bb2",
+   "sha256": "1rrhzq9kixvvjjlb8xan5dd3g9jpygl83l77sl9r5ddv0flg6ali"
   },
   "stable": {
    "version": [
@@ -100672,11 +101029,11 @@
   "repo": "fritzgrabo/tab-bar-echo-area",
   "unstable": {
    "version": [
-    20210315,
-    1609
+    20210424,
+    1927
    ],
-   "commit": "d2ff6b1acb553bf1546e730640397b9e33ca5279",
-   "sha256": "1agjb68bjfjzgacrip2mjwzfdbvj3xn8cs3f6q5kdjg5v7lg9c9h"
+   "commit": "c60fceca7f0e7e400e4d660b23e6c64b178d9a06",
+   "sha256": "11h14wp0c30wc0y0y9qp5r9gwma09wl54bg0a1vxn037llwnfiv1"
   }
  },
  {
@@ -100687,14 +101044,14 @@
   "repo": "fritzgrabo/tab-bar-groups",
   "unstable": {
    "version": [
-    20210321,
-    2129
+    20210419,
+    2057
    ],
    "deps": [
     "s"
    ],
-   "commit": "b83315c9a63ba2f6bbeaaa449a3b78b84a87ec1c",
-   "sha256": "03pc85g5f5ys0s45ccg3z7dni4cxngs3532xf9ng94a421yhxmkr"
+   "commit": "509b3a3909b074faa9677509de0becb9cc054a37",
+   "sha256": "1bnhxzbpk7xi0vi5m2mwwss97pzhwbxqn6k59028ibwxs3hvaq1c"
   }
  },
  {
@@ -100941,11 +101298,11 @@
   "repo": "11111000000/tao-theme-emacs",
   "unstable": {
    "version": [
-    20201222,
-    602
+    20210417,
+    626
    ],
-   "commit": "468ee4f6ba7afb9dbfc8855ae2c333cb16ca4408",
-   "sha256": "0yqibx6wcdsj5k6130c3qp0hmj6zwhfjrrvw98lny23ksw6k0s3s"
+   "commit": "d5ccf6f53d65e80083acdfb0bced6bcd678c6ea9",
+   "sha256": "1wgk0xngamwgh242wfmxizi5r1ji5dxmr8s542g3p7rgfv5w0qs8"
   },
   "stable": {
    "version": [
@@ -100965,11 +101322,11 @@
   "repo": "saf-dmitry/taskpaper-mode",
   "unstable": {
    "version": [
-    20210310,
-    1632
+    20210415,
+    1322
    ],
-   "commit": "d6edb345f31a13918d603d44b90a4ce30b34632b",
-   "sha256": "0jx095yjpsh28r6a23w2fxqv0rysbwz49c22vri2s8hzw011m55p"
+   "commit": "1c0028d6c406cf4884e6aa35313e82041b7e857f",
+   "sha256": "0gv1iychm7xzdf99l1kiyvqfdhl9s8g900jjq7bj2kkd3r3c22ki"
   },
   "stable": {
    "version": [
@@ -101156,28 +101513,28 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20210409,
-    2343
+    20210429,
+    1950
    ],
    "deps": [
     "rainbow-identifiers",
     "visual-fill-column"
    ],
-   "commit": "88e10161e1aa2a7c83ebc41ba8492d84d8e64e26",
-   "sha256": "010jlhbidl3vny9z4dp4mhix827p2aa76ja2v822sdlszcb8vh9x"
+   "commit": "cc3c22a22e02a5606407d70e76ec221d5ec82533",
+   "sha256": "0j0zrravv4whakzgxvprisyxnlpcbmdywljq5vnvww2j1f75vwj7"
   },
   "stable": {
    "version": [
     0,
     7,
-    22
+    24
    ],
    "deps": [
     "rainbow-identifiers",
     "visual-fill-column"
    ],
-   "commit": "3ed57544faf0fdd17dd8762126466b15dc471f8f",
-   "sha256": "1frljw1gipsr9l6cpb1skwi5b566x9yx3dhcc7bxfq11inh7bc74"
+   "commit": "9187e6e3d903474645f3e64806bc62ef687ec205",
+   "sha256": "1ra04cp49zzx8vy8aswd00l46ixyc44sxh1s3nw880b4ywzxmc6j"
   }
  },
  {
@@ -101295,20 +101652,20 @@
   "repo": "clarete/templatel",
   "unstable": {
    "version": [
-    20210327,
-    2307
+    20210425,
+    2215
    ],
-   "commit": "dd7e76919f36da9f8efe7f9e3d84098f3c7c6644",
-   "sha256": "0apv1r756d984a47d9pvqzgcs652fdwy3swf4js9dki3nzljy756"
+   "commit": "3ee3761d9dd30b1c6af74dc393d43b9a91a75951",
+   "sha256": "1c58m2x4frwqxbi8n884c4l69pfwzdxsrig8p35y7mbywlwf1s2l"
   },
   "stable": {
    "version": [
     0,
     1,
-    5
+    6
    ],
-   "commit": "971153aa43addf88bfe0922bcac19cb0edd3f86d",
-   "sha256": "0ldb01sxzrvchjy160karvmksinicw3d14jazriy84dxks8i6w8a"
+   "commit": "8374097a129b2cd13c449568f95ee7380b36b307",
+   "sha256": "03n7amd2mfr4jmc4s1ar5ckm86knr7qarxxlkdhbnw3svy5kbc57"
   }
  },
  {
@@ -101419,22 +101776,22 @@
  },
  {
   "ename": "term-alert",
-  "commit": "0d77aee0b1b2eb7834436bdfa339f95cb97da140",
-  "sha256": "02qvfhklysfk1fd4ibdngf4crp9k5ab11zgg90hi1sp429a53f3m",
+  "commit": "8bcf021a68579f1b9c02dc959c525de0c6ca1fb0",
+  "sha256": "1hk1gzszqc3ijzarzi9d5hiw8ya19qp5jyb7alnsx7sn9pw6a612",
   "fetcher": "github",
-  "repo": "CallumCameron/term-alert",
+  "repo": "calliecameron/term-alert",
   "unstable": {
    "version": [
-    20161119,
-    945
+    20210414,
+    1638
    ],
    "deps": [
     "alert",
     "f",
     "term-cmd"
    ],
-   "commit": "1166c39cc3fb1cb7808eb8955b7f9f6094a306cd",
-   "sha256": "1hbyiwqv9waynf8gm3c717mph0p9mfi2x1wfpvdzzr25r0fz8xr0"
+   "commit": "ca1b48ad911bc972b049f48fe0531e702dbc553c",
+   "sha256": "0jnv1011y521pc4rrjyrv1la6r1q2sb120lxf1nbns17wv86d0cd"
   },
   "stable": {
    "version": [
@@ -101452,21 +101809,21 @@
  },
  {
   "ename": "term-cmd",
-  "commit": "e08ea89cf193414cce5073fc9c312f2b382bc842",
-  "sha256": "0pbz9fy9rjfpzspwq78ggf1wcvjslwvj8fvc05w4g56ydza0gqi4",
+  "commit": "8bcf021a68579f1b9c02dc959c525de0c6ca1fb0",
+  "sha256": "0jcn77hcjykvd1778948pj2qr03n1w4q8alz50gnlwg3y031y92y",
   "fetcher": "github",
-  "repo": "CallumCameron/term-cmd",
+  "repo": "calliecameron/term-cmd",
   "unstable": {
    "version": [
-    20160517,
-    1045
+    20210417,
+    1447
    ],
    "deps": [
     "dash",
     "f"
    ],
-   "commit": "552aa58965aab9b78e46934462bafe54c0396ffb",
-   "sha256": "0l5xk8npc23c716fjckd65xq83hjwnvpyxixc9brxfz4ybngzwhy"
+   "commit": "281b9a6d864ca85dc1451dc46baca98f48dc3f60",
+   "sha256": "1knijk9l8ipb882h8awwx18lh3q1yy13dyjp5gm36nw06212qxx2"
   },
   "stable": {
    "version": [
@@ -101764,11 +102121,11 @@
   "stable": {
    "version": [
     1,
-    0,
-    1
+    1,
+    0
    ],
-   "commit": "d609290021ea7f2d10caadffc9131663838f8ad4",
-   "sha256": "1gvydmi37d7jxibn7nfg1rhb6phfn3kgrlmq250g7321g15j1q3v"
+   "commit": "77181c75cbde5954542688659cd4f2352ed29fbe",
+   "sha256": "1bcwja7hm11hxd1nmf1z93hkzcvkkpxavvbivg6j336ygzr1r82g"
   }
  },
  {
@@ -102247,18 +102604,18 @@
     20200212,
     1903
    ],
-   "commit": "9c6323483c9feaa9ffba8ceb98f54281733ed50c",
-   "sha256": "0qjx9arygjh7h3wjrfcwc7jw1jxah2jf6wfinprv7b6jg1n8k6vy"
+   "commit": "e7c2e64c404b5cba6b27948ffaf36b56992e4580",
+   "sha256": "0mshmbbl3v3f0qjmw9g1z5pkr2183j091wxr8nc1ksr28y2q6vnr"
   },
   "stable": {
    "version": [
     2021,
+    5,
     3,
-    15,
     0
    ],
-   "commit": "6d68811e7ee75f8e0b450b9b1778bfad2c44c715",
-   "sha256": "16yixl9qq6zh47zjnad9rv2vbjq936ms212j0wfdax7qhg094af8"
+   "commit": "5d2501709782c10358b73c85d8911880d34c7fa3",
+   "sha256": "022sgd9hsgmqr586xmzdbzmxfqaq69ps2ghq430h4ad992wanvkz"
   }
  },
  {
@@ -102314,20 +102671,20 @@
    "deps": [
     "haskell-mode"
    ],
-   "commit": "4f7bbb325631968d6e7b82b25ece810959d4b87f",
-   "sha256": "1p4w48zz25fym40l3wijr06qfd4drhkynbhf2nx2yh766yv8icmg"
+   "commit": "ce6d01ac1f41b9121e414cfcf6253cbbff4c034e",
+   "sha256": "0i12lswqpdfnbmq7q4vdds33qkm4f4lyh02c27y82c74aymh81d0"
   },
   "stable": {
    "version": [
     1,
     7,
-    2
+    4
    ],
    "deps": [
     "haskell-mode"
    ],
-   "commit": "223b0f4388dce62c82eb2fb86cf1351d42aef198",
-   "sha256": "0k93i9smhw5bws2xiybha15g26mwyq0zj6xzxccwh0bfpl76xzqq"
+   "commit": "652d7a4e374d3c171278e6bdfccfa41c7621d4d3",
+   "sha256": "11590ifnh9ynwcfv31f5m59wr6ckrm3xi2g40wvk4ddxslj4yxnh"
   }
  },
  {
@@ -102338,8 +102695,8 @@
   "repo": "ananthakumaran/tide",
   "unstable": {
    "version": [
-    20210327,
-    1928
+    20210412,
+    1650
    ],
    "deps": [
     "cl-lib",
@@ -102348,14 +102705,14 @@
     "s",
     "typescript-mode"
    ],
-   "commit": "ad6fa78911d5d7e85c0851c0c1afc01f3cbde7c1",
-   "sha256": "1b815gxmn31x5b59mmlv5di72mz3vdm19crrpcnvb18vl2ak2vw3"
+   "commit": "ccff099e94beda9f5378ffc2b412cb4257111e8d",
+   "sha256": "17fb6zkz5d568151ypw8jkhnpikcrpwn3kc2w1mm9hs2g3hbigid"
   },
   "stable": {
    "version": [
     4,
-    0,
-    2
+    2,
+    3
    ],
    "deps": [
     "cl-lib",
@@ -102364,8 +102721,8 @@
     "s",
     "typescript-mode"
    ],
-   "commit": "dafb6befd83e5eea2e2c7f79ab89bc4877001b6d",
-   "sha256": "1n2dihpl53a48jis3l4rry581wpr5lxjd433drlkaa4lqgx8cw67"
+   "commit": "2a3ac4f38472d66e2d8a6bbe5dadb52bc008acbd",
+   "sha256": "1fj2fghiycnzds2zxfxgj1d9mdzsvs9rvl9bwy2f1vwawqk1m48w"
   }
  },
  {
@@ -102726,10 +103083,10 @@
   "repo": "snosov1/toc-org",
   "unstable": {
    "version": [
-    20210323,
-    1256
+    20210421,
+    657
    ],
-   "commit": "c4c61c5a382f94a3a4537e254243006dec2dcca4",
+   "commit": "df4ad6ff15e3b02f6322305638a441a636b9b37e",
    "sha256": "00a2al7ghrlabf65kfj1mk30p2pl37h6ppwlgghbgiy7rwlzkdbm"
   },
   "stable": {
@@ -102824,8 +103181,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "74e1fcbeca25734235afec9c6a4d0cf73736b62c",
-   "sha256": "0yrcsr4360v222klahbccfq3vb4kp5xdsibydwircv36xhxplzq3"
+   "commit": "2d76365d2aa13543121d5c623df465adb68b76f7",
+   "sha256": "1n247g5dq73rkxf0wys5lsbvma44y5qlh577s3rcx7l0yrylwdry"
   }
  },
  {
@@ -103124,8 +103481,8 @@
    "deps": [
     "w32-ime"
    ],
-   "commit": "809215eccfe8ff33d461c7ff980ed64c621a84bb",
-   "sha256": "1915v2x45cx9ydb53aw98da00wmqymn96af0wan9k46527ck54lg"
+   "commit": "92591f7c0b94f8b1875f1078d1ba3be40848f0b8",
+   "sha256": "0r5cmj8ih8n7m37fqwyymmd0swyxr6g124cw9cz24ri0dyiwi73k"
   },
   "stable": {
    "version": [
@@ -103193,8 +103550,8 @@
     20201101,
     1045
    ],
-   "commit": "e67e2d1149ebf3e79cd2162e78802af3ed5f82da",
-   "sha256": "0jrpa8kndq2v69nr9jva970q0n3662x2g0chg89nd2d3gbv693mw"
+   "commit": "2f70aa236878d9c3726c31d6ba922e2d7076951d",
+   "sha256": "1fi0qc8qbcgkjjvi5iysifammqcc6nwcrwjhwi713zykd5cir180"
   },
   "stable": {
    "version": [
@@ -103297,20 +103654,20 @@
   "repo": "magit/transient",
   "unstable": {
    "version": [
-    20210315,
-    1902
+    20210426,
+    2141
    ],
-   "commit": "cc16a5eaa73617a281b0bbf71b24432c38994e30",
-   "sha256": "15ah0h7i96wn4w5321gydr6pxahb8mc8dk58b9paqv06klp5q2cd"
+   "commit": "6ceddc4d8c7a3c13d78c459213c796d2c19234c6",
+   "sha256": "0dhz5ca9i83vgi3pvkbvwanxbi1ibzwbmnhm8ymxdvzn508rlswl"
   },
   "stable": {
    "version": [
     0,
     3,
-    0
+    2
    ],
-   "commit": "9ca983bab26d1a8e189a8c44471d9575284b268d",
-   "sha256": "0g694ydmb9zjn99hxgfjd3m73kpmnkbrgqhr73b4crbxza5sl29c"
+   "commit": "162698aa9d40ecafefcb1af7bdf602954d766970",
+   "sha256": "1766hdqzg95k62nqhadfv502mpnjlx1l59ppqmc6r0las82dc6a8"
   }
  },
  {
@@ -103671,8 +104028,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20210411,
-    1031
+    20210422,
+    2011
    ],
    "deps": [
     "ace-window",
@@ -103684,8 +104041,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32",
-   "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik"
+   "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf",
+   "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9"
   },
   "stable": {
    "version": [
@@ -103721,8 +104078,8 @@
     "all-the-icons",
     "treemacs"
    ],
-   "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32",
-   "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik"
+   "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf",
+   "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9"
   }
  },
  {
@@ -103733,15 +104090,15 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20210107,
-    1251
+    20210419,
+    1753
    ],
    "deps": [
     "evil",
     "treemacs"
    ],
-   "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32",
-   "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik"
+   "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf",
+   "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9"
   },
   "stable": {
    "version": [
@@ -103770,8 +104127,8 @@
    "deps": [
     "treemacs"
    ],
-   "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32",
-   "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik"
+   "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf",
+   "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9"
   },
   "stable": {
    "version": [
@@ -103802,8 +104159,8 @@
     "pfuture",
     "treemacs"
    ],
-   "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32",
-   "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik"
+   "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf",
+   "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9"
   },
   "stable": {
    "version": [
@@ -103835,8 +104192,8 @@
     "persp-mode",
     "treemacs"
    ],
-   "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32",
-   "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik"
+   "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf",
+   "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9"
   },
   "stable": {
    "version": [
@@ -103868,8 +104225,8 @@
     "perspective",
     "treemacs"
    ],
-   "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32",
-   "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik"
+   "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf",
+   "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9"
   }
  },
  {
@@ -103887,8 +104244,8 @@
     "projectile",
     "treemacs"
    ],
-   "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32",
-   "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik"
+   "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf",
+   "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9"
   },
   "stable": {
    "version": [
@@ -103994,20 +104351,20 @@
   "repo": "ianpan870102/tron-legacy-emacs-theme",
   "unstable": {
    "version": [
-    20210315,
-    712
+    20210420,
+    1201
    ],
-   "commit": "4d543fbb9cb2098af1be0f5b10e1e4cd5245a9d0",
-   "sha256": "0fyprvi4s331r6a54xa4dljw0k330kiyhzcfnnjhbsqxc86264pz"
+   "commit": "e7d16ebe4a824e7d7766fb34ffe4ea3b002f3d23",
+   "sha256": "15njpd9923rl07lq4mxs611glgnw3qyr21wk6xak6n1cminvy81g"
   },
   "stable": {
    "version": [
     2,
-    5,
+    6,
     0
    ],
-   "commit": "cdc052b044448654109bfb7d9b3d8bbfcf49042d",
-   "sha256": "0q1i2q6pkld8rz938yj9g68a55041d9vnps05nn4v1l8rx1x8jif"
+   "commit": "74e0cf066392c6fa99327e42b24caf4ed2fc414f",
+   "sha256": "1vc50y7a248f0b4bk6mawb6f7n5dd6skrln8asall2m834bzzg37"
   }
  },
  {
@@ -104886,15 +105243,11 @@
   "repo": "ideasman42/emacs-undo-fu",
   "unstable": {
    "version": [
-    20200701,
-    1435
+    20210418,
+    920
    ],
-   "commit": "7cbc3f852bcc1a22ce279cf36c89328841692493",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 296 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 553 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 1293 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 2555 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503\n"
-   ]
+   "commit": "e0ad06b5ef2ac2733dad2ad48e3957b5c36edfa5",
+   "sha256": "0xix4ghri62xdqlh48pydhih1zsnfsy7ncrk6w2wrnz4fa033pia"
   }
  },
  {
@@ -104905,15 +105258,11 @@
   "repo": "ideasman42/emacs-undo-fu-session",
   "unstable": {
    "version": [
-    20210407,
-    326
+    20210418,
+    920
    ],
-   "commit": "b2d8874bc8ce892a6702b4136626bd65e0ad7760",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 283 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 562 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 1339 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 2016 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503\n"
-   ]
+   "commit": "243d93b4c7c1224e7067cd323f64d23dfdfe7c0e",
+   "sha256": "1gdx6kir0a0v7q2ai59miibch9hccqlnx2y88qswfpqr9pf7z6vm"
   }
  },
  {
@@ -105778,11 +106127,11 @@
   "repo": "ideasman42/emacs-utimeclock",
   "unstable": {
    "version": [
-    20210124,
-    138
+    20210418,
+    1050
    ],
-   "commit": "d4b2014c5684b33ff73b4940bdff7b1138c1f85d",
-   "sha256": "00cx125pq6jad1v8pxq016hzg6wz1d06l4pc6z9r60l89y2m9hm2"
+   "commit": "21e74953a88ea5a0a17b86a951bf649dc9a0eaf4",
+   "sha256": "14hn22ld61l4w4livl83fjf4w59kzwn9qy2pc94p05qpgp8x2hy8"
   }
  },
  {
@@ -105858,15 +106207,15 @@
   "repo": "damon-kwok/v-mode",
   "unstable": {
    "version": [
-    20200823,
-    535
+    20210425,
+    411
    ],
    "deps": [
     "dash",
     "hydra"
    ],
-   "commit": "d97fb8de5ab19359029dec1195f3d5b87aeb27b1",
-   "sha256": "1rhk9bcrn43gv0cz92cbvhhjvbifyq7lkdg3hcrla87b2dm4rp3l"
+   "commit": "96ca8dad3a3a402a44bf9066591fe27fa2e4fd9a",
+   "sha256": "08n577b8xr1pv2mdzqzdbkd5j0pih7zd4z4p5y5w4hq72mcid43q"
   }
  },
  {
@@ -106000,11 +106349,11 @@
   "repo": "arthurgleckler/validate-html",
   "unstable": {
    "version": [
-    20210131,
-    1704
+    20210420,
+    2344
    ],
-   "commit": "39890f7d00579954a660fc3b1c0195231325efd6",
-   "sha256": "0xb1gnf0f408z9p6iscb9g5c5xj2d460gyzk1mr0wjm847b9cs42"
+   "commit": "748e874d50c3a95c61590ae293778e26de05c5f9",
+   "sha256": "0b2b5dm85jwgkqvga23r3vfya07vxv2n7a3a6r1pxpk8asqlw41c"
   }
  },
  {
@@ -106263,14 +106612,14 @@
   "repo": "justbur/emacs-vdiff",
   "unstable": {
    "version": [
-    20201103,
-    1427
+    20210426,
+    155
    ],
    "deps": [
     "hydra"
    ],
-   "commit": "007e44be19d068fd6b49874b6e9b8df8b1f552bd",
-   "sha256": "197xrwph1llrzjgkhlvagiwdgfp68pb45w5afg89ndahpqc2725s"
+   "commit": "84b8243d9f5d8082b05794dbc998d43dbdd7676a",
+   "sha256": "0lv9d9g8lnc3rzqi4v9iqr1ck5df8d52yh81cxzy7x2375b2mfgm"
   },
   "stable": {
    "version": [
@@ -106487,20 +106836,20 @@
   "repo": "federicotdn/verb",
   "unstable": {
    "version": [
-    20210402,
-    1621
+    20210429,
+    2113
    ],
-   "commit": "f9e69bf42eb8108aeee020ed3f58f456e042967f",
-   "sha256": "1hycs3aaqw6ss3ccbjd8p3fpb4aslm9hk3b9cwqnz4lxcxvqbfvj"
+   "commit": "a6e46f436495fb54ba57832450995425ad8dbc26",
+   "sha256": "0zm3ks1j60vdm9fqspa06fcgcz5mmz1pz4fgr21q001bi3wg8vfq"
   },
   "stable": {
    "version": [
     2,
-    13,
-    1
+    14,
+    0
    ],
-   "commit": "91827971f655936d8a8df95c9d2f39eaee667c97",
-   "sha256": "1bvvj25shkasy4b14ifkvh195w401xggmhjkflld5frzp7pm6zvp"
+   "commit": "0d7f7d36f6ae8130a9bd40845f156a3e3b30eb49",
+   "sha256": "1bpfxfgq5q022rx592wkigj5chq8ihry8lgrni4rsqbbmbrc1h4b"
   }
  },
  {
@@ -106984,19 +107333,19 @@
   "repo": "joostkremers/visual-fill-column",
   "unstable": {
    "version": [
-    20210404,
-    2152
+    20210419,
+    857
    ],
-   "commit": "6854932d7fe689caf5cbc1ab65271fcfd46590bd",
-   "sha256": "02ijylplnv8qzh6r2ci6h4sdm61vn0d2iajmbqyn91hs0695661j"
+   "commit": "6fa9e7912af412533aec0da8b8f62c227f9f3f54",
+   "sha256": "1wfww6bqdphv871in80fc84ml8gkl04il6w51z2ycx99km8b723l"
   },
   "stable": {
    "version": [
     2,
-    2
+    4
    ],
-   "commit": "68784162d758fbe6a91d04e9caa8f05683fb6ba9",
-   "sha256": "1wjb4zm9mx07v0qx2fxmclg4pg0ssgnf8lp89wc56kmc0s40jhii"
+   "commit": "6fa9e7912af412533aec0da8b8f62c227f9f3f54",
+   "sha256": "1wfww6bqdphv871in80fc84ml8gkl04il6w51z2ycx99km8b723l"
   }
  },
  {
@@ -107007,14 +107356,14 @@
   "repo": "benma/visual-regexp.el",
   "unstable": {
    "version": [
-    20190414,
-    814
+    20210502,
+    2019
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "3e3ed81a3cbadef1f1f4cb16f9112a58641d70ca",
-   "sha256": "12p3rlhdphwmx1kxsjzcl2wj3i6qgpvw8iwhg1whs6yqgaxivixd"
+   "commit": "48457d42a5e0fe10fa3a9c15854f1f127ade09b5",
+   "sha256": "1z2cz6f8ymzrb7fdmw6824y7n5y7rmac5ljl03a6csdhp1yz5c2z"
   },
   "stable": {
    "version": [
@@ -107189,11 +107538,11 @@
   "repo": "jcs-elpa/vs-dark-theme",
   "unstable": {
    "version": [
-    20201025,
-    1148
+    20210427,
+    727
    ],
-   "commit": "3d087e1c48872b5b623ac72c85a9bd3d80ec02cd",
-   "sha256": "1j326w78drqsr4bxq2sjfnf3ax3hwk1k63flbqj8vfq5w1pc5iy0"
+   "commit": "5a826e6ea3e9edd9241e3253ce97333955c8ae1a",
+   "sha256": "0q94crd6m6m000gjxwv92jz9rphmnr5wg7jzf6yig1hlhfqjgw9v"
   },
   "stable": {
    "version": [
@@ -107212,11 +107561,11 @@
   "repo": "jcs-elpa/vs-light-theme",
   "unstable": {
    "version": [
-    20201025,
-    1148
+    20210427,
+    727
    ],
-   "commit": "4e6501118bafb62ecfca8797b6c6d81310d95fd2",
-   "sha256": "17n9c6fj70rgrc63g72vdxnv8xjnqa6w0rrvh6ih3z2xmky91b2a"
+   "commit": "e324120248c1d513a6516edff250d161f876aad9",
+   "sha256": "1jw9cbbvm76ijvcrkkn27r3n6qw14jxbirdc0bryv4k12yiwla9m"
   },
   "stable": {
    "version": [
@@ -107250,20 +107599,20 @@
   "repo": "ianpan870102/vscode-dark-plus-emacs-theme",
   "unstable": {
    "version": [
-    20210331,
-    1541
+    20210430,
+    819
    ],
-   "commit": "3c349f64ff8f12348b865b8c6896db05386cdc49",
-   "sha256": "0f2dlgjczy45dygyw6was5m74fldrbf3l29bss370qcaj3h2bm3z"
+   "commit": "24c4cb28042b3b9cc8f4e5294d7597f986aa6fae",
+   "sha256": "0b85sm6n2ahyyj220k5mqd5ar3x8204p0cfxjyhlk2f989jvfm3i"
   },
   "stable": {
    "version": [
-    1,
-    5,
+    2,
+    0,
     0
    ],
-   "commit": "c64d5f7088f1295df0bd8f1dc87a532e00647fbe",
-   "sha256": "09a6plb2dqayj4m456ldh43a654jbkg8zjiky7bkj5m0kpdc5426"
+   "commit": "41772165b3b1195a7e86747ea5b316b16be4c7ef",
+   "sha256": "1vcaqvhdgr91pr7kqskbscs8awm8jp6dkh79h6w36i9ipmc4l4hl"
   }
  },
  {
@@ -107432,20 +107781,21 @@
   "repo": "d12frosted/vulpea",
   "unstable": {
    "version": [
-    20210329,
-    605
+    20210503,
+    624
    ],
    "deps": [
     "org",
     "org-roam",
     "s"
    ],
-   "commit": "b394b82cb463f67932dae0fbe3a67daa4d647ea6",
-   "sha256": "0ssh12jrqfk7llfcfdf6dn9pq0hiqi5f7zp75v1j56qfpijzcbl0"
+   "commit": "c4f39b853c54cbfab48876812012e040b56838ee",
+   "sha256": "1dgmxbdvyb9vdha2swg4ahai6xvfvlr7d03y3c2c3db2jbr00aw5"
   },
   "stable": {
    "version": [
     0,
+    1,
     1
    ],
    "deps": [
@@ -107453,8 +107803,8 @@
     "org-roam",
     "s"
    ],
-   "commit": "4088c95bdd64ca1afbc59bacee571c7260988175",
-   "sha256": "03kynwkl4q91xz9wsmyx8g3aqgls1r8p5dxhixg586sr9xr4xck0"
+   "commit": "c4f39b853c54cbfab48876812012e040b56838ee",
+   "sha256": "1dgmxbdvyb9vdha2swg4ahai6xvfvlr7d03y3c2c3db2jbr00aw5"
   }
  },
  {
@@ -107524,11 +107874,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20210409,
-    626
+    20210420,
+    1048
    ],
-   "commit": "8bab3dc89d36b55ba26ae5941f294c57805d24b2",
-   "sha256": "15kp2lsfci6p8wkrda12m4vf12p13xd9x5rh3ypc6yvz1snypgyy"
+   "commit": "a395147050674ff88f03a6ac354a84ccbdc23f1e",
+   "sha256": "1gpbmnfxc5z2nm03d5989z8mb91wlq8788vvsl9kf2yl8s4fg5a0"
   }
  },
  {
@@ -107837,19 +108187,20 @@
   "repo": "bnbeckwith/wc-mode",
   "unstable": {
    "version": [
-    20200108,
-    1841
+    20210418,
+    47
    ],
-   "commit": "79107d1130e8be3e1db4619373b98045b4fd9033",
-   "sha256": "01icd63mb2hg1bgbmkq3jm8kc3ic8whfy2awcgx53zqkmyz87qxc"
+   "commit": "63be1433b8a63cdc3239cc751e36360429c42b51",
+   "sha256": "1wzgb4z2qyyv223x5fc7ff2fn5xpz4s7lr1q1y33q8878a7w9d45"
   },
   "stable": {
    "version": [
     1,
-    4
+    4,
+    1
    ],
-   "commit": "79107d1130e8be3e1db4619373b98045b4fd9033",
-   "sha256": "01icd63mb2hg1bgbmkq3jm8kc3ic8whfy2awcgx53zqkmyz87qxc"
+   "commit": "63be1433b8a63cdc3239cc751e36360429c42b51",
+   "sha256": "1wzgb4z2qyyv223x5fc7ff2fn5xpz4s7lr1q1y33q8878a7w9d45"
   }
  },
  {
@@ -108141,14 +108492,14 @@
   "repo": "emacs-love/weblorg",
   "unstable": {
    "version": [
-    20210410,
-    421
+    20210430,
+    2251
    ],
    "deps": [
     "templatel"
    ],
-   "commit": "66bf957ace451ad0140e77d2fea235aefcd9ae26",
-   "sha256": "0qjrwpdi1zg8xbi9xnq5kpiw8dns1g899jh9vrsfqmkvr9vsm220"
+   "commit": "11ec801222eeb468878e6585efb55721592dbfe8",
+   "sha256": "01ipk5fwx5phsd6kr7kvdckhd19hly4szwlwl1a0jaxy0ab6iv54"
   },
   "stable": {
    "version": [
@@ -108327,11 +108678,11 @@
   "repo": "jstaursky/weyland-yutani-theme",
   "unstable": {
    "version": [
-    20210331,
-    1857
+    20210426,
+    2101
    ],
-   "commit": "998c171becf2e589e65aae0283ebfee90c03d6df",
-   "sha256": "18zbawhrv9904frg686hlvqr4zqx62ay85igrwm8fr41wipxxhz6"
+   "commit": "ba042c41554cb46593ef67b40a5523487cf9c6f6",
+   "sha256": "1k2fyy8kdlpb9vqqm0izxjwqqh84ih78wkc2xpmck771a5xzggf8"
   }
  },
  {
@@ -108511,10 +108862,10 @@
    "version": [
     3,
     5,
-    1
+    2
    ],
-   "commit": "c0608e812a8d1bc7aefeacdfaeb56a7272eabf44",
-   "sha256": "1g07i6hyv9glhk6xq1z9vn81vi2f0byy7dp3rg4gw22sm6f6d1al"
+   "commit": "5fb30301cb3b4fca5a0e1ce8ec1ef59290b79199",
+   "sha256": "1wgygby4zwlbx6ry6asraaixl169qdz092zgk1brvg63w7f8vkkb"
   }
  },
  {
@@ -108660,19 +109011,19 @@
   "repo": "lassik/emacs-whois",
   "unstable": {
    "version": [
-    20200715,
-    1715
+    20210429,
+    805
    ],
-   "commit": "11d01c483ab3ba78b6ea1e195bda65b5e35f2d4c",
-   "sha256": "14w1cchij7i8a9m9z71dsz76aphidmvp8lbai4gaxxi4qiyvkcn3"
+   "commit": "6ce65ec5c992b1e1cb538610f1c3708e9d467c39",
+   "sha256": "0cz5c0zy4lz0534nfr2xf7p0d09ppcfdmry4335gx19vz47fj60n"
   },
   "stable": {
    "version": [
     0,
-    2
+    3
    ],
-   "commit": "7cc7e2734ec823bed6eb923387b3b33a1cde0c86",
-   "sha256": "0d8q8as85fjn2v65i25xv9bzg03mlk4jhxrbqrcg5ywjiv5i2ljg"
+   "commit": "6ce65ec5c992b1e1cb538610f1c3708e9d467c39",
+   "sha256": "0cz5c0zy4lz0534nfr2xf7p0d09ppcfdmry4335gx19vz47fj60n"
   }
  },
  {
@@ -109012,27 +109363,27 @@
   "repo": "bmag/emacs-purpose",
   "unstable": {
    "version": [
-    20210411,
-    1700
+    20210423,
+    454
    ],
    "deps": [
     "imenu-list",
     "let-alist"
    ],
-   "commit": "dc4f8a00a8b0c1cf6242e1bf47f82e08c508a51e",
-   "sha256": "0h5s448dgpqi24fpmkbalw4w96jf9ny5gar8qjw0kqmcfxxny9b0"
+   "commit": "1a556294131a78b557f88bd28d42b43d5c6bd79a",
+   "sha256": "15v3225irmgg6zsv4h3zyqrbcgx9kbr6rzx5v5hgf9h16fgibi8j"
   },
   "stable": {
    "version": [
     1,
-    7
+    8
    ],
    "deps": [
     "imenu-list",
     "let-alist"
    ],
-   "commit": "a302340e183d20baa4445858d321f43449298829",
-   "sha256": "1dpy8hkjn87wbdkzyabhay4jx4dgc0ab2flyf0rjq1qaazk393sc"
+   "commit": "8f84defbb4d80ecaada37a2bbde2c1d8699f98af",
+   "sha256": "1bq0s56wj6ibyh625zfnisy8yniz72dpg4mcgq55azsbnd4fblqq"
   }
  },
  {
@@ -109211,8 +109562,8 @@
     20210405,
     1410
    ],
-   "commit": "4b4a8f05401bd08092518ddccdf35461f1124f5a",
-   "sha256": "16aknbzmh3a4lb0bzkljl70yx8v8g74vfji4h4iqvx013vwvqyp2"
+   "commit": "c67784cc0c44dc7c590f1f1f5a979a36b1e8c11d",
+   "sha256": "0pisq1b2yjfplv64xn33lw38ymmpr8wah84pfnwvzqnlfsn5s1hs"
   }
  },
  {
@@ -109253,11 +109604,11 @@
   "repo": "magit/with-editor",
   "unstable": {
    "version": [
-    20210319,
-    1930
+    20210427,
+    1244
    ],
-   "commit": "ebcbd3b137154e6c5a2b976bacbb89d48ddfa242",
-   "sha256": "0qir7kzvnlchpvmpl8gj11yqly6j5m260mmxny9xxwx0dzwaya4k"
+   "commit": "86bdff68a106bc9d383fdab3bbf1ad4b703a52f0",
+   "sha256": "1rk8vza2g8gxybhjk10xj3pw9whc80cs9qv4avyv926g7dw60as9"
   },
   "stable": {
    "version": [
@@ -109580,8 +109931,8 @@
   "repo": "abo-abo/worf",
   "unstable": {
    "version": [
-    20210309,
-    1513
+    20210429,
+    1645
    ],
    "deps": [
     "ace-link",
@@ -109589,8 +109940,8 @@
     "swiper",
     "zoutline"
    ],
-   "commit": "fff12d4d3bb1ddf70cd0abb78aecd9133b367990",
-   "sha256": "1fbi0rv9pvh9bf72fjc3pfql9xfnw7zif0rsw0r2gn4sdn7202id"
+   "commit": "7ed797cacf8949928b97bc0fab0bf0f80931b055",
+   "sha256": "0yp2z5j7vqjfk7s3pid44y2ygccvpgqxazzly3z9q4swjw59p5j8"
   },
   "stable": {
    "version": [
@@ -109630,11 +109981,11 @@
   "repo": "pashinin/workgroups2",
   "unstable": {
    "version": [
-    20210402,
-    1450
+    20210426,
+    1223
    ],
-   "commit": "b182bf853ec408de014ba35527177c7cab90d620",
-   "sha256": "11rmv6wc7brw1la73y9dvmmx2pqaxxwm4087qkgr9vjg5h02k67d"
+   "commit": "1d9de2d23ff4ebb61964b399a19bdb460cadd32f",
+   "sha256": "18hh6v15fjixjain9br26jdysdph4c1bb3wq9q1wmq62wb9x8n9d"
   },
   "stable": {
    "version": [
@@ -109740,20 +110091,20 @@
   "repo": "bnbeckwith/writegood-mode",
   "unstable": {
    "version": [
-    20180525,
-    1343
+    20210418,
+    110
    ],
-   "commit": "b71757ec337e226909fb0422f0224e31acc71733",
-   "sha256": "038gliy6l931r02bf2dbhmp188sgk1rq46ngg9nhf5q5rkf3pi8p"
+   "commit": "ed42d918d98826ad88928b7af9f2597502afc6b0",
+   "sha256": "1nwngnddlkcvix7qx39fadab7hqzg8snb0k63kwpr8v57lyrm48z"
   },
   "stable": {
    "version": [
     2,
     0,
-    3
+    4
    ],
-   "commit": "b71757ec337e226909fb0422f0224e31acc71733",
-   "sha256": "038gliy6l931r02bf2dbhmp188sgk1rq46ngg9nhf5q5rkf3pi8p"
+   "commit": "ed42d918d98826ad88928b7af9f2597502afc6b0",
+   "sha256": "1nwngnddlkcvix7qx39fadab7hqzg8snb0k63kwpr8v57lyrm48z"
   }
  },
  {
@@ -109894,11 +110245,11 @@
   "repo": "ag91/writer-word-goals",
   "unstable": {
    "version": [
-    20210405,
-    1155
+    20210503,
+    656
    ],
-   "commit": "77435ca396e7cc2685f4962e959070dbe1f70db1",
-   "sha256": "0kblcf1qfa06bwqm6pwwdmmpcipn3yjcjw09hmryipzhgf97zfxa"
+   "commit": "ef94f78b2c4e4fcf1a59d492637cbc84396cb032",
+   "sha256": "0xf2nvwvag21ds566r90rlf98hf80mz3zj2svhwmqrj6nm70p6z3"
   }
  },
  {
@@ -109979,26 +110330,26 @@
   "repo": "skeeto/x86-lookup",
   "unstable": {
    "version": [
-    20210409,
-    2313
+    20210412,
+    2022
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "5e194fdac8a1e12d87b8ed4edeb887eb5543c34d",
-   "sha256": "0f76qsb8hiryfgwkpymw5sicbmz1p48s0dxai1fmjlvaimrw56mm"
+   "commit": "1573d61cc4457737b94624598a891c837fb52c16",
+   "sha256": "16y13bwsfx4mm8p1n09f4443kh03hl7jvfvkbwdrm6dlbywiqq8m"
   },
   "stable": {
    "version": [
     1,
     2,
-    0
+    1
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "609b2ba70dc5a246ac9b4b5f89eb5ef4331519bf",
-   "sha256": "19zgq7mcc3wx847xc911fibvphbsws99m2l3k54xdjp8mb5qfdzm"
+   "commit": "1573d61cc4457737b94624598a891c837fb52c16",
+   "sha256": "16y13bwsfx4mm8p1n09f4443kh03hl7jvfvkbwdrm6dlbywiqq8m"
   }
  },
  {
@@ -110099,11 +110450,11 @@
   "repo": "xahlee/xah-math-input",
   "unstable": {
    "version": [
-    20210403,
-    2312
+    20210419,
+    1833
    ],
-   "commit": "bc1ff04a11be7c3b728aa012324377305d48e087",
-   "sha256": "0q9civwf4mxapmq6hzrf3wimc7pfp28yipx007abchwimpdxvwws"
+   "commit": "6ccd3ca21aa71a2c1f831fabbdfc9e32c02e180d",
+   "sha256": "1bibdx0sawgsdzdiivy4x7rf4s5hnz2ypllwz9sk2fdmjyv8d08c"
   }
  },
  {
@@ -110560,11 +110911,7 @@
     1123
    ],
    "commit": "8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 322 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 540 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 1079 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 2268 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503\n"
-   ]
+   "sha256": "07i9x2f1mgfr3d5v507ln5z8mh59zdzqv53yyyrcbhvr7j9vi1p3"
   }
  },
  {
@@ -110859,8 +111206,17 @@
   "repo": "zkry/yaml.el",
   "unstable": {
    "version": [
-    20210406,
-    156
+    20210424,
+    2033
+   ],
+   "commit": "d0abc17e3ddf42624d87fa6d2d3e1ba1dd175035",
+   "sha256": "19937d26gvj5ir1absb8rxyv35ac85xwvgb0nqcldmnqxqa2h66p"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    1
    ],
    "commit": "d8ac09e8cad7f67339e19c53e77da1cd0ff98d36",
    "sha256": "0wkrvhb5yhb38sf7w1njxij1x0pfxp56hn97j2bk4w58dz94fxir"
@@ -111108,11 +111464,11 @@
   "repo": "emacsorphanage/yascroll",
   "unstable": {
    "version": [
-    20210108,
-    1826
+    20210427,
+    645
    ],
-   "commit": "b9061340cc15a3ace3ca8c6e54512b481c71acf1",
-   "sha256": "1vr0p3q5pnnqpdfvnz29v8sjsldp22hghqb16gmj7l0n2xnlvyv3"
+   "commit": "bd20a61ab7cd610625137c051c7f15e7404b7829",
+   "sha256": "0mxl8qxj9vdr8cg9xkh2v901n8m1drk0wzf4di34vkgkmrlkigyg"
   },
   "stable": {
    "version": [
@@ -111192,14 +111548,13 @@
   "stable": {
    "version": [
     0,
-    23
+    24
    ],
    "deps": [
-    "s",
     "yasnippet"
    ],
-   "commit": "e5ebfcdb38eb79a6d6705107d07f7bab2e2b5c38",
-   "sha256": "18pcnjnqvcky6i49p38vy3ms5xiisn27vy47pc3vsgr3r2n87mqb"
+   "commit": "be823d7e1a1a46454d60a9f3dabb16b68b5dd853",
+   "sha256": "0ak0drxlg3m2v4ya5chpgl82rcl7ic2nmnybhpw1qk51mcmv643y"
   }
  },
  {
@@ -111942,11 +112297,11 @@
   "repo": "ziglang/zig-mode",
   "unstable": {
    "version": [
-    20201022,
-    955
+    20210412,
+    1428
    ],
-   "commit": "6f10653cc17b9c74150ac2f6833eaaaf55488398",
-   "sha256": "00mz9z181ppr6ad9614k24vlzi4b6flqzzwc1f8vlp7ixnk9i47g"
+   "commit": "2d0eb23e6b5c12b946f12c23803157605c90f02f",
+   "sha256": "0lpsqclk37nx8i9jfskbnvxrhvh6vaflgh63xijhv9ajx2iwpw0r"
   }
  },
  {
@@ -112012,14 +112367,14 @@
   "repo": "nnicandro/emacs-zmq",
   "unstable": {
    "version": [
-    20210402,
-    2340
+    20210424,
+    1943
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "0a186a732b78aeb86599ea8123b36c4885789c7d",
-   "sha256": "0i6ghqwh35gnyz5b8ipbk030byibcmiy207pvplgszz39sjjjfp6"
+   "commit": "790033363cf0e78c616cfe117a2f681381e96f29",
+   "sha256": "0vssi5d02s7f9rhsgqnbh4ql2nvjcc4hsrmihwrk1ij50pn927yj"
   },
   "stable": {
    "version": [
@@ -112048,8 +112403,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "e795739ec182d217ffaf3c595819c308911540ee",
-   "sha256": "108bw2k255rkngfkp5iff1frsirc06j70ar1gcrh9lc3fcxdawlp"
+   "commit": "57d89fc1e17d94a8e9f3365b0d647a80520cc4a8",
+   "sha256": "0vbpc5lav8pw7caa4442z15a5s1l9wzjv68dgrbjnjvpn6yz3pay"
   }
  },
  {
@@ -112296,11 +112651,21 @@
     "s"
    ],
    "commit": "bee8196c5db26b75abc1359a5a7cb8a2b1f192ad",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 324 ms\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 632 ms\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 1159 ms\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 2278 ms\nerror: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503\n"
-   ]
+   "sha256": "1n0y6wap2yvqa75jf5yvdb9dy304c7i5g28g5lqj20ikj914wai7"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "deps": [
+    "ht",
+    "oauth",
+    "s"
+   ],
+   "commit": "bee8196c5db26b75abc1359a5a7cb8a2b1f192ad",
+   "sha256": "1n0y6wap2yvqa75jf5yvdb9dy304c7i5g28g5lqj20ikj914wai7"
   }
  },
  {
@@ -112318,8 +112683,8 @@
     "deferred",
     "request"
    ],
-   "commit": "a760009b9ecfa0b3362e77a6b44453821768d02e",
-   "sha256": "0vfdpgb0ln3xrx4i32mqisaj7qm2yx73rhagx6adr8hjw78gysfy"
+   "commit": "45961801f9e0350d7457d0d84c5004f63aed9070",
+   "sha256": "18hi6m2ngl9yz599q5bhifafi4vz1adc06bjl0bhb3rs62vbkwk2"
   },
   "stable": {
    "version": [
@@ -112417,14 +112782,14 @@
   "repo": "fourier/ztree",
   "unstable": {
    "version": [
-    20210409,
-    1841
+    20210415,
+    1947
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "c9ad9136d52ca5a81475693864e255d29448f43f",
-   "sha256": "03i5pa3nfdz6g0yrdk7r2qcn679w0s85cc5kcmgrwlnhdzakgr80"
+   "commit": "f05677f9696e573c8c607e8876fb4a0cccbc491f",
+   "sha256": "1kav7xiarm0dgvgxf49qqcy2jp388b51x3qb92dyd3i73n6bk09j"
   }
  },
  {

From 4dbda0125a3564dc5849789b48a03f0bc80b8a0a Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 3 May 2021 22:52:32 +0200
Subject: [PATCH 028/143] maintainers/scripts/haskell: Add --do-commit option

---
 .../scripts/haskell/regenerate-hackage-packages.sh   |  5 +++++
 maintainers/scripts/haskell/update-hackage.sh        | 12 ++++++++++--
 maintainers/scripts/haskell/update-stackage.sh       |  5 +++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
index 79b93f5b7cb..2408d893dae 100755
--- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh
+++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
@@ -18,3 +18,8 @@ extractionDerivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { }
 unpacked_hackage="$(nix-build -E "$extractionDerivation" --no-out-link)"
 
 hackage2nix --hackage "$unpacked_hackage" --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) --nixpkgs "$PWD" --config pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+
+if [[ "${1:-}" == "--do-commit" ]]; then
+   git add pkgs/development/haskell-modules/hackage-packages.nix
+   git commit -m "hackage-packages.nix: Regenerate based on current config"
+fi
diff --git a/maintainers/scripts/haskell/update-hackage.sh b/maintainers/scripts/haskell/update-hackage.sh
index de4b3bc0448..a8ad8d9e2ec 100755
--- a/maintainers/scripts/haskell/update-hackage.sh
+++ b/maintainers/scripts/haskell/update-hackage.sh
@@ -7,7 +7,9 @@ set -euo pipefail
 
 pin_file=pkgs/data/misc/hackage/pin.json
 current_commit="$(jq -r .commit $pin_file)"
-head_commit="$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/commercialhaskell/all-cabal-hashes/branches/hackage | jq -r .commit.sha)"
+git_info="$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/commercialhaskell/all-cabal-hashes/branches/hackage)"
+head_commit="$(echo "$git_info" | jq -r .commit.sha)"
+commit_msg="$(echo "$git_info" | jq -r .commit.commit.message)"
 
 if [ "$current_commit" != "$head_commit" ]; then
    url="https://github.com/commercialhaskell/all-cabal-hashes/archive/$head_commit.tar.gz"
@@ -16,6 +18,12 @@ if [ "$current_commit" != "$head_commit" ]; then
      --arg commit "$head_commit" \
      --arg hash "$hash" \
      --arg url "$url" \
-     '{commit: $commit, url: $url, sha256: $hash}' \
+     --arg commit_msg "$commit_msg" \
+     '{commit: $commit, url: $url, sha256: $hash, msg: $commit_msg}' \
      > $pin_file
 fi
+
+if [[ "${1:-}" == "--do-commit" ]]; then
+   git add pkgs/data/misc/hackage/pin.json
+   git commit -m "all-cabal-hashes: Changing pin to '$commit_msg'"
+fi
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index 0e08c02bc2c..c3be3158b29 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -49,3 +49,8 @@ sed -e '/  # Stackage Nightly/,/^$/c \TODO\
 sed -e "/TODO/r $tmpfile" \
     -e "s/TODO/  # Stackage Nightly $version/" \
     -i pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+
+if [[ "${1:-}" == "--do-commit" ]]; then
+   git add pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+   git commit -m "configuration-hackage2nix.yaml: Changing Stackage pin to Nightly $version"
+fi

From e9430c7f2b0d325ee8ff2eaa7fb5079c30ba74c1 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 3 May 2021 22:59:53 +0200
Subject: [PATCH 029/143] all-cabal-hashes: Changing pin to 'Update from
 Hackage at 2021-05-03T20:39:01Z'

---
 pkgs/data/misc/hackage/pin.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index f0aef7f5a1c..8370470ee17 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,5 +1,6 @@
 {
-  "commit": "f04ff9179e228b67aee1241fe8c6508f91e92fb5",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f04ff9179e228b67aee1241fe8c6508f91e92fb5.tar.gz",
-  "sha256": "11k786zcj21hgjxd2fvfshllxdl1z252x01wvfs16wp66n720wly"
+  "commit": "95e79fb1492c7f34c2454dcb783ac8b46c0f5c8c",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/95e79fb1492c7f34c2454dcb783ac8b46c0f5c8c.tar.gz",
+  "sha256": "1wp7m8j6z2j6h8z14cnzg223jmkcgpsafraxiirbih3h4wqq2nhr",
+  "msg": "Update from Hackage at 2021-05-03T20:39:01Z"
 }

From 9b4dd31a38d8d369d039734043e1d9403daab0fc Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 3 May 2021 22:59:55 +0200
Subject: [PATCH 030/143] configuration-hackage2nix.yaml: Changing Stackage pin
 to Nightly 2021-05-03

---
 .../configuration-hackage2nix.yaml            | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b0a366dc5ed..4cf9ae98736 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -101,7 +101,7 @@ default-package-overrides:
   - gi-secret < 0.0.13
   - gi-vte < 2.91.28
 
-  # Stackage Nightly 2021-04-28
+  # Stackage Nightly 2021-05-03
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
@@ -335,7 +335,7 @@ default-package-overrides:
   - benchpress ==0.2.2.16
   - between ==0.11.0.0
   - bibtex ==0.1.0.6
-  - bifunctors ==5.5.10
+  - bifunctors ==5.5.11
   - bimap ==0.4.0
   - bimaps ==0.1.0.2
   - bimap-server ==0.1.0.1
@@ -391,7 +391,7 @@ default-package-overrides:
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.5
-  - brick ==0.61
+  - brick ==0.62
   - broadcast-chan ==0.2.1.1
   - bsb-http-chunked ==0.0.0.4
   - bson ==0.4.0.1
@@ -508,6 +508,7 @@ default-package-overrides:
   - cmdargs ==0.10.21
   - codec-beam ==0.2.0
   - code-page ==0.2.1
+  - collect-errors ==0.1.0.0
   - co-log-concurrent ==0.5.0.0
   - co-log-core ==0.2.1.1
   - Color ==0.3.1
@@ -702,7 +703,7 @@ default-package-overrides:
   - Diff ==0.4.0
   - digest ==0.0.1.2
   - digits ==0.3.1
-  - dimensional ==1.3
+  - dimensional ==1.4
   - di-monad ==1.3.1
   - directory-tree ==0.12.1
   - direct-sqlite ==2.3.26
@@ -827,7 +828,7 @@ default-package-overrides:
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.10
   - exp-pairs ==0.2.1.0
-  - express ==0.1.6
+  - express ==0.1.8
   - extended-reals ==0.2.4.0
   - extensible-effects ==5.0.0.1
   - extensible-exceptions ==0.1.1.4
@@ -842,7 +843,7 @@ default-package-overrides:
   - fakepull ==0.3.0.2
   - faktory ==1.0.2.1
   - fast-digits ==0.3.0.0
-  - fast-logger ==3.0.3
+  - fast-logger ==3.0.5
   - fast-math ==1.0.2
   - fb ==2.1.1
   - fclabels ==2.0.5
@@ -1076,7 +1077,7 @@ default-package-overrides:
   - happy ==1.20.0
   - happy-meta ==0.2.0.11
   - HasBigDecimal ==0.1.1
-  - hasbolt ==0.1.4.4
+  - hasbolt ==0.1.4.5
   - hashable ==1.3.0.0
   - hashable-time ==0.2.1
   - hashids ==1.0.2.4
@@ -1335,7 +1336,7 @@ default-package-overrides:
   - inliterate ==0.1.0
   - input-parsers ==0.2.2
   - insert-ordered-containers ==0.2.4
-  - inspection-testing ==0.4.4.0
+  - inspection-testing ==0.4.5.0
   - instance-control ==0.1.2.0
   - int-cast ==0.2.0.0
   - integer-logarithms ==1.0.3.1
@@ -1428,7 +1429,7 @@ default-package-overrides:
   - language-avro ==0.1.3.1
   - language-bash ==0.9.2
   - language-c ==0.8.3
-  - language-c-quote ==0.12.2.1
+  - language-c-quote ==0.13
   - language-docker ==9.3.0
   - language-java ==0.2.9
   - language-javascript ==0.7.1.0
@@ -1520,9 +1521,10 @@ default-package-overrides:
   - lzma ==0.0.0.3
   - lzma-conduit ==1.2.1
   - machines ==0.7.2
+  - machines-binary ==7.0.0.0
   - magic ==1.1
   - magico ==0.0.2.1
-  - mainland-pretty ==0.7.0.1
+  - mainland-pretty ==0.7.1
   - main-tester ==0.2.0.1
   - makefile ==1.1.0.0
   - managed ==1.0.8
@@ -1962,7 +1964,7 @@ default-package-overrides:
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.14.0.0
   - pushbullet-types ==0.4.1.0
-  - pusher-http-haskell ==2.1.0.0
+  - pusher-http-haskell ==2.1.0.1
   - pvar ==1.0.0.0
   - PyF ==0.9.0.3
   - qchas ==1.1.0.1
@@ -2011,7 +2013,7 @@ default-package-overrides:
   - rate-limit ==1.4.2
   - ratel-wai ==1.1.5
   - rattle ==0.2
-  - rattletrap ==11.1.0
+  - rattletrap ==11.1.1
   - Rattus ==0.5
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
@@ -2031,7 +2033,7 @@ default-package-overrides:
   - recursion-schemes ==5.2.2.1
   - reducers ==3.12.3
   - refact ==0.3.0.2
-  - ref-fd ==0.4.0.2
+  - ref-fd ==0.5
   - refined ==0.6.2
   - reflection ==2.1.6
   - reform ==0.2.7.4
@@ -2039,7 +2041,7 @@ default-package-overrides:
   - reform-hamlet ==0.0.5.3
   - reform-happstack ==0.2.5.4
   - RefSerialize ==0.4.0
-  - ref-tf ==0.4.0.2
+  - ref-tf ==0.5
   - regex ==1.1.0.0
   - regex-applicative ==0.3.4
   - regex-applicative-text ==0.1.0.1
@@ -2115,8 +2117,9 @@ default-package-overrides:
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
   - sampling ==0.3.5
-  - sandwich ==0.1.0.3
-  - sandwich-slack ==0.1.0.3
+  - sandwich ==0.1.0.5
+  - sandwich-quickcheck ==0.1.0.5
+  - sandwich-slack ==0.1.0.4
   - sandwich-webdriver ==0.1.0.4
   - say ==0.1.0.1
   - sbp ==2.6.3
@@ -2284,7 +2287,7 @@ default-package-overrides:
   - sql-words ==0.1.6.4
   - squeal-postgresql ==0.7.0.1
   - squeather ==0.6.0.0
-  - srcloc ==0.5.1.2
+  - srcloc ==0.6
   - stache ==2.2.1
   - stackcollapse-ghc ==0.0.1.3
   - stack-templatizer ==0.1.0.2
@@ -2341,7 +2344,7 @@ default-package-overrides:
   - stripe-http-client ==2.6.2
   - stripe-tests ==2.6.2
   - strive ==5.0.14
-  - structs ==0.1.5
+  - structs ==0.1.6
   - structured ==0.1.0.1
   - structured-cli ==2.7.0.1
   - subcategories ==0.1.1.0
@@ -2692,7 +2695,7 @@ default-package-overrides:
   - Win32 ==2.6.1.0
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
-  - witch ==0.2.0.2
+  - witch ==0.2.1.1
   - witherable ==0.4.1
   - within ==0.2.0.1
   - with-location ==0.1.0

From 991041b33a18e92ddef1705a566a0cc5d401b96b Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 3 May 2021 23:01:56 +0200
Subject: [PATCH 031/143] hackage-packages.nix: Regenerate based on current
 config

---
 .../haskell-modules/hackage-packages.nix      | 648 +++++++-----------
 1 file changed, 239 insertions(+), 409 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 86b75b58e1a..3e8ee4045cc 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -40441,28 +40441,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.10";
-       sha256 = "03d96df4j1aq9z7hrk3n519g3h7fjgjf82fmgp6wxxbaigyrqwp7";
-       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_11" = callPackage
     ({ mkDerivation, base, base-orphans, comonad, containers, hspec
      , hspec-discover, QuickCheck, tagged, template-haskell
      , th-abstraction, transformers, transformers-compat
@@ -40482,7 +40460,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bifunctors";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bighugethesaurus" = callPackage
@@ -43257,8 +43234,8 @@ self: {
        pname = "bits-extra";
        version = "0.0.2.0";
        sha256 = "1c54008kinzcx93kc8vcp7wq7la662m8nk82ax76i9b0gvbkk21f";
-       revision = "1";
-       editedCabalFile = "1ri4z6zj20qsyyzsrl89sjcm4ir2w6538i6l36a6ffz7f0h0ahng";
+       revision = "2";
+       editedCabalFile = "01qlnzbc3kgbyacqg9c7ldab2s91h9s4kalld0wz9q2k1d4063lv";
        libraryHaskellDepends = [ base ghc-prim vector ];
        testHaskellDepends = [
          base doctest doctest-discover ghc-prim hedgehog hspec hw-hedgehog
@@ -45965,32 +45942,6 @@ self: {
      }) {};
 
   "brick" = callPackage
-    ({ mkDerivation, base, bytestring, config-ini, containers
-     , contravariant, data-clist, deepseq, directory, dlist, exceptions
-     , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
-     , template-haskell, text, text-zipper, transformers, unix, vector
-     , vty, word-wrap
-     }:
-     mkDerivation {
-       pname = "brick";
-       version = "0.61";
-       sha256 = "0cwrsndplgw5226cpdf7aad03jjidqh5wwwgm75anmya7c5lzl2d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring config-ini containers contravariant data-clist
-         deepseq directory dlist exceptions filepath microlens microlens-mtl
-         microlens-th stm template-haskell text text-zipper transformers
-         unix vector vty word-wrap
-       ];
-       testHaskellDepends = [
-         base containers microlens QuickCheck vector
-       ];
-       description = "A declarative terminal user interface library";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "brick_0_62" = callPackage
     ({ mkDerivation, base, bytestring, config-ini, containers
      , contravariant, data-clist, deepseq, directory, dlist, exceptions
      , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
@@ -46014,7 +45965,6 @@ self: {
        ];
        description = "A declarative terminal user interface library";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "brick-dropdownmenu" = callPackage
@@ -54237,8 +54187,8 @@ self: {
      }:
      mkDerivation {
        pname = "chessIO";
-       version = "0.6.0.0";
-       sha256 = "0lc0bif9bp4h0131cy9rss90qv026mlknr16ayxlvfn3ynyarqv8";
+       version = "0.6.1.0";
+       sha256 = "0agrj7k2kfyfdh23m7nciywl9sgi4vy82h83p76jlclbcakdqy1c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67399,22 +67349,22 @@ self: {
 
   "css-selectors" = callPackage
     ({ mkDerivation, aeson, alex, array, base, binary, blaze-markup
-     , bytestring, data-default, Decimal, happy, QuickCheck, shakespeare
-     , template-haskell, test-framework, test-framework-quickcheck2
-     , text, zlib
+     , bytestring, data-default, Decimal, happy, hashable, QuickCheck
+     , shakespeare, template-haskell, test-framework
+     , test-framework-quickcheck2, text, zlib
      }:
      mkDerivation {
        pname = "css-selectors";
-       version = "0.3.0.0";
-       sha256 = "1p7zzp40gvl5nq2zrb19cjw47w3sf20qwi3mplxq67ryzljmbaz4";
+       version = "0.4.0.1";
+       sha256 = "0wj16835xcr33kqpwlrqgsain0dv6dl9cxcxncxhp0c0z5bl4ysd";
        libraryHaskellDepends = [
          aeson array base binary blaze-markup bytestring data-default
-         Decimal QuickCheck shakespeare template-haskell text zlib
+         Decimal hashable QuickCheck shakespeare template-haskell text zlib
        ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
-         base binary QuickCheck test-framework test-framework-quickcheck2
-         text
+         base binary hashable QuickCheck test-framework
+         test-framework-quickcheck2 text
        ];
        description = "Parsing, rendering and manipulating css selectors in Haskell";
        license = lib.licenses.bsd3;
@@ -76160,10 +76110,8 @@ self: {
      }:
      mkDerivation {
        pname = "dimensional";
-       version = "1.3";
-       sha256 = "0i4k7m134w3pczj8qllc59djdhisj92z78qrzap9v0f4rx8jb8r9";
-       revision = "2";
-       editedCabalFile = "10xkgwjb9kqa95jck3b9wa3sz6vcb2lkygfmcqqz6hz6j65l79r8";
+       version = "1.4";
+       sha256 = "19w6plp97ylwqgwzhfy54cvjvh0dd1gj843y59cmryckh80jap8s";
        libraryHaskellDepends = [
          base deepseq exact-pi ieee754 numtype-dk semigroups vector
        ];
@@ -76172,7 +76120,7 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       description = "Statically checked physical dimensions, using Type Families and Data Kinds";
+       description = "Statically checked physical dimensions";
        license = lib.licenses.bsd3;
      }) {};
 
@@ -76180,8 +76128,8 @@ self: {
     ({ mkDerivation, base, dimensional, numtype-dk }:
      mkDerivation {
        pname = "dimensional-codata";
-       version = "2014.0.0.2";
-       sha256 = "1bmal7i0zvfivri5w7fbl4n0gyybnr2wy2cvz21b33jrzjblr1g0";
+       version = "2014.0.0.3";
+       sha256 = "1303i7f8c9nsr5x128qaqisny4r3fnfq7zarl4g9q0zckxgqhpgj";
        libraryHaskellDepends = [ base dimensional numtype-dk ];
        description = "CODATA Recommended Physical Constants with Dimensional Types";
        license = lib.licenses.bsd3;
@@ -88318,19 +88266,6 @@ self: {
      }) {};
 
   "express" = callPackage
-    ({ mkDerivation, base, leancheck, template-haskell }:
-     mkDerivation {
-       pname = "express";
-       version = "0.1.6";
-       sha256 = "1yfbym97j3ih6zvlkg0d08qiivi7cyv61lbyc6qi094apazacq6c";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base leancheck ];
-       benchmarkHaskellDepends = [ base leancheck ];
-       description = "Dynamically-typed expressions involving applications and variables";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "express_0_1_8" = callPackage
     ({ mkDerivation, base, leancheck, template-haskell }:
      mkDerivation {
        pname = "express";
@@ -88341,7 +88276,6 @@ self: {
        benchmarkHaskellDepends = [ base leancheck ];
        description = "Dynamically-typed expressions involving applications and variables";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "expression-parser" = callPackage
@@ -89498,26 +89432,6 @@ self: {
      }) {};
 
   "fast-logger" = callPackage
-    ({ mkDerivation, array, auto-update, base, bytestring, directory
-     , easy-file, filepath, hspec, hspec-discover, text, unix-compat
-     , unix-time
-     }:
-     mkDerivation {
-       pname = "fast-logger";
-       version = "3.0.3";
-       sha256 = "0s7hsbii1km7dqkxa27v2fw553wqx6x00204s6iapv2k20ra0qsp";
-       libraryHaskellDepends = [
-         array auto-update base bytestring directory easy-file filepath text
-         unix-compat unix-time
-       ];
-       testHaskellDepends = [ base bytestring directory hspec ];
-       testToolDepends = [ hspec-discover ];
-       description = "A fast logging system";
-       license = lib.licenses.bsd3;
-       maintainers = with lib.maintainers; [ sternenseemann ];
-     }) {};
-
-  "fast-logger_3_0_5" = callPackage
     ({ mkDerivation, array, auto-update, base, bytestring, directory
      , easy-file, filepath, hspec, hspec-discover, text, unix-compat
      , unix-time
@@ -89534,7 +89448,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A fast logging system";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ sternenseemann ];
      }) {};
 
@@ -102503,8 +102416,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-tags-core";
-       version = "0.2.4.1";
-       sha256 = "0d1srd72ajp2csyic6wpj6i7818rimqbcg5c3lxj76cz9zpjr1g8";
+       version = "0.3.0.0";
+       sha256 = "035k7akyhhn5jf2231ahplgggymc8h8k2kxia6i22v9cv976zgna";
        libraryHaskellDepends = [
          attoparsec base bytestring directory filepath-bytestring ghc mtl
          pipes pipes-attoparsec pipes-bytestring text transformers
@@ -102533,8 +102446,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-tags-plugin";
-       version = "0.2.4.1";
-       sha256 = "1hzv3s6pys1cqwj3hs1xww52v5yapisw9y3d5fmxzh0s6nawpxf2";
+       version = "0.3.0.0";
+       sha256 = "1d39jnz79vlxqqg2bw3cj1djii3bkmayqs4sm2a6bs5xzsplc5w3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118681,30 +118594,6 @@ self: {
      }) {};
 
   "hasbolt" = callPackage
-    ({ mkDerivation, base, binary, bytestring, connection, containers
-     , data-binary-ieee754, data-default, hspec, mtl, network
-     , QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "hasbolt";
-       version = "0.1.4.4";
-       sha256 = "0kk1lamyms1mf8d290c3asnvgk51i8sqj810whms2a5346w9n4ll";
-       revision = "1";
-       editedCabalFile = "1bnbhq6k2af08riyaplfgm2lzghhi3nc0ijiw0yk1y5pq618zhxy";
-       libraryHaskellDepends = [
-         base binary bytestring connection containers data-binary-ieee754
-         data-default mtl network text
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec QuickCheck text
-       ];
-       description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hasbolt_0_1_4_5" = callPackage
     ({ mkDerivation, base, binary, bytestring, connection, containers
      , data-binary-ieee754, data-default, hspec, mtl, network
      , QuickCheck, text
@@ -137851,8 +137740,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsendxmpp";
-       version = "0.1.2.5";
-       sha256 = "0wyfcsc0vjyx87r5dv51frfligf4d7v0n1m7967vg4d6jkw2zxd9";
+       version = "0.1.2.6";
+       sha256 = "1w3jm8lsll65i57iqlspw1vzvw5rr4q9qwarq896s0vr8kz68irh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -139145,6 +139034,24 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "hspec-golden_0_2_0_0" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec, hspec-core
+     , optparse-applicative, silently
+     }:
+     mkDerivation {
+       pname = "hspec-golden";
+       version = "0.2.0.0";
+       sha256 = "0sg9f73x2i1g6n1pjcvb1zx4nx17w5drdrrhzp2z3lsxc9yxs8nk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath hspec-core ];
+       executableHaskellDepends = [ base directory optparse-applicative ];
+       testHaskellDepends = [ base directory hspec hspec-core silently ];
+       description = "Golden tests for hspec";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hspec-golden-aeson" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt
@@ -144229,8 +144136,8 @@ self: {
        pname = "hw-prim";
        version = "0.6.3.0";
        sha256 = "0gqn7s0ki9x951n5whyh0pkcbbqz4kpcn80xxpsv1c0v34946xv7";
-       revision = "1";
-       editedCabalFile = "1z3fcff42xq0j430q72ncjv6zc0zvzzq94ifh06m342z0x8imv83";
+       revision = "2";
+       editedCabalFile = "14x1bijg1d8jdh963rxrlwzlqa1p1vh0bc7hjdysk8dzbrc7fbmv";
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim mmap transformers unliftio-core
          vector
@@ -149142,22 +149049,6 @@ self: {
      }) {};
 
   "inspection-testing" = callPackage
-    ({ mkDerivation, base, containers, ghc, mtl, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "inspection-testing";
-       version = "0.4.4.0";
-       sha256 = "1zr7c7xpmnfwn2p84rqw69n1g91rdkh7d20awvj0s56nbdikgiyh";
-       libraryHaskellDepends = [
-         base containers ghc mtl template-haskell transformers
-       ];
-       testHaskellDepends = [ base ];
-       description = "GHC plugin to do inspection testing";
-       license = lib.licenses.mit;
-     }) {};
-
-  "inspection-testing_0_4_5_0" = callPackage
     ({ mkDerivation, base, containers, ghc, mtl, template-haskell
      , transformers
      }:
@@ -149171,7 +149062,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "GHC plugin to do inspection testing";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "inspector-wrecker" = callPackage
@@ -150066,8 +149956,8 @@ self: {
      }:
      mkDerivation {
        pname = "interval-algebra";
-       version = "0.4.0";
-       sha256 = "0852yv0d7c3gh6ggab6wvnk7g1pad02nnpbmzw98c9zkzw2zk9wh";
+       version = "0.5.0";
+       sha256 = "1zjqyhcdi058gkq8pyhwfnn2zlzj8iifsl2c1z2ngvmpgxivq0qc";
        libraryHaskellDepends = [
          base containers QuickCheck time witherable
        ];
@@ -151139,6 +151029,27 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "irc-client_1_1_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, containers
+     , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
+     , network-conduit-tls, old-locale, profunctors, stm, stm-chans
+     , text, time, tls, transformers, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-client";
+       version = "1.1.2.1";
+       sha256 = "1zaa8na730m96flgiyzcwq95v2ianvflsw3abvdavf7xpq4s71ld";
+       libraryHaskellDepends = [
+         base bytestring conduit connection containers contravariant
+         exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
+         profunctors stm stm-chans text time tls transformers x509
+         x509-store x509-validation
+       ];
+       description = "An IRC client library";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "irc-colors" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -159495,30 +159406,6 @@ self: {
      }) {};
 
   "language-c-quote" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers
-     , exception-mtl, exception-transformers, filepath, happy
-     , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb
-     , symbol, template-haskell, test-framework, test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "language-c-quote";
-       version = "0.12.2.1";
-       sha256 = "0hwv4b40wj953f39gqn8ji4ycli67c90b8xbizskd4i1x3nqbi35";
-       libraryHaskellDepends = [
-         array base bytestring containers exception-mtl
-         exception-transformers filepath haskell-src-meta mainland-pretty
-         mtl srcloc syb symbol template-haskell
-       ];
-       libraryToolDepends = [ alex happy ];
-       testHaskellDepends = [
-         base bytestring HUnit mainland-pretty srcloc symbol test-framework
-         test-framework-hunit
-       ];
-       description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "language-c-quote_0_13" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , exception-mtl, exception-transformers, filepath, happy
      , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb
@@ -159540,7 +159427,6 @@ self: {
        ];
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "language-c99" = callPackage
@@ -164034,6 +163920,8 @@ self: {
        pname = "libtelnet";
        version = "0.1.0.1";
        sha256 = "13g7wpibjncj9h6yva8gj9fqs8j806r1vnina78wgv8f980dqxks";
+       revision = "1";
+       editedCabalFile = "13lg79nlwmhd5qqyr31bk7wpfl0mvr37q4ha3q83gxya03f34v5h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -170921,19 +170809,6 @@ self: {
      }) {};
 
   "mainland-pretty" = callPackage
-    ({ mkDerivation, base, containers, srcloc, text, transformers }:
-     mkDerivation {
-       pname = "mainland-pretty";
-       version = "0.7.0.1";
-       sha256 = "0cifvdpqcb1cvjazgqwaxvl2ga7kap5a6f89yw1xn8y5yw7nz1c8";
-       libraryHaskellDepends = [
-         base containers srcloc text transformers
-       ];
-       description = "Pretty printing designed for printing source code";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "mainland-pretty_0_7_1" = callPackage
     ({ mkDerivation, base, containers, srcloc, text, transformers }:
      mkDerivation {
        pname = "mainland-pretty";
@@ -170944,7 +170819,6 @@ self: {
        ];
        description = "Pretty printing designed for printing source code";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "majordomo" = callPackage
@@ -196302,6 +196176,41 @@ self: {
        license = lib.licenses.gpl2Plus;
      }) {};
 
+  "pandoc-plot_1_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , data-default, directory, filepath, githash, hashable, hspec
+     , hspec-expectations, lifted-async, lifted-base, mtl
+     , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup
+     , tasty, tasty-hspec, tasty-hunit, template-haskell, text
+     , typed-process, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-plot";
+       version = "1.2.0";
+       sha256 = "091283hcp3rin1rpg6b4lkh32svqr1gjxsa15id3qic7a7knx2r0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers data-default directory filepath hashable
+         lifted-async lifted-base mtl pandoc pandoc-types shakespeare
+         tagsoup template-haskell text typed-process yaml
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath githash optparse-applicative
+         pandoc pandoc-types template-haskell text typed-process
+       ];
+       testHaskellDepends = [
+         base containers directory filepath hspec hspec-expectations
+         pandoc-types tasty tasty-hspec tasty-hunit text
+       ];
+       benchmarkHaskellDepends = [
+         base criterion pandoc-types template-haskell text
+       ];
+       description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
+       license = lib.licenses.gpl2Plus;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "pandoc-pyplot" = callPackage
     ({ mkDerivation, base, containers, data-default-class, deepseq
      , directory, filepath, hashable, hspec, hspec-expectations, mtl
@@ -214275,8 +214184,8 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "2.1.0.0";
-       sha256 = "1zmcpbd20m7pc1bc0dwkhy33vbakdwc478dmzpr4l80kck0mpmy6";
+       version = "2.1.0.1";
+       sha256 = "19mdq0piyvqvw2nfcb164narj6d9wgp1as75ri2w21i5qmm1jhi8";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptonite hashable
          http-client http-client-tls http-types memory text time
@@ -218301,8 +218210,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "11.1.0";
-       sha256 = "1q915fq9bjwridd67rsmavxcbkgp3xxq9ps09z6mi62608c26987";
+       version = "11.1.1";
+       sha256 = "0cfxdi2h6aqa6zylg1hgn563fpi72zqfqzl9gsipm7jz1532j2a3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -220282,17 +220191,6 @@ self: {
      }) {};
 
   "ref-fd" = callPackage
-    ({ mkDerivation, base, stm, transformers }:
-     mkDerivation {
-       pname = "ref-fd";
-       version = "0.4.0.2";
-       sha256 = "1camr7cv1fglicyp2ivv7qv1yidj36zxcglfvmw7giqdj7r7j5w8";
-       libraryHaskellDepends = [ base stm transformers ];
-       description = "A type class for monads with references using functional dependencies";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "ref-fd_0_5" = callPackage
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "ref-fd";
@@ -220301,7 +220199,6 @@ self: {
        libraryHaskellDepends = [ base stm transformers ];
        description = "A type class for monads with references using functional dependencies";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ref-mtl" = callPackage
@@ -220318,17 +220215,6 @@ self: {
      }) {};
 
   "ref-tf" = callPackage
-    ({ mkDerivation, base, stm, transformers }:
-     mkDerivation {
-       pname = "ref-tf";
-       version = "0.4.0.2";
-       sha256 = "0pq9pm8jsx9w1q81pf5pvc361ad8dbyklw94jq47drr2i0dc7n20";
-       libraryHaskellDepends = [ base stm transformers ];
-       description = "A type class for monads with references using type families";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "ref-tf_0_5" = callPackage
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "ref-tf";
@@ -220337,7 +220223,6 @@ self: {
        libraryHaskellDepends = [ base stm transformers ];
        description = "A type class for monads with references using type families";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "refact" = callPackage
@@ -223815,8 +223700,8 @@ self: {
      }:
      mkDerivation {
        pname = "request";
-       version = "0.2.0.0";
-       sha256 = "023bldkfjqbwmd6mh4vb2k7z5vi8lfkhf5an057h04dzhpgb3r9l";
+       version = "0.2.1.0";
+       sha256 = "1a2zx0gb03mv6g4sw0r6pxkvih8ca5w9w44k6d3n7b5b7s8yznhk";
        libraryHaskellDepends = [
          base bytestring case-insensitive http-client http-client-tls
          http-types
@@ -229205,49 +229090,6 @@ self: {
      }) {};
 
   "sandwich" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, async, base, brick
-     , bytestring, colour, containers, directory, exceptions, filepath
-     , free, haskell-src-exts, lens, lifted-async, microlens
-     , microlens-th, monad-control, monad-logger, mtl
-     , optparse-applicative, pretty-show, process, safe, safe-exceptions
-     , stm, string-interpolate, template-haskell, text, time
-     , transformers, transformers-base, unix, unliftio-core, vector, vty
-     }:
-     mkDerivation {
-       pname = "sandwich";
-       version = "0.1.0.3";
-       sha256 = "1gd8k4dx25bgqrw16dwvq9lnk7gpvpci01kvnn3s08ylkiq2qax9";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal async base brick bytestring colour containers
-         directory exceptions filepath free haskell-src-exts lens
-         lifted-async microlens microlens-th monad-control monad-logger mtl
-         optparse-applicative pretty-show process safe safe-exceptions stm
-         string-interpolate template-haskell text time transformers
-         transformers-base unix unliftio-core vector vty
-       ];
-       executableHaskellDepends = [
-         aeson ansi-terminal async base brick bytestring colour containers
-         directory exceptions filepath free haskell-src-exts lens
-         lifted-async microlens microlens-th monad-control monad-logger mtl
-         optparse-applicative pretty-show process safe safe-exceptions stm
-         string-interpolate template-haskell text time transformers
-         transformers-base unix unliftio-core vector vty
-       ];
-       testHaskellDepends = [
-         aeson ansi-terminal async base brick bytestring colour containers
-         directory exceptions filepath free haskell-src-exts lens
-         lifted-async microlens microlens-th monad-control monad-logger mtl
-         optparse-applicative pretty-show process safe safe-exceptions stm
-         string-interpolate template-haskell text time transformers
-         transformers-base unix unliftio-core vector vty
-       ];
-       description = "Yet another test framework for Haskell";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "sandwich_0_1_0_5" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, brick
      , bytestring, colour, containers, directory, exceptions, filepath
      , free, haskell-src-exts, lens, lifted-async, microlens
@@ -229288,66 +229130,29 @@ self: {
        ];
        description = "Yet another test framework for Haskell";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sandwich-quickcheck" = callPackage
-    ({ mkDerivation, base, free, monad-control, QuickCheck
-     , safe-exceptions, sandwich, string-interpolate, time
+    ({ mkDerivation, base, brick, free, monad-control, QuickCheck
+     , safe-exceptions, sandwich, string-interpolate, text, time
      }:
      mkDerivation {
        pname = "sandwich-quickcheck";
-       version = "0.1.0.4";
-       sha256 = "0sljlpnhv5wpda1w9nh5da2psmg9snias8k9dr62y9khymn3aya7";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.1.0.5";
+       sha256 = "03z8g5q3yxfpazbwi56ji9554z3l2ac776mzz06xsb7cha3kf7lw";
        libraryHaskellDepends = [
-         base free monad-control QuickCheck safe-exceptions sandwich
-         string-interpolate time
-       ];
-       executableHaskellDepends = [
-         base free monad-control QuickCheck safe-exceptions sandwich
-         string-interpolate time
+         base brick free monad-control QuickCheck safe-exceptions sandwich
+         string-interpolate text time
        ];
        testHaskellDepends = [
-         base free monad-control QuickCheck safe-exceptions sandwich
-         string-interpolate time
+         base brick free monad-control QuickCheck safe-exceptions sandwich
+         string-interpolate text time
        ];
        description = "Sandwich integration with QuickCheck";
        license = lib.licenses.bsd3;
      }) {};
 
   "sandwich-slack" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, lens
-     , lens-aeson, monad-logger, mtl, safe, safe-exceptions, sandwich
-     , stm, string-interpolate, text, time, vector, wreq
-     }:
-     mkDerivation {
-       pname = "sandwich-slack";
-       version = "0.1.0.3";
-       sha256 = "1g8ymxy4q08jxlfbd7ar6n30wm1mcm942vr5627bpx63m83yld1y";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers lens lens-aeson monad-logger mtl
-         safe safe-exceptions sandwich stm string-interpolate text time
-         vector wreq
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers lens lens-aeson monad-logger mtl
-         safe safe-exceptions sandwich stm string-interpolate text time
-         vector wreq
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers lens lens-aeson monad-logger mtl
-         safe safe-exceptions sandwich stm string-interpolate text time
-         vector wreq
-       ];
-       description = "Sandwich integration with Slack";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "sandwich-slack_0_1_0_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, lens
      , lens-aeson, monad-logger, mtl, safe, safe-exceptions, sandwich
      , stm, string-interpolate, text, time, vector, wreq
@@ -229375,7 +229180,6 @@ self: {
        ];
        description = "Sandwich integration with Slack";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "sandwich-webdriver" = callPackage
@@ -244926,23 +244730,30 @@ self: {
      }) {};
 
   "souffle-haskell" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq, directory
-     , filepath, hedgehog, hspec, hspec-hedgehog, mtl
-     , neat-interpolation, process, template-haskell, temporary, text
-     , type-errors-pretty, vector
+    ({ mkDerivation, array, base, bytestring, containers, criterion
+     , deepseq, directory, filepath, hedgehog, hspec, hspec-hedgehog
+     , mtl, neat-interpolation, process, template-haskell, temporary
+     , text, text-short, type-errors-pretty, vector
      }:
      mkDerivation {
        pname = "souffle-haskell";
-       version = "2.1.0";
-       sha256 = "1szkv27my46xgwqanhb6wkgncll08yznpl0p2m1wq5cifxir2m7h";
+       version = "3.0.0";
+       sha256 = "0zwz28w8fmz8lfwd5bzhysc43y5gfsa1px2xhlkxg5psy0j1935q";
        libraryHaskellDepends = [
-         array base containers deepseq directory filepath mtl process
-         template-haskell temporary text type-errors-pretty vector
+         array base bytestring containers deepseq directory filepath mtl
+         process template-haskell temporary text text-short
+         type-errors-pretty vector
        ];
        testHaskellDepends = [
-         array base containers deepseq directory filepath hedgehog hspec
-         hspec-hedgehog mtl neat-interpolation process template-haskell
-         temporary text type-errors-pretty vector
+         array base bytestring containers deepseq directory filepath
+         hedgehog hspec hspec-hedgehog mtl neat-interpolation process
+         template-haskell temporary text text-short type-errors-pretty
+         vector
+       ];
+       benchmarkHaskellDepends = [
+         array base bytestring containers criterion deepseq directory
+         filepath mtl process template-haskell temporary text text-short
+         type-errors-pretty vector
        ];
        description = "Souffle Datalog bindings for Haskell";
        license = lib.licenses.mit;
@@ -246232,6 +246043,22 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "splitmix-distributions" = callPackage
+    ({ mkDerivation, base, containers, erf, hspec, mtl, splitmix
+     , transformers
+     }:
+     mkDerivation {
+       pname = "splitmix-distributions";
+       version = "0.7.0.0";
+       sha256 = "1zidzdfyk0rc5hijai99i2k4vh1nlqp42l2m3z92d2qmqkk8nzdl";
+       libraryHaskellDepends = [
+         base containers erf mtl splitmix transformers
+       ];
+       testHaskellDepends = [ base erf hspec mtl splitmix transformers ];
+       description = "Random samplers for some common distributions, based on splitmix";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "splitter" = callPackage
     ({ mkDerivation, base, directory, filepath, parsec, range }:
      mkDerivation {
@@ -246937,17 +246764,6 @@ self: {
      }) {};
 
   "srcloc" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "srcloc";
-       version = "0.5.1.2";
-       sha256 = "0vn0zqsk191ghh2993hls05hp7kvnskaafnfrrqhfbmpdg7dp7h6";
-       libraryHaskellDepends = [ base ];
-       description = "Data types for managing source code locations";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "srcloc_0_6" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "srcloc";
@@ -246956,7 +246772,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data types for managing source code locations";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "srec" = callPackage
@@ -250903,8 +250718,8 @@ self: {
      }:
      mkDerivation {
        pname = "streamly-archive";
-       version = "0.0.1";
-       sha256 = "055jcqndkzg14c2fvkncn9034bw60n8s8yjkkjx7kqrj9p0kp01a";
+       version = "0.0.2";
+       sha256 = "00cd5ssa5hi4pvc5li24z68f1k50h02frn4668gcrv8lr5kh6s50";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring streamly ];
        librarySystemDepends = [ archive ];
@@ -251006,8 +250821,8 @@ self: {
      }:
      mkDerivation {
        pname = "streamly-lmdb";
-       version = "0.2.0";
-       sha256 = "1mkcnn7y4rwc8m0qvcqyw20jd7ax3nm455228fwp3yaslgw4mcvy";
+       version = "0.2.1";
+       sha256 = "08rj29i3vb4ahgrd2zhyi2sl1lk95s7vk020xx9mwzi8sbn0ay05";
        libraryHaskellDepends = [ async base bytestring streamly ];
        librarySystemDepends = [ lmdb ];
        testHaskellDepends = [
@@ -252109,25 +251924,6 @@ self: {
      }) {};
 
   "structs" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
-     , tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     , th-abstraction
-     }:
-     mkDerivation {
-       pname = "structs";
-       version = "0.1.5";
-       sha256 = "1qsj5w6g0lcvbrm0zs37f1yk3im1swhnb4j1mbpr3fyc3zswwbjf";
-       libraryHaskellDepends = [
-         base deepseq ghc-prim primitive template-haskell th-abstraction
-       ];
-       testHaskellDepends = [
-         base primitive QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "Strict GC'd imperative object-oriented programming with cheap pointers";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "structs_0_1_6" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
      , tasty, tasty-hunit, tasty-quickcheck, template-haskell
      , th-abstraction
@@ -252144,7 +251940,6 @@ self: {
        ];
        description = "Strict GC'd imperative object-oriented programming with cheap pointers";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "structural-induction" = callPackage
@@ -264565,16 +264360,18 @@ self: {
 
   "tlex" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
-     , hspec, hspec-discover, QuickCheck, tlex-core
+     , enummapset-th, hspec, hspec-discover, QuickCheck, tlex-core
      }:
      mkDerivation {
        pname = "tlex";
-       version = "0.2.0.0";
-       sha256 = "0ad2zxlwrkpz2lgqp9lyj4aaq0nicj8vxfys0hn63cv23arwr0cc";
+       version = "0.3.0.0";
+       sha256 = "1sbs6zxa6x2isxvynlqjf8rgy0y1syr6svvgb22bj43qsg3p3vnx";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [ base containers tlex-core ];
+       libraryHaskellDepends = [
+         base containers enummapset-th tlex-core
+       ];
        testHaskellDepends = [
-         base containers doctest hspec QuickCheck tlex-core
+         base containers doctest enummapset-th hspec QuickCheck tlex-core
        ];
        testToolDepends = [ hspec-discover ];
        description = "A lexer generator";
@@ -264583,20 +264380,21 @@ self: {
 
   "tlex-core" = callPackage
     ({ mkDerivation, array, base, Cabal, cabal-doctest, containers
-     , doctest, hashable, hspec, hspec-discover, QuickCheck
-     , transformers, unordered-containers
+     , doctest, enummapset-th, hashable, hspec, hspec-discover
+     , QuickCheck, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "tlex-core";
-       version = "0.2.1.0";
-       sha256 = "1qjzxsz7rl1fmfp1yzc2cdxjwz9nwjrxz6d18023cz41v1jympzq";
+       version = "0.3.0.0";
+       sha256 = "0nmxy35xxz6d2i7hcci68cwv9fm1ffsg00n9minaqgkwcyrk2qba";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         array base containers hashable transformers unordered-containers
+         array base containers enummapset-th hashable transformers
+         unordered-containers
        ];
        testHaskellDepends = [
-         array base containers doctest hashable hspec QuickCheck
-         transformers unordered-containers
+         array base containers doctest enummapset-th hashable hspec
+         QuickCheck transformers unordered-containers
        ];
        testToolDepends = [ hspec-discover ];
        description = "A lexer generator";
@@ -264605,20 +264403,20 @@ self: {
 
   "tlex-debug" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
-     , hspec, hspec-discover, QuickCheck, tlex, tlex-core
+     , enummapset-th, hspec, hspec-discover, QuickCheck, tlex, tlex-core
      , unordered-containers
      }:
      mkDerivation {
        pname = "tlex-debug";
-       version = "0.2.0.0";
-       sha256 = "0qj1wcdg9spf7vfwmpkqp5z74qzh9xkb4m6gv0v015krr8qvwc01";
+       version = "0.3.0.0";
+       sha256 = "012554saxmnqfm1rvgjgzn7aakvp1ai95xpavr6b3h1pqy63md6s";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         base containers tlex tlex-core unordered-containers
+         base containers enummapset-th tlex tlex-core unordered-containers
        ];
        testHaskellDepends = [
-         base containers doctest hspec QuickCheck tlex tlex-core
-         unordered-containers
+         base containers doctest enummapset-th hspec QuickCheck tlex
+         tlex-core unordered-containers
        ];
        testToolDepends = [ hspec-discover ];
        description = "Debug utilities for Tlex";
@@ -264627,16 +264425,20 @@ self: {
 
   "tlex-encoding" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, charset, containers
-     , doctest, hspec, hspec-discover, QuickCheck, tlex, tlex-core
+     , doctest, enummapset-th, hspec, hspec-discover, QuickCheck, tlex
+     , tlex-core
      }:
      mkDerivation {
        pname = "tlex-encoding";
-       version = "0.2.0.0";
-       sha256 = "0krisx0fh85dccgcw6y1b3b1q2brwqz75hqg6r7w39rn0w7b5xm7";
+       version = "0.3.0.0";
+       sha256 = "1ip1zfjfn5jw817i4q8cav98d261jq7h00qaxfsmkcv7kqiqzbac";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [ base charset containers tlex tlex-core ];
+       libraryHaskellDepends = [
+         base charset containers enummapset-th tlex tlex-core
+       ];
        testHaskellDepends = [
-         base charset containers doctest hspec QuickCheck tlex tlex-core
+         base charset containers doctest enummapset-th hspec QuickCheck tlex
+         tlex-core
        ];
        testToolDepends = [ hspec-discover ];
        description = "Encoding plugin for Tlex";
@@ -264645,20 +264447,21 @@ self: {
 
   "tlex-th" = callPackage
     ({ mkDerivation, array, base, Cabal, cabal-doctest, containers
-     , doctest, ghc-prim, hspec, hspec-discover, QuickCheck
-     , template-haskell, tlex, tlex-core
+     , doctest, enummapset-th, ghc-prim, hspec, hspec-discover
+     , QuickCheck, template-haskell, tlex, tlex-core
      }:
      mkDerivation {
        pname = "tlex-th";
-       version = "0.2.0.1";
-       sha256 = "19hlj81rxnki90imiz4zjklfl4ffbpkkd9iycq4wbj92i9vw4n8v";
+       version = "0.3.0.0";
+       sha256 = "1fhp2md3v2n51irivgdij5zdql1lx8iay9yvsrmj9nhvlfjq2b4g";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         array base containers ghc-prim template-haskell tlex tlex-core
+         array base containers enummapset-th ghc-prim template-haskell tlex
+         tlex-core
        ];
        testHaskellDepends = [
-         array base containers doctest ghc-prim hspec QuickCheck
-         template-haskell tlex tlex-core
+         array base containers doctest enummapset-th ghc-prim hspec
+         QuickCheck template-haskell tlex tlex-core
        ];
        testToolDepends = [ hspec-discover ];
        description = "TemplateHaskell plugin for Tlex";
@@ -275054,6 +274857,28 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "uuid_1_3_15" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cryptohash-md5
+     , cryptohash-sha1, entropy, network-info, QuickCheck, random, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, uuid-types
+     }:
+     mkDerivation {
+       pname = "uuid";
+       version = "1.3.15";
+       sha256 = "0r05h16gd7fgfpq9iz43jcn9jzrgfa0gk4cv1xy0p4rli66rb1gq";
+       libraryHaskellDepends = [
+         base binary bytestring cryptohash-md5 cryptohash-sha1 entropy
+         network-info random text time uuid-types
+       ];
+       testHaskellDepends = [
+         base bytestring QuickCheck random tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "uuid-aeson" = callPackage
     ({ mkDerivation, aeson, base, text, uuid }:
      mkDerivation {
@@ -275168,6 +274993,28 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "uuid-types_1_0_5" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, ghc-byteorder
+     , hashable, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "uuid-types";
+       version = "1.0.5";
+       sha256 = "1pd7xd6inkmmwjscf7pmiwqjks9y0gi1p8ahqbapvh34gadvhs5d";
+       libraryHaskellDepends = [
+         base binary bytestring deepseq hashable random template-haskell
+         text
+       ];
+       testHaskellDepends = [
+         base binary bytestring ghc-byteorder QuickCheck tasty tasty-hunit
+         tasty-quickcheck template-haskell
+       ];
+       description = "Type definitions for Universally Unique Identifiers";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "uulib" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -282991,29 +282838,13 @@ self: {
      }) {};
 
   "witch" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hspec
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "witch";
-       version = "0.2.0.2";
-       sha256 = "13y5zbs9lwniamwq2cm45rsc7xp11ny2m7x3f965qd6az66ds396";
-       libraryHaskellDepends = [
-         base bytestring containers template-haskell text
-       ];
-       testHaskellDepends = [ base bytestring containers hspec text ];
-       description = "Convert values from one type into another";
-       license = lib.licenses.isc;
-     }) {};
-
-  "witch_0_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, hspec, QuickCheck
      , template-haskell, text
      }:
      mkDerivation {
        pname = "witch";
-       version = "0.2.1.0";
-       sha256 = "0zvq9axjmqksk4fqq42qgbj4whx27p4m40cgvdqmq4vpj4csvswl";
+       version = "0.2.1.1";
+       sha256 = "0z3c7ni1sd4mqv2v35sj2qls9bdkkk3sclpclxll420b7qbicf1r";
        libraryHaskellDepends = [
          base bytestring containers template-haskell text
        ];
@@ -283022,7 +282853,6 @@ self: {
        ];
        description = "Convert values from one type into another";
        license = lib.licenses.isc;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "with-index" = callPackage

From e117e00a5c83fdfd880126aa4dc9a1b245dc70a6 Mon Sep 17 00:00:00 2001
From: Matt Christ <matt@christ.systems>
Date: Mon, 3 May 2021 17:31:57 -0500
Subject: [PATCH 032/143] emacs pkgs: update elpa

---
 .../editors/emacs-modes/elpa-generated.nix    | 139 ++++++++++--------
 1 file changed, 81 insertions(+), 58 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index ca76e43e413..76ca43aac8d 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -114,10 +114,10 @@
       elpaBuild {
         pname = "aggressive-completion";
         ename = "aggressive-completion";
-        version = "1.5";
+        version = "1.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/aggressive-completion-1.5.tar";
-          sha256 = "1gy0q5yc1a0w31qpyb92f672zcfgxbp5s104ycgk11jxk4y17nw9";
+          url = "https://elpa.gnu.org/packages/aggressive-completion-1.6.tar";
+          sha256 = "0i7kcxd7pbdw57gczbxddr2n4j778x2ccfpkgjhdlpdsyidfh2bq";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -219,16 +219,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    async = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
+    async = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "async";
         ename = "async";
-        version = "1.9.3";
+        version = "1.9.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/async-1.9.3.tar";
-          sha256 = "1pmfjrlapvhkjqcal8x95w190hm9wsgxb3byc22rc1gf5z0p52c8";
+          url = "https://elpa.gnu.org/packages/async-1.9.5.tar";
+          sha256 = "02f43vqlggy4qkqdggkl9mcg3rvagjysj45xgrx41jjx6cnjnm19";
         };
-        packageRequires = [ cl-lib nadvice ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/async.html";
           license = lib.licenses.free;
@@ -238,10 +238,10 @@
       elpaBuild {
         pname = "auctex";
         ename = "auctex";
-        version = "13.0.6";
+        version = "13.0.11";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-13.0.6.tar";
-          sha256 = "00wp388rh2nnk8fam53kilykg90jylps31qxv9ijy1lsp1hqdjys";
+          url = "https://elpa.gnu.org/packages/auctex-13.0.11.tar";
+          sha256 = "0sy4f1n38q58vyzw5l0f80ci3j99rb25gbwj0frl0pglfmgzl44k";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -482,10 +482,10 @@
       elpaBuild {
         pname = "cl-lib";
         ename = "cl-lib";
-        version = "0.6.1";
+        version = "0.7";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/cl-lib-0.6.1.el";
-          sha256 = "00w7bw6wkig13pngijh7ns45s1jn5kkbbjaqznsdh6jk5x089j9y";
+          url = "https://elpa.gnu.org/packages/cl-lib-0.7.tar";
+          sha256 = "0s1vkkj1yc5zn6bvc84sr726cm4v3jh2ymm7hc3rr00swwbz35lv";
         };
         packageRequires = [];
         meta = {
@@ -651,6 +651,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    corfu = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "corfu";
+        ename = "corfu";
+        version = "0.4";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/corfu-0.4.tar";
+          sha256 = "0yaspx58w02n3liqy5i4lm6lk5f1fm6v5lfrzp7xaqnngq1f4gbj";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/corfu.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     counsel = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib, swiper }:
       elpaBuild {
         pname = "counsel";
@@ -775,10 +790,10 @@
       elpaBuild {
         pname = "debbugs";
         ename = "debbugs";
-        version = "0.27";
+        version = "0.28";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/debbugs-0.27.tar";
-          sha256 = "1zn9p9vmfv5ihrp8d06b6abs48q225v42cgwa01s39hld6zg6wbv";
+          url = "https://elpa.gnu.org/packages/debbugs-0.28.tar";
+          sha256 = "1qks38hpg3drhxzw66n5yxfq0v6fj9ya7d9dc6x0xwfp6r2x0li0";
         };
         packageRequires = [ emacs soap-client ];
         meta = {
@@ -1209,7 +1224,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    excorporate = callPackage ({ elpaBuild
+    excorporate = callPackage ({ cl-lib ? null
+                               , elpaBuild
                                , emacs
                                , fetchurl
                                , fsm
@@ -1220,12 +1236,19 @@
       elpaBuild {
         pname = "excorporate";
         ename = "excorporate";
-        version = "0.9.5";
+        version = "0.9.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/excorporate-0.9.5.tar";
-          sha256 = "0z5x8lqvxh8zra23nmh36cdnr2yk855i4fc3mlbwaj5sdy9sqpf5";
+          url = "https://elpa.gnu.org/packages/excorporate-0.9.6.tar";
+          sha256 = "0ljav8g1npg0a36x1xxpfs2gvk622fh3si95s3w2vmwa27ynirzj";
         };
-        packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ];
+        packageRequires = [
+          cl-lib
+          emacs
+          fsm
+          nadvice
+          soap-client
+          url-http-ntlm
+        ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/excorporate.html";
           license = lib.licenses.free;
@@ -2233,10 +2256,10 @@
       elpaBuild {
         pname = "modus-themes";
         ename = "modus-themes";
-        version = "1.2.4";
+        version = "1.3.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/modus-themes-1.2.4.tar";
-          sha256 = "0wz6dgkrq4ryvj0kxnzqxwh4i8b9lw15d5dsazjpqa7gfwffpzp0";
+          url = "https://elpa.gnu.org/packages/modus-themes-1.3.2.tar";
+          sha256 = "085zi3ckf4s1kjskqb04b78rgrhbdhrrp74yksb5w0hl58bd8rsc";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2696,10 +2719,10 @@
       elpaBuild {
         pname = "phps-mode";
         ename = "phps-mode";
-        version = "0.4.2";
+        version = "0.4.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/phps-mode-0.4.2.tar";
-          sha256 = "0ngh54jdh56563crgvf0r4gd6zfvhbkxs9prp12930gav8mdm3sh";
+          url = "https://elpa.gnu.org/packages/phps-mode-0.4.3.tar";
+          sha256 = "0yvwfaj7l4z3zgycvnf1j0r5jx4lryaapljbw2sqvwqpbgyiw0y0";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2741,10 +2764,10 @@
       elpaBuild {
         pname = "posframe";
         ename = "posframe";
-        version = "1.0.0";
+        version = "1.0.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/posframe-1.0.0.tar";
-          sha256 = "1k06dbh9xqn2vix5qkcapl57v0c21b344r8dx6j5qr4jxirsn2x5";
+          url = "https://elpa.gnu.org/packages/posframe-1.0.2.tar";
+          sha256 = "19a1dkjyw9m74aamyqrsvzrdwshngqpmjzdngx6v5nifvcilrlnk";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2756,10 +2779,10 @@
       elpaBuild {
         pname = "project";
         ename = "project";
-        version = "0.5.4";
+        version = "0.6.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/project-0.5.4.tar";
-          sha256 = "0arjvhzzcf8b80w94yvpgfdlhsjwf5jk1r7vcai5a4dg3bi9cxyb";
+          url = "https://elpa.gnu.org/packages/project-0.6.0.tar";
+          sha256 = "0m0r1xgz1ffx6mi2gjz1dkgrn89sh4y5ysi0gj6p1w05bf8p0lc0";
         };
         packageRequires = [ emacs xref ];
         meta = {
@@ -2801,10 +2824,10 @@
       elpaBuild {
         pname = "pyim";
         ename = "pyim";
-        version = "3.6";
+        version = "3.7.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/pyim-3.6.tar";
-          sha256 = "1fmbzh33s9xdvrfjhkqr9ydcqbiv8lr04k5idvbpc9vwjjjan5y0";
+          url = "https://elpa.gnu.org/packages/pyim-3.7.1.tar";
+          sha256 = "0k73f1qdl51qshnvycjassdh70id5gp5qi5wz7k4zyl8pbampiyd";
         };
         packageRequires = [ async emacs xr ];
         meta = {
@@ -3081,10 +3104,10 @@
       elpaBuild {
         pname = "rec-mode";
         ename = "rec-mode";
-        version = "1.6";
+        version = "1.8.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rec-mode-1.6.tar";
-          sha256 = "1dhv3n2x0bpdisi9bj3qa0bhpjzhs57fga72s4fxh44gp92yl18q";
+          url = "https://elpa.gnu.org/packages/rec-mode-1.8.1.tar";
+          sha256 = "0injk27l38d0sl9nzjz2bkd0qgccxyf31i42mwmivv86kv0kyxyb";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3267,10 +3290,10 @@
       elpaBuild {
         pname = "setup";
         ename = "setup";
-        version = "0.1.2";
+        version = "0.2.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/setup-0.1.2.tar";
-          sha256 = "1q29phch4fvmvc255kgvzsnzdqp6kaip7ybpxprd0kkdjs3jrsqv";
+          url = "https://elpa.gnu.org/packages/setup-0.2.0.tar";
+          sha256 = "1xhjkyksilw1vbx12a4yz4bpj0dhl3m02yi8d9nyd19z098cfa9y";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3297,10 +3320,10 @@
       elpaBuild {
         pname = "shell-command-plus";
         ename = "shell-command+";
-        version = "2.0.0";
+        version = "2.1.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/shell-command+-2.0.0.tar";
-          sha256 = "1l8lwami4rbp94sbb1k4dvv7z0dvf51s0992xragpn9b9jbx5qd6";
+          url = "https://elpa.gnu.org/packages/shell-command+-2.1.0.tar";
+          sha256 = "1jyrnv89989bi03m5h8dj0cllsw3rvyxkiyfrh9v6gpxjwfy8lmq";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3691,10 +3714,10 @@
       elpaBuild {
         pname = "tramp";
         ename = "tramp";
-        version = "2.5.0.3";
+        version = "2.5.0.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tramp-2.5.0.3.tar";
-          sha256 = "0c77d1ihn17lzk9jb7ss346ryprnbii1zmijl6zj0kk4lm8fpfl3";
+          url = "https://elpa.gnu.org/packages/tramp-2.5.0.4.tar";
+          sha256 = "0yk4ckk45gkjp24nfywz49j8pazq33m6pga3lirb5h6zc8an5z24";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3736,10 +3759,10 @@
       elpaBuild {
         pname = "transient";
         ename = "transient";
-        version = "0.3.0";
+        version = "0.3.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/transient-0.3.0.tar";
-          sha256 = "1a457apfl762nn5xf1h3hbvrgs9hybkxh0jwb2y713zkhhck66cp";
+          url = "https://elpa.gnu.org/packages/transient-0.3.2.tar";
+          sha256 = "10zqa245dn6z689z7ap6nx6q9s95whzgybpwl2slpmnawxix2q6i";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3927,10 +3950,10 @@
       elpaBuild {
         pname = "vertico";
         ename = "vertico";
-        version = "0.4";
+        version = "0.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vertico-0.4.tar";
-          sha256 = "1af9ri51i7pn1pcsmbavnwqafrn46vbxrbqjzfi6a7q6n5yv77im";
+          url = "https://elpa.gnu.org/packages/vertico-0.6.tar";
+          sha256 = "19f6ffljraikz83nc2y9q83zjc4cfyzn9rnwm18lwh6sjsydz6kk";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4235,10 +4258,10 @@
       elpaBuild {
         pname = "xref";
         ename = "xref";
-        version = "1.0.4";
+        version = "1.1.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xref-1.0.4.el";
-          sha256 = "0hkm59qqlsfw3w9ws9xhpmmz30ylifmh05a00ba58zvv1kz04x1g";
+          url = "https://elpa.gnu.org/packages/xref-1.1.0.tar";
+          sha256 = "1s7pwk09bry4nqr4bc78a3mbwyrxagai2gpsd49x47czy2x7m3ax";
         };
         packageRequires = [ emacs ];
         meta = {

From 0f1a3ab3dff327ae224f5fe1d95cf3962719673a Mon Sep 17 00:00:00 2001
From: Matt Christ <matt@christ.systems>
Date: Mon, 3 May 2021 17:32:12 -0500
Subject: [PATCH 033/143] emacs pkgs: update org

---
 .../editors/emacs-modes/org-generated.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 0114f4dc180..40ff42e9fae 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -4,10 +4,10 @@
       elpaBuild {
         pname = "org";
         ename = "org";
-        version = "20210412";
+        version = "20210503";
         src = fetchurl {
-          url = "https://orgmode.org/elpa/org-20210412.tar";
-          sha256 = "17hj4y0c9hjqqa7inzjadz9z64vh621lm4cb0asm13r7d1v186yf";
+          url = "https://orgmode.org/elpa/org-20210503.tar";
+          sha256 = "0j9p834c67qzxbxz8s1n8l5blylrpb3jh9wywphlb6jgbgl0mw09";
         };
         packageRequires = [];
         meta = {
@@ -19,10 +19,10 @@
       elpaBuild {
         pname = "org-plus-contrib";
         ename = "org-plus-contrib";
-        version = "20210412";
+        version = "20210503";
         src = fetchurl {
-          url = "https://orgmode.org/elpa/org-plus-contrib-20210412.tar";
-          sha256 = "162nl1a62l9d4nazply93sx4lih11845z87hxmpfd0n7i7s290mh";
+          url = "https://orgmode.org/elpa/org-plus-contrib-20210503.tar";
+          sha256 = "0k0wmnx2g919h3s9ynv1cvdlyxvydglslamlwph4xng4kzcr5lrk";
         };
         packageRequires = [];
         meta = {

From 008ecb1e82af1e7db68aa8f429a095ef34a8376c Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 10:22:25 +0200
Subject: [PATCH 034/143] haskellPackages.hledger-lib: remove unnecessary
 override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3b6f5f3ef5e..c0faf5f27c0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -854,9 +854,6 @@ self: super: {
   snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22
   swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
 
-  # hledger-lib requires the latest version of pretty-simple
-  hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple; };
-
   # Copy hledger man pages from data directory into the proper place. This code
   # should be moved into the cabal2nix generator.
   hledger = overrideCabal super.hledger (drv: {

From e7e6727e9e520cc24f172d7b111188533789c784 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 11:05:36 +0200
Subject: [PATCH 035/143] configuration-hackage2nix.yaml: add myself as
 maintainer for flat

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4cf9ae98736..d73d56baee8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2926,6 +2926,7 @@ package-maintainers:
     # other packages I can help out for
     - systemd
     - fast-logger
+    - flat
     - Euterpea2
     - utc
     - socket

From 6e98fdd7c323c1b78a0a13a867d9ac316cca29ad Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 11:33:42 +0200
Subject: [PATCH 036/143] top-level/release-haskell.nix: add more top-level
 haskell packages

These should now also include all packages that use haskellPackages in
some form where it is apparent from all-packages.nix.

Some of those probably could do with a cleanup (maybe fetchable from
hackage, many are missing justStaticExecutables).
---
 pkgs/top-level/release-haskell.nix | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index bf09485fa0d..d08580dd941 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -83,12 +83,16 @@ let
 
     tests.haskell = packagePlatforms pkgs.tests.haskell;
 
-    # top-level haskell packages
+    # top-level packages that depend on haskellPackages
     inherit (pkgsPlatforms)
+      agda
       bench
+      bustle
+      blucontrol
       cabal-install
       cabal2nix
       cachix
+      cedille
       darcs
       dhall
       dhall-bash
@@ -97,15 +101,20 @@ let
       dhall-json
       dhall-nix
       dhall-text
+      diagrams-builder
       elm2nix
       fffuu
       futhark
+      ghcid
+      git-brunch
+      gitit
       glirc
       hadolint
       haskell-ci
       haskell-language-server
       hasura-graphql-engine
       hinit
+      hedgewars
       hledger
       hledger-iadd
       hledger-interest
@@ -113,7 +122,12 @@ let
       hledger-web
       hlint
       hpack
+      hyper-haskell
+      hyper-haskell-server-with-packages
       icepeak
+      idris
+      ihaskell
+      jl
       koka
       krank
       madlang
@@ -127,21 +141,33 @@ let
       nix-output-monitor
       nix-tree
       nixfmt
+      nota
+      ormolu
       pandoc
+      petrinizer
       place-cursor-at
+      pinboard-notes-backup
       shake
       shellcheck
+      sourceAndTags
       spacecookie
       splot
       stack
       stack2nix
       stutter
       stylish-haskell
+      taffybar
+      tamarin-prover
       taskell
+      termonad-with-packages
+      tldr-hs
       tweet-hs
       update-nix-fetchgit
       uuagc
+      vaultenv
       wstunnel
+      xmobar
+      xmonad-with-packages
       ;
 
     gitAndTools.git-annex = pkgsPlatforms.gitAndTools.git-annex;

From 63bcfc67e380683e0212297f7f027a9abade6b4d Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 12:43:40 +0200
Subject: [PATCH 037/143] haskellPackages.diagrams-cairo: unbreak

https://github.com/diagrams/diagrams-cairo/issues/77
---
 pkgs/development/haskell-modules/configuration-common.nix     | 4 ++++
 .../haskell-modules/configuration-hackage2nix.yaml            | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c0faf5f27c0..ab96dde17d5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1798,4 +1798,8 @@ self: super: {
     passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-latest.sh;
   };
 
+  # Too strict version bounds on base and optparse-applicative
+  # https://github.com/diagrams/diagrams-cairo/issues/77
+  diagrams-cairo = doJailbreak super.diagrams-cairo;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d73d56baee8..17d18182337 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4103,7 +4103,6 @@ broken-packages:
   - Chart-simple
   - chart-svg
   - chart-svg-various
-  - Chart-tests
   - chart-unit
   - charter
   - chatty-text
@@ -4792,7 +4791,6 @@ broken-packages:
   - diagrams-boolean
   - diagrams-braille
   - diagrams-builder
-  - diagrams-cairo
   - diagrams-canvas
   - diagrams-graphviz
   - diagrams-gtk
@@ -6567,7 +6565,6 @@ broken-packages:
   - hidden-char
   - hie-core
   - hieraclus
-  - hierarchical-clustering-diagrams
   - hierarchical-exceptions
   - hierarchical-spectral-clustering
   - hierarchy
@@ -11874,7 +11871,6 @@ broken-packages:
   - yesod-lucid
   - yesod-mangopay
   - yesod-markdown
-  - yesod-media-simple
   - yesod-page-cursor
   - yesod-paginate
   - yesod-pagination

From 5ca8d3570eadcccf60c20e8411159aca234e766d Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 12:44:10 +0200
Subject: [PATCH 038/143] haskellPackages.plots: unmark as broken

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 17d18182337..80e1f355bff 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -9088,7 +9088,6 @@ broken-packages:
   - plot-gtk3
   - Plot-ho-matic
   - plot-lab
-  - plots
   - PlslTools
   - plugins
   - plugins-auto

From 96f573300f85fee4e79a925c18f163322f3a7d8e Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 12:47:11 +0200
Subject: [PATCH 039/143] hackage-packages.nix: Regenerate based on current
 config

---
 pkgs/development/haskell-modules/hackage-packages.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3e8ee4045cc..af3f0122810 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3141,8 +3141,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tests of the Charts library";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ChasingBottoms" = callPackage
@@ -74925,8 +74923,6 @@ self: {
        ];
        description = "Cairo backend for diagrams drawing EDSL";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-canvas" = callPackage
@@ -93042,6 +93038,7 @@ self: {
        ];
        description = "Principled and efficient bit-oriented binary serialization";
        license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sternenseemann ];
      }) {};
 
   "flat-maybe" = callPackage
@@ -129178,8 +129175,6 @@ self: {
        ];
        description = "Draw diagrams of dendrograms made by hierarchical-clustering";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "hierarchical-env" = callPackage
@@ -205336,8 +205331,6 @@ self: {
        ];
        description = "Diagrams based plotting library";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "plotserver-api" = callPackage
@@ -289792,8 +289785,6 @@ self: {
        ];
        description = "Simple display of media types, served by yesod";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-newsfeed" = callPackage

From 990d12641e2ffc56816e52a6eaa866b150f75ddf Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 13:23:03 +0200
Subject: [PATCH 040/143] ihaskell: unbreak

Use upstream release.nix as an inspiration for the correct overrides to
fix RPATH issues and make tests run again.
---
 .../haskell-modules/configuration-common.nix  |  1 -
 .../configuration-hackage2nix.yaml            | 13 ----------
 .../haskell-modules/configuration-nix.nix     | 15 +++++++++++
 .../haskell-modules/hackage-packages.nix      | 26 -------------------
 4 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ab96dde17d5..a9443528f90 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -291,7 +291,6 @@ self: super: {
   htsn = dontCheck super.htsn;
   htsn-import = dontCheck super.htsn-import;
   http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105
-  ihaskell = dontCheck super.ihaskell;
   influxdb = dontCheck super.influxdb;
   integer-roots = dontCheck super.integer-roots; # requires an old version of smallcheck, will be fixed in > 1.0
   itanium-abi = dontCheck super.itanium-abi;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 80e1f355bff..21129a32a0e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7153,22 +7153,9 @@ broken-packages:
   - ige-mac-integration
   - ignore
   - igraph
-  - ihaskell
-  - ihaskell-aeson
   - ihaskell-basic
-  - ihaskell-blaze
-  - ihaskell-charts
-  - ihaskell-diagrams
   - ihaskell-display
-  - ihaskell-gnuplot
-  - ihaskell-graphviz
-  - ihaskell-hatex
-  - ihaskell-hvega
-  - ihaskell-inline-r
-  - ihaskell-juicypixels
-  - ihaskell-magic
   - ihaskell-parsec
-  - ihaskell-plot
   - ihaskell-rlangqq
   - ihaskell-widgets
   - ihttp
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index ba00d200073..5063e81c1f4 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -826,4 +826,19 @@ self: super: builtins.intersectAttrs super {
 
   # Tests access internet
   prune-juice = dontCheck super.prune-juice;
+
+  # based on https://github.com/gibiansky/IHaskell/blob/aafeabef786154d81ab7d9d1882bbcd06fc8c6c4/release.nix
+  ihaskell = overrideCabal super.ihaskell (drv: {
+    configureFlags = (drv.configureFlags or []) ++ [
+      # ihaskell's cabal file forces building a shared executable,
+      # but without passing --enable-executable-dynamic, the RPATH
+      # contains /build/ and leads to a build failure with nix
+      "--enable-executable-dynamic"
+    ];
+    preCheck = ''
+      export HOME=$TMPDIR/home
+      export PATH=$PWD/dist/build/ihaskell:$PATH
+      export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH
+    '';
+  });
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index af3f0122810..423e1697f11 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -146759,8 +146759,6 @@ self: {
        ];
        description = "A Haskell backend kernel for the IPython project";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-aeson" = callPackage
@@ -146776,8 +146774,6 @@ self: {
        ];
        description = "IHaskell display instances for Aeson";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-basic" = callPackage
@@ -146802,8 +146798,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ];
        description = "IHaskell display instances for blaze-html types";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-charts" = callPackage
@@ -146820,8 +146814,6 @@ self: {
        ];
        description = "IHaskell display instances for charts types";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-diagrams" = callPackage
@@ -146838,8 +146830,6 @@ self: {
        ];
        description = "IHaskell display instances for diagram types";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-display" = callPackage
@@ -146864,8 +146854,6 @@ self: {
        libraryHaskellDepends = [ base bytestring gnuplot ihaskell ];
        description = "IHaskell display instance for Gnuplot (from gnuplot package)";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-graphviz" = callPackage
@@ -146877,8 +146865,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ihaskell process ];
        description = "IHaskell display instance for GraphViz (external binary)";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-hatex" = callPackage
@@ -146890,8 +146876,6 @@ self: {
        libraryHaskellDepends = [ base HaTeX ihaskell text ];
        description = "IHaskell display instances for hatex";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-hvega" = callPackage
@@ -146903,8 +146887,6 @@ self: {
        libraryHaskellDepends = [ aeson base hvega ihaskell text ];
        description = "IHaskell display instance for hvega types";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-inline-r" = callPackage
@@ -146922,8 +146904,6 @@ self: {
        ];
        description = "Embed R quasiquotes and plots in IHaskell notebooks";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-juicypixels" = callPackage
@@ -146938,8 +146918,6 @@ self: {
        ];
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-magic" = callPackage
@@ -146956,8 +146934,6 @@ self: {
        ];
        description = "IHaskell display instances for bytestrings";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-parsec" = callPackage
@@ -146986,8 +146962,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ];
        description = "IHaskell display instance for Plot (from plot package)";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-rlangqq" = callPackage

From 648a5b14fb2bd10456e54e7ad9f596946877021a Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 13:34:35 +0200
Subject: [PATCH 041/143] haskellPackages.ihaskell-{display,basic}: jailbreak

Version bounds on base are too strict:
https://github.com/gibiansky/IHaskell/issues/1217

Fixes evaluation of top-level ihaskell.
---
 pkgs/development/haskell-modules/configuration-common.nix    | 5 +++++
 .../haskell-modules/configuration-hackage2nix.yaml           | 2 --
 pkgs/development/haskell-modules/hackage-packages.nix        | 4 ----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a9443528f90..8b2151e995b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1801,4 +1801,9 @@ self: super: {
   # https://github.com/diagrams/diagrams-cairo/issues/77
   diagrams-cairo = doJailbreak super.diagrams-cairo;
 
+  # Too strict version bounds on base
+  # https://github.com/gibiansky/IHaskell/issues/1217
+  ihaskell-display = doJailbreak super.ihaskell-display;
+  ihaskell-basic = doJailbreak super.ihaskell-basic;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 21129a32a0e..6a5feb2c721 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7153,8 +7153,6 @@ broken-packages:
   - ige-mac-integration
   - ignore
   - igraph
-  - ihaskell-basic
-  - ihaskell-display
   - ihaskell-parsec
   - ihaskell-rlangqq
   - ihaskell-widgets
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 423e1697f11..19a96571ca3 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -146785,8 +146785,6 @@ self: {
        libraryHaskellDepends = [ base ihaskell ];
        description = "IHaskell display instances for basic types";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-blaze" = callPackage
@@ -146841,8 +146839,6 @@ self: {
        libraryHaskellDepends = [ base classy-prelude ihaskell ];
        description = "IHaskell display instances for basic types";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-gnuplot" = callPackage

From e30cf42f0cd541763671baf57d084d89face9463 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 12:54:16 +0200
Subject: [PATCH 042/143] haskellPackages.cabal2nix-latest: use
 unstable-YYYY-MM-DD format

This is the preferred format for things fetched from git or similar that
are not proper releases: https://nixos.org/manual/nixpkgs/stable/#sec-package-naming

Also we should think about making name and attribute name more
consistent: cabal2nix-latest -> cabal2nix-unstable
---
 maintainers/scripts/haskell/update-cabal2nix-latest.sh | 2 +-
 pkgs/development/haskell-modules/cabal2nix-latest.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/haskell/update-cabal2nix-latest.sh b/maintainers/scripts/haskell/update-cabal2nix-latest.sh
index 1f22bb1792f..e8018e1384d 100755
--- a/maintainers/scripts/haskell/update-cabal2nix-latest.sh
+++ b/maintainers/scripts/haskell/update-cabal2nix-latest.sh
@@ -14,4 +14,4 @@ commit="$(jq -r .commit.sha <<< "$head_info")"
 date="$(date "--date=$(jq -r .commit.commit.committer.date <<< "$head_info")" +%F)"
 # generate nix expression from cabal file, replacing the version with the commit date
 echo '# This file defines cabal2nix-latest, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-latest.nix
-cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-latest.nix
+cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-latest.nix
diff --git a/pkgs/development/haskell-modules/cabal2nix-latest.nix b/pkgs/development/haskell-modules/cabal2nix-latest.nix
index 75c9de963a0..a8b37e4e46e 100644
--- a/pkgs/development/haskell-modules/cabal2nix-latest.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-latest.nix
@@ -8,7 +8,7 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "2021-05-01";
+  version = "unstable-2021-05-01";
   src = fetchzip {
     url = "https://github.com/NixOS/cabal2nix/archive/849a3507c849e3e2331efbc5ebe391b70a215ddc.tar.gz";
     sha256 = "0g91d2bd72l3kkykc47a2raymvgw6427n7cg9ayzvrpldkd0silc";

From 794bc5e9ed7ebb17822b510f24dcc607e727484d Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 13:38:29 +0200
Subject: [PATCH 043/143] haskellPackages.cabal2nix-unstable: rename from
 cabal2nix-latest

---
 .../scripts/haskell/regenerate-hackage-packages.sh        | 4 ++--
 ...e-cabal2nix-latest.sh => update-cabal2nix-unstable.sh} | 8 ++++----
 .../{cabal2nix-latest.nix => cabal2nix-unstable.nix}      | 2 +-
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 pkgs/development/haskell-modules/non-hackage-packages.nix | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename maintainers/scripts/haskell/{update-cabal2nix-latest.sh => update-cabal2nix-unstable.sh} (68%)
 rename pkgs/development/haskell-modules/{cabal2nix-latest.nix => cabal2nix-unstable.nix} (93%)

diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
index 2408d893dae..a56d8a0a0e2 100755
--- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh
+++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-latest -I nixpkgs=.
+#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable -I nixpkgs=.
 
 # This script is used to regenerate nixpkgs' Haskell package set, using a tool
 # called hackage2nix. hackage2nix looks at
@@ -9,7 +9,7 @@
 # companion tool cabal2nix.
 #
 # Related scripts are update-hackage.sh, for updating the snapshot of the
-# Hackage database used by hackage2nix, and update-cabal2nix-latest.sh,
+# Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh,
 # for updating the version of hackage2nix used to perform this task.
 
 set -euo pipefail
diff --git a/maintainers/scripts/haskell/update-cabal2nix-latest.sh b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh
similarity index 68%
rename from maintainers/scripts/haskell/update-cabal2nix-latest.sh
rename to maintainers/scripts/haskell/update-cabal2nix-unstable.sh
index e8018e1384d..41583704560 100755
--- a/maintainers/scripts/haskell/update-cabal2nix-latest.sh
+++ b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh
@@ -1,7 +1,7 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-latest -I nixpkgs=.
+#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable -I nixpkgs=.
 
-# Updates cabal2nix-latest to the latest master of the nixos/cabal2nix repository.
+# Updates cabal2nix-unstable to the latest master of the nixos/cabal2nix repository.
 # See regenerate-hackage-packages.sh for details on the purpose of this script.
 
 set -euo pipefail
@@ -13,5 +13,5 @@ commit="$(jq -r .commit.sha <<< "$head_info")"
 # extract commit timestamp and convert to date
 date="$(date "--date=$(jq -r .commit.commit.committer.date <<< "$head_info")" +%F)"
 # generate nix expression from cabal file, replacing the version with the commit date
-echo '# This file defines cabal2nix-latest, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-latest.nix
-cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-latest.nix
+echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-unstable.nix
+cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-unstable.nix
diff --git a/pkgs/development/haskell-modules/cabal2nix-latest.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
similarity index 93%
rename from pkgs/development/haskell-modules/cabal2nix-latest.nix
rename to pkgs/development/haskell-modules/cabal2nix-unstable.nix
index a8b37e4e46e..3b8a85881f5 100644
--- a/pkgs/development/haskell-modules/cabal2nix-latest.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
@@ -1,4 +1,4 @@
-# This file defines cabal2nix-latest, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.
+# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.
 { mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
 , containers, deepseq, directory, distribution-nixpkgs, fetchzip
 , filepath, hackage-db, hopenssl, hpack, language-nix, lens, lib
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8b2151e995b..baa65bb2181 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1793,8 +1793,8 @@ self: super: {
   # https://github.com/obsidiansystems/database-id/issues/1
   database-id-class = doJailbreak super.database-id-class;
 
-  cabal2nix-latest = overrideCabal super.cabal2nix-latest {
-    passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-latest.sh;
+  cabal2nix-unstable = overrideCabal super.cabal2nix-unstable {
+    passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh;
   };
 
   # Too strict version bounds on base and optparse-applicative
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index 7c3c43fd9dc..1882d68f234 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -13,7 +13,7 @@ self: super: {
 
   # Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated
   # from the latest master instead of the current version on Hackage.
-  cabal2nix-latest = self.callPackage ./cabal2nix-latest.nix { };
+  cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { };
 
   # https://github.com/channable/vaultenv/issues/1
   vaultenv = self.callPackage ../tools/haskell/vaultenv { };

From 48ba23210bcc95555ab404074935f5e7e14e579f Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 12:03:26 +0200
Subject: [PATCH 044/143] haskell-hyper: 0.1.0.2 -> 0.2.3.0

---
 pkgs/development/tools/haskell/hyper-haskell/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix
index 6b139904616..356936fe7d3 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/default.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix
@@ -1,18 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, jshon, electron_3
+{ lib, stdenv, fetchFromGitHub, jshon, electron_10
 , runtimeShell, hyper-haskell-server, extra-packages ? [] }:
 
 let
   binPath = lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
-  electron = electron_3;
+  electron = electron_10;
 in stdenv.mkDerivation rec {
   pname = "hyper-haskell";
-  version = "0.1.0.2";
+  version = "0.2.3.0";
 
   src = fetchFromGitHub {
     owner = "HeinrichApfelmus";
     repo = "hyper-haskell";
     rev = "v${version}";
-    sha256 = "1k38h7qx12z7463z8466pji0nwfkp4qkg7q83kns2mzmwmw5jnmb";
+    sha256 = "1nmkry4wh6a2dy98fcs81mq2p7zhxp1k0f4m3szr6fm3j1zwrd43";
   };
 
   propagatedBuildInputs = extra-packages;

From 517662d02d0cdceb15f2d203f60bb2860c75a150 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 12:03:56 +0200
Subject: [PATCH 045/143] haskellPackages.hyper-extra: unbreak

https://github.com/HeinrichApfelmus/hyper-haskell/issues/42
---
 pkgs/development/haskell-modules/configuration-common.nix     | 4 ++++
 .../haskell-modules/configuration-hackage2nix.yaml            | 2 --
 pkgs/development/haskell-modules/hackage-packages.nix         | 4 ----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index baa65bb2181..f08525a5450 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1806,4 +1806,8 @@ self: super: {
   ihaskell-display = doJailbreak super.ihaskell-display;
   ihaskell-basic = doJailbreak super.ihaskell-basic;
 
+  # too strict bounds on QuickCheck
+  # https://github.com/HeinrichApfelmus/hyper-haskell/issues/42
+  hyper-extra = doJailbreak super.hyper-extra;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 6a5feb2c721..005a3a69e8f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7111,8 +7111,6 @@ broken-packages:
   - hylolib
   - hylotab
   - hyloutils
-  - hyper-extra
-  - hyper-haskell-server
   - hyperdrive
   - hyperfunctions
   - hyperion
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 19a96571ca3..c2df2f96872 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -145465,8 +145465,6 @@ self: {
        ];
        description = "Display instances for the HyperHaskell graphical Haskell interpreter";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyper-haskell-server" = callPackage
@@ -145486,8 +145484,6 @@ self: {
        ];
        description = "Server back-end for the HyperHaskell graphical Haskell interpreter";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyperdrive" = callPackage

From 86c975b00c8111502c972b1aed16dc364f459dd6 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 12:07:02 +0200
Subject: [PATCH 046/143] haskell-hyper: refactor expression

* Use stdenvNoCC
* Utilize unpackPhase, allow for patching
---
 .../tools/haskell/hyper-haskell/default.nix    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix
index 356936fe7d3..2b3fb76903e 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/default.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix
@@ -1,10 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, jshon, electron_10
+{ lib, stdenvNoCC, fetchFromGitHub, jshon, electron_10
 , runtimeShell, hyper-haskell-server, extra-packages ? [] }:
 
 let
   binPath = lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
   electron = electron_10;
-in stdenv.mkDerivation rec {
+in stdenvNoCC.mkDerivation rec {
   pname = "hyper-haskell";
   version = "0.2.3.0";
 
@@ -17,19 +17,21 @@ in stdenv.mkDerivation rec {
 
   propagatedBuildInputs = extra-packages;
 
-  buildCommand = ''
+  dontBuild = true;
+
+  installPhase = ''
     mkdir -p $out/bin $out/share/hyper-haskell/worksheets $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/mime/packages
 
     # Electron app
-    cp -R $src/app $out
+    cp -R app $out
 
     # Desktop Launcher
-    cp $src/resources/hyper-haskell.desktop $out/share/applications/hyper-haskell.desktop
-    cp $src/resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/hyper-haskell.svg
-    cp $src/resources/shared-mime-info.xml $out/share/mime/packages/hyper-haskell.xml
+    cp resources/hyper-haskell.desktop $out/share/applications/hyper-haskell.desktop
+    cp resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/hyper-haskell.svg
+    cp resources/shared-mime-info.xml $out/share/mime/packages/hyper-haskell.xml
 
     # install example worksheets with backend set to nix
-    for worksheet in "$src/worksheets/"*.hhs; do
+    for worksheet in "worksheets/"*.hhs; do
       ${jshon}/bin/jshon -e settings -s nix -i packageTool -p < $worksheet > $out/share/hyper-haskell/worksheets/`basename $worksheet`
     done
 

From f37d5402bca698b8d06829812345e9d55c29ffbb Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Tue, 4 May 2021 13:43:44 +0200
Subject: [PATCH 047/143] maintainers/scripts/haskell: Improve commit messages

---
 .../haskell/regenerate-hackage-packages.sh    |  8 +++++--
 maintainers/scripts/haskell/update-hackage.sh | 10 +++++++--
 .../scripts/haskell/update-stackage.sh        | 22 +++++++++++++++----
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
index a56d8a0a0e2..96131f98fa0 100755
--- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh
+++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
@@ -20,6 +20,10 @@ unpacked_hackage="$(nix-build -E "$extractionDerivation" --no-out-link)"
 hackage2nix --hackage "$unpacked_hackage" --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) --nixpkgs "$PWD" --config pkgs/development/haskell-modules/configuration-hackage2nix.yaml
 
 if [[ "${1:-}" == "--do-commit" ]]; then
-   git add pkgs/development/haskell-modules/hackage-packages.nix
-   git commit -m "hackage-packages.nix: Regenerate based on current config"
+git add pkgs/development/haskell-modules/hackage-packages.nix
+git commit -F - << EOF
+hackage-packages.nix: Regenerate based on current config
+
+This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
+EOF
 fi
diff --git a/maintainers/scripts/haskell/update-hackage.sh b/maintainers/scripts/haskell/update-hackage.sh
index a8ad8d9e2ec..3c338e98c64 100755
--- a/maintainers/scripts/haskell/update-hackage.sh
+++ b/maintainers/scripts/haskell/update-hackage.sh
@@ -7,9 +7,11 @@ set -euo pipefail
 
 pin_file=pkgs/data/misc/hackage/pin.json
 current_commit="$(jq -r .commit $pin_file)"
+old_date="$(jq -r .msg $pin_file | sed 's/Update from Hackage at //')"
 git_info="$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/commercialhaskell/all-cabal-hashes/branches/hackage)"
 head_commit="$(echo "$git_info" | jq -r .commit.sha)"
 commit_msg="$(echo "$git_info" | jq -r .commit.commit.message)"
+new_date="$(echo "$commit_msg" | sed 's/Update from Hackage at //')"
 
 if [ "$current_commit" != "$head_commit" ]; then
    url="https://github.com/commercialhaskell/all-cabal-hashes/archive/$head_commit.tar.gz"
@@ -24,6 +26,10 @@ if [ "$current_commit" != "$head_commit" ]; then
 fi
 
 if [[ "${1:-}" == "--do-commit" ]]; then
-   git add pkgs/data/misc/hackage/pin.json
-   git commit -m "all-cabal-hashes: Changing pin to '$commit_msg'"
+git add pkgs/data/misc/hackage/pin.json
+git commit -F - << EOF
+all-cabal-hashes: $old_date -> $new_date
+
+This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
+EOF
 fi
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index c3be3158b29..b332e8d4dc6 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -4,11 +4,21 @@ set -eu -o pipefail
 
 tmpfile=$(mktemp "update-stackage.XXXXXXX")
 # shellcheck disable=SC2064
+
+config_file="pkgs/development/haskell-modules/configuration-hackage2nix.yaml"
+
 trap "rm ${tmpfile} ${tmpfile}.new" 0
+touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors.
 
 curl -L -s "https://stackage.org/nightly/cabal.config" >"$tmpfile"
+old_version=$(grep "  # Stackage Nightly" $config_file | sed -E 's/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/\1/')
 version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.nightly-//p" "$tmpfile")
 
+if [[ "$old_version" == "$version" ]]; then
+   echo "No new stackage version"
+   exit 0 # Nothing to do
+fi
+
 # Create a simple yaml version of the file.
 sed -r \
     -e '/^--/d' \
@@ -43,14 +53,18 @@ sed -r \
 # Drop the previous configuration ...
 # shellcheck disable=SC1004
 sed -e '/  # Stackage Nightly/,/^$/c \TODO\
-'   -i pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+'   -i $config_file
 
 # ... and replace it with the new one.
 sed -e "/TODO/r $tmpfile" \
     -e "s/TODO/  # Stackage Nightly $version/" \
-    -i pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+    -i $config_file
 
 if [[ "${1:-}" == "--do-commit" ]]; then
-   git add pkgs/development/haskell-modules/configuration-hackage2nix.yaml
-   git commit -m "configuration-hackage2nix.yaml: Changing Stackage pin to Nightly $version"
+git add $config_file
+git commit -F - << EOF
+Stackage Nightly: $old_version -> $version
+
+This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
+EOF
 fi

From caf7725f9583b84425d83fb3ff0d735dcc2448a5 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 11:20:34 +0200
Subject: [PATCH 048/143] stutter: move overrides into configuration-nix.nix

Move necessary overrides into configuration-nix.nix, so there's no
discrepancy between stutter and haskellPackages.stutter.

However the build of stutter is still broken its dependency snipcheck
doesn't build with the pandoc version we have.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 7 +++++++
 pkgs/top-level/all-packages.nix                        | 4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 5063e81c1f4..3f0e2145394 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -841,4 +841,11 @@ self: super: builtins.intersectAttrs super {
       export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH
     '';
   });
+
+  # tests need to execute the built executable
+  stutter = overrideCabal super.stutter (drv: {
+    preCheck = ''
+      export PATH=dist/build/stutter:$PATH
+    '' + (drv.preCheck or "");
+  });
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04effbffbd3..f426a8a84f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8665,9 +8665,7 @@ in
 
   stunnel = callPackage ../tools/networking/stunnel { };
 
-  stutter = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.stutter) (drv: {
-    preCheck = "export PATH=dist/build/stutter:$PATH";
-  });
+  stutter = haskell.lib.justStaticExecutables haskellPackages.stutter;
 
   strongswan    = callPackage ../tools/networking/strongswan { };
   strongswanTNC = strongswan.override { enableTNC = true; };

From 6784d2b87c275b32f04e27e95ac9e73a9135b9e0 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 15:30:37 +0200
Subject: [PATCH 049/143] top-level/release-haskell.nix: add less obvious
 top-level haskell pkgs

These were found by grepping for haskellPackages in the whole
repository.
---
 pkgs/top-level/release-haskell.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index d08580dd941..2d99c41ca6e 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -86,14 +86,18 @@ let
     # top-level packages that depend on haskellPackages
     inherit (pkgsPlatforms)
       agda
+      arion
       bench
       bustle
       blucontrol
       cabal-install
       cabal2nix
       cachix
+      carp
       cedille
+      client-ip-echo
       darcs
+      dconf2nix
       dhall
       dhall-bash
       dhall-docs
@@ -113,6 +117,8 @@ let
       haskell-ci
       haskell-language-server
       hasura-graphql-engine
+      hci
+      hercules-ci-agent
       hinit
       hedgewars
       hledger
@@ -130,8 +136,11 @@ let
       jl
       koka
       krank
+      lambdabot
+      ldgallery
       madlang
       matterhorn
+      mueval
       neuron-notes
       niv
       nix-delegate
@@ -139,18 +148,22 @@ let
       nix-diff
       nix-linter
       nix-output-monitor
+      nix-script
       nix-tree
       nixfmt
       nota
       ormolu
       pandoc
+      pakcs
       petrinizer
       place-cursor-at
       pinboard-notes-backup
+      pretty-simple
       shake
       shellcheck
       sourceAndTags
       spacecookie
+      spago
       splot
       stack
       stack2nix
@@ -163,14 +176,18 @@ let
       tldr-hs
       tweet-hs
       update-nix-fetchgit
+      uqm
       uuagc
       vaultenv
       wstunnel
       xmobar
       xmonad-with-packages
+      yi
+      zsh-git-prompt
       ;
 
     gitAndTools.git-annex = pkgsPlatforms.gitAndTools.git-annex;
+    elmPackages.elm = pkgsPlatforms.elmPackages.elm;
   } // versionedCompilerJobs {
     # Packages which should be checked on more than the
     # default GHC version. This list can be used to test

From 07dd4a91f572762c99172903334b2e884c8f7a53 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 15:38:20 +0200
Subject: [PATCH 050/143] top-level/release-haskell.nix: use top-level
 git-annex attribute

This saves us from the annoyances of the gitAndTools attribute set which
doesn't have recurseForDerivations and is thus ignored by
packagePlatforms.
---
 pkgs/top-level/release-haskell.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 2d99c41ca6e..cce010642d3 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -67,9 +67,7 @@ let
   };
 
   # hydra jobs for `pkgs` of which we import a subset of
-  pkgsPlatforms = packagePlatforms pkgs // {
-    gitAndTools = packagePlatforms pkgs.gitAndTools;
-  };
+  pkgsPlatforms = packagePlatforms pkgs;
 
   # names of packages in an attribute set that are maintained
   maintainedPkgNames = set: builtins.attrNames
@@ -110,6 +108,7 @@ let
       fffuu
       futhark
       ghcid
+      git-annex
       git-brunch
       gitit
       glirc
@@ -186,7 +185,6 @@ let
       zsh-git-prompt
       ;
 
-    gitAndTools.git-annex = pkgsPlatforms.gitAndTools.git-annex;
     elmPackages.elm = pkgsPlatforms.elmPackages.elm;
   } // versionedCompilerJobs {
     # Packages which should be checked on more than the

From ea71b0aa913b5d1340b4d3a5a630cf01bd0577b1 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 15:40:52 +0200
Subject: [PATCH 051/143] top-level/release-haskell.nix: also tests writers
 tests

This should show us what impact our changes have on writeHaskell.
---
 pkgs/top-level/release-haskell.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index cce010642d3..c9c16d01771 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -79,7 +79,12 @@ let
     haskellPackages = packagePlatforms pkgs.haskellPackages;
     haskell.compiler = packagePlatforms pkgs.haskell.compiler;
 
-    tests.haskell = packagePlatforms pkgs.tests.haskell;
+    tests = let
+      testPlatforms = packagePlatforms pkgs.tests;
+    in {
+      haskell = testPlatforms.haskell;
+      writers = testPlatforms.writers;
+    };
 
     # top-level packages that depend on haskellPackages
     inherit (pkgsPlatforms)
@@ -216,6 +221,7 @@ let
       constituents = accumulateDerivations [
         # haskell specific tests
         jobs.tests.haskell
+        jobs.tests.writers # writeHaskell{,Bin}
         # important top-level packages
         jobs.cabal-install
         jobs.cabal2nix

From 75f01ec9094f29477e53e043c72bfd17c27bdab1 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 16:06:57 +0200
Subject: [PATCH 052/143] yi: unbreak

yi-language: apply patch allowing newer regex-* dependencies
---
 .../haskell-modules/configuration-common.nix  | 10 ++++++
 .../configuration-hackage2nix.yaml            | 16 ----------
 .../haskell-modules/hackage-packages.nix      | 32 -------------------
 3 files changed, 10 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f08525a5450..191b4fea760 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1810,4 +1810,14 @@ self: super: {
   # https://github.com/HeinrichApfelmus/hyper-haskell/issues/42
   hyper-extra = doJailbreak super.hyper-extra;
 
+  # Fixes too strict version bounds on regex libraries
+  # Presumably to be removed at the next release
+  yi-language = appendPatch super.yi-language (pkgs.fetchpatch {
+    url = "https://github.com/yi-editor/yi/commit/0d3bcb5ba4c237d57ce33a3dc39b63c56d890765.patch";
+    sha256 = "0r4mzngs0x1akqpajzx7ssa9rax977fvj5ra8d3grfbpx6z0nm01";
+    includes = [ "yi-language.cabal" ];
+    stripLen = 2;
+    extraPrefix = "";
+  });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 005a3a69e8f..21b6716d064 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -11883,24 +11883,8 @@ broken-packages:
   - yggdrasil
   - yhccore
   - yhseq
-  - yi
   - yi-contrib
-  - yi-core
-  - yi-dynamic-configuration
-  - yi-emacs-colours
-  - yi-frontend-pango
-  - yi-frontend-vty
-  - yi-fuzzy-open
-  - yi-ireader
-  - yi-keymap-cua
-  - yi-keymap-emacs
-  - yi-keymap-vim
-  - yi-language
-  - yi-misc-modes
-  - yi-mode-haskell
-  - yi-mode-javascript
   - yi-monokai
-  - yi-snippet
   - yi-solarized
   - yi-spolsky
   - yices
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c2df2f96872..381bc6b8353 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -290668,8 +290668,6 @@ self: {
        ];
        description = "Yi editor";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-contrib" = callPackage
@@ -290720,8 +290718,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq yi-rope ];
        description = "Yi editor core library";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-dynamic-configuration" = callPackage
@@ -290738,8 +290734,6 @@ self: {
        ];
        description = "Dynamic configuration support for Yi";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-emacs-colours" = callPackage
@@ -290751,8 +290745,6 @@ self: {
        libraryHaskellDepends = [ base containers split yi-language ];
        description = "Simple mapping from colour names used in emacs to Color";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-frontend-pango" = callPackage
@@ -290772,8 +290764,6 @@ self: {
        ];
        description = "Pango frontend for Yi editor";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-frontend-vty" = callPackage
@@ -290791,8 +290781,6 @@ self: {
        ];
        description = "Vty frontend for Yi editor";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-fuzzy-open" = callPackage
@@ -290811,8 +290799,6 @@ self: {
        ];
        description = "Fuzzy open plugin for yi";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-gtk" = callPackage
@@ -290840,8 +290826,6 @@ self: {
        ];
        description = "Yi editor incremental reader";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-keymap-cua" = callPackage
@@ -290857,8 +290841,6 @@ self: {
        ];
        description = "Cua keymap for Yi editor";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-keymap-emacs" = callPackage
@@ -290876,8 +290858,6 @@ self: {
        ];
        description = "Emacs keymap for Yi editor";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-keymap-vim" = callPackage
@@ -290904,8 +290884,6 @@ self: {
        ];
        description = "Vim keymap for Yi editor";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-language" = callPackage
@@ -290933,8 +290911,6 @@ self: {
        ];
        description = "Collection of language-related Yi libraries";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-misc-modes" = callPackage
@@ -290952,8 +290928,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor miscellaneous modes";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-mode-haskell" = callPackage
@@ -290971,8 +290945,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor haskell mode";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-mode-javascript" = callPackage
@@ -290991,8 +290963,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor javascript mode";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-monokai" = callPackage
@@ -291045,8 +291015,6 @@ self: {
        ];
        description = "Snippet support for yi";
        license = lib.licenses.gpl2Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-solarized" = callPackage

From 917524cb3908b5010e5804b32a8b2ef2cd3bfccd Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 11:38:46 +0200
Subject: [PATCH 053/143] pinboard-notes-backup: justStaticExecutables, move
 overrides

Should reduce closure size and reduce the difference between top-level
and haskellPackages version of pinboard-notes-backup.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix                        | 9 +--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 3f0e2145394..b6bfb78771d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -848,4 +848,13 @@ self: super: builtins.intersectAttrs super {
       export PATH=dist/build/stutter:$PATH
     '' + (drv.preCheck or "");
   });
+
+  # Install man page and generate shell completions
+  pinboard-notes-backup = overrideCabal
+    (generateOptparseApplicativeCompletion "pnbackup" super.pinboard-notes-backup)
+    (drv: {
+      postInstall = ''
+        install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1
+      '' + (drv.postInstall or "");
+    });
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f426a8a84f8..e7715c6cda5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23793,14 +23793,7 @@ in
 
   pinboard = with python3Packages; toPythonApplication pinboard;
 
-  pinboard-notes-backup = haskell.lib.overrideCabal
-    (haskell.lib.generateOptparseApplicativeCompletion "pnbackup"
-      haskellPackages.pinboard-notes-backup)
-    (drv: {
-      postInstall = ''
-        install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1
-      '' + (drv.postInstall or "");
-    });
+  pinboard-notes-backup = haskell.lib.justStaticExecutables haskellPackages.pinboard-notes-backup;
 
   pixelnuke = callPackage ../applications/graphics/pixelnuke { };
 

From 4da6569df4d4c8203c902a7b052a03e3b5a52679 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 16:22:44 +0200
Subject: [PATCH 054/143] haskellPackages.pinboard-notes-backup: add bdesham to
 maintainers

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 21b6716d064..1c4648ffa1a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2935,6 +2935,8 @@ package-maintainers:
     - yarn2nix
   poscat:
     - hinit
+  bdesham:
+    - pinboard-notes-backup
 
 unsupported-platforms:
   alsa-mixer:                                   [ x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 381bc6b8353..6a82b343bf9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -202981,6 +202981,7 @@ self: {
        ];
        description = "Back up the notes you've saved to Pinboard";
        license = lib.licenses.gpl3Only;
+       maintainers = with lib.maintainers; [ bdesham ];
      }) {};
 
   "pinch" = callPackage

From fbe45054e4705b3e6dc14e0015915b033f0136fe Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 16:56:31 +0200
Subject: [PATCH 055/143] haskellPackages.jsaddle: unbreak

Luckily, only version bounds with no weird GHC failures:
https://github.com/ghcjs/jsaddle/issues/123
---
 pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 191b4fea760..1b51fe615ca 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1820,4 +1820,12 @@ self: super: {
     extraPrefix = "";
   });
 
+  # https://github.com/ghcjs/jsaddle/issues/123
+  jsaddle = overrideCabal super.jsaddle (drv: {
+    # lift conditional version constraint on ref-tf
+    postPatch = ''
+      sed -i 's/ref-tf.*,/ref-tf,/' jsaddle.cabal
+    '' + (drv.postPatch or "");
+  });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 48e4953c0c4d9e7ca1dfd5ab77135014c1efc0f0 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Wed, 5 May 2021 00:55:40 +1000
Subject: [PATCH 056/143] ihaskell: remove unnecessary ihaskell-display package

---
 pkgs/development/tools/haskell/ihaskell/wrapper.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
index 875d5a8a4a8..ec8261e5dec 100644
--- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -4,7 +4,6 @@ let
     self.ihaskell
     (haskell.lib.doJailbreak self.ihaskell-blaze)
     (haskell.lib.doJailbreak self.ihaskell-diagrams)
-    (haskell.lib.doJailbreak self.ihaskell-display)
   ] ++ packages self);
   ihaskellSh = writeScriptBin "ihaskell-notebook" ''
     #! ${stdenv.shell}

From f9f78b82cf01ebe579b956ec534bce6ed538d225 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 19:00:51 +0200
Subject: [PATCH 057/143] ihaskell: clean up unnecessary doJailbreaks

---
 pkgs/development/tools/haskell/ihaskell/wrapper.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
index ec8261e5dec..4a848231410 100644
--- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -2,8 +2,8 @@
 let
   ihaskellEnv = ghcWithPackages (self: [
     self.ihaskell
-    (haskell.lib.doJailbreak self.ihaskell-blaze)
-    (haskell.lib.doJailbreak self.ihaskell-diagrams)
+    self.ihaskell-blaze
+    self.ihaskell-diagrams
   ] ++ packages self);
   ihaskellSh = writeScriptBin "ihaskell-notebook" ''
     #! ${stdenv.shell}

From 595a50fd07e6a3ea5ad907e65c527c89bc2d45d6 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 19 Apr 2021 16:23:11 -0400
Subject: [PATCH 058/143] linux/common-config.nix: Enable FB_SIMPLE on AArch64

---
 pkgs/os-specific/linux/kernel/common-config.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 5cece836b73..20f3ce1a00a 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -871,6 +871,11 @@ let
       # The kernel command line will override a platform-specific configuration from its device tree.
       # https://github.com/torvalds/linux/blob/856deb866d16e29bd65952e0289066f6078af773/kernel/dma/contiguous.c#L35-L44
       CMA_SIZE_MBYTES = freeform "32";
+
+      # Many ARM SBCs hand off a pre-configured framebuffer.
+      # This always can can be replaced by the actual native driver.
+      # Keeping it a built-in ensures it will be used if possible.
+      FB_SIMPLE = yes;
     };
   };
 in

From 7264c049c73b433a3f6eebfe8f02bb3e4c903e69 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 1 May 2021 16:59:15 -0400
Subject: [PATCH 059/143] linux/common-config.nix: Configure for armv7l-linux
 too

---
 pkgs/os-specific/linux/kernel/common-config.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 20f3ce1a00a..776a422df73 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -859,7 +859,7 @@ let
       # Bump the maximum number of CPUs to support systems like EC2 x1.*
       # instances and Xeon Phi.
       NR_CPUS = freeform "384";
-    } // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
+    } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
       # Enables support for the Allwinner Display Engine 2.0
       SUN8I_DE2_CCU = whenAtLeast "4.13" yes;
 
@@ -876,6 +876,9 @@ let
       # This always can can be replaced by the actual native driver.
       # Keeping it a built-in ensures it will be used if possible.
       FB_SIMPLE = yes;
+
+    } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux") {
+      ARM_LPAE = yes;
     };
   };
 in

From c60de9291772c4186dda97da576039e6c7037b4d Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 19 Apr 2021 16:20:37 -0400
Subject: [PATCH 060/143] profiles/all-hardware.nix: Add simplefb for AArch64

---
 nixos/modules/profiles/all-hardware.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index d460c52dbef..b2dd488908a 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -51,6 +51,13 @@ in
 
       # Hyper-V support.
       "hv_storvsc"
+    ] ++ lib.optionals pkgs.stdenv.isAarch64 [
+      # Most of the following falls into two categories:
+      #  - early KMS / early display
+      #  - early storage (e.g. USB) support
+
+      # Allows using framebuffer configured by the initial boot firmware
+      "simplefb"
     ];
 
   # Include lots of firmware.

From 5bc36c1b3018b34a561e1257ce7b80fd506c6587 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 19 Apr 2021 16:20:57 -0400
Subject: [PATCH 061/143] profiles/all-hardware.nix: Add support for Allwinner
 hardware

---
 nixos/modules/profiles/all-hardware.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index b2dd488908a..0af87fa621a 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -58,6 +58,15 @@ in
 
       # Allows using framebuffer configured by the initial boot firmware
       "simplefb"
+
+      # Allwinner support
+
+      # Required for early KMS
+      "sun4i-drm"
+      "sun8i-mixer" # Audio, but required for kms
+
+      # PWM for the backlight
+      "pwm-sun4i"
     ];
 
   # Include lots of firmware.

From a8af02fe6d1d7f187fca0b54159eb8eeb87dbfc4 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 19 Apr 2021 16:21:46 -0400
Subject: [PATCH 062/143] profiles/all-hardware.nix: Add modules for integrated
 displays

Namely, this is used by the pinebook's display
---
 nixos/modules/profiles/all-hardware.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 0af87fa621a..78557797ebc 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -67,6 +67,15 @@ in
 
       # PWM for the backlight
       "pwm-sun4i"
+
+      # Misc. uncategorized hardware
+
+      # Used for some platform's integrated displays
+      "panel-simple"
+      "pwm-bl"
+
+      # Misc "weak" dependencies
+      "analogix-anx6345" # For DP or eDP (e.g. integrated display)
     ];
 
   # Include lots of firmware.

From a846d198316d9522b7456f4b54779df1cd4f13a5 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 19 Apr 2021 16:22:11 -0400
Subject: [PATCH 063/143] profiles/all-hardware.nix: Add power regulator
 modules

This is used on some allwinner platforms, and is a weak dependency for
USB to work.
---
 nixos/modules/profiles/all-hardware.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 78557797ebc..e3ec50f9e78 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -74,6 +74,11 @@ in
       "panel-simple"
       "pwm-bl"
 
+      # Power supply drivers, some platforms need them for USB
+      "axp20x-ac-power"
+      "axp20x-battery"
+      "pinctrl-axp209"
+
       # Misc "weak" dependencies
       "analogix-anx6345" # For DP or eDP (e.g. integrated display)
     ];

From 70205bd13c8e790148158e08716f0820b9c309b6 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 19 Apr 2021 21:40:00 -0400
Subject: [PATCH 064/143] profiles/all-hardware.nix: Add support for Raspberry
 Pi 4 USB

---
 nixos/modules/profiles/all-hardware.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index e3ec50f9e78..30e7983b248 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -68,6 +68,10 @@ in
       # PWM for the backlight
       "pwm-sun4i"
 
+      # Broadcom
+
+      "pcie-brcmstb"
+
       # Misc. uncategorized hardware
 
       # Used for some platform's integrated displays
@@ -79,6 +83,9 @@ in
       "axp20x-battery"
       "pinctrl-axp209"
 
+      # USB drivers
+      "xhci-pci-renesas"
+
       # Misc "weak" dependencies
       "analogix-anx6345" # For DP or eDP (e.g. integrated display)
     ];

From 535d463cf911f37f94357f4e470499b9c18aec9f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 22 Apr 2021 15:57:37 -0400
Subject: [PATCH 065/143] profiles/all-hardware.nix: Add rockchip modules

---
 nixos/modules/profiles/all-hardware.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 30e7983b248..31599f28109 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -72,6 +72,14 @@ in
 
       "pcie-brcmstb"
 
+      # Rockchip
+      "dw-hdmi"
+      "dw-mipi-dsi"
+      "rockchipdrm"
+      "rockchip-rga"
+      "phy-rockchip-pcie"
+      "pcie-rockchip-host"
+
       # Misc. uncategorized hardware
 
       # Used for some platform's integrated displays

From 9fa3e2c2a3898717d1a32add3ff90bb9803e9930 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 22 Apr 2021 15:58:16 -0400
Subject: [PATCH 066/143] profiles/all-hardware.nix: Add regulator needed for
 rockchip

But not exclusive to rockchip
---
 nixos/modules/profiles/all-hardware.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 31599f28109..04ee3af6600 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -90,6 +90,7 @@ in
       "axp20x-ac-power"
       "axp20x-battery"
       "pinctrl-axp209"
+      "mp8859"
 
       # USB drivers
       "xhci-pci-renesas"

From 82625705c624feb2aafabf7a0af8b64b4b036ec8 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 22 Apr 2021 15:58:39 -0400
Subject: [PATCH 067/143] profiles/all-hardware.nix: Add analogix-dp

While it's being brought in implicitly by the other analogix driver,
let's be explicit, in case things change.
---
 nixos/modules/profiles/all-hardware.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 04ee3af6600..2371f21fa08 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -96,6 +96,7 @@ in
       "xhci-pci-renesas"
 
       # Misc "weak" dependencies
+      "analogix-dp"
       "analogix-anx6345" # For DP or eDP (e.g. integrated display)
     ];
 

From 14ac6de0244049c7a4a3d0cfd400c6e6f5081ea9 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 1 May 2021 16:58:50 -0400
Subject: [PATCH 068/143] profiles/all-hardware.nix: Fix for arvmv7l-linux

---
 nixos/modules/profiles/all-hardware.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 2371f21fa08..7b305319e84 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -46,7 +46,7 @@ in
       # VMware support.
       "mptspi" "vmxnet3" "vsock"
     ] ++ lib.optional platform.isx86 "vmw_balloon"
-    ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
+    ++ lib.optionals (!platform.isAarch64 && !platform.isAarch32) [ # not sure where else they're missing
       "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"
 
       # Hyper-V support.

From f5b7687d26c48f35c46f3a497c7145dcb06ddfc0 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 1 May 2021 19:43:55 -0400
Subject: [PATCH 069/143] profiles/all-hardware.nix: Share some config for all
 ARM

---
 nixos/modules/profiles/all-hardware.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 7b305319e84..c185acc5a0f 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -51,7 +51,7 @@ in
 
       # Hyper-V support.
       "hv_storvsc"
-    ] ++ lib.optionals pkgs.stdenv.isAarch64 [
+    ] ++ lib.optionals (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [
       # Most of the following falls into two categories:
       #  - early KMS / early display
       #  - early storage (e.g. USB) support
@@ -67,6 +67,10 @@ in
 
       # PWM for the backlight
       "pwm-sun4i"
+    ] ++ lib.optionals pkgs.stdenv.isAarch64 [
+      # Most of the following falls into two categories:
+      #  - early KMS / early display
+      #  - early storage (e.g. USB) support
 
       # Broadcom
 

From cb9b46a3cdcbb4c82c582441f213259ce5399b15 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 3 May 2021 23:46:29 -0400
Subject: [PATCH 070/143] profiles/all-hardware.nix: Add vc4 for broadcom
 hardware

Namely, early KMS on raspberry pi
---
 nixos/modules/profiles/all-hardware.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index c185acc5a0f..c7a13974a51 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -67,6 +67,10 @@ in
 
       # PWM for the backlight
       "pwm-sun4i"
+
+      # Broadcom
+
+      "vc4"
     ] ++ lib.optionals pkgs.stdenv.isAarch64 [
       # Most of the following falls into two categories:
       #  - early KMS / early display

From 1cb977c8588c9aa1bf30fe7fa154b5fcc763471f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 3 May 2021 23:45:26 -0400
Subject: [PATCH 071/143] sd-image: Rely on profiles/all-hardware.nix

This ensures that SD images and UEFI installers don't drift in
compatibility with regards to early initrd.
---
 nixos/modules/installer/sd-card/sd-image-aarch64.nix | 7 -------
 nixos/modules/installer/sd-card/sd-image.nix         | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64.nix b/nixos/modules/installer/sd-card/sd-image-aarch64.nix
index 96ebb7537da..165e2aac27b 100644
--- a/nixos/modules/installer/sd-card/sd-image-aarch64.nix
+++ b/nixos/modules/installer/sd-card/sd-image-aarch64.nix
@@ -18,13 +18,6 @@
   # - ttyAMA0: for QEMU's -machine virt
   boot.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"];
 
-  boot.initrd.availableKernelModules = [
-    # Allows early (earlier) modesetting for the Raspberry Pi
-    "vc4" "bcm2835_dma" "i2c_bcm2835"
-    # Allows early (earlier) modesetting for Allwinner SoCs
-    "sun4i_drm" "sun8i_drm_hdmi" "sun8i_mixer"
-  ];
-
   sdImage = {
     populateFirmwareCommands = let
       configTxt = pkgs.writeText "config.txt" ''
diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix
index 45c8c67169b..d0fe79903d3 100644
--- a/nixos/modules/installer/sd-card/sd-image.nix
+++ b/nixos/modules/installer/sd-card/sd-image.nix
@@ -29,6 +29,7 @@ in
   imports = [
     (mkRemovedOptionModule [ "sdImage" "bootPartitionID" ] "The FAT partition for SD image now only holds the Raspberry Pi firmware files. Use firmwarePartitionID to configure that partition's ID.")
     (mkRemovedOptionModule [ "sdImage" "bootSize" ] "The boot files for SD image have been moved to the main ext4 partition. The FAT partition now only holds the Raspberry Pi firmware files. Changing its size may not be required.")
+    ../../profiles/all-hardware.nix
   ];
 
   options.sdImage = {

From eb9b3a59f0699754a31f76e886ed7eaf9b9e2cdb Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 5 May 2021 11:45:18 +0200
Subject: [PATCH 072/143] haskell.packages.ghc901: update to 5.6.2 to fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index 92d26a6eb0e..0147143e7b2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -98,4 +98,7 @@ self: super: {
   # The test suite seems pretty broken.
   base64-bytestring = dontCheck super.base64-bytestring;
 
+  # 5.6 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
+  profunctors = super.profunctors_5_6_2;
+
 }

From 20020d3ec8764d119df541d4ceae1d2a81f909df Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 5 May 2021 12:22:59 +0200
Subject: [PATCH 073/143] haskellPackages.hnix: unbreak
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The mystery build failure was caused by having the same instance as an
orphan and imported from ref-tf 0.5 (why ever that doesn't warrant a
logged error message…). The solution for this is
https://github.com/haskell-nix/hnix/pull/918, which sadly doesn't apply
cleanly on the hnix 0.12.0.1 tarball. Therefore I've backported the
patch until hnix hopefully gets a new hackage release soon.
---
 .../haskell-modules/configuration-common.nix  | 14 +++++++-
 .../patches/hnix-ref-tf-0.5-support.patch     | 34 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/haskell-modules/patches/hnix-ref-tf-0.5-support.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1b51fe615ca..b0ff20c4cf7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -197,7 +197,19 @@ self: super: {
   digit = doJailbreak super.digit;
 
   # 2020-06-05: HACK: does not pass own build suite - `dontCheck`
-  hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck super.hnix);
+  hnix = generateOptparseApplicativeCompletion "hnix"
+    (overrideCabal super.hnix (drv: {
+      doCheck = false;
+      prePatch = ''
+        # fix encoding problems when patching
+        ${pkgs.dos2unix}/bin/dos2unix hnix.cabal
+      '' + (drv.prePatch or "");
+      patches = [
+        # support ref-tf in hnix 0.12.0.1, can be removed after
+        # https://github.com/haskell-nix/hnix/pull/918
+        ./patches/hnix-ref-tf-0.5-support.patch
+      ] ++ (drv.patches or []);
+    }));
 
   # Fails for non-obvious reasons while attempting to use doctest.
   search = dontCheck super.search;
diff --git a/pkgs/development/haskell-modules/patches/hnix-ref-tf-0.5-support.patch b/pkgs/development/haskell-modules/patches/hnix-ref-tf-0.5-support.patch
new file mode 100644
index 00000000000..5a4d0446e71
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/hnix-ref-tf-0.5-support.patch
@@ -0,0 +1,34 @@
+diff '--color=auto' '--color=never' -r --unified hnix-0.12.0.1/hnix.cabal hnix-patched/hnix.cabal
+--- hnix-0.12.0.1/hnix.cabal	2001-09-09 03:46:40.000000000 +0200
++++ hnix-patched/hnix.cabal	2021-05-05 12:07:38.388267353 +0200
+@@ -430,7 +430,7 @@
+     , parser-combinators >= 1.0.1 && < 1.3
+     , prettyprinter >= 1.7.0 && < 1.8
+     , process >= 1.6.3 && < 1.7
+-    , ref-tf >= 0.4.0 && < 0.5
++    , ref-tf >= 0.5
+     , regex-tdfa >= 1.2.3 && < 1.4
+     , scientific >= 0.3.6 && < 0.4
+     , semialign >= 1 && < 1.2
+diff '--color=auto' '--color=never' -r --unified hnix-0.12.0.1/src/Nix/Fresh.hs hnix-patched/src/Nix/Fresh.hs
+--- hnix-0.12.0.1/src/Nix/Fresh.hs	2001-09-09 03:46:40.000000000 +0200
++++ hnix-patched/src/Nix/Fresh.hs	2021-05-05 12:07:45.841267497 +0200
+@@ -65,18 +65,3 @@
+ 
+ runFreshIdT :: Functor m => Var m i -> FreshIdT i m a -> m a
+ runFreshIdT i m = runReaderT (unFreshIdT m) i
+-
+--- Orphan instance needed by Infer.hs and Lint.hs
+-
+--- Since there's no forking, it's automatically atomic.
+-instance MonadAtomicRef (ST s) where
+-  atomicModifyRef r f = do
+-    v <- readRef r
+-    let (a, b) = f v
+-    writeRef r a
+-    return b
+-  atomicModifyRef' r f = do
+-    v <- readRef r
+-    let (a, b) = f v
+-    writeRef r $! a
+-    return b

From 2222050406a70d331900dbfaeccc0734d6cac5cd Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 5 May 2021 15:25:24 +0200
Subject: [PATCH 074/143] haskell.packages.ghc901.lens: bump to 5.0.1

Release 5 introduced GHC 9.0 compatibility, but hasn't hit stackage yet.
---
 pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index 0147143e7b2..c55d720033e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -101,4 +101,7 @@ self: super: {
   # 5.6 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
   profunctors = super.profunctors_5_6_2;
 
+  # 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
+  lens = super.lens_5_0_1;
+
 }

From a7dfc81ade194b6063316c944c84f30a335a30dc Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 5 May 2021 14:51:03 +0200
Subject: [PATCH 075/143] top-level/release-haskell.nix: support aarch64-linux
 and x86_64-darwin

top-level/release.nix builds haskellPackages on those systems as well,
so we should test on them as well. Currently we have virtually no
insight into the state on there.
---
 pkgs/top-level/release-haskell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index c9c16d01771..1c3389c24d1 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -5,7 +5,7 @@
 
   $ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix
 */
-{ supportedSystems ? [ "x86_64-linux" ] }:
+{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] }:
 
 let
 

From 1c9ec1f3b3065443138472df1876995821f94cb1 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 5 May 2021 18:16:29 +0200
Subject: [PATCH 076/143] haskellPackages: mark pkgs failing eval as
 unsupported on aarch64 / darwin

---
 .../configuration-hackage2nix.yaml            |  55 +++++++-
 .../haskell-modules/hackage-packages.nix      | 131 +++++++++++++++++-
 2 files changed, 181 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 1c4648ffa1a..7c943523054 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2944,45 +2944,94 @@ unsupported-platforms:
   alsa-seq:                                     [ x86_64-darwin ]
   AWin32Console:                                [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   barbly:                                       [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
+  bdcs-api:                                     [ x86_64-darwin ]
+  binding-sane:                                 [ x86_64-darwin ]
   bindings-directfb:                            [ x86_64-darwin ]
+  cut-the-crap:                                 [ x86_64-darwin ]
   d3d11binding:                                 [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   DirectSound:                                  [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   dx9base:                                      [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   dx9d3d:                                       [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   dx9d3dx:                                      [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  Euterpea:                                     [ x86_64-darwin ]
   freenect:                                     [ x86_64-darwin ]
   FTGL:                                         [ x86_64-darwin ]
+  gi-dbusmenu-gtk3:                             [ x86_64-darwin ]
+  gi-dbusmenu:                                  [ x86_64-darwin ]
+  gi-ggit:                                      [ x86_64-darwin ]
+  gi-ibus:                                      [ x86_64-darwin ]
   gi-ostree:                                    [ x86_64-darwin ]
+  gi-vte:                                       [ x86_64-darwin ]
+  gnome-keyring:                                [ x86_64-darwin ]
   gtk-mac-integration:                          [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
+  gtk-sni-tray:                                 [ x86_64-darwin ]
+  gtk-sni-tray:                                 [ x86_64-darwin ]
+  haskell-snake:                                [ x86_64-darwin ]
   hcwiid:                                       [ x86_64-darwin ]
+  hedgewars:                                    [ x86_64-darwin ]
   HFuse:                                        [ x86_64-darwin ]
+  hidapi:                                       [ x86_64-darwin ]
   hommage-ds:                                   [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  HSoM:                                         [ x86_64-darwin ]
+  iwlib:                                        [ x86_64-darwin ]
+  libmodbus:                                    [ x86_64-darwin ]
+  libsystemd-journal:                           [ x86_64-darwin ]
+  libsystemd-journal:                           [ x86_64-darwin ]
+  libtelnet:                                    [ x86_64-darwin ]
+  libzfs:                                       [ x86_64-darwin ]
+  linearEqSolver:                               [ aarch64-linux ]
   lio-fs:                                       [ x86_64-darwin ]
+  logging-facade-journald:                      [ x86_64-darwin ]
   midi-alsa:                                    [ x86_64-darwin ]
+  mpi-hs:                                       [ aarch64-linux, x86_64-darwin ]
+  mpi-hs-binary:                                [ aarch64-linux ]
+  mpi-hs-binary:                                [ x86_64-darwin ]
+  mpi-hs-cereal:                                [ aarch64-linux ]
+  mpi-hs-cereal:                                [ x86_64-darwin ]
+  mpi-hs-store:                                 [ aarch64-linux ]
+  mpi-hs-store:                                 [ x86_64-darwin ]
+  mplayer-spot:                                 [ aarch64-linux ]
+  oculus:                                       [ x86_64-darwin ]
   pam:                                          [ x86_64-darwin ]
+  piyo:                                         [ x86_64-darwin ]
+  PortMidi-simple:                              [ x86_64-darwin ]
   PortMidi:                                     [ x86_64-darwin ]
+  posix-api:                                    [ x86_64-darwin ]
   Raincat:                                      [ x86_64-darwin ]
   reactivity:                                   [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  reflex-dom:                                   [ x86_64-darwin ]
   rtlsdr:                                       [ x86_64-darwin ]
   rubberband:                                   [ x86_64-darwin ]
+  sbv:                                          [ aarch64-linux ]
   sdl2-mixer:                                   [ x86_64-darwin ]
   sdl2-ttf:                                     [ x86_64-darwin ]
+  synthesizer-alsa:                             [ x86_64-darwin ]
+  taffybar:                                     [ x86_64-darwin ]
+  termonad:                                     [ x86_64-darwin ]
   tokyotyrant-haskell:                          [ x86_64-darwin ]
-  vulkan:                                       [ i686-linux, armv7l-linux ]
+  udev:                                         [ x86_64-darwin ]
+  vrpn:                                         [ x86_64-darwin ]
+  vulkan:                                       [ i686-linux, armv7l-linux, x86_64-darwin ]
   VulkanMemoryAllocator:                        [ i686-linux, armv7l-linux ]
+  VulkanMemoryAllocator:                        [ x86_64-darwin ]
+  vulkan-utils:                                 [ x86_64-darwin ]
+  webkit2gtk3-javascriptcore:                   [ x86_64-darwin ]
   Win32-console:                                [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   Win32-dhcp-server:                            [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   Win32-errors:                                 [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   Win32-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  Win32:                                        [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   Win32-junction-point:                         [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   Win32-notify:                                 [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   Win32-security:                               [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  Win32-services-wrapper:                       [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   Win32-services:                               [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  Win32:                                        [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  Win32-services-wrapper:                       [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   xattr:                                        [ x86_64-darwin ]
+  xgboost-haskell:                              [ aarch64-linux, armv7l-linux ]
   XInput:                                       [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   xmobar:                                       [ x86_64-darwin ]
+  xmonad-extras:                                [ x86_64-darwin ]
+  xmonad-volume:                                [ x86_64-darwin ]
 
 dont-distribute-packages:
   # Depends on shine, which is a ghcjs project.
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6a82b343bf9..abb07e119f7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5620,6 +5620,9 @@ self: {
        ];
        description = "Library for computer music research and education";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "EventSocket" = callPackage
@@ -9400,6 +9403,9 @@ self: {
        ];
        description = "Library for computer music education";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "HSoundFile" = callPackage
@@ -16152,6 +16158,9 @@ self: {
        executableHaskellDepends = [ base PortMidi ];
        description = "Simplified PortMidi wrapper";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "PostgreSQL" = callPackage
@@ -20945,7 +20954,9 @@ self: {
        ];
        description = "Bindings to the VulkanMemoryAllocator library";
        license = lib.licenses.bsd3;
-       platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ];
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "WAVE" = callPackage
@@ -39390,6 +39401,9 @@ self: {
        ];
        description = "BDCS API Server";
        license = lib.licenses.gpl3Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libgit2-glib;};
@@ -68335,6 +68349,9 @@ self: {
        testToolDepends = [ c2hs ];
        description = "Cuts out uninteresting parts of videos by detecting silences";
        license = lib.licenses.mit;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) pocketsphinx; inherit (pkgs) sphinxbase;};
 
   "cutter" = callPackage
@@ -103543,6 +103560,9 @@ self: {
        libraryPkgconfigDepends = [ libdbusmenu ];
        description = "Dbusmenu bindings";
        license = lib.licenses.lgpl21Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) libdbusmenu;};
 
   "gi-dbusmenu_0_4_9" = callPackage
@@ -103562,6 +103582,9 @@ self: {
        libraryPkgconfigDepends = [ libdbusmenu ];
        description = "Dbusmenu bindings";
        license = lib.licenses.lgpl21Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
        hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) libdbusmenu;};
 
@@ -103770,6 +103793,9 @@ self: {
        libraryPkgconfigDepends = [ libgit2-glib ];
        description = "libgit2-glib bindings";
        license = lib.licenses.lgpl21Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) libgit2-glib;};
 
   "gi-ggit_1_0_10" = callPackage
@@ -103791,6 +103817,9 @@ self: {
        libraryPkgconfigDepends = [ libgit2-glib ];
        description = "libgit2-glib bindings";
        license = lib.licenses.lgpl21Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
        hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) libgit2-glib;};
 
@@ -104547,6 +104576,9 @@ self: {
        libraryPkgconfigDepends = [ ibus ];
        description = "IBus bindings";
        license = lib.licenses.lgpl21Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) ibus;};
 
   "gi-ibus_1_5_3" = callPackage
@@ -104568,6 +104600,9 @@ self: {
        libraryPkgconfigDepends = [ ibus ];
        description = "IBus bindings";
        license = lib.licenses.lgpl21Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
        hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) ibus;};
 
@@ -104959,6 +104994,9 @@ self: {
        libraryPkgconfigDepends = [ vte_291 ];
        description = "Vte bindings";
        license = lib.licenses.lgpl21Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {vte_291 = pkgs.vte;};
 
   "gi-vte_2_91_28" = callPackage
@@ -104983,6 +105021,9 @@ self: {
        libraryPkgconfigDepends = [ vte_291 ];
        description = "Vte bindings";
        license = lib.licenses.lgpl21Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
        hydraPlatforms = lib.platforms.none;
      }) {vte_291 = pkgs.vte;};
 
@@ -107625,6 +107666,9 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libgnome-keyring";
        license = lib.licenses.gpl3Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs.gnome3) gnome-keyring; 
          inherit (pkgs) libgnome-keyring;};
 
@@ -113332,6 +113376,9 @@ self: {
        ];
        description = "A standalone StatusNotifierItem/AppIndicator tray";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) gtk3;};
 
   "gtk-strut" = callPackage
@@ -120845,6 +120892,9 @@ self: {
        ];
        description = "Snake game implemetation in Haskell using SDL2";
        license = lib.licenses.gpl3Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "haskell-spacegoo" = callPackage
@@ -129003,6 +129053,9 @@ self: {
        librarySystemDepends = [ systemd ];
        description = "Haskell bindings to HIDAPI";
        license = lib.licenses.mit;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) systemd;};
 
   "hidden-char" = callPackage
@@ -152218,6 +152271,9 @@ self: {
        librarySystemDepends = [ wirelesstools ];
        description = "Bindings for the iw C library";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) wirelesstools;};
 
   "ix" = callPackage
@@ -163417,6 +163473,9 @@ self: {
        librarySystemDepends = [ modbus ];
        description = "Haskell bindings to the C modbus library";
        license = lib.licenses.bsd2;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {modbus = null;};
 
   "libmolude" = callPackage
@@ -163857,6 +163916,9 @@ self: {
        libraryPkgconfigDepends = [ systemd ];
        description = "Haskell bindings to libsystemd-journal";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
@@ -163889,6 +163951,9 @@ self: {
        libraryPkgconfigDepends = [ libtelnet ];
        description = "Bindings to libtelnet";
        license = lib.licenses.gpl3Plus;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) libtelnet;};
 
   "libversion" = callPackage
@@ -164026,6 +164091,9 @@ self: {
        executableSystemDepends = [ nvpair zfs ];
        description = "Bindings to libzfs, for dealing with the Z File System and Zpools";
        license = lib.licenses.mit;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {nvpair = null; inherit (pkgs) zfs;};
 
   "licensor" = callPackage
@@ -164905,6 +164973,9 @@ self: {
        libraryHaskellDepends = [ base sbv ];
        description = "Use SMT solvers to solve linear systems over integers and rationals";
        license = lib.licenses.bsd3;
+       platforms = [
+         "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux"
+       ];
      }) {};
 
   "linearmap-category" = callPackage
@@ -167831,6 +167902,9 @@ self: {
        ];
        description = "Journald back-end for logging-facade";
        license = lib.licenses.mit;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "logging-facade-syslog" = callPackage
@@ -180941,6 +181015,7 @@ self: {
        testSystemDepends = [ mpich ];
        description = "MPI bindings for Haskell";
        license = lib.licenses.asl20;
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) mpich;};
 
   "mpi-hs-binary" = callPackage
@@ -180958,6 +181033,9 @@ self: {
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
        license = lib.licenses.asl20;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "mpi-hs-cereal" = callPackage
@@ -180975,6 +181053,9 @@ self: {
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
        license = lib.licenses.asl20;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "mpi-hs-store" = callPackage
@@ -180992,6 +181073,9 @@ self: {
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
        license = lib.licenses.asl20;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "mplayer-spot" = callPackage
@@ -181012,6 +181096,9 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Save your spot when watching movies with @mplayer@";
        license = lib.licenses.bsd3;
+       platforms = [
+         "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux"
+       ];
      }) {};
 
   "mpppc" = callPackage
@@ -191269,6 +191356,9 @@ self: {
        librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ];
        description = "Oculus Rift ffi providing head tracking data";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
@@ -204598,6 +204688,9 @@ self: {
        ];
        description = "Haskell game engine like fantasy console";
        license = lib.licenses.mit;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "pkcs1" = callPackage
@@ -207462,6 +207555,9 @@ self: {
        ];
        description = "posix bindings";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {inherit (pkgs) systemd;};
@@ -220523,6 +220619,9 @@ self: {
        ];
        description = "Functional Reactive Web Apps with Reflex";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
        maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
@@ -229529,6 +229628,9 @@ self: {
        ];
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = lib.licenses.bsd3;
+       platforms = [
+         "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux"
+       ];
      }) {inherit (pkgs) z3;};
 
   "sbvPlugin" = callPackage
@@ -254888,6 +254990,9 @@ self: {
        ];
        description = "Control synthesizer effects via ALSA/MIDI";
        license = "GPL";
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "synthesizer-core" = callPackage
@@ -255776,6 +255881,9 @@ self: {
        executablePkgconfigDepends = [ gtk3 ];
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) gtk3;};
 
   "tag-bits" = callPackage
@@ -259309,6 +259417,9 @@ self: {
        ];
        description = "Terminal emulator configurable in Haskell";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; 
          vte_291 = pkgs.vte;};
 
@@ -277919,6 +278030,9 @@ self: {
        executableSystemDepends = [ quat vrpn ];
        description = "Bindings to VRPN";
        license = lib.licenses.mit;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {quat = null; inherit (pkgs) vrpn;};
 
   "vt-utils" = callPackage
@@ -278103,7 +278217,7 @@ self: {
        libraryPkgconfigDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
        license = lib.licenses.bsd3;
-       platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ];
+       platforms = [ "aarch64-linux" "x86_64-linux" ];
      }) {vulkan = null;};
 
   "vulkan-api" = callPackage
@@ -278138,6 +278252,9 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Utils for the vulkan package";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "waargonaut" = callPackage
@@ -281664,6 +281781,9 @@ self: {
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) webkitgtk;};
 
   "webkitgtk3" = callPackage
@@ -285186,6 +285306,7 @@ self: {
        executableSystemDepends = [ xgboost ];
        description = "XGBoost library for Haskell";
        license = lib.licenses.mit;
+       platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) xgboost;};
 
   "xhaskell-library" = callPackage
@@ -286589,6 +286710,9 @@ self: {
        ];
        description = "Third party extensions for xmonad with wacky dependencies";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "xmonad-screenshot" = callPackage
@@ -286666,6 +286790,9 @@ self: {
        ];
        description = "XMonad volume controls";
        license = lib.licenses.bsd3;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "xmonad-wallpaper" = callPackage

From f5a9654af4a985718659ce36f5ce2bd391d12bd7 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 5 May 2021 18:26:40 +0200
Subject: [PATCH 077/143] configuration-hackage2nix: fix typos, duplicate
 entries

---
 .../configuration-hackage2nix.yaml            | 13 +++++-------
 .../haskell-modules/hackage-packages.nix      | 21 +++++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7c943523054..be2dc3c5090 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2945,7 +2945,7 @@ unsupported-platforms:
   AWin32Console:                                [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   barbly:                                       [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
   bdcs-api:                                     [ x86_64-darwin ]
-  binding-sane:                                 [ x86_64-darwin ]
+  bindings-sane:                                [ x86_64-darwin ]
   bindings-directfb:                            [ x86_64-darwin ]
   cut-the-crap:                                 [ x86_64-darwin ]
   d3d11binding:                                 [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
@@ -2956,7 +2956,7 @@ unsupported-platforms:
   Euterpea:                                     [ x86_64-darwin ]
   freenect:                                     [ x86_64-darwin ]
   FTGL:                                         [ x86_64-darwin ]
-  gi-dbusmenu-gtk3:                             [ x86_64-darwin ]
+  gi-dbusmenugtk3:                              [ x86_64-darwin ]
   gi-dbusmenu:                                  [ x86_64-darwin ]
   gi-ggit:                                      [ x86_64-darwin ]
   gi-ibus:                                      [ x86_64-darwin ]
@@ -2984,12 +2984,9 @@ unsupported-platforms:
   logging-facade-journald:                      [ x86_64-darwin ]
   midi-alsa:                                    [ x86_64-darwin ]
   mpi-hs:                                       [ aarch64-linux, x86_64-darwin ]
-  mpi-hs-binary:                                [ aarch64-linux ]
-  mpi-hs-binary:                                [ x86_64-darwin ]
-  mpi-hs-cereal:                                [ aarch64-linux ]
-  mpi-hs-cereal:                                [ x86_64-darwin ]
-  mpi-hs-store:                                 [ aarch64-linux ]
-  mpi-hs-store:                                 [ x86_64-darwin ]
+  mpi-hs-binary:                                [ aarch64-linux, x86_64-darwin ]
+  mpi-hs-cereal:                                [ aarch64-linux, x86_64-darwin ]
+  mpi-hs-store:                                 [ aarch64-linux, x86_64-darwin ]
   mplayer-spot:                                 [ aarch64-linux ]
   oculus:                                       [ x86_64-darwin ]
   pam:                                          [ x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index abb07e119f7..72c5c9e0a79 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -42012,6 +42012,9 @@ self: {
        libraryPkgconfigDepends = [ sane-backends ];
        description = "FFI bindings to libsane";
        license = lib.licenses.lgpl3Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) sane-backends;};
 
   "bindings-sc3" = callPackage
@@ -103610,6 +103613,9 @@ self: {
        libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ];
        description = "DbusmenuGtk bindings";
        license = lib.licenses.lgpl21Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;};
 
   "gi-dbusmenugtk3_0_4_10" = callPackage
@@ -103634,6 +103640,9 @@ self: {
        libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ];
        description = "DbusmenuGtk bindings";
        license = lib.licenses.lgpl21Only;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
        hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;};
 
@@ -181033,9 +181042,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
        license = lib.licenses.asl20;
-       platforms = [
-         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
-       ];
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {};
 
   "mpi-hs-cereal" = callPackage
@@ -181053,9 +181060,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
        license = lib.licenses.asl20;
-       platforms = [
-         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
-       ];
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {};
 
   "mpi-hs-store" = callPackage
@@ -181073,9 +181078,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "MPI bindings for Haskell";
        license = lib.licenses.asl20;
-       platforms = [
-         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
-       ];
+       platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
      }) {};
 
   "mplayer-spot" = callPackage

From f5865286fd4a0bd24086b39c0d41d351c1e270fa Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 5 May 2021 22:07:47 +0200
Subject: [PATCH 078/143] haskellPackages.ad: fix build on aarch64

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b0ff20c4cf7..f5d3472e7ac 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1840,4 +1840,10 @@ self: super: {
     '' + (drv.postPatch or "");
   });
 
+  # GHCi issue on aarch64 prevent doctests from running
+  # https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437
+  ad = overrideCabal super.ad {
+    doCheck = !pkgs.stdenv.hostPlatform.isAarch64;
+  };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 977ccbf6bf39dbc81a5463c012a214bfe1dfb001 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 5 May 2021 22:45:52 +0200
Subject: [PATCH 079/143] hedgewars: portability is limited by fpc

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 pkgs/games/hedgewars/default.nix                                | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index be2dc3c5090..db102aeb9d8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2968,7 +2968,6 @@ unsupported-platforms:
   gtk-sni-tray:                                 [ x86_64-darwin ]
   haskell-snake:                                [ x86_64-darwin ]
   hcwiid:                                       [ x86_64-darwin ]
-  hedgewars:                                    [ x86_64-darwin ]
   HFuse:                                        [ x86_64-darwin ]
   hidapi:                                       [ x86_64-darwin ]
   hommage-ds:                                   [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index ea714d8bc7c..8682668d396 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -102,6 +102,6 @@ mkDerivation rec {
        hedgehog or hedgehogs after a player's or CPU turn is shown only when
        all movement on the battlefield has ceased).'';
     maintainers = with maintainers; [ kragniz fpletz ];
-    inherit (ghc.meta) platforms;
+    inherit (fpc.meta) platforms;
   };
 }

From fef108cf2655216a7497f00352e53b7caa290c78 Mon Sep 17 00:00:00 2001
From: "P. R. d. O" <d.ol.rod@protonmail.com>
Date: Wed, 5 May 2021 15:44:25 -0600
Subject: [PATCH 080/143] upwork: 5.5.0.1 -> 5.5.0.11

---
 pkgs/applications/misc/upwork/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix
index 9b8821b5115..6a60e81933b 100644
--- a/pkgs/applications/misc/upwork/default.nix
+++ b/pkgs/applications/misc/upwork/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "upwork";
-  version = "5.5.0.1";
+  version = "5.5.0.11";
 
   src = fetchurl {
-    url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_1_291c031686ed44ff/${pname}_${version}_amd64.deb";
-    sha256 = "49192ecfb10929b5b51cf8899186059649c894109ec172695cd7cfaa50923f6a";
+    url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_11_61df9c99b6df4e7b/${pname}_${version}_amd64.deb";
+    sha256 = "db83d5fb1b5383992c6156284f6f3cd3a6b23f727ce324ba90c82817553fb4f7";
   };
 
   dontWrapGApps = true;

From abf5583c5a964f62142025c6c350842041791183 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 6 May 2021 10:49:57 +0200
Subject: [PATCH 081/143] haskellPackages.llvm-hs: disable tests on non-x86_64

Should fix build on aarch64, see linked issue.
---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f5d3472e7ac..6f3114615b1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1846,4 +1846,10 @@ self: super: {
     doCheck = !pkgs.stdenv.hostPlatform.isAarch64;
   };
 
+  # Tests need to lookup target triple x86_64-unknown-linux
+  # https://github.com/llvm-hs/llvm-hs/issues/334
+  llvm-hs = overrideCabal super.llvm-hs {
+    doCheck = pkgs.stdenv.targetPlatform.system == "x86_64-linux";
+  };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 73c2dd4aa67cf9ef970554b45c39e7756bd1e92d Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 5 May 2021 21:52:20 +0200
Subject: [PATCH 082/143] petrinizer: fix build

* take z3 haskell package from haskellPackages
* take sbv 7.13 from haskellPackages, apply patch fixing build
  with GHC >= 8.8.8
---
 .../science/logic/petrinizer/default.nix      | 12 +++----
 .../science/logic/petrinizer/sbv-7.13.nix     | 26 ----------------
 .../science/logic/petrinizer/z3.nix           | 24 --------------
 .../haskell-modules/configuration-common.nix  |  8 +++++
 .../configuration-hackage2nix.yaml            |  1 +
 .../haskell-modules/hackage-packages.nix      | 31 +++++++++++++++++++
 6 files changed, 44 insertions(+), 58 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/petrinizer/sbv-7.13.nix
 delete mode 100644 pkgs/applications/science/logic/petrinizer/z3.nix

diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix
index 38039f61fda..3977eb6a4ed 100644
--- a/pkgs/applications/science/logic/petrinizer/default.nix
+++ b/pkgs/applications/science/logic/petrinizer/default.nix
@@ -1,12 +1,8 @@
-{ mkDerivation, callPackage, buildPackages
+{ mkDerivation
 , async, base, bytestring, containers, fetchFromGitLab, mtl
-, parallel-io, parsec, lib, stm, transformers
+, parallel-io, parsec, lib, stm, transformers, sbv_7_13, z3
 }:
-let
-  z3 = callPackage ./z3.nix { gomp = null; z3 = buildPackages.z3; };
-in let
-  sbv = callPackage ./sbv-7.13.nix { inherit z3; };
-in
+
 mkDerivation rec {
   pname = "petrinizer";
   version = "0.9.1.1";
@@ -22,7 +18,7 @@ mkDerivation rec {
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
-    async base bytestring containers mtl parallel-io parsec sbv stm
+    async base bytestring containers mtl parallel-io parsec sbv_7_13 stm
     transformers
   ];
   description = "Safety and Liveness Analysis of Petri Nets with SMT solvers";
diff --git a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix
deleted file mode 100644
index f0c8dd24904..00000000000
--- a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ mkDerivation, array, async, base, bytestring, containers
-, crackNum, deepseq, directory, doctest, filepath, generic-deriving
-, ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random
-, lib, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
-, template-haskell, time, z3
-}:
-mkDerivation {
-  pname = "sbv";
-  version = "7.13";
-  sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik";
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [
-    array async base containers crackNum deepseq directory filepath
-    generic-deriving ghc mtl pretty process QuickCheck random syb
-    template-haskell time
-  ];
-  testHaskellDepends = [
-    base bytestring containers crackNum directory doctest filepath Glob
-    hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit
-    tasty-quickcheck template-haskell
-  ];
-  testSystemDepends = [ z3 ];
-  homepage = "http://leventerkok.github.com/sbv/";
-  description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-  license = lib.licenses.bsd3;
-}
diff --git a/pkgs/applications/science/logic/petrinizer/z3.nix b/pkgs/applications/science/logic/petrinizer/z3.nix
deleted file mode 100644
index a20ccea16dc..00000000000
--- a/pkgs/applications/science/logic/petrinizer/z3.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, fetchpatch
-, base, containers, gomp, hspec, QuickCheck, lib
-, transformers, z3
-}:
-mkDerivation {
-  pname = "z3";
-  version = "408.0";
-  sha256 = "13qkzy9wc17rm60i24fa9sx15ywbxq4a80g33w20887gvqyc0q53";
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [ base containers transformers ];
-  librarySystemDepends = [ gomp z3 ];
-  testHaskellDepends = [ base hspec QuickCheck ];
-  homepage = "https://github.com/IagoAbal/haskell-z3";
-  description = "Bindings for the Z3 Theorem Prover";
-  license = lib.licenses.bsd3;
-  doCheck = false;
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/IagoAbal/haskell-z3/commit/b10e09b8a809fb5bbbb1ef86aeb62109ece99cae.patch";
-      sha256 = "13fnrs27mg3985r3lwks8fxfxr5inrayy2cyx2867d92pnl3yry4";
-    })
-  ];
-}
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6f3114615b1..5172675764b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1852,4 +1852,12 @@ self: super: {
     doCheck = pkgs.stdenv.targetPlatform.system == "x86_64-linux";
   };
 
+  # Fix build failure by picking patch from 8.5,
+  # we need this version of sbv for petrinizer
+  sbv_7_13 = appendPatch super.sbv_7_13
+    (pkgs.fetchpatch {
+      url = "https://github.com/LeventErkok/sbv/commit/57014b9c7c67dd9b63619a996e2c66e32c33c958.patch";
+      sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm";
+    });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index db102aeb9d8..9c345f6dabc 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2818,6 +2818,7 @@ extra-packages:
   - optparse-applicative < 0.16         # needed for niv-0.2.19
   - refinery == 0.3.*                   # required by hls-tactics-plugin-1.0.0.0
   - resolv == 0.1.1.2                   # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
+  - sbv == 7.13                         # required for pkgs.petrinizer
 
 package-maintainers:
   peti:
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 72c5c9e0a79..d375f7b3eb8 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -229602,6 +229602,37 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "sbv_7_13" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, containers
+     , crackNum, deepseq, directory, doctest, filepath, generic-deriving
+     , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb
+     , tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+     , template-haskell, time, z3
+     }:
+     mkDerivation {
+       pname = "sbv";
+       version = "7.13";
+       sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array async base containers crackNum deepseq directory filepath
+         generic-deriving ghc mtl pretty process QuickCheck random syb
+         template-haskell time
+       ];
+       testHaskellDepends = [
+         base bytestring containers crackNum directory doctest filepath Glob
+         hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit
+         tasty-quickcheck template-haskell
+       ];
+       testSystemDepends = [ z3 ];
+       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
+       license = lib.licenses.bsd3;
+       platforms = [
+         "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux"
+       ];
+       hydraPlatforms = lib.platforms.none;
+     }) {inherit (pkgs) z3;};
+
   "sbv" = callPackage
     ({ mkDerivation, array, async, base, bench-show, bytestring
      , containers, deepseq, directory, doctest, filepath, gauge, Glob

From eaeb69862c6ae9c3d32e78c7b72d652906213e80 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 6 May 2021 16:23:33 +0200
Subject: [PATCH 083/143] petrinizer: restrict platforms by sbv

sbv has the most limited range of platforms of the dependencies.
---
 pkgs/applications/science/logic/petrinizer/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix
index 3977eb6a4ed..e28137dde75 100644
--- a/pkgs/applications/science/logic/petrinizer/default.nix
+++ b/pkgs/applications/science/logic/petrinizer/default.nix
@@ -24,4 +24,5 @@ mkDerivation rec {
   description = "Safety and Liveness Analysis of Petri Nets with SMT solvers";
   license = lib.licenses.gpl3;
   maintainers = with lib.maintainers; [ raskin ];
+  inherit (sbv_7_13.meta) platforms;
 }

From a5a983385579c0e720d56e6804257b85e757a8a6 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 6 May 2021 17:45:52 +0200
Subject: [PATCH 084/143] haskellPackages.vinyl: disable failing doctests on
 aarch64

This is the same linking bug as encountered with trifecta and ad.
Also group these cases together.
---
 pkgs/development/haskell-modules/configuration-common.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5172675764b..750b62ff153 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -373,7 +373,6 @@ self: super: {
   tickle = dontCheck super.tickle;
   tpdb = dontCheck super.tpdb;
   translatable-intset = dontCheck super.translatable-intset;
-  trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; # affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461
   ua-parser = dontCheck super.ua-parser;
   unagi-chan = dontCheck super.unagi-chan;
   wai-logger = dontCheck super.wai-logger;
@@ -1840,11 +1839,15 @@ self: super: {
     '' + (drv.postPatch or "");
   });
 
-  # GHCi issue on aarch64 prevent doctests from running
+  # Doctests fail on aarch64 due to a GHCi linking bug
   # https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437
   ad = overrideCabal super.ad {
     doCheck = !pkgs.stdenv.hostPlatform.isAarch64;
   };
+  trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta;
+  vinyl = overrideCabal super.vinyl {
+    doCheck = !pkgs.stdenv.hostPlatform.isAarch64;
+  };
 
   # Tests need to lookup target triple x86_64-unknown-linux
   # https://github.com/llvm-hs/llvm-hs/issues/334

From 6b1ec5695f979879ee3bb9a9aad90cc8cfbc140b Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 6 May 2021 17:53:13 +0200
Subject: [PATCH 085/143] haskellPackages.FractalArt: pass objc on darwin

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index b6bfb78771d..1a2c1d0f60b 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -857,4 +857,10 @@ self: super: builtins.intersectAttrs super {
         install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1
       '' + (drv.postInstall or "");
     });
+
+  # TODO(@sternenseemann): can we determine this statically in cabal2nix?
+  FractalArt = super.FractalArt.override
+    (lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
+      objc = pkgs.darwin.libojc;
+    });
 }

From da347ae2512d593e44541985697ab9c1fc9a1281 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 6 May 2021 18:02:33 +0200
Subject: [PATCH 086/143] haskellPackages.arbtt: pass Foundation on darwin

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 1a2c1d0f60b..91cfafcb943 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -863,4 +863,10 @@ self: super: builtins.intersectAttrs super {
     (lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
       objc = pkgs.darwin.libojc;
     });
+
+  arbtt = overrideCabal super.arbtt (drv: {
+    librarySystemDepends = lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
+      pkgs.darwin.apple_sdk.frameworks.Foundation
+    ] ++ (drv.librarySystemDepends or [])
+  });
 }

From a51a542d605ba3dc9daa4af25834f529d0dd8c00 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 6 May 2021 18:14:00 +0200
Subject: [PATCH 087/143] haskellPackages: fix eval of darwin specific
 overrides

---
 .../haskell-modules/configuration-nix.nix          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 91cfafcb943..e7c8b74afea 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -858,15 +858,15 @@ self: super: builtins.intersectAttrs super {
       '' + (drv.postInstall or "");
     });
 
-  # TODO(@sternenseemann): can we determine this statically in cabal2nix?
-  FractalArt = super.FractalArt.override
-    (lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
-      objc = pkgs.darwin.libojc;
-    });
+  FractalArt = overrideCabal super.FractalArt (drv: {
+    librarySystemDepends = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
+      pkgs.darwin.libobjc
+    ] ++ (drv.librarySystemDepends or []);
+  });
 
   arbtt = overrideCabal super.arbtt (drv: {
-    librarySystemDepends = lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
+    librarySystemDepends = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
       pkgs.darwin.apple_sdk.frameworks.Foundation
-    ] ++ (drv.librarySystemDepends or [])
+    ] ++ (drv.librarySystemDepends or []);
   });
 }

From 0781c31545e19b154dcf38ce1ae962340d04a70b Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 6 May 2021 19:35:36 +0200
Subject: [PATCH 088/143] haskellPackages.arbtt: add missing frameworks for
 darwin

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index e7c8b74afea..74e4f9857d5 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -867,6 +867,8 @@ self: super: builtins.intersectAttrs super {
   arbtt = overrideCabal super.arbtt (drv: {
     librarySystemDepends = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
       pkgs.darwin.apple_sdk.frameworks.Foundation
+      pkgs.darwin.apple_sdk.frameworks.Carbon
+      pkgs.darwin.apple_sdk.frameworks.IOKit
     ] ++ (drv.librarySystemDepends or []);
   });
 }

From fc1638c3ba064cb38696d831376715ab2c5625a6 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 6 May 2021 19:54:22 +0200
Subject: [PATCH 089/143] taffybar: inherit meta set from haskellPackages

---
 .../applications/window-managers/taffybar/default.nix | 11 +++++------
 pkgs/top-level/all-packages.nix                       |  4 +---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix
index cc457f81589..da495606930 100644
--- a/pkgs/applications/window-managers/taffybar/default.nix
+++ b/pkgs/applications/window-managers/taffybar/default.nix
@@ -1,7 +1,9 @@
-{ lib, stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }:
+{ lib, stdenv, haskellPackages, makeWrapper, packages ? (x: []) }:
 
 let
-taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self);
+  taffybarEnv = haskellPackages.ghc.withPackages (self: [
+    self.taffybar
+  ] ++ packages self);
 in stdenv.mkDerivation {
   name = "taffybar-with-packages-${taffybarEnv.version}";
 
@@ -13,8 +15,5 @@ in stdenv.mkDerivation {
       --set NIX_GHC "${taffybarEnv}/bin/ghc"
   '';
 
-  meta = {
-    platforms = lib.platforms.unix;
-    license = lib.licenses.bsd3;
-  };
+  inherit (haskellPackages.taffybar) meta;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03c414f57c9..50b6c680320 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26248,9 +26248,7 @@ in
     # customConfig = builtins.readFile ./tabbed.config.h;
   };
 
-  taffybar = callPackage ../applications/window-managers/taffybar {
-    inherit (haskellPackages) ghcWithPackages;
-  };
+  taffybar = callPackage ../applications/window-managers/taffybar {};
 
   tagainijisho = callPackage ../applications/office/tagainijisho {};
 

From d1d0c73dfb4eeabbca80d9258b57a40bf59577b4 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 6 May 2021 20:06:05 +0200
Subject: [PATCH 090/143] haskellPackages.FractalArt: add AppKit framework to
 dependencies

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 74e4f9857d5..501d1572737 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -861,6 +861,7 @@ self: super: builtins.intersectAttrs super {
   FractalArt = overrideCabal super.FractalArt (drv: {
     librarySystemDepends = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
       pkgs.darwin.libobjc
+      pkgs.darwin.apple_sdk.frameworks.AppKit
     ] ++ (drv.librarySystemDepends or []);
   });
 

From d8db949832947e43665c34ec52f6aecf9c60ca25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 1 May 2021 22:28:26 +0200
Subject: [PATCH 091/143] python3Packages.fritzconnection: 1.4.2 -> 1.5.0

https://fritzconnection.readthedocs.io/en/1.5.0/sources/changes.html
---
 pkgs/development/python-modules/fritzconnection/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix
index 8e54cb6897c..ad157fbda4c 100644
--- a/pkgs/development/python-modules/fritzconnection/default.nix
+++ b/pkgs/development/python-modules/fritzconnection/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "fritzconnection";
-  version = "1.4.2";
+  version = "1.5.0";
 
   # no tests on PyPI
   src = fetchFromGitHub {
     owner = "kbr";
     repo = pname;
     rev = version;
-    sha256 = "02w1hwbfwbh5xlq433myzv6ms7jqxg8kn3d6znq4ic22zprzf5r2";
+    sha256 = "sha256-Iw7R+39rpoCTrRD74kBihF7AMcJWxy2xdPhKLznWdlo=";
   };
 
   disabled = pythonOlder "3.6";

From 774b4d678375cd0c2a7a2e95ff16ed5cd3f0cb86 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Fri, 7 May 2021 10:27:27 +0900
Subject: [PATCH 092/143] spago: 0.20.1 -> 0.20.2

---
 .../haskell-modules/configuration-nix.nix     | 20 ++--------
 .../tools/purescript/spago/spago.nix          | 38 +++++++++----------
 .../tools/purescript/spago/update.sh          |  7 +++-
 3 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 501d1572737..718c4bc88eb 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -657,10 +657,6 @@ self: super: builtins.intersectAttrs super {
 
   spago =
     let
-      # spago requires an older version of megaparsec, but it appears to work
-      # fine with newer versions.
-      spagoWithOverrides = doJailbreak super.spago;
-
       docsSearchApp_0_0_10 = pkgs.fetchurl {
         url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/docs-search-app.js";
         sha256 = "0m5ah29x290r0zk19hx2wix2djy7bs4plh9kvjz6bs9r45x25pa5";
@@ -681,17 +677,8 @@ self: super: builtins.intersectAttrs super {
         sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6";
       };
 
-      spagoFixHpack = overrideCabal spagoWithOverrides (drv: {
+      spagoDocs = overrideCabal super.spago (drv: {
         postUnpack = (drv.postUnpack or "") + ''
-          # The source for spago is pulled directly from GitHub.  It uses a
-          # package.yaml file with hpack, not a .cabal file.  In the package.yaml file,
-          # it uses defaults from the master branch of the hspec repo.  It will try to
-          # fetch these at build-time (but it will fail if running in the sandbox).
-          #
-          # The following line modifies the package.yaml to not pull in
-          # defaults from the hspec repo.
-          substituteInPlace "$sourceRoot/package.yaml" --replace 'defaults: hspec/hspec@master' ""
-
           # Spago includes the following two files directly into the binary
           # with Template Haskell.  They are fetched at build-time from the
           # `purescript-docs-search` repo above.  If they cannot be fetched at
@@ -717,9 +704,8 @@ self: super: builtins.intersectAttrs super {
         '';
       });
 
-      # Because of the problem above with pulling in hspec defaults to the
-      # package.yaml file, the tests are disabled.
-      spagoWithoutChecks = dontCheck spagoFixHpack;
+      # Tests require network access.
+      spagoWithoutChecks = dontCheck spagoDocs;
     in
     spagoWithoutChecks;
 
diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix
index ed8da83e30a..0bd33f19f8e 100644
--- a/pkgs/development/tools/purescript/spago/spago.nix
+++ b/pkgs/development/tools/purescript/spago/spago.nix
@@ -1,37 +1,38 @@
+# This has been automatically generated by the script
+# ./update.sh.  This should not be changed by hand.
 { mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool
-, base, bower-json, bytestring, Cabal, containers, cryptonite
-, dhall, directory, either, extra, fetchgit, file-embed, filepath
-, foldl, fsnotify, generic-lens, Glob, hpack, hspec, hspec-discover
+, base, bower-json, bytestring, containers, cryptonite, dhall
+, directory, either, extra, fetchgit, file-embed, filepath, foldl
+, fsnotify, generic-lens, Glob, hspec, hspec-discover
 , hspec-megaparsec, http-client, http-conduit, http-types
 , lens-family-core, lib, megaparsec, mtl, network-uri, open-browser
 , optparse-applicative, prettyprinter, process, QuickCheck, retry
-, rio, rio-orphans, safe, semver-range, stm, stringsearch
-, tar, template-haskell, temporary, text, time, transformers
-, turtle, unliftio, unordered-containers, utf8-string, versions
-, with-utf8, zlib
+, rio, rio-orphans, safe, semver-range, stm, stringsearch, tar
+, template-haskell, temporary, text, time, transformers, turtle
+, unliftio, unordered-containers, utf8-string, versions, with-utf8
+, zlib
 }:
 mkDerivation {
   pname = "spago";
-  version = "0.20.1";
+  version = "0.20.2";
   src = fetchgit {
     url = "https://github.com/purescript/spago.git";
-    sha256 = "1j2yi6zz9m0k0298wllin39h244v8b2rx87yxxgdbjg77kn96vxg";
-    rev = "41ad739614f4f2c2356ac921308f9475a5a918f4";
+    sha256 = "11jh3bszvl8zfi4xcabpx43jply28dxdywd6fadxspaa05jdxxn2";
+    rev = "0f38c9153e46f30e9d87963e181f5c1a595f4b64";
     fetchSubmodules = true;
   };
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
     aeson aeson-pretty ansi-terminal async-pool base bower-json
-    bytestring Cabal containers cryptonite dhall directory either
-    file-embed filepath foldl fsnotify generic-lens Glob http-client
-    http-conduit http-types lens-family-core megaparsec mtl network-uri
-    open-browser optparse-applicative prettyprinter process retry rio
-    rio-orphans safe semver-range stm stringsearch tar template-haskell
-    temporary text time transformers turtle unliftio
-    unordered-containers utf8-string versions with-utf8 zlib
+    bytestring containers cryptonite dhall directory either file-embed
+    filepath foldl fsnotify generic-lens Glob http-client http-conduit
+    http-types lens-family-core megaparsec mtl network-uri open-browser
+    optparse-applicative prettyprinter process retry rio rio-orphans
+    safe semver-range stm stringsearch tar template-haskell temporary
+    text time transformers turtle unliftio unordered-containers
+    utf8-string versions with-utf8 zlib
   ];
-  libraryToolDepends = [ hpack ];
   executableHaskellDepends = [
     ansi-terminal base text turtle with-utf8
   ];
@@ -40,7 +41,6 @@ mkDerivation {
     process QuickCheck temporary text turtle versions
   ];
   testToolDepends = [ hspec-discover ];
-  prePatch = "hpack";
   homepage = "https://github.com/purescript/spago#readme";
   license = lib.licenses.bsd3;
 }
diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/development/tools/purescript/spago/update.sh
index 74bc0105066..12595885df3 100755
--- a/pkgs/development/tools/purescript/spago/update.sh
+++ b/pkgs/development/tools/purescript/spago/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p cabal2nix curl jq
+#!nix-shell -i bash -p cabal2nix curl jq haskellPackages.cabal2nix-unstable -I nixpkgs=.
 #
 # This script will update the spago derivation to the latest version using
 # cabal2nix.
@@ -25,7 +25,10 @@ new_version=$(curl --silent "https://api.github.com/repos/purescript/spago/relea
 echo "Updating spago from old version $old_version to new version $new_version."
 echo "Running cabal2nix and outputting to ${spago_derivation_file}..."
 
-cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" > "$spago_derivation_file"
+echo "# This has been automatically generated by the script" > "$spago_derivation_file"
+echo "# ./update.sh.  This should not be changed by hand." >> "$spago_derivation_file"
+
+cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" >> "$spago_derivation_file"
 
 # TODO: This should ideally also automatically update the docsSearchVersion
 # from pkgs/development/haskell/configuration-nix.nix.

From 8c6c17b84e8f78f496d25ff39caa7e43875b70ad Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 7 May 2021 12:35:42 +0200
Subject: [PATCH 093/143] haskellPackages.cpuid: set accurate meta.platform
 value

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 501d1572737..bfb213684ca 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -872,4 +872,10 @@ self: super: builtins.intersectAttrs super {
       pkgs.darwin.apple_sdk.frameworks.IOKit
     ] ++ (drv.librarySystemDepends or []);
   });
+
+  # set more accurate set of platforms instead of maintaining
+  # an ever growing list of platforms to exclude via unsupported-platforms
+  cpuid = overrideCabal super.cpuid {
+    platforms = pkgs.lib.platforms.x86;
+  };
 }

From ffc669baf944dfc0556abf4efda0fb46d19df97c Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Fri, 7 May 2021 12:54:13 +0200
Subject: [PATCH 094/143] haskellPackages.haggle: unbreak

https://github.com/travitch/haggle/issues/4
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 750b62ff153..a341e6a657e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1863,4 +1863,8 @@ self: super: {
       sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm";
     });
 
+  # Too strict bounds on ref-tf
+  # https://github.com/travitch/haggle/issues/4
+  haggle = doJailbreak super.haggle;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 226cbcbaf7c809aa3f571488ad146acf40158adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Fri, 7 May 2021 13:22:55 +0200
Subject: [PATCH 095/143] vorta: add borgbackup to $PATH

---
 pkgs/applications/backup/vorta/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix
index c37bf0f20f7..fc56d6c5400 100644
--- a/pkgs/applications/backup/vorta/default.nix
+++ b/pkgs/applications/backup/vorta/default.nix
@@ -2,6 +2,7 @@
 , python3
 , fetchFromGitHub
 , wrapQtAppsHook
+, borgbackup
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -30,7 +31,10 @@ python3.pkgs.buildPythonApplication rec {
   doCheck = false;
 
   preFixup = ''
-    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+    makeWrapperArgs+=(
+      "''${qtWrapperArgs[@]}"
+      --prefix PATH : ${lib.makeBinPath [ borgbackup ]}
+    )
   '';
 
   meta = with lib; {

From d36f591349bf59ac5a6e60a8c94e500917bf089b Mon Sep 17 00:00:00 2001
From: Shlok Datye <shlok@quant.is>
Date: Fri, 7 May 2021 16:14:07 +0200
Subject: [PATCH 096/143] haskellPackages.streamly-archive: unbreak

(The correct libarchive is now being passed into the package.)
---
 .../development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 pkgs/development/haskell-modules/configuration-nix.nix         | 3 +++
 pkgs/development/haskell-modules/hackage-packages.nix          | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 9c345f6dabc..9a94c99125b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -10656,7 +10656,6 @@ broken-packages:
   - streaming-sort
   - streaming-utils
   - streaming-with
-  - streamly-archive
   - streamly-fsnotify
   - streamly-lmdb
   - streamproc
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index f01758f8f74..6f38c89088c 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -864,4 +864,7 @@ self: super: builtins.intersectAttrs super {
   cpuid = overrideCabal super.cpuid {
     platforms = pkgs.lib.platforms.x86;
   };
+
+  # Pass the correct libarchive into the package.
+  streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; };
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d375f7b3eb8..bdee77f676a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -250826,8 +250826,6 @@ self: {
        testSystemDepends = [ archive ];
        description = "Stream data from archives using the streamly library";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {archive = null;};
 
   "streamly-binary" = callPackage

From d4917fafb536a9a62073e84347541494f708f78f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 7 May 2021 17:22:57 +0200
Subject: [PATCH 097/143] home-assistant: enable fritz component tests

These tests require pytest-mock for the mocker fixture, but it isn't
declared anywhere.

https://github.com/home-assistant/core/issues/50253
---
 pkgs/servers/home-assistant/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 4df380e2b5a..6e37666c78d 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -176,6 +176,7 @@ in with py.pkgs; buildPythonApplication rec {
     # test infrastructure
     asynctest
     pytest-aiohttp
+    pytest-mock
     pytest-rerunfailures
     pytest-xdist
     pytestCheckHook
@@ -237,6 +238,7 @@ in with py.pkgs; buildPythonApplication rec {
     "folder"
     "folder_watcher"
     "freebox"
+    "fritz"
     "fritzbox"
     "fritzbox_callmonitor"
     "frontend"

From 732c69861400981492bf1159e95e71d845e0b4e0 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 7 May 2021 14:34:18 -0300
Subject: [PATCH 098/143] cagebreak: 1.7.0 -> 1.7.1

Now it uses scdoc as manpage generator.
---
 .../window-managers/cagebreak/default.nix     | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix
index de996f080e7..260d94fd80a 100644
--- a/pkgs/applications/window-managers/cagebreak/default.nix
+++ b/pkgs/applications/window-managers/cagebreak/default.nix
@@ -9,7 +9,6 @@
 , meson
 , ninja
 , nixosTests
-, pandoc
 , pango
 , pixman
 , pkg-config
@@ -23,20 +22,19 @@
 
 stdenv.mkDerivation rec {
   pname = "cagebreak";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "project-repo";
     repo = pname;
     rev = version;
-    hash = "sha256-HpAjJHu5sxZKof3ydnU3wcP5GpnH6Ax8m1T1vVoq+oI=";
+    hash = "sha256-1IztedN5/I/4TDKHLJ26fSrDsvJ5QAr+cbzS2PQITDE=";
   };
 
   nativeBuildInputs = [
     makeWrapper
     meson
     ninja
-    pandoc
     pkg-config
     scdoc
     wayland
@@ -66,26 +64,27 @@ stdenv.mkDerivation rec {
     "-Dxwayland=${lib.boolToString withXwayland}"
   ];
 
+  # TODO: investigate why is this happening
   postPatch = ''
     sed -i -e 's|<drm_fourcc.h>|<libdrm/drm_fourcc.h>|' *.c
   '';
 
   postInstall = ''
-    mkdir -p $contrib/share/cagebreak
-    cp $src/examples/config $contrib/share/cagebreak/config
+    install -d $contrib/share/cagebreak/
+    install -m644 $src/examples/config $contrib/share/cagebreak/
   '';
 
   postFixup = lib.optionalString withXwayland ''
     wrapProgram $out/bin/cagebreak --prefix PATH : "${xwayland}/bin"
   '';
 
-  passthru.tests.basic = nixosTests.cagebreak;
-
   meta = with lib; {
-    description = "A Wayland tiling compositor inspired by ratpoison";
     homepage = "https://github.com/project-repo/cagebreak";
+    description = "A Wayland tiling compositor inspired by ratpoison";
     license = licenses.mit;
-    platforms = platforms.linux;
     maintainers = with maintainers; [ berbiche ];
+    platforms = platforms.linux;
   };
+
+  passthru.tests.basic = nixosTests.cagebreak;
 }

From 9309f19ea26d2824d404c83687f7325e6578aad2 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 7 May 2021 14:36:25 -0300
Subject: [PATCH 099/143] cagebreak: merge contrib output with regular output

---
 pkgs/applications/window-managers/cagebreak/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix
index 260d94fd80a..d88bc0cdbdf 100644
--- a/pkgs/applications/window-managers/cagebreak/default.nix
+++ b/pkgs/applications/window-managers/cagebreak/default.nix
@@ -53,11 +53,6 @@ stdenv.mkDerivation rec {
     wlroots
   ];
 
-  outputs = [
-    "out"
-    "contrib"
-  ];
-
   mesonFlags = [
     "-Dman-pages=true"
     "-Dversion_override=${version}"
@@ -70,8 +65,8 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    install -d $contrib/share/cagebreak/
-    install -m644 $src/examples/config $contrib/share/cagebreak/
+    install -d $out/share/cagebreak/
+    install -m644 $src/examples/config $out/share/cagebreak/
   '';
 
   postFixup = lib.optionalString withXwayland ''

From f417ed0e69dce879c745a1a79920af01577ee8a3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 May 2021 21:24:30 +0200
Subject: [PATCH 100/143] python3Packages.rich: 9.13.0 -> 10.1.0

---
 .../python-modules/rich/default.nix           | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index 52bef42f270..d292eaa5223 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -6,7 +6,7 @@
 , colorama
 , dataclasses
 , ipywidgets
-, poetry
+, poetry-core
 , pygments
 , typing-extensions
 , pytestCheckHook
@@ -14,27 +14,33 @@
 
 buildPythonPackage rec {
   pname = "rich";
-  version = "9.13.0";
+  version = "10.1.0";
+  format = "pyproject";
+  disabled = pythonOlder "3.6";
 
-  # tests not included in pypi tarball
   src = fetchFromGitHub {
     owner = "willmcgugan";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0si3rzhg8wfxw4aakkp8sr6nbzfa54rl0w92macd1338q90ha4ly";
+    sha256 = "sha256-HH+k9uiK34yoqu83rknCIe2DpoqJRHkcqABuj8zjzqs=";
   };
-  format = "pyproject";
 
-  nativeBuildInputs = [ poetry ];
+  nativeBuildInputs = [ poetry-core ];
+
   propagatedBuildInputs = [
     CommonMark
     colorama
     ipywidgets
     pygments
     typing-extensions
-  ] ++ lib.optional (pythonOlder "3.7") dataclasses;
+  ] ++ lib.optional (pythonOlder "3.7") [
+    dataclasses
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  checkInputs = [ pytestCheckHook ];
   pythonImportsCheck = [ "rich" ];
 
   meta = with lib; {

From 9c6305ab6a48868e6ea872a0c9d7cd37572d1ec2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 May 2021 21:25:19 +0200
Subject: [PATCH 101/143] python3Packages.surepy: 0.5.0 -> 0.6.0

---
 pkgs/development/python-modules/surepy/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix
index dd071b5cf08..ff2b588e470 100644
--- a/pkgs/development/python-modules/surepy/default.nix
+++ b/pkgs/development/python-modules/surepy/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "surepy";
-  version = "0.5.0";
+  version = "0.6.0";
   format = "pyproject";
   disabled = pythonOlder "3.8";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "benleb";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1adsnjya142bxdhfxqsi2qa35ylvdcibigs1wafjlxazlxs3mg0j";
+    sha256 = "sha256-XoYiZPBc9SybyKocui1HqSA+YPiPpbupJWMCfmQT5RU=";
   };
 
   nativeBuildInputs = [ poetry-core ];
@@ -43,11 +43,6 @@ buildPythonPackage rec {
     rich
   ];
 
-  postPatch = ''
-    # halo is out-dated, https://github.com/benleb/surepy/pull/7
-    substituteInPlace pyproject.toml --replace "^0.0.30" "^0.0.31"
-  '';
-
   # Project has no tests
   doCheck = false;
   pythonImportsCheck = [ "surepy" ];

From c742d23e61c00da067fea60841f0607f9d514656 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 7 May 2021 20:01:11 +0200
Subject: [PATCH 102/143] home-assistant: enable surepetcare tests

---
 pkgs/servers/home-assistant/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index e1f05a38c15..54b74beb6f5 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -358,6 +358,7 @@ in with py.pkgs; buildPythonApplication rec {
     "stream"
     "subaru"
     "sun"
+    "surepetcare"
     "switch"
     "system_health"
     "system_log"

From b858ba8a7c9f6188f15a2cedee1b7e7a5fe8bbb7 Mon Sep 17 00:00:00 2001
From: Shlok Datye <shlok@quant.is>
Date: Fri, 7 May 2021 20:04:04 +0200
Subject: [PATCH 103/143] haskellPackages.streamly-lmdb: unbreak

(The latest version of streamly-lmdb (0.2.1) is not broken at all.)
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 pkgs/development/haskell-modules/hackage-packages.nix           | 2 --
 2 files changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 9a94c99125b..dccd1f75a93 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -10657,7 +10657,6 @@ broken-packages:
   - streaming-utils
   - streaming-with
   - streamly-fsnotify
-  - streamly-lmdb
   - streamproc
   - strelka
   - strict-base-types
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index bdee77f676a..22a5534c817 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -250926,8 +250926,6 @@ self: {
        testSystemDepends = [ lmdb ];
        description = "Stream data to or from LMDB databases using the streamly library";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) lmdb;};
 
   "streamly-posix" = callPackage

From e35cbc0bdb48c68f93cc682c67ecbb3b0f5f77a3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 7 May 2021 20:12:49 +0200
Subject: [PATCH 104/143] python3Packages.pyxnat: add missing six dependency

---
 pkgs/development/python-modules/pyxnat/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix
index 87f6b9756ed..a72b4603775 100644
--- a/pkgs/development/python-modules/pyxnat/default.nix
+++ b/pkgs/development/python-modules/pyxnat/default.nix
@@ -5,6 +5,7 @@
 , nose
 , lxml
 , requests
+, six
 }:
 
 buildPythonPackage rec {
@@ -17,7 +18,11 @@ buildPythonPackage rec {
     sha256 = "22524120d744b50d25ef6bfc7052637e4ead9e2afac92563231ec89848f5adf5";
   };
 
-  propagatedBuildInputs = [ lxml requests ];
+  propagatedBuildInputs = [
+    lxml
+    requests
+    six
+  ];
 
   # future is not used, and pathlib is installed part of python38+
   # w/o an external package

From fcd5670a07bd3d8cac2fe63063edc21381640eff Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 7 May 2021 20:26:15 +0200
Subject: [PATCH 105/143] emulsion: fix build

ZHF #122042
Failing Hydra build: https://hydra.nixos.org/build/142625836
---
 pkgs/applications/graphics/emulsion/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix
index 9792ce4d6d2..465e78e434c 100644
--- a/pkgs/applications/graphics/emulsion/default.nix
+++ b/pkgs/applications/graphics/emulsion/default.nix
@@ -63,17 +63,10 @@ rustPlatform.buildRustPackage rec {
     OpenGL
   ];
 
-  installPhase = ''
-    runHook preInstall
-    install -D $releaseDir/emulsion $out/bin/emulsion
-  '' + lib.optionalString stdenv.isLinux ''
-      patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion
-  '' + ''
-    runHook postInstall
+  postFixup = lib.optionalString stdenv.isLinux ''
+    patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion
   '';
 
-  dontPatchELF = true;
-
   meta = with lib; {
     description = "A fast and minimalistic image viewer";
     homepage = "https://arturkovacs.github.io/emulsion-website/";

From 50530ec8b8590fdd6d9d52618281c0bfcd7515f4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 7 May 2021 20:35:48 +0200
Subject: [PATCH 106/143] python3Packages.seabreeze: fix build, enable tests

---
 .../python-modules/seabreeze/default.nix      | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix
index 7580647f5a1..06802a8a2ce 100644
--- a/pkgs/development/python-modules/seabreeze/default.nix
+++ b/pkgs/development/python-modules/seabreeze/default.nix
@@ -1,8 +1,17 @@
 { lib
 , fetchFromGitHub
 , buildPythonPackage
-, pyusb
+, cython
+, git
+, pkgconfig
+, pytest-runner
+, setuptools-scm
+, future
 , numpy
+, pyusb
+, mock
+, pytestCheckHook
+, zipp
 }:
 
 ## Usage
@@ -18,19 +27,35 @@ buildPythonPackage rec {
     owner = "ap--";
     repo = "python-seabreeze";
     rev = "v${version}";
-    sha256 = "1lna3w1vsci35dhyi7qjvbb99gxvzk23k195c7by7kkrps844q1j";
+    sha256 = "1hm9aalpb9sdp8s7ckn75xvyiacp5678pv9maybm5nz0z2h29ibq";
+    leaveDotGit = true;
   };
 
+  nativeBuildInputs = [
+    cython
+    git
+    pkgconfig
+    pytest-runner
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    future
+    numpy
+    pyusb
+  ];
+
   postInstall = ''
     mkdir -p $out/etc/udev/rules.d
-    cp misc/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules
+    cp os_support/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules
   '';
 
-  # underlying c libraries are tested and fail
-  # (c libs are used with anaconda, which we don't care about as we use the alternative path, being that of pyusb).
-  doCheck = false;
-
-  propagatedBuildInputs = [ pyusb numpy ];
+  # few backends enabled, but still some tests
+  checkInputs = [
+    pytestCheckHook
+    mock
+    zipp
+  ];
 
   setupPyBuildFlags = [ "--without-cseabreeze" ];
 

From 3d043c6939574cf335f4407967273b4cb9ca795f Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Fri, 7 May 2021 20:00:47 +0200
Subject: [PATCH 107/143] nixosTests.fancontrol: fix test

and set myself (module author) as maintainer
---
 nixos/tests/fancontrol.nix | 40 ++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/nixos/tests/fancontrol.nix b/nixos/tests/fancontrol.nix
index 356cd57ffa1..296c6802641 100644
--- a/nixos/tests/fancontrol.nix
+++ b/nixos/tests/fancontrol.nix
@@ -1,28 +1,34 @@
 import ./make-test-python.nix ({ pkgs, ... } : {
   name = "fancontrol";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ evils ];
+  };
 
-  machine =
-    { ... }:
-    { hardware.fancontrol.enable = true;
-      hardware.fancontrol.config = ''
-        INTERVAL=42
-        DEVPATH=hwmon1=devices/platform/dummy
-        DEVNAME=hwmon1=dummy
-        FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp1_input
-        FCFANS=hwmon1/device/pwm1=hwmon1/device/fan1_input
-        MINTEMP=hwmon1/device/pwm1=25
-        MAXTEMP=hwmon1/device/pwm1=65
-        MINSTART=hwmon1/device/pwm1=150
-        MINSTOP=hwmon1/device/pwm1=0
-      '';
+  machine = { ... }: {
+    imports = [ ../modules/profiles/minimal.nix ];
+    hardware.fancontrol.enable = true;
+    hardware.fancontrol.config = ''
+      INTERVAL=42
+      DEVPATH=hwmon1=devices/platform/dummy
+      DEVNAME=hwmon1=dummy
+      FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp1_input
+      FCFANS=hwmon1/device/pwm1=hwmon1/device/fan1_input
+      MINTEMP=hwmon1/device/pwm1=25
+      MAXTEMP=hwmon1/device/pwm1=65
+      MINSTART=hwmon1/device/pwm1=150
+      MINSTOP=hwmon1/device/pwm1=0
+    '';
     };
 
   # This configuration cannot be valid for the test VM, so it's expected to get an 'outdated' error.
   testScript = ''
     start_all()
-    machine.wait_for_unit("fancontrol.service")
-    machine.wait_until_succeeds(
-        "journalctl -eu fancontrol | grep 'Configuration appears to be outdated'"
+    # can't wait for unit fancontrol.service because it doesn't become active due to invalid config
+    # fancontrol.service is WantedBy multi-user.target
+    machine.wait_for_unit("multi-user.target")
+    machine.succeed(
+        "journalctl -eu fancontrol | tee /dev/stderr | grep 'Configuration appears to be outdated'"
     )
+    machine.shutdown()
   '';
 })

From 5ae90276c38faec9c1e18b5e7b71af9eebd1b2af Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Fri, 7 May 2021 20:02:17 +0200
Subject: [PATCH 108/143] nixos/fancontrol: clean up module

set a group and user for the service
remove default null config
  it's required, now it throws an error pointing to the option

set myself (module author) as maintainer
---
 .../modules/services/hardware/fancontrol.nix  | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix
index e1ce11a5aef..3722db5bc51 100644
--- a/nixos/modules/services/hardware/fancontrol.nix
+++ b/nixos/modules/services/hardware/fancontrol.nix
@@ -6,21 +6,21 @@ let
   cfg = config.hardware.fancontrol;
   configFile = pkgs.writeText "fancontrol.conf" cfg.config;
 
-in{
+in
+{
   options.hardware.fancontrol = {
     enable = mkEnableOption "software fan control (requires fancontrol.config)";
 
     config = mkOption {
-      default = null;
-      type = types.nullOr types.lines;
-      description = "Fancontrol configuration file content. See <citerefentry><refentrytitle>pwmconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry> from the lm_sensors package.";
+      type = types.lines;
+      description = "Required fancontrol configuration file content. See <citerefentry><refentrytitle>pwmconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry> from the lm_sensors package.";
       example = ''
         # Configuration file generated by pwmconfig
         INTERVAL=10
         DEVPATH=hwmon3=devices/virtual/thermal/thermal_zone2 hwmon4=devices/platform/f71882fg.656
         DEVNAME=hwmon3=soc_dts1 hwmon4=f71869a
         FCTEMPS=hwmon4/device/pwm1=hwmon3/temp1_input
-        FCFANS= hwmon4/device/pwm1=hwmon4/device/fan1_input
+        FCFANS=hwmon4/device/pwm1=hwmon4/device/fan1_input
         MINTEMP=hwmon4/device/pwm1=35
         MAXTEMP=hwmon4/device/pwm1=65
         MINSTART=hwmon4/device/pwm1=150
@@ -30,16 +30,30 @@ in{
   };
 
   config = mkIf cfg.enable {
+
+    users = {
+      groups.lm_sensors = {};
+
+      users.fancontrol = {
+        isSystemUser = true;
+        group = "lm_sensors";
+        description = "fan speed controller";
+      };
+    };
+
     systemd.services.fancontrol = {
-      unitConfig.Documentation = "man:fancontrol(8)";
+      documentation = [ "man:fancontrol(8)" ];
       description = "software fan control";
       wantedBy = [ "multi-user.target" ];
       after = [ "lm_sensors.service" ];
 
       serviceConfig = {
-        Type = "simple";
         ExecStart = "${pkgs.lm_sensors}/sbin/fancontrol ${configFile}";
+        Group = "lm_sensors";
+        User = "fancontrol";
       };
     };
   };
+
+  meta.maintainers = [ maintainers.evils ];
 }

From 0f000b836e39297b1cb824c6f0c1871870265ec1 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 7 May 2021 20:47:02 +0200
Subject: [PATCH 109/143] haskellPackages.hercules-ci-optparse-applicative:
 2021-03-05 -> 2021-03-18

---
 .../misc/haskell/hercules-ci-optparse-applicative.nix        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
index 7f49430c15c..17bedd5e7d3 100644
--- a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
+++ b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
@@ -6,9 +6,8 @@ mkDerivation {
   version = "0.16.1.0";
   src = fetchgit {
     url = "https://github.com/hercules-ci/optparse-applicative.git";
-    sha256 = "0v0r11jaav95im82if976256kncp0ji7nfdrlpbgmwxnkj1hxl48";
-    rev = "f9d1242f9889d2e09ff852db9dc2d231d9a3e8d8";
-    fetchSubmodules = true;
+    sha256 = "05vchaw2rf46hh2128qjpky686iy5hff964mbdhcyiz612jjflyp";
+    rev = "9e2968c09a7c5b29d04578dc68d81ce5aec0591e";
   };
   libraryHaskellDepends = [
     ansi-wl-pprint base process transformers transformers-compat

From 12493f272b466473c59f1f42a8e2c8df55e99158 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 7 May 2021 20:25:29 +0200
Subject: [PATCH 110/143] python3Packages.runway-python: fix build, enable
 tests

---
 .../python-modules/runway-python/default.nix  | 50 +++++++++++++++----
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix
index 69b928aad08..9244a94d235 100644
--- a/pkgs/development/python-modules/runway-python/default.nix
+++ b/pkgs/development/python-modules/runway-python/default.nix
@@ -1,33 +1,43 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, pythonAtLeast
+, fetchFromGitHub
+, colorcet
+, cryptography
 , flask
 , flask-compress
 , flask-cors
 , flask-sockets
+, gevent
 , imageio
 , numpy
-, scipy
 , pillow
-, gevent
-, wget
+, pyopenssl
+, scipy
 , six
-, colorcet
 , unidecode
 , urllib3
+, wget
+, deepdiff
+, pytestCheckHook
+, pytestcov
+, websocket_client
 }:
 
 buildPythonPackage rec {
   pname = "runway-python";
   version = "0.6.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "66cf1517dd817bf6db3792608920274f964dd0ced8dabecd925b8bc17aa95740";
+  src = fetchFromGitHub {
+    owner = "runwayml";
+    repo = "model-sdk";
+    rev = version;
+    sha256 = "1ww2wai1qnly8i7g42vhkkbs4yp7wi9x4fjdxsg9fl3izjra0zs2";
   };
 
   propagatedBuildInputs = [
     colorcet
+    cryptography
     flask
     flask-compress
     flask-cors
@@ -36,6 +46,7 @@ buildPythonPackage rec {
     imageio
     numpy
     pillow
+    pyopenssl
     scipy
     six
     unidecode
@@ -43,13 +54,30 @@ buildPythonPackage rec {
     wget
   ];
 
-  # tests are not packaged in the released tarball
-  doCheck = false;
-
   pythonImportsCheck = [
     "runway"
   ];
 
+  checkInputs = [
+    deepdiff
+    pytestCheckHook
+    pytestcov
+    websocket_client
+  ];
+
+  disabledTests = [
+    # these tests require network
+    "test_file_deserialization_remote"
+    "test_file_deserialization_absolute_directory"
+    "test_file_deserialization_remote_directory"
+  ] ++ lib.optionals (pythonAtLeast "3.9") [
+     # AttributeError: module 'base64' has no attribute 'decodestring
+     # https://github.com/runwayml/model-sdk/issues/99
+     "test_image_serialize_and_deserialize"
+     "test_segmentation_serialize_and_deserialize_colormap"
+     "test_segmentation_serialize_and_deserialize_labelmap"
+  ];
+
   meta = {
     description = "Helper library for creating Runway models";
     homepage = "https://github.com/runwayml/model-sdk";

From 4f64f6d889b6d83f0c55ea37b87a1d4219b105da Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 7 May 2021 20:52:42 +0200
Subject: [PATCH 111/143] python3Packages.simple-salesforce: fix build

Configure explicit test phase.
---
 .../simple-salesforce/default.nix               | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix
index cd89c1c8aae..af92f345950 100644
--- a/pkgs/development/python-modules/simple-salesforce/default.nix
+++ b/pkgs/development/python-modules/simple-salesforce/default.nix
@@ -1,10 +1,8 @@
 { lib
 , fetchFromGitHub
 , buildPythonPackage
+, authlib
 , requests
-, pyopenssl
-, cryptography
-, idna
 , mock
 , isPy27
 , nose
@@ -24,21 +22,20 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
+    authlib
     requests
-    pyopenssl
-    cryptography
-    idna
   ];
 
   checkInputs = [
     nose
     pytz
     responses
-  ] ++ lib.optionals isPy27 [ mock ];
+  ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "mock==1.0.1" "mock"
+  checkPhase = ''
+    runHook preCheck
+    nosetests -v
+    runHook postCheck
   '';
 
   meta = with lib; {

From 9fd589504eb629d84e5852e76fbc2708944c7877 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 7 May 2021 20:09:32 +0200
Subject: [PATCH 112/143] haskellPackages.haskell-gi: Bump versions manually to
 still build with used C libs

---
 .../haskell-modules/configuration-common.nix  |  32 +-
 .../configuration-hackage2nix.yaml            |  27 +-
 .../haskell-modules/hackage-packages.nix      | 335 +++---------------
 .../patches/jsaddle-webkit2gtk.patch          |  65 ++++
 4 files changed, 153 insertions(+), 306 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a341e6a657e..e1b40d87759 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1291,16 +1291,32 @@ self: super: {
   # https://github.com/kowainik/policeman/issues/57
   policeman = doJailbreak super.policeman;
 
-  haskell-gi-base = addBuildDepends super.haskell-gi-base [ pkgs.gobject-introspection ];
+  # nixpkgs has bumped gdkpixbuf C lib, so we need gi-gdkpixbuf_2_0_26 to link against that.
+  # This leads to all this bumps which can be removed once stackage has haskell-gi 0.25.
+  haskell-gi = self.haskell-gi_0_25_0;
+  haskell-gi-base = addBuildDepends super.haskell-gi-base_0_25_0 [ pkgs.gobject-introspection ];
+  gi-glib = self.gi-glib_2_0_25;
+  gi-cairo = self.gi-cairo_1_0_25;
+  gi-gobject = self.gi-gobject_2_0_26;
+  gi-atk = self.gi-atk_2_0_23;
+  gi-gio = self.gi-gio_2_0_28;
+  gi-harfbuzz = self.gi-harfbuzz_0_0_4;
+  gi-javascriptcore = self.gi-javascriptcore_4_0_23;
+  gi-pango = self.gi-pango_1_0_24;
+  gi-soup = self.gi-soup_2_4_24;
+  gi-gdkpixbuf = self.gi-gdkpixbuf_2_0_26;
+  gi-gdk = self.gi-gdk_3_0_24;
+  gi-gtk = self.gi-gtk_3_0_37;
+  gi-webkit2 = self.gi-webkit2_4_0_27;
+  gi-cairo-render = doJailbreak super.gi-cairo-render;
+  gi-cairo-connector = doJailbreak super.gi-cairo-connector;
+  gi-gtk-hs = self.gi-gtk-hs_0_3_10;
+  gi-dbusmenu = self.gi-dbusmenu_0_4_9;
+  gi-xlib = self.gi-xlib_2_0_10;
 
-  # 2020-08-14: Needs some manual patching to be compatible with haskell-gi-base 0.24
+  # 2021-05-17: Needs some manual patching to be compatible with haskell-gi-base 0.25
   # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
-  jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk (pkgs.fetchpatch {
-    url = "https://github.com/ghcjs/jsaddle/compare/9727365...f842748.patch";
-    sha256 = "07l4l999lmlx7sqxf7v4f70rmxhx9r0cjblkgc4n0y6jin4iv1cb";
-    stripLen = 2;
-    extraPrefix = "";
-  });
+  jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch;
 
   # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
   # https://github.com/lehins/massiv/pull/104
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index dccd1f75a93..46470d75db8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -88,18 +88,18 @@ default-package-overrides:
   # so we need to restrict these to compatible versions
   # Remove these as soon as haskell-gi{,-base} are 0.25.*
   # in Stackage Nightly!
-  - gi-ggit < 1.0.10
-  - gi-girepository < 1.0.24
-  - gi-gst < 1.0.24
-  - gi-gstbase < 1.0.24
-  - gi-gstvideo < 1.0.24
-  - gi-gtksource < 3.0.24
-  - gi-ibus < 1.5.3
-  - gi-notify < 0.7.23
-  - gi-ostree < 1.0.14
-  - gi-pangocairo < 1.0.25
-  - gi-secret < 0.0.13
-  - gi-vte < 2.91.28
+  #- gi-ggit < 1.0.10
+  #- gi-girepository < 1.0.24
+  #- gi-gst < 1.0.24
+  #- gi-gstbase < 1.0.24
+  #- gi-gstvideo < 1.0.24
+  #- gi-gtksource < 3.0.24
+  #- gi-ibus < 1.5.3
+  #- gi-notify < 0.7.23
+  #- gi-ostree < 1.0.14
+  #- gi-pangocairo < 1.0.25
+  #- gi-secret < 0.0.13
+  #- gi-vte < 2.91.28
 
   # Stackage Nightly 2021-05-03
   - abstract-deque ==0.3
@@ -2819,6 +2819,8 @@ extra-packages:
   - refinery == 0.3.*                   # required by hls-tactics-plugin-1.0.0.0
   - resolv == 0.1.1.2                   # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
   - sbv == 7.13                         # required for pkgs.petrinizer
+  - gi-gdk == 3.0.24                    # 2021-05-07: For haskell-gi 0.25 without gtk4
+  - gi-gtk < 4.0                        # 2021-05-07: For haskell-gi 0.25 without gtk4
 
 package-maintainers:
   peti:
@@ -5777,7 +5779,6 @@ broken-packages:
   - ghcup
   - ght
   - gi-cairo-again
-  - gi-gmodule
   - gi-graphene
   - gi-gsk
   - gi-gstaudio
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 22a5534c817..16b9400d01a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -103670,6 +103670,31 @@ self: {
        license = lib.licenses.lgpl21Only;
      }) {inherit (pkgs) gtk3;};
 
+  "gi-gdk_3_0_24" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
+     , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-gdk";
+       version = "3.0.24";
+       sha256 = "17slysv7zj3nbzh302w8jkvcfkvwfk5s80n99lqhggd6lnhf5fjx";
+       setupHaskellDepends = [
+         base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango
+         haskell-gi
+       ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
+         gi-gobject gi-pango haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       description = "Gdk bindings";
+       license = lib.licenses.lgpl21Only;
+       hydraPlatforms = lib.platforms.none;
+     }) {inherit (pkgs) gtk3;};
+
   "gi-gdk_4_0_3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk4
@@ -103784,30 +103809,6 @@ self: {
      }) {gtk4-x11 = null;};
 
   "gi-ggit" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, libgit2-glib, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-ggit";
-       version = "1.0.9";
-       sha256 = "0qvmppdby40ncd9alnnk8ang90qcaj00c0g0nrq0s0m1ynar8ccd";
-       setupHaskellDepends = [
-         base Cabal gi-gio gi-glib gi-gobject haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ libgit2-glib ];
-       description = "libgit2-glib bindings";
-       license = lib.licenses.lgpl21Only;
-       platforms = [
-         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
-       ];
-     }) {inherit (pkgs) libgit2-glib;};
-
-  "gi-ggit_1_0_10" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, libgit2-glib, text, transformers
@@ -103829,7 +103830,6 @@ self: {
        platforms = [
          "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
        ];
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) libgit2-glib;};
 
   "gi-gio" = callPackage
@@ -103872,25 +103872,6 @@ self: {
      }) {inherit (pkgs) glib;};
 
   "gi-girepository" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-girepository";
-       version = "1.0.23";
-       sha256 = "0a8sis3zayiywi7mgs1g4p7nr9szv392j7bimq5nvva04lj6sdzc";
-       setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ gobject-introspection ];
-       description = "GIRepository (gobject-introspection) bindings";
-       license = lib.licenses.lgpl21Only;
-     }) {inherit (pkgs) gobject-introspection;};
-
-  "gi-girepository_1_0_24" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
@@ -103907,7 +103888,6 @@ self: {
        libraryPkgconfigDepends = [ gobject-introspection ];
        description = "GIRepository (gobject-introspection) bindings";
        license = lib.licenses.lgpl21Only;
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) gobject-introspection;};
 
   "gi-glib" = callPackage
@@ -103966,8 +103946,6 @@ self: {
        libraryPkgconfigDepends = [ gmodule ];
        description = "GModule bindings";
        license = lib.licenses.lgpl21Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {gmodule = null;};
 
   "gi-gobject" = callPackage
@@ -104078,25 +104056,6 @@ self: {
      }) {inherit (pkgs) gtk4;};
 
   "gi-gst" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gstreamer, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gst";
-       version = "1.0.23";
-       sha256 = "0w4xscgd49d6d00gvsqc210r63c0wj748dqa5ypppr4mzllsm0qv";
-       setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ gstreamer ];
-       description = "GStreamer bindings";
-       license = lib.licenses.lgpl21Only;
-     }) {inherit (pkgs.gst_all_1) gstreamer;};
-
-  "gi-gst_1_0_24" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gstreamer, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
@@ -104113,7 +104072,6 @@ self: {
        libraryPkgconfigDepends = [ gstreamer ];
        description = "GStreamer bindings";
        license = lib.licenses.lgpl21Only;
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs.gst_all_1) gstreamer;};
 
   "gi-gstaudio" = callPackage
@@ -104140,27 +104098,6 @@ self: {
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstbase" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gstbase";
-       version = "1.0.23";
-       sha256 = "0im25z9pf9j0cxj0b6lbbr3lis9kbvzzvzns65cmargbh1018959";
-       setupHaskellDepends = [
-         base Cabal gi-glib gi-gobject gi-gst haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject gi-gst haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ gst-plugins-base ];
-       description = "GStreamerBase bindings";
-       license = lib.licenses.lgpl21Only;
-     }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
-
-  "gi-gstbase_1_0_24" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
@@ -104179,7 +104116,6 @@ self: {
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerBase bindings";
        license = lib.licenses.lgpl21Only;
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstpbutils" = callPackage
@@ -104232,27 +104168,6 @@ self: {
      }) {gstreamer-tag = null;};
 
   "gi-gstvideo" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi
-     , haskell-gi-base, haskell-gi-overloading, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gstvideo";
-       version = "1.0.23";
-       sha256 = "1kb09kal08x7nznc0g8c2n9jfijapdndbnsfs5cvz0p9smvd092i";
-       setupHaskellDepends = [
-         base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
-         haskell-gi haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ gst-plugins-base ];
-       description = "GStreamerVideo bindings";
-       license = lib.licenses.lgpl21Only;
-     }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
-
-  "gi-gstvideo_1_0_24" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi
      , haskell-gi-base, haskell-gi-overloading, text, transformers
@@ -104271,7 +104186,6 @@ self: {
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerVideo bindings";
        license = lib.licenses.lgpl21Only;
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gtk" = callPackage
@@ -104298,6 +104212,31 @@ self: {
        license = lib.licenses.lgpl21Only;
      }) {inherit (pkgs) gtk3;};
 
+  "gi-gtk_3_0_37" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
+     , gi-pango, gtk3, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gtk";
+       version = "3.0.37";
+       sha256 = "1psg789lrpcnrwh1y80y7s09hcxl3hihi0gwsmd7j3v731dp7a0k";
+       setupHaskellDepends = [
+         base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib
+         gi-gobject gi-pango haskell-gi
+       ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
+         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       description = "Gtk bindings";
+       license = lib.licenses.lgpl21Only;
+       hydraPlatforms = lib.platforms.none;
+     }) {inherit (pkgs) gtk3;};
+
   "gi-gtk_4_0_4" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
@@ -104453,30 +104392,6 @@ self: {
      }) {gtksheet = null;};
 
   "gi-gtksource" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
-     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
-     , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gtksource";
-       version = "3.0.23";
-       sha256 = "13rsxjbl62q8zhwqr8jm2fh5njzfa86izqwag4d6aw8xi71wqfrn";
-       setupHaskellDepends = [
-         base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib
-         gi-gobject gi-gtk gi-pango haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ gtksourceview3 ];
-       description = "GtkSource bindings";
-       license = lib.licenses.lgpl21Only;
-     }) {inherit (pkgs) gtksourceview3;};
-
-  "gi-gtksource_3_0_24" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base
@@ -104498,7 +104413,6 @@ self: {
        libraryPkgconfigDepends = [ gtksourceview3 ];
        description = "GtkSource bindings";
        license = lib.licenses.lgpl21Only;
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) gtksourceview3;};
 
   "gi-handy" = callPackage
@@ -104567,30 +104481,6 @@ self: {
      }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;};
 
   "gi-ibus" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, ibus, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-ibus";
-       version = "1.5.2";
-       sha256 = "14chw0qhzdxixsqsn2ra31z561kn2zclk15b7hfpfzayqr6dqci1";
-       setupHaskellDepends = [
-         base Cabal gi-gio gi-glib gi-gobject haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ ibus ];
-       description = "IBus bindings";
-       license = lib.licenses.lgpl21Only;
-       platforms = [
-         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
-       ];
-     }) {inherit (pkgs) ibus;};
-
-  "gi-ibus_1_5_3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, ibus, text, transformers
@@ -104612,7 +104502,6 @@ self: {
        platforms = [
          "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
        ];
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) ibus;};
 
   "gi-javascriptcore" = callPackage
@@ -104656,27 +104545,6 @@ self: {
      }) {inherit (pkgs) webkitgtk;};
 
   "gi-notify" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, libnotify, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-notify";
-       version = "0.7.22";
-       sha256 = "0j5cxx9dsxh2wafw4xa7yasr6n98h2qwpm1y08nm7m6i0kwrksap";
-       setupHaskellDepends = [
-         base Cabal gi-gdkpixbuf gi-glib gi-gobject haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
-         haskell-gi haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ libnotify ];
-       description = "Libnotify bindings";
-       license = lib.licenses.lgpl21Only;
-     }) {inherit (pkgs) libnotify;};
-
-  "gi-notify_0_7_23" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, libnotify, text, transformers
@@ -104695,34 +104563,9 @@ self: {
        libraryPkgconfigDepends = [ libnotify ];
        description = "Libnotify bindings";
        license = lib.licenses.lgpl21Only;
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) libnotify;};
 
   "gi-ostree" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, ostree, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-ostree";
-       version = "1.0.13";
-       sha256 = "07k02mffidw18f104crmhayr5nf3v5xcldc8fbmxdinp7wik5c7f";
-       setupHaskellDepends = [
-         base Cabal gi-gio gi-glib gi-gobject haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ ostree ];
-       description = "OSTree bindings";
-       license = lib.licenses.lgpl21Only;
-       platforms = [
-         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
-       ];
-     }) {inherit (pkgs) ostree;};
-
-  "gi-ostree_1_0_14" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, ostree, text, transformers
@@ -104744,7 +104587,6 @@ self: {
        platforms = [
          "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
        ];
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) ostree;};
 
   "gi-pango" = callPackage
@@ -104799,32 +104641,6 @@ self: {
      }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
   "gi-pangocairo" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
-     , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi
-     , haskell-gi-base, haskell-gi-overloading, pango, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-pangocairo";
-       version = "1.0.24";
-       sha256 = "1yya5gsqrkagmm33rsasshlj691nmax47fqdn1p2rnf4aqx1jcqr";
-       setupHaskellDepends = [
-         base Cabal gi-cairo gi-glib gi-gobject gi-pango haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
-         haskell-gi haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ cairo pango ];
-       preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
-         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
-       '';
-       description = "PangoCairo bindings";
-       license = lib.licenses.lgpl21Only;
-     }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
-
-  "gi-pangocairo_1_0_25" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi
      , haskell-gi-base, haskell-gi-overloading, pango, text
@@ -104848,7 +104664,6 @@ self: {
        '';
        description = "PangoCairo bindings";
        license = lib.licenses.lgpl21Only;
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
   "gi-poppler" = callPackage
@@ -104875,27 +104690,6 @@ self: {
      }) {inherit (pkgs) poppler_gi;};
 
   "gi-secret" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, libsecret, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-secret";
-       version = "0.0.12";
-       sha256 = "19mr7mvay2slm5k6afqj0hhy4ddh0advrb5dyzqi75xysx7xagm8";
-       setupHaskellDepends = [
-         base Cabal gi-gio gi-glib gi-gobject haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ libsecret ];
-       description = "Libsecret bindings";
-       license = lib.licenses.lgpl21Only;
-     }) {inherit (pkgs) libsecret;};
-
-  "gi-secret_0_0_13" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, libsecret, text, transformers
@@ -104914,7 +104708,6 @@ self: {
        libraryPkgconfigDepends = [ libsecret ];
        description = "Libsecret bindings";
        license = lib.licenses.lgpl21Only;
-       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) libsecret;};
 
   "gi-soup" = callPackage
@@ -104982,33 +104775,6 @@ self: {
      }) {inherit (pkgs) vips;};
 
   "gi-vte" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
-     , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi
-     , haskell-gi-base, haskell-gi-overloading, text, transformers
-     , vte_291
-     }:
-     mkDerivation {
-       pname = "gi-vte";
-       version = "2.91.27";
-       sha256 = "0a4n8yah3nirwciw0y1i8vpcjqbbk3pw15nd8av109cyxgl8nzx8";
-       setupHaskellDepends = [
-         base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango
-         haskell-gi
-       ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
-         gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading
-         text transformers
-       ];
-       libraryPkgconfigDepends = [ vte_291 ];
-       description = "Vte bindings";
-       license = lib.licenses.lgpl21Only;
-       platforms = [
-         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
-       ];
-     }) {vte_291 = pkgs.vte;};
-
-  "gi-vte_2_91_28" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi
      , haskell-gi-base, haskell-gi-overloading, text, transformers
@@ -105033,7 +104799,6 @@ self: {
        platforms = [
          "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
        ];
-       hydraPlatforms = lib.platforms.none;
      }) {vte_291 = pkgs.vte;};
 
   "gi-webkit" = callPackage
diff --git a/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch b/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch
new file mode 100644
index 00000000000..33c276926f4
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch
@@ -0,0 +1,65 @@
+From 09f44aa3271390c14f92a3f196ab2ba475b4907f Mon Sep 17 00:00:00 2001
+From: Malte Brandy <malte.brandy@maralorn.de>
+Date: Fri, 14 Aug 2020 17:52:28 +0200
+Subject: [PATCH 1/2] jsaddle-webkit2gtk: Bump haskell-gi-base upper bound
+
+---
+ jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal b/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal
+index 93d0b77..60c2312 100644
+--- a/jsaddle-webkit2gtk.cabal
++++ b/jsaddle-webkit2gtk.cabal
+@@ -35,7 +35,7 @@ library
+         gi-gtk >=3.0.17 && <3.1,
+         gi-webkit2 >=4.0.14 && <4.1,
+         gi-javascriptcore >=4.0.14 && <4.1,
+-        haskell-gi-base >=0.20 && <0.24,
++        haskell-gi-base >=0.20 && <0.26,
+         haskell-gi-overloading >=0.0 && < 2.0,
+         jsaddle >=0.9.4.0 && <0.10,
+         text >=1.2.1.3 && <1.3,
+
+From f8427480ca827b2bee1d9b33dfa6118e14fe2924 Mon Sep 17 00:00:00 2001
+From: Malte Brandy <malte.brandy@maralorn.de>
+Date: Fri, 14 Aug 2020 18:10:26 +0200
+Subject: [PATCH 2/2] Locally define noAdjustment and noCancellable
+
+Those two convenience definitions disappeared from gi-gio and gi-gtk in
+newer versions.
+---
+ .../src/Language/Javascript/JSaddle/WebKitGTK.hs       | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs b/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs
+index 898dac2..5249477 100644
+--- a/src/Language/Javascript/JSaddle/WebKitGTK.hs
++++ b/src/Language/Javascript/JSaddle/WebKitGTK.hs
+@@ -55,11 +55,11 @@ import GI.GLib (timeoutAdd, idleAdd, pattern PRIORITY_HIGH, pattern PRIORITY_DEF
+ import qualified GI.Gtk as Gtk (main, init)
+ import GI.Gtk
+        (windowSetPosition, windowSetDefaultSize, windowNew,
+-        scrolledWindowNew, noAdjustment, containerAdd,
++        scrolledWindowNew, Adjustment, containerAdd,
+         WindowType(..), WindowPosition(..), widgetDestroy,
+         widgetGetToplevel, widgetShowAll, onWidgetDestroy,
+         mainQuit)
+-import GI.Gio (noCancellable)
++import GI.Gio (Cancellable)
+ import GI.JavaScriptCore (valueToString)
+ import GI.WebKit2
+        (scriptDialogPromptSetText, scriptDialogPromptGetDefaultText,
+@@ -82,6 +82,12 @@ import Language.Javascript.JSaddle (JSM, Results, Batch)
+ import Language.Javascript.JSaddle.Run (runJavaScript)
+ import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers)
+ 
++noAdjustment :: Maybe Adjustment
++noAdjustment = Nothing
++
++noCancellable :: Maybe Cancellable
++noCancellable = Nothing
++
+ quitWebView :: WebView -> IO ()
+ quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync?
+                                    widgetDestroy w

From 80466be2512a0694c1d472a4e3de26d5e4e1de12 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 7 May 2021 21:22:37 +0200
Subject: [PATCH 113/143] python3Packaegs.sphinx-autobuild: add missing
 colorama dependency

---
 .../python-modules/sphinx-autobuild/default.nix           | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix
index 7d4629be50c..379dbdd0b3d 100644
--- a/pkgs/development/python-modules/sphinx-autobuild/default.nix
+++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, colorama
 , sphinx
 , livereload
 }:
@@ -14,10 +15,15 @@ buildPythonPackage rec {
     sha256 = "de1ca3b66e271d2b5b5140c35034c89e47f263f2cd5db302c9217065f7443f05";
   };
 
-  propagatedBuildInputs = [ sphinx livereload ];
+  propagatedBuildInputs = [
+    colorama
+    sphinx
+    livereload
+  ];
 
   # No tests included.
   doCheck = false;
+
   pythonImportsCheck = [ "sphinx_autobuild" ];
 
   meta = with lib; {

From b672992e2c6913801968d6b12e827e442ac08c36 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 7 May 2021 21:22:56 +0200
Subject: [PATCH 114/143] sphinx-autobuild: init from
 python3Packages.sphinx-autobuild

---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4b86795539..3b61508448d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17665,6 +17665,8 @@ in
 
   sphinx = with python3Packages; toPythonApplication sphinx;
 
+  sphinx-autobuild = with python3Packages; toPythonApplication sphinx-autobuild;
+
   sphinx-serve = with python3Packages; toPythonApplication sphinx-serve;
 
   sphinxbase = callPackage ../development/libraries/sphinxbase { };

From 49d736450b4e01cb3d265406bdc2ed99f4c57bf1 Mon Sep 17 00:00:00 2001
From: Jan Solanti <jhs@psonet.com>
Date: Fri, 7 May 2021 22:27:53 +0300
Subject: [PATCH 115/143] renderdoc: 1.12 -> 1.13

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

diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index 626610728ae..597bd1f1705 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -13,14 +13,14 @@ let
   pythonPackages = python3Packages;
 in
 mkDerivation rec {
-  version = "1.12";
+  version = "1.13";
   pname = "renderdoc";
 
   src = fetchFromGitHub {
     owner = "baldurk";
     repo = "renderdoc";
     rev = "v${version}";
-    sha256 = "4k0WsTsz4WwPZC8Dj85l2ntJOZkLgmBBOJcX9Bb4U7I=";
+    sha256 = "MBvdnB1YPeCaXSgqqtGs0SMocbarjmaWtIUkBBCvufc=";
   };
 
   buildInputs = [

From 5b4b18098360c26751bc130a6cee171842b2f5de Mon Sep 17 00:00:00 2001
From: Mica Semrick <mica@silentumbrella.com>
Date: Fri, 7 May 2021 12:34:11 -0700
Subject: [PATCH 116/143] dateutils: 0.4.7 -> 0.4.8

---
 pkgs/tools/misc/dateutils/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index 9ef68a590c2..e6793813b2b 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -1,21 +1,14 @@
 { lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.7";
+  version = "0.4.8";
   pname = "dateutils";
 
   src = fetchurl {
     url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz";
-    sha256 = "16jr9yjk8wgzfh22hr3z6mp4jm3fkacyibds4jj5xx5yymbm8wj9";
+    sha256 = "0061f36axskm7yq9cp64x5a5phil8d3zgcd668nfmqzk9ji58w1z";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://bitbucket.org/hroptatyr/dateutils/commits/6813ed94534f2311fbe9164748919e39d60b0190/raw";
-      sha256 = "1zs3iizb172ha56g03rr8kzd8zx6qypiqsc11jw758mliwxk5rgc";
-    })
-  ];
-
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ tzdata ]; # needed for datezone
   enableParallelBuilding = true;

From d75130019b38ef8ceb2d62a5d868ea4a31242b6e Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 7 May 2021 21:42:42 +0200
Subject: [PATCH 117/143] haskellPackages.gi-*: Fix some builds

---
 .../haskell-modules/configuration-common.nix  |  2 ++
 .../configuration-hackage2nix.yaml            |  1 +
 .../haskell-modules/hackage-packages.nix      | 23 +++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e1b40d87759..f84e4d04873 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1313,6 +1313,8 @@ self: super: {
   gi-gtk-hs = self.gi-gtk-hs_0_3_10;
   gi-dbusmenu = self.gi-dbusmenu_0_4_9;
   gi-xlib = self.gi-xlib_2_0_10;
+  gi-gdkx11 = self.gi-gdkx11_3_0_11;
+  gi-dbusmenugtk3 = self.gi-dbusmenugtk3_0_4_10;
 
   # 2021-05-17: Needs some manual patching to be compatible with haskell-gi-base 0.25
   # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 46470d75db8..cbca22b9f7e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2821,6 +2821,7 @@ extra-packages:
   - sbv == 7.13                         # required for pkgs.petrinizer
   - gi-gdk == 3.0.24                    # 2021-05-07: For haskell-gi 0.25 without gtk4
   - gi-gtk < 4.0                        # 2021-05-07: For haskell-gi 0.25 without gtk4
+  - gi-gdkx11 == 3.0.11                 # 2021-05-07: For haskell-gi 0.25 without gtk4
 
 package-maintainers:
   peti:
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 16b9400d01a..86afed3a600 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -103785,6 +103785,29 @@ self: {
        license = lib.licenses.lgpl21Only;
      }) {inherit (pkgs) gtk3;};
 
+  "gi-gdkx11_3_0_11" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
+     , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi
+     , haskell-gi-base, haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gdkx11";
+       version = "3.0.11";
+       sha256 = "07r47fpx6rvsahgnv8g741fl6h1s6y1xrlyacbpc3d8cv7x4aax2";
+       setupHaskellDepends = [
+         base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi
+       ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject
+         gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text
+         transformers
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       description = "GdkX11 bindings";
+       license = lib.licenses.lgpl21Only;
+       hydraPlatforms = lib.platforms.none;
+     }) {inherit (pkgs) gtk3;};
+
   "gi-gdkx11_4_0_3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi

From 7f236bd4b245b88c3111e627aa2654cb73be3d15 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 5 May 2021 22:38:46 +0200
Subject: [PATCH 118/143] hackage2nix: Split configuration, auto disable hydra
 builds

We split configuration-hackage2nix.yaml into multiple files.  We bump
cabal2nix-unstable to get support for multiple config files in
hackage2nix.

* The file main.yaml is only supposed to be edited by humans.
* The file stackage.yaml is only supposed to be updated by the
  update-stackage.sh
* The file broken.yaml can be edited by humans, but probably future
  helpers will want to insert broken packages into this file based on
  hydra reports.
* The file transitive-broken.yaml is newly introduced to be generated
  by regenerate-transitive-broken-packages.sh

regenerate-transitive-broken-packages.sh makes a nix query (in
transitive-broken-packages.nix) which evaluates all haskellPackages
once with and once without "allowBroken" this way it get's a list of
packages which are broken by some transitive dependency, but does not
disable packages which have eval errors not caused by a broken package.
---
 .../haskell/regenerate-hackage-packages.sh    |   20 +-
 .../regenerate-transitive-broken-packages.sh  |    3 +
 .../haskell/transitive-broken-packages.nix    |   21 +
 maintainers/scripts/haskell/update-hackage.sh |    2 +-
 .../scripts/haskell/update-stackage.sh        |   26 +-
 .../haskell-modules/cabal2nix-unstable.nix    |    6 +-
 .../broken.yaml}                              | 3152 +----------------
 .../configuration-hackage2nix/main.yaml       |  439 +++
 .../configuration-hackage2nix/stackage.yaml   | 2694 ++++++++++++++
 .../transitive-broken.yaml                    |  121 +
 10 files changed, 3309 insertions(+), 3175 deletions(-)
 create mode 100755 maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
 create mode 100644 maintainers/scripts/haskell/transitive-broken-packages.nix
 rename pkgs/development/haskell-modules/{configuration-hackage2nix.yaml => configuration-hackage2nix/broken.yaml} (62%)
 create mode 100644 pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
 create mode 100644 pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
 create mode 100644 pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
index 96131f98fa0..462840cd24c 100755
--- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh
+++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh
@@ -1,9 +1,9 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable -I nixpkgs=.
+#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git nix -I nixpkgs=.
 
 # This script is used to regenerate nixpkgs' Haskell package set, using a tool
-# called hackage2nix. hackage2nix looks at
-# pkgs/development/haskell-modules/configuration-hackage2nix.yaml and generates
+# called hackage2nix. hackage2nix looks at the config files in
+# pkgs/development/haskell-modules/configuration-hackage2nix and generates
 # a Nix expression for package version specified there, using the Cabal files
 # from the Hackage database (available under all-cabal-hashes) and its
 # companion tool cabal2nix.
@@ -14,10 +14,18 @@
 
 set -euo pipefail
 
-extractionDerivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"'
-unpacked_hackage="$(nix-build -E "$extractionDerivation" --no-out-link)"
+extraction_derivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"'
+unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)"
+config_dir=pkgs/development/haskell-modules/configuration-hackage2nix
 
-hackage2nix --hackage "$unpacked_hackage" --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) --nixpkgs "$PWD" --config pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+hackage2nix \
+   --hackage "$unpacked_hackage" \
+   --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) \
+   --nixpkgs "$PWD" \
+   --config "$config_dir/main.yaml" \
+   --config "$config_dir/stackage.yaml" \
+   --config "$config_dir/broken.yaml" \
+   --config "$config_dir/transitive-broken.yaml"
 
 if [[ "${1:-}" == "--do-commit" ]]; then
 git add pkgs/development/haskell-modules/hackage-packages.nix
diff --git a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
new file mode 100755
index 00000000000..ed03ef5eb6a
--- /dev/null
+++ b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
@@ -0,0 +1,3 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p coreutils nix gnused -I nixpkgs=.
+echo -e $(nix-instantiate --eval --strict maintainers/scripts/haskell/transitive-broken-packages.nix) | sed 's/\"//' > pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
diff --git a/maintainers/scripts/haskell/transitive-broken-packages.nix b/maintainers/scripts/haskell/transitive-broken-packages.nix
new file mode 100644
index 00000000000..3ddadea216f
--- /dev/null
+++ b/maintainers/scripts/haskell/transitive-broken-packages.nix
@@ -0,0 +1,21 @@
+let
+  nixpkgs = import ../../..;
+  inherit (nixpkgs {}) pkgs lib;
+  getEvaluating = x:
+    builtins.attrNames (
+      lib.filterAttrs (
+        _: v: (builtins.tryEval (v.outPath or null)).success && lib.isDerivation v && !v.meta.broken
+      ) x
+    );
+  brokenDeps = lib.subtractLists
+    (getEvaluating pkgs.haskellPackages)
+    (getEvaluating (nixpkgs { config.allowBroken = true; }).haskellPackages);
+in
+''
+  # This file is automatically generated by
+  # maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
+  # It is supposed to list all haskellPackages that cannot evaluate because they
+  # depend on a dependency marked as broken.
+  dont-distribute-packages:
+  ${lib.concatMapStringsSep "\n" (x: "  - ${x}") brokenDeps}
+''
diff --git a/maintainers/scripts/haskell/update-hackage.sh b/maintainers/scripts/haskell/update-hackage.sh
index 3c338e98c64..a7cfecbbb0f 100755
--- a/maintainers/scripts/haskell/update-hackage.sh
+++ b/maintainers/scripts/haskell/update-hackage.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p nix curl jq nix-prefetch-github -I nixpkgs=.
+#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused -I nixpkgs=.
 
 # See regenerate-hackage-packages.sh for details on the purpose of this script.
 
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index b332e8d4dc6..3d51ddc4338 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -1,17 +1,18 @@
-#! /usr/bin/env bash
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused gnugrep -I nixpkgs=.
 
 set -eu -o pipefail
 
 tmpfile=$(mktemp "update-stackage.XXXXXXX")
 # shellcheck disable=SC2064
 
-config_file="pkgs/development/haskell-modules/configuration-hackage2nix.yaml"
+stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml"
 
 trap "rm ${tmpfile} ${tmpfile}.new" 0
 touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors.
 
 curl -L -s "https://stackage.org/nightly/cabal.config" >"$tmpfile"
-old_version=$(grep "  # Stackage Nightly" $config_file | sed -E 's/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/\1/')
+old_version=$(grep "# Stackage Nightly" $stackage_config | sed -E 's/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/\1/')
 version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.nightly-//p" "$tmpfile")
 
 if [[ "$old_version" == "$version" ]]; then
@@ -29,6 +30,13 @@ sed -r \
     -e '/^$/d' \
     < "${tmpfile}" | sort --ignore-case >"${tmpfile}.new"
 
+cat > $stackage_config << EOF
+# Stackage Nightly $version
+# This file is auto-generated by
+# maintainers/scripts/haskell/update-stackage.sh
+default-package-overrides:
+EOF
+
 # Drop restrictions on some tools where we always want the latest version.
 sed -r \
     -e '/ cabal-install /d' \
@@ -48,17 +56,7 @@ sed -r \
     -e '/ ShellCheck /d' \
     -e '/ stack /d' \
     -e '/ weeder /d' \
-    < "${tmpfile}.new" > "${tmpfile}"
-
-# Drop the previous configuration ...
-# shellcheck disable=SC1004
-sed -e '/  # Stackage Nightly/,/^$/c \TODO\
-'   -i $config_file
-
-# ... and replace it with the new one.
-sed -e "/TODO/r $tmpfile" \
-    -e "s/TODO/  # Stackage Nightly $version/" \
-    -i $config_file
+    < "${tmpfile}.new" >> $stackage_config
 
 if [[ "${1:-}" == "--do-commit" ]]; then
 git add $config_file
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
index 3b8a85881f5..1ec16eaf5eb 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
@@ -8,10 +8,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "unstable-2021-05-01";
+  version = "unstable-2021-05-06";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/849a3507c849e3e2331efbc5ebe391b70a215ddc.tar.gz";
-    sha256 = "0g91d2bd72l3kkykc47a2raymvgw6427n7cg9ayzvrpldkd0silc";
+    url = "https://github.com/NixOS/cabal2nix/archive/b598bc4682b0827554b5780acdd6f948d320283b.tar.gz";
+    sha256 = "04afm56cyhj2l41cvq4z11k92jjchr21a8vg9pjaz438pma7jgw1";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
similarity index 62%
rename from pkgs/development/haskell-modules/configuration-hackage2nix.yaml
rename to pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index cbca22b9f7e..52c18b3e43d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -1,3155 +1,5 @@
-# pkgs/development/haskell-modules/configuration-hackage2nix.yaml
-
-compiler: ghc-8.10.4
-
-core-packages:
-  - array-0.5.4.0
-  - base-4.14.1.0
-  - binary-0.8.8.0
-  - bytestring-0.10.12.0
-  - Cabal-3.2.1.0
-  - containers-0.6.2.1
-  - deepseq-1.4.4.0
-  - directory-1.3.6.0
-  - exceptions-0.10.4
-  - filepath-1.4.2.1
-  - ghc-8.10.4
-  - ghc-boot-8.10.4
-  - ghc-boot-th-8.10.4
-  - ghc-compact-0.1.0.0
-  - ghc-heap-8.10.4
-  - ghc-prim-0.6.1
-  - ghci-8.10.4
-  - haskeline-0.8.0.1
-  - hpc-0.6.1.0
-  - integer-gmp-1.0.3.0
-  - libiserv-8.10.4
-  - mtl-2.2.2
-  - parsec-3.1.14.0
-  - pretty-1.1.3.6
-  - process-1.6.9.0
-  - rts-1.0
-  - stm-2.5.0.0
-  - template-haskell-2.16.0.0
-  - terminfo-0.4.1.4
-  - text-1.2.4.1
-  - time-1.9.3
-  - transformers-0.5.6.2
-  - unix-2.7.2.2
-  - xhtml-3000.2.2.1
-
-  # Hack: The following package is a core package of GHCJS. If we don't declare
-  # it, then hackage2nix will generate a Hackage database where all dependants
-  # of this library are marked as "broken".
-  - ghcjs-base-0
-
-# This is a list of packages with versions from the latest Stackage LTS release.
-#
-# The packages and versions in this list cause the `hackage2nix` tool to
-# generate the package at the given version.
-#
-# For instance, with a line like the following:
-#
-# - aeson ==1.4.6.0
-#
-# `hackage2nix` will generate the `aeson` package at version 1.4.6.0 in the
-# ./hackage-packages.nix file.
-#
-# Since the packages in the LTS package set are sometimes older than the latest
-# on Hackage, `hackage2nix` is smart enough to also generate the latest version
-# of a given package.
-#
-# In the above example with aeson, if there was version 1.5.0.0 of aeson
-# available on Hackage, `hackage2nix` would generate two packages, `aeson`
-# at version 1.4.6.0 and `aeson_1_5_0_0` at version 1.5.0.0.
-#
-# WARNING: This list is generated semiautomatically based on the most recent
-# LTS package set. If you want to add entries to it, you must do so before the
-# comment saying "# LTS Haskell x.y". Any changes after that comment will be
-# lost the next time `update-stackage.sh` runs.
-default-package-overrides:
-  # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag
-  - MissingH ==1.4.2.0
-  # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
-  # not yet available in Nixpkgs
-  - gi-gdkx11 < 4
-  # Needs Cabal 3.4 for Setup.hs
-  - gi-javascriptcore < 4.0.23 #
-  - gi-soup < 2.4.24 #
-  - gi-webkit2 < 4.0.27 #
-  # To stay hls 1.0 compatible
-  - ghcide < 1.1
-  - hls-retrie-plugin < 1.0.0.1
-  - lsp < 1.2
-  - lsp-types < 1.2
-  - hls-plugin-api < 1.1.0.0
-  - hls-explicit-imports-plugin < 1.0.0.1
-  # 2021-04-02: Stackage Nighlty has haskell-gi* < 0.25,
-  # so we need to restrict these to compatible versions
-  # Remove these as soon as haskell-gi{,-base} are 0.25.*
-  # in Stackage Nightly!
-  #- gi-ggit < 1.0.10
-  #- gi-girepository < 1.0.24
-  #- gi-gst < 1.0.24
-  #- gi-gstbase < 1.0.24
-  #- gi-gstvideo < 1.0.24
-  #- gi-gtksource < 3.0.24
-  #- gi-ibus < 1.5.3
-  #- gi-notify < 0.7.23
-  #- gi-ostree < 1.0.14
-  #- gi-pangocairo < 1.0.25
-  #- gi-secret < 0.0.13
-  #- gi-vte < 2.91.28
-
-  # Stackage Nightly 2021-05-03
-  - abstract-deque ==0.3
-  - abstract-par ==0.3.3
-  - AC-Angle ==1.0
-  - accuerr ==0.2.0.2
-  - ace ==0.6
-  - action-permutations ==0.0.0.1
-  - ad ==4.4.1
-  - adjunctions ==4.4
-  - adler32 ==0.1.2.0
-  - aeson ==1.5.6.0
-  - aeson-attoparsec ==0.0.0
-  - aeson-better-errors ==0.9.1.0
-  - aeson-casing ==0.2.0.0
-  - aeson-combinators ==0.0.5.0
-  - aeson-commit ==1.3
-  - aeson-compat ==0.3.9
-  - aeson-default ==0.9.1.0
-  - aeson-diff ==1.1.0.9
-  - aeson-generic-compat ==0.0.1.3
-  - aeson-lens ==0.5.0.0
-  - aeson-optics ==1.1.0.1
-  - aeson-picker ==0.1.0.5
-  - aeson-pretty ==0.8.8
-  - aeson-qq ==0.8.3
-  - aeson-schemas ==1.3.3
-  - aeson-with ==0.1.2.0
-  - aeson-yak ==0.1.1.3
-  - aeson-yaml ==1.1.0.0
-  - Agda ==2.6.1.3
-  - agda2lagda ==0.2020.11.1
-  - al ==0.1.4.2
-  - alarmclock ==0.7.0.5
-  - alerts ==0.1.2.0
-  - alex ==3.2.6
-  - alex-meta ==0.3.0.13
-  - alg ==0.2.13.1
-  - algebraic-graphs ==0.5
-  - Allure ==0.10.2.0
-  - almost-fix ==0.0.2
-  - alsa-core ==0.5.0.1
-  - alsa-mixer ==0.3.0
-  - alsa-pcm ==0.6.1.1
-  - alsa-seq ==0.6.0.8
-  - alternative-vector ==0.0.0
-  - ALUT ==2.4.0.3
-  - amazonka-apigateway ==1.6.1
-  - amazonka-application-autoscaling ==1.6.1
-  - amazonka-appstream ==1.6.1
-  - amazonka-athena ==1.6.1
-  - amazonka-autoscaling ==1.6.1
-  - amazonka-budgets ==1.6.1
-  - amazonka-certificatemanager ==1.6.1
-  - amazonka-cloudformation ==1.6.1
-  - amazonka-cloudfront ==1.6.1
-  - amazonka-cloudhsm ==1.6.1
-  - amazonka-cloudsearch ==1.6.1
-  - amazonka-cloudsearch-domains ==1.6.1
-  - amazonka-cloudtrail ==1.6.1
-  - amazonka-cloudwatch ==1.6.1
-  - amazonka-cloudwatch-events ==1.6.1
-  - amazonka-cloudwatch-logs ==1.6.1
-  - amazonka-codebuild ==1.6.1
-  - amazonka-codecommit ==1.6.1
-  - amazonka-codedeploy ==1.6.1
-  - amazonka-codepipeline ==1.6.1
-  - amazonka-cognito-identity ==1.6.1
-  - amazonka-cognito-idp ==1.6.1
-  - amazonka-cognito-sync ==1.6.1
-  - amazonka-config ==1.6.1
-  - amazonka-core ==1.6.1
-  - amazonka-datapipeline ==1.6.1
-  - amazonka-devicefarm ==1.6.1
-  - amazonka-directconnect ==1.6.1
-  - amazonka-discovery ==1.6.1
-  - amazonka-dms ==1.6.1
-  - amazonka-ds ==1.6.1
-  - amazonka-dynamodb ==1.6.1
-  - amazonka-dynamodb-streams ==1.6.1
-  - amazonka-ecr ==1.6.1
-  - amazonka-ecs ==1.6.1
-  - amazonka-efs ==1.6.1
-  - amazonka-elasticache ==1.6.1
-  - amazonka-elasticbeanstalk ==1.6.1
-  - amazonka-elasticsearch ==1.6.1
-  - amazonka-elastictranscoder ==1.6.1
-  - amazonka-elb ==1.6.1
-  - amazonka-elbv2 ==1.6.1
-  - amazonka-emr ==1.6.1
-  - amazonka-gamelift ==1.6.1
-  - amazonka-glacier ==1.6.1
-  - amazonka-glue ==1.6.1
-  - amazonka-health ==1.6.1
-  - amazonka-iam ==1.6.1
-  - amazonka-importexport ==1.6.1
-  - amazonka-inspector ==1.6.1
-  - amazonka-iot ==1.6.1
-  - amazonka-iot-dataplane ==1.6.1
-  - amazonka-kinesis ==1.6.1
-  - amazonka-kinesis-analytics ==1.6.1
-  - amazonka-kinesis-firehose ==1.6.1
-  - amazonka-kms ==1.6.1
-  - amazonka-lambda ==1.6.1
-  - amazonka-lightsail ==1.6.1
-  - amazonka-marketplace-analytics ==1.6.1
-  - amazonka-marketplace-metering ==1.6.1
-  - amazonka-ml ==1.6.1
-  - amazonka-opsworks ==1.6.1
-  - amazonka-opsworks-cm ==1.6.1
-  - amazonka-pinpoint ==1.6.1
-  - amazonka-polly ==1.6.1
-  - amazonka-rds ==1.6.1
-  - amazonka-redshift ==1.6.1
-  - amazonka-rekognition ==1.6.1
-  - amazonka-route53 ==1.6.1
-  - amazonka-route53-domains ==1.6.1
-  - amazonka-s3 ==1.6.1
-  - amazonka-sdb ==1.6.1
-  - amazonka-servicecatalog ==1.6.1
-  - amazonka-ses ==1.6.1
-  - amazonka-shield ==1.6.1
-  - amazonka-sms ==1.6.1
-  - amazonka-snowball ==1.6.1
-  - amazonka-sns ==1.6.1
-  - amazonka-sqs ==1.6.1
-  - amazonka-ssm ==1.6.1
-  - amazonka-stepfunctions ==1.6.1
-  - amazonka-storagegateway ==1.6.1
-  - amazonka-sts ==1.6.1
-  - amazonka-support ==1.6.1
-  - amazonka-swf ==1.6.1
-  - amazonka-test ==1.6.1
-  - amazonka-waf ==1.6.1
-  - amazonka-workspaces ==1.6.1
-  - amazonka-xray ==1.6.1
-  - amqp ==0.22.0
-  - amqp-utils ==0.6.1.0
-  - annotated-wl-pprint ==0.7.0
-  - ansi-terminal ==0.11
-  - ansi-wl-pprint ==0.6.9
-  - ANum ==0.2.0.2
-  - 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
-  - appar ==0.1.8
-  - appendmap ==0.1.5
-  - apply-refact ==0.9.2.0
-  - apportionment ==0.0.0.3
-  - approximate ==0.3.4
-  - approximate-equality ==1.1.0.2
-  - app-settings ==0.2.0.12
-  - arbor-lru-cache ==0.1.1.1
-  - arithmoi ==0.11.0.1
-  - array-memoize ==0.6.0
-  - arrow-extras ==0.1.0.1
-  - ascii ==1.0.1.4
-  - ascii-case ==1.0.0.4
-  - ascii-char ==1.0.0.8
-  - asciidiagram ==1.3.3.3
-  - ascii-group ==1.0.0.4
-  - ascii-predicates ==1.0.0.4
-  - ascii-progress ==0.3.3.0
-  - ascii-superset ==1.0.1.4
-  - ascii-th ==1.0.0.4
-  - asif ==6.0.4
-  - asn1-encoding ==0.9.6
-  - asn1-parse ==0.9.5
-  - asn1-types ==0.3.4
-  - assert-failure ==0.1.2.5
-  - assoc ==1.0.2
-  - astro ==0.4.2.1
-  - async ==2.2.3
-  - async-extra ==0.2.0.0
-  - async-pool ==0.9.1
-  - async-refresh ==0.3.0.0
-  - async-refresh-tokens ==0.4.0.0
-  - atom-basic ==0.2.5
-  - atomic-primops ==0.8.4
-  - atomic-write ==0.2.0.7
-  - attoparsec ==0.13.2.5
-  - attoparsec-base64 ==0.0.0
-  - attoparsec-binary ==0.2
-  - attoparsec-expr ==0.1.1.2
-  - attoparsec-iso8601 ==1.0.2.0
-  - attoparsec-path ==0.0.0.1
-  - audacity ==0.0.2
-  - aur ==7.0.6
-  - aura ==3.2.4
-  - authenticate ==1.3.5
-  - authenticate-oauth ==1.6.0.1
-  - auto ==0.4.3.1
-  - autoexporter ==1.1.20
-  - auto-update ==0.1.6
-  - avers ==0.0.17.1
-  - avro ==0.5.2.0
-  - aws-cloudfront-signed-cookies ==0.2.0.6
-  - backprop ==0.2.6.4
-  - backtracking ==0.1.0
-  - bank-holidays-england ==0.2.0.6
-  - barbies ==2.0.2.0
-  - base16 ==0.3.0.1
-  - base16-bytestring ==1.0.1.0
-  - base16-lens ==0.1.3.2
-  - base32 ==0.2.0.0
-  - base32-lens ==0.1.1.1
-  - base32string ==0.9.1
-  - base58-bytestring ==0.1.0
-  - base58string ==0.10.0
-  - base64 ==0.4.2.3
-  - base64-bytestring ==1.1.0.0
-  - base64-bytestring-type ==1.0.1
-  - base64-lens ==0.3.1
-  - base64-string ==0.2
-  - base-compat ==0.11.2
-  - base-compat-batteries ==0.11.2
-  - basement ==0.0.12
-  - 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
-  - bcp47 ==0.2.0.3
-  - bcp47-orphans ==0.1.0.3
-  - bcrypt ==0.0.11
-  - bech32 ==1.1.0
-  - bech32-th ==1.0.2
-  - bench ==1.0.12
-  - benchpress ==0.2.2.16
-  - between ==0.11.0.0
-  - bibtex ==0.1.0.6
-  - bifunctors ==5.5.11
-  - bimap ==0.4.0
-  - bimaps ==0.1.0.2
-  - bimap-server ==0.1.0.1
-  - bin ==0.1.1
-  - binary-conduit ==1.3.1
-  - binary-ext ==2.0.4
-  - binary-ieee754 ==0.1.0.0
-  - binary-instances ==1.0.1
-  - binary-list ==1.1.1.2
-  - binary-orphans ==1.0.1
-  - binary-parser ==0.5.7
-  - binary-parsers ==0.2.4.0
-  - binary-search ==2.0.0
-  - binary-shared ==0.8.3
-  - binary-tagged ==0.3
-  - bindings-DSL ==1.0.25
-  - bindings-GLFW ==3.3.2.0
-  - bindings-libzip ==1.0.1
-  - bindings-uname ==0.1
-  - bins ==0.1.2.0
-  - bitarray ==0.0.1.1
-  - bits ==0.5.3
-  - bitset-word8 ==0.1.1.2
-  - bits-extra ==0.0.2.0
-  - bitvec ==1.1.1.0
-  - bitwise-enum ==1.0.1.0
-  - blake2 ==0.3.0
-  - blanks ==0.5.0
-  - blas-carray ==0.1.0.1
-  - blas-comfort-array ==0.0.0.2
-  - blas-ffi ==0.1
-  - blaze-bootstrap ==0.1.0.1
-  - blaze-builder ==0.4.2.1
-  - blaze-html ==0.9.1.2
-  - blaze-markup ==0.8.2.8
-  - blaze-svg ==0.3.6.1
-  - blaze-textual ==0.2.1.0
-  - bmp ==1.2.6.3
-  - BNFC ==2.9.1
-  - BNFC-meta ==0.6.1
-  - board-games ==0.3
-  - boltzmann-samplers ==0.1.1.0
-  - Boolean ==0.2.4
-  - boolean-like ==0.1.1.0
-  - boolsimplifier ==0.1.8
-  - boots ==0.2.0.1
-  - bordacount ==0.1.0.0
-  - boring ==0.2
-  - both ==0.1.1.1
-  - bound ==2.0.3
-  - BoundedChan ==1.0.3.0
-  - bounded-queue ==1.0.0
-  - boundingboxes ==0.2.3
-  - bower-json ==1.0.0.1
-  - boxes ==0.1.5
-  - brick ==0.62
-  - broadcast-chan ==0.2.1.1
-  - bsb-http-chunked ==0.0.0.4
-  - bson ==0.4.0.1
-  - btrfs ==0.2.0.0
-  - buffer-builder ==0.2.4.7
-  - buffer-pipe ==0.0
-  - bugsnag-haskell ==0.0.4.1
-  - bugsnag-hs ==0.2.0.3
-  - bugzilla-redhat ==0.3.1
-  - burrito ==1.2.0.1
-  - butcher ==1.3.3.2
-  - buttplug-hs-core ==0.1.0.0
-  - 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
-  - byteorder ==1.0.4
-  - bytes ==0.17.1
-  - byteset ==0.1.1.0
-  - bytestring-builder ==0.10.8.2.0
-  - bytestring-conversion ==0.3.1
-  - bytestring-lexing ==0.5.0.2
-  - bytestring-mmap ==0.2.2
-  - bytestring-strict-builder ==0.4.5.4
-  - bytestring-to-vector ==0.3.0.1
-  - bytestring-tree-builder ==0.2.7.9
-  - bz2 ==1.0.1.0
-  - bzlib ==0.5.1.0
-  - bzlib-conduit ==0.3.0.2
-  - c14n ==0.1.0.1
-  - c2hs ==0.28.7
-  - cabal-appimage ==0.3.0.2
-  - cabal-debian ==5.1
-  - cabal-doctest ==1.0.8
-  - cabal-file ==0.1.1
-  - cabal-flatpak ==0.1.0.2
-  - cabal-plan ==0.7.2.0
-  - cabal-rpm ==2.0.8
-  - cache ==0.1.3.0
-  - cacophony ==0.10.1
-  - calendar-recycling ==0.0.0.1
-  - call-stack ==0.3.0
-  - can-i-haz ==0.3.1.0
-  - capability ==0.4.0.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.2
-  - cased ==0.1.0.0
-  - case-insensitive ==1.2.1.0
-  - cases ==0.1.4.1
-  - casing ==0.1.4.1
-  - cassava ==0.5.2.0
-  - cassava-conduit ==0.6.0
-  - cassava-megaparsec ==2.0.2
-  - cast ==0.1.0.2
-  - category ==0.2.5.0
-  - cayley-client ==0.4.15
-  - cborg ==0.2.5.0
-  - cborg-json ==0.2.2.0
-  - cereal ==0.5.8.1
-  - cereal-conduit ==0.8.0
-  - cereal-text ==0.1.0.2
-  - cereal-vector ==0.2.0.1
-  - cfenv ==0.1.0.0
-  - cgi ==3001.5.0.0
-  - chan ==0.0.4.1
-  - ChannelT ==0.0.0.7
-  - character-cases ==0.1.0.6
-  - charset ==0.3.8
-  - charsetdetect-ae ==1.1.0.4
-  - Chart ==1.9.3
-  - chaselev-deque ==0.5.0.5
-  - ChasingBottoms ==1.3.1.10
-  - cheapskate ==0.1.1.2
-  - cheapskate-highlight ==0.1.0.0
-  - cheapskate-lucid ==0.1.0.0
-  - checkers ==0.5.6
-  - checksum ==0.0
-  - chimera ==0.3.1.0
-  - chiphunk ==0.1.4.0
-  - choice ==0.2.2
-  - chronologique ==0.3.1.3
-  - chronos ==1.1.1
-  - chronos-bench ==0.2.0.2
-  - chunked-data ==0.3.1
-  - cipher-aes ==0.2.11
-  - cipher-camellia ==0.0.2
-  - cipher-des ==0.0.6
-  - cipher-rc4 ==0.1.4
-  - circle-packing ==0.1.0.6
-  - circular ==0.3.1.1
-  - citeproc ==0.3.0.9
-  - clash-ghc ==1.2.5
-  - clash-lib ==1.2.5
-  - clash-prelude ==1.2.5
-  - classy-prelude ==1.5.0
-  - classy-prelude-conduit ==1.5.0
-  - clay ==0.13.3
-  - clientsession ==0.9.1.2
-  - climb ==0.3.3
-  - Clipboard ==2.3.2.0
-  - clock ==0.8
-  - clock-extras ==0.1.0.2
-  - closed ==0.2.0.1
-  - clumpiness ==0.17.0.2
-  - ClustalParser ==1.3.0
-  - cmark ==0.6
-  - cmark-gfm ==0.2.2
-  - cmark-lucid ==0.1.0.0
-  - cmdargs ==0.10.21
-  - codec-beam ==0.2.0
-  - code-page ==0.2.1
-  - collect-errors ==0.1.0.0
-  - co-log-concurrent ==0.5.0.0
-  - co-log-core ==0.2.1.1
-  - Color ==0.3.1
-  - colorful-monoids ==0.2.1.3
-  - colorize-haskell ==1.0.1
-  - colour ==2.3.5
-  - combinatorial ==0.1.0.1
-  - comfort-array ==0.4.1
-  - comfort-graph ==0.0.3.1
-  - commonmark ==0.1.1.4
-  - commonmark-extensions ==0.2.0.4
-  - commonmark-pandoc ==0.2.0.1
-  - commutative ==0.0.2
-  - comonad ==5.0.8
-  - comonad-extras ==4.0.1
-  - compactmap ==0.1.4.2.1
-  - compdata ==0.12.1
-  - compensated ==0.8.3
-  - compiler-warnings ==0.1.0
-  - composable-associations ==0.1.0.0
-  - composable-associations-aeson ==0.1.0.1
-  - composite-aeson ==0.7.5.0
-  - composite-aeson-path ==0.7.5.0
-  - composite-aeson-refined ==0.7.5.0
-  - composite-aeson-throw ==0.1.0.0
-  - composite-base ==0.7.5.0
-  - composite-binary ==0.7.5.0
-  - composite-ekg ==0.7.5.0
-  - composite-hashable ==0.7.5.0
-  - composite-tuple ==0.1.2.0
-  - composite-xstep ==0.1.0.0
-  - composition ==1.0.2.2
-  - composition-extra ==2.0.0
-  - concise ==0.1.0.1
-  - concurrency ==1.11.0.1
-  - concurrent-extra ==0.7.0.12
-  - concurrent-output ==1.10.12
-  - concurrent-split ==0.0.1.1
-  - concurrent-supply ==0.1.8
-  - cond ==0.4.1.1
-  - conduit ==1.3.4.1
-  - conduit-algorithms ==0.0.11.0
-  - conduit-combinators ==1.3.0
-  - conduit-concurrent-map ==0.1.1
-  - conduit-extra ==1.3.5
-  - conduit-parse ==0.2.1.0
-  - conduit-zstd ==0.0.2.0
-  - conferer ==1.1.0.0
-  - conferer-aeson ==1.1.0.1
-  - conferer-hspec ==1.1.0.0
-  - conferer-warp ==1.1.0.0
-  - ConfigFile ==1.1.4
-  - config-ini ==0.2.4.0
-  - configurator ==0.3.0.0
-  - configurator-export ==0.1.0.1
-  - configurator-pg ==0.2.5
-  - connection ==0.3.1
-  - connection-pool ==0.2.2
-  - console-style ==0.0.2.1
-  - constraint ==0.1.4.0
-  - constraints ==0.13
-  - constraint-tuples ==0.1.2
-  - construct ==0.3.0.2
-  - 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
-  - cookie ==0.4.5
-  - core-data ==0.2.1.9
-  - core-program ==0.2.6.0
-  - core-text ==0.3.0.0
-  - countable ==1.0
-  - country ==0.2.1
-  - cpphs ==1.20.9.1
-  - cprng-aes ==0.6.1
-  - cpu ==0.1.2
-  - cpuinfo ==0.1.0.2
-  - crackNum ==2.4
-  - crc32c ==0.0.0
-  - credential-store ==0.1.2
-  - criterion ==1.5.9.0
-  - criterion-measurement ==0.1.2.0
-  - 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.102.0
-  - cryptohash-sha512 ==0.11.100.1
-  - cryptonite ==0.28
-  - cryptonite-conduit ==0.2.2
-  - cryptonite-openssl ==0.7
-  - crypto-numbers ==0.2.7
-  - crypto-pubkey ==0.2.8
-  - crypto-pubkey-types ==0.4.3
-  - crypto-random ==0.0.9
-  - crypto-random-api ==0.2.0
-  - csp ==1.4.0
-  - css-syntax ==0.1.0.0
-  - css-text ==0.1.3.0
-  - csv ==0.1.2
-  - ctrie ==0.2
-  - cubicbezier ==0.6.0.6
-  - cubicspline ==0.1.2
-  - cuckoo-filter ==0.2.0.2
-  - cue-sheet ==2.0.1
-  - curl ==1.3.8
-  - currencies ==0.2.0.0
-  - currency ==0.2.0.0
-  - cursor ==0.3.0.0
-  - cursor-brick ==0.1.0.0
-  - cursor-fuzzy-time ==0.0.0.0
-  - cursor-gen ==0.3.0.0
-  - cutter ==0.0
-  - cyclotomic ==1.1.1
-  - czipwith ==1.0.1.3
-  - d10 ==0.2.1.6
-  - data-accessor ==0.2.3
-  - data-accessor-mtl ==0.2.0.4
-  - data-accessor-template ==0.2.1.16
-  - data-accessor-transformers ==0.2.1.7
-  - data-ascii ==1.0.0.6
-  - data-binary-ieee754 ==0.4.4
-  - data-bword ==0.1.0.1
-  - data-checked ==0.3
-  - data-clist ==0.1.2.3
-  - data-compat ==0.1.0.3
-  - data-default ==0.7.1.1
-  - data-default-class ==0.1.2.0
-  - data-default-instances-containers ==0.0.1
-  - 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.1
-  - data-forest ==0.1.0.8
-  - data-has ==0.4.0.0
-  - data-hash ==0.2.0.1
-  - data-interval ==2.1.0
-  - data-inttrie ==0.1.4
-  - data-lens-light ==0.1.2.2
-  - data-memocombinators ==0.5.1
-  - data-msgpack ==0.0.13
-  - data-msgpack-types ==0.0.3
-  - data-or ==1.0.0.5
-  - data-ordlist ==0.4.7.0
-  - data-ref ==0.0.2
-  - data-reify ==0.6.3
-  - data-serializer ==0.3.5
-  - data-textual ==0.3.0.3
-  - dataurl ==0.1.0.0
-  - DAV ==1.3.4
-  - DBFunctor ==0.1.1.1
-  - dbus ==1.2.17
-  - dbus-hslogger ==0.1.0.1
-  - debian ==4.0.2
-  - debian-build ==0.10.2.0
-  - debug-trace-var ==0.2.0
-  - dec ==0.0.4
-  - Decimal ==0.5.2
-  - declarative ==0.5.4
-  - deepseq-generics ==0.2.0.0
-  - deepseq-instances ==0.1.0.1
-  - deferred-folds ==0.9.17
-  - dejafu ==2.4.0.2
-  - dense-linear-algebra ==0.1.0.0
-  - depq ==0.4.2
-  - deque ==0.4.3
-  - deriveJsonNoPrefix ==0.1.0.1
-  - derive-topdown ==0.0.2.2
-  - deriving-aeson ==0.2.6.1
-  - deriving-compat ==0.5.10
-  - derulo ==1.0.10
-  - dhall ==1.38.1
-  - dhall-bash ==1.0.36
-  - dhall-json ==1.7.6
-  - dhall-lsp-server ==1.0.14
-  - dhall-yaml ==1.2.6
-  - diagrams-solve ==0.1.3
-  - 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.4
-  - di-monad ==1.3.1
-  - directory-tree ==0.12.1
-  - direct-sqlite ==2.3.26
-  - 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.9
-  - dlist ==0.8.0.8
-  - dlist-instances ==0.1.1.1
-  - dlist-nonempty ==0.1.1
-  - dns ==4.0.1
-  - dockerfile ==0.2.0
-  - doclayout ==0.3.0.2
-  - doctemplates ==0.9
-  - doctest ==0.16.3
-  - doctest-discover ==0.2.0.0
-  - doctest-driver-gen ==0.3.0.3
-  - doctest-exitcode-stdio ==0.0
-  - doctest-extract ==0.1
-  - 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
-  - dotnet-timespan ==0.0.1.0
-  - double-conversion ==2.0.2.0
-  - download ==0.3.2.7
-  - download-curl ==0.1.4
-  - drinkery ==0.4
-  - dsp ==0.2.5.1
-  - dual ==0.1.1.1
-  - dublincore-xml-conduit ==0.1.0.2
-  - dunai ==0.7.0
-  - duration ==0.2.0.0
-  - dvorak ==0.1.0.0
-  - dynamic-state ==0.3.1
-  - dyre ==0.8.12
-  - eap ==0.9.0.2
-  - earcut ==0.1.0.4
-  - Earley ==0.13.0.1
-  - easy-file ==0.2.2
-  - Ebnf2ps ==1.0.15
-  - echo ==0.1.4
-  - ecstasy ==0.2.1.0
-  - ed25519 ==0.0.5.0
-  - edit-distance ==0.2.2.1
-  - edit-distance-vector ==1.0.0.4
-  - editor-open ==0.6.0.0
-  - egison ==4.1.2
-  - egison-pattern-src ==0.2.1.2
-  - egison-pattern-src-th-mode ==0.2.1.2
-  - either ==5.0.1.1
-  - either-both ==0.1.1.1
-  - either-unwrap ==1.1
-  - ekg ==0.4.0.15
-  - ekg-core ==0.1.1.7
-  - ekg-json ==0.1.0.6
-  - ekg-statsd ==0.2.5.0
-  - 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
-  - elynx ==0.5.0.2
-  - elynx-markov ==0.5.0.2
-  - elynx-nexus ==0.5.0.2
-  - elynx-seq ==0.5.0.2
-  - elynx-tools ==0.5.0.2
-  - elynx-tree ==0.5.0.2
-  - email-validate ==2.3.2.13
-  - emojis ==0.1
-  - enclosed-exceptions ==1.0.3
-  - ENIG ==0.0.1.0
-  - entropy ==0.4.1.6
-  - 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.7.0.0
-  - equivalence ==0.3.5
-  - erf ==2.0.0.0
-  - error-or ==0.1.2.0
-  - error-or-utils ==0.1.1
-  - errors ==2.3.0
-  - errors-ext ==0.4.2
-  - ersatz ==0.4.9
-  - esqueleto ==3.4.1.1
-  - essence-of-live-coding ==0.2.5
-  - essence-of-live-coding-gloss ==0.2.5
-  - essence-of-live-coding-pulse ==0.2.5
-  - essence-of-live-coding-quickcheck ==0.2.5
-  - etc ==0.4.1.0
-  - eve ==0.1.9.0
-  - 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
-  - executable-path ==0.0.3.1
-  - exit-codes ==1.0.0
-  - exomizer ==1.0.0
-  - experimenter ==0.1.0.12
-  - expiring-cache-map ==0.0.6.1
-  - explicit-exception ==0.1.10
-  - exp-pairs ==0.2.1.0
-  - express ==0.1.8
-  - extended-reals ==0.2.4.0
-  - extensible-effects ==5.0.0.1
-  - extensible-exceptions ==0.1.1.4
-  - extra ==1.7.9
-  - extractable-singleton ==0.0.1
-  - extrapolate ==0.4.4
-  - fail ==4.9.0.0
-  - failable ==1.2.4.0
-  - fakedata ==0.8.0
-  - fakedata-parser ==0.1.0.0
-  - fakefs ==0.3.0.2
-  - fakepull ==0.3.0.2
-  - faktory ==1.0.2.1
-  - fast-digits ==0.3.0.0
-  - fast-logger ==3.0.5
-  - fast-math ==1.0.2
-  - fb ==2.1.1
-  - fclabels ==2.0.5
-  - feature-flags ==0.1.0.1
-  - fedora-dists ==1.1.2
-  - fedora-haskell-tools ==0.9
-  - feed ==1.3.2.0
-  - FenwickTree ==0.1.2.1
-  - fft ==0.1.8.6
-  - 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
-  - filepath-bytestring ==1.4.2.1.7
-  - file-path-th ==0.1.0.0
-  - filepattern ==0.1.2
-  - fileplow ==0.1.0.0
-  - filtrable ==0.1.4.0
-  - fin ==0.2
-  - FindBin ==0.0.5
-  - fingertree ==0.1.4.2
-  - finite-typelits ==0.1.4.2
-  - first-class-families ==0.8.0.1
-  - first-class-patterns ==0.3.2.5
-  - fitspec ==0.4.8
-  - fixed ==0.3
-  - fixed-length ==0.2.2.1
-  - fixed-vector ==1.2.0.0
-  - fixed-vector-hetero ==0.6.1.0
-  - fix-whitespace ==0.0.5
-  - flac ==0.2.0
-  - flac-picture ==0.1.2
-  - flags-applicative ==0.1.0.3
-  - flat ==0.4.4
-  - flat-mcmc ==1.5.2
-  - flexible-defaults ==0.0.3
-  - FloatingHex ==0.5
-  - floatshow ==0.2.4
-  - flow ==1.0.22
-  - flush-queue ==1.0.0
-  - fmlist ==0.9.4
-  - fmt ==0.6.1.2
-  - 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.6
-  - foldl ==1.4.11
-  - folds ==0.7.6
-  - follow-file ==0.0.3
-  - FontyFruity ==0.5.3.5
-  - foreign-store ==0.2
-  - ForestStructures ==0.0.1.0
-  - forkable-monad ==0.2.0.3
-  - forma ==1.1.3
-  - format-numbers ==0.1.0.1
-  - formatting ==6.3.7
-  - foundation ==0.0.26.1
-  - fourmolu ==0.3.0.0
-  - free ==5.1.5
-  - free-categories ==0.2.0.2
-  - 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
-  - fsnotify ==0.3.0.1
-  - fsnotify-conduit ==0.1.1.1
-  - ftp-client ==0.5.1.4
-  - ftp-client-conduit ==0.5.0.5
-  - funcmp ==1.9
-  - function-builder ==0.3.0.1
-  - functor-classes-compat ==1.0.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
-  - gauge ==0.2.5
-  - gd ==3000.7.3
-  - gdp ==0.0.3.0
-  - general-games ==1.1.1
-  - generic-aeson ==0.2.0.12
-  - generic-arbitrary ==0.1.0
-  - generic-constraints ==1.1.1.1
-  - generic-data ==0.9.2.0
-  - generic-data-surgery ==0.3.0.0
-  - generic-deriving ==1.13.1
-  - generic-functor ==0.2.0.0
-  - generic-lens ==2.1.0.0
-  - generic-lens-core ==2.1.0.0
-  - generic-monoid ==0.1.0.1
-  - generic-optics ==2.1.0.0
-  - GenericPretty ==1.2.2
-  - generic-random ==1.3.0.1
-  - generics-eot ==0.4.0.1
-  - generics-sop ==0.5.1.1
-  - generics-sop-lens ==0.2.0.1
-  - geniplate-mirror ==0.7.7
-  - genvalidity ==0.11.0.0
-  - genvalidity-aeson ==0.3.0.0
-  - genvalidity-bytestring ==0.6.0.0
-  - genvalidity-containers ==0.9.0.0
-  - genvalidity-criterion ==0.2.0.0
-  - genvalidity-hspec ==0.7.0.4
-  - genvalidity-hspec-aeson ==0.3.1.1
-  - genvalidity-hspec-binary ==0.2.0.4
-  - genvalidity-hspec-cereal ==0.2.0.4
-  - genvalidity-hspec-hashable ==0.2.0.5
-  - genvalidity-hspec-optics ==0.1.1.2
-  - genvalidity-hspec-persistent ==0.0.0.1
-  - genvalidity-mergeful ==0.2.0.0
-  - genvalidity-mergeless ==0.2.0.0
-  - genvalidity-path ==0.3.0.4
-  - genvalidity-persistent ==0.0.0.0
-  - genvalidity-property ==0.5.0.1
-  - genvalidity-scientific ==0.2.1.1
-  - genvalidity-sydtest ==0.0.0.0
-  - genvalidity-sydtest-aeson ==0.0.0.0
-  - genvalidity-sydtest-hashable ==0.0.0.0
-  - genvalidity-sydtest-lens ==0.0.0.0
-  - genvalidity-sydtest-persistent ==0.0.0.1
-  - genvalidity-text ==0.7.0.2
-  - genvalidity-time ==0.3.0.0
-  - genvalidity-typed-uuid ==0.0.0.2
-  - genvalidity-unordered-containers ==0.3.0.1
-  - genvalidity-uuid ==0.1.0.4
-  - genvalidity-vector ==0.3.0.1
-  - geojson ==4.0.2
-  - getopt-generics ==0.13.0.4
-  - ghc-byteorder ==4.11.0.0.10
-  - ghc-check ==0.5.0.4
-  - ghc-core ==0.5.6
-  - ghc-events ==0.16.0
-  - ghc-exactprint ==0.6.4
-  - ghcid ==0.8.7
-  - ghci-hexcalc ==0.1.1.0
-  - ghcjs-codemirror ==0.0.0.2
-  - ghc-lib ==8.10.4.20210206
-  - ghc-lib-parser ==8.10.4.20210206
-  - ghc-lib-parser-ex ==8.10.0.19
-  - ghc-parser ==0.2.3.0
-  - ghc-paths ==0.1.0.12
-  - ghc-prof ==1.4.1.8
-  - ghc-source-gen ==0.4.0.0
-  - ghc-syntax-highlighter ==0.0.6.0
-  - ghc-tcplugins-extra ==0.4.1
-  - ghc-trace-events ==0.1.2.2
-  - ghc-typelits-extra ==0.4.2
-  - ghc-typelits-knownnat ==0.7.5
-  - ghc-typelits-natnormalise ==0.7.4
-  - ghc-typelits-presburger ==0.6.0.0
-  - ghost-buster ==0.1.1.0
-  - gi-atk ==2.0.22
-  - gi-cairo ==1.0.24
-  - gi-cairo-connector ==0.1.0
-  - gi-cairo-render ==0.1.0
-  - gi-dbusmenu ==0.4.8
-  - gi-dbusmenugtk3 ==0.4.9
-  - gi-gdk ==3.0.23
-  - gi-gdkpixbuf ==2.0.24
-  - gi-gdkx11 ==3.0.10
-  - gi-gio ==2.0.27
-  - gi-glib ==2.0.24
-  - gi-gobject ==2.0.25
-  - gi-graphene ==1.0.2
-  - gi-gtk ==3.0.36
-  - gi-gtk-hs ==0.3.9
-  - gi-harfbuzz ==0.0.3
-  - ginger ==0.10.1.0
-  - gingersnap ==0.3.1.0
-  - gi-pango ==1.0.23
-  - githash ==0.1.5.0
-  - github-release ==1.3.7
-  - github-rest ==1.0.3
-  - github-types ==0.2.1
-  - 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.3
-  - GLFW-b ==3.3.0.0
-  - Glob ==0.10.1
-  - gloss ==1.13.2.1
-  - gloss-rendering ==1.13.1.1
-  - GLURaw ==2.0.0.4
-  - GLUT ==2.7.0.16
-  - gluturtle ==0.0.58.1
-  - gnuplot ==0.5.6.1
-  - google-isbn ==1.0.3
-  - gopher-proxy ==0.1.1.2
-  - gothic ==0.1.6
-  - gpolyline ==0.1.0.1
-  - graph-core ==0.3.0.0
-  - graphite ==0.10.0.1
-  - graphql-client ==1.1.1
-  - graphs ==0.7.1
-  - graphula ==2.0.0.4
-  - graphviz ==2999.20.1.0
-  - graph-wrapper ==0.2.6.0
-  - gravatar ==0.8.0
-  - greskell ==1.2.0.1
-  - greskell-core ==0.1.3.6
-  - greskell-websocket ==0.1.2.5
-  - groom ==0.1.2.1
-  - group-by-date ==0.1.0.4
-  - groups ==0.5.2
-  - gtk-sni-tray ==0.1.6.0
-  - gtk-strut ==0.1.3.0
-  - guarded-allocation ==0.0.1
-  - H ==0.9.0.1
-  - hackage-db ==2.1.0
-  - hackage-security ==0.6.0.1
-  - haddock-library ==1.9.0
-  - hadoop-streaming ==0.2.0.3
-  - hakyll-convert ==0.3.0.4
-  - half ==0.3.1
-  - hall-symbols ==0.1.0.6
-  - hamtsolo ==1.0.3
-  - HandsomeSoup ==0.4.2
-  - hapistrano ==0.4.1.3
-  - happstack-server ==7.7.0
-  - happy ==1.20.0
-  - happy-meta ==0.2.0.11
-  - HasBigDecimal ==0.1.1
-  - hasbolt ==0.1.4.5
-  - hashable ==1.3.0.0
-  - hashable-time ==0.2.1
-  - hashids ==1.0.2.4
-  - hashing ==0.1.0.1
-  - hashmap ==1.3.3
-  - hashtables ==1.2.4.1
-  - haskeline ==0.8.1.2
-  - haskell-awk ==1.2
-  - haskell-gi ==0.24.7
-  - haskell-gi-base ==0.24.5
-  - haskell-gi-overloading ==1.0
-  - haskell-import-graph ==1.0.4
-  - haskell-lexer ==1.1
-  - haskell-lsp ==0.22.0.0
-  - haskell-lsp-types ==0.22.0.0
-  - haskell-names ==0.9.9
-  - HaskellNet ==0.6
-  - haskell-src ==1.0.3.1
-  - haskell-src-exts ==1.23.1
-  - haskell-src-exts-util ==0.2.5
-  - haskell-src-meta ==0.8.7
-  - haskey-btree ==0.3.0.1
-  - hasql ==1.4.5.1
-  - hasql-notifications ==0.2.0.0
-  - hasql-optparse-applicative ==0.3.0.6
-  - hasql-pool ==0.5.2
-  - hasql-queue ==1.2.0.2
-  - hasql-transaction ==1.0.0.2
-  - hasty-hamiltonian ==1.3.4
-  - HaTeX ==3.22.3.0
-  - HaXml ==1.25.5
-  - haxr ==3000.11.4.1
-  - HCodecs ==0.5.2
-  - hdaemonize ==0.5.6
-  - HDBC ==2.4.0.3
-  - HDBC-session ==0.1.2.0
-  - headroom ==0.4.1.0
-  - heap ==1.0.4
-  - heaps ==0.4
-  - hebrew-time ==0.1.2
-  - hedgehog ==1.0.5
-  - hedgehog-corpus ==0.2.0
-  - hedgehog-fakedata ==0.0.1.4
-  - hedgehog-fn ==1.0
-  - hedgehog-quickcheck ==0.1.1
-  - hedis ==0.14.2
-  - hedn ==0.3.0.2
-  - here ==1.2.13
-  - heredoc ==0.2.0.0
-  - heterocephalus ==1.0.5.4
-  - hexml ==0.3.4
-  - hexml-lens ==0.2.1
-  - hexpat ==0.20.13
-  - hformat ==0.3.3.1
-  - hfsevents ==0.1.6
-  - hgrev ==0.2.6
-  - hidapi ==0.1.7
-  - hie-bios ==0.7.5
-  - hi-file-parser ==0.1.2.0
-  - higher-leveldb ==0.6.0.0
-  - highlighting-kate ==0.6.4
-  - hinfo ==0.0.3.0
-  - hinotify ==0.4.1
-  - hint ==0.9.0.4
-  - hjsmin ==0.2.0.4
-  - hkd-default ==1.1.0.0
-  - hkgr ==0.2.7
-  - hlibcpuid ==0.2.0
-  - hlibgit2 ==0.18.0.16
-  - hlibsass ==0.1.10.1
-  - hmatrix ==0.20.2
-  - hmatrix-backprop ==0.1.3.0
-  - hmatrix-gsl ==0.19.0.1
-  - hmatrix-gsl-stats ==0.4.1.8
-  - hmatrix-morpheus ==0.1.1.2
-  - hmatrix-vector-sized ==0.1.3.0
-  - hmm-lapack ==0.4
-  - hmpfr ==0.4.4
-  - hnock ==0.4.0
-  - hoauth2 ==1.16.0
-  - hocon ==0.1.0.4
-  - hOpenPGP ==2.9.5
-  - hopenpgp-tools ==0.23.6
-  - hopfli ==0.2.2.1
-  - hosc ==0.18.1
-  - hostname ==1.0
-  - hostname-validate ==1.0.0
-  - hourglass ==0.2.12
-  - hourglass-orphans ==0.1.0.0
-  - hp2pretty ==0.10
-  - hpack ==0.34.4
-  - hpack-dhall ==0.5.2
-  - hpc-codecov ==0.3.0.0
-  - hpc-lcov ==1.0.1
-  - hprotoc ==2.4.17
-  - hruby ==0.3.8.1
-  - hsass ==0.8.0
-  - hs-bibutils ==6.10.0.0
-  - hsc2hs ==0.68.7
-  - hscolour ==1.24.4
-  - hsdns ==1.8
-  - hsebaysdk ==0.4.1.0
-  - hsemail ==2.2.1
-  - hs-functors ==0.1.7.1
-  - hs-GeoIP ==0.3
-  - hsini ==0.5.1.2
-  - hsinstall ==2.6
-  - HSlippyMap ==3.0.1
-  - hslogger ==1.3.1.0
-  - hslua ==1.3.0.1
-  - hslua-aeson ==1.0.3.1
-  - hslua-module-doclayout ==0.2.0.1
-  - hslua-module-path ==0.1.0.1
-  - hslua-module-system ==0.2.2.1
-  - hslua-module-text ==0.3.0.1
-  - HsOpenSSL ==0.11.7
-  - HsOpenSSL-x509-system ==0.1.0.4
-  - hsp ==0.10.0
-  - hspec ==2.7.10
-  - hspec-attoparsec ==0.1.0.2
-  - hspec-checkers ==0.1.0.2
-  - hspec-contrib ==0.5.1
-  - hspec-core ==2.7.10
-  - hspec-discover ==2.7.10
-  - hspec-expectations ==0.8.2
-  - hspec-expectations-json ==1.0.0.3
-  - hspec-expectations-lifted ==0.10.0
-  - hspec-expectations-pretty-diff ==0.7.2.5
-  - hspec-golden ==0.1.0.3
-  - hspec-golden-aeson ==0.7.0.0
-  - hspec-hedgehog ==0.0.1.2
-  - hspec-junit-formatter ==1.0.0.2
-  - hspec-leancheck ==0.0.4
-  - hspec-megaparsec ==2.2.0
-  - hspec-meta ==2.7.8
-  - hspec-need-env ==0.1.0.6
-  - hspec-parsec ==0
-  - hspec-smallcheck ==0.5.2
-  - hspec-tables ==0.0.1
-  - hspec-wai ==0.11.0
-  - hspec-wai-json ==0.11.0
-  - hs-php-session ==0.0.9.3
-  - hsshellscript ==3.5.0
-  - hs-tags ==0.1.5
-  - HStringTemplate ==0.8.7
-  - HSvm ==0.1.1.3.22
-  - HsYAML ==0.2.1.0
-  - HsYAML-aeson ==0.2.0.0
-  - hsyslog ==5.0.2
-  - htaglib ==1.2.0
-  - HTF ==0.14.0.6
-  - html ==1.0.1.2
-  - html-conduit ==1.3.2.1
-  - html-entities ==1.1.4.5
-  - html-entity-map ==0.1.0.0
-  - htoml ==1.0.0.3
-  - http2 ==3.0.1
-  - HTTP ==4000.3.16
-  - http-api-data ==0.4.2
-  - http-client ==0.6.4.1
-  - http-client-openssl ==0.3.2.0
-  - http-client-overrides ==0.1.1.0
-  - http-client-tls ==0.3.5.3
-  - http-common ==0.8.2.1
-  - http-conduit ==2.3.8
-  - http-date ==0.0.11
-  - http-directory ==0.1.8
-  - http-download ==0.2.0.0
-  - httpd-shed ==0.4.1.1
-  - http-link-header ==1.2.0
-  - http-media ==0.8.0.0
-  - http-query ==0.1.0.1
-  - http-reverse-proxy ==0.6.0
-  - http-streams ==0.8.7.2
-  - http-types ==0.12.3
-  - human-readable-duration ==0.2.1.4
-  - HUnit ==1.6.2.0
-  - HUnit-approx ==1.1.1.1
-  - hunit-dejafu ==2.0.0.4
-  - hvect ==0.4.0.0
-  - hvega ==0.11.0.1
-  - hw-balancedparens ==0.4.1.1
-  - hw-bits ==0.7.2.1
-  - hw-conduit ==0.2.1.0
-  - 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
-  - hw-fingertree-strict ==0.1.2.0
-  - hw-hedgehog ==0.1.1.0
-  - hw-hspec-hedgehog ==0.1.1.0
-  - hw-int ==0.0.2.0
-  - hw-ip ==2.4.2.0
-  - hw-json ==1.3.2.2
-  - 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.3
-  - hw-mquery ==0.2.1.0
-  - hw-packed-vector ==0.2.1.0
-  - hw-parser ==0.1.1.0
-  - hw-prim ==0.6.3.0
-  - hw-rankselect ==0.13.4.0
-  - hw-rankselect-base ==0.3.4.1
-  - hw-simd ==0.1.2.0
-  - hw-streams ==0.0.1.0
-  - hw-string-parse ==0.0.0.4
-  - hw-succinct ==0.1.0.1
-  - hw-xml ==0.5.1.0
-  - hxt ==9.3.1.22
-  - hxt-charproperties ==9.5.0.0
-  - hxt-css ==0.1.0.3
-  - hxt-curl ==9.1.1.1
-  - hxt-expat ==9.1.1
-  - hxt-http ==9.1.5.2
-  - hxt-regex-xmlschema ==9.2.0.7
-  - hxt-tagsoup ==9.1.4
-  - hxt-unicode ==9.0.2.4
-  - hybrid-vectors ==0.2.2
-  - hyper ==0.2.1.0
-  - hyperloglog ==0.4.4
-  - hyphenation ==0.8.1
-  - iconv ==0.4.1.3
-  - identicon ==0.2.2
-  - ieee754 ==0.8.0
-  - if ==0.1.0.0
-  - iff ==0.0.6
-  - ihaskell ==0.10.2.0
-  - ihs ==0.1.0.3
-  - ilist ==0.4.0.1
-  - imagesize-conduit ==1.1
-  - Imlib ==0.1.2
-  - immortal ==0.3
-  - immortal-queue ==0.1.0.1
-  - inbox ==0.1.0
-  - include-file ==0.1.0.4
-  - incremental-parser ==0.5.0.2
-  - indents ==0.5.0.1
-  - indexed ==0.1.3
-  - indexed-containers ==0.1.0.2
-  - indexed-list-literals ==0.2.1.3
-  - indexed-profunctors ==0.1.1
-  - indexed-traversable ==0.1.1
-  - indexed-traversable-instances ==0.1
-  - infer-license ==0.2.0
-  - inflections ==0.4.0.6
-  - influxdb ==1.9.1.2
-  - ini ==0.4.1
-  - inj ==1.0
-  - inline-c ==0.9.1.4
-  - inline-c-cpp ==0.4.0.3
-  - inline-r ==0.10.4
-  - inliterate ==0.1.0
-  - input-parsers ==0.2.2
-  - insert-ordered-containers ==0.2.4
-  - inspection-testing ==0.4.5.0
-  - instance-control ==0.1.2.0
-  - int-cast ==0.2.0.0
-  - integer-logarithms ==1.0.3.1
-  - integer-roots ==1.0
-  - integration ==0.2.1
-  - intern ==0.9.4
-  - interpolate ==0.2.1
-  - interpolatedstring-perl6 ==1.0.2
-  - interpolation ==0.1.1.1
-  - interpolator ==1.1.0.2
-  - IntervalMap ==0.6.1.2
-  - intervals ==0.9.2
-  - intro ==0.9.0.0
-  - intset-imperative ==0.1.0.0
-  - invariant ==0.5.4
-  - invertible ==0.2.0.7
-  - invertible-grammar ==0.1.3
-  - io-machine ==0.2.0.0
-  - io-manager ==0.1.0.3
-  - io-memoize ==1.1.1.0
-  - io-region ==0.1.1
-  - io-storage ==0.3
-  - io-streams ==1.5.2.0
-  - io-streams-haproxy ==1.0.1.0
-  - ip6addr ==1.0.2
-  - ipa ==0.3
-  - iproute ==1.7.11
-  - IPv6Addr ==2.0.2
-  - ipynb ==0.1.0.1
-  - ipython-kernel ==0.10.2.1
-  - irc ==0.6.1.0
-  - irc-client ==1.1.2.0
-  - irc-conduit ==0.3.0.4
-  - irc-ctcp ==0.1.3.0
-  - isbn ==1.1.0.2
-  - islink ==0.1.0.0
-  - iso3166-country-codes ==0.20140203.8
-  - iso639 ==0.1.0.3
-  - iso8601-time ==0.1.5
-  - iterable ==3.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.2
-  - jalaali ==1.0.0.0
-  - jira-wiki-markup ==1.3.4
-  - jose ==0.8.4
-  - jose-jwt ==0.9.2
-  - 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.12
-  - jsonpath ==0.2.0.0
-  - json-rpc ==1.0.3
-  - json-rpc-generic ==0.2.1.5
-  - JuicyPixels ==3.3.5
-  - JuicyPixels-blurhash ==0.1.0.3
-  - JuicyPixels-extra ==0.4.1
-  - JuicyPixels-scale-dct ==0.1.2
-  - junit-xml ==0.1.0.2
-  - justified-containers ==0.3.0.0
-  - jwt ==0.10.0
-  - kan-extensions ==5.2.2
-  - kanji ==3.4.1
-  - katip ==0.8.5.0
-  - katip-logstash ==0.1.0.0
-  - kawhi ==0.3.0
-  - kazura-queue ==0.1.0.4
-  - kdt ==0.2.4
-  - keep-alive ==0.2.0.0
-  - keycode ==0.2.2
-  - keys ==3.12.3
-  - ki ==0.2.0.1
-  - kind-apply ==0.3.2.0
-  - kind-generics ==0.4.1.0
-  - kind-generics-th ==0.2.2.2
-  - kmeans ==0.1.3
-  - koji ==0.0.1
-  - koofr-client ==1.0.0.3
-  - krank ==0.2.2
-  - kubernetes-webhook-haskell ==0.2.0.3
-  - l10n ==0.1.0.1
-  - labels ==0.3.3
-  - lackey ==1.0.14
-  - LambdaHack ==0.10.2.0
-  - lame ==0.2.0
-  - language-avro ==0.1.3.1
-  - language-bash ==0.9.2
-  - language-c ==0.8.3
-  - language-c-quote ==0.13
-  - language-docker ==9.3.0
-  - language-java ==0.2.9
-  - language-javascript ==0.7.1.0
-  - language-protobuf ==1.0.1
-  - language-python ==0.5.8
-  - language-thrift ==0.12.0.0
-  - lapack ==0.3.2
-  - lapack-carray ==0.0.3
-  - lapack-comfort-array ==0.0.0.1
-  - lapack-ffi ==0.0.3
-  - lapack-ffi-tools ==0.1.2.1
-  - largeword ==1.2.5
-  - latex ==0.1.0.4
-  - lattices ==2.0.2
-  - lawful ==0.1.0.0
-  - lazy-csv ==0.5.1
-  - lazyio ==0.1.0.4
-  - lca ==0.4
-  - leancheck ==0.9.4
-  - leancheck-instances ==0.0.4
-  - leapseconds-announced ==2017.1.0.1
-  - learn-physics ==0.6.5
-  - lens ==4.19.2
-  - lens-action ==0.2.5
-  - lens-aeson ==1.1.1
-  - lens-csv ==0.1.1.0
-  - lens-datetime ==0.3
-  - lens-family ==2.0.0
-  - lens-family-core ==2.0.0
-  - lens-family-th ==0.5.2.0
-  - lens-misc ==0.0.2.0
-  - lens-process ==0.4.0.0
-  - lens-properties ==4.11.1
-  - lens-regex ==0.1.3
-  - lens-regex-pcre ==1.1.0.0
-  - lenz ==0.4.2.0
-  - leveldb-haskell ==0.6.5
-  - libffi ==0.1
-  - libgit ==0.3.1
-  - libgraph ==1.14
-  - libjwt-typed ==0.2
-  - libmpd ==0.10.0.0
-  - liboath-hs ==0.0.1.2
-  - libyaml ==0.1.2
-  - LibZip ==1.0.1
-  - lifted-async ==0.10.2
-  - lifted-base ==0.2.3.12
-  - lift-generics ==0.2
-  - lift-type ==0.1.0.1
-  - line ==4.0.1
-  - linear ==1.21.5
-  - linear-circuit ==0.1.0.2
-  - linenoise ==0.3.2
-  - linux-file-extents ==0.2.0.0
-  - 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.5
-  - list-t ==1.0.4
-  - ListTree ==0.2.3
-  - little-rio ==0.2.2
-  - llvm-hs ==9.0.1
-  - llvm-hs-pure ==9.0.0
-  - lmdb ==0.2.5
-  - load-env ==0.2.1.0
-  - loc ==0.1.3.10
-  - locators ==0.3.0.3
-  - loch-th ==0.2.2
-  - lockfree-queue ==0.2.3.1
-  - log-domain ==0.13.1
-  - logfloat ==0.13.3.3
-  - logging ==3.0.5
-  - logging-facade ==0.3.0
-  - logging-facade-syslog ==1
-  - logict ==0.7.1.0
-  - logstash ==0.1.0.1
-  - loop ==0.3.0
-  - lrucache ==1.2.0.1
-  - lrucaching ==0.3.3
-  - lsp-test ==0.11.0.5
-  - lucid ==2.9.12.1
-  - lucid-cdn ==0.2.2.0
-  - lucid-extras ==0.2.2
-  - lukko ==0.1.1.3
-  - lz4-frame-conduit ==0.1.0.1
-  - lzma ==0.0.0.3
-  - lzma-conduit ==1.2.1
-  - machines ==0.7.2
-  - machines-binary ==7.0.0.0
-  - magic ==1.1
-  - magico ==0.0.2.1
-  - mainland-pretty ==0.7.1
-  - main-tester ==0.2.0.1
-  - makefile ==1.1.0.0
-  - managed ==1.0.8
-  - MapWith ==0.2.0.0
-  - markdown ==0.1.17.4
-  - markdown-unlit ==0.5.1
-  - markov-chain ==0.0.3.4
-  - 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.1
-  - mathexpr ==0.3.0.0
-  - math-extras ==0.1.1.0
-  - math-functions ==0.3.4.2
-  - matplotlib ==0.7.5
-  - matrices ==0.5.0
-  - matrix ==0.3.6.1
-  - matrix-as-xyz ==0.1.2.2
-  - matrix-market-attoparsec ==0.1.1.3
-  - matrix-static ==0.3
-  - maximal-cliques ==0.1.1
-  - mbox ==0.3.4
-  - mbox-utility ==0.0.3.1
-  - mcmc ==0.4.0.0
-  - mcmc-types ==1.0.3
-  - 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
-  - memory ==0.15.0
-  - MemoTrie ==0.6.10
-  - mercury-api ==0.1.0.2
-  - mergeful ==0.2.0.0
-  - mergeless ==0.3.0.0
-  - mersenne-random-pure64 ==0.2.2.0
-  - messagepack ==0.5.4
-  - metrics ==0.4.1.1
-  - mfsolve ==0.3.2.0
-  - microlens ==0.4.12.0
-  - microlens-aeson ==2.3.1
-  - microlens-contra ==0.1.0.2
-  - microlens-ghc ==0.4.13
-  - microlens-mtl ==0.2.0.1
-  - microlens-platform ==0.4.2
-  - microlens-process ==0.2.0.2
-  - microlens-th ==0.4.3.9
-  - microspec ==0.2.1.3
-  - microstache ==1.0.1.2
-  - midair ==0.2.0.1
-  - midi ==0.2.2.2
-  - mighty-metropolis ==2.0.0
-  - mime-mail ==0.5.1
-  - mime-mail-ses ==0.4.3
-  - mime-types ==0.1.0.9
-  - 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.1
-  - mltool ==0.2.0.1
-  - mmap ==0.5.9
-  - mmark ==0.0.7.2
-  - mmark-cli ==0.0.5.0
-  - mmark-ext ==0.2.1.3
-  - mmorph ==1.1.5
-  - mnist-idx ==0.1.2.8
-  - mockery ==0.3.5
-  - mock-time ==0.1.0
-  - mod ==0.1.2.2
-  - model ==0.5
-  - modern-uri ==0.3.4.1
-  - modular ==0.1.0.8
-  - monad-chronicle ==1.0.0.1
-  - monad-control ==1.0.2.3
-  - monad-control-aligned ==0.0.1.1
-  - monad-coroutine ==0.9.1
-  - 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
-  - monad-logger-prefix ==0.1.12
-  - monad-loops ==0.4.3
-  - monad-memo ==0.5.3
-  - monad-metrics ==0.2.2.0
-  - monad-par ==0.3.5
-  - monad-parallel ==0.7.2.4
-  - monad-par-extras ==0.3.3
-  - monad-peel ==0.2.1.2
-  - monad-primitive ==0.1
-  - monad-products ==4.0.1
-  - MonadPrompt ==1.0.0.5
-  - MonadRandom ==0.5.3
-  - 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
-  - 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
-  - more-containers ==0.2.2.2
-  - morpheus-graphql ==0.17.0
-  - morpheus-graphql-app ==0.17.0
-  - morpheus-graphql-client ==0.17.0
-  - morpheus-graphql-core ==0.17.0
-  - morpheus-graphql-subscriptions ==0.17.0
-  - moss ==0.2.0.0
-  - mountpoints ==1.0.2
-  - mpi-hs ==0.7.2.0
-  - mpi-hs-binary ==0.1.1.0
-  - 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
-  - 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
-  - MusicBrainz ==0.4.1
-  - mustache ==2.3.1
-  - mutable-containers ==0.3.4
-  - mwc-probability ==2.3.1
-  - mwc-random ==0.14.0.0
-  - mwc-random-monad ==0.7.3.1
-  - mx-state-codes ==1.0.0.0
-  - mysql ==0.2.0.1
-  - mysql-simple ==0.4.5
-  - n2o ==0.11.1
-  - nagios-check ==0.3.2
-  - names-th ==0.3.0.1
-  - nano-erl ==0.1.0.1
-  - nanospec ==0.2.2
-  - nats ==1.1.2
-  - natural-induction ==0.2.0.0
-  - natural-sort ==0.1.2
-  - natural-transformation ==0.4
-  - ndjson-conduit ==0.1.0.5
-  - neat-interpolation ==0.5.1.2
-  - netcode-io ==0.0.2
-  - netlib-carray ==0.1
-  - netlib-comfort-array ==0.0.0.1
-  - netlib-ffi ==0.1.1
-  - netpbm ==1.0.4
-  - nettle ==0.3.0
-  - netwire ==5.0.3
-  - netwire-input ==0.0.7
-  - netwire-input-glfw ==0.0.11
-  - network ==3.1.1.1
-  - network-bsd ==2.8.1.0
-  - network-byte-order ==0.1.6
-  - network-conduit-tls ==1.3.2
-  - network-info ==0.2.0.10
-  - network-ip ==0.3.0.3
-  - network-messagepack-rpc ==0.1.2.0
-  - network-messagepack-rpc-websocket ==0.1.1.1
-  - network-run ==0.2.4
-  - network-simple ==0.4.5
-  - network-simple-tls ==0.4
-  - network-transport ==0.5.4
-  - network-transport-composed ==0.2.1
-  - network-uri ==2.6.4.1
-  - newtype ==0.2.2.0
-  - newtype-generics ==0.6
-  - nicify-lib ==1.0.1
-  - NineP ==0.0.2.1
-  - nix-derivation ==1.1.2
-  - nix-paths ==1.0.1
-  - nonce ==1.0.7
-  - nondeterminism ==1.4
-  - non-empty ==0.3.3
-  - nonempty-containers ==0.3.4.1
-  - nonemptymap ==0.0.6.0
-  - non-empty-sequence ==0.2.0.4
-  - nonempty-vector ==0.2.1.0
-  - nonempty-zipper ==1.0.0.2
-  - non-negative ==0.1.2
-  - not-gloss ==0.7.7.0
-  - no-value ==1.0.0.0
-  - nowdoc ==0.1.1.0
-  - nqe ==0.6.3
-  - nri-env-parser ==0.1.0.7
-  - nri-observability ==0.1.0.2
-  - nri-prelude ==0.6.0.0
-  - nsis ==0.3.3
-  - numbers ==3000.2.0.2
-  - numeric-extras ==0.1
-  - numeric-prelude ==0.4.3.3
-  - numhask ==0.6.0.2
-  - NumInstances ==1.4
-  - numtype-dk ==0.5.0.2
-  - nuxeo ==0.3.2
-  - nvim-hs ==2.1.0.4
-  - nvim-hs-contrib ==2.0.0.0
-  - nvim-hs-ghcid ==2.0.0.0
-  - oauthenticated ==0.2.1.0
-  - ObjectName ==1.1.0.1
-  - o-clock ==1.2.0.1
-  - odbc ==0.2.2
-  - oeis2 ==1.0.5
-  - ofx ==0.4.4.0
-  - old-locale ==1.0.0.7
-  - old-time ==1.1.0.3
-  - once ==0.4
-  - one-liner ==1.0
-  - one-liner-instances ==0.1.2.1
-  - OneTuple ==0.2.2.1
-  - Only ==0.1
-  - oo-prototypes ==0.1.0.0
-  - opaleye ==0.7.1.0
-  - OpenAL ==1.7.0.5
-  - openapi3 ==3.1.0
-  - open-browser ==0.2.1.0
-  - openexr-write ==0.1.0.2
-  - OpenGL ==3.0.3.0
-  - OpenGLRaw ==3.3.4.0
-  - openpgp-asciiarmor ==0.1.2
-  - opensource ==0.1.1.0
-  - openssl-streams ==1.2.3.0
-  - opentelemetry ==0.6.1
-  - opentelemetry-extra ==0.6.1
-  - opentelemetry-lightstep ==0.6.1
-  - opentelemetry-wai ==0.6.1
-  - operational ==0.2.3.5
-  - operational-class ==0.3.0.0
-  - optics ==0.3
-  - optics-core ==0.3.0.1
-  - optics-extra ==0.3
-  - optics-th ==0.3.0.2
-  - optics-vl ==0.2.1
-  - optional-args ==1.0.2
-  - options ==1.2.1.1
-  - optparse-applicative ==0.16.1.0
-  - optparse-generic ==1.4.4
-  - optparse-simple ==0.1.1.3
-  - optparse-text ==0.1.1.0
-  - ordered-containers ==0.2.2
-  - ormolu ==0.1.4.1
-  - overhang ==1.0.0
-  - packcheck ==0.5.1
-  - packdeps ==0.6.0.0
-  - pager ==0.1.1.0
-  - pagination ==0.2.2
-  - pagure-cli ==0.2
-  - pandoc ==2.13
-  - pandoc-dhall-decoder ==0.1.0.1
-  - pandoc-plot ==1.1.1
-  - pandoc-throw ==0.1.0.0
-  - pandoc-types ==1.22
-  - pantry ==0.5.1.5
-  - parallel ==3.2.2.0
-  - parallel-io ==0.3.3
-  - parameterized ==0.5.0.0
-  - paripari ==0.7.0.0
-  - parseargs ==0.2.0.9
-  - parsec-class ==1.0.0.0
-  - parsec-numbers ==0.1.0
-  - parsec-numeric ==0.1.0.0
-  - ParsecTools ==0.0.2.0
-  - parser-combinators ==1.2.1
-  - parser-combinators-tests ==1.2.1
-  - parsers ==0.12.10
-  - partial-handler ==1.0.3
-  - partial-isomorphisms ==0.2.2.1
-  - partial-semigroup ==0.5.1.8
-  - password ==3.0.0.0
-  - password-instances ==3.0.0.0
-  - password-types ==1.0.0.0
-  - path ==0.7.0
-  - path-binary-instance ==0.1.0.1
-  - path-extensions ==0.1.1.0
-  - path-extra ==0.2.0
-  - path-io ==1.6.2
-  - path-like ==0.2.0.2
-  - path-pieces ==0.2.1
-  - path-text-utf8 ==0.0.1.6
-  - pathtype ==0.8.1.1
-  - pathwalk ==0.3.1.2
-  - pattern-arrows ==0.0.2
-  - pava ==0.1.1.1
-  - 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.2
-  - pdfinfo ==1.5.4
-  - peano ==0.1.0.1
-  - pem ==0.2.4
-  - percent-format ==0.0.1
-  - peregrin ==0.3.1
-  - perfect-hash-generator ==0.2.0.6
-  - perfect-vector-shuffle ==0.1.1.1
-  - persist ==0.1.1.5
-  - persistable-record ==0.6.0.5
-  - persistable-types-HDBC-pg ==0.0.3.5
-  - persistent ==2.11.0.4
-  - persistent-documentation ==0.1.0.2
-  - persistent-mtl ==0.2.1.0
-  - persistent-mysql ==2.10.3.1
-  - persistent-pagination ==0.1.1.2
-  - persistent-postgresql ==2.11.0.1
-  - persistent-qq ==2.9.2.1
-  - persistent-sqlite ==2.11.1.0
-  - persistent-template ==2.9.1.0
-  - 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
-  - phantom-state ==0.2.1.2
-  - pid1 ==0.1.2.0
-  - pinboard ==0.10.2.0
-  - pipes ==4.3.15
-  - pipes-aeson ==0.4.1.8
-  - pipes-attoparsec ==0.5.1.5
-  - pipes-binary ==0.4.2
-  - pipes-bytestring ==2.1.7
-  - pipes-concurrency ==2.0.12
-  - pipes-csv ==1.4.3
-  - pipes-extras ==1.0.15
-  - pipes-fastx ==0.3.0.0
-  - pipes-group ==1.0.12
-  - pipes-http ==1.0.6
-  - pipes-network ==0.6.5
-  - pipes-network-tls ==0.4
-  - pipes-ordered-zip ==1.2.1
-  - pipes-parse ==3.0.9
-  - pipes-random ==1.0.0.5
-  - pipes-safe ==2.3.3
-  - pipes-wai ==3.2.0
-  - pkcs10 ==0.2.0.0
-  - pkgtreediff ==0.4.1
-  - place-cursor-at ==1.0.1
-  - placeholders ==0.1
-  - plaid ==0.1.0.4
-  - plotlyhs ==0.2.1
-  - pointed ==5.0.2
-  - pointedlist ==0.6.1
-  - pointless-fun ==1.1.0.6
-  - poll ==0.0.0.2
-  - poly ==0.5.0.0
-  - poly-arity ==0.1.0
-  - polynomials-bernstein ==1.1.2
-  - polyparse ==1.13
-  - polysemy ==1.5.0.0
-  - polysemy-plugin ==0.3.0.0
-  - pooled-io ==0.0.2.2
-  - port-utils ==0.2.1.0
-  - posix-paths ==0.2.1.6
-  - possibly ==1.0.0.0
-  - postgres-options ==0.2.0.0
-  - postgresql-binary ==0.12.4
-  - postgresql-libpq ==0.9.4.3
-  - postgresql-libpq-notify ==0.2.0.0
-  - postgresql-orm ==0.5.1
-  - postgresql-simple ==0.6.4
-  - postgresql-typed ==0.6.2.0
-  - 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.4.0.3
-  - pretty-hex ==1.1
-  - 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
-  - primitive-extras ==0.10.1
-  - primitive-unaligned ==0.1.1.1
-  - primitive-unlifted ==0.1.3.0
-  - print-console-colors ==0.1.0.0
-  - probability ==0.2.7
-  - process-extras ==0.7.4
-  - product-isomorphic ==0.0.3.3
-  - product-profunctors ==0.11.0.2
-  - profiterole ==0.1
-  - profunctors ==5.5.2
-  - projectroot ==0.2.0.1
-  - project-template ==0.2.1.0
-  - prometheus ==2.2.2
-  - prometheus-client ==1.0.1
-  - prometheus-wai-middleware ==1.0.1.0
-  - promises ==0.3
-  - prompt ==0.1.1.2
-  - prospect ==0.1.0.0
-  - proto3-wire ==1.2.1
-  - protobuf ==0.2.1.3
-  - protobuf-simple ==0.1.1.0
-  - protocol-buffers ==2.4.17
-  - 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-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
-  - publicsuffix ==0.20200526
-  - pulse-simple ==0.1.14
-  - pureMD5 ==2.1.3
-  - purescript-bridge ==0.14.0.0
-  - pushbullet-types ==0.4.1.0
-  - pusher-http-haskell ==2.1.0.1
-  - pvar ==1.0.0.0
-  - PyF ==0.9.0.3
-  - qchas ==1.1.0.1
-  - qm-interpolated-string ==0.3.0.0
-  - qrcode-core ==0.9.4
-  - qrcode-juicypixels ==0.8.2
-  - quadratic-irrational ==0.1.1
-  - QuasiText ==0.1.2.6
-  - QuickCheck ==2.14.2
-  - quickcheck-arbitrary-adt ==0.3.1.0
-  - quickcheck-assertions ==0.3.0
-  - quickcheck-classes ==0.6.5.0
-  - quickcheck-classes-base ==0.6.2.0
-  - quickcheck-higherorder ==0.1.0.0
-  - quickcheck-instances ==0.3.25.2
-  - quickcheck-io ==0.2.0
-  - quickcheck-simple ==0.1.1.1
-  - quickcheck-special ==0.1.0.6
-  - quickcheck-text ==0.1.2.1
-  - quickcheck-transformer ==0.3.1.1
-  - quickcheck-unicode ==1.0.1.0
-  - quiet ==0.2
-  - quote-quot ==0.2.0.0
-  - radius ==0.7.1.0
-  - rainbow ==0.34.2.2
-  - rainbox ==0.26.0.0
-  - ral ==0.2
-  - rampart ==1.1.0.2
-  - ramus ==0.1.2
-  - rando ==0.0.0.4
-  - random ==1.1
-  - random-bytestring ==0.1.4
-  - random-fu ==0.2.7.4
-  - random-shuffle ==0.0.4
-  - random-source ==0.3.0.8
-  - random-tree ==0.6.0.5
-  - range ==0.3.0.2
-  - ranged-list ==0.1.0.0
-  - Ranged-sets ==0.4.0
-  - range-set-list ==0.1.3.1
-  - rank1dynamic ==0.4.1
-  - rank2classes ==1.4.1
-  - Rasterific ==0.7.5.3
-  - rasterific-svg ==0.3.3.2
-  - ratel ==1.0.14
-  - rate-limit ==1.4.2
-  - ratel-wai ==1.1.5
-  - rattle ==0.2
-  - rattletrap ==11.1.1
-  - Rattus ==0.5
-  - rawfilepath ==0.2.4
-  - rawstring-qm ==0.2.3.0
-  - raw-strings-qq ==1.1
-  - rcu ==0.2.5
-  - rdf ==0.1.0.5
-  - 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
-  - rebase ==1.6.1
-  - record-dot-preprocessor ==0.2.10
-  - record-hasfield ==1.0
-  - records-sop ==0.1.1.0
-  - record-wrangler ==0.1.1.0
-  - recursion-schemes ==5.2.2.1
-  - reducers ==3.12.3
-  - refact ==0.3.0.2
-  - ref-fd ==0.5
-  - refined ==0.6.2
-  - reflection ==2.1.6
-  - reform ==0.2.7.4
-  - reform-blaze ==0.2.4.3
-  - reform-hamlet ==0.0.5.3
-  - reform-happstack ==0.2.5.4
-  - RefSerialize ==0.4.0
-  - ref-tf ==0.5
-  - regex ==1.1.0.0
-  - regex-applicative ==0.3.4
-  - regex-applicative-text ==0.1.0.1
-  - regex-base ==0.94.0.1
-  - regex-compat ==0.95.2.1
-  - regex-compat-tdfa ==0.95.1.4
-  - regex-pcre ==0.95.0.0
-  - regex-pcre-builtin ==0.95.2.3.8.43
-  - regex-posix ==0.96.0.0
-  - regex-tdfa ==1.3.1.0
-  - regex-with-pcre ==1.1.0.0
-  - registry ==0.2.0.3
-  - reinterpret-cast ==0.1.0
-  - relapse ==1.0.0.0
-  - relational-query ==0.12.2.3
-  - relational-query-HDBC ==0.7.2.0
-  - relational-record ==0.2.2.0
-  - relational-schemas ==0.1.8.0
-  - reliable-io ==0.0.1
-  - relude ==0.7.0.0
-  - renderable ==0.2.0.1
-  - replace-attoparsec ==1.4.4.0
-  - replace-megaparsec ==1.4.4.0
-  - repline ==0.4.0.0
-  - req ==3.9.0
-  - req-conduit ==1.0.0
-  - rerebase ==1.6.1
-  - rescue ==0.4.2.1
-  - resistor-cube ==0.0.1.2
-  - resolv ==0.1.2.0
-  - resource-pool ==0.2.3.2
-  - resourcet ==1.2.4.2
-  - result ==0.2.6.0
-  - rethinkdb-client-driver ==0.0.25
-  - retry ==0.8.1.2
-  - rev-state ==0.1.2
-  - rfc1751 ==0.1.3
-  - rfc5051 ==0.2
-  - rhbzquery ==0.4.3
-  - rhine ==0.7.0
-  - rhine-gloss ==0.7.0
-  - rigel-viz ==0.2.0.0
-  - rio ==0.1.20.0
-  - rio-orphans ==0.1.2.0
-  - rio-prettyprint ==0.1.1.0
-  - roc-id ==0.1.0.0
-  - rocksdb-haskell ==1.0.1
-  - rocksdb-haskell-jprupp ==2.1.3
-  - rocksdb-query ==0.4.2
-  - roles ==0.2.0.0
-  - rope-utf16-splay ==0.3.2.0
-  - rosezipper ==0.2
-  - rot13 ==0.2.0.1
-  - rpmbuild-order ==0.4.3.2
-  - RSA ==2.4.1
-  - runmemo ==1.0.0.1
-  - rvar ==0.2.0.6
-  - safe ==0.3.19
-  - safe-coloured-text ==0.0.0.0
-  - safecopy ==0.10.4.2
-  - 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.1
-  - salak ==0.3.6
-  - salak-yaml ==0.3.5.3
-  - saltine ==0.1.1.1
-  - salve ==1.0.11
-  - sample-frame ==0.0.3
-  - sample-frame-np ==0.0.4.1
-  - sampling ==0.3.5
-  - sandwich ==0.1.0.5
-  - sandwich-quickcheck ==0.1.0.5
-  - sandwich-slack ==0.1.0.4
-  - sandwich-webdriver ==0.1.0.4
-  - say ==0.1.0.1
-  - sbp ==2.6.3
-  - scalpel ==0.6.2
-  - scalpel-core ==0.6.2
-  - scanf ==0.1.0.0
-  - scanner ==0.3.1
-  - scheduler ==1.5.0
-  - scientific ==0.3.6.2
-  - scotty ==0.12
-  - scrypt ==0.5.0
-  - sdl2 ==2.5.3.0
-  - sdl2-gfx ==0.2
-  - sdl2-image ==2.0.0
-  - sdl2-mixer ==1.1.0
-  - sdl2-ttf ==2.1.2
-  - search-algorithms ==0.3.1
-  - secp256k1-haskell ==0.5.0
-  - securemem ==0.1.10
-  - selda ==0.5.1.0
-  - selda-json ==0.1.1.0
-  - selda-postgresql ==0.1.8.1
-  - selda-sqlite ==0.1.7.1
-  - selections ==0.3.0.0
-  - selective ==0.4.2
-  - semialign ==1.1.0.1
-  - semialign-indexed ==1.1
-  - semialign-optics ==1.1
-  - semigroupoid-extras ==5
-  - semigroupoids ==5.3.5
-  - semigroups ==0.19.1
-  - semirings ==0.6
-  - semiring-simple ==1.0.0.1
-  - semver ==0.4.0.1
-  - sendfile ==0.7.11.1
-  - sendgrid-v3 ==0.3.0.0
-  - seqalign ==0.2.0.4
-  - seqid ==0.6.2
-  - seqid-streams ==0.7.2
-  - sequence-formats ==1.6.1
-  - sequenceTools ==1.4.0.5
-  - serf ==0.1.1.0
-  - serialise ==0.2.3.0
-  - servant ==0.18.2
-  - servant-auth ==0.4.0.0
-  - servant-auth-client ==0.4.1.0
-  - servant-auth-docs ==0.2.10.0
-  - servant-auth-server ==0.4.6.0
-  - servant-auth-swagger ==0.2.10.1
-  - servant-blaze ==0.9.1
-  - servant-client ==0.18.2
-  - servant-client-core ==0.18.2
-  - servant-conduit ==0.15.1
-  - servant-docs ==0.11.8
-  - servant-elm ==0.7.2
-  - servant-errors ==0.1.6.0
-  - servant-exceptions ==0.2.1
-  - servant-exceptions-server ==0.2.1
-  - servant-foreign ==0.15.3
-  - servant-http-streams ==0.18.2
-  - servant-machines ==0.15.1
-  - servant-multipart ==0.12
-  - servant-openapi3 ==2.0.1.2
-  - servant-pipes ==0.15.2
-  - servant-rawm ==1.0.0.0
-  - servant-server ==0.18.2
-  - servant-swagger ==1.1.10
-  - servant-swagger-ui ==0.3.5.3.47.1
-  - servant-swagger-ui-core ==0.3.5
-  - serverless-haskell ==0.12.6
-  - serversession ==1.0.2
-  - serversession-frontend-wai ==1.0
-  - ses-html ==0.4.0.0
-  - set-cover ==0.1.1
-  - setenv ==0.1.1.3
-  - setlocale ==1.0.0.10
-  - sexp-grammar ==2.3.0
-  - SHA ==1.6.4.4
-  - shake-language-c ==0.12.0
-  - shake-plus ==0.3.3.1
-  - shake-plus-extended ==0.4.1.0
-  - shakespeare ==2.0.25
-  - shared-memory ==0.2.0.0
-  - shell-conduit ==5.0.0
-  - shell-escape ==0.2.0
-  - shellmet ==0.0.4.0
-  - 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
-  - signal ==0.1.0.4
-  - silently ==1.2.5.1
-  - simple-affine-space ==0.1.1
-  - simple-cabal ==0.1.3
-  - simple-cmd ==0.2.3
-  - simple-cmd-args ==0.1.6
-  - simple-log ==0.9.12
-  - simple-reflect ==0.3.3
-  - simple-sendfile ==0.2.30
-  - simple-templates ==1.0.0
-  - simple-vec3 ==0.6.0.1
-  - simplistic-generics ==2.0.0
-  - since ==0.0.0
-  - singleton-bool ==0.1.5
-  - singleton-nats ==0.4.5
-  - singletons ==2.7
-  - singletons-presburger ==0.6.0.0
-  - siphash ==1.0.3
-  - sitemap-gen ==0.1.0.0
-  - sized ==1.0.0.0
-  - skein ==1.0.9.4
-  - skews ==0.1.0.3
-  - skip-var ==0.1.1.0
-  - skylighting ==0.10.5.1
-  - skylighting-core ==0.10.5.1
-  - slack-api ==0.12
-  - slack-progressbar ==0.1.0.1
-  - slick ==1.1.1.0
-  - slist ==0.2.0.0
-  - slynx ==0.5.0.2
-  - smallcheck ==1.2.1
-  - smash ==0.1.2
-  - smash-aeson ==0.1.0.0
-  - smash-lens ==0.1.0.1
-  - smash-microlens ==0.1.0.0
-  - smoothie ==0.4.2.11
-  - smtp-mail ==0.3.0.0
-  - snap-blaze ==0.2.1.5
-  - snap-core ==1.0.4.2
-  - snap-server ==1.1.2.0
-  - snowflake ==0.1.1.1
-  - soap ==0.2.3.6
-  - soap-openssl ==0.1.0.2
-  - soap-tls ==0.1.1.4
-  - socket ==0.8.3.0
-  - socks ==0.6.1
-  - some ==1.0.3
-  - sop-core ==0.5.0.1
-  - sort ==1.0.0.0
-  - sorted-list ==0.2.1.0
-  - sourcemap ==0.1.6.1
-  - sox ==0.2.3.1
-  - soxlib ==0.0.3.1
-  - spacecookie ==1.0.0.0
-  - sparse-linear-algebra ==0.3.1
-  - sparse-tensor ==0.2.1.5
-  - spatial-math ==0.5.0.1
-  - special-values ==0.1.0.0
-  - speculate ==0.4.6
-  - speedy-slice ==0.3.2
-  - Spintax ==0.3.6
-  - splice ==0.6.1.1
-  - splint ==1.0.1.4
-  - split ==0.2.3.4
-  - splitmix ==0.1.0.3
-  - spoon ==0.3.1
-  - spreadsheet ==0.1.3.8
-  - 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.6
-  - stache ==2.2.1
-  - stackcollapse-ghc ==0.0.1.3
-  - stack-templatizer ==0.1.0.2
-  - stateref ==0.3
-  - StateVar ==1.2.1
-  - static-text ==0.2.0.6
-  - statistics ==0.15.2.0
-  - status-notifier-item ==0.3.0.5
-  - stb-image-redux ==0.2.1.3
-  - step-function ==0.2
-  - stm-chans ==3.0.0.4
-  - stm-conduit ==4.0.1
-  - stm-containers ==1.2
-  - stm-delay ==0.1.1.1
-  - stm-extras ==0.1.0.3
-  - stm-hamt ==1.2.0.6
-  - stm-lifted ==2.5.0.0
-  - STMonadTrans ==0.4.5
-  - stm-split ==0.0.2.1
-  - stopwatch ==0.1.0.6
-  - storable-complex ==0.2.3.0
-  - storable-endian ==0.2.6
-  - storable-record ==0.0.5
-  - storable-tuple ==0.0.3.3
-  - storablevector ==0.2.13.1
-  - store ==0.7.11
-  - store-core ==0.4.4.4
-  - store-streaming ==0.2.0.3
-  - stratosphere ==0.59.1
-  - streaming ==0.2.3.0
-  - streaming-attoparsec ==1.0.0.1
-  - streaming-bytestring ==0.2.0
-  - streaming-commons ==0.2.2.1
-  - streamly ==0.7.3
-  - streams ==3.3
-  - strict ==0.4.0.1
-  - strict-concurrency ==0.2.4.3
-  - 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
-  - string-conversions ==0.4.0.1
-  - string-interpolate ==0.3.1.0
-  - string-qq ==0.0.4
-  - string-random ==0.1.4.1
-  - stringsearch ==0.3.6.6
-  - string-transform ==1.1.1
-  - stripe-concepts ==1.0.2.6
-  - stripe-core ==2.6.2
-  - stripe-haskell ==2.6.2
-  - stripe-http-client ==2.6.2
-  - stripe-tests ==2.6.2
-  - strive ==5.0.14
-  - structs ==0.1.6
-  - structured ==0.1.0.1
-  - structured-cli ==2.7.0.1
-  - subcategories ==0.1.1.0
-  - sum-type-boilerplate ==0.1.1
-  - sundown ==0.6
-  - superbuffer ==0.3.1.1
-  - svg-tree ==0.6.2.4
-  - swagger ==0.3.0
-  - swagger2 ==2.6
-  - sweet-egison ==0.1.1.3
-  - swish ==0.10.0.4
-  - syb ==0.7.2.1
-  - sydtest ==0.1.0.0
-  - sydtest-discover ==0.0.0.0
-  - sydtest-persistent-sqlite ==0.0.0.0
-  - sydtest-servant ==0.0.0.0
-  - sydtest-wai ==0.0.0.0
-  - sydtest-yesod ==0.0.0.0
-  - symbol ==0.2.4
-  - symengine ==0.1.2.0
-  - symmetry-operations-symbols ==0.0.2.1
-  - 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.2
-  - tabular ==0.2.2.8
-  - taffybar ==3.2.3
-  - tagchup ==0.4.1.1
-  - tagged ==0.8.6.1
-  - tagged-binary ==0.2.0.1
-  - tagged-identity ==0.1.3
-  - tagged-transformer ==0.8.1
-  - tagshare ==0.0
-  - tagsoup ==0.14.8
-  - tao ==1.0.0
-  - tao-example ==1.0.0
-  - tar ==0.5.1.1
-  - tar-conduit ==0.3.2
-  - tardis ==0.4.3.0
-  - tasty ==1.4.1
-  - tasty-ant-xml ==1.1.8
-  - tasty-bench ==0.2.5
-  - tasty-dejafu ==2.0.0.7
-  - tasty-discover ==4.2.2
-  - tasty-expected-failure ==0.12.3
-  - tasty-focus ==1.0.1
-  - tasty-golden ==2.3.4
-  - tasty-hedgehog ==1.0.1.0
-  - tasty-hspec ==1.1.6
-  - tasty-hunit ==0.10.0.3
-  - tasty-hunit-compat ==0.2.0.1
-  - tasty-kat ==0.0.3
-  - tasty-leancheck ==0.0.1
-  - tasty-lua ==0.2.3.2
-  - tasty-program ==1.0.5
-  - tasty-quickcheck ==0.10.1.2
-  - tasty-rerun ==1.1.18
-  - tasty-silver ==3.2.1
-  - tasty-smallcheck ==0.8.2
-  - tasty-test-reporter ==0.1.1.4
-  - tasty-th ==0.1.7
-  - tasty-wai ==0.1.1.1
-  - Taxonomy ==2.1.0
-  - TCache ==0.12.1
-  - tce-conf ==1.3
-  - tdigest ==0.2.1.1
-  - template-haskell-compat-v0208 ==0.1.5
-  - temporary ==1.3
-  - temporary-rc ==1.2.0.3
-  - temporary-resourcet ==0.1.0.1
-  - tensorflow-test ==0.1.0.0
-  - tensors ==0.1.5
-  - termbox ==0.3.0
-  - terminal-progress-bar ==0.4.1
-  - terminal-size ==0.3.2.1
-  - test-framework ==0.8.2.0
-  - test-framework-hunit ==0.3.0.2
-  - test-framework-leancheck ==0.0.1
-  - test-framework-quickcheck2 ==0.3.0.5
-  - test-framework-smallcheck ==0.2
-  - test-fun ==0.1.0.0
-  - testing-type-modifiers ==0.1.0.1
-  - texmath ==0.12.2
-  - text-ansi ==0.1.1
-  - text-binary ==0.2.1.1
-  - text-builder ==0.6.6.2
-  - text-conversions ==0.3.1
-  - text-format ==0.3.2
-  - 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.3.0.0
-  - text-metrics ==0.3.0
-  - text-postgresql ==0.0.3.1
-  - text-printer ==0.5.0.1
-  - text-regex-replace ==0.1.1.4
-  - text-region ==0.3.1.0
-  - text-short ==0.1.3
-  - text-show ==3.9
-  - text-show-instances ==3.8.4
-  - text-zipper ==0.11
-  - tfp ==1.0.2
-  - tf-random ==0.5
-  - th-abstraction ==0.4.2.0
-  - th-bang-compat ==0.0.1.0
-  - th-compat ==0.1.2
-  - th-constraint-compat ==0.0.1.0
-  - 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.2
-  - these-optics ==1.0.1.2
-  - these-skinny ==0.7.4
-  - th-expand-syns ==0.4.8.0
-  - th-extras ==0.0.0.4
-  - th-lift ==0.8.2
-  - th-lift-instances ==0.1.18
-  - 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.3
-  - thyme ==0.3.5.5
-  - tidal ==1.7.4
-  - 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
-  - timezone-olson ==0.2.0
-  - timezone-series ==0.1.9
-  - tinylog ==0.15.0
-  - titlecase ==1.0.1
-  - tldr ==0.9.0
-  - tls ==1.5.5
-  - tls-debug ==0.4.8
-  - tls-session-manager ==0.0.4
-  - tlynx ==0.5.0.2
-  - tmapchan ==0.0.3
-  - tmapmvar ==0.0.4
-  - tmp-postgres ==1.34.1.0
-  - tomland ==1.3.2.0
-  - tonalude ==0.1.1.1
-  - topograph ==1.0.0.1
-  - torsor ==0.1
-  - tostring ==0.2.1.1
-  - transaction ==0.1.1.3
-  - transformers-base ==0.4.5.2
-  - transformers-bifunctors ==0.1
-  - transformers-compat ==0.6.6
-  - transformers-fix ==1.0
-  - traverse-with-class ==1.0.1.0
-  - tree-diff ==0.2
-  - tree-fun ==0.8.1.0
-  - tree-view ==0.5.1
-  - trifecta ==2.1.1
-  - triplesec ==0.2.2.1
-  - tsv2csv ==0.1.0.2
-  - ttc ==0.4.0.0
-  - 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
-  - turtle ==1.5.22
-  - typecheck-plugin-nat-simple ==0.1.0.2
-  - 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
-  - type-hint ==0.1
-  - type-level-integers ==0.0.1
-  - type-level-kv-list ==1.1.0
-  - type-level-natural-number ==2.0
-  - type-level-numbers ==0.1.1.1
-  - type-map ==0.1.6.0
-  - type-natural ==1.1.0.0
-  - typenums ==0.1.4
-  - type-of-html ==1.6.2.0
-  - 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
-  - tzdata ==0.2.20201021.0
-  - ua-parser ==0.7.6.0
-  - uglymemo ==0.1.0.1
-  - ulid ==0.3.0.0
-  - unagi-chan ==0.4.1.3
-  - unbounded-delays ==0.1.1.1
-  - unboxed-ref ==0.4.0.0
-  - unboxing-vector ==0.2.0.0
-  - uncaught-exception ==0.1.0
-  - uncertain ==0.3.1.0
-  - unconstrained ==0.1.0.2
-  - unexceptionalio ==0.5.1
-  - unexceptionalio-trans ==0.5.1
-  - unicode ==0.0.1.1
-  - unicode-show ==0.1.0.4
-  - unicode-transforms ==0.3.7.1
-  - unification-fd ==0.11.1
-  - union-find ==0.2
-  - unipatterns ==0.0.0.0
-  - uniplate ==1.6.13
-  - uniprot-kb ==0.1.2.0
-  - uniq-deep ==1.2.0
-  - unique ==0.0.1
-  - unique-logic ==0.4
-  - unique-logic-tf ==0.5.1
-  - unit-constraint ==0.0.0
-  - universe ==1.2.1
-  - universe-base ==1.1.2
-  - universe-instances-base ==1.1
-  - universe-instances-extended ==1.1.2
-  - universe-instances-trans ==1.1
-  - universe-reverse-instances ==1.1.1
-  - universe-some ==1.2.1
-  - universum ==1.7.2
-  - unix-bytestring ==0.3.7.3
-  - unix-compat ==0.5.3
-  - unix-time ==0.4.7
-  - unliftio ==0.2.14
-  - unliftio-core ==0.2.0.1
-  - unliftio-pool ==0.2.1.1
-  - unliftio-streams ==0.1.1.1
-  - unlit ==0.4.0.0
-  - unordered-containers ==0.2.13.0
-  - unsafe ==0.0
-  - urbit-hob ==0.3.3
-  - uri-bytestring ==0.3.3.0
-  - uri-bytestring-aeson ==0.1.0.8
-  - uri-encode ==1.5.0.7
-  - url ==2.1.3
-  - users ==0.5.0.0
-  - utf8-conversions ==0.1.0.4
-  - utf8-light ==0.4.2
-  - utf8-string ==1.0.2
-  - util ==0.1.17.1
-  - utility-ht ==0.0.16
-  - uuid ==1.3.14
-  - uuid-types ==1.0.4
-  - validation ==1.1.1
-  - validation-selective ==0.1.0.1
-  - validity ==0.11.0.0
-  - validity-aeson ==0.2.0.4
-  - validity-bytestring ==0.4.1.1
-  - validity-containers ==0.5.0.4
-  - validity-path ==0.4.0.1
-  - validity-persistent ==0.0.0.0
-  - validity-primitive ==0.0.0.1
-  - validity-scientific ==0.2.0.3
-  - validity-text ==0.3.1.1
-  - validity-time ==0.4.0.0
-  - validity-unordered-containers ==0.2.0.3
-  - validity-uuid ==0.1.0.3
-  - validity-vector ==0.2.0.3
-  - valor ==0.1.0.0
-  - vault ==0.3.1.5
-  - vec ==0.4
-  - vector ==0.12.3.0
-  - vector-algorithms ==0.8.0.4
-  - vector-binary-instances ==0.2.5.2
-  - vector-buffer ==0.4.1
-  - vector-builder ==0.3.8.1
-  - vector-bytes-instances ==0.1.1
-  - vector-circular ==0.1.3
-  - vector-instances ==3.4
-  - vector-mmap ==0.0.3
-  - vector-rotcev ==0.1.0.0
-  - vector-sized ==1.4.3.1
-  - vector-space ==0.16
-  - vector-split ==1.0.0.2
-  - vector-th-unbox ==0.2.1.9
-  - verbosity ==0.4.0.0
-  - versions ==4.0.3
-  - vformat ==0.14.1.0
-  - vformat-aeson ==0.1.0.1
-  - vformat-time ==0.1.0.0
-  - ViennaRNAParser ==1.3.3
-  - vinyl ==0.13.1
-  - void ==0.7.3
-  - vty ==5.33
-  - wai ==3.2.3
-  - wai-app-static ==3.1.7.2
-  - wai-conduit ==3.0.0.4
-  - wai-cors ==0.2.7
-  - wai-enforce-https ==0.0.2.1
-  - wai-eventsource ==3.0.0
-  - wai-extra ==3.1.6
-  - wai-feature-flags ==0.1.0.1
-  - wai-handler-launch ==3.0.3.1
-  - wai-logger ==2.3.6
-  - wai-middleware-auth ==0.2.4.1
-  - wai-middleware-caching ==0.1.0.2
-  - wai-middleware-clacks ==0.1.0.1
-  - wai-middleware-static ==0.9.0
-  - wai-rate-limit ==0.1.0.0
-  - wai-rate-limit-redis ==0.1.0.0
-  - wai-saml2 ==0.2.1.2
-  - wai-session ==0.3.3
-  - wai-session-redis ==0.1.0.1
-  - wai-slack-middleware ==0.2.0
-  - wai-websockets ==3.0.1.2
-  - wakame ==0.1.0.0
-  - warp ==3.3.15
-  - warp-tls ==3.3.0
-  - warp-tls-uid ==0.2.0.6
-  - wave ==0.2.0
-  - wcwidth ==0.0.2
-  - webby ==1.0.1
-  - webdriver ==0.9.0.1
-  - webex-teams-api ==0.2.0.1
-  - webex-teams-conduit ==0.2.0.1
-  - webex-teams-pipes ==0.2.0.1
-  - webgear-server ==0.2.1
-  - webrtc-vad ==0.1.0.3
-  - websockets ==0.12.7.2
-  - websockets-snap ==0.10.3.1
-  - weigh ==0.0.16
-  - wide-word ==0.1.1.2
-  - wikicfp-scraper ==0.1.0.12
-  - wild-bind ==0.1.2.7
-  - wild-bind-x11 ==0.2.0.12
-  - Win32 ==2.6.1.0
-  - Win32-notify ==0.3.0.3
-  - windns ==0.1.0.1
-  - witch ==0.2.1.1
-  - witherable ==0.4.1
-  - within ==0.2.0.1
-  - with-location ==0.1.0
-  - with-utf8 ==1.0.2.2
-  - 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
-  - world-peace ==1.0.2.0
-  - wrap ==0.0.0
-  - wreq ==0.5.3.3
-  - writer-cps-exceptions ==0.1.0.1
-  - writer-cps-mtl ==0.1.1.6
-  - writer-cps-transformers ==0.5.6.1
-  - wss-client ==0.3.0.0
-  - wuss ==1.1.18
-  - X11 ==1.9.2
-  - X11-xft ==0.3.1
-  - x11-xim ==0.0.9.0
-  - x509 ==1.7.5
-  - x509-store ==1.6.7
-  - x509-system ==1.6.6
-  - x509-validation ==1.6.11
-  - Xauth ==0.1
-  - xdg-basedir ==0.2.2
-  - xdg-desktop-entry ==0.1.1.1
-  - xdg-userdirs ==0.1.0.2
-  - xeno ==0.4.2
-  - xlsx ==0.8.3
-  - xlsx-tabular ==0.2.2.1
-  - xml ==1.3.14
-  - xml-basic ==0.1.3.1
-  - xml-conduit ==1.9.1.1
-  - 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
-  - xml-indexed-cursor ==0.1.1.0
-  - xml-lens ==0.3
-  - xml-picklers ==0.3.6
-  - xml-to-json ==2.0.1
-  - xml-to-json-fast ==2.0.0
-  - xml-types ==0.3.8
-  - xmonad ==0.15
-  - xmonad-contrib ==0.16
-  - 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.3
-  - yesod ==1.6.1.1
-  - yesod-auth ==1.6.10.3
-  - yesod-auth-hashdb ==1.7.1.6
-  - yesod-auth-oauth2 ==0.6.3.0
-  - yesod-bin ==1.6.1
-  - yesod-core ==1.6.19.0
-  - yesod-fb ==0.6.1
-  - yesod-form ==1.6.7
-  - yesod-gitrev ==0.2.1
-  - yesod-markdown ==0.12.6.9
-  - yesod-newsfeed ==1.7.0.0
-  - yesod-page-cursor ==2.0.0.6
-  - yesod-paginator ==1.1.1.0
-  - yesod-persistent ==1.6.0.6
-  - yesod-sitemap ==1.6.0
-  - yesod-static ==1.6.1.0
-  - yesod-test ==1.6.12
-  - yesod-websockets ==0.3.0.3
-  - yes-precure5-command ==5.5.3
-  - yi-rope ==0.11
-  - yjsvg ==0.2.0.1
-  - yjtools ==0.9.18
-  - yoga ==0.0.0.5
-  - youtube ==0.2.1.1
-  - zenacy-html ==2.0.3
-  - zenacy-unicode ==1.0.1
-  - zero ==0.1.5
-  - zeromq4-haskell ==0.8.0
-  - zeromq4-patterns ==0.3.1.0
-  - zim-parser ==0.2.1.0
-  - zio ==0.1.0.2
-  - zip ==1.7.0
-  - zip-archive ==0.4.1
-  - zipper-extra ==0.1.3.2
-  - zippers ==0.3.1
-  - zip-stream ==0.2.1.0
-  - zlib ==0.6.2.3
-  - zlib-bindings ==0.1.1.5
-  - zlib-lens ==0.1.2.1
-  - zot ==0.0.3
-  - zstd ==0.1.2.0
-  - ztail ==1.2.0.2
-  - zydiskell ==0.2.0.0
-
-extra-packages:
-  - base16-bytestring < 1               # required for cabal-install etc.
-  - Cabal == 2.2.*                      # required for jailbreak-cabal etc.
-  - Cabal == 2.4.*                      # required for cabal-install etc.
-  - Cabal == 3.2.*                      # required for cabal-install etc.
-  - dependent-map == 0.2.4.0            # required by Hasura 1.3.1, 2020-08-20
-  - dependent-sum == 0.4                # required by Hasura 1.3.1, 2020-08-20
-  - dhall == 1.29.0                     # required for ats-pkg
-  - Diff < 0.4                          # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
-  - ghc-tcplugins-extra ==0.3.2         # required for polysemy-plugin 0.2.5.0
-  - haddock == 2.23.*                   # required on GHC < 8.10.x
-  - haddock-api == 2.23.*               # required on GHC < 8.10.x
-  - haddock-library ==1.7.*             # required by stylish-cabal-0.5.0.0
-  - happy == 1.19.9                     # for purescript
-  - hinotify == 0.3.9                   # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
-  - hlint < 3.3                         # We don‘t have ghc-lib-parser 9.0.X yet.
-  - immortal == 0.2.2.1                 # required by Hasura 1.3.1, 2020-08-20
-  - lsp-test < 0.14                     # needed for hls 1.0.0
-  - mmorph == 1.1.3                     # Newest working version of mmorph on ghc 8.6.5. needed for hls
-  - network == 2.6.3.1                  # required by pkgs/games/hedgewars/default.nix, 2020-11-15
-  - optparse-applicative < 0.16         # needed for niv-0.2.19
-  - refinery == 0.3.*                   # required by hls-tactics-plugin-1.0.0.0
-  - resolv == 0.1.1.2                   # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
-  - sbv == 7.13                         # required for pkgs.petrinizer
-  - gi-gdk == 3.0.24                    # 2021-05-07: For haskell-gi 0.25 without gtk4
-  - gi-gtk < 4.0                        # 2021-05-07: For haskell-gi 0.25 without gtk4
-  - gi-gdkx11 == 3.0.11                 # 2021-05-07: For haskell-gi 0.25 without gtk4
-
-package-maintainers:
-  peti:
-    - cabal-install
-    - cabal2nix
-    - cabal2spec
-    - distribution-nixpkgs
-    - funcmp
-    - git-annex
-    - hackage-db
-    - hledger
-    - hledger-interest
-    - hledger-ui
-    - hledger-web
-    - hopenssl
-    - hsdns
-    - hsemail
-    - hsyslog
-    - jailbreak-cabal
-    - language-nix
-    - logging-facade-syslog
-    - nix-paths
-    - pandoc
-    - structured-haskell-mode
-    - titlecase
-    - xmonad
-    - xmonad-contrib
-  gridaphobe:
-    - located-base
-  jb55:
-    # - bson-lens
-    - cased
-    - elm-export-persistent
-    # - pipes-mongodb
-    - streaming-wai
-  kiwi:
-    - config-schema
-    - config-value
-    - glirc
-    - irc-core
-    - matterhorn
-    - mattermost-api
-    - mattermost-api-qc
-    - Unique
-  psibi:
-    - path-pieces
-    - persistent
-    - persistent-sqlite
-    - persistent-template
-    - shakespeare
-  abbradar:
-    - Agda
-  roberth:
-    - arion-compose
-    - hercules-ci-agent
-    - hercules-ci-api
-    - hercules-ci-api-agent
-    - hercules-ci-api-core
-    - hercules-ci-cli
-    - hercules-ci-cnix-expr
-    - hercules-ci-cnix-store
-  cdepillabout:
-    - pretty-simple
-    - spago
-  terlar:
-    - nix-diff
-  maralorn:
-    - reflex-dom
-    - cabal-fmt
-    - shh
-    - neuron
-    - releaser
-    - taskwarrior
-    - haskell-language-server
-    - shake-bench
-    - iCalendar
-    - stm-containers
-  sorki:
-    - cayenne-lpp
-    - data-stm32
-    - gcodehs
-    - nix-derivation
-    - nix-narinfo
-    - ttn
-    - ttn-client
-    - update-nix-fetchgit
-    - zre
-  utdemir:
-    - nix-tree
-  turion:
-    - rhine
-    - rhine-gloss
-    - essence-of-live-coding
-    - essence-of-live-coding-gloss
-    - essence-of-live-coding-pulse
-    - essence-of-live-coding-quickcheck
-    - Agda
-    - dunai
-    - finite-typelits
-    - pulse-simple
-    - simple-affine-space
-  sternenseemann:
-    # also maintain upstream package
-    - spacecookie
-    - gopher-proxy
-    # other packages I can help out for
-    - systemd
-    - fast-logger
-    - flat
-    - Euterpea2
-    - utc
-    - socket
-    - gitit
-    - yarn-lock
-    - yarn2nix
-  poscat:
-    - hinit
-  bdesham:
-    - pinboard-notes-backup
-
-unsupported-platforms:
-  alsa-mixer:                                   [ x86_64-darwin ]
-  alsa-pcm:                                     [ x86_64-darwin ]
-  alsa-seq:                                     [ x86_64-darwin ]
-  AWin32Console:                                [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  barbly:                                       [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
-  bdcs-api:                                     [ x86_64-darwin ]
-  bindings-sane:                                [ x86_64-darwin ]
-  bindings-directfb:                            [ x86_64-darwin ]
-  cut-the-crap:                                 [ x86_64-darwin ]
-  d3d11binding:                                 [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  DirectSound:                                  [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  dx9base:                                      [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  dx9d3d:                                       [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  dx9d3dx:                                      [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  Euterpea:                                     [ x86_64-darwin ]
-  freenect:                                     [ x86_64-darwin ]
-  FTGL:                                         [ x86_64-darwin ]
-  gi-dbusmenugtk3:                              [ x86_64-darwin ]
-  gi-dbusmenu:                                  [ x86_64-darwin ]
-  gi-ggit:                                      [ x86_64-darwin ]
-  gi-ibus:                                      [ x86_64-darwin ]
-  gi-ostree:                                    [ x86_64-darwin ]
-  gi-vte:                                       [ x86_64-darwin ]
-  gnome-keyring:                                [ x86_64-darwin ]
-  gtk-mac-integration:                          [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
-  gtk-sni-tray:                                 [ x86_64-darwin ]
-  gtk-sni-tray:                                 [ x86_64-darwin ]
-  haskell-snake:                                [ x86_64-darwin ]
-  hcwiid:                                       [ x86_64-darwin ]
-  HFuse:                                        [ x86_64-darwin ]
-  hidapi:                                       [ x86_64-darwin ]
-  hommage-ds:                                   [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  HSoM:                                         [ x86_64-darwin ]
-  iwlib:                                        [ x86_64-darwin ]
-  libmodbus:                                    [ x86_64-darwin ]
-  libsystemd-journal:                           [ x86_64-darwin ]
-  libsystemd-journal:                           [ x86_64-darwin ]
-  libtelnet:                                    [ x86_64-darwin ]
-  libzfs:                                       [ x86_64-darwin ]
-  linearEqSolver:                               [ aarch64-linux ]
-  lio-fs:                                       [ x86_64-darwin ]
-  logging-facade-journald:                      [ x86_64-darwin ]
-  midi-alsa:                                    [ x86_64-darwin ]
-  mpi-hs:                                       [ aarch64-linux, x86_64-darwin ]
-  mpi-hs-binary:                                [ aarch64-linux, x86_64-darwin ]
-  mpi-hs-cereal:                                [ aarch64-linux, x86_64-darwin ]
-  mpi-hs-store:                                 [ aarch64-linux, x86_64-darwin ]
-  mplayer-spot:                                 [ aarch64-linux ]
-  oculus:                                       [ x86_64-darwin ]
-  pam:                                          [ x86_64-darwin ]
-  piyo:                                         [ x86_64-darwin ]
-  PortMidi-simple:                              [ x86_64-darwin ]
-  PortMidi:                                     [ x86_64-darwin ]
-  posix-api:                                    [ x86_64-darwin ]
-  Raincat:                                      [ x86_64-darwin ]
-  reactivity:                                   [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  reflex-dom:                                   [ x86_64-darwin ]
-  rtlsdr:                                       [ x86_64-darwin ]
-  rubberband:                                   [ x86_64-darwin ]
-  sbv:                                          [ aarch64-linux ]
-  sdl2-mixer:                                   [ x86_64-darwin ]
-  sdl2-ttf:                                     [ x86_64-darwin ]
-  synthesizer-alsa:                             [ x86_64-darwin ]
-  taffybar:                                     [ x86_64-darwin ]
-  termonad:                                     [ x86_64-darwin ]
-  tokyotyrant-haskell:                          [ x86_64-darwin ]
-  udev:                                         [ x86_64-darwin ]
-  vrpn:                                         [ x86_64-darwin ]
-  vulkan:                                       [ i686-linux, armv7l-linux, x86_64-darwin ]
-  VulkanMemoryAllocator:                        [ i686-linux, armv7l-linux ]
-  VulkanMemoryAllocator:                        [ x86_64-darwin ]
-  vulkan-utils:                                 [ x86_64-darwin ]
-  webkit2gtk3-javascriptcore:                   [ x86_64-darwin ]
-  Win32-console:                                [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  Win32-dhcp-server:                            [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  Win32-errors:                                 [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  Win32-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  Win32:                                        [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  Win32-junction-point:                         [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  Win32-notify:                                 [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  Win32-security:                               [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  Win32-services:                               [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  Win32-services-wrapper:                       [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  xattr:                                        [ x86_64-darwin ]
-  xgboost-haskell:                              [ aarch64-linux, armv7l-linux ]
-  XInput:                                       [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
-  xmobar:                                       [ x86_64-darwin ]
-  xmonad-extras:                                [ x86_64-darwin ]
-  xmonad-volume:                                [ x86_64-darwin ]
-
-dont-distribute-packages:
-  # Depends on shine, which is a ghcjs project.
-  - shine-varying
-
-  # these packages depend on software with an unfree license
-  - accelerate-bignum
-  - accelerate-blas
-  - accelerate-cublas
-  - accelerate-cuda
-  - accelerate-cufft
-  - accelerate-examples
-  - accelerate-fft
-  - accelerate-fourier-benchmark
-  - accelerate-io-array
-  - accelerate-io-bmp
-  - accelerate-io-bytestring
-  - accelerate-io-cereal
-  - accelerate-io-JuicyPixels
-  - accelerate-io-repa
-  - accelerate-io-vector
-  - accelerate-kullback-liebler
-  - accelerate-llvm-ptx
-  - bindings-yices
-  - boolector
-  - ccelerate-cuda
-  - containers-accelerate
-  - cplex-hs
-  - cublas
-  - cuda # 2020-08-18 because of dependency nvidia-x11
-  - cufft
-  - cusolver
-  - cusparse
-  - gloss-raster-accelerate
-  - hashable-accelerate
-  - libnvvm
-  - matlab
-  - nvvm
-  - Obsidian
-  - odpic-raw
-  - patch-image
-  # license for input data unclear, dependency not on Hackage
-  # see https://github.com/NixOS/nixpkgs/pull/88604
-  - tensorflow-mnist
-  - yices-easy
-  - yices-painless
-
-  # these packages don't evaluate because they have broken (system) dependencies
-  - XML
-  - comark
-  - couch-simple
-  - diagrams-hsqml
-  - diagrams-reflex
-  - dialog
-  - fltkhs-demos
-  - fltkhs-fluid-demos
-  - fltkhs-hello-world
-  - fltkhs-themes
-  - ghcjs-dom-hello
-  - ghcjs-dom-webkit
-  - gi-javascriptcore
-  - gi-webkit
-  - gi-webkit2
-  - gi-webkit2webextension
-  - gsmenu
-  - haste-gapi
-  - haste-perch
-  - hbro
-  - hplayground
-  - hs-mesos
-  - hsqml
-  - hsqml-datamodel
-  - hsqml-datamodel-vinyl
-  - hsqml-datemodel-vinyl
-  - hsqml-demo-manic
-  - hsqml-demo-morris
-  - hsqml-demo-notes
-  - hsqml-demo-notes
-  - hsqml-demo-samples
-  - hsqml-morris
-  - hsqml-morris
-  - hstorchat
-  - imprevu-happstack
-  - jsaddle-webkit2gtk
-  - jsaddle-webkitgtk
-  - jsc
-  - lambdacat
-  - leksah
-  - manatee-all
-  - manatee-browser
-  - manatee-reader
-  - markup-preview
-  - nomyx-api
-  - nomyx-core
-  - nomyx-language
-  - nomyx-library
-  - nomyx-server
-  - passman-cli
-  - passman-core
-  - reflex-dom-colonnade
-  - reflex-dom-contrib
-  - reflex-dom-fragment-shader-canvas
-  - reflex-dom-helpers
-  - reflex-jsx
-  - sneathlane-haste
-  - spike
-  - tianbar
-  - trasa-reflex
-  - treersec
-  - wai-middleware-brotli
-  - web-browser-in-haskell
-  - webkit
-  - webkitgtk3
-  - webkitgtk3-javascriptcore
-  - websnap
-
 broken-packages:
-  # These packages don't compile or depend on packages that don't compile.
+  # These packages don't compile.
   - 3dmodels
   - 4Blocks
   - a50
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
new file mode 100644
index 00000000000..edc4fa3ac56
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -0,0 +1,439 @@
+# pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+
+compiler: ghc-8.10.4
+
+core-packages:
+  - array-0.5.4.0
+  - base-4.14.1.0
+  - binary-0.8.8.0
+  - bytestring-0.10.12.0
+  - Cabal-3.2.1.0
+  - containers-0.6.2.1
+  - deepseq-1.4.4.0
+  - directory-1.3.6.0
+  - exceptions-0.10.4
+  - filepath-1.4.2.1
+  - ghc-8.10.4
+  - ghc-boot-8.10.4
+  - ghc-boot-th-8.10.4
+  - ghc-compact-0.1.0.0
+  - ghc-heap-8.10.4
+  - ghc-prim-0.6.1
+  - ghci-8.10.4
+  - haskeline-0.8.0.1
+  - hpc-0.6.1.0
+  - integer-gmp-1.0.3.0
+  - libiserv-8.10.4
+  - mtl-2.2.2
+  - parsec-3.1.14.0
+  - pretty-1.1.3.6
+  - process-1.6.9.0
+  - rts-1.0
+  - stm-2.5.0.0
+  - template-haskell-2.16.0.0
+  - terminfo-0.4.1.4
+  - text-1.2.4.1
+  - time-1.9.3
+  - transformers-0.5.6.2
+  - unix-2.7.2.2
+  - xhtml-3000.2.2.1
+
+  # Hack: The following package is a core package of GHCJS. If we don't declare
+  # it, then hackage2nix will generate a Hackage database where all dependants
+  # of this library are marked as "broken".
+  - ghcjs-base-0
+
+# This is a list of packages with versions from the latest Stackage LTS release.
+#
+# The packages and versions in this list cause the `hackage2nix` tool to
+# generate the package at the given version.
+#
+# For instance, with a line like the following:
+#
+# - aeson ==1.4.6.0
+#
+# `hackage2nix` will generate the `aeson` package at version 1.4.6.0 in the
+# ./hackage-packages.nix file.
+#
+# Since the packages in the LTS package set are sometimes older than the latest
+# on Hackage, `hackage2nix` is smart enough to also generate the latest version
+# of a given package.
+#
+# In the above example with aeson, if there was version 1.5.0.0 of aeson
+# available on Hackage, `hackage2nix` would generate two packages, `aeson`
+# at version 1.4.6.0 and `aeson_1_5_0_0` at version 1.5.0.0.
+#
+# WARNING: This list is generated semiautomatically based on the most recent
+# LTS package set. If you want to add entries to it, you must do so before the
+# comment saying "# LTS Haskell x.y". Any changes after that comment will be
+# lost the next time `update-stackage.sh` runs.
+default-package-overrides:
+  # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag
+  - MissingH ==1.4.2.0
+  # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
+  # not yet available in Nixpkgs
+  - gi-gdkx11 < 4
+  # Needs Cabal 3.4 for Setup.hs
+  - gi-javascriptcore < 4.0.23 #
+  - gi-soup < 2.4.24 #
+  - gi-webkit2 < 4.0.27 #
+  # To stay hls 1.0 compatible
+  - ghcide < 1.1
+  - hls-retrie-plugin < 1.0.0.1
+  - lsp < 1.2
+  - lsp-types < 1.2
+  - hls-plugin-api < 1.1.0.0
+  - hls-explicit-imports-plugin < 1.0.0.1
+
+extra-packages:
+  - base16-bytestring < 1               # required for cabal-install etc.
+  - Cabal == 2.2.*                      # required for jailbreak-cabal etc.
+  - Cabal == 2.4.*                      # required for cabal-install etc.
+  - Cabal == 3.2.*                      # required for cabal-install etc.
+  - dependent-map == 0.2.4.0            # required by Hasura 1.3.1, 2020-08-20
+  - dependent-sum == 0.4                # required by Hasura 1.3.1, 2020-08-20
+  - dhall == 1.29.0                     # required for ats-pkg
+  - Diff < 0.4                          # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
+  - ghc-tcplugins-extra ==0.3.2         # required for polysemy-plugin 0.2.5.0
+  - haddock == 2.23.*                   # required on GHC < 8.10.x
+  - haddock-api == 2.23.*               # required on GHC < 8.10.x
+  - haddock-library ==1.7.*             # required by stylish-cabal-0.5.0.0
+  - happy == 1.19.9                     # for purescript
+  - hinotify == 0.3.9                   # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
+  - hlint < 3.3                         # We don‘t have ghc-lib-parser 9.0.X yet.
+  - immortal == 0.2.2.1                 # required by Hasura 1.3.1, 2020-08-20
+  - lsp-test < 0.14                     # needed for hls 1.0.0
+  - mmorph == 1.1.3                     # Newest working version of mmorph on ghc 8.6.5. needed for hls
+  - network == 2.6.3.1                  # required by pkgs/games/hedgewars/default.nix, 2020-11-15
+  - optparse-applicative < 0.16         # needed for niv-0.2.19
+  - refinery == 0.3.*                   # required by hls-tactics-plugin-1.0.0.0
+  - resolv == 0.1.1.2                   # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
+  - sbv == 7.13                         # required for pkgs.petrinizer
+  - gi-gdk == 3.0.24                    # 2021-05-07: For haskell-gi 0.25 without gtk4
+  - gi-gtk < 4.0                        # 2021-05-07: For haskell-gi 0.25 without gtk4
+  - gi-gdkx11 == 3.0.11                 # 2021-05-07: For haskell-gi 0.25 without gtk4
+
+package-maintainers:
+  peti:
+    - cabal-install
+    - cabal2nix
+    - cabal2spec
+    - distribution-nixpkgs
+    - funcmp
+    - git-annex
+    - hackage-db
+    - hledger
+    - hledger-interest
+    - hledger-ui
+    - hledger-web
+    - hopenssl
+    - hsdns
+    - hsemail
+    - hsyslog
+    - jailbreak-cabal
+    - language-nix
+    - logging-facade-syslog
+    - nix-paths
+    - pandoc
+    - structured-haskell-mode
+    - titlecase
+    - xmonad
+    - xmonad-contrib
+  gridaphobe:
+    - located-base
+  jb55:
+    # - bson-lens
+    - cased
+    - elm-export-persistent
+    # - pipes-mongodb
+    - streaming-wai
+  kiwi:
+    - config-schema
+    - config-value
+    - glirc
+    - irc-core
+    - matterhorn
+    - mattermost-api
+    - mattermost-api-qc
+    - Unique
+  psibi:
+    - path-pieces
+    - persistent
+    - persistent-sqlite
+    - persistent-template
+    - shakespeare
+  abbradar:
+    - Agda
+  roberth:
+    - arion-compose
+    - hercules-ci-agent
+    - hercules-ci-api
+    - hercules-ci-api-agent
+    - hercules-ci-api-core
+    - hercules-ci-cli
+    - hercules-ci-cnix-expr
+    - hercules-ci-cnix-store
+  cdepillabout:
+    - pretty-simple
+    - spago
+  terlar:
+    - nix-diff
+  maralorn:
+    - reflex-dom
+    - cabal-fmt
+    - shh
+    - neuron
+    - releaser
+    - taskwarrior
+    - haskell-language-server
+    - shake-bench
+    - iCalendar
+    - stm-containers
+  sorki:
+    - cayenne-lpp
+    - data-stm32
+    - gcodehs
+    - nix-derivation
+    - nix-narinfo
+    - ttn
+    - ttn-client
+    - update-nix-fetchgit
+    - zre
+  utdemir:
+    - nix-tree
+  turion:
+    - rhine
+    - rhine-gloss
+    - essence-of-live-coding
+    - essence-of-live-coding-gloss
+    - essence-of-live-coding-pulse
+    - essence-of-live-coding-quickcheck
+    - Agda
+    - dunai
+    - finite-typelits
+    - pulse-simple
+    - simple-affine-space
+  sternenseemann:
+    # also maintain upstream package
+    - spacecookie
+    - gopher-proxy
+    # other packages I can help out for
+    - systemd
+    - fast-logger
+    - flat
+    - Euterpea2
+    - utc
+    - socket
+    - gitit
+    - yarn-lock
+    - yarn2nix
+  poscat:
+    - hinit
+  bdesham:
+    - pinboard-notes-backup
+
+unsupported-platforms:
+  alsa-mixer:                                   [ x86_64-darwin ]
+  alsa-pcm:                                     [ x86_64-darwin ]
+  alsa-seq:                                     [ x86_64-darwin ]
+  AWin32Console:                                [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  barbly:                                       [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
+  bdcs-api:                                     [ x86_64-darwin ]
+  bindings-sane:                                [ x86_64-darwin ]
+  bindings-directfb:                            [ x86_64-darwin ]
+  cut-the-crap:                                 [ x86_64-darwin ]
+  d3d11binding:                                 [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  DirectSound:                                  [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  dx9base:                                      [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  dx9d3d:                                       [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  dx9d3dx:                                      [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  Euterpea:                                     [ x86_64-darwin ]
+  freenect:                                     [ x86_64-darwin ]
+  FTGL:                                         [ x86_64-darwin ]
+  gi-dbusmenugtk3:                              [ x86_64-darwin ]
+  gi-dbusmenu:                                  [ x86_64-darwin ]
+  gi-ggit:                                      [ x86_64-darwin ]
+  gi-ibus:                                      [ x86_64-darwin ]
+  gi-ostree:                                    [ x86_64-darwin ]
+  gi-vte:                                       [ x86_64-darwin ]
+  gnome-keyring:                                [ x86_64-darwin ]
+  gtk-mac-integration:                          [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
+  gtk-sni-tray:                                 [ x86_64-darwin ]
+  gtk-sni-tray:                                 [ x86_64-darwin ]
+  haskell-snake:                                [ x86_64-darwin ]
+  hcwiid:                                       [ x86_64-darwin ]
+  HFuse:                                        [ x86_64-darwin ]
+  hidapi:                                       [ x86_64-darwin ]
+  hommage-ds:                                   [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  HSoM:                                         [ x86_64-darwin ]
+  iwlib:                                        [ x86_64-darwin ]
+  libmodbus:                                    [ x86_64-darwin ]
+  libsystemd-journal:                           [ x86_64-darwin ]
+  libsystemd-journal:                           [ x86_64-darwin ]
+  libtelnet:                                    [ x86_64-darwin ]
+  libzfs:                                       [ x86_64-darwin ]
+  linearEqSolver:                               [ aarch64-linux ]
+  lio-fs:                                       [ x86_64-darwin ]
+  logging-facade-journald:                      [ x86_64-darwin ]
+  midi-alsa:                                    [ x86_64-darwin ]
+  mpi-hs:                                       [ aarch64-linux, x86_64-darwin ]
+  mpi-hs-binary:                                [ aarch64-linux, x86_64-darwin ]
+  mpi-hs-cereal:                                [ aarch64-linux, x86_64-darwin ]
+  mpi-hs-store:                                 [ aarch64-linux, x86_64-darwin ]
+  mplayer-spot:                                 [ aarch64-linux ]
+  oculus:                                       [ x86_64-darwin ]
+  pam:                                          [ x86_64-darwin ]
+  piyo:                                         [ x86_64-darwin ]
+  PortMidi-simple:                              [ x86_64-darwin ]
+  PortMidi:                                     [ x86_64-darwin ]
+  posix-api:                                    [ x86_64-darwin ]
+  Raincat:                                      [ x86_64-darwin ]
+  reactivity:                                   [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  reflex-dom:                                   [ x86_64-darwin ]
+  rtlsdr:                                       [ x86_64-darwin ]
+  rubberband:                                   [ x86_64-darwin ]
+  sbv:                                          [ aarch64-linux ]
+  sdl2-mixer:                                   [ x86_64-darwin ]
+  sdl2-ttf:                                     [ x86_64-darwin ]
+  synthesizer-alsa:                             [ x86_64-darwin ]
+  taffybar:                                     [ x86_64-darwin ]
+  termonad:                                     [ x86_64-darwin ]
+  tokyotyrant-haskell:                          [ x86_64-darwin ]
+  udev:                                         [ x86_64-darwin ]
+  vrpn:                                         [ x86_64-darwin ]
+  vulkan:                                       [ i686-linux, armv7l-linux, x86_64-darwin ]
+  VulkanMemoryAllocator:                        [ i686-linux, armv7l-linux ]
+  VulkanMemoryAllocator:                        [ x86_64-darwin ]
+  vulkan-utils:                                 [ x86_64-darwin ]
+  webkit2gtk3-javascriptcore:                   [ x86_64-darwin ]
+  Win32-console:                                [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  Win32-dhcp-server:                            [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  Win32-errors:                                 [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  Win32-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  Win32:                                        [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  Win32-junction-point:                         [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  Win32-notify:                                 [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  Win32-security:                               [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  Win32-services:                               [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  Win32-services-wrapper:                       [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  xattr:                                        [ x86_64-darwin ]
+  xgboost-haskell:                              [ aarch64-linux, armv7l-linux ]
+  XInput:                                       [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
+  xmobar:                                       [ x86_64-darwin ]
+  xmonad-extras:                                [ x86_64-darwin ]
+  xmonad-volume:                                [ x86_64-darwin ]
+
+dont-distribute-packages:
+  # Depends on shine, which is a ghcjs project.
+  - shine-varying
+
+  # these packages depend on software with an unfree license
+  - accelerate-bignum
+  - accelerate-blas
+  - accelerate-cublas
+  - accelerate-cuda
+  - accelerate-cufft
+  - accelerate-examples
+  - accelerate-fft
+  - accelerate-fourier-benchmark
+  - accelerate-io-array
+  - accelerate-io-bmp
+  - accelerate-io-bytestring
+  - accelerate-io-cereal
+  - accelerate-io-JuicyPixels
+  - accelerate-io-repa
+  - accelerate-io-vector
+  - accelerate-kullback-liebler
+  - accelerate-llvm-ptx
+  - bindings-yices
+  - boolector
+  - ccelerate-cuda
+  - containers-accelerate
+  - cplex-hs
+  - cublas
+  - cuda # 2020-08-18 because of dependency nvidia-x11
+  - cufft
+  - cusolver
+  - cusparse
+  - gloss-raster-accelerate
+  - hashable-accelerate
+  - libnvvm
+  - matlab
+  - nvvm
+  - Obsidian
+  - odpic-raw
+  - patch-image
+  # license for input data unclear, dependency not on Hackage
+  # see https://github.com/NixOS/nixpkgs/pull/88604
+  - tensorflow-mnist
+  - yices-easy
+  - yices-painless
+
+  # these packages don't evaluate because they have broken (system) dependencies
+  - XML
+  - comark
+  - couch-simple
+  - diagrams-hsqml
+  - diagrams-reflex
+  - dialog
+  - fltkhs-demos
+  - fltkhs-fluid-demos
+  - fltkhs-hello-world
+  - fltkhs-themes
+  - ghcjs-dom-hello
+  - ghcjs-dom-webkit
+  - gi-javascriptcore
+  - gi-webkit
+  - gi-webkit2
+  - gi-webkit2webextension
+  - gsmenu
+  - haste-gapi
+  - haste-perch
+  - hbro
+  - hplayground
+  - hs-mesos
+  - hsqml
+  - hsqml-datamodel
+  - hsqml-datamodel-vinyl
+  - hsqml-datemodel-vinyl
+  - hsqml-demo-manic
+  - hsqml-demo-morris
+  - hsqml-demo-notes
+  - hsqml-demo-notes
+  - hsqml-demo-samples
+  - hsqml-morris
+  - hsqml-morris
+  - hstorchat
+  - imprevu-happstack
+  - jsaddle-webkit2gtk
+  - jsaddle-webkitgtk
+  - jsc
+  - lambdacat
+  - leksah
+  - manatee-all
+  - manatee-browser
+  - manatee-reader
+  - markup-preview
+  - nomyx-api
+  - nomyx-core
+  - nomyx-language
+  - nomyx-library
+  - nomyx-server
+  - passman-cli
+  - passman-core
+  - reflex-dom-colonnade
+  - reflex-dom-contrib
+  - reflex-dom-fragment-shader-canvas
+  - reflex-dom-helpers
+  - reflex-jsx
+  - sneathlane-haste
+  - spike
+  - tianbar
+  - trasa-reflex
+  - treersec
+  - wai-middleware-brotli
+  - web-browser-in-haskell
+  - webkit
+  - webkitgtk3
+  - webkitgtk3-javascriptcore
+  - websnap
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
new file mode 100644
index 00000000000..460bfe28b61
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@@ -0,0 +1,2694 @@
+default-package-overrides:
+  # Stackage Nightly 2021-05-03
+  - abstract-deque ==0.3
+  - abstract-par ==0.3.3
+  - AC-Angle ==1.0
+  - accuerr ==0.2.0.2
+  - ace ==0.6
+  - action-permutations ==0.0.0.1
+  - ad ==4.4.1
+  - adjunctions ==4.4
+  - adler32 ==0.1.2.0
+  - aeson ==1.5.6.0
+  - aeson-attoparsec ==0.0.0
+  - aeson-better-errors ==0.9.1.0
+  - aeson-casing ==0.2.0.0
+  - aeson-combinators ==0.0.5.0
+  - aeson-commit ==1.3
+  - aeson-compat ==0.3.9
+  - aeson-default ==0.9.1.0
+  - aeson-diff ==1.1.0.9
+  - aeson-generic-compat ==0.0.1.3
+  - aeson-lens ==0.5.0.0
+  - aeson-optics ==1.1.0.1
+  - aeson-picker ==0.1.0.5
+  - aeson-pretty ==0.8.8
+  - aeson-qq ==0.8.3
+  - aeson-schemas ==1.3.3
+  - aeson-with ==0.1.2.0
+  - aeson-yak ==0.1.1.3
+  - aeson-yaml ==1.1.0.0
+  - Agda ==2.6.1.3
+  - agda2lagda ==0.2020.11.1
+  - al ==0.1.4.2
+  - alarmclock ==0.7.0.5
+  - alerts ==0.1.2.0
+  - alex ==3.2.6
+  - alex-meta ==0.3.0.13
+  - alg ==0.2.13.1
+  - algebraic-graphs ==0.5
+  - Allure ==0.10.2.0
+  - almost-fix ==0.0.2
+  - alsa-core ==0.5.0.1
+  - alsa-mixer ==0.3.0
+  - alsa-pcm ==0.6.1.1
+  - alsa-seq ==0.6.0.8
+  - alternative-vector ==0.0.0
+  - ALUT ==2.4.0.3
+  - amazonka-apigateway ==1.6.1
+  - amazonka-application-autoscaling ==1.6.1
+  - amazonka-appstream ==1.6.1
+  - amazonka-athena ==1.6.1
+  - amazonka-autoscaling ==1.6.1
+  - amazonka-budgets ==1.6.1
+  - amazonka-certificatemanager ==1.6.1
+  - amazonka-cloudformation ==1.6.1
+  - amazonka-cloudfront ==1.6.1
+  - amazonka-cloudhsm ==1.6.1
+  - amazonka-cloudsearch ==1.6.1
+  - amazonka-cloudsearch-domains ==1.6.1
+  - amazonka-cloudtrail ==1.6.1
+  - amazonka-cloudwatch ==1.6.1
+  - amazonka-cloudwatch-events ==1.6.1
+  - amazonka-cloudwatch-logs ==1.6.1
+  - amazonka-codebuild ==1.6.1
+  - amazonka-codecommit ==1.6.1
+  - amazonka-codedeploy ==1.6.1
+  - amazonka-codepipeline ==1.6.1
+  - amazonka-cognito-identity ==1.6.1
+  - amazonka-cognito-idp ==1.6.1
+  - amazonka-cognito-sync ==1.6.1
+  - amazonka-config ==1.6.1
+  - amazonka-core ==1.6.1
+  - amazonka-datapipeline ==1.6.1
+  - amazonka-devicefarm ==1.6.1
+  - amazonka-directconnect ==1.6.1
+  - amazonka-discovery ==1.6.1
+  - amazonka-dms ==1.6.1
+  - amazonka-ds ==1.6.1
+  - amazonka-dynamodb ==1.6.1
+  - amazonka-dynamodb-streams ==1.6.1
+  - amazonka-ecr ==1.6.1
+  - amazonka-ecs ==1.6.1
+  - amazonka-efs ==1.6.1
+  - amazonka-elasticache ==1.6.1
+  - amazonka-elasticbeanstalk ==1.6.1
+  - amazonka-elasticsearch ==1.6.1
+  - amazonka-elastictranscoder ==1.6.1
+  - amazonka-elb ==1.6.1
+  - amazonka-elbv2 ==1.6.1
+  - amazonka-emr ==1.6.1
+  - amazonka-gamelift ==1.6.1
+  - amazonka-glacier ==1.6.1
+  - amazonka-glue ==1.6.1
+  - amazonka-health ==1.6.1
+  - amazonka-iam ==1.6.1
+  - amazonka-importexport ==1.6.1
+  - amazonka-inspector ==1.6.1
+  - amazonka-iot ==1.6.1
+  - amazonka-iot-dataplane ==1.6.1
+  - amazonka-kinesis ==1.6.1
+  - amazonka-kinesis-analytics ==1.6.1
+  - amazonka-kinesis-firehose ==1.6.1
+  - amazonka-kms ==1.6.1
+  - amazonka-lambda ==1.6.1
+  - amazonka-lightsail ==1.6.1
+  - amazonka-marketplace-analytics ==1.6.1
+  - amazonka-marketplace-metering ==1.6.1
+  - amazonka-ml ==1.6.1
+  - amazonka-opsworks ==1.6.1
+  - amazonka-opsworks-cm ==1.6.1
+  - amazonka-pinpoint ==1.6.1
+  - amazonka-polly ==1.6.1
+  - amazonka-rds ==1.6.1
+  - amazonka-redshift ==1.6.1
+  - amazonka-rekognition ==1.6.1
+  - amazonka-route53 ==1.6.1
+  - amazonka-route53-domains ==1.6.1
+  - amazonka-s3 ==1.6.1
+  - amazonka-sdb ==1.6.1
+  - amazonka-servicecatalog ==1.6.1
+  - amazonka-ses ==1.6.1
+  - amazonka-shield ==1.6.1
+  - amazonka-sms ==1.6.1
+  - amazonka-snowball ==1.6.1
+  - amazonka-sns ==1.6.1
+  - amazonka-sqs ==1.6.1
+  - amazonka-ssm ==1.6.1
+  - amazonka-stepfunctions ==1.6.1
+  - amazonka-storagegateway ==1.6.1
+  - amazonka-sts ==1.6.1
+  - amazonka-support ==1.6.1
+  - amazonka-swf ==1.6.1
+  - amazonka-test ==1.6.1
+  - amazonka-waf ==1.6.1
+  - amazonka-workspaces ==1.6.1
+  - amazonka-xray ==1.6.1
+  - amqp ==0.22.0
+  - amqp-utils ==0.6.1.0
+  - annotated-wl-pprint ==0.7.0
+  - ansi-terminal ==0.11
+  - ansi-wl-pprint ==0.6.9
+  - ANum ==0.2.0.2
+  - 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
+  - appar ==0.1.8
+  - appendmap ==0.1.5
+  - apply-refact ==0.9.2.0
+  - apportionment ==0.0.0.3
+  - approximate ==0.3.4
+  - approximate-equality ==1.1.0.2
+  - app-settings ==0.2.0.12
+  - arbor-lru-cache ==0.1.1.1
+  - arithmoi ==0.11.0.1
+  - array-memoize ==0.6.0
+  - arrow-extras ==0.1.0.1
+  - ascii ==1.0.1.4
+  - ascii-case ==1.0.0.4
+  - ascii-char ==1.0.0.8
+  - asciidiagram ==1.3.3.3
+  - ascii-group ==1.0.0.4
+  - ascii-predicates ==1.0.0.4
+  - ascii-progress ==0.3.3.0
+  - ascii-superset ==1.0.1.4
+  - ascii-th ==1.0.0.4
+  - asif ==6.0.4
+  - asn1-encoding ==0.9.6
+  - asn1-parse ==0.9.5
+  - asn1-types ==0.3.4
+  - assert-failure ==0.1.2.5
+  - assoc ==1.0.2
+  - astro ==0.4.2.1
+  - async ==2.2.3
+  - async-extra ==0.2.0.0
+  - async-pool ==0.9.1
+  - async-refresh ==0.3.0.0
+  - async-refresh-tokens ==0.4.0.0
+  - atom-basic ==0.2.5
+  - atomic-primops ==0.8.4
+  - atomic-write ==0.2.0.7
+  - attoparsec ==0.13.2.5
+  - attoparsec-base64 ==0.0.0
+  - attoparsec-binary ==0.2
+  - attoparsec-expr ==0.1.1.2
+  - attoparsec-iso8601 ==1.0.2.0
+  - attoparsec-path ==0.0.0.1
+  - audacity ==0.0.2
+  - aur ==7.0.6
+  - aura ==3.2.4
+  - authenticate ==1.3.5
+  - authenticate-oauth ==1.6.0.1
+  - auto ==0.4.3.1
+  - autoexporter ==1.1.20
+  - auto-update ==0.1.6
+  - avers ==0.0.17.1
+  - avro ==0.5.2.0
+  - aws-cloudfront-signed-cookies ==0.2.0.6
+  - backprop ==0.2.6.4
+  - backtracking ==0.1.0
+  - bank-holidays-england ==0.2.0.6
+  - barbies ==2.0.2.0
+  - base16 ==0.3.0.1
+  - base16-bytestring ==1.0.1.0
+  - base16-lens ==0.1.3.2
+  - base32 ==0.2.0.0
+  - base32-lens ==0.1.1.1
+  - base32string ==0.9.1
+  - base58-bytestring ==0.1.0
+  - base58string ==0.10.0
+  - base64 ==0.4.2.3
+  - base64-bytestring ==1.1.0.0
+  - base64-bytestring-type ==1.0.1
+  - base64-lens ==0.3.1
+  - base64-string ==0.2
+  - base-compat ==0.11.2
+  - base-compat-batteries ==0.11.2
+  - basement ==0.0.12
+  - 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
+  - bcp47 ==0.2.0.3
+  - bcp47-orphans ==0.1.0.3
+  - bcrypt ==0.0.11
+  - bech32 ==1.1.0
+  - bech32-th ==1.0.2
+  - bench ==1.0.12
+  - benchpress ==0.2.2.16
+  - between ==0.11.0.0
+  - bibtex ==0.1.0.6
+  - bifunctors ==5.5.11
+  - bimap ==0.4.0
+  - bimaps ==0.1.0.2
+  - bimap-server ==0.1.0.1
+  - bin ==0.1.1
+  - binary-conduit ==1.3.1
+  - binary-ext ==2.0.4
+  - binary-ieee754 ==0.1.0.0
+  - binary-instances ==1.0.1
+  - binary-list ==1.1.1.2
+  - binary-orphans ==1.0.1
+  - binary-parser ==0.5.7
+  - binary-parsers ==0.2.4.0
+  - binary-search ==2.0.0
+  - binary-shared ==0.8.3
+  - binary-tagged ==0.3
+  - bindings-DSL ==1.0.25
+  - bindings-GLFW ==3.3.2.0
+  - bindings-libzip ==1.0.1
+  - bindings-uname ==0.1
+  - bins ==0.1.2.0
+  - bitarray ==0.0.1.1
+  - bits ==0.5.3
+  - bitset-word8 ==0.1.1.2
+  - bits-extra ==0.0.2.0
+  - bitvec ==1.1.1.0
+  - bitwise-enum ==1.0.1.0
+  - blake2 ==0.3.0
+  - blanks ==0.5.0
+  - blas-carray ==0.1.0.1
+  - blas-comfort-array ==0.0.0.2
+  - blas-ffi ==0.1
+  - blaze-bootstrap ==0.1.0.1
+  - blaze-builder ==0.4.2.1
+  - blaze-html ==0.9.1.2
+  - blaze-markup ==0.8.2.8
+  - blaze-svg ==0.3.6.1
+  - blaze-textual ==0.2.1.0
+  - bmp ==1.2.6.3
+  - BNFC ==2.9.1
+  - BNFC-meta ==0.6.1
+  - board-games ==0.3
+  - boltzmann-samplers ==0.1.1.0
+  - Boolean ==0.2.4
+  - boolean-like ==0.1.1.0
+  - boolsimplifier ==0.1.8
+  - boots ==0.2.0.1
+  - bordacount ==0.1.0.0
+  - boring ==0.2
+  - both ==0.1.1.1
+  - bound ==2.0.3
+  - BoundedChan ==1.0.3.0
+  - bounded-queue ==1.0.0
+  - boundingboxes ==0.2.3
+  - bower-json ==1.0.0.1
+  - boxes ==0.1.5
+  - brick ==0.62
+  - broadcast-chan ==0.2.1.1
+  - bsb-http-chunked ==0.0.0.4
+  - bson ==0.4.0.1
+  - btrfs ==0.2.0.0
+  - buffer-builder ==0.2.4.7
+  - buffer-pipe ==0.0
+  - bugsnag-haskell ==0.0.4.1
+  - bugsnag-hs ==0.2.0.3
+  - bugzilla-redhat ==0.3.1
+  - burrito ==1.2.0.1
+  - butcher ==1.3.3.2
+  - buttplug-hs-core ==0.1.0.0
+  - 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
+  - byteorder ==1.0.4
+  - bytes ==0.17.1
+  - byteset ==0.1.1.0
+  - bytestring-builder ==0.10.8.2.0
+  - bytestring-conversion ==0.3.1
+  - bytestring-lexing ==0.5.0.2
+  - bytestring-mmap ==0.2.2
+  - bytestring-strict-builder ==0.4.5.4
+  - bytestring-to-vector ==0.3.0.1
+  - bytestring-tree-builder ==0.2.7.9
+  - bz2 ==1.0.1.0
+  - bzlib ==0.5.1.0
+  - bzlib-conduit ==0.3.0.2
+  - c14n ==0.1.0.1
+  - c2hs ==0.28.7
+  - cabal-appimage ==0.3.0.2
+  - cabal-debian ==5.1
+  - cabal-doctest ==1.0.8
+  - cabal-file ==0.1.1
+  - cabal-flatpak ==0.1.0.2
+  - cabal-plan ==0.7.2.0
+  - cabal-rpm ==2.0.8
+  - cache ==0.1.3.0
+  - cacophony ==0.10.1
+  - calendar-recycling ==0.0.0.1
+  - call-stack ==0.3.0
+  - can-i-haz ==0.3.1.0
+  - capability ==0.4.0.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.2
+  - cased ==0.1.0.0
+  - case-insensitive ==1.2.1.0
+  - cases ==0.1.4.1
+  - casing ==0.1.4.1
+  - cassava ==0.5.2.0
+  - cassava-conduit ==0.6.0
+  - cassava-megaparsec ==2.0.2
+  - cast ==0.1.0.2
+  - category ==0.2.5.0
+  - cayley-client ==0.4.15
+  - cborg ==0.2.5.0
+  - cborg-json ==0.2.2.0
+  - cereal ==0.5.8.1
+  - cereal-conduit ==0.8.0
+  - cereal-text ==0.1.0.2
+  - cereal-vector ==0.2.0.1
+  - cfenv ==0.1.0.0
+  - cgi ==3001.5.0.0
+  - chan ==0.0.4.1
+  - ChannelT ==0.0.0.7
+  - character-cases ==0.1.0.6
+  - charset ==0.3.8
+  - charsetdetect-ae ==1.1.0.4
+  - Chart ==1.9.3
+  - chaselev-deque ==0.5.0.5
+  - ChasingBottoms ==1.3.1.10
+  - cheapskate ==0.1.1.2
+  - cheapskate-highlight ==0.1.0.0
+  - cheapskate-lucid ==0.1.0.0
+  - checkers ==0.5.6
+  - checksum ==0.0
+  - chimera ==0.3.1.0
+  - chiphunk ==0.1.4.0
+  - choice ==0.2.2
+  - chronologique ==0.3.1.3
+  - chronos ==1.1.1
+  - chronos-bench ==0.2.0.2
+  - chunked-data ==0.3.1
+  - cipher-aes ==0.2.11
+  - cipher-camellia ==0.0.2
+  - cipher-des ==0.0.6
+  - cipher-rc4 ==0.1.4
+  - circle-packing ==0.1.0.6
+  - circular ==0.3.1.1
+  - citeproc ==0.3.0.9
+  - clash-ghc ==1.2.5
+  - clash-lib ==1.2.5
+  - clash-prelude ==1.2.5
+  - classy-prelude ==1.5.0
+  - classy-prelude-conduit ==1.5.0
+  - clay ==0.13.3
+  - clientsession ==0.9.1.2
+  - climb ==0.3.3
+  - Clipboard ==2.3.2.0
+  - clock ==0.8
+  - clock-extras ==0.1.0.2
+  - closed ==0.2.0.1
+  - clumpiness ==0.17.0.2
+  - ClustalParser ==1.3.0
+  - cmark ==0.6
+  - cmark-gfm ==0.2.2
+  - cmark-lucid ==0.1.0.0
+  - cmdargs ==0.10.21
+  - codec-beam ==0.2.0
+  - code-page ==0.2.1
+  - collect-errors ==0.1.0.0
+  - co-log-concurrent ==0.5.0.0
+  - co-log-core ==0.2.1.1
+  - Color ==0.3.1
+  - colorful-monoids ==0.2.1.3
+  - colorize-haskell ==1.0.1
+  - colour ==2.3.5
+  - combinatorial ==0.1.0.1
+  - comfort-array ==0.4.1
+  - comfort-graph ==0.0.3.1
+  - commonmark ==0.1.1.4
+  - commonmark-extensions ==0.2.0.4
+  - commonmark-pandoc ==0.2.0.1
+  - commutative ==0.0.2
+  - comonad ==5.0.8
+  - comonad-extras ==4.0.1
+  - compactmap ==0.1.4.2.1
+  - compdata ==0.12.1
+  - compensated ==0.8.3
+  - compiler-warnings ==0.1.0
+  - composable-associations ==0.1.0.0
+  - composable-associations-aeson ==0.1.0.1
+  - composite-aeson ==0.7.5.0
+  - composite-aeson-path ==0.7.5.0
+  - composite-aeson-refined ==0.7.5.0
+  - composite-aeson-throw ==0.1.0.0
+  - composite-base ==0.7.5.0
+  - composite-binary ==0.7.5.0
+  - composite-ekg ==0.7.5.0
+  - composite-hashable ==0.7.5.0
+  - composite-tuple ==0.1.2.0
+  - composite-xstep ==0.1.0.0
+  - composition ==1.0.2.2
+  - composition-extra ==2.0.0
+  - concise ==0.1.0.1
+  - concurrency ==1.11.0.1
+  - concurrent-extra ==0.7.0.12
+  - concurrent-output ==1.10.12
+  - concurrent-split ==0.0.1.1
+  - concurrent-supply ==0.1.8
+  - cond ==0.4.1.1
+  - conduit ==1.3.4.1
+  - conduit-algorithms ==0.0.11.0
+  - conduit-combinators ==1.3.0
+  - conduit-concurrent-map ==0.1.1
+  - conduit-extra ==1.3.5
+  - conduit-parse ==0.2.1.0
+  - conduit-zstd ==0.0.2.0
+  - conferer ==1.1.0.0
+  - conferer-aeson ==1.1.0.1
+  - conferer-hspec ==1.1.0.0
+  - conferer-warp ==1.1.0.0
+  - ConfigFile ==1.1.4
+  - config-ini ==0.2.4.0
+  - configurator ==0.3.0.0
+  - configurator-export ==0.1.0.1
+  - configurator-pg ==0.2.5
+  - connection ==0.3.1
+  - connection-pool ==0.2.2
+  - console-style ==0.0.2.1
+  - constraint ==0.1.4.0
+  - constraints ==0.13
+  - constraint-tuples ==0.1.2
+  - construct ==0.3.0.2
+  - 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
+  - cookie ==0.4.5
+  - core-data ==0.2.1.9
+  - core-program ==0.2.6.0
+  - core-text ==0.3.0.0
+  - countable ==1.0
+  - country ==0.2.1
+  - cpphs ==1.20.9.1
+  - cprng-aes ==0.6.1
+  - cpu ==0.1.2
+  - cpuinfo ==0.1.0.2
+  - crackNum ==2.4
+  - crc32c ==0.0.0
+  - credential-store ==0.1.2
+  - criterion ==1.5.9.0
+  - criterion-measurement ==0.1.2.0
+  - 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.102.0
+  - cryptohash-sha512 ==0.11.100.1
+  - cryptonite ==0.28
+  - cryptonite-conduit ==0.2.2
+  - cryptonite-openssl ==0.7
+  - crypto-numbers ==0.2.7
+  - crypto-pubkey ==0.2.8
+  - crypto-pubkey-types ==0.4.3
+  - crypto-random ==0.0.9
+  - crypto-random-api ==0.2.0
+  - csp ==1.4.0
+  - css-syntax ==0.1.0.0
+  - css-text ==0.1.3.0
+  - csv ==0.1.2
+  - ctrie ==0.2
+  - cubicbezier ==0.6.0.6
+  - cubicspline ==0.1.2
+  - cuckoo-filter ==0.2.0.2
+  - cue-sheet ==2.0.1
+  - curl ==1.3.8
+  - currencies ==0.2.0.0
+  - currency ==0.2.0.0
+  - cursor ==0.3.0.0
+  - cursor-brick ==0.1.0.0
+  - cursor-fuzzy-time ==0.0.0.0
+  - cursor-gen ==0.3.0.0
+  - cutter ==0.0
+  - cyclotomic ==1.1.1
+  - czipwith ==1.0.1.3
+  - d10 ==0.2.1.6
+  - data-accessor ==0.2.3
+  - data-accessor-mtl ==0.2.0.4
+  - data-accessor-template ==0.2.1.16
+  - data-accessor-transformers ==0.2.1.7
+  - data-ascii ==1.0.0.6
+  - data-binary-ieee754 ==0.4.4
+  - data-bword ==0.1.0.1
+  - data-checked ==0.3
+  - data-clist ==0.1.2.3
+  - data-compat ==0.1.0.3
+  - data-default ==0.7.1.1
+  - data-default-class ==0.1.2.0
+  - data-default-instances-containers ==0.0.1
+  - 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.1
+  - data-forest ==0.1.0.8
+  - data-has ==0.4.0.0
+  - data-hash ==0.2.0.1
+  - data-interval ==2.1.0
+  - data-inttrie ==0.1.4
+  - data-lens-light ==0.1.2.2
+  - data-memocombinators ==0.5.1
+  - data-msgpack ==0.0.13
+  - data-msgpack-types ==0.0.3
+  - data-or ==1.0.0.5
+  - data-ordlist ==0.4.7.0
+  - data-ref ==0.0.2
+  - data-reify ==0.6.3
+  - data-serializer ==0.3.5
+  - data-textual ==0.3.0.3
+  - dataurl ==0.1.0.0
+  - DAV ==1.3.4
+  - DBFunctor ==0.1.1.1
+  - dbus ==1.2.17
+  - dbus-hslogger ==0.1.0.1
+  - debian ==4.0.2
+  - debian-build ==0.10.2.0
+  - debug-trace-var ==0.2.0
+  - dec ==0.0.4
+  - Decimal ==0.5.2
+  - declarative ==0.5.4
+  - deepseq-generics ==0.2.0.0
+  - deepseq-instances ==0.1.0.1
+  - deferred-folds ==0.9.17
+  - dejafu ==2.4.0.2
+  - dense-linear-algebra ==0.1.0.0
+  - depq ==0.4.2
+  - deque ==0.4.3
+  - deriveJsonNoPrefix ==0.1.0.1
+  - derive-topdown ==0.0.2.2
+  - deriving-aeson ==0.2.6.1
+  - deriving-compat ==0.5.10
+  - derulo ==1.0.10
+  - dhall ==1.38.1
+  - dhall-bash ==1.0.36
+  - dhall-json ==1.7.6
+  - dhall-lsp-server ==1.0.14
+  - dhall-yaml ==1.2.6
+  - diagrams-solve ==0.1.3
+  - 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.4
+  - di-monad ==1.3.1
+  - directory-tree ==0.12.1
+  - direct-sqlite ==2.3.26
+  - 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.9
+  - dlist ==0.8.0.8
+  - dlist-instances ==0.1.1.1
+  - dlist-nonempty ==0.1.1
+  - dns ==4.0.1
+  - dockerfile ==0.2.0
+  - doclayout ==0.3.0.2
+  - doctemplates ==0.9
+  - doctest ==0.16.3
+  - doctest-discover ==0.2.0.0
+  - doctest-driver-gen ==0.3.0.3
+  - doctest-exitcode-stdio ==0.0
+  - doctest-extract ==0.1
+  - 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
+  - dotnet-timespan ==0.0.1.0
+  - double-conversion ==2.0.2.0
+  - download ==0.3.2.7
+  - download-curl ==0.1.4
+  - drinkery ==0.4
+  - dsp ==0.2.5.1
+  - dual ==0.1.1.1
+  - dublincore-xml-conduit ==0.1.0.2
+  - dunai ==0.7.0
+  - duration ==0.2.0.0
+  - dvorak ==0.1.0.0
+  - dynamic-state ==0.3.1
+  - dyre ==0.8.12
+  - eap ==0.9.0.2
+  - earcut ==0.1.0.4
+  - Earley ==0.13.0.1
+  - easy-file ==0.2.2
+  - Ebnf2ps ==1.0.15
+  - echo ==0.1.4
+  - ecstasy ==0.2.1.0
+  - ed25519 ==0.0.5.0
+  - edit-distance ==0.2.2.1
+  - edit-distance-vector ==1.0.0.4
+  - editor-open ==0.6.0.0
+  - egison ==4.1.2
+  - egison-pattern-src ==0.2.1.2
+  - egison-pattern-src-th-mode ==0.2.1.2
+  - either ==5.0.1.1
+  - either-both ==0.1.1.1
+  - either-unwrap ==1.1
+  - ekg ==0.4.0.15
+  - ekg-core ==0.1.1.7
+  - ekg-json ==0.1.0.6
+  - ekg-statsd ==0.2.5.0
+  - 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
+  - elynx ==0.5.0.2
+  - elynx-markov ==0.5.0.2
+  - elynx-nexus ==0.5.0.2
+  - elynx-seq ==0.5.0.2
+  - elynx-tools ==0.5.0.2
+  - elynx-tree ==0.5.0.2
+  - email-validate ==2.3.2.13
+  - emojis ==0.1
+  - enclosed-exceptions ==1.0.3
+  - ENIG ==0.0.1.0
+  - entropy ==0.4.1.6
+  - 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.7.0.0
+  - equivalence ==0.3.5
+  - erf ==2.0.0.0
+  - error-or ==0.1.2.0
+  - error-or-utils ==0.1.1
+  - errors ==2.3.0
+  - errors-ext ==0.4.2
+  - ersatz ==0.4.9
+  - esqueleto ==3.4.1.1
+  - essence-of-live-coding ==0.2.5
+  - essence-of-live-coding-gloss ==0.2.5
+  - essence-of-live-coding-pulse ==0.2.5
+  - essence-of-live-coding-quickcheck ==0.2.5
+  - etc ==0.4.1.0
+  - eve ==0.1.9.0
+  - 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
+  - executable-path ==0.0.3.1
+  - exit-codes ==1.0.0
+  - exomizer ==1.0.0
+  - experimenter ==0.1.0.12
+  - expiring-cache-map ==0.0.6.1
+  - explicit-exception ==0.1.10
+  - exp-pairs ==0.2.1.0
+  - express ==0.1.8
+  - extended-reals ==0.2.4.0
+  - extensible-effects ==5.0.0.1
+  - extensible-exceptions ==0.1.1.4
+  - extra ==1.7.9
+  - extractable-singleton ==0.0.1
+  - extrapolate ==0.4.4
+  - fail ==4.9.0.0
+  - failable ==1.2.4.0
+  - fakedata ==0.8.0
+  - fakedata-parser ==0.1.0.0
+  - fakefs ==0.3.0.2
+  - fakepull ==0.3.0.2
+  - faktory ==1.0.2.1
+  - fast-digits ==0.3.0.0
+  - fast-logger ==3.0.5
+  - fast-math ==1.0.2
+  - fb ==2.1.1
+  - fclabels ==2.0.5
+  - feature-flags ==0.1.0.1
+  - fedora-dists ==1.1.2
+  - fedora-haskell-tools ==0.9
+  - feed ==1.3.2.0
+  - FenwickTree ==0.1.2.1
+  - fft ==0.1.8.6
+  - 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
+  - filepath-bytestring ==1.4.2.1.7
+  - file-path-th ==0.1.0.0
+  - filepattern ==0.1.2
+  - fileplow ==0.1.0.0
+  - filtrable ==0.1.4.0
+  - fin ==0.2
+  - FindBin ==0.0.5
+  - fingertree ==0.1.4.2
+  - finite-typelits ==0.1.4.2
+  - first-class-families ==0.8.0.1
+  - first-class-patterns ==0.3.2.5
+  - fitspec ==0.4.8
+  - fixed ==0.3
+  - fixed-length ==0.2.2.1
+  - fixed-vector ==1.2.0.0
+  - fixed-vector-hetero ==0.6.1.0
+  - fix-whitespace ==0.0.5
+  - flac ==0.2.0
+  - flac-picture ==0.1.2
+  - flags-applicative ==0.1.0.3
+  - flat ==0.4.4
+  - flat-mcmc ==1.5.2
+  - flexible-defaults ==0.0.3
+  - FloatingHex ==0.5
+  - floatshow ==0.2.4
+  - flow ==1.0.22
+  - flush-queue ==1.0.0
+  - fmlist ==0.9.4
+  - fmt ==0.6.1.2
+  - 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.6
+  - foldl ==1.4.11
+  - folds ==0.7.6
+  - follow-file ==0.0.3
+  - FontyFruity ==0.5.3.5
+  - foreign-store ==0.2
+  - ForestStructures ==0.0.1.0
+  - forkable-monad ==0.2.0.3
+  - forma ==1.1.3
+  - format-numbers ==0.1.0.1
+  - formatting ==6.3.7
+  - foundation ==0.0.26.1
+  - fourmolu ==0.3.0.0
+  - free ==5.1.5
+  - free-categories ==0.2.0.2
+  - 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
+  - fsnotify ==0.3.0.1
+  - fsnotify-conduit ==0.1.1.1
+  - ftp-client ==0.5.1.4
+  - ftp-client-conduit ==0.5.0.5
+  - funcmp ==1.9
+  - function-builder ==0.3.0.1
+  - functor-classes-compat ==1.0.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
+  - gauge ==0.2.5
+  - gd ==3000.7.3
+  - gdp ==0.0.3.0
+  - general-games ==1.1.1
+  - generic-aeson ==0.2.0.12
+  - generic-arbitrary ==0.1.0
+  - generic-constraints ==1.1.1.1
+  - generic-data ==0.9.2.0
+  - generic-data-surgery ==0.3.0.0
+  - generic-deriving ==1.13.1
+  - generic-functor ==0.2.0.0
+  - generic-lens ==2.1.0.0
+  - generic-lens-core ==2.1.0.0
+  - generic-monoid ==0.1.0.1
+  - generic-optics ==2.1.0.0
+  - GenericPretty ==1.2.2
+  - generic-random ==1.3.0.1
+  - generics-eot ==0.4.0.1
+  - generics-sop ==0.5.1.1
+  - generics-sop-lens ==0.2.0.1
+  - geniplate-mirror ==0.7.7
+  - genvalidity ==0.11.0.0
+  - genvalidity-aeson ==0.3.0.0
+  - genvalidity-bytestring ==0.6.0.0
+  - genvalidity-containers ==0.9.0.0
+  - genvalidity-criterion ==0.2.0.0
+  - genvalidity-hspec ==0.7.0.4
+  - genvalidity-hspec-aeson ==0.3.1.1
+  - genvalidity-hspec-binary ==0.2.0.4
+  - genvalidity-hspec-cereal ==0.2.0.4
+  - genvalidity-hspec-hashable ==0.2.0.5
+  - genvalidity-hspec-optics ==0.1.1.2
+  - genvalidity-hspec-persistent ==0.0.0.1
+  - genvalidity-mergeful ==0.2.0.0
+  - genvalidity-mergeless ==0.2.0.0
+  - genvalidity-path ==0.3.0.4
+  - genvalidity-persistent ==0.0.0.0
+  - genvalidity-property ==0.5.0.1
+  - genvalidity-scientific ==0.2.1.1
+  - genvalidity-sydtest ==0.0.0.0
+  - genvalidity-sydtest-aeson ==0.0.0.0
+  - genvalidity-sydtest-hashable ==0.0.0.0
+  - genvalidity-sydtest-lens ==0.0.0.0
+  - genvalidity-sydtest-persistent ==0.0.0.1
+  - genvalidity-text ==0.7.0.2
+  - genvalidity-time ==0.3.0.0
+  - genvalidity-typed-uuid ==0.0.0.2
+  - genvalidity-unordered-containers ==0.3.0.1
+  - genvalidity-uuid ==0.1.0.4
+  - genvalidity-vector ==0.3.0.1
+  - geojson ==4.0.2
+  - getopt-generics ==0.13.0.4
+  - ghc-byteorder ==4.11.0.0.10
+  - ghc-check ==0.5.0.4
+  - ghc-core ==0.5.6
+  - ghc-events ==0.16.0
+  - ghc-exactprint ==0.6.4
+  - ghcid ==0.8.7
+  - ghci-hexcalc ==0.1.1.0
+  - ghcjs-codemirror ==0.0.0.2
+  - ghc-lib ==8.10.4.20210206
+  - ghc-lib-parser ==8.10.4.20210206
+  - ghc-lib-parser-ex ==8.10.0.19
+  - ghc-parser ==0.2.3.0
+  - ghc-paths ==0.1.0.12
+  - ghc-prof ==1.4.1.8
+  - ghc-source-gen ==0.4.0.0
+  - ghc-syntax-highlighter ==0.0.6.0
+  - ghc-tcplugins-extra ==0.4.1
+  - ghc-trace-events ==0.1.2.2
+  - ghc-typelits-extra ==0.4.2
+  - ghc-typelits-knownnat ==0.7.5
+  - ghc-typelits-natnormalise ==0.7.4
+  - ghc-typelits-presburger ==0.6.0.0
+  - ghost-buster ==0.1.1.0
+  - gi-atk ==2.0.22
+  - gi-cairo ==1.0.24
+  - gi-cairo-connector ==0.1.0
+  - gi-cairo-render ==0.1.0
+  - gi-dbusmenu ==0.4.8
+  - gi-dbusmenugtk3 ==0.4.9
+  - gi-gdk ==3.0.23
+  - gi-gdkpixbuf ==2.0.24
+  - gi-gdkx11 ==3.0.10
+  - gi-gio ==2.0.27
+  - gi-glib ==2.0.24
+  - gi-gobject ==2.0.25
+  - gi-graphene ==1.0.2
+  - gi-gtk ==3.0.36
+  - gi-gtk-hs ==0.3.9
+  - gi-harfbuzz ==0.0.3
+  - ginger ==0.10.1.0
+  - gingersnap ==0.3.1.0
+  - gi-pango ==1.0.23
+  - githash ==0.1.5.0
+  - github-release ==1.3.7
+  - github-rest ==1.0.3
+  - github-types ==0.2.1
+  - 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.3
+  - GLFW-b ==3.3.0.0
+  - Glob ==0.10.1
+  - gloss ==1.13.2.1
+  - gloss-rendering ==1.13.1.1
+  - GLURaw ==2.0.0.4
+  - GLUT ==2.7.0.16
+  - gluturtle ==0.0.58.1
+  - gnuplot ==0.5.6.1
+  - google-isbn ==1.0.3
+  - gopher-proxy ==0.1.1.2
+  - gothic ==0.1.6
+  - gpolyline ==0.1.0.1
+  - graph-core ==0.3.0.0
+  - graphite ==0.10.0.1
+  - graphql-client ==1.1.1
+  - graphs ==0.7.1
+  - graphula ==2.0.0.4
+  - graphviz ==2999.20.1.0
+  - graph-wrapper ==0.2.6.0
+  - gravatar ==0.8.0
+  - greskell ==1.2.0.1
+  - greskell-core ==0.1.3.6
+  - greskell-websocket ==0.1.2.5
+  - groom ==0.1.2.1
+  - group-by-date ==0.1.0.4
+  - groups ==0.5.2
+  - gtk-sni-tray ==0.1.6.0
+  - gtk-strut ==0.1.3.0
+  - guarded-allocation ==0.0.1
+  - H ==0.9.0.1
+  - hackage-db ==2.1.0
+  - hackage-security ==0.6.0.1
+  - haddock-library ==1.9.0
+  - hadoop-streaming ==0.2.0.3
+  - hakyll-convert ==0.3.0.4
+  - half ==0.3.1
+  - hall-symbols ==0.1.0.6
+  - hamtsolo ==1.0.3
+  - HandsomeSoup ==0.4.2
+  - hapistrano ==0.4.1.3
+  - happstack-server ==7.7.0
+  - happy ==1.20.0
+  - happy-meta ==0.2.0.11
+  - HasBigDecimal ==0.1.1
+  - hasbolt ==0.1.4.5
+  - hashable ==1.3.0.0
+  - hashable-time ==0.2.1
+  - hashids ==1.0.2.4
+  - hashing ==0.1.0.1
+  - hashmap ==1.3.3
+  - hashtables ==1.2.4.1
+  - haskeline ==0.8.1.2
+  - haskell-awk ==1.2
+  - haskell-gi ==0.24.7
+  - haskell-gi-base ==0.24.5
+  - haskell-gi-overloading ==1.0
+  - haskell-import-graph ==1.0.4
+  - haskell-lexer ==1.1
+  - haskell-lsp ==0.22.0.0
+  - haskell-lsp-types ==0.22.0.0
+  - haskell-names ==0.9.9
+  - HaskellNet ==0.6
+  - haskell-src ==1.0.3.1
+  - haskell-src-exts ==1.23.1
+  - haskell-src-exts-util ==0.2.5
+  - haskell-src-meta ==0.8.7
+  - haskey-btree ==0.3.0.1
+  - hasql ==1.4.5.1
+  - hasql-notifications ==0.2.0.0
+  - hasql-optparse-applicative ==0.3.0.6
+  - hasql-pool ==0.5.2
+  - hasql-queue ==1.2.0.2
+  - hasql-transaction ==1.0.0.2
+  - hasty-hamiltonian ==1.3.4
+  - HaTeX ==3.22.3.0
+  - HaXml ==1.25.5
+  - haxr ==3000.11.4.1
+  - HCodecs ==0.5.2
+  - hdaemonize ==0.5.6
+  - HDBC ==2.4.0.3
+  - HDBC-session ==0.1.2.0
+  - headroom ==0.4.1.0
+  - heap ==1.0.4
+  - heaps ==0.4
+  - hebrew-time ==0.1.2
+  - hedgehog ==1.0.5
+  - hedgehog-corpus ==0.2.0
+  - hedgehog-fakedata ==0.0.1.4
+  - hedgehog-fn ==1.0
+  - hedgehog-quickcheck ==0.1.1
+  - hedis ==0.14.2
+  - hedn ==0.3.0.2
+  - here ==1.2.13
+  - heredoc ==0.2.0.0
+  - heterocephalus ==1.0.5.4
+  - hexml ==0.3.4
+  - hexml-lens ==0.2.1
+  - hexpat ==0.20.13
+  - hformat ==0.3.3.1
+  - hfsevents ==0.1.6
+  - hgrev ==0.2.6
+  - hidapi ==0.1.7
+  - hie-bios ==0.7.5
+  - hi-file-parser ==0.1.2.0
+  - higher-leveldb ==0.6.0.0
+  - highlighting-kate ==0.6.4
+  - hinfo ==0.0.3.0
+  - hinotify ==0.4.1
+  - hint ==0.9.0.4
+  - hjsmin ==0.2.0.4
+  - hkd-default ==1.1.0.0
+  - hkgr ==0.2.7
+  - hlibcpuid ==0.2.0
+  - hlibgit2 ==0.18.0.16
+  - hlibsass ==0.1.10.1
+  - hmatrix ==0.20.2
+  - hmatrix-backprop ==0.1.3.0
+  - hmatrix-gsl ==0.19.0.1
+  - hmatrix-gsl-stats ==0.4.1.8
+  - hmatrix-morpheus ==0.1.1.2
+  - hmatrix-vector-sized ==0.1.3.0
+  - hmm-lapack ==0.4
+  - hmpfr ==0.4.4
+  - hnock ==0.4.0
+  - hoauth2 ==1.16.0
+  - hocon ==0.1.0.4
+  - hOpenPGP ==2.9.5
+  - hopenpgp-tools ==0.23.6
+  - hopfli ==0.2.2.1
+  - hosc ==0.18.1
+  - hostname ==1.0
+  - hostname-validate ==1.0.0
+  - hourglass ==0.2.12
+  - hourglass-orphans ==0.1.0.0
+  - hp2pretty ==0.10
+  - hpack ==0.34.4
+  - hpack-dhall ==0.5.2
+  - hpc-codecov ==0.3.0.0
+  - hpc-lcov ==1.0.1
+  - hprotoc ==2.4.17
+  - hruby ==0.3.8.1
+  - hsass ==0.8.0
+  - hs-bibutils ==6.10.0.0
+  - hsc2hs ==0.68.7
+  - hscolour ==1.24.4
+  - hsdns ==1.8
+  - hsebaysdk ==0.4.1.0
+  - hsemail ==2.2.1
+  - hs-functors ==0.1.7.1
+  - hs-GeoIP ==0.3
+  - hsini ==0.5.1.2
+  - hsinstall ==2.6
+  - HSlippyMap ==3.0.1
+  - hslogger ==1.3.1.0
+  - hslua ==1.3.0.1
+  - hslua-aeson ==1.0.3.1
+  - hslua-module-doclayout ==0.2.0.1
+  - hslua-module-path ==0.1.0.1
+  - hslua-module-system ==0.2.2.1
+  - hslua-module-text ==0.3.0.1
+  - HsOpenSSL ==0.11.7
+  - HsOpenSSL-x509-system ==0.1.0.4
+  - hsp ==0.10.0
+  - hspec ==2.7.10
+  - hspec-attoparsec ==0.1.0.2
+  - hspec-checkers ==0.1.0.2
+  - hspec-contrib ==0.5.1
+  - hspec-core ==2.7.10
+  - hspec-discover ==2.7.10
+  - hspec-expectations ==0.8.2
+  - hspec-expectations-json ==1.0.0.3
+  - hspec-expectations-lifted ==0.10.0
+  - hspec-expectations-pretty-diff ==0.7.2.5
+  - hspec-golden ==0.1.0.3
+  - hspec-golden-aeson ==0.7.0.0
+  - hspec-hedgehog ==0.0.1.2
+  - hspec-junit-formatter ==1.0.0.2
+  - hspec-leancheck ==0.0.4
+  - hspec-megaparsec ==2.2.0
+  - hspec-meta ==2.7.8
+  - hspec-need-env ==0.1.0.6
+  - hspec-parsec ==0
+  - hspec-smallcheck ==0.5.2
+  - hspec-tables ==0.0.1
+  - hspec-wai ==0.11.0
+  - hspec-wai-json ==0.11.0
+  - hs-php-session ==0.0.9.3
+  - hsshellscript ==3.5.0
+  - hs-tags ==0.1.5
+  - HStringTemplate ==0.8.7
+  - HSvm ==0.1.1.3.22
+  - HsYAML ==0.2.1.0
+  - HsYAML-aeson ==0.2.0.0
+  - hsyslog ==5.0.2
+  - htaglib ==1.2.0
+  - HTF ==0.14.0.6
+  - html ==1.0.1.2
+  - html-conduit ==1.3.2.1
+  - html-entities ==1.1.4.5
+  - html-entity-map ==0.1.0.0
+  - htoml ==1.0.0.3
+  - http2 ==3.0.1
+  - HTTP ==4000.3.16
+  - http-api-data ==0.4.2
+  - http-client ==0.6.4.1
+  - http-client-openssl ==0.3.2.0
+  - http-client-overrides ==0.1.1.0
+  - http-client-tls ==0.3.5.3
+  - http-common ==0.8.2.1
+  - http-conduit ==2.3.8
+  - http-date ==0.0.11
+  - http-directory ==0.1.8
+  - http-download ==0.2.0.0
+  - httpd-shed ==0.4.1.1
+  - http-link-header ==1.2.0
+  - http-media ==0.8.0.0
+  - http-query ==0.1.0.1
+  - http-reverse-proxy ==0.6.0
+  - http-streams ==0.8.7.2
+  - http-types ==0.12.3
+  - human-readable-duration ==0.2.1.4
+  - HUnit ==1.6.2.0
+  - HUnit-approx ==1.1.1.1
+  - hunit-dejafu ==2.0.0.4
+  - hvect ==0.4.0.0
+  - hvega ==0.11.0.1
+  - hw-balancedparens ==0.4.1.1
+  - hw-bits ==0.7.2.1
+  - hw-conduit ==0.2.1.0
+  - 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
+  - hw-fingertree-strict ==0.1.2.0
+  - hw-hedgehog ==0.1.1.0
+  - hw-hspec-hedgehog ==0.1.1.0
+  - hw-int ==0.0.2.0
+  - hw-ip ==2.4.2.0
+  - hw-json ==1.3.2.2
+  - 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.3
+  - hw-mquery ==0.2.1.0
+  - hw-packed-vector ==0.2.1.0
+  - hw-parser ==0.1.1.0
+  - hw-prim ==0.6.3.0
+  - hw-rankselect ==0.13.4.0
+  - hw-rankselect-base ==0.3.4.1
+  - hw-simd ==0.1.2.0
+  - hw-streams ==0.0.1.0
+  - hw-string-parse ==0.0.0.4
+  - hw-succinct ==0.1.0.1
+  - hw-xml ==0.5.1.0
+  - hxt ==9.3.1.22
+  - hxt-charproperties ==9.5.0.0
+  - hxt-css ==0.1.0.3
+  - hxt-curl ==9.1.1.1
+  - hxt-expat ==9.1.1
+  - hxt-http ==9.1.5.2
+  - hxt-regex-xmlschema ==9.2.0.7
+  - hxt-tagsoup ==9.1.4
+  - hxt-unicode ==9.0.2.4
+  - hybrid-vectors ==0.2.2
+  - hyper ==0.2.1.0
+  - hyperloglog ==0.4.4
+  - hyphenation ==0.8.1
+  - iconv ==0.4.1.3
+  - identicon ==0.2.2
+  - ieee754 ==0.8.0
+  - if ==0.1.0.0
+  - iff ==0.0.6
+  - ihaskell ==0.10.2.0
+  - ihs ==0.1.0.3
+  - ilist ==0.4.0.1
+  - imagesize-conduit ==1.1
+  - Imlib ==0.1.2
+  - immortal ==0.3
+  - immortal-queue ==0.1.0.1
+  - inbox ==0.1.0
+  - include-file ==0.1.0.4
+  - incremental-parser ==0.5.0.2
+  - indents ==0.5.0.1
+  - indexed ==0.1.3
+  - indexed-containers ==0.1.0.2
+  - indexed-list-literals ==0.2.1.3
+  - indexed-profunctors ==0.1.1
+  - indexed-traversable ==0.1.1
+  - indexed-traversable-instances ==0.1
+  - infer-license ==0.2.0
+  - inflections ==0.4.0.6
+  - influxdb ==1.9.1.2
+  - ini ==0.4.1
+  - inj ==1.0
+  - inline-c ==0.9.1.4
+  - inline-c-cpp ==0.4.0.3
+  - inline-r ==0.10.4
+  - inliterate ==0.1.0
+  - input-parsers ==0.2.2
+  - insert-ordered-containers ==0.2.4
+  - inspection-testing ==0.4.5.0
+  - instance-control ==0.1.2.0
+  - int-cast ==0.2.0.0
+  - integer-logarithms ==1.0.3.1
+  - integer-roots ==1.0
+  - integration ==0.2.1
+  - intern ==0.9.4
+  - interpolate ==0.2.1
+  - interpolatedstring-perl6 ==1.0.2
+  - interpolation ==0.1.1.1
+  - interpolator ==1.1.0.2
+  - IntervalMap ==0.6.1.2
+  - intervals ==0.9.2
+  - intro ==0.9.0.0
+  - intset-imperative ==0.1.0.0
+  - invariant ==0.5.4
+  - invertible ==0.2.0.7
+  - invertible-grammar ==0.1.3
+  - io-machine ==0.2.0.0
+  - io-manager ==0.1.0.3
+  - io-memoize ==1.1.1.0
+  - io-region ==0.1.1
+  - io-storage ==0.3
+  - io-streams ==1.5.2.0
+  - io-streams-haproxy ==1.0.1.0
+  - ip6addr ==1.0.2
+  - ipa ==0.3
+  - iproute ==1.7.11
+  - IPv6Addr ==2.0.2
+  - ipynb ==0.1.0.1
+  - ipython-kernel ==0.10.2.1
+  - irc ==0.6.1.0
+  - irc-client ==1.1.2.0
+  - irc-conduit ==0.3.0.4
+  - irc-ctcp ==0.1.3.0
+  - isbn ==1.1.0.2
+  - islink ==0.1.0.0
+  - iso3166-country-codes ==0.20140203.8
+  - iso639 ==0.1.0.3
+  - iso8601-time ==0.1.5
+  - iterable ==3.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.2
+  - jalaali ==1.0.0.0
+  - jira-wiki-markup ==1.3.4
+  - jose ==0.8.4
+  - jose-jwt ==0.9.2
+  - 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.12
+  - jsonpath ==0.2.0.0
+  - json-rpc ==1.0.3
+  - json-rpc-generic ==0.2.1.5
+  - JuicyPixels ==3.3.5
+  - JuicyPixels-blurhash ==0.1.0.3
+  - JuicyPixels-extra ==0.4.1
+  - JuicyPixels-scale-dct ==0.1.2
+  - junit-xml ==0.1.0.2
+  - justified-containers ==0.3.0.0
+  - jwt ==0.10.0
+  - kan-extensions ==5.2.2
+  - kanji ==3.4.1
+  - katip ==0.8.5.0
+  - katip-logstash ==0.1.0.0
+  - kawhi ==0.3.0
+  - kazura-queue ==0.1.0.4
+  - kdt ==0.2.4
+  - keep-alive ==0.2.0.0
+  - keycode ==0.2.2
+  - keys ==3.12.3
+  - ki ==0.2.0.1
+  - kind-apply ==0.3.2.0
+  - kind-generics ==0.4.1.0
+  - kind-generics-th ==0.2.2.2
+  - kmeans ==0.1.3
+  - koji ==0.0.1
+  - koofr-client ==1.0.0.3
+  - krank ==0.2.2
+  - kubernetes-webhook-haskell ==0.2.0.3
+  - l10n ==0.1.0.1
+  - labels ==0.3.3
+  - lackey ==1.0.14
+  - LambdaHack ==0.10.2.0
+  - lame ==0.2.0
+  - language-avro ==0.1.3.1
+  - language-bash ==0.9.2
+  - language-c ==0.8.3
+  - language-c-quote ==0.13
+  - language-docker ==9.3.0
+  - language-java ==0.2.9
+  - language-javascript ==0.7.1.0
+  - language-protobuf ==1.0.1
+  - language-python ==0.5.8
+  - language-thrift ==0.12.0.0
+  - lapack ==0.3.2
+  - lapack-carray ==0.0.3
+  - lapack-comfort-array ==0.0.0.1
+  - lapack-ffi ==0.0.3
+  - lapack-ffi-tools ==0.1.2.1
+  - largeword ==1.2.5
+  - latex ==0.1.0.4
+  - lattices ==2.0.2
+  - lawful ==0.1.0.0
+  - lazy-csv ==0.5.1
+  - lazyio ==0.1.0.4
+  - lca ==0.4
+  - leancheck ==0.9.4
+  - leancheck-instances ==0.0.4
+  - leapseconds-announced ==2017.1.0.1
+  - learn-physics ==0.6.5
+  - lens ==4.19.2
+  - lens-action ==0.2.5
+  - lens-aeson ==1.1.1
+  - lens-csv ==0.1.1.0
+  - lens-datetime ==0.3
+  - lens-family ==2.0.0
+  - lens-family-core ==2.0.0
+  - lens-family-th ==0.5.2.0
+  - lens-misc ==0.0.2.0
+  - lens-process ==0.4.0.0
+  - lens-properties ==4.11.1
+  - lens-regex ==0.1.3
+  - lens-regex-pcre ==1.1.0.0
+  - lenz ==0.4.2.0
+  - leveldb-haskell ==0.6.5
+  - libffi ==0.1
+  - libgit ==0.3.1
+  - libgraph ==1.14
+  - libjwt-typed ==0.2
+  - libmpd ==0.10.0.0
+  - liboath-hs ==0.0.1.2
+  - libyaml ==0.1.2
+  - LibZip ==1.0.1
+  - lifted-async ==0.10.2
+  - lifted-base ==0.2.3.12
+  - lift-generics ==0.2
+  - lift-type ==0.1.0.1
+  - line ==4.0.1
+  - linear ==1.21.5
+  - linear-circuit ==0.1.0.2
+  - linenoise ==0.3.2
+  - linux-file-extents ==0.2.0.0
+  - 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.5
+  - list-t ==1.0.4
+  - ListTree ==0.2.3
+  - little-rio ==0.2.2
+  - llvm-hs ==9.0.1
+  - llvm-hs-pure ==9.0.0
+  - lmdb ==0.2.5
+  - load-env ==0.2.1.0
+  - loc ==0.1.3.10
+  - locators ==0.3.0.3
+  - loch-th ==0.2.2
+  - lockfree-queue ==0.2.3.1
+  - log-domain ==0.13.1
+  - logfloat ==0.13.3.3
+  - logging ==3.0.5
+  - logging-facade ==0.3.0
+  - logging-facade-syslog ==1
+  - logict ==0.7.1.0
+  - logstash ==0.1.0.1
+  - loop ==0.3.0
+  - lrucache ==1.2.0.1
+  - lrucaching ==0.3.3
+  - lsp-test ==0.11.0.5
+  - lucid ==2.9.12.1
+  - lucid-cdn ==0.2.2.0
+  - lucid-extras ==0.2.2
+  - lukko ==0.1.1.3
+  - lz4-frame-conduit ==0.1.0.1
+  - lzma ==0.0.0.3
+  - lzma-conduit ==1.2.1
+  - machines ==0.7.2
+  - machines-binary ==7.0.0.0
+  - magic ==1.1
+  - magico ==0.0.2.1
+  - mainland-pretty ==0.7.1
+  - main-tester ==0.2.0.1
+  - makefile ==1.1.0.0
+  - managed ==1.0.8
+  - MapWith ==0.2.0.0
+  - markdown ==0.1.17.4
+  - markdown-unlit ==0.5.1
+  - markov-chain ==0.0.3.4
+  - 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.1
+  - mathexpr ==0.3.0.0
+  - math-extras ==0.1.1.0
+  - math-functions ==0.3.4.2
+  - matplotlib ==0.7.5
+  - matrices ==0.5.0
+  - matrix ==0.3.6.1
+  - matrix-as-xyz ==0.1.2.2
+  - matrix-market-attoparsec ==0.1.1.3
+  - matrix-static ==0.3
+  - maximal-cliques ==0.1.1
+  - mbox ==0.3.4
+  - mbox-utility ==0.0.3.1
+  - mcmc ==0.4.0.0
+  - mcmc-types ==1.0.3
+  - 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
+  - memory ==0.15.0
+  - MemoTrie ==0.6.10
+  - mercury-api ==0.1.0.2
+  - mergeful ==0.2.0.0
+  - mergeless ==0.3.0.0
+  - mersenne-random-pure64 ==0.2.2.0
+  - messagepack ==0.5.4
+  - metrics ==0.4.1.1
+  - mfsolve ==0.3.2.0
+  - microlens ==0.4.12.0
+  - microlens-aeson ==2.3.1
+  - microlens-contra ==0.1.0.2
+  - microlens-ghc ==0.4.13
+  - microlens-mtl ==0.2.0.1
+  - microlens-platform ==0.4.2
+  - microlens-process ==0.2.0.2
+  - microlens-th ==0.4.3.9
+  - microspec ==0.2.1.3
+  - microstache ==1.0.1.2
+  - midair ==0.2.0.1
+  - midi ==0.2.2.2
+  - mighty-metropolis ==2.0.0
+  - mime-mail ==0.5.1
+  - mime-mail-ses ==0.4.3
+  - mime-types ==0.1.0.9
+  - 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.1
+  - mltool ==0.2.0.1
+  - mmap ==0.5.9
+  - mmark ==0.0.7.2
+  - mmark-cli ==0.0.5.0
+  - mmark-ext ==0.2.1.3
+  - mmorph ==1.1.5
+  - mnist-idx ==0.1.2.8
+  - mockery ==0.3.5
+  - mock-time ==0.1.0
+  - mod ==0.1.2.2
+  - model ==0.5
+  - modern-uri ==0.3.4.1
+  - modular ==0.1.0.8
+  - monad-chronicle ==1.0.0.1
+  - monad-control ==1.0.2.3
+  - monad-control-aligned ==0.0.1.1
+  - monad-coroutine ==0.9.1
+  - 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
+  - monad-logger-prefix ==0.1.12
+  - monad-loops ==0.4.3
+  - monad-memo ==0.5.3
+  - monad-metrics ==0.2.2.0
+  - monad-par ==0.3.5
+  - monad-parallel ==0.7.2.4
+  - monad-par-extras ==0.3.3
+  - monad-peel ==0.2.1.2
+  - monad-primitive ==0.1
+  - monad-products ==4.0.1
+  - MonadPrompt ==1.0.0.5
+  - MonadRandom ==0.5.3
+  - 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
+  - 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
+  - more-containers ==0.2.2.2
+  - morpheus-graphql ==0.17.0
+  - morpheus-graphql-app ==0.17.0
+  - morpheus-graphql-client ==0.17.0
+  - morpheus-graphql-core ==0.17.0
+  - morpheus-graphql-subscriptions ==0.17.0
+  - moss ==0.2.0.0
+  - mountpoints ==1.0.2
+  - mpi-hs ==0.7.2.0
+  - mpi-hs-binary ==0.1.1.0
+  - 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
+  - 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
+  - MusicBrainz ==0.4.1
+  - mustache ==2.3.1
+  - mutable-containers ==0.3.4
+  - mwc-probability ==2.3.1
+  - mwc-random ==0.14.0.0
+  - mwc-random-monad ==0.7.3.1
+  - mx-state-codes ==1.0.0.0
+  - mysql ==0.2.0.1
+  - mysql-simple ==0.4.5
+  - n2o ==0.11.1
+  - nagios-check ==0.3.2
+  - names-th ==0.3.0.1
+  - nano-erl ==0.1.0.1
+  - nanospec ==0.2.2
+  - nats ==1.1.2
+  - natural-induction ==0.2.0.0
+  - natural-sort ==0.1.2
+  - natural-transformation ==0.4
+  - ndjson-conduit ==0.1.0.5
+  - neat-interpolation ==0.5.1.2
+  - netcode-io ==0.0.2
+  - netlib-carray ==0.1
+  - netlib-comfort-array ==0.0.0.1
+  - netlib-ffi ==0.1.1
+  - netpbm ==1.0.4
+  - nettle ==0.3.0
+  - netwire ==5.0.3
+  - netwire-input ==0.0.7
+  - netwire-input-glfw ==0.0.11
+  - network ==3.1.1.1
+  - network-bsd ==2.8.1.0
+  - network-byte-order ==0.1.6
+  - network-conduit-tls ==1.3.2
+  - network-info ==0.2.0.10
+  - network-ip ==0.3.0.3
+  - network-messagepack-rpc ==0.1.2.0
+  - network-messagepack-rpc-websocket ==0.1.1.1
+  - network-run ==0.2.4
+  - network-simple ==0.4.5
+  - network-simple-tls ==0.4
+  - network-transport ==0.5.4
+  - network-transport-composed ==0.2.1
+  - network-uri ==2.6.4.1
+  - newtype ==0.2.2.0
+  - newtype-generics ==0.6
+  - nicify-lib ==1.0.1
+  - NineP ==0.0.2.1
+  - nix-derivation ==1.1.2
+  - nix-paths ==1.0.1
+  - nonce ==1.0.7
+  - nondeterminism ==1.4
+  - non-empty ==0.3.3
+  - nonempty-containers ==0.3.4.1
+  - nonemptymap ==0.0.6.0
+  - non-empty-sequence ==0.2.0.4
+  - nonempty-vector ==0.2.1.0
+  - nonempty-zipper ==1.0.0.2
+  - non-negative ==0.1.2
+  - not-gloss ==0.7.7.0
+  - no-value ==1.0.0.0
+  - nowdoc ==0.1.1.0
+  - nqe ==0.6.3
+  - nri-env-parser ==0.1.0.7
+  - nri-observability ==0.1.0.2
+  - nri-prelude ==0.6.0.0
+  - nsis ==0.3.3
+  - numbers ==3000.2.0.2
+  - numeric-extras ==0.1
+  - numeric-prelude ==0.4.3.3
+  - numhask ==0.6.0.2
+  - NumInstances ==1.4
+  - numtype-dk ==0.5.0.2
+  - nuxeo ==0.3.2
+  - nvim-hs ==2.1.0.4
+  - nvim-hs-contrib ==2.0.0.0
+  - nvim-hs-ghcid ==2.0.0.0
+  - oauthenticated ==0.2.1.0
+  - ObjectName ==1.1.0.1
+  - o-clock ==1.2.0.1
+  - odbc ==0.2.2
+  - oeis2 ==1.0.5
+  - ofx ==0.4.4.0
+  - old-locale ==1.0.0.7
+  - old-time ==1.1.0.3
+  - once ==0.4
+  - one-liner ==1.0
+  - one-liner-instances ==0.1.2.1
+  - OneTuple ==0.2.2.1
+  - Only ==0.1
+  - oo-prototypes ==0.1.0.0
+  - opaleye ==0.7.1.0
+  - OpenAL ==1.7.0.5
+  - openapi3 ==3.1.0
+  - open-browser ==0.2.1.0
+  - openexr-write ==0.1.0.2
+  - OpenGL ==3.0.3.0
+  - OpenGLRaw ==3.3.4.0
+  - openpgp-asciiarmor ==0.1.2
+  - opensource ==0.1.1.0
+  - openssl-streams ==1.2.3.0
+  - opentelemetry ==0.6.1
+  - opentelemetry-extra ==0.6.1
+  - opentelemetry-lightstep ==0.6.1
+  - opentelemetry-wai ==0.6.1
+  - operational ==0.2.3.5
+  - operational-class ==0.3.0.0
+  - optics ==0.3
+  - optics-core ==0.3.0.1
+  - optics-extra ==0.3
+  - optics-th ==0.3.0.2
+  - optics-vl ==0.2.1
+  - optional-args ==1.0.2
+  - options ==1.2.1.1
+  - optparse-applicative ==0.16.1.0
+  - optparse-generic ==1.4.4
+  - optparse-simple ==0.1.1.3
+  - optparse-text ==0.1.1.0
+  - ordered-containers ==0.2.2
+  - ormolu ==0.1.4.1
+  - overhang ==1.0.0
+  - packcheck ==0.5.1
+  - packdeps ==0.6.0.0
+  - pager ==0.1.1.0
+  - pagination ==0.2.2
+  - pagure-cli ==0.2
+  - pandoc ==2.13
+  - pandoc-dhall-decoder ==0.1.0.1
+  - pandoc-plot ==1.1.1
+  - pandoc-throw ==0.1.0.0
+  - pandoc-types ==1.22
+  - pantry ==0.5.1.5
+  - parallel ==3.2.2.0
+  - parallel-io ==0.3.3
+  - parameterized ==0.5.0.0
+  - paripari ==0.7.0.0
+  - parseargs ==0.2.0.9
+  - parsec-class ==1.0.0.0
+  - parsec-numbers ==0.1.0
+  - parsec-numeric ==0.1.0.0
+  - ParsecTools ==0.0.2.0
+  - parser-combinators ==1.2.1
+  - parser-combinators-tests ==1.2.1
+  - parsers ==0.12.10
+  - partial-handler ==1.0.3
+  - partial-isomorphisms ==0.2.2.1
+  - partial-semigroup ==0.5.1.8
+  - password ==3.0.0.0
+  - password-instances ==3.0.0.0
+  - password-types ==1.0.0.0
+  - path ==0.7.0
+  - path-binary-instance ==0.1.0.1
+  - path-extensions ==0.1.1.0
+  - path-extra ==0.2.0
+  - path-io ==1.6.2
+  - path-like ==0.2.0.2
+  - path-pieces ==0.2.1
+  - path-text-utf8 ==0.0.1.6
+  - pathtype ==0.8.1.1
+  - pathwalk ==0.3.1.2
+  - pattern-arrows ==0.0.2
+  - pava ==0.1.1.1
+  - 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.2
+  - pdfinfo ==1.5.4
+  - peano ==0.1.0.1
+  - pem ==0.2.4
+  - percent-format ==0.0.1
+  - peregrin ==0.3.1
+  - perfect-hash-generator ==0.2.0.6
+  - perfect-vector-shuffle ==0.1.1.1
+  - persist ==0.1.1.5
+  - persistable-record ==0.6.0.5
+  - persistable-types-HDBC-pg ==0.0.3.5
+  - persistent ==2.11.0.4
+  - persistent-documentation ==0.1.0.2
+  - persistent-mtl ==0.2.1.0
+  - persistent-mysql ==2.10.3.1
+  - persistent-pagination ==0.1.1.2
+  - persistent-postgresql ==2.11.0.1
+  - persistent-qq ==2.9.2.1
+  - persistent-sqlite ==2.11.1.0
+  - persistent-template ==2.9.1.0
+  - 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
+  - phantom-state ==0.2.1.2
+  - pid1 ==0.1.2.0
+  - pinboard ==0.10.2.0
+  - pipes ==4.3.15
+  - pipes-aeson ==0.4.1.8
+  - pipes-attoparsec ==0.5.1.5
+  - pipes-binary ==0.4.2
+  - pipes-bytestring ==2.1.7
+  - pipes-concurrency ==2.0.12
+  - pipes-csv ==1.4.3
+  - pipes-extras ==1.0.15
+  - pipes-fastx ==0.3.0.0
+  - pipes-group ==1.0.12
+  - pipes-http ==1.0.6
+  - pipes-network ==0.6.5
+  - pipes-network-tls ==0.4
+  - pipes-ordered-zip ==1.2.1
+  - pipes-parse ==3.0.9
+  - pipes-random ==1.0.0.5
+  - pipes-safe ==2.3.3
+  - pipes-wai ==3.2.0
+  - pkcs10 ==0.2.0.0
+  - pkgtreediff ==0.4.1
+  - place-cursor-at ==1.0.1
+  - placeholders ==0.1
+  - plaid ==0.1.0.4
+  - plotlyhs ==0.2.1
+  - pointed ==5.0.2
+  - pointedlist ==0.6.1
+  - pointless-fun ==1.1.0.6
+  - poll ==0.0.0.2
+  - poly ==0.5.0.0
+  - poly-arity ==0.1.0
+  - polynomials-bernstein ==1.1.2
+  - polyparse ==1.13
+  - polysemy ==1.5.0.0
+  - polysemy-plugin ==0.3.0.0
+  - pooled-io ==0.0.2.2
+  - port-utils ==0.2.1.0
+  - posix-paths ==0.2.1.6
+  - possibly ==1.0.0.0
+  - postgres-options ==0.2.0.0
+  - postgresql-binary ==0.12.4
+  - postgresql-libpq ==0.9.4.3
+  - postgresql-libpq-notify ==0.2.0.0
+  - postgresql-orm ==0.5.1
+  - postgresql-simple ==0.6.4
+  - postgresql-typed ==0.6.2.0
+  - 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.4.0.3
+  - pretty-hex ==1.1
+  - 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
+  - primitive-extras ==0.10.1
+  - primitive-unaligned ==0.1.1.1
+  - primitive-unlifted ==0.1.3.0
+  - print-console-colors ==0.1.0.0
+  - probability ==0.2.7
+  - process-extras ==0.7.4
+  - product-isomorphic ==0.0.3.3
+  - product-profunctors ==0.11.0.2
+  - profiterole ==0.1
+  - profunctors ==5.5.2
+  - projectroot ==0.2.0.1
+  - project-template ==0.2.1.0
+  - prometheus ==2.2.2
+  - prometheus-client ==1.0.1
+  - prometheus-wai-middleware ==1.0.1.0
+  - promises ==0.3
+  - prompt ==0.1.1.2
+  - prospect ==0.1.0.0
+  - proto3-wire ==1.2.1
+  - protobuf ==0.2.1.3
+  - protobuf-simple ==0.1.1.0
+  - protocol-buffers ==2.4.17
+  - 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-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
+  - publicsuffix ==0.20200526
+  - pulse-simple ==0.1.14
+  - pureMD5 ==2.1.3
+  - purescript-bridge ==0.14.0.0
+  - pushbullet-types ==0.4.1.0
+  - pusher-http-haskell ==2.1.0.1
+  - pvar ==1.0.0.0
+  - PyF ==0.9.0.3
+  - qchas ==1.1.0.1
+  - qm-interpolated-string ==0.3.0.0
+  - qrcode-core ==0.9.4
+  - qrcode-juicypixels ==0.8.2
+  - quadratic-irrational ==0.1.1
+  - QuasiText ==0.1.2.6
+  - QuickCheck ==2.14.2
+  - quickcheck-arbitrary-adt ==0.3.1.0
+  - quickcheck-assertions ==0.3.0
+  - quickcheck-classes ==0.6.5.0
+  - quickcheck-classes-base ==0.6.2.0
+  - quickcheck-higherorder ==0.1.0.0
+  - quickcheck-instances ==0.3.25.2
+  - quickcheck-io ==0.2.0
+  - quickcheck-simple ==0.1.1.1
+  - quickcheck-special ==0.1.0.6
+  - quickcheck-text ==0.1.2.1
+  - quickcheck-transformer ==0.3.1.1
+  - quickcheck-unicode ==1.0.1.0
+  - quiet ==0.2
+  - quote-quot ==0.2.0.0
+  - radius ==0.7.1.0
+  - rainbow ==0.34.2.2
+  - rainbox ==0.26.0.0
+  - ral ==0.2
+  - rampart ==1.1.0.2
+  - ramus ==0.1.2
+  - rando ==0.0.0.4
+  - random ==1.1
+  - random-bytestring ==0.1.4
+  - random-fu ==0.2.7.4
+  - random-shuffle ==0.0.4
+  - random-source ==0.3.0.8
+  - random-tree ==0.6.0.5
+  - range ==0.3.0.2
+  - ranged-list ==0.1.0.0
+  - Ranged-sets ==0.4.0
+  - range-set-list ==0.1.3.1
+  - rank1dynamic ==0.4.1
+  - rank2classes ==1.4.1
+  - Rasterific ==0.7.5.3
+  - rasterific-svg ==0.3.3.2
+  - ratel ==1.0.14
+  - rate-limit ==1.4.2
+  - ratel-wai ==1.1.5
+  - rattle ==0.2
+  - rattletrap ==11.1.1
+  - Rattus ==0.5
+  - rawfilepath ==0.2.4
+  - rawstring-qm ==0.2.3.0
+  - raw-strings-qq ==1.1
+  - rcu ==0.2.5
+  - rdf ==0.1.0.5
+  - 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
+  - rebase ==1.6.1
+  - record-dot-preprocessor ==0.2.10
+  - record-hasfield ==1.0
+  - records-sop ==0.1.1.0
+  - record-wrangler ==0.1.1.0
+  - recursion-schemes ==5.2.2.1
+  - reducers ==3.12.3
+  - refact ==0.3.0.2
+  - ref-fd ==0.5
+  - refined ==0.6.2
+  - reflection ==2.1.6
+  - reform ==0.2.7.4
+  - reform-blaze ==0.2.4.3
+  - reform-hamlet ==0.0.5.3
+  - reform-happstack ==0.2.5.4
+  - RefSerialize ==0.4.0
+  - ref-tf ==0.5
+  - regex ==1.1.0.0
+  - regex-applicative ==0.3.4
+  - regex-applicative-text ==0.1.0.1
+  - regex-base ==0.94.0.1
+  - regex-compat ==0.95.2.1
+  - regex-compat-tdfa ==0.95.1.4
+  - regex-pcre ==0.95.0.0
+  - regex-pcre-builtin ==0.95.2.3.8.43
+  - regex-posix ==0.96.0.0
+  - regex-tdfa ==1.3.1.0
+  - regex-with-pcre ==1.1.0.0
+  - registry ==0.2.0.3
+  - reinterpret-cast ==0.1.0
+  - relapse ==1.0.0.0
+  - relational-query ==0.12.2.3
+  - relational-query-HDBC ==0.7.2.0
+  - relational-record ==0.2.2.0
+  - relational-schemas ==0.1.8.0
+  - reliable-io ==0.0.1
+  - relude ==0.7.0.0
+  - renderable ==0.2.0.1
+  - replace-attoparsec ==1.4.4.0
+  - replace-megaparsec ==1.4.4.0
+  - repline ==0.4.0.0
+  - req ==3.9.0
+  - req-conduit ==1.0.0
+  - rerebase ==1.6.1
+  - rescue ==0.4.2.1
+  - resistor-cube ==0.0.1.2
+  - resolv ==0.1.2.0
+  - resource-pool ==0.2.3.2
+  - resourcet ==1.2.4.2
+  - result ==0.2.6.0
+  - rethinkdb-client-driver ==0.0.25
+  - retry ==0.8.1.2
+  - rev-state ==0.1.2
+  - rfc1751 ==0.1.3
+  - rfc5051 ==0.2
+  - rhbzquery ==0.4.3
+  - rhine ==0.7.0
+  - rhine-gloss ==0.7.0
+  - rigel-viz ==0.2.0.0
+  - rio ==0.1.20.0
+  - rio-orphans ==0.1.2.0
+  - rio-prettyprint ==0.1.1.0
+  - roc-id ==0.1.0.0
+  - rocksdb-haskell ==1.0.1
+  - rocksdb-haskell-jprupp ==2.1.3
+  - rocksdb-query ==0.4.2
+  - roles ==0.2.0.0
+  - rope-utf16-splay ==0.3.2.0
+  - rosezipper ==0.2
+  - rot13 ==0.2.0.1
+  - rpmbuild-order ==0.4.3.2
+  - RSA ==2.4.1
+  - runmemo ==1.0.0.1
+  - rvar ==0.2.0.6
+  - safe ==0.3.19
+  - safe-coloured-text ==0.0.0.0
+  - safecopy ==0.10.4.2
+  - 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.1
+  - salak ==0.3.6
+  - salak-yaml ==0.3.5.3
+  - saltine ==0.1.1.1
+  - salve ==1.0.11
+  - sample-frame ==0.0.3
+  - sample-frame-np ==0.0.4.1
+  - sampling ==0.3.5
+  - sandwich ==0.1.0.5
+  - sandwich-quickcheck ==0.1.0.5
+  - sandwich-slack ==0.1.0.4
+  - sandwich-webdriver ==0.1.0.4
+  - say ==0.1.0.1
+  - sbp ==2.6.3
+  - scalpel ==0.6.2
+  - scalpel-core ==0.6.2
+  - scanf ==0.1.0.0
+  - scanner ==0.3.1
+  - scheduler ==1.5.0
+  - scientific ==0.3.6.2
+  - scotty ==0.12
+  - scrypt ==0.5.0
+  - sdl2 ==2.5.3.0
+  - sdl2-gfx ==0.2
+  - sdl2-image ==2.0.0
+  - sdl2-mixer ==1.1.0
+  - sdl2-ttf ==2.1.2
+  - search-algorithms ==0.3.1
+  - secp256k1-haskell ==0.5.0
+  - securemem ==0.1.10
+  - selda ==0.5.1.0
+  - selda-json ==0.1.1.0
+  - selda-postgresql ==0.1.8.1
+  - selda-sqlite ==0.1.7.1
+  - selections ==0.3.0.0
+  - selective ==0.4.2
+  - semialign ==1.1.0.1
+  - semialign-indexed ==1.1
+  - semialign-optics ==1.1
+  - semigroupoid-extras ==5
+  - semigroupoids ==5.3.5
+  - semigroups ==0.19.1
+  - semirings ==0.6
+  - semiring-simple ==1.0.0.1
+  - semver ==0.4.0.1
+  - sendfile ==0.7.11.1
+  - sendgrid-v3 ==0.3.0.0
+  - seqalign ==0.2.0.4
+  - seqid ==0.6.2
+  - seqid-streams ==0.7.2
+  - sequence-formats ==1.6.1
+  - sequenceTools ==1.4.0.5
+  - serf ==0.1.1.0
+  - serialise ==0.2.3.0
+  - servant ==0.18.2
+  - servant-auth ==0.4.0.0
+  - servant-auth-client ==0.4.1.0
+  - servant-auth-docs ==0.2.10.0
+  - servant-auth-server ==0.4.6.0
+  - servant-auth-swagger ==0.2.10.1
+  - servant-blaze ==0.9.1
+  - servant-client ==0.18.2
+  - servant-client-core ==0.18.2
+  - servant-conduit ==0.15.1
+  - servant-docs ==0.11.8
+  - servant-elm ==0.7.2
+  - servant-errors ==0.1.6.0
+  - servant-exceptions ==0.2.1
+  - servant-exceptions-server ==0.2.1
+  - servant-foreign ==0.15.3
+  - servant-http-streams ==0.18.2
+  - servant-machines ==0.15.1
+  - servant-multipart ==0.12
+  - servant-openapi3 ==2.0.1.2
+  - servant-pipes ==0.15.2
+  - servant-rawm ==1.0.0.0
+  - servant-server ==0.18.2
+  - servant-swagger ==1.1.10
+  - servant-swagger-ui ==0.3.5.3.47.1
+  - servant-swagger-ui-core ==0.3.5
+  - serverless-haskell ==0.12.6
+  - serversession ==1.0.2
+  - serversession-frontend-wai ==1.0
+  - ses-html ==0.4.0.0
+  - set-cover ==0.1.1
+  - setenv ==0.1.1.3
+  - setlocale ==1.0.0.10
+  - sexp-grammar ==2.3.0
+  - SHA ==1.6.4.4
+  - shake-language-c ==0.12.0
+  - shake-plus ==0.3.3.1
+  - shake-plus-extended ==0.4.1.0
+  - shakespeare ==2.0.25
+  - shared-memory ==0.2.0.0
+  - shell-conduit ==5.0.0
+  - shell-escape ==0.2.0
+  - shellmet ==0.0.4.0
+  - 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
+  - signal ==0.1.0.4
+  - silently ==1.2.5.1
+  - simple-affine-space ==0.1.1
+  - simple-cabal ==0.1.3
+  - simple-cmd ==0.2.3
+  - simple-cmd-args ==0.1.6
+  - simple-log ==0.9.12
+  - simple-reflect ==0.3.3
+  - simple-sendfile ==0.2.30
+  - simple-templates ==1.0.0
+  - simple-vec3 ==0.6.0.1
+  - simplistic-generics ==2.0.0
+  - since ==0.0.0
+  - singleton-bool ==0.1.5
+  - singleton-nats ==0.4.5
+  - singletons ==2.7
+  - singletons-presburger ==0.6.0.0
+  - siphash ==1.0.3
+  - sitemap-gen ==0.1.0.0
+  - sized ==1.0.0.0
+  - skein ==1.0.9.4
+  - skews ==0.1.0.3
+  - skip-var ==0.1.1.0
+  - skylighting ==0.10.5.1
+  - skylighting-core ==0.10.5.1
+  - slack-api ==0.12
+  - slack-progressbar ==0.1.0.1
+  - slick ==1.1.1.0
+  - slist ==0.2.0.0
+  - slynx ==0.5.0.2
+  - smallcheck ==1.2.1
+  - smash ==0.1.2
+  - smash-aeson ==0.1.0.0
+  - smash-lens ==0.1.0.1
+  - smash-microlens ==0.1.0.0
+  - smoothie ==0.4.2.11
+  - smtp-mail ==0.3.0.0
+  - snap-blaze ==0.2.1.5
+  - snap-core ==1.0.4.2
+  - snap-server ==1.1.2.0
+  - snowflake ==0.1.1.1
+  - soap ==0.2.3.6
+  - soap-openssl ==0.1.0.2
+  - soap-tls ==0.1.1.4
+  - socket ==0.8.3.0
+  - socks ==0.6.1
+  - some ==1.0.3
+  - sop-core ==0.5.0.1
+  - sort ==1.0.0.0
+  - sorted-list ==0.2.1.0
+  - sourcemap ==0.1.6.1
+  - sox ==0.2.3.1
+  - soxlib ==0.0.3.1
+  - spacecookie ==1.0.0.0
+  - sparse-linear-algebra ==0.3.1
+  - sparse-tensor ==0.2.1.5
+  - spatial-math ==0.5.0.1
+  - special-values ==0.1.0.0
+  - speculate ==0.4.6
+  - speedy-slice ==0.3.2
+  - Spintax ==0.3.6
+  - splice ==0.6.1.1
+  - splint ==1.0.1.4
+  - split ==0.2.3.4
+  - splitmix ==0.1.0.3
+  - spoon ==0.3.1
+  - spreadsheet ==0.1.3.8
+  - 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.6
+  - stache ==2.2.1
+  - stackcollapse-ghc ==0.0.1.3
+  - stack-templatizer ==0.1.0.2
+  - stateref ==0.3
+  - StateVar ==1.2.1
+  - static-text ==0.2.0.6
+  - statistics ==0.15.2.0
+  - status-notifier-item ==0.3.0.5
+  - stb-image-redux ==0.2.1.3
+  - step-function ==0.2
+  - stm-chans ==3.0.0.4
+  - stm-conduit ==4.0.1
+  - stm-containers ==1.2
+  - stm-delay ==0.1.1.1
+  - stm-extras ==0.1.0.3
+  - stm-hamt ==1.2.0.6
+  - stm-lifted ==2.5.0.0
+  - STMonadTrans ==0.4.5
+  - stm-split ==0.0.2.1
+  - stopwatch ==0.1.0.6
+  - storable-complex ==0.2.3.0
+  - storable-endian ==0.2.6
+  - storable-record ==0.0.5
+  - storable-tuple ==0.0.3.3
+  - storablevector ==0.2.13.1
+  - store ==0.7.11
+  - store-core ==0.4.4.4
+  - store-streaming ==0.2.0.3
+  - stratosphere ==0.59.1
+  - streaming ==0.2.3.0
+  - streaming-attoparsec ==1.0.0.1
+  - streaming-bytestring ==0.2.0
+  - streaming-commons ==0.2.2.1
+  - streamly ==0.7.3
+  - streams ==3.3
+  - strict ==0.4.0.1
+  - strict-concurrency ==0.2.4.3
+  - 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
+  - string-conversions ==0.4.0.1
+  - string-interpolate ==0.3.1.0
+  - string-qq ==0.0.4
+  - string-random ==0.1.4.1
+  - stringsearch ==0.3.6.6
+  - string-transform ==1.1.1
+  - stripe-concepts ==1.0.2.6
+  - stripe-core ==2.6.2
+  - stripe-haskell ==2.6.2
+  - stripe-http-client ==2.6.2
+  - stripe-tests ==2.6.2
+  - strive ==5.0.14
+  - structs ==0.1.6
+  - structured ==0.1.0.1
+  - structured-cli ==2.7.0.1
+  - subcategories ==0.1.1.0
+  - sum-type-boilerplate ==0.1.1
+  - sundown ==0.6
+  - superbuffer ==0.3.1.1
+  - svg-tree ==0.6.2.4
+  - swagger ==0.3.0
+  - swagger2 ==2.6
+  - sweet-egison ==0.1.1.3
+  - swish ==0.10.0.4
+  - syb ==0.7.2.1
+  - sydtest ==0.1.0.0
+  - sydtest-discover ==0.0.0.0
+  - sydtest-persistent-sqlite ==0.0.0.0
+  - sydtest-servant ==0.0.0.0
+  - sydtest-wai ==0.0.0.0
+  - sydtest-yesod ==0.0.0.0
+  - symbol ==0.2.4
+  - symengine ==0.1.2.0
+  - symmetry-operations-symbols ==0.0.2.1
+  - 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.2
+  - tabular ==0.2.2.8
+  - taffybar ==3.2.3
+  - tagchup ==0.4.1.1
+  - tagged ==0.8.6.1
+  - tagged-binary ==0.2.0.1
+  - tagged-identity ==0.1.3
+  - tagged-transformer ==0.8.1
+  - tagshare ==0.0
+  - tagsoup ==0.14.8
+  - tao ==1.0.0
+  - tao-example ==1.0.0
+  - tar ==0.5.1.1
+  - tar-conduit ==0.3.2
+  - tardis ==0.4.3.0
+  - tasty ==1.4.1
+  - tasty-ant-xml ==1.1.8
+  - tasty-bench ==0.2.5
+  - tasty-dejafu ==2.0.0.7
+  - tasty-discover ==4.2.2
+  - tasty-expected-failure ==0.12.3
+  - tasty-focus ==1.0.1
+  - tasty-golden ==2.3.4
+  - tasty-hedgehog ==1.0.1.0
+  - tasty-hspec ==1.1.6
+  - tasty-hunit ==0.10.0.3
+  - tasty-hunit-compat ==0.2.0.1
+  - tasty-kat ==0.0.3
+  - tasty-leancheck ==0.0.1
+  - tasty-lua ==0.2.3.2
+  - tasty-program ==1.0.5
+  - tasty-quickcheck ==0.10.1.2
+  - tasty-rerun ==1.1.18
+  - tasty-silver ==3.2.1
+  - tasty-smallcheck ==0.8.2
+  - tasty-test-reporter ==0.1.1.4
+  - tasty-th ==0.1.7
+  - tasty-wai ==0.1.1.1
+  - Taxonomy ==2.1.0
+  - TCache ==0.12.1
+  - tce-conf ==1.3
+  - tdigest ==0.2.1.1
+  - template-haskell-compat-v0208 ==0.1.5
+  - temporary ==1.3
+  - temporary-rc ==1.2.0.3
+  - temporary-resourcet ==0.1.0.1
+  - tensorflow-test ==0.1.0.0
+  - tensors ==0.1.5
+  - termbox ==0.3.0
+  - terminal-progress-bar ==0.4.1
+  - terminal-size ==0.3.2.1
+  - test-framework ==0.8.2.0
+  - test-framework-hunit ==0.3.0.2
+  - test-framework-leancheck ==0.0.1
+  - test-framework-quickcheck2 ==0.3.0.5
+  - test-framework-smallcheck ==0.2
+  - test-fun ==0.1.0.0
+  - testing-type-modifiers ==0.1.0.1
+  - texmath ==0.12.2
+  - text-ansi ==0.1.1
+  - text-binary ==0.2.1.1
+  - text-builder ==0.6.6.2
+  - text-conversions ==0.3.1
+  - text-format ==0.3.2
+  - 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.3.0.0
+  - text-metrics ==0.3.0
+  - text-postgresql ==0.0.3.1
+  - text-printer ==0.5.0.1
+  - text-regex-replace ==0.1.1.4
+  - text-region ==0.3.1.0
+  - text-short ==0.1.3
+  - text-show ==3.9
+  - text-show-instances ==3.8.4
+  - text-zipper ==0.11
+  - tfp ==1.0.2
+  - tf-random ==0.5
+  - th-abstraction ==0.4.2.0
+  - th-bang-compat ==0.0.1.0
+  - th-compat ==0.1.2
+  - th-constraint-compat ==0.0.1.0
+  - 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.2
+  - these-optics ==1.0.1.2
+  - these-skinny ==0.7.4
+  - th-expand-syns ==0.4.8.0
+  - th-extras ==0.0.0.4
+  - th-lift ==0.8.2
+  - th-lift-instances ==0.1.18
+  - 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.3
+  - thyme ==0.3.5.5
+  - tidal ==1.7.4
+  - 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
+  - timezone-olson ==0.2.0
+  - timezone-series ==0.1.9
+  - tinylog ==0.15.0
+  - titlecase ==1.0.1
+  - tldr ==0.9.0
+  - tls ==1.5.5
+  - tls-debug ==0.4.8
+  - tls-session-manager ==0.0.4
+  - tlynx ==0.5.0.2
+  - tmapchan ==0.0.3
+  - tmapmvar ==0.0.4
+  - tmp-postgres ==1.34.1.0
+  - tomland ==1.3.2.0
+  - tonalude ==0.1.1.1
+  - topograph ==1.0.0.1
+  - torsor ==0.1
+  - tostring ==0.2.1.1
+  - transaction ==0.1.1.3
+  - transformers-base ==0.4.5.2
+  - transformers-bifunctors ==0.1
+  - transformers-compat ==0.6.6
+  - transformers-fix ==1.0
+  - traverse-with-class ==1.0.1.0
+  - tree-diff ==0.2
+  - tree-fun ==0.8.1.0
+  - tree-view ==0.5.1
+  - trifecta ==2.1.1
+  - triplesec ==0.2.2.1
+  - tsv2csv ==0.1.0.2
+  - ttc ==0.4.0.0
+  - 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
+  - turtle ==1.5.22
+  - typecheck-plugin-nat-simple ==0.1.0.2
+  - 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
+  - type-hint ==0.1
+  - type-level-integers ==0.0.1
+  - type-level-kv-list ==1.1.0
+  - type-level-natural-number ==2.0
+  - type-level-numbers ==0.1.1.1
+  - type-map ==0.1.6.0
+  - type-natural ==1.1.0.0
+  - typenums ==0.1.4
+  - type-of-html ==1.6.2.0
+  - 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
+  - tzdata ==0.2.20201021.0
+  - ua-parser ==0.7.6.0
+  - uglymemo ==0.1.0.1
+  - ulid ==0.3.0.0
+  - unagi-chan ==0.4.1.3
+  - unbounded-delays ==0.1.1.1
+  - unboxed-ref ==0.4.0.0
+  - unboxing-vector ==0.2.0.0
+  - uncaught-exception ==0.1.0
+  - uncertain ==0.3.1.0
+  - unconstrained ==0.1.0.2
+  - unexceptionalio ==0.5.1
+  - unexceptionalio-trans ==0.5.1
+  - unicode ==0.0.1.1
+  - unicode-show ==0.1.0.4
+  - unicode-transforms ==0.3.7.1
+  - unification-fd ==0.11.1
+  - union-find ==0.2
+  - unipatterns ==0.0.0.0
+  - uniplate ==1.6.13
+  - uniprot-kb ==0.1.2.0
+  - uniq-deep ==1.2.0
+  - unique ==0.0.1
+  - unique-logic ==0.4
+  - unique-logic-tf ==0.5.1
+  - unit-constraint ==0.0.0
+  - universe ==1.2.1
+  - universe-base ==1.1.2
+  - universe-instances-base ==1.1
+  - universe-instances-extended ==1.1.2
+  - universe-instances-trans ==1.1
+  - universe-reverse-instances ==1.1.1
+  - universe-some ==1.2.1
+  - universum ==1.7.2
+  - unix-bytestring ==0.3.7.3
+  - unix-compat ==0.5.3
+  - unix-time ==0.4.7
+  - unliftio ==0.2.14
+  - unliftio-core ==0.2.0.1
+  - unliftio-pool ==0.2.1.1
+  - unliftio-streams ==0.1.1.1
+  - unlit ==0.4.0.0
+  - unordered-containers ==0.2.13.0
+  - unsafe ==0.0
+  - urbit-hob ==0.3.3
+  - uri-bytestring ==0.3.3.0
+  - uri-bytestring-aeson ==0.1.0.8
+  - uri-encode ==1.5.0.7
+  - url ==2.1.3
+  - users ==0.5.0.0
+  - utf8-conversions ==0.1.0.4
+  - utf8-light ==0.4.2
+  - utf8-string ==1.0.2
+  - util ==0.1.17.1
+  - utility-ht ==0.0.16
+  - uuid ==1.3.14
+  - uuid-types ==1.0.4
+  - validation ==1.1.1
+  - validation-selective ==0.1.0.1
+  - validity ==0.11.0.0
+  - validity-aeson ==0.2.0.4
+  - validity-bytestring ==0.4.1.1
+  - validity-containers ==0.5.0.4
+  - validity-path ==0.4.0.1
+  - validity-persistent ==0.0.0.0
+  - validity-primitive ==0.0.0.1
+  - validity-scientific ==0.2.0.3
+  - validity-text ==0.3.1.1
+  - validity-time ==0.4.0.0
+  - validity-unordered-containers ==0.2.0.3
+  - validity-uuid ==0.1.0.3
+  - validity-vector ==0.2.0.3
+  - valor ==0.1.0.0
+  - vault ==0.3.1.5
+  - vec ==0.4
+  - vector ==0.12.3.0
+  - vector-algorithms ==0.8.0.4
+  - vector-binary-instances ==0.2.5.2
+  - vector-buffer ==0.4.1
+  - vector-builder ==0.3.8.1
+  - vector-bytes-instances ==0.1.1
+  - vector-circular ==0.1.3
+  - vector-instances ==3.4
+  - vector-mmap ==0.0.3
+  - vector-rotcev ==0.1.0.0
+  - vector-sized ==1.4.3.1
+  - vector-space ==0.16
+  - vector-split ==1.0.0.2
+  - vector-th-unbox ==0.2.1.9
+  - verbosity ==0.4.0.0
+  - versions ==4.0.3
+  - vformat ==0.14.1.0
+  - vformat-aeson ==0.1.0.1
+  - vformat-time ==0.1.0.0
+  - ViennaRNAParser ==1.3.3
+  - vinyl ==0.13.1
+  - void ==0.7.3
+  - vty ==5.33
+  - wai ==3.2.3
+  - wai-app-static ==3.1.7.2
+  - wai-conduit ==3.0.0.4
+  - wai-cors ==0.2.7
+  - wai-enforce-https ==0.0.2.1
+  - wai-eventsource ==3.0.0
+  - wai-extra ==3.1.6
+  - wai-feature-flags ==0.1.0.1
+  - wai-handler-launch ==3.0.3.1
+  - wai-logger ==2.3.6
+  - wai-middleware-auth ==0.2.4.1
+  - wai-middleware-caching ==0.1.0.2
+  - wai-middleware-clacks ==0.1.0.1
+  - wai-middleware-static ==0.9.0
+  - wai-rate-limit ==0.1.0.0
+  - wai-rate-limit-redis ==0.1.0.0
+  - wai-saml2 ==0.2.1.2
+  - wai-session ==0.3.3
+  - wai-session-redis ==0.1.0.1
+  - wai-slack-middleware ==0.2.0
+  - wai-websockets ==3.0.1.2
+  - wakame ==0.1.0.0
+  - warp ==3.3.15
+  - warp-tls ==3.3.0
+  - warp-tls-uid ==0.2.0.6
+  - wave ==0.2.0
+  - wcwidth ==0.0.2
+  - webby ==1.0.1
+  - webdriver ==0.9.0.1
+  - webex-teams-api ==0.2.0.1
+  - webex-teams-conduit ==0.2.0.1
+  - webex-teams-pipes ==0.2.0.1
+  - webgear-server ==0.2.1
+  - webrtc-vad ==0.1.0.3
+  - websockets ==0.12.7.2
+  - websockets-snap ==0.10.3.1
+  - weigh ==0.0.16
+  - wide-word ==0.1.1.2
+  - wikicfp-scraper ==0.1.0.12
+  - wild-bind ==0.1.2.7
+  - wild-bind-x11 ==0.2.0.12
+  - Win32 ==2.6.1.0
+  - Win32-notify ==0.3.0.3
+  - windns ==0.1.0.1
+  - witch ==0.2.1.1
+  - witherable ==0.4.1
+  - within ==0.2.0.1
+  - with-location ==0.1.0
+  - with-utf8 ==1.0.2.2
+  - 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
+  - world-peace ==1.0.2.0
+  - wrap ==0.0.0
+  - wreq ==0.5.3.3
+  - writer-cps-exceptions ==0.1.0.1
+  - writer-cps-mtl ==0.1.1.6
+  - writer-cps-transformers ==0.5.6.1
+  - wss-client ==0.3.0.0
+  - wuss ==1.1.18
+  - X11 ==1.9.2
+  - X11-xft ==0.3.1
+  - x11-xim ==0.0.9.0
+  - x509 ==1.7.5
+  - x509-store ==1.6.7
+  - x509-system ==1.6.6
+  - x509-validation ==1.6.11
+  - Xauth ==0.1
+  - xdg-basedir ==0.2.2
+  - xdg-desktop-entry ==0.1.1.1
+  - xdg-userdirs ==0.1.0.2
+  - xeno ==0.4.2
+  - xlsx ==0.8.3
+  - xlsx-tabular ==0.2.2.1
+  - xml ==1.3.14
+  - xml-basic ==0.1.3.1
+  - xml-conduit ==1.9.1.1
+  - 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
+  - xml-indexed-cursor ==0.1.1.0
+  - xml-lens ==0.3
+  - xml-picklers ==0.3.6
+  - xml-to-json ==2.0.1
+  - xml-to-json-fast ==2.0.0
+  - xml-types ==0.3.8
+  - xmonad ==0.15
+  - xmonad-contrib ==0.16
+  - 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.3
+  - yesod ==1.6.1.1
+  - yesod-auth ==1.6.10.3
+  - yesod-auth-hashdb ==1.7.1.6
+  - yesod-auth-oauth2 ==0.6.3.0
+  - yesod-bin ==1.6.1
+  - yesod-core ==1.6.19.0
+  - yesod-fb ==0.6.1
+  - yesod-form ==1.6.7
+  - yesod-gitrev ==0.2.1
+  - yesod-markdown ==0.12.6.9
+  - yesod-newsfeed ==1.7.0.0
+  - yesod-page-cursor ==2.0.0.6
+  - yesod-paginator ==1.1.1.0
+  - yesod-persistent ==1.6.0.6
+  - yesod-sitemap ==1.6.0
+  - yesod-static ==1.6.1.0
+  - yesod-test ==1.6.12
+  - yesod-websockets ==0.3.0.3
+  - yes-precure5-command ==5.5.3
+  - yi-rope ==0.11
+  - yjsvg ==0.2.0.1
+  - yjtools ==0.9.18
+  - yoga ==0.0.0.5
+  - youtube ==0.2.1.1
+  - zenacy-html ==2.0.3
+  - zenacy-unicode ==1.0.1
+  - zero ==0.1.5
+  - zeromq4-haskell ==0.8.0
+  - zeromq4-patterns ==0.3.1.0
+  - zim-parser ==0.2.1.0
+  - zio ==0.1.0.2
+  - zip ==1.7.0
+  - zip-archive ==0.4.1
+  - zipper-extra ==0.1.3.2
+  - zippers ==0.3.1
+  - zip-stream ==0.2.1.0
+  - zlib ==0.6.2.3
+  - zlib-bindings ==0.1.1.5
+  - zlib-lens ==0.1.2.1
+  - zot ==0.0.3
+  - zstd ==0.1.2.0
+  - ztail ==1.2.0.2
+  - zydiskell ==0.2.0.0
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
new file mode 100644
index 00000000000..7a68332fc8f
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -0,0 +1,121 @@
+# This file is automatically generated by
+# maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
+# It is supposed to list all haskellPackages that cannot evaluate because they
+# depend on a dependency marked as broken.
+dont-distribute-packages:
+ - AesonBson
+ - HGamer3D-API
+ - HGamer3D-CAudio-Binding
+ - HGamer3D-OIS-Binding
+ - HipmunkPlayground
+ - Holumbus-Distribution
+ - Holumbus-MapReduce
+ - Holumbus-Storage
+ - KiCS
+ - KiCS-debugger
+ - KiCS-prophecy
+ - RESTng
+ - ViennaRNA-bindings
+ - XML
+ - acme-safe
+ - aeson-bson
+ - approx-rand-test
+ - barley
+ - bson-mapping
+ - clash-prelude-quickcheck
+ - click-clack
+ - cloudyfs
+ - cognimeta-utils
+ - comark
+ - comonad-random
+ - containers-accelerate
+ - definitive-graphics
+ - ecdsa
+ - effective-aspects-mzv
+ - eliminators_0_8
+ - fltkhs-demos
+ - fltkhs-fluid-demos
+ - fltkhs-hello-world
+ - fltkhs-themes
+ - fluent-logger-conduit
+ - gi-gtk_4_0_4
+ - goat
+ - gridfs
+ - gsmenu
+ - gtk2hs-cast-glade
+ - gtk2hs-cast-gnomevfs
+ - gtk2hs-cast-gtkglext
+ - gtk2hs-cast-gtksourceview2
+ - hakyll-contrib-i18n
+ - hascat
+ - hascat-lib
+ - hascat-setup
+ - hascat-system
+ - haste-gapi
+ - haste-perch
+ - hatexmpp3
+ - hplayground
+ - hs2dot
+ - hsqml-datamodel-vinyl
+ - hsqml-demo-morris
+ - hsqml-morris
+ - hubris
+ - hxt-binary
+ - hxt-filter
+ - imprevu-happstack
+ - javaclass
+ - keera-posture
+ - lambdabot-xmpp
+ - leksah
+ - liquidhaskell-cabal-demo
+ - mp3decoder
+ - network-pgi
+ - nomyx-api
+ - nomyx-core
+ - nomyx-language
+ - nomyx-library
+ - nomyx-server
+ - one-liner_2_0
+ - openpgp-crypto-api
+ - patch-image
+ - perdure
+ - persistent-mysql_2_12_1_0
+ - persistent-postgresql_2_12_1_1
+ - persistent-sqlite_2_12_0_0
+ - pontarius-mediaserver
+ - pontarius-xmpp-extras
+ - pontarius-xpmn
+ - procrastinating-structure
+ - reactive
+ - redHandlers
+ - reflex-dom-colonnade
+ - regex-genex
+ - ribosome
+ - ribosome-root
+ - ribosome-test
+ - ripple
+ - robot
+ - roguestar-engine
+ - roguestar-gl
+ - roguestar-glut
+ - route-generator
+ - sc2hs
+ - sexpresso
+ - shine-varying
+ - singleton-nats_0_4_6
+ - smtp2mta
+ - sneathlane-haste
+ - sock2stream
+ - starrover2
+ - text-xml-generic
+ - trasa-reflex
+ - treersec
+ - tuple-hlist
+ - wai-dispatch
+ - wai-hastache
+ - wai-middleware-brotli
+ - wai-session-tokyocabinet
+ - wx
+ - wxc
+ - wxcore
+

From dfaca8a8ac00ca7a1738f7bfef868201587c423e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@users.noreply.github.com>
Date: Fri, 7 May 2021 22:24:18 +0200
Subject: [PATCH 119/143] python3Packages.spidev: set platforms to linux only
 (#122091)

The module interfaces with the linux kernel and its sysfs, so it is
unsupported on anything but Linux.
---
 pkgs/development/python-modules/spidev/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/spidev/default.nix b/pkgs/development/python-modules/spidev/default.nix
index 0d0fd582363..90ca839bc1e 100644
--- a/pkgs/development/python-modules/spidev/default.nix
+++ b/pkgs/development/python-modules/spidev/default.nix
@@ -19,6 +19,7 @@ buildPythonPackage rec {
     description = "Python bindings for Linux SPI access through spidev";
     license = licenses.mit;
     maintainers = with maintainers; [ hexa ];
+    platforms = platforms.linux;
   };
 
 }

From 587f96abc73ab1fea0673237854a3a758a9420bb Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 7 May 2021 21:34:43 +0200
Subject: [PATCH 120/143] cloc: 1.88 -> 1.90

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

diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index 3e18d3f4b54..939c9f744f4 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cloc";
-  version = "1.88";
+  version = "1.90";
 
   src = fetchFromGitHub {
     owner = "AlDanial";
     repo = "cloc";
-    rev = version;
-    sha256 = "1ixgswzbzv63bl50gb2kgaqr0jcicjz6w610hi9fal1i7744zraw";
+    rev = "v${version}";
+    sha256 = "0ic9q6qqw5f1wafp9lpmhr0miasbdb9zr59c0jlymnzffdmnliyc";
   };
 
   setSourceRoot = ''

From 2d64c6d79bc5f9071fec3045161093c551875042 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@users.noreply.github.com>
Date: Fri, 7 May 2021 22:33:13 +0200
Subject: [PATCH 121/143] igraph: enable autodetection for LTO support
 (#122058)

> The IGRAPH_ENABLE_LTO build option now supports the AUTO value, which
> uses LTO only if the compiler supports it. Warning: CMake may not
> always be able to detect that LTO is not fully supported. Therefore,
> the default setting is OFF.

https://igraph.org/2021/03/23/igraph-0.9.1-c.html
---
 pkgs/development/libraries/igraph/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix
index 8dab59e9947..29e12cc8541 100644
--- a/pkgs/development/libraries/igraph/default.nix
+++ b/pkgs/development/libraries/igraph/default.nix
@@ -77,15 +77,17 @@ stdenv.mkDerivation rec {
     "-DIGRAPH_USE_INTERNAL_GMP=OFF"
     "-DIGRAPH_GLPK_SUPPORT=ON"
     "-DIGRAPH_GRAPHML_SUPPORT=ON"
-    "-DIGRAPH_ENABLE_LTO=ON"
+    "-DIGRAPH_ENABLE_LTO=AUTO"
     "-DIGRAPH_ENABLE_TLS=ON"
     "-DBUILD_SHARED_LIBS=ON"
   ];
 
   doCheck = true;
 
-  preCheck = ''
-    # needed to find libigraph.so
+  # needed to find libigraph, and liblas on darwin
+  preCheck = if stdenv.isDarwin then ''
+    export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [ blas ]}:$PWD/src"
+  '' else ''
     export LD_LIBRARY_PATH="$PWD/src"
   '';
 

From e41af2b3e2aa992e589e48ef0ad3e642a0080ba3 Mon Sep 17 00:00:00 2001
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
Date: Fri, 7 May 2021 16:37:56 -0400
Subject: [PATCH 122/143] python3Packages.nmigen: unbreak (#121846)

---
 pkgs/development/python-modules/nmigen/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix
index 1e38a087bce..d42e27a2932 100644
--- a/pkgs/development/python-modules/nmigen/default.nix
+++ b/pkgs/development/python-modules/nmigen/default.nix
@@ -3,11 +3,12 @@
 , pythonOlder
 , fetchFromGitHub
 , setuptools
-, setuptools_scm
+, setuptools-scm
 , pyvcd
 , jinja2
 , importlib-resources
 , importlib-metadata
+, git
 
 # for tests
 , pytestCheckHook
@@ -30,7 +31,7 @@ buildPythonPackage rec {
     sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1";
   };
 
-  nativeBuildInputs = [ setuptools_scm ];
+  nativeBuildInputs = [ setuptools-scm git ];
 
   propagatedBuildInputs = [
     setuptools

From a2871ba445582b5faa225a137ed0532f495cf2ca Mon Sep 17 00:00:00 2001
From: Jonas Chevalier <zimbatm@zimbatm.com>
Date: Fri, 7 May 2021 22:43:06 +0200
Subject: [PATCH 123/143] treefmt: 0.1.1 -> 0.2.0 (#122055)

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

diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix
index c90492c6aec..9b426882fe5 100644
--- a/pkgs/development/tools/treefmt/default.nix
+++ b/pkgs/development/tools/treefmt/default.nix
@@ -1,16 +1,16 @@
 { lib, rustPlatform, fetchFromGitHub }:
 rustPlatform.buildRustPackage rec {
   pname = "treefmt";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "treefmt";
     rev = "v${version}";
-    sha256 = "0a4yikkqppawii1q0kzsxwfp1aid688wa0lixjwfsl279lr69css";
+    sha256 = "10mv18hsyz5kd001i6cgk0xag4yk7rhxvs09acp2s68qni1v8vx2";
   };
 
-  cargoSha256 = "08k60gd23yanfraxpbw9hi7jbqgsxz9mv1ci6q9piis5742zlj9s";
+  cargoSha256 = "02455sk8n900j8qr79mrchk7m0gb4chhw0saa280p86vn56flvs0";
 
   meta = {
     description = "one CLI to format the code tree";

From 54ada505a81e92dcb48526c0b35e11999cc99f23 Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Thu, 6 May 2021 19:38:55 +0000
Subject: [PATCH 124/143] go_1_16: 1.16.3 -> 1.16.4

---
 pkgs/development/compilers/go/1.16.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix
index f82a0d72b7a..219f19ad27c 100644
--- a/pkgs/development/compilers/go/1.16.nix
+++ b/pkgs/development/compilers/go/1.16.nix
@@ -11,7 +11,7 @@ let
 
   inherit (lib) optionals optionalString;
 
-  version = "1.16.3";
+  version = "1.16.4";
 
   go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "sha256-spjSnekjbKR6Aj44IxO8wtLu0x36cGtgoEEDzoOnGiU=";
+    sha256 = "sha256-rk9rbioWd9MYF5hGVadiB0tTVtpQ+1hyK5kQSHDUNQM=";
   };
 
   # perl is used for testing go vet

From a916ffbb2752be32b1d44cf40bed4dbc1974da62 Mon Sep 17 00:00:00 2001
From: Danielle Lancashire <dani@builds.terrible.systems>
Date: Thu, 6 May 2021 19:40:39 +0000
Subject: [PATCH 125/143] go_1_15: 1.15.11 -> 1.15.12

---
 pkgs/development/compilers/go/1.15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix
index 7f7870b7e06..1aa0ec03017 100644
--- a/pkgs/development/compilers/go/1.15.nix
+++ b/pkgs/development/compilers/go/1.15.nix
@@ -11,7 +11,7 @@ let
 
   inherit (lib) optionals optionalString;
 
-  version = "1.15.11";
+  version = "1.15.12";
 
   go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "1rb1s130yqy80kcl140k5a53xhvw4fmrpmclvqygcv67si0j8nzj";
+    sha256 = "sha256-HGkRk330onf6dOe378PQhZRJjExK3AtsSuNWYTdSgJE=";
   };
 
   # perl is used for testing go vet

From 29ca0ab721fd729c9173224fb7ff90cbccb9d0ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Fri, 7 May 2021 21:03:26 +0200
Subject: [PATCH 126/143] python3Packages.kmapper: fix tests

---
 .../python-modules/kmapper/default.nix         | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix
index 6c173661084..abba8354399 100644
--- a/pkgs/development/python-modules/kmapper/default.nix
+++ b/pkgs/development/python-modules/kmapper/default.nix
@@ -1,11 +1,11 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , scikitlearn
 , numpy
 , scipy
 , jinja2
-, pytest
+, pytestCheckHook
 , networkx
 , matplotlib
 , python-igraph
@@ -17,9 +17,11 @@ buildPythonPackage rec {
   pname = "kmapper";
   version = "2.0.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3708d889f96f6bbe89c52000dd9378ca4c35638180ff894b64ebbdfcfe62aab2";
+  src = fetchFromGitHub {
+    owner = "scikit-tda";
+    repo = "kepler-mapper";
+    rev = "v${version}";
+    sha256 = "0djm27si2bn18khrbb7rwhflc5ma6g9smhikhk5i1apwn5avm6l4";
   };
 
   propagatedBuildInputs = [
@@ -30,7 +32,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    pytest
+    pytestCheckHook
     networkx
     matplotlib
     python-igraph
@@ -38,10 +40,6 @@ buildPythonPackage rec {
     ipywidgets
   ];
 
-  checkPhase = ''
-    pytest test --ignore test/test_drawing.py
-  '';
-
   meta = with lib; {
     description = "Python implementation of Mapper algorithm for Topological Data Analysis";
     homepage = "https://kepler-mapper.scikit-tda.org/";

From a014b77adeb2dad67d72be0e22f1dfe9686e82c4 Mon Sep 17 00:00:00 2001
From: evalexpr <jonathan@wilkins.tech>
Date: Fri, 7 May 2021 22:16:06 +0100
Subject: [PATCH 127/143] python39Packages.pushbullet: add missing dependency
 (#122080)

also switch to pytestCheckHook
---
 .../python-modules/pushbullet/default.nix     | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix
index 68c9d9180dc..43cab7db675 100644
--- a/pkgs/development/python-modules/pushbullet/default.nix
+++ b/pkgs/development/python-modules/pushbullet/default.nix
@@ -1,6 +1,12 @@
-{ lib, buildPythonPackage, fetchPypi
-, requests, websocket_client, python_magic
-, pytest, mock }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, websocket_client
+, python_magic
+, cryptography
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "pushbullet.py";
@@ -11,13 +17,17 @@ buildPythonPackage rec {
     sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
   };
 
-  propagatedBuildInputs = [ requests websocket_client python_magic ];
+  propagatedBuildInputs = [ cryptography requests websocket_client python_magic ];
 
-  checkInputs = [ pytest mock ];
-
-  checkPhase = ''
-    PUSHBULLET_API_KEY="" py.test -k "not test_e2e and not test_auth"
+  preCheck = ''
+    export PUSHBULLET_API_KEY=""
   '';
+  checkInputs = [ pytestCheckHook ];
+  disabledTests = [
+    "test_auth_fail"
+    "test_auth_success"
+    "test_decryption"
+  ];
 
   meta = with lib; {
     description = "A simple python client for pushbullet.com";

From c16380b5b46872c011d6aad9b7698e08fe6041a7 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 7 May 2021 20:57:33 +0200
Subject: [PATCH 128/143] gnuapl: Fix build

One instance of this error/warning comes up during the build.
According to the comment in the code they know what they are doing,
so this can be ignored.
---
 pkgs/development/interpreters/gnu-apl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index 9ae373ff7a8..abfa74bb67d 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     "-Wno-error=class-memaccess"
     "-Wno-error=restrict"
     "-Wno-error=format-truncation"
+    # Needed with GCC 10
+    "-Wno-error=maybe-uninitialized"
    ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference");
 
   patchPhase = lib.optionalString stdenv.isDarwin ''

From 8bdfc34ab0ef717504418b2388b881927934466f Mon Sep 17 00:00:00 2001
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
Date: Fri, 7 May 2021 18:00:04 -0400
Subject: [PATCH 129/143] python3Packages.pyvex: fix on darwin

---
 pkgs/development/python-modules/pyvex/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 310170d040d..618dfef4171 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -28,6 +28,7 @@ buildPythonPackage rec {
 
   preBuild = ''
     export CC=${stdenv.cc.targetPrefix}cc
+    substituteInPlace pyvex_c/Makefile --replace 'AR=ar' 'AR=${stdenv.cc.targetPrefix}ar'
   '';
 
   # No tests are available on PyPI, GitHub release has tests

From 6549f6357bc363320b8036a417a180b7f3b7b7cd Mon Sep 17 00:00:00 2001
From: Jonathan Wilkins <jonathan@wilkins.tech>
Date: Fri, 7 May 2021 20:35:04 +0100
Subject: [PATCH 130/143] python38Packages.atlassian-python-api: switch to
 fetching from GitHub

The pypi source code doesn't contain the response stubs necessary for
the tests to pass
---
 .../atlassian-python-api/default.nix          | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix
index 617d5562b43..31d615f5314 100755
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@@ -1,30 +1,28 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, isPy3k
-, certifi
-, chardet
+, fetchFromGitHub
 , deprecated
-, idna
 , oauthlib
 , requests
 , requests_oauthlib
 , six
-, urllib3
-, pytestrunner
-, pytest
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "atlassian-python-api";
   version = "3.8.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "7ef384a91a790c807336e2bd6b7554284691aadd6d7413d199baf752dd84c53e";
+  src = fetchFromGitHub {
+    owner = "atlassian-api";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-J0/CtfBtOdWReKQS/VvOL/3r+j4zJfnv/ICIXepKUvc=";
   };
 
-  checkInputs = [ pytestrunner pytest ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   propagatedBuildInputs = [ deprecated oauthlib requests requests_oauthlib six ];
 

From 15e309b2b6d8505cdcebe59460ff73e617103cf6 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 7 May 2021 23:32:12 +0200
Subject: [PATCH 131/143] svtplay-dl: 3.6 -> 3.7

---
 pkgs/tools/misc/svtplay-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 67548e305d7..1d78759761d 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -8,13 +8,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "svtplay-dl";
-  version = "3.6";
+  version = "3.7";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "1hnbpj4k08356k2rmsairbfnxwfxs5lv59nxcj6hy5wf162h2hzb";
+    sha256 = "0krskxbmlglkipqzjwgm2nmq118m8l0djgh0f8l6n2w3bjblhyfx";
   };
 
   pythonPaths = [ cryptography pyyaml requests ];

From 2c301e3f3fb78cbea4d77c09cd3cbc99d5fa6e0e Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Fri, 7 May 2021 15:49:00 -0400
Subject: [PATCH 132/143] python3Packages.cvxpy: disable OpenMP on Darwin

Matches upstream, which doesn't test OpenMP on Darwin.
---
 pkgs/development/python-modules/cvxpy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index 1d060c41bb2..359ee96f60a 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -9,7 +9,7 @@
 , osqp
 , scipy
 , scs
-, useOpenmp ? true
+, useOpenmp ? (!stdenv.isDarwin)
   # Check inputs
 , pytestCheckHook
 }:

From d807301cceaad1073eb9d5175df270e034269018 Mon Sep 17 00:00:00 2001
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
Date: Fri, 7 May 2021 17:18:34 -0400
Subject: [PATCH 133/143] python3Packages.rfc3339-validator: fix on darwin

---
 .../python-modules/rfc3339-validator/default.nix       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/rfc3339-validator/default.nix b/pkgs/development/python-modules/rfc3339-validator/default.nix
index f51a232550b..07bc719698a 100644
--- a/pkgs/development/python-modules/rfc3339-validator/default.nix
+++ b/pkgs/development/python-modules/rfc3339-validator/default.nix
@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, fetchpatch
 , fetchPypi
 , pytestCheckHook
 , hypothesis
@@ -17,6 +18,15 @@ buildPythonPackage rec {
     sha256 = "7a578aa0740e9ee2b48356fe1f347139190c4c72e27f303b3617054efd15df32";
   };
 
+  patches = [
+    # Fixes test failure on darwin. Filed upstream: https://github.com/naimetti/rfc3339-validator/pull/3.
+    # Not yet merged.
+    (fetchpatch {
+      url = "https://github.com/rmcgibbo/rfc3339-validator/commit/4b6bb62c30bd158d3b4663690dcba1084ac31770.patch";
+      sha256 = "0h9k82hhmp2xfzn49n3i47ws3rpm9lvfs2rjrds7hgx5blivpwl6";
+    })
+  ];
+
   propagatedBuildInputs = [ six ];
 
   checkInputs = [ pytestCheckHook hypothesis strict-rfc3339 ];

From 10f33d0d3b879c6f2ca5a424d02e242985545dec Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 7 May 2021 21:34:35 +0200
Subject: [PATCH 134/143] rustracer: 2.1.40 -> 2.1.44

NOTE: even though the latest upstream version is 2.1.46 we cannot use
this as every rustracer version technically requires nightly Rust. We
work around this by setting `RUSTC_BOOTSTRAP`, but also have to stick to
older versions where each used "nightly" feature is already in a `rustc`
that's also available in `nixpkgs`.

ZHF #122042
Closes #119155
Hydra build: https://hydra.nixos.org/build/142609369
---
 pkgs/development/tools/rust/racer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 3ad4b54b47a..c4d0d605cf6 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "racer";
-  version = "2.1.40";
+  version = "2.1.44";
 
   src = fetchFromGitHub {
     owner = "racer-rust";
     repo = "racer";
     rev = "v${version}";
-    sha256 = "sha256-8Is+RBfcXKbGSFzYoolLHs30rxlNI//xVGEOhxP2TV8=";
+    sha256 = "sha256-EmxJg2QDpGZ5TbMy9y6P11LdMucBdvewkRewuUzccGM=";
   };
 
-  cargoSha256 = "sha256-iUomr9viCdZk4nV75/OP8vHtJpMbmy+pq1IbaA2lLmE=";
+  cargoSha256 = "sha256-kKQnpEashpIwrXubuZIpU+tzxFaUjr6jaVunYPqaHnM=";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = lib.optional stdenv.isDarwin Security;

From 2e8f6e0d9358ec78df4d0dcd8a5519eadfd72de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 6 May 2021 13:20:00 +0200
Subject: [PATCH 135/143] fetchgit: document --fetch-lfs flag

Fixes: 74128561 ("fetchgit: add lfs support")
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index f2df9d9a869..661e0d674c5 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -47,6 +47,7 @@ Options:
       --deepClone     Clone the entire repository.
       --no-deepClone  Make a shallow clone of just the required ref.
       --leave-dotGit  Keep the .git directories.
+      --fetch-lfs     Fetch git Large File Storage (LFS) files.
       --fetch-submodules Fetch submodules.
       --builder       Clone as fetchgit does, but url, rev, and out option are mandatory.
       --quiet         Only print the final json summary.

From c397682663b586529838794c87ce0293cff8eda4 Mon Sep 17 00:00:00 2001
From: Konstantin Alekseev <mail@kalekseev.com>
Date: Sat, 8 May 2021 01:13:59 +0300
Subject: [PATCH 136/143] python3Packages.pip-tools: 6.0.1 -> 6.1.0

---
 .../python-modules/pip-tools/default.nix      | 51 ++++++++-----------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 48f15181ce0..51da889621f 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -1,45 +1,36 @@
-{ lib, fetchPypi, buildPythonPackage, pip, pytest, click, six
-, setuptools_scm, git, glibcLocales, mock }:
+{ lib
+, fetchPypi
+, pythonOlder
+, buildPythonPackage
+, pip
+, pytest
+, pytest-xdist
+, click
+, setuptools-scm
+, git
+, glibcLocales
+, mock
+, pep517
+}:
 
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "6.0.1";
+  version = "6.1.0";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3b0c7b95e8d3dfb011bb42cb38f356fcf5d0630480462b59c4d0a112b8d90281";
+    sha256 = "sha256-QAv3finMpIwxq8IQBCkyu1LcwTjvTqTVLF20KaqK5u4=";
   };
 
   LC_ALL = "en_US.UTF-8";
-  checkInputs = [ pytest git glibcLocales mock ];
-  propagatedBuildInputs = [ pip click six setuptools_scm ];
-
-  disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) [
-    # Depend on network tests:
-    "test_allow_unsafe_option" #paramaterized, but all fail
-    "test_annotate_option" #paramaterized, but all fail
-    "test_editable_package_vcs"
-    "test_editable_top_level_deps_preserved" # can't figure out how to select only one parameter to ignore
-    "test_filter_pip_markers"
-    "test_filter_pip_markes"
-    "test_generate_hashes_all_platforms"
-    "test_generate_hashes_verbose"
-    "test_generate_hashes_with_editable"
-    "test_generate_hashes_with_url"
-    "test_generate_hashes_without_interfering_with_each_other"
-    "test_get_file_hash_without_interfering_with_each_other"
-    "test_get_hashes_local_repository_cache_miss"
-    "test_realistic_complex_sub_dependencies"
-    "test_stdin"
-    "test_upgrade_packages_option"
-    "test_url_package"
-    "test_editable_package"
-    "test_locally_available_editable_package_is_not_archived_in_cache_dir"
-  ];
+  checkInputs = [ pytest git glibcLocales mock pytest-xdist ];
+  propagatedBuildInputs = [ pip click setuptools-scm pep517 ];
 
   checkPhase = ''
     export HOME=$(mktemp -d) VIRTUAL_ENV=1
-    py.test -k "${disabledTests}"
+    py.test -m "not network"
   '';
 
   meta = with lib; {

From 31d83714424d2878d0e7cf3e57f7adb1a2b3c379 Mon Sep 17 00:00:00 2001
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
Date: Fri, 7 May 2021 18:51:08 -0400
Subject: [PATCH 137/143] python3Packages.cxxfilt: fix on darwin

---
 pkgs/development/python-modules/cxxfilt/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cxxfilt/default.nix b/pkgs/development/python-modules/cxxfilt/default.nix
index 580d698d8da..1cc5ad19bda 100644
--- a/pkgs/development/python-modules/cxxfilt/default.nix
+++ b/pkgs/development/python-modules/cxxfilt/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , gcc-unwrapped
@@ -12,9 +13,11 @@ buildPythonPackage rec {
     sha256 = "ef6810e76d16c95c11b96371e2d8eefd1d270ec03f9bcd07590e8dcc2c69e92b";
   };
 
-  postPatch = ''
+  postPatch = let
+    libstdcpp = "${lib.getLib gcc-unwrapped}/lib/libstdc++${stdenv.hostPlatform.extensions.sharedLibrary}";
+  in ''
     substituteInPlace cxxfilt/__init__.py \
-      --replace "find_any_library('stdc++', 'c++')" '"${lib.getLib gcc-unwrapped}/lib/libstdc++.so"'
+      --replace "find_any_library('stdc++', 'c++')" '"${libstdcpp}"'
   '';
 
   # no tests

From fb770b152653b2bffa7d4787b25f4a2674dfb695 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 7 May 2021 22:53:47 +0200
Subject: [PATCH 138/143] python3Packages.adafruit-platformdetect: 3.8.0 ->
 3.10.0

---
 .../python-modules/adafruit-platformdetect/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 5d0ee6f7c42..ede11fdf754 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "adafruit-platformdetect";
-  version = "3.8.0";
+  version = "3.10.0";
 
   src = fetchPypi {
     pname = "Adafruit-PlatformDetect";
     inherit version;
-    sha256 = "sha256-AjUpxdY/5IoWMBtufP3OVnMpUwpxgpCNWoydH1w+t+Y=";
+    sha256 = "sha256-lIyDYt6OsBOPq1ytD4B4JxX7JeSGWprH2kqqFMzZcGY=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 31c1a6613354ecb774e28f80dfcdbbd1e0eba51c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 7 May 2021 20:46:05 +0200
Subject: [PATCH 139/143] avian: remove

ZHF #122042

Doesn't compile anymore[1] and isn't supported by upstream[2].

[1] https://hydra.nixos.org/build/142613769
[2] https://github.com/ReadyTalk/avian/blob/0871979b298add320ca63f65060acb7532c8a0dd/README.md
---
 pkgs/development/compilers/avian/default.nix | 43 --------------------
 pkgs/top-level/aliases.nix                   |  6 +++
 pkgs/top-level/all-packages.nix              |  5 ---
 3 files changed, 6 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/development/compilers/avian/default.nix

diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix
deleted file mode 100644
index d39aa2806a4..00000000000
--- a/pkgs/development/compilers/avian/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:
-
-stdenv.mkDerivation rec {
-  pname = "avian";
-  version = "1.2.0";
-
-  src = fetchFromGitHub {
-    owner = "readytalk";
-    repo = "avian";
-    rev = "v${version}";
-    sha256 = "1j2y45cpqk3x6a743mgpg7z3ivwm7qc9jy6xirvay7ah1qyxmm48";
-  };
-
-  buildInputs = [ zlib jdk ]
-    ++ lib.optionals stdenv.isDarwin [ CoreServices Foundation ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-error";
-
-  postPatch = ''
-    substituteInPlace makefile \
-        --replace 'g++' 'c++' \
-        --replace 'gcc' 'cc'
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp build/*/avian $out/bin/
-    cp build/*/avian-dynamic $out/bin/
-  '';
-
-  meta = {
-    description = "Lightweight Java virtual machine";
-    longDescription = ''
-      Avian is a lightweight virtual machine and class library designed
-      to provide a useful subset of Java’s features, suitable for
-      building self-contained applications.
-    '';
-    homepage = "https://readytalk.github.io/avian/";
-    license = lib.licenses.isc;
-    platforms = lib.platforms.all;
-    maintainers = [ lib.maintainers.earldouglas ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7002cc928ee..c7f7d36cbf0 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -971,6 +971,12 @@ mapAliases ({
 
   posix_man_pages = man-pages-posix; # Added 2021-04-15
 
+  /* Cleanup before 21.11, Added 2021-05-07 */
+  avian = throw ''
+    The package doesn't compile anymore on NixOS and both development
+    & maintenance is abandoned by upstream.
+  '';
+
   /* If these are in the scope of all-packages.nix, they cause collisions
   between mixed versions of qt. See:
   https://github.com/NixOS/nixpkgs/pull/101369 */
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbe7c06ea87..8b0e720e750 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10137,11 +10137,6 @@ in
 
   avra = callPackage ../development/compilers/avra { };
 
-  avian = callPackage ../development/compilers/avian {
-    inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
-    jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
-  };
-
   bigloo = callPackage ../development/compilers/bigloo { };
 
   binaryen = callPackage ../development/compilers/binaryen { };

From 4022232b36d2f45828b24a2726e66ba7e210b1c5 Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Wed, 5 May 2021 21:02:44 +0200
Subject: [PATCH 140/143] zellij: 0.6.0 -> 0.8.0

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

diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix
index f0b6a8ba98c..9aaa2117776 100644
--- a/pkgs/tools/misc/zellij/default.nix
+++ b/pkgs/tools/misc/zellij/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zellij";
-  version = "0.6.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "zellij-org";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-spESDjX7scihVQrr/f6KMCI9VfdTxxPWP7FcJ965FYk=";
+    sha256 = "sha256-armEkYiRQ2RvKFUtNlnMejkNSLJOEQpFzUPduNJatMo=";
   };
 
-  cargoSha256 = "0rm31sfcj2d85w1l4hhfmva3j828dfhiv5br1mnpaqaa01zzs1q1";
+  cargoSha256 = "sha256-68UfDlQ1KuGZwcuSNeOCwULxS+Ei16lEydrO4CssD3Y=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From adb0cf013fa7fdc595eb42a48734ea01fb0eed46 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 7 May 2021 21:45:59 +0200
Subject: [PATCH 141/143] python3Packages.monty: add missing pydanctic and tqdm
 dependencies

---
 .../python-modules/monty/default.nix          | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix
index a2398ce750d..53f139dde34 100644
--- a/pkgs/development/python-modules/monty/default.nix
+++ b/pkgs/development/python-modules/monty/default.nix
@@ -1,22 +1,20 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, isPy27
+, pythonOlder
+, msgpack
 , nose
 , numpy
-, six
-, ruamel_yaml
-, msgpack
-, coverage
-, coveralls
+, pydantic
 , pymongo
-, lsof
+, ruamel_yaml
+, tqdm
 }:
 
 buildPythonPackage rec {
   pname = "monty";
   version = "2021.3.3";
-  disabled = isPy27; # uses type annotations
+  disabled = pythonOlder "3.5"; # uses type annotations
 
   # No tests in Pypi
   src = fetchFromGitHub {
@@ -26,21 +24,30 @@ buildPythonPackage rec {
     sha256 = "1nbv0ys0fv70rgzskkk8gsfr9dsmm7ykim5wv36li840zsj83b1l";
   };
 
-  checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo];
-  propagatedBuildInputs = [ six ruamel_yaml ];
+  propagatedBuildInputs = [
+    ruamel_yaml
+    tqdm
+    msgpack
+  ];
 
-  # test suite tries to decode bytes, but msgpack now returns a str
-  # https://github.com/materialsvirtuallab/monty/pull/121
-  postPatch = ''
-    substituteInPlace tests/test_serialization.py \
-      --replace ".decode('utf-8')" ""
-  '';
+  checkInputs = [
+    nose
+    numpy
+    pydantic
+    pymongo
+  ];
 
   preCheck = ''
     substituteInPlace tests/test_os.py \
       --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#'
   '';
 
+  checkPhase = ''
+    runHook preCheck
+    nosetests -v
+    runHook postCheck
+  '';
+
   meta = with lib; {
     description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems";
     longDescription = "

From b76bf3c624fb271cd8c550c5ce1e5299377a6e77 Mon Sep 17 00:00:00 2001
From: Konstantin Alekseev <mail@kalekseev.com>
Date: Sat, 8 May 2021 01:54:01 +0300
Subject: [PATCH 142/143] python3Packages.aiomysql: fix dependency on PyMySQL

---
 pkgs/development/python-modules/aiomysql/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix
index 803f642406c..3432931f935 100644
--- a/pkgs/development/python-modules/aiomysql/default.nix
+++ b/pkgs/development/python-modules/aiomysql/default.nix
@@ -4,6 +4,7 @@
 , pymysql
 , pytest
 , isPy27
+, fetchpatch
 }:
 
 buildPythonPackage rec {
@@ -18,6 +19,14 @@ buildPythonPackage rec {
     sha256 = "1qvy3phbsxp55161dnppjfx2m1kn82v0irc3xzqw0adfd81vaiad";
   };
 
+  patches = [
+    (fetchpatch {
+      # vendor functions previously provided by pymysql.util
+      url = "https://github.com/aio-libs/aiomysql/pull/554/commits/919b997a9de7f53d721af76762fba425e306531e.patch";
+      sha256 = "V1VYyqr6RwTXoVoGVyMuJst6uqTuuHbpMOpLoVZO1XA=";
+    })
+  ];
+
   propagatedBuildInputs = [
     pymysql
   ];

From 088da8735f6620b60d724aa7db742607ea216087 Mon Sep 17 00:00:00 2001
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
Date: Fri, 7 May 2021 19:16:04 -0400
Subject: [PATCH 143/143] python3Packages.jq: 1.1.2 -> 1.1.3

---
 .../development/python-modules/jq/default.nix |  9 +++--
 .../python-modules/jq/jq-py-setup.patch       | 33 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix
index efc1152678f..f9f71a587ab 100644
--- a/pkgs/development/python-modules/jq/default.nix
+++ b/pkgs/development/python-modules/jq/default.nix
@@ -2,14 +2,17 @@
 
 buildPythonPackage rec {
   pname = "jq";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "77e747c6ad10ce65479f5f9064ab036483bf307bf71fdd7d6235ef895fcc506e";
+    sha256 = "1ryxcll7601ki9rwlnryhhxpmwwnxs2qxq7kjm2b0xcqgzx1vv7r";
   };
 
-  patches = [ ./jq-py-setup.patch ];
+  patches = [
+    # Removes vendoring
+    ./jq-py-setup.patch
+  ];
 
   buildInputs = [ jq ];
 
diff --git a/pkgs/development/python-modules/jq/jq-py-setup.patch b/pkgs/development/python-modules/jq/jq-py-setup.patch
index df5245a0c3b..cf871379675 100644
--- a/pkgs/development/python-modules/jq/jq-py-setup.patch
+++ b/pkgs/development/python-modules/jq/jq-py-setup.patch
@@ -1,17 +1,17 @@
-From 968ddf2bd773e800e46737fced743bd00af9aa0d Mon Sep 17 00:00:00 2001
-From: William Kral <william.kral@gmail.com>
-Date: Tue, 8 Sep 2020 22:04:24 -0700
-Subject: [PATCH] Vastly simplify setup.py for distro compatibility
+From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001
+From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
+Date: Fri, 7 May 2021 19:14:20 -0400
+Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility
 
 ---
- setup.py | 101 ++-----------------------------------------------------
- 1 file changed, 2 insertions(+), 99 deletions(-)
+ setup.py | 98 +-------------------------------------------------------
+ 1 file changed, 1 insertion(+), 97 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index cb63f60..87380ed 100644
+index 663792c..3ebcabe 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1,114 +1,19 @@
+@@ -1,113 +1,19 @@
  #!/usr/bin/env python
  
  import os
@@ -79,8 +79,7 @@ index cb63f60..87380ed 100644
 -            tarball_path=jq_lib_tarball_path,
 -            lib_dir=jq_lib_dir,
 -            commands=[
--                ["autoreconf", "-i"],
--                ["./configure", "CFLAGS=-fPIC", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
+-                ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
 -                ["make"],
 -            ])
 -
@@ -93,7 +92,7 @@ index cb63f60..87380ed 100644
 -
 -        macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
 -        if macosx_deployment_target:
--            os.environ['MACOSX_DEPLOYMENT_TARGET'] = macosx_deployment_target
+-            os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target)
 -
 -        def run_command(args):
 -            print("Executing: %s" % ' '.join(args))
@@ -127,21 +126,19 @@ index cb63f60..87380ed 100644
  )
  
  setup(
-@@ -120,8 +25,7 @@ setup(
-     url='http://github.com/mwilliamson/jq.py',
+@@ -120,7 +26,6 @@ setup(
      python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
      license='BSD 2-Clause',
--    ext_modules = [jq_extension],
+     ext_modules = [jq_extension],
 -    cmdclass={"build_ext": jq_build_ext},
-+    ext_modules=[jq_extension],
      classifiers=[
          'Development Status :: 5 - Production/Stable',
          'Intended Audience :: Developers',
-@@ -137,4 +41,3 @@ setup(
-         'Programming Language :: Python :: 3.8',
+@@ -137,4 +42,3 @@ setup(
+         'Programming Language :: Python :: 3.9',
      ],
  )
 -
 -- 
-2.28.0
+2.29.3