about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix36
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix46
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix36
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix36
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix36
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix14
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix38
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix36
-rw-r--r--pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix6
-rw-r--r--pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix111
-rw-r--r--pkgs/applications/networking/mailreaders/himalaya/default.nix6
-rw-r--r--pkgs/applications/networking/p2p/qbittorrent/default.nix11
-rw-r--r--pkgs/data/misc/hackage/pin.json8
-rw-r--r--pkgs/data/themes/adwaita-qt/default.nix4
-rw-r--r--pkgs/data/themes/nordic/default.nix34
-rw-r--r--pkgs/desktops/gnome/apps/gnome-boxes/default.nix4
-rw-r--r--pkgs/desktops/gnome/apps/gnome-calendar/default.nix4
-rw-r--r--pkgs/desktops/gnome/apps/gnome-maps/default.nix4
-rw-r--r--pkgs/desktops/gnome/core/eog/default.nix4
-rw-r--r--pkgs/desktops/gnome/core/epiphany/default.nix4
-rw-r--r--pkgs/desktops/gnome/core/evolution-data-server/default.nix4
-rw-r--r--pkgs/desktops/gnome/core/gnome-software/default.nix4
-rw-r--r--pkgs/desktops/gnome/extensions/unite/default.nix4
-rw-r--r--pkgs/development/beam-modules/rebar3-release.nix3
-rw-r--r--pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch71
-rw-r--r--pkgs/development/compilers/llvm/12/compiler-rt/default.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix80
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-head.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml40
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml11
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml122
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml50
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix14
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix2665
-rw-r--r--pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch65
-rw-r--r--pkgs/development/interpreters/erlang/R21.nix4
-rw-r--r--pkgs/development/libraries/cpp-utilities/default.nix4
-rw-r--r--pkgs/development/libraries/glibc/common.nix22
-rw-r--r--pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch9
-rw-r--r--pkgs/development/libraries/graphene/default.nix8
-rw-r--r--pkgs/development/ocaml-modules/bisect_ppx/default.nix21
-rw-r--r--pkgs/development/ocaml-modules/fix/default.nix29
-rw-r--r--pkgs/development/ocaml-modules/ocaml-version/default.nix19
-rw-r--r--pkgs/development/ocaml-modules/ppx_gen_rec/default.nix17
-rw-r--r--pkgs/development/python-modules/adblock/default.nix27
-rw-r--r--pkgs/development/python-modules/datadog/default.nix4
-rw-r--r--pkgs/development/python-modules/google-api-python-client/default.nix4
-rw-r--r--pkgs/development/python-modules/pyupgrade/default.nix4
-rw-r--r--pkgs/development/python-modules/textacy/default.nix44
-rw-r--r--pkgs/development/tools/electron/default.nix32
-rw-r--r--pkgs/development/tools/go-toml/default.nix4
-rw-r--r--pkgs/development/tools/lazygit/default.nix4
-rw-r--r--pkgs/development/tools/parsing/tree-sitter/grammar.nix3
-rw-r--r--pkgs/development/web/flyctl/default.nix6
-rw-r--r--pkgs/games/stockfish/default.nix8
-rw-r--r--pkgs/misc/vim-plugins/generated.nix166
-rw-r--r--pkgs/misc/vim-plugins/overrides.nix2
-rw-r--r--pkgs/misc/vim-plugins/vim-plugin-names2
-rw-r--r--pkgs/misc/vim-plugins/vim-utils.nix4
-rw-r--r--pkgs/misc/vscode-extensions/default.nix12
-rw-r--r--pkgs/os-specific/bsd/netbsd/default.nix2
-rw-r--r--pkgs/servers/matrix-appservice-discord/default.nix3
-rw-r--r--pkgs/servers/mpd/default.nix10
-rw-r--r--pkgs/servers/pr-tracker/default.nix16
-rw-r--r--pkgs/tools/admin/acme.sh/default.nix4
-rw-r--r--pkgs/tools/backup/bacula/default.nix4
-rw-r--r--pkgs/tools/inputmethods/interception-tools/default.nix27
-rw-r--r--pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch32
-rw-r--r--pkgs/tools/misc/freshfetch/Cargo.lock587
-rw-r--r--pkgs/tools/misc/freshfetch/default.nix31
-rw-r--r--pkgs/tools/misc/silicon/default.nix6
-rw-r--r--pkgs/tools/networking/ngrok-2/default.nix2
-rwxr-xr-xpkgs/tools/networking/ngrok-2/update.sh1
-rw-r--r--pkgs/tools/networking/ngrok-2/versions.json36
-rw-r--r--pkgs/tools/security/exploitdb/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix10
-rw-r--r--pkgs/top-level/dotnet-packages.nix20
-rw-r--r--pkgs/top-level/release-haskell.nix2
82 files changed, 3277 insertions, 1602 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix
new file mode 100644
index 0000000000000..658a18c05867b
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, emacs, lib }:
+
+stdenv.mkDerivation {
+  pname = "apheleia";
+  version = "2021-05-23";
+
+  src = fetchFromGitHub {
+    owner = "raxod502";
+    repo = "apheleia";
+    rev = "f865c165dac606187a66b2b25a57d5099b452120";
+    sha256 = "sha256-n37jJsNOGhSjUtQysG3NVIjjayhbOa52iTXBc8SyKXE=";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    runHook preBuild
+    emacs -L . --batch -f batch-byte-compile *.el
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Reformat buffer stably";
+    homepage = "https://github.com/raxod502/apheleia";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ leungbk ];
+    platforms = emacs.meta.platforms;
+  };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix b/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix
new file mode 100644
index 0000000000000..74fc1a1792195
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, emacs, emacsPackages, lib }:
+
+let
+  runtimeDeps = with emacsPackages; [
+    evil
+    markdown-mode
+  ];
+in
+stdenv.mkDerivation {
+  pname = "evil-markdown";
+  version = "2020-06-01";
+
+  src = fetchFromGitHub {
+    owner = "Somelauw";
+    repo = "evil-markdown";
+    rev = "064fe9b4767470472356d20bdd08e2f30ebbc9ac";
+    sha256 = "sha256-Kt2wxG1XCFowavVWtj0urM/yURKegonpZcxTy/+CrJY=";
+  };
+
+  buildInputs = [
+    emacs
+  ] ++ runtimeDeps;
+
+  propagatedUserEnvPkgs = runtimeDeps;
+
+  buildPhase = ''
+    runHook preBuild
+    emacs -L . --batch -f batch-byte-compile *.el
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Vim-like keybindings for markdown-mode";
+    homepage = "https://github.com/Somelauw/evil-markdown";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ leungbk ];
+    platforms = emacs.meta.platforms;
+  };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix
new file mode 100644
index 0000000000000..1b4da6340dc2e
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, emacs, lib }:
+
+stdenv.mkDerivation {
+  pname = "git-undo";
+  version = "2019-10-13";
+
+  src = fetchFromGitHub {
+    owner = "jwiegley";
+    repo = "git-undo-el";
+    rev = "cf31e38e7889e6ade7d2d2b9f8719fd44f52feb5";
+    sha256 = "sha256-cVkK9EF6qQyVV3uVqnBEjF8e9nEx/8ixnM8PvxqCyYE=";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    runHook preBuild
+    emacs -L . --batch -f batch-byte-compile *.el
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Revert region to most recent Git-historical version";
+    homepage = "https://github.com/jwiegley/git-undo-el";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ leungbk ];
+    platforms = emacs.meta.platforms;
+  };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix
new file mode 100644
index 0000000000000..64cfbde98b77c
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, emacs, lib }:
+
+stdenv.mkDerivation {
+  pname = "isearch-plus";
+  version = "2021-01-01";
+
+  src = fetchFromGitHub {
+    owner = "emacsmirror";
+    repo = "isearch-plus";
+    rev = "376a8f9f8a9666d7e61d125abcdb645847cb8619";
+    sha256 = "sha256-Kd5vpu+mI1tJPcsu7EpnnBcPVdVAijkAeTz+bLB3WlQ=";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    runHook preBuild
+    emacs -L . --batch -f batch-byte-compile *.el
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Extensions to isearch";
+    homepage = "https://www.emacswiki.org/emacs/download/isearch%2b.el";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ leungbk ];
+    platforms = emacs.meta.platforms;
+  };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix
new file mode 100644
index 0000000000000..0db28255f70ca
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, emacs, lib }:
+
+stdenv.mkDerivation {
+  pname = "isearch-prop";
+  version = "2019-05-01";
+
+  src = fetchFromGitHub {
+    owner = "emacsmirror";
+    repo = "isearch-prop";
+    rev = "4a2765f835dd115d472142da05215c4c748809f4";
+    sha256 = "sha256-A1Kt4nm7iRV9J5yaLupwiNL5g7ddZvQs79dggmqZ7Rk=";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    runHook preBuild
+    emacs -L . --batch -f batch-byte-compile *.el
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Search text- or overlay-property contexts";
+    homepage = "https://www.emacswiki.org/emacs/download/isearch-prop.el";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ leungbk ];
+    platforms = emacs.meta.platforms;
+  };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 80cc7578b4fb2..f862a1ae8a54d 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -65,11 +65,15 @@
     };
   };
 
+  apheleia = callPackage ./apheleia {};
+
   emacspeak = callPackage ./emacspeak {};
 
   ess-R-object-popup =
     callPackage ./ess-R-object-popup { };
 
+  evil-markdown = callPackage ./evil-markdown { };
+
   font-lock-plus = callPackage ./font-lock-plus { };
 
   ghc-mod = melpaBuild {
@@ -88,6 +92,8 @@
     };
   };
 
+  git-undo = callPackage ./git-undo { };
+
   haskell-unicode-input-method = melpaBuild {
     pname = "emacs-haskell-unicode-input-method";
     version = "20110905.2307";
@@ -111,6 +117,10 @@
 
   helm-words = callPackage ./helm-words { };
 
+  isearch-plus = callPackage ./isearch-plus { };
+
+  isearch-prop = callPackage ./isearch-prop { };
+
   jam-mode = callPackage ./jam-mode { };
 
   llvm-mode = trivialBuild {
@@ -177,6 +187,8 @@
 
   };
 
+  mu4e-patch = callPackage ./mu4e-patch { };
+
   org-mac-link =
     callPackage ./org-mac-link { };
 
@@ -206,6 +218,8 @@
 
   tramp = callPackage ./tramp { };
 
+  youtube-dl = callPackage ./youtube-dl { };
+
   zeitgeist = callPackage ./zeitgeist { };
 
   # From old emacsPackages (pre emacsPackagesNg)
diff --git a/pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix b/pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix
new file mode 100644
index 0000000000000..4a436339ebc46
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, emacs, lib }:
+
+stdenv.mkDerivation {
+  pname = "mu4e-patch";
+  version = "2019-05-09";
+
+  src = fetchFromGitHub {
+    owner = "seanfarley";
+    repo = "mu4e-patch";
+    rev = "522da46c1653b1cacc79cde91d6534da7ae9517d";
+    sha256 = "sha256-1lV4dDuCdyCUXi/In2DzYJPEHuAc9Jfbz2ZecNZwn4I=";
+  };
+
+  buildInputs = [
+    emacs
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    emacs -L . --batch -f batch-byte-compile *.el
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Colorize patch emails in mu4e";
+    homepage = "https://github.com/seanfarley/mu4e-patch";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ leungbk ];
+    platforms = emacs.meta.platforms;
+  };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix
new file mode 100644
index 0000000000000..c99693463a648
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, emacs, lib }:
+
+stdenv.mkDerivation {
+  pname = "youtube-dl";
+  version = "2018-10-12";
+
+  src = fetchFromGitHub {
+    owner = "skeeto";
+    repo = "youtube-dl-emacs";
+    rev = "af877b5bc4f01c04fccfa7d47a2c328926f20ef4";
+    sha256 = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4=";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    runHook preBuild
+    emacs -L . --batch -f batch-byte-compile *.el
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Emacs frontend to the youtube-dl utility";
+    homepage = "https://github.com/skeeto/youtube-dl-emacs";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ leungbk ];
+    platforms = emacs.meta.platforms;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 72b17400df30d..09128301d6c8d 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -88,19 +88,19 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "10.0.16";
+  version = "10.0.17";
 
   lang = "en-US";
 
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
-      sha256 = "07h2gd6cwwq17lrwjpfah1xvr8ny8700qvi971qacrr7ssicw2pw";
+      sha256 = "13x38n1cvqmxjz0jf2fda8lx2k25szzmg7gvv08z3q5na7109m2m";
     };
 
     i686-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
-      sha256 = "145kniiby5nnd0ll3v2gggzxz52bqbrdp72hvh96i8qnzi0fq25a";
+      sha256 = "0f0ndwmzh732svwbcf1lbxlvdxw4i4d56w9xdl5fxd4n7ivqml1q";
     };
   };
 in
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
deleted file mode 100644
index 7356768f3973e..0000000000000
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{ stdenv
-, fetchgit
-, fetchurl
-
-# common
-, zip
-
-# HTTPS Everywhere
-, git
-, libxml2 # xmllint
-, python27
-, python27Packages
-, rsync
-}:
-
-{
-  https-everywhere = stdenv.mkDerivation rec {
-    pname = "https-everywhere";
-    version = "2017.10.4";
-
-    extid = "https-everywhere-eff@eff.org";
-
-    src = fetchgit {
-      url = "https://git.torproject.org/https-everywhere.git";
-      rev = "refs/tags/${version}";
-      sha256 = "1g7971xygnhagnb25xjdf6mli6091ai9igx42d0ww88g8i0cqfzj";
-      fetchSubmodules = true; # for translations, TODO: remove
-    };
-
-    nativeBuildInputs = [
-      git
-      libxml2 # xmllint
-      python27
-      python27Packages.lxml
-      rsync
-      zip
-    ];
-
-    buildPhase = ''
-      $shell ./makexpi.sh ${version} --no-recurse
-    '';
-
-    installPhase = ''
-      install -m 444 -D pkg/https-everywhere-$version-eff.xpi "$out/$extid.xpi"
-    '';
-  };
-
-  noscript = stdenv.mkDerivation rec {
-    pname = "noscript";
-    version = "5.1.2";
-
-    extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
-
-    src = fetchurl {
-      url = "https://secure.informaction.com/download/releases/noscript-${version}.xpi";
-      sha256 = "1fzspdiwhjabwz1yxb3gzj7giz9jbc1xxm65i93rvhzcp537cs42";
-    };
-
-    dontUnpack = true;
-
-    installPhase = ''
-      install -m 444 -D $src "$out/$extid.xpi"
-    '';
-  };
-
-  torbutton = stdenv.mkDerivation rec {
-    pname = "torbutton";
-    version = "1.9.8.1";
-
-    extid = "torbutton@torproject.org";
-
-    src = fetchgit {
-      url = "https://git.torproject.org/torbutton.git";
-      rev = "refs/tags/${version}";
-      sha256 = "1amp0c9ky0a7fsa0bcbi6n6ginw7s2g3an4rj7kvc1lxmrcsm65l";
-    };
-
-    nativeBuildInputs = [ zip ];
-
-    buildPhase = ''
-      $shell ./makexpi.sh
-    '';
-
-    installPhase = ''
-      install -m 444 -D pkg/torbutton-$version.xpi "$out/$extid.xpi"
-    '';
-  };
-
-  tor-launcher = stdenv.mkDerivation rec {
-    pname = "tor-launcher";
-    version = "0.2.13";
-
-    extid = "tor-launcher@torproject.org";
-
-    src = fetchgit {
-      url = "https://git.torproject.org/tor-launcher.git";
-      rev = "refs/tags/${version}";
-      sha256 = "1f98v88y2clwvjiw77kxqc9cacp5h0489a540nc2wmsx7vnskrq0";
-    };
-
-    nativeBuildInputs = [ zip ];
-
-    buildPhase = ''
-      make package
-    '';
-
-    installPhase = ''
-      install -m 444 -D pkg/tor-launcher-$version.xpi "$out/$extid.xpi"
-    '';
-  };
-}
diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix
index b810103cf2ede..b1c709b055b9a 100644
--- a/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "himalaya";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "soywod";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-wiasnkoIU4l1yyhUSTahOJMCOyhpz2w4WJzi/UBmiHE=";
+    sha256 = "sha256-6RgT/SxO4vsk8Yx2AbaNIFvnAvgDmeTXvb/v6nUJxhc=";
   };
 
-  cargoSha256 = "sha256-VXSJLDpT0s+sh6buOP63QSiUp34H6G/FWibemtNU9wQ=";
+  cargoSha256 = "sha256-NEuIh7FwIdAWzlChna3+G0VukfV8nYZfVWa+3LxQCIA=";
 
   # use --lib flag to avoid test with imap server
   # https://github.com/soywod/himalaya/issues/145
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 4c0d391ccaabe..bd4fafed11195 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -12,15 +12,17 @@ assert trackerSearch -> (python3 != null);
 with lib;
 mkDerivation rec {
   pname = "qbittorrent";
-  version = "4.3.3";
+  version = "4.3.5";
 
   src = fetchFromGitHub {
     owner = "qbittorrent";
-    repo = "qbittorrent";
+    repo = "qBittorrent";
     rev = "release-${version}";
-    sha256 = "0y8vrvfv8n6zg6pgg5a9hmvxi2z9rrfd9k8zv04nv5js91b99ncq";
+    sha256 = "1vdk42f8rxffyfydjk5cgzg5gl88ng2pynlyxw5ajh08wvkkjzgy";
   };
 
+  enableParallelBuilding = true;
+
   # NOTE: 2018-05-31: CMake is working but it is not officially supported
   nativeBuildInputs = [ makeWrapper pkg-config ];
 
@@ -47,7 +49,8 @@ mkDerivation rec {
   meta = {
     description = "Featureful free software BitTorrent client";
     homepage    = "https://www.qbittorrent.org/";
-    license     = licenses.gpl2;
+    changelog   = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog";
+    license     = licenses.gpl2Plus;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ Anton-Latukha ];
   };
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index f53ef94c47d4c..7c4e3b9a8694a 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "0fb7f9edea05a2b464b5667debe1e3ece585c185",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0fb7f9edea05a2b464b5667debe1e3ece585c185.tar.gz",
-  "sha256": "01rzbda8g62gj2x3if46lglis9gqw3qfpqyiv2lrnm7alsg36ld9",
-  "msg": "Update from Hackage at 2021-05-19T07:17:55Z"
+  "commit": "9be76e8f01853e5a2f0600107c9b50d12a17581b",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/9be76e8f01853e5a2f0600107c9b50d12a17581b.tar.gz",
+  "sha256": "0sy8lx04yb9lk9liscqr44z7lzzq67w3zmkq78a0yv37jadb557k",
+  "msg": "Update from Hackage at 2021-06-02T14:32:36Z"
 }
diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix
index 2722c4fe20c99..fa69afe50c5e7 100644
--- a/pkgs/data/themes/adwaita-qt/default.nix
+++ b/pkgs/data/themes/adwaita-qt/default.nix
@@ -12,13 +12,13 @@
 
 mkDerivation rec {
   pname = "adwaita-qt";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "FedoraQt";
     repo = pname;
     rev = version;
-    sha256 = "1fkivdiz4al84nhgg1srj33l109j9si63biw3asy339cyyzj28c9";
+    sha256 = "sha256-3uHa7veLzaSIm9WSR/Z0X+aSdXziO1TnI/CQgccrKYg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix
index c12f9e2ba78b7..1014d483440cb 100644
--- a/pkgs/data/themes/nordic/default.nix
+++ b/pkgs/data/themes/nordic/default.nix
@@ -2,70 +2,70 @@
 
 stdenv.mkDerivation rec {
   pname = "nordic";
-  version = "unstable-2021-05-21";
+  version = "unstable-2021-06-04";
 
   srcs = [
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "7e4f95ddaa8d94a66ed11a3b939cbd10864f1610";
-      sha256 = "079gf8gxn1d2j44nhx4jzx2hz8hpsid7xwh414fjl3g2avb7n05a";
+      rev = "9a98c05f4d4f6c9e701ac20b0bf5c18284ad0015";
+      sha256 = "0ghgr7fr7anm8hdq6n46xhkjxydqkr0qlk1q7mdg08j43f0yra7b";
       name = "Nordic";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "0b4197e281ba306ac4918cabbd83003c38c0067d";
-      sha256 = "1w85i2fbils2ivwsa85g1asj2nx0p0cak840nyr58hdwky49ci5p";
+      rev = "90ce6f539735af1f231c4fa07708cef602e1c8a2";
+      sha256 = "1g6sz7ifpc8jf4iplcsmihqhjdc7yp5xygw8584n122jmh8mak47";
       name = "Nordic-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "aba3c78910de8a47950a0b2defb8022c615d91f6";
-      sha256 = "1746w0iahmdgw3kj1q2cswf12pf0ln7qq1grfz9sn8rjafzjchj8";
+      rev = "529cdb86b4d4474a67a56eb9377e3c7907b452db";
+      sha256 = "06li44i5wh4h06fbhvjf5cjma5czjdgnwvm79d8hg6vmi2101b0a";
       name = "Nordic-darker";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "9946dd747e1ea05782e084d2c2d94e2e4c7605ac";
-      sha256 = "0mz1l1h26zhv0pnsbs0rx0xrwrn2y8g3ik0aa8ww5f411vvzgfr5";
+      rev = "1d16f37de315c298a6c3d79a552ed6f18cbb7fb4";
+      sha256 = "0nxzygnysg4ciib337vay0qcc80hpryjnclwjwjzj51i95366k25";
       name = "Nordic-darker-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "5c0be5a783cd14af5c7647ca13d946c64e03561d";
-      sha256 = "0751z3b9s0ycrsha20jx8lhdgvggcl0rdgv975dpaiqqjqyd9z06";
+      rev = "78a30080bc50ee88c23d393049306ef1925bcdb8";
+      sha256 = "10w4815fcf3pd24ar7jp0wcdiwn3zzrdj2p6fqlgx26biz7kf3iv";
       name = "Nordic-bluish-accent";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "9cb8d9f786614579e59ec2c3dd9fd8dd9b56316e";
-      sha256 = "09s9y7waygrx3p6c0c4py0ywg2ihpdmx73xhw5f92rr5nhsvish7";
+      rev = "e4363da8d457e8b14f6e4340979225db92d34aa9";
+      sha256 = "1sjw2hvg4jgxqzgqhqixq216a7vv5licbc8ii1rsz88ycafsbr7j";
       name = "Nordic-bluish-accent-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = "${pname}-polar";
-      rev = "69652db56e1721ac183cd57d21a801a09655a811";
-      sha256 = "0zjd4np11mjwmc1kh2n1ig77g4wq88s2yrmnga0gvw1lf44n3qn2";
+      rev = "a38fd7d440309573947d3e53ea3ed295cf027ce7";
+      sha256 = "1r6hz0m0y7c1d0ka1x9cd47r0jvpgkld6x3gf2b7w7yvqpmh6a44";
       name = "Nordic-Polar";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = "${pname}-polar";
-      rev = "3a67c1a2308ba3e9ec5d82f4a3416f85b6085b08";
-      sha256 = "0gpg2izh4ay78j79vjp4svmi3qy9qaw0n6ai8zwm7p25dwm56fjy";
+      rev = "b86d43c48bcac57c49d891b967311fd90f6d4bcd";
+      sha256 = "0c725kf5ql42zrqk6dwk6i7wyrhr3gddipvhy6692nv0dszqm0ml";
       name = "Nordic-Polar-standard-buttons";
     })
   ];
diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
index 5972843ab314e..8d0e86b1a93b1 100644
--- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
@@ -54,11 +54,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-boxes";
-  version = "40.1";
+  version = "40.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "seKPLH+3a/T7uGLQ1S6BG5TL6f8W8GdAiWRWhpCILvg=";
+    sha256 = "hzN1mi2GpWNnWWpTSQRjO4HKqlxFpWNtsulZDHFK6Nk=";
   };
 
   doCheck = true;
diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix
index 9c0b1f6597686..da2e37e51fc42 100644
--- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-calendar";
-  version = "40.1";
+  version = "40.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "2M30n57uHDo8aZHDL4VjxKfE2w23ymPOUcyRjkM7M6U=";
+    sha256 = "njcB/UoOWJgA0iUgN3BkTzHVI0ZV9UqDqF/wVW3X6jM=";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix
index 2818215a4ff9c..0a07428b1b220 100644
--- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-maps";
-  version = "40.1";
+  version = "40.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-mAXUwFs6NpV0bTdisoFr/+bZ19VuF7y7nZ1B3C0CYxo=";
+    sha256 = "sha256-g+gVAFTQxLWmPJoJvyx9+YmuaQ7Kwb5r97ExKqpjm9Q=";
   };
 
   doCheck = true;
diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix
index 426a878335289..e67a623069b16 100644
--- a/pkgs/desktops/gnome/core/eog/default.nix
+++ b/pkgs/desktops/gnome/core/eog/default.nix
@@ -28,11 +28,11 @@
 
 stdenv.mkDerivation rec {
   pname = "eog";
-  version = "40.1";
+  version = "40.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-e+CGA3/tm2v4S6yXqD48kYMBt+nJavEwsnJS0KURFok=";
+    sha256 = "sha256-kITimZMftX3ih+V9vS7i0pf7Z0DA1TW52o1fGWqP0ZU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix
index f286d384c4e80..0b4191b2266c8 100644
--- a/pkgs/desktops/gnome/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome/core/epiphany/default.nix
@@ -37,11 +37,11 @@
 
 stdenv.mkDerivation rec {
   pname = "epiphany";
-  version = "40.1";
+  version = "40.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "1l0sb1xg16g4wg3z99xb0w2kbyczbn7q4mphs3w4lxq22xml4sk9";
+    sha256 = "dRGeIgZWV89w7ytgPU9zg1VzvQNPHmGMD2YkeP1saDU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix
index 0ed3565d7f039..8781a2aa7fdea 100644
--- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-data-server";
-  version = "3.40.1";
+  version = "3.40.2";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "08iykha7zhk21b3axsp3v1jfwda612v0m8rz8zlzppm5i8s5ziza";
+    sha256 = "7IKVFjnzKlzs6AqLC5qj9mt9MY4+4sHDUjTy4r3opBg=";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix
index 64cd214e8090f..226b251ec46ab 100644
--- a/pkgs/desktops/gnome/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-software/default.nix
@@ -43,11 +43,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gnome-software";
-  version = "40.1";
+  version = "40.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "16q2902swxsjdxb1nj335sv1bb76rvq4w6dn4yszkwf3s0fd86in";
+    sha256 = "y9HdKguvw/U93kIAPEpKA3RsuNZNxdJ+uNvmc27nJ5Y=";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix
index 1fbd31ec10a53..228cb70615057 100644
--- a/pkgs/desktops/gnome/extensions/unite/default.nix
+++ b/pkgs/desktops/gnome/extensions/unite/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-unite";
-  version = "53";
+  version = "54";
 
   src = fetchFromGitHub {
     owner = "hardpixel";
     repo = "unite-shell";
     rev = "v${version}";
-    sha256 = "0fw9wqf362h2yd67fhgbhqx0b2fwcl25wxmb92dqwigxjcj0dnw6";
+    sha256 = "sha256-Ys2kWPj/FugW/LkvLAZdbj7Ufg/KShC+EX6QrjKNVH8=";
   };
 
   uuid = "unite@hardpixel.eu";
diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix
index d2c9da6414faf..80082945e4c9e 100644
--- a/pkgs/development/beam-modules/rebar3-release.nix
+++ b/pkgs/development/beam-modules/rebar3-release.nix
@@ -46,7 +46,8 @@ let
 
     buildInputs = buildInputs ++ [ erlang rebar3 openssl ] ++ beamDeps;
 
-    dontStrip = true;
+    # ensure we strip any native binaries (eg. NIFs, ports)
+    stripDebugList = lib.optional (releaseType == "release") "rel";
 
     inherit src;
 
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch
new file mode 100644
index 0000000000000..425dc2af01e7c
--- /dev/null
+++ b/pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch
@@ -0,0 +1,71 @@
+diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp
+--- a/lib/sanitizer_common/sanitizer_mac.cpp
++++ b/lib/sanitizer_common/sanitizer_mac.cpp
+@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) {
+ // Offset example:
+ // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4
+ constexpr u16 GetOSMajorKernelOffset() {
+-  if (TARGET_OS_OSX) return 4;
+-  if (TARGET_OS_IOS || TARGET_OS_TV) return 6;
+-  if (TARGET_OS_WATCH) return 13;
++#if TARGET_OS_OSX
++  return 4;
++#endif
++#if TARGET_OS_IOS || TARGET_OS_TV
++  return 6;
++#endif
++#if TARGET_OS_WATCH
++  return 13;
++#endif
+ }
+ 
+ using VersStr = char[64];
+@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) {
+   u16 os_major = kernel_major - offset;
+ 
+   const char *format = "%d.0";
+-  if (TARGET_OS_OSX) {
+-    if (os_major >= 16) {  // macOS 11+
+-      os_major -= 5;
+-    } else {  // macOS 10.15 and below
+-      format = "10.%d";
+-    }
++#if TARGET_OS_OSX
++  if (os_major >= 16) {  // macOS 11+
++    os_major -= 5;
++  } else {  // macOS 10.15 and below
++    format = "10.%d";
+   }
++#endif
+   return internal_snprintf(vers, sizeof(VersStr), format, os_major);
+ }
+ 
+@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) {
+ // Aligned versions example:
+ // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6
+ static void MapToMacos(u16 *major, u16 *minor) {
+-  if (TARGET_OS_OSX)
+-    return;
+-
+-  if (TARGET_OS_IOS || TARGET_OS_TV)
++#if !TARGET_OS_OSX
++#if TARGET_OS_IOS || TARGET_OS_TV
+     *major += 2;
+-  else if (TARGET_OS_WATCH)
++#elif TARGET_OS_WATCH
+     *major += 9;
+-  else
++#else
+     UNREACHABLE("unsupported platform");
++#endif
+ 
+   if (*major >= 16) {  // macOS 11+
+     *major -= 5;
+@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) {
+     *minor = *major;
+     *major = 10;
+   }
++#endif
+ }
+ 
+ static MacosVersion GetMacosAlignedVersionInternal() {
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
index 895af8f2f020d..cde1317ca35de 100644
--- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
@@ -59,6 +59,8 @@ stdenv.mkDerivation {
     # extra `/`.
     ./normalize-var.patch
   ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    # Prevent a compilation error on darwin
+    ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch
     ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5cc0a3e79cd51..cc39fb4fd10fe 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -203,12 +203,11 @@ self: super: {
           sha256 = "0pqmijfkysjixg3gb4kmrqdif7s2saz8qi6k337jf15i0npzln8d";
           revert = true;
         })
-        # fix broken location annotations (necessary for update-nix-fetchgit).
-        # Can be removed on the next hnix release after
-        # https://github.com/haskell-nix/hnix/pull/936 is merged.
+        # allow relude < 1.0 again
         (pkgs.fetchpatch {
-          url = "https://github.com/expipiplus1/hnix/commit/7cd998426ab7d930d288a1d6e266dc4e85cece3d.patch";
-          sha256 = "19ay6vxa90ykgdd0fis2djvki2kpgfsq7z55iyqg965m583vsfr6";
+          url = "https://github.com/haskell-nix/hnix/commit/f4ea5dcb344369916586498ba33c00d0fc605a79.patch";
+          sha256 = "1ajl7d49d658xhalgf3pc5svmbq73dsysy6z434n75vb1357mx86";
+          revert = true;
         })
       ] ++ (drv.patches or []);
       # make sure patches are not broken by cabal file revisions
@@ -704,6 +703,9 @@ self: super: {
 
   # 2021-03-12: All of this libraries have to restrictive upper bounds
   # https://github.com/diagrams/diagrams-core/issues/112
+  # https://github.com/diagrams/diagrams-cairo/issues/77
+  # https://github.com/diagrams/diagrams-rasterific/issues/63
+  # https://github.com/diagrams/diagrams-cairo/issues/77
   active = doJailbreak super.active;
   statestack = doJailbreak super.statestack;
   force-layout = doJailbreak super.force-layout;
@@ -713,13 +715,20 @@ self: super: {
   diagrams-postscript = doJailbreak super.diagrams-postscript;
   diagrams-svg = doJailbreak super.diagrams-svg;
   diagrams-contrib = doJailbreak super.diagrams-contrib;
-  # apply patch from master to add compat with optparse-applicative >= 0.16
+  # Apply patch from master to add compat with optparse-applicative >= 0.16.
+  # We unfortunately can't upgrade to 1.4.4 which includes this patch yet
+  # since it would require monoid-extras 0.6 which breaks other diagrams libs.
   diagrams-lib = doJailbreak (appendPatch super.diagrams-lib
     (pkgs.fetchpatch {
       url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch";
       sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa";
       includes = [ "*/CmdLine.hs" ];
     }));
+  diagrams-rasterific = doJailbreak super.diagrams-rasterific;
+  diagrams-cairo = doJailbreak super.diagrams-cairo;
+
+  # https://github.com/diagrams/diagrams-solve/issues/4
+  diagrams-solve = dontCheck super.diagrams-solve;
 
   # https://github.com/danidiaz/streaming-eversion/issues/1
   streaming-eversion = dontCheck super.streaming-eversion;
@@ -737,9 +746,6 @@ self: super: {
   # Has a dependency on outdated versions of directory.
   cautious-file = doJailbreak (dontCheck super.cautious-file);
 
-  # https://github.com/diagrams/diagrams-solve/issues/4
-  diagrams-solve = dontCheck super.diagrams-solve;
-
   # test suite does not compile with recent versions of QuickCheck
   integer-logarithms = dontCheck (super.integer-logarithms);
 
@@ -1305,10 +1311,6 @@ self: super: {
   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
-  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
   massiv = dontCheck super.massiv;
@@ -1398,22 +1400,6 @@ self: super: {
           pkgs.lib.makeBinPath deps
         }"
       '';
-
-      # These can both be removed upon the release of update-nix-fetchgit-0.2.7
-      patches = [
-        # 2021-05-17 compile with hnix >= 0.13
-        # https://github.com/expipiplus1/update-nix-fetchgit/pull/64
-        (pkgs.fetchpatch {
-          url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/bc28c8b26c38093aa950574802012c0cd8447ce8.patch";
-          sha256 = "1dwd1jdsrx3ss6ql1bk2ch7ln74mkq6jy9ms8vi8kmf3gbg8l9fg";
-        })
-        # Fix test failure
-        # https://github.com/expipiplus1/update-nix-fetchgit/pull/60
-        (pkgs.fetchpatch {
-          url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/4a43e1ea4e7e1c18de81e3f9fe0b86faa70865f5.patch";
-          sha256 = "1z74c1blgwr4q37m1rhlj7534qbnp3nnxf63m8j2b7iz0ljgm0m9";
-        })
-      ] ++ (drv.patches or []);
     }));
 
   # Our quickcheck-instances is too old for the newer binary-instances, but
@@ -1821,10 +1807,6 @@ self: super: {
     passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh;
   };
 
-  # Too strict version bounds on base and optparse-applicative
-  # 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;
@@ -1943,8 +1925,8 @@ EOT
   # https://github.com/haskell-hvr/missingh/issues/56
   MissingH = doJailbreak super.MissingH;
 
-  # Too strict bound on random
-  # https://github.com/batterseapower/parallel-io/issues/14
+  # Too strict bound on containers
+  # https://github.com/batterseapower/parallel-io/issues/14#issuecomment-853441933
   parallel-io = doJailbreak super.parallel-io;
 
   # Disable flaky tests
@@ -1967,30 +1949,8 @@ EOT
     testTarget = "libarchive-test --test-options='-j1'";
   };
 
-  # 2021-05-23: Override for a quite recent Hackage release.
-  taffybar =
-    if pkgs.lib.versionAtLeast super.taffybar.version "3.2.5"
-    then throw "Drop src override for taffybar >= 3.2.5"
-    else overrideCabal super.taffybar (drv: {
-      src = pkgs.fetchFromGitHub {
-        owner = "taffybar";
-        repo = "taffybar";
-        rev = "91c83e01e131d560e704b12f0d798905e4289a3d";
-        sha256 = "1kkpkjdyd1yv8z1qlzr3jrzyk9lxac5m4f9py8igyars2nwnhhzr";
-      };
-      version = "3.2.5";
-      editedCabalFile = null;
-    });
-
-  # 2021-05-25: Fixes darwin build: https://gitlab.com/lysxia/ap-normalize/-/issues/1
-  ap-normalize =
-    assert pkgs.lib.versionOlder super.ap-normalize.version "0.1.0.1";
-    overrideSrc super.ap-normalize rec {
-      version = "0.1.0.1";
-      src = pkgs.fetchurl {
-        url = "https://hackage.haskell.org/package/ap-normalize-${version}/ap-normalize-${version}.tar.gz";
-        sha256 = "1212zxc4qn6msk0w13yhrza2qjs79h78misllb4chng75jqi61l2";
-      };
-    };
+  # unrestrict bounds for hashable and semigroups
+  # https://github.com/HeinrichApfelmus/reactive-banana/issues/215
+  reactive-banana = doJailbreak super.reactive-banana;
 
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 9866364e34a09..36fe13151f3cb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -5,7 +5,7 @@ with haskellLib;
 self: super: {
 
   # This compiler version needs llvm 9.x.
-  llvmPackages = pkgs.llvmPackages_9;
+  llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_9;
 
   # Disable GHC 8.10.x core libraries.
   array = null;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index bcce0bb897c53..99b53b9f14f3c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -5,7 +5,7 @@ with haskellLib;
 self: super: {
 
   # This compiler version needs llvm 6.x.
-  llvmPackages = pkgs.llvmPackages_6;
+  llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_6;
 
   # Disable GHC 8.6.x core libraries.
   array = null;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 8fb10d8b05f51..aab26897cca4a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -5,7 +5,7 @@ with haskellLib;
 self: super: {
 
   # This compiler version needs llvm 7.x.
-  llvmPackages = pkgs.llvmPackages_7;
+  llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_7;
 
   # Disable GHC 8.8.x core libraries.
   array = null;
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 ff82fc8c199c1..16c85d1fef766 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -5,7 +5,7 @@ with haskellLib;
 self: super: {
 
   # This compiler version needs llvm 10.x.
-  llvmPackages = pkgs.llvmPackages_10;
+  llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10;
 
   # Disable GHC 9.0.x core libraries.
   array = null;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 2b136c6bf83e1..ca455a7c8929e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -11,7 +11,7 @@ with haskellLib;
 
 self: super: {
 
-  llvmPackages = pkgs.llvmPackages_10;
+  llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10;
 
   # Disable GHC 8.7.x core libraries.
   array = null;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index da10af5b53d62..bc9881ee1fca2 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -703,6 +703,7 @@ broken-packages:
   - commander
   - Commando
   - commodities
+  - commonmark-cli
   - commsec
   - compactable
   - Compactable
@@ -1000,12 +1001,12 @@ broken-packages:
   - dhrun
   - dia-base
   - diagrams-boolean
+  - diagrams-builder
   - diagrams-canvas
   - diagrams-graphviz
   - diagrams-gtk
   - diagrams-pdf
   - diagrams-qrcode
-  - diagrams-rasterific
   - diagrams-tikz
   - dib
   - dice2tex
@@ -1039,6 +1040,7 @@ broken-packages:
   - direct-plugins
   - direct-rocksdb
   - direm
+  - discord-haskell
   - discordian-calendar
   - discord-types
   - discrete
@@ -1282,6 +1284,7 @@ broken-packages:
   - Facebook-Password-Hacker-Online-Latest-Version
   - faceted
   - facts
+  - fadno-braids
   - failable-list
   - failure-detector
   - fakedata
@@ -1635,6 +1638,7 @@ broken-packages:
   - global-variables
   - glob-posix
   - GlomeTrace
+  - gloss-banana
   - gloss-export
   - gloss-game
   - glpk-headers
@@ -1758,7 +1762,18 @@ broken-packages:
   - hakismet
   - hakka
   - hako
+  - hakyll-blaze-templates
+  - hakyll-contrib
+  - hakyll-contrib-csv
+  - hakyll-contrib-elm
+  - hakyll-contrib-links
+  - hakyll-dhall
+  - hakyll-dir-list
+  - hakyll-process
+  - hakyll-R
+  - hakyll-series
   - hakyll-shortcode
+  - hakyll-shortcut-links
   - HaLeX
   - halfs
   - halipeto
@@ -1832,7 +1847,6 @@ broken-packages:
   - haskell-awk
   - haskell-bitmex-rest
   - haskell-brainfuck
-  - haskell-ci
   - haskell-cnc
   - haskell-coffee
   - haskell-compression
@@ -1886,6 +1900,7 @@ broken-packages:
   - haskey
   - haskheap
   - haskhol-core
+  - hasklepias
   - haskmon
   - haskoin
   - haskoin-util
@@ -1897,6 +1912,7 @@ broken-packages:
   - haskus-binary
   - haskyapi
   - hasmin
+  - hasqlator-mysql
   - hasql-backend
   - hasql-class
   - hasql-cursor-transaction
@@ -2081,6 +2097,7 @@ broken-packages:
   - hlogger
   - HLogger
   - hlongurl
+  - hlrdb-core
   - hls-exactprint-utils
   - hls-floskell-plugin
   - hls-fourmolu-plugin
@@ -2092,6 +2109,7 @@ broken-packages:
   - hmatrix-nipals
   - hmatrix-sparse
   - hmatrix-static
+  - hmatrix-sundials
   - hmatrix-svdlibc
   - hmatrix-syntax
   - hmatrix-tests
@@ -2557,6 +2575,7 @@ broken-packages:
   - katip-syslog
   - katt
   - katydid
+  - kawaii
   - kawhi
   - kdesrc-build-extra
   - kd-tree
@@ -2857,6 +2876,7 @@ broken-packages:
   - MASMGen
   - massiv-persist
   - massiv-serialise
+  - master-plan
   - mathflow
   - math-grads
   - math-interpolate
@@ -3407,6 +3427,7 @@ broken-packages:
   - parser-helper
   - parsers-megaparsec
   - parsimony
+  - parsley
   - parsnip
   - partage
   - partial-records
@@ -3467,6 +3488,7 @@ broken-packages:
   - persistent-cereal
   - persistent-database-url
   - persistent-discover
+  - persistent-documentation
   - persistent-equivalence
   - persistent-migration
   - persistent-mongoDB
@@ -3612,6 +3634,7 @@ broken-packages:
   - postmaster
   - potato-tool
   - potoki-core
+  - powerdns
   - powermate
   - powerpc
   - powerqueue-levelmem
@@ -3719,6 +3742,7 @@ broken-packages:
   - pushme
   - push-notifications
   - putlenses
+  - puzzle-draw
   - pyffi
   - pyfi
   - python-pickle
@@ -3763,6 +3787,7 @@ broken-packages:
   - quiver
   - quokka
   - quoridor-hs
+  - raaz
   - RabbitMQ
   - rad
   - radian
@@ -3800,7 +3825,9 @@ broken-packages:
   - react-haskell
   - reaction-logic
   - reactive-bacon
-  - reactive-banana
+  - reactive-banana-gi-gtk
+  - reactive-banana-sdl2
+  - reactive-banana-threepenny
   - reactive-thread
   - react-tutorial-haskell-server
   - readability
@@ -3985,6 +4012,9 @@ broken-packages:
   - SableCC2Hs
   - safe-buffer-monad
   - safe-coerce
+  - safe-coloured-text-gen
+  - safe-coloured-text-layout
+  - safe-coloured-text-terminfo
   - safecopy-migrate
   - safecopy-store
   - safe-freeze
@@ -4337,6 +4367,7 @@ broken-packages:
   - sparse-lin-alg
   - special-functors
   - special-keys
+  - speculate
   - speculation
   - sphinx
   - sphinxesc
@@ -4820,6 +4851,7 @@ broken-packages:
   - typed-encoding
   - typedflow
   - typedquery
+  - typed-time
   - typed-wire
   - type-eq
   - type-fun
@@ -4890,6 +4922,7 @@ broken-packages:
   - unpack-funcs
   - unroll-ghc-plugin
   - unsafely
+  - unsatisfiable
   - unsequential
   - unused
   - uom-plugin
@@ -5185,6 +5218,7 @@ broken-packages:
   - yahoo-web-search
   - yajl
   - yall
+  - yam-app
   - yam-config
   - yaml-pretty-extras
   - YamlReference
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 86edacf144ba0..6f3808103063e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -84,12 +84,15 @@ default-package-overrides:
   # We can keep this pin at most until base 4.15
   - monoid-extras < 0.6
   - diagrams-core < 1.5.0
+  - diagrams-lib < 1.4.4
   # 2021-05-11: Pin for hls 1.1.0
   - ghcide == 1.2.*
   - hls-plugin-api == 1.1.0.0
   - hls-explicit-imports-plugin < 1.0.0.2
   # 2021-05-12: remove once versions >= 5.0.0 is in stackage
   - futhark < 0.19.5
+  # 2021-06-05: remove once pandoc 2.14 is in stackage
+  - pandoc-crossref < 0.3.11.0
 
 extra-packages:
   - base16-bytestring < 1               # required for cabal-install etc.
@@ -126,6 +129,7 @@ package-maintainers:
   berberman:
     - nvfetcher
     - arch-web
+    - uusi
   bdesham:
     - pinboard-notes-backup
   cdepillabout:
@@ -302,6 +306,12 @@ package-maintainers:
     - yarn-lock
     - yarn2nix
     - large-hashable
+    - haskell-ci
+    - diagrams
+    # owothia
+    - irc-client
+    - chatter
+    - envy
   terlar:
     - nix-diff
   turion:
@@ -395,6 +405,7 @@ unsupported-platforms:
   PortMidi:                                     [ x86_64-darwin ]
   posix-api:                                    [ x86_64-darwin ]
   Raincat:                                      [ x86_64-darwin ]
+  reactive-balsa:                               [ x86_64-darwin ] # depends on alsa-core
   reactivity:                                   [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
   reflex-dom-fragment-shader-canvas:            [ x86_64-darwin, aarch64-linux ]
   reflex-dom:                                   [ x86_64-darwin, aarch64-linux ]
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index a8c353cd6a7c8..bfe0b93b3e41c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@@ -1,4 +1,4 @@
-# Stackage Nightly 2021-05-19
+# Stackage Nightly 2021-06-01
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -11,6 +11,8 @@ default-package-overrides:
   - ad ==4.4.1
   - adjunctions ==4.4
   - adler32 ==0.1.2.0
+  - aern2-mp ==0.2.6.0
+  - aern2-real ==0.2.6.0
   - aeson ==1.5.6.0
   - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.0
@@ -27,7 +29,7 @@ default-package-overrides:
   - aeson-pretty ==0.8.8
   - aeson-qq ==0.8.3
   - aeson-schemas ==1.3.3
-  - aeson-typescript ==0.3.0.0
+  - aeson-typescript ==0.3.0.1
   - aeson-with ==0.1.2.0
   - aeson-yak ==0.1.1.3
   - aeson-yaml ==1.1.0.0
@@ -148,10 +150,10 @@ default-package-overrides:
   - 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
+  - ap-normalize ==0.1.0.1
   - appar ==0.1.8
   - appendmap ==0.1.5
-  - apply-refact ==0.9.2.0
+  - apply-refact ==0.9.3.0
   - apportionment ==0.0.0.3
   - approximate ==0.3.4
   - approximate-equality ==1.1.0.2
@@ -176,7 +178,7 @@ default-package-overrides:
   - asn1-types ==0.3.4
   - assert-failure ==0.1.2.5
   - assoc ==1.0.2
-  - astro ==0.4.2.1
+  - astro ==0.4.3.0
   - async ==2.2.3
   - async-extra ==0.2.0.0
   - async-pool ==0.9.1
@@ -201,6 +203,8 @@ default-package-overrides:
   - avers ==0.0.17.1
   - avro ==0.5.2.0
   - aws-cloudfront-signed-cookies ==0.2.0.6
+  - aws-xray-client ==0.1.0.0
+  - aws-xray-client-wai ==0.1.0.0
   - backprop ==0.2.6.4
   - backtracking ==0.1.0
   - bank-holidays-england ==0.2.0.6
@@ -356,7 +360,7 @@ default-package-overrides:
   - cayley-client ==0.4.15
   - cborg ==0.2.5.0
   - cborg-json ==0.2.2.0
-  - cdar-mBound ==0.1.0.1
+  - cdar-mBound ==0.1.0.2
   - c-enum ==0.1.0.1
   - cereal ==0.5.8.1
   - cereal-conduit ==0.8.0
@@ -391,9 +395,9 @@ default-package-overrides:
   - circle-packing ==0.1.0.6
   - circular ==0.3.1.1
   - citeproc ==0.3.0.9
-  - clash-ghc ==1.4.1
-  - clash-lib ==1.4.1
-  - clash-prelude ==1.4.1
+  - clash-ghc ==1.4.2
+  - clash-lib ==1.4.2
+  - clash-prelude ==1.4.2
   - classy-prelude ==1.5.0
   - classy-prelude-conduit ==1.5.0
   - clay ==0.13.3
@@ -519,6 +523,7 @@ default-package-overrides:
   - csp ==1.4.0
   - css-syntax ==0.1.0.0
   - css-text ==0.1.3.0
+  - c-struct ==0.1.0.1
   - csv ==0.1.2
   - ctrie ==0.2
   - cubicbezier ==0.6.0.6
@@ -573,6 +578,7 @@ default-package-overrides:
   - data-textual ==0.3.0.3
   - dataurl ==0.1.0.0
   - DAV ==1.3.4
+  - DBFunctor ==0.1.2.1
   - dbus ==1.2.17
   - dbus-hslogger ==0.1.0.1
   - debian ==4.0.2
@@ -708,7 +714,7 @@ default-package-overrides:
   - errors ==2.3.0
   - errors-ext ==0.4.2
   - ersatz ==0.4.9
-  - esqueleto ==3.4.1.1
+  - esqueleto ==3.5.0.0
   - essence-of-live-coding ==0.2.5
   - essence-of-live-coding-gloss ==0.2.5
   - essence-of-live-coding-pulse ==0.2.5
@@ -734,7 +740,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.10
+  - express ==0.1.12
   - extended-reals ==0.2.4.0
   - extensible-effects ==5.0.0.1
   - extensible-exceptions ==0.1.1.4
@@ -747,18 +753,18 @@ default-package-overrides:
   - fakedata-parser ==0.1.0.0
   - fakefs ==0.3.0.2
   - fakepull ==0.3.0.2
-  - faktory ==1.0.2.3
+  - faktory ==1.0.3.0
   - fast-digits ==0.3.0.0
   - fast-logger ==3.0.5
   - fast-math ==1.0.2
   - fb ==2.1.1
-  - fclabels ==2.0.5
+  - fclabels ==2.0.5.1
   - 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
+  - fft ==0.1.8.7
   - fgl ==5.7.0.3
   - file-embed ==0.0.14.0
   - file-embed-lzma ==0
@@ -938,7 +944,7 @@ default-package-overrides:
   - gitrev ==1.3.1
   - gi-xlib ==2.0.9
   - gl ==0.9
-  - glabrous ==2.0.3
+  - glabrous ==2.0.4
   - GLFW-b ==3.3.0.0
   - Glob ==0.10.1
   - gloss ==1.13.2.1
@@ -947,6 +953,7 @@ default-package-overrides:
   - GLUT ==2.7.0.16
   - gluturtle ==0.0.58.1
   - gnuplot ==0.5.6.1
+  - goldplate ==0.2.0
   - google-isbn ==1.0.3
   - gopher-proxy ==0.1.1.2
   - gothic ==0.1.6
@@ -974,16 +981,17 @@ default-package-overrides:
   - haddock-library ==1.9.0
   - hadoop-streaming ==0.2.0.3
   - hakyll-convert ==0.3.0.4
+  - hal ==0.4.8
   - 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
+  - happstack-server ==7.7.1
   - happy ==1.20.0
   - happy-meta ==0.2.0.11
   - HasBigDecimal ==0.1.1
-  - hasbolt ==0.1.4.5
+  - hasbolt ==0.1.5.0
   - hashable ==1.3.0.0
   - hashable-time ==0.2.1
   - hashids ==1.0.2.4
@@ -1240,7 +1248,7 @@ default-package-overrides:
   - inline-r ==0.10.4
   - inliterate ==0.1.0
   - input-parsers ==0.2.2
-  - insert-ordered-containers ==0.2.4
+  - insert-ordered-containers ==0.2.5
   - inspection-testing ==0.4.5.0
   - instance-control ==0.1.2.0
   - int-cast ==0.2.0.0
@@ -1289,7 +1297,7 @@ default-package-overrides:
   - ix-shapable ==0.1.0
   - jack ==0.7.2
   - jalaali ==1.0.0.0
-  - jira-wiki-markup ==1.3.4
+  - jira-wiki-markup ==1.3.5
   - jose ==0.8.4
   - jose-jwt ==0.9.2
   - js-chart ==2.9.4.1
@@ -1355,7 +1363,7 @@ default-package-overrides:
   - lazyio ==0.1.0.4
   - lazysmallcheck ==0.6
   - lca ==0.4
-  - leancheck ==0.9.4
+  - leancheck ==0.9.6
   - leancheck-instances ==0.0.4
   - leapseconds-announced ==2017.1.0.1
   - learn-physics ==0.6.5
@@ -1402,6 +1410,7 @@ default-package-overrides:
   - list-t ==1.0.4
   - list-transformer ==1.0.7
   - ListTree ==0.2.3
+  - literatex ==0.1.0.0
   - little-rio ==0.2.2
   - llvm-hs ==9.0.1
   - llvm-hs-pure ==9.0.0
@@ -1501,7 +1510,7 @@ default-package-overrides:
   - min-max-pqueue ==0.1.0.2
   - mintty ==0.1.2
   - missing-foreign ==0.1.1
-  - mixed-types-num ==0.5.3.1
+  - mixed-types-num ==0.5.7.0
   - mltool ==0.2.0.1
   - mmap ==0.5.9
   - mmark ==0.0.7.2
@@ -1519,7 +1528,7 @@ default-package-overrides:
   - 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-coroutine ==0.9.1.2
   - monad-extras ==0.6.0
   - monadic-arrays ==0.2.2
   - monad-journal ==0.8.1
@@ -1597,6 +1606,8 @@ default-package-overrides:
   - netlib-carray ==0.1
   - netlib-comfort-array ==0.0.0.1
   - netlib-ffi ==0.1.1
+  - net-mqtt ==0.7.1.0
+  - net-mqtt-lens ==0.1.0.0
   - netpbm ==1.0.4
   - nettle ==0.3.0
   - netwire ==5.0.3
@@ -1699,7 +1710,7 @@ default-package-overrides:
   - pagure-cli ==0.2
   - pandoc ==2.13
   - pandoc-dhall-decoder ==0.1.0.1
-  - pandoc-plot ==1.2.1
+  - pandoc-plot ==1.2.2
   - pandoc-throw ==0.1.0.0
   - pandoc-types ==1.22
   - pantry ==0.5.2.1
@@ -1716,7 +1727,7 @@ default-package-overrides:
   - parsers ==0.12.10
   - partial-handler ==1.0.3
   - partial-isomorphisms ==0.2.2.1
-  - partial-semigroup ==0.5.1.8
+  - partial-semigroup ==0.5.1.12
   - password ==3.0.0.0
   - password-instances ==3.0.0.0
   - password-types ==1.0.0.0
@@ -1733,7 +1744,7 @@ default-package-overrides:
   - pattern-arrows ==0.0.2
   - pava ==0.1.1.1
   - pcg-random ==0.1.3.7
-  - pcre2 ==1.1.4
+  - pcre2 ==1.1.5
   - pcre-heavy ==1.0.0.2
   - pcre-light ==0.4.1.0
   - pcre-utils ==0.1.8.2
@@ -1747,17 +1758,16 @@ default-package-overrides:
   - 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 ==2.13.0.2
   - persistent-mtl ==0.2.1.0
-  - persistent-mysql ==2.10.3.1
+  - persistent-mysql ==2.13.0.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
+  - persistent-postgresql ==2.13.0.1
+  - persistent-qq ==2.12.0.1
+  - persistent-sqlite ==2.13.0.3
+  - persistent-template ==2.12.0.0
+  - persistent-test ==2.13.0.3
+  - persistent-typed-db ==0.1.0.4
   - pg-harness-client ==0.6.0
   - pgp-wordlist ==0.1.0.3
   - pg-transact ==0.3.1.1
@@ -1917,7 +1927,7 @@ default-package-overrides:
   - range-set-list ==0.1.3.1
   - rank1dynamic ==0.4.1
   - rank2classes ==1.4.1
-  - Rasterific ==0.7.5.3
+  - Rasterific ==0.7.5.4
   - rasterific-svg ==0.3.3.2
   - ratel ==1.0.15
   - rate-limit ==1.4.2
@@ -1936,7 +1946,7 @@ default-package-overrides:
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
   - rebase ==1.6.1
-  - record-dot-preprocessor ==0.2.10
+  - record-dot-preprocessor ==0.2.11
   - record-hasfield ==1.0
   - records-sop ==0.1.1.0
   - record-wrangler ==0.1.1.0
@@ -2005,8 +2015,8 @@ default-package-overrides:
   - rope-utf16-splay ==0.3.2.0
   - rosezipper ==0.2
   - rot13 ==0.2.0.1
-  - rpmbuild-order ==0.4.4
-  - rp-tree ==0.3.5
+  - rpmbuild-order ==0.4.5
+  - rp-tree ==0.3.6
   - RSA ==2.4.1
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.6
@@ -2034,13 +2044,13 @@ default-package-overrides:
   - sandwich-webdriver ==0.1.0.4
   - say ==0.1.0.1
   - sbp ==2.6.3
-  - sbv ==8.14
+  - sbv ==8.15
   - 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
+  - scientific ==0.3.7.0
   - scotty ==0.12
   - scrypt ==0.5.0
   - sdl2 ==2.5.3.0
@@ -2081,6 +2091,7 @@ default-package-overrides:
   - servant-auth-docs ==0.2.10.0
   - servant-auth-server ==0.4.6.0
   - servant-auth-swagger ==0.2.10.1
+  - servant-auth-wordpress ==1.0.0.2
   - servant-blaze ==0.9.1
   - servant-client ==0.18.2
   - servant-client-core ==0.18.2
@@ -2191,7 +2202,7 @@ default-package-overrides:
   - splint ==1.0.1.4
   - split ==0.2.3.4
   - splitmix ==0.1.0.3
-  - splitmix-distributions ==0.8.0.0
+  - splitmix-distributions ==0.9.0.0
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.8
   - sqlcli ==0.2.2.0
@@ -2237,6 +2248,7 @@ default-package-overrides:
   - streaming-commons ==0.2.2.1
   - streamly ==0.7.3
   - streams ==3.3
+  - streamt ==0.5.0.0
   - strict ==0.4.0.1
   - strict-concurrency ==0.2.4.3
   - strict-list ==0.1.5
@@ -2247,7 +2259,7 @@ default-package-overrides:
   - string-combinators ==0.6.0.5
   - string-conv ==0.1.2
   - string-conversions ==0.4.0.1
-  - string-interpolate ==0.3.1.0
+  - string-interpolate ==0.3.1.1
   - string-qq ==0.0.4
   - string-random ==0.1.4.1
   - stringsearch ==0.3.6.6
@@ -2322,7 +2334,7 @@ default-package-overrides:
   - tasty-test-reporter ==0.1.1.4
   - tasty-th ==0.1.7
   - tasty-wai ==0.1.1.1
-  - Taxonomy ==2.1.0
+  - Taxonomy ==2.2.0
   - TCache ==0.12.1
   - tce-conf ==1.3
   - tdigest ==0.2.1.1
@@ -2348,7 +2360,7 @@ default-package-overrides:
   - text-builder ==0.6.6.2
   - text-conversions ==0.3.1
   - text-format ==0.3.2
-  - text-icu ==0.7.0.1
+  - text-icu ==0.7.1.0
   - text-latin1 ==0.3.1
   - text-ldap ==0.1.1.13
   - textlocal ==0.1.0.5
@@ -2505,12 +2517,12 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.3
   - unix-time ==0.4.7
-  - unliftio ==0.2.16
+  - unliftio ==0.2.17
   - 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
+  - unordered-containers ==0.2.14.0
   - unsafe ==0.0
   - urbit-hob ==0.3.3
   - uri-bytestring ==0.3.3.0
@@ -2542,6 +2554,7 @@ default-package-overrides:
   - validity-vector ==0.2.0.3
   - valor ==0.1.0.0
   - vault ==0.3.1.5
+  - vcs-ignore ==0.0.1.0
   - vec ==0.4
   - vector ==0.12.3.0
   - vector-algorithms ==0.8.0.4
@@ -2563,7 +2576,7 @@ default-package-overrides:
   - vformat-aeson ==0.1.0.1
   - vformat-time ==0.1.0.0
   - ViennaRNAParser ==1.3.3
-  - vinyl ==0.13.2
+  - vinyl ==0.13.3
   - void ==0.7.3
   - vty ==5.33
   - wai ==3.2.3
@@ -2588,8 +2601,8 @@ default-package-overrides:
   - 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 ==3.3.16
+  - warp-tls ==3.3.1
   - warp-tls-uid ==0.2.0.6
   - wave ==0.2.0
   - wcwidth ==0.0.2
@@ -2610,7 +2623,7 @@ default-package-overrides:
   - Win32 ==2.6.1.0
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
-  - witch ==0.3.1.0
+  - witch ==0.3.3.0
   - witherable ==0.4.1
   - within ==0.2.0.1
   - with-location ==0.1.0
@@ -2621,6 +2634,7 @@ default-package-overrides:
   - wl-pprint-text ==1.2.0.1
   - word24 ==2.0.1
   - word8 ==0.1.3
+  - wordpress-auth ==1.0.0.1
   - word-trie ==0.3.0
   - word-wrap ==0.4.1
   - world-peace ==1.0.2.0
@@ -2664,19 +2678,19 @@ default-package-overrides:
   - xss-sanitize ==0.3.6
   - xxhash-ffi ==0.2.0.0
   - yaml ==0.11.5.0
-  - yamlparse-applicative ==0.1.0.3
+  - yamlparse-applicative ==0.1.0.4
   - yesod ==1.6.1.1
   - yesod-auth ==1.6.10.3
-  - yesod-auth-hashdb ==1.7.1.6
+  - yesod-auth-hashdb ==1.7.1.7
   - yesod-auth-oauth2 ==0.6.3.4
   - yesod-bin ==1.6.1
-  - yesod-core ==1.6.20
+  - yesod-core ==1.6.20.1
   - yesod-fb ==0.6.1
   - yesod-form ==1.6.7
   - yesod-gitrev ==0.2.1
   - yesod-markdown ==0.12.6.11
   - yesod-newsfeed ==1.7.0.0
-  - yesod-page-cursor ==2.0.0.7
+  - yesod-page-cursor ==2.0.0.8
   - yesod-paginator ==1.1.1.0
   - yesod-persistent ==1.6.0.7
   - yesod-sitemap ==1.6.0
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index 20d6617d3c784..e813a2a834756 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -29,6 +29,7 @@ dont-distribute-packages:
  - Advgame
  - Advise-me
  - aern2-real
+ - aern2-real_0_2_7_0
  - AERN-Net
  - AERN-Real
  - AERN-Real-Double
@@ -93,7 +94,6 @@ dont-distribute-packages:
  - ApplePush
  - approx-rand-test
  - arbor-monad-metric-datadog
- - arch-hs
  - archlinux-web
  - arduino-copilot
  - arff
@@ -399,9 +399,7 @@ dont-distribute-packages:
  - claferwiki
  - clash
  - clash-ghc
- - clash-ghc_1_4_2
  - clash-lib
- - clash-lib_1_4_2
  - clash-multisignal
  - clash-prelude-quickcheck
  - clash-systemverilog
@@ -440,6 +438,7 @@ dont-distribute-packages:
  - cnc-spec-compiler
  - Coadjute
  - codec
+ - code-conjure
  - codec-rpm
  - codemonitor
  - cognimeta-utils
@@ -625,8 +624,6 @@ dont-distribute-packages:
  - dhall-docs
  - dhcp-lease-parser
  - dia-functions
- - diagrams-braille
- - diagrams-builder
  - diagrams-haddock
  - diagrams-html5
  - diagrams-pandoc
@@ -782,9 +779,9 @@ dont-distribute-packages:
  - extemp
  - extensible-data
  - extract-dependencies
+ - extrapolate
  - Facts
  - factual-api
- - fadno-braids
  - FailureT
  - fakedata-quickcheck
  - fallingblocks
@@ -970,7 +967,6 @@ dont-distribute-packages:
  - global-config
  - glome-hs
  - GlomeView
- - gloss-banana
  - gloss-devil
  - gloss-examples
  - gloss-sodium
@@ -1086,28 +1082,8 @@ dont-distribute-packages:
  - hadoop-tools
  - haggis
  - hails-bin
- - hakyll-agda
- - hakyll-alectryon
- - hakyll-blaze-templates
- - hakyll-contrib
- - hakyll-contrib-csv
- - hakyll-contrib-elm
- - hakyll-contrib-hyphenation
- - hakyll-contrib-i18n
- - hakyll-contrib-links
- - hakyll-dhall
- - hakyll-dir-list
  - hakyll-elm
- - hakyll-favicon
- - hakyll-filestore
- - hakyll-images
  - hakyll-ogmarkup
- - hakyll-process
- - hakyll-R
- - hakyll-sass
- - hakyll-series
- - hakyll-shakespeare
- - hakyll-shortcut-links
  - hakyll-typescript
  - halberd
  - hall-symbols
@@ -1351,10 +1327,10 @@ dont-distribute-packages:
  - HLearn-datastructures
  - HLearn-distributions
  - hledger-api
+ - hlrdb
  - hls
  - hly
  - hmark
- - hmatrix-sundials
  - hmeap
  - hmeap-utils
  - hmep
@@ -1610,7 +1586,6 @@ dont-distribute-packages:
  - iteratee-parsec
  - iteratee-stm
  - iterio-server
- - iterm-show-diagrams
  - iter-stats
  - ivor
  - ivory-avr-atmega328p-registers
@@ -1680,7 +1655,6 @@ dont-distribute-packages:
  - karakuri
  - katip-elasticsearch
  - katip-rollbar
- - kawaii
  - keera-hails-i18n
  - keera-hails-mvc-environment-gtk
  - keera-hails-mvc-model-lightmodel
@@ -1917,7 +1891,6 @@ dont-distribute-packages:
  - marquise
  - marvin
  - masakazu-bot
- - master-plan
  - matchers
  - mathblog
  - mathlink
@@ -2000,6 +1973,7 @@ dont-distribute-packages:
  - Monocle
  - monte-carlo
  - moo
+ - moo-nad
  - morley
  - morloc
  - morphisms-functors-inventory
@@ -2118,6 +2092,7 @@ dont-distribute-packages:
  - NoSlow
  - notmuch-haskell
  - notmuch-web
+ - nri-prelude_0_6_0_1
  - numerical
  - numeric-ode
  - numhask-hedgehog
@@ -2344,7 +2319,6 @@ dont-distribute-packages:
  - push-notify-apn
  - push-notify-ccs
  - push-notify-general
- - puzzle-draw
  - puzzle-draw-cmdline
  - pvd
  - qd-vec
@@ -2417,18 +2391,10 @@ dont-distribute-packages:
  - rdioh
  - react-flux-servant
  - reactive
- - reactive-balsa
- - reactive-banana-automation
- - reactive-banana-bunch
- - reactive-banana-gi-gtk
  - reactive-banana-sdl
- - reactive-banana-sdl2
- - reactive-banana-threepenny
  - reactive-banana-wx
  - reactive-fieldtrip
  - reactive-glut
- - reactive-jack
- - reactive-midyim
  - reactor
  - readline-statevar
  - readpyc
@@ -2559,6 +2525,7 @@ dont-distribute-packages:
  - ruler-core
  - runtime-arbitrary
  - S3
+ - safe-coloured-text-layout-gen
  - safe-numeric
  - safer-file-handles
  - safer-file-handles-bytestring
@@ -2929,7 +2896,6 @@ dont-distribute-packages:
  - tensorflow-core-ops
  - tensorflow-logging
  - tensorflow-ops
- - termbox-banana
  - terminal-text
  - terrahs
  - testbench
@@ -3248,6 +3214,7 @@ dont-distribute-packages:
  - yajl-enumerator
  - yam
  - yam-datasource
+ - yam-job
  - yam-logger
  - yaml-rpc-scotty
  - yaml-rpc-snap
@@ -3255,6 +3222,7 @@ dont-distribute-packages:
  - yam-redis
  - yam-transaction
  - yam-transaction-odbc
+ - yam-transaction-postgresql
  - yam-web
  - yarr-image-io
  - yavie
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index a9f6263ab5dd2..538d5381a96a4 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -819,4 +819,18 @@ self: super: builtins.intersectAttrs super {
   # itself causing an infinite recursion at evaluation
   # time
   random = dontCheck super.random;
+
+  # Since this package is primarily used by nixpkgs maintainers and is probably
+  # not used to link against by anyone, we can make it’s closure smaller.
+  cabal2nix-unstable = justStaticExecutables super.cabal2nix-unstable;
+
+  # test suite needs local redis daemon
+  nri-redis = dontCheck super.nri-redis;
+
+  # Make tophat find itself for _compiling_ its test suite
+  tophat = overrideCabal super.tophat (drv: {
+    postPatch = ''
+      sed -i 's|"tophat"|"./dist/build/tophat/tophat"|' app-test-bin/*.hs
+    '' + (drv.postPatch or "");
+  });
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9ec6640f3d90c..459821f253f55 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3898,26 +3898,26 @@ self: {
 
   "DBFunctor" = callPackage
     ({ mkDerivation, base, bytestring, cassava, cereal, containers
-     , deepseq, either, MissingH, text, time, transformers
-     , unordered-containers, vector
+     , deepseq, either, text, time, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "DBFunctor";
-       version = "0.1.1.1";
-       sha256 = "0n3qmgjf9ly5vpnsvh8rhwbd94l157d1asy95n8yqpmrb6xqc1k4";
+       version = "0.1.2.1";
+       sha256 = "0ikb4s9g1mrp4pdz1119dq1vci7mfcvcw92xs47rcin26a3ysdcz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring cassava cereal containers deepseq either MissingH
-         text time transformers unordered-containers vector
+         base bytestring cassava cereal containers deepseq either text time
+         transformers unordered-containers vector
        ];
        executableHaskellDepends = [
-         base bytestring cassava cereal containers deepseq either MissingH
-         text time transformers unordered-containers vector
+         base bytestring cassava cereal containers deepseq either text time
+         transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         base bytestring cassava cereal containers deepseq either MissingH
-         text time transformers unordered-containers vector
+         base bytestring cassava cereal containers deepseq either text time
+         transformers unordered-containers vector
        ];
        description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell";
        license = lib.licenses.bsd3;
@@ -6347,8 +6347,8 @@ self: {
      }:
      mkDerivation {
        pname = "Frames";
-       version = "0.7.1";
-       sha256 = "10js8xhp1v6gk6aagrzkn5c2c2gg4xml9vavpvhjfvj2jz77rfkm";
+       version = "0.7.2";
+       sha256 = "08q3zfhb6wf4b8020d63v6zpmb3834ba50hnb478vvjqd8rrp1mh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14097,6 +14097,24 @@ self: {
        license = lib.licenses.gpl3Only;
      }) {};
 
+  "NanoID" = callPackage
+    ({ mkDerivation, base, bytestring, extra, mwc-random
+     , optparse-applicative
+     }:
+     mkDerivation {
+       pname = "NanoID";
+       version = "1.2.0";
+       sha256 = "1fwbzdj7cn96fbq4vsp4582p317qw3piy237vxf79d0wmdp006zn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring extra mwc-random ];
+       executableHaskellDepends = [
+         base bytestring mwc-random optparse-applicative
+       ];
+       description = "NanoID generator";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "NanoProlog" = callPackage
     ({ mkDerivation, base, containers, ListLike, uu-parsinglib }:
      mkDerivation {
@@ -15934,32 +15952,34 @@ self: {
 
   "PrimitiveArray" = callPackage
     ({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector
-     , containers, criterion, deepseq, DPutils, hashable, lens
-     , log-domain, mtl, OrderedBits, primitive, QuickCheck, smallcheck
-     , tasty, tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector
+     , containers, criterion, deepseq, DPutils, hashable, hashtables
+     , lens, log-domain, mtl, OrderedBits, primitive, QuickCheck
+     , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck, tasty-th
+     , text, unordered-containers, vector, vector-algorithms
      , vector-binary-instances, vector-th-unbox
      }:
      mkDerivation {
        pname = "PrimitiveArray";
-       version = "0.10.0.0";
-       sha256 = "0g9shj3zqk8rdp905di9i5g5bhga5msc7cs609fk3nkjm16ms0vi";
+       version = "0.10.1.0";
+       sha256 = "1qjld82q0fdaav6y9ky0bkmqjxvv48502zd3s9i1b72wn436zhib";
        libraryHaskellDepends = [
          aeson base binary bits cereal cereal-vector containers deepseq
-         DPutils hashable lens log-domain mtl OrderedBits primitive
-         QuickCheck smallcheck text vector vector-binary-instances
-         vector-th-unbox
+         DPutils hashable hashtables lens log-domain mtl OrderedBits
+         primitive QuickCheck smallcheck text unordered-containers vector
+         vector-algorithms vector-binary-instances vector-th-unbox
        ];
        testHaskellDepends = [
          aeson base binary bits cereal cereal-vector containers deepseq
-         DPutils hashable lens log-domain mtl OrderedBits primitive
-         QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
-         tasty-th text vector vector-binary-instances vector-th-unbox
+         DPutils hashable hashtables lens log-domain mtl OrderedBits
+         primitive QuickCheck smallcheck tasty tasty-quickcheck
+         tasty-smallcheck tasty-th text unordered-containers vector
+         vector-algorithms vector-binary-instances vector-th-unbox
        ];
        benchmarkHaskellDepends = [
          aeson base binary bits cereal cereal-vector containers criterion
-         deepseq DPutils hashable lens log-domain mtl OrderedBits primitive
-         QuickCheck smallcheck text vector vector-binary-instances
-         vector-th-unbox
+         deepseq DPutils hashable hashtables lens log-domain mtl OrderedBits
+         primitive QuickCheck smallcheck text unordered-containers vector
+         vector-algorithms vector-binary-instances vector-th-unbox
        ];
        description = "Efficient multidimensional arrays";
        license = lib.licenses.bsd3;
@@ -16029,8 +16049,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "Probnet";
-       version = "0.1.0.2";
-       sha256 = "1jk1y51rda8j4lan2az906fwb5hgqb8s50p0xrhchnf654scm851";
+       version = "0.1.0.4";
+       sha256 = "02q4c7mp268r8f3p2f37yksssginjrs89ldqljpn80aj53ylcqyf";
        libraryHaskellDepends = [ base ];
        description = "Geometric Extrapolation of Integer Sequences with error prediction";
        license = lib.licenses.mit;
@@ -16877,8 +16897,8 @@ self: {
      }:
      mkDerivation {
        pname = "Rasterific";
-       version = "0.7.5.3";
-       sha256 = "164ivzwrla90baqz6gapmcmi1yg5bk0sczqv4xawx3l7dzkz8ghv";
+       version = "0.7.5.4";
+       sha256 = "07silf2b85kxq7wvl5mnwrg5p0gwzlapipj9hi224i9ix1knn5f1";
        libraryHaskellDepends = [
          base bytestring containers dlist FontyFruity free JuicyPixels mtl
          primitive transformers vector vector-algorithms
@@ -19631,14 +19651,14 @@ self: {
 
   "Taxonomy" = callPackage
     ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl
-     , parsec, text, vector
+     , graphviz, parsec, text, vector
      }:
      mkDerivation {
        pname = "Taxonomy";
-       version = "2.1.0";
-       sha256 = "1l64ma631q1gh57gwg09mpxz66hkhqbc9f9dn2bhy681p8ia7j50";
+       version = "2.2.0";
+       sha256 = "0rwm3p510k5nmzbdy8bxdviv37mba0bvygxq92f24wqb5gry8w9w";
        libraryHaskellDepends = [
-         aeson base bytestring either-unwrap fgl parsec text vector
+         aeson base bytestring either-unwrap fgl graphviz parsec text vector
        ];
        description = "Libary for parsing, processing and vizualization of taxonomy data";
        license = lib.licenses.gpl3Only;
@@ -21330,6 +21350,25 @@ self: {
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; 
          inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
 
+  "X11_1_10" = callPackage
+    ({ mkDerivation, base, data-default-class, libX11, libXext
+     , libXinerama, libXrandr, libXrender, libXScrnSaver
+     }:
+     mkDerivation {
+       pname = "X11";
+       version = "1.10";
+       sha256 = "1zrdqryx99izjvsrsalb65ihpmikm9r6cjlci7cfp6wlwa3i585n";
+       libraryHaskellDepends = [ base data-default-class ];
+       librarySystemDepends = [
+         libX11 libXext libXinerama libXrandr libXrender libXScrnSaver
+       ];
+       description = "A binding to the X11 graphics library";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; 
+         inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; 
+         inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
+
   "X11-extras" = callPackage
     ({ mkDerivation, base, libX11, X11 }:
      mkDerivation {
@@ -21808,8 +21847,8 @@ self: {
      }:
      mkDerivation {
        pname = "Z-Data";
-       version = "0.8.2.0";
-       sha256 = "0xjy5689ck23fyas52qrfrl716fpgmnahp7pln54yyz106hxqj4p";
+       version = "0.8.3.0";
+       sha256 = "1y8vgz3jps2vsg5ay9s792knfyk5cvc6549q5li51jaqibsrw99m";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq ghc-prim
@@ -21836,8 +21875,8 @@ self: {
      }:
      mkDerivation {
        pname = "Z-IO";
-       version = "0.8.0.0";
-       sha256 = "000ziih2c33v5mbf9sljkrr0x9hxv31cq77blva6xy32zzh12yz3";
+       version = "0.8.1.0";
+       sha256 = "08nw9jxg2n8yls5p1dhyy976qbcj5kwv468fq1dijn91f7ylhfix";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23692,10 +23731,8 @@ self: {
      }:
      mkDerivation {
        pname = "active";
-       version = "0.2.0.14";
-       sha256 = "0x3b4ln6csa554qls28wbxvclkbdz3yi60i1m0q5ing0cs16fifz";
-       revision = "1";
-       editedCabalFile = "01j431dkl3ax98g974v6mgxv9xha4c0hlpjqq5fvh7l8lyjan676";
+       version = "0.2.0.15";
+       sha256 = "019xr66pahsssqr2hybs88mga4qshv1vmd22j7624wqafqm57d74";
        libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -24160,8 +24197,31 @@ self: {
      }:
      mkDerivation {
        pname = "aern2-mp";
-       version = "0.2.1.1";
-       sha256 = "1fsdvjancc2mi9i7l1gaqqvhnafchvw37hrn9ksd20djy43gzwyw";
+       version = "0.2.6.0";
+       sha256 = "0vfjgcf2pnspaixgxg8av7k0cqv5cqmy161zkgjr822n118an1ch";
+       libraryHaskellDepends = [
+         base cdar-mBound collect-errors deepseq hspec integer-logarithms
+         mixed-types-num QuickCheck reflection regex-tdfa template-haskell
+       ];
+       testHaskellDepends = [
+         base cdar-mBound collect-errors deepseq hspec integer-logarithms
+         mixed-types-num QuickCheck reflection regex-tdfa template-haskell
+       ];
+       description = "Multi-precision ball (interval) arithmetic";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "aern2-mp_0_2_7_0" = callPackage
+    ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec
+     , integer-logarithms, mixed-types-num, QuickCheck, reflection
+     , regex-tdfa, template-haskell
+     }:
+     mkDerivation {
+       pname = "aern2-mp";
+       version = "0.2.7.0";
+       sha256 = "1gsqaggg6mpcpl9s3z566gmbynj4l6n1fhni5b0p8pf5hj8n93gg";
        libraryHaskellDepends = [
          base cdar-mBound collect-errors deepseq hspec integer-logarithms
          mixed-types-num QuickCheck reflection regex-tdfa template-haskell
@@ -24182,12 +24242,37 @@ self: {
      }:
      mkDerivation {
        pname = "aern2-real";
-       version = "0.2.1.0";
-       sha256 = "06nz820p5gillvyjnx7bhmadpc0mrkvg8wiz9zmpcj6d23f28vzg";
+       version = "0.2.6.0";
+       sha256 = "182vjrbdzjcpbbhmpsmv6i685jrnw94vda37646d1gph5v3hvfw6";
+       libraryHaskellDepends = [
+         aern2-mp base collect-errors hspec integer-logarithms
+         mixed-types-num QuickCheck
+       ];
+       testHaskellDepends = [
+         aern2-mp base collect-errors hspec integer-logarithms
+         mixed-types-num QuickCheck
+       ];
+       description = "Real numbers as sequences of MPBalls";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "aern2-real_0_2_7_0" = callPackage
+    ({ mkDerivation, aern2-mp, base, collect-errors, hspec
+     , integer-logarithms, mixed-types-num, QuickCheck
+     }:
+     mkDerivation {
+       pname = "aern2-real";
+       version = "0.2.7.0";
+       sha256 = "0dsph1775rifr9vvx4w7v55bryqmh04fhk6nyk7d91yhn1sf6wc9";
        libraryHaskellDepends = [
          aern2-mp base collect-errors hspec integer-logarithms
          mixed-types-num QuickCheck
        ];
+       testHaskellDepends = [
+         aern2-mp base collect-errors hspec integer-logarithms
+         mixed-types-num QuickCheck
+       ];
        description = "Real numbers as sequences of MPBalls";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -25054,20 +25139,21 @@ self: {
 
   "aeson-typescript" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, hspec, interpolate, mtl, process, template-haskell
-     , temporary, text, th-abstraction, unordered-containers
+     , filepath, hspec, mtl, process, string-interpolate
+     , template-haskell, temporary, text, th-abstraction
+     , unordered-containers
      }:
      mkDerivation {
        pname = "aeson-typescript";
-       version = "0.3.0.0";
-       sha256 = "054mhzsywbprccvp5pqscj9f92dvkrxgzpxz16bfadxn98wa1j7h";
+       version = "0.3.0.1";
+       sha256 = "0xbj6m1lxpv4qclz5msrdplpy3mdxq5icjl3fq4bwbqy5rs6vczv";
        libraryHaskellDepends = [
-         aeson base containers interpolate mtl template-haskell text
+         aeson base containers mtl string-interpolate template-haskell text
          th-abstraction unordered-containers
        ];
        testHaskellDepends = [
-         aeson base bytestring containers directory filepath hspec
-         interpolate mtl process template-haskell temporary text
+         aeson base bytestring containers directory filepath hspec mtl
+         process string-interpolate template-haskell temporary text
          th-abstraction unordered-containers
        ];
        description = "Generate TypeScript definition files from your ADTs";
@@ -25425,6 +25511,26 @@ self: {
        license = lib.licenses.publicDomain;
      }) {};
 
+  "agda2lagda_0_2021_6_1" = callPackage
+    ({ mkDerivation, base, directory, filepath, goldplate
+     , optparse-applicative, process
+     }:
+     mkDerivation {
+       pname = "agda2lagda";
+       version = "0.2021.6.1";
+       sha256 = "1108xzl4fv86qpasg1wbc26bypd06s41kmgzybrggc76pv15hbis";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory filepath optparse-applicative
+       ];
+       testHaskellDepends = [ base process ];
+       testToolDepends = [ goldplate ];
+       description = "Translate .agda files into .lagda.tex files.";
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "agentx" = callPackage
     ({ mkDerivation, base, binary, bitwise, bytestring, containers
      , data-default, Diff, fclabels, mtl, network, pipes
@@ -30697,8 +30803,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, integer-gmp }:
      mkDerivation {
        pname = "aop-prelude";
-       version = "0.4.0.0";
-       sha256 = "0jg572zz9lbhpp4bxldrc0gs0ac0f4hfcrxds77gr51xizxfa7cn";
+       version = "0.4.1.0";
+       sha256 = "1ha39yfmiw61g907h83wsjw9zyvvkzi7zbr3y9dcciv2cgnb5h6a";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base ghc-prim ];
        description = "prelude for Algebra of Programming";
@@ -30755,8 +30861,8 @@ self: {
     ({ mkDerivation, base, inspection-testing, transformers }:
      mkDerivation {
        pname = "ap-normalize";
-       version = "0.1.0.0";
-       sha256 = "0iqfilamnp0k170af7sw0ydn0cmba7ab06yinkl8vfppf583a4la";
+       version = "0.1.0.1";
+       sha256 = "1212zxc4qn6msk0w13yhrza2qjs79h78misllb4chng75jqi61l2";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base inspection-testing transformers ];
        description = "Self-normalizing applicative expressions";
@@ -31673,8 +31779,8 @@ self: {
      }:
      mkDerivation {
        pname = "apply-refact";
-       version = "0.9.2.0";
-       sha256 = "1j0afdl6g51wyb3g47wss15v0yl50n23k3icbyla8h89rxh74lcx";
+       version = "0.9.3.0";
+       sha256 = "1sn5g71sx8xa4ggyk49m661iip6zrzl65vb87l16l31kf79bbm7w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32134,21 +32240,21 @@ self: {
      , bytestring, Cabal, conduit, conduit-extra, containers, deepseq
      , Diff, directory, filepath, hackage-db, http-client
      , http-client-tls, megaparsec, microlens, microlens-th
-     , neat-interpolation, optparse-applicative, polysemy, prettyprinter
+     , neat-interpolation, optparse-simple, polysemy, prettyprinter
      , prettyprinter-ansi-terminal, servant-client, split, tar-conduit
      , template-haskell, text
      }:
      mkDerivation {
        pname = "arch-hs";
-       version = "0.8.0.0";
-       sha256 = "1g33ss6jvvpdgpcl0kwmbvnkawq8cngphjmsbv0jcpnh17brgf8x";
+       version = "0.9.0.0";
+       sha256 = "09i5b4pdbc1x7977icq0m7amk59iy0822ki5dlhd7y74m2dmdf9z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson algebraic-graphs arch-web base bytestring Cabal conduit
          conduit-extra containers deepseq Diff directory filepath hackage-db
          http-client http-client-tls megaparsec microlens microlens-th
-         neat-interpolation optparse-applicative polysemy prettyprinter
+         neat-interpolation optparse-simple polysemy prettyprinter
          prettyprinter-ansi-terminal servant-client split tar-conduit
          template-haskell text
        ];
@@ -32156,13 +32262,12 @@ self: {
          aeson algebraic-graphs arch-web base bytestring Cabal conduit
          conduit-extra containers deepseq Diff directory filepath hackage-db
          http-client http-client-tls megaparsec microlens microlens-th
-         neat-interpolation optparse-applicative polysemy prettyprinter
+         neat-interpolation optparse-simple polysemy prettyprinter
          prettyprinter-ansi-terminal servant-client split tar-conduit
          template-haskell text
        ];
        description = "Distribute hackage packages to archlinux";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "arch-web" = callPackage
@@ -32753,8 +32858,8 @@ self: {
      }:
      mkDerivation {
        pname = "armor";
-       version = "0.2";
-       sha256 = "1flidqihfgb1vwikm3q4dyjdjzrc5z2955ph6h30q0dyv4707s94";
+       version = "0.2.0.1";
+       sha256 = "1pp9y7y9i01mbnkrx4870m4a4crpyzikpi4w8znn3avjbl5c1bxx";
        libraryHaskellDepends = [
          base bytestring containers directory filepath hashable HUnit lens
        ];
@@ -33996,8 +34101,8 @@ self: {
      }:
      mkDerivation {
        pname = "astro";
-       version = "0.4.2.1";
-       sha256 = "0agy9a91n1sy6rgdgwvdz354x452j2lg7nr3by7z9r22rwdxwpfs";
+       version = "0.4.3.0";
+       sha256 = "1zbraw0l40r190vw9dc7bwwcrac4p6yqwng5qa8n277v6cwy5kv5";
        libraryHaskellDepends = [ base matrix time ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -36449,8 +36554,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-lambda-haskell-runtime";
-       version = "4.1.0";
-       sha256 = "1zb426bj1k3b3sp5hlg0ajx19mf0vwvr39zdg6p9l9i830qfdjfw";
+       version = "4.1.1";
+       sha256 = "0w4pdyagcs7m05kccdq0x3s1d4vbr2ihqjrbill0p0gn25q9h6cc";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive exceptions hashable
          http-client http-types mtl path path-io safe-exceptions-checked
@@ -36780,8 +36885,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-xray-client-persistent";
-       version = "0.1.0.0";
-       sha256 = "02aig9j9asbkxni7bmyay1vhs7flf0gz401yldcq4n824c9q8h6f";
+       version = "0.1.0.1";
+       sha256 = "1b45g9gswr2c16xphprqkrpyh2q29kgnr10hm29zjw5pcahgc8mg";
        libraryHaskellDepends = [
          aws-xray-client base conduit containers lens persistent random
          resourcet text time
@@ -42056,8 +42161,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "birds-of-paradise";
-       version = "0.2.0.0";
-       sha256 = "1jkj8li8yxl9kk5i8p63p9jkdcvdznmh473n12dxzimxnh15sf1y";
+       version = "0.2.1.0";
+       sha256 = "0kjwylhya86zqsmc5q6iqrbq4kp3hqxgx3kwam2pv1ls01qdsvvy";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Birds of Paradise";
@@ -44012,8 +44117,8 @@ self: {
      }:
      mkDerivation {
        pname = "blucontrol";
-       version = "0.3.0.1";
-       sha256 = "06hmk4pg5qfcj6smzpn549d1jcsvcbgi2pxgvgvn9k7lab9cb5kg";
+       version = "0.3.1.0";
+       sha256 = "035lrn1j6hrvl5vs5k0q1hb3zwbqh5bvxmfxvjvv9lncv8iy2nd9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47922,6 +48027,18 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "c-struct" = callPackage
+    ({ mkDerivation, array, base, primitive, template-haskell }:
+     mkDerivation {
+       pname = "c-struct";
+       version = "0.1.0.1";
+       sha256 = "0932b00zhhss86baj6cqhvn4f66l6z8dax58l4gbaif81w9281zw";
+       libraryHaskellDepends = [ array base primitive template-haskell ];
+       testHaskellDepends = [ array base primitive template-haskell ];
+       description = "To make a wrapper for struct of C language";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "c0check" = callPackage
     ({ mkDerivation, base, c0parser }:
      mkDerivation {
@@ -49893,25 +50010,25 @@ self: {
     ({ mkDerivation, aeson, async, base, bytestring, calamity-commands
      , colour, concurrent-extra, connection, containers
      , data-default-class, data-flags, deepseq, deque, df1, di-core
-     , di-polysemy, exceptions, fmt, focus, generic-lens, hashable
+     , di-polysemy, exceptions, focus, generic-lens, hashable
      , http-api-data, http-client, http-date, http-types, lens
      , lens-aeson, megaparsec, mime-types, mtl, polysemy
-     , polysemy-plugin, reflection, req, safe-exceptions, scientific
-     , stm, stm-chans, stm-containers, text, text-show, time, tls
-     , typerep-map, unagi-chan, unboxing-vector, unordered-containers
-     , vector, websockets, x509-system
+     , polysemy-plugin, PyF, reflection, req, safe-exceptions
+     , scientific, stm, stm-chans, stm-containers, text, text-show, time
+     , tls, typerep-map, unagi-chan, unboxing-vector
+     , unordered-containers, vector, websockets, x509-system
      }:
      mkDerivation {
        pname = "calamity";
-       version = "0.1.30.1";
-       sha256 = "1qxag4vdxn2s3ijkr9lz5djafnwi7c6vj4q9b5z5p41ldvsil3l7";
+       version = "0.1.30.2";
+       sha256 = "0i0v8cb0a3mbkrb3liw60gb7zflnps5w04a6nx5aynini7mpwanj";
        libraryHaskellDepends = [
          aeson async base bytestring calamity-commands colour
          concurrent-extra connection containers data-default-class
-         data-flags deepseq deque df1 di-core di-polysemy exceptions fmt
-         focus generic-lens hashable http-api-data http-client http-date
+         data-flags deepseq deque df1 di-core di-polysemy exceptions focus
+         generic-lens hashable http-api-data http-client http-date
          http-types lens lens-aeson megaparsec mime-types mtl polysemy
-         polysemy-plugin reflection req safe-exceptions scientific stm
+         polysemy-plugin PyF reflection req safe-exceptions scientific stm
          stm-chans stm-containers text text-show time tls typerep-map
          unagi-chan unboxing-vector unordered-containers vector websockets
          x509-system
@@ -49928,8 +50045,8 @@ self: {
      }:
      mkDerivation {
        pname = "calamity-commands";
-       version = "0.1.2.0";
-       sha256 = "1qm55aikpc1645bzks90r88f317rz5mzwv7grrs9dr37hmy3sl65";
+       version = "0.1.3.0";
+       sha256 = "0vhv63vapjc51hx6g9mjr5vgxlsfkss828wxcfjf5jd98qdv96dj";
        libraryHaskellDepends = [
          base generic-lens lens megaparsec polysemy polysemy-plugin text
          text-show unordered-containers
@@ -52120,8 +52237,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdar-mBound";
-       version = "0.1.0.1";
-       sha256 = "1a31rjs1if69987xi15qpyl2m21qscsxpyrq4jhfk3j87ilpx5zg";
+       version = "0.1.0.2";
+       sha256 = "1qzpb9kwswln7vbj0v0qm6fsi6v3v9xx701hyfg12y3f9hz096zf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers deepseq integer-gmp ];
@@ -53292,6 +53409,7 @@ self: {
        ];
        description = "A library of simple NLP algorithms";
        license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sternenseemann ];
      }) {};
 
   "chatty" = callPackage
@@ -53445,6 +53563,17 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "check-cfg-ambiguity" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "check-cfg-ambiguity";
+       version = "0.0.0.1";
+       sha256 = "1qdg707a8yq61s5rs677yc8wp00sxdrf4vpr2r3c98q2psbkxl1n";
+       libraryHaskellDepends = [ base containers ];
+       description = "Checks context free grammar for ambiguity using brute force up to given limit";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "check-email" = callPackage
     ({ mkDerivation, base, bytestring, email-validate, resolv }:
      mkDerivation {
@@ -55152,37 +55281,6 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "1.4.1";
-       sha256 = "0brfhgdb5ilrm4rxx8hsjsrzrj0lxppsd1g1k7m4jrdk7xp1mnlk";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base bifunctors bytestring Cabal clash-lib clash-prelude
-         concurrent-supply containers deepseq directory exceptions extra
-         filepath ghc ghc-boot ghc-prim ghc-typelits-extra
-         ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable
-         haskeline integer-gmp lens mtl primitive process reflection split
-         template-haskell text time transformers uniplate unix
-         unordered-containers utf8-string vector
-       ];
-       executableHaskellDepends = [ base ];
-       description = "Clash: a functional hardware description language - GHC frontend";
-       license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
-  "clash-ghc_1_4_2" = callPackage
-    ({ mkDerivation, array, base, bifunctors, bytestring, Cabal
-     , clash-lib, clash-prelude, concurrent-supply, containers, deepseq
-     , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim
-     , ghc-typelits-extra, ghc-typelits-knownnat
-     , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp
-     , lens, mtl, primitive, process, reflection, split
-     , template-haskell, text, time, transformers, uniplate, unix
-     , unordered-containers, utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "clash-ghc";
        version = "1.4.2";
        sha256 = "04sj88mcxszgbr8rxnrwa48r2pkf7h612507gcyk131f5kf6mkss";
        isLibrary = true;
@@ -55219,49 +55317,6 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "1.4.1";
-       sha256 = "1gg2snjfhhclfmyz07l5hddn8pfh9k4l4xjba1bx5php76kyiz0v";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty ansi-terminal array attoparsec base
-         base16-bytestring binary bytestring clash-prelude concurrent-supply
-         containers cryptohash-sha256 data-binary-ieee754 data-default
-         deepseq directory dlist errors exceptions extra filepath ghc
-         ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate
-         lens mtl ordered-containers parsers pretty-show prettyprinter
-         primitive process reducers template-haskell temporary terminal-size
-         text text-show time transformers trifecta unordered-containers
-         utf8-string vector vector-binary-instances
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base base16-bytestring bytestring clash-prelude
-         concurrent-supply containers data-default deepseq ghc
-         ghc-typelits-knownnat haskell-src-exts lens pretty-show
-         quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell
-         text transformers unordered-containers
-       ];
-       description = "Clash: a functional hardware description language - As a library";
-       license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
-  "clash-lib_1_4_2" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array
-     , attoparsec, base, base16-bytestring, binary, bytestring
-     , clash-prelude, concurrent-supply, containers, cryptohash-sha256
-     , data-binary-ieee754, data-default, deepseq, directory, dlist
-     , errors, exceptions, extra, filepath, ghc, ghc-boot-th
-     , ghc-typelits-knownnat, hashable, haskell-src-exts
-     , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl
-     , ordered-containers, parsers, pretty-show, prettyprinter
-     , primitive, process, quickcheck-text, reducers, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, temporary, terminal-size
-     , text, text-show, time, transformers, trifecta
-     , unordered-containers, utf8-string, vector
-     , vector-binary-instances
-     }:
-     mkDerivation {
-       pname = "clash-lib";
        version = "1.4.2";
        sha256 = "1gismfz0pahhgfgra8kn34i3g82ip5nfy9aj38ym3rcnpg4aw10m";
        enableSeparateDataOutput = true;
@@ -55318,48 +55373,6 @@ self: {
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "1.4.1";
-       sha256 = "12f3nlg6820grkjkljhyqgq43qc1x58akiy51gbxf6qp8k55akka";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         array arrows base bifunctors binary bytestring constraints
-         containers data-binary-ieee754 data-default-class deepseq ghc-prim
-         ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise
-         half hashable integer-gmp interpolate lens QuickCheck
-         recursion-schemes reflection singletons template-haskell text
-         text-show th-abstraction th-lift th-orphans time transformers
-         type-errors uniplate vector
-       ];
-       testHaskellDepends = [
-         base deepseq doctest ghc-typelits-extra ghc-typelits-knownnat
-         ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base
-         tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th
-         template-haskell
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq template-haskell
-       ];
-       description = "Clash: a functional hardware description language - Prelude library";
-       license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "clash-prelude_1_4_2" = callPackage
-    ({ mkDerivation, array, arrows, base, bifunctors, binary
-     , bytestring, Cabal, cabal-doctest, constraints, containers
-     , criterion, data-binary-ieee754, data-default-class, deepseq
-     , doctest, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat
-     , ghc-typelits-natnormalise, half, hashable, hedgehog, hint
-     , integer-gmp, interpolate, lens, QuickCheck
-     , quickcheck-classes-base, recursion-schemes, reflection
-     , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck
-     , tasty-th, template-haskell, text, text-show, th-abstraction
-     , th-lift, th-orphans, time, transformers, type-errors, uniplate
-     , vector
-     }:
-     mkDerivation {
-       pname = "clash-prelude";
        version = "1.4.2";
        sha256 = "04hshjdddd9sk697zvbwlq6cdvyvdfrw670ksfdxxgssyrcsid95";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -56648,8 +56661,8 @@ self: {
      }:
      mkDerivation {
        pname = "cloudi";
-       version = "2.0.1";
-       sha256 = "0s01582a2iyibwhlkmmf4n9h0fs3w0sjip65j78c4hldc91ylvqd";
+       version = "2.0.2";
+       sha256 = "19m07hh2vrzgj6nalcm3fbrlxcv5c8ci6d9c9pihv82d444n37j6";
        libraryHaskellDepends = [
          array base binary bytestring containers network time unix zlib
        ];
@@ -57579,14 +57592,15 @@ self: {
      }:
      mkDerivation {
        pname = "code-conjure";
-       version = "0.2.6";
-       sha256 = "1nvzyxmgn2wwa3j3rf38jz1nhhldv9jgbb91r7v2m822rxhr5pwp";
+       version = "0.3.2";
+       sha256 = "1mmsbs9n04vcrhaizxv6z6mkd0w5gvhvrffwyfxpfg995vf19gz9";
        libraryHaskellDepends = [
          base express leancheck speculate template-haskell
        ];
        testHaskellDepends = [ base express leancheck speculate ];
        description = "conjure Haskell functions out of partial definitions";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "code-page" = callPackage
@@ -58994,24 +59008,49 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "commonmark_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, parsec, tasty
+     , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers
+     , unicode-transforms
+     }:
+     mkDerivation {
+       pname = "commonmark";
+       version = "0.2";
+       sha256 = "083xrmyxsgn6ivrxqgmjbqvv4k64n7a330pbf1n7xbsjqh78cg28";
+       libraryHaskellDepends = [
+         base bytestring containers parsec text transformers
+         unicode-transforms
+       ];
+       testHaskellDepends = [
+         base parsec tasty tasty-hunit tasty-quickcheck text
+         unicode-transforms
+       ];
+       benchmarkHaskellDepends = [ base tasty-bench text ];
+       description = "Pure Haskell commonmark parser";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "commonmark-cli" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, commonmark
      , commonmark-extensions, commonmark-pandoc, containers, mtl
-     , pandoc-types, pretty-simple, text
+     , pandoc-types, text
      }:
      mkDerivation {
        pname = "commonmark-cli";
-       version = "0.1.0.1";
-       sha256 = "1k7s7wzphllfydki1ifzab6b4x865vwxg50xldqdar141425s84l";
+       version = "0.2";
+       sha256 = "1g3i01acaqfqiqkl5xyxvzrh0alfx3il4r4rcjs4ii1nwaljdg6j";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson ansi-terminal base bytestring commonmark
          commonmark-extensions commonmark-pandoc containers mtl pandoc-types
-         pretty-simple text
+         text
        ];
        description = "Command-line commonmark converter and highlighter";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "commonmark-extensions" = callPackage
@@ -59038,6 +59077,28 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "commonmark-extensions_0_2_1_2" = callPackage
+    ({ mkDerivation, base, commonmark, containers, emojis, filepath
+     , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "commonmark-extensions";
+       version = "0.2.1.2";
+       sha256 = "1ky0j7086a8mqpg26j2nkrc5wfwiw5cd3h3jqncpy59vmj1prkx4";
+       libraryHaskellDepends = [
+         base commonmark containers emojis filepath network-uri parsec text
+         transformers
+       ];
+       testHaskellDepends = [
+         base commonmark parsec tasty tasty-hunit text
+       ];
+       benchmarkHaskellDepends = [ base commonmark tasty-bench text ];
+       description = "Pure Haskell commonmark parser";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "commonmark-pandoc" = callPackage
     ({ mkDerivation, base, commonmark, commonmark-extensions
      , containers, pandoc-types, text
@@ -59053,6 +59114,22 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "commonmark-pandoc_0_2_1" = callPackage
+    ({ mkDerivation, base, commonmark, commonmark-extensions
+     , pandoc-types, text
+     }:
+     mkDerivation {
+       pname = "commonmark-pandoc";
+       version = "0.2.1";
+       sha256 = "0i5qavci8j63d15i2c6cbm0b53kcjh7s4vxadfgf4vkp2sy1ybvw";
+       libraryHaskellDepends = [
+         base commonmark commonmark-extensions pandoc-types text
+       ];
+       description = "Bridge between commonmark and pandoc AST";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "commsec" = callPackage
     ({ mkDerivation, base, bytestring, cipher-aes128, crypto-api
      , network
@@ -62112,16 +62189,18 @@ self: {
      }) {};
 
   "connections" = callPackage
-    ({ mkDerivation, base, containers, doctest, hedgehog }:
+    ({ mkDerivation, base, containers, doctest, extended-reals
+     , hedgehog, time
+     }:
      mkDerivation {
        pname = "connections";
-       version = "0.3.0";
-       sha256 = "0ias6f5nzd83i2x6823ypzp598d8rgp74wmhd4gk7slcyszgpj6l";
+       version = "0.3.1";
+       sha256 = "0candwv3sv6qk76a4dn3m64957462da1pyvixl8jazf0gvq1pp23";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers extended-reals time ];
        executableHaskellDepends = [ base doctest ];
-       testHaskellDepends = [ base hedgehog ];
+       testHaskellDepends = [ base hedgehog time ];
        description = "Orders, Galois connections, and lattices";
        license = lib.licenses.bsd3;
      }) {};
@@ -62579,10 +62658,8 @@ self: {
      }:
      mkDerivation {
        pname = "consumers";
-       version = "2.2.0.2";
-       sha256 = "0nml5hn6n95ngy1qvj6w4rkwa8r6qax0nc2vgimk68bawv4z97qd";
-       revision = "2";
-       editedCabalFile = "0fa67waf0af62kpljdksm00lvh29vm1rddfpjvy5c7lcy2a9ll97";
+       version = "2.2.0.3";
+       sha256 = "0jvh3mf7jmrv3zjplc5cjmpyj7h15573l6dlyzn3c2jhj61zjwkk";
        libraryHaskellDepends = [
          base containers exceptions extra hpqtypes lifted-base
          lifted-threads log-base monad-control monad-time mtl stm time
@@ -62784,19 +62861,20 @@ self: {
      }) {};
 
   "context-free-grammar" = callPackage
-    ({ mkDerivation, array, base, containers, control-monad-omega
-     , dlist, HUnit, mtl, pretty, QuickCheck, quickcheck-properties
-     , template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
+    ({ mkDerivation, alex, array, base, containers, control-monad-omega
+     , dlist, happy, HUnit, mtl, pretty, QuickCheck
+     , quickcheck-properties, semigroups, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "context-free-grammar";
-       version = "0.1.0";
-       sha256 = "11s6v8h39iq0wy4p4y8cwpr8fjhphql07s38rgbm8qsq1hj9f3a1";
+       version = "0.1.1";
+       sha256 = "15xsm8v157jpz2v98lry7sr77nwk0785mmj3zdb21ajqnkccyb14";
        libraryHaskellDepends = [
          array base containers control-monad-omega dlist mtl pretty
-         template-haskell
+         semigroups template-haskell
        ];
+       libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
          base containers HUnit pretty QuickCheck quickcheck-properties
          template-haskell test-framework test-framework-hunit
@@ -66666,8 +66744,8 @@ self: {
      }:
      mkDerivation {
        pname = "css-selectors";
-       version = "0.4.0.2";
-       sha256 = "1299xqp1ssxarz2i9wgzcyj4zmjry6cq02jb2a9n0vw61gw6z5g4";
+       version = "0.4.0.3";
+       sha256 = "1jz7s5lpfgs6axzkmwp2is1mhsn8jsb52ahxv8my07lx0yvy1g7v";
        libraryHaskellDepends = [
          aeson array base binary blaze-markup bytestring data-default
          Decimal hashable QuickCheck shakespeare template-haskell text zlib
@@ -67991,8 +68069,8 @@ self: {
      }:
      mkDerivation {
        pname = "darcs";
-       version = "2.16.3";
-       sha256 = "1bf11ndz6k7fx9bb31l4l6dqfkrld3gxsrrqggcg7d57wa3yw9c9";
+       version = "2.16.4";
+       sha256 = "07dygwh6p4fsrlgxmq6r7yvxmf4n2y04izzd30jzqgs0pi9645p4";
        configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
        isLibrary = true;
        isExecutable = true;
@@ -73682,6 +73760,8 @@ self: {
        pname = "dhall-lsp-server";
        version = "1.0.14";
        sha256 = "1jy80w3lr6c0hvn0525h5kn6fh9rj6ir942hdkilrzd9farg6qj9";
+       revision = "1";
+       editedCabalFile = "10947mmbwy5fg52s63cs7lqa6hydrg3w8ka7rfkpdiqn2q9f146r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74067,6 +74147,7 @@ self: {
        doHaddock = false;
        description = "Embedded domain-specific language for declarative vector graphics";
        license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sternenseemann ];
      }) {};
 
   "diagrams-boolean" = callPackage
@@ -74107,7 +74188,6 @@ self: {
        ];
        description = "Braille diagrams with plain text";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "diagrams-builder" = callPackage
@@ -74137,6 +74217,7 @@ self: {
        description = "hint-based build service for the diagrams graphics EDSL";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -74380,6 +74461,38 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "diagrams-lib_1_4_4" = callPackage
+    ({ mkDerivation, active, adjunctions, array, base, bytestring
+     , cereal, colour, containers, criterion, data-default-class
+     , deepseq, diagrams-core, diagrams-solve, directory, distributive
+     , dual-tree, exceptions, filepath, fingertree, fsnotify, hashable
+     , intervals, JuicyPixels, lens, linear, monoid-extras, mtl
+     , numeric-extras, optparse-applicative, process, profunctors
+     , QuickCheck, semigroups, tagged, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-lib";
+       version = "1.4.4";
+       sha256 = "09np7kj8si8kcb854f95a0cq392mgbxif8lnazbpfsa1k87d9vzy";
+       libraryHaskellDepends = [
+         active adjunctions array base bytestring cereal colour containers
+         data-default-class diagrams-core diagrams-solve directory
+         distributive dual-tree exceptions filepath fingertree fsnotify
+         hashable intervals JuicyPixels lens linear monoid-extras mtl
+         optparse-applicative process profunctors semigroups tagged text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base deepseq diagrams-solve distributive lens numeric-extras
+         QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion diagrams-core ];
+       description = "Embedded domain-specific language for declarative graphics";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "diagrams-pandoc" = callPackage
     ({ mkDerivation, base, diagrams-builder, diagrams-cairo
      , diagrams-core, diagrams-lib, diagrams-svg, directory, filepath
@@ -74489,10 +74602,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-rasterific";
-       version = "1.4.2";
-       sha256 = "161rsy3g59n3sfrbfyvd4i4hszl0zm59w21b7pk6w88n0bk8gf2l";
-       revision = "1";
-       editedCabalFile = "0q2nzcdv7j654bk8c5fjz3whiz1l6cdy21n6ah53f1s7rlsbiz0g";
+       version = "1.4.2.1";
+       sha256 = "09a1jnpc4kplg1yhv5kxhi0ph22m5xyr0vmnjv2c5wlz72c72z2z";
        libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
@@ -74501,8 +74612,6 @@ self: {
        testHaskellDepends = [ base diagrams-core diagrams-lib ];
        description = "Rasterific backend for diagrams";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-reflex" = callPackage
@@ -75725,14 +75834,12 @@ self: {
        broken = true;
      }) {};
 
-  "directory_1_3_6_1" = callPackage
+  "directory_1_3_6_2" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.3.6.1";
-       sha256 = "00cr2sshzjmn57rpvjj8wvgr60x2mk8c7w1nd40wxqs8s9xaa1bi";
-       revision = "2";
-       editedCabalFile = "14kwmqa1pf1bij7qang5aihw38ch7m5prsics0p0y72jkxx98y48";
+       version = "1.3.6.2";
+       sha256 = "0zgwx7bwhw0s5xc17hfn1ps3fxn9ihv174b2s7rz63flm8lsm0y3";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -75970,8 +76077,8 @@ self: {
      }:
      mkDerivation {
        pname = "discord-haskell";
-       version = "1.8.6";
-       sha256 = "0mmppadd1hmmdgbfjwzhy28kibzssbsnr5dxjiqf3hahmll74qjl";
+       version = "1.8.7";
+       sha256 = "0nby3267nhdgc8692k5c28yy0a2bzvl84dn54sg25j6nchzs991g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -75983,6 +76090,8 @@ self: {
        executableHaskellDepends = [ base text unliftio ];
        description = "Write bots for Discord in Haskell";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "discord-hs" = callPackage
@@ -76003,31 +76112,29 @@ self: {
      }) {};
 
   "discord-register" = callPackage
-    ({ mkDerivation, base, calamity, dhall, di, di-polysemy
-     , generic-lens, hspec, hspec-megaparsec, megaparsec, polysemy
-     , polysemy-plugin, text, text-show, unboxing-vector
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, base, binary, bytestring, calamity
+     , calamity-commands, data-flags, di, di-polysemy, generic-lens
+     , hashable, hedis, lens, megaparsec, polysemy, polysemy-plugin
+     , regex-tdfa, text, text-show, unboxing-vector
+     , unordered-containers
      }:
      mkDerivation {
        pname = "discord-register";
-       version = "0.0.1";
-       sha256 = "1crwbdkyg6k4777lcc7yi5n47xpsnvl3s1652n896k1hck7ckrr8";
+       version = "0.0.2";
+       sha256 = "01imq7m41g26x7prm223y6bagjwyzb3glwy41fg4kdd244pz02wf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base calamity dhall di di-polysemy generic-lens hspec
-         hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show
-         unboxing-vector unordered-containers vector
+         aeson base binary bytestring calamity calamity-commands data-flags
+         di di-polysemy generic-lens hashable hedis lens megaparsec polysemy
+         polysemy-plugin regex-tdfa text text-show unboxing-vector
+         unordered-containers
        ];
        executableHaskellDepends = [
-         base calamity dhall di di-polysemy generic-lens hspec
-         hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show
-         unboxing-vector unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base calamity dhall di di-polysemy generic-lens hspec
-         hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show
-         unboxing-vector unordered-containers vector
+         aeson base binary bytestring calamity calamity-commands data-flags
+         di di-polysemy generic-lens hashable hedis lens megaparsec polysemy
+         polysemy-plugin regex-tdfa text text-show unboxing-vector
+         unordered-containers
        ];
        description = "Discord verification bot";
        license = lib.licenses.mpl20;
@@ -78376,8 +78483,8 @@ self: {
      }:
      mkDerivation {
        pname = "domain";
-       version = "0.1";
-       sha256 = "1lr97k14wc35myckknsv3vyximqfv5vq04f5kpd8167lk3vjahm2";
+       version = "0.1.1";
+       sha256 = "0ykf1bxd0xmgdhkvd8rp14p4zccpwp5ywj2yiyh6mpp4sp03qwiw";
        libraryHaskellDepends = [
          attoparsec base bytestring domain-core foldl hashable
          parser-combinators template-haskell template-haskell-compat-v0208
@@ -79143,8 +79250,8 @@ self: {
     ({ mkDerivation, base, ki, transformers, unagi-chan }:
      mkDerivation {
        pname = "drama";
-       version = "0.3.0.0";
-       sha256 = "17smzrvpaah2lcc2467dd61lns53q4n0bf0pl9glsv04j9kv2nl9";
+       version = "0.4.0.0";
+       sha256 = "15p8pac1xcl5iifv1g0bs09l99x6q8skid71wlyxh4g9j7hrgpdr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ki transformers unagi-chan ];
@@ -84095,6 +84202,7 @@ self: {
        ];
        description = "An environmentally friendly way to deal with environment variables";
        license = lib.licenses.bsd3;
+       maintainers = with lib.maintainers; [ sternenseemann ];
      }) {};
 
   "envy-extensible" = callPackage
@@ -85031,46 +85139,14 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
      , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql
      , mysql-simple, persistent, persistent-mysql, persistent-postgresql
-     , persistent-sqlite, persistent-template, postgresql-libpq
-     , postgresql-simple, resourcet, tagged, text, time, transformers
-     , unliftio, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "esqueleto";
-       version = "3.4.1.1";
-       sha256 = "15355vc3ysqr4yd149xz7zm7iba7pb04p3yxgp1n6dxczwldjf43";
-       revision = "1";
-       editedCabalFile = "0rwj2cg7pkn4nwapyk9syb64f0qycq7kqwbpciwwq9xdviwcvqzk";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-html bytestring conduit containers
-         monad-logger persistent resourcet tagged text time transformers
-         unliftio unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base blaze-html bytestring conduit containers
-         exceptions hspec monad-logger mtl mysql mysql-simple persistent
-         persistent-mysql persistent-postgresql persistent-sqlite
-         persistent-template postgresql-libpq postgresql-simple resourcet
-         tagged text time transformers unliftio unordered-containers vector
-       ];
-       description = "Type-safe EDSL for SQL queries on persistent backends";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "esqueleto_3_4_2_1" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
-     , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql
-     , mysql-simple, persistent, persistent-mysql, persistent-postgresql
      , persistent-sqlite, postgresql-libpq, postgresql-simple, resourcet
      , tagged, text, time, transformers, unliftio, unordered-containers
      , vector
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "3.4.2.1";
-       sha256 = "0yh2fgk5rjphszn2prww190nsvw84j68js7wnd6p5iwynrw6ahxh";
-       revision = "1";
-       editedCabalFile = "0nsm17spkhsykizmpr29x8zq16ha6j0325r08ms675jn574ni2g1";
+       version = "3.5.0.0";
+       sha256 = "00mamdsm4yc8gdvb5zfnhnp7iqkg7h9fd5jgzrbdh9q7isyc6kiy";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-html bytestring conduit containers
          monad-logger persistent resourcet tagged text time transformers
@@ -85085,7 +85161,6 @@ self: {
        ];
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ess" = callPackage
@@ -86346,8 +86421,8 @@ self: {
      }:
      mkDerivation {
        pname = "exact-real";
-       version = "0.12.4.1";
-       sha256 = "194qx4dq8c9w1nbr4vyalmvp0m1a0q1pxjckg59m7c3fsz9r88jg";
+       version = "0.12.5";
+       sha256 = "1xjj17h8a4sbja7f29xvasgzxzn58i2276ysqqkw8d5dsd5913lb";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base integer-gmp random ];
        testHaskellDepends = [
@@ -87384,8 +87459,8 @@ self: {
     ({ mkDerivation, base, leancheck, template-haskell }:
      mkDerivation {
        pname = "express";
-       version = "0.1.10";
-       sha256 = "09ajf8ibcwxqbyrrz7yb84fpzfb7g54b1mz5q8w3dvk8rrdxaak1";
+       version = "0.1.12";
+       sha256 = "1055qj5ymlzshva94i1gfr6sfmjgv1rhxpx5h76fdq5ia6hkd68z";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base leancheck ];
        benchmarkHaskellDepends = [ base leancheck ];
@@ -87865,6 +87940,7 @@ self: {
        testHaskellDepends = [ base express leancheck speculate ];
        description = "generalize counter-examples of test properties";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ez-couch" = callPackage
@@ -88077,6 +88153,7 @@ self: {
        description = "Braid representations in Haskell";
        license = lib.licenses.bsd2;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "fadno-xml" = callPackage
@@ -88320,20 +88397,20 @@ self: {
 
   "faktory" = callPackage
     ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
-     , connection, cryptonite, hspec, markdown-unlit, megaparsec, memory
-     , mtl, network, random, safe-exceptions, scanner, semigroups, text
-     , time, unix, unordered-containers
+     , connection, cryptonite, errors, hspec, markdown-unlit, megaparsec
+     , memory, mtl, network, random, safe-exceptions, scanner
+     , semigroups, text, time, unix, unordered-containers
      }:
      mkDerivation {
        pname = "faktory";
-       version = "1.0.2.3";
-       sha256 = "1ppyj7avp7y5n0qgql1j73yc62szykhxm1j8nxv93hsijzi6p4a5";
+       version = "1.0.3.0";
+       sha256 = "1igarcl4cvipndg9rhg4lpcrl09mbfkpqcp3prr14izclcldr47y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-casing base bytestring connection cryptonite megaparsec
-         memory mtl network random safe-exceptions scanner semigroups text
-         time unix unordered-containers
+         aeson aeson-casing base bytestring connection cryptonite errors
+         megaparsec memory mtl network random safe-exceptions scanner
+         semigroups text time unix unordered-containers
        ];
        executableHaskellDepends = [ aeson base safe-exceptions ];
        testHaskellDepends = [
@@ -89076,16 +89153,16 @@ self: {
 
   "fbrnch" = callPackage
     ({ mkDerivation, aeson, async, base, bugzilla-redhat, bytestring
-     , config-ini, directory, email-validate, extra, filepath, haxr
-     , http-conduit, http-directory, http-query, lens, lens-aeson, mtl
+     , config-ini, directory, email-validate, extra, filepath
+     , http-conduit, http-directory, http-query, koji, lens, lens-aeson
      , network-uri, optparse-applicative, pretty-terminal, process
      , rpmbuild-order, simple-cmd, simple-cmd-args, text, time
      , typed-process, unordered-containers, utf8-string, xdg-basedir
      }:
      mkDerivation {
        pname = "fbrnch";
-       version = "0.8.0";
-       sha256 = "113mpna3crycw2kxsbniah5m71wvswy7v6j2p76ybl1qg50bq075";
+       version = "0.9";
+       sha256 = "1basamg578nyyjl677q3fax31pxcckxvdpw4f48gdmnmlnd9f6vm";
        isLibrary = false;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89093,8 +89170,8 @@ self: {
        ];
        executableHaskellDepends = [
          aeson async base bugzilla-redhat bytestring config-ini directory
-         email-validate extra filepath haxr http-conduit http-directory
-         http-query mtl network-uri optparse-applicative pretty-terminal
+         email-validate extra filepath http-conduit http-directory
+         http-query koji network-uri optparse-applicative pretty-terminal
          process rpmbuild-order simple-cmd simple-cmd-args text time
          typed-process unordered-containers utf8-string xdg-basedir
        ];
@@ -89208,8 +89285,8 @@ self: {
      }:
      mkDerivation {
        pname = "fclabels";
-       version = "2.0.5";
-       sha256 = "0ppvc1s5bvx38y6yd6ib1wxi3y2j438xzl9iqhpr4hc1zwvsi6rx";
+       version = "2.0.5.1";
+       sha256 = "0g4ca5pm2bafsnpari7wqhy79i5qs8njb3kdknk0xsrazdsl174k";
        libraryHaskellDepends = [
          base base-orphans mtl template-haskell transformers
        ];
@@ -90110,8 +90187,8 @@ self: {
      }:
      mkDerivation {
        pname = "fft";
-       version = "0.1.8.6";
-       sha256 = "0hjv3r09imb2ypgbz3qj9hf4f36v977z38gdcad3qa0334qdin1f";
+       version = "0.1.8.7";
+       sha256 = "1kkdw08qzsgjgg9z7pf5876cn2hlq22cgvc3k2amidn317n2d6vz";
        libraryHaskellDepends = [
          array base carray ix-shapable storable-complex syb transformers
        ];
@@ -91422,6 +91499,23 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "fitspec_0_4_10" = callPackage
+    ({ mkDerivation, base, cmdargs, leancheck, pretty, template-haskell
+     }:
+     mkDerivation {
+       pname = "fitspec";
+       version = "0.4.10";
+       sha256 = "1jq4brkwq59hj8fpyfq60hywj9hx82qp0yjvyl0bmwy8jpc6j91k";
+       libraryHaskellDepends = [
+         base cmdargs leancheck template-haskell
+       ];
+       testHaskellDepends = [ base leancheck ];
+       benchmarkHaskellDepends = [ base pretty ];
+       description = "refining property sets for testing Haskell programs";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "fix-imports" = callPackage
     ({ mkDerivation, base, containers, cpphs, deepseq, directory
      , filepath, haskell-src-exts, mtl, pretty, process, split
@@ -94127,8 +94221,8 @@ self: {
      }:
      mkDerivation {
        pname = "fortran-src";
-       version = "0.4.2";
-       sha256 = "03x1pxkpl41r4cf034qj5ls946azbzwdyxkp2nxxymjx0nm2lsv6";
+       version = "0.4.3";
+       sha256 = "0wmyx0zlz2hmbrag8wgm8k33z9p0c2ylf3490hf9nz9b2303wflq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96943,7 +97037,7 @@ self: {
        license = lib.licenses.isc;
      }) {};
 
-  "futhark_0_19_5" = callPackage
+  "futhark_0_19_6" = callPackage
     ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary
      , blaze-html, bmp, bytestring, bytestring-to-vector, cmark-gfm
      , containers, directory, directory-tree, dlist, file-embed
@@ -96958,8 +97052,8 @@ self: {
      }:
      mkDerivation {
        pname = "futhark";
-       version = "0.19.5";
-       sha256 = "1x922g3iq50an8jv75370qr0qslmxnrrqbwr7adca30ljaa7nfvh";
+       version = "0.19.6";
+       sha256 = "1wpg2ad2xv60xsdvnq3246nps3ldc00n58k7jxmh8lrx5bjzg263";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97303,8 +97397,8 @@ self: {
     ({ mkDerivation, base, bytestring, serialport }:
      mkDerivation {
        pname = "fxpak";
-       version = "0.1.1";
-       sha256 = "1nnb47i17b4rc2ayzq5qaydx0ss3m8yw02pjwfmipk8398qr8ss5";
+       version = "0.1.2";
+       sha256 = "1mrpbz32aczrh5aw550p1vzvj8zqhcnmj574sc012r3z1c0g1cin";
        libraryHaskellDepends = [ base bytestring serialport ];
        description = "Interface to the FXPak/FXPak Pro USB interface";
        license = lib.licenses.bsd3;
@@ -98853,12 +98947,13 @@ self: {
      }) {};
 
   "generic-override" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "generic-override";
-       version = "0.0.0.0";
-       sha256 = "13v5zrhhzjzm4fib5zjsp4sf1hhgx9450mmy4v12h7bgljz8xfd5";
+       version = "0.2.0.0";
+       sha256 = "0hrya5rqdrgl66hm818v6jf11hfrvra242n1sdjypkv13zxzsk6x";
        libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        description = "Provides functionality for overriding instances for generic derivation";
        license = lib.licenses.bsd3;
      }) {};
@@ -98867,8 +98962,8 @@ self: {
     ({ mkDerivation, aeson, base, generic-override, hspec, text }:
      mkDerivation {
        pname = "generic-override-aeson";
-       version = "0.0.0.0";
-       sha256 = "02xwssk7158k7hhh170knxn7f2s7slcp4sy7a4b3w4cn1r016bhz";
+       version = "0.0.0.2";
+       sha256 = "1hgrxhfssxm4l0c98ffgc20lbzy34bbhzr4vg06vqg51m4620b25";
        libraryHaskellDepends = [ aeson base generic-override ];
        testHaskellDepends = [ aeson base generic-override hspec text ];
        description = "Provides orphan instances necessary for integrating generic-override and aeson";
@@ -100156,6 +100251,24 @@ self: {
        broken = true;
      }) {inherit (pkgs) geos;};
 
+  "gerrit" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , http-client, http-client-tls, tasty, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "gerrit";
+       version = "0.1.0.0";
+       sha256 = "03lcf9xvyhypzkrs6lv7dnwsxnn52vnnl6mhsbbhmpv2bf59whq2";
+       libraryHaskellDepends = [
+         aeson base bytestring containers http-client http-client-tls text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory tasty tasty-hunit
+       ];
+       description = "A gerrit client library";
+       license = lib.licenses.asl20;
+     }) {};
+
   "getemx" = callPackage
     ({ mkDerivation, base, curl, directory, filepath, haskell98, hxt
      , mtl, old-locale, process, time
@@ -101405,8 +101518,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-tags";
-       version = "1.1";
-       sha256 = "0dk80lss2iq2yi7cnx78nk7pfnc3khwm3xincj3ybaiy60c94x8x";
+       version = "1.3";
+       sha256 = "1fshj5zdnhr879c9q48mb89f1fidc2skgmgi385sa5r8wxn1ili0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -102012,33 +102125,16 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "ghcjs-base_0_2_0_0" = callPackage
-    ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
-     , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim
-     , hashable, HUnit, integer-gmp, primitive, QuickCheck
-     , quickcheck-unicode, random, scientific, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, time
-     , transformers, unordered-containers, vector
-     }:
+  "ghcjs-base_0_2_0_3" = callPackage
+    ({ mkDerivation }:
      mkDerivation {
        pname = "ghcjs-base";
-       version = "0.2.0.0";
-       sha256 = "0wvmxr33a3bsv1mh8lb10haapvcykp9200ppbdpjiz2wihnb4mk8";
-       libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring containers deepseq dlist
-         ghc-prim ghcjs-prim hashable integer-gmp primitive scientific text
-         time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit
-         primitive QuickCheck quickcheck-unicode random test-framework
-         test-framework-hunit test-framework-quickcheck2 text
-       ];
+       version = "0.2.0.3";
+       sha256 = "09sv5p57l8jczbycasbb06h4qsifi5fagxwsr665yil1gickfxyg";
        description = "base library for GHCJS";
        license = lib.licenses.mit;
        hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {ghcjs-prim = null;};
+     }) {};
 
   "ghcjs-base-stub" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, containers, deepseq
@@ -105462,8 +105558,8 @@ self: {
      }:
      mkDerivation {
        pname = "glabrous";
-       version = "2.0.3";
-       sha256 = "06bpazshc07rg1w06sl171k12mry708512hrdckqw7winwfrwwkh";
+       version = "2.0.4";
+       sha256 = "0rzfs09njlll144l05s77hs9pm9mmnb8h705xlyr5yavllkv1ypk";
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring cereal cereal-text
          either text unordered-containers
@@ -105968,6 +106064,7 @@ self: {
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = lib.licenses.gpl3Only;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-devil" = callPackage
@@ -108992,19 +109089,17 @@ self: {
   "goldplate" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff
      , directory, filepath, Glob, optparse-applicative, process
-     , regex-pcre-builtin, text, time, unordered-containers
+     , regex-pcre-builtin, text, unordered-containers
      }:
      mkDerivation {
        pname = "goldplate";
-       version = "0.1.3";
-       sha256 = "109qhyq0n4w1jdz7y2hd8cjf44pikavv6mfnmf65vyfjangjq610";
-       revision = "1";
-       editedCabalFile = "1chrg7mfs4w4hbc0i1pdsj1350c4h3dhcv7xswn2ygq78337xxqk";
+       version = "0.2.0";
+       sha256 = "1f2n981676ykrv08fgdj87mj5r4841a18ywvgpc2hgapsgwbgma1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson aeson-pretty async base bytestring Diff directory filepath
-         Glob optparse-applicative process regex-pcre-builtin text time
+         Glob optparse-applicative process regex-pcre-builtin text
          unordered-containers
        ];
        description = "A lightweight golden test runner";
@@ -109776,8 +109871,8 @@ self: {
     ({ mkDerivation, base, criterion, hedgehog }:
      mkDerivation {
        pname = "grab";
-       version = "0.0.0.4";
-       sha256 = "0yanm9ak2sw266wn9lllz086g53sra7xfncpql6403d2lj3j1jj4";
+       version = "0.0.0.6";
+       sha256 = "0fhindbl5ygfncbww0wqbq4bkjr9q6v0f12f0rzblz71wapshnni";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hedgehog ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -109791,8 +109886,8 @@ self: {
     ({ mkDerivation, base, containers, grab, hedgehog, text }:
      mkDerivation {
        pname = "grab-form";
-       version = "0.0.0.4";
-       sha256 = "0ch8c0kfjky9s1ilrxyr27jhmvynrp61imb188rc3fv7yfr0b5n5";
+       version = "0.0.0.6";
+       sha256 = "18gk6p6fxvsiihlr6amvlqf9s7i4v0wi7vzpfjkc580zzvxd9c8n";
        libraryHaskellDepends = [ base containers grab text ];
        testHaskellDepends = [ base containers hedgehog text ];
        description = "Applicative parsers for form parameter lists";
@@ -114895,6 +114990,7 @@ self: {
        description = "A package allowing to write Hakyll blog posts in Rmd";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-agda" = callPackage
@@ -114911,7 +115007,6 @@ self: {
        ];
        description = "Wrapper to integrate literate Agda files with Hakyll";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hakyll-alectryon" = callPackage
@@ -114928,7 +115023,6 @@ self: {
        ];
        description = "Hakyll extension for rendering Coq code using Alectryon";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hakyll-blaze-templates" = callPackage
@@ -114941,6 +115035,7 @@ self: {
        description = "Blaze templates for Hakyll";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-contrib" = callPackage
@@ -114957,6 +115052,7 @@ self: {
        description = "Extra modules for the hakyll website compiler";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-contrib-csv" = callPackage
@@ -114974,6 +115070,7 @@ self: {
        description = "Generate Html tables from Csv files";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-contrib-elm" = callPackage
@@ -114993,6 +115090,7 @@ self: {
        description = "Compile Elm code for inclusion in Hakyll static site";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-contrib-hyphenation" = callPackage
@@ -115004,7 +115102,6 @@ self: {
        libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ];
        description = "automatic hyphenation for Hakyll";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ erictapen ];
      }) {};
 
@@ -115051,6 +115148,7 @@ self: {
        description = "A hakyll library that helps maintain a separate links database";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-convert" = callPackage
@@ -115100,6 +115198,7 @@ self: {
        description = "Dhall compiler for Hakyll";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-dir-list" = callPackage
@@ -115115,6 +115214,7 @@ self: {
        description = "Allow Hakyll to create hierarchical menues from directories";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-elm" = callPackage
@@ -115144,7 +115244,6 @@ self: {
        executableHaskellDepends = [ base hakyll ];
        testHaskellDepends = [ base ];
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hakyll-filestore" = callPackage
@@ -115159,7 +115258,6 @@ self: {
        ];
        description = "FileStore utilities for Hakyll";
        license = lib.licenses.publicDomain;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hakyll-images" = callPackage
@@ -115181,7 +115279,6 @@ self: {
        ];
        description = "Hakyll utilities to work with images";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hakyll-ogmarkup" = callPackage
@@ -115206,6 +115303,7 @@ self: {
        description = "Hakyll compiler for arbitrary external processes";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-sass" = callPackage
@@ -115221,7 +115319,6 @@ self: {
        ];
        description = "Hakyll SASS compiler over hsass";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hakyll-series" = callPackage
@@ -115234,6 +115331,7 @@ self: {
        description = "Adds series functionality to hakyll";
        license = lib.licenses.mit;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-shakespeare" = callPackage
@@ -115251,7 +115349,6 @@ self: {
        ];
        description = "Hakyll Hamlet compiler";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hakyll-shortcode" = callPackage
@@ -115292,6 +115389,7 @@ self: {
        description = "Use shortcut-links in markdown file for Hakyll";
        license = lib.licenses.mpl20;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-typescript" = callPackage
@@ -116095,6 +116193,38 @@ self: {
        broken = true;
      }) {};
 
+  "hapistrano_0_4_1_4" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, async, base, directory
+     , filepath, formatting, gitrev, hspec, hspec-discover, mtl
+     , optparse-applicative, path, path-io, process, QuickCheck
+     , silently, stm, temporary, time, transformers, typed-process, yaml
+     }:
+     mkDerivation {
+       pname = "hapistrano";
+       version = "0.4.1.4";
+       sha256 = "1ci2q3vkjw51k5hbswmcajk7gl1zpmwx3npbkf3kng3j1kcv0bzw";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base filepath gitrev mtl path process stm time
+         transformers typed-process yaml
+       ];
+       executableHaskellDepends = [
+         aeson async base formatting gitrev optparse-applicative path
+         path-io stm yaml
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec mtl path path-io process QuickCheck
+         silently temporary yaml
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A deployment library for Haskell applications";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "happindicator" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, glib, gtk
      , gtk2hs-buildtools, libappindicator-gtk2, mtl
@@ -116663,8 +116793,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-server";
-       version = "7.7.0";
-       sha256 = "0jyjnksgwvasnhwwn8scqms1kja4hzlbpn0lmyr6yng5n4989d0x";
+       version = "7.7.1";
+       sha256 = "1zxdv7nihw3kjq2fvw5cl3s27pwm5gkli3sl15iqxfm7mdxz8rm0";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -117231,8 +117361,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.4.5";
-       sha256 = "185qh24n6j3b5awwmm92hxravb3sq40l5q8vyng74296mjc65nkw";
+       version = "0.1.5.0";
+       sha256 = "0q0nd8d22knf6b1xwqz3gxmpymbvlx1p20hyahd5qr1yhjgpch0b";
        libraryHaskellDepends = [
          base binary bytestring connection containers data-binary-ieee754
          data-default mtl network text
@@ -117529,15 +117659,15 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "hashable_1_3_1_0" = callPackage
+  "hashable_1_3_2_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, ghc-prim, HUnit
      , integer-gmp, QuickCheck, random, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, unix
      }:
      mkDerivation {
        pname = "hashable";
-       version = "1.3.1.0";
-       sha256 = "1i57iibad5gjk88yq1svi35mjcbgjmms7jzd28wva8f598x84qc0";
+       version = "1.3.2.0";
+       sha256 = "0dyn343wdwbm1facpcjiyd8w0s0hk23jqh7mbj108az5dx5rdgar";
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim integer-gmp text
        ];
@@ -117624,11 +117754,26 @@ self: {
        pname = "hashable-time";
        version = "0.2.1";
        sha256 = "1zw2gqagpbwq1hgx5rlvy6mhsnb15cxg3pmhawwv0ylfihmx2yxh";
+       revision = "1";
+       editedCabalFile = "151gxiprdlj3masa95vvrxal9nwa72n3p1y15xyj4hp7mvvl4s2l";
        libraryHaskellDepends = [ base hashable time time-compat ];
        description = "Hashable instances for Data.Time";
        license = lib.licenses.bsd3;
      }) {};
 
+  "hashable-time_0_3" = callPackage
+    ({ mkDerivation, base, hashable, time-compat }:
+     mkDerivation {
+       pname = "hashable-time";
+       version = "0.3";
+       sha256 = "15zv0pgxp7rgd6v7skhyxgyf2sd8gr1br12bpd17r650yscw9fij";
+       libraryHaskellDepends = [ base time-compat ];
+       testHaskellDepends = [ base hashable time-compat ];
+       description = "Hashable instances for Data.Time";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hashabler" = callPackage
     ({ mkDerivation, array, base, bytestring, ghc-prim, integer-gmp
      , primitive, template-haskell, text
@@ -118330,8 +118475,7 @@ self: {
        doHaddock = false;
        description = "Cabal package script generator for Travis-CI";
        license = lib.licenses.gpl3Plus;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
+       maintainers = with lib.maintainers; [ sternenseemann ];
      }) {};
 
   "haskell-cnc" = callPackage
@@ -119620,8 +119764,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-stack-trace-plugin";
-       version = "0.1.1.1";
-       sha256 = "0mm1nyhlia00vawpwcq6dda0j9d8sgd1ls4xin0s84jplw5z9hwz";
+       version = "0.1.3.0";
+       sha256 = "1vlqf0j88qshqkc1j688x38h4sqdkww5ya4ihaz3fy8l86wwmnvw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ghc ];
@@ -120847,6 +120991,29 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "hasklepias" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, flow, hspec
+     , interval-algebra, QuickCheck, safe, text, time
+     , unordered-containers, vector, witherable
+     }:
+     mkDerivation {
+       pname = "hasklepias";
+       version = "0.7.1";
+       sha256 = "1w6gs3n1g12sw2w72l04l27na3kgmyqsip8d53wpmslqwccr6blc";
+       libraryHaskellDepends = [
+         aeson base bytestring containers flow interval-algebra QuickCheck
+         safe text time unordered-containers vector witherable
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers flow hspec interval-algebra
+         QuickCheck text time unordered-containers vector
+       ];
+       description = "Define features from events";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "haskmon" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-streams
      , io-streams, time, vector
@@ -121058,8 +121225,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.52.13";
-       sha256 = "1ms07ka51j20xb86b3i4gca9svh2wxa4i0wb6qxbwq7n2138ck0h";
+       version = "0.53.2";
+       sha256 = "04wm92b7687qivwjia69gahd9y2dasirmyxcbv8liqfp5xfmjbmz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121104,8 +121271,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store-data";
-       version = "0.52.13";
-       sha256 = "08c95grxg11kf96di27z7d72c2l7h2qzb8p5446fd91pidzgz3zb";
+       version = "0.53.2";
+       sha256 = "1i949izj89g797zp07qxjx16sd2591gsxbpq94v52vzgd6rl9h7n";
        libraryHaskellDepends = [
          aeson base binary bytes bytestring cereal containers data-default
          deepseq hashable haskoin-core http-client http-types lens mtl
@@ -122346,6 +122513,26 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "hasqlator-mysql" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers, dlist
+     , io-streams, megaparsec, mtl, mysql-haskell, pretty-simple
+     , prettyprinter, scientific, template-haskell, text, time
+     }:
+     mkDerivation {
+       pname = "hasqlator-mysql";
+       version = "0.0.3";
+       sha256 = "1b1nw3l96gvf2laxw7w72w8ya8aazdhv4w7c5ly47n09hx9q77zp";
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers dlist io-streams megaparsec
+         mtl mysql-haskell pretty-simple prettyprinter scientific
+         template-haskell text time
+       ];
+       description = "composable SQL generation";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hasqly-mysql" = callPackage
     ({ mkDerivation, base, binary, bytestring, dlist, mtl
      , mysql-haskell, scientific, text, time
@@ -125697,8 +125884,8 @@ self: {
      }:
      mkDerivation {
        pname = "heredocs";
-       version = "0.2.0.0";
-       sha256 = "1649vhzymizmmi3ggmqxyq4b0fhrpipj4ljy1w7hca2wyh4jm1yw";
+       version = "0.2.1.0";
+       sha256 = "0wjj5sy4mpd4ahavdmi67j70xs1wrga8dnzr5jv8cjnqjj2p8f59";
        libraryHaskellDepends = [
          base bytestring doctest parsec template-haskell text
        ];
@@ -126061,8 +126248,8 @@ self: {
      }:
      mkDerivation {
        pname = "hevm";
-       version = "0.44.1";
-       sha256 = "1ygrksnqav1cw9pq1x2xi0na5fxy0phyc0v48nkzpis868gy0b97";
+       version = "0.46.0";
+       sha256 = "1pqs4hcjy1gipdp63d8jcy035n96rfx14x0s67ihmh16s11i85bz";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -129551,20 +129738,24 @@ self: {
 
   "hledger-stockquotes" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
-     , hedgehog, hledger-lib, req, safe, scientific, split, tasty
-     , tasty-hedgehog, tasty-hunit, text, time, unordered-containers
+     , directory, hedgehog, hledger-lib, raw-strings-qq, req, safe
+     , safe-exceptions, scientific, split, tasty, tasty-hedgehog
+     , tasty-hunit, text, time, unordered-containers, xdg-basedir, yaml
      }:
      mkDerivation {
        pname = "hledger-stockquotes";
-       version = "0.1.1.0";
-       sha256 = "1srgl70zsixbfgmh22psg7q4wqfiay2jiybyvml42iv712n7z8xx";
+       version = "0.1.2.0";
+       sha256 = "064q6qz6rrahk9ri5hr1y6n17nmd4l124xb3l8q5rvm81x3hzp3x";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring containers hledger-lib req safe scientific
          split text time unordered-containers
        ];
-       executableHaskellDepends = [ base bytestring cmdargs text time ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs directory raw-strings-qq
+         safe-exceptions text time xdg-basedir yaml
+       ];
        testHaskellDepends = [
          base hedgehog tasty tasty-hedgehog tasty-hunit
        ];
@@ -129888,6 +130079,7 @@ self: {
        ];
        description = "High-level Redis Database";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hlrdb-core" = callPackage
@@ -129906,6 +130098,8 @@ self: {
        ];
        description = "High-level Redis Database Core API";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hls" = callPackage
@@ -130642,6 +130836,7 @@ self: {
        description = "hmatrix interface to sundials";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {sundials_arkode = null; sundials_cvode = null;};
 
   "hmatrix-svdlibc" = callPackage
@@ -131053,10 +131248,10 @@ self: {
      }:
      mkDerivation {
        pname = "hnix";
-       version = "0.13.0.1";
-       sha256 = "1c01ns9h7va6ri568c0hzcdkmr0jdiay5z1vwwva7cv7dlvn6wl7";
-       revision = "2";
-       editedCabalFile = "148w8jbn4hrhp8zk90vr5grc4fsnsq4him6ii21imikril4ib7ya";
+       version = "0.13.1";
+       sha256 = "12mqwhvxk0w0fjbdl3ignayp08nm31qi028wq5qrkcyxw29ff1k7";
+       revision = "1";
+       editedCabalFile = "01dmzpcqav7p764dpicih8jm0g6yiiqgww8b5m6c0bfvvgfqyx2h";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -131095,16 +131290,16 @@ self: {
     ({ mkDerivation, algebraic-graphs, attoparsec, base
      , base16-bytestring, base64-bytestring, binary, bytestring, cereal
      , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256
-     , cryptohash-sha512, directory, filepath, hashable, lifted-base
-     , monad-control, mtl, nix-derivation, process, saltine, tasty
-     , tasty-discover, tasty-golden, tasty-hspec, tasty-hunit
+     , cryptohash-sha512, directory, filepath, hashable, hspec
+     , lifted-base, monad-control, mtl, nix-derivation, process, saltine
+     , tasty, tasty-discover, tasty-golden, tasty-hspec, tasty-hunit
      , tasty-quickcheck, temporary, text, time, unix
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "hnix-store-core";
-       version = "0.4.2.0";
-       sha256 = "02i7vxhpaqwyjvd6w2raxjz7r0xxs37x5b6pq9rw6l1l0k18nx5i";
+       version = "0.4.3.0";
+       sha256 = "17l7198s3dzjx416nplinyghbqgignvpvxkww241gjv4p23izf77";
        libraryHaskellDepends = [
          algebraic-graphs attoparsec base base16-bytestring
          base64-bytestring bytestring cereal containers cryptohash-md5
@@ -131114,8 +131309,9 @@ self: {
        ];
        testHaskellDepends = [
          attoparsec base base16-bytestring base64-bytestring binary
-         bytestring containers directory filepath process tasty tasty-golden
-         tasty-hspec tasty-hunit tasty-quickcheck temporary text unix
+         bytestring containers directory filepath hspec process tasty
+         tasty-golden tasty-hspec tasty-hunit tasty-quickcheck temporary
+         text unix
        ];
        testToolDepends = [ tasty-discover ];
        description = "Core effects for interacting with the Nix store";
@@ -131129,8 +131325,8 @@ self: {
      }:
      mkDerivation {
        pname = "hnix-store-remote";
-       version = "0.4.2.0";
-       sha256 = "17v785dql4rl2yn1qdagvnyx8y9r3bd02npg51mfqhl49knd92fr";
+       version = "0.4.3.1";
+       sha256 = "1wp6z5f13fkgh3mdzr1zcqdvsx1j90l5isf671gsg43brsv4c2vl";
        libraryHaskellDepends = [
          attoparsec base binary bytestring containers hnix-store-core mtl
          network nix-derivation text time unordered-containers
@@ -133538,8 +133734,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpqtypes";
-       version = "1.9.1.0";
-       sha256 = "13q20ak0zakwvlc05y187iq2vpvdjx9dlmvmgvv2gjd263sqcgm2";
+       version = "1.9.1.1";
+       sha256 = "0s5dyia6v59vz7xk8m6gj0shdygk39pmks5yr7dlzksb8gqfgral";
        setupHaskellDepends = [ base Cabal directory filepath ];
        libraryHaskellDepends = [
          aeson async base bytestring containers exceptions lifted-base
@@ -133570,6 +133766,8 @@ self: {
        pname = "hpqtypes-extras";
        version = "1.11.0.0";
        sha256 = "0574ma8b149rhpdk9mdg5sawhl3db4d0qxs5az31g83i93hf4mwq";
+       revision = "2";
+       editedCabalFile = "1n98wpppwd0gwchwfis525qac3808j1vnvb3vxziq1d9x088gqf6";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash exceptions
          extra fields-json hpqtypes lifted-base log-base monad-control mtl
@@ -140003,14 +140201,14 @@ self: {
 
   "http-client-websockets" = callPackage
     ({ mkDerivation, base, bytestring, hspec, http-client
-     , http-client-tls, network-uri, utf8-string, websockets
+     , http-client-tls, network-uri, text, websockets
      }:
      mkDerivation {
        pname = "http-client-websockets";
-       version = "0.1.1.1";
-       sha256 = "0b5kvyrfhhj7c5ys8ccxwv6prhb6sj0ycinzbk1yrwnd3wrmzk78";
+       version = "0.1.1.2";
+       sha256 = "0g2zhj0fzhynyls5rxpzh50hxjsygx7037rw2h79ihca10crsqgm";
        libraryHaskellDepends = [
-         base bytestring http-client network-uri utf8-string websockets
+         base bytestring http-client network-uri text websockets
        ];
        testHaskellDepends = [
          base bytestring hspec http-client-tls network-uri websockets
@@ -147345,17 +147543,17 @@ self: {
      }) {aether = null;};
 
   "insert-ordered-containers" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, hashable
+    ({ mkDerivation, aeson, base, base-compat, deepseq, hashable
      , indexed-traversable, lens, optics-core, optics-extra, QuickCheck
      , semigroupoids, semigroups, tasty, tasty-quickcheck, text
      , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "insert-ordered-containers";
-       version = "0.2.4";
-       sha256 = "174maygil2mffjz2ssqawlmv36413m65zp3ng67hzij4dh8piz7x";
+       version = "0.2.5";
+       sha256 = "0bb3ggzic8z5zmvmzp1fsnb572c2v383740b0ddf1fwihpn52c1y";
        libraryHaskellDepends = [
-         aeson base base-compat hashable indexed-traversable lens
+         aeson base base-compat deepseq hashable indexed-traversable lens
          optics-core optics-extra semigroupoids semigroups text transformers
          unordered-containers
        ];
@@ -147673,8 +147871,8 @@ self: {
        pname = "int-cast";
        version = "0.2.0.0";
        sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0";
-       revision = "3";
-       editedCabalFile = "1b99lqxwbhg96iykfr2l7qd388cbx9sf8bln728505qgj6kgsvj7";
+       revision = "4";
+       editedCabalFile = "1l5n3hsa8gr0wzc3cb32ha2j8kcf976i84z04580q41macf0r0h6";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -148297,8 +148495,8 @@ self: {
      }:
      mkDerivation {
        pname = "interval-algebra";
-       version = "0.8.0";
-       sha256 = "1mayv7rqpbx09y82vyzdvbdjrqgk4vpsbz7qx9cy2h09q355zs7d";
+       version = "0.8.2";
+       sha256 = "1xa9rlb9klf0bnig0ccryjxcbz023hwy1wnxp4vwn5ggb0fbmzys";
        libraryHaskellDepends = [
          base containers QuickCheck safe time witherable
        ];
@@ -148550,17 +148748,15 @@ self: {
      }:
      mkDerivation {
        pname = "invert";
-       version = "1.0";
-       sha256 = "18q070bawfnyi4wl6rxb6l5ihda0xzmlb8g1z0sg46vghvbs985v";
-       revision = "2";
-       editedCabalFile = "1829iy3jg0zwms16cqd4rdg5khl348ih44b3mz7l7cy9wlci3cli";
+       version = "1.0.0.1";
+       sha256 = "07p7vcc3mc4zq0j2qlm4yp0cfsashb32ndx5i9ib0x6lk6rb9djp";
        libraryHaskellDepends = [
          base containers generic-deriving hashable unordered-containers
          vector
        ];
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
-       description = "Automatically generate a function's inverse";
+       description = "Automatically generate a function’s inverse";
        license = lib.licenses.asl20;
        hydraPlatforms = lib.platforms.none;
        broken = true;
@@ -148781,6 +148977,8 @@ self: {
        pname = "io-streams";
        version = "1.5.2.1";
        sha256 = "1y3sqmxrwiksz7pl4hf3vzvg8p8n00qnv98nj5xbpcadlh468rny";
+       revision = "1";
+       editedCabalFile = "0zgrhvafnk9ds29n6x93cifw4993mgvvx3p2d3922frkjvd6xa5v";
        configureFlags = [ "-fnointeractivetests" ];
        libraryHaskellDepends = [
          attoparsec base bytestring network primitive process text time
@@ -149354,6 +149552,7 @@ self: {
        ];
        description = "An IRC client library";
        license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ sternenseemann ];
      }) {};
 
   "irc-colors" = callPackage
@@ -150242,7 +150441,6 @@ self: {
        ];
        description = "Orphan Show instances for diagrams package that render inline in some terminals";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ival" = callPackage
@@ -151384,8 +151582,23 @@ self: {
     ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }:
      mkDerivation {
        pname = "jira-wiki-markup";
-       version = "1.3.4";
-       sha256 = "0rrqaibgafbynrlcsp7f7hkzgkp2gix7ji2hkpgpby6fvp6965fh";
+       version = "1.3.5";
+       sha256 = "0k5z2lxj5xp9hpr3mmdbzkd0yn718477pqjvymyz361h938rqnz5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl parsec text ];
+       executableHaskellDepends = [ base text ];
+       testHaskellDepends = [ base parsec tasty tasty-hunit text ];
+       description = "Handle Jira wiki markup";
+       license = lib.licenses.mit;
+     }) {};
+
+  "jira-wiki-markup_1_4_0" = callPackage
+    ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }:
+     mkDerivation {
+       pname = "jira-wiki-markup";
+       version = "1.4.0";
+       sha256 = "0p6axj6km4440ss5naw68r3r85si4qxqgrklp6ssfyapawy0s88w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec text ];
@@ -151393,6 +151606,7 @@ self: {
        testHaskellDepends = [ base parsec tasty tasty-hunit text ];
        description = "Handle Jira wiki markup";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "jmacro" = callPackage
@@ -151858,8 +152072,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.9.7.1";
-       sha256 = "1igkv5lvlbq0xl2dp6d8fp4ybwnwmgrc3r4sfjsric0bj8sq2k86";
+       version = "0.9.8.0";
+       sha256 = "0g3jdh4x80fsbrcj5kd81inv8hcx662v5dsn9d6q1dla0cz8w8i9";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat base64-bytestring bytestring
          containers deepseq exceptions filepath ghc-prim http-types lens
@@ -151876,8 +152090,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-clib";
-       version = "0.9.7.1";
-       sha256 = "07s2iy136dm526mr7q43mxqq9qndg8jbi9kz1652qgl0ivn8lapc";
+       version = "0.9.8.0";
+       sha256 = "0axgfkxgvm4awvklss2pqa8a4112m3q7k38h71anxs6i199lgkyq";
        libraryHaskellDepends = [
          aeson base base-compat bytestring data-default jsaddle text
        ];
@@ -151925,8 +152139,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-warp";
-       version = "0.9.7.1";
-       sha256 = "1piyxxmik1bwdzkz46vgdhdp0gw4p01fww591zqbxzjk6rmrpby0";
+       version = "0.9.8.0";
+       sha256 = "06bf071xnfx7mjzf7jdyjspjw28s2z3br5gmx9vcs7paji20c8np";
        libraryHaskellDepends = [
          aeson base bytestring containers foreign-store http-types jsaddle
          stm text time transformers wai wai-websockets warp websockets
@@ -151950,8 +152164,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-webkit2gtk";
-       version = "0.9.7.1";
-       sha256 = "0f2siaid0b03zrjzpb3lr9k9w5np2vml6apd961zd97dghvvhiix";
+       version = "0.9.8.0";
+       sha256 = "01iav691d3h6l9x7vw0spb68n4y5m9pb8d02iyp5lvkqr2y4h9kv";
        libraryHaskellDepends = [
          aeson base bytestring directory gi-gio gi-glib gi-gtk
          gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading
@@ -151984,17 +152198,11 @@ self: {
      }) {};
 
   "jsaddle-wkwebview" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, data-default
-     , directory, jsaddle, text
-     }:
+    ({ mkDerivation }:
      mkDerivation {
        pname = "jsaddle-wkwebview";
-       version = "0.9.7.1";
-       sha256 = "0dfaysw7fzmv2b62wi5id45f4i0x2vbjp9irbdkmv1h2z3ydwy20";
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory jsaddle
-         text
-       ];
+       version = "0.9.8.0";
+       sha256 = "1cjncl2jqnx4j83pmcnnvcc0rswhwwb5grwh636b11yyp4vv58dw";
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = lib.licenses.mit;
        hydraPlatforms = lib.platforms.none;
@@ -153011,26 +153219,26 @@ self: {
      }) {};
 
   "jsonnet" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring
      , containers, data-fix, deriving-compat, directory, exceptions
-     , filepath, hashable, megaparsec, mtl, optparse-applicative
-     , parser-combinators, scientific, semigroupoids, tasty
+     , filepath, hashable, lens, megaparsec, mtl, optparse-applicative
+     , parser-combinators, scientific, semigroupoids, tasty, tasty-bench
      , tasty-golden, tasty-hunit, template-haskell, text
-     , transformers-compat, unbound-generics, unordered-containers
-     , vector
+     , th-lift-instances, th-utilities, transformers-compat
+     , unbound-generics, unordered-containers, vector
      }:
      mkDerivation {
        pname = "jsonnet";
-       version = "0.2.0.0";
-       sha256 = "0ns2yij8yl555n5rb0pahxpqrwxgzfvdr4ajp0dy5amqsv13hhmh";
+       version = "0.3.1.1";
+       sha256 = "021kklj3ycpm5n2r6bjqc0vicn9vdv5a56sd1la6pf430i1fd7z9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-wl-pprint base bytestring containers data-fix
-         deriving-compat directory exceptions filepath hashable megaparsec
-         mtl optparse-applicative parser-combinators scientific
-         semigroupoids template-haskell text transformers-compat
-         unbound-generics unordered-containers vector
+         aeson ansi-wl-pprint base binary bytestring containers data-fix
+         deriving-compat directory exceptions filepath hashable lens
+         megaparsec mtl parser-combinators scientific semigroupoids
+         template-haskell text th-lift-instances th-utilities
+         transformers-compat unbound-generics unordered-containers vector
        ];
        executableHaskellDepends = [
          aeson ansi-wl-pprint base bytestring mtl optparse-applicative text
@@ -153039,6 +153247,9 @@ self: {
          ansi-wl-pprint base bytestring filepath mtl tasty tasty-golden
          tasty-hunit text
        ];
+       benchmarkHaskellDepends = [
+         ansi-wl-pprint base bytestring tasty-bench text
+       ];
        description = "Jsonnet implementaton in pure Haskell";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -154399,6 +154610,7 @@ self: {
        description = "Utilities for serving static sites and blogs with Wai/Warp";
        license = lib.licenses.asl20;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "kawhi" = callPackage
@@ -154995,8 +155207,8 @@ self: {
      }:
      mkDerivation {
        pname = "kempe";
-       version = "0.2.0.3";
-       sha256 = "0bki6h5qk78d3qgprn8k1av2xxlb43bxb07qqk4x1x5diy92mc5x";
+       version = "0.2.0.4";
+       sha256 = "0rzpid5lnjnjgsip3fvm5d313hh8wb7gqla3dyf56l9q7y4r20js";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -159739,8 +159951,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
-       version = "0.9.4";
-       sha256 = "0w17ymj7k4sr9jwp9yrgh3l94l3kgjyxxnpxwj2sdqk8fvmjpkny";
+       version = "0.9.6";
+       sha256 = "0nw7hm9aawv6xljii3cjy9qbdbb5p05k5rmc9qv4dkajjjyhyna9";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Enumerative property-based testing";
@@ -162189,15 +162401,18 @@ self: {
      }) {nvpair = null; inherit (pkgs) zfs;};
 
   "licensor" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, process }:
+    ({ mkDerivation, base, bytestring, Cabal, containers, directory
+     , http-client, http-client-tls, process, tar, temporary, zlib
+     }:
      mkDerivation {
        pname = "licensor";
-       version = "0.4.3";
-       sha256 = "19ydisxc5yzm0ccj76p7sg39cpjg5c57wd3gaybc5k7bqrlv14c6";
+       version = "0.5.0";
+       sha256 = "0i49l4d5dvvj4s6fbdhg38dmdclxr4ld69lzm1s5xx9m7aqy3al9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal containers directory process
+         base bytestring Cabal containers directory http-client
+         http-client-tls process tar temporary zlib
        ];
        executableHaskellDepends = [ base Cabal containers directory ];
        description = "A license compatibility helper";
@@ -163063,18 +163278,24 @@ self: {
 
   "linearmap-category" = callPackage
     ({ mkDerivation, base, call-stack, constrained-categories
-     , containers, free-vector-spaces, ieee754, lens, linear
-     , manifolds-core, QuickCheck, semigroups, tagged, transformers
-     , vector, vector-space
+     , containers, data-default-class, free-vector-spaces, hashable
+     , ieee754, lens, linear, manifolds-core, MemoTrie, QuickCheck
+     , semigroups, tagged, tasty, tasty-quickcheck, template-haskell
+     , transformers, vector, vector-space
      }:
      mkDerivation {
        pname = "linearmap-category";
-       version = "0.4.0.1";
-       sha256 = "1zc7zns49d832wm22dsbv5xvh5x6s4zg6ky1vr941rs1z9jskmyj";
+       version = "0.4.1.0";
+       sha256 = "01cpl44wg5kyx9lxv23hcsxd8dw90psqj9sgaklhxklbdvn77bvr";
        libraryHaskellDepends = [
          base call-stack constrained-categories containers
-         free-vector-spaces ieee754 lens linear manifolds-core QuickCheck
-         semigroups tagged transformers vector vector-space
+         data-default-class free-vector-spaces hashable ieee754 lens linear
+         manifolds-core MemoTrie QuickCheck semigroups tagged
+         template-haskell transformers vector vector-space
+       ];
+       testHaskellDepends = [
+         base constrained-categories linear manifolds-core QuickCheck tasty
+         tasty-quickcheck vector-space
        ];
        description = "Native, complete, matrix-free linear algebra";
        license = lib.licenses.gpl3Only;
@@ -164500,6 +164721,42 @@ self: {
        broken = true;
      }) {};
 
+  "literatex" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, conduit
+     , filepath, optparse-applicative, tasty, tasty-hunit, text, ttc
+     , unliftio
+     }:
+     mkDerivation {
+       pname = "literatex";
+       version = "0.1.0.0";
+       sha256 = "0nfmvblm3a370a59hyd28wv8xnq1wlxcm5xz4n6b3n5cprj4h99z";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring conduit text ttc unliftio
+       ];
+       executableHaskellDepends = [
+         ansi-wl-pprint base optparse-applicative ttc
+       ];
+       testHaskellDepends = [
+         base bytestring filepath tasty tasty-hunit text ttc unliftio
+       ];
+       description = "transform literate source code to Markdown";
+       license = lib.licenses.mit;
+     }) {};
+
+  "little-earley" = callPackage
+    ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "little-earley";
+       version = "0.2.0.0";
+       sha256 = "0zqlnaj1w6m2h7g55xg9cjl978ij66lw69x4v5b9vi7x7maa44ms";
+       libraryHaskellDepends = [ base containers mtl ];
+       testHaskellDepends = [ base containers mtl tasty tasty-hunit ];
+       description = "Simple implementation of Earley parsing";
+       license = lib.licenses.mit;
+     }) {};
+
   "little-logger" = callPackage
     ({ mkDerivation, base, co-log, co-log-core, microlens, mtl, tasty
      , tasty-hunit, text, unliftio-core
@@ -165539,8 +165796,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-base";
-       version = "0.9.1.0";
-       sha256 = "0p0zb805a8zlxdnii6r0gmf0zic4g4zxkvcq84j6g8973qx1fch9";
+       version = "0.9.1.1";
+       sha256 = "0b69q4vhayqg0n8kzqb4lma289av39zm5qbinnam4hh9inqhayfk";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring deepseq exceptions mmorph
          monad-control monad-time mtl semigroups stm text time
@@ -165632,10 +165889,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-postgres";
-       version = "0.7.1.4";
-       sha256 = "1m96d5486xadypm5iby8rkb979k82md394j5iaik6xk5aavcn6xx";
-       revision = "1";
-       editedCabalFile = "0yyaxibkq8c9bwhaday8ijmfbm8k3i14wd9zsgfby99b6rxra351";
+       version = "0.7.1.5";
+       sha256 = "0g89403ijgp2xznd497xhvifh2jlgph4raz4l5fh5ajxvcf33hvn";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring deepseq
          hpqtypes http-client lifted-base log-base mtl semigroups split text
@@ -170233,6 +170488,7 @@ self: {
        description = "The project management tool for hackers";
        license = lib.licenses.mit;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "mastermind" = callPackage
@@ -174839,8 +175095,27 @@ self: {
      }:
      mkDerivation {
        pname = "mixed-types-num";
-       version = "0.5.3.1";
-       sha256 = "1g19y0kkksx87i8azqndikpwans7061fj7z255vssl1x46vh843h";
+       version = "0.5.7.0";
+       sha256 = "0fnf165ff6c4vbc2hlfrydb7w8csk1hjxd86lvnh4y9w6sc9g6hp";
+       libraryHaskellDepends = [
+         base collect-errors hspec hspec-smallcheck mtl QuickCheck
+         smallcheck template-haskell
+       ];
+       testHaskellDepends = [
+         base collect-errors hspec hspec-smallcheck QuickCheck smallcheck
+       ];
+       description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "mixed-types-num_0_5_8_0" = callPackage
+    ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl
+     , QuickCheck, smallcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "mixed-types-num";
+       version = "0.5.8.0";
+       sha256 = "1i40g6kf4my91i7xg54wfi6n2s8ivmx5k08ccqz3iycn6gha8pr7";
        libraryHaskellDepends = [
          base collect-errors hspec hspec-smallcheck mtl QuickCheck
          smallcheck template-haskell
@@ -174850,6 +175125,7 @@ self: {
        ];
        description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mixpanel-client" = callPackage
@@ -176163,8 +176439,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-coroutine";
-       version = "0.9.1";
-       sha256 = "1d85jyfwf4h60cfp3dyrkmf7kw7ya37z2vqmv6rdbpqc1pslmb1i";
+       version = "0.9.1.2";
+       sha256 = "1s4975q1k23b2skyq9mwkkda08f2zxkv96x0yplzhz9n64kchhf3";
        libraryHaskellDepends = [
          base monad-parallel transformers transformers-compat
        ];
@@ -177267,8 +177543,8 @@ self: {
      }:
      mkDerivation {
        pname = "monadic-recursion-schemes";
-       version = "0.1.12.0";
-       sha256 = "0h5syc9p4imlf03qfb1rjsk4rq2kqry522zvw67x122q1xzdnwnw";
+       version = "0.1.13.0";
+       sha256 = "04n81zx1h68w9v8fihwhfbkyv7lb84p3nzppqf7zc55znbn67lym";
        libraryHaskellDepends = [
          base comonad containers free mtl recursion-schemes transformers
        ];
@@ -178098,6 +178374,21 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "moo-nad" = callPackage
+    ({ mkDerivation, base, dep-t, mtl, tasty, tasty-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "moo-nad";
+       version = "0.1.0.2";
+       sha256 = "017yl4vy7apa6p91y4mhk4p36b4dgvwqdjplc38gijvk9zqd3rbm";
+       libraryHaskellDepends = [ base dep-t mtl transformers ];
+       testHaskellDepends = [ base dep-t mtl tasty tasty-hunit ];
+       doHaddock = false;
+       description = "Invocation helpers for the ReaderT-record-of-functions style";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "moonshine" = callPackage
     ({ mkDerivation, aeson, base, bytestring, canteven-config, ekg
      , ekg-core, hslogger, snap, text, time, transformers, yaml
@@ -180143,12 +180434,13 @@ self: {
      }) {};
 
   "multi-except" = callPackage
-    ({ mkDerivation, base, dlist, semigroupoids }:
+    ({ mkDerivation, base, dlist, hspec, semigroupoids }:
      mkDerivation {
        pname = "multi-except";
-       version = "0.1.1.0";
-       sha256 = "18zs66sn31wjngi7iibf1wc3jz15c6rz6sx424n6j88nzwd3wzq7";
+       version = "0.2.1.0";
+       sha256 = "0ai19lk32wbpsmwxig5wzc7iqi81h0mxpykrmfw05vv4zwjqiqfz";
        libraryHaskellDepends = [ base dlist semigroupoids ];
+       testHaskellDepends = [ base hspec semigroupoids ];
        description = "Multiple Exceptions";
        license = lib.licenses.mit;
        hydraPlatforms = lib.platforms.none;
@@ -186253,6 +186545,28 @@ self: {
        broken = true;
      }) {};
 
+  "nix-graph" = callPackage
+    ({ mkDerivation, algebraic-graphs, attoparsec, base, containers
+     , hashable, nix-derivation, optparse-applicative, stm, text, ttrie
+     , unliftio
+     }:
+     mkDerivation {
+       pname = "nix-graph";
+       version = "1.0.0.0";
+       sha256 = "1hxby1xpzld55whpb1kzzdl3gi250svpl1lw5xw9qg10a3md29zh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         algebraic-graphs attoparsec base containers hashable nix-derivation
+         stm text ttrie unliftio
+       ];
+       executableHaskellDepends = [
+         algebraic-graphs base optparse-applicative
+       ];
+       description = "Reify the Nix build graph into a Haskell graph data structure";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "nix-narinfo" = callPackage
     ({ mkDerivation, attoparsec, base, containers, filepath, hspec
      , QuickCheck, text
@@ -187645,6 +187959,73 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "nri-prelude_0_6_0_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base
+     , bytestring, containers, directory, exceptions, filepath, ghc
+     , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text
+     , safe-coloured-text-terminfo, safe-exceptions, terminal-size, text
+     , time, vector
+     }:
+     mkDerivation {
+       pname = "nri-prelude";
+       version = "0.6.0.1";
+       sha256 = "10gfw6vs2vc1jll80lirzjplwx3p3l9yssddqjklnd67rnvm95r4";
+       libraryHaskellDepends = [
+         aeson aeson-pretty async auto-update base bytestring containers
+         directory exceptions filepath ghc hedgehog junit-xml pretty-diff
+         pretty-show safe-coloured-text safe-coloured-text-terminfo
+         safe-exceptions terminal-size text time vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty async auto-update base bytestring containers
+         directory exceptions filepath ghc hedgehog junit-xml pretty-diff
+         pretty-show safe-coloured-text safe-coloured-text-terminfo
+         safe-exceptions terminal-size text time vector
+       ];
+       description = "A Prelude inspired by the Elm programming language";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "nri-redis" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, conduit, hedis
+     , nri-env-parser, nri-observability, nri-prelude, resourcet
+     , safe-exceptions, text, unordered-containers, uuid
+     }:
+     mkDerivation {
+       pname = "nri-redis";
+       version = "0.1.0.0";
+       sha256 = "00im3rnb7w45xm60l42kzrj3sc9dg3098w988fdhdschwk34zqpc";
+       libraryHaskellDepends = [
+         aeson async base bytestring conduit hedis nri-env-parser
+         nri-observability nri-prelude resourcet safe-exceptions text
+         unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring conduit hedis nri-env-parser
+         nri-observability nri-prelude resourcet safe-exceptions text
+         unordered-containers uuid
+       ];
+       description = "An intuitive hedis wrapper library";
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "nri-test-encoding" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, filepath
+     , nri-prelude, servant, servant-auth-server, servant-server, text
+     }:
+     mkDerivation {
+       pname = "nri-test-encoding";
+       version = "0.1.0.0";
+       sha256 = "11vk1f99xbqs678rxldxh9qfwailinxpjl6q6pvikb8f32rrb74y";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring filepath nri-prelude servant
+         servant-auth-server servant-server text
+       ];
+       description = "A library to simplify writing golden tests for encoding types";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "nsis" = callPackage
     ({ mkDerivation, base, directory, process, transformers, uniplate
      }:
@@ -188161,18 +188542,32 @@ self: {
        broken = true;
      }) {};
 
+  "numhask_0_8_0_0" = callPackage
+    ({ mkDerivation, base, doctest, QuickCheck }:
+     mkDerivation {
+       pname = "numhask";
+       version = "0.8.0.0";
+       sha256 = "104vc3b43lbck6r39kv5rscvqx3hxxf8nyvzsw8shb9xifmnijkh";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck ];
+       description = "A numeric class hierarchy";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "numhask-array" = callPackage
-    ({ mkDerivation, adjunctions, base, deepseq, distributive, doctest
-     , numhask, vector
+    ({ mkDerivation, adjunctions, base, distributive, doctest, numhask
+     , vector
      }:
      mkDerivation {
        pname = "numhask-array";
-       version = "0.8.0";
-       sha256 = "03c12d34s20f01vc9kpgrm3n4xi8h4kqzlndj1ncpqb69xx3fhc5";
+       version = "0.9.0";
+       sha256 = "09l0cm2f66c5bagrwby8bj22b6lklbi8mbsgxxh0gw5zvb9bhgmr";
        libraryHaskellDepends = [
-         adjunctions base deepseq distributive numhask vector
+         adjunctions base distributive numhask vector
        ];
-       testHaskellDepends = [ base doctest numhask ];
+       testHaskellDepends = [ base doctest ];
        description = "Multi-dimensional array interface for numhask";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -188273,13 +188668,13 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-space";
-       version = "0.7.1.0";
-       sha256 = "1wn4fi2778dxmqfimwx9favwd6v507vzpwms04w2bk5gn1fxgcdg";
+       version = "0.8.0.0";
+       sha256 = "1ya4fcr0mxj4blijl2k2sdfkkywjmr616qcaddl7zqphjvrc4gd0";
        libraryHaskellDepends = [
          adjunctions base containers distributive numhask random
          semigroupoids tdigest text time vector
        ];
-       testHaskellDepends = [ base doctest numhask ];
+       testHaskellDepends = [ base doctest ];
        description = "Numerical spaces";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -188389,23 +188784,25 @@ self: {
      }) {};
 
   "nvfetcher" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, extra, free
-     , neat-interpolation, shake, text, tomland, transformers
-     , unordered-containers, validation-selective
+    ({ mkDerivation, aeson, base, binary, bytestring, containers, extra
+     , free, microlens, microlens-th, neat-interpolation
+     , optparse-simple, shake, text, tomland, transformers
+     , validation-selective
      }:
      mkDerivation {
        pname = "nvfetcher";
-       version = "0.1.0.0";
-       sha256 = "1flzivh84fxik5zw3n8j4b65lh8cxd15mjh72y4622rnlnfn2xvv";
+       version = "0.2.0.0";
+       sha256 = "04gslnmamy79i563ma7kj2b36mqr2c1wlcivqs70akr7s4my3g7z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary bytestring extra free neat-interpolation shake
-         text transformers unordered-containers
+         aeson base binary bytestring containers extra free microlens
+         microlens-th neat-interpolation shake text transformers
        ];
        executableHaskellDepends = [
-         aeson base binary bytestring extra free neat-interpolation shake
-         text tomland transformers unordered-containers validation-selective
+         aeson base binary bytestring containers extra free microlens
+         microlens-th neat-interpolation optparse-simple shake text tomland
+         transformers validation-selective
        ];
        description = "Generate nix sources expr for the latest version of packages";
        license = lib.licenses.mit;
@@ -190585,8 +190982,8 @@ self: {
      }:
      mkDerivation {
        pname = "openid-connect";
-       version = "0.1.0.0";
-       sha256 = "12qp155dazycypv0fvw8mbh3rl5j5ybd2vyfga8wi55n16v1w8mv";
+       version = "0.1.1";
+       sha256 = "16qqndcvbs30nraik0ida1dw40hk3k9mi318dnqnjx64x6wvcgmr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -192174,8 +192571,8 @@ self: {
      }:
      mkDerivation {
        pname = "ordinal";
-       version = "0.4.0.3";
-       sha256 = "1ar7l68cx9zci7mi6qx7a6ja7vp9axxjczyzxrbnjrvd2k3zxg51";
+       version = "0.4.0.5";
+       sha256 = "0m073n6yln9rfdzlkwd10fl04b725h3hpybz01r0wiyw4bfv2n3b";
        libraryHaskellDepends = [
          base containers data-default QuickCheck regex template-haskell text
          time vector
@@ -193120,6 +193517,25 @@ self: {
        broken = true;
      }) {};
 
+  "packstream" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , data-binary-ieee754, hspec, mtl, text
+     }:
+     mkDerivation {
+       pname = "packstream";
+       version = "0.1.0.2";
+       sha256 = "0skp7n6y9wzsa4mr456cpmqw0fzyb5613hqw7fs0qyzwb5swna2c";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 mtl text
+       ];
+       testHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 hspec mtl
+         text
+       ];
+       description = "PackStream converter for Neo4j BOLT protocol";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "packunused" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, haskell-src-exts
      , optparse-applicative, process, split
@@ -193537,6 +193953,65 @@ self: {
        maintainers = with lib.maintainers; [ peti ];
      }) {};
 
+  "pandoc_2_14_0_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base
+     , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
+     , case-insensitive, citeproc, commonmark, commonmark-extensions
+     , commonmark-pandoc, connection, containers, data-default, deepseq
+     , Diff, directory, doclayout, doctemplates, emojis, exceptions
+     , file-embed, filepath, Glob, haddock-library, hslua
+     , hslua-module-path, hslua-module-system, hslua-module-text, HsYAML
+     , HTTP, http-client, http-client-tls, http-types, ipynb
+     , jira-wiki-markup, JuicyPixels, mtl, network, network-uri
+     , pandoc-types, parsec, process, QuickCheck, random, safe
+     , scientific, SHA, skylighting, skylighting-core, split, syb
+     , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua
+     , tasty-quickcheck, temporary, texmath, text, text-conversions
+     , time, unicode-collation, unicode-transforms, unix
+     , unordered-containers, xml, xml-conduit, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "pandoc";
+       version = "2.14.0.1";
+       sha256 = "0fyhmdd1qnf9z4k1m8mm4m1p4lvpirlxx78plglch5h4xqidibr3";
+       configureFlags = [ "-fhttps" "-f-trypandoc" ];
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty array attoparsec base base64-bytestring binary
+         blaze-html blaze-markup bytestring case-insensitive citeproc
+         commonmark commonmark-extensions commonmark-pandoc connection
+         containers data-default deepseq directory doclayout doctemplates
+         emojis exceptions file-embed filepath Glob haddock-library hslua
+         hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP
+         http-client http-client-tls http-types ipynb jira-wiki-markup
+         JuicyPixels mtl network network-uri pandoc-types parsec process
+         random safe scientific SHA skylighting skylighting-core split syb
+         tagsoup temporary texmath text text-conversions time
+         unicode-collation unicode-transforms unix unordered-containers xml
+         xml-conduit zip-archive zlib
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base bytestring containers Diff directory doctemplates exceptions
+         filepath Glob hslua mtl pandoc-types process QuickCheck tasty
+         tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml
+         zip-archive
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers deepseq mtl tasty-bench text time
+       ];
+       postInstall = ''
+         mkdir -p $out/share/man/man1
+         mv "man/"*.1 $out/share/man/man1/
+       '';
+       description = "Conversion between markup formats";
+       license = lib.licenses.gpl2Plus;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ peti ];
+     }) {};
+
   "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
@@ -193629,6 +194104,43 @@ self: {
        license = lib.licenses.gpl2Only;
      }) {};
 
+  "pandoc-crossref_0_3_11_0" = callPackage
+    ({ mkDerivation, base, containers, criterion, data-accessor
+     , data-accessor-template, data-accessor-transformers, data-default
+     , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser
+     , optparse-applicative, pandoc, pandoc-types, roman-numerals, syb
+     , template-haskell, temporary, text, utility-ht
+     }:
+     mkDerivation {
+       pname = "pandoc-crossref";
+       version = "0.3.11.0";
+       sha256 = "1czz54px5pv5a5ijxllz3nrq5s5k4rb05xb8r29drrnz13j45chk";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base containers data-accessor data-accessor-template
+         data-accessor-transformers data-default directory filepath mtl
+         pandoc pandoc-types roman-numerals syb template-haskell text
+         utility-ht
+       ];
+       executableHaskellDepends = [
+         base deepseq gitrev open-browser optparse-applicative pandoc
+         pandoc-types template-haskell temporary text
+       ];
+       testHaskellDepends = [
+         base containers data-accessor data-default directory filepath hspec
+         mtl pandoc pandoc-types text
+       ];
+       benchmarkHaskellDepends = [
+         base criterion pandoc pandoc-types text
+       ];
+       doHaddock = false;
+       description = "Pandoc filter for cross-references";
+       license = lib.licenses.gpl2Only;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "pandoc-csv2table" = callPackage
     ({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
      mkDerivation {
@@ -193916,25 +194428,25 @@ self: {
 
   "pandoc-plot" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion
-     , data-default, directory, filepath, githash, hashable, hspec
+     , data-default, directory, filepath, gitrev, 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
+     , typed-process, unix, yaml
      }:
      mkDerivation {
        pname = "pandoc-plot";
-       version = "1.2.1";
-       sha256 = "1jz8q3qv9m837zwl2lhrcqfjmfs08gcv7qfxiw3w21nfl8gxbgqx";
+       version = "1.2.2";
+       sha256 = "0lj4a1nn78zsv7rms3irk0fy390k2yfd6ck687x9h1xqmsdhd3kd";
        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
+         tagsoup template-haskell text typed-process unix yaml
        ];
        executableHaskellDepends = [
-         base containers directory filepath githash optparse-applicative
+         base containers directory filepath gitrev optparse-applicative
          pandoc pandoc-types template-haskell text typed-process
        ];
        testHaskellDepends = [
@@ -194872,10 +195384,8 @@ self: {
     ({ mkDerivation, base, containers, extensible-exceptions, random }:
      mkDerivation {
        pname = "parallel-io";
-       version = "0.3.3";
-       sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s";
-       revision = "2";
-       editedCabalFile = "0mggzni708nzxlsjbibdzf03s3b5lnqj2zi1hnbh1rd4j4jr07ym";
+       version = "0.3.4";
+       sha256 = "10bglxm685pljh0i896zrgs6g3iz0n7gl1qslvfn63pjxgvz5v2a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -195736,6 +196246,29 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "parsley" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, cpphs
+     , dependent-map, dependent-sum, ghc-prim, hashable, mtl
+     , pretty-terminal, template-haskell, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "parsley";
+       version = "0.1.0.1";
+       sha256 = "01rslkkisbrgdn2d8hzrag2z6hh9gjilp2bg0j87n8awzm1i2n19";
+       revision = "1";
+       editedCabalFile = "16rpf1l3ph3yil2jnyp9z0j46afb38bii52bwkl4blk2f781k97z";
+       libraryHaskellDepends = [
+         array base bytestring containers dependent-map dependent-sum
+         ghc-prim hashable mtl pretty-terminal template-haskell text
+         unordered-containers
+       ];
+       libraryToolDepends = [ cpphs ];
+       description = "A fast parser combinator library backed by Typed Template Haskell";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "parsnip" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , data-default, ghc-prim, primitive
@@ -195857,8 +196390,8 @@ self: {
     ({ mkDerivation, base, doctest, hedgehog }:
      mkDerivation {
        pname = "partial-semigroup";
-       version = "0.5.1.8";
-       sha256 = "1lxvgz0z04fkd67lnva902j8y5qxp6naga7gfnnazwafsb0s9kww";
+       version = "0.5.1.12";
+       sha256 = "0dkbw136cgqqhgckcn7wj39gd8ng8jmbdbq99qan5l2h5090k30h";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hedgehog ];
        description = "A partial binary associative operator";
@@ -195869,8 +196402,8 @@ self: {
     ({ mkDerivation, base, hedgehog, partial-semigroup }:
      mkDerivation {
        pname = "partial-semigroup-hedgehog";
-       version = "0.6.0.6";
-       sha256 = "0n0j8xlrz66mzkvrsa083b9057n3rgbir7pwqxqycwzgj18g68s6";
+       version = "0.6.0.8";
+       sha256 = "0gldqqrfc87x1ff33qgan3pp62siqgal3imkf81b9rynws0saxh7";
        libraryHaskellDepends = [ base hedgehog partial-semigroup ];
        description = "Property testing for partial semigroups using Hedgehog";
        license = lib.licenses.asl20;
@@ -197042,8 +197575,8 @@ self: {
      }:
      mkDerivation {
        pname = "pcre2";
-       version = "1.1.4";
-       sha256 = "0wrw2slmkxxmw3zx85f9xv8374fsvhxsyf1l149fvkaqnvf19bs2";
+       version = "1.1.5";
+       sha256 = "0kwlcv2rh8hyx93i3q3xv8ijxccl02n5nbkv4g74dr12d41ggc1h";
        libraryHaskellDepends = [
          base containers mtl template-haskell text
        ];
@@ -198269,46 +198802,17 @@ self: {
 
   "persistent" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , blaze-html, bytestring, conduit, containers, fast-logger, hspec
-     , http-api-data, monad-logger, mtl, path-pieces, resource-pool
-     , resourcet, scientific, shakespeare, silently, text, time
-     , transformers, unliftio, unliftio-core, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "persistent";
-       version = "2.11.0.4";
-       sha256 = "1n5wkhfvyqq6p57nkf9yx73kap6spyzam5w12ni8pmd1m6pk77xn";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-html bytestring
-         conduit containers fast-logger http-api-data monad-logger mtl
-         path-pieces resource-pool resourcet scientific silently text time
-         transformers unliftio unliftio-core unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-html bytestring
-         containers hspec http-api-data path-pieces scientific shakespeare
-         text time transformers unordered-containers vector
-       ];
-       description = "Type-safe, multi-backend data serialization";
-       license = lib.licenses.mit;
-       maintainers = with lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent_2_13_0_1" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, bytestring, conduit, containers, criterion, deepseq
-     , deepseq-generics, fast-logger, file-embed, hspec, http-api-data
-     , lift-type, monad-logger, mtl, path-pieces, QuickCheck
-     , quickcheck-instances, resource-pool, resourcet, scientific
-     , shakespeare, silently, template-haskell, text, th-lift-instances
-     , time, transformers, unliftio, unliftio-core, unordered-containers
-     , vector
+     , fast-logger, file-embed, hspec, http-api-data, lift-type
+     , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances
+     , resource-pool, resourcet, scientific, shakespeare, silently
+     , template-haskell, text, th-lift-instances, time, transformers
+     , unliftio, unliftio-core, unordered-containers, vector
      }:
      mkDerivation {
        pname = "persistent";
-       version = "2.13.0.1";
-       sha256 = "0yvipx9y33pr1vz7818w2ylr5zf9bmng8ka70mdb4f563l4ynp96";
+       version = "2.13.0.2";
+       sha256 = "1fn3hjn3pxxnawvdif691vmxahnmal5ivr5rll0f26ia7rjqrnn2";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html bytestring
          conduit containers fast-logger http-api-data lift-type monad-logger
@@ -198325,12 +198829,10 @@ self: {
          unordered-containers vector
        ];
        benchmarkHaskellDepends = [
-         base criterion deepseq deepseq-generics file-embed template-haskell
-         text
+         base criterion deepseq file-embed template-haskell text
        ];
        description = "Type-safe, multi-backend data serialization";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ psibi ];
      }) {};
 
@@ -198435,6 +198937,8 @@ self: {
        pname = "persistent-documentation";
        version = "0.1.0.2";
        sha256 = "0ys864vjzl97c9qv0gg5q9zviammrfvm0schvh7ckr9pdg062z17";
+       revision = "1";
+       editedCabalFile = "0pzgmwqjyzpql7d6bk9xkzkjvm21giq7f420y4fqq4wli3g2cwmx";
        libraryHaskellDepends = [
          base containers mtl persistent template-haskell text
        ];
@@ -198445,6 +198949,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Documentation DSL for persistent entities";
        license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-equivalence" = callPackage
@@ -198614,34 +199120,6 @@ self: {
 
   "persistent-mysql" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , containers, fast-logger, hspec, HUnit, monad-logger, mysql
-     , mysql-simple, persistent, persistent-qq, persistent-template
-     , persistent-test, QuickCheck, quickcheck-instances, resource-pool
-     , resourcet, text, time, transformers, unliftio-core
-     }:
-     mkDerivation {
-       pname = "persistent-mysql";
-       version = "2.10.3.1";
-       sha256 = "00gs2ym5vw2cqahv48cx8fhi3kx06rn0s1pafm8pdlr98snvwif7";
-       revision = "1";
-       editedCabalFile = "1nd3l499kpv2rfhqqjw1b3qsn558rwz3794cy2x493l98rsspszp";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit containers monad-logger
-         mysql mysql-simple persistent resource-pool resourcet text
-         transformers unliftio-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers fast-logger hspec HUnit monad-logger
-         mysql persistent persistent-qq persistent-template persistent-test
-         QuickCheck quickcheck-instances resourcet text time transformers
-         unliftio-core
-       ];
-       description = "Backend for the persistent library using MySQL database server";
-       license = lib.licenses.mit;
-     }) {};
-
-  "persistent-mysql_2_13_0_0" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, fast-logger, hspec, http-api-data, HUnit
      , monad-logger, mysql, mysql-simple, path-pieces, persistent
      , persistent-qq, persistent-test, QuickCheck, quickcheck-instances
@@ -198649,8 +199127,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mysql";
-       version = "2.13.0.0";
-       sha256 = "1lqd1j9r973081yzvvz9c65csqjd8bzapb4dayzwbhwjq2p0sxiz";
+       version = "2.13.0.1";
+       sha256 = "1gl48xcsczpzipg9v107x970rzi66vr26772ml9z8szxygamgsdb";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers monad-logger
          mysql mysql-simple persistent resource-pool resourcet text
@@ -198664,7 +199142,6 @@ self: {
        ];
        description = "Backend for the persistent library using MySQL database server";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "persistent-mysql-haskell" = callPackage
@@ -198759,16 +199236,19 @@ self: {
   "persistent-postgresql" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , conduit, containers, fast-logger, hspec, hspec-expectations
-     , HUnit, monad-logger, mtl, persistent, persistent-qq
-     , persistent-template, persistent-test, postgresql-libpq
-     , postgresql-simple, QuickCheck, quickcheck-instances
-     , resource-pool, resourcet, string-conversions, text, time
-     , transformers, unliftio-core, unordered-containers, vector
+     , hspec-expectations-lifted, http-api-data, HUnit, monad-logger
+     , mtl, path-pieces, persistent, persistent-qq, persistent-test
+     , postgresql-libpq, postgresql-simple, QuickCheck
+     , quickcheck-instances, resource-pool, resourcet
+     , string-conversions, text, time, transformers, unliftio
+     , unliftio-core, unordered-containers, vector
      }:
      mkDerivation {
        pname = "persistent-postgresql";
-       version = "2.11.0.1";
-       sha256 = "08bmf52fqjwzyw4dnvh2ql4q3ai05fzzicgd5z6bim13b9s4ggmk";
+       version = "2.13.0.1";
+       sha256 = "186anbb0sgml094pw1nb529pddi4q1af0mcv3xa8bshr1xywpnd8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring conduit containers
          monad-logger mtl persistent postgresql-libpq postgresql-simple
@@ -198777,16 +199257,16 @@ self: {
        ];
        testHaskellDepends = [
          aeson base bytestring containers fast-logger hspec
-         hspec-expectations HUnit monad-logger persistent persistent-qq
-         persistent-template persistent-test QuickCheck quickcheck-instances
-         resourcet text time transformers unliftio-core unordered-containers
-         vector
+         hspec-expectations hspec-expectations-lifted http-api-data HUnit
+         monad-logger path-pieces persistent persistent-qq persistent-test
+         QuickCheck quickcheck-instances resourcet text time transformers
+         unliftio unliftio-core unordered-containers vector
        ];
        description = "Backend for the persistent library using postgresql";
        license = lib.licenses.mit;
      }) {};
 
-  "persistent-postgresql_2_13_0_0" = callPackage
+  "persistent-postgresql_2_13_0_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , conduit, containers, fast-logger, hspec, hspec-expectations
      , hspec-expectations-lifted, http-api-data, HUnit, monad-logger
@@ -198798,8 +199278,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-postgresql";
-       version = "2.13.0.0";
-       sha256 = "0a18h7ib01if2dspq8f3vwb02cwi74c12i0n3ax4aq6819qy12gb";
+       version = "2.13.0.2";
+       sha256 = "1cbrwzk2s3xrdxpas64slk1habn38xspdg09xj2yazszkmr31hrh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -198841,34 +199321,12 @@ self: {
   "persistent-qq" = callPackage
     ({ mkDerivation, aeson, base, bytestring, fast-logger
      , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent
-     , persistent-sqlite, persistent-template, resourcet
-     , template-haskell, text, unliftio
-     }:
-     mkDerivation {
-       pname = "persistent-qq";
-       version = "2.9.2.1";
-       sha256 = "0gnwkrjyh9fkli35qp0mvivbsycz58ng26z6rfqv377hgrjsvjiq";
-       libraryHaskellDepends = [
-         base haskell-src-meta mtl persistent template-haskell text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring fast-logger haskell-src-meta hspec HUnit
-         monad-logger mtl persistent persistent-sqlite persistent-template
-         resourcet template-haskell text unliftio
-       ];
-       description = "Provides a quasi-quoter for raw SQL for persistent";
-       license = lib.licenses.mit;
-     }) {};
-
-  "persistent-qq_2_12_0_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, fast-logger
-     , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent
      , persistent-sqlite, resourcet, template-haskell, text, unliftio
      }:
      mkDerivation {
        pname = "persistent-qq";
-       version = "2.12.0.0";
-       sha256 = "1mw565rwnzdsw0vc0gs31z4l4pw8qxb70l898invj7dfnq5vj62f";
+       version = "2.12.0.1";
+       sha256 = "1dvniapxjaw2vmdqd5cplwxdxiy2l6z6gns8gp3ci3rn3xp0pf6p";
        libraryHaskellDepends = [
          base haskell-src-meta mtl persistent template-haskell text
        ];
@@ -198879,7 +199337,6 @@ self: {
        ];
        description = "Provides a quasi-quoter for raw SQL for persistent";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "persistent-ratelimit" = callPackage
@@ -198980,38 +199437,6 @@ self: {
   "persistent-sqlite" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th
-     , monad-logger, mtl, persistent, persistent-template
-     , persistent-test, QuickCheck, resource-pool, resourcet, sqlite
-     , system-fileio, system-filepath, temporary, text, time
-     , transformers, unliftio-core, unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-sqlite";
-       version = "2.11.1.0";
-       sha256 = "04rdzcckdkvs8nisx0hh96sdfyly82yr8c0mx6nsxpyi7m52by9j";
-       configureFlags = [ "-fsystemlib" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring conduit containers microlens-th monad-logger
-         mtl persistent resource-pool resourcet text time transformers
-         unliftio-core unordered-containers
-       ];
-       librarySystemDepends = [ sqlite ];
-       testHaskellDepends = [
-         base bytestring conduit containers exceptions fast-logger hspec
-         HUnit microlens monad-logger mtl persistent persistent-template
-         persistent-test QuickCheck resourcet system-fileio system-filepath
-         temporary text time transformers unliftio-core
-       ];
-       description = "Backend for the persistent library using sqlite3";
-       license = lib.licenses.mit;
-       maintainers = with lib.maintainers; [ psibi ];
-     }) {inherit (pkgs) sqlite;};
-
-  "persistent-sqlite_2_13_0_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th
      , monad-logger, mtl, persistent, persistent-test, QuickCheck
      , resource-pool, resourcet, sqlite, system-fileio, system-filepath
      , temporary, text, time, transformers, unliftio-core
@@ -199019,10 +199444,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-sqlite";
-       version = "2.13.0.0";
-       sha256 = "1xbf22cnvhjs59wqml0n5flk1fhrhjw3flm3lnhh1nik3scfny0w";
-       revision = "1";
-       editedCabalFile = "0y21azb1cvaxwlypprh3wqxr0w0hchf3r509vqxvywqymckqc71i";
+       version = "2.13.0.3";
+       sha256 = "12za89crbk74mya4qxpw5fp5fqp64vwz5s8vbjd7m8r3j3vbw338";
        configureFlags = [ "-fsystemlib" ];
        isLibrary = true;
        isExecutable = true;
@@ -199040,41 +199463,10 @@ self: {
        ];
        description = "Backend for the persistent library using sqlite3";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ psibi ];
      }) {inherit (pkgs) sqlite;};
 
   "persistent-template" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , deepseq, deepseq-generics, file-embed, hspec, http-api-data
-     , monad-control, monad-logger, path-pieces, persistent, QuickCheck
-     , template-haskell, text, th-lift-instances, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-template";
-       version = "2.9.1.0";
-       sha256 = "19ilgz8r6p5wy111rb4v0d6cnrj8jfiv2pnzdynpxd9ay66vgbca";
-       revision = "2";
-       editedCabalFile = "1lyrnh2lskkbvpjhbjiyh2ibndldsr8zgaiws7n37pa3vnmfx0qw";
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-api-data monad-control
-         monad-logger path-pieces persistent template-haskell text
-         th-lift-instances transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec persistent QuickCheck text
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq deepseq-generics file-embed persistent
-         template-haskell text
-       ];
-       description = "Type-safe, non-relational, multi-backend persistence";
-       license = lib.licenses.mit;
-       maintainers = with lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent-template_2_12_0_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "persistent-template";
@@ -199084,7 +199476,6 @@ self: {
        doHaddock = false;
        description = "Type-safe, non-relational, multi-backend persistence";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ psibi ];
      }) {};
 
@@ -199094,8 +199485,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-template-classy";
-       version = "0.1.0.1";
-       sha256 = "0ph5cfm5gj6qydv70s9bmb5ynymqnrhqiwcqpd0s87xj2iv9v46a";
+       version = "0.2.0";
+       sha256 = "0grfr7bb0c9m4fhg27g4qch43mgjqfrzw2c0gi0arq5ibm3n17kk";
        libraryHaskellDepends = [
          base lens persistent persistent-sqlite persistent-template
          template-haskell text
@@ -199112,29 +199503,6 @@ self: {
 
   "persistent-test" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit
-     , containers, exceptions, hspec, hspec-expectations, HUnit
-     , monad-control, monad-logger, mtl, path-pieces, persistent
-     , persistent-template, QuickCheck, quickcheck-instances, random
-     , resourcet, text, time, transformers, transformers-base, unliftio
-     , unliftio-core, unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-test";
-       version = "2.0.3.5";
-       sha256 = "16m3nlmpwxibfhgrfl3xqh3a518bkrd7qaa8hklfq2qwlvjbb31v";
-       libraryHaskellDepends = [
-         aeson base blaze-html bytestring conduit containers exceptions
-         hspec hspec-expectations HUnit monad-control monad-logger mtl
-         path-pieces persistent persistent-template QuickCheck
-         quickcheck-instances random resourcet text time transformers
-         transformers-base unliftio unliftio-core unordered-containers
-       ];
-       description = "Tests for Persistent";
-       license = lib.licenses.mit;
-     }) {};
-
-  "persistent-test_2_13_0_0" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit
      , containers, exceptions, hspec, hspec-expectations, http-api-data
      , HUnit, monad-control, monad-logger, mtl, path-pieces, persistent
      , QuickCheck, quickcheck-instances, random, resourcet, text, time
@@ -199143,10 +199511,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-test";
-       version = "2.13.0.0";
-       sha256 = "1fyahnnx9f3dg36kqviah5l9410d0x819dz3afxapcq27myccdw7";
-       revision = "1";
-       editedCabalFile = "16yzpsy11bcglipgcy0x8mcxlx7w00gfvnw5fhjkbj99lxdwwgm0";
+       version = "2.13.0.3";
+       sha256 = "07q53jvhz00cf10k7a8fkvykgwcl10fgzh8k9gv1d248f336crvs";
        libraryHaskellDepends = [
          aeson base blaze-html bytestring conduit containers exceptions
          hspec hspec-expectations http-api-data HUnit monad-control
@@ -199156,43 +199522,18 @@ self: {
        ];
        description = "Tests for Persistent";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "persistent-typed-db" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec
-     , http-api-data, monad-logger, path-pieces, persistent
-     , persistent-template, resource-pool, resourcet, template-haskell
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-typed-db";
-       version = "0.1.0.2";
-       sha256 = "1pdhdb29b7gyaw3kh1vr76dyr7gvwpx9ymib17fzfsxks6s76dxc";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit http-api-data monad-logger
-         path-pieces persistent persistent-template resource-pool resourcet
-         template-haskell text transformers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring conduit esqueleto hspec http-api-data
-         monad-logger path-pieces persistent persistent-template
-         resource-pool resourcet template-haskell text transformers
-       ];
-       description = "Type safe access to multiple database schemata";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "persistent-typed-db_0_1_0_3" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec
-     , http-api-data, monad-logger, path-pieces, persistent
-     , persistent-template, resource-pool, resourcet, template-haskell
-     , text, transformers
+     , hspec-discover, http-api-data, monad-logger, path-pieces
+     , persistent, resource-pool, resourcet, template-haskell, text
+     , transformers
      }:
      mkDerivation {
        pname = "persistent-typed-db";
-       version = "0.1.0.3";
-       sha256 = "15x4qfk4bwafqa495y8dsywa5mrcfnmqm7pyn419p20yngnyhzn8";
+       version = "0.1.0.4";
+       sha256 = "1dd5kig6zkiq5qkqv63icz9z8mn0b56b06w6z980hi7a2bmp6pk8";
        libraryHaskellDepends = [
          aeson base bytestring conduit http-api-data monad-logger
          path-pieces persistent resource-pool resourcet template-haskell
@@ -199200,12 +199541,12 @@ self: {
        ];
        testHaskellDepends = [
          aeson base bytestring conduit esqueleto hspec http-api-data
-         monad-logger path-pieces persistent persistent-template
-         resource-pool resourcet template-haskell text transformers
+         monad-logger path-pieces persistent resource-pool resourcet
+         template-haskell text transformers
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Type safe access to multiple database schemata";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "persistent-vector" = callPackage
@@ -199953,8 +200294,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-phonetics-basics";
-       version = "0.6.2.0";
-       sha256 = "1vzx21pp9hkksbw5vpl8rarxpnbhmj04xys3qx0xk0zqf2p1f86q";
+       version = "0.6.3.0";
+       sha256 = "1hc1wmq2syvi0xsbkrm52hd5k8j2kk80n45695zd85fqwbayhj2c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -200059,8 +200400,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-examples-array";
-       version = "0.4.1.0";
-       sha256 = "02z7c3ngcj4dz473j0ha05qh5wviiy4qp1mk3p4gidxrhkgbxhyc";
+       version = "0.4.2.0";
+       sha256 = "02lv4w9v8jf7v6dkrwwmy79h7yphmk37n54r9whii6kicns80ff2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -200120,8 +200461,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-generalized-examples-array";
-       version = "0.1.1.0";
-       sha256 = "04b65k6jjrlfx93m7625f991vll136y0lbh82f9qgxlmwv1vwmm8";
+       version = "0.2.1.0";
+       sha256 = "0bz5lyl75i143crva3piz4005k81ia26rj455cgbgz3yknj3qpaf";
        libraryHaskellDepends = [
          base heaps mmsyn2-array parallel
          phonetic-languages-constraints-array
@@ -200142,8 +200483,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-generalized-examples-common";
-       version = "0.1.1.0";
-       sha256 = "0yhpw7bpfag5d6cbm385dy5jxll2vn8104ypqngdv0qlxqx25m9l";
+       version = "0.1.2.0";
+       sha256 = "1k65ynaz2mh35nqsf3izqq0lxqbkyj24i1g3r3gbfpbkajdhqz0v";
        libraryHaskellDepends = [
          base heaps phonetic-languages-phonetics-basics subG
        ];
@@ -200158,8 +200499,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-generalized-properties-array";
-       version = "0.1.1.0";
-       sha256 = "04jg2b2qzm3yhbckbpn7zarfdy921lryx8d5r3cx9vcp55xvain0";
+       version = "0.1.2.0";
+       sha256 = "1vlzgcq8pv22m9pxwx0p1xss9zzlvwap11gn88pdgn0zgkhcsm0b";
        libraryHaskellDepends = [
          base phonetic-languages-phonetics-basics
          phonetic-languages-rhythmicity phonetic-languages-simplified-base
@@ -200839,8 +201180,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinch-gen";
-       version = "0.4.1.0";
-       sha256 = "11sk0lmzsxw0k8i8airpv7p461z25n6y2fygx0l7gv0zadaici2v";
+       version = "0.4.2.0";
+       sha256 = "0saacr8q2varfqcq386dk9k04caijm90yi106wyl88pn3f5piaq3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -203045,8 +203386,8 @@ self: {
      }:
      mkDerivation {
        pname = "ploterific";
-       version = "0.2.0.0";
-       sha256 = "1x49b7js161bhdr8v631qr1r4cjnxg9kdvnlc55b5g5kajwf714w";
+       version = "0.2.1.1";
+       sha256 = "1i5rgbnvi7s5rq13kj4fnanzmalzh53rim0r3nxxa82i25nb1sfq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -206565,6 +206906,30 @@ self: {
        license = lib.licenses.gpl2Only;
      }) {};
 
+  "powerdns" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , case-insensitive, containers, deepseq, http-client, servant
+     , servant-client, servant-client-core, tasty, tasty-hunit, text
+     , time
+     }:
+     mkDerivation {
+       pname = "powerdns";
+       version = "0.1";
+       sha256 = "1fg698m3qmm5f0g0fl394hx593pwg7ai730imwahv00fr846lqm1";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring case-insensitive containers
+         deepseq servant servant-client servant-client-core text time
+       ];
+       testHaskellDepends = [
+         base http-client servant-client servant-client-core tasty
+         tasty-hunit
+       ];
+       description = "PowerDNS API bindings for api/v1";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "powermate" = callPackage
     ({ mkDerivation, base, directory, unix }:
      mkDerivation {
@@ -209094,8 +209459,8 @@ self: {
      }:
      mkDerivation {
        pname = "profiteur";
-       version = "0.4.5.1";
-       sha256 = "0mq2fal93v42rkgiq0xwqzqc413dgkiawa09bxgv0sgajzslqx80";
+       version = "0.4.6.0";
+       sha256 = "0jkrx34hymx70aqxjcnw2a7pdiw1hy4nc6m2larjrgxjczshpfqx";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -210516,8 +210881,8 @@ self: {
      }:
      mkDerivation {
        pname = "proton";
-       version = "0.0.3";
-       sha256 = "0w68v8sglyg99jni1p1cz6x87cm6x1ayll08wlijaiwpqc2pma2n";
+       version = "0.0.4";
+       sha256 = "1z8w3ymn893jgzanxp89x6kga9d79kggvcgkm9mhwd9q88h97v91";
        libraryHaskellDepends = [
          adjunctions async base bifunctors comonad compactable containers
          contravariant distributive folds linear mtl profunctors tagged
@@ -210588,8 +210953,8 @@ self: {
      }:
      mkDerivation {
        pname = "provenience";
-       version = "0.1.1.0";
-       sha256 = "020kfw1laishiqy8npg2f2llq7dv1djii0d0khjfw7f1scy4x10n";
+       version = "0.1.2.0";
+       sha256 = "0irhlscjq3anfhzn2qs28w4k6z48p557a060iqpimjw2kjkyrr4d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -210976,8 +211341,10 @@ self: {
      }:
      mkDerivation {
        pname = "publish";
-       version = "2.1.6";
-       sha256 = "1clb9sxrsskklzany9q5600v77qywdszgzxjxrvsihrirf0akry2";
+       version = "2.2.2";
+       sha256 = "19bvdldggklzq6wqgcbvnf4jjlbdbh1l80dm92aj0405a9rhsa28";
+       revision = "2";
+       editedCabalFile = "19ajwrsd1l9p4cm9ckii5i6nb5w28sxl7kr129xz8kwkpj4z6lfq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -211969,6 +212336,7 @@ self: {
        description = "Creating graphics for pencil puzzles";
        license = lib.licenses.mit;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "puzzle-draw-cmdline" = callPackage
@@ -214212,29 +214580,37 @@ self: {
      }) {};
 
   "raaz" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, criterion
+    ({ mkDerivation, attoparsec, base, bytestring
      , criterion-measurement, deepseq, hspec, hspec-discover, HUnit
-     , optparse-applicative, pretty, QuickCheck, transformers, vector
+     , optparse-applicative, pretty, QuickCheck, vector
      }:
      mkDerivation {
        pname = "raaz";
-       version = "0.2.2";
-       sha256 = "1v7zyk61vk4d6xniqq4fglwccgpx9clx7hxp1xr531spshadq99p";
+       version = "0.3.0";
+       sha256 = "0a322ji29s537kz1mazbl7grbg0s1wkz2cxg74zlvqa47xbk20k1";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base bytestring deepseq vector ];
-       executableHaskellDepends = [ base optparse-applicative ];
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring criterion-measurement deepseq hspec HUnit pretty
+         QuickCheck vector
+       ];
+       executableHaskellDepends = [
+         base bytestring deepseq optparse-applicative vector
+       ];
        testHaskellDepends = [
-         base bytestring hspec hspec-discover HUnit QuickCheck transformers
-         vector
+         attoparsec base bytestring deepseq hspec hspec-discover HUnit
+         QuickCheck vector
        ];
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
-         base blaze-builder bytestring criterion criterion-measurement
-         pretty
+         base bytestring criterion-measurement deepseq pretty vector
        ];
-       description = "The raaz cryptographic library";
-       license = lib.licenses.bsd3;
+       doHaddock = false;
+       description = "Fast and type safe cryptography";
+       license = "(Apache-2.0 OR BSD-3-Clause)";
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "rabocsv2qif" = callPackage
@@ -216279,7 +216655,9 @@ self: {
        ];
        description = "Programmatically edit MIDI events via ALSA and reactive-banana";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
+       platforms = [
+         "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
+       ];
      }) {};
 
   "reactive-banana" = callPackage
@@ -216302,8 +216680,6 @@ self: {
        ];
        description = "Library for functional reactive programming (FRP)";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana-automation" = callPackage
@@ -216320,7 +216696,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "home (etc) automation using reactive-banana";
        license = lib.licenses.agpl3Only;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reactive-banana-bunch" = callPackage
@@ -216336,7 +216711,6 @@ self: {
        ];
        description = "Extend reactive-banana to multiple events per time point";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reactive-banana-gi-gtk" = callPackage
@@ -216354,6 +216728,7 @@ self: {
        description = "Simple reactive programming with GTK GObject Introspection";
        license = lib.licenses.publicDomain;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-sdl" = callPackage
@@ -216384,6 +216759,7 @@ self: {
        description = "Reactive Banana integration with SDL2";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-threepenny" = callPackage
@@ -216399,6 +216775,7 @@ self: {
        description = "Examples for the reactive-banana library, using threepenny-gui";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-wx" = callPackage
@@ -216492,7 +216869,6 @@ self: {
        ];
        description = "Process MIDI events via reactive-banana and JACK";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reactive-midyim" = callPackage
@@ -216512,7 +216888,6 @@ self: {
        ];
        description = "Process MIDI events via reactive-banana";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "reactive-thread" = callPackage
@@ -216961,7 +217336,7 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "rebase_1_12_0_1" = callPackage
+  "rebase_1_13" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
      , contravariant, deepseq, dlist, either, hashable, hashable-time
      , mtl, profunctors, scientific, selective, semigroupoids, stm, text
@@ -216970,8 +217345,8 @@ self: {
      }:
      mkDerivation {
        pname = "rebase";
-       version = "1.12.0.1";
-       sha256 = "1yl09702psialskvm39i9rl3sag853qr1237jhs79yk7nhvdlaqx";
+       version = "1.13";
+       sha256 = "0cqpp2cn3yi9d825qzavs52ky77b628fm8p7w51zy9qjx1p7650v";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers contravariant deepseq
          dlist either hashable hashable-time mtl profunctors scientific
@@ -217060,8 +217435,8 @@ self: {
      }:
      mkDerivation {
        pname = "record-dot-preprocessor";
-       version = "0.2.10";
-       sha256 = "1zwkc5mqcxlv4cm7qd75sdmvjckvpchcrqphsq82val41mp27nk5";
+       version = "0.2.11";
+       sha256 = "1hsk7n8hrskj30wcil4rvjhng3zcj7f9a0dn69371iay4x8d75md";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base extra ghc uniplate ];
@@ -218075,6 +218450,22 @@ self: {
        maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
+  "reflex-dom-ace" = callPackage
+    ({ mkDerivation, base, containers, data-default, ghcjs-dom, jsaddle
+     , lens, mtl, reflex-dom-core, text
+     }:
+     mkDerivation {
+       pname = "reflex-dom-ace";
+       version = "0.3.0.3";
+       sha256 = "024xwgqasf2sciz0paq7p1ry1njcz46pz2l1cyjxm562hjqvsb0h";
+       libraryHaskellDepends = [
+         base containers data-default ghcjs-dom jsaddle lens mtl
+         reflex-dom-core text
+       ];
+       description = "Basic support for using the Ace editor with Reflex";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "reflex-dom-colonnade" = callPackage
     ({ mkDerivation, base, colonnade, containers, contravariant, reflex
      , reflex-dom, semigroups, text, vector
@@ -221270,12 +221661,12 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "rerebase_1_12_0_1" = callPackage
+  "rerebase_1_13" = callPackage
     ({ mkDerivation, rebase }:
      mkDerivation {
        pname = "rerebase";
-       version = "1.12.0.1";
-       sha256 = "0kh0022hfviywa4rkwnrqygc7s3vg8qvr9znh66v5c1i3gaibzq5";
+       version = "1.13";
+       sha256 = "1ng16dnlrxcy76mpw21mwf2sk70q4i0kmqhxikjhc2h06zdpkqfr";
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
        license = lib.licenses.mit;
@@ -223788,15 +224179,16 @@ self: {
 
   "rollbar" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, http-conduit
-     , lifted-base, monad-control, network, resourcet, text, vector
+     , lifted-base, monad-control, network, network-bsd, resourcet, text
+     , vector
      }:
      mkDerivation {
        pname = "rollbar";
-       version = "1.1.2";
-       sha256 = "1ip4bsnav2bwbbasz0mmfkq7cvi72jfdbz00r1ql4kpgwwkdhysz";
+       version = "1.1.3";
+       sha256 = "0mj8s2kfv8fw8mpb3xz8fvlyvdx46nsh1waw7jvw4cxphywfq9b8";
        libraryHaskellDepends = [
          aeson base basic-prelude http-conduit lifted-base monad-control
-         network resourcet text vector
+         network network-bsd resourcet text vector
        ];
        description = "error tracking through rollbar.com";
        license = lib.licenses.mit;
@@ -224595,8 +224987,8 @@ self: {
      }:
      mkDerivation {
        pname = "rp-tree";
-       version = "0.3.5";
-       sha256 = "06av43wbyy68flcfdbz20dd3vmh4na44mh041z7h7rh6hzilzr1j";
+       version = "0.3.6";
+       sha256 = "0dz2xkgmk3lfr0pnc7xzfz756bzdkbmb2m96zdpw7vgyz59h9i64";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -224697,8 +225089,10 @@ self: {
      }:
      mkDerivation {
        pname = "rpmbuild-order";
-       version = "0.4.4";
-       sha256 = "17zqnjn6zib0rvzj8gzpaj87b79v8fx5qlc6ifidi6rmykjqnx42";
+       version = "0.4.5";
+       sha256 = "1lz6w2nd8yq0arfpp6vnv7lazr9289wan00b6layfdhlql9f21vl";
+       revision = "1";
+       editedCabalFile = "05arkmpbh5fdqbqhkwl76isbigrsc0f54zkbdl21jap6k4g9kzsk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -224709,7 +225103,7 @@ self: {
          base directory extra fgl optparse-applicative simple-cmd-args
        ];
        testHaskellDepends = [ base extra hspec simple-cmd unix ];
-       description = "Order RPM packages by dependencies";
+       description = "Sort RPM packages in dependency order";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
        broken = true;
@@ -225491,6 +225885,97 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "safe-coloured-text_0_1_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, text, validity
+     , validity-bytestring, validity-text
+     }:
+     mkDerivation {
+       pname = "safe-coloured-text";
+       version = "0.1.0.0";
+       sha256 = "1fcqwllpbp9x1r1bvyry6bmp2s9rp8rlr3i94hdiydc71hpl7a0w";
+       libraryHaskellDepends = [
+         base bytestring text validity validity-bytestring validity-text
+       ];
+       description = "Safely output coloured text";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "safe-coloured-text-gen" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-bytestring
+     , genvalidity-sydtest, genvalidity-text, safe-coloured-text
+     , sydtest, sydtest-discover, text
+     }:
+     mkDerivation {
+       pname = "safe-coloured-text-gen";
+       version = "0.0.0.0";
+       sha256 = "1z5livjv0n1i05i3fi58hi7vqwvycapnr5rp1m8rpgj8lhsbi9qx";
+       libraryHaskellDepends = [
+         base genvalidity genvalidity-bytestring genvalidity-text
+         safe-coloured-text
+       ];
+       testHaskellDepends = [
+         base genvalidity-sydtest safe-coloured-text sydtest text
+       ];
+       testToolDepends = [ sydtest-discover ];
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "safe-coloured-text-layout" = callPackage
+    ({ mkDerivation, base, bytestring, safe-coloured-text, sydtest
+     , sydtest-discover, text, validity
+     }:
+     mkDerivation {
+       pname = "safe-coloured-text-layout";
+       version = "0.0.0.0";
+       sha256 = "11fbfqs96dlhyywkmy97b2fsws0fdsv3illdd61w3fckbxbdw6bw";
+       libraryHaskellDepends = [ base safe-coloured-text text validity ];
+       testHaskellDepends = [
+         base bytestring safe-coloured-text sydtest text
+       ];
+       testToolDepends = [ sydtest-discover ];
+       description = "Safely layout output coloured text";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "safe-coloured-text-layout-gen" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-sydtest
+     , safe-coloured-text, safe-coloured-text-gen
+     , safe-coloured-text-layout, sydtest, sydtest-discover
+     }:
+     mkDerivation {
+       pname = "safe-coloured-text-layout-gen";
+       version = "0.0.0.0";
+       sha256 = "1v4in8zl689j47jwac0z1k3rnnsc54qdclrbzja9aa364bmczzv8";
+       libraryHaskellDepends = [
+         base genvalidity safe-coloured-text-gen safe-coloured-text-layout
+       ];
+       testHaskellDepends = [
+         base genvalidity-sydtest safe-coloured-text safe-coloured-text-gen
+         safe-coloured-text-layout sydtest
+       ];
+       testToolDepends = [ sydtest-discover ];
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "safe-coloured-text-terminfo" = callPackage
+    ({ mkDerivation, base, safe-coloured-text, terminfo }:
+     mkDerivation {
+       pname = "safe-coloured-text-terminfo";
+       version = "0.0.0.0";
+       sha256 = "0f94zzmanmxplkcg1s954rq00ppv69icyjpzr5s0g6c14zp1k85b";
+       libraryHaskellDepends = [ base safe-coloured-text terminfo ];
+       description = "Safely output coloured text";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "safe-decimal" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest
      , exceptions, hspec, hspec-discover, QuickCheck, scientific
@@ -225834,6 +226319,18 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "safe-wild-cards" = callPackage
+    ({ mkDerivation, base, template-haskell, th-abstraction }:
+     mkDerivation {
+       pname = "safe-wild-cards";
+       version = "1.0.0";
+       sha256 = "1cgs7v30jamk2i8xbis7gc5n0f3c9rykxq7s81mxafyyj33ac36d";
+       libraryHaskellDepends = [ base template-haskell th-abstraction ];
+       testHaskellDepends = [ base ];
+       description = "Use RecordWildCards safely";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "safecopy" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
      , generic-data, HUnit, lens, lens-action, old-time, QuickCheck
@@ -226194,6 +226691,32 @@ self: {
        license = lib.licenses.mit;
      }) {inherit (pkgs) libsodium;};
 
+  "saltine_0_2_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
+     , libsodium, profunctors, QuickCheck, semigroups, test-framework
+     , test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "saltine";
+       version = "0.2.0.0";
+       sha256 = "1xgrnm6qmm0mymq3dh4mdvzi8sfssnpz06xsrw8zdpa1vl0a0gm6";
+       libraryHaskellDepends = [
+         base bytestring deepseq hashable profunctors text
+       ];
+       libraryPkgconfigDepends = [ libsodium ];
+       testHaskellDepends = [
+         base bytestring QuickCheck semigroups test-framework
+         test-framework-quickcheck2 text
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq text
+       ];
+       benchmarkSystemDepends = [ libsodium ];
+       description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {inherit (pkgs) libsodium;};
+
   "saltine-quickcheck" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex
      , libsodium, QuickCheck, saltine, tasty, tasty-quickcheck
@@ -226550,6 +227073,50 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "sandwich_0_1_0_7" = 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.7";
+       sha256 = "1ndw054vp2ygxd86whqbsdvrbv49khh1a6ia9zlqzx3gjbhqpxxi";
+       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;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "sandwich-quickcheck" = callPackage
     ({ mkDerivation, base, brick, free, monad-control, QuickCheck
      , safe-exceptions, sandwich, string-interpolate, text, time
@@ -226643,6 +227210,50 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "sandwich-webdriver_0_1_0_5" = callPackage
+    ({ mkDerivation, aeson, base, containers, convertible, data-default
+     , directory, exceptions, filepath, http-client, http-client-tls
+     , http-conduit, lifted-base, microlens, microlens-aeson
+     , monad-control, monad-logger, mtl, network, process, random, retry
+     , safe, safe-exceptions, sandwich, string-interpolate, temporary
+     , text, time, transformers, unix, unordered-containers, vector
+     , webdriver, X11
+     }:
+     mkDerivation {
+       pname = "sandwich-webdriver";
+       version = "0.1.0.5";
+       sha256 = "113as1i4f3hghbwrf4ii8lnxxb8nih177ffjbx3shsddnhx0fa8y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers convertible data-default directory exceptions
+         filepath http-client http-client-tls http-conduit lifted-base
+         microlens microlens-aeson monad-control monad-logger mtl network
+         process random retry safe safe-exceptions sandwich
+         string-interpolate temporary text time transformers unix
+         unordered-containers vector webdriver X11
+       ];
+       executableHaskellDepends = [
+         aeson base containers convertible data-default directory exceptions
+         filepath http-client http-client-tls http-conduit lifted-base
+         microlens microlens-aeson monad-control monad-logger mtl network
+         process random retry safe safe-exceptions sandwich
+         string-interpolate temporary text time transformers unix
+         unordered-containers vector webdriver X11
+       ];
+       testHaskellDepends = [
+         aeson base containers convertible data-default directory exceptions
+         filepath http-client http-client-tls http-conduit lifted-base
+         microlens microlens-aeson monad-control monad-logger mtl network
+         process random retry safe safe-exceptions sandwich
+         string-interpolate temporary text time transformers unix
+         unordered-containers vector webdriver X11
+       ];
+       description = "Sandwich integration with Selenium WebDriver";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "sarasvati" = callPackage
     ({ mkDerivation, base, deepseq, portaudio }:
      mkDerivation {
@@ -226990,8 +227601,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "8.14";
-       sha256 = "1yf350daksxwz084j81ngamr53jpz7y2fi4cnpni6vy16mb0sxz1";
+       version = "8.15";
+       sha256 = "11qzh2gfq9v8cxz6jjbipnfiwjs0hw34ghg5gdpr0h7bj77in30p";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers deepseq directory filepath libBF mtl
@@ -227818,20 +228429,20 @@ self: {
   "scientific" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , deepseq, hashable, integer-gmp, integer-logarithms, primitive
-     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text
+     , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, template-haskell, text
      }:
      mkDerivation {
        pname = "scientific";
-       version = "0.3.6.2";
-       sha256 = "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397";
+       version = "0.3.7.0";
+       sha256 = "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq hashable integer-gmp
-         integer-logarithms primitive text
+         integer-logarithms primitive template-haskell text
        ];
        testHaskellDepends = [
-         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
-         tasty-hunit tasty-quickcheck tasty-smallcheck text
+         base binary bytestring QuickCheck smallcheck tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck text
        ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Numbers represented using scientific notation";
@@ -230261,13 +230872,13 @@ self: {
      , cassava, containers, data-default, directory, doctest
      , doctest-discover, file-embed, filepath, hlint, hspec
      , hspec-discover, html-charset, http-client, http-types
-     , optparse-applicative, QuickCheck, temporary, text, text-trie
-     , unicode-show, wai, warp, zip
+     , interpolatedstring-perl6, optparse-applicative, QuickCheck
+     , random, temporary, text, text-trie, unicode-show, wai, warp, zip
      }:
      mkDerivation {
        pname = "seonbi";
-       version = "0.1.1";
-       sha256 = "1jsikmlr647c51zmd471wnff6wzxybmp7bvidvyx5fkzb3nlhrqb";
+       version = "0.2.0";
+       sha256 = "1bj428ds0lw6vg0927mn9ss63zrrzfi9jn7fy1hpr583vywc8pba";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -230284,8 +230895,9 @@ self: {
          optparse-applicative text wai warp
        ];
        testHaskellDepends = [
-         aeson base bytestring containers doctest doctest-discover hlint
-         hspec hspec-discover QuickCheck text unicode-show
+         aeson base bytestring containers directory doctest doctest-discover
+         filepath hlint hspec hspec-discover interpolatedstring-perl6
+         QuickCheck random text unicode-show
        ];
        testToolDepends = [ hspec-discover ];
        description = "SmartyPants for Korean language";
@@ -231153,8 +231765,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-wordpress";
-       version = "1.0.0.1";
-       sha256 = "08ngbgmzksp27n8znigrj5i2nvsqjansn4vv3my38vdqqgzm09w8";
+       version = "1.0.0.2";
+       sha256 = "0j4n5anlw3a2cgclmyblg01dcls91hzlmxgc2jkcdpwd49i0pv5n";
        libraryHaskellDepends = [
          base mtl servant-server text time wai wordpress-auth
        ];
@@ -237457,12 +238069,12 @@ self: {
      , hspec, hspec-core, HUnit, ini, iso8601-time, memory, mtl, network
      , network-transport, optparse-applicative, QuickCheck, random
      , simple-logger, sqlite-simple, stm, template-haskell, text, time
-     , timeit, transformers, unliftio, unliftio-core, x509
+     , timeit, transformers, unliftio, unliftio-core, websockets, x509
      }:
      mkDerivation {
        pname = "simplexmq";
-       version = "0.3.1";
-       sha256 = "0rc443nq4m1ghi5wbsaj6ravqs488lb2si0xmisg9h5ghsh204bf";
+       version = "0.3.2";
+       sha256 = "1bxg91ycmpa8762v5vdviqvyzkfap4iv9plnr7gcibf8vsd39qxl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -237470,7 +238082,8 @@ self: {
          base64-bytestring bytestring containers cryptonite directory
          filepath generic-random iso8601-time memory mtl network
          network-transport QuickCheck random simple-logger sqlite-simple stm
-         template-haskell text time transformers unliftio unliftio-core x509
+         template-haskell text time transformers unliftio unliftio-core
+         websockets x509
        ];
        executableHaskellDepends = [
          ansi-terminal asn1-encoding asn1-types async attoparsec base
@@ -237478,7 +238091,7 @@ self: {
          directory filepath generic-random ini iso8601-time memory mtl
          network network-transport optparse-applicative QuickCheck random
          simple-logger sqlite-simple stm template-haskell text time
-         transformers unliftio unliftio-core x509
+         transformers unliftio unliftio-core websockets x509
        ];
        testHaskellDepends = [
          ansi-terminal asn1-encoding asn1-types async attoparsec base
@@ -237486,7 +238099,7 @@ self: {
          filepath generic-random hspec hspec-core HUnit iso8601-time memory
          mtl network network-transport QuickCheck random simple-logger
          sqlite-simple stm template-haskell text time timeit transformers
-         unliftio unliftio-core x509
+         unliftio unliftio-core websockets x509
        ];
        description = "SimpleXMQ message broker";
        license = lib.licenses.agpl3Only;
@@ -237574,15 +238187,15 @@ self: {
      }) {inherit (pkgs.xorg) libXft;};
 
   "single-tuple" = callPackage
-    ({ mkDerivation, base, hspec, hspec-discover, OneTuple, Only }:
+    ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, OneTuple
+     , Only
+     }:
      mkDerivation {
        pname = "single-tuple";
-       version = "0.1.1.0";
-       sha256 = "1cviix5did4pm4bimg12v2qa9ms5icf19k3iz13g07d5q9jyiwji";
-       revision = "1";
-       editedCabalFile = "0gmki1bz7sn1lw5f1f1zp3rfphwba03fv6825djlidybln8snld0";
-       libraryHaskellDepends = [ base OneTuple Only ];
-       testHaskellDepends = [ base hspec OneTuple Only ];
+       version = "0.1.2.0";
+       sha256 = "1dxrdddfdvs69icv6ixjv5crfznllxvg8sjiw9xwyn26f36g2mw8";
+       libraryHaskellDepends = [ base ghc-prim OneTuple Only ];
+       testHaskellDepends = [ base ghc-prim hspec OneTuple Only ];
        testToolDepends = [ hspec-discover ];
        description = "a class for single tuple implementations";
        license = lib.licenses.asl20;
@@ -238650,8 +239263,8 @@ self: {
      }:
      mkDerivation {
        pname = "slave-thread";
-       version = "1.1";
-       sha256 = "02b64s0m7k81s187wj81yzr7l73p79iyh7a59dqf7r72l4r7akbd";
+       version = "1.1.0.1";
+       sha256 = "05hz0qglxg889l3b0sw9f79xqssw70fd62a766xcvj7aalmrc32i";
        libraryHaskellDepends = [
          base deferred-folds focus foldl stm-containers
        ];
@@ -242881,6 +243494,25 @@ self: {
        benchmarkHaskellDepends = [ base express leancheck ];
        description = "discovery of properties about Haskell functions";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "speculate_0_4_8" = callPackage
+    ({ mkDerivation, base, cmdargs, containers, express, leancheck }:
+     mkDerivation {
+       pname = "speculate";
+       version = "0.4.8";
+       sha256 = "1xrrd1r4sbhvahdd3k9xnh8w9mmk4zh738q9blrjnvnd560wybp4";
+       libraryHaskellDepends = [
+         base cmdargs containers express leancheck
+       ];
+       testHaskellDepends = [ base express leancheck ];
+       benchmarkHaskellDepends = [ base express leancheck ];
+       description = "discovery of properties about Haskell functions";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "speculation" = callPackage
@@ -243347,8 +243979,8 @@ self: {
      }:
      mkDerivation {
        pname = "splitmix-distributions";
-       version = "0.8.0.0";
-       sha256 = "1l7fh6nycsxy15m2w60pq6zp4iq811wzbklkyrc7z3wlghskqrmk";
+       version = "0.9.0.0";
+       sha256 = "0y6v93kgbldkf9pznrfy8848njy7cln7bd3nrx2b7dmrz6yd4rpz";
        libraryHaskellDepends = [
          base containers erf exceptions mtl splitmix transformers
        ];
@@ -244345,8 +244977,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "stable-marriage";
-       version = "0.2.0.0";
-       sha256 = "1qxns33mmr1nxw6gabi5s1i70ksp0ls54q7cf95fy7vs1nwngz0n";
+       version = "0.2.1.0";
+       sha256 = "1dv4333an20mlhmsxhaldjcj54pnkjvp7zpiasd6shii5d4cn0z1";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base ghc-prim ];
        description = "algorithms around stable marriage";
@@ -245675,6 +246307,8 @@ self: {
        pname = "statestack";
        version = "0.3";
        sha256 = "1b8yd314h8a97ggjv82cy4mr0f4scb5pjvslxq7hwxxq7cw7mgns";
+       revision = "1";
+       editedCabalFile = "03kk2zab7mcr5m89mxxl0zivag2hb024ijfdi0mp794hswncwhxy";
        libraryHaskellDepends = [
          base mtl transformers transformers-compat
        ];
@@ -246476,14 +247110,12 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "stm_2_5_0_0" = callPackage
+  "stm_2_5_0_1" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "stm";
-       version = "2.5.0.0";
-       sha256 = "1illcj8zgzmpl91hzgk0j74ha436a379gw13siq4gifbcrf6iqsr";
-       revision = "1";
-       editedCabalFile = "189fxk75h7n27kw7ndyn8nkxm3117qdh1dpag1mcs487kxghff62";
+       version = "2.5.0.1";
+       sha256 = "1fipf3bbk34mbld1apwnq6kbjxbrz2nc9cxxmhkk2bdcc2z4y7j5";
        libraryHaskellDepends = [ array base ];
        description = "Software Transactional Memory";
        license = lib.licenses.bsd3;
@@ -248156,6 +248788,22 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "streamt" = callPackage
+    ({ mkDerivation, async, base, criterion, hspec, logict, mtl, tasty
+     , tasty-hunit
+     }:
+     mkDerivation {
+       pname = "streamt";
+       version = "0.5.0.0";
+       sha256 = "0r2r6ribk85hwmzdn2imgajb28q5d5gbhysr62bw2jhmd5xy7985";
+       libraryHaskellDepends = [ base logict mtl ];
+       testHaskellDepends = [
+         async base criterion hspec mtl tasty tasty-hunit
+       ];
+       description = "Simple, Fair and Terminating Backtracking Monad Transformer";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "strelka" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-data, base, base-prelude
      , base64-bytestring, bifunctors, bytestring
@@ -248615,8 +249263,8 @@ self: {
      }:
      mkDerivation {
        pname = "string-interpolate";
-       version = "0.3.1.0";
-       sha256 = "0hyrcndhwd06phlmykyz7bklj5gnj4amcn11ckfvw0iws3sksl8d";
+       version = "0.3.1.1";
+       sha256 = "0hhzvrs9msyqsxwsqqm55lyxf85vhg4vcsszl735zsbs7431av69";
        libraryHaskellDepends = [
          base bytestring haskell-src-exts haskell-src-meta split
          template-haskell text text-conversions utf8-string
@@ -253003,8 +253651,8 @@ self: {
      }:
      mkDerivation {
        pname = "taffybar";
-       version = "3.2.4";
-       sha256 = "1hv0s9kp0ixha9qjgrp1l52w48z68ngk17a0c6364qc95qsd2ycp";
+       version = "3.2.5";
+       sha256 = "1gfdlqgdqq2ivvzj7cgqahpm2bmwg90ri5ss7ah38alrp5rvda1v";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -253610,6 +254258,28 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "talash" = callPackage
+    ({ mkDerivation, alfred-margaret, base, brick, bytestring
+     , colorful-monoids, containers, directory, ghc-compact, intro
+     , microlens, microlens-th, text, unix, unordered-containers, vector
+     , vector-algorithms, vector-sized, vty
+     }:
+     mkDerivation {
+       pname = "talash";
+       version = "0.1.0.1";
+       sha256 = "1j28i5aipldjknfx22dil0xi1gwlv89frl1fn606yl1g84q1kr5n";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         alfred-margaret base brick bytestring colorful-monoids containers
+         directory ghc-compact intro microlens microlens-th text unix
+         unordered-containers vector vector-algorithms vector-sized vty
+       ];
+       executableHaskellDepends = [ base ];
+       description = "Line oriented fast enough text search";
+       license = lib.licenses.gpl3Only;
+     }) {};
+
   "tamarin-prover" = callPackage
     ({ mkDerivation, aeson, array, base, binary, blaze-builder
      , blaze-html, bytestring, cmdargs, conduit, containers, deepseq
@@ -254386,14 +255056,14 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "tasty-hspec_1_1_7" = callPackage
+  "tasty-hspec_1_2" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
      , tasty-quickcheck, tasty-smallcheck
      }:
      mkDerivation {
        pname = "tasty-hspec";
-       version = "1.1.7";
-       sha256 = "05738x9hvnwqlp91x2da3b3fpn84hbsha7850xphnh2bpbx3lbx1";
+       version = "1.2";
+       sha256 = "0hnq6q4mk2avirb8cgibaxj5m2c4rf5xsqry04zx4nc15la5xniw";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck tasty tasty-quickcheck
          tasty-smallcheck
@@ -256362,7 +257032,6 @@ self: {
        libraryHaskellDepends = [ base reactive-banana termbox ];
        description = "reactive-banana + termbox";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "termbox-bindings" = callPackage
@@ -257740,8 +258409,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-icu";
-       version = "0.7.0.1";
-       sha256 = "0y3z5jda7v2iyll2148ivxfd2yhp27d3ryxrspp0cdq394klqxp2";
+       version = "0.7.1.0";
+       sha256 = "0s9gcd9lcrhk92ydhizyk0vbpf542ipc4hj60fa02b2g2x9q93ij";
        libraryHaskellDepends = [ base bytestring deepseq text ];
        librarySystemDepends = [ icu ];
        testHaskellDepends = [
@@ -258120,12 +258789,14 @@ self: {
      }:
      mkDerivation {
        pname = "text-replace";
-       version = "0.0.0.6";
-       sha256 = "05hr2185q4rcn1hvrrkqy2sbl8xzk7ij00x61vhvmyk29dbbk2cf";
+       version = "0.1";
+       sha256 = "0jzqq709r4jpbvgkix9ybi6asvhshl0ayz5a4gddrccli5k430n6";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers ];
-       executableHaskellDepends = [ base optparse-applicative parsec ];
+       libraryHaskellDepends = [ base containers text ];
+       executableHaskellDepends = [
+         base optparse-applicative parsec text
+       ];
        testHaskellDepends = [ base hedgehog neat-interpolation text ];
        description = "Simple text replacements from a list of search/replace pairs";
        license = lib.licenses.asl20;
@@ -259865,8 +260536,8 @@ self: {
        pname = "through-text";
        version = "0.1.0.0";
        sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk";
-       revision = "5";
-       editedCabalFile = "1fdy2wyczl2jncy9gg0asasb8bybcnif8aqnw9fq73sr1778kjpf";
+       revision = "6";
+       editedCabalFile = "12mqlm77g0fymx3xwlkf6s9nqivcf78szhrzkvssi7lq1lqq9lbc";
        libraryHaskellDepends = [ base bytestring case-insensitive text ];
        description = "Convert textual types through Text without needing O(n^2) instances";
        license = lib.licenses.bsd3;
@@ -260379,6 +261050,27 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "time-compat_1_9_6" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, deepseq, hashable
+     , HUnit, QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck
+     , time
+     }:
+     mkDerivation {
+       pname = "time-compat";
+       version = "1.9.6";
+       sha256 = "0k466nyn7v8g3lx0gjfq6hzs4gmm4ws2wcm7xqyw48fmn55pb5rx";
+       libraryHaskellDepends = [
+         base base-orphans deepseq hashable time
+       ];
+       testHaskellDepends = [
+         base base-compat deepseq hashable HUnit QuickCheck tagged tasty
+         tasty-hunit tasty-quickcheck time
+       ];
+       description = "Compatibility package for time";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "time-extras" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -262654,6 +263346,21 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "tophat" = callPackage
+    ({ mkDerivation, base, filepath, hspec, profunctors, text }:
+     mkDerivation {
+       pname = "tophat";
+       version = "1.0.0.0";
+       sha256 = "0zwhik8x2z1kbyv873kvdbnzyyg4f6qky1gw03icarxan9553s7m";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base profunctors text ];
+       executableHaskellDepends = [ base filepath text ];
+       testHaskellDepends = [ base hspec profunctors text ];
+       description = "Template-to-Haskell preprocessor, and templating language";
+       license = lib.licenses.gpl3Only;
+     }) {};
+
   "topkata" = callPackage
     ({ mkDerivation, ALUT, array, base, filepath, GLFW-b, OpenAL
      , OpenGL, parseargs, random
@@ -267281,6 +267988,20 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "typed-time" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, time }:
+     mkDerivation {
+       pname = "typed-time";
+       version = "0.1.0.0";
+       sha256 = "0fk8zb198i5xfwrc820br8hh1nfcqcrzyzkyf0srijjf88m92y27";
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base hspec hspec-core time ];
+       description = "A strongly typed way to handle time and date formats";
+       license = lib.licenses.isc;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "typed-uuid" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, deepseq, hashable
      , http-api-data, random, text, uuid, validity, validity-uuid
@@ -268999,17 +269720,17 @@ self: {
      }) {};
 
   "unicode-tricks" = callPackage
-    ({ mkDerivation, base, containers, data-default, hspec
+    ({ mkDerivation, base, containers, data-default, hashable, hspec
      , hspec-discover, QuickCheck, text
      }:
      mkDerivation {
        pname = "unicode-tricks";
-       version = "0.9.1.0";
-       sha256 = "1jqljawh6xvavp9g8mjlw4pkiagd59yybbizr9vcg70dd8pnanv2";
+       version = "0.10.1.0";
+       sha256 = "0f9giqhd4jjqdd0wcbrrd8f01bhqv25m13ss3f1jfaaacaiylpam";
        libraryHaskellDepends = [
-         base containers data-default QuickCheck text
+         base containers data-default hashable QuickCheck text
        ];
-       testHaskellDepends = [ base hspec QuickCheck ];
+       testHaskellDepends = [ base hashable hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
        description = "Functions to work with unicode blocks more convenient";
        license = lib.licenses.bsd3;
@@ -270144,8 +270865,33 @@ self: {
      }:
      mkDerivation {
        pname = "unliftio";
-       version = "0.2.16";
-       sha256 = "1zawfyjr8immg5sqvwknwqp3xym0acjhlqm0y6xs63wjvp72wb3r";
+       version = "0.2.17";
+       sha256 = "1z37bqnrzhqhg7dfmsqz31lq8ng3qnkknc9d4pxbjbbmf1g21hfv";
+       libraryHaskellDepends = [
+         async base bytestring deepseq directory filepath process stm time
+         transformers unix unliftio-core
+       ];
+       testHaskellDepends = [
+         async base bytestring containers deepseq directory filepath hspec
+         process QuickCheck stm time transformers unix unliftio-core
+       ];
+       benchmarkHaskellDepends = [
+         async base bytestring deepseq directory filepath gauge process stm
+         time transformers unix unliftio-core
+       ];
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+       license = lib.licenses.mit;
+     }) {};
+
+  "unliftio_0_2_18" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, deepseq
+     , directory, filepath, gauge, hspec, process, QuickCheck, stm, time
+     , transformers, unix, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.2.18";
+       sha256 = "0yg5x2v3p4pdw7892l1mkihmdbak14qvmni1vk2a0y2gdmxfvx1y";
        libraryHaskellDepends = [
          async base bytestring deepseq directory filepath process stm time
          transformers unix unliftio-core
@@ -270160,6 +270906,7 @@ self: {
        ];
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unliftio-core" = callPackage
@@ -270300,8 +271047,8 @@ self: {
      }:
      mkDerivation {
        pname = "unordered-containers";
-       version = "0.2.13.0";
-       sha256 = "0mbvld5dym17jc13ycl862k73kg26y9khb8578w13cwfmdli7c46";
+       version = "0.2.14.0";
+       sha256 = "0rw8kmg7xjlacmr1hcpin95abkd387awf154s9ran7zg9jllh3x1";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [
          base ChasingBottoms containers hashable HUnit QuickCheck random
@@ -270576,6 +271323,19 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "unsatisfiable" = callPackage
+    ({ mkDerivation, base, ghc }:
+     mkDerivation {
+       pname = "unsatisfiable";
+       version = "0";
+       sha256 = "0cvlqrrr31dn2agd7cz2s5gnf2m1yy21kwmymcpdg5zk34dc19wh";
+       libraryHaskellDepends = [ base ghc ];
+       description = "Unsatisfiable type class";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "unscramble" = callPackage
     ({ mkDerivation, array, base, optparse-applicative, stream-fusion
      , unordered-containers
@@ -270740,8 +271500,8 @@ self: {
      }:
      mkDerivation {
        pname = "update-nix-fetchgit";
-       version = "0.2.5";
-       sha256 = "0lga69cnzysayvsflbcf43i7ncnib9mq62azi30kpm860s0h5lfb";
+       version = "0.2.7";
+       sha256 = "0knwn11c3kdh1xbpa8l6kgskis9fcsjr06hxay3rl4yiqprf80xn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -272172,6 +272932,7 @@ self: {
        ];
        description = "Tweak .cabal files";
        license = lib.licenses.mit;
+       maintainers = with lib.maintainers; [ berberman ];
      }) {};
 
   "uvector" = callPackage
@@ -274476,8 +275237,8 @@ self: {
      }:
      mkDerivation {
        pname = "vinyl";
-       version = "0.13.2";
-       sha256 = "1ymrh8ra54a2x3kmw87gfcrv413rbr4msy0ppppi6lh2lvq5zk09";
+       version = "0.13.3";
+       sha256 = "0mlk94n3s4ah8y9w9vcrk1n7gnsm19d1iijk9da4219dwrkaax2l";
        libraryHaskellDepends = [ array base deepseq ghc-prim ];
        testHaskellDepends = [
          aeson base hspec lens lens-aeson microlens mtl should-not-typecheck
@@ -277471,30 +278232,30 @@ self: {
     ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, directory, gauge
      , ghc-prim, hashable, hspec, http-client, http-date, http-types
-     , http2, HUnit, iproute, lifted-base, network, process, QuickCheck
+     , http2, HUnit, iproute, network, process, QuickCheck
      , simple-sendfile, stm, streaming-commons, text, time, time-manager
-     , unix, unix-compat, vault, wai, word8, x509
+     , unix, unix-compat, unliftio, vault, wai, word8, x509
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.3.15";
-       sha256 = "0nj4xxzjcy33hyfdagpc2ij6ga71r1fmc248rjgwsyfflial63bz";
+       version = "3.3.16";
+       sha256 = "1qnngw7afh448hv7fzp4l36j7hz6f8a8f1qga976j8l53qhmgcf1";
        libraryHaskellDepends = [
-         array async auto-update base bsb-http-chunked bytestring
-         case-insensitive containers ghc-prim hashable http-date http-types
-         http2 iproute network simple-sendfile stm streaming-commons text
-         time-manager unix unix-compat vault wai word8 x509
+         array auto-update base bsb-http-chunked bytestring case-insensitive
+         containers ghc-prim hashable http-date http-types http2 iproute
+         network simple-sendfile stm streaming-commons text time-manager
+         unix unix-compat unliftio vault wai word8 x509
        ];
        testHaskellDepends = [
          array async auto-update base bsb-http-chunked bytestring
          case-insensitive containers directory ghc-prim hashable hspec
-         http-client http-date http-types http2 HUnit iproute lifted-base
-         network process QuickCheck simple-sendfile stm streaming-commons
-         text time time-manager unix unix-compat vault wai word8 x509
+         http-client http-date http-types http2 HUnit iproute network
+         process QuickCheck simple-sendfile stm streaming-commons text time
+         time-manager unix unix-compat unliftio vault wai word8 x509
        ];
        benchmarkHaskellDepends = [
          auto-update base bytestring containers gauge hashable http-date
-         http-types network time-manager unix unix-compat x509
+         http-types network time-manager unix unix-compat unliftio x509
        ];
        description = "A fast, light-weight web server for WAI applications";
        license = lib.licenses.mit;
@@ -277574,15 +278335,16 @@ self: {
 
   "warp-tls" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
-     , network, streaming-commons, tls, tls-session-manager, wai, warp
+     , network, streaming-commons, tls, tls-session-manager, unliftio
+     , wai, warp
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.3.0";
-       sha256 = "03fwwggl6lhxs7swwylgpk9j8g5szq2h871nfbgs6xzr1b5hpas1";
+       version = "3.3.1";
+       sha256 = "1k8f3r0l36mgwm69fikprv6pyjzj15702kq25dr9nc3sv5lcs162";
        libraryHaskellDepends = [
          base bytestring cryptonite data-default-class network
-         streaming-commons tls tls-session-manager wai warp
+         streaming-commons tls tls-session-manager unliftio wai warp
        ];
        description = "HTTP over TLS support for Warp via the TLS package";
        license = lib.licenses.mit;
@@ -279920,18 +280682,18 @@ self: {
      }) {};
 
   "witch" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hspec
+    ({ mkDerivation, base, bytestring, containers, HUnit
      , template-haskell, text, time
      }:
      mkDerivation {
        pname = "witch";
-       version = "0.3.1.0";
-       sha256 = "1jk0p1w5a3nr12nn6afwagpgkv1i6pyn83idkbps6kq3kb3l15w4";
+       version = "0.3.3.0";
+       sha256 = "0wckjjy7yxq899f515xhwl2izqmrr9zck0kjlgz6qfa1fsl6lbvx";
        libraryHaskellDepends = [
          base bytestring containers template-haskell text time
        ];
        testHaskellDepends = [
-         base bytestring containers hspec text time
+         base bytestring containers HUnit text time
        ];
        description = "Convert values from one type into another";
        license = lib.licenses.isc;
@@ -280665,8 +281427,8 @@ self: {
      }:
      mkDerivation {
        pname = "wordpress-auth";
-       version = "1.0.0.0";
-       sha256 = "150rri8lrl6j3f9q7wc34ajg06rakgk8a5npzz7vdap64994wy5c";
+       version = "1.0.0.1";
+       sha256 = "10drplm0bg72ph87apbdmm4ar7gh09x6w6sgwgvdkz4zpkc48s0j";
        libraryHaskellDepends = [
          base base16-bytestring bytestring cookie cryptohash-md5
          cryptohash-sha256 hs-php-session http-types mtl text time
@@ -283499,6 +284261,8 @@ self: {
        pname = "xmonad";
        version = "0.15";
        sha256 = "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa";
+       revision = "1";
+       editedCabalFile = "0yqh96qqphllr0zyz5j93cij5w2qvf39xxnrb52pz0qz3pywz9wd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -283549,6 +284313,8 @@ self: {
        pname = "xmonad-contrib";
        version = "0.16";
        sha256 = "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd";
+       revision = "1";
+       editedCabalFile = "0vimkby2gq6sgzxzbvz67caba609xqlv2ii2gi8a1cjrnn6ib011";
        libraryHaskellDepends = [
          base bytestring containers directory extensible-exceptions filepath
          mtl old-locale old-time process random semigroups unix utf8-string
@@ -284443,6 +285209,8 @@ self: {
        ];
        description = "Yam App";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-config" = callPackage
@@ -284489,6 +285257,7 @@ self: {
        sha256 = "0c6frqjf3xhd5bksaz6rvd6qbqbj15y441476dgj2asm2yd64895";
        libraryHaskellDepends = [ base cron yam-app ];
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "yam-logger" = callPackage
@@ -284588,6 +285357,7 @@ self: {
          base containers persistent-postgresql unliftio-core yam-app
        ];
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "yam-web" = callPackage
@@ -284832,8 +285602,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml-unscrambler";
-       version = "0.1.0.1";
-       sha256 = "05z892g8c9alwmjwjm1405s43s8cdbj42ymqc9jlb27qc8ikc4n7";
+       version = "0.1.0.2";
+       sha256 = "03wvb5skx41kdmdc6zhydr7zddzyshy2cgk8zmwy26q70z3g01zf";
        libraryHaskellDepends = [
          acc attoparsec attoparsec-data attoparsec-time base base64
          bytestring conduit containers foldl hashable libyaml mtl scientific
@@ -284893,8 +285663,8 @@ self: {
      }:
      mkDerivation {
        pname = "yamlparse-applicative";
-       version = "0.1.0.3";
-       sha256 = "14fp7qyfh9ax2cqp5amvj2hi8fl9imdq25j8bx5mil8f2jxqr6bi";
+       version = "0.1.0.4";
+       sha256 = "19z6bg8pvhaccc4pc89a2hc1f1g9x66ma179gfx36pjgqdkp0fg1";
        libraryHaskellDepends = [
          aeson base bytestring containers optparse-applicative path path-io
          prettyprinter safe-coloured-text scientific text
@@ -285794,8 +286564,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-hashdb";
-       version = "1.7.1.6";
-       sha256 = "062f2fv4ixr5bd5xcs208xfg2i18z25g3imf86qrziv0yxxg5qpc";
+       version = "1.7.1.7";
+       sha256 = "1daibkn5qhw131pp0sfyahyicwlgpin90zkcrwr2qk05ms5j3hj5";
        libraryHaskellDepends = [
          aeson base bytestring persistent text yesod-auth yesod-core
          yesod-form yesod-persistent
@@ -286036,6 +286806,25 @@ self: {
        broken = true;
      }) {};
 
+  "yesod-autoreload" = callPackage
+    ({ mkDerivation, base, shakespeare, text, yesod-core
+     , yesod-websockets
+     }:
+     mkDerivation {
+       pname = "yesod-autoreload";
+       version = "0.0.0.0";
+       sha256 = "1dzig02l00hw9xz974pf923yr6045x45sw8nnhnqw8rd67r2l7d3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base shakespeare text yesod-core yesod-websockets
+       ];
+       executableHaskellDepends = [ base yesod-core ];
+       testHaskellDepends = [ base ];
+       description = "Auto-reload a yesod app during development";
+       license = lib.licenses.mit;
+     }) {};
+
   "yesod-bin" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra
      , containers, data-default-class, directory, file-embed, filepath
@@ -286175,8 +286964,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.6.20";
-       sha256 = "1f3imbd22i9vl30760063p308byddwxafpl5hdric2z7vmnxayqy";
+       version = "1.6.20.1";
+       sha256 = "1y24sn30fm7bjq9rfv4lclz3vraaac9qbd2xgz949agm2irjwg4p";
        libraryHaskellDepends = [
          aeson auto-update base blaze-html blaze-markup bytestring
          case-insensitive cereal clientsession conduit conduit-extra
@@ -286818,8 +287607,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-page-cursor";
-       version = "2.0.0.7";
-       sha256 = "1jkisnlbg5p5fd28r37xp844mjdpdz13s9dfpzbr30pxbyy57kf8";
+       version = "2.0.0.8";
+       sha256 = "1azd2kv5b36kryz3l587mn329a46m8mp4z8knzx5va24bmhca9jy";
        libraryHaskellDepends = [
          aeson base bytestring containers http-link-header network-uri text
          unliftio yesod-core
diff --git a/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch b/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch
deleted file mode 100644
index 33c276926f4bd..0000000000000
--- a/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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
diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix
index 3959c13e57bc0..7706bd69fbf5f 100644
--- a/pkgs/development/interpreters/erlang/R21.nix
+++ b/pkgs/development/interpreters/erlang/R21.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "21.3.8.23";
-  sha256 = "sha256-zIEXn2HuXeRKHfXmm0AAv9rEqqc4gIgaYek0hSUK5YU=";
+  version = "21.3.8.24";
+  sha256 = "sha256-FNs+M4KFFKzfb4EG513HtyQ9eRRtxSPMpYq0bmRgY3g=";
 }
diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix
index 14e2c8878fd91..de7bf560d3eae 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cpp-utilities";
-  version = "5.10.3";
+  version = "5.10.4";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-bEdDRvm5W12wJnW4xC+AcRLevZ0H7C625eknKzNrLLU=";
+    sha256 = "sha256-pZh/NbTzQR2kjMeauv1HcRn0hDBaCNRbaZ3+1qs5rxU=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 3597dd70f2c90..888548d79f032 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -226,6 +226,28 @@ stdenv.mkDerivation ({
     libc_cv_c_cleanup=yes
     libc_cv_gnu89_inline=yes
     EOF
+
+    # ./configure has logic like
+    #
+    #     AR=`$CC -print-prog-name=ar`
+    #
+    # This searches various directories in the gcc and its wrapper. In nixpkgs,
+    # this returns the bare string "ar", which is build ar. This can result as
+    # a build failure with the following message:
+    #
+    #     libc_pic.a: error adding symbols: archive has no index; run ranlib to add one
+    #
+    # (Observed cross compiling from aarch64-linux -> armv7l-linux).
+    #
+    # Nixpkgs passes a correct value for AR and friends, so to use the correct
+    # set of tools, we only need to delete this special handling.
+    sed -i \
+      -e '/^AR=/d' \
+      -e '/^AS=/d' \
+      -e '/^LD=/d' \
+      -e '/^OBJCOPY=/d' \
+      -e '/^OBJDUMP=/d' \
+      $configureScript
   '';
 
   preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH";
diff --git a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
index a82a06d427bbd..9111217ea08ed 100644
--- a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
+++ b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
@@ -23,7 +23,7 @@ index b9a2fb5..4b8629f 100644
 +       value: '',
 +       description: 'Installation directory for binary files in tests')
 diff --git a/tests/meson.build b/tests/meson.build
-index 77281f5..c4c7fac 100644
+index 77281f5..7522456 100644
 --- a/tests/meson.build
 +++ b/tests/meson.build
 @@ -21,8 +21,17 @@ unit_tests = [
@@ -71,7 +71,12 @@ index 77281f5..c4c7fac 100644
        ),
        env: ['MUTEST_OUTPUT=tap'],
        protocol: 'tap',
-@@ -70,13 +79,13 @@ if build_gir and host_system == 'linux' and not meson.is_cross_build()
+@@ -66,17 +75,18 @@ endif
+ if build_gir and host_system == 'linux' and not meson.is_cross_build()
+   foreach unit: ['introspection.py']
+     wrapper = '@0@.test'.format(unit)
++    install_data(unit, install_dir: test_bindir)
+     custom_target(wrapper,
        output: wrapper,
        command: [
          gen_installed_test,
diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix
index a9c647268ac56..a8e0d11798268 100644
--- a/pkgs/development/libraries/graphene/default.nix
+++ b/pkgs/development/libraries/graphene/default.nix
@@ -12,6 +12,7 @@
 , docbook_xsl
 , docbook_xml_dtd_43
 , gobject-introspection
+, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
     pkg-config
     gobject-introspection
     python3
+    makeWrapper
   ];
 
   buildInputs = [
@@ -62,6 +64,12 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs tests/gen-installed-test.py
+    PATH=${python3.withPackages (pp: [ pp.pygobject3 pp.tappy ])}/bin:$PATH patchShebangs tests/introspection.py
+  '';
+
+  postFixup = ''
+    wrapProgram "${placeholder "installedTests"}/libexec/installed-tests/graphene-1.0/introspection.py" \
+      --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0"
   '';
 
   passthru = {
diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
index eba0108199496..ddeda86e9bf73 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix
+++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
@@ -1,27 +1,28 @@
-{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ocaml-migrate-parsetree, ppx_tools_versioned }:
+{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ppxlib }:
 
 buildDunePackage rec {
   pname = "bisect_ppx";
-  version = "2.5.0";
-
-  useDune2 = true;
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "aantron";
     repo = "bisect_ppx";
     rev = version;
-    sha256 = "0w2qd1myvh333jvkf8hgrqzl8ns4xgfggk4frf1ij3jyc7qc0868";
+    sha256 = "sha256-YeLDlH3mUbVEY4OmzlrvSwVUav3uMtSsTFlOsQKnz84=";
   };
 
+  minimumOCamlVersion = "4.08";
+  useDune2 = true;
+
   buildInputs = [
     cmdliner
-    ocaml-migrate-parsetree
-    ppx_tools_versioned
+    ppxlib
   ];
 
-  meta = {
-    description = "Code coverage for OCaml";
-    license = lib.licenses.mit;
+  meta = with lib; {
+    description = "Bisect_ppx is a code coverage tool for OCaml and Reason. It helps you test thoroughly by showing what's not tested.";
+    license = licenses.mit;
     homepage = "https://github.com/aantron/bisect_ppx";
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix
index d4ce484653b93..ffd0b5003ce40 100644
--- a/pkgs/development/ocaml-modules/fix/default.nix
+++ b/pkgs/development/ocaml-modules/fix/default.nix
@@ -1,25 +1,24 @@
-{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
+{ lib, fetchFromGitLab, buildDunePackage }:
 
-assert lib.versionAtLeast (lib.getVersion ocaml) "3.12";
+buildDunePackage rec {
+  pname = "fix";
+  version = "20201120";
 
-stdenv.mkDerivation {
-
-  name = "ocaml-fix-20130611";
-
-  src = fetchurl {
-    url = "http://gallium.inria.fr/~fpottier/fix/fix-20130611.tar.gz";
-    sha256 = "1phlqcs1nb93x9cf0w0hnq2ck4dmn71zm4mxf60w96vb9yb9qzp0";
+  src = fetchFromGitLab {
+    domain = "gitlab.inria.fr";
+    owner = "fpottier";
+    repo = "fix";
+    rev = "${version}";
+    sha256 = "sha256-RO+JCG6R2i5uZfwTYEnQBCVq963fjv5lA2wA/8KrgMg=";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ];
-
-  createFindlibDestdir = true;
+  minimumOCamlVersion = "4.03";
+  useDune2 = true;
 
   meta = with lib; {
-    homepage = "http://gallium.inria.fr/~fpottier/fix/";
+    homepage = "https://gitlab.inria.fr/fpottier/fix/";
     description = "A simple OCaml module for computing the least solution of a system of monotone equations";
     license = licenses.cecill-c;
-    maintainers = [ maintainers.vbgl ];
-    platforms = ocaml.meta.platforms or [];
+    maintainers = with maintainers; [ vbgl ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix
index 4fde475cf936a..a8912c0f5d581 100644
--- a/pkgs/development/ocaml-modules/ocaml-version/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix
@@ -1,24 +1,21 @@
 { lib, fetchurl, buildDunePackage }:
 
 buildDunePackage rec {
-
   pname = "ocaml-version";
-  version = "3.0.0";
-
-  minimumOCamlVersion = "4.07";
-
-  useDune2 = true;
+  version = "3.1.0";
 
   src = fetchurl {
     url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-v${version}.tbz";
-    sha256 = "15vk8sh50p3f2mbv8z7mqnx76cffri36f2krp25zkkwix8jg7ci4";
+    sha256 = "sha256-rHuhagnY9yISdC85NpgPv667aYx7v2JRgq99ayw83l8=";
   };
 
-  meta = {
+  minimumOCamlVersion = "4.07";
+  useDune2 = true;
+
+  meta = with lib; {
     description = "Manipulate, parse and generate OCaml compiler version strings";
     homepage = "https://github.com/ocurrent/ocaml-version";
-    license = lib.licenses.isc;
-    maintainers = [ lib.maintainers.vbgl ];
+    license = licenses.isc;
+    maintainers = with maintainers; [ vbgl ];
   };
-
 }
diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
index 87ccd85a07df1..ee801f6adfd84 100644
--- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
@@ -1,22 +1,23 @@
-{ lib, fetchurl, buildDunePackage, ocaml-migrate-parsetree }:
+{ lib, fetchurl, buildDunePackage, ppxlib }:
 
 buildDunePackage rec {
   pname = "ppx_gen_rec";
-  version = "1.1.0";
-
-  useDune2 = true;
+  version = "2.0.0";
 
   src = fetchurl {
     url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
-    sha256 = "0fwi4bknq8h9zgpsarjvnzdm9bm8qlyyw0lz30pihg02aiiljqbh";
+    sha256 = "sha256-/mMj5UT22KQGVy1sjgEoOgPzyCYyeDPtWJYNDvQ9nlk=";
   };
 
-  buildInputs = [ ocaml-migrate-parsetree ];
+  minimumOCamlVersion = "4.07";
+  useDune2 = true;
+
+  buildInputs = [ ppxlib ];
 
   meta = with lib; {
     homepage = "https://github.com/flowtype/ocaml-ppx_gen_rec";
-    description = "ocaml preprocessor that generates a recursive module";
+    description = "A ppx rewriter that transforms a recursive module expression into a struct.";
     license = licenses.mit;
-    maintainers = [ maintainers.frontsideair ];
+    maintainers = with maintainers; [ frontsideair ];
   };
 }
diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix
index 59d1f2e4e7a80..186e2e9e44378 100644
--- a/pkgs/development/python-modules/adblock/default.nix
+++ b/pkgs/development/python-modules/adblock/default.nix
@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , buildPythonPackage
 , rustPlatform
-, pythonImportsCheckHook
 , pkg-config
 , openssl
 , publicsuffix-list
@@ -11,11 +10,14 @@
 , libiconv
 , CoreFoundation
 , Security
+, pytestCheckHook
+, toml
+, python
 }:
 
 buildPythonPackage rec {
   pname = "adblock";
-  version = "0.4.0";
+  version = "0.4.4";
   disabled = isPy27;
 
   # Pypi only has binary releases
@@ -23,18 +25,18 @@ buildPythonPackage rec {
     owner = "ArniDagur";
     repo = "python-adblock";
     rev = version;
-    sha256 = "10d6ks2fyzbizq3kb69q478idj0h86k6ygjb6wl3zq3mf65ma4zg";
+    sha256 = "sha256-zNQ8zEpTLzyU5AnFBNpOGDJ02Ogu2+xl85LA+ia7Si4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-gEFmj3/KvhvvsOK2nX2L1RUD4Wfp3nYzEzVnQZIsIDY=";
+    hash = "sha256-ajVZ0xPxC31hM1gQr3DC1HWdpIYBCSmqm0z2cflcClg=";
   };
 
   format = "pyproject";
 
-  nativeBuildInputs = [ pkg-config pythonImportsCheckHook ]
+  nativeBuildInputs = [ pkg-config ]
     ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook ]);
 
   buildInputs = [ openssl ]
@@ -42,10 +44,19 @@ buildPythonPackage rec {
 
   PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat";
 
-  # There are no rust tests
-  doCheck = false;
+  checkInputs = [ pytestCheckHook toml ];
 
-  pythonImportsCheck = [ "adblock" ];
+  preCheck = ''
+    # import from $out instead
+    rm -r adblock
+  '';
+
+  disabledTestPaths = [
+    # relies on directory removed above
+    "tests/test_typestubs.py"
+  ];
+
+  pythonImportsCheck = [ "adblock" "adblock.adblock" ];
 
   meta = with lib; {
     description = "Python wrapper for Brave's adblocking library, which is written in Rust";
diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index ad3f66b5d6585..fbe3316e01001 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -17,11 +17,11 @@
 
 buildPythonPackage rec {
   pname = "datadog";
-  version = "0.40.1";
+  version = "0.41.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "438c1dde5462e68c5c792b7b4a1d87a0ddd970af3db31b3cf15980eed0c44311";
+    sha256 = "sha256-PeGkO4qNX2sZ0WLsG0gtxasmNsWc9l5gWJcCMEUQpok=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index f5c8bcc6c31cb..e2b15ccca6560 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1s1q1nw05925ryvnycq4bmqrxc14cicdl1j4l9xvyis26cjg71va";
+    sha256 = "sha256-mHm40dGCEq6Ss1urYejqntXqY++cjKhHk4U42hDdGTs=";
   };
 
   # No tests included in archive
diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix
index 74723b665bef9..412b032db7f65 100644
--- a/pkgs/development/python-modules/pyupgrade/default.nix
+++ b/pkgs/development/python-modules/pyupgrade/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyupgrade";
-  version = "2.18.0";
+  version = "2.19.1";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-nkMKy1NAFBG/PuPdj3LAqr0c4UqEM2R2kHKuORql2dw=";
+    sha256 = "sha256-zDT8VskHEX4uldMvxnb9A+FKMuvZbtEcmdVl5mghTs4=";
   };
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index 9f9fe685c9522..5c8928a385d46 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -1,34 +1,39 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib
+, buildPythonPackage
 , cachetools
 , cytoolz
+, fetchPypi
 , jellyfish
+, joblib
 , matplotlib
 , networkx
 , numpy
 , pyemd
 , pyphen
-, pytest
+, pytestCheckHook
+, pythonOlder
 , requests
 , scikit-learn
 , scipy
 , spacy
-, srsly
+, tqdm
 }:
 
 buildPythonPackage rec {
   pname = "textacy";
-  version = "0.10.1";
-  disabled = isPy27;
+  version = "0.11.0";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ff72adc6dbb85db6981324e226fff77830da57d7fe7e4adb2cafd9dc2a8bfa7d";
+    sha256 = "sha256-d/tyTCewoERA15iBv4H2LORFzgco15fnnN1sneeGuF4=";
   };
 
   propagatedBuildInputs = [
     cachetools
     cytoolz
     jellyfish
+    joblib
     matplotlib
     networkx
     numpy
@@ -38,22 +43,25 @@ buildPythonPackage rec {
     scikit-learn
     scipy
     spacy
-    srsly
+    tqdm
   ];
 
-  checkInputs = [ pytest ];
-  # almost all tests have to deal with downloading a dataset, only test pure tests
-  checkPhase = ''
-    pytest tests/test_text_utils.py \
-      tests/test_utils.py \
-      tests/preprocessing \
-      tests/datasets/test_base_dataset.py
-  '';
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    # Almost all tests have to deal with downloading a dataset, only test pure tests
+    "tests/test_constants.py"
+    "tests/preprocessing/test_normalize.py"
+    "tests/similarity/test_edits.py"
+    "tests/preprocessing/test_resources.py"
+    "tests/preprocessing/test_replace.py"
+  ];
+
+  pythonImportsCheck = [ "textacy" ];
 
   meta = with lib; {
-    # scikit-learn in pythonPackages is too new for textacy
-    # remove as soon as textacy support scikit-learn >= 0.24
-    broken = true;
     description = "Higher-level text processing, built on spaCy";
     homepage = "https://textacy.readthedocs.io/";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index e3cd9d2cf905f..0b2cdbe9c045e 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -105,23 +105,23 @@ rec {
     headers = "1dqkx861vfq6xbzdlbgza6h4j7bib8p3xahllrnfc0s65y8gf0ry";
   };
 
-  electron_12 = mkElectron "12.0.9" {
-    x86_64-linux = "3ab0a873f720d3bf56cce6ca1bf9d8b956843920798f659ca0829e4cc3126f6d";
-    x86_64-darwin = "b3f1e378f58e7c36b54451c5a3485adc370277827974e1eb0790b6965737c872";
-    i686-linux = "37405b3b27779ad417c3ae432d7f0d969c126c958a0ad8f2585c34fc8ee6c6e6";
-    armv7l-linux = "2d41ef3ed6a215efe2c7d03d8055fcfda0079f09e9580e5bf70e8ac4a22b0898";
-    aarch64-linux = "22a85817ea2edbba2e17b35f6e3a8104b2165e070ea21a1f2fa3b40e8d7aecc9";
-    aarch64-darwin = "cb8aa8153005ea0d801182eb714d56af0217345b1152d867317291670731daeb";
-    headers = "1vwcjzkjag2wxrwnsbi8bgbv8bi6vn5iq9b04krwlk7mlhm4ax66";
+  electron_12 = mkElectron "12.0.10" {
+    x86_64-linux = "b5383b5818062de42536a7966df875ae781433a7ee991da34643bc6fda4ad038";
+    x86_64-darwin = "3d4111280bf50dbfb141b46551974b0e4e39eb0d1f8ef789d71f7d3295a8e24f";
+    i686-linux = "6fd10db8d896ef82ac8f2a1d796942dc56f5b41e504c86121d83eababa0cccb8";
+    armv7l-linux = "5820ac7e70488507417122aaa0381439f929da1819c2c710ba74569a609cc972";
+    aarch64-linux = "022ff009969d9f270704e918fe2dda6cd395c3e9d9e9515e99eca628d996a503";
+    aarch64-darwin = "d2af4870a79866621469043e44a2a0e995abc5530d4aaf1add567b00eb286b01";
+    headers = "1vl3cnhf2j5g4xhk17rag0vzbxwba5fq54mhvv0hp3hqbiqhdds6";
   };
 
-  electron_13 = mkElectron "13.0.1" {
-    x86_64-linux = "05c6cfc2804d426d6c2af15cc16e0265782917e76fb2c4e87b7469d0f3ab0f81";
-    x86_64-darwin = "a65a44bfafcdfcdee0bb2b3515dab57e884e0700830ccd142e15f01e6c3a4976";
-    i686-linux = "3f3b358879523b10e6341a5c74842f8c09a1073f6064410f3495143733663f8d";
-    armv7l-linux = "b6657862bf4b1f61f5c1e0c836401f82822fc5ebd69ecb2efd0777255fefc813";
-    aarch64-linux = "ccc581dc5ddf9d2adefb60d8bc495b5a04363a80614d617094c142b8c5aa95de";
-    aarch64-darwin = "e58e3ea3fffc8c3b280b0b6c22c685f9ecd82ef0340a5207d8b9c6f20e7c0197";
-    headers = "0idlap698vqz7i2by3g9k4yqhm87fqc34pgzxcidzan9qvyd0njx";
+  electron_13 = mkElectron "13.1.0" {
+    x86_64-linux = "6681078971d2e99e9f8b3c598de65869d3596356af901bbbabcc4860c0496bb4";
+    x86_64-darwin = "d62a561e80fcbcb0f249e74c487313192451046f288478add65be997793831de";
+    i686-linux = "e4d8cc19689b1f9c00894bb776083f8543abeba9203d3297268c1644f1300355";
+    armv7l-linux = "ac5a19e31fd83db5775a2af57f742c7b3e5fc4528958329ec3c81f82e7bd611a";
+    aarch64-linux = "0ed0cc3afae5cc7e1e6c6204866a1cecdf97e0ab658789e8951842bd0d28e1bb";
+    aarch64-darwin = "6da46d2861011263af2953a3e0186735e54708c01c50967ff5f8ed71b73f7fea";
+    headers = "1h4saavsy97kmbfaw6xcya5l0iybr37vyw7bv539c7a064kam07b";
   };
 }
diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix
index 355f468237c46..fee8d94f754b3 100644
--- a/pkgs/development/tools/go-toml/default.nix
+++ b/pkgs/development/tools/go-toml/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "go-toml";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "pelletier";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-O3gfQon8ktObLVED4A5sCSOw8K1NIXP3a5AsLq3Svb4=";
+    sha256 = "sha256-x740f6I+szhq4mEsed4bsXcC8PvzF6PKFJNJ9SKMGIE=";
   };
 
   goPackagePath = "github.com/pelletier/go-toml";
diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix
index 7038b7c1eb036..af33938c1a6f4 100644
--- a/pkgs/development/tools/lazygit/default.nix
+++ b/pkgs/development/tools/lazygit/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "lazygit";
-  version = "0.28.1";
+  version = "0.28.2";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-tan8ksSyMIeDL7oRAWd3Qtz/sKbhAAfY7IknfwjyvgQ=";
+    sha256 = "sha256-s5Ou0FhL9+2/xm7lKMG/3ya5P8idI0cgtJ28cV37pJQ=";
   };
 
   vendorSha256 = null;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix
index 5ca381e6d2ffc..93e1cb3804fbb 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix
@@ -1,5 +1,7 @@
 { stdenv
 , tree-sitter
+, libcxx
+, lib
 }:
 
 # Build a parser grammar and put the resulting shared object in `$out/parser`
@@ -27,6 +29,7 @@ stdenv.mkDerivation {
       "${source}/${location}"
   ;
 
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
   buildInputs = [ tree-sitter ];
 
   dontUnpack = true;
diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index f531c9a902d60..e0412b0dd3663 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.0.220";
+  version = "0.0.222";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    sha256 = "sha256-QuNe2Q7d0WSF3pkDNKxs6b6hO9Q99oJM+ZddHD/tOaI=";
+    sha256 = "sha256-yFcsbk5CAOqnT1ljOe+lGfEj1sCBsaFNZnfcQOfezs4=";
   };
 
   preBuild = ''
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  vendorSha256 = "sha256-zoheYyeofg8oVRicnZt+lFOixIH/Ssv7Kh7zC6yT/uY=";
+  vendorSha256 = "sha256-NnHnSfm3XYiwgGn56GsthFKiflJvhYhjoxmm8ogm+Uc=";
 
   doCheck = false;
 
diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index ef9c7fbe4d642..b09dc523d1ac6 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -12,13 +12,13 @@ let
            if stdenv.isi686 then "x86-32" else
            if stdenv.isAarch64 then "armv8" else
            "unknown";
-    version = "12";
+    version = "13";
 
-    nnueFile = "nn-82215d0fd0df.nnue";
+    nnueFile = "nn-62ef826d1a6d.nnue";
     nnue = fetchurl {
       name = nnueFile;
       url = "https://tests.stockfishchess.org/api/nn/${nnueFile}";
-      sha256 = "1r4yqrh4di05syyhl84hqcz84djpbd605b27zhbxwg6zs07ms8c2";
+      sha256 = "0qsy9rr4zgxrpgwhwbi96z01a2560am2b00q2klbj4bd39nq5vv2";
     };
 in
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz";
-    sha256 = "16980aicm5i6i9252239q4f9bcxg1gnqkv6nphrmpz4drg8i3v6i";
+    sha256 = "0qhxp2w543psanzhzn8jhfafx8aip57v9nsvafbwa5xynchlgl8m";
   };
 
   # This addresses a linker issue with Darwin
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 842b2600bd69c..12c6e885d7b33 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -185,12 +185,12 @@ final: prev:
 
   aurora = buildVimPluginFrom2Nix {
     pname = "aurora";
-    version = "2021-06-03";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "aurora";
-      rev = "8d5601629f123e9553688a6705a1490ee8be9a1c";
-      sha256 = "0i2nyk46yvr59hxwc99iaa0zdy0xcnaa1z1q93xf85i2pdyjg99b";
+      rev = "6a77e8ecf38b0e7a547df58f499cecc1c50cd444";
+      sha256 = "1yh88v6p1ingwydzr40jcva9gw58ihmgjndaf7h3sp0ldvl75ci2";
     };
     meta.homepage = "https://github.com/ray-x/aurora/";
   };
@@ -413,12 +413,12 @@ final: prev:
 
   chadtree = buildVimPluginFrom2Nix {
     pname = "chadtree";
-    version = "2021-06-05";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "a33387ffed163f922d93f142a908adfda521a224";
-      sha256 = "1gs06vs1bgjr76hg1pdkxsd81c12fnaqg8r1lfvwcvph1nzqj7d9";
+      rev = "00fe69a21e128d0378d1e00eb5334cde9cd7a227";
+      sha256 = "0nrcxsf00x2ygh16965d6fp5lhjq7hg9wzqgail2l0pwjdxnizm4";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -970,8 +970,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "defx.nvim";
-      rev = "27890150286f62d9c2fcb624f6f3bd1fd45c7f3c";
-      sha256 = "0fvwdjqiqwhaxwkrnzfai0ay4sksr4ma4akhzqnfqd0blbhc4x2i";
+      rev = "b42f1b974a50d4c0ebe563a210b5a3bf138c0166";
+      sha256 = "0z0xd5qnrm85ibwy826n7wbk0w8nzwmrs5xii9xkxgych4q9xanp";
     };
     meta.homepage = "https://github.com/Shougo/defx.nvim/";
   };
@@ -1014,12 +1014,12 @@ final: prev:
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2021-06-05";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "70ca378f399be626020e2994f9604eae35c232a6";
-      sha256 = "0njjwa2ixqm792chvkq91fb7dadaf05kws727w1q9r5sp8k000sr";
+      rev = "a20d2376b57ca500782719f1c4f83796d160c296";
+      sha256 = "15hrlr6f98y1cmdyrlady6h4b501b7mvyzfbvsqcxjj8vj18pxas";
     };
     meta.homepage = "https://github.com/Shougo/denite.nvim/";
   };
@@ -1030,8 +1030,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "5d4ca0cab361962a58db6f4a3ad06b00348b743d";
-      sha256 = "04ja8ps0vmvg5aggr6lr4qb4pv46hi86x8zw8mwrzav04z8fhxcw";
+      rev = "6f3574b091d48e37599dcb356349a31472556716";
+      sha256 = "0im9jnrbf1qbglh9wzqalfvp98wx9ccg5gk89k40nz3gggpwsbfh";
     };
     meta.homepage = "https://github.com/Shougo/deol.nvim/";
   };
@@ -1256,12 +1256,12 @@ final: prev:
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2021-06-05";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "e9bd32d18430ee2c95b154d90533affc3ca6f62b";
-      sha256 = "0g5ssg6363552fx7y74hl5wbmpmdz6z7y98jwa5y3dkq3xqh6ykn";
+      rev = "218229c593de9ca3b526605c50da7cb7e6ffb47c";
+      sha256 = "13xhzhpdwq680imvm7208wyhb2l5hppnflhbzyl1w3i7bzpczaxc";
     };
     meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
   };
@@ -1280,12 +1280,12 @@ final: prev:
 
   dhall-vim = buildVimPluginFrom2Nix {
     pname = "dhall-vim";
-    version = "2020-08-19";
+    version = "2021-06-05";
     src = fetchFromGitHub {
       owner = "vmchale";
       repo = "dhall-vim";
-      rev = "77d1c165bcbe6bb7f9eedbeafe390c2107d3c52e";
-      sha256 = "03x55x0gvf7n4i8hh6s5453mf5h43pf7kdy817q6w1149bd90vxy";
+      rev = "68500ef46ff3706f46c99db3be7a0c8abcf6a3ae";
+      sha256 = "0lwna4kcq7davfvh3535n8wl9jxkjm7cg6jgpisd17kvagihh8qw";
     };
     meta.homepage = "https://github.com/vmchale/dhall-vim/";
   };
@@ -1739,12 +1739,12 @@ final: prev:
 
   gina-vim = buildVimPluginFrom2Nix {
     pname = "gina-vim";
-    version = "2021-04-28";
+    version = "2021-06-05";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "gina.vim";
-      rev = "699d1e9d4104c994a37cb18b730f38ff7f32f2d1";
-      sha256 = "1akcpf5iyrbj4apjvp02613x328igp9gk4gaqgkx4qvwha4khbi5";
+      rev = "7069668147157d872821ebed1eee07742ece48fd";
+      sha256 = "0fbr154jgvr71liq0cwdl1qwg8j40yg9i2gb6ykz4p2y5cvs3wz6";
     };
     meta.homepage = "https://github.com/lambdalisue/gina.vim/";
   };
@@ -1763,12 +1763,12 @@ final: prev:
 
   git-messenger-vim = buildVimPluginFrom2Nix {
     pname = "git-messenger-vim";
-    version = "2021-05-14";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "git-messenger.vim";
-      rev = "2a26734c6322449a56d02c25a2947e9b7519ca49";
-      sha256 = "0ib0yl7zqklj9i1sgv854d3xl5sqbdf2khh9cpraik1rv23nlf2h";
+      rev = "f17e40e9995bbb21e0e9b7fd29278637a69fcc02";
+      sha256 = "09izgdlba3413llb698r8iagpfnhvp57yaz7qlcypbyvqr9l41mm";
     };
     meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
   };
@@ -1799,12 +1799,12 @@ final: prev:
 
   gitsigns-nvim = buildVimPluginFrom2Nix {
     pname = "gitsigns-nvim";
-    version = "2021-06-02";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "gitsigns.nvim";
-      rev = "4e3e2626af9573758a4e8c0d463ff3b733d40644";
-      sha256 = "01cr2a6xqzazyapkdlqjbxswsm9y7hnwl3bs7wcp23dwlpdvxc89";
+      rev = "0d8db4531a508f875d98b55f5e78bc1c560d6342";
+      sha256 = "1avp9df2lbiczycgfiigbyny8s6srjw6h88a88161m29g2mznr2s";
     };
     meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
   };
@@ -2506,6 +2506,18 @@ final: prev:
     meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
   };
 
+  lightline-gruvbox-vim = buildVimPluginFrom2Nix {
+    pname = "lightline-gruvbox-vim";
+    version = "2018-03-23";
+    src = fetchFromGitHub {
+      owner = "shinchu";
+      repo = "lightline-gruvbox.vim";
+      rev = "21659af1fc980ebe7de0f475e57c3fda9a82c2d3";
+      sha256 = "0h9br1r5vbrx5cplnk34xlg1kagasj3zn18f8d4ifi0pibyq6pm1";
+    };
+    meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/";
+  };
+
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
     version = "2021-05-30";
@@ -3100,8 +3112,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet.vim";
-      rev = "5d65a8fde5c3f4dfc0dc1a13639515948d8a28a5";
-      sha256 = "1iaapjpx91kcz9h2gp7vzgj7lnjs86g0iqkg3vgr04kj9lsvj3j7";
+      rev = "d2e1e6b4c4e17cab2debd0353fed77b417b53237";
+      sha256 = "0bwlcija1sbml5ni7mz4q97hhnl7hiqamzzvqw8qyp8aw2b0kj1q";
     };
     meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
   };
@@ -3324,12 +3336,12 @@ final: prev:
 
   nvim-autopairs = buildVimPluginFrom2Nix {
     pname = "nvim-autopairs";
-    version = "2021-06-05";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "windwp";
       repo = "nvim-autopairs";
-      rev = "b09ab7495e55f09293500aacf460d176f942504d";
-      sha256 = "05w7bjn1iy1qa3ni12vm9p28y4bsz4kkfgmcs44152qmcqj13wp1";
+      rev = "64c937940c2d890bd192a56e1a831e378fe0168b";
+      sha256 = "05pa2zz7dwzfjsgz8chv0wkx202f8x3plbxyczlkp390sfhqk0nn";
     };
     meta.homepage = "https://github.com/windwp/nvim-autopairs/";
   };
@@ -3348,12 +3360,12 @@ final: prev:
 
   nvim-bqf = buildVimPluginFrom2Nix {
     pname = "nvim-bqf";
-    version = "2021-06-02";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "kevinhwang91";
       repo = "nvim-bqf";
-      rev = "554ae68f404492c8d37381545b9a785fda30c26e";
-      sha256 = "0z6xb6wsq5kjcnyiqbp2ik97yl2kb9hxy0rfccfswh5pgmfv2z1i";
+      rev = "85b05cdc0ce371b055504be5d16cdfb1ea110f22";
+      sha256 = "0sr3rcy5mw0gx06x12dqc4bsb2ypc2xvcr6cqzw4w8w520ys7aid";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
   };
@@ -3432,12 +3444,12 @@ final: prev:
 
   nvim-dap-ui = buildVimPluginFrom2Nix {
     pname = "nvim-dap-ui";
-    version = "2021-05-31";
+    version = "2021-06-05";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "nvim-dap-ui";
-      rev = "055b143fdd23fee1d86247a8ec7c43c84a2a896b";
-      sha256 = "0v9mxpr5m01w948ddh598k1vzaiyq2zl6fkykbpzkijhk8qvjnv9";
+      rev = "3c221fe2cc2d675ebf8c83bb62e0b44516ae34ae";
+      sha256 = "0hcfs9c5m610sh5105kd4qbgj8ikfds7zfh2hcf1ly5ikkbz1ma4";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
   };
@@ -3480,12 +3492,12 @@ final: prev:
 
   nvim-hlslens = buildVimPluginFrom2Nix {
     pname = "nvim-hlslens";
-    version = "2021-06-04";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "kevinhwang91";
       repo = "nvim-hlslens";
-      rev = "d5ba4abab33808dbf653cc8270d82561f96b220b";
-      sha256 = "0qyb6fjjcgjifkgvcy475gxplbvdvzd51z7xv2m7gshy6m4vlzk6";
+      rev = "081fac590588ce0f6bcf54699658ba960a514172";
+      sha256 = "05sw210pfsb4nfcix978x1mrnmjz5yv1rmv1501mqla8xq18cskv";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
   };
@@ -3504,24 +3516,24 @@ final: prev:
 
   nvim-jdtls = buildVimPluginFrom2Nix {
     pname = "nvim-jdtls";
-    version = "2021-06-03";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-jdtls";
-      rev = "8bd4eac08c637961b10ac01c124fb5091484c265";
-      sha256 = "0jjsq718m0c1f45k9b68z0inlhy5nas48ff5yd0v29qlcv01w3wf";
+      rev = "89fdc14457f2b18eebebeb226df9f6d5e464e318";
+      sha256 = "09rd1hq8rzp84aiplvp0w4j1wykycrb55z1qwk83d9fv006sqvcl";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
   };
 
   nvim-lightbulb = buildVimPluginFrom2Nix {
     pname = "nvim-lightbulb";
-    version = "2021-03-13";
+    version = "2021-06-05";
     src = fetchFromGitHub {
       owner = "kosayoda";
       repo = "nvim-lightbulb";
-      rev = "9c3b264ae2da1d984f0482d5a0dfa43f567fa064";
-      sha256 = "0yjxmnn3a7fw0fjwfqk284zshlw8v7wp8pn16d5m40rvbkk2ipzr";
+      rev = "388cc8caaf3e10836810aabbb9283a27dd8584cd";
+      sha256 = "0a7izbvpwn0sx9gvpczvl57fy9rm7jaibc4m44asjz501m04lbra";
     };
     meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
   };
@@ -3600,12 +3612,12 @@ final: prev:
 
   nvim-toggleterm-lua = buildVimPluginFrom2Nix {
     pname = "nvim-toggleterm-lua";
-    version = "2021-06-01";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "nvim-toggleterm.lua";
-      rev = "53134b08a5a5e66f343c4e431966a0a19ce2d162";
-      sha256 = "00gxkl87f8gawil9bdxa5s15yswc1ac4y9c5vx3kmhv6g5ipcrrn";
+      rev = "7e13134c7e252746586ccb35a535c42a1c3b07c4";
+      sha256 = "17md8wvfvy9z2an89fxcg64d6lmqndmzj9qn294s311fn7zpaz0p";
     };
     meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
   };
@@ -3616,8 +3628,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "kyazdani42";
       repo = "nvim-tree.lua";
-      rev = "f56ac7884c9b12343d66a2bacf90097af3c58cf6";
-      sha256 = "0v2aznndmc5bsipqbj4q40qqmv384z6k5xh17yfcp7a6iak5zzjq";
+      rev = "82f1598bd4388c8089cf08007b17a3555c0328f0";
+      sha256 = "1mpszdypmhw3zizm699rq1m3zfrzmn1ilqaha01zb3q64l7mddzc";
     };
     meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
   };
@@ -3636,12 +3648,12 @@ final: prev:
 
   nvim-treesitter-context = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-context";
-    version = "2021-05-25";
+    version = "2021-06-05";
     src = fetchFromGitHub {
       owner = "romgrk";
       repo = "nvim-treesitter-context";
-      rev = "af10a3251f3e826c3fb2062ddeb4c74f23a2f52d";
-      sha256 = "1pl1v28wscdcns4cs2cv44rh0vrk8fwmr2banjgp5lcjynivzrwr";
+      rev = "bdc598b519cfbfdf61baf9a27953da2fc1642b23";
+      sha256 = "1slyjfjcrna06b23kbw4vf81qbncgimzhw1qsqwsqldnvdc35lcr";
     };
     meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/";
   };
@@ -4405,12 +4417,12 @@ final: prev:
 
   sideways-vim = buildVimPluginFrom2Nix {
     pname = "sideways-vim";
-    version = "2021-05-24";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "AndrewRadev";
       repo = "sideways.vim";
-      rev = "9ce855ab448467dc1468ef8b46bb86d38aa3d0fa";
-      sha256 = "0ldz09hjck5pq0lhbk93gm1zvc0aifsfk75w5pzrwqmwidimzyid";
+      rev = "15acde01892efd6e8d2a5c452babe862ce05f74d";
+      sha256 = "0bb06g2knzqj7himsvpfydq8yig2szz9q5pqds9yv83m3vh4kppl";
     };
     meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
   };
@@ -4887,12 +4899,12 @@ final: prev:
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
-    version = "2021-06-03";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "2697bcfaf0fac861e08c3a55d9334ec6d823029f";
-      sha256 = "0q9kq64y3yrazcks476yplkrhx59z82ij5wj1w8qakidy2i008z1";
+      rev = "feaed4b6e23bd56906089154f293f2b1ecb68c7e";
+      sha256 = "0kx9xmlv6smpqgf2mdz0n6r4cwrsldw9d92xk5m1pdsmpi1b61sa";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -5536,12 +5548,12 @@ final: prev:
 
   vim-autoformat = buildVimPluginFrom2Nix {
     pname = "vim-autoformat";
-    version = "2021-05-24";
+    version = "2021-06-05";
     src = fetchFromGitHub {
       owner = "vim-autoformat";
       repo = "vim-autoformat";
-      rev = "728d42f93054e15d260e25da0255378f171df7d2";
-      sha256 = "1r86100i30jqyxz1hc4z6ykx5s44iaapffs1xbv3pg8grz8fmf6x";
+      rev = "31e47bb9ee7a8b7aa2d324723dac75ea02896044";
+      sha256 = "1pw5iipr6yln1nspy2sn13cx7p1cn5485l8rkkkyqfwqgqsj3jfq";
     };
     meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";
   };
@@ -5716,12 +5728,12 @@ final: prev:
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2021-06-04";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "c743b1171194f85469a64556a1f54882cb73cc17";
-      sha256 = "0ws8rvvmszcspwvzns7i82l458sa2mhi0013li8c61g1g2wbpphn";
+      rev = "351ec86836986fb36e48ba414d65b62a7793374a";
+      sha256 = "1gksn9s40fjzwp6v0cmss2mxhpprj8ycysy5rbfp8h3vdghkkya7";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -6484,12 +6496,12 @@ final: prev:
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2021-06-03";
+    version = "2021-06-06";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "f7f1413ed9b69eb80c8af07d38ebcc889ed64d96";
-      sha256 = "16az604z245bw64dhkgmszifg1ajnf0i9binllixwaifnh6vfnhh";
+      rev = "41960996e0c532069533072b3fd820fafe9ce0b3";
+      sha256 = "0lzjwjbdq90b39561yp7qs1l69iw4jlxcjrsi5yvh1rbhv7gpy1i";
     };
     meta.homepage = "https://github.com/tpope/vim-fugitive/";
   };
@@ -8357,6 +8369,18 @@ final: prev:
     meta.homepage = "https://github.com/mhinz/vim-signify/";
   };
 
+  vim-simpledb = buildVimPluginFrom2Nix {
+    pname = "vim-simpledb";
+    version = "2020-10-02";
+    src = fetchFromGitHub {
+      owner = "ivalkeen";
+      repo = "vim-simpledb";
+      rev = "1e9e72160dd01c837b5afb4f75cbb587a15b31b5";
+      sha256 = "1y0i876p2pxx7gbr04acnv94cjrincsbg03bqxr89xbqlbggxf0w";
+    };
+    meta.homepage = "https://github.com/ivalkeen/vim-simpledb/";
+  };
+
   vim-slash = buildVimPluginFrom2Nix {
     pname = "vim-slash";
     version = "2019-08-28";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 8618d2c506f54..4e43bbe29a24d 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -621,7 +621,7 @@ self: super: {
             libiconv
           ];
 
-          cargoSha256 = "16fhiv6qmf7dv968jyybkgs1wkphy383s78g8w5wnz4i0czld8dq";
+          cargoSha256 = "sha256-/ALOjJayCmLpMV8zC9ryEofUxYdvqj4Cn+sY1qRuqcs=";
         };
       in
       ''
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 9d150c93c7cde..1d43a2d8eaecb 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -214,6 +214,7 @@ itchyny/thumbnail.vim
 itchyny/vim-cursorword
 itchyny/vim-gitbranch
 itspriddle/vim-shellcheck
+ivalkeen/vim-simpledb
 ivanov/vim-ipython
 jackguo380/vim-lsp-cxx-highlight
 jacoborus/tender.vim
@@ -577,6 +578,7 @@ SevereOverfl0w/deoplete-github
 shaunsingh/moonlight.nvim@pure-lua
 shaunsingh/nord.nvim
 sheerun/vim-polyglot
+shinchu/lightline-gruvbox.vim
 Shougo/context_filetype.vim
 Shougo/defx.nvim
 Shougo/denite.nvim
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 52bf4341fa5bb..1163f5dd9f0e2 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -341,10 +341,10 @@ let
         beforePlugins
         vamImpl
         (nativeImpl packages)
-        customRC
       ]
       ++ lib.optional (pathogen != null) pathogenImpl
-      ++ lib.optional (plug != null) plugImpl;
+      ++ lib.optional (plug != null) plugImpl
+      ++ [ customRC ];
 
     in
       lib.concatStringsSep "\n" (lib.filter (x: x != null && x != "") entries);
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 4e7713bdc5fd4..9d21b057c8a24 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }:
+{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq }:
 
 let
   inherit (vscode-utils) buildVscodeMarketplaceExtension;
@@ -99,13 +99,21 @@ let
         };
       };
 
-      B4dM4n.vscode-nixpkgs-fmt = buildVscodeMarketplaceExtension {
+      b4dm4n.vscode-nixpkgs-fmt = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "nixpkgs-fmt";
           publisher = "B4dM4n";
           version = "0.0.1";
           sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8=";
         };
+        nativeBuildInputs = [ jq ];
+        buildInputs = [ nixpkgs-fmt ];
+        postInstall = ''
+          cd "$out/$installPrefix"
+          tmp_package_json=$(mktemp)
+          jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json > "$tmp_package_json"
+          mv "$tmp_package_json" package.json
+        '';
         meta = with lib; {
           license = licenses.mit;
         };
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 9e0b734c81745..d53a1afe5e6cb 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -96,6 +96,8 @@ in lib.makeScopeWithSplicing
     HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc);
   } // lib.optionalAttrs (stdenv'.cc.isGNU or false) {
     HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc);
+  } // lib.optionalAttrs (stdenv'.isx86_32) {
+    USE_SSP = "no";
   } // lib.optionalAttrs (attrs.headersOnly or false) {
     installPhase = "includesPhase";
     dontBuild = true;
diff --git a/pkgs/servers/matrix-appservice-discord/default.nix b/pkgs/servers/matrix-appservice-discord/default.nix
index 4a41f019e1793..7b7a67821f9e0 100644
--- a/pkgs/servers/matrix-appservice-discord/default.nix
+++ b/pkgs/servers/matrix-appservice-discord/default.nix
@@ -43,7 +43,8 @@ in mkYarnPackage rec {
 
   doCheck = true;
   checkPhase = ''
-    yarn --offline test
+    # the default 2000ms timeout is sometimes too short on our busy builders
+    yarn --offline test --timeout 10000
   '';
 
   postInstall = ''
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 3e1f810000467..56bf0ed5d2ffe 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, darwin
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost
+# Darwin inputs
+, AudioToolbox, AudioUnit
 # Inputs
 , curl, libmms, libnfs, liburing, samba
 # Archive support
@@ -114,13 +116,13 @@ let
 
     in stdenv.mkDerivation rec {
       pname = "mpd";
-      version = "0.22.6";
+      version = "0.22.8";
 
       src = fetchFromGitHub {
         owner  = "MusicPlayerDaemon";
         repo   = "MPD";
         rev    = "v${version}";
-        sha256 = "sha256-Xu+MxMxR5u++R3lZHe6UQ+mEmRnWbN6173ZX39KS1A8=";
+        sha256 = "sha256-nlUgFmiIrheN/FsSlQ/16iqwBXDw6xuwJG/foPZD07M=";
       };
 
       buildInputs = [
@@ -133,7 +135,7 @@ let
         gtest
       ]
         ++ concatAttrVals features_ featureDependencies
-        ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.AudioUnit ];
+        ++ lib.optionals stdenv.isDarwin [ AudioToolbox AudioUnit ];
 
       nativeBuildInputs = [
         meson
diff --git a/pkgs/servers/pr-tracker/default.nix b/pkgs/servers/pr-tracker/default.nix
index 1bc53f352b6dd..d7bb27b4f29bd 100644
--- a/pkgs/servers/pr-tracker/default.nix
+++ b/pkgs/servers/pr-tracker/default.nix
@@ -1,6 +1,6 @@
 { rustPlatform
 , lib
-, fetchgit
+, fetchurl
 , openssl
 , pkg-config
 , systemd
@@ -8,20 +8,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pr-tracker";
-  version = "1.0.0";
+  version = "1.1.0";
 
-  src = fetchgit {
-    url = "https://git.qyliss.net/pr-tracker";
-    rev = version;
-    sha256 = "sha256-NHtY05Llrvfvcb3uyagLd6kaVW630TIP3IreFrY3wl0=";
+  src = fetchurl {
+    url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz";
+    sha256 = "0881ckb4y762isisf9d6xk6fh9207xi1i04kays298zx2dq6gh6h";
   };
 
-  cargoSha256 = "sha256-SgSASfIanADV31pVy+VIwozTLxq7P3oMDIiAAQ8s+k0=";
+  cargoSha256 = "0r8pxg65s5jv95a0g8pzr693za7jfb4rv0wc739lkbpf0dssw8sr";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl systemd ];
 
   meta = with lib; {
+    changelog = "https://git.qyliss.net/pr-tracker/plain/NEWS?h=${version}";
     description = "Nixpkgs pull request channel tracker";
     longDescription = ''
       A web server that displays the path a Nixpkgs pull request will take
@@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec {
     platforms = platforms.linux;
     homepage = "https://git.qyliss.net/pr-tracker";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ sumnerevans ];
+    maintainers = with maintainers; [ qyliss sumnerevans ];
   };
 }
diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix
index a7e1d02cb3028..0417e3079cebe 100644
--- a/pkgs/tools/admin/acme.sh/default.nix
+++ b/pkgs/tools/admin/acme.sh/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }:
 stdenv.mkDerivation rec {
   pname = "acme.sh";
-  version = "2.8.9";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "Neilpang";
     repo = "acme.sh";
     rev = version;
-    sha256 = "sha256-xiLAvxly4WbMb6DAXPsXJgQqVmTlX9cbqFECJQ+r0Jk=";
+    sha256 = "sha256-BSKqfj8idpE4OV8/EJkCFo5i1vq/aEde/moqJcwuDvk=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index aca741175e57f..c37e789338499 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bacula";
-  version = "11.0.3";
+  version = "11.0.5";
 
   src = fetchurl {
     url    = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz";
-    sha256 = "sha256-AVh3NPdJD8t3N4AbLh/hsflHB7s/sLcbNnE8eqsDkjw=";
+    sha256 = "sha256-71s7Z4EEQiAbgNwdR8zvd7XtN4/hKFQG86c0AbboERo=";
   };
 
   buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix
index 21636ea8d8ebd..35b3b1e336d33 100644
--- a/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/pkgs/tools/inputmethods/interception-tools/default.nix
@@ -1,19 +1,18 @@
-{ lib, stdenv, fetchurl, pkg-config, cmake, libyamlcpp,
-  libevdev, udev }:
+{ lib, stdenv, fetchFromGitLab, pkg-config, cmake, libyamlcpp,
+  libevdev, udev, boost }:
 
-let
-  version = "0.2.1";
-  baseName = "interception-tools";
-in stdenv.mkDerivation {
-  name = "${baseName}-${version}";
-
-  src = fetchurl {
-    url = "https://gitlab.com/interception/linux/tools/repository/v${version}/archive.tar.gz";
-    sha256 = "0lqz89wsf9r5xdgflincysxg4l8fpgg5z8zczhhrg9s5787srfzi";
+stdenv.mkDerivation rec {
+  pname = "interception-tools";
+  version = "0.6.6";
+  src = fetchFromGitLab {
+    owner = "interception/linux";
+    repo = "tools";
+    rev = "v${version}";
+    sha256 = "0k9h14a9d65nwvv7pj0kigjgzfv453mm3r4svnxfg1h5lccmy8jj";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ libevdev udev libyamlcpp ];
+  buildInputs = [ libevdev udev libyamlcpp boost ];
 
   prePatch = ''
     substituteInPlace CMakeLists.txt --replace \
@@ -21,12 +20,10 @@ in stdenv.mkDerivation {
       "\"$(pkg-config --cflags libevdev | cut -c 3-)\""
   '';
 
-  patches = [ ./fix-udevmon-configuration-job-path.patch ];
-
   meta = {
     description = "A minimal composable infrastructure on top of libudev and libevdev";
     homepage = "https://gitlab.com/interception/linux/tools";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Only;
     maintainers = [ lib.maintainers.vyp ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch b/pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch
deleted file mode 100644
index 469c96647d69f..0000000000000
--- a/pkgs/tools/inputmethods/interception-tools/fix-udevmon-configuration-job-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d3a5d661b80f3597368f517ebaeddfdfaafc1bf2 Mon Sep 17 00:00:00 2001
-From: xd1le <elisp.vim@gmail.com>
-Date: Mon, 28 Aug 2017 00:19:09 +1000
-Subject: [PATCH] fix udevmon configuration job path
-
-For some reason, the udevmon job $PATH seems to be empty (or otherwise
-seems to point to `/no-such-path`). This commit fixes that by setting
-its $PATH to the same $PATH that the parent udevmon process has.
----
- udevmon.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/udevmon.cpp b/udevmon.cpp
-index ebdd909..b523efd 100644
---- a/udevmon.cpp
-+++ b/udevmon.cpp
-@@ -237,8 +237,11 @@ private:
-             case 0: {
-                 char *command[] = {(char *)"sh", (char *)"-c",
-                                    (char *)job.c_str(), nullptr};
-+                std::string path = getenv("PATH");
-                 std::string variables = "DEVNODE=" + devnode;
--                char *environment[]   = {(char *)variables.c_str(), nullptr};
-+                std::string pathenv = "PATH=" + path;
-+                char *environment[] = {(char *)variables.c_str(),
-+                                       (char *)pathenv.c_str(), nullptr};
-                 execvpe(command[0], command, environment);
-                 std::fprintf(stderr,
-                              R"(exec failed for devnode %s, job "%s" )"
--- 
-2.14.1
-
diff --git a/pkgs/tools/misc/freshfetch/Cargo.lock b/pkgs/tools/misc/freshfetch/Cargo.lock
new file mode 100644
index 0000000000000..24cfb7e9de966
--- /dev/null
+++ b/pkgs/tools/misc/freshfetch/Cargo.lock
@@ -0,0 +1,587 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "bstr"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+dependencies = [
+ "libc",
+ "num-integer",
+ "num-traits",
+ "time",
+ "winapi",
+]
+
+[[package]]
+name = "clap"
+version = "2.33.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags",
+ "strsim",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "clml_rs"
+version = "0.3.0"
+source = "git+https://github.com/K4rakara/clml-rs#eecf1378f4e85a9b3dc91e8a15d497a2fd75906f"
+dependencies = [
+ "lazy_static",
+ "rand",
+ "regex",
+]
+
+[[package]]
+name = "cmd_lib"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42443b644d30f401746fb4483fba96b13076e1ef6cb5bca7d6a14d1d8f9f2bd9"
+dependencies = [
+ "cmd_lib_core",
+ "cmd_lib_macros",
+]
+
+[[package]]
+name = "cmd_lib_core"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c50c50a1536e882455aeaff22015146ea143b9106fc8e116669dd078ec7b7fc8"
+
+[[package]]
+name = "cmd_lib_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d202b0cfc28d8928ba89138c0a8248cf921b9870c6c9d60c9951092df5b62b2"
+dependencies = [
+ "cmd_lib_core",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+dependencies = [
+ "cfg-if",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "lazy_static",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "lazy_static",
+]
+
+[[package]]
+name = "doc-comment"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+
+[[package]]
+name = "either"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
+[[package]]
+name = "freshfetch"
+version = "0.2.0"
+dependencies = [
+ "chrono",
+ "clap",
+ "clml_rs",
+ "cmd_lib",
+ "cmd_lib_core",
+ "lazy_static",
+ "mlua",
+ "regex",
+ "sysinfo",
+ "term_size",
+ "uname",
+ "users",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
+
+[[package]]
+name = "log"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "lua-src"
+version = "543.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "029180f994b9b36f47d905f92569b516acf7d073778e2e781c15ee375b1ca27d"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "luajit-src"
+version = "210.1.3+restyfe08842"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36d3de8377d8e0492b646527befb7eb826a9ecd2dc8c1f81ab0e654bc03a029b"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "memchr"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+
+[[package]]
+name = "memoffset"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "mlua"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f2fc8e1085d53b72898c59ceee1980b5826b0c98ce99886b7518f0ead00e5cb"
+dependencies = [
+ "bstr",
+ "cc",
+ "lazy_static",
+ "lua-src",
+ "luajit-src",
+ "num-traits",
+ "pkg-config",
+]
+
+[[package]]
+name = "ntapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom",
+ "libc",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rayon"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
+dependencies = [
+ "autocfg",
+ "crossbeam-deque",
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "lazy_static",
+ "num_cpus",
+]
+
+[[package]]
+name = "regex"
+version = "1.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "sysinfo"
+version = "0.15.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de94457a09609f33fec5e7fceaf907488967c6c7c75d64da6a7ce6ffdb8b5abd"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "core-foundation-sys",
+ "doc-comment",
+ "libc",
+ "ntapi",
+ "once_cell",
+ "rayon",
+ "winapi",
+]
+
+[[package]]
+name = "term_size"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "time"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
+]
+
+[[package]]
+name = "uname"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[package]]
+name = "users"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa4227e95324a443c9fcb06e03d4d85e91aabe9a5a02aa818688b6918b6af486"
+dependencies = [
+ "libc",
+ "log",
+]
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/pkgs/tools/misc/freshfetch/default.nix b/pkgs/tools/misc/freshfetch/default.nix
new file mode 100644
index 0000000000000..7ed3343603587
--- /dev/null
+++ b/pkgs/tools/misc/freshfetch/default.nix
@@ -0,0 +1,31 @@
+{ fetchFromGitHub, fetchurl, lib, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "freshfetch";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "k4rakara";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1l9zngr5l12g71j85iyph4jjri3crxc2pi9q0gczrrzvs03439mn";
+  };
+
+  cargoLock = {
+    # update Cargo.lock every new release of freshfetch
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "clml_rs-0.3.0" = "0hvd59zh7czk9jd1a2wwcm1acpcfbz32v9ka7ap6f74d638jcc19";
+    };
+  };
+
+  # freshfetch depends on rust nightly features
+  RUSTC_BOOTSTRAP = 1;
+
+  meta = with lib; {
+    description = "A fresh take on neofetch";
+    homepage = "https://github.com/k4rakara/freshfetch";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix
index ae58054511407..40586f6be6567 100644
--- a/pkgs/tools/misc/silicon/default.nix
+++ b/pkgs/tools/misc/silicon/default.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "silicon";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "Aloxaf";
     repo = "silicon";
     rev = "v${version}";
-    sha256 = "sha256-ci0gq4rOQHBmFPvhXZseIlwnqAWd06/qg/i/luhV79s=";
+    sha256 = "sha256-k+p8AEEL1BBJTmPc58QoIk7EOzu8QKdG00RQ58EN3bg=";
   };
 
-  cargoSha256 = "sha256-sUPOf9er+BOMqDJ8C6+Xjjqj6NQUV2JTzGA4yUWtDWM=";
+  cargoSha256 = "sha256-vpegobS7lpRkt/oZePW9WggYeg0JXDte8fQP/bf7oAI=";
 
   buildInputs = [ llvmPackages.libclang expat freetype fira-code ]
     ++ lib.optionals stdenv.isLinux [ libxcb ]
diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix
index 3549677e22fc9..fbfab8d2f05aa 100644
--- a/pkgs/tools/networking/ngrok-2/default.nix
+++ b/pkgs/tools/networking/ngrok-2/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     description = "Allows you to expose a web server running on your local machine to the internet";
     homepage = "https://ngrok.com/";
     license = licenses.unfree;
-    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
     maintainers = [ maintainers.bobvanderlinden ];
   };
 }
diff --git a/pkgs/tools/networking/ngrok-2/update.sh b/pkgs/tools/networking/ngrok-2/update.sh
index 7908a1524e594..4e2aaf4e5596b 100755
--- a/pkgs/tools/networking/ngrok-2/update.sh
+++ b/pkgs/tools/networking/ngrok-2/update.sh
@@ -29,5 +29,6 @@ get_download_info() {
     get_download_info linux arm
     get_download_info linux arm64
     get_download_info darwin amd64
+    get_download_info darwin arm64
 ) | jq --slurp 'map ({ (.sys): . }) | add' \
     > pkgs/tools/networking/ngrok-2/versions.json
diff --git a/pkgs/tools/networking/ngrok-2/versions.json b/pkgs/tools/networking/ngrok-2/versions.json
index 656e6a640e53c..85b0e47168a2c 100644
--- a/pkgs/tools/networking/ngrok-2/versions.json
+++ b/pkgs/tools/networking/ngrok-2/versions.json
@@ -1,32 +1,38 @@
 {
   "linux-386": {
     "sys": "linux-386",
-    "url": "https://bin.equinox.io/a/bjFaKy3TSAg/ngrok-2.3.35-linux-386",
-    "sha256": "1fdd1c057c3c31044400ef6ade20ad3f10bce415ad33ccfb4bc2fd83bb36f62f",
-    "version": "2.3.35"
+    "url": "https://bin.equinox.io/a/c4ZY6f7svn7/ngrok-2.3.40-linux-386",
+    "sha256": "1b645ff0abbb28ca7c0f6a2109653be2dc281860b582b4de6927fde12c99da26",
+    "version": "2.3.40"
   },
   "linux-amd64": {
     "sys": "linux-amd64",
-    "url": "https://bin.equinox.io/a/52fZaxjGg9n/ngrok-2.3.35-linux-amd64",
-    "sha256": "b456608239cdf4b5119916c62a87640667d1cb1900c53faed89e3dacc1fe4679",
-    "version": "2.3.35"
+    "url": "https://bin.equinox.io/a/b5PAmc6L9z2/ngrok-2.3.40-linux-amd64",
+    "sha256": "218d267cd1195334718bafac14bfdf1c19dc95dcf8a24aaa6a1383c21dc86e76",
+    "version": "2.3.40"
   },
   "linux-arm": {
     "sys": "linux-arm",
-    "url": "https://bin.equinox.io/a/2cUd5mRRjoF/ngrok-2.3.35-linux-arm",
-    "sha256": "94d88311e9b2baea615d9fe7c6921ac0167040ec66aa0d0cbb856c027d617f1f",
-    "version": "2.3.35"
+    "url": "https://bin.equinox.io/a/aRh9rdUAJyf/ngrok-2.3.40-linux-arm",
+    "sha256": "538a7431df141a929a250eaf6ed7afdcce817bcd8cfe60b61f4c6d7a289b1d1c",
+    "version": "2.3.40"
   },
   "linux-arm64": {
     "sys": "linux-arm64",
-    "url": "https://bin.equinox.io/a/k2qx6ipHqpb/ngrok-2.3.35-linux-arm64",
-    "sha256": "fd07f5c449f1c1444606bbc9d06fa6b649325ddf0b3e6dac6f32d785a886f170",
-    "version": "2.3.35"
+    "url": "https://bin.equinox.io/a/2gpRjDRBpJv/ngrok-2.3.40-linux-arm64",
+    "sha256": "dc7b4465ef95f6d04d1b1996111b3a2631e5f464d7dca7f4994f59ea4edbe21f",
+    "version": "2.3.40"
   },
   "darwin-amd64": {
     "sys": "darwin-amd64",
-    "url": "https://bin.equinox.io/a/jKkD2Wcds2L/ngrok-2.3.35-darwin-amd64",
-    "sha256": "dd74a6be1a155c41ff06aadad910196cae13e06ab997bc0b144288b2da568f2a",
-    "version": "2.3.35"
+    "url": "https://bin.equinox.io/a/fcZQXtHSDgM/ngrok-2.3.40-darwin-amd64",
+    "sha256": "80c8fb121d6c93350d84351d9516674f4e20a3e003cdd7dcb4c3e7c48b9c5b07",
+    "version": "2.3.40"
+  },
+  "darwin-arm64": {
+    "sys": "darwin-arm64",
+    "url": "https://bin.equinox.io/a/3TEKdZeyAnt/ngrok-2.3.40-darwin-arm64",
+    "sha256": "c9e6dfec454f9faec92a13dfd3f3857de982007e3b85987bb875aa0d74ca8101",
+    "version": "2.3.40"
   }
 }
diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index e32386acbb2dd..a1e43618346be 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2021-06-03";
+  version = "2021-06-05";
 
   src = fetchFromGitHub {
     owner = "offensive-security";
     repo = pname;
     rev = version;
-    sha256 = "sha256-a2x9Hfo39VeaMsio9VbOPe5hr2xLjmAzlSNUWtaXG6A=";
+    sha256 = "sha256-91BJ0rgR9pP4rlLz38Tug0Cd5s7WajgdxA7Dtm4Pre0=";
   };
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfdcf9bfe783e..885a6a77d248b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4340,6 +4340,8 @@ in
 
   uudeview = callPackage ../tools/misc/uudeview { };
 
+  uusi = haskell.lib.justStaticExecutables haskellPackages.uusi;
+
   uutils-coreutils = callPackage ../tools/misc/uutils-coreutils {
     inherit (python3Packages) sphinx;
     inherit (darwin.apple_sdk.frameworks) Security;
@@ -4839,6 +4841,8 @@ in
 
   frescobaldi = python3Packages.callPackage ../misc/frescobaldi {};
 
+  freshfetch = callPackage ../tools/misc/freshfetch { };
+
   frostwire = callPackage ../applications/networking/p2p/frostwire { };
   frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { };
 
@@ -19305,8 +19309,10 @@ in
   mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12;
   mod_timestamp = pkgs.apacheHttpdPackages.mod_timestamp;
 
-  inherit (callPackages ../servers/mpd { stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; })
-    mpd mpd-small mpdWithFeatures;
+  inherit (callPackages ../servers/mpd {
+    stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv;
+    inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit;
+  }) mpd mpd-small mpdWithFeatures;
 
   libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { };
 
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index b26dd1b1e59dd..55eb567640331 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -174,9 +174,23 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   FSharpFormatting = fetchNuGet {
     baseName = "FSharp.Formatting";
-    version = "2.9.8";
-    sha256 = "1bswcpa68i2lqds4kkl2qxgkfrppbpxa4jkyja48azljajh0df3m";
-    outputFiles = [ "lib/net40/*" ];
+    version = "11.2.0";
+    sha256 = "4IMrd+jpRZw+vBXx4X89/B/Fdpiuy2hwtmQNGWQp0wM=";
+    outputFiles = [ "lib/*" ];
+    postUnpack = ''
+      chmod -R a+r $sourceRoot
+    '';
+
+    meta = with lib; {
+      description = "F# tools for generating documentation (Markdown processor and F# code formatter)";
+      homepage = "https://fsprojects.github.io/FSharp.Formatting/";
+      longDescription = ''
+        The FSharp.Formatting package includes libraries and tools for processing F# script files,
+        markdown and components for documentation generation.
+      '';
+      license = licenses.asl20;
+      maintainers = [ maintainers.ratsclub ];
+    };
   };
 
   NUnit3 = fetchNuGet {
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 7a3eb608389dd..36a5835c9cd01 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -175,6 +175,7 @@ let
         nix-tree
         nixfmt
         nota
+        nvfetcher
         ormolu
         pandoc
         pakcs
@@ -199,6 +200,7 @@ let
         tldr-hs
         tweet-hs
         update-nix-fetchgit
+        uusi
         uqm
         uuagc
         vaultenv