about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/audio/easyeffects/default.nix8
-rw-r--r--pkgs/applications/audio/myxer/default.nix40
-rw-r--r--pkgs/applications/audio/picard/default.nix4
-rw-r--r--pkgs/applications/editors/atom/env.nix8
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix230
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix171
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json4921
-rw-r--r--pkgs/applications/editors/kodestudio/default.nix135
-rw-r--r--pkgs/applications/editors/vscode/extensions/default.nix4
-rw-r--r--pkgs/applications/graphics/drawio/default.nix4
-rw-r--r--pkgs/applications/graphics/inkscape/default.nix28
-rw-r--r--pkgs/applications/graphics/symbolic-preview/default.nix20
-rw-r--r--pkgs/applications/misc/authy/default.nix91
-rw-r--r--pkgs/applications/misc/cura/stable.nix72
-rw-r--r--pkgs/applications/misc/feedbackd/default.nix12
-rw-r--r--pkgs/applications/misc/gnome-secrets/default.nix4
-rw-r--r--pkgs/applications/misc/haxor-news/default.nix8
-rw-r--r--pkgs/applications/misc/obsidian/default.nix4
-rw-r--r--pkgs/applications/misc/plover/default.nix25
-rw-r--r--pkgs/applications/misc/privacyidea/default.nix20
-rw-r--r--pkgs/applications/misc/stw/default.nix32
-rw-r--r--pkgs/applications/misc/sway-launcher-desktop/default.nix2
-rw-r--r--pkgs/applications/misc/ydict/default.nix6
-rw-r--r--pkgs/applications/networking/cluster/fluxcd/default.nix8
-rw-r--r--pkgs/applications/networking/cluster/roxctl/default.nix6
-rw-r--r--pkgs/applications/networking/cluster/talosctl/default.nix10
-rw-r--r--pkgs/applications/networking/cluster/tektoncd-cli/default.nix4
-rw-r--r--pkgs/applications/networking/cluster/terraform-providers/providers.json9
-rw-r--r--pkgs/applications/networking/cluster/terraform/default.nix5
-rw-r--r--pkgs/applications/networking/cluster/tgswitch/default.nix14
-rw-r--r--pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix11
-rw-r--r--pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json4
-rw-r--r--pkgs/applications/networking/instant-messengers/discord/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/gajim/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix60
-rw-r--r--pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix67
-rw-r--r--pkgs/applications/networking/instant-messengers/slack-term/default.nix8
-rw-r--r--pkgs/applications/networking/instant-messengers/torchat/default.nix40
-rw-r--r--pkgs/applications/networking/mujmap/default.nix8
-rw-r--r--pkgs/applications/networking/n8n/node-packages.nix1008
-rw-r--r--pkgs/applications/networking/sniffers/wireshark/default.nix4
-rw-r--r--pkgs/applications/office/appflowy/default.nix4
-rw-r--r--pkgs/applications/science/astronomy/gpredict/default.nix12
-rw-r--r--pkgs/applications/science/logic/coq/default.nix1
-rw-r--r--pkgs/applications/system/glances/default.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/gh/default.nix6
-rw-r--r--pkgs/applications/version-management/gogs/default.nix6
-rw-r--r--pkgs/applications/version-management/sourcehut/builds.nix29
-rw-r--r--pkgs/applications/version-management/sourcehut/core.nix13
-rw-r--r--pkgs/applications/version-management/sourcehut/default.nix4
-rw-r--r--pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix32
-rw-r--r--pkgs/applications/version-management/sourcehut/git.nix58
-rw-r--r--pkgs/applications/version-management/sourcehut/hg.nix38
-rw-r--r--pkgs/applications/version-management/sourcehut/hub.nix4
-rw-r--r--pkgs/applications/version-management/sourcehut/lists.nix25
-rw-r--r--pkgs/applications/version-management/sourcehut/man.nix4
-rw-r--r--pkgs/applications/version-management/sourcehut/meta.nix22
-rw-r--r--pkgs/applications/version-management/sourcehut/pages.nix18
-rw-r--r--pkgs/applications/version-management/sourcehut/paste.nix9
-rw-r--r--pkgs/applications/version-management/sourcehut/patches/redis-socket/build/0001-Revert-Add-build-submission-and-queue-monitoring.patch69
-rw-r--r--pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch42
-rw-r--r--pkgs/applications/version-management/sourcehut/patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch50
-rw-r--r--pkgs/applications/version-management/sourcehut/patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch48
-rw-r--r--pkgs/applications/version-management/sourcehut/patches/redis-socket/meta/0001-Revert-Add-webhook-queue-monitoring.patch48
-rw-r--r--pkgs/applications/version-management/sourcehut/patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch50
-rw-r--r--pkgs/applications/version-management/sourcehut/scm.nix4
-rw-r--r--pkgs/applications/version-management/sourcehut/todo.nix25
-rwxr-xr-xpkgs/applications/version-management/sourcehut/update.sh2
-rw-r--r--pkgs/applications/video/qarte/default.nix8
-rw-r--r--pkgs/applications/virtualization/containerd/default.nix4
-rw-r--r--pkgs/applications/virtualization/runc/default.nix4
-rw-r--r--pkgs/applications/window-managers/fbpanel/default.nix4
-rw-r--r--pkgs/build-support/trivial-builders.nix1
-rw-r--r--pkgs/data/misc/hackage/pin.json8
-rw-r--r--pkgs/desktops/cdesktopenv/default.nix5
-rw-r--r--pkgs/development/compilers/gcl/default.nix5
-rw-r--r--pkgs/development/compilers/gmqcc/default.nix43
-rw-r--r--pkgs/development/coq-modules/bignums/default.nix1
-rw-r--r--pkgs/development/coq-modules/coq-elpi/default.nix7
-rw-r--r--pkgs/development/go-modules/generic/default.nix5
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix29
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml7
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml5
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml40
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml4
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix10
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix1616
-rw-r--r--pkgs/development/haskell-modules/hoogle.nix9
-rw-r--r--pkgs/development/interpreters/clojure/babashka.nix4
-rw-r--r--pkgs/development/libraries/glpk/default.nix8
-rw-r--r--pkgs/development/libraries/hidapi/default.nix4
-rw-r--r--pkgs/development/libraries/libagar/libagar_test.nix6
-rw-r--r--pkgs/development/libraries/libdeltachat/default.nix6
-rw-r--r--pkgs/development/libraries/libmediaart/default.nix4
-rw-r--r--pkgs/development/libraries/libnftnl/default.nix4
-rw-r--r--pkgs/development/libraries/libosinfo/default.nix3
-rw-r--r--pkgs/development/libraries/libqalculate/default.nix10
-rw-r--r--pkgs/development/libraries/libzim/default.nix4
-rw-r--r--pkgs/development/libraries/physics/cernlib/default.nix5
-rw-r--r--pkgs/development/libraries/poppler/default.nix4
-rw-r--r--pkgs/development/libraries/sptk/default.nix31
-rw-r--r--pkgs/development/node-packages/node-packages.nix2263
-rw-r--r--pkgs/development/ocaml-modules/cry/default.nix20
-rw-r--r--pkgs/development/ocaml-modules/elpi/default.nix20
-rw-r--r--pkgs/development/ocaml-modules/faad/default.nix24
-rw-r--r--pkgs/development/ocaml-modules/frei0r/default.nix24
-rw-r--r--pkgs/development/ocaml-modules/lame/default.nix26
-rw-r--r--pkgs/development/ocaml-modules/lilv/default.nix25
-rw-r--r--pkgs/development/ocaml-modules/ocurl/default.nix17
-rw-r--r--pkgs/development/ocaml-modules/soundtouch/default.nix23
-rw-r--r--pkgs/development/ocaml-modules/taglib/default.nix26
-rw-r--r--pkgs/development/ocaml-modules/wasm/default.nix7
-rw-r--r--pkgs/development/python-modules/adb-shell/default.nix4
-rw-r--r--pkgs/development/python-modules/async-upnp-client/default.nix4
-rw-r--r--pkgs/development/python-modules/black/default.nix5
-rw-r--r--pkgs/development/python-modules/canonicaljson/default.nix4
-rw-r--r--pkgs/development/python-modules/dash/default.nix39
-rw-r--r--pkgs/development/python-modules/databricks-connect/default.nix4
-rw-r--r--pkgs/development/python-modules/deezer-python/default.nix10
-rw-r--r--pkgs/development/python-modules/docopt-ng/default.nix4
-rw-r--r--pkgs/development/python-modules/dulwich/default.nix4
-rw-r--r--pkgs/development/python-modules/fakeredis/default.nix6
-rw-r--r--pkgs/development/python-modules/fastapi-mail/default.nix6
-rw-r--r--pkgs/development/python-modules/fido2/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-appengine-logging/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-asset/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix6
-rw-r--r--pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-container/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-datacatalog/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-dataproc/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-datastore/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-dlp/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-error-reporting/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-iam-logging/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-iam/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-iot/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-kms/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-language/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-org-policy/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-os-config/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-pubsub/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-redis/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-secret-manager/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-securitycenter/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-speech/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-storage/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-tasks/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-texttospeech/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-trace/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-translate/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix4
-rw-r--r--pkgs/development/python-modules/hidapi/default.nix4
-rw-r--r--pkgs/development/python-modules/huum/default.nix4
-rw-r--r--pkgs/development/python-modules/inkex/default.nix6
-rw-r--r--pkgs/development/python-modules/mkdocs-material/default.nix4
-rw-r--r--pkgs/development/python-modules/peaqevcore/default.nix4
-rw-r--r--pkgs/development/python-modules/plugwise/default.nix8
-rw-r--r--pkgs/development/python-modules/pre-commit-hooks/default.nix6
-rw-r--r--pkgs/development/python-modules/pulumi/default.nix15
-rw-r--r--pkgs/development/python-modules/pyfxa/default.nix63
-rw-r--r--pkgs/development/python-modules/pyroute2-core/default.nix4
-rw-r--r--pkgs/development/python-modules/pyroute2-ethtool/default.nix4
-rw-r--r--pkgs/development/python-modules/pyroute2-ipdb/default.nix4
-rw-r--r--pkgs/development/python-modules/pyroute2-ipset/default.nix4
-rw-r--r--pkgs/development/python-modules/pyroute2-ndb/default.nix4
-rw-r--r--pkgs/development/python-modules/pyroute2-nftables/default.nix4
-rw-r--r--pkgs/development/python-modules/pyroute2-nslink/default.nix4
-rw-r--r--pkgs/development/python-modules/pyroute2-protocols/default.nix4
-rw-r--r--pkgs/development/python-modules/pyroute2/default.nix4
-rw-r--r--pkgs/development/python-modules/pyshark/default.nix6
-rw-r--r--pkgs/development/python-modules/pysigma-backend-insightidr/default.nix4
-rw-r--r--pkgs/development/python-modules/pysigma-backend-splunk/default.nix4
-rw-r--r--pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix4
-rw-r--r--pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix4
-rw-r--r--pkgs/development/python-modules/pysigma-pipeline-windows/default.nix5
-rw-r--r--pkgs/development/python-modules/pysigma/default.nix4
-rw-r--r--pkgs/development/python-modules/pywemo/default.nix4
-rw-r--r--pkgs/development/python-modules/quantum-gateway/default.nix9
-rw-r--r--pkgs/development/python-modules/questionary/default.nix1
-rw-r--r--pkgs/development/python-modules/regenmaschine/default.nix4
-rw-r--r--pkgs/development/python-modules/rollbar/default.nix4
-rw-r--r--pkgs/development/python-modules/sagemaker/default.nix4
-rw-r--r--pkgs/development/python-modules/spacy/default.nix4
-rw-r--r--pkgs/development/python-modules/staticjinja/default.nix4
-rw-r--r--pkgs/development/python-modules/stripe/default.nix4
-rw-r--r--pkgs/development/python-modules/validphys2/default.nix10
-rw-r--r--pkgs/development/python-modules/vertica-python/default.nix4
-rw-r--r--pkgs/development/python-modules/webexteamssdk/default.nix13
-rw-r--r--pkgs/development/python-modules/xknx/default.nix4
-rw-r--r--pkgs/development/python-modules/yolink-api/default.nix4
-rw-r--r--pkgs/development/python2-modules/click/default.nix28
-rw-r--r--pkgs/development/python2-modules/cryptography/default.nix86
-rw-r--r--pkgs/development/python2-modules/cryptography/vectors.nix24
-rw-r--r--pkgs/development/python2-modules/decorator/default.nix21
-rw-r--r--pkgs/development/python2-modules/flask/default.nix28
-rw-r--r--pkgs/development/python2-modules/freezegun/default.nix29
-rw-r--r--pkgs/development/python2-modules/ipaddr/default.nix23
-rw-r--r--pkgs/development/python2-modules/itsdangerous/default.nix21
-rw-r--r--pkgs/development/python2-modules/libcloud/default.nix39
-rw-r--r--pkgs/development/python2-modules/lpod/default.nix31
-rw-r--r--pkgs/development/python2-modules/pyjwt/default.nix47
-rw-r--r--pkgs/development/python2-modules/urllib3/default.nix84
-rw-r--r--pkgs/development/python2-modules/vcrpy/default.nix48
-rw-r--r--pkgs/development/python2-modules/werkzeug/default.nix60
-rw-r--r--pkgs/development/python2-modules/wsproto/default.nix25
-rw-r--r--pkgs/development/python2-modules/wxPython/default.nix91
-rw-r--r--pkgs/development/tools/analysis/checkov/default.nix15
-rw-r--r--pkgs/development/tools/analysis/eresi/default.nix7
-rw-r--r--pkgs/development/tools/apksigner/default.nix1
-rw-r--r--pkgs/development/tools/circup/default.nix6
-rw-r--r--pkgs/development/tools/easyjson/deps.nix11
-rw-r--r--pkgs/development/tools/goa/deps.nix75
-rw-r--r--pkgs/development/tools/goresym/default.nix26
-rw-r--r--pkgs/development/tools/kubernetes-controller-tools/default.nix6
-rw-r--r--pkgs/development/tools/metals/default.nix4
-rw-r--r--pkgs/development/tools/misc/inotify-tools/default.nix4
-rw-r--r--pkgs/development/tools/misc/kibana/6.x.nix63
-rw-r--r--pkgs/development/tools/misc/pwninit/default.nix35
-rw-r--r--pkgs/development/tools/rust/cargo-generate/default.nix6
-rw-r--r--pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix4
-rw-r--r--pkgs/development/tools/vend/default.nix37
-rw-r--r--pkgs/development/tools/vend/remove_tidy.patch13
-rw-r--r--pkgs/development/web/nodejs/v10.nix14
-rw-r--r--pkgs/development/web/nodejs/v16.nix4
-rw-r--r--pkgs/games/gargoyle/default.nix6
-rw-r--r--pkgs/games/macopix/default.nix5
-rw-r--r--pkgs/games/stuntrally/default.nix10
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix4
-rw-r--r--pkgs/os-specific/linux/firejail/default.nix23
-rw-r--r--pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix10
-rw-r--r--pkgs/os-specific/linux/nftables/default.nix22
-rw-r--r--pkgs/os-specific/linux/usbip/default.nix4
-rw-r--r--pkgs/pkgs-lib/formats.nix2
-rw-r--r--pkgs/servers/adguardhome/bins.nix20
-rw-r--r--pkgs/servers/adguardhome/default.nix2
-rw-r--r--pkgs/servers/coturn/default.nix7
-rw-r--r--pkgs/servers/dendrite/default.nix6
-rw-r--r--pkgs/servers/home-assistant/component-packages.nix2
-rw-r--r--pkgs/servers/home-assistant/default.nix4
-rw-r--r--pkgs/servers/http/webhook/default.nix21
-rw-r--r--pkgs/servers/monitoring/prometheus/nats-exporter.nix22
-rw-r--r--pkgs/servers/nosql/dragonflydb/default.nix109
-rw-r--r--pkgs/servers/nosql/dragonflydb/fixes.patch132
-rw-r--r--pkgs/servers/nosql/dragonflydb/glog.patch553
-rw-r--r--pkgs/servers/persistent-evdev/default.nix42
-rw-r--r--pkgs/servers/search/elasticsearch/plugins.nix20
-rw-r--r--pkgs/servers/tailscale/default.nix6
-rw-r--r--pkgs/shells/fish/plugins/hydro.nix2
-rw-r--r--pkgs/shells/zsh/oh-my-zsh/default.nix6
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools-cross.nix11
-rw-r--r--pkgs/tools/admin/certigo/default.nix21
-rw-r--r--pkgs/tools/admin/exoscale-cli/default.nix4
-rw-r--r--pkgs/tools/audio/liquidsoap/full.nix155
-rw-r--r--pkgs/tools/bluetooth/bluewalker/default.nix29
-rw-r--r--pkgs/tools/compression/bzip3/default.nix5
-rw-r--r--pkgs/tools/compression/efficient-compression-tool/default.nix39
-rw-r--r--pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch108
-rw-r--r--pkgs/tools/filesystems/btrfs-progs/default.nix4
-rw-r--r--pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch98
-rw-r--r--pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch48
-rw-r--r--pkgs/tools/filesystems/ntfs-3g/default.nix41
-rw-r--r--pkgs/tools/filesystems/rmfuse/poetry.lock208
-rw-r--r--pkgs/tools/filesystems/xfsprogs/default.nix4
-rw-r--r--pkgs/tools/graphics/esshader/default.nix38
-rw-r--r--pkgs/tools/graphics/ifm/default.nix5
-rw-r--r--pkgs/tools/misc/csvs-to-sqlite/default.nix8
-rw-r--r--pkgs/tools/misc/mprocs/default.nix8
-rw-r--r--pkgs/tools/misc/zellij/default.nix8
-rw-r--r--pkgs/tools/networking/go-shadowsocks2/default.nix4
-rw-r--r--pkgs/tools/package-management/nix/default.nix12
-rw-r--r--pkgs/tools/package-management/nixpkgs-review/default.nix24
-rw-r--r--pkgs/tools/security/nuclei/default.nix6
-rw-r--r--pkgs/tools/security/sigma-cli/default.nix3
-rw-r--r--pkgs/tools/system/runitor/default.nix14
-rw-r--r--pkgs/tools/text/ispell/default.nix4
-rw-r--r--pkgs/tools/text/ltex-ls/default.nix34
-rw-r--r--pkgs/tools/virtualization/cloud-init/default.nix1
-rw-r--r--pkgs/top-level/aliases.nix7
-rw-r--r--pkgs/top-level/all-packages.nix68
-rw-r--r--pkgs/top-level/coq-packages.nix2
-rw-r--r--pkgs/top-level/ocaml-packages.nix24
-rw-r--r--pkgs/top-level/perl-packages.nix7
-rw-r--r--pkgs/top-level/python2-packages.nix34
286 files changed, 8580 insertions, 7165 deletions
diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix
index de4b7a3176f68..ff7cce36712de 100644
--- a/pkgs/applications/audio/easyeffects/default.nix
+++ b/pkgs/applications/audio/easyeffects/default.nix
@@ -4,7 +4,7 @@
 , fetchFromGitHub
 , calf
 , fftwFloat
-, fmt
+, fmt_8
 , glib
 , gtk4
 , itstool
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "easyeffects";
-  version = "6.2.4";
+  version = "6.2.5";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "easyeffects";
     rev = "v${version}";
-    sha256 = "sha256-g/qN1Tafh71HdPLHW43Zva9MK6G+qxSnb1aRisuwdBw=";
+    sha256 = "sha256-LvTvNBo3aUGUD4vA04YtINFBjTplhmkxj3FlbTZDTA0=";
   };
 
   nativeBuildInputs = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     fftwFloat
-    fmt
+    fmt_8
     glib
     gtk4
     libadwaita
diff --git a/pkgs/applications/audio/myxer/default.nix b/pkgs/applications/audio/myxer/default.nix
deleted file mode 100644
index 5617282135546..0000000000000
--- a/pkgs/applications/audio/myxer/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv
-, lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, libpulseaudio
-, glib
-, pango
-, gtk3
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "myxer";
-  version = "1.2.1";
-
-  src = fetchFromGitHub {
-    owner = "Aurailus";
-    repo = pname;
-    rev = version;
-    sha256 = "0bnhpzmx4yyasv0j7bp31q6jm20p0qwcia5bzmpkz1jhnc27ngix";
-  };
-
-  cargoSha256 = "1cyh0nk627sgyr78rcnhj7af5jcahvjkiv5sz7xwqfdhvx5kqsk5";
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [ libpulseaudio glib pango gtk3 ];
-
-  # Currently no tests are implemented, so we avoid building the package twice
-  doCheck = false;
-
-  meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64);
-    description = "A modern Volume Mixer for PulseAudio";
-    homepage = "https://github.com/Aurailus/Myxer";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ erin ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index aff62e96576ae..481f151ed5617 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -18,13 +18,13 @@ let
 in
 pythonPackages.buildPythonApplication rec {
   pname = "picard";
-  version = "2.8";
+  version = "2.8.1";
 
   src = fetchFromGitHub {
     owner = "metabrainz";
     repo = pname;
     rev = "refs/tags/release-${version}";
-    sha256 = "sha256-DG5b3mw6AL4HSF3diGXOqIeH/eXGqLOsbcnPbD6kznE=";
+    sha256 = "sha256-KEKOouTNmmZiPyKo8xCQv6Zkreidtz2DaEbHjuwJJvY=";
   };
 
   nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index e59b03beba853..a5ca5775aae3f 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig
-, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr
-, gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk
+, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr
+, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk
 , at-spi2-core, libdbusmenu, libdrm, mesa
 }:
 
 let
   packages = [
-    stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3
-    fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr gconf nss
+    stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype
+    fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss
     xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
     xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
     xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index 0cee33fc81e4a..5ae2c51a8da06 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -767,16 +767,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    consult = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    consult = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "consult";
         ename = "consult";
-        version = "0.17";
+        version = "0.18";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/consult-0.17.tar";
-          sha256 = "16yrp6scxg93anxrp5nww08ixxqk8ra9dn9zm8w5dry997kmkasa";
+          url = "https://elpa.gnu.org/packages/consult-0.18.tar";
+          sha256 = "0nvi8f0jrji26sjmji8f7rvc8gr1zq49kliq39z7h970d8p10cx2";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ compat emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/consult.html";
           license = lib.licenses.free;
@@ -801,10 +801,10 @@
       elpaBuild {
         pname = "corfu";
         ename = "corfu";
-        version = "0.23";
+        version = "0.25";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/corfu-0.23.tar";
-          sha256 = "1l988jmvn3x1x77sc89pg5ivwl9i4r2v4k74ymkplgcc9wpffm1v";
+          url = "https://elpa.gnu.org/packages/corfu-0.25.tar";
+          sha256 = "1ix65l80q8id8vxkvx4wd780cav53lws2z1x3pnj4wmm0n4qwyd9";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -861,10 +861,10 @@
       elpaBuild {
         pname = "cpupower";
         ename = "cpupower";
-        version = "1.0.4";
+        version = "1.0.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/cpupower-1.0.4.tar";
-          sha256 = "12910d3qbkapr4bvqv88lr85fz6rkim0zrc24nxnvkhkh3yi8qvd";
+          url = "https://elpa.gnu.org/packages/cpupower-1.0.5.tar";
+          sha256 = "1hg5jwdkxl6mx145wwdmnhc8k3z3srvpm757kppj1ybmvjbpxx0y";
         };
         packageRequires = [];
         meta = {
@@ -921,10 +921,10 @@
       elpaBuild {
         pname = "csv-mode";
         ename = "csv-mode";
-        version = "1.19";
+        version = "1.20";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/csv-mode-1.19.tar";
-          sha256 = "0sslxlnw10ba6m711p4ps4zsfjz56dsp2945ga5z0y8d860pliqh";
+          url = "https://elpa.gnu.org/packages/csv-mode-1.20.tar";
+          sha256 = "08im1llz04s3ckpj3c3j4wxq4g00fyld2m8ylnh878ss5izzs0lg";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1037,6 +1037,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    detached = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "detached";
+        ename = "detached";
+        version = "0.7";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/detached-0.7.tar";
+          sha256 = "1a2w6cmzy7c861rih9k2qbnmizyybrs1kwqp6lbz3wfs2h0zisrw";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/detached.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     devdocs = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "devdocs";
@@ -1202,16 +1217,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    dtache = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    dtache = callPackage ({ detached, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "dtache";
         ename = "dtache";
-        version = "0.6";
+        version = "0.7";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dtache-0.6.tar";
-          sha256 = "1nv5hzn4rnm8pzfr5i209djaafj4ymg5j886yq2j19zkjadc8yx3";
+          url = "https://elpa.gnu.org/packages/dtache-0.7.tar";
+          sha256 = "0cws662f53f2j1viicrwijmniiqxz1n4mh6kwck25pl954xa61gf";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ detached emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/dtache.html";
           license = lib.licenses.free;
@@ -1326,10 +1341,10 @@
       elpaBuild {
         pname = "eev";
         ename = "eev";
-        version = "20220416";
+        version = "20220605";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eev-20220416.tar";
-          sha256 = "174hwb3cyiqimzcsl62yhq51hb4gxmj5wni6w5ng4m24bfkx87nc";
+          url = "https://elpa.gnu.org/packages/eev-20220605.tar";
+          sha256 = "1d8bmps72519hv3raqyjx1sbd7vmihckq8qrzd2v0rglx4smikdk";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1444,10 +1459,10 @@
       elpaBuild {
         pname = "embark";
         ename = "embark";
-        version = "0.16";
+        version = "0.17";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/embark-0.16.tar";
-          sha256 = "1fgsy4nqwl1cah287fbabpi9lwmbiyn36c4z918514iwr5hgrmfi";
+          url = "https://elpa.gnu.org/packages/embark-0.17.tar";
+          sha256 = "05r5z59sv0j4sawybd4353ziya87q6yzx4l8sjklybcn2mslpp1q";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1464,10 +1479,10 @@
       elpaBuild {
         pname = "embark-consult";
         ename = "embark-consult";
-        version = "0.5";
+        version = "0.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/embark-consult-0.5.tar";
-          sha256 = "1z4n5gm30yan3gg2aqwb1ygql56v9sg2px1dr0gdl32lgmn9kvg6";
+          url = "https://elpa.gnu.org/packages/embark-consult-0.6.tar";
+          sha256 = "1c8rx9ikazbnap293ab6s26djikdy85i7z330wdwwrgmipkfawaj";
         };
         packageRequires = [ consult emacs embark ];
         meta = {
@@ -1714,10 +1729,10 @@
       elpaBuild {
         pname = "fontaine";
         ename = "fontaine";
-        version = "0.2.1";
+        version = "0.2.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/fontaine-0.2.1.tar";
-          sha256 = "11g03gaiypqf0xi7s3xyjnbi2w154lkd7j0ybmn8scs6pbzdyl95";
+          url = "https://elpa.gnu.org/packages/fontaine-0.2.2.tar";
+          sha256 = "14q10r5086pyknpm8kd9f0scwwbgygqjp8b08k6a4f30a3pl3rqi";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2144,6 +2159,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    inspector = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "inspector";
+        ename = "inspector";
+        version = "0.5";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/inspector-0.5.tar";
+          sha256 = "19f2a0fw0zcrfirjhq7my910jiqxqkishyjprj87cahpksdp4cp9";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/inspector.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     ioccur = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "ioccur";
@@ -2558,10 +2588,10 @@
       elpaBuild {
         pname = "logos";
         ename = "logos";
-        version = "0.3.2";
+        version = "0.4.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/logos-0.3.2.tar";
-          sha256 = "1qpbp9f9lz7yrky42cq8b4k295593s7l892zsrdyifnqcgs50bfd";
+          url = "https://elpa.gnu.org/packages/logos-0.4.0.tar";
+          sha256 = "12yypzfd6lf71qyix0a1088vkamh9ilq8inpmv2882w3r5dii345";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2772,10 +2802,10 @@
       elpaBuild {
         pname = "modus-themes";
         ename = "modus-themes";
-        version = "2.3.0";
+        version = "2.4.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/modus-themes-2.3.0.tar";
-          sha256 = "028c1z4p1bbgf34fml4i0prihxn44x288iyprz9gxrp7x3gl05n8";
+          url = "https://elpa.gnu.org/packages/modus-themes-2.4.1.tar";
+          sha256 = "0wm4wj2dsv93p8yq7byrwni079caxny9cgn8d5xz0a6g1igqzx4q";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2821,10 +2851,10 @@
       elpaBuild {
         pname = "multishell";
         ename = "multishell";
-        version = "1.1.9";
+        version = "1.1.10";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/multishell-1.1.9.tar";
-          sha256 = "0gi5qmx27v7kaczr9b3sic69br3l7mcws3sdrs8c14iipcyl5qhb";
+          url = "https://elpa.gnu.org/packages/multishell-1.1.10.tar";
+          sha256 = "1ipn9rlh9jg55i04adjy32n8dkjhhw1bcd72w97mlsdk66g8j6l3";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -2931,10 +2961,10 @@
       elpaBuild {
         pname = "nano-modeline";
         ename = "nano-modeline";
-        version = "0.7";
+        version = "0.7.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nano-modeline-0.7.tar";
-          sha256 = "1fsjzbdawkn4vmk6zs6az1b42mx5ka7a618fgx5zdncr79wl0vjw";
+          url = "https://elpa.gnu.org/packages/nano-modeline-0.7.1.tar";
+          sha256 = "18a4mp27z6pj87yhp81x5a79g0kv6mzzd0axq2p31003r675l0hx";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2957,6 +2987,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    nftables-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "nftables-mode";
+        ename = "nftables-mode";
+        version = "1.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/nftables-mode-1.1.tar";
+          sha256 = "0wcd31frnvxzkns4jdfxraai0bfi1184wcn64r8lg73h933p47iz";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/nftables-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     nhexl-mode = callPackage ({ cl-lib ? null
                               , elpaBuild
                               , emacs
@@ -3130,10 +3175,10 @@
       elpaBuild {
         pname = "org";
         ename = "org";
-        version = "9.5.3";
+        version = "9.5.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-9.5.3.tar";
-          sha256 = "0i8lx7gsdz79qv0h3qdbwqd0m91z6ky33wjmkcbify75giixiv25";
+          url = "https://elpa.gnu.org/packages/org-9.5.4.tar";
+          sha256 = "1rcr1kyvd2l5h1i22z40x998jm4b6vk47i77y376blcrcx2dp26m";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3190,10 +3235,10 @@
       elpaBuild {
         pname = "org-remark";
         ename = "org-remark";
-        version = "1.0.4";
+        version = "1.0.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-remark-1.0.4.tar";
-          sha256 = "1mbsp92vw8p8l2pxs53r7wafrplrwfx0rmfk723cl9hpvghvl9vf";
+          url = "https://elpa.gnu.org/packages/org-remark-1.0.5.tar";
+          sha256 = "01pgfg9j5wrhggjklkc9nbfiwjd5qnmhcbcccc06jz3hmd0rnxr2";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -3265,10 +3310,10 @@
       elpaBuild {
         pname = "osm";
         ename = "osm";
-        version = "0.7";
+        version = "0.8";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/osm-0.7.tar";
-          sha256 = "0k2phmh2sl50vx88cgndghcjfz0i20mjs2hg4mlh4hb5q9yjpcj4";
+          url = "https://elpa.gnu.org/packages/osm-0.8.tar";
+          sha256 = "1vvd149n4pa6jy7xk5dmhi0nfwcjd4rvxn283f1jxp5jvv47m202";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3340,10 +3385,10 @@
       elpaBuild {
         pname = "parser-generator";
         ename = "parser-generator";
-        version = "0.1.5";
+        version = "0.1.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/parser-generator-0.1.5.tar";
-          sha256 = "06cl9whk321l1q5xcjmgq5c59l10ybwcdsmmbrkrllnbpqxy23bj";
+          url = "https://elpa.gnu.org/packages/parser-generator-0.1.6.tar";
+          sha256 = "0qql5klnh8fbnbkb4mhv6axxvw4qv09cy1h556m0qzg30sckxas1";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3400,10 +3445,10 @@
       elpaBuild {
         pname = "phps-mode";
         ename = "phps-mode";
-        version = "0.4.20";
+        version = "0.4.22";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/phps-mode-0.4.20.tar";
-          sha256 = "0xb4i3s6yira1kfqwrs72ajvpqc6pw7gqlxmfmdhyyvib6p93l6m";
+          url = "https://elpa.gnu.org/packages/phps-mode-0.4.22.tar";
+          sha256 = "1094dmvihx0ff7fyjldd2zfn47nq89p6bjp90ma0xf01hf6ggn6c";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3535,10 +3580,10 @@
       elpaBuild {
         pname = "pyim";
         ename = "pyim";
-        version = "4.2.0";
+        version = "4.2.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/pyim-4.2.0.tar";
-          sha256 = "1yb6yv92987kq0ls38d0fqwbj5jrf4cg3jvdbwjzr61gg3izf414";
+          url = "https://elpa.gnu.org/packages/pyim-4.2.1.tar";
+          sha256 = "15hsz1ji8xa7zqzzmbi0vk95vgsvl4dsd1rann04vfaz30a1rdzv";
         };
         packageRequires = [ async emacs xr ];
         meta = {
@@ -3550,10 +3595,10 @@
       elpaBuild {
         pname = "pyim-basedict";
         ename = "pyim-basedict";
-        version = "0.5.0";
+        version = "0.5.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.0.tar";
-          sha256 = "0h946wsnbbii32kl2kpv0k1kq118ymvpd5q1mphfsf126dz9sv78";
+          url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.3.tar";
+          sha256 = "1x3zmcbp5yck5dxfms8d9ym0fdbvwr40fn8wrq0qfl9a58k8i5bx";
         };
         packageRequires = [];
         meta = {
@@ -3815,10 +3860,10 @@
       elpaBuild {
         pname = "rec-mode";
         ename = "rec-mode";
-        version = "1.8.3";
+        version = "1.8.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rec-mode-1.8.3.tar";
-          sha256 = "0lkmvvdj4xx3qhxqggizrcdawav0accyrza2wmhfdq88g2zh5575";
+          url = "https://elpa.gnu.org/packages/rec-mode-1.8.4.tar";
+          sha256 = "03n0g6inhj0mqqcqimh6nfi6rdzgh4w59vdjicvn880r5n8zwn4d";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4260,10 +4305,10 @@
       elpaBuild {
         pname = "sql-beeline";
         ename = "sql-beeline";
-        version = "0.1";
+        version = "0.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sql-beeline-0.1.tar";
-          sha256 = "0yvj96aljmyiz8y6xjpypqjfrl1jdcrcc4jx4kbgl6mkv4z2aq1g";
+          url = "https://elpa.gnu.org/packages/sql-beeline-0.2.tar";
+          sha256 = "1bqzs53x506bzgchvjfr1ljqxbb9y041n7aj9n7ajb2634i7lllr";
         };
         packageRequires = [];
         meta = {
@@ -4301,6 +4346,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    srht = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
+      elpaBuild {
+        pname = "srht";
+        ename = "srht";
+        version = "0.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/srht-0.1.tar";
+          sha256 = "1cdylp2hma83iv062nf7qyz21a3r8562gwx2lk6cf45k2kh3hbv8";
+        };
+        packageRequires = [ emacs plz ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/srht.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     ssh-deploy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "ssh-deploy";
@@ -4553,10 +4613,10 @@
       elpaBuild {
         pname = "tmr";
         ename = "tmr";
-        version = "0.2.3";
+        version = "0.3.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tmr-0.2.3.tar";
-          sha256 = "0lys6g96cvfyhwr7z0yv9cx2ykzyixjppv5fh29qzq3h3dywx5wb";
+          url = "https://elpa.gnu.org/packages/tmr-0.3.0.tar";
+          sha256 = "1cv90hg7hsaffkcxryp9d5cyjvmfpxcmrw5knipad77yxzaf4s6b";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4583,10 +4643,10 @@
       elpaBuild {
         pname = "tramp";
         ename = "tramp";
-        version = "2.5.2.4";
+        version = "2.5.2.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tramp-2.5.2.4.tar";
-          sha256 = "0ap1d34p1akrrm8z1r7ln6mj13xg2nrvjln2v3g8plhhp354jldz";
+          url = "https://elpa.gnu.org/packages/tramp-2.5.2.5.tar";
+          sha256 = "05f59x7jl4m187y2cidhnfz7p8q85gav4xpipazfvm5dicxz4j7c";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4802,10 +4862,10 @@
       elpaBuild {
         pname = "vc-got";
         ename = "vc-got";
-        version = "1.1";
+        version = "1.1.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vc-got-1.1.tar";
-          sha256 = "1myck30ybq8ggf4yk3s2sqjqj8m1kfl8qxygkk3ynfa6jxxy4x1r";
+          url = "https://elpa.gnu.org/packages/vc-got-1.1.1.tar";
+          sha256 = "0f8rwd4scvlyn9i9xq7d2sly7r0ddzi8z565jx1h2lkcs5nbihcb";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4894,10 +4954,10 @@
       elpaBuild {
         pname = "vertico";
         ename = "vertico";
-        version = "0.23";
+        version = "0.24";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vertico-0.23.tar";
-          sha256 = "1d2r2y1bhvipn4xqzla5rv09cdpg7f19m9hrnv1pqypjvbgqv1m2";
+          url = "https://elpa.gnu.org/packages/vertico-0.24.tar";
+          sha256 = "17vsx1yijx9clly977lvc6y296kq8g859hqwwq1v8zh4k0wqr9hc";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4947,10 +5007,10 @@
       elpaBuild {
         pname = "visual-filename-abbrev";
         ename = "visual-filename-abbrev";
-        version = "1.1";
+        version = "1.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.1.tar";
-          sha256 = "1l2wq7q28lcl78flxqvsxc9h96whpynqq8kpmbiy3nzlw2mrgr8g";
+          url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.2.tar";
+          sha256 = "0sipyqrgf723ii2zd6r8hvihn5kax5qd0dwwrrxqy6f58wnhyq1r";
         };
         packageRequires = [ emacs ];
         meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
index f85120c0c21d1..b3303d3dfd698 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -49,10 +49,10 @@
       elpaBuild {
         pname = "annotate";
         ename = "annotate";
-        version = "1.5.4";
+        version = "1.6.0";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/annotate-1.5.4.tar";
-          sha256 = "1d11q4ddc2rw7n8jrxdddc5h42hf16sbc1l4v6zmmsriahxhgfdd";
+          url = "https://elpa.nongnu.org/nongnu/annotate-1.6.0.tar";
+          sha256 = "12843875nvrw5cs2pzag9i2k4vgajbs4rr56js7h6mx9w6jmg8hc";
         };
         packageRequires = [];
         meta = {
@@ -258,10 +258,10 @@
       elpaBuild {
         pname = "cider";
         ename = "cider";
-        version = "1.4.0";
+        version = "1.4.1";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/cider-1.4.0.tar";
-          sha256 = "11a3ysvrywp79pp1yivpsgi8azgzbg7ayiai94p1dyd3viy29qn0";
+          url = "https://elpa.nongnu.org/nongnu/cider-1.4.1.tar";
+          sha256 = "0l36pqmjqzv6ykmw593h6qd24pygq7171qfinvlp2fh8897ac2nj";
         };
         packageRequires = [
           clojure-mode
@@ -325,6 +325,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    corfu-terminal = callPackage ({ corfu
+                                  , elpaBuild
+                                  , emacs
+                                  , fetchurl
+                                  , lib
+                                  , popon }:
+      elpaBuild {
+        pname = "corfu-terminal";
+        ename = "corfu-terminal";
+        version = "0.4";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.4.tar";
+          sha256 = "1rmfj2lzdab2s49k9ja79i7xcw74r9cr5kv7rgrisqxwgcnvsi95";
+        };
+        packageRequires = [ corfu emacs popon ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/corfu-terminal.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     crux = callPackage ({ elpaBuild, fetchurl, lib, seq }:
       elpaBuild {
         pname = "crux";
@@ -598,16 +618,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-matchit = callPackage ({ elpaBuild, emacs, evil, fetchurl, lib }:
+    evil-matchit = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "evil-matchit";
         ename = "evil-matchit";
-        version = "2.4.4";
+        version = "3.0.0";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-matchit-2.4.4.tar";
-          sha256 = "1p8xsi0068wabsfn3jwhyinkk2684xp9hlapcbj6y58wkpzqj0f6";
+          url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.0.tar";
+          sha256 = "036zf7l8pkhbyk7gz91r00v4fqi2wfdnqv95xkh7jpm2i9xcgg5p";
         };
-        packageRequires = [ emacs evil ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/evil-matchit.html";
           license = lib.licenses.free;
@@ -673,6 +693,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flymake-popon = callPackage ({ elpaBuild
+                                 , emacs
+                                 , fetchurl
+                                 , flymake ? null
+                                 , lib
+                                 , popon
+                                 , posframe }:
+      elpaBuild {
+        pname = "flymake-popon";
+        ename = "flymake-popon";
+        version = "0.2";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.2.tar";
+          sha256 = "08wpfia4q12nhc6l0xmdc54f1s73c0ds6hxwgkk5hjw906rpgn4a";
+        };
+        packageRequires = [ emacs flymake popon posframe ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/flymake-popon.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     forth-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "forth-mode";
@@ -1270,10 +1311,10 @@
       elpaBuild {
         pname = "kotlin-mode";
         ename = "kotlin-mode";
-        version = "1.0.0";
+        version = "2.0.0";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/kotlin-mode-1.0.0.tar";
-          sha256 = "0ajnnsh6a8psfh7gd34d2wfii08jxr7x7k6na0assjldsxy7afwj";
+          url = "https://elpa.nongnu.org/nongnu/kotlin-mode-2.0.0.tar";
+          sha256 = "0q1pfjcsk6c17hs5xg7wb6f4i29hn3zxgznjcr3v11dm4xmrj9iv";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1524,14 +1565,29 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-auto-tangle = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "org-auto-tangle";
+        ename = "org-auto-tangle";
+        version = "0.4.1";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.4.1.tar";
+          sha256 = "169i1agnv66gkpgn5wxxri42610n2dp1gz9bfafk2n2a8b08mhn1";
+        };
+        packageRequires = [ async emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/org-auto-tangle.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
       elpaBuild {
         pname = "org-contrib";
         ename = "org-contrib";
-        version = "0.3";
+        version = "0.4";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/org-contrib-0.3.tar";
-          sha256 = "0fqhyby7624drskfsasgvzyxbgjb42rd6vw8l6xgb3h22kaprl0q";
+          url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.tar";
+          sha256 = "05r7w0h9v1vfhv1dd2vaabq2gm8ra70s1cirlp75s343b0z28ca6";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -1579,10 +1635,10 @@
       elpaBuild {
         pname = "org-mime";
         ename = "org-mime";
-        version = "0.2.6";
+        version = "0.3.1";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/org-mime-0.2.6.tar";
-          sha256 = "1l6mniyhmw3vbkvahw24038isd4ysbx505c3r0ar1rh7fbdf58cf";
+          url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.1.tar";
+          sha256 = "0dm7addyc98kh1lm4d8x7nvnkh6bwkw300ms2zlwm1ii91jzfkkg";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1745,6 +1801,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    popon = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "popon";
+        ename = "popon";
+        version = "0.4";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/popon-0.4.tar";
+          sha256 = "1c3brjhkdnpawi8jsc20jvhc1vl3l39da12rn3lfx2bfxvjvz76w";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/popon.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     popup = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "popup";
@@ -1918,10 +1989,10 @@
       elpaBuild {
         pname = "shellcop";
         ename = "shellcop";
-        version = "0.0.9";
+        version = "0.1.0";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/shellcop-0.0.9.tar";
-          sha256 = "0rv98s3w3pd2l477100d8kn2kqx21xn3axzcfbxbkgl8bc78mvci";
+          url = "https://elpa.nongnu.org/nongnu/shellcop-0.1.0.tar";
+          sha256 = "0z0aml86y1m11lz8a8wdjfad5dzynjsqw69qin0a4vv2b8gy8mhr";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2064,6 +2135,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    swsw = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "swsw";
+        ename = "swsw";
+        version = "2.1.1";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/swsw-2.1.1.tar";
+          sha256 = "0k6cysa4pmxv1kmpn0fqvardbdfayj92cq0r3gxrx9pgqxlqwfix";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/swsw.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     systemd = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "systemd";
@@ -2209,10 +2295,10 @@
       elpaBuild {
         pname = "vc-fossil";
         ename = "vc-fossil";
-        version = "20210928";
+        version = "20220707";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/vc-fossil-20210928.tar";
-          sha256 = "0n4h1cj1336mv5cswq0139bkry5gnv4hrrwzd4bqhrxp5kbhqa5y";
+          url = "https://elpa.nongnu.org/nongnu/vc-fossil-20220707.tar";
+          sha256 = "0l33y8mij6rw4h47ryqpjxr1i2xzis98rbi230izkvsc6w7qf89q";
         };
         packageRequires = [];
         meta = {
@@ -2220,14 +2306,29 @@
           license = lib.licenses.free;
         };
       }) {};
+    vcomplete = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "vcomplete";
+        ename = "vcomplete";
+        version = "1.2.1";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/vcomplete-1.2.1.tar";
+          sha256 = "1fcchgv4kdmhzgincfy1jm625lwj3qrjskd0cswag5z15by6b5xf";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vcomplete.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     visual-fill-column = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "visual-fill-column";
         ename = "visual-fill-column";
-        version = "2.4";
+        version = "2.5";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.4.tar";
-          sha256 = "0100v17s9w9nqjpr7h3zianfy1i4i71idk2qrlzqzcd8qn1m3vjx";
+          url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.5.tar";
+          sha256 = "0mqhm7xkxpzjk96n6qybqg2780kbjg1w7ash88zhnbp8kvy0rrwi";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2239,10 +2340,10 @@
       elpaBuild {
         pname = "web-mode";
         ename = "web-mode";
-        version = "17.2.0";
+        version = "17.2.2";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.0.tar";
-          sha256 = "15m7rx7sz7f6h0x90811bcl8gdcpn216ia48nmkqhqrm85synlja";
+          url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.2.tar";
+          sha256 = "19ajwjcxv7vqysk085jyys77vry8nw7rzc7c43khyxb54qvg36i3";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2337,10 +2438,10 @@
       elpaBuild {
         pname = "xah-fly-keys";
         ename = "xah-fly-keys";
-        version = "17.7.20220429090059";
+        version = "17.13.20220526011611";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.7.20220429090059.tar";
-          sha256 = "006lqjx88b0g0szxai82qdn3bv8qajp2x281arpmp3rpb7faggvq";
+          url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.13.20220526011611.tar";
+          sha256 = "1lg8805s5y61jr6yrm44zdjm0nad6adc5xr78zm0i0qzigbhhdcq";
         };
         packageRequires = [ emacs ];
         meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
index bc3466f4890f6..fdf580cd81a74 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -273,8 +273,8 @@
     20210923,
     950
    ],
-   "commit": "0d6aace2ffd184137618a0c6e7f29826cbd8d1f9",
-   "sha256": "1rf989ll07xqmamdigzqmamhfscx7wk0xh5yaqam1q3hj13yywm5"
+   "commit": "9c8c26c0de493f21cf4a68abad49f944d427bd88",
+   "sha256": "18lidpmi0sp9za6ykidgnssdvnx1p7kyr51k4b21cqjrnal606zl"
   }
  },
  {
@@ -939,8 +939,8 @@
  },
  {
   "ename": "ac-math",
-  "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",
-  "sha256": "02c821zabxp9qkwx252pxjmssdbmas0iwanw09r03bmiby9d4nsl",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "16qsbx65q8z6dsq7z1mvfqw2bjwdrnhsfsc0sl8awm5f4463bi10",
   "fetcher": "github",
   "repo": "vspinu/ac-math",
   "unstable": {
@@ -1810,8 +1810,8 @@
  },
  {
   "ename": "ado-mode",
-  "commit": "337f21eb8f4af233b4c0bc658cd82e8479b49aaa",
-  "sha256": "1gybsnj7s21vm1iakz4hy5d6skzcfi6455wnikv9dpwy1069rw32",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "0x070d95krvmq08hknclx8qj8zsm2afmiw3nv891ks8dg211glnj",
   "fetcher": "github",
   "repo": "louabill/ado-mode",
   "unstable": {
@@ -1834,20 +1834,20 @@
  },
  {
   "ename": "adoc-mode",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "0jd3zr4zpb4qqn504azl0y02cryv7n9wphv64b0fbpipr7w5hm2c",
+  "commit": "221950c9703432a8e3c2a99f2cc709dff7bcbdbb",
+  "sha256": "13d2mj9bf9z5ky7gi1dajky210h1kzr2bh1vvl5cvq7slsrjfazi",
   "fetcher": "github",
-  "repo": "sensorflo/adoc-mode",
+  "repo": "emacsorphanage/adoc-mode",
   "unstable": {
    "version": [
-    20160314,
-    2130
+    20220529,
+    551
    ],
    "deps": [
     "markup-faces"
    ],
-   "commit": "745884359a1b8826ede2c4cfd2f0b5478953ac40",
-   "sha256": "199da15f6p84809z33w3m35lrk9bgx8qpgnxsxgisli373mpzvd8"
+   "commit": "cacd4e8f6773da85ebe17b733eb5e74f2f7c379c",
+   "sha256": "08w8xirp2frkap74d646j6pbaby72j1233hlz0nk3pzlh0lglzc0"
   },
   "stable": {
    "version": [
@@ -1893,14 +1893,14 @@
   "repo": "minad/affe",
   "unstable": {
    "version": [
-    20220407,
-    2313
+    20220603,
+    548
    ],
    "deps": [
     "consult"
    ],
-   "commit": "a61d593d0cbff65a93111be96b9f53d3e640cf8d",
-   "sha256": "1pkqr7asz6h4gjkrg8mc8qikxy4agiv0x6ragbasy0xm3q4wxm0h"
+   "commit": "e8cb221892ae4d82fc52fffb72b45b5b89ada334",
+   "sha256": "0gwg60c3f2ypjwpai3j4dhzdjn29lxskf3s0nw75pnipngf0sh9r"
   },
   "stable": {
    "version": [
@@ -2062,11 +2062,11 @@
   "url": "https://bitbucket.org/agriggio/ahg",
   "unstable": {
    "version": [
-    20210412,
-    847
+    20220529,
+    1200
    ],
-   "commit": "77bc2a628df006dcd2dc359ac12acdf8091a1356",
-   "sha256": "1wmvz9d40aznqh2y078v8k7n3l66m48vnf873vifi8rwg6158kqh"
+   "commit": "d93cc73f79f6c29d533c468112181cd4c7b11935",
+   "sha256": "1jq411g0ryxkqw4wig6mlm0dpjzx87cw3x277bcj796s3nxl95ln"
   }
  },
  {
@@ -2489,11 +2489,11 @@
   "repo": "domtronn/all-the-icons.el",
   "unstable": {
    "version": [
-    20220427,
-    1911
+    20220521,
+    816
    ],
-   "commit": "68365b48f142d75ef4bdc3a274256d97752e3b65",
-   "sha256": "1nf6z5i9gpbv1qdrm7r0qb0mbzipdn9mnfwc478rrazmn2l0m5cs"
+   "commit": "ca1ef30004d3fb76aaa70bd47cb83e9fe017a7f7",
+   "sha256": "149i1wh2wk4j6x8zyz8macz6pfhkmpvf9j6xqhn3psnbdpikjvqp"
   },
   "stable": {
    "version": [
@@ -2641,15 +2641,15 @@
   "repo": "seagle0128/all-the-icons-ivy-rich",
   "unstable": {
    "version": [
-    20220510,
-    752
+    20220607,
+    1820
    ],
    "deps": [
     "all-the-icons",
     "ivy-rich"
    ],
-   "commit": "7c382ccbc8b1b2d0e18d280b24ee2029dca070d8",
-   "sha256": "0145agd3kg1m7ylishf4ypg6bc01jrps17rwxw0kdqrh3gp7xvg3"
+   "commit": "e489b08aeae53c0288474495b5c0e6847ba1005d",
+   "sha256": "150p4aqg7dd3k277518ia3zsjkyn8f8a5msmgh9x812gypcrgcpm"
   },
   "stable": {
    "version": [
@@ -2715,8 +2715,8 @@
     20220212,
     1526
    ],
-   "commit": "45deed4b9aadcd5e2a5482b0fe5110bb78ba1dd6",
-   "sha256": "0g77kdr0lhv2w4gdcmc2bf4ix5kpjg9g358v0kjn26gr36m843j6"
+   "commit": "e79c3762130749b02689d1274adce8b93aac9b7a",
+   "sha256": "0vpcran6yxp9vyy9xhwc9kj7hw3shsvz6igy4yvj0i4xkpkib4p8"
   },
   "stable": {
    "version": [
@@ -2846,14 +2846,14 @@
   "url": "https://repo.or.cz/amread-mode.git",
   "unstable": {
    "version": [
-    20220210,
-    1354
+    20220519,
+    45
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "a3358645582148e81bff54e18877451b747173bb",
-   "sha256": "0nl1w5ysq90bxl16jrdh87wyp6ffawbjc3c6zrbhsfmfd24jiq28"
+   "commit": "21f3cf796c08625cf70d534a990f4ae2273a5d4f",
+   "sha256": "1rs5ybxh779fzb2xr0y8rhh4qzdpgrfgir4r81rpfxyhksls88xx"
   }
  },
  {
@@ -3229,11 +3229,11 @@
   "repo": "bastibe/annotate.el",
   "unstable": {
    "version": [
-    20220428,
-    1339
+    20220603,
+    1023
    ],
-   "commit": "e982a7b74a681a8c2c823d8dcaafd185ab5f719e",
-   "sha256": "13vnc9qkz2n121yf482sj19daxa262pnp49cy8p5cvrr75narh1r"
+   "commit": "7f48fad362b15546da7b015b533609a2452497b0",
+   "sha256": "01kv6bjsnsarnmmy7jrbs74q1pdabz2k4p0330hcny7nl9xp51jj"
   },
   "stable": {
    "version": [
@@ -3271,8 +3271,8 @@
     20200914,
     644
    ],
-   "commit": "9a5f2b4a8cd14edbde9d16dcdfcb8db2a91be0d8",
-   "sha256": "1pn3w2prmz9ibhy5l22c6mmccr7lfy561gkd2s41hlcjsyd4ar00"
+   "commit": "6385f850a185523bb5241a71f5a7614a148f6b53",
+   "sha256": "0dllhhbr265dm12nkiil0s7cb24l7pjdjgfwgcsy98imn8pl8z4p"
   },
   "stable": {
    "version": [
@@ -3624,19 +3624,19 @@
   "repo": "radian-software/apheleia",
   "unstable": {
    "version": [
-    20220512,
-    1952
+    20220604,
+    2239
    ],
-   "commit": "b5dbab53eadf64529a0bfe217c7750f1d7d85fce",
-   "sha256": "1w7x7k5mrvp5yq5ppq9zps5z2c7h67yjxyaxcvbkjibvswb0c616"
+   "commit": "67853e98b190cc735a8ad31bd1de64f76f2990c4",
+   "sha256": "1jbidfz0s7lz190hzwvj7qxh2f3lmbwaynqrarr183pksja4jqwc"
   },
   "stable": {
    "version": [
-    2,
+    3,
     0
    ],
-   "commit": "84b04329d7c0ddf41e41433b3f732714995a2bfd",
-   "sha256": "0kd0aydpfvxzq8qc6cknx11hcc6vwp7lxzjwbkcr5w4jynza59v1"
+   "commit": "18ccacc5cf0806ecf11d0a3d462de1803e46a9ad",
+   "sha256": "0fpqh4wv69msfsnv3k88cai3nbja70ab5c02xf8gwfgg3613pjdd"
   }
  },
  {
@@ -3741,8 +3741,8 @@
     20210802,
     1715
    ],
-   "commit": "ea9a32aa33580b0695e7298d56c3d5f050a02b87",
-   "sha256": "13wm9g184lxzf55cwx1cc88d5a17yghbfqsqvyihsb7yv2i2xg8i"
+   "commit": "9b84a7cb74d687745df37ba15113933fc6256274",
+   "sha256": "0ng2wzfmardlfjga60850izq7xh22qcc1i69n4ap6f74s334k8iq"
   },
   "stable": {
    "version": [
@@ -3892,11 +3892,11 @@
   "repo": "nbarrientos/archive-rpm",
   "unstable": {
    "version": [
-    20220314,
-    1647
+    20220527,
+    632
    ],
-   "commit": "515d2230352fffcc982ae2e322d95cbee6aca760",
-   "sha256": "1x8mwhfwcpbwaha5qb5hnl6ga29cbi27a26m0q4840agpr53s1km"
+   "commit": "cb48fee04cb0cbb26f760a3b95649f7dac78c6ec",
+   "sha256": "088rcqlwhdcaal99cbwsfg93nvzil2kix28zib2lxv6lfapjpzwp"
   },
   "stable": {
    "version": [
@@ -4036,6 +4036,25 @@
   }
  },
  {
+  "ename": "arxiv-citation",
+  "commit": "92d5032fee7e103ccf1517b7bbc18e4c5059eba7",
+  "sha256": "1n5v28s071gdgd6yzv0ywa9vhkc2x21ax3b3b1x7z3y8xvqwrr2s",
+  "fetcher": "gitlab",
+  "repo": "slotThe/arxiv-citation",
+  "unstable": {
+   "version": [
+    20220601,
+    652
+   ],
+   "deps": [
+    "dash",
+    "s"
+   ],
+   "commit": "ce4bf6958109b3b15bfc3f808ba4882b41fcb3ff",
+   "sha256": "0q74qgsdy2dahzvxlv9mayd6f6fgyf1q4lf6gvwc0xm9ms5qwf4c"
+  }
+ },
+ {
   "ename": "arxiv-mode",
   "commit": "1207f9108fae0bdb11b74971dbb6b6d9ec25e5c0",
   "sha256": "01am6h9h2m0fqsmxgk9c36jwraznh5wp2k1ajmwawplx4cshhx1x",
@@ -4280,10 +4299,10 @@
  },
  {
   "ename": "async-backup",
-  "commit": "79cfb4a1c6b89cc5d93020089804b5e6ae711387",
-  "sha256": "0w56q76x2b31adhjjsqm38jfgxi2305s9lxvwbq8w13693i5fv8a",
+  "commit": "4f3fa2076ce777618f2982a7ba69b497d68aebc3",
+  "sha256": "1m1kj4bj1a9514pprd43i15bgshkm1lcqq44h7grg8pxxxks1xxw",
   "fetcher": "git",
-  "url": "https://tildegit.org/contrapunctus/async-backup.git",
+  "url": "https://codeberg.org/contrapunctus/async-backup.git",
   "unstable": {
    "version": [
     20220131,
@@ -4336,8 +4355,8 @@
     20201026,
     339
    ],
-   "commit": "43ca538ecece4e14bb9bcd887854aeb14b3d45f4",
-   "sha256": "05l6wbhyh2jy5cqmy0b3bg5klafcc1fcfp5944r9wdah0lpg169k"
+   "commit": "d407daa17e0557f366d485c7c39880d2cd19938a",
+   "sha256": "1hmf0n6gm95ajr15s3vmd1ybk28zklna2n5xp0hrn9q5vj6wv7a5"
   },
   "stable": {
    "version": [
@@ -4360,8 +4379,8 @@
     20210731,
     609
    ],
-   "commit": "e0d11744d9b2bca780322b1b282fb5ffb18cfd75",
-   "sha256": "1va7fhh4ppb9aily009m6nf43z5l8fdwinsqy46qj81w5apmbpg5"
+   "commit": "bac60d0c76f0fe48b5f634502c79e87d7ab057b6",
+   "sha256": "1yldbkxywmybzv80ynisklzl8qyb7xb5wxlb4q7i355v6654ciap"
   },
   "stable": {
    "version": [
@@ -4661,8 +4680,8 @@
     "keytar",
     "s"
    ],
-   "commit": "5c6f0952f28ce722f4a75139f3dc1afc99e12396",
-   "sha256": "0v83s1gfyh1zbaaqgj2q9vg193k705kr18mszp6p8rdyffdw5fqi"
+   "commit": "66ee3b73b7739fd35d848fabbeec0b2c44b0b532",
+   "sha256": "16gkm4ysh0pgg9ag0b6q4xpx8mr1gk6sghr236hjkvjvca5b85sj"
   },
   "stable": {
    "version": [
@@ -4767,15 +4786,15 @@
   "repo": "emacscollective/auto-compile",
   "unstable": {
    "version": [
-    20220422,
-    1600
+    20220517,
+    1501
    ],
    "deps": [
     "compat",
     "packed"
    ],
-   "commit": "16de66c381dab3c1fb7bc248e0f81ef68966bd7d",
-   "sha256": "0ls5n124rl8s3dyj0kr7n1sv3dkn9bw7k61s2f2ads43gp3744qp"
+   "commit": "b204e2f85aaa4d41af4eb1819633c9613f5172bf",
+   "sha256": "0wqiypznwg7pcqb1qvf4ba2kx4f8x01ms8zxbxy134j9idm4g39f"
   },
   "stable": {
    "version": [
@@ -4805,8 +4824,8 @@
     "cl-lib",
     "popup"
    ],
-   "commit": "d546b18c3e83e38686d9b7316c6c705597e1a8b3",
-   "sha256": "1fwg2zn7digz22vf22h4kim3wkz2i2wvs42ak12lxg8aa3w6wn94"
+   "commit": "72c44902f893bfffe4ff0075e992541d79cfbb5d",
+   "sha256": "0rbawimh6540mj0m0xapj7swhz119921vdwgvxrvpyd8n3alww4g"
   },
   "stable": {
    "version": [
@@ -5148,8 +5167,8 @@
    "deps": [
     "ht"
    ],
-   "commit": "e31a2d2bb97ffcbeb493f3501311b30c3f10952f",
-   "sha256": "0md8dlx1g5lxb4f5yxhm617kj49zysya9y6awjrvpj30crp78g5z"
+   "commit": "26ad2261866d19994f8927002dcc53a80540ffd3",
+   "sha256": "0zakrvsnbliv0rsm6pm0d98bpf1llbl97cw8r55g7g8r79mjjxrp"
   },
   "stable": {
    "version": [
@@ -5298,8 +5317,8 @@
     20210805,
     1344
    ],
-   "commit": "85b02fa6ce76ab872c025a82c2f14614af3d89e1",
-   "sha256": "1rnigp11xlxhzrfwqna0dqrd0a655gs0qf5m6bkzq41ssdvvdis8"
+   "commit": "ba5e28cd4ca7515f7d7a8c243f913d571ca976d6",
+   "sha256": "00cv35q52nprj12396c1447bpbi710sapqw3s9v5jm5m3x7w4z9m"
   },
   "stable": {
    "version": [
@@ -5503,11 +5522,11 @@
   "url": "https://git.sr.ht/~pkal/autocrypt",
   "unstable": {
    "version": [
-    20220215,
-    1204
+    20220526,
+    1846
    ],
-   "commit": "c439cbe029f7ffeca6de0ea72258069c41350509",
-   "sha256": "1r7qan2v3kaykacnf98s2zcfb5ryk4jqpw7acrfvajgvdn3w03sh"
+   "commit": "5fae83ac0501a26c92e022218341c21cc71e463c",
+   "sha256": "01ib6lzywssm81mwi72aaavkp078kkbgvnhi0gl09vgn2pba78va"
   }
  },
  {
@@ -5567,8 +5586,8 @@
     20190331,
     2230
    ],
-   "commit": "09166f32d3ece2b297da036f0abbeba63329580e",
-   "sha256": "09j3mxa0803piywmfkvxg0jpgbx6qbvibsik8wsms898bg5n3s4d"
+   "commit": "7725c08f00a463ba7210efcb759c934223c85b00",
+   "sha256": "1dqascm5ds9jzp4m4hdb4l9wwfcnkc1ba3y4m24ybx43gjj38sxn"
   }
  },
  {
@@ -5711,20 +5730,20 @@
     "avy",
     "embark"
    ],
-   "commit": "81c7f751be1de33dee9f7523fd3429ee3fe9a0d1",
-   "sha256": "11yvhhq251qmbnljjcfxnc53dqa63jm6ximfd0618hcwcgxlkkdc"
+   "commit": "63f0d4dc09afb058450dc10dd3916027a93ee487",
+   "sha256": "0q8l4ckdmcagiiccvb0s94gc1lywgqh02d8p16ygpcfxz8967w4a"
   },
   "stable": {
    "version": [
     0,
-    16
+    17
    ],
    "deps": [
     "avy",
     "embark"
    ],
-   "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b",
-   "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv"
+   "commit": "97270d725761ee02db461b45b18ec16ae31f203e",
+   "sha256": "1s0ssf4q9kg4c5w87h2ypyvrhi31mz3s6k4h7pxi9a47lkccq8n1"
   }
  },
  {
@@ -5925,8 +5944,8 @@
     20220512,
     1931
    ],
-   "commit": "b52fa715285e7ad182c8e679ebf05b130dd5b5e2",
-   "sha256": "1hb4npfpg1iy9j0p29q1jrjgx0mrn333m45nmsnxw8nlaxzd97x6"
+   "commit": "847cc6e728b692ad3fdaec28d0c8c49ec0378a56",
+   "sha256": "02nf2vn6s6pc63yw2rggdx9capn9432w6j56m9v0c5ygarpxb53p"
   }
  },
  {
@@ -6271,25 +6290,25 @@
  },
  {
   "ename": "base16-theme",
-  "commit": "30862f6be74882cfb57fb031f7318d3fd15551e3",
-  "sha256": "115dhr3gfvdz5wv76fwpv3b4dywiwbk69qrhkfhij8vpcfybrpzx",
+  "commit": "a91349e3285531fd7040b8bf192c15cccbcac8d1",
+  "sha256": "1j49gan9i0wqr2zvc23811yiv72gyiwiqyf4jckik4vcfx3gsk1f",
   "fetcher": "github",
-  "repo": "belak/base16-emacs",
+  "repo": "base16-project/base16-emacs",
   "unstable": {
    "version": [
-    20220510,
-    423
+    20220526,
+    1015
    ],
-   "commit": "43f3257aaf53e9c50f5db11b81fd66ec41ab2883",
-   "sha256": "07k73bgjb6ixfgbiwf8zswf6n0kb3bf1ka1pcv88h3a9hhndvgv5"
+   "commit": "26b84fc93505219517a512eb01e6370365174989",
+   "sha256": "0qp71j77zg8gippcn277s0j5a9n6dbwv3kdp2nya6li4b412vgba"
   },
   "stable": {
    "version": [
-    2,
-    4
+    3,
+    0
    ],
-   "commit": "7b2bb8d05562fa8d75366e82eef895c03ab7b31c",
-   "sha256": "1jgqq52q2q7sgf46xip0sfpwyi8k43v2l688hx7p0whncjhd7cmr"
+   "commit": "26b84fc93505219517a512eb01e6370365174989",
+   "sha256": "0qp71j77zg8gippcn277s0j5a9n6dbwv3kdp2nya6li4b412vgba"
   }
  },
  {
@@ -6300,11 +6319,11 @@
   "repo": "szermatt/emacs-bash-completion",
   "unstable": {
    "version": [
-    20220328,
-    844
+    20220531,
+    1104
    ],
-   "commit": "29b5fc860a5b0db9828acfceca09b773fbdb8e8a",
-   "sha256": "1gj62v4j3s21kbm1zapb7scv1zh4q9k1jjpgrr4wy0fqk7gzfprq"
+   "commit": "8e9c20dbfe01d8bf6c61db231593623a201c75c6",
+   "sha256": "1jq6nx5kpln15yv0k9njql8xl7id7yswdl7hkkbwha99i1cn0nqd"
   },
   "stable": {
    "version": [
@@ -6534,8 +6553,8 @@
  },
  {
   "ename": "bbdb",
-  "commit": "caaa21f235c4864f6008fb454d0a970a2fd22a86",
-  "sha256": "0mm8n3dbi8lap3pjr97n2f675iy7sg476sm1vxygbc3j67rq1zb2",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "0gnjdlb338gxpsmdx8scj5vb1rbvfkmm71xq37sahy0m4r402al1",
   "fetcher": "git",
   "url": "https://git.savannah.nongnu.org/git/bbdb.git",
   "unstable": {
@@ -6543,6 +6562,9 @@
     20220416,
     405
    ],
+   "deps": [
+    "cl-lib"
+   ],
    "commit": "ed7648f723d3fd03476b8a007a76e9058f7f7f47",
    "sha256": "05a6rh2chyafsw9n3aar4dscvq8wdb9bbl3b12vawilj3b5bv9jy"
   },
@@ -6553,6 +6575,9 @@
     2,
     2
    ],
+   "deps": [
+    "cl-lib"
+   ],
    "commit": "ed7648f723d3fd03476b8a007a76e9058f7f7f47",
    "sha256": "05a6rh2chyafsw9n3aar4dscvq8wdb9bbl3b12vawilj3b5bv9jy"
   }
@@ -6938,8 +6963,8 @@
     20210715,
     1004
    ],
-   "commit": "f04dad824b9879f7382f36780a0151e4ef544815",
-   "sha256": "1a3s6za2dlavknpmcbkbrdf4a75a1a0qgni3igq1657xfxk658gw"
+   "commit": "72dae979d4cf33ac1b63c73df337fcc2c2aafd72",
+   "sha256": "08cn2pvg8gxb6a88z8fiklcyyf3sagl9h5x7k7f44jfyqwqzpky7"
   },
   "stable": {
    "version": [
@@ -7022,8 +7047,8 @@
    "deps": [
     "reformatter"
    ],
-   "commit": "b4003950a925d1c659bc359ab5e88e4441775d77",
-   "sha256": "1x5hbs9j4ms93p080267kjyqpk81il3x7q87awf6qzz5xhc20d3b"
+   "commit": "94bc804220248b43b68c073545858692816d307a",
+   "sha256": "1ad4fil4x55p1vba2vb7065pggm0yj8mbzvrgwzwxgihhqzaln0p"
   },
   "stable": {
    "version": [
@@ -7133,8 +7158,8 @@
     "a",
     "pdf-tools"
    ],
-   "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86",
-   "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri"
+   "commit": "4359c640c7822a23976e9a5ca4ce63452d796912",
+   "sha256": "176qjbhvdg1bqy45qk6zf5ij12qif6xkd3ppd1a5wg67p2rv21z8"
   }
  },
  {
@@ -7592,11 +7617,11 @@
   "repo": "pythonic-emacs/blacken",
   "unstable": {
    "version": [
-    20220110,
-    1841
+    20220529,
+    1541
    ],
-   "commit": "563c744f545552cb92e8e84d5be4e2cdbabc93ca",
-   "sha256": "0pf9yllx0h78m925sdrg6hbv54ky2pi7cpkdsnx891qjsahvjnpy"
+   "commit": "764912ada13c3bf57e770fcd978c81a1ce26666a",
+   "sha256": "1s2wml00wdgzxf8zp3gl0zxgmsfjflf90j04zqnp5jzsp6cmifsq"
   },
   "stable": {
    "version": [
@@ -7639,20 +7664,26 @@
   "repo": "Artawower/blamer.el",
   "unstable": {
    "version": [
-    20220404,
-    1917
+    20220531,
+    1900
    ],
-   "commit": "f5c0b5ef2ae46062ba13dd03215cdfc49d0fd30b",
-   "sha256": "1acwh5xcfizmd6m4kwlvpyysznknjwzqmgppc33khldqiv3ga9sp"
+   "deps": [
+    "posframe"
+   ],
+   "commit": "b86822f460a54c60fdfede62d4a86bd4991baa21",
+   "sha256": "1vqfqzjgip1a3mcbd22dgkp1wc2x4r375npbwjs99jn7br1d73ny"
   },
   "stable": {
    "version": [
     0,
-    4,
-    6
+    5,
+    0
    ],
-   "commit": "f5c0b5ef2ae46062ba13dd03215cdfc49d0fd30b",
-   "sha256": "1acwh5xcfizmd6m4kwlvpyysznknjwzqmgppc33khldqiv3ga9sp"
+   "deps": [
+    "posframe"
+   ],
+   "commit": "330c0ac2e3bbc242c2e769655bb6b68555aada70",
+   "sha256": "1wmz3kp5k7n5xj2yx4rz7f7a5khvhll1jvda40b3c8x6mx9n416f"
   }
  },
  {
@@ -7827,11 +7858,11 @@
   "repo": "kennethloeffler/blox",
   "unstable": {
    "version": [
-    20210225,
-    1900
+    20220521,
+    807
    ],
-   "commit": "2bf0e618451fb1da11263d8a35ffcd9210590c0a",
-   "sha256": "0lkhdm9jhy8wlmrmd9nqrbrczh5k75q38n6bq3gfhppycmysh9d5"
+   "commit": "9ebebb65fb38b5570ba8dfbb5ec835633c06b67d",
+   "sha256": "0cbmqzhv8bnfjracdc7xc5ba7cr8fqfh8l617sxarw51daallxri"
   },
   "stable": {
    "version": [
@@ -8147,21 +8178,21 @@
  },
  {
   "ename": "borg",
-  "commit": "325cca8031b99c6abe2ee9858a6b547d1af0cdde",
-  "sha256": "0rklhjm6zpmyjvw39475fsfn5n5mxkf33b8hkfx0pjjdp0ylr21n",
+  "commit": "af5c1593052d63146e850683c461a760ab166033",
+  "sha256": "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr",
   "fetcher": "github",
   "repo": "emacscollective/borg",
   "unstable": {
    "version": [
-    20220511,
-    1643
+    20220527,
+    2237
    ],
    "deps": [
     "epkg",
     "magit"
    ],
-   "commit": "55271c12e05c14e30102bd64bd609af29d58846e",
-   "sha256": "104kf3km7450jj7brgjhmw5idrvk3s1qjxclzpv7xypyvi53ab8l"
+   "commit": "1f87dfcca69decc9db651af6b9f38034ab9fbd51",
+   "sha256": "1k2lp2g6nsm843gf3a5ddck75pg62dpvnnpjpwbxzjhraswr9z5c"
   },
   "stable": {
    "version": [
@@ -8238,8 +8269,8 @@
  },
  {
   "ename": "bpe",
-  "commit": "1a99263c2672d4c2433835cf948101130126e14b",
-  "sha256": "08zfqcgs7i2ram2qpy8vrzksx5722aahr66vdi4d9bcxm03s19fm",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0lbbbfd66p5hdxv083k6370c4hkaydh2vq35753i25gnhzxs9hhl",
   "fetcher": "github",
   "repo": "yuutayamada/bpe",
   "unstable": {
@@ -8652,11 +8683,11 @@
   "repo": "astoff/buffer-env",
   "unstable": {
    "version": [
-    20220506,
-    1506
+    20220606,
+    1330
    ],
-   "commit": "7b7e5c2a79ad3b31b465387df0ccc18a5809f9d1",
-   "sha256": "1r4lbz5hadsxw9dkhi10xr54zmsgknmklfmb78yxnvqhwl30kk20"
+   "commit": "fc98ca9e2a8b6edcec7199bf52eaf1848bd3e35c",
+   "sha256": "1i629jdlp3lxjk3awarx64s7czbzg15yy101ns9hrjk914bvskbc"
   }
  },
  {
@@ -8854,8 +8885,8 @@
     20200924,
     345
    ],
-   "commit": "b918ba023212b0e223a7ca7df3a2ec12a7c54206",
-   "sha256": "0xj9k2i7dmnqg99k1kraq58fc1kzgvriy08g46zhka3dz2l2m5br"
+   "commit": "124529e089c7ea70877cfa881e55b3a21f28ffd1",
+   "sha256": "1g7nizs3iy4avaifnw91fps72i2iifkbrlh8fkdymcynnmhkqdvf"
   },
   "stable": {
    "version": [
@@ -8906,8 +8937,8 @@
  },
  {
   "ename": "bufshow",
-  "commit": "543a734795eed11aa47a8e1348d14e362b341af0",
-  "sha256": "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "01ywg76zvkwv67li5phyz797gdn866bnxxqfwg4adzakhhbc8pzm",
   "fetcher": "github",
   "repo": "pjones/bufshow",
   "unstable": {
@@ -9756,8 +9787,8 @@
   "repo": "chenyanming/calibredb.el",
   "unstable": {
    "version": [
-    20220511,
-    1104
+    20220604,
+    1655
    ],
    "deps": [
     "dash",
@@ -9767,8 +9798,8 @@
     "s",
     "transient"
    ],
-   "commit": "232fa1cf3af08200af439d1cbb5a131f38286183",
-   "sha256": "1ncyrrzk0a1wfyr3khvznda7l59g4vg9h3nglzbihnbvfkxqh6cn"
+   "commit": "e4ce01a08f0e9cbbaea03ab5259d0cc029e9f2ad",
+   "sha256": "0jd5d9inxhiymzphf4gw11wwg5lv4jp3hflj9w24grcd77i6wkdg"
   },
   "stable": {
    "version": [
@@ -9796,16 +9827,16 @@
   "repo": "beacoder/call-graph",
   "unstable": {
    "version": [
-    20220506,
-    1214
+    20220528,
+    27
    ],
    "deps": [
     "hierarchy",
     "ivy",
     "tree-mode"
    ],
-   "commit": "42023e5d1781c75f425e8c72b63b28e53dae6e9c",
-   "sha256": "029ssw7k9prmh7rv4drjmwzcykrihpqkmkylz0fla40l7ycmdr5c"
+   "commit": "b37836ed04a1268301c0ef84496f165c671f55e4",
+   "sha256": "1vy8l4ra6pwvchn9fb0z8hskn744kbl1djya8l44hir4ma75kxhh"
   },
   "stable": {
    "version": [
@@ -9934,11 +9965,11 @@
   "repo": "minad/cape",
   "unstable": {
    "version": [
-    20220506,
-    1814
+    20220607,
+    1615
    ],
-   "commit": "e72edf2d6357beb64798ef1894cc807190f80901",
-   "sha256": "0l6slrbh7sr3r3zgxh4r1r0g2131mvpmy2vd1hrkjf9q9c5hpqq0"
+   "commit": "67c48f1c3609f1426f02c5d8b81e23b1e8b89659",
+   "sha256": "15cq18pc97lhibz4nyyjavhgyalyg8wrc6wc9pzg2iq1gp0yrq2x"
   },
   "stable": {
    "version": [
@@ -9960,17 +9991,17 @@
     20210707,
     2310
    ],
-   "commit": "02dc92c900babbd232fbcdd14f7ccf44d234ee77",
-   "sha256": "0gar2j9vis9b2wj1fhqahcrmaw867z3pmsn5d70bb8mdr3xq3dmm"
+   "commit": "81b25899ca8321f507f204b4777f223c26e4d6ab",
+   "sha256": "1a2fx5zf36770bim9spnhlvdv8mjbhpyg3mvwni5mgjdn4zidb2g"
   },
   "stable": {
    "version": [
     0,
-    9,
+    10,
     1
    ],
-   "commit": "b49431c48d40490ef979247d308af63345376cee",
-   "sha256": "0cbiwkmd29abih8rjjm35dfkrkr8c6axbzq3fkryay6jyvpi42c5"
+   "commit": "5cff5efc2bbb19b2512b940f79c8c696e0737424",
+   "sha256": "1cf76mllnm43wndzl26rrlfg2bc7r2a0ig6v9lm41nil9x6simsm"
   }
  },
  {
@@ -10120,8 +10151,8 @@
   "repo": "cask/cask",
   "unstable": {
    "version": [
-    20220504,
-    1421
+    20220605,
+    2031
    ],
    "deps": [
     "ansi",
@@ -10132,8 +10163,8 @@
     "s",
     "shut-up"
    ],
-   "commit": "2eb520e64c2e1047319761df0bcc6fa5149f8cd6",
-   "sha256": "1fg8c8wksban6kblrdsp008ga8srhyp7dbhzbk46dgmprvwmxbwn"
+   "commit": "f2c6609590380bf4791fa18b7581ed6a8db2cbbb",
+   "sha256": "1zvibg876q5zi7fh72wfl6avskgvvn4az75gjc3bkdckv9rpy43a"
   },
   "stable": {
    "version": [
@@ -10283,11 +10314,11 @@
   "repo": "catppuccin/emacs",
   "unstable": {
    "version": [
-    20220330,
-    1021
+    20220515,
+    435
    ],
-   "commit": "352ebf62099e95cb4a71060a7d4a228f00358b97",
-   "sha256": "01qh2q0vlgpni66mks4xzvdzm22yq314n5n4jx20bdknbhlvb8rq"
+   "commit": "784684c54a0d94c4a1cff8a69fcbdcd5d916e0a5",
+   "sha256": "0f7nm16fmb9chpc1cii4y035ykhq5mhbzq0m9xp0hdi7pjmarf3l"
   }
  },
  {
@@ -10563,8 +10594,8 @@
     20200507,
     1529
    ],
-   "commit": "4093821cc9759ca5a3c6e527d4cc915fc3a5ad74",
-   "sha256": "0r6dzhhlpbkh2n9dmb7iyd78b5rsnkxhk84wm0kgqjy541gfvbhk"
+   "commit": "ebaeb80fba0bafdf6f95706308123dec2cf4b99f",
+   "sha256": "0rf6csfn3sprr4mlwq5gzl5di9xyhd4v46927vjhjj3k1qahvmpb"
   }
  },
  {
@@ -10631,6 +10662,30 @@
   }
  },
  {
+  "ename": "cern-root-mode",
+  "commit": "c4f2e661e24ff3320b45cbebbc51a7b45ce3520c",
+  "sha256": "18srgi3695j4dpbcwjfj1ccc1ppn0idv9y5skgyssnrin8s3cb3g",
+  "fetcher": "github",
+  "repo": "jaypmorgan/cern-root-mode",
+  "unstable": {
+   "version": [
+    20220531,
+    1304
+   ],
+   "commit": "0227ab66f67276d3142a95cfc858bf621f501346",
+   "sha256": "1h0kjf92qxvw0128igsj8x7qyxhdkcjvlcxa29hpl97ad774qqnq"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    4
+   ],
+   "commit": "2df8781df1d807bf522eb19ac7b03b4bfaeb89c0",
+   "sha256": "159q50m8sr4adw7czkq0mq6hq43svkk2psx0wnmmb1aa8ivhwyip"
+  }
+ },
+ {
   "ename": "ceylon-mode",
   "commit": "09cd1a2ccf33b209a470780a66d54e1b1d597a86",
   "sha256": "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4",
@@ -10664,8 +10719,8 @@
     20171115,
     2108
    ],
-   "commit": "0d98e5a6f0c08e2b1d2c8e96c3dfc7e619210f72",
-   "sha256": "1i5icnrvfi83kxf4n6a83aksllnaddb653kcjnmg3n70q5mffavf"
+   "commit": "798512dd6a94abd432e9f1712147a39f623ea718",
+   "sha256": "1bg2dzr8bqwg3y78r9smllx6bji4gyl3hbbp08ff7q0va0b9zmnd"
   },
   "stable": {
    "version": [
@@ -10820,8 +10875,8 @@
     20220318,
     1007
    ],
-   "commit": "0a526709f55f8074f8846f8e7b9090431f1d6a47",
-   "sha256": "118pc03zpv9c7haxvmf4xkd6lby7xrxsal6pwq5lw5sw840g1nhr"
+   "commit": "c44b4e950af73dd82805181da5473db2c93e2eaf",
+   "sha256": "0jbpl17f5jdil9slv92ldvq4b60zpgr60cv0rk4qf3nwm4ijpk21"
   },
   "stable": {
    "version": [
@@ -10868,8 +10923,8 @@
  },
  {
   "ename": "chapel-mode",
-  "commit": "f84c693e9e90069b028be6149dd730f2ba5f4aff",
-  "sha256": "0yi1xjm1myxywjdb3n1505mz7vnylrvpd067aibjc4vgq0gqvq6f",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1a870d100d9x2lnb9c4lc6b2g912pznw784fyv0rhk7jq5jkafa5",
   "fetcher": "github",
   "repo": "damon-kwok/chapel-mode",
   "unstable": {
@@ -11110,8 +11165,8 @@
     20210601,
     1653
    ],
-   "commit": "ae36c823ca151f1dc6144ec96b2f5e98181c0dbb",
-   "sha256": "1n01h4lwfcm0skf0pgh7p87bmk4x3r6qsr5jcgm1ldafsx35x60g"
+   "commit": "af591400c55dc2a427a85cbca28e3f9b5361f14b",
+   "sha256": "0qgwvnqldbf9w95vbm6spkzx6x07hvlhkdky4vicakikh1g0zmwc"
   }
  },
  {
@@ -11125,8 +11180,8 @@
     20210713,
     1551
    ],
-   "commit": "05fc1449db497e715b33b8e08359fa17c3148c7b",
-   "sha256": "16sdhias8ws93lhfhbf5hm05gff1r3imphk7gdziy51xfgyml619"
+   "commit": "151594b11fa6555c73b998ed1f15ee9b5f979f67",
+   "sha256": "1f4fas6z2d7zn505nmnlgv4b66k495zq3358php44jblhc1vrg8v"
   }
  },
  {
@@ -11218,8 +11273,8 @@
  },
  {
   "ename": "chinese-word-at-point",
-  "commit": "c9b7785eca577218feade982c979694389f37ec3",
-  "sha256": "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "05h047nzy2v0d6lxsm2f6jqkp51j6h4b517q4wkxwkiw0a9q4p5v",
   "fetcher": "github",
   "repo": "xuchunyang/chinese-word-at-point.el",
   "unstable": {
@@ -11329,22 +11384,22 @@
  },
  {
   "ename": "chronometrist",
-  "commit": "1cead898505916ff42bbc5c2d978df55dc09da69",
-  "sha256": "1nvgbddhci7bpznq2s3yakk3qpd1f8fzskrf3klnc88d5v6xj3qi",
+  "commit": "4f3fa2076ce777618f2982a7ba69b497d68aebc3",
+  "sha256": "10hab6h4pjgkldq0qlsyr69hq40g9hfsmhaxngfjl4yra355zr6b",
   "fetcher": "git",
-  "url": "https://tildegit.org/contrapunctus/chronometrist.git",
+  "url": "https://codeberg.org/contrapunctus/chronometrist.git",
   "unstable": {
    "version": [
-    20220415,
-    1213
+    20220604,
+    344
    ],
    "deps": [
     "dash",
     "seq",
     "ts"
    ],
-   "commit": "f7b2defceed8bafb87da704ce3e7774f53abf1c4",
-   "sha256": "176imva32l766llrj4171r7bb3z5isvprrr5cl28cm41vqg4szfx"
+   "commit": "b80d6ac5b661a90e84ab84bad9badb596c1d1965",
+   "sha256": "01sdf2w73zapjv1x1dcasy16qs2nsnya3xz5q5avpi5gvmrarb36"
   },
   "stable": {
    "version": [
@@ -11363,10 +11418,10 @@
  },
  {
   "ename": "chronometrist-goal",
-  "commit": "d5c27f29f3ab4633e6a1d69b3a82e47ba216bf39",
-  "sha256": "05z9jwjf9py0bfxgilh2x05pqjyg9zamf4zl6s6fb7fiz7mfm9k5",
+  "commit": "4f3fa2076ce777618f2982a7ba69b497d68aebc3",
+  "sha256": "0wd64bz1qfwqzfkj2yf0sxwvakmych1h4rhakjqixvjpx75nm658",
   "fetcher": "git",
-  "url": "https://tildegit.org/contrapunctus/chronometrist-goal.git",
+  "url": "https://codeberg.org/contrapunctus/chronometrist-goal.git",
   "unstable": {
    "version": [
     20210510,
@@ -11382,10 +11437,10 @@
  },
  {
   "ename": "chronometrist-key-values",
-  "commit": "1cead898505916ff42bbc5c2d978df55dc09da69",
-  "sha256": "0xh06qd76na7vxr4v8v5nn37vq4v3v6cbbyzvrbg90nmkki0hhwr",
+  "commit": "4f3fa2076ce777618f2982a7ba69b497d68aebc3",
+  "sha256": "17fjmdgm8n9za3mwkahqhvz1d69lwhc7yqqryx16myn4kyg0i835",
   "fetcher": "git",
-  "url": "https://tildegit.org/contrapunctus/chronometrist.git",
+  "url": "https://codeberg.org/contrapunctus/chronometrist.git",
   "unstable": {
    "version": [
     20220414,
@@ -11394,8 +11449,8 @@
    "deps": [
     "chronometrist"
    ],
-   "commit": "f7b2defceed8bafb87da704ce3e7774f53abf1c4",
-   "sha256": "176imva32l766llrj4171r7bb3z5isvprrr5cl28cm41vqg4szfx"
+   "commit": "b80d6ac5b661a90e84ab84bad9badb596c1d1965",
+   "sha256": "01sdf2w73zapjv1x1dcasy16qs2nsnya3xz5q5avpi5gvmrarb36"
   },
   "stable": {
    "version": [
@@ -11412,10 +11467,10 @@
  },
  {
   "ename": "chronometrist-spark",
-  "commit": "14000772028841fc06aa3baf3545ea193d5705c6",
-  "sha256": "04gm5srg62zb80av5b5i2k1d790cf9xb6zn0bisf7l4i7cvjxafk",
+  "commit": "b4de903fe96f70798f0c5668c9845eb78907e50b",
+  "sha256": "1kkvwk964sddzw6wmlvfcqfaazzhikjkynbhrzffy6qacfbi5rsv",
   "fetcher": "git",
-  "url": "https://tildegit.org/contrapunctus/chronometrist.git",
+  "url": "https://codeberg.org/contrapunctus/chronometrist.git",
   "unstable": {
    "version": [
     20220321,
@@ -11425,8 +11480,8 @@
     "chronometrist",
     "spark"
    ],
-   "commit": "f7b2defceed8bafb87da704ce3e7774f53abf1c4",
-   "sha256": "176imva32l766llrj4171r7bb3z5isvprrr5cl28cm41vqg4szfx"
+   "commit": "b80d6ac5b661a90e84ab84bad9badb596c1d1965",
+   "sha256": "01sdf2w73zapjv1x1dcasy16qs2nsnya3xz5q5avpi5gvmrarb36"
   },
   "stable": {
    "version": [
@@ -11498,8 +11553,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20220507,
-    1357
+    20220531,
+    616
    ],
    "deps": [
     "clojure-mode",
@@ -11509,14 +11564,14 @@
     "sesman",
     "spinner"
    ],
-   "commit": "69d374818bd0af1489ee8828b258c689ccc24a66",
-   "sha256": "0r585myfkdsqrmd7fydbfdakwsfh4wq4bkjgngyag8mkam88ms16"
+   "commit": "b9e1cc26e2afda003a4b6c1f2a26e04f1c45f3d0",
+   "sha256": "15a9khkd21dfrw9r435x46533cs3246l1dgjg86cvkgjjhl21f9z"
   },
   "stable": {
    "version": [
     1,
     4,
-    0
+    1
    ],
    "deps": [
     "clojure-mode",
@@ -11526,8 +11581,8 @@
     "sesman",
     "spinner"
    ],
-   "commit": "b2cee7fc301735b403920583cc2c23dcf70990a3",
-   "sha256": "08gj8nm6qjjgn75aijhkbdhpwfd1qx6fy2c77m8ca99pbqvabmcq"
+   "commit": "11156e7b0cab470f4aab39d3af5ee3cb1e0b09d0",
+   "sha256": "08635ln514nrglx6qyhaq1x7y7lw4mcd659ba8zs071yjiariarm"
   }
  },
  {
@@ -11662,8 +11717,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "794821e129ea47b04fdeedc61d9ccb3c4240c72d",
-   "sha256": "0yvh3f165j3i4qk4qixk7xnqvfckz4dh5z7sdm3940f3wgk2g2mv"
+   "commit": "2f33f991c726d5214d6a17bbbd19836302a8e423",
+   "sha256": "0jpq67q7vhmgvsjh4qqk5lb40w9rkdr2v8bd5gh32k8wkbgykpgg"
   },
   "stable": {
    "version": [
@@ -11730,14 +11785,14 @@
   "repo": "emacs-circe/circe",
   "unstable": {
    "version": [
-    20220421,
-    1956
+    20220526,
+    1206
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c",
-   "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937"
+   "commit": "41cdc116b09818d33f5cb0fc1d72c025c23aa2f1",
+   "sha256": "0hmclqaagnqvyvxb93vi1qdyvqm53hsyjyv1b4zh79hwzvn6s8g3"
   },
   "stable": {
    "version": [
@@ -11802,35 +11857,36 @@
  },
  {
   "ename": "citar",
-  "commit": "b2aa35ca3930920d61e50dd75394f70ccd1c737b",
-  "sha256": "0x66iwimvrihyxs5h816f2k2f2wgdn1kmiahvh5nfff6kx1xdplj",
+  "commit": "d96246c6f08d0ab2ccd2b04222e304c7ab8914ca",
+  "sha256": "1arf0fki9by8zx12vgdj1jvvaz9sq32jn9yv6xb2qkx5pzg4sw6j",
   "fetcher": "github",
-  "repo": "bdarcus/citar",
+  "repo": "emacs-citar/citar",
   "unstable": {
    "version": [
-    20220509,
-    2336
+    20220602,
+    2157
    ],
    "deps": [
     "citeproc",
     "org",
     "parsebib"
    ],
-   "commit": "9a6fc6da11ad2b475244cc4cbd51c77615e9aad3",
-   "sha256": "0q1hl8xsqb64lx10kcc4az3azaa8j3zly3pkf3lixh0qrc74bil2"
+   "commit": "1976f2938b3fc2ebb963429dce78f2372edb483c",
+   "sha256": "0fdasl6nzrp8q29njda5z4x79fjlfigjyx4xxgpq0wkq41kw3zy0"
   },
   "stable": {
    "version": [
     0,
-    9
+    9,
+    5
    ],
    "deps": [
+    "citeproc",
     "org",
-    "parsebib",
-    "s"
+    "parsebib"
    ],
-   "commit": "348ffb9853e04fbe3e0cbc25185236ecf65ccb35",
-   "sha256": "15jhpl2j4rm97cvvqzlfzxarvxvcsg64raz068psrsd2y7y2zh4c"
+   "commit": "d55cac7a2b8b848990ebd713de8667bf3fe93c6b",
+   "sha256": "04asi5gr4p1d8llra3qwly2jp1ll3zs0hjcysrrvdcax0jcr473b"
   }
  },
  {
@@ -11920,19 +11976,20 @@
   "repo": "universal-ctags/citre",
   "unstable": {
    "version": [
-    20220427,
-    1203
+    20220523,
+    745
    ],
-   "commit": "87e2cbf3b2ae6d59ec919a2dcb38e56ccfa5ec14",
-   "sha256": "1wycbcwmls7lf1vn83pwfrb1bhxf8d5p7w25b1c9lrzq7l769i2k"
+   "commit": "1c0ca637c7993559a0175e3001941457b8c71211",
+   "sha256": "0ybv61akxv7nrxpc5zfjbbxrv8xs38sgrbsbslx2mqzcv9915q2i"
   },
   "stable": {
    "version": [
     0,
-    2
+    2,
+    1
    ],
-   "commit": "32b79a94db62194d96e73064ab804b7efa920795",
-   "sha256": "10lryjy3771hs8lavh7818a5ia9ia1qwrhzfmgr5sb4c0gn36wcg"
+   "commit": "1c0ca637c7993559a0175e3001941457b8c71211",
+   "sha256": "0ybv61akxv7nrxpc5zfjbbxrv8xs38sgrbsbslx2mqzcv9915q2i"
   }
  },
  {
@@ -12198,20 +12255,20 @@
   "repo": "redguardtoo/cliphist",
   "unstable": {
    "version": [
-    20210813,
-    750
+    20220525,
+    1034
    ],
-   "commit": "a794c95e2f70a9b042af7bd07e2483fde75f2a2e",
-   "sha256": "0rbgg6vrvsmjlgwq0v450g41qx4gx9ixx4j30aa4i78ryxz4d76r"
+   "commit": "d02b97a2aa0da13711d9a6f845649115de8ac11b",
+   "sha256": "05s8lqfbsq3m0k4fx3ap4506f3gnmsxb9lv8hc095i9xsk7mvaab"
   },
   "stable": {
    "version": [
     0,
     6,
-    2
+    3
    ],
-   "commit": "a794c95e2f70a9b042af7bd07e2483fde75f2a2e",
-   "sha256": "0rbgg6vrvsmjlgwq0v450g41qx4gx9ixx4j30aa4i78ryxz4d76r"
+   "commit": "d02b97a2aa0da13711d9a6f845649115de8ac11b",
+   "sha256": "05s8lqfbsq3m0k4fx3ap4506f3gnmsxb9lv8hc095i9xsk7mvaab"
   }
  },
  {
@@ -12456,8 +12513,8 @@
  },
  {
   "ename": "clocker",
-  "commit": "dadd3f5abad2e1f7863c4d654ff065f641395f64",
-  "sha256": "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1gjp66pvmzkqb40js6nas5gr9pipw6qcq21z8wbb365k5jcswzlg",
   "fetcher": "github",
   "repo": "roman/clocker.el",
   "unstable": {
@@ -12488,6 +12545,40 @@
   }
  },
  {
+  "ename": "clockodo",
+  "commit": "7e69c0409dbe1fa03956027a549b651e652be9a5",
+  "sha256": "09aapriw3fp82m6cna1nsz6al8jd313r8zfpljr09jgqaagplx3z",
+  "fetcher": "github",
+  "repo": "santifa/clockodo-el",
+  "unstable": {
+   "version": [
+    20220604,
+    2049
+   ],
+   "deps": [
+    "org",
+    "request",
+    "ts"
+   ],
+   "commit": "6329aaebc4373edaa4cd1d046582a4cc36db4888",
+   "sha256": "03n11mr39wj3nyabs24l5caqbzc7lm0wp4wazcsrsxwm7pij9vrs"
+  },
+  "stable": {
+   "version": [
+    0,
+    8,
+    0
+   ],
+   "deps": [
+    "org",
+    "request",
+    "ts"
+   ],
+   "commit": "6329aaebc4373edaa4cd1d046582a4cc36db4888",
+   "sha256": "03n11mr39wj3nyabs24l5caqbzc7lm0wp4wazcsrsxwm7pij9vrs"
+  }
+ },
+ {
   "ename": "clojars",
   "commit": "7f766319c3e18a41017684ea503b0382e96ab31b",
   "sha256": "1skvd29347hwapgdqznbzwfcp2nf077qkdzknxc8ylmqa32yf5w1",
@@ -12912,17 +13003,17 @@
     20220322,
     1258
    ],
-   "commit": "a1c61a7e1a9f7a019809010e097f1e4c42c50022",
-   "sha256": "1qabbyqn450lhb5f1kaxqwv37fc9ahj89rka5c374kgzscjgjdna"
+   "commit": "aaf5353c47965cae7e12aa03884be3ae67e9b09a",
+   "sha256": "00201mylx581g4q2j81v4x39x2axx5xq7himpk9ywxpvygh1r0dv"
   },
   "stable": {
    "version": [
     3,
     23,
-    1
+    2
    ],
-   "commit": "efe08e289466683b0945a5396f6848064dec5ae0",
-   "sha256": "1sm70am8h6fxbpxv7ky2vnx394i3qvg0vl215hg2lqaf9p9ll0ld"
+   "commit": "a8bd06dfd47a56e09e660de5e58f26579105d2d4",
+   "sha256": "09kk81nd4m6p07k7rwg2cfjv2rrwcmkmsz6xi58milq2byqw1n3j"
   }
  },
  {
@@ -12984,8 +13075,8 @@
  },
  {
   "ename": "cnfonts",
-  "commit": "0d5787ffeeee68ffa41f3e777071815084e0ed7a",
-  "sha256": "1pryn08fkdrdj7w302205nj1qhfbk1jzqxx6717crrxakkdqmn9w",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "026jayflpi4k0xydh9farn2b5ap6gc8bnj31pdnx7hb0hr4svzjc",
   "fetcher": "github",
   "repo": "tumashu/cnfonts",
   "unstable": {
@@ -13074,11 +13165,11 @@
   "repo": "astoff/code-cells.el",
   "unstable": {
    "version": [
-    20220305,
-    1320
+    20220606,
+    852
    ],
-   "commit": "8660bdeedee360e5eb632f1eb1356eb09d7dfbee",
-   "sha256": "0mvfsdlhc3znc0d2p8vm7apkbpvbs688wmwvd0sms33qly53f546"
+   "commit": "27ac22bc0be905f31abf8c09e63d371b0b0059d3",
+   "sha256": "1j704wncimabcydxazbllsqlp4wlh2mwv2zdf7kpcaychsw9990c"
   }
  },
  {
@@ -13574,8 +13665,8 @@
    "deps": [
     "s"
    ],
-   "commit": "fa85a6b9d852d725730a6ad1cc5afeb4ede93ca7",
-   "sha256": "1xmr4gxj3k4vy654270jgs3x8nv72q4hyk7q8zixycnymbqvby5f"
+   "commit": "902b30b6577ffd14d8b5169c85249033581c4f1a",
+   "sha256": "03nildwfjrbkcp25whbcklgm4gaqbwj6c65j1ngmykd2a1l1ghw7"
   },
   "stable": {
    "version": [
@@ -13861,14 +13952,14 @@
   "repo": "ddoherty03/commify",
   "unstable": {
    "version": [
-    20210904,
-    1106
+    20220531,
+    1301
    ],
    "deps": [
     "s"
    ],
-   "commit": "d6656bd3a909917a51ba033a11d4ab5f5fe55f83",
-   "sha256": "1zbk2nc1qnryapsj68hlqmkn0ab7llzpmnls6y3s2656lxcn2b0k"
+   "commit": "c4aeccae5b4a073fc3f4e8bd780a2ebbb7d5e533",
+   "sha256": "0ph5z31hibsjy6711gwfxa1qmlyyg3fh3wvgsafsgnkg6mlf2h3h"
   }
  },
  {
@@ -14051,8 +14142,8 @@
     "axiom-environment",
     "company"
    ],
-   "commit": "b52fa715285e7ad182c8e679ebf05b130dd5b5e2",
-   "sha256": "1hb4npfpg1iy9j0p29q1jrjgx0mrn333m45nmsnxw8nlaxzd97x6"
+   "commit": "847cc6e728b692ad3fdaec28d0c8c49ec0378a56",
+   "sha256": "02nf2vn6s6pc63yw2rggdx9capn9432w6j56m9v0c5ygarpxb53p"
   }
  },
  {
@@ -14367,8 +14458,8 @@
     "emojify",
     "ht"
    ],
-   "commit": "6f095b419468b0443e1dcd8537ef4b84092f155c",
-   "sha256": "1ssjzhbngb5v7wzh40zzh1j0pfzv0paqync8jvd0diwaz983rwzx"
+   "commit": "464b0a8e877ef2c80180336be4afe0d8c0b4c72d",
+   "sha256": "0cdp159qk4cq1fbqymh3v4sjnkj1ijk9x0picj6fqqr7wnqn1gwa"
   },
   "stable": {
    "version": [
@@ -14471,8 +14562,8 @@
     "ht",
     "s"
    ],
-   "commit": "e2e8a39976506cbf149f9c62a69c7a438be09579",
-   "sha256": "1lra119f4bbx6rhpm118yml6qnqy7s1lj2w1dnm8vbl68r255zyp"
+   "commit": "1f9c92a27bbf50783275a16dd3988666d1ecb023",
+   "sha256": "1c4bh80gwrdvy98xm92g7qqvi5lnaki5y4ng317px0zg3frj1i24"
   },
   "stable": {
    "version": [
@@ -14824,8 +14915,8 @@
     "maxima",
     "seq"
    ],
-   "commit": "ce5fd160c193e387d9e2bacdba4065c4b4262cb1",
-   "sha256": "18bjr4n1m1y76kh0pp6ci7ywklrmw611ka3avrj23lb0wwrljf86"
+   "commit": "1334f44725bd80a265de858d652f3fde4ae401fa",
+   "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1"
   },
   "stable": {
    "version": [
@@ -15167,27 +15258,28 @@
   "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20220509,
-    2300
+    20220601,
+    1652
    ],
    "deps": [
     "company",
     "prescient"
    ],
-   "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484",
-   "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c"
+   "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e",
+   "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk"
   },
   "stable": {
    "version": [
     5,
-    2
+    2,
+    1
    ],
    "deps": [
     "company",
     "prescient"
    ],
-   "commit": "3dbcef387502d309d130a518a18d48cd2f0e15b7",
-   "sha256": "024l7s0b6apbzanw3cnhjypxnxfinfb5b3nhaabrc138m5pis8j5"
+   "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e",
+   "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk"
   }
  },
  {
@@ -15256,8 +15348,8 @@
     "company-quickhelp",
     "popup"
    ],
-   "commit": "75a2f5c7669833646fc653cabd531737b52fb469",
-   "sha256": "0zkjicfa5dlzq2834p70ks3mr48086lf0dlr0r5df7jrw8wrw8c9"
+   "commit": "a34e0d8c7eca37e99c135e4b7fa5aaff8a15f576",
+   "sha256": "0l9syc32jsx75jhkphbv506gmilvl3vianja8f732wj3y694bnza"
   },
   "stable": {
    "version": [
@@ -15381,8 +15473,8 @@
  },
  {
   "ename": "company-shell",
-  "commit": "bbaa05d158f3806b9f79a2c826763166dbee56ca",
-  "sha256": "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1j918rbgxs7jclmd6qqgwrxi8djdpcl796wn700ky5jijhahjalp",
   "fetcher": "github",
   "repo": "Alexander-Miller/company-shell",
   "unstable": {
@@ -15844,11 +15936,11 @@
   "repo": "paldepind/composable.el",
   "unstable": {
    "version": [
-    20201024,
-    1458
+    20220608,
+    1148
    ],
-   "commit": "6f2efaa7018feb854720cc2518e4274ad708f793",
-   "sha256": "101shj0z8piww7idb6ha67synhw12x1lwgp3w48w1khrcw43zq7f"
+   "commit": "205a69c64ea95ef67070423c31ed70ec44ec980c",
+   "sha256": "0wlqfdiab60ciznrl9ny4rspva7xdwl8w9k8jxd2gpcb11fy1nn0"
   },
   "stable": {
    "version": [
@@ -15952,8 +16044,8 @@
   "repo": "necaris/conda.el",
   "unstable": {
    "version": [
-    20220315,
-    1533
+    20220604,
+    1727
    ],
    "deps": [
     "dash",
@@ -15961,14 +16053,14 @@
     "pythonic",
     "s"
    ],
-   "commit": "9c28d7a853b4b4bd00215cf7f07856c1563f2ad7",
-   "sha256": "03r9f2pvxxv6nlxgljnd5cmnlvsykypdl38cfi79iw3spr0lcrxn"
+   "commit": "e4154db0dbfb7faf46b645eddfaad9326e4ea18d",
+   "sha256": "1ily4abrn85fwy90hfm1nq9kwazb80amdgx4disaa2s62yx6k62j"
   },
   "stable": {
    "version": [
     0,
     0,
-    11
+    12
    ],
    "deps": [
     "dash",
@@ -15976,8 +16068,8 @@
     "pythonic",
     "s"
    ],
-   "commit": "78e1aad076f6cefc6aa7cc77d08e174b13050994",
-   "sha256": "02l9m5wx0z865w3cdwbw7c22fmdjbsw4svivqg72nbl7yrq7rv5v"
+   "commit": "e4154db0dbfb7faf46b645eddfaad9326e4ea18d",
+   "sha256": "1ily4abrn85fwy90hfm1nq9kwazb80amdgx4disaa2s62yx6k62j"
   }
  },
  {
@@ -16116,22 +16208,25 @@
   "repo": "minad/consult",
   "unstable": {
    "version": [
-    20220508,
-    928
+    20220603,
+    1902
    ],
    "deps": [
     "compat"
    ],
-   "commit": "1dfdf55f3d941f08089e5d0e611cd9daa8a44b19",
-   "sha256": "1hsxavf55xmy91xmv8yh6fb4aphv6sv947hs35ghvfm5s74sk47v"
+   "commit": "b816d1c42f420411c31fe0968ddc868aa2186de7",
+   "sha256": "014sbc3d2w7p5a8jsyag7qxlmixvs7zycpdrylxxbs9gkivfyyxw"
   },
   "stable": {
    "version": [
     0,
-    17
+    18
+   ],
+   "deps": [
+    "compat"
    ],
-   "commit": "f517b70dd8a3be0b8c883633f2a7721448b40f0f",
-   "sha256": "08l3h7b5j1q9nwcq660667b245qspl20ikhfdvd9k3g3n2p6p5kz"
+   "commit": "0f55ad146b327d82a4a6dfa674349bfbbf3820e4",
+   "sha256": "0sy4rn1vjk1g50r8z14hzj8lds6s7ij2zkjqfi6mfash5il75wnq"
   }
  },
  {
@@ -16250,8 +16345,8 @@
  },
  {
   "ename": "consult-flycheck",
-  "commit": "5a141c728f28e53b9f92ccbbff07c2af1dde3706",
-  "sha256": "1cwbm7qsni8ycasx2v20yd1749lmlhf98kz28i1p8m0yqkjc3my0",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "12zwy7jwbg7njm009c1rns0q382rv5lmbzjb4giy4wwwpjg3nfgf",
   "fetcher": "github",
   "repo": "minad/consult-flycheck",
   "unstable": {
@@ -16388,15 +16483,15 @@
   "url": "https://codeberg.org/jao/consult-notmuch.git",
   "unstable": {
    "version": [
-    20220421,
-    717
+    20220513,
+    1647
    ],
    "deps": [
     "consult",
     "notmuch"
    ],
-   "commit": "16eb2c100ca144140f07014c32e99487c6a73e18",
-   "sha256": "0ynla60n7aksp8fqikpsxv45li68ccgklr3xq601z3zyiyjg54a2"
+   "commit": "4138855cddee0ef126cff6a5fc5ca9c49fd2682d",
+   "sha256": "1wqp0pp408bxywxzq3gk1hk5vr19k4vsz5b979b4gbk89i1gxamb"
   },
   "stable": {
    "version": [
@@ -16462,8 +16557,8 @@
  },
  {
   "ename": "consult-projectile",
-  "commit": "ba7bac7fc95ba11094d3ad64d658be0ec7a16817",
-  "sha256": "03v8srjc8glybfmnfh9nwxz9fkvkrbyji19xvglzl0cy4dwivca9",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1yic707260ld5l1i8ll7sxpz07835hsn0ka4q670zpygazy3jiy0",
   "fetcher": "gitlab",
   "repo": "OlMon/consult-projectile",
   "unstable": {
@@ -16548,10 +16643,10 @@
  },
  {
   "ename": "contextual",
-  "commit": "de20db067590624bbd2ca5a7a537b7f11ada84f2",
-  "sha256": "1xwjjchmn3xqxbgvqishh8i75scc4kjgdzlp5j64d443pfgyr56a",
+  "commit": "7325c1a705d07d6916d55a1fc2bb7012e22504fd",
+  "sha256": "0zsyshy2n17zmk3l2shpd4ci9l0xwyx3bmv0psqlpcd0zcjdsfdv",
   "fetcher": "github",
-  "repo": "e-user/contextual",
+  "repo": "outergod/contextual",
   "unstable": {
    "version": [
     20180726,
@@ -16819,14 +16914,14 @@
   "repo": "galeo/corfu-doc",
   "unstable": {
    "version": [
-    20220429,
-    1348
+    20220606,
+    1654
    ],
    "deps": [
     "corfu"
    ],
-   "commit": "5a6f4f879de6dc2ca6e22789878d416e88e85905",
-   "sha256": "1rvymrs2vgcqr05xij719fyv5hd3bi34f8aragcabbiwbmjfhz7z"
+   "commit": "616a2a9fc6fb3222ea2273435ddbc63eba72670d",
+   "sha256": "0hkcpwkwz9ls2yawlpi2zx2zvrggyqc5qrnl1q4fc3dajnkl1gy4"
   }
  },
  {
@@ -16907,15 +17002,15 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20220402,
-    953
+    20220529,
+    1130
    ],
    "deps": [
     "ivy",
     "swiper"
    ],
-   "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d",
-   "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94"
+   "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22",
+   "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8"
   },
   "stable": {
    "version": [
@@ -17145,26 +17240,26 @@
   "repo": "redguardtoo/counsel-etags",
   "unstable": {
    "version": [
-    20220405,
-    510
+    20220526,
+    1436
    ],
    "deps": [
     "counsel"
    ],
-   "commit": "c74ae94297c4a2dc0b6878c2e9460a4f386158d4",
-   "sha256": "01a11dij88ysnrpmrs0flc9m43mlbc41zcahwmaqdp58rvgc24ji"
+   "commit": "05d364b556aadcfe49df727c0729abc3f0c14372",
+   "sha256": "1v77lpp0nij1rjg2k9wj42kqk7xqg1dzs9vmadha6f2j8j6375m8"
   },
   "stable": {
    "version": [
     1,
     10,
-    0
+    1
    ],
    "deps": [
     "counsel"
    ],
-   "commit": "dc7b9f9b381dffd19c79cb7ee53b79034590d309",
-   "sha256": "1zmx7vfi02c8k9wnbsmka5yx3ci8fv9wl8r0cc28jn40vgrivn8c"
+   "commit": "05d364b556aadcfe49df727c0729abc3f0c14372",
+   "sha256": "1v77lpp0nij1rjg2k9wj42kqk7xqg1dzs9vmadha6f2j8j6375m8"
   }
  },
  {
@@ -17175,14 +17270,14 @@
   "repo": "CsBigDataHub/counsel-fd",
   "unstable": {
    "version": [
-    20210606,
-    1724
+    20220514,
+    2227
    ],
    "deps": [
     "counsel"
    ],
-   "commit": "e9513a3c7f6cdbdf038f951e828e631c0455e7d4",
-   "sha256": "005l1is12jq35nn1ap87a7p74qin26zpgbk599619lh9vai157ww"
+   "commit": "c1ba2e36fe69111e7f6f42ea1b0e3b7a45d96de0",
+   "sha256": "1jpaknp9v9xyxqs9gkm9v1ylwp9pn2smla9zk4qk49i6ff5db6dd"
   }
  },
  {
@@ -17782,26 +17877,26 @@
   "repo": "emacsfodder/emacs-theme-creamsody",
   "unstable": {
    "version": [
-    20170222,
-    1058
+    20220527,
+    927
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "32fa3f4e461da92700523b1b20e7b28974c19a26",
-   "sha256": "01q1l8ajw6lpp1bb4yp8r70d86hcl4hy0mz7x1hzqsvb7flhppp0"
+   "commit": "4e1f00a590628034282a914d483fd6008a76c8f8",
+   "sha256": "0yw40fmisw5wby45pk4jblpshj1vsdhs43d7b25xpvjc6l0j5jz4"
   },
   "stable": {
    "version": [
     0,
     3,
-    7
+    14
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "32fa3f4e461da92700523b1b20e7b28974c19a26",
-   "sha256": "01q1l8ajw6lpp1bb4yp8r70d86hcl4hy0mz7x1hzqsvb7flhppp0"
+   "commit": "4e1f00a590628034282a914d483fd6008a76c8f8",
+   "sha256": "0yw40fmisw5wby45pk4jblpshj1vsdhs43d7b25xpvjc6l0j5jz4"
   }
  },
  {
@@ -17866,8 +17961,8 @@
  },
  {
   "ename": "creole",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "1q1c6f953g39xal1p7rj8dlcx2crk5cz1q07zp8bgp5jx4nd2z9n",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "12z7vhdqqjnwilm95hjd4ad07dwkcwcqgi6y9fwkq4jmsshpsf5c",
   "fetcher": "github",
   "repo": "nicferrier/elwikicreole",
   "unstable": {
@@ -18138,8 +18233,8 @@
  },
  {
   "ename": "csound-mode",
-  "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3",
-  "sha256": "0fpfgk5s45w69sxd1vmd8irb518x07hqfq6cmlm2ahpnsdljd1v3",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "19gsq761ahblikv5l5y70alh0f0pc29b1shqpqd5nxm4q34p4qk9",
   "fetcher": "github",
   "repo": "hlolli/csound-mode",
   "unstable": {
@@ -18285,15 +18380,15 @@
   "repo": "neeasade/ct.el",
   "unstable": {
    "version": [
-    20210219,
-    1344
+    20220514,
+    2027
    ],
    "deps": [
     "dash",
     "hsluv"
    ],
-   "commit": "c302ee94feee0c5efc511e8f9fd8cb2f6dfe3490",
-   "sha256": "0230h5qvg5jbpyry4xxmh41c0wpinmm04k5hc1qsc2mvqhv3n9n5"
+   "commit": "6bc55d01780fa921ced0e648d04497e27e23fe54",
+   "sha256": "03yfk0kwckb6gpp9ndnb9i1vcvx61wcy30jg35zkyfd2h93vjnp2"
   }
  },
  {
@@ -18369,19 +18464,19 @@
   "repo": "radian-software/ctrlf",
   "unstable": {
    "version": [
-    20220509,
-    2344
+    20220601,
+    1649
    ],
-   "commit": "d37d7a997e1e3ef5e2223aeecbbef92f369b0760",
-   "sha256": "1lfd20xknpxxb9qiqhj9mqabsgibzdkhf335mm4vl9jvgim6j7vs"
+   "commit": "cefb0aff9d316bd03e911f7f483f8d01f15cf5a2",
+   "sha256": "19kh2h2bbk43hwzmz57jzhq20d8rq7pfzfisq3by3ckrwb1vrvax"
   },
   "stable": {
    "version": [
     1,
-    4
+    5
    ],
-   "commit": "282eaa836d2198bb5947dfd3c454ae5305f55efb",
-   "sha256": "04w708g7d1pnsc18h8fjyqkhk08jkq853alaidriamxyycvdwk0i"
+   "commit": "495b9bc1002d27356929c101c458e69e4201e214",
+   "sha256": "1nd1yk86s0dyf87q77dg724f6629p270q3ar85jgp8gclw5plvyz"
   }
  },
  {
@@ -18458,8 +18553,8 @@
  },
  {
   "ename": "cubicaltt",
-  "commit": "1be42b49c206fc4f0df6fb50fed80b3d9b76710b",
-  "sha256": "1wgy6965cnw201wx4a2pn71sa40mh2712y0d0470klr156krj0n9",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "18x0i4m8zk10mvpx07nh56a6cknl97yja4hv0xzsiqrqmr0290rw",
   "fetcher": "github",
   "repo": "mortberg/cubicaltt",
   "unstable": {
@@ -18858,17 +18953,17 @@
     20211111,
     1407
    ],
-   "commit": "89591f7c85f6b8eb580ac8f3a00014f28c61a139",
-   "sha256": "0yj3i2jrajh33v0h6djlzsl5l5gb2958z365d1zjbabqxj202wg3"
+   "commit": "8e29b6d47f6f5b10ec1a37f06db440156ac2ac2e",
+   "sha256": "13vcbw8abqc92hq6cd9izr5fdq4zah3snd1c9ly8pr40gcfhwvdx"
   },
   "stable": {
    "version": [
     0,
     29,
-    28
+    30
    ],
-   "commit": "27b6709241461f620fb25756ef9f1192cc4f589a",
-   "sha256": "0k5wnrvnwq699mvvngraq5d93pyyiz77sn9dcqjrazc74b63sm8w"
+   "commit": "a6f04ef2430fb4e7383a068cd1ae9a115d7a78df",
+   "sha256": "141qywx4ym817lrpqis4x2i2bll0hcjljn1qfnn1dwmhmydhhkwx"
   }
  },
  {
@@ -18894,20 +18989,20 @@
   "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode",
   "unstable": {
    "version": [
-    20210119,
-    1853
+    20220601,
+    1949
    ],
-   "commit": "199743df55c6bfce3cdb08405bd8519768c8dfa9",
-   "sha256": "18jzrql5g2sd322w25phws7d1v8906lyc0ipn6cknlrv4pjmdazv"
+   "commit": "024aca97d07e72bf3500fb6bf0cdf50c4992a741",
+   "sha256": "0mwd412d2kha8avkyhvvkh8r7an859xk18f7phgx7kj989pr3xkr"
   },
   "stable": {
    "version": [
     2,
     0,
-    11
+    12
    ],
-   "commit": "cfd1d0869d51b7548b3fb738b2f2593c76533d44",
-   "sha256": "0vkl470vvmxap8ca773a0jvjvalmvdbbax3qvgjdclp54ml75al4"
+   "commit": "024aca97d07e72bf3500fb6bf0cdf50c4992a741",
+   "sha256": "0mwd412d2kha8avkyhvvkh8r7an859xk18f7phgx7kj989pr3xkr"
   }
  },
  {
@@ -19066,8 +19161,8 @@
   "repo": "emacs-lsp/dap-mode",
   "unstable": {
    "version": [
-    20220512,
-    513
+    20220518,
+    629
    ],
    "deps": [
     "bui",
@@ -19079,8 +19174,8 @@
     "posframe",
     "s"
    ],
-   "commit": "52ac284dafff3fbae561d1743b73131339421d76",
-   "sha256": "112qpba47csbhqha4y3vlccgzm14x7x522r2n1p9q4ssknn7va4i"
+   "commit": "67fd9e5d4e157e72b09ab34daca67619cb98c673",
+   "sha256": "0ggi7bcx7pmvdlngkv4spbbcb912ih8pn2d57395sx4iykkswyry"
   },
   "stable": {
    "version": [
@@ -19327,11 +19422,11 @@
   "repo": "magnars/dash.el",
   "unstable": {
    "version": [
-    20220417,
-    2250
+    20220607,
+    1100
    ],
-   "commit": "7fd71338dce041b352f84e7939f6966f4d379459",
-   "sha256": "1q2p51348bpg35h9c9cg21k27c7svh52qvi6zlslvnig7wcx662s"
+   "commit": "0c49a33a61c739eb12e4c3680138c1659926202d",
+   "sha256": "0wv0hkifzn8qmwa5pxs6lc2dywc0pc6wyfcf13kvjhnj7md4wplh"
   },
   "stable": {
    "version": [
@@ -19406,8 +19501,8 @@
    "deps": [
     "dash"
    ],
-   "commit": "7fd71338dce041b352f84e7939f6966f4d379459",
-   "sha256": "1q2p51348bpg35h9c9cg21k27c7svh52qvi6zlslvnig7wcx662s"
+   "commit": "0c49a33a61c739eb12e4c3680138c1659926202d",
+   "sha256": "0wv0hkifzn8qmwa5pxs6lc2dywc0pc6wyfcf13kvjhnj7md4wplh"
   },
   "stable": {
    "version": [
@@ -19430,11 +19525,11 @@
   "repo": "emacs-dashboard/emacs-dashboard",
   "unstable": {
    "version": [
-    20220409,
-    620
+    20220526,
+    738
    ],
-   "commit": "0a86c0eabe6bb5e188e6ae915d971103248a3d26",
-   "sha256": "1ki4g5s4n2c4zvsk56w4ync2rrwbchz63ms68a2xjkmnihy83x90"
+   "commit": "34d1f97200055e6b521c131270d8322efc6c52be",
+   "sha256": "03mnvxv0rjnby56y67f5x44s4wcnn9vxzcq1gxkxxz14kn8k42kn"
   },
   "stable": {
    "version": [
@@ -19457,15 +19552,15 @@
   "repo": "hyakt/emacs-dashboard-hackernews",
   "unstable": {
    "version": [
-    20190109,
-    205
+    20220516,
+    1809
    ],
    "deps": [
     "dashboard",
     "request"
    ],
-   "commit": "b71814716d8f78181b9d1990f06072460de0797e",
-   "sha256": "1dvv10xn2mh0nh85cd78y23cn8p9ygdhj4k7xs4fa6r7bhp0xvqm"
+   "commit": "dd5f8ec998d7b7bf162b4eb72474b683b8aa0a14",
+   "sha256": "037gn5q12lfkgp5cz2v54zdk1pcwsw5kb8b6lgn7fg04dlrahm8i"
   }
  },
  {
@@ -19482,8 +19577,8 @@
    "deps": [
     "dashboard"
    ],
-   "commit": "f9e199a20c654c3d1d8f405fdec9acb294afc004",
-   "sha256": "0l0bylzd9r6cc04r1b5ky3dqshzc2k6j47hqini35ibk331dm804"
+   "commit": "cd7c32f972f653a665e64aadf9bb88ed9fc10d5e",
+   "sha256": "0jy63yqix10pkw79i3x48przzbmbh5dm1hjd6w72yfa7ln01c4q4"
   },
   "stable": {
    "version": [
@@ -19689,8 +19784,8 @@
  },
  {
   "ename": "db",
-  "commit": "79ac40439b65c217e1caaa7175d26556b6a6c889",
-  "sha256": "05jhga9n6gh1bmj8gda14sb703gn7jgjlvy55mlr5kdb2z3rqw1n",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0yb2kgaqw31sl7h7mpmack2s8m9w1qhrvhn78z8gzjf4xn8pln09",
   "fetcher": "github",
   "repo": "nicferrier/emacs-db",
   "unstable": {
@@ -19931,8 +20026,8 @@
  },
  {
   "ename": "decl",
-  "commit": "8c2ecd46180643a0c493e05ec86fe50bc1e55146",
-  "sha256": "0wdhmp226wmrjvjgpbz8ihvhxxv3rrxh97sdqm3mgsav3n071n6k",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0w2099qqs89lb1lyd7y10yz11akpcc7afk9xgap4ikgafh2mi9gy",
   "fetcher": "github",
   "repo": "preetpalS/decl.el",
   "unstable": {
@@ -20093,8 +20188,8 @@
     "s",
     "wiki-summary"
    ],
-   "commit": "51fd884c52faf61339aef3a3429fe91672b3e6a8",
-   "sha256": "10ch8ds5d27kry1ih2cwyp5pl2dlhwwfdsr0smpd1r23i74qlhmm"
+   "commit": "749d3fc788cb26032dd30e509596a8988b7b6a7d",
+   "sha256": "1c58v122k1qa5vv5f2fcway5qkcr8j8kbp6y8fz4b5nj9di8azj9"
   },
   "stable": {
    "version": [
@@ -20458,6 +20553,29 @@
   }
  },
  {
+  "ename": "detached",
+  "commit": "f3cbb8f0ec4406a862e1d0066d5c9868ab060391",
+  "sha256": "1sfd9mw39n62kib403bnlsbfsnbcfwbb1znj9yc9b4kfmw6q68sy",
+  "fetcher": "git",
+  "url": "https://git.sr.ht/~niklaseklund/detached.el",
+  "unstable": {
+   "version": [
+    20220603,
+    1446
+   ],
+   "commit": "24b925435c5fb7d5927fd4db5217fbfd4f8ed9c8",
+   "sha256": "0lvx39i879d8n5m3b2pgjpw7i0a6wlfr2zk3bfk6kjm1vcrhhaz6"
+  },
+  "stable": {
+   "version": [
+    0,
+    7
+   ],
+   "commit": "8402e7ef4574c719f114b15f89b4aecdddea1e1e",
+   "sha256": "160h60vrpxslw6y290ndc065cc75dab58aq7kjqash94vkifnii2"
+  }
+ },
+ {
   "ename": "detour",
   "commit": "010af7946b10ded846225a19d375434b5d9427a8",
   "sha256": "0w63vqlzkvx54y8y71gzzdyxzm4430bqfyapzyrzrsmxh773hnmn",
@@ -20480,11 +20598,11 @@
   "repo": "astoff/devdocs.el",
   "unstable": {
    "version": [
-    20220410,
-    1627
+    20220606,
+    1342
    ],
-   "commit": "4257e59dafbffb2616d240f84c5c25770ee28cac",
-   "sha256": "1ddzydqrgz2c12s24gy3c1gb2d9344z7ykxy2yn5gn6dzjynfnl9"
+   "commit": "d5d0cfbfbcd037ef8f84f41b2adc3f5a23baa11f",
+   "sha256": "1q81ddnvdsfmfas2sfkxzpcr51f8zmmwmig0p3i3hcc9jf1wviid"
   }
  },
  {
@@ -20525,14 +20643,14 @@
   "repo": "psibi/dhall-mode",
   "unstable": {
    "version": [
-    20200822,
-    258
+    20220519,
+    1115
    ],
    "deps": [
     "reformatter"
    ],
-   "commit": "ad259c8a2292fb398dff1ce7d25c686edb02945d",
-   "sha256": "1vp8cjkkiih7cz5d8kcpc2ysq3iz4wr5wi2lkkkhp94k04jl5h1r"
+   "commit": "c77f1c1e75b6d2725019c5275fc102ae98d25628",
+   "sha256": "0b0pahi122rnfqpjk2svdcyywka2md6sch609d0x7vqlpylk66dx"
   }
  },
  {
@@ -20697,11 +20815,11 @@
   "url": "https://codeberg.org/ideasman42/emacs-diff-ansi.git",
   "unstable": {
    "version": [
-    20220507,
-    1118
+    20220524,
+    18
    ],
-   "commit": "bfcce7f609a95b4b5e11c384c75fef8c7c972b95",
-   "sha256": "0gddzdx0f6l982ij9q2ljm9dbpjrwi12glxhqr599jnxnlcrxshn"
+   "commit": "7e493019234d468354758f7e60032a1fb379de44",
+   "sha256": "0ri50ralsbmi3j0fbrk0xspnyw7ivpjii59dd09791sgyycaakh4"
   }
  },
  {
@@ -20727,14 +20845,14 @@
   "repo": "dgutov/diff-hl",
   "unstable": {
    "version": [
-    20220506,
-    2102
+    20220515,
+    1714
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "14f2db367e8023ab0027713315a38ecd703afdbf",
-   "sha256": "0ciyg1g9sil1pvmd53r57gyds85f11457anjcfi96p4jjyjg9sxx"
+   "commit": "e84209e959a17c7b96148e099e391daa29a4835e",
+   "sha256": "1jjgdjlbpi8d5yb83143jhkb2v4375kvmxkn1q5v3wyqx0f21npx"
   },
   "stable": {
    "version": [
@@ -21089,8 +21207,8 @@
     20220218,
     1541
    ],
-   "commit": "3b3b24eb231af889b0eea50e6e0a20c2bca9c439",
-   "sha256": "0x2vx80rx8mcj1jf6p7qbf1sfy4zymnrbpkm1gzrs8k4jibmwyz7"
+   "commit": "29c33c7636195f12a10b241448df7eb6760536e1",
+   "sha256": "1x182g34y13is7x7z32dgrcpbhzyc2narmdl3m702zpnvpd96dn7"
   },
   "stable": {
    "version": [
@@ -21477,8 +21595,8 @@
  },
  {
   "ename": "dired-imenu",
-  "commit": "e346de86b7f7fd5dad548f0936cde54ac11e3f79",
-  "sha256": "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "07n2kgfva4alvwcn91fa2s79inc6gv1fsg80znvvpvjw7pf8zd8i",
   "fetcher": "github",
   "repo": "DamienCassou/dired-imenu",
   "unstable": {
@@ -21788,14 +21906,14 @@
   "repo": "jojojames/dired-sidebar",
   "unstable": {
    "version": [
-    20220413,
-    753
+    20220601,
+    1536
    ],
    "deps": [
     "dired-subtree"
    ],
-   "commit": "0521cdc53e4a7ae7ea4728e5ac9f69287528dc56",
-   "sha256": "0r25hnij6yfdnspp0kmcp1j8dkw44xgq05ldvxqmricawxnsaxw8"
+   "commit": "bede31ae5f4ecdcb8cac01a9ffe746988838a344",
+   "sha256": "0i7y5xd1q862xg4bsg3apqcm7mha96ark7sk2cq2lpwndy3i4mxf"
   },
   "stable": {
    "version": [
@@ -22011,14 +22129,14 @@
   "repo": "wbolster/emacs-direnv",
   "unstable": {
    "version": [
-    20220103,
-    1342
+    20220513,
+    656
    ],
    "deps": [
     "dash"
    ],
-   "commit": "d71ceb415732c3b76a2948147fa3559622aceba2",
-   "sha256": "01fgn8gcprx747x382ka1y5yjfcarjdhpmfr9gal8blhvlknqc8f"
+   "commit": "416ed17efa93503b37eba196a14f967e0899bce4",
+   "sha256": "0s8p96w6jvlcv2fqf3f3a3fkpk0b6a6znj6xr5nwl49xvdivlaw7"
   },
   "stable": {
    "version": [
@@ -22133,20 +22251,20 @@
   "repo": "alexluigit/dirvish",
   "unstable": {
    "version": [
-    20220512,
-    1734
+    20220608,
+    1236
    ],
-   "commit": "e40cc2dd1594d4285ec78100e98a0b0516d23782",
-   "sha256": "0qzz9bzl0rjllr84hqfczjg6h4ra4ylpcsikhdx25gc7jfvah1zi"
+   "commit": "f47331477af930a9759cadc9ade8cf81bc03497d",
+   "sha256": "12h6z8z51bcnvlsb3274zxfpg3rrfhxbldyar0jn2ix0msy6kc50"
   },
   "stable": {
    "version": [
     1,
-    2,
-    0
+    3,
+    21
    ],
-   "commit": "f03db6106adc61e050ea242dcfbd3fcae71dee23",
-   "sha256": "1aniq3lylc2fmw3snsjmbpzzgjspryjfq6vsc10daihnihnff0qg"
+   "commit": "5e57c8ba2ec278e14c6d3e2c79ae1c29f775bb46",
+   "sha256": "1pr17dmi57lwmwj5d17w239pdscb747zm36vdmjyy2d3yn1dns4h"
   }
  },
  {
@@ -22174,8 +22292,8 @@
  },
  {
   "ename": "disaster",
-  "commit": "a4654b3646b96f967e2c75440e664a417cd0f517",
-  "sha256": "1ad8q81n0s13cwmm216wqx3s92195pda1amc4wxvpb3lq7dbd3yn",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "11nc8cpapmnl7syjwglxq58fpmhksphzk1baizcda82zlk5ipahw",
   "fetcher": "github",
   "repo": "jart/disaster",
   "unstable": {
@@ -22622,8 +22740,8 @@
  },
  {
   "ename": "django-theme",
-  "commit": "4ede3b4fb214b915a8230e7f220ffe71c73ad7c4",
-  "sha256": "1rydl857zfpbvd7aziz6h7n3rrh584z2cbfxlss3wgfclzmbyhgf",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "18vvn7hb5krxkk03z72h36y9qcim8qbwlnm2wmh6dhyldhlwwzgb",
   "fetcher": "github",
   "repo": "andrzejsliwa/django-theme.el",
   "unstable": {
@@ -22849,8 +22967,8 @@
   "repo": "Silex/docker.el",
   "unstable": {
    "version": [
-    20220409,
-    1157
+    20220530,
+    603
    ],
    "deps": [
     "aio",
@@ -22861,8 +22979,8 @@
     "tablist",
     "transient"
    ],
-   "commit": "cf137f5b8af7cbda17ef1d09c626db35e0e84078",
-   "sha256": "0rdi882r746nv8zzpcc3rv9p110ylwv1bk7nbzcychn7qsc05ydz"
+   "commit": "44f0bbec9b3deb027d17f4c10d8ec4106ed89dfb",
+   "sha256": "0w62z4y77fx2flyybhk44n2207r55j3djhpdn5xgj0hd1gnprfzr"
   },
   "stable": {
    "version": [
@@ -23052,20 +23170,20 @@
  },
  {
   "ename": "docstr",
-  "commit": "d2638156924dc2a327dca5f20ca63479878690c2",
-  "sha256": "1kga9h5vy4nzwhcvshxk1lpg1n7lfbygxbdpln7vfizpw065f3m7",
+  "commit": "97d68e8842fdfcda9c8865ccc53b1d0d7c42a7e7",
+  "sha256": "0zq6pm84l6cqa57198hn5pk596wlkcnk46g01q1072650i8bp58x",
   "fetcher": "github",
-  "repo": "jcs-elpa/docstr",
+  "repo": "emacs-vs/docstr",
   "unstable": {
    "version": [
-    20220214,
-    1539
+    20220608,
+    532
    ],
    "deps": [
     "s"
    ],
-   "commit": "bb7485d24a4fb147fc7fc7fcd1e1c7ddd3ff64b5",
-   "sha256": "18h39vrr66y0m16nfax6646qlnw1l0qd5c7dqpnr060ma52sbfkv"
+   "commit": "0a48429c2d0c2aa1de34ea24d2d3f9c8176519de",
+   "sha256": "145b9rgkrsxbnwjplkm6qx6bdzq1zgx99qrwnrl9kkk13091xhk2"
   },
   "stable": {
    "version": [
@@ -23088,11 +23206,11 @@
   "repo": "progfolio/doct",
   "unstable": {
    "version": [
-    20220227,
-    205
+    20220529,
+    1851
    ],
-   "commit": "4033a8fd8681d3989550f7a2532d6b4e3c45bfe8",
-   "sha256": "1vfwxjn86rprfz3cfc6w6hw5lqnbh093kydv0lapgz508f5yjazg"
+   "commit": "8464809754f3316d5a2fdcf3c01ce1e8736b323b",
+   "sha256": "01sjb41kii5hhh7gdd132k4iaqqfd0psy9hlc3bi7g4bplp7h7gf"
   }
  },
  {
@@ -23225,16 +23343,15 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20220412,
-    853
+    20220608,
+    936
    ],
    "deps": [
-    "all-the-icons",
     "dash",
     "shrink-path"
    ],
-   "commit": "85bdd9ed8674710f6b9815e9a1c41ad4b5a45ace",
-   "sha256": "1wmy080z709mn29w7h9m17a18jnr6a8dzip92k86kcg5z3mjg5ki"
+   "commit": "999790c984a83288c2b62d0a7294123f8eaf4b52",
+   "sha256": "0skdczk429p5cp8k24wc9inv6dripm9m5fb306nifq3akpc37dvx"
   },
   "stable": {
    "version": [
@@ -23278,14 +23395,14 @@
   "repo": "doomemacs/themes",
   "unstable": {
    "version": [
-    20220504,
-    1557
+    20220526,
+    2301
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "e9bdd137116fa2037ed60037b8421cf68c64888d",
-   "sha256": "178ri980kwkndb73dawhsfr1dkl6xjdb451z0iar9ghk8z0r0wpg"
+   "commit": "ec199971005e720f138b3bf12b4004714a074c8c",
+   "sha256": "0457frpjinqg9vzbhjdmz5vcw22bg1n3g4gv7j80lw8lbj9ljr61"
   },
   "stable": {
    "version": [
@@ -23749,29 +23866,6 @@
   }
  },
  {
-  "ename": "dtache",
-  "commit": "0d69cbd12938e72bcaea6b2a79385f48a462713d",
-  "sha256": "08cmfhjdn30wnyfypx5qjscbi4wbfvypxnwfrcx09nn137qc3h55",
-  "fetcher": "git",
-  "url": "https://git.sr.ht/~niklaseklund/dtache",
-  "unstable": {
-   "version": [
-    20220512,
-    1524
-   ],
-   "commit": "5a39733299cae60da2aab0e0b9f559bcc022369f",
-   "sha256": "166sbnq9n70yp7w8in2qkv921gzkzhzwkr3bjgnj427gxn34m1xd"
-  },
-  "stable": {
-   "version": [
-    0,
-    6
-   ],
-   "commit": "4ecda689e4ccddc23805a22484c95c4f3f65e3bb",
-   "sha256": "0lrj4dwcrx3s9mxnik9h9cppqjdfnbnlknfa40qwhlzxdvhxmfmq"
-  }
- },
- {
   "ename": "dtb-mode",
   "commit": "0c33d49a8d79ee60571775fc224453a351b0ff48",
   "sha256": "0s8jwmg2kafg31scl04swbx56dnxr2y3j56g95a4k4ffnb0q28n3",
@@ -23794,8 +23888,8 @@
   "repo": "dtk01/dtk",
   "unstable": {
    "version": [
-    20220309,
-    759
+    20220602,
+    2129
    ],
    "deps": [
     "cl-lib",
@@ -23803,8 +23897,8 @@
     "s",
     "seq"
    ],
-   "commit": "56b339bc76926defa775c406113e306ec6d31b36",
-   "sha256": "0g33sn95zk4fp1jyh472k3qyvbm062njbxkmnv0qavrbli097q80"
+   "commit": "092cb79d1985a0c5017070353abbb93b8977803d",
+   "sha256": "1lgjph43lc13iil6cp6ihn4w8d9yy7kc0s6y912hialykrscvcas"
   }
  },
  {
@@ -23830,11 +23924,11 @@
   "repo": "jscheid/dtrt-indent",
   "unstable": {
    "version": [
-    20220226,
-    1354
+    20220518,
+    807
    ],
-   "commit": "66fc30af02901db023e464a24d2b5fb3ff472794",
-   "sha256": "0ihwmkxgbd0mgfvzisjiwvyypa9z21ckyxdnkf9y5lxywjyr39zh"
+   "commit": "57f4072fa8acd5f7af40b11f5f33607bca324fe1",
+   "sha256": "1pimn792p93i2rs08al32xr3p9csp645ai5830mgjza6nkkqhxml"
   },
   "stable": {
    "version": [
@@ -23912,16 +24006,16 @@
   "repo": "jacktasia/dumb-jump",
   "unstable": {
    "version": [
-    20211018,
-    1545
+    20220524,
+    2122
    ],
    "deps": [
     "dash",
     "popup",
     "s"
    ],
-   "commit": "dbb915441a2b66f2fbb954ff5de2723c5a4771d4",
-   "sha256": "0gbxhl50j6m6c0kq2v3ph9b3mdrmjdslxiy6lhms4l01zyrg621g"
+   "commit": "1dd583011f4025b1b8c75fd785691851b6c5dfa3",
+   "sha256": "1c4w5hxydn59ga9731mcg0r0hlbn2fzjalvv0w2flnx77pkl8g6a"
   },
   "stable": {
    "version": [
@@ -23964,17 +24058,17 @@
     20210909,
     1010
    ],
-   "commit": "862831cd6e1146b0c18e6bdbf7daafb42868d439",
-   "sha256": "0kfykznv16lmbxhccnp9f1qn9wswadizp3mhq1kf1b29pvppf1yr"
+   "commit": "1c74870571c21e7e95c0ec53d3b714d08fcf2b83",
+   "sha256": "1y0gihaksjrxbxp8rr43xwbqcjy0y4a60kz7g1qqdafb1y38x5kr"
   },
   "stable": {
    "version": [
     3,
-    1,
-    1
+    2,
+    0
    ],
-   "commit": "09eac98ced1fff7dea4e5ac45b59e00c1874067e",
-   "sha256": "0ljv4gnalxq77byic23c8hrjmsqvn87gqj0ijm7rdx4xr1pff1jg"
+   "commit": "43af00f79e41ce9101d42b36dab13e1f68d49a7a",
+   "sha256": "0fa8fkj2piis8b56phl6p77pl1na81krdnmmvyw16hq45zbmm9rk"
   }
  },
  {
@@ -24311,8 +24405,8 @@
  },
  {
   "ename": "e2wm-bookmark",
-  "commit": "45488849da42ac775e532f30f588bfabb7af3cae",
-  "sha256": "1myaqxzrgff5gxcn3zn1bsmyf5122ql1mwr05wamd450lq8nmbw5",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "03pjwl9bi9bpsrkqdq8dzf34ksivamlpnp0rc09qrhss765mx2cz",
   "fetcher": "github",
   "repo": "myuhe/e2wm-bookmark.el",
   "unstable": {
@@ -24482,11 +24576,11 @@
   "repo": "redguardtoo/eacl",
   "unstable": {
    "version": [
-    20220101,
-    1517
+    20220526,
+    1434
    ],
-   "commit": "4d9d42fa05e550dbac71a2c93e1da71c48af9449",
-   "sha256": "1bpnrvjiz6k9s36v23y1b6pjyl78741g4rc2mpdwxcnk0vzmi0aj"
+   "commit": "4fe2cafbfeb73d806ebea8801c3522ff2886f30b",
+   "sha256": "05m121lw90rjs1a6wq8gvqxzydm4940x30xp3kh1v5x4zwwcf03b"
   },
   "stable": {
    "version": [
@@ -24500,8 +24594,8 @@
  },
  {
   "ename": "earthfile-mode",
-  "commit": "3df5031b52e919ace5b07c588eec343ed35cb416",
-  "sha256": "1gcdbfzd0v5rs6wfssh8dgby9rmgyar2zqphh2whjvzqp95axh5g",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1md8c7mds7zqzkfblijz64qywz1195sszixay6srr0r4lc1jlvyp",
   "fetcher": "github",
   "repo": "earthly/earthly-emacs",
   "unstable": {
@@ -24760,11 +24854,11 @@
   "repo": "flexibeast/ebuku",
   "unstable": {
    "version": [
-    20220106,
-    902
+    20220530,
+    453
    ],
-   "commit": "5004d377f8c89436c28d4a7ffbef407a2b28861e",
-   "sha256": "05cwxlqkj9wwy35pc8dq37rdvmkrc8528s64qw0pji406r6qs9l3"
+   "commit": "83ec048a6d9b5376b4416ec8a07c14f243a1b45f",
+   "sha256": "1zl89afgj085sc6hqb8ibz0fmm4gjwaf3wzpwr8dhdh2qkl8wdiy"
   }
  },
  {
@@ -25228,8 +25322,8 @@
  },
  {
   "ename": "edit-server-htmlize",
-  "commit": "219b037401a81ce70bd2106dabffa16d8b0c7cef",
-  "sha256": "007lv3698a88wxan7kplz2117azxxpzzgshin9c1aabg059hszlj",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0fcq988gjwmpa1cwm3nw36mn8ry8c0vby6f3lv7k2p1mhb68q960",
   "fetcher": "github",
   "repo": "frobtech/edit-server-htmlize",
   "unstable": {
@@ -25403,8 +25497,8 @@
     20220404,
     2105
    ],
-   "commit": "d1a3c37235dd87e0bce6ffc75f5568218d6d83b4",
-   "sha256": "19k9mi6phdny1ihxf5apkxfv67cvyihl0za7al29dvim6172km4y"
+   "commit": "940a4adbbeb3b6b1a72270a814d52770dd89a997",
+   "sha256": "1gsx2qgv5xm9r0i0axd4hf31g2rq2m4a1hvnif48g4xb0llss73c"
   }
  },
  {
@@ -25415,8 +25509,8 @@
   "repo": "sebastiw/edts",
   "unstable": {
    "version": [
-    20220415,
-    1722
+    20220521,
+    1345
    ],
    "deps": [
     "auto-complete",
@@ -25427,8 +25521,8 @@
     "popup",
     "s"
    ],
-   "commit": "5c096ecdf9462b125f2eb4092899ff63636cfc40",
-   "sha256": "1l97a55kg8dcvbdv9c2bk1acz4y9vl3x68mbybhbm0rs78170hx3"
+   "commit": "77e0dc91f603e8bedebfdccc90352ebbfd217c99",
+   "sha256": "1ny3nk6x428ksfnhpgfy6z0rd272nbsnqdzaxdshld8b0cj5rz6b"
   }
  },
  {
@@ -25463,11 +25557,11 @@
   "repo": "suntsov/efar",
   "unstable": {
    "version": [
-    20211122,
-    1943
+    20220530,
+    1412
    ],
-   "commit": "49dc9b89a8b9bf2523c202ac8830d1245768f3f4",
-   "sha256": "18pxs3mml90hd97fdhpgxyww4vjcj7jjiz0xzlzj0fd83pxxjr3n"
+   "commit": "bcf74e57031bb700c0e8b0a49c6e4583112b7eda",
+   "sha256": "1mfv5v120d49gsxf01imj4m71d7ijrvzi0h9nsfpd9yn93i8sraf"
   },
   "stable": {
    "version": [
@@ -25623,8 +25717,8 @@
   "repo": "joaotavora/eglot",
   "unstable": {
    "version": [
-    20220509,
-    1904
+    20220519,
+    900
    ],
    "deps": [
     "eldoc",
@@ -25634,8 +25728,8 @@
     "seq",
     "xref"
    ],
-   "commit": "ba618d2cee55c8c339d46621b7e721957cc30a72",
-   "sha256": "08ynxy8wpb1ran8r7h51n5r1njpjvz7hdxkgvr5njlhwp5wz2jd5"
+   "commit": "aa50b4bb9e52d15472c7a4f9c6101506dfa4f8b4",
+   "sha256": "1sjr6x2xbbyda0g3b04zqd6a7hm2n23dxpcb89yawssiwjn5v8xp"
   },
   "stable": {
    "version": [
@@ -25661,16 +25755,16 @@
   "repo": "fsharp/emacs-fsharp-mode",
   "unstable": {
    "version": [
-    20220409,
-    1811
+    20220605,
+    1329
    ],
    "deps": [
     "eglot",
     "fsharp-mode",
     "jsonrpc"
    ],
-   "commit": "5208b54098c7534f4768b87c5f4c8a01b638737b",
-   "sha256": "04s37djxzy8v5xwc5hh8gq37zh7f6ih3y07g07q2fc39rk1xslpd"
+   "commit": "c7842fe63b8bae5aa8bd6a9891036c5ce04e4030",
+   "sha256": "17ibcl9ilm7ml4gjlvcx40hni8awccm1zk37y0nfvcscigf3i8pr"
   },
   "stable": {
    "version": [
@@ -25765,11 +25859,11 @@
   "url": "https://forge.chalec.org/hjuvi/eide.git",
   "unstable": {
    "version": [
-    20220316,
-    619
+    20220531,
+    452
    ],
-   "commit": "23c78f4850f44d18eef66c694e7e05882d841ba6",
-   "sha256": "1icj34anks7f0cjdqc1kgj3bva3bnhily5xc5mzx21w0iciqvpk6"
+   "commit": "a32b9266414d9173dfa92fa44b17064ebb39522f",
+   "sha256": "09v74b78vq0vw93pm2xgkdyp6f7ql0l52bzgj1pyayjr5y6y65mg"
   },
   "stable": {
    "version": [
@@ -25798,14 +25892,14 @@
  },
  {
   "ename": "ein",
-  "commit": "215e163755fe391ce1f049622e7b9bf9a8aea95a",
-  "sha256": "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "1m00w3cg69xrg2cbcm9sxpfx9f80ksaj44bswh8y2bhbakv0wcxn",
   "fetcher": "github",
   "repo": "millejoh/emacs-ipython-notebook",
   "unstable": {
    "version": [
-    20220419,
-    735
+    20220608,
+    1138
    ],
    "deps": [
     "anaphora",
@@ -25816,8 +25910,8 @@
     "websocket",
     "with-editor"
    ],
-   "commit": "388c8f753cfb99b4f82acbdff26bbe27189d2299",
-   "sha256": "03idq7z0ry3mjvsw0w3acnsnfjijqkp9lr1v1xn5jn3s58ciyw80"
+   "commit": "7b9b14435c1dee85dd1eb5faf5d58edfa5ca5cbb",
+   "sha256": "1k8qj7h0kshf5crpk05q7bmp7pn6mzzbj80vwd0x9w4dwyrw0kin"
   }
  },
  {
@@ -25852,8 +25946,8 @@
   "repo": "kostafey/ejc-sql",
   "unstable": {
    "version": [
-    20220511,
-    1619
+    20220517,
+    1303
    ],
    "deps": [
     "clomacs",
@@ -25861,8 +25955,8 @@
     "direx",
     "spinner"
    ],
-   "commit": "900cf3ff0a8cffeeb0155ca131fa2e425ca9137d",
-   "sha256": "0r7rfpfxxn620cafw2h3in384lql3qbnpdrc8j2yyqlqgp73yygk"
+   "commit": "5e100426be90fc193154b1219ab1058534a4fb52",
+   "sha256": "0mxl8z86wi4kjnxl2bmk5j8p7fvlihcgpd7lkxnlsifqysnvpp86"
   },
   "stable": {
    "version": [
@@ -25926,28 +26020,28 @@
   "repo": "xgqt/emacs-el-fetch",
   "unstable": {
    "version": [
-    20220510,
-    1536
+    20220529,
+    1847
    ],
-   "commit": "3aa9594e807cb03af228c13224b381ecdd7ba2e3",
-   "sha256": "0rpdmhck3qn325jscysvgj2nzdy09rl895wsk5jhssmgmnp92zxs"
+   "commit": "7dea7aeffa68ede2cb34678ac2734502309ccbe5",
+   "sha256": "0fk48py9vx1mamwix2p3b20s3l7bfn9n4adqxrzli3810q3xd1mv"
   },
   "stable": {
    "version": [
-    2,
-    0,
+    3,
+    1,
     0
    ],
-   "commit": "3fa818577238adf9db7264e302d9614ce973d307",
-   "sha256": "0fbbnwxm96zmj2hlsjjxki901vs98qcxn8shyz8bs3qzb6kvlwyw"
+   "commit": "7dea7aeffa68ede2cb34678ac2734502309ccbe5",
+   "sha256": "0fk48py9vx1mamwix2p3b20s3l7bfn9n4adqxrzli3810q3xd1mv"
   }
  },
  {
   "ename": "el-fly-indent-mode",
-  "commit": "237311b98eec4b577409f55e16d8e640936d41a2",
-  "sha256": "00iqiawbzijm515lswbkzxf1m6ys242xrg6lzf8k40g2ygyd1q1r",
+  "commit": "fa9d1ac8f71a14e975e3d39a7ddd7351b2f4ba7f",
+  "sha256": "1wph83wczq3n5vavpkd5ad3fhswlcl0b2d1h79qji1xwigi22r88",
   "fetcher": "github",
-  "repo": "jiahaowork/el-fly-indent-mode.el",
+  "repo": "jiahaoli95/el-fly-indent-mode.el",
   "unstable": {
    "version": [
     20180422,
@@ -25968,8 +26062,8 @@
     20211224,
     959
    ],
-   "commit": "9353309744e4f8a7c9b1adf22ec99536fb2146b0",
-   "sha256": "14r7n9dkx1kf3j549h0kmdnsl89nwxadbx0qqmj2xzin7n9c412y"
+   "commit": "bf3dba444dcd240b8cb358a0850c8c5a92606134",
+   "sha256": "07wfy24lcmd1ccwjidxz704sziy95cjd1al59yava5g7nvw20wbn"
   },
   "stable": {
    "version": [
@@ -26413,19 +26507,20 @@
   "repo": "doublep/eldev",
   "unstable": {
    "version": [
-    20220501,
-    1128
+    20220607,
+    2112
    ],
-   "commit": "7275089749779599d87bee878e5103921ea919f9",
-   "sha256": "07p8qz4fx2gvgk46sl076w1rgqmdpbxsn54m330627sla5wk5bpf"
+   "commit": "61e3d10df55c8600f3a1f504dd718a1fe368ab50",
+   "sha256": "1aswsj7b2913v6v22drl3xc5n286xyf7w0zp3681jpmsba1h2xv3"
   },
   "stable": {
    "version": [
     1,
-    1
+    1,
+    2
    ],
-   "commit": "e08d0135a7b484686a969f5987f07bc72285ded4",
-   "sha256": "1ipjrifscjynrbf0nm4siyv57cd7jdi0v16kb2byv9y0yr481ag1"
+   "commit": "a837e383093dce56b36548b8a91b611b58bdc3fe",
+   "sha256": "1a7r2r48fb789nackny6y437nng119bwb40apar8m74233iz1063"
   }
  },
  {
@@ -26571,10 +26666,10 @@
  },
  {
   "ename": "electric-cursor",
-  "commit": "639747f3e5b2f8753478826a69b27727e1738d04",
-  "sha256": "12rlgyp9r4dgp0mid95rx0p5ygpxjzhvlxkmidlzakyirc1i0jlw",
-  "fetcher": "github",
-  "repo": "duckwork/electric-cursor",
+  "commit": "5485aeeb5c536e88cd1c2cfb1163d0b3ab44b8a1",
+  "sha256": "0adjj9fhh1xzgijf7bpbxy2hrrbrxm473jsy52y47a6fnprpbhc8",
+  "fetcher": "git",
+  "url": "https://codeberg.org/acdw/electric-cursor.el",
   "unstable": {
    "version": [
     20220108,
@@ -26835,8 +26930,8 @@
   "repo": "remyhonig/elfeed-org",
   "unstable": {
    "version": [
-    20220420,
-    1234
+    20220529,
+    1958
    ],
    "deps": [
     "cl-lib",
@@ -26845,8 +26940,8 @@
     "org",
     "s"
    ],
-   "commit": "e6bf4268485703907a97896fb1080f59977c9e3d",
-   "sha256": "1md7nxayysd6pkxyp85jmmz3jh6civpd3y0qgn0zq865jcjv86l6"
+   "commit": "d28c858303e60dcb3a6eb18ea85ee3cb9e3dd623",
+   "sha256": "189hr2pqpm9vpz06frkl6r3k6q6ispx97zj24lczcli44l7d8gsz"
   }
  },
  {
@@ -26857,15 +26952,15 @@
   "repo": "fasheng/elfeed-protocol",
   "unstable": {
    "version": [
-    20220419,
-    1358
+    20220524,
+    336
    ],
    "deps": [
     "cl-lib",
     "elfeed"
    ],
-   "commit": "eaf1329ff221098eb6d4709245010d070c89b173",
-   "sha256": "14zn3h7v9vygi6syjnywd5j56xlqv4a1z2grlkgrr0jd0y427jzk"
+   "commit": "b813574faefc1ac4825da19b40f620339b6badff",
+   "sha256": "0k9rkghp9rg7aidmx7q0n4wpb9z5cwr7j8z167yzaqgf9s3y4jj2"
   },
   "stable": {
    "version": [
@@ -26889,14 +26984,14 @@
   "repo": "sp1ff/elfeed-score",
   "unstable": {
    "version": [
-    20220428,
-    123
+    20220528,
+    2320
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "419de17d681d75789271b8457509fa3f942eab54",
-   "sha256": "1mx134xj9n73v55i0yjn86zn19sg93m95gqacs2c6dxzq1v3q14f"
+   "commit": "ff8cfdfcb3fce9ecdfe7e58463c5c5814cb3d1c2",
+   "sha256": "1x909sbwcnjkamhvi0jkd4qy99a971zxc3ydqx3x2k12slhvaczz"
   },
   "stable": {
    "version": [
@@ -26919,15 +27014,28 @@
   "repo": "SqrtMinusOne/elfeed-summary",
   "unstable": {
    "version": [
-    20220506,
-    720
+    20220604,
+    850
+   ],
+   "deps": [
+    "elfeed",
+    "magit-section"
+   ],
+   "commit": "1cf73acae8b791e214dc347c2adf7ec17e8ff41a",
+   "sha256": "0k7g5v616gw5lsl4rga2k7dzha1mjw50sh2fhk4lkgz41z8jssa1"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
    ],
    "deps": [
     "elfeed",
     "magit-section"
    ],
-   "commit": "641a453cfd03e098b5e6376e035eafd080b08781",
-   "sha256": "00sxk4pf58678lhjmzdi42dkiiszpnnjhv0dwdgi60mc31d7kqdc"
+   "commit": "1cf73acae8b791e214dc347c2adf7ec17e8ff41a",
+   "sha256": "0k7g5v616gw5lsl4rga2k7dzha1mjw50sh2fhk4lkgz41z8jssa1"
   }
  },
  {
@@ -27063,11 +27171,11 @@
   "repo": "xuchunyang/elisp-demos",
   "unstable": {
    "version": [
-    20210312,
-    542
+    20220513,
+    1626
    ],
-   "commit": "924b07d28e4f5b82f0e1377bcde800068f0a6d9d",
-   "sha256": "1pf37rlpmr8fjaxqk47p7dv84nksgh3r63m23jpi1g49myvwfzgi"
+   "commit": "01c301b516e9949d0239d20f6834afbc9acf0abb",
+   "sha256": "07rjc6kkhhc0y2wwgsv09z66i9qyfl2b189jrxqcha02rw5sb0lp"
   },
   "stable": {
    "version": [
@@ -27348,17 +27456,17 @@
   "stable": {
    "version": [
     0,
-    21,
+    22,
     0
    ],
    "deps": [
-    "dash",
     "f",
     "reformatter",
-    "s"
+    "s",
+    "seq"
    ],
-   "commit": "5df694e307cf8fa5a3555d800984aa4ebb40664f",
-   "sha256": "0iwk4fmw8hq3ry4ky1zc7lgl4cpbnrjyk74c2xzddfspi3ks41fd"
+   "commit": "1e277684d8a6681a2410cce2dd589ee30a998369",
+   "sha256": "1gnr61ibzcznfqy5f8capmbz75rcfikwy106rjdmp45qz2jwp4di"
   }
  },
  {
@@ -27428,8 +27536,8 @@
  },
  {
   "ename": "elmine",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "1xkx1wwrzd2dl13z8n4qh3gl202j0i9crab5b3788z8mq0g4v4bn",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1zh0wc0n9r60y72jg26bhnmlbz2h282vwxr4p0k0v65jc1j20a75",
   "fetcher": "github",
   "repo": "leoc/elmine",
   "unstable": {
@@ -27620,17 +27728,17 @@
  },
  {
   "ename": "elpa-mirror",
-  "commit": "d64ce7042c45f29fb394be25ce415912182bac8b",
-  "sha256": "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "056ci878vsmab9d2j72wy2skdipvi9hz0cnlhyfc3zj3shr6cbnj",
   "fetcher": "github",
   "repo": "redguardtoo/elpa-mirror",
   "unstable": {
    "version": [
-    20220123,
-    1237
+    20220526,
+    1512
    ],
-   "commit": "3e0fe0f91d1c5798752c255b89950617f88b8d9e",
-   "sha256": "1vfhxbn9m3412hpgpnpf523lm9cl4lkbk1fgjvqldlknwks376jh"
+   "commit": "b200d979bcbfe2df0f7c0074aeb5497251ed47a8",
+   "sha256": "1gmwf3wv984vxnr42936kyb4npkwc3mwpm81akprxm5ggzz0zigd"
   },
   "stable": {
    "version": [
@@ -27650,11 +27758,11 @@
   "url": "https://thelambdalab.xyz/git/elpher.git",
   "unstable": {
    "version": [
-    20220503,
-    833
+    20220530,
+    1219
    ],
-   "commit": "bf0dd36eb2f5b339c6b561dbe3ee9693565b484b",
-   "sha256": "0dv71zc95m5sa4824vk3d1xk726nh2v50i0yp6w3ydfzzsfph6j6"
+   "commit": "79c241f1ce5d4e4f2ba377485f4434e93391eb0f",
+   "sha256": "00av8qfxvr9f4jfai7pr7c1sf50m07z6gfxwy3lzvsv6i88s43fs"
   },
   "stable": {
    "version": [
@@ -28038,17 +28146,17 @@
   "repo": "tecosaur/emacs-everywhere",
   "unstable": {
    "version": [
-    20220407,
-    329
+    20220517,
+    1401
    ],
-   "commit": "54b9ba1ac0d7f8b644354fd6d27c9e3aff111dcc",
-   "sha256": "165ba97ll0k8fsr3k2bxpwg4lnmd3513vn4mdgxcx9ll5p1jr4nd"
+   "commit": "0d0d1854299aa50edb3fd57317949c00f3fcbb03",
+   "sha256": "1x7c4sj7rj17mc3iwim96vn9m9ar04hj6a8lvilf4814lgvz9q4k"
   }
  },
  {
   "ename": "emacsc",
-  "commit": "acc9b816796b9f142c53f90593952b43c962d2d8",
-  "sha256": "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "06yhv7g579fpzbpinzn046i7zwsc6z43vrzawvxppzxpjcz8nh4r",
   "fetcher": "github",
   "repo": "knu/emacsc",
   "unstable": {
@@ -28371,19 +28479,19 @@
   "repo": "oantolin/embark",
   "unstable": {
    "version": [
-    20220509,
-    2259
+    20220608,
+    17
    ],
-   "commit": "81c7f751be1de33dee9f7523fd3429ee3fe9a0d1",
-   "sha256": "11yvhhq251qmbnljjcfxnc53dqa63jm6ximfd0618hcwcgxlkkdc"
+   "commit": "63f0d4dc09afb058450dc10dd3916027a93ee487",
+   "sha256": "0q8l4ckdmcagiiccvb0s94gc1lywgqh02d8p16ygpcfxz8967w4a"
   },
   "stable": {
    "version": [
     0,
-    16
+    17
    ],
-   "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b",
-   "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv"
+   "commit": "97270d725761ee02db461b45b18ec16ae31f203e",
+   "sha256": "1s0ssf4q9kg4c5w87h2ypyvrhi31mz3s6k4h7pxi9a47lkccq8n1"
   }
  },
  {
@@ -28394,27 +28502,27 @@
   "repo": "oantolin/embark",
   "unstable": {
    "version": [
-    20220507,
-    143
+    20220526,
+    1525
    ],
    "deps": [
     "consult",
     "embark"
    ],
-   "commit": "81c7f751be1de33dee9f7523fd3429ee3fe9a0d1",
-   "sha256": "11yvhhq251qmbnljjcfxnc53dqa63jm6ximfd0618hcwcgxlkkdc"
+   "commit": "63f0d4dc09afb058450dc10dd3916027a93ee487",
+   "sha256": "0q8l4ckdmcagiiccvb0s94gc1lywgqh02d8p16ygpcfxz8967w4a"
   },
   "stable": {
    "version": [
     0,
-    16
+    17
    ],
    "deps": [
     "consult",
     "embark"
    ],
-   "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b",
-   "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv"
+   "commit": "97270d725761ee02db461b45b18ec16ae31f203e",
+   "sha256": "1s0ssf4q9kg4c5w87h2ypyvrhi31mz3s6k4h7pxi9a47lkccq8n1"
   }
  },
  {
@@ -28544,8 +28652,8 @@
  },
  {
   "ename": "emms",
-  "commit": "4caa7403144670c07e326ed3a7d982c427d4a254",
-  "sha256": "0ml66fgzxl4wsk5g7d78mqhr9gqmbld6qh31nfc6z19c8107jrd5",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "07r44rvnwvw7fcqjy4c7kjl0qmjynkibjhwraaiv1y92l1m9z8m1",
   "fetcher": "git",
   "url": "https://git.savannah.gnu.org/git/emms.git",
   "unstable": {
@@ -28594,8 +28702,8 @@
  },
  {
   "ename": "emms-info-mediainfo",
-  "commit": "d08c28c6ff4caf14f0bf4b0f40f16660dac2d5d9",
-  "sha256": "17x8vvfhx739hcj9j1nh6j4r6zqnwa5zq9zpi9b6lxc8979k3m4w",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0hmja2s6120yka2h6p60v1b5hgkd1ywz82igwcv5wf9mxm9mmfw9",
   "fetcher": "github",
   "repo": "fgallina/emms-info-mediainfo",
   "unstable": {
@@ -28842,8 +28950,8 @@
     "emojify",
     "request"
    ],
-   "commit": "434ccc9df8eb884f248d5934e7d465348bb203a4",
-   "sha256": "07mbh3a34qcb1d37fvy3g5z3mc436lc5vlqqk46x7bjwdbkzlsfs"
+   "commit": "f683f95ceae812c77c54d398e0dc02c6da4ae17f",
+   "sha256": "0ghv79g1iirqzy1d10ywspcdcbb5br4vd86fxg44bk4iw7jn40ng"
   },
   "stable": {
    "version": [
@@ -29021,14 +29129,14 @@
   "repo": "hrs/engine-mode",
   "unstable": {
    "version": [
-    20200611,
-    1825
+    20220519,
+    1916
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "e0910f141f2d37c28936c51c3c8bb8a9ca0c01d1",
-   "sha256": "15zx4a8gvgk077pnj7wr78nfjrzrj2i9ma6cj6jj6i8ikz6wyvjz"
+   "commit": "57045918301f5a96f67bd409f7683987a72272cd",
+   "sha256": "1a2c9c9kwkczg6jjn9rf46f1qgvqr6r695srp9cijq192f23d83n"
   },
   "stable": {
    "version": [
@@ -29155,15 +29263,15 @@
   "repo": "purcell/envrc",
   "unstable": {
    "version": [
-    20220218,
-    1627
+    20220604,
+    1519
    ],
    "deps": [
     "inheritenv",
     "seq"
    ],
-   "commit": "4730b31ff1479b6d822ccc7517251dcb52de45b3",
-   "sha256": "0w2fnqqihiqkkqw1x1gghgd0644gf7r5wp12dr7h1ljhfcb4kz83"
+   "commit": "7f36664fc6d97a7ca77c6c3e0c6577b72fa0b70d",
+   "sha256": "0858d36xgc6r4s116hc4pb8jf1j1l9ixws9xpk39a8h1diw3gplm"
   },
   "stable": {
    "version": [
@@ -29294,8 +29402,8 @@
  },
  {
   "ename": "epkg",
-  "commit": "2133b10c735ce47fc8d8ff8c51f29ec4b13982a3",
-  "sha256": "1cj53l3fdxjwkky3j3rfmv3l11m5xkn4l8qx8x2fr35rkldii5w3",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww",
   "fetcher": "github",
   "repo": "emacscollective/epkg",
   "unstable": {
@@ -29459,14 +29567,14 @@
   "repo": "emacsomancer/equake",
   "unstable": {
    "version": [
-    20220424,
-    350
+    20220607,
+    2211
    ],
    "deps": [
     "dash"
    ],
-   "commit": "ea5c0570f58b8e62249e001ed434a1056a50abe7",
-   "sha256": "0l85xks1m8yprd5q84gp0ryaagjd74kwb40r0mwdly6y4dzi0kvr"
+   "commit": "1f1f269edd27ffce8b6ead5b317e49fa433b039f",
+   "sha256": "0am0lixinl10x6j62hz86wg0pdminmm74vfyklzxh0yhvbvlcc5l"
   }
  },
  {
@@ -29865,8 +29973,8 @@
  },
  {
   "ename": "erefactor",
-  "commit": "18063e16a6f556b1871e1a5b74e353a85a794e63",
-  "sha256": "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1fvs0zqd57jpv6yj234w1dqynldnpfifm10swwrmnyjfc6wv5a9i",
   "fetcher": "github",
   "repo": "mhayashi1120/Emacs-erefactor",
   "unstable": {
@@ -29954,8 +30062,8 @@
     20200914,
     644
    ],
-   "commit": "9a5f2b4a8cd14edbde9d16dcdfcb8db2a91be0d8",
-   "sha256": "1pn3w2prmz9ibhy5l22c6mmccr7lfy561gkd2s41hlcjsyd4ar00"
+   "commit": "6385f850a185523bb5241a71f5a7614a148f6b53",
+   "sha256": "0dllhhbr265dm12nkiil0s7cb24l7pjdjgfwgcsy98imn8pl8z4p"
   },
   "stable": {
    "version": [
@@ -29979,18 +30087,16 @@
     20220215,
     1844
    ],
-   "commit": "4bf325feb5885056ad3315d9a0316b652613b3d9",
-   "sha256": "0dwjafw8ab71bqvwpv49cwqarrcd5pa0wyh7yxjn3spnl6f80j1l"
+   "commit": "5f870f8af2d4cad995589414aa5eda92486fa508",
+   "sha256": "1w0lyvx1fdi3qgkc4fc61rabp1j6qscnm3m26k887q8gwl8k5ss3"
   },
   "stable": {
    "version": [
     25,
-    0,
-    -1,
-    3
+    0
    ],
-   "commit": "47f121af8ee55a0dbe2a8c9ab85031ba052bad6b",
-   "sha256": "1ir42hz81bzxn1shqq0gn824hxd6j774889vjy68psi95psfs8r2"
+   "commit": "4ed7957623e5ccbd420a09a506bd6bc9930fe93c",
+   "sha256": "1nf72yiirdpxcs8m10xc04ryghxxc73x954x38m5a6fhv2hfhp2n"
   }
  },
  {
@@ -30132,8 +30238,8 @@
   "repo": "rejeep/ert-runner.el",
   "unstable": {
    "version": [
-    20201005,
-    2336
+    20220513,
+    1142
    ],
    "deps": [
     "ansi",
@@ -30143,8 +30249,8 @@
     "s",
     "shut-up"
    ],
-   "commit": "80cf4f60ec8c1f04f58054ed8ad2dcfacc17d8b5",
-   "sha256": "1zxhiy8hpyz1nbi238gnwvs2pyrl1h8pgfyqrjhqwni8bih4kzx7"
+   "commit": "69d66b934223d5f1801ba3a4c8dbfb3453f2a041",
+   "sha256": "12hy1wnrs9dq2hl88fbybjv18a5fh5az5vpcrrxihrwy2gi2yrw0"
   },
   "stable": {
    "version": [
@@ -30512,26 +30618,26 @@
   "repo": "Phundrak/eshell-info-banner.el",
   "unstable": {
    "version": [
-    20220402,
-    1721
+    20220531,
+    940
    ],
    "deps": [
     "s"
    ],
-   "commit": "53fc69b8712b9869cee49468a6e418d64d2c3ab9",
-   "sha256": "16ma3z7sxj95p3jfaszdvaj45rjkmb806mlm2vv5pgcbzqjfhrp6"
+   "commit": "b7f2bfc0137be9cdc3dfe26a71e1984d3c3bcdc4",
+   "sha256": "0xj9cmcm8cfmmnvjs2wwhqc9j7jwydywscbwq16clwb3v4v5gj1i"
   },
   "stable": {
    "version": [
     0,
     8,
-    7
+    8
    ],
    "deps": [
     "s"
    ],
-   "commit": "9c17e92f0229c9002e071842a88396c3f2439d72",
-   "sha256": "08kqqlvia3hzl9yq5yia92a27rk3fsahdizlf7rpywkmj5aix43l"
+   "commit": "27b0be266beaedd594bf0022582567454107af5f",
+   "sha256": "0xj9cmcm8cfmmnvjs2wwhqc9j7jwydywscbwq16clwb3v4v5gj1i"
   }
  },
  {
@@ -30932,11 +31038,11 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20220225,
-    1523
+    20220509,
+    801
    ],
-   "commit": "39eba283000a7b0220303d7c5a4f3ee05efc1e9c",
-   "sha256": "1avzxbdj2ghzv94mjmikqdb6za4dxkby2pnyrz0519fs4sc17a06"
+   "commit": "e83ac622fe7e3cbfc848481a9257e5ed5c7b5afb",
+   "sha256": "1qi399iidac2hbz1c2ydqcbfcqr5f7ldgqbhchk96az2l41yb6sp"
   },
   "stable": {
    "version": [
@@ -30992,14 +31098,14 @@
   "repo": "ShuguangSun/ess-r-insert-obj",
   "unstable": {
    "version": [
-    20211209,
-    812
+    20220531,
+    31
    ],
    "deps": [
     "ess"
    ],
-   "commit": "dd367cb918c90ec6d3824da869f7a75bb1ca49b6",
-   "sha256": "17vrs3wz3gpjvnq8i5gz14jnsds8s359ynx73wwh0ydcrx79f9dh"
+   "commit": "105a8edf97cc1e82ce1e959e7b7bd049851a255a",
+   "sha256": "02ydx9l074wl4f57b0l7lv2vnjvj8rbzppjd2gqh5g7gpy9lggv6"
   },
   "stable": {
    "version": [
@@ -31045,8 +31151,8 @@
  },
  {
   "ename": "ess-smart-underscore",
-  "commit": "b4d6166f5c80cf37c79256402fa633ad2274d065",
-  "sha256": "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1mkx4530j1mwdikxh2j9gzfqqv8v29z9ril303vzrhhj8lbzrvm1",
   "fetcher": "github",
   "repo": "mattfidler/ess-smart-underscore.el",
   "unstable": {
@@ -31308,8 +31414,8 @@
  },
  {
   "ename": "ethan-wspace",
-  "commit": "9454f3a58e3416fa60d8411b0db19c408935408f",
-  "sha256": "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "1dr7ydicqa7iv88n68nlnrzh7sg8lrcnmkmc6629gi00kwxlgjbp",
   "fetcher": "github",
   "repo": "glasserc/ethan-wspace",
   "unstable": {
@@ -31354,8 +31460,8 @@
  },
  {
   "ename": "euslisp-mode",
-  "commit": "b04fffe5e52f26e92930a112a64531228f94e340",
-  "sha256": "0v92lry9ynkvsvx060njaw1j5lj9sb1i3srs2hfqqwyqni5ldkri",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0ixg22yw4x0g4gzy3jnq4n0b6dhvavwzp3gp0gy0lk5l2iv9i4nz",
   "fetcher": "github",
   "repo": "iory/euslisp-mode",
   "unstable": {
@@ -31550,15 +31656,15 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20220510,
-    2302
+    20220518,
+    859
    ],
    "deps": [
     "cl-lib",
     "goto-chg"
    ],
-   "commit": "5a9cfbc443219c4063b17853b7828ec0a00d2736",
-   "sha256": "1vr46xn72l5m0r9v3d1xaz86q607ga5adxlqdh7mlymw15w004ha"
+   "commit": "157af04d2cf466e301e82b0e667c5e7203fd96a2",
+   "sha256": "1aqavbxg5656ycjia2pbsvif3zaf0r99v87cym6442pszhdv2hsy"
   },
   "stable": {
    "version": [
@@ -31727,8 +31833,8 @@
  },
  {
   "ename": "evil-colemak-minimal",
-  "commit": "828c744062069027f19fe5f2f233179f9149dc16",
-  "sha256": "0qi5k17b9k227zz9binbrd22cwmlqxkay98by9yxcbyhl4hjhdyy",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "149hpqcv9pak4bvka3hljfl8lf0bwfipi0kq8rn9rj6sc624nxzj",
   "fetcher": "github",
   "repo": "bmallred/evil-colemak-minimal",
   "unstable": {
@@ -31751,28 +31857,28 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20220505,
-    619
+    20220607,
+    105
    ],
    "deps": [
     "annalist",
     "evil"
    ],
-   "commit": "9707efcae4fc76fa204b1c29565aae35b99b865a",
-   "sha256": "0iyhxmaiqk0c72lmggv9jppxmlkb0vd9y0zqxgzjnznz9p08l3vz"
+   "commit": "79fc09b0140311377726551ee31622f61d28c571",
+   "sha256": "05q9fqcj1fq8dqg014i5kk0zwh1d5q13m35052276pjmkgfnfrk7"
   },
   "stable": {
    "version": [
     0,
     0,
-    7
+    8
    ],
    "deps": [
     "annalist",
     "evil"
    ],
-   "commit": "f31162b2536d14bf97fe96d6e54be0d091ba9493",
-   "sha256": "1f5mbg2k527brn6b7njdjizpbzj252c53crzl8sf2564czcprqj0"
+   "commit": "a63cb007bf15c3fd4c3322f29f85d18d5574f7ba",
+   "sha256": "159i3qvjnp7jiffwpr517nnxcy3w3g40302vyzxvz6mb6qay6f2c"
   }
  },
  {
@@ -32210,8 +32316,8 @@
  },
  {
   "ename": "evil-lion",
-  "commit": "8a7a0691775afec6d2c7be3d6739b55bd1d2053d",
-  "sha256": "1rwmpc5ifblb41c1yhhv26ayff4nk9iza7w0wb5ganny2r82fg2v",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0qi7syxhni4m5m33lkb6ajw36naysm14mp2qwidmdq8h66zmy53p",
   "fetcher": "github",
   "repo": "edkolev/evil-lion",
   "unstable": {
@@ -32317,26 +32423,20 @@
   "repo": "redguardtoo/evil-matchit",
   "unstable": {
    "version": [
-    20220513,
-    230
-   ],
-   "deps": [
-    "evil"
+    20220608,
+    1134
    ],
-   "commit": "b47931128c6b7924ea432895f469769986de410d",
-   "sha256": "1zjdwqqrc2znk2y8f424ygnkxsvx0hq46gicjb4nllbvvvbx6kyb"
+   "commit": "271551560c3c8c066b29d335f781ff9b5aefe746",
+   "sha256": "1vzpmr33smi1kgcrxj7jl8wvk1ffvy2bf6p6pki0r53lk03mf8fr"
   },
   "stable": {
    "version": [
-    2,
-    4,
-    4
-   ],
-   "deps": [
-    "evil"
+    3,
+    0,
+    0
    ],
-   "commit": "b314e816bacfc01bb7df9b19a06b18638af5cdbe",
-   "sha256": "01r85bnmqbmvwlhv5ihglp0dhws1g2wsw2vy0vsw5mi5mmx2xsqr"
+   "commit": "7a2a7384b6e752a805d6fbb78cf9425e54c2b18b",
+   "sha256": "0a55hhqi14g0hy80cfi5anxs44rcdxm1jkkyl561b4d4g823bpbi"
   }
  },
  {
@@ -32452,11 +32552,11 @@
   "repo": "redguardtoo/evil-nerd-commenter",
   "unstable": {
    "version": [
-    20220414,
-    1201
+    20220524,
+    1231
    ],
-   "commit": "95ed1ad2448e7f49f1ee417061b61edbb69a0749",
-   "sha256": "0hypgk03yksvgakx24mrz9nrx2z0d691ls80by2fw96788d68k8x"
+   "commit": "386cd758a477d1b1ba742ef698ecc19916b43fbe",
+   "sha256": "1gg6g14nyizfagn5dgqr8qrfcyvlbcm0jvlb2wqp5z2wp1dyzqkg"
   },
   "stable": {
    "version": [
@@ -32603,8 +32703,8 @@
  },
  {
   "ename": "evil-paredit",
-  "commit": "88db86e1351410bcff6f3ed80681946afcec9959",
-  "sha256": "0xvxxa3gjgsrv10a61y0591bn3gj8v1ff2wck8s0svwfl076gyfy",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1wsgb4whd3lq8830vja5k6d574azwfy5i918xblsihddn7m35dkd",
   "fetcher": "github",
   "repo": "roman/evil-paredit",
   "unstable": {
@@ -33053,14 +33153,11 @@
   "repo": "7696122/evil-terminal-cursor-changer",
   "unstable": {
    "version": [
-    20220422,
-    255
-   ],
-   "deps": [
-    "evil"
+    20220514,
+    258
    ],
-   "commit": "69d562932f9ab9869ab1ed923e9789cbfa0ff14c",
-   "sha256": "14d9hyv2hhv0vzvmq5m1d59imzxmlm1qc484kn3sbc99553q0s1x"
+   "commit": "81ede5cfa5d8944aa4777987c846a27e28457266",
+   "sha256": "01q3h1dmhpcjqs9zchq7wfpibd49pycfnrpn0gj0sh5bspzrqfm7"
   }
  },
  {
@@ -33077,8 +33174,8 @@
    "deps": [
     "evil"
    ],
-   "commit": "5a9cfbc443219c4063b17853b7828ec0a00d2736",
-   "sha256": "1vr46xn72l5m0r9v3d1xaz86q607ga5adxlqdh7mlymw15w004ha"
+   "commit": "157af04d2cf466e301e82b0e667c5e7203fd96a2",
+   "sha256": "1aqavbxg5656ycjia2pbsvif3zaf0r99v87cym6442pszhdv2hsy"
   },
   "stable": {
    "version": [
@@ -33280,15 +33377,15 @@
   "repo": "meain/evil-textobj-tree-sitter",
   "unstable": {
    "version": [
-    20220423,
-    947
+    20220527,
+    1400
    ],
    "deps": [
     "evil",
     "tree-sitter"
    ],
-   "commit": "bfdef5a292f7dde36967bb86eb2f7009b03631b1",
-   "sha256": "18nxwn051rq2r4jhc21hy2lmla7aghc2l9cvj7ib97q2l4f0jv64"
+   "commit": "fba268b2fd15657404da308b3e91efa87d9f15be",
+   "sha256": "0av546si5h8ka9qm07sqwfklq6d864di16cfwg80g4s7anhh7f11"
   }
  },
  {
@@ -33886,15 +33983,15 @@
   "stable": {
    "version": [
     0,
-    1,
+    2,
     0
    ],
    "deps": [
     "dash",
     "ht"
    ],
-   "commit": "fb4349fb7dbddcebc189cce52dda25ab42d27b06",
-   "sha256": "18ihdfm8hbfl0nhk5k02m0f5dni5pmljnv0my87pmhqa4bzi1b38"
+   "commit": "e668666770858e92de83d8217c7e384de3ba1e34",
+   "sha256": "0hlm8c1sif4z8fl6k9k9akc26nzxby792ca6wkrqxcjsc65a65zv"
   }
  },
  {
@@ -34310,21 +34407,21 @@
  },
  {
   "ename": "f",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "18qax8i24gpccif4xcxccclpwl00plxjf3zbq9dry37b1r4mj57s",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1sfji40z03mwdkdf922rdykxkaidihfkmy7isgn4fr6hbgjkqgi7",
   "fetcher": "github",
   "repo": "rejeep/f.el",
   "unstable": {
    "version": [
-    20220511,
-    1502
+    20220608,
+    943
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "ad2c7dd369a15988f1c6298b5edb901ce2e1f446",
-   "sha256": "0rjggym7a7sb12bspdydk2vx12hqjqv0qmkpfi0z6s7mcnpl7fhq"
+   "commit": "d2019d4f9625bcc44349c69fe46d6645fd9ff4ff",
+   "sha256": "0vml6p19zwab2zrln2g6g2hb31czlz2rqln5wi8lc37h8lgfx7fy"
   },
   "stable": {
    "version": [
@@ -34454,8 +34551,8 @@
  },
  {
   "ename": "factlog",
-  "commit": "9075a42edee1ac7de0812d2eefcba5681859eb6e",
-  "sha256": "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "1x1pn2r54b5njl3wangjpwgwsaxq37zz3kh4dj6razifb9277pcq",
   "fetcher": "github",
   "repo": "tkf/factlog",
   "unstable": {
@@ -34487,25 +34584,25 @@
   "repo": "WJCFerguson/emacs-faff-theme",
   "unstable": {
    "version": [
-    20220512,
-    21
+    20220527,
+    1238
    ],
-   "commit": "33b3344848ae17d45c19d222e53b368ea6867e7e",
-   "sha256": "1yi2xzp1a945p11h6ac5ci0n56ffd40sm3ja6i4hrw4dd41axgyg"
+   "commit": "cb0ce3ef4430eda81aa6225f7083beb8ae03a425",
+   "sha256": "0zq8k1ggv40fdz6a5ri5nxg7yznvlwx7j3cpl7gig1v1p97h0b8k"
   },
   "stable": {
    "version": [
     3,
-    2
+    3
    ],
-   "commit": "fffae9ada9057e81812f90edbd589f4a4f346768",
-   "sha256": "1rcjawwjk0jkihv26wrhhp0ncnj9qq1q16gkb9c8ys1qvaqyaiah"
+   "commit": "cb0ce3ef4430eda81aa6225f7083beb8ae03a425",
+   "sha256": "0zq8k1ggv40fdz6a5ri5nxg7yznvlwx7j3cpl7gig1v1p97h0b8k"
   }
  },
  {
   "ename": "fakir",
-  "commit": "d0a8abd5fd77a14b957f53b5bc8474403cc1e18f",
-  "sha256": "07bicglgpm6qkcsxwj6rswhx4hgh27rfg8s1cki7g8qcvk2f7b25",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1pdil5shyrvwg4h3y4apnyvj7dq4f5ghg7kb3ybf52i2vimnmi7z",
   "fetcher": "github",
   "repo": "nicferrier/emacs-fakir",
   "unstable": {
@@ -34618,14 +34715,14 @@
   "repo": "condy0919/fanyi.el",
   "unstable": {
    "version": [
-    20220310,
-    358
+    20220519,
+    105
    ],
    "deps": [
     "s"
    ],
-   "commit": "b01cb24209d223ae0e7281c279daab87800ee7f4",
-   "sha256": "1jaw9xwh58p1n0x943f6fly0scxf6zd6czq87xrb3fnkmv8qdnhk"
+   "commit": "b09d122a17724668f73d44b9fe0b47add7f596c1",
+   "sha256": "1ys3aymskjsrvkqq3k91ml1rxms8bp64i9r4q4ya5k8xdz828m5z"
   }
  },
  {
@@ -35033,8 +35130,8 @@
     "f",
     "s"
    ],
-   "commit": "d81983cf389dd5d2ec6cf9d702ff28ffd1be676b",
-   "sha256": "109d5sz2prlih28nbzaq3anyr7kyjm9cr7krndgsf7n68w6dz5b4"
+   "commit": "cab1b591a541f2a5ee25529572c6895e7f78cc4f",
+   "sha256": "1zziwgx9w76sww9wcnfvj1msmcp3z5lxgv8pkc0szp7a1ckm07hi"
   },
   "stable": {
    "version": [
@@ -35207,8 +35304,8 @@
     20210707,
     354
    ],
-   "commit": "02ab2b3854df5515245ca2a924f89bf830f9c4de",
-   "sha256": "1jp3jcr9ni3rslhjv3wg7gqjg2iihdi3six4b65chcxryhkd21jd"
+   "commit": "1191c3454c8ae10aafe9ae08e98563948284c677",
+   "sha256": "1dbxnl14mzxij6209qsa69zbxp64qkz0q2pkayxl6fmi4s2sp3rs"
   },
   "stable": {
    "version": [
@@ -35237,10 +35334,10 @@
  },
  {
   "ename": "filldent",
-  "commit": "4e3d46311b4d15314b6d1a0d5ff95c5f7e366223",
-  "sha256": "0if5fxr5vy4b8w36d0vi43cba5xpvqc2ma46d80bpark95jj8cvq",
-  "fetcher": "github",
-  "repo": "duckwork/filldent.el",
+  "commit": "cf2e923e6036542b89ee9cb36fca699092a24b64",
+  "sha256": "1z0yhg57nb6wf8iwbj84b22qjhy969zmvrxq766yl08950093k0r",
+  "fetcher": "git",
+  "url": "https://codeberg.org/acdw/filldent.el",
   "unstable": {
    "version": [
     20220423,
@@ -35357,8 +35454,8 @@
     20220430,
     107
    ],
-   "commit": "116b976b526680c038109882d5cd2d9f218b62a5",
-   "sha256": "0sq8fyq19jw1hm0m6hiqnvzzvx0c3xigfx7x6i40ib5hnfjlqs0a"
+   "commit": "38ebbc21e32a6e616d315f5f898df4ca825f916d",
+   "sha256": "1hla8vvm8ia9rxsrrcwh8adg9ygnlpw9s1jci58jbiq2a0ng3mkp"
   },
   "stable": {
    "version": [
@@ -35549,11 +35646,11 @@
   "repo": "jming422/fira-code-mode",
   "unstable": {
    "version": [
-    20210702,
-    1631
+    20220531,
+    1555
    ],
-   "commit": "eaff81f867d9c84e25891368f3d0cac7513984e8",
-   "sha256": "0gc77fkc6jczb52f5hil3h0hv74f7cxbijc8mjprh7zzgb09b6za"
+   "commit": "7b469ca0c22b7e6a907cd65eebdfa9723998a131",
+   "sha256": "1jgkgnpi5zmmqmm622p3cl0hj72cbag68c8mbi9bakw2fkq64xm2"
   }
  },
  {
@@ -35722,8 +35819,8 @@
  },
  {
   "ename": "fix-muscle-memory",
-  "commit": "c6b0501714a6d82657b88d11e3f79d75eea17d8e",
-  "sha256": "0qhasnjw0bj5hzw27r8vj6shhwc3zxcp3wmxijh1rpdw4773f7n8",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1y46amy0a566pk5918xargyiipcnf91xpmmfdb442456argbji8w",
   "fetcher": "github",
   "repo": "jonnay/fix-muscle-memory",
   "unstable": {
@@ -35904,11 +36001,11 @@
   "repo": "seblemaguer/flatfluc-theme",
   "unstable": {
    "version": [
-    20210908,
-    1423
+    20220522,
+    1657
    ],
-   "commit": "33726cd072ad83c6943e1c3b83db2fff60f324ce",
-   "sha256": "1nai41dzpnmv63k75xnhc64vipb9nqyv3k75mp2g8csxz569ph2l"
+   "commit": "1679983d22a3b213262e09b3b25db75818a9d37a",
+   "sha256": "1ikkr45bdkajg1s3slq00wwrk06iyly2rnrigzm5vnbw6b5ildn4"
   }
  },
  {
@@ -35928,8 +36025,8 @@
  },
  {
   "ename": "flatland-theme",
-  "commit": "0a081fd0c5598fdf5bc0ab92f4d009f32132a29e",
-  "sha256": "14drqwcp9nv269aqm34d426a7gx1a7kr9ygnqa2c8ia1fsizybl3",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "13b3s62xrdds2w5c1ppvq9ipybxncnmbnzcd2303rr56k9da920a",
   "fetcher": "github",
   "repo": "gchp/flatland-emacs",
   "unstable": {
@@ -36217,11 +36314,11 @@
   "repo": "amake/flutter.el",
   "unstable": {
    "version": [
-    20220502,
-    50
+    20220526,
+    1214
    ],
-   "commit": "e49cbcb70235fa39a7d243521e03ad874451a39a",
-   "sha256": "1hjfkcdi99yfld9jakhhrncpm2yvg03xz35dngc6nn23dkwdpidm"
+   "commit": "b4148db1e6e6822a6a0da1eda3c58affe562d1dc",
+   "sha256": "0ga6jw948w0zwab4jixcrlmv6f9ck0vf7v40g3z4l6ddi2ibsy15"
   }
  },
  {
@@ -36239,8 +36336,8 @@
     "flutter",
     "flycheck"
    ],
-   "commit": "e49cbcb70235fa39a7d243521e03ad874451a39a",
-   "sha256": "1hjfkcdi99yfld9jakhhrncpm2yvg03xz35dngc6nn23dkwdpidm"
+   "commit": "b4148db1e6e6822a6a0da1eda3c58affe562d1dc",
+   "sha256": "0ga6jw948w0zwab4jixcrlmv6f9ck0vf7v40g3z4l6ddi2ibsy15"
   }
  },
  {
@@ -36350,8 +36447,8 @@
   "repo": "flycheck/flycheck",
   "unstable": {
    "version": [
-    20220504,
-    830
+    20220514,
+    1743
    ],
    "deps": [
     "dash",
@@ -36359,8 +36456,8 @@
     "pkg-info",
     "seq"
    ],
-   "commit": "1d7c1b20782ccbaa6f97e37f5e1d0cee3d5eda8a",
-   "sha256": "01hr9xpjyws32aap2jlyncbgl1rfig8ylspln01yxf1lljysicc2"
+   "commit": "66a973afca1d03b8284baaa7590eb2b8615a1e6a",
+   "sha256": "1acvldcdac11p92c47a25q5k3lxsibigr98b3b2zcmf5l90l0y49"
   },
   "stable": {
    "version": [
@@ -36691,8 +36788,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "35daaccc75b0367844b249a8cb05bf73bcebd52a",
-   "sha256": "0id3jp0d2bkrk17l6svj5c518yp6ndlqg7py962qdrvzz82004j7"
+   "commit": "6fb8d0204b0293478b5565e378797acab1f2e038",
+   "sha256": "1f1sg9rv91hgwzwx8nrc15nvk7m1hxm0f25gh592vjr6yy2n668r"
   },
   "stable": {
    "version": [
@@ -37148,14 +37245,14 @@
   "repo": "emacs-elsa/flycheck-elsa",
   "unstable": {
    "version": [
-    20200203,
-    1758
+    20220523,
+    1105
    ],
    "deps": [
     "seq"
    ],
-   "commit": "911ffb3498e411c538eebce20c6b20b39d725af6",
-   "sha256": "1b0g9lqg6kmvhvh4a6g6xmag4jmkx3br6b37z8kb7p7x3wb691f4"
+   "commit": "39c486096d76344f3045e69620b277ee34b6e5e8",
+   "sha256": "1i7r9k28d0x4gsr4if2xx6karny8f5jrbxvi5529sh8sacl6dyfh"
   }
  },
  {
@@ -37276,8 +37373,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "c52ba814f299f62a2a339bae679f3d6d04566854",
-   "sha256": "11l69nj1f61lvw4arn9k0g9n5pczypn15qq4c02x1kljjlx0h1zs"
+   "commit": "71109b55b3809b8e3be827cec1b61914adf6b45b",
+   "sha256": "0xr6v7ah9a1qr3x4a6ajk2p0mqs7jcx0d6bwm49z2sfx2nz88kz9"
   },
   "stable": {
    "version": [
@@ -37355,8 +37452,8 @@
     "grammarly",
     "s"
    ],
-   "commit": "abc66e71d542f65a90c394058cdd3a7b2002c6a6",
-   "sha256": "0irp6cpi9qy80wssrncdlxjr2612l2mnprrfjjm5hjggflp5wygg"
+   "commit": "46584fee0a8e72c2b1687f4a4ec45feb1bcb1607",
+   "sha256": "1hj259iz1n07vj7jw4000l8hq8l4ivkys6xisb3apixr03sz8zg5"
   },
   "stable": {
    "version": [
@@ -37649,14 +37746,14 @@
   "repo": "jojojames/flycheck-jest",
   "unstable": {
    "version": [
-    20180411,
-    328
+    20220530,
+    1418
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "08f27c5ed97c83c445f99fab58f0b6c826f14449",
-   "sha256": "1ipr1yyk5vf2i8q7923r18a216sgf759x5f6j5776jcjkhp98c98"
+   "commit": "8181c5d2e1318c6ddcff21c6f3f6d76413545645",
+   "sha256": "0lhvgffn08ipafyh7icldbkgslcvqr1pja70fas54f3s077sql2k"
   }
  },
  {
@@ -37781,8 +37878,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "63674d8b928377d763df40317e15f4ca257f77d6",
-   "sha256": "14fjv2wckymhfw0sm89bkbn6lvmcxsivv5m1dva0wr5j0gppaj47"
+   "commit": "e866e3ac1bea1ef7078a6aa926abbee9ca598e5b",
+   "sha256": "185lgdvvhnps626c50xr5r45pyvy131hn24mgm39n6gqpcmlgxhh"
   },
   "stable": {
    "version": [
@@ -38108,8 +38205,8 @@
     "flycheck",
     "pest-mode"
    ],
-   "commit": "43447a2c70f98edd1139005e32f437d3f142442b",
-   "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a"
+   "commit": "af677327f185113442e95b00986097b30cab650c",
+   "sha256": "01wy3v1aj2891wgbr7rwpaw9xavfrqbyiqiv01q6jjdvc5vl0rwi"
   },
   "stable": {
    "version": [
@@ -38328,8 +38425,8 @@
  },
  {
   "ename": "flycheck-projectile",
-  "commit": "2760b15caa9b23c344ad9a6685fd6994110cba36",
-  "sha256": "1xpl0p07m95gh187jikiz850396h388d24mg97zr6sa6krq8vv55",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0rgm6czkvqnksmhw596xj88g8kdbksy0rdclamm7dvjbjyyaq4p9",
   "fetcher": "github",
   "repo": "nbfalcon/flycheck-projectile",
   "unstable": {
@@ -39041,8 +39138,8 @@
     "flymake",
     "let-alist"
    ],
-   "commit": "8f36fed9eef834cf94931fc8b813f9ac8db6d2a4",
-   "sha256": "0586g7qdcp2bh51ll1sv73ji6vh8l3xxsndpkqxgfkyckmc3iyhh"
+   "commit": "46afe132148da1e3f989e25b00ee17ae4bf1716c",
+   "sha256": "046kmnfid30bwihfzp6mv7ya4vf48b8isfq6hm7y15925y695cg9"
   }
  },
  {
@@ -39088,8 +39185,8 @@
    "deps": [
     "flymake"
    ],
-   "commit": "6ce75c17bc02ae9755deda50d5ac366785c94091",
-   "sha256": "0nbggmz3b6r2rixbn20r58dca05h45lsdyfbbw74syd4fv5g8s9c"
+   "commit": "99fcfbd002dbfd99ab66910265507bf767f52ce6",
+   "sha256": "0ik8rpw1gqrzc7p5ky22clprhvpd0a5i5zrb1p4fnwcywa5mzqr2"
   },
   "stable": {
    "version": [
@@ -39316,8 +39413,8 @@
     "grammarly",
     "s"
    ],
-   "commit": "74ab6bb817205dbf1cd77a161be76904c1e17b75",
-   "sha256": "0ngs38h3zcg2znqbfy0m886g4spn39bnch4s1zcl8f8zcn3s24mg"
+   "commit": "2c5711952922358ea9ca9a7351eb45588238f661",
+   "sha256": "0l0fc2qsg77gv0kha45q6il74xvi0vnh42fkr01dhyf0g1bq4mpq"
   },
   "stable": {
    "version": [
@@ -39578,8 +39675,8 @@
    "deps": [
     "s"
    ],
-   "commit": "c24339b50a4b42cc2bd7e8e167c77a75d8227774",
-   "sha256": "1lvpyn9s3x9wyhdsa9krra03appn8p0dv8086hixpmqm10d21wl1"
+   "commit": "5f9eef8fe3f342f17593e0caeaba906ba7cab24a",
+   "sha256": "1mz18inlv78lg40jgq68qq3v62b6mgmz89lcgczg93lyfh81pjp3"
   },
   "stable": {
    "version": [
@@ -39695,8 +39792,8 @@
    "deps": [
     "flymake"
    ],
-   "commit": "06d819c6d1292f8c87ebc0681c83c9fb48620bbe",
-   "sha256": "1blzcr2c176wlqv8fr4mna0qqm20cd77s8b4gz21jzrq44d7qqf8"
+   "commit": "2e98ef45d764cd8d4e146097ff763c5ec92c6570",
+   "sha256": "1mckr39zgx2f0n56iw4mmy26bayb1y0wjcrr6nnxpbl6jr28rqvw"
   },
   "stable": {
    "version": [
@@ -39725,8 +39822,8 @@
    "deps": [
     "pest-mode"
    ],
-   "commit": "43447a2c70f98edd1139005e32f437d3f142442b",
-   "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a"
+   "commit": "af677327f185113442e95b00986097b30cab650c",
+   "sha256": "01wy3v1aj2891wgbr7rwpaw9xavfrqbyiqiv01q6jjdvc5vl0rwi"
   },
   "stable": {
    "version": [
@@ -39784,8 +39881,8 @@
    "deps": [
     "flymake-easy"
    ],
-   "commit": "10d3e7e1c31c104e3da694b2b52cd34df61efa5e",
-   "sha256": "1gzg5xz2vchz6kq7hyc1pvd250kfnwkpy88gmh857v3mnzrq71dg"
+   "commit": "abee6b8f50a631e5bc52499b938fcfd88f958a44",
+   "sha256": "0vxi77x11ipsgyy008b9gwav7psdv0wx3bg07sbg6fmhaa3y4fqi"
   },
   "stable": {
    "version": [
@@ -40150,20 +40247,20 @@
   "repo": "shaohme/flymake-yamllint",
   "unstable": {
    "version": [
-    20220311,
-    636
+    20220531,
+    913
    ],
-   "commit": "a93bf9a6697566f0e29fb51a87c5cc7b2a972d2d",
-   "sha256": "0h1w5b2krdvvr73w2k54bxc3dbgs1kbgb2za0z7wc8w02cl8fg57"
+   "commit": "f269e6614993f3c56d545e7d7b225ca2ba1da342",
+   "sha256": "0pw2c22nvy4fkcqbhkrj94q66sx7ggcan26wvy9z6wp04qzaiva8"
   },
   "stable": {
    "version": [
     0,
     1,
-    3
+    4
    ],
-   "commit": "a93bf9a6697566f0e29fb51a87c5cc7b2a972d2d",
-   "sha256": "0h1w5b2krdvvr73w2k54bxc3dbgs1kbgb2za0z7wc8w02cl8fg57"
+   "commit": "f269e6614993f3c56d545e7d7b225ca2ba1da342",
+   "sha256": "0pw2c22nvy4fkcqbhkrj94q66sx7ggcan26wvy9z6wp04qzaiva8"
   }
  },
  {
@@ -40207,11 +40304,11 @@
   "repo": "d12frosted/flyspell-correct",
   "unstable": {
    "version": [
-    20220131,
-    834
+    20220520,
+    630
    ],
-   "commit": "e8027a412262bc04056a5b5440efdb7f370c3320",
-   "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn"
+   "commit": "7d7b6b01188bd28e20a13736ac9f36c3367bd16e",
+   "sha256": "1b6h3wjmxg9d1d3mfvw6fsgkr1w0d14zxllv9jb5cscl5lq8rbmm"
   },
   "stable": {
    "version": [
@@ -40231,15 +40328,15 @@
   "repo": "d12frosted/flyspell-correct",
   "unstable": {
    "version": [
-    20210124,
-    1143
+    20220520,
+    630
    ],
    "deps": [
     "avy-menu",
     "flyspell-correct"
    ],
-   "commit": "e8027a412262bc04056a5b5440efdb7f370c3320",
-   "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn"
+   "commit": "7d7b6b01188bd28e20a13736ac9f36c3367bd16e",
+   "sha256": "1b6h3wjmxg9d1d3mfvw6fsgkr1w0d14zxllv9jb5cscl5lq8rbmm"
   },
   "stable": {
    "version": [
@@ -40263,15 +40360,15 @@
   "repo": "d12frosted/flyspell-correct",
   "unstable": {
    "version": [
-    20210124,
-    1143
+    20220520,
+    630
    ],
    "deps": [
     "flyspell-correct",
     "helm"
    ],
-   "commit": "e8027a412262bc04056a5b5440efdb7f370c3320",
-   "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn"
+   "commit": "7d7b6b01188bd28e20a13736ac9f36c3367bd16e",
+   "sha256": "1b6h3wjmxg9d1d3mfvw6fsgkr1w0d14zxllv9jb5cscl5lq8rbmm"
   },
   "stable": {
    "version": [
@@ -40295,15 +40392,15 @@
   "repo": "d12frosted/flyspell-correct",
   "unstable": {
    "version": [
-    20210124,
-    1143
+    20220520,
+    630
    ],
    "deps": [
     "flyspell-correct",
     "ivy"
    ],
-   "commit": "e8027a412262bc04056a5b5440efdb7f370c3320",
-   "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn"
+   "commit": "7d7b6b01188bd28e20a13736ac9f36c3367bd16e",
+   "sha256": "1b6h3wjmxg9d1d3mfvw6fsgkr1w0d14zxllv9jb5cscl5lq8rbmm"
   },
   "stable": {
    "version": [
@@ -40327,15 +40424,15 @@
   "repo": "d12frosted/flyspell-correct",
   "unstable": {
    "version": [
-    20210124,
-    1143
+    20220520,
+    630
    ],
    "deps": [
     "flyspell-correct",
     "popup"
    ],
-   "commit": "e8027a412262bc04056a5b5440efdb7f370c3320",
-   "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn"
+   "commit": "7d7b6b01188bd28e20a13736ac9f36c3367bd16e",
+   "sha256": "1b6h3wjmxg9d1d3mfvw6fsgkr1w0d14zxllv9jb5cscl5lq8rbmm"
   },
   "stable": {
    "version": [
@@ -40569,8 +40666,8 @@
  },
  {
   "ename": "fold-this",
-  "commit": "9853fcb99bd8717c77fa2b3bafb6e85d0d5d491c",
-  "sha256": "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0v0rppl53cxfr1y1yi8vcy761ipp9lpsw52hhmd2iv67d4xa2s05",
   "fetcher": "github",
   "repo": "magnars/fold-this.el",
   "unstable": {
@@ -40679,8 +40776,8 @@
     20170305,
     1356
    ],
-   "commit": "a5fafe89d4032fd1f0c21b7b04708ef2cce2517b",
-   "sha256": "0m9dwcgja1d33h6d5fbc42lgfxafwvzc3zwnj4ywx6vai9yqljhd"
+   "commit": "26fe027e03911f24b3658b44611d3b38fb6df455",
+   "sha256": "0zcj78r7ixlrag1h58s64g63xx87m1qn3wv6rs6qxcqxwlcl9n96"
   },
   "stable": {
    "version": [
@@ -40764,8 +40861,8 @@
     20191004,
     1850
    ],
-   "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86",
-   "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri"
+   "commit": "4359c640c7822a23976e9a5ca4ce63452d796912",
+   "sha256": "176qjbhvdg1bqy45qk6zf5ij12qif6xkd3ppd1a5wg67p2rv21z8"
   }
  },
  {
@@ -40836,14 +40933,14 @@
  },
  {
   "ename": "forge",
-  "commit": "6cee0395aa57874032cb75c9f3f71e62bd139235",
-  "sha256": "0a1yvdxx43zq9ivwmg34wyybkw4vhgzd2c54cchsbrbr972x9522",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "0pzlh2b77qfg4fgpxm8zxvrnfwl7q38srxsvf39r4hgip30sk3lp",
   "fetcher": "github",
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20220506,
-    420
+    20220526,
+    1854
    ],
    "deps": [
     "closql",
@@ -40857,8 +40954,8 @@
     "transient",
     "yaml"
    ],
-   "commit": "05babf69068de7a982bd2e8ad888f37dc7319003",
-   "sha256": "02mck5c2cbz61j2xwgpwaqlpbnp5svn6g05lylhmw7g0sprzcdvb"
+   "commit": "66b3993c98c724e0d3e6411036ccdfab95c7a504",
+   "sha256": "0mfg16vb006avbgw8gygylbqa74cp1fp5cfdr2mp32z6fc77sqcd"
   },
   "stable": {
    "version": [
@@ -41052,8 +41149,8 @@
  },
  {
   "ename": "fountain-mode",
-  "commit": "27cc1d093ce12b559a4266184fb9077c9810d542",
-  "sha256": "1jmb5xm0d1wffw3gj0idv114dzs845n41312dvghv7bblbxyd7bj",
+  "commit": "af5c1593052d63146e850683c461a760ab166033",
+  "sha256": "1ljfdk79lvy04whx0sl211xam5nkj5i31myrdnl6kkg8azbdsj4d",
   "fetcher": "github",
   "repo": "rnkn/fountain-mode",
   "unstable": {
@@ -41497,6 +41594,21 @@
   }
  },
  {
+  "ename": "frimacs",
+  "commit": "80c47d487c434b7e551a265b32e49da6baa818b6",
+  "sha256": "0lg5yarriaab4x1zsdfhfci3sivmj2gslwvnc35jmhp2jq4fa9q9",
+  "fetcher": "github",
+  "repo": "pdo/frimacs",
+  "unstable": {
+   "version": [
+    20220602,
+    1847
+   ],
+   "commit": "4713aa13c96183bccaeccc135b932f94522c2c05",
+   "sha256": "02i6niy6axhwdxw56vqqcnin9iba8vblnmf0fprk06rwlxyj7svc"
+  }
+ },
+ {
   "ename": "fringe-current-line",
   "commit": "eaaa6f7f2f753a7c8489415ae406c4169eda9fa8",
   "sha256": "125yn0wbrrxrmdn7qfxj0f4538sb3xnqb3r2inz3gpblc1vxnqb8",
@@ -41612,11 +41724,11 @@
   "repo": "fsharp/emacs-fsharp-mode",
   "unstable": {
    "version": [
-    20220429,
-    1847
+    20220605,
+    1329
    ],
-   "commit": "5208b54098c7534f4768b87c5f4c8a01b638737b",
-   "sha256": "04s37djxzy8v5xwc5hh8gq37zh7f6ih3y07g07q2fc39rk1xslpd"
+   "commit": "c7842fe63b8bae5aa8bd6a9891036c5ce04e4030",
+   "sha256": "17ibcl9ilm7ml4gjlvcx40hni8awccm1zk37y0nfvcscigf3i8pr"
   },
   "stable": {
    "version": [
@@ -41682,8 +41794,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "041430cda31c73fd51d7c16e736dcf08db13eb11",
-   "sha256": "10kv8hpqh08mgyhn04i72kvzncdaqyflai6h0flg89wv1air0m46"
+   "commit": "6900d1eab9750001e8525f3990ed6fa4a73a8c44",
+   "sha256": "0vxak1s31ql6zk1i3c2kj35dxqi5sdp41ip56b586y0f1p9hfcab"
   },
   "stable": {
    "version": [
@@ -41829,6 +41941,35 @@
   }
  },
  {
+  "ename": "fussy",
+  "commit": "c62fcc6f8f487390423a66aca59700d8856287c9",
+  "sha256": "1rsdrnbnqhd0vk56il7z5vcnz356xhvhmimry3diiaqswl79mk20",
+  "fetcher": "github",
+  "repo": "jojojames/fussy",
+  "unstable": {
+   "version": [
+    20220606,
+    1543
+   ],
+   "deps": [
+    "flx"
+   ],
+   "commit": "1e77aa133b1bed8164a927b9090af839d0383774",
+   "sha256": "0jiip3gcrqvm91bcv647j30kqxbpfqi10w21zi986ggdjjhdcdjs"
+  },
+  "stable": {
+   "version": [
+    1,
+    4
+   ],
+   "deps": [
+    "flx"
+   ],
+   "commit": "4526f81bb76b5af3af13e540ff7a5f1ac0d8ed4f",
+   "sha256": "0mk31kf9aj0mmdynv42h3lwzd4x9ys1d9s1r9qyy0kdi8y8vcs21"
+  }
+ },
+ {
   "ename": "futhark-mode",
   "commit": "97210774b450b7611d2bfdf36e04a425835d86b9",
   "sha256": "1sck984a8m0i9n07jnhpnin6k060756g73ix34ghzd65j5f0pvlw",
@@ -41872,8 +42013,8 @@
  },
  {
   "ename": "fuzzy",
-  "commit": "9e0197df173fbd7ec1e7e35c47476fcf2aaa483f",
-  "sha256": "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0hcl2qw1685nn9kv32dj1lnf4wv91nkp5h23rbzzvjaa81z3x8j3",
   "fetcher": "github",
   "repo": "auto-complete/fuzzy-el",
   "unstable": {
@@ -41881,8 +42022,8 @@
     20211231,
     1837
    ],
-   "commit": "7691a73a85f014a34cc161650e989801f2aba5a3",
-   "sha256": "1xm0cmfyvypxhygl36m3r68asixmrdq23q4c3vkx8y7i7yaml4w1"
+   "commit": "bfba20e435a6f5bba328309a8a5ca20dea7a301d",
+   "sha256": "0y4lv1cbpfcz8d1dwvqc728s5hyn6b7fb2n0gg4lhz76h1i411ky"
   },
   "stable": {
    "version": [
@@ -42124,8 +42265,8 @@
  },
  {
   "ename": "gather",
-  "commit": "595e40c7102294684badf86deb72d86bbc3c1426",
-  "sha256": "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1y7n7qavqj5dv03y3cvmhj59pccyiz66axvxi7b99q9ya6ig7hsg",
   "fetcher": "github",
   "repo": "mhayashi1120/Emacs-gather",
   "unstable": {
@@ -42571,8 +42712,8 @@
  },
  {
   "ename": "geiser-stklos",
-  "commit": "6530db79aafe4ac4cefa01f77a8cc1e259385171",
-  "sha256": "0bbxxxvzp4dd22lrlmg0lnishvqj1pcm82scds27nrkzrcdycs8s",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1msv27dfasy18mdjh5ymgqakgjj73gw77nzarcg0s34dbdssrzp0",
   "fetcher": "gitlab",
   "repo": "emacs-geiser/stklos",
   "unstable": {
@@ -43074,8 +43215,8 @@
  },
  {
   "ename": "ghub",
-  "commit": "2133b10c735ce47fc8d8ff8c51f29ec4b13982a3",
-  "sha256": "1xqhjhr08qrbv4g6i73f60h6ph4rc2m419f2p5n54hrq929qsdri",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i",
   "fetcher": "github",
   "repo": "magit/ghub",
   "unstable": {
@@ -43447,16 +43588,16 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20220506,
-    1936
+    20220607,
+    1403
    ],
    "deps": [
     "compat",
     "transient",
     "with-editor"
    ],
-   "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d",
-   "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c"
+   "commit": "2dfeaa6839c643a54d96c9f855bae11d5cba2453",
+   "sha256": "052zdj08296s34b7a5p6fapxym7ni1mlw3iqpvw6jhkv9qihmqv2"
   },
   "stable": {
    "version": [
@@ -43567,8 +43708,8 @@
  },
  {
   "ename": "git-gutter+",
-  "commit": "b2db25d23c2a1a4f38867aac25d687a150e95c2b",
-  "sha256": "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "02f314ks9hv8fgbajq1cci3gd9vycz08w87xngz3wa8r1f7ga6gc",
   "fetcher": "github",
   "repo": "nonsequitur/git-gutter-plus",
   "unstable": {
@@ -43630,8 +43771,8 @@
  },
  {
   "ename": "git-gutter-fringe+",
-  "commit": "ad46c349d13f7d40db706b487319ede40b96b09c",
-  "sha256": "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "18h9jkp5blfw4lgxh36x51wjh7fh669q4g7qsifj3lhg595lb757",
   "fetcher": "github",
   "repo": "nonsequitur/git-gutter-fringe-plus",
   "unstable": {
@@ -44910,11 +45051,11 @@
   "url": "https://codeberg.org/akib/emacs-gnu-indent.git",
   "unstable": {
    "version": [
-    20220330,
-    422
+    20220515,
+    1719
    ],
-   "commit": "cd5dc79ac65c24e9e775bd2582ad620e316f2182",
-   "sha256": "07ccrjlh5ph8sdsrd7k5ihrjl4qgsjf9qr54y90fq5b9hzy9ksgp"
+   "commit": "ff3e10edbdf9b919747ec2ba3434d5858f5cc9fa",
+   "sha256": "040vlkzhgi7mhp6m4nrqz2srh8fr8xgpgbiqm8mbcs7py41smkg0"
   }
  },
  {
@@ -45770,11 +45911,11 @@
   "repo": "lorniu/go-translate",
   "unstable": {
    "version": [
-    20220404,
-    1240
+    20220514,
+    1046
    ],
-   "commit": "b0898e6cd647e38e6f70e6cd121b789610573237",
-   "sha256": "19nffy0zqcjgqigbq0p03ldf31xki1cci48yfj620nh0cxvyd0vp"
+   "commit": "3b48787f5e91b9480ef5066bf3657f67306524ca",
+   "sha256": "1c27rk6r9103lwmb0mqkfiph521w7af34p2hli9ahjj8da5y91cb"
   },
   "stable": {
    "version": [
@@ -46043,8 +46184,8 @@
     20220210,
     1659
    ],
-   "commit": "1faa779a126c3564e74d6254d596da8dd2b4bf56",
-   "sha256": "0lhlpl3ilkrpfk3r638avp85wvbyk3arlssa94xw99a4nz7ix4a2"
+   "commit": "25bd3525fa8277d40a0163df04f6a06277e6265b",
+   "sha256": "0nwjz13zyi9fvy96frzjw9y9k42vzgy4h1rpx4p9ar5agi9nrk17"
   }
  },
  {
@@ -46092,8 +46233,8 @@
  },
  {
   "ename": "google-this",
-  "commit": "1e6aed365c42987d64d0cd9a8a6178339b1b39e8",
-  "sha256": "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "02jfrjan40a5dwjwigr4aff413v6dd20przy7l4jbrbaazq705w2",
   "fetcher": "github",
   "repo": "Malabarba/emacs-google-this",
   "unstable": {
@@ -46268,8 +46409,8 @@
     20210323,
     332
    ],
-   "commit": "ea845966423ce90526d717bb27d0022101c75796",
-   "sha256": "0cwp00677vw20xzrrf7sjjivdz5ny9imqdhj8719ibgqa0cq52zc"
+   "commit": "6fa81449dac4b5b0a0245ff29f13b44cc72cf940",
+   "sha256": "0d0c3zfy8ffg26nzbwy6i26niyikdxf15f8z2147kahlwl23nsvp"
   },
   "stable": {
    "version": [
@@ -46355,8 +46496,8 @@
     20210323,
     422
    ],
-   "commit": "d4db955860de830ebc067b065cba16a776717e76",
-   "sha256": "0d9429y6nwmjywj7rbyjdxs9h98177s16szj6mr54clixvws57rg"
+   "commit": "8046c9d4839438437281fece36858575c0810706",
+   "sha256": "0w09j5k7kvlhq6zdwimx2kmcxc6hbyc3kf2dx3w2b3bc4c8k2xq9"
   },
   "stable": {
    "version": [
@@ -46385,8 +46526,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "b4c0b4fe98b2692cf84e445ad2528911e3e1a622",
-   "sha256": "1wcr3bw7ck5v5w1x3ivhmgm4lq7ln0fvszl7sw0cyj95jqcd7brd"
+   "commit": "b4847059960b2faa100c7066f104be86c561229d",
+   "sha256": "16x2n3xb7yx7ihl4bgzwdwqxv20arlmz7nmiw8j7gy8qvfjnrk0q"
   },
   "stable": {
    "version": [
@@ -46620,8 +46761,8 @@
     "s",
     "websocket"
    ],
-   "commit": "3e14e53b87465ca35b08b5355061e380afb87b31",
-   "sha256": "0zia9hpamwjhyc38l903jwfij06y237j5c2sx600g5r9y36byg9z"
+   "commit": "37d4d7d068c51afefebd58dfa6021662c9c64cf1",
+   "sha256": "0knwcljmq52xlrnl8nzmja0kacc0bb68g4sgi3gkj7g3rl5g2crs"
   },
   "stable": {
    "version": [
@@ -46737,8 +46878,8 @@
  },
  {
   "ename": "graphql",
-  "commit": "3e801ae56f11b64a5a3e52cf1a6c152940ab8c97",
-  "sha256": "139fng2psn535ymqa7c6hm1r7ja1gs5mdvb487jj6fh0bl9wq8la",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1az0pczmyifsig8yaq9qf8w29vr8vcy2s9dqgfdx09zjypy540nm",
   "fetcher": "github",
   "repo": "vermiculus/graphql.el",
   "unstable": {
@@ -46767,15 +46908,15 @@
   "repo": "ifitzpatrick/graphql-doc.el",
   "unstable": {
    "version": [
-    20210808,
-    8
+    20220527,
+    1721
    ],
    "deps": [
     "promise",
     "request"
    ],
-   "commit": "6ba7961fc9c5c9818bd60abce6ba9dfef2dad452",
-   "sha256": "0hb6nxyiz36r3ii8iava76cv0k4nckslli20q2iw8s1nszgwbxky"
+   "commit": "d37140267e0c426c7c18aff31900aa1650257394",
+   "sha256": "008wnng94pm2p1xjpbvzzm2l29yq1635j45xywgcj66vknsvvijg"
   },
   "stable": {
    "version": [
@@ -47541,8 +47682,8 @@
  },
  {
   "ename": "guru-mode",
-  "commit": "e60af6ccb902d8ef00cfecbb13cafebbe3b00d89",
-  "sha256": "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0daan2hhi24agbc33rss9j298caszfnx6qqx8kh69s16yk5hm4h0",
   "fetcher": "github",
   "repo": "bbatsov/guru-mode",
   "unstable": {
@@ -48001,16 +48142,16 @@
   "repo": "otavioschwanck/harpoon.el",
   "unstable": {
    "version": [
-    20220402,
-    446
+    20220604,
+    50
    ],
    "deps": [
     "f",
     "hydra",
     "project"
    ],
-   "commit": "a23571eaab94fb2da0569ed5ab3c1b469f123b97",
-   "sha256": "0xl7lfj9cc9qp72ibjyilrdxrknvfd07fk206c8933yngrkqf376"
+   "commit": "b08d4af6e4ab404c8a1031ff8cbfff49d5c8aec4",
+   "sha256": "103z74y5x3pfanbalf6xgrm7cny30f1n3lihliabfiav96xzpmq7"
   }
  },
  {
@@ -48139,11 +48280,11 @@
   "repo": "haskell/haskell-mode",
   "unstable": {
    "version": [
-    20220331,
-    1645
+    20220529,
+    1859
    ],
-   "commit": "4ec2aa32b1772e629a6a2b47b84048e1990d6728",
-   "sha256": "0m0irwlwz17dmx4k1x82slmbxaxkmhxdjm9ha1490jf4wbbh93q4"
+   "commit": "5a9f8072c7b9168f0a8409adf9d62a3e4ad4ea3d",
+   "sha256": "0np1wrwdq7b9hpqpl9liampacnkx6diphyk8h2sbz2mfn9qr7pxs"
   },
   "stable": {
    "version": [
@@ -48239,26 +48380,26 @@
   "repo": "purplg/hass",
   "unstable": {
    "version": [
-    20220402,
-    1326
+    20220526,
+    2124
    ],
    "deps": [
     "request"
    ],
-   "commit": "c6bded14ae4b68194bd9e35428e9973ca144569b",
-   "sha256": "1qklrp1gskcr93j8gzi1nsp6kzjq7pra1rnyls67l4nchff2knl3"
+   "commit": "5da5404c8de483ca70dcab13ad07805f1b37e4bd",
+   "sha256": "1a9m8pny9x8mfi1jkk7y4357hbhqfi7i71shs26ilr0gyivfvxbp"
   },
   "stable": {
    "version": [
     2,
-    1,
-    2
+    2,
+    1
    ],
    "deps": [
     "request"
    ],
-   "commit": "22873f7df205cc1144ebff7aa2dc9bb85031c8a3",
-   "sha256": "1qklrp1gskcr93j8gzi1nsp6kzjq7pra1rnyls67l4nchff2knl3"
+   "commit": "5da5404c8de483ca70dcab13ad07805f1b37e4bd",
+   "sha256": "1a9m8pny9x8mfi1jkk7y4357hbhqfi7i71shs26ilr0gyivfvxbp"
   }
  },
  {
@@ -48309,8 +48450,8 @@
     20210108,
     1835
    ],
-   "commit": "6641a0d7c00ce633887baf3f8c594d9a8a504e9b",
-   "sha256": "0395f1pwrga0vfd153s7xlgiw5m2d89s5lx6xn9dm8x31q78ghq6"
+   "commit": "063785e0a9e54826e758571281c6715f4dd82387",
+   "sha256": "0hl54ksfiv0gnvhnfxa913n8jhysv94nmhryd4ipg2lljlr11zxr"
   },
   "stable": {
    "version": [
@@ -48366,8 +48507,8 @@
  },
  {
   "ename": "hc-zenburn-theme",
-  "commit": "01ccd40bd5fc2699a4756ebf503ac50f562cf600",
-  "sha256": "0jcddk9ppgcizyyciabj3sgk1pmingl97knf9nmr0mi89h7n2g5y",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "14ag9y0i5ma07ja0f2n9lmnivhy11r1l9ixy41xl3wc4gjdhmyn2",
   "fetcher": "github",
   "repo": "edran/hc-zenburn-emacs",
   "unstable": {
@@ -48449,15 +48590,15 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20220512,
-    1048
+    20220607,
+    1243
    ],
    "deps": [
     "helm-core",
     "popup"
    ],
-   "commit": "0f7d7acf5724d79ed51ae22349ceb743c4868a3e",
-   "sha256": "177gpf0s722xdya74gdx8my3jw49f38im31i3impw5c25g8x9ajs"
+   "commit": "9e706bc154deab9b5932d7849eff249f7c4bf1c9",
+   "sha256": "1kgh0srn59sbjkrjb1kwvyiyklp3aj6bf8c161b3k73g6gpz3kj4"
   },
   "stable": {
    "version": [
@@ -48556,8 +48697,8 @@
    "deps": [
     "helm"
    ],
-   "commit": "9820ba1893c8a7e31e756c891f9b4cf0eff1e50b",
-   "sha256": "173n4s1i9zi4yizvlzfr2qsj6rb2qizkmhwm21ijd701ac3v9xcs"
+   "commit": "6a45f2f6a6c5a957eb43ed32c6e77069c5251e1c",
+   "sha256": "04fq30hashpvss4f1ar9w2nc5pw7drhx0l5d37x7dy2y7pf85mal"
   },
   "stable": {
    "version": [
@@ -48573,8 +48714,8 @@
  },
  {
   "ename": "helm-ag-r",
-  "commit": "6aa1cf029db913dafb561e4c8ccc1ca9099524de",
-  "sha256": "0ivh7f021lbmbaj6gs4y8m99s63js57w04q7cwx7v4i32cpas7r9",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "00z4xg144axzha993iv3ci3wpsh4rbdbff9ywapfa19j4q76fb72",
   "fetcher": "github",
   "repo": "yuutayamada/helm-ag-r",
   "unstable": {
@@ -49355,14 +49496,14 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20220512,
-    856
+    20220607,
+    1243
    ],
    "deps": [
     "async"
    ],
-   "commit": "0f7d7acf5724d79ed51ae22349ceb743c4868a3e",
-   "sha256": "177gpf0s722xdya74gdx8my3jw49f38im31i3impw5c25g8x9ajs"
+   "commit": "9e706bc154deab9b5932d7849eff249f7c4bf1c9",
+   "sha256": "1kgh0srn59sbjkrjb1kwvyiyklp3aj6bf8c161b3k73g6gpz3kj4"
   },
   "stable": {
    "version": [
@@ -49538,14 +49679,14 @@
   "repo": "emacs-helm/helm-dictionary",
   "unstable": {
    "version": [
-    20220319,
-    955
+    20220514,
+    714
    ],
    "deps": [
     "helm"
    ],
-   "commit": "69f1e5bf03d67c9e5cb0065e702e8c311ac9d3db",
-   "sha256": "0haq758rxayl4qwyxm44w7mq1s5g0gpfxspd0q9c546qvws4kwrr"
+   "commit": "65fdf36e9a5c6dd8dffa71dfb6c65bc03879abe2",
+   "sha256": "1r62xrq95lzgg3if0q86idl9l8gmks76pgpxr615vm8ndhq8a545"
   }
  },
  {
@@ -49919,8 +50060,8 @@
    "deps": [
     "helm"
    ],
-   "commit": "f9ffd81c3b7fa3e5f79f511a6c2226b5e99b73e6",
-   "sha256": "0g4gy812ahch4p4nqw8wz0a7qsn637lm85x3iahphy53qvyzc9rf"
+   "commit": "5814015490c4540a5779168511d596022c6ebb44",
+   "sha256": "0rivhzxk0yifjkphf59sq4h37485kggdy8ww7s10nf40n360prz3"
   },
   "stable": {
    "version": [
@@ -50184,8 +50325,8 @@
     "flx",
     "helm"
    ],
-   "commit": "dd092e8eea5257d49bbdf694df4fefd86252e54b",
-   "sha256": "1w6625gd5k149wm54m7ci6l9pzrcma6z8hppj965vqlwqc8fj4xa"
+   "commit": "99bb20cd7ec89ac1e2ae6eaecd9ac4b30f570bee",
+   "sha256": "1srns7jr7nbgq25x4qapc44p6ivfzlm18xxqnbdadf05ld9jgh2v"
   },
   "stable": {
    "version": [
@@ -50531,8 +50672,8 @@
    "deps": [
     "helm"
    ],
-   "commit": "6285c083d885ea8e110868c6a5b9df69c3f3c4af",
-   "sha256": "1di39sbwf3yi01jh8nbiayqqnms1dddfqnz5g0gg935f5w3l1phm"
+   "commit": "c97a2fe68632938c2414249abbc9c7004eed3255",
+   "sha256": "1scjp0rrgsvlk963vrx6s8fmgz4fga24prlvbck07c3wvrfz37lx"
   },
   "stable": {
    "version": [
@@ -50790,8 +50931,8 @@
  },
  {
   "ename": "helm-j-cheatsheet",
-  "commit": "681b43eb224942155b97181bbb78bcd295347d04",
-  "sha256": "0lppzk60vl3ps9fqnrh020awiy5w46gwlb6d91pr889x24ryphmm",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1k3ajip1k225zrcb901887a8lqp0wkyavqikajfb0jszk8v63ysk",
   "fetcher": "github",
   "repo": "abo-abo/helm-j-cheatsheet",
   "unstable": {
@@ -50985,14 +51126,14 @@
   "repo": "emacs-helm/helm-ls-git",
   "unstable": {
    "version": [
-    20220418,
-    657
+    20220605,
+    434
    ],
    "deps": [
     "helm"
    ],
-   "commit": "c6494a462e605d6fd16c9355e32685c3e0085589",
-   "sha256": "02gx6a8n7csip5wm818bmhrq4r0r394r3vvfsn8fja8fagmg3z1a"
+   "commit": "27a0fae5c8927c5980f49726bd29d0a7274af337",
+   "sha256": "03k5gpz3vinj4w7k0cfmpjn6rxwiyyscn4jl9zyj2bgdf2m39wfm"
   },
   "stable": {
    "version": [
@@ -51382,8 +51523,8 @@
  },
  {
   "ename": "helm-org",
-  "commit": "5c14f6b048ec9983e31fcd3e7cdea45ebe806ce8",
-  "sha256": "02zyc7nssl4zvbbw03fl0nbf4d6qmqxywa2hnfyiwfzn5jzxkl95",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0j486w0nzn9iw96h8gh9vwichhnasvl4h0wd48dfxnvzymz6z5gj",
   "fetcher": "github",
   "repo": "emacs-helm/helm-org",
   "unstable": {
@@ -51463,14 +51604,14 @@
     "org-ql",
     "s"
    ],
-   "commit": "46f523d94a376b168176c75bbd0e3e0d00e61170",
-   "sha256": "0vrk7lx4n4imvsnqv50w6fmqnndr48x89gcmm375fw6zgy2m90bl"
+   "commit": "64a9234733904af20fd495861792f1d5c2b37190",
+   "sha256": "1w3vly4jh854gb9bgnwqfzry6214v498fmiwm491gi8m5g0d05xp"
   },
   "stable": {
    "version": [
     0,
     6,
-    1
+    2
    ],
    "deps": [
     "dash",
@@ -51478,8 +51619,8 @@
     "org-ql",
     "s"
    ],
-   "commit": "f666fe150f1bf3c3ce43d0e15f90b20d43c2e772",
-   "sha256": "1mpq3v8lxqllnb4afqh7p9av0p9bha8ld7741zaw4hxb1252xgm2"
+   "commit": "115500c8a0a3190ec6a69d1120fe81944d819125",
+   "sha256": "0iamqv5j43ngj1xdqr36rkgk9lqpk9bg8y531jsldnvwzrp3srpf"
   }
  },
  {
@@ -52079,8 +52220,8 @@
  },
  {
   "ename": "helm-recoll",
-  "commit": "0a0d168f96470753c22b92ad863be98d8c421ccd",
-  "sha256": "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0bq0gp1cqmx39fsfpccxn7dsa34f75bdi3kyni7d55rvlvascaqz",
   "fetcher": "github",
   "repo": "emacs-helm/helm-recoll",
   "unstable": {
@@ -52357,8 +52498,8 @@
     "s",
     "searcher"
    ],
-   "commit": "d0a3aa7c4a882c6563c053c3317600582043d71c",
-   "sha256": "10hvm4xym1886b02jqpg83p2pz6s9nkkrs7ifnydhn2zn5khn855"
+   "commit": "6409eef130d3561e024813f3af82a61f73c9ae5b",
+   "sha256": "1l0csk24ls9784k4fry15mdkmryn2dcvssiqv07jjl90n04pjq62"
   },
   "stable": {
    "version": [
@@ -52733,15 +52874,15 @@
   "repo": "emacs-helm/helm-system-packages",
   "unstable": {
    "version": [
-    20210628,
-    1727
+    20220515,
+    812
    ],
    "deps": [
     "helm",
     "seq"
    ],
-   "commit": "a16bb1c3708416984106a98353700d456414b6a1",
-   "sha256": "09acgs1mjkqmm7n88x4hck2bp3jv5fifdkd406r8fh874vyfib38"
+   "commit": "e93f4aeaa77b73c6e529141c3fa0ac49b40b6306",
+   "sha256": "1i5dy2hi5xiyb2p2795pk24h8kzmd38pasd51azyx5d0qmjjvb8m"
   },
   "stable": {
    "version": [
@@ -52759,8 +52900,8 @@
  },
  {
   "ename": "helm-systemd",
-  "commit": "35763febad20f29320d459394f810668db6c3353",
-  "sha256": "1m1by9i37ban3zkznyamp5vxizj8zsz06fdscdhmky1grf6ri4r8",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "03hzx0202kw5bhmbn51wsaf1jajk2cmxx3nkk4pa8dawgrh8mg95",
   "fetcher": "github",
   "repo": "Lompik/helm-systemd",
   "unstable": {
@@ -52838,8 +52979,8 @@
    "deps": [
     "helm-core"
    ],
-   "commit": "b6bd3379b98d306935731e9632907387b078e000",
-   "sha256": "0ki38i2qiysba6xm6hc4xmy4vkpsvc85lh1vgjy8741wkysija2x"
+   "commit": "7b39adc0e80e791390f34aab866a963df317c235",
+   "sha256": "0jllvylilc81gxkdhy4cl0bma8jrkjhj8c1m7vzjdxr3mplnl1sj"
   },
   "stable": {
    "version": [
@@ -53179,14 +53320,14 @@
   "repo": "duncanburke/help-find",
   "unstable": {
    "version": [
-    20210826,
-    928
+    20220513,
+    1028
    ],
    "deps": [
     "dash"
    ],
-   "commit": "576d6505b9e42f50f121b1a6a675f17f03a04406",
-   "sha256": "064asvq6hfmrh3fnkm8dnarwmdgfm8f97mjng1bkf13wmnzglhck"
+   "commit": "6dd61bbb6290e06e30c002c011da71e348ac045f",
+   "sha256": "00b4vbk3m0br5k2x9mqx1v58j7jpd4k1nln18s99ggxpmx5klk02"
   }
  },
  {
@@ -53221,8 +53362,8 @@
   "repo": "Wilfred/helpful",
   "unstable": {
    "version": [
-    20220412,
-    421
+    20220513,
+    302
    ],
    "deps": [
     "dash",
@@ -53230,23 +53371,22 @@
     "f",
     "s"
    ],
-   "commit": "c2729a236a84a1fbd3d184c163fbd10e0fd62077",
-   "sha256": "0q5a1s4wkxjp56gy95qzkxzz8w46djacgh9fhwm509rkkdxpp30c"
+   "commit": "209971ba9f576ba080352642cfbf25df5692b1d7",
+   "sha256": "1qrxr0ybvdvx6qw6akb1pv074bmffv4m57855kk8fr1vp4w07z0i"
   },
   "stable": {
    "version": [
     0,
-    18
+    19
    ],
    "deps": [
     "dash",
-    "dash-functional",
     "elisp-refs",
     "f",
     "s"
    ],
-   "commit": "5a5eb62ae1f9cfdd4897ec6e878ec96231c52bdd",
-   "sha256": "0gdjxykqkal2x765mi51m99i5ql23i1fy909wy4mzj5ajhjfgqcc"
+   "commit": "2afbde902742b1aa64daa31a635ba564f14b35ae",
+   "sha256": "0qwsifzsjw95l83m7z07fr9h1sqbhggwmcps1qgbddpan2a8ab8a"
   }
  },
  {
@@ -54203,11 +54343,11 @@
   "url": "https://codeberg.org/ideasman42/emacs-hl-prog-extra.git",
   "unstable": {
    "version": [
-    20220507,
-    1118
+    20220607,
+    140
    ],
-   "commit": "a8e2ee5d43ce70c59e57d2ab90b39a6cf9e7b851",
-   "sha256": "08vs56lvq9ihhxd7vhcgd9lry2bm8q14mx18ap1izj6r52njdsy5"
+   "commit": "e7e24735cd020746e4070c908a6ebd2515c4c19b",
+   "sha256": "00r7fdgi9mda69sw1c0q9zhjwjdrn74gyw3hk9ml3n3qxnagkfva"
   }
  },
  {
@@ -54261,13 +54401,13 @@
  },
  {
   "ename": "hledger-mode",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "15s8rqc94z70jzv13961nvcm9a9qadq04pf0m6xrzf8qqk71zn52",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "05nyifa0r398w5yw1751rzn90w9dh9w5y7fhn9h5xmd7qdq8zibq",
   "fetcher": "github",
   "repo": "narendraj9/hledger-mode",
   "unstable": {
    "version": [
-    20210706,
+    20220515,
     1225
    ],
    "deps": [
@@ -54275,8 +54415,8 @@
     "htmlize",
     "popup"
    ],
-   "commit": "9ac07ff0adbce6a402c17e789b1750f9da0d22f4",
-   "sha256": "0x3dgws8nh7q8x7zzjwbm5k9n7gi7qqd3ww7y51fbx6p6ii3jpp4"
+   "commit": "400bde42a8d2712af80cd7c773c9cdfbb63a515a",
+   "sha256": "0xmcfpr3rxli1adwypg18npl8hb8ak5rg6a6i26inzzqja6vr897"
   }
  },
  {
@@ -54357,8 +54497,8 @@
  },
  {
   "ename": "hoa-mode",
-  "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3",
-  "sha256": "0cg7jg8ddcrpr47imix21m84h65z2xls3p20b32pasiqav3n8zsm",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1j8fi6bv25lgj8n6ykki2n1k9hbwbm7gw9g5jh2ds5n475291gcj",
   "fetcher": "git",
   "url": "https://gitlab.lrde.epita.fr/spot/emacs-modes.git",
   "unstable": {
@@ -54554,11 +54694,11 @@
   "repo": "axelf4/hotfuzz",
   "unstable": {
    "version": [
-    20210924,
-    936
+    20220607,
+    1906
    ],
-   "commit": "95a1be449624aa2b25128b900b6211034d0e17bb",
-   "sha256": "1lfwa6r3z79kvahgily4drmpf2y4sfwkv5gqbpn57fjxh2sq4rwp"
+   "commit": "50ea5b54c21dc6a2437e37b17c7ea14f8ba06771",
+   "sha256": "11aw2b5wixf6qlh3b2wnnms4n1fgp23g1yy48ykb3g6hkwrs2nrs"
   }
  },
  {
@@ -54696,8 +54836,8 @@
  },
  {
   "ename": "ht",
-  "commit": "6c7589bca1c1dfcc0fe76779f6847fda946ab981",
-  "sha256": "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1fcqidqkzxnqrdm6qljn0dy26f1bk0ipkamcq56f5myrd8mnqhgd",
   "fetcher": "github",
   "repo": "Wilfred/ht.el",
   "unstable": {
@@ -54848,8 +54988,8 @@
     20200929,
     559
    ],
-   "commit": "049efcadbd9b51a601cca60fc78616bcef0799ae",
-   "sha256": "09l1n4jmw2cr89jfss3zmlbzpbglir1h548kv3zdl44hbyb4wlk9"
+   "commit": "1bacc5a6348e29ab506cd530e2ebb7348caf77fd",
+   "sha256": "0pjm45973khr48w17srwvp4ns1sjifjy8pv2q0gnhks00ab5p5n1"
   },
   "stable": {
    "version": [
@@ -55827,8 +55967,8 @@
  },
  {
   "ename": "ido-completing-read+",
-  "commit": "6104efc035bcf469d133ab9a2caf42c9d4482334",
-  "sha256": "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0amf3v21f86pd7z3ijvlqgxrc6fpl6afwcc84r206ywzxbw11k6j",
   "fetcher": "github",
   "repo": "DarwinAwardWinner/ido-completing-read-plus",
   "unstable": {
@@ -56014,8 +56154,8 @@
  },
  {
   "ename": "ido-select-window",
-  "commit": "775c8361322c2ba9026130dd60083e0255170b8f",
-  "sha256": "03xqfpnagy2sk67yq7n7s6ma3im37d558zzx8sdzd9pbfxy9ij23",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "0fjc5j5s7g109lac0pv75vw8g50a0217kyngcyrmylfpy210cd4f",
   "fetcher": "github",
   "repo": "pjones/ido-select-window",
   "unstable": {
@@ -56159,15 +56299,15 @@
   "repo": "idris-hackers/idris-mode",
   "unstable": {
    "version": [
-    20220105,
-    1300
+    20220519,
+    917
    ],
    "deps": [
     "cl-lib",
     "prop-menu"
    ],
-   "commit": "65d6db1b7574ceccd3d97eee3790c2f74aa9724d",
-   "sha256": "0dc5mfm0gh7y4yzsz2lgc3802m4pv85l213j04k347xqqcl414lc"
+   "commit": "3c1f8f8410d909229d12d0227399f2d5c16b1ea4",
+   "sha256": "1is7n7j7h6w3x5i7byqn3kc41qk2p5wb0cdnr6cjxvlc3zar3wb0"
   },
   "stable": {
    "version": [
@@ -56606,11 +56746,11 @@
   "repo": "petergardfjall/emacs-immaterial-theme",
   "unstable": {
    "version": [
-    20220214,
-    1859
+    20220519,
+    635
    ],
-   "commit": "ca82a1700cf7834b55ada36e53811f6effde6283",
-   "sha256": "1c9d895g4dw0jp1ipm1mlhs2ln5f61ng83rv294jh32nrl3wrs81"
+   "commit": "e022d1a2fdc899b4c22254ebcf8997f5690d7c60",
+   "sha256": "0knpyh0ci777g6h83lr4pvy7w1syf068gy1p409rg3ssnwjnkxnl"
   },
   "stable": {
    "version": [
@@ -56707,8 +56847,8 @@
    "deps": [
     "impatient-mode"
    ],
-   "commit": "6825147ebacb1d738b1c96baf0534a5ed3e6b289",
-   "sha256": "10kjxm93cdll6a5l1lzk0ciya5z6d02x5rl7har507ac1laj1v23"
+   "commit": "832e6725d4b95b2f00ff8be94cd75dc3cc873ca4",
+   "sha256": "0d54m7hkfaidxjynz762i7cjrgdqy9d3rrkm2r16ql9rmk8hdwvn"
   },
   "stable": {
    "version": [
@@ -56797,8 +56937,8 @@
     "epc",
     "f"
    ],
-   "commit": "701dfcca5f3ab42be0f26a8d381d7116c79be850",
-   "sha256": "035830aizamh4c8hpnmfrbz9v9gy23d3nx0dv366l3q8mrh36l44"
+   "commit": "570fb4f519d5e84dd681f932447cb995e8460840",
+   "sha256": "1xrlnighvzgmfb4fwnp07bnj1wyym1pn4ap62swq0h0mcq8gjr80"
   },
   "stable": {
    "version": [
@@ -56848,8 +56988,8 @@
     20220227,
     653
    ],
-   "commit": "6fb6c9326077105febe2cd9c77b683b7c310cf03",
-   "sha256": "069mcbj3gwpbw1fwrpyfb81s0kyk3vklymfj9z7nr7yl8ra986ym"
+   "commit": "e04850bb05a816395a92c69b7ad7cd32d33eb62a",
+   "sha256": "1fvvhpbqq22cab2pa480sanp1jnjyipysa8jgxwrf3r438yhi729"
   },
   "stable": {
    "version": [
@@ -57054,14 +57194,14 @@
   "repo": "clojure-emacs/inf-clojure",
   "unstable": {
    "version": [
-    20220421,
-    559
+    20220603,
+    1523
    ],
    "deps": [
     "clojure-mode"
    ],
-   "commit": "abeab8d6d4cb3bdded5e9083776aab0c06cbdf57",
-   "sha256": "0b73dm3kyard035jfijcah8vp96vzgywmkl0ajnhyzzxmbl26hqa"
+   "commit": "8f295050a856b03d6ec14f0fd5e782e7acde6e2d",
+   "sha256": "0gm2psay483202vjzf27gvlmy7l2y8gawwviv5rbfbsxyb4l5xrm"
   },
   "stable": {
    "version": [
@@ -57452,8 +57592,8 @@
  },
  {
   "ename": "initsplit",
-  "commit": "5a908c8fad08cd4d7dbb586570d0f0b384bf9071",
-  "sha256": "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1jkn4d7mlchpnzn79rln8ypcwqac7h3lv44ax3dpppzxq5y6ylx1",
   "fetcher": "github",
   "repo": "dabrahams/initsplit",
   "unstable": {
@@ -58084,8 +58224,8 @@
    "deps": [
     "f"
    ],
-   "commit": "e6c9d5e19533eda6b74505a86198416eeecb915a",
-   "sha256": "00chrr0i1bw0dzrlznahca8zj4q9yqwl187m9dm9d1kgh0dwhn3s"
+   "commit": "85efbf0c1c651a94062fa820faf48f7bc8d4f8af",
+   "sha256": "1yhmzrns7bzncg0mc7mxwg5jxvblhfkg7nim5c66hmq3mr60gb48"
   },
   "stable": {
    "version": [
@@ -58117,8 +58257,8 @@
  },
  {
   "ename": "isend-mode",
-  "commit": "8ef6e4dab78a4c333647a85ed07a81da8083ec0c",
-  "sha256": "0sk80a08ny9vqw94klqfgii297qm633000wlcldha76ip8viikdv",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "16xd41z7b1kf599ggwkikdamd41ldlfvc37hq25z8hz7g1ajbcar",
   "fetcher": "github",
   "repo": "ffevotte/isend-mode.el",
   "unstable": {
@@ -58317,11 +58457,11 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20220406,
-    1052
+    20220529,
+    1130
    ],
-   "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d",
-   "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94"
+   "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22",
+   "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8"
   },
   "stable": {
    "version": [
@@ -58348,8 +58488,8 @@
     "avy",
     "ivy"
    ],
-   "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d",
-   "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94"
+   "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22",
+   "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8"
   },
   "stable": {
    "version": [
@@ -58595,8 +58735,8 @@
     "ivy",
     "s"
    ],
-   "commit": "942b2565097c97c1afc4fa395fac5788eabc730b",
-   "sha256": "03q15h6ckbrxmwskf19dhzcr8whgcipbf4nilpqfnhpsn5f4zl8l"
+   "commit": "bb576866d81ee4ee428c8d56663d3e30edf57998",
+   "sha256": "1plpjs2vkc9n1cb05p7ldfrm0ic2b82lpnmghkd60x64j36yjp20"
   },
   "stable": {
    "version": [
@@ -58716,8 +58856,8 @@
     "hydra",
     "ivy"
    ],
-   "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d",
-   "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94"
+   "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22",
+   "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8"
   },
   "stable": {
    "version": [
@@ -58917,27 +59057,28 @@
   "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20220509,
-    2300
+    20220601,
+    1652
    ],
    "deps": [
     "ivy",
     "prescient"
    ],
-   "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484",
-   "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c"
+   "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e",
+   "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk"
   },
   "stable": {
    "version": [
     5,
-    2
+    2,
+    1
    ],
    "deps": [
     "ivy",
     "prescient"
    ],
-   "commit": "3dbcef387502d309d130a518a18d48cd2f0e15b7",
-   "sha256": "024l7s0b6apbzanw3cnhjypxnxfinfb5b3nhaabrc138m5pis8j5"
+   "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e",
+   "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk"
   }
  },
  {
@@ -58973,8 +59114,8 @@
  },
  {
   "ename": "ivy-rich",
-  "commit": "35763febad20f29320d459394f810668db6c3353",
-  "sha256": "1il1lhxxg694j9w65qwzjm4p4l3q1h1hfndybj6z1cb72ijw27fr",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1qwfnz3lgsp9brbhv2kv9bzlzyjzj6j6plzs1nhczpz06c62123s",
   "fetcher": "github",
   "repo": "Yevgnen/ivy-rich",
   "unstable": {
@@ -59049,8 +59190,8 @@
     "s",
     "searcher"
    ],
-   "commit": "17a93eadb8a681d878e1d66b90073ed1be2e1dc2",
-   "sha256": "0m0lvpqamikmg957jj2nkr8xqzxl0kxyjl68577h4r83b60xrnhh"
+   "commit": "22867f0987b77e2cba0d251b62f5bd6324cc366f",
+   "sha256": "0kk39km7nw7izhb5r2rlhbaxcypvjngnmxmxnb2b0jx101kwzrhr"
   },
   "stable": {
    "version": [
@@ -60056,11 +60197,11 @@
   "repo": "Michael-Allan/Java_Mode_Tamed",
   "unstable": {
    "version": [
-    20220510,
-    430
+    20220524,
+    2327
    ],
-   "commit": "f968413df2c2bd1e00c5b6c61c53bdd208b90ee3",
-   "sha256": "0gyf61krqy6d5sjvj5c9z57vqx2nq0fia2pxmk32slisxc9drcqm"
+   "commit": "5e8eb048dd398597378eaf20842e410398bd5b55",
+   "sha256": "0qhp1p49b8mjnyr8lxlvwjdhnl36l5byyzb9psnf1iid7f306rki"
   }
  },
  {
@@ -60720,8 +60861,8 @@
  },
  {
   "ename": "json-rpc",
-  "commit": "82c6b97cdfe2970f028a00146b01e5734710291b",
-  "sha256": "1v1pfmm9g18p6kgn27q1m1bjgwbzvwfm0jbsxp8gdsssaygky71k",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0m986dlzsvr068nywrrrad72wwnv22dvw00d8y66h5rmx1nh87hs",
   "fetcher": "github",
   "repo": "skeeto/elisp-json-rpc",
   "unstable": {
@@ -60843,8 +60984,8 @@
  },
  {
   "ename": "jss",
-  "commit": "e3dc3607f512df378ba141327802820da4991a97",
-  "sha256": "050hskqcjz5kc8nni255vj3hc9m936w1rybvg5kqyz4p4lpzj00k",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0jm2gfba3i12k269xrvhy0y4s536x7arcpx0018adylg7b4mmsh6",
   "fetcher": "github",
   "repo": "segv/jss",
   "unstable": {
@@ -60990,8 +61131,8 @@
   "repo": "gcv/julia-snail",
   "unstable": {
    "version": [
-    20220512,
-    539
+    20220523,
+    435
    ],
    "deps": [
     "dash",
@@ -61001,8 +61142,8 @@
     "spinner",
     "vterm"
    ],
-   "commit": "88ce4fadc065736e154506538d365a8f1dd643e1",
-   "sha256": "1gj9mnv0kyq20hdz506qlz80kx28zwng12vnnahshji6bh6wbwj5"
+   "commit": "326da9a7d0463ed2727f66dcbd4cb58b517ffe25",
+   "sha256": "0irspd2j644g1fwai51wwawmq5ni0fpwzby3j4yka2w0pwvqvg6w"
   },
   "stable": {
    "version": [
@@ -61029,14 +61170,14 @@
   "repo": "shg/julia-vterm.el",
   "unstable": {
    "version": [
-    20220510,
-    2259
+    20220524,
+    1328
    ],
    "deps": [
     "vterm"
    ],
-   "commit": "5374776991232de966efca245f9ce24c59728588",
-   "sha256": "0cg5mqiciawigb5n7w8q5hi8q1h253nbjif3p9n7vhbckwx318rx"
+   "commit": "c5f67a372777bb6a855ba2a89228a713c8dda957",
+   "sha256": "15h92yq88na3banbf7x0k99bya9z5216qckyrgx3f5ksdci1bbih"
   },
   "stable": {
    "version": [
@@ -61598,15 +61739,15 @@
   "repo": "ogdenwebb/emacs-kaolin-themes",
   "unstable": {
    "version": [
-    20220422,
-    1305
+    20220519,
+    720
    ],
    "deps": [
     "autothemer",
     "cl-lib"
    ],
-   "commit": "51b1f719bc300a4f684b6dc7511dfb044f75f575",
-   "sha256": "0nq78kb751lgz398w8xbbl63cznb1g3l6j0j4limylmi8rlzvsnd"
+   "commit": "5fd75d41647d9535eb730b99b5adddc9edf55cd2",
+   "sha256": "1pi9xhrlw76b35zsndgkfc4g5v1kk29y023xd0iczf74v8ih08ps"
   },
   "stable": {
    "version": [
@@ -61694,11 +61835,11 @@
   "repo": "delaanthonio/kconfig-mode",
   "unstable": {
    "version": [
-    20211018,
-    2142
+    20220604,
+    1415
    ],
-   "commit": "241436a507782d18f09dab7d1f373ddea60fad3d",
-   "sha256": "0ayizg9ih98yn9127737i0g9q8f484v0fc9qwda0al3r69iqxpxq"
+   "commit": "cd87b71c8c1739d026645ece0bbd20055a7a2d4a",
+   "sha256": "114hjz7k8p8xmpfbv2img98qfkb46wn4mz5sdbl7278f973z2yqv"
   }
  },
  {
@@ -62011,14 +62152,14 @@
   "repo": "dacap/keyfreq",
   "unstable": {
    "version": [
-    20210630,
-    1318
+    20220607,
+    1613
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "7bb36e910ae04ff1dce387e3ce73b669d299680b",
-   "sha256": "188055yg9fqw92p1wip7mx7nz5gz5jbwb6lgcjncxzs4i9v7w8kr"
+   "commit": "dd88193cd7a91a92113121191573758ea2a3ceb1",
+   "sha256": "1rld3pwrdpgvpbn1pfwa71bb0kapv5a0ny0dh7ck2g07k1wql7lh"
   },
   "stable": {
    "version": [
@@ -62131,8 +62272,8 @@
  },
  {
   "ename": "keystore-mode",
-  "commit": "7870d808fc19096ed6ecde5e9297b28254466210",
-  "sha256": "1r1my7jgjv2zvkhdwd8ml6489x48gzanz4lvdiw5m2hymb53fdg6",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1sbafmwn286k4hj99dp9kz3s1pnx2i27f2k157pnkzgywn8n63pi",
   "fetcher": "github",
   "repo": "peterpaul/keystore-mode",
   "unstable": {
@@ -62175,8 +62316,8 @@
     20220222,
     639
    ],
-   "commit": "d6fe2d51769ee5d1d84a74adeae5c3a0aa66a602",
-   "sha256": "0hkp0dl8aqc2javsnl3pm37iy9f534l6wf1vgh44ba6ws6bxxgl5"
+   "commit": "468b528add57e15c2413c8984937fb428fb257f3",
+   "sha256": "1r481kpijmyawv5v32y202nz932mv24l5v7vrgandrjnaxjv0kgs"
   },
   "stable": {
    "version": [
@@ -62431,8 +62572,8 @@
     20210318,
     2106
    ],
-   "commit": "93ccd2058c1980207848810942dbb1a6d9edebe9",
-   "sha256": "1ciqb2simq7fdc31pjav30rlskami70dcg4abqairfq3yvx5nb7k"
+   "commit": "37292f00a8a457762a94011d7719e2c7d03d821c",
+   "sha256": "1zagb6lx5nhn1za7ybkdz6b33vmmw0k7ms3swxgw1fv2dzyqns4c"
   },
   "stable": {
    "version": [
@@ -62633,11 +62774,11 @@
   "repo": "Emacs-Kotlin-Mode-Maintainers/kotlin-mode",
   "unstable": {
    "version": [
-    20210917,
-    1911
+    20220527,
+    1646
    ],
-   "commit": "3e0c34087ba4965a8bf08d3f27325f0a1e631bfb",
-   "sha256": "15gxznanmcgjgcqlcazschxcwlsmd4rzivw0jb6pvz3m7zabd16r"
+   "commit": "99499e1500034b5fd5fdce9bfef367d90c61b5ce",
+   "sha256": "067m5idlnfz01aiynmnxh3x3vv4c2nkkldskv7g1cssxqaxagnxj"
   }
  },
  {
@@ -62920,41 +63061,41 @@
   "repo": "emacsfodder/kurecolor",
   "unstable": {
    "version": [
-    20220508,
-    929
+    20220527,
+    829
    ],
    "deps": [
     "s"
    ],
-   "commit": "61d7211469ea3e2c429937869c5a29584103361a",
-   "sha256": "0mi5jln34pd372h7f3rvigis6dll6sxdqg9izj9bip93917cff0y"
+   "commit": "d17a77d9210b3e7b8141d03c04d1898bcab2b876",
+   "sha256": "0gnh0yzip0238ycprx03147xaclcbmiy4lkp6wqil2waavwrkwbf"
   },
   "stable": {
    "version": [
     1,
     2,
-    7
+    9
    ],
    "deps": [
     "s"
    ],
-   "commit": "1c80df0f2c542f54920f18aa4eb837f0a51c7676",
-   "sha256": "0hmsf7kgzmpzri3ggb7l6y3pvfpinfv0d24fnxpbp1zd17lfwks1"
+   "commit": "076de3e420210fc479675389acb3fed6ada9c8e0",
+   "sha256": "0a36bnnyg0ay60kpjwv6s5cl5m3cvygjgq7kfpj8wkjv1gf19q05"
   }
  },
  {
   "ename": "kuronami-theme",
-  "commit": "f1fe04f11b3ab6ee00a36d2d171d7042aebe3115",
-  "sha256": "00f5lxhpqy1p7nlaw7nka90hy95dqrg7flfv5i9f8nrx9r3r7rpp",
+  "commit": "d1630a13d841c740a700a5fa34de8a0e9d20b17e",
+  "sha256": "02ps0q7nk91jdxwyzyyr26m4xsbynsfvwj3yxnnjjapqvvqlk7h4",
   "fetcher": "github",
-  "repo": "super3ggo/kuronami",
+  "repo": "inj0h/kuronami",
   "unstable": {
    "version": [
-    20220309,
-    604
+    20220602,
+    339
    ],
-   "commit": "910e8fa56a0cfe89dae888522f9fec4045d017fb",
-   "sha256": "0pghi50ffzlp7igvq81dmrbrwyj9ivl5kkxm47hff7qgb9rvx8n1"
+   "commit": "a51d5ff3883bd94d0a181bb5d60f747190eda4f6",
+   "sha256": "0mrk8d0z09cbvqisl44ln50bbmfim0j876v91x73428vr7k46z0d"
   },
   "stable": {
    "version": [
@@ -62968,8 +63109,8 @@
  },
  {
   "ename": "kv",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "0c10r7mhg517p62lc87ccqypsjrm28xh3bgv4f01fnx569jqgzgp",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1dv3vbhgs7q5q92idyy5mn9gwmx2k6xigb1vchfh7p21f2is86x8",
   "fetcher": "github",
   "repo": "nicferrier/emacs-kv",
   "unstable": {
@@ -63167,8 +63308,8 @@
     "highlight",
     "math-symbol-lists"
    ],
-   "commit": "67ae434d6ce2073e9c914817d21269f5c6a2a66f",
-   "sha256": "14m9i4ikppbf4ffrxibhdlvanyvjfhx68xalga66lj5chhhdqbk5"
+   "commit": "1fb1d9aa8d162279e0496d976b286fffc721f332",
+   "sha256": "0qwv6jpszhp47hx4bmj5qp85lpmcka75c7f1jsd8q10r95gmd7l4"
   },
   "stable": {
    "version": [
@@ -63235,8 +63376,8 @@
  },
  {
   "ename": "langtool",
-  "commit": "503845e79e67c921f1fde31447f3dd4da2b6f993",
-  "sha256": "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1vsxdkq8qdjn446rf7gjcnr1hwaasqrp0ibv4nsvnib7n85ldl7s",
   "fetcher": "github",
   "repo": "mhayashi1120/Emacs-langtool",
   "unstable": {
@@ -63330,26 +63471,26 @@
   "repo": "PillFall/languagetool.el",
   "unstable": {
    "version": [
-    20220127,
-    2215
+    20220514,
+    309
    ],
    "deps": [
     "request"
    ],
-   "commit": "ea50c120ee3418489b43d51ed750288791d6eb95",
-   "sha256": "0xm6yh6aybz8mnf6lh0dx9qgbk05kr2chiw4pnk9w6n9apssx9xa"
+   "commit": "503d18bd3c074fe8f495cfa6a34ccca1ef6961ce",
+   "sha256": "0zid9ip540qknnj9sdky2jrxp5l5kym76dr3wgff3ika6g7y75p6"
   },
   "stable": {
    "version": [
     1,
-    0,
+    1,
     0
    ],
    "deps": [
     "request"
    ],
-   "commit": "ea50c120ee3418489b43d51ed750288791d6eb95",
-   "sha256": "0xm6yh6aybz8mnf6lh0dx9qgbk05kr2chiw4pnk9w6n9apssx9xa"
+   "commit": "503d18bd3c074fe8f495cfa6a34ccca1ef6961ce",
+   "sha256": "0zid9ip540qknnj9sdky2jrxp5l5kym76dr3wgff3ika6g7y75p6"
   }
  },
  {
@@ -63409,6 +63550,24 @@
   }
  },
  {
+  "ename": "latex-change-env",
+  "commit": "f213f7787cd06b2f6ff8f4e2cf035f44b6407384",
+  "sha256": "1z4g784k19dbyf7azdgrbqdbgpc8jnza0r4mvyi91lzn7h1bfr1y",
+  "fetcher": "gitlab",
+  "repo": "slotThe/change-env",
+  "unstable": {
+   "version": [
+    20220531,
+    726
+   ],
+   "deps": [
+    "auctex"
+   ],
+   "commit": "b5c31c9551bea70835762360a57407fba6e37b4e",
+   "sha256": "1q88pg2izz2m22n0xgd281vhna5znrs3q6nfg3v6bkxp73y17k13"
+  }
+ },
+ {
   "ename": "latex-extra",
   "commit": "1e6aed365c42987d64d0cd9a8a6178339b1b39e8",
   "sha256": "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj",
@@ -63534,8 +63693,8 @@
  },
  {
   "ename": "launch",
-  "commit": "8e46ed1761fa2e69f0dc2f58e422ea1de8a8cb49",
-  "sha256": "043gwz583pa1wv84fl634p1v86lcsldsw7qkjbm6y678q5mms0m6",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1zcfnk8qd727ngr9bmgj5sf28g6kj9xa9qnkpxy73yz0z1ga7b7p",
   "fetcher": "github",
   "repo": "sfllaw/emacs-launch",
   "unstable": {
@@ -63682,14 +63841,14 @@
   "repo": "AnselmC/le-thesaurus.el",
   "unstable": {
    "version": [
-    20220509,
-    2120
+    20220519,
+    610
    ],
    "deps": [
     "request"
    ],
-   "commit": "2af1ab37097cdd17044ab217e9aa6839add98626",
-   "sha256": "1w2k2pvzgd5v008ma9bc6y16aiyjixhgvrn7bxf6cy43056mh0wf"
+   "commit": "3ea30714e7197f660dea59ec6c762cde0a44f74e",
+   "sha256": "0dbaxxa81bsfqnkqz0sfx67kqghi3qscclwnsvk638m3xrp6sbbz"
   }
  },
  {
@@ -63960,11 +64119,11 @@
   "repo": "ledger/ledger-mode",
   "unstable": {
    "version": [
-    20220307,
-    854
+    20220604,
+    1632
    ],
-   "commit": "11e850395448ee7012dba16bd6df103f5552ebfb",
-   "sha256": "0hzky36vrlb7kvpyz4gy3zn01zdlmlx0s58w6ggk5djbcvjc2rfx"
+   "commit": "1e6ddafa0fdf8f009c35488fdd6d0b0c8485ad34",
+   "sha256": "1f2djjxr8sy9adysprfk5zk9dkphnfa4dcv8hzknszchjm6a3lgh"
   },
   "stable": {
    "version": [
@@ -64191,8 +64350,8 @@
  },
  {
   "ename": "leuven-theme",
-  "commit": "c75a5db2c9724a513ad3f64fc138d8565d608eeb",
-  "sha256": "0468jbv04gwxhh9ag3yblzv1y1rxfr6yqr6dqfp11x6j8c910byr",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "11jnwyqf7vkw7h5qy7nrp0vvmyskbxc54nwc8p8carhzvpqm41d6",
   "fetcher": "github",
   "repo": "fniessen/emacs-leuven-theme",
   "unstable": {
@@ -64202,6 +64361,15 @@
    ],
    "commit": "d7dd9188a65e2ab7cf73c2e575a830baae38cb0c",
    "sha256": "0wvx4wcn845v1fh5jlljlh7l28nwycpivaay7flqb52zz47xj116"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    2
+   ],
+   "commit": "c72db2d5aeb5ed8e4ca066c803ae8d30e7540f79",
+   "sha256": "1mv5lv98b3351cwkiw51bq8xx4hmnvk93sx6lkdmq0sciw2qz22i"
   }
  },
  {
@@ -64526,8 +64694,8 @@
    "deps": [
     "request"
    ],
-   "commit": "e03f4a30c4abf354fb961babe4dce1dfa733aa82",
-   "sha256": "11mjypjv1h2qsfbqxfwknv6lp2fql4cnfsivcpj68475grn1g3s5"
+   "commit": "053e7f6517b20d5c9c93952428bd7d98a2700722",
+   "sha256": "1x99hanrlr8x07d16v19k00q9jgq3s121wsxr0x97d6dpi9hq8l5"
   },
   "stable": {
    "version": [
@@ -64568,8 +64736,8 @@
     20220209,
     755
    ],
-   "commit": "7d706986636b5cfc04f14341c19046b56b61b51c",
-   "sha256": "0v7306fq02q36smg157xcsil0r99vznzf7fx0xnys2df5id0ww36"
+   "commit": "c917420838b088da68b148652d3be468d7b746b5",
+   "sha256": "1mwa0ggbw4v8cd3v9l2rsydn0hklzc5z37gfxljg843v9b594z97"
   },
   "stable": {
    "version": [
@@ -64598,8 +64766,8 @@
     "indicators",
     "ov"
    ],
-   "commit": "c0cebef629a98556f5696f78436f4d8428ce8135",
-   "sha256": "0k7gzx3g33wf7w3wbpiv6b3amnl2miyynvr3x6wlpzmh3q57s11a"
+   "commit": "e8fe451f1c22ad2f90c82da42b4da73d5152d835",
+   "sha256": "1yfvzyy1gkk53ivlzcxpyl2dp6hhw127sl7bkg0ansgdfsnm1zgl"
   },
   "stable": {
    "version": [
@@ -64642,10 +64810,10 @@
  },
  {
   "ename": "lines-at-once",
-  "commit": "513d0f0c6976f685fc0df6b6bb0da3162f58f537",
-  "sha256": "1hiij6i47i9px82ll87dvx5pgp5jzz8qis7hdm8n6hd3c9rnabma",
+  "commit": "dcf4e93b13a279485fcbc8d2bb329008b2120b0a",
+  "sha256": "04ljzb7711mncmjh2ahhdkxngmh0g1kpxija3rqnmz4csnvmqp0f",
   "fetcher": "github",
-  "repo": "jiahaowork/lines-at-once.el",
+  "repo": "jiahaoli95/lines-at-once.el",
   "unstable": {
    "version": [
     20180422,
@@ -64844,8 +65012,8 @@
     20211004,
     1429
    ],
-   "commit": "22dd4c3ea4c0d2bd82270e2fb272317d0bc87752",
-   "sha256": "02aa3ci9cfxswpv5nf0bqpp9lkbqirpmksg5hwxl0xxr672mv7kc"
+   "commit": "13738280c854654b8118f90c9ab1a6a74410f0c4",
+   "sha256": "0c5qzp3zw5nz8hwv3zxy26bh67bsxkrnal596c6m8x8747rfvd31"
   },
   "stable": {
    "version": [
@@ -64998,16 +65166,16 @@
   "repo": "noctuid/lispyville",
   "unstable": {
    "version": [
-    20210702,
-    2031
+    20220519,
+    2339
    ],
    "deps": [
     "cl-lib",
     "evil",
     "lispy"
    ],
-   "commit": "9c14bed0359f659e246d345c706f895737c3d172",
-   "sha256": "1jlxcr9vikczhryw3xslfy6hzs2ikcf9khbwaw53ymwdxrmphcci"
+   "commit": "32d6b1f4b3f5bc792a0610c7e91123a70b582a91",
+   "sha256": "1h87j2yc79skb56i8j5239nr0hialgwg0fkz418caxzkrjglrf8m"
   }
  },
  {
@@ -65308,11 +65476,11 @@
   "repo": "jingtaozf/literate-elisp",
   "unstable": {
    "version": [
-    20220322,
-    133
+    20220524,
+    217
    ],
-   "commit": "dc4f9d64a8483aa6e394178087c589cdefc571e2",
-   "sha256": "08hhp74s56h9k3hlfqky68aiv4qy79gnci46r5nh4mbkrybsijnq"
+   "commit": "4bfc686f5ee5d781f99d6d4d9b7dd057054c8b1c",
+   "sha256": "0r0mzfj6yxlzh89cs249s2xlryi6z6acvd43picz0jv7ff616fph"
   },
   "stable": {
    "version": [
@@ -65435,11 +65603,11 @@
   "repo": "donkirkby/live-py-plugin",
   "unstable": {
    "version": [
-    20220512,
-    34
+    20220518,
+    204
    ],
-   "commit": "7eaf6dc55caaaa65c5d6937b25e1748df75dbdb3",
-   "sha256": "0gcszam4qsl64jx5yggbawsawrj74cqsp7mbzmvvs40gr8pvx2yp"
+   "commit": "054b959fef7e696864ae29575583d0dec414f2d6",
+   "sha256": "0ldrdl9bqjfc472wn8qp3d9mj6kadcl082cl106bgl0p365ngarj"
   },
   "stable": {
    "version": [
@@ -65834,8 +66002,8 @@
     "ht",
     "s"
    ],
-   "commit": "b3366ec866b6e3b5c608fee23e86eb832d132ef8",
-   "sha256": "106fgd8id9xrrl7qyyzxxmi690m29i7zcfk6anc5h52lm52ydk0j"
+   "commit": "f9addea83793b771b3a61d167ed5419749a349c1",
+   "sha256": "01yjhy33i0c8xswkqajjj6ibn0xi9s0vlblnng0q7gi4h3glfxwf"
   },
   "stable": {
    "version": [
@@ -65913,15 +66081,15 @@
   "repo": "doublep/logview",
   "unstable": {
    "version": [
-    20201014,
-    2033
+    20220607,
+    1757
    ],
    "deps": [
     "datetime",
     "extmap"
    ],
-   "commit": "5a543c53d04d32f0adcc023253888198e0b69589",
-   "sha256": "01vvyf7bbkaj8338dinp6x1w4alld165njb0sh432gdkpa6y2wkm"
+   "commit": "a17cafb5445b584e8fa386709192317da5ac4530",
+   "sha256": "0ck9milv8jv0qxqbb77f1z5q36d8c3hwgryq3mxllc2i0mvssyq6"
   },
   "stable": {
    "version": [
@@ -66016,8 +66184,8 @@
  },
  {
   "ename": "loop",
-  "commit": "ba481ca96469b3bd518e4fd8f24947338c8af014",
-  "sha256": "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1qyg1qy7jdh7ncihg59wd467laylx46lsw9vxf0hjpbrq19rj0dz",
   "fetcher": "github",
   "repo": "Wilfred/loop.el",
   "unstable": {
@@ -66076,8 +66244,8 @@
     "map",
     "seq"
    ],
-   "commit": "98537cb29e28d32d3607fa61253ff1bf04db2539",
-   "sha256": "1skl536wmygbnnvcdh307zh5d3y0vz31q0nkwvbd5rpifl4rpk2h"
+   "commit": "a2dbc79bd33a1d194c4804c1157caf27e67b5066",
+   "sha256": "0ccwf2sh52689ajpx7zf0kz8win7nclhm70sc08wk44ygazywjfx"
   },
   "stable": {
    "version": [
@@ -66108,8 +66276,8 @@
     "dash",
     "loopy"
    ],
-   "commit": "98537cb29e28d32d3607fa61253ff1bf04db2539",
-   "sha256": "1skl536wmygbnnvcdh307zh5d3y0vz31q0nkwvbd5rpifl4rpk2h"
+   "commit": "a2dbc79bd33a1d194c4804c1157caf27e67b5066",
+   "sha256": "0ccwf2sh52689ajpx7zf0kz8win7nclhm70sc08wk44ygazywjfx"
   },
   "stable": {
    "version": [
@@ -66189,8 +66357,8 @@
   "repo": "emacs-lsp/lsp-dart",
   "unstable": {
    "version": [
-    20220430,
-    1535
+    20220522,
+    1902
    ],
    "deps": [
     "dap-mode",
@@ -66200,13 +66368,13 @@
     "lsp-mode",
     "lsp-treemacs"
    ],
-   "commit": "7ca60ce9a703ad7a950dcd5ec36ef4251f57d207",
-   "sha256": "1snsnd9pgq2lz3avypps73qfdl3ky2i5sx04sybj7gj41yz834bc"
+   "commit": "4d28d13d8b468bfb8f992da0ea450269d672562c",
+   "sha256": "1z936j2x5sy5hagn0i4a4j16ippmkh1d2ccd7kw6ilal4zi4smk9"
   },
   "stable": {
    "version": [
     1,
-    21,
+    22,
     0
    ],
    "deps": [
@@ -66217,8 +66385,8 @@
     "lsp-mode",
     "lsp-treemacs"
    ],
-   "commit": "813d3c92db02596a8e8aa7802977c50ec1262f9d",
-   "sha256": "1l0208bys0zq9qgnih27aldi5v3rp5bj8i9nar24hgfm42ld75gz"
+   "commit": "4d28d13d8b468bfb8f992da0ea450269d672562c",
+   "sha256": "1z936j2x5sy5hagn0i4a4j16ippmkh1d2ccd7kw6ilal4zi4smk9"
   }
  },
  {
@@ -66229,8 +66397,8 @@
   "repo": "emacs-lsp/lsp-docker",
   "unstable": {
    "version": [
-    20220501,
-    1056
+    20220513,
+    1434
    ],
    "deps": [
     "dash",
@@ -66239,8 +66407,8 @@
     "lsp-mode",
     "yaml"
    ],
-   "commit": "c57863609abfb93fccabf81dc3112ac38f93c4a2",
-   "sha256": "007rf2zbkskidskmcnlsx56dxv0saqm2nl9ih1rk6h9vm27yl24z"
+   "commit": "a0d7cbf80652429c0be4dc7d39e1887ba4691ec7",
+   "sha256": "1mf3c76c8979pqwkikx5dpi0nnfq7w111c6fa65sp4s9y1aip63z"
   }
  },
  {
@@ -66283,8 +66451,8 @@
   "repo": "emacs-grammarly/lsp-grammarly",
   "unstable": {
    "version": [
-    20220511,
-    707
+    20220530,
+    2101
    ],
    "deps": [
     "grammarly",
@@ -66293,8 +66461,8 @@
     "request",
     "s"
    ],
-   "commit": "709c522df7a68e2724dbfb5bd210199dff5a2264",
-   "sha256": "188sx0a6n1kl9awcic1pjbzxsqhq2cbbk8chbp8zgpl0x67ph7d6"
+   "commit": "d56ca607cd597e622969c91a78ec74e463260b32",
+   "sha256": "1rxnfzdyv4ad0b3b1prgxhpnk9y9ayjr5s9r7x38ch43khfqz0cq"
   },
   "stable": {
    "version": [
@@ -66551,8 +66719,8 @@
    "deps": [
     "lsp-mode"
    ],
-   "commit": "8c2ba735ed1e21777408167f6a7c7d9681d9e7bc",
-   "sha256": "1iqmvy870vllb794cpmsnpm65hindxym9dnhb0pnxz0mf6hcvz2v"
+   "commit": "8a133cee26ea8c69831817295136c985039f19ce",
+   "sha256": "0zfwn3nald6w4xi3swnrd098sinaw93w4aaqdfhdqkq90j81whri"
   },
   "stable": {
    "version": [
@@ -66621,8 +66789,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20220511,
-    1331
+    20220607,
+    937
    ],
    "deps": [
     "dash",
@@ -66632,8 +66800,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "465bcc5fbeb6293446a3241f5f2c1b872337958c",
-   "sha256": "151vc741rwi2gggkw39msql1y050b1n46rrjnzalz9nqsk6l5dp2"
+   "commit": "358b5df8df10b4837193af78c2e72df2c381b1fa",
+   "sha256": "1bqd1ga9jcwhkcm527sisx65lvh3lfsg01xln0iilyi2y7ahvzy7"
   },
   "stable": {
    "version": [
@@ -66915,14 +67083,15 @@
   "repo": "merrickluo/lsp-tailwindcss",
   "unstable": {
    "version": [
-    20211211,
-    248
+    20220601,
+    1509
    ],
    "deps": [
+    "f",
     "lsp-mode"
    ],
-   "commit": "8c04fc4ac6f5eb8053ecdaaedffa35e0f7a5b865",
-   "sha256": "01qn3qkr06jz0xsqvz76pc2x8aby0hv1f84mh1v3zsmcjdb64vy8"
+   "commit": "09377d5bbb742f11c458481905ddbb022dd2b0da",
+   "sha256": "090ymnd24cd2665b9kb32yxwvbbrcxc884s68b9g1x59z7wmw42g"
   },
   "stable": {
    "version": [
@@ -66981,16 +67150,16 @@
   "repo": "emacs-lsp/lsp-ui",
   "unstable": {
    "version": [
-    20220510,
-    627
+    20220514,
+    2010
    ],
    "deps": [
     "dash",
     "lsp-mode",
     "markdown-mode"
    ],
-   "commit": "eba9c4eaa255a14e2facd658e7122674c05390f8",
-   "sha256": "09c6qy17dlqh2jnzk6xf6cj8r7gbwgn59cmhaadzhh3v3n13362z"
+   "commit": "a0b97db2ada163453c9072d3640202a0b27c29f5",
+   "sha256": "1dpbx7mny2h7qrd67z6n0grl6nv95zwc9yiiv5b0fby6gank5hv9"
   },
   "stable": {
    "version": [
@@ -67064,8 +67233,8 @@
  },
  {
   "ename": "lusty-explorer",
-  "commit": "efedaa3b1de5f6406c7dcd842eee42eefaf8ab50",
-  "sha256": "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1qmv4077xd8156k1gh25cwv6x1ig27wka5j2ka0j0k0fp8xvwlw1",
   "fetcher": "github",
   "repo": "sjbach/lusty-emacs",
   "unstable": {
@@ -67325,14 +67494,14 @@
   "repo": "amake/macports.el",
   "unstable": {
    "version": [
-    20220512,
-    1330
+    20220606,
+    34
    ],
    "deps": [
     "transient"
    ],
-   "commit": "ebca27f8e16d3607070582849bea81d40ca5f584",
-   "sha256": "0xz5y5smfa69ylngkfck935c03ak40i4aazzklzyslv385vv9kd4"
+   "commit": "bb5c789af7adaaf5b7c0a6013d0397b4cd801b10",
+   "sha256": "0v63m2i505074i63642ywiaplis65mszg66rn4h7r7x960a6bpyq"
   }
  },
  {
@@ -67519,8 +67688,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20220512,
-    1218
+    20220607,
+    1443
    ],
    "deps": [
     "compat",
@@ -67530,8 +67699,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d",
-   "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c"
+   "commit": "2dfeaa6839c643a54d96c9f855bae11d5cba2453",
+   "sha256": "052zdj08296s34b7a5p6fapxym7ni1mlw3iqpvw6jhkv9qihmqv2"
   },
   "stable": {
    "version": [
@@ -67897,8 +68066,8 @@
     "libgit",
     "magit"
    ],
-   "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d",
-   "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c"
+   "commit": "2dfeaa6839c643a54d96c9f855bae11d5cba2453",
+   "sha256": "052zdj08296s34b7a5p6fapxym7ni1mlw3iqpvw6jhkv9qihmqv2"
   },
   "stable": {
    "version": [
@@ -68046,15 +68215,15 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20220506,
-    1936
+    20220513,
+    1429
    ],
    "deps": [
     "compat",
     "dash"
    ],
-   "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d",
-   "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c"
+   "commit": "2dfeaa6839c643a54d96c9f855bae11d5cba2453",
+   "sha256": "052zdj08296s34b7a5p6fapxym7ni1mlw3iqpvw6jhkv9qihmqv2"
   },
   "stable": {
    "version": [
@@ -68117,14 +68286,14 @@
   "repo": "magit/magit-tbdiff",
   "unstable": {
    "version": [
-    20220306,
-    2311
+    20220527,
+    2213
    ],
    "deps": [
     "magit"
    ],
-   "commit": "ae9345d867539a4c5c635be04df2e26468444da8",
-   "sha256": "1klns192jlp0ba9gklkkjjhl33k7dha0ircpm4d11y8vcy3c3zh3"
+   "commit": "ff416b87a77a2f7cea234d9063ff629fc0e4c6c8",
+   "sha256": "11l5vkh5ylg91czl69s4al50pyyhfkarl2qqp32ma2rymsq0mhsm"
   },
   "stable": {
    "version": [
@@ -68629,8 +68798,8 @@
     20210108,
     1832
    ],
-   "commit": "e1af20253fbc5a91034ccd01cf00141130c11863",
-   "sha256": "1pvyv1yhhm5ziqrlvd0hfphp3mcdh8iwwqs5awb54frj9j61fsi8"
+   "commit": "7d886dddf81568c9387410701f60302cd33b4f63",
+   "sha256": "1yalwmbmh993qhp8n4ybh5f6mi82gf68119ziy0w0hxpxpv7x2bc"
   },
   "stable": {
    "version": [
@@ -68655,8 +68824,8 @@
    "deps": [
     "manage-minor-mode"
    ],
-   "commit": "e4c38aeb8ef6a85d8c082ad683720e5a4174aa79",
-   "sha256": "18w2xazs6hw49z7v2z8dcjwbzn696vny22ncdh0s2szp0acwvlaa"
+   "commit": "884aca19bd6affec69c58cbfcac46bab4cd87bde",
+   "sha256": "1y000660813hdpzjl2bx699qi8am90qrhxnykfr1zjiv4i942sja"
   },
   "stable": {
    "version": [
@@ -68688,8 +68857,8 @@
  },
  {
   "ename": "mandoku",
-  "commit": "1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912",
-  "sha256": "1pg7ir3y6yk92kfs5agbxapcxf7gy60m353rjv8g3kfkx5zyh3mv",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "00w246svp3lmbhq7cak2p7fmabnl6dbbsa3cx7wbiwq0f4hpjiaw",
   "fetcher": "github",
   "repo": "mandoku/mandoku",
   "unstable": {
@@ -68952,11 +69121,11 @@
   "repo": "jrblevin/markdown-mode",
   "unstable": {
    "version": [
-    20220508,
-    1219
+    20220603,
+    300
    ],
-   "commit": "5b6e660c13ca3f4d15dbc1aa3d7ab2f228491ef9",
-   "sha256": "11phyiblvxzx3dqqqrqlfi0q67ih1hy1630rlx6pi7w835npn0wz"
+   "commit": "1f709778ac7990f4a07fdf11fe37bc6541810b29",
+   "sha256": "1gwx11rzyaz7ym5lzaddcr1mz1pzysykz8kajkkfx2rq65k9skpw"
   },
   "stable": {
    "version": [
@@ -69084,8 +69253,8 @@
  },
  {
   "ename": "markup",
-  "commit": "a75c955ad6b2f68b8933329e545625d948f6f8f4",
-  "sha256": "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0v4lnwgh10rj5njgn4mw8mf39rg29jb4s9imxhsdimnqaizh83wk",
   "fetcher": "github",
   "repo": "leoc/markup.el",
   "unstable": {
@@ -69167,8 +69336,8 @@
     20200720,
     1034
    ],
-   "commit": "c36dcf8c282f547da5b3666f025a3000b5dbd1d9",
-   "sha256": "135j7i4y5jhypbknknmpha6mfjfzphb3n7pb303dss0amxfs0430"
+   "commit": "5e8518a5f89c19d4aa9d7146cfdb213194d24e5d",
+   "sha256": "0471f234wi2bd3das0l96j4c3ka4cs6gs4w85hrw8b8bwx19d5xm"
   },
   "stable": {
    "version": [
@@ -69242,21 +69411,21 @@
  },
  {
   "ename": "mastodon",
-  "commit": "891defb51d73e742486b18cbe4495c951b26fc47",
-  "sha256": "0450xbgv0hy5gvcycxin6yvb0vd65y5dsgxlx6xjnzij3rkb4xsj",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "0jmmcnd76sw0fapac370d8mkg1v1qhhdy015pds0v7j5g5wwrssz",
   "fetcher": "git",
   "url": "https://codeberg.org/martianh/mastodon.el",
   "unstable": {
    "version": [
-    20220405,
-    1531
+    20220513,
+    1124
    ],
    "deps": [
     "request",
     "seq"
    ],
-   "commit": "e5ff349d23c71a521db41dcdb1ac9765bac5388f",
-   "sha256": "1iq7m0acvhb86l5p7ah2pq2fz1716l94dw1m7pbi6asbnypgnavy"
+   "commit": "4ab5a4bb8d603b189a99cc4a4eea4c42e8f97cf0",
+   "sha256": "00rvnpcbpxpnqqplqvgjny5ddj6ggdk3i532hdw8i9z38r2gafyl"
   },
   "stable": {
    "version": [
@@ -69303,16 +69472,16 @@
   "repo": "matsievskiysv/math-preview",
   "unstable": {
    "version": [
-    20220512,
-    1853
+    20220604,
+    1107
    ],
    "deps": [
     "dash",
     "json",
     "s"
    ],
-   "commit": "0f0b2315d23e5d18b627c9faa8f231f175b728a0",
-   "sha256": "003ih3nrv753rj4ssdvs6ddqzxgl63vzmrypd41xf4g5dfsbmsf0"
+   "commit": "a7254ba89a524f30c1acfdbde07a179271f02658",
+   "sha256": "1d1s1ff49xb5rdmphgx2g5n5mmjrkrdi38wqijlkr6jj15d5lrig"
   },
   "stable": {
    "version": [
@@ -69458,15 +69627,15 @@
   "repo": "sasanidas/maxima",
   "unstable": {
    "version": [
-    20210526,
-    1525
+    20220531,
+    1751
    ],
    "deps": [
     "s",
     "test-simple"
    ],
-   "commit": "ce5fd160c193e387d9e2bacdba4065c4b4262cb1",
-   "sha256": "18bjr4n1m1y76kh0pp6ci7ywklrmw611ka3avrj23lb0wwrljf86"
+   "commit": "1334f44725bd80a265de858d652f3fde4ae401fa",
+   "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1"
   },
   "stable": {
    "version": [
@@ -69882,11 +70051,11 @@
   "repo": "meow-edit/meow",
   "unstable": {
    "version": [
-    20220501,
-    1918
+    20220515,
+    2054
    ],
-   "commit": "72d6ff36b62a57aa9c9dbfbd44cdb3002a0e940a",
-   "sha256": "0vaam51wg8a7ilk9kp3lvz3p0vfcc3fl2nkpwswdadgr69f2d4qb"
+   "commit": "0a978e0232947d8e3a0895d104fe7f8671daed6f",
+   "sha256": "0phzafaj4zvih9h5ky7jryixwhv0kxwjvcxijvch7sn1i6fdpvkf"
   },
   "stable": {
    "version": [
@@ -69906,11 +70075,11 @@
   "repo": "ocaml/merlin",
   "unstable": {
    "version": [
-    20220502,
-    811
+    20220517,
+    1602
    ],
-   "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee",
-   "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm"
+   "commit": "88c0c2e66d65e3a6ba30c14a8dcef6685b285a55",
+   "sha256": "19cq56369dlzhdf6kxm2iz0qc7w6kxjrm8cjv0rwmswzp5lnsd44"
   },
   "stable": {
    "version": [
@@ -69938,8 +70107,8 @@
     "auto-complete",
     "merlin"
    ],
-   "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee",
-   "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm"
+   "commit": "88c0c2e66d65e3a6ba30c14a8dcef6685b285a55",
+   "sha256": "19cq56369dlzhdf6kxm2iz0qc7w6kxjrm8cjv0rwmswzp5lnsd44"
   },
   "stable": {
    "version": [
@@ -69971,8 +70140,8 @@
     "company",
     "merlin"
    ],
-   "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee",
-   "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm"
+   "commit": "88c0c2e66d65e3a6ba30c14a8dcef6685b285a55",
+   "sha256": "19cq56369dlzhdf6kxm2iz0qc7w6kxjrm8cjv0rwmswzp5lnsd44"
   },
   "stable": {
    "version": [
@@ -70033,8 +70202,8 @@
     "iedit",
     "merlin"
    ],
-   "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee",
-   "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm"
+   "commit": "88c0c2e66d65e3a6ba30c14a8dcef6685b285a55",
+   "sha256": "19cq56369dlzhdf6kxm2iz0qc7w6kxjrm8cjv0rwmswzp5lnsd44"
   },
   "stable": {
    "version": [
@@ -70362,8 +70531,8 @@
   "repo": "danielsz/meyvn-el",
   "unstable": {
    "version": [
-    20211025,
-    106
+    20220521,
+    17
    ],
    "deps": [
     "cider",
@@ -70373,8 +70542,8 @@
     "projectile",
     "s"
    ],
-   "commit": "80ece19a6ce6fd3dac374911edb9734286978450",
-   "sha256": "0qqr88r1g3lwzl4m9qjiwba23ylp44g5hspawwfzchlbs9js6yj7"
+   "commit": "ae02f9e3b93730672f2f0a476a4e32bf1a024937",
+   "sha256": "0j0p3s4n0z873191w8z27p2fl77ybpb958v0wzjdi1alq0rl1bdf"
   },
   "stable": {
    "version": [
@@ -70916,20 +71085,20 @@
   "repo": "hlissner/emacs-mips-mode",
   "unstable": {
    "version": [
-    20211114,
-    1645
+    20220608,
+    1204
    ],
-   "commit": "5676174bea9a5780ddd33d2d8111b8678dfa4e99",
-   "sha256": "0nlxhchcy3swmyfzdd8qmdzq05a4lzlgs1psnsvfjbbi9w8g8w5v"
+   "commit": "98795cdc81979821ac35d9f94ce354cd99780c67",
+   "sha256": "1wpgp08q1f2gbkn4ksd3chfz2s3cn8fdfyz04wmj37ss43mai355"
   },
   "stable": {
    "version": [
     1,
-    1,
-    1
+    2,
+    0
    ],
-   "commit": "e6c25201a3325b555e64388908d584f3f81d9e32",
-   "sha256": "0ai4ff6hinajvnp8r86s5pv0rrv8h68ncdz4k98kka1ws2f79zdf"
+   "commit": "98795cdc81979821ac35d9f94ce354cd99780c67",
+   "sha256": "1wpgp08q1f2gbkn4ksd3chfz2s3cn8fdfyz04wmj37ss43mai355"
   }
  },
  {
@@ -71212,8 +71381,8 @@
  },
  {
   "ename": "mocker",
-  "commit": "16a4fe34a6f354d396c24ff13e15157510202259",
-  "sha256": "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1c44ws77r0sp9b46a2xk39039m28mf8sqd46dbzwsms5glkwl82c",
   "fetcher": "github",
   "repo": "sigma/mocker.el",
   "unstable": {
@@ -71402,8 +71571,8 @@
  },
  {
   "ename": "modern-sh",
-  "commit": "b0db199b134810cd2912aaaaa9793d9a59bdedef",
-  "sha256": "1lz14cwv61kn765ahs91dzgpp18kzyhj0a10p6y39pk481fp7wbl",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0liizd9w6yh1p1x3pvmalv97rn6676rknh8r1lcka9xgcng8lap1",
   "fetcher": "github",
   "repo": "damon-kwok/modern-sh",
   "unstable": {
@@ -71466,20 +71635,20 @@
   "url": "https://git.sr.ht/~protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20220512,
-    1808
+    20220605,
+    1714
    ],
-   "commit": "b6285162d80fe438b4ac99acff74d33b5f901c35",
-   "sha256": "139ycd3p63hlxs70g266xj6i7bng1p2xavwcsxf4j4nvfayib9r7"
+   "commit": "6f2b048528d1c40bf5bead0d3e01beff28b78d2b",
+   "sha256": "0hr7202jhmjcx3z71dn2lzwv7980lalj0kbvjn6jjg4dm71fywjn"
   },
   "stable": {
    "version": [
     2,
-    3,
-    3
+    4,
+    1
    ],
-   "commit": "ee0670f85bc55a3178c18774e141b4e58b2f6fe7",
-   "sha256": "14nfb94y9vcnpmwj9acwl6h5v0h1c6swqf33ch4zimxxqgx9zrm4"
+   "commit": "467aab71377a6e1476dcab7ab5f2c55d1ffc28fe",
+   "sha256": "0b4y8dzyc9qwwaf2ngqiwyfcnhwlr49kxhc96laqk20lvjlfsrnx"
   }
  },
  {
@@ -71490,11 +71659,11 @@
   "repo": "kuanyui/moe-theme.el",
   "unstable": {
    "version": [
-    20220111,
-    1220
+    20220608,
+    1159
    ],
-   "commit": "edf3fe47fb986e283e3b04cba443dcb39fe8720e",
-   "sha256": "1wr6xd3hhgnqjrr2d8llbrdaagi4wz77zfxh1jg2f2mj28i52ksz"
+   "commit": "4d9e876d24d69d18c4111fa42bd34fe01a124866",
+   "sha256": "1a18pg8fwx0iicxrab2qj7wfh05pbqb4bh13nhlp2r94w024idd9"
   },
   "stable": {
    "version": [
@@ -71789,11 +71958,11 @@
   "repo": "jessieh/mood-one-theme",
   "unstable": {
    "version": [
-    20210221,
-    18
+    20220608,
+    25
    ],
-   "commit": "42e402a89473458f55a71c5bbe785575e9a927ba",
-   "sha256": "1ma5138src6iglkhd2h8w9k4gqqaxvsngz08cd4v2s8dhqkcayw8"
+   "commit": "65e98bafa0277b9c706c6e3564f11edbca5d5699",
+   "sha256": "1sc8z0fp7q9xkjm5d2x8gv0l0km4m28q71li1pkvdzmxmzn40ayd"
   },
   "stable": {
    "version": [
@@ -72122,8 +72291,8 @@
     20210306,
     1053
    ],
-   "commit": "247db142f7251062978ade3fd27c815259eaa05b",
-   "sha256": "16bdqpmj4lsc3nx78ikvgqslb6jrzc5qmkhfl8m5gy26gfd37dxn"
+   "commit": "73f289987769fe1dd381bf436b5888a2a663e276",
+   "sha256": "09y3x603xgk51jgnry3x59hysv7z8d7v0p3bsp015z9lx3m83b4v"
   },
   "stable": {
    "version": [
@@ -72524,16 +72693,16 @@
   "repo": "xzz53/mu4e-alert",
   "unstable": {
    "version": [
-    20220416,
-    1840
+    20220528,
+    1923
    ],
    "deps": [
     "alert",
     "ht",
     "s"
    ],
-   "commit": "b34d0ea7b75709cc25d842a783cebea855dc9f7d",
-   "sha256": "09qzph8madnhd8kqnj662sgfcyvp1wg35ll6i5xbh98yazc0r64s"
+   "commit": "85489fae322a655e275be2483b9d02486b172ea8",
+   "sha256": "17d2nqndb760k96s8wskpx4g6xmfzwaifmbs25pj9114zvpz2byy"
   },
   "stable": {
    "version": [
@@ -72613,14 +72782,14 @@
   "repo": "agpchil/mu4e-maildirs-extension",
   "unstable": {
    "version": [
-    20201028,
-    921
+    20220517,
+    1852
    ],
    "deps": [
     "dash"
    ],
-   "commit": "1167bc6e08996f866e73e9a02f563fd21ac317fd",
-   "sha256": "0bnznfz3bfk348hw5avri6n5w7x8376j0vzybwdxrqb6hfbvwzw0"
+   "commit": "cdc2e141d8ecd59508a5cd50d6d02120073bf4f1",
+   "sha256": "0nkkz4x0wk3sc1d97zl47x4d80d29r5nmh6f3sy7xw342gnb8gsj"
   },
   "stable": {
    "version": [
@@ -72722,10 +72891,10 @@
  },
  {
   "ename": "muban",
-  "commit": "3576c6b7d79ce6d4df40ce83400fa2468f8fbcdf",
-  "sha256": "1njphxx6sgw952p7v2qkbjwa8sb2mwrxrzv35bzp0d4c84ny2sa0",
+  "commit": "167ddaca39085bd570bb9392408ae31e58509793",
+  "sha256": "13p1xbz90q055iczyclwcw0bkwwphq3c9bgy1ykr84jhfhvpm80a",
   "fetcher": "github",
-  "repo": "jiahaowork/muban.el",
+  "repo": "jiahaoli95/muban.el",
   "unstable": {
    "version": [
     20180415,
@@ -72987,14 +73156,14 @@
   "repo": "magnars/multiple-cursors.el",
   "unstable": {
    "version": [
-    20220328,
-    1724
+    20220528,
+    1215
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "aae47aebc0ae829211fa1e923232715d8e327b36",
-   "sha256": "1rpimqf8srlvilnqi02lr7my9ccxc89gc14pzs6jdffc60gb4659"
+   "commit": "fd8441bfc8738d463601823e5a3d9c2d7123bfbf",
+   "sha256": "1201q60cnydglq431hkf68kz6gx4i1fs1v00jldliqrxkxm0ignx"
   },
   "stable": {
    "version": [
@@ -73059,8 +73228,8 @@
  },
  {
   "ename": "mustache",
-  "commit": "d1bcf9599ca6d2c29333071a80f96808d4ab52e2",
-  "sha256": "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1qag8yv1xh65ny7gni4ncz42ij3h6ca4nzp13pbfy5bmyw9hfzlj",
   "fetcher": "github",
   "repo": "Wilfred/mustache.el",
   "unstable": {
@@ -73115,8 +73284,8 @@
  },
  {
   "ename": "mustang-theme",
-  "commit": "2ed3691edd1cba6abc0c30d2aab732e2ba51bf00",
-  "sha256": "0771l3x6109ki914nwpfz3fj7pbvpcg9vf485mrccq2wlxymr5dr",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0984cjy659w4f0hxpvijs6wz6978vwabkp7nbwnqb9pmpgaf1ia2",
   "fetcher": "github",
   "repo": "mswift42/mustang-theme",
   "unstable": {
@@ -73271,11 +73440,11 @@
   "repo": "redguardtoo/mybigword",
   "unstable": {
    "version": [
-    20201030,
-    1253
+    20220526,
+    1438
    ],
-   "commit": "4c1386252444df2ade734e02078069a06f3f0f97",
-   "sha256": "0gbynsf84dgsg2m6h2m2xj54ph0a7kiz9njd33j4xp7r36d268f8"
+   "commit": "ffbfa2a938a58c4e60ccc4c2ec0ae32a11eac485",
+   "sha256": "1aknn89k9chrn65jxxj82pjia4rqfqp8s71j7x1hb10fscmscdbp"
   },
   "stable": {
    "version": [
@@ -73289,8 +73458,8 @@
  },
  {
   "ename": "mykie",
-  "commit": "e10504a19e052c080be2ccc9b1b8fd2e73a852e0",
-  "sha256": "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "18s3cb0gxji5xvslbpw9dcw2d3msj6lv7zg8kl3vifjzjsp5b94p",
   "fetcher": "github",
   "repo": "yuutayamada/mykie-el",
   "unstable": {
@@ -73591,8 +73760,8 @@
  },
  {
   "ename": "namespaces",
-  "commit": "de404e9ad3d1e27af24e868e84218d872d5fc795",
-  "sha256": "02pb7762khxpah4q6xg8r7dmlv1kwyzinffi7pcaps6ycj29q2fr",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0mcyi74zvd60kmvyi1zq43arnk57rmahdyl4g75v31ka6fd5yspm",
   "fetcher": "github",
   "repo": "chrisbarrett/elisp-namespaces",
   "unstable": {
@@ -74012,20 +74181,20 @@
   "repo": "babashka/neil",
   "unstable": {
    "version": [
-    20220501,
-    2053
+    20220514,
+    2039
    ],
-   "commit": "239c16655431b27ee558bf250bece4f4b10a0e83",
-   "sha256": "1d31g7a9js378cq56gqwrd978bzc57848j169lsykz24yqx3sf22"
+   "commit": "12fadb994054306984010d0096b051a972af75cc",
+   "sha256": "08fbm2sfdw4g0skbwyn9wbb1jcf46l8f23j552y202znfmyqhz2v"
   },
   "stable": {
    "version": [
     0,
     0,
-    28
+    31
    ],
-   "commit": "6e8620c1a3001d1541ad934ae2847905451a21cf",
-   "sha256": "0ipg6d8vm7i4jgdxa56w8a4al2nnj09pivfplfja7791mgl0qk30"
+   "commit": "61e9d2f4c55601a5a03e1525eb75cfa6ce7325b1",
+   "sha256": "1sg29z2hca6ssplj4hcam0334rabix0bqbm94blgl0yn1r5cac7r"
   }
  },
  {
@@ -74527,11 +74696,11 @@
   "repo": "m-cat/nimbus-theme",
   "unstable": {
    "version": [
-    20220513,
-    240
+    20220525,
+    220
    ],
-   "commit": "958a92a979c88bee909d03a78b2faf6726d0069b",
-   "sha256": "0l4bi6hnwk4lssmya8x6av0j0nhvwccxaiv2ar1byiy7i3bxvr16"
+   "commit": "a5f51bc847553dc1ac7ad54fa5af32cd4623a66d",
+   "sha256": "12m9vcnpg8vv6kbi6yw0n2x8gall2wz8y5gl1jgiil9nycyxnikg"
   },
   "stable": {
    "version": [
@@ -74554,17 +74723,17 @@
     20181024,
     1439
    ],
-   "commit": "7905dee5ac62f7a1e0dfec4d936b97d96c7566d7",
-   "sha256": "17q8sqnrrsyxz6zld2zarp44wsjn53nsp8bz8k007wd5lbwylvg2"
+   "commit": "55f54511d35716c43637dee2bcb5fbc7839f967b",
+   "sha256": "0pmxi8nsd9zid9nys8ba26281k34s0gv7dszk2rlx92rb8c3k22i"
   },
   "stable": {
    "version": [
     1,
-    10,
-    2
+    11,
+    0
    ],
-   "commit": "e72d1d581c945c158ed68d9bc48911063022a2c6",
-   "sha256": "0mspq4mvx41qri2v2zlg2y3znx5gfw6d8s3czbcfpr2218qbpz55"
+   "commit": "51edeeb063a82693573db43782d9e3733b2840e4",
+   "sha256": "14wqccblr3nc2pjgv1a5fsjznp7iyp6z993jp1ddknz01dvhr765"
   }
  },
  {
@@ -74857,16 +75026,16 @@
   "repo": "dickmao/nnhackernews",
   "unstable": {
    "version": [
-    20220107,
-    1537
+    20220604,
+    2100
    ],
    "deps": [
     "anaphora",
     "dash",
     "request"
    ],
-   "commit": "6748065db2f12ae6ea07058e7d643f586fb4b3bc",
-   "sha256": "0b566hb8j0mwl8b8plaf10majn8v70r9j7ffwsk1jnkixc8y4l37"
+   "commit": "ec99d579b9fa26fdb5f5e00dfd77e968ed8386f0",
+   "sha256": "0bnalbgf3bdvwnvmdjy1vq439n6vkfzmp9a5rgn0kdr32ar75kfw"
   }
  },
  {
@@ -74886,8 +75055,8 @@
  },
  {
   "ename": "nnreddit",
-  "commit": "4581c76fee699eb9f41eb0f00e4ccd4a008b8399",
-  "sha256": "0pfb57pwdyhsrmgzbf83xrq10xjhm6sk6xyz8rd15gjqka2mc8c2",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "07m8q4nymchx16pj6l2brmks6011i586dyycaczv1zqdvvhd4b8g",
   "fetcher": "github",
   "repo": "dickmao/nnreddit",
   "unstable": {
@@ -74909,8 +75078,8 @@
  },
  {
   "ename": "nntwitter",
-  "commit": "39b3ec38c4a6762afdea13c17e0447caa976181f",
-  "sha256": "0788lajp113rqc38d0s1qypvgmfnxw1mjcj97syi27jda5jw3lbl",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "1sgj1fn06zk2rblf5c4jlqyjdrlxvn56pj1q9vylglswy7dgz9xp",
   "fetcher": "github",
   "repo": "dickmao/nntwitter",
   "unstable": {
@@ -74950,14 +75119,14 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20220509,
-    1733
+    20220530,
+    1845
    ],
    "deps": [
     "compat"
    ],
-   "commit": "fed46eb7060aca624bfe1a18f13b73f94e70f013",
-   "sha256": "169asd32iask7h6m861j1qfg60mxnmxxcwc3f8ddxkpfjb6b27sq"
+   "commit": "a5aa3faada054f96b70b32ba9d9447f7a4cf403c",
+   "sha256": "1gykaxdzv1j5q6h9m36ms5708h3jsn5yjilnajrngv3nkh6mb0qs"
   },
   "stable": {
    "version": [
@@ -74995,15 +75164,14 @@
   "repo": "thomp/noaa",
   "unstable": {
    "version": [
-    20220509,
-    1600
+    20220515,
+    2359
    ],
    "deps": [
-    "dash",
     "request"
    ],
-   "commit": "507831164b09a2d769bd68d5a45608fc0de626dd",
-   "sha256": "1xsnr4y3al9ps2v1y8yjapmghrvcgk8671h300l3w9w0gjcwkbhj"
+   "commit": "1ebacdfbaa996319adf88a49258814c28ba49b1b",
+   "sha256": "1gz3blbj1snvdq9vyc2f2brbpkarxid221lpqm8h58jlzxx0by86"
   }
  },
  {
@@ -75292,11 +75460,11 @@
   "url": "https://git.notmuchmail.org/git/notmuch",
   "unstable": {
    "version": [
-    20220226,
-    1200
+    20220602,
+    1121
    ],
-   "commit": "37492858b61907e4728b2e68e67238c68e9a0d49",
-   "sha256": "0kc750z3p23rkn2nr3z7y205xb58qi77f2vr8w33nj4ykgil65ar"
+   "commit": "3a6b479a7360fbdbc1c6def4c1e1581bfd63e8a2",
+   "sha256": "1r7vr10yz0vjhlv5wbgv1x3519fg9lhdp165ksr1gg8mcp5yca37"
   },
   "stable": {
    "version": [
@@ -75810,11 +75978,11 @@
   "repo": "enricoflor/numbex",
   "unstable": {
    "version": [
-    20220504,
-    1329
+    20220518,
+    29
    ],
-   "commit": "55d4977c74ca33d1ad4c10fea7369f4bcdfd3f86",
-   "sha256": "0d43ad14b2k1w3my2nwrnw58z594hw18k6p37xvvpnx8r4fdxbl2"
+   "commit": "aa3903f190946e54f41601dd7831f3aa973a8be7",
+   "sha256": "1fnll6ccys7wmwbw4xp638ln0qsdy9bfczphgrdjps0h8xr3awpc"
   }
  },
  {
@@ -75921,11 +76089,11 @@
   "repo": "dpk/nxml-uxml",
   "unstable": {
    "version": [
-    20220130,
-    1405
+    20220606,
+    1213
    ],
-   "commit": "94440741f7e8b83504d53991f26f63b4855cce27",
-   "sha256": "17k0d6ik2zj99kdvxdj5jg2kjj83lpy983mgcr3vv36axlw58wyr"
+   "commit": "95bbd0018ab218b9f39f5bf1f1e809f60fbc3edc",
+   "sha256": "10rah19x3pnvksi7ikji36i5bci9jhh6xjqlv6cn6xm7fdwrrkd8"
   }
  },
  {
@@ -76024,27 +76192,27 @@
   "repo": "rocher/ob-ada-spark",
   "unstable": {
    "version": [
-    20220401,
-    926
+    20220515,
+    2014
    ],
    "deps": [
     "f"
    ],
-   "commit": "1213b877bc893ac5990a20052ea2bf2d8f086260",
-   "sha256": "18v4psk9ilvbnsbdksarix7zak7pbyxbn0rfy3kv9r2p0nrw9brj"
+   "commit": "b4f16b255947240e458127e5c737d793ac894ac1",
+   "sha256": "1vfkp4k5wz6aqq13f8p3la825q7qa3q1m05s2a5mdffn2r7f7nb9"
   },
   "stable": {
    "version": [
     1,
     2,
     5,
-    2
+    3
    ],
    "deps": [
     "f"
    ],
-   "commit": "1213b877bc893ac5990a20052ea2bf2d8f086260",
-   "sha256": "18v4psk9ilvbnsbdksarix7zak7pbyxbn0rfy3kv9r2p0nrw9brj"
+   "commit": "b4f16b255947240e458127e5c737d793ac894ac1",
+   "sha256": "1vfkp4k5wz6aqq13f8p3la825q7qa3q1m05s2a5mdffn2r7f7nb9"
   }
  },
  {
@@ -76110,8 +76278,8 @@
    "deps": [
     "axiom-environment"
    ],
-   "commit": "b52fa715285e7ad182c8e679ebf05b130dd5b5e2",
-   "sha256": "1hb4npfpg1iy9j0p29q1jrjgx0mrn333m45nmsnxw8nlaxzd97x6"
+   "commit": "847cc6e728b692ad3fdaec28d0c8c49ec0378a56",
+   "sha256": "02nf2vn6s6pc63yw2rggdx9capn9432w6j56m9v0c5ygarpxb53p"
   }
  },
  {
@@ -76622,15 +76790,15 @@
   "repo": "shg/ob-julia-vterm.el",
   "unstable": {
    "version": [
-    20220512,
-    820
+    20220518,
+    1429
    ],
    "deps": [
     "julia-vterm",
     "queue"
    ],
-   "commit": "448b1d0d2edf908c13a99a2424fec20de636f5a3",
-   "sha256": "040k25ikvngczd8yxm8i6qa0q6vbqgsiq1ddwq1wlvhaw9iam6qm"
+   "commit": "39dbdb265785ae72bcd53706bc53190ec5e11bf0",
+   "sha256": "0wnvfv2ddvfwm6w446xx3x024g2vi8wzxyj85wdhpdh2hzssfchi"
   },
   "stable": {
    "version": [
@@ -77037,15 +77205,15 @@
   "url": "https://repo.or.cz/ob-spice.git",
   "unstable": {
    "version": [
-    20220210,
-    1415
+    20220529,
+    404
    ],
    "deps": [
     "org",
     "spice-mode"
    ],
-   "commit": "6dc2c6b9391ea8dd8123224f6c282b673b89dc94",
-   "sha256": "15lnmqzpgaz8n6zh0x9dm6hynl7rf1pcyf5m3fk7bbinqbxclljn"
+   "commit": "b1106ef2a74b2e88b294b05b83af22810feef4f6",
+   "sha256": "1k0ylhlaz8g2f1p1chn9vrzid78fswpyjalim73566pslc09lxsp"
   },
   "stable": {
    "version": [
@@ -77370,20 +77538,20 @@
   "repo": "ocaml-ppx/ocamlformat",
   "unstable": {
    "version": [
-    20220307,
-    1315
+    20220519,
+    1004
    ],
-   "commit": "c490e5b7c4b5f5e5848a5cbdb1e669588dfeaae3",
-   "sha256": "1kq8290g494z48a1g1myzyazzfl33gz1hws984kxv8i29lp7jqr3"
+   "commit": "3b59f18b040e8bf7484a91435bfffcc34db55864",
+   "sha256": "11nm1idxnpzrdipnaxi35hzppwmylzdpvmjfnlgrqbmb6bcjinxs"
   },
   "stable": {
    "version": [
     0,
-    21,
-    0
+    22,
+    4
    ],
-   "commit": "63e478f1186a03c7e4dfeeb39b3d8fe2ef1cb429",
-   "sha256": "10vy102a0isd8cg94y61pm4qfgy74d6003dw0qn0bdmbd19r5071"
+   "commit": "838ba9fa00cc27703441220b9a5d3880b17430fb",
+   "sha256": "171lq3vx4y8xj4by5zy93isx8nhg6ysxg1hxmkqkq16fdaiz8mnc"
   }
  },
  {
@@ -77567,26 +77735,26 @@
   "repo": "oer/oer-reveal",
   "unstable": {
    "version": [
-    20220402,
-    1505
+    20220603,
+    1106
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "df7180a8d75dedb2fd8878843a3d3cc654be508d",
-   "sha256": "0wf02hziqxmjvcxbnl8nr6dmgw9ivmx2n1ybrqh2k75zz1rnzasc"
+   "commit": "0c455d31516baa02603f54917d5ff1f309e31925",
+   "sha256": "1y8vw5m9z9jc8yam5hxsamiz9hpn2v9q5rmrf9f9s7m4xm5iq10j"
   },
   "stable": {
    "version": [
     4,
     4,
-    0
+    4
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "df7180a8d75dedb2fd8878843a3d3cc654be508d",
-   "sha256": "0wf02hziqxmjvcxbnl8nr6dmgw9ivmx2n1ybrqh2k75zz1rnzasc"
+   "commit": "0c455d31516baa02603f54917d5ff1f309e31925",
+   "sha256": "1y8vw5m9z9jc8yam5hxsamiz9hpn2v9q5rmrf9f9s7m4xm5iq10j"
   }
  },
  {
@@ -78315,11 +78483,11 @@
   "repo": "oantolin/orderless",
   "unstable": {
    "version": [
-    20220418,
-    2119
+    20220527,
+    2228
    ],
-   "commit": "75eeae21971d86b51a712ed8ecd6434463b2d866",
-   "sha256": "0rl3na97qkl5a5p2ifs1sli80rq38qqmjqkv6khn60f05rj5yvk3"
+   "commit": "8b9af2796fa0eb87eea4140bc08d16880a493803",
+   "sha256": "0vbxg9k4w6yc770l330ir2h0fz108msmxhjq7p8alcql45vmhwn8"
   },
   "stable": {
    "version": [
@@ -78477,30 +78645,30 @@
   "repo": "eyeinsky/org-anki",
   "unstable": {
    "version": [
-    20220302,
-    1706
+    20220525,
+    903
    ],
    "deps": [
     "dash",
     "promise",
     "request"
    ],
-   "commit": "c1790b1cdd2e5733cf64c7507a89da0b6179cf7d",
-   "sha256": "10r8k14dlm017c4kahim2jv2nkx0898r0dc21z5szp4hw7l1z4n9"
+   "commit": "c084599a199f794b7e25d5ca4d58f0c0ad87c160",
+   "sha256": "1h0dlph8cxs8spdqy0zs515hnza5jp15szbv7qgnricbg9k3pkx7"
   },
   "stable": {
    "version": [
+    1,
     0,
-    0,
-    9
+    2
    ],
    "deps": [
     "dash",
     "promise",
     "request"
    ],
-   "commit": "c1790b1cdd2e5733cf64c7507a89da0b6179cf7d",
-   "sha256": "10r8k14dlm017c4kahim2jv2nkx0898r0dc21z5szp4hw7l1z4n9"
+   "commit": "c084599a199f794b7e25d5ca4d58f0c0ad87c160",
+   "sha256": "1h0dlph8cxs8spdqy0zs515hnza5jp15szbv7qgnricbg9k3pkx7"
   }
  },
  {
@@ -78594,26 +78762,26 @@
   "repo": "yilkalargaw/org-auto-tangle",
   "unstable": {
    "version": [
-    20211115,
-    543
+    20220607,
+    2042
    ],
    "deps": [
     "async"
    ],
-   "commit": "c3cbde261fd66b747374b667cb715ca9ee8c52ba",
-   "sha256": "084pfgjyf41nmwyixvza9vhmfbaq587hx78knpg7c19aiki2r8zx"
+   "commit": "87b867b46e9d75bb65c6b4d02565c67e225bd429",
+   "sha256": "1zb7vcmhmjiqpbbhqrqci689rnpn10p985cs5jk9sgg66xsbrgs3"
   },
   "stable": {
    "version": [
     0,
     4,
-    0
+    1
    ],
    "deps": [
     "async"
    ],
-   "commit": "c3cbde261fd66b747374b667cb715ca9ee8c52ba",
-   "sha256": "084pfgjyf41nmwyixvza9vhmfbaq587hx78knpg7c19aiki2r8zx"
+   "commit": "87b867b46e9d75bb65c6b4d02565c67e225bd429",
+   "sha256": "1zb7vcmhmjiqpbbhqrqci689rnpn10p985cs5jk9sgg66xsbrgs3"
   }
  },
  {
@@ -78624,11 +78792,11 @@
   "repo": "calvinwyoung/org-autolist",
   "unstable": {
    "version": [
-    20211225,
-    658
+    20220530,
+    1620
    ],
-   "commit": "48666001f9ae1fdf9e295410d5a494e79284e2f7",
-   "sha256": "0ij0j96ns4scrlcf52ljwhi3y4q9jfv9kra3nw162fs3f4q6lp7m"
+   "commit": "da3a45f95f2e9f7281d533d1e5cec1764ae26a9c",
+   "sha256": "0zj4g6vfwyyxlpci6fcawvf35bgk7b84rrnm9s9myv53b6nri73f"
   },
   "stable": {
    "version": [
@@ -78674,8 +78842,8 @@
  },
  {
   "ename": "org-beautify-theme",
-  "commit": "f55f1ee9890f720e058401a052e14c7411252967",
-  "sha256": "0rrlyn61xh3szw8aihxpbmg809xx5ac66xqzj895dn1raz129h2w",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "08f8lzbsyx919i83k070zyykn5hmndj5krschby52mimsllcrl80",
   "fetcher": "github",
   "repo": "jonnay/org-beautify-theme",
   "unstable": {
@@ -78931,14 +79099,14 @@
   "repo": "dfeich/org-clock-convenience",
   "unstable": {
    "version": [
-    20220503,
-    530
+    20220515,
+    849
    ],
    "deps": [
     "org"
    ],
-   "commit": "988d4e3c9f0ae6df098b0ab1985b79eed2c5b808",
-   "sha256": "0b1i013likxba92z3bwrg9in3g3daaz31fdsn1cfxbn3yha6yzai"
+   "commit": "9201db80862d144459f1316d571842f5389a47eb",
+   "sha256": "010wl014dh8sipfqnyasxy1rq5q726bgxm50v4fyqlqkpc6r07d2"
   }
  },
  {
@@ -79050,6 +79218,26 @@
   }
  },
  {
+  "ename": "org-contacts",
+  "commit": "40c73fda1fc5fd5cf01680838a9556fb3fa528cf",
+  "sha256": "11xh2qpibpxcfw6wbv7i18294pd9ccdhdqnka2p3jcrpac1m8ai9",
+  "fetcher": "git",
+  "url": "https://repo.or.cz/org-contacts.git",
+  "unstable": {
+   "version": [
+    20220604,
+    102
+   ],
+   "deps": [
+    "cl-lib",
+    "gnus",
+    "org"
+   ],
+   "commit": "c1c4cadf3f7890a07d03c531ef823e1fb5f3ef2f",
+   "sha256": "07jkgmi9i9k0pnlxhrmhx3rjqaxl3q69mz9zmyxrpk7y9dv6hc92"
+  }
+ },
+ {
   "ename": "org-context",
   "commit": "f33b6157eb172719a56c3e86233708b1e545e451",
   "sha256": "19y8aln7wix9p506ajvfkl641147c5mdmjm98jnq68cx2r4wp6zz",
@@ -79312,6 +79500,25 @@
   }
  },
  {
+  "ename": "org-edit-indirect",
+  "commit": "53497135511754f2d6fb11b4f9ffd34f6715bd2c",
+  "sha256": "0kbhj4qihb442f2yvnv5i6d0gy8hdqa6qbawj563zgrfi19swi0r",
+  "fetcher": "github",
+  "repo": "agzam/org-edit-indirect.el",
+  "unstable": {
+   "version": [
+    20220508,
+    2141
+   ],
+   "deps": [
+    "edit-indirect",
+    "org"
+   ],
+   "commit": "f146d1b406308298b4004a28aaa11124b02d015b",
+   "sha256": "18w6gpdj8ch8zgyidaglym8mxp23y4aa6a0z2qix7skka0vlknjq"
+  }
+ },
+ {
   "ename": "org-edit-latex",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
   "sha256": "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry",
@@ -79535,8 +79742,8 @@
     "request",
     "request-deferred"
    ],
-   "commit": "554c48fb57dc46877202028019197b0699961ca0",
-   "sha256": "1l48dgzwwh230l5kxd17jdmjwhbkaqzmj95znxzhs9jrfm7jixyb"
+   "commit": "f8075bd8eac7288eea1060077ca103d5fd01fb65",
+   "sha256": "0vmf9l3cc5i0kqyqdvbhd4sndla2j57rvy551rib5knhqx1ry0sd"
   },
   "stable": {
    "version": [
@@ -79654,23 +79861,24 @@
     "org-edna",
     "transient"
    ],
-   "commit": "4e0fcf9a440e463d395f8f37efe8f1e691ed07dc",
-   "sha256": "0672pcklp743k8fz39hwf1zxb7f1sywdjsm8d8ha8r6h2rjbyl6k"
+   "commit": "66918121e8daf8e0b355b12717dc898150f0f2e1",
+   "sha256": "128r3nfhx7pqfhfjymny7idrnid7g9xc3rjmxa71r80bj936j86b"
   },
   "stable": {
    "version": [
-    1,
-    1,
-    1
+    2,
+    0,
+    0
    ],
    "deps": [
     "f",
     "org",
     "org-agenda-property",
-    "org-edna"
+    "org-edna",
+    "transient"
    ],
-   "commit": "13f04f46ed027cd119f21377b050288a96b344cf",
-   "sha256": "15my09gz094z0ihrakxa1x0zcb073s85azwmp891iv62qjhgl5x6"
+   "commit": "4e0fcf9a440e463d395f8f37efe8f1e691ed07dc",
+   "sha256": "0672pcklp743k8fz39hwf1zxb7f1sywdjsm8d8ha8r6h2rjbyl6k"
   }
  },
  {
@@ -79956,8 +80164,8 @@
  },
  {
   "ename": "org-kanban",
-  "commit": "a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1",
-  "sha256": "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1gfkmqrhhbbwg4q6h56nrjknh9m0fzd3svm7y0l6wlfh5bg6hqjr",
   "fetcher": "github",
   "repo": "gizmomogwai/org-kanban",
   "unstable": {
@@ -80036,14 +80244,14 @@
   "url": "https://repo.or.cz/org-link-beautify.git",
   "unstable": {
    "version": [
-    20220503,
-    458
+    20220605,
+    239
    ],
    "deps": [
     "all-the-icons"
    ],
-   "commit": "b20e296b497360de12d5d973aa273cab70c77126",
-   "sha256": "17vcrz99759sh75swd94w1pajq5kknj7bgw5n12frwgfjlq6hi3s"
+   "commit": "47d54dd736abc9ef5406e3e7394d54c5110d355d",
+   "sha256": "0g3j3xnyk1fxs3m7c3vsb7ai7cxjj6iv3qji19a50rjcc7l6s4ja"
   }
  },
  {
@@ -80120,8 +80328,8 @@
    "deps": [
     "seq"
    ],
-   "commit": "075e0e6d36eb50406a608bc8a2f0dd359ec63938",
-   "sha256": "133smvw9iaxg0p3y5wl0rc4fwwgbxgw6hxngpmar8qf4grwy4w27"
+   "commit": "d2f4b9e8f1c7c9b495f71deeaa77e4f6f47bc7bf",
+   "sha256": "1p9mz0fz6s63wy7zh4r1ifa7kcycymlcgmqjbpgv85m2783ab0l6"
   }
  },
  {
@@ -80165,20 +80373,20 @@
   "repo": "org-mime/org-mime",
   "unstable": {
    "version": [
-    20220204,
-    42
+    20220521,
+    1422
    ],
-   "commit": "98504d043c8421ac390b7358b146733c7c0b4479",
-   "sha256": "0n0bm9xddlgvlrmc2yjkdyvag7690yphdkcjx4w3cb04xlcac9ns"
+   "commit": "cf96f585c68ad14751a3f73d937cbfcb890171b9",
+   "sha256": "17380kpf08j5ai30nn5iks0k3x8sm3kmz8lkyr1v0qvpr5a8s70b"
   },
   "stable": {
    "version": [
     0,
-    2,
-    6
+    3,
+    1
    ],
-   "commit": "a7bf07316f93015e4f853ea0fc5b8d05b4a7695d",
-   "sha256": "01f04xpqkgja34a0z4smh2kxzn3lvx2391fnbfxmq92pxqp3gk0j"
+   "commit": "cf96f585c68ad14751a3f73d937cbfcb890171b9",
+   "sha256": "17380kpf08j5ai30nn5iks0k3x8sm3kmz8lkyr1v0qvpr5a8s70b"
   }
  },
  {
@@ -80208,21 +80416,21 @@
   "repo": "ndwarshuis/org-ml",
   "unstable": {
    "version": [
-    20211231,
-    700
+    20220601,
+    1412
    ],
    "deps": [
     "dash",
     "org",
     "s"
    ],
-   "commit": "3974435bbf72722801f7ed78855381d77a773162",
-   "sha256": "0zdvz8lzrf7dj6giryy98wkxrrcawigvhab3prxwhjrkp8n9wvbv"
+   "commit": "f191ebfee6dcf6a05b5d1db43cf75f4a20faa8b4",
+   "sha256": "1vcdbpq746xa5a3rlq9vj4r42ygmws0wg7r7q4zylkvx9gv0c3n5"
   },
   "stable": {
    "version": [
     5,
-    7,
+    8,
     1
    ],
    "deps": [
@@ -80230,8 +80438,8 @@
     "org",
     "s"
    ],
-   "commit": "0a96482452fc60170e3f5b8cf3a259b2b09c9ef5",
-   "sha256": "1ca6wgjwslv3582fmsxna81mgryziw9v9zh1836sbp3yszqddday"
+   "commit": "7b0022b3a751bb4396b07f47546c66ddcd5be922",
+   "sha256": "1vcdbpq746xa5a3rlq9vj4r42ygmws0wg7r7q4zylkvx9gv0c3n5"
   }
  },
  {
@@ -80260,11 +80468,11 @@
   "repo": "minad/org-modern",
   "unstable": {
    "version": [
-    20220422,
-    940
+    20220605,
+    2206
    ],
-   "commit": "ff1046705b3950b7a49da50bc34c11da86c6226d",
-   "sha256": "0zg2bi6jprigvqy4zglb8f8357sxikcfx0b8vjbwcjl08iimxp6j"
+   "commit": "b352680d9ee8c6e6966cc21d595513c3595e3bb7",
+   "sha256": "1mc1m6x9bj92lfsbrxnasp78sc501mjiad4jrb5m1j42j0d1cs83"
   },
   "stable": {
    "version": [
@@ -80498,8 +80706,8 @@
  },
  {
   "ename": "org-octopress",
-  "commit": "fba6c3c645ba903f636814b5a2bb1baca0b5283b",
-  "sha256": "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw",
+  "commit": "4d846f217178edce928aa586147c3cd71312eb2a",
+  "sha256": "1qwmm2c226m1g8hwkj2f5yxczg8d1wvya0b1gadgcbwrxlcrjm8s",
   "fetcher": "github",
   "repo": "yoshinari-nomura/org-octopress",
   "unstable": {
@@ -80894,8 +81102,8 @@
   "repo": "alphapapa/org-ql",
   "unstable": {
    "version": [
-    20220318,
-    1534
+    20220602,
+    1651
    ],
    "deps": [
     "dash",
@@ -80909,14 +81117,14 @@
     "transient",
     "ts"
    ],
-   "commit": "46f523d94a376b168176c75bbd0e3e0d00e61170",
-   "sha256": "0vrk7lx4n4imvsnqv50w6fmqnndr48x89gcmm375fw6zgy2m90bl"
+   "commit": "64a9234733904af20fd495861792f1d5c2b37190",
+   "sha256": "1w3vly4jh854gb9bgnwqfzry6214v498fmiwm491gi8m5g0d05xp"
   },
   "stable": {
    "version": [
     0,
     6,
-    1
+    2
    ],
    "deps": [
     "dash",
@@ -80930,8 +81138,8 @@
     "transient",
     "ts"
    ],
-   "commit": "f666fe150f1bf3c3ce43d0e15f90b20d43c2e772",
-   "sha256": "1mpq3v8lxqllnb4afqh7p9av0p9bha8ld7741zaw4hxb1252xgm2"
+   "commit": "115500c8a0a3190ec6a69d1120fe81944d819125",
+   "sha256": "0iamqv5j43ngj1xdqr36rkgk9lqpk9bg8y531jsldnvwzrp3srpf"
   }
  },
  {
@@ -80954,8 +81162,8 @@
  },
  {
   "ename": "org-random-todo",
-  "commit": "80fad6244ea3e5bdf7f448c9f62374fae45bae78",
-  "sha256": "0yflppdbkfn2phd21zkjdlidzasfm846mzniay83v3akz0qx31lr",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1abhpazwr7gp9bvl83zdg2nvw51mg70myqi18l3hzic033pbhxwz",
   "fetcher": "github",
   "repo": "unhammer/org-random-todo",
   "unstable": {
@@ -81010,28 +81218,28 @@
   "repo": "oer/org-re-reveal",
   "unstable": {
    "version": [
-    20220402,
-    1456
+    20220523,
+    1744
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "c787ebf93d51b63b8726df241e3e2fcda35d4ae1",
-   "sha256": "02y6qm4va43c25i7b0q3pvk888war64rrb2p9bmv5p8176dy1mjw"
+   "commit": "93ba4e91f1d007669d39fc76c097ff5d6a64489e",
+   "sha256": "0qwlyikci53z1qc33nsg19fazg5p1jrjsjc481afyjf364ds2j1i"
   },
   "stable": {
    "version": [
     3,
-    13,
+    14,
     0
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "c787ebf93d51b63b8726df241e3e2fcda35d4ae1",
-   "sha256": "02y6qm4va43c25i7b0q3pvk888war64rrb2p9bmv5p8176dy1mjw"
+   "commit": "ac67832e7b342326deef650db6601b95127627bc",
+   "sha256": "1kcr1zpafgaykbkxfav4iia6fbglpjv4kvj5yjn8wcm1liiaj6ck"
   }
  },
  {
@@ -81186,8 +81394,8 @@
   "repo": "jkitchin/org-ref",
   "unstable": {
    "version": [
-    20220509,
-    1414
+    20220601,
+    2032
    ],
    "deps": [
     "avy",
@@ -81198,11 +81406,12 @@
     "htmlize",
     "hydra",
     "org",
+    "ox-pandoc",
     "parsebib",
     "s"
    ],
-   "commit": "0d2355d1eb4dcac1095a03d885788a12fe566610",
-   "sha256": "019pbp02fnbb7rcr80cfyi7pa9b413lgdfmbwaak2icb5cpmj452"
+   "commit": "cbe9e870a5f488cdfc5e6a3b5478845ea8acdcde",
+   "sha256": "05js4f3xnms8c06s63agmhfcwj6cjsp2z83pqmlwga8h74z7f5y7"
   },
   "stable": {
    "version": [
@@ -81278,28 +81487,29 @@
   "repo": "akirak/org-reverse-datetree",
   "unstable": {
    "version": [
-    20220310,
-    1646
+    20220521,
+    1755
    ],
    "deps": [
     "dash",
     "org"
    ],
-   "commit": "9ebd42b521e7adf26a35cbb17144113a83f73264",
-   "sha256": "0wjz26qmjwiz1594b4s9vycbbz7zhs52xpa0ksph92fcl21c5fp5"
+   "commit": "0b24765e270a2dfd84adf3a0f9afa8b72aabad30",
+   "sha256": "1z529iy3zm8szyr98kmi7m3rfpkx139xcpjz4vazk23zj93mpxrc"
   },
   "stable": {
    "version": [
     0,
     3,
-    10
+    11,
+    1
    ],
    "deps": [
     "dash",
     "org"
    ],
-   "commit": "c42078f8601b7f600135f66e75246a53c5f9975f",
-   "sha256": "1afmv6ncjbm6dalgz459lhh0rif8rlag23n05jwdv7izibwb1dm2"
+   "commit": "0b24765e270a2dfd84adf3a0f9afa8b72aabad30",
+   "sha256": "1z529iy3zm8szyr98kmi7m3rfpkx139xcpjz4vazk23zj93mpxrc"
   }
  },
  {
@@ -81349,8 +81559,8 @@
   "repo": "org-roam/org-roam",
   "unstable": {
    "version": [
-    20220512,
-    1634
+    20220608,
+    1621
    ],
    "deps": [
     "dash",
@@ -81359,8 +81569,8 @@
     "magit-section",
     "org"
    ],
-   "commit": "2657f0b444194e1de6957f9cfc112383980d62f9",
-   "sha256": "1x1222nvy5fq2cyz8ds271xq03bcyn4252vxzdch9gai3n0vg00b"
+   "commit": "fcefc1b1b4027185dc35cc1fe16c268ae65bc076",
+   "sha256": "0brfmiz97sg7wz7pi148xw422jcmvcfk60rb9nfvw71xdnncqaj0"
   },
   "stable": {
    "version": [
@@ -82004,15 +82214,15 @@
   "url": "https://repo.or.cz/org-tag-beautify.git",
   "unstable": {
    "version": [
-    20220427,
-    1552
+    20220602,
+    940
    ],
    "deps": [
     "all-the-icons",
     "org-pretty-tags"
    ],
-   "commit": "88fde267441118836a5c4ed28bb5958fca37a800",
-   "sha256": "1f7acxpc133abqzhc667syd7dkazarazndwl1dg8clcms4v6xaqq"
+   "commit": "481f44aa4067b287e0c724c6d5e1185c62d1560c",
+   "sha256": "016p3fjdd5vpri7bg2yfmk3ldkng7jp65fb0fv9i89kmzkkcq4az"
   }
  },
  {
@@ -82385,8 +82595,8 @@
     20220220,
     1757
    ],
-   "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86",
-   "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri"
+   "commit": "4359c640c7822a23976e9a5ca4ce63452d796912",
+   "sha256": "176qjbhvdg1bqy45qk6zf5ij12qif6xkd3ppd1a5wg67p2rv21z8"
   }
  },
  {
@@ -82824,8 +83034,8 @@
     "ht",
     "s"
    ],
-   "commit": "6fe53900ead434f3e18e63e9d22a8fa8380ccb37",
-   "sha256": "0h33ih533dirghhpjlyzm3k8iss007f9npk2fpbc75z3q4ws67wp"
+   "commit": "f9347e8d1f7cf770c7a2bc594ccf3f3c730f9b81",
+   "sha256": "0k27dy8r1g6ikd61n8vv4dv4la4rpl88a05x4fg8702573vqq1cx"
   },
   "stable": {
    "version": [
@@ -83028,8 +83238,8 @@
     20211126,
     2201
    ],
-   "commit": "bc981b957967be8d872c08be9ba7f2dbde5caf1d",
-   "sha256": "1gn9bs5fxrshyyi7wqm30p2d4izjdrspvh5cx8fs803mxl593wim"
+   "commit": "e54b5cc7f95ded5dc39f60fbf6d72f64f469da58",
+   "sha256": "1i0h9f45jzw3m341pp242ihcqf7jvzddxidnn1qv971fpvibjvxx"
   },
   "stable": {
    "version": [
@@ -83169,14 +83379,14 @@
   "repo": "vyorkin/ormolu.el",
   "unstable": {
    "version": [
-    20211020,
-    2229
+    20220530,
+    921
    ],
    "deps": [
     "reformatter"
    ],
-   "commit": "1941a8ce48027b5670d226bacc2fa10b00774b3a",
-   "sha256": "1bs6c6059g585dwsd4ldl49v38l6jlr54z9rj9qhc1a1gg6pzb3b"
+   "commit": "a6b1d3f8838d067ac5352fb0673c3c3dae7abd73",
+   "sha256": "098az157nsgwdxl8pbvznha1lvh2mpilm7m90p9v6pwdfvmcjb3x"
   }
  },
  {
@@ -83244,19 +83454,19 @@
   "repo": "minad/osm",
   "unstable": {
    "version": [
-    20220511,
-    1756
+    20220513,
+    1002
    ],
-   "commit": "471f21f0f8bffc078d5ccfd86610a83e5269c2a0",
-   "sha256": "1w8xc4g2fgg9l0yibqc0190afgk71z697ni4yx1v1z1vy46s76c4"
+   "commit": "563d9646b1f8df37cefcec5d51d20249eba407da",
+   "sha256": "039ac364f00slx1dxxgsgfcr4x47v9ymn8arcs0fyhdhw7jnky5j"
   },
   "stable": {
    "version": [
     0,
-    7
+    8
    ],
-   "commit": "e3ea969ce1bf84343f357efa2de97e1dd857f481",
-   "sha256": "0d037512llpny669m6mhvwhnm90g6ysgjqdx45gqxfwdc65s4a46"
+   "commit": "563d9646b1f8df37cefcec5d51d20249eba407da",
+   "sha256": "039ac364f00slx1dxxgsgfcr4x47v9ymn8arcs0fyhdhw7jnky5j"
   }
  },
  {
@@ -83992,14 +84202,14 @@
   "url": "https://git.sr.ht/~jakob/ox-haunt",
   "unstable": {
    "version": [
-    20200202,
-    229
+    20220602,
+    143
    ],
    "deps": [
     "org"
    ],
-   "commit": "f3c8fda6fee78f45a259e5d218a519dfd11c00c7",
-   "sha256": "1rs1n228c2fmpvirc57bqgf2616ijpphkgf4w9ln5j46snmkam25"
+   "commit": "4d585c51d5701b4d43c02db78c7032658cae47fd",
+   "sha256": "19pwg5qds5xmrv3yxkmhd3ibln3spcldwkmfwixkaq20an9z2d6k"
   },
   "stable": {
    "version": [
@@ -84039,27 +84249,26 @@
   "repo": "kaushalmodi/ox-hugo",
   "unstable": {
    "version": [
-    20220512,
-    1805
+    20220531,
+    2158
    ],
    "deps": [
     "tomelr"
    ],
-   "commit": "cab606a2098524ea7ac97704cc8df6d2d9d190f8",
-   "sha256": "13gfchjdhalijbf5d4xmz1zvl904syl4lm07ssrqck4h66y4nr9y"
+   "commit": "df0b12ef1aff2b322403f24006f0ec17676d3606",
+   "sha256": "0xxj133j2l0002yp4hm4k01klrcvpbzxp6f75rhyvijny0ggmnw4"
   },
   "stable": {
    "version": [
     0,
-    11,
+    12,
     1
    ],
    "deps": [
-    "org",
     "tomelr"
    ],
-   "commit": "4fc594eda0d0cb41cc3b634b43fbd055db7ae67e",
-   "sha256": "1qrxy32g8brmc3psfg458ca6r91wqq55bgmsk76w6zm8cgrvsnyc"
+   "commit": "3c8c0bf28cf02128ceff9a972db3ebad01083953",
+   "sha256": "0q4gyjzvxzw6a0phw2x2v9n43i28n3g9m7szwbhzch4j6ggxzcw4"
   }
  },
  {
@@ -84400,14 +84609,14 @@
   "repo": "yjwen/org-reveal",
   "unstable": {
    "version": [
-    20220410,
-    1533
+    20220524,
+    1144
    ],
    "deps": [
     "org"
    ],
-   "commit": "862b41df7734f57019543f6bd82ff7dad7183358",
-   "sha256": "1009w8bp2rkqjvks97xlzbprrb1fxhcdb9fzx08ak229glvwav08"
+   "commit": "43ebe238ef747985b336880305ae5065da67235c",
+   "sha256": "1j7bz4g6dd5zcsdj24ry71i5sadldcza2ib7k4yayz6xi5qv3gl5"
   }
  },
  {
@@ -84448,14 +84657,14 @@
   "repo": "choppsv1/org-rfc-export",
   "unstable": {
    "version": [
-    20220206,
-    1046
+    20220604,
+    1114
    ],
    "deps": [
     "org"
    ],
-   "commit": "0849028a2e4a274bfb0fc85d9538203ddf72a9e8",
-   "sha256": "1syzqc1lhnpkrzzd2hwxmaqr31dn44gcqwy5db44y8fr6nkrj6n0"
+   "commit": "f0fe3503f8732ea5e95a4016c6b7ce5b47cf6295",
+   "sha256": "0a1gp9s92m7scxdf2sc4dqh6ixyv1x7cf190z5d2lz8yz3aw9hkw"
   }
  },
  {
@@ -84876,28 +85085,25 @@
   "repo": "melpa/package-build",
   "unstable": {
    "version": [
-    20220510,
-    2024
+    20220530,
+    1027
    ],
-   "commit": "899bb08963c21028a02894426a9d86f768fe06d8",
-   "sha256": "1zw68gg8ai5921kly35fnxapnxqzdqx8ll7w8bdxpv8f06vq24xj"
+   "commit": "6bbe65de495110970c2c33497ca640a0774e41b3",
+   "sha256": "0g6x0p6dbz7zk4xrh5n3367zhv026h3a9hbb8jf2f0qw95685cbr"
   },
   "stable": {
    "version": [
     3,
-    0
-   ],
-   "deps": [
-    "cl-lib"
+    1
    ],
-   "commit": "032e9bd086029b2fdff09c3c2e606e29682e1fb1",
-   "sha256": "0jjb1gl6qqkrvf4v03fp9sv69xc6qh3lc65blms46zkx64995c6r"
+   "commit": "1604b3a5f0040c6f487d38561388abab2f3d54c5",
+   "sha256": "1gkqav0ipfk5gsklxrbggqrbphr12qg1qr6dpdi4f0hs0i11fr23"
   }
  },
  {
   "ename": "package-filter",
-  "commit": "89312eaf69f3d7ac46647255c847fcb45415e78d",
-  "sha256": "0am73zch2fy1hfjwzk8kg0j3lgbcz3hzxjrdf0j0a9w0myp0mmjm",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0l1hq3a7bx1mp17g9lii4b7m31b1n328b8r6rqv5g2ab1d2cs0ks",
   "fetcher": "github",
   "repo": "milkypostman/package-filter",
   "unstable": {
@@ -84917,15 +85123,15 @@
   "repo": "purcell/package-lint",
   "unstable": {
    "version": [
-    20220412,
-    1648
+    20220607,
+    738
    ],
    "deps": [
     "cl-lib",
     "let-alist"
    ],
-   "commit": "80a9d9815ab2919c992ad29ae4846443dec43a35",
-   "sha256": "0sfxpw19vi7hsr3j86wbwxfi02020z38qg1w72j8k6mm0m9m21yi"
+   "commit": "70529b2ecba5f3a037be8b2c6ecbca769c64b00e",
+   "sha256": "1s26jbxlpqd9p1ahmxga6m28d142l1lnv315bkzsf642kk57446k"
   },
   "stable": {
    "version": [
@@ -84954,8 +85160,8 @@
    "deps": [
     "package-lint"
    ],
-   "commit": "80a9d9815ab2919c992ad29ae4846443dec43a35",
-   "sha256": "0sfxpw19vi7hsr3j86wbwxfi02020z38qg1w72j8k6mm0m9m21yi"
+   "commit": "70529b2ecba5f3a037be8b2c6ecbca769c64b00e",
+   "sha256": "1s26jbxlpqd9p1ahmxga6m28d142l1lnv315bkzsf642kk57446k"
   },
   "stable": {
    "version": [
@@ -85046,8 +85252,8 @@
  },
  {
   "ename": "packed",
-  "commit": "57a2fb9524df3fdfdc54c403112e12bd70888b23",
-  "sha256": "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "19bqa1j2g453gk9h0k4pvi1mgpyx9f9rh7ang28sq13hzd9c8mjb",
   "fetcher": "github",
   "repo": "emacscollective/packed",
   "unstable": {
@@ -85389,27 +85595,27 @@
   "repo": "joostkremers/pandoc-mode",
   "unstable": {
    "version": [
-    20211208,
-    2229
+    20220519,
+    2008
    ],
    "deps": [
     "dash",
     "hydra"
    ],
-   "commit": "c1429887287b7ee9601196e26f97c908b6e4f5c0",
-   "sha256": "1zw92bkp5mjzc78vrvsaj3ycqn0j5mqzxxxv2nkb891spgandpvy"
+   "commit": "2a4e726a29d38e7c2379787cad619e5392ad2da0",
+   "sha256": "1yn9mdlxcv9d33nvgy3wp09qhynb2m50cyhsv1xf77wyzlwdlb2p"
   },
   "stable": {
    "version": [
     2,
-    31
+    32
    ],
    "deps": [
     "dash",
     "hydra"
    ],
-   "commit": "500e80666fb779457be8771c5613c177187ba0cc",
-   "sha256": "1c3gay9fkikg7h46djw1nf86fzckmv7w1zbz5fbar20klcr12pbm"
+   "commit": "2a4e726a29d38e7c2379787cad619e5392ad2da0",
+   "sha256": "1yn9mdlxcv9d33nvgy3wp09qhynb2m50cyhsv1xf77wyzlwdlb2p"
   }
  },
  {
@@ -85446,8 +85652,8 @@
     20200510,
     5
    ],
-   "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86",
-   "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri"
+   "commit": "4359c640c7822a23976e9a5ca4ce63452d796912",
+   "sha256": "176qjbhvdg1bqy45qk6zf5ij12qif6xkd3ppd1a5wg67p2rv21z8"
   }
  },
  {
@@ -85520,8 +85726,8 @@
    "deps": [
     "autothemer"
    ],
-   "commit": "95e8248edbdb01fedc7db4472bcce90d2d872106",
-   "sha256": "13rcajw03sbddks5wgzznvrz7ibd7m0jx8mcw1amfk97ghs57h7s"
+   "commit": "f6738f8e6075cb6b275210d7e978b1420ee9a056",
+   "sha256": "0f6vphpxvky4x6fnwyp1gx56awsvhdmazf1p6qg191inn3h5wygj"
   },
   "stable": {
    "version": [
@@ -85538,8 +85744,8 @@
  },
  {
   "ename": "paredit",
-  "commit": "caaa21f235c4864f6008fb454d0a970a2fd22a86",
-  "sha256": "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0mpay7xqb4910nlp0gmdj8q2zkinq77zh5b9lcg6ah2d9vzxzc9s",
   "fetcher": "git",
   "url": "https://mumble.net/~campbell/git/paredit.git",
   "unstable": {
@@ -85747,8 +85953,8 @@
    "deps": [
     "s"
    ],
-   "commit": "c2bdc5ee1d1f029886245f9a5c409e47c1db2cb8",
-   "sha256": "050b932qa0ll66pa68i8bbjdmi8bgdvklqm65cvm5ssc5hcwjq3k"
+   "commit": "079da5e65a5ded0b5ebe7cfe799eac668d7323db",
+   "sha256": "1w00ifh8qa12f9b38acv47c9cb3vnzpyk72p5qf6jf4pjc2izx9c"
   },
   "stable": {
    "version": [
@@ -85848,15 +86054,15 @@
   "repo": "clojure-emacs/parseedn",
   "unstable": {
    "version": [
-    20220512,
-    1328
+    20220520,
+    835
    ],
    "deps": [
     "map",
     "parseclj"
    ],
-   "commit": "35e9f3173a6cca60b6851dddace470b29654ac77",
-   "sha256": "06in2r87rn398bnqfc7bmpfvfbvrx9ybqs8r5yzy5y84f9gbfnm4"
+   "commit": "a09686fbb9113b8b1b4f20c9e1dc0d6fea01a64f",
+   "sha256": "0wjzzjwz92rk5nx1km1fw46lgspqahj93p5mfyrxwcw27cb8z1av"
   },
   "stable": {
    "version": [
@@ -85922,8 +86128,8 @@
  },
  {
   "ename": "passmm",
-  "commit": "8ae2a1e10375f9cd55d19502c9740b2737eba209",
-  "sha256": "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "17rd9pgi9p9w9m9grpnhn1d4mrx3bfrzl04z37mf4gd8qzzzqvqs",
   "fetcher": "github",
   "repo": "pjones/passmm",
   "unstable": {
@@ -86237,8 +86443,8 @@
  },
  {
   "ename": "paxedit",
-  "commit": "106b272c2f0741d21d31a0ddfa4f521c575559c1",
-  "sha256": "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "08mf53y7ipiqw8p21y6fly0qh3fqgmcwl8r95m1a2lqh3wg5xi9j",
   "fetcher": "github",
   "repo": "promethial/paxedit",
   "unstable": {
@@ -86441,8 +86647,8 @@
  },
  {
   "ename": "pcre2el",
-  "commit": "f04a25e467cc4c7d9a263330a7a1a53d67c6eb9b",
-  "sha256": "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1ri005gw9i93l8flvvgcmk0ww3b6lvnpwpls7k69cm0pbxhyvm40",
   "fetcher": "github",
   "repo": "joddie/pcre2el",
   "unstable": {
@@ -86470,8 +86676,8 @@
  },
  {
   "ename": "pcsv",
-  "commit": "80ffaf99b2a4566a3f9d0309cd7b63f563f3826e",
-  "sha256": "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1z6if6cpj2kz2d975f5ar10yaqvys1cspzbak2sza3858vf9wph5",
   "fetcher": "github",
   "repo": "mhayashi1120/Emacs-pcsv",
   "unstable": {
@@ -86524,22 +86730,22 @@
  },
  {
   "ename": "pdf-tools",
-  "commit": "10a057a573123c7093159e662fafdc97c2dd4a02",
-  "sha256": "1x0yd86r3iybpiq7ypln1fy0cl55wznkcgvqszzqjdrnlpqs0abc",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "1632b6qr7mpj655vs3ylkfzcm2yx1bi2v2lb1w3wqfjickmy0p2v",
   "fetcher": "github",
   "repo": "vedang/pdf-tools",
   "unstable": {
    "version": [
-    20220512,
-    145
+    20220522,
+    13
    ],
    "deps": [
     "let-alist",
     "nadvice",
     "tablist"
    ],
-   "commit": "fedd930a09a497c03df3ce5204ccbd80da724662",
-   "sha256": "13yl83ld5z1asjqrsfdzyhnz4nrrr064lwbsgfvk3mmlqpas7b08"
+   "commit": "f9ccdf99e560bae70d3a13325cec9dc0e3cc45b0",
+   "sha256": "19hj0hbg3rssw9xjia1g0nmknmvcrxhgb3p0y5vy8nlk0d2h5v4z"
   },
   "stable": {
    "version": [
@@ -86846,11 +87052,11 @@
   "repo": "Bad-ptr/persp-mode.el",
   "unstable": {
    "version": [
-    20220206,
-    1742
+    20220507,
+    32
    ],
-   "commit": "7a594a3d8f1c4ba9234dcd831a589e87f3f4ae86",
-   "sha256": "0ckcnqg2fn4m5zp06jlw5cj81clizrm8cxjiwz5rd4d9m9lwdrgd"
+   "commit": "d0f8eb099e852b6073d4ec06d32587c60a7dce3f",
+   "sha256": "02518lq9wma0hsm96lws7fg2bdjsp52jg2rj33iczsj515w5mdgl"
   },
   "stable": {
    "version": [
@@ -86942,14 +87148,14 @@
   "repo": "nex3/perspective-el",
   "unstable": {
    "version": [
-    20220420,
-    1550
+    20220521,
+    2138
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "4e38680793585a907ae46b148697030c2b552a00",
-   "sha256": "0jgd2vzfza3pnnksh1kss5mqhbirqn93lvzanhgjr4vb4fv8x13f"
+   "commit": "794afdbc5188ef6f2d78d26302cd78903ce618fa",
+   "sha256": "1adn4knbhsygsy67q6w86qbhqx2gg6rw5hcnan7x40wq8fi7hr0p"
   },
   "stable": {
    "version": [
@@ -87034,8 +87240,8 @@
     20200321,
     504
    ],
-   "commit": "43447a2c70f98edd1139005e32f437d3f142442b",
-   "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a"
+   "commit": "af677327f185113442e95b00986097b30cab650c",
+   "sha256": "01wy3v1aj2891wgbr7rwpaw9xavfrqbyiqiv01q6jjdvc5vl0rwi"
   },
   "stable": {
    "version": [
@@ -87216,8 +87422,8 @@
  },
  {
   "ename": "phi-rectangle",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "111fqqa7h5cajq92sbiqhavm25l5bcapxhfh38y7irq4mv08xifw",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "133d0iphybwg7gpbv257vdxamm5d6yk96qv2fgq1cxw0b778ylx0",
   "fetcher": "github",
   "repo": "zk-phi/phi-rectangle",
   "unstable": {
@@ -87392,26 +87598,26 @@
   "repo": "OVYA/php-cs-fixer",
   "unstable": {
    "version": [
-    20220510,
-    1407
+    20220516,
+    1008
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "225ca7127052e2b3d660495d04319e817ec302ab",
-   "sha256": "1zwl6hpw0ka4pdsk9i67dbv42idb0nhi5i3yajy1wzdihj7hqg3y"
+   "commit": "efe4368d891f1eec6311363cfd6be3e9eadb5e0a",
+   "sha256": "1j0ivk4d8xd2r9ssdn9y4xl3lr2isg4sks5va7wjvk6h7jnf81bj"
   },
   "stable": {
    "version": [
-    1,
+    2,
     0,
-    2
+    0
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "ac2d64c4b672a01744d14cc8ad80e9c9ff55c63c",
-   "sha256": "1jyjqwv4haibv526bwpvyyszs7ga9lmsjhn47hyk3ddffrr84c0y"
+   "commit": "efe4368d891f1eec6311363cfd6be3e9eadb5e0a",
+   "sha256": "1j0ivk4d8xd2r9ssdn9y4xl3lr2isg4sks5va7wjvk6h7jnf81bj"
   }
  },
  {
@@ -87431,17 +87637,17 @@
  },
  {
   "ename": "php-mode",
-  "commit": "5593a586ce7579fd3a136e2416b89721157f98e1",
-  "sha256": "1xa9dmjinm6qm4cbzqanw5njmif71sg3jxnvgvi17jj9j3125d9f",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "097bznn3k1z68mxdmp8zm4cn590sl9qgc1g7dm3abcli77xy4436",
   "fetcher": "github",
   "repo": "emacs-php/php-mode",
   "unstable": {
    "version": [
-    20220120,
-    1959
+    20220606,
+    1831
    ],
-   "commit": "4503672471b8fdaaea6c454344817a119c87fcc6",
-   "sha256": "0fxmqhpw0i54davcg9h8gxf8zxix02g2wnxxly6m0p5g785yng2h"
+   "commit": "81717a56b74d7ab76a1126eb4f45167d5eb61c32",
+   "sha256": "1bnn1lwsqd9rlx1qjrl4h2v6j29cnhagd4ay82psq309yvr4av5x"
   },
   "stable": {
    "version": [
@@ -88034,15 +88240,16 @@
   "repo": "pwalsh/pipenv.el",
   "unstable": {
    "version": [
-    20210127,
-    1444
+    20220514,
+    123
    ],
    "deps": [
+    "load-env-vars",
     "pyvenv",
     "s"
    ],
-   "commit": "8f50c68d415307a2cbc65cc4df20df18e1776e9b",
-   "sha256": "0l81vbwp7gmcg1n7i8cwa01rpwc24db7gxqvmhln8piy1r2ymh6x"
+   "commit": "3af159749824c03f59176aff7f66ddd6a5785a10",
+   "sha256": "1ak9dvjqhdm12i7yamgbqjmc4zmvy2f0gd1nia1q9dy3n6576ryq"
   }
  },
  {
@@ -88153,8 +88360,8 @@
  },
  {
   "ename": "pkgbuild-mode",
-  "commit": "ca7bf43ef8893bf04e9658390e306ef69e80a156",
-  "sha256": "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0hsm4qqh555fkbd34mi0cah5j69rcsxfglj9lr927bv828663mrb",
   "fetcher": "github",
   "repo": "juergenhoetzel/pkgbuild-mode",
   "unstable": {
@@ -89506,8 +89713,8 @@
  },
  {
   "ename": "popup",
-  "commit": "083fb071191bccd6feb3fb84569373a597440fb1",
-  "sha256": "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "009446in223b8391n1mq3fn8gdvwlp3x7lc32mhzcsnyijhvc73y",
   "fetcher": "github",
   "repo": "auto-complete/popup-el",
   "unstable": {
@@ -89515,8 +89722,8 @@
     20211231,
     1823
    ],
-   "commit": "114d646f0f4dd49de19dfedd78630018f71470e5",
-   "sha256": "1hgia0d2j81mlkcl8bilznn4044qjjpy00cdd96zs7p2lbvaz3sb"
+   "commit": "976bd8e06100df5a266377d0e5f63b104ba93119",
+   "sha256": "0ssr7anniahn8l72gykc24c6yma4lkjwrxc3a8wvi6r7qkbdafxq"
   },
   "stable": {
    "version": [
@@ -89659,8 +89866,8 @@
     20210215,
     1849
    ],
-   "commit": "f90f3a09622993bf34704bb11c24984f6b1f10e2",
-   "sha256": "05gmc5wrj4pn1s1k4p6vvnl1z75bj4w163mpy8rybxdhsqhhf9a4"
+   "commit": "71a0ab27b13733df0fa37fd1a5fcba8799a35df9",
+   "sha256": "1c7h9xhi366alh4y7jycfb79ssrhnd61pa4pk9ncfwh3lspp2sf0"
   },
   "stable": {
    "version": [
@@ -89757,11 +89964,11 @@
   "repo": "tumashu/posframe",
   "unstable": {
    "version": [
-    20220124,
-    859
+    20220528,
+    27
    ],
-   "commit": "c91d4d53fa479ceb604071008ce0a901770eff57",
-   "sha256": "15h809mf8d8w8axbfzjs40j8yrh5ms88x4pmlx1qlcac8j6qrilf"
+   "commit": "0d23bc5f7cfac00277d83ae7ba52c48685bcbc68",
+   "sha256": "1p42kyh1l9m3h48fl4pq27rcz2dbhgk28qnrf5h1mmxjln1lbb2w"
   },
   "stable": {
    "version": [
@@ -90034,15 +90241,15 @@
   "repo": "LaurenceWarne/prefab.el",
   "unstable": {
    "version": [
-    20220403,
-    1026
+    20220605,
+    1310
    ],
    "deps": [
     "f",
     "transient"
    ],
-   "commit": "ffcf9c640c8c458a58b752ef2608e07a929a1104",
-   "sha256": "119gbadnzgxhrw5y5swyzkm5268wjpjnxfy21ybsxw8dj2rsvvzj"
+   "commit": "5ca61a420d8de5e3707a5c2f01153f4ab2ea3ec1",
+   "sha256": "16fhcry3a66acwnms7qshw4q1jzqqcqhl4g3yddhxramcgbp2x3f"
   },
   "stable": {
    "version": [
@@ -90081,19 +90288,20 @@
   "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20220509,
-    2300
+    20220601,
+    1652
    ],
-   "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484",
-   "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c"
+   "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e",
+   "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk"
   },
   "stable": {
    "version": [
     5,
-    2
+    2,
+    1
    ],
-   "commit": "3dbcef387502d309d130a518a18d48cd2f0e15b7",
-   "sha256": "024l7s0b6apbzanw3cnhjypxnxfinfb5b3nhaabrc138m5pis8j5"
+   "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e",
+   "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk"
   }
  },
  {
@@ -90149,28 +90357,29 @@
   "repo": "jscheid/prettier.el",
   "unstable": {
    "version": [
-    20211018,
-    955
+    20220603,
+    1338
    ],
    "deps": [
+    "editorconfig",
     "iter2",
     "nvm"
    ],
-   "commit": "485417c0677255249e944b1174225547e4c61c00",
-   "sha256": "17jh6xccqs4z2slj6c3hhdk29nv300d4lmvrgz9cn8cxrk157vcy"
+   "commit": "3fcf3ba3507f47b8ac1392e7901aa2c418147758",
+   "sha256": "0sg6ibcwfgnwgfg760v8wnijz79n86f61b7rlgizvgi8v7ky88f6"
   },
   "stable": {
    "version": [
     1,
-    1,
+    3,
     0
    ],
    "deps": [
     "iter2",
     "nvm"
    ],
-   "commit": "8b38172bb6644b71b718c0732e5b9f1cd32e587a",
-   "sha256": "0zkicnfj1y2zpwbwm4ccrpvzr5z6rpkk82mdzaszkx0sksd3hzxm"
+   "commit": "1c0a1bd97635090a611cf6cda3ba9146c84fa41d",
+   "sha256": "14plfh1hqjygcpp1ijkhzkpsshqfpzmn6c44bac6rk13072sg097"
   }
  },
  {
@@ -90559,16 +90768,16 @@
   "repo": "rejeep/prodigy.el",
   "unstable": {
    "version": [
-    20220507,
-    1753
+    20220523,
+    1728
    ],
    "deps": [
     "dash",
     "f",
     "s"
    ],
-   "commit": "535789e32028133fa9dfb4c9135b6a65c199472f",
-   "sha256": "0x68c7c40cafg4lbi1lwlli3bghnhcb21wm4idg6qr07y351fjqd"
+   "commit": "a3be00d3b90a77118c2d7d9f5a2f26151091fa07",
+   "sha256": "0pijzj4a8q6acm8rsrx92gam04vhz5xgc5jzzv5ykl6d4xx4zskk"
   },
   "stable": {
    "version": [
@@ -90671,8 +90880,8 @@
     20210715,
     1213
    ],
-   "commit": "d47f08f64cce595cbd4e9fbe3544986b3c4cee83",
-   "sha256": "0pp9f8kcgnsgz0mykss4jppnwvlfx7ny58y4pb1rm4l2xvs8y6yj"
+   "commit": "f0f8d70317fb6f505ec2762aa82962322b14a9f0",
+   "sha256": "07dxxr610dmjbx9mm9xyhpfg3piqmj5njxz2arrz47h49xsgl4b0"
   },
   "stable": {
    "version": [
@@ -90795,11 +91004,11 @@
   "repo": "buzztaiki/project-rootfile.el",
   "unstable": {
    "version": [
-    20220512,
-    443
+    20220516,
+    1419
    ],
-   "commit": "cb87657c4426e39aa2c481190e594c68fb0de8be",
-   "sha256": "07gb9b72gkwz748xwnsjayn68x5qn8b0ka8wmwvqgwgak14f1da3"
+   "commit": "65e46311dae24f3458e43c2490ad265c711aa624",
+   "sha256": "03x0mlndml6mm3jfpk95rnq2fhcdyr199pj9hmxjb1ny1j72lvdl"
   }
  },
  {
@@ -90837,17 +91046,17 @@
  },
  {
   "ename": "projectile",
-  "commit": "ca7bf43ef8893bf04e9658390e306ef69e80a156",
-  "sha256": "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0p592fq6gp4dzar30fiw6ks6i75kc9q1pm1agrx0qxwk84f4j76f",
   "fetcher": "github",
   "repo": "bbatsov/projectile",
   "unstable": {
    "version": [
-    20220430,
-    800
+    20220530,
+    615
    ],
-   "commit": "a4f86f981c84a546530d5904253fa266431ef806",
-   "sha256": "02303v7y79vdl4n2qga42892cqd5hdajwzp4vk3a4fxcyl8yhv8k"
+   "commit": "e60883ff370c1545499b97cf56479de1a58c5b3b",
+   "sha256": "08h4q3fghhc749pb8zak2z5p1sify01bkxhhv9iyrg0iiwl9bl6p"
   },
   "stable": {
    "version": [
@@ -90964,8 +91173,8 @@
     "projectile",
     "ripgrep"
    ],
-   "commit": "4ed5c741233a81d96115f556784269042070901e",
-   "sha256": "1bz9srlimpr5lzsjd02jq23h0vg2lnk921m24g0wsrdrccvmfxi2"
+   "commit": "872e250e8f93b8bb0a8a1de8bde17fd9bd116e31",
+   "sha256": "1n3jkj8a37ap4ndh9an5qm8dn8nxcgv9vqr8bcnxx5l0wnsvdg8z"
   },
   "stable": {
    "version": [
@@ -91249,11 +91458,11 @@
   "repo": "ProofGeneral/PG",
   "unstable": {
    "version": [
-    20220329,
-    655
+    20220525,
+    1052
    ],
-   "commit": "2a8701209b273db5a35f15145ec62f32799e03b1",
-   "sha256": "05l65cwyw2pdyv6rn14h0axplgnlm5z7v90iwcxk9vysz74icdd7"
+   "commit": "ac9ba11fda58800a1cec699fbda8811644847bbe",
+   "sha256": "03bn22byy8p80wjdpal2w1cq2jkxdnivdd6xdkfh3vl5mb5vwc68"
   }
  },
  {
@@ -91339,27 +91548,25 @@
  },
  {
   "ename": "protobuf-mode",
-  "commit": "b4e7f5f641251e17add561991d3bcf1fde23467b",
-  "sha256": "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj",
+  "commit": "5be08102d4de84c35b18cd1e3321fe8b6836ff56",
+  "sha256": "0ksrgr2ymac30qcwmjzrf1jfdkkfpy91irbyp87fjnipi4dfnp6h",
   "fetcher": "github",
-  "repo": "google/protobuf",
+  "repo": "protocolbuffers/protobuf",
   "unstable": {
    "version": [
     20220303,
     1716
    ],
-   "commit": "b3cbea18ea02ab82379ba5d014899035aad4b8f4",
-   "sha256": "0x60jy244xm1gkqvsidyj8xfqdfwpn0q8knr28n4giycwlzncgyr"
+   "commit": "c0fc2e881bc36aafb0bf539bf41889611370f60c",
+   "sha256": "108i14rd0wvj04kk6mqz577g142sqs33avbflc728mnkkp9wqmpy"
   },
   "stable": {
    "version": [
     21,
-    0,
-    -1,
     1
    ],
-   "commit": "3cede25cef0c2f5f5b60461b608d8c07a621ac04",
-   "sha256": "0q024rd5y8kd9pjslh118vhl3awr95gfvc6zxxr6i4qwqq1jy5nj"
+   "commit": "e73ed1630fdec85d7fb513c166629ed49cd4eb18",
+   "sha256": "0h2an911grs5kdvsf4cgypa4x022rgm81arxg42ks6sdzf8895x2"
   }
  },
  {
@@ -91533,29 +91740,28 @@
   "repo": "emacs-php/psysh.el",
   "unstable": {
    "version": [
-    20190709,
-    106
+    20220607,
+    1642
    ],
    "deps": [
-    "f",
     "php-runtime",
     "s"
    ],
-   "commit": "21250984ad8137aa3440ac12e52475ef03f19fcb",
-   "sha256": "1r0aiwdmj0y96faqvbz39wgxw91i9bj6rnwlj3a277pzlhzmyyxl"
+   "commit": "796b26a5cd75df9d2ecb206718b310ff21787063",
+   "sha256": "01j8dfgck3wlayh5spklfwvkzzckd0zwa4d5mrhpii2xsjy28r8a"
   },
   "stable": {
    "version": [
     0,
-    0,
-    5
+    1,
+    1
    ],
    "deps": [
-    "f",
+    "php-runtime",
     "s"
    ],
-   "commit": "4709a57cdcf7103c4a606be89849ea3ead2d38a5",
-   "sha256": "1apf6mnqp9bg5dfykgvsn02z0xpyx6k34sd2pvicicig7w09kzvb"
+   "commit": "796b26a5cd75df9d2ecb206718b310ff21787063",
+   "sha256": "01j8dfgck3wlayh5spklfwvkzzckd0zwa4d5mrhpii2xsjy28r8a"
   }
  },
  {
@@ -91761,11 +91967,11 @@
   "repo": "AmaiKinono/puni",
   "unstable": {
    "version": [
-    20220405,
-    1808
+    20220517,
+    1536
    ],
-   "commit": "bb9b1e271b51b3dfae984da15f0e40f5be5b2473",
-   "sha256": "1m581adq9pp6q22n2dfazzmnlyb375ggk4f0ihpccrwccf2kzdk3"
+   "commit": "a8f6e66be99051f34f0ab2704bdea04667d8b005",
+   "sha256": "0h6isykcwh7b1vxm5qikcfd3g6v0lv487q7gf5j9p6v5gs1f9yb9"
   }
  },
  {
@@ -91945,11 +92151,11 @@
   "url": "https://codeberg.org/ideasman42/emacs-py-autopep8.git",
   "unstable": {
    "version": [
-    20220502,
-    310
+    20220522,
+    1152
    ],
-   "commit": "89c9ed8de2deab6bb891ae25c85cc6498e60b90a",
-   "sha256": "0ygvl8zq8d6lbv8x6j6vklxhc6xrmii4fd9c74py1bjqvx4d1fjh"
+   "commit": "d904639f1fca12435e38adb6cc602cd468fa618b",
+   "sha256": "1sr64n1cg1pdxfa3n8ckq3hy92asnwi2b5nl88qy3jy1mybah4d2"
   },
   "stable": {
    "version": [
@@ -92126,11 +92332,11 @@
   "repo": "statmobile/pydoc",
   "unstable": {
    "version": [
-    20211119,
-    2211
+    20220531,
+    1457
    ],
-   "commit": "3aaffe41e1c5a9d53fbc1de02686c386fd002890",
-   "sha256": "1z6p1glspxr5vl9igzhginaws65iqs9h2ymi21f62x7ydm54i96y"
+   "commit": "c8b667e17bfe3e63221f822c5c4d58c8fb4fea90",
+   "sha256": "082ar5w28dknaa63mf587vdzr78xlnvh8lbxqq3hk6qa2c72akam"
   },
   "stable": {
    "version": [
@@ -92219,8 +92425,8 @@
   "repo": "dwcoates/pygn-mode",
   "unstable": {
    "version": [
-    20211021,
-    2325
+    20220531,
+    1422
    ],
    "deps": [
     "ivy",
@@ -92229,8 +92435,8 @@
     "tree-sitter-langs",
     "uci-mode"
    ],
-   "commit": "eb1da7e3eb5f5754b60d404b0e341206eebe19ca",
-   "sha256": "1nf5ihyppviwys3qay07v25f96jj5a2yr4qh1iygv2423y63q7gp"
+   "commit": "9a56e701cfcdf9024dda15175e0d0fc645446019",
+   "sha256": "1g24545512vr07773k7lcjf4ispwkf7y3y4nivgp66fqr1lqh34z"
   },
   "stable": {
    "version": [
@@ -92249,34 +92455,34 @@
  },
  {
   "ename": "pyim",
-  "commit": "151a0af91a58e27f724854d85d5dd9668229fe8d",
-  "sha256": "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1g730kh9hmc5g87n6661cbl65i7nzcmr15s975brdw3wv6nqzly2",
   "fetcher": "github",
   "repo": "tumashu/pyim",
   "unstable": {
    "version": [
-    20220512,
-    930
+    20220608,
+    343
    ],
    "deps": [
     "async",
     "xr"
    ],
-   "commit": "dcdae4db85646de85b1ca75e4604691cf9273273",
-   "sha256": "1432ph59plnh41xrmq59n9z987r41xf34qsxl3sbzfw6v8m927ys"
+   "commit": "21eb4d60d0af85099ddd820e4a367e662185beac",
+   "sha256": "1bj63c8hp05hah0cwsn4df3wjqfp556brqbhhr4n5sx57mfgr2xj"
   },
   "stable": {
    "version": [
     4,
     2,
-    0
+    1
    ],
    "deps": [
     "async",
     "xr"
    ],
-   "commit": "cd1bfd2bbc10fe0ac47d0ec383cde453f6019e6c",
-   "sha256": "0lvf50p97fns4pc6ilm4pqzp7s4srhcx2gyg6x5ywd5wv32nd04d"
+   "commit": "6b4cea1b541f5efd18067d4cafa1ca4b059a0c63",
+   "sha256": "1qcdf1v20sm99gbirjycppm3rnig1qvk8iiv50zmd6z38l48j7vh"
   }
  },
  {
@@ -92287,20 +92493,20 @@
   "repo": "tumashu/pyim-basedict",
   "unstable": {
    "version": [
-    20210517,
-    43
+    20220531,
+    555
    ],
-   "commit": "86f6de3e3a1523eb278bd3afe7c4ceba2a0e2972",
-   "sha256": "07jrp0n5cfhlfhjjfkiqrc3aadjx1vn33dw1f39snqhqly4x4yq8"
+   "commit": "0e6da11c4f500f6a3642dca167592eb27066ba52",
+   "sha256": "0h3w44q1ivhrrhy19ckis4z54kqrh7madzjif1ai2fnxfqk0zi5p"
   },
   "stable": {
    "version": [
     0,
-    3,
-    1
+    5,
+    3
    ],
-   "commit": "f71d0ffd9d2421f2b51cd0ccb89fd9eb43c09585",
-   "sha256": "0576r8ap9gp91ycjf1d47pn13kxp0f9fysn09zlq44hr0s1y2y5d"
+   "commit": "4aa30ff9f83cf6435230a987d323e48230f1f40e",
+   "sha256": "1xy48cvmx37sx8kcyfwjy92ym22p81a7qm48967a79bh98pydgsp"
   }
  },
  {
@@ -92347,14 +92553,14 @@
   "repo": "tumashu/pyim-wbdict",
   "unstable": {
    "version": [
-    20210902,
-    1714
+    20220604,
+    1340
    ],
    "deps": [
     "pyim"
    ],
-   "commit": "4db1ca7fee75bd3aa394d620e5af2f42b3caf3c4",
-   "sha256": "141rzf15334r4sdqy791n3kspad8jcz4iig55mvcqabii4bqx9p1"
+   "commit": "e3b128cfcf218e4a0ca04189b0bd46909761227e",
+   "sha256": "04bp6fvqvp9myiakjak0jj4zinqcljr03v3w986zm7gs9i7hxx4f"
   },
   "stable": {
    "version": [
@@ -92441,17 +92647,17 @@
     20210411,
     1931
    ],
-   "commit": "2ea65b12176e575748db64d740ef834cba577d70",
-   "sha256": "18fv0kibj3rj8aydyxzda4mk7qi19hg82q3rm2mdi85082628wmy"
+   "commit": "72855d5d08a91ca5faa8c5442ff6f4aedfadf7ca",
+   "sha256": "1f4q7yb159jg57wmd29300sjis8y53nr9b880cd5yb8da7j3fbzb"
   },
   "stable": {
    "version": [
     2,
-    13,
-    8
+    14,
+    1
    ],
-   "commit": "45cbae2bab9001bb2f159103490a02d63e75ee5b",
-   "sha256": "1wc3h25p7pid3pzh6vaiaynzs1bqrl62dpb2g486hp3kbqdzlwp3"
+   "commit": "6447553ab509c9e811b7da53168e17fe2cadf187",
+   "sha256": "1v2qid36mig87q7cqblv0nzja7xj4ls15q5hy7jzvhpj20fsmp5f"
   }
  },
  {
@@ -92765,20 +92971,20 @@
   "repo": "jdtsmith/python-mls",
   "unstable": {
    "version": [
-    20220505,
-    1523
+    20220528,
+    1502
    ],
-   "commit": "6016c780865b3b9dcf90d9452367e0d39bbc1d1f",
-   "sha256": "00n2vrc7yq2cfsiwpwdga0yjl483rd59zvbdf41nxa92sircvjp2"
+   "commit": "bbfe9a8b2ea081c032eccfd541dac2bc46aa54a6",
+   "sha256": "0686f0a2jglby8nmwjfbzxjm7xd7h71safa4bphj1rb9v23kxzwl"
   },
   "stable": {
    "version": [
     0,
     1,
-    1
+    3
    ],
-   "commit": "97e58c6b785f7096c0e02f6c1d12b008cc0219c1",
-   "sha256": "0nhk2jwzlnc0c1fzzdbc7dwil9wwk2ghizgynvdp9b2kg3jyd76n"
+   "commit": "e0af9d48023c9f999160245df64c524ec54c2af6",
+   "sha256": "188wrjm7yp5q08q6gkyalqy5b6cc7lkjx3xza21gkpc1iwd75436"
   }
  },
  {
@@ -92789,11 +92995,11 @@
   "repo": "python-mode-devs/python-mode",
   "unstable": {
    "version": [
-    20220512,
-    1206
+    20220608,
+    1625
    ],
-   "commit": "97bb2d5ca50bec43a22ffc6187d13e3afb38238f",
-   "sha256": "02i5mqx3ip6k9n09yzr395ayhf4i1l7n8sk9q0ibcm2zadxnlqc7"
+   "commit": "68f5313712e20e2f292e723a84ebb5db609e38e5",
+   "sha256": "1lhnfac9jc5p80pvi9akv4b288g3i9x2j5658z5v0g5rwfipqncz"
   },
   "stable": {
    "version": [
@@ -92879,16 +93085,16 @@
   "repo": "wavexx/python-x.el",
   "unstable": {
    "version": [
-    20190611,
-    1303
+    20220602,
+    2108
    ],
    "deps": [
     "cl-lib",
     "folding",
     "python"
    ],
-   "commit": "b1f8eaccee210d7c0580dba6dc9bd361fcf3765d",
-   "sha256": "0vyipfsppissa87pdnbksamdby0yl2q8nzawqivv6smn33jp6vsn"
+   "commit": "fef5162af9dfc1225339098ae00e053a2e16b799",
+   "sha256": "17nyjvbydclp2v2nrmdayxic2mj7j0frksc359ad999r05qq0nv7"
   },
   "stable": {
    "version": [
@@ -93099,8 +93305,8 @@
   "repo": "quarto-dev/quarto-emacs",
   "unstable": {
    "version": [
-    20220405,
-    1556
+    20220602,
+    1714
    ],
    "deps": [
     "markdown-mode",
@@ -93108,8 +93314,8 @@
     "polymode",
     "request"
    ],
-   "commit": "2a199735866dc34126a061c6f2990378b381e687",
-   "sha256": "0bdigc8d2b9g2dgdcalf5f0a7hh56sji7k78vv23ikdydmag5bi1"
+   "commit": "3cf4546a01766775d56b92e1c974c850ec35d5a9",
+   "sha256": "0r2f4m5vqxhb6jpkciywj86mxvw9zw5wxpmh56d1znids4jyypxz"
   }
  },
  {
@@ -93173,8 +93379,8 @@
     "leaf",
     "quelpa"
    ],
-   "commit": "ea60d14a6c8dbe65ad0b3353185945d43ae4393d",
-   "sha256": "0xddhjal99q3s537kcdrcimykmzca73ic3v2abv2ymwby2wm52b9"
+   "commit": "9b2197770304772fa5262d0b9bfd26908746a2fb",
+   "sha256": "0v9ky8s3yfxvdyvc83b7qlv4xxb9j65g4iwkzc3kdn0zsbakrjp0"
   },
   "stable": {
    "version": [
@@ -93312,8 +93518,8 @@
     20210904,
     1553
    ],
-   "commit": "30e9a1333fe4a83424385df53ddaf7016df3679d",
-   "sha256": "1k6iyzajrw7kvz027l7yddvxq4a0jsahrdhsv8is4bnz8ws36s15"
+   "commit": "314beae43cac2e4943e9ed4850e8e147bc3d2fac",
+   "sha256": "029swfgl8jzla9y6d0s4nfzpgnbn9j0b9wn0gzzdb02khp5sanqh"
   },
   "stable": {
    "version": [
@@ -93471,11 +93677,11 @@
   "repo": "greghendershott/racket-mode",
   "unstable": {
    "version": [
-    20220512,
-    1447
+    20220607,
+    1810
    ],
-   "commit": "3b351fbb0d3e81bf260cb3fc7b623f1b782550cc",
-   "sha256": "0gcyb47ld10jvrf3wm63njz0d9y70fi8dwsx14pbdcrw2xs2p4s3"
+   "commit": "1c88636d5da4537b897e7b9b23edfd9495a24d10",
+   "sha256": "12nfrdvgndn11a17zaawv2i6mbjfiw1gih683l0cj0xknx11rg8j"
   }
  },
  {
@@ -94175,8 +94381,8 @@
  },
  {
   "ename": "real-auto-save",
-  "commit": "35763febad20f29320d459394f810668db6c3353",
-  "sha256": "1li0b2d93ffxjq4jdyzyvjdy5h7q5xllys0w4748d2bhr8q35p3w",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1n0hsms3g0z06b3i55gpp0xqxfychqscvfifpz4jmar87z7lvwp2",
   "fetcher": "github",
   "repo": "ChillarAnand/real-auto-save",
   "unstable": {
@@ -94475,11 +94681,11 @@
   "repo": "xendk/reaper",
   "unstable": {
    "version": [
-    20220426,
-    2048
+    20220527,
+    2122
    ],
-   "commit": "2cfe54e9f5470415ab5f59d3c0829bfce41525ad",
-   "sha256": "1050bv05ljgr61jpvcahfd0cjc00n5kvdvdsawnq4fgpfj2j3vih"
+   "commit": "a8ec93656698c5c02a02279ee7d7976325cc74cd",
+   "sha256": "075x71llqa8g4a872m57vij49bsxiv42yr0sbrwcxjm6dp6q08wa"
   },
   "stable": {
    "version": [
@@ -94842,8 +95048,8 @@
     "promise",
     "request"
    ],
-   "commit": "911a1c6310b42226392fd03dc1746a4c6fc4eb95",
-   "sha256": "0zljjqd1qyxh0p5rjphkljbl4b1kpmjw279axxp8y4hd67rk8fc2"
+   "commit": "c00407087e155c4fb672e5544e2ef3cb33f1f7eb",
+   "sha256": "14mfv9fx3zdca1xbbs31m3c2hjxjq25692j8ln73knlgy0y659dd"
   }
  },
  {
@@ -95799,8 +96005,8 @@
     "f",
     "s"
    ],
-   "commit": "dd72004f6f7b0d554dbd979f22a31c350e211089",
-   "sha256": "126dn4d0f301pybvrkjw3h5c729kbnaglzbgpsv5v7r35wrmxfgs"
+   "commit": "a94de082d8f6a1219532e85f432b4919c175fe9b",
+   "sha256": "0hs61cl97r6bwl2di5fjgrh6cmhjjfgk750159028a7pfcm3qyjd"
   },
   "stable": {
    "version": [
@@ -95970,15 +96176,15 @@
   "repo": "dajva/rg.el",
   "unstable": {
    "version": [
-    20220511,
-    1328
+    20220521,
+    1653
    ],
    "deps": [
     "transient",
     "wgrep"
    ],
-   "commit": "c46c5167ac03f68fd6fee07972017282c62bc942",
-   "sha256": "1pkbkh260k2r7x158b691ppqvxxzqkyylbapwlrxzc2ly23rmaxs"
+   "commit": "51596cb516d7af1737d964ffdbb4c4d416d6dfaf",
+   "sha256": "0pka31i87mf9ih40cb8yc1scvzklb5h5agscac2v7faklranih7i"
   },
   "stable": {
    "version": [
@@ -96174,8 +96380,8 @@
   "repo": "DogLooksGood/emacs-rime",
   "unstable": {
    "version": [
-    20220421,
-    1811
+    20220522,
+    2351
    ],
    "deps": [
     "cl-lib",
@@ -96183,8 +96389,8 @@
     "popup",
     "posframe"
    ],
-   "commit": "e6a89e9fa9eabc32063bffb2eacfcece46f7a049",
-   "sha256": "0rzynl2n6bk5lwff2rvpj0p3djnr421i1a9vm53554hk0vljzksr"
+   "commit": "0b4a2709159f5e975544b26302b8463deb7640d8",
+   "sha256": "1sk09z05xvg94pkf4181hvlg9q0m71kinzxv8223ls8df6ymc43k"
   },
   "stable": {
    "version": [
@@ -96275,11 +96481,11 @@
   "repo": "nlamirault/ripgrep.el",
   "unstable": {
    "version": [
-    20220309,
-    1746
+    20220520,
+    1410
    ],
-   "commit": "4ed5c741233a81d96115f556784269042070901e",
-   "sha256": "1bz9srlimpr5lzsjd02jq23h0vg2lnk921m24g0wsrdrccvmfxi2"
+   "commit": "872e250e8f93b8bb0a8a1de8bde17fd9bd116e31",
+   "sha256": "1n3jkj8a37ap4ndh9an5qm8dn8nxcgv9vqr8bcnxx5l0wnsvdg8z"
   },
   "stable": {
    "version": [
@@ -96374,11 +96580,11 @@
   "repo": "jgkamat/rmsbolt",
   "unstable": {
    "version": [
-    20220510,
-    1621
+    20220526,
+    1719
    ],
-   "commit": "3fe322e5739e57cceea37c4104ac7bc5231555c3",
-   "sha256": "1nc7hh3psw548mzzbcz7226i7pbyrdadmlrw955cl91z51rahxah"
+   "commit": "9c56c62993b9644a3c8bf6fc0a3a6599c0956707",
+   "sha256": "035cbj2ppxrjx8fdyjq3w7zjznzljxkcnr5pg61xw2vigd9mcjva"
   }
  },
  {
@@ -96536,11 +96742,11 @@
   "repo": "DerBeutlin/ros.el",
   "unstable": {
    "version": [
-    20220314,
-    2026
+    20220604,
+    749
    ],
-   "commit": "5e2bcd808f301b1a92cd583f2799d520bd802480",
-   "sha256": "0gb5bk1c10n4hr9dbwpgyk17qmd6bfqj9v9l0bmrbdvxafmnii8p"
+   "commit": "f66d2177b00b277a36c058549c477d854148623c",
+   "sha256": "07magls67fy99ckvy759lqk2q41mi4dvljx78ahclckyp7adwl21"
   }
  },
  {
@@ -96614,15 +96820,15 @@
   "repo": "pezra/rspec-mode",
   "unstable": {
    "version": [
-    20220401,
-    306
+    20220517,
+    2325
    ],
    "deps": [
     "cl-lib",
     "ruby-mode"
    ],
-   "commit": "a54ac64097b6ccc6acc52a8b077ceb63766fc4d1",
-   "sha256": "0s512jgd62rh0x5x24jzkmnw7hs6m1s1bcys41hr1vv27i0j2zvh"
+   "commit": "41224216cb7762a18eb0e309095796f3eb319e01",
+   "sha256": "0ym2i3w071iqh32p36fb22br62cbfs6zyhpm9khbspgmvpxaas8x"
   },
   "stable": {
    "version": [
@@ -96967,8 +97173,8 @@
  },
  {
   "ename": "ruby-refactor",
-  "commit": "8d223ef5b9e51265c510f1cf7888b621e47bfdcf",
-  "sha256": "0nwinnnhy72h1ihjlnjl8k8z3yf4nl2z7hfv085gwiacr6nn2rby",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0zz913v8hwc97qpz1c910adrhcj5ca7s72ixjnr32xq4qscmw9x2",
   "fetcher": "github",
   "repo": "ajvargo/ruby-refactor",
   "unstable": {
@@ -97120,17 +97326,18 @@
   "repo": "semenInRussia/emacs-run-command-recipes",
   "unstable": {
    "version": [
-    20220301,
-    2010
+    20220604,
+    1330
    ],
    "deps": [
     "dash",
     "f",
+    "ht",
     "run-command",
     "s"
    ],
-   "commit": "02a4d366e309b7dd6a45f8a94669a25d6fe80ea1",
-   "sha256": "0j634n2v8sqpybbmd62jayyamz28dzlmvr45bsijbwxn6b4pa8k0"
+   "commit": "6cff6fff2c3ac23384d044a9c64d0e4b80721d4c",
+   "sha256": "1bg1ha4mlbxr13w3v7xkbdi9mqp3amljikbnkfcc5wijx572c396"
   }
  },
  {
@@ -97235,8 +97442,8 @@
     20220217,
     2009
    ],
-   "commit": "d17be3051b22a06d7742178cd1367aed61807a66",
-   "sha256": "0yslscybdvnmak1h99qgjrwqim9aiwxhnp5kw4wb4nfqr1nwm3yd"
+   "commit": "0df2f22479b98f76d97de90e1c390ff1b0902a46",
+   "sha256": "0c8bhdsip75wa966zhli2khncqf1zhbxyxfqics1lh10ncxa7qw0"
   },
   "stable": {
    "version": [
@@ -97279,8 +97486,8 @@
   "repo": "brotzeit/rustic",
   "unstable": {
    "version": [
-    20220509,
-    716
+    20220531,
+    1820
    ],
    "deps": [
     "dash",
@@ -97294,13 +97501,13 @@
     "spinner",
     "xterm-color"
    ],
-   "commit": "3b379fc25b7a097a014147d9c8b83ec1a418cd76",
-   "sha256": "129mclfyy6nji7c3avni4y3kzi3z67dv3cv40jmlv1m4isxf59n1"
+   "commit": "2c5b46e4e103edb6a4f60a6e38f3bc0c3099d470",
+   "sha256": "1rqfbkl16c287gg4p7y6hny5020j2q11yldamdcmrk83is7v06px"
   },
   "stable": {
    "version": [
     3,
-    0
+    1
    ],
    "deps": [
     "dash",
@@ -97314,8 +97521,8 @@
     "spinner",
     "xterm-color"
    ],
-   "commit": "b3f4442f7198eee758958196f89a150f8de8963a",
-   "sha256": "18br5yfakfwcbw3vkawhw5sm41xg78cz4bimz36x5xcgbwi88k3p"
+   "commit": "3bdc3042d3d321a0b0c45147c22732dc6bdfcdf3",
+   "sha256": "1bryx1w388ryhxk0ydigqf14hfdy518g8h06gimdim6bi1npvyl0"
   }
  },
  {
@@ -97378,8 +97585,8 @@
  },
  {
   "ename": "s",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "0dars9212z0yv97mj4615h23vd22vy8b6cw2n433z9jhif3aybqa",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "04mcdjm4i1vws26l3n7s5d4nkwf9l7gr95ab18a40si7wiza5pk1",
   "fetcher": "github",
   "repo": "magnars/s.el",
   "unstable": {
@@ -97402,8 +97609,8 @@
  },
  {
   "ename": "s-buffer",
-  "commit": "f1bf91527219e7afc8e113134a958f3adb862a5a",
-  "sha256": "07kivgzv24psjq1240gwj9wkndq4bhvjh38x552k90m9v6jz8l6m",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0c65zz03gw7wpx2cy889z2k4f7j1nfhi43jjff9vpcnlviyhqc9f",
   "fetcher": "github",
   "repo": "nicferrier/emacs-s-buffer",
   "unstable": {
@@ -97588,21 +97795,6 @@
   }
  },
  {
-  "ename": "sane-term",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "08b8zlr8qzxfrpg9lqiyam3sb8a8rzak79ra4r6ljjppyj4zmwi7",
-  "fetcher": "github",
-  "repo": "adamrt/sane-term",
-  "unstable": {
-   "version": [
-    20181130,
-    101
-   ],
-   "commit": "369178c2dd0348250c2ec0019567688376c637f7",
-   "sha256": "1klwn7crvn7769b5kan91fj5lpz5sanghi4way8h77b2iciya7bf"
-  }
- },
- {
   "ename": "sass-mode",
   "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487",
   "sha256": "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800",
@@ -97804,8 +97996,8 @@
     20200830,
     301
    ],
-   "commit": "b929e705e76e8ff47d170c5e9849f86002f3e09f",
-   "sha256": "1iflrjldvabilvji1zmx1rmkl6z16s50k3hldn3l871gz16wa0h6"
+   "commit": "6aae7963498675dfb5bedaaef2cb8e56bdcddcab",
+   "sha256": "1ildv2wi9j1gp99l2d69gdc2a5h4i1jm17f59xr987l942mwnwnf"
   }
  },
  {
@@ -98074,8 +98266,8 @@
  },
  {
   "ename": "scratch-log",
-  "commit": "bec9692973db8853f9d329aebc0cc9e81bb34003",
-  "sha256": "1yp3p0dzhmqrd0krqii3x79k4zc3p59148cijhk6my4n1xqnhs69",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "15mn3i9mg6p1vcm5bdmp5wc0q945f9f1bkx1pwvns1iqj9pxdkv5",
   "fetcher": "github",
   "repo": "mori-dev/scratch-log",
   "unstable": {
@@ -98156,8 +98348,8 @@
  },
  {
   "ename": "scribble-mode",
-  "commit": "6469c2b389d757003da69da727905228eb564d50",
-  "sha256": "0idagikxhr86h2k6fb45zdzg73wpmpiszx0gi6d8jx7s1xqd6s50",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "09l54fmpkvwikf8b1kqxndka21j2v5cj09vxkhvlc659j6l1qh88",
   "fetcher": "github",
   "repo": "emacs-pe/scribble-mode",
   "unstable": {
@@ -98293,11 +98485,11 @@
   "repo": "t-e-r-m/sculpture-themes",
   "unstable": {
    "version": [
-    20220512,
-    2235
+    20220601,
+    1349
    ],
-   "commit": "be3adaf9db276e899b44e5093316cae2014b22c9",
-   "sha256": "0wn066zc72djac8ccss95ydi69ggngknkjh2hg0hi17g3m2pj6f6"
+   "commit": "ff2fdd1c38cb9f3f1abf420b77d1ef3a2786ce57",
+   "sha256": "1pwj9snqr87x16h02fnls90m63c3v6y35zcnr2f5sq9ydfxrzijn"
   },
   "stable": {
    "version": [
@@ -98383,8 +98575,8 @@
     "dash",
     "f"
    ],
-   "commit": "26ecae6a6d028fcbffc576a69ef8f787646bc12a",
-   "sha256": "1v9clc25pwbdq50xqabk36iypg2n68ip7znnhy6qwk9b3ir00zm5"
+   "commit": "2a0e37f818f4486dd624300a8dd77ac1b6d96070",
+   "sha256": "1dy336ga5268mqqhw1fpwd9zbagfldfbp11jc3yd1aasj9y32s99"
   },
   "stable": {
    "version": [
@@ -98615,17 +98807,17 @@
  },
  {
   "ename": "selectrum",
-  "commit": "4273a6e55cf797d1fab1825618aab7e9b6c01886",
-  "sha256": "012jmgr7w6x0gy8ygpzyyk23adyzmr7cknz2w51zjapcilkf6ghv",
+  "commit": "ebc43ea653ed9623745d0379576a023729ce9f32",
+  "sha256": "0gjkfdny0b8l6sf44z5c3psqglvh2kp4mp60lj2ajgybv80pzb44",
   "fetcher": "github",
-  "repo": "raxod502/selectrum",
+  "repo": "radian-software/selectrum",
   "unstable": {
    "version": [
-    20220323,
-    10
+    20220513,
+    2106
    ],
-   "commit": "7da932eeb89f1aa8060a73ddd040f95bbb127343",
-   "sha256": "14hplki838svbjpasmm9ik8c5xm0ji2xxrp61cq82dc6r0axg5w9"
+   "commit": "810ea697bdd559d97b86b795e01769cddfa3daf2",
+   "sha256": "1bci9vnpki7lf3v3wwcixq1ak5mgbvlxplsw5c04nckir163cqvb"
   },
   "stable": {
    "version": [
@@ -98644,27 +98836,28 @@
   "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20220509,
-    2300
+    20220601,
+    1652
    ],
    "deps": [
     "prescient",
     "selectrum"
    ],
-   "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484",
-   "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c"
+   "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e",
+   "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk"
   },
   "stable": {
    "version": [
     5,
-    2
+    2,
+    1
    ],
    "deps": [
     "prescient",
     "selectrum"
    ],
-   "commit": "3dbcef387502d309d130a518a18d48cd2f0e15b7",
-   "sha256": "024l7s0b6apbzanw3cnhjypxnxfinfb5b3nhaabrc138m5pis8j5"
+   "commit": "07d61b7779c4cca3009390383e7f98a55de7e17e",
+   "sha256": "0z97d7nnl1hgxj4fsvgw3hb3j4dc9wkdq2vq3dw607f29lwqiadk"
   }
  },
  {
@@ -98777,34 +98970,34 @@
   "repo": "abailly/sensei",
   "unstable": {
    "version": [
-    20220502,
-    2012
+    20220530,
+    1226
    ],
    "deps": [
     "projectile",
     "request"
    ],
-   "commit": "1294a96f544fd1be9ddaea3a85369fcf437403e9",
-   "sha256": "0cg7rwvfc0yf9pld50f6hnpcyq3g7r7rh62sb9wzdnwiv9n249lk"
+   "commit": "3538990de9ab57154e3da08d10fbd2c6228d87b8",
+   "sha256": "1f7q7s0ajrpgaa78j3zrff5dr1p2j82kgpvpal2lgqns4947m726"
   },
   "stable": {
    "version": [
     0,
-    41,
-    1
+    43,
+    3
    ],
    "deps": [
     "projectile",
     "request"
    ],
-   "commit": "1294a96f544fd1be9ddaea3a85369fcf437403e9",
-   "sha256": "0cg7rwvfc0yf9pld50f6hnpcyq3g7r7rh62sb9wzdnwiv9n249lk"
+   "commit": "3538990de9ab57154e3da08d10fbd2c6228d87b8",
+   "sha256": "1f7q7s0ajrpgaa78j3zrff5dr1p2j82kgpvpal2lgqns4947m726"
   }
  },
  {
   "ename": "sensitive",
-  "commit": "5e5468ce136fabe59e1434f8a7f265f41c5e64c1",
-  "sha256": "0v988k0x3mdp7ank2ihghphh8sanvv96s4sg6pnszg5hczak1vr3",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1q53y2lf28z8vdja13bhn1w7yrzqirbk1m02sv2w6chf40797fxy",
   "fetcher": "github",
   "repo": "timvisher/sensitive.el",
   "unstable": {
@@ -98827,15 +99020,15 @@
   "repo": "noctuid/emacs-sentence-navigation",
   "unstable": {
    "version": [
-    20180408,
-    1619
+    20220522,
+    1137
    ],
    "deps": [
     "ample-regexps",
     "cl-lib"
    ],
-   "commit": "7c5d2edeaed01196aec25031782e89adeaa089f0",
-   "sha256": "15za4fg7c8fsih86wz1npyx6gdmw0xhizklfsyfh84416dsmgswp"
+   "commit": "ea6e94a5518643acda5b6e98e4e7f47dfc107d29",
+   "sha256": "1wpr37gwkly0jl0m8kh7f1pkp9dwg5i1r3bpx3sd1z8c57sfn8da"
   }
  },
  {
@@ -98855,8 +99048,8 @@
  },
  {
   "ename": "separedit",
-  "commit": "297ba98f4bc011948c34aad30ae28b7adc611938",
-  "sha256": "00p4crbzr5fkcj8lhpfd9w44ynpmhd9fay9yrwgz0yh87lll6nqx",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1k7wd8aaq5yq9l1jpj4sl5kjcp0rhknv3gdb8hqx65kscpmksdzh",
   "fetcher": "github",
   "repo": "twlz0ne/separedit.el",
   "unstable": {
@@ -98902,8 +99095,8 @@
  },
  {
   "ename": "sequences",
-  "commit": "4cf716df68fb2d6a41fe75fac0b41e356bddcf30",
-  "sha256": "12wnkywkmxfk2sx40h90k53d5qmc8hiky5vhlyf0ws3n39zvhplh",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0s3n454zizak773svgw3rj0cn5nyq4xrhwr9vywd9x9f0xcfj3n8",
   "fetcher": "github",
   "repo": "timvisher/sequences.el",
   "unstable": {
@@ -99555,26 +99748,26 @@
   "repo": "redguardtoo/shellcop",
   "unstable": {
    "version": [
-    20220414,
-    530
+    20220526,
+    1424
    ],
-   "commit": "327f5ac43e5d543149a772aef06cdb616477eb43",
-   "sha256": "1rmv2swyir91c6x94bggkrwankfkipfzhxzmg2c1455ybm48n3lx"
+   "commit": "4e71f5b9199a0ad10017104a6b2bf5ef5f207dfc",
+   "sha256": "10aydyxli33h4vg0mkbmni41swy78cbj85k9j0qf1lhiqxzah8k5"
   },
   "stable": {
    "version": [
     0,
-    0,
-    9
+    1,
+    0
    ],
-   "commit": "327f5ac43e5d543149a772aef06cdb616477eb43",
-   "sha256": "1rmv2swyir91c6x94bggkrwankfkipfzhxzmg2c1455ybm48n3lx"
+   "commit": "4e71f5b9199a0ad10017104a6b2bf5ef5f207dfc",
+   "sha256": "10aydyxli33h4vg0mkbmni41swy78cbj85k9j0qf1lhiqxzah8k5"
   }
  },
  {
   "ename": "shelldoc",
-  "commit": "551623175e55629be6cfe44a595f25f09bd889e8",
-  "sha256": "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0ihw3c2rg01zrmpdp61wh9xw7klbrcnh29gbsxs2143a70bmms1x",
   "fetcher": "github",
   "repo": "mhayashi1120/Emacs-shelldoc",
   "unstable": {
@@ -99672,20 +99865,20 @@
   "repo": "redguardtoo/shenshou",
   "unstable": {
    "version": [
-    20220324,
-    1137
+    20220607,
+    39
    ],
-   "commit": "bc16a637edaaca831a5147b6f479ba1dbdc02454",
-   "sha256": "0mli3h3i511vq8g69b2y8hq9591bv5yjblvx7cnh1nrjpb4flak0"
+   "commit": "317a87ca4b1a3f1860d9ce88aeabac154598a834",
+   "sha256": "045z3h0yk5bkdiipp158s47bphmbz1fgmfx9fdm5acf1w1sdqm8q"
   },
   "stable": {
    "version": [
     0,
     0,
-    1
+    4
    ],
-   "commit": "8e12d366ca371fc259294485047a431a7c610605",
-   "sha256": "09w57wq9mw3yjklxsqm87xl2q229qwqp48ssxlp5xpwhwljgwd2j"
+   "commit": "317a87ca4b1a3f1860d9ce88aeabac154598a834",
+   "sha256": "045z3h0yk5bkdiipp158s47bphmbz1fgmfx9fdm5acf1w1sdqm8q"
   }
  },
  {
@@ -99696,14 +99889,14 @@
   "repo": "purcell/emacs-shfmt",
   "unstable": {
    "version": [
-    20210803,
-    222
+    20220602,
+    1535
    ],
    "deps": [
     "reformatter"
    ],
-   "commit": "ceb1ed4df3d7e198e4c5af0c2fd44c4d9d65832e",
-   "sha256": "1apaka8w4iwpa2ba652zpl5kl17ixjfnws0pnmx52yyvfj7bjv7n"
+   "commit": "279a51defa3e0d97dc40b8a26e078699d4e22e90",
+   "sha256": "1kzi8gy37cm1z4x69400gbkawx4k0jafvz8m50w0b48nvrvsy6ys"
   },
   "stable": {
    "version": [
@@ -99767,11 +99960,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20220426,
-    715
+    20220606,
+    2301
    ],
-   "commit": "7baf17355289c29d18f993f383c5d6a187f33b35",
-   "sha256": "1a2m6jkvnv852q07wvi80nbm7437wnvdfdyiq4iffhffmz8c2mrr"
+   "commit": "45155e42ea10990295d47d5ee3cb29be16a1f9f6",
+   "sha256": "1cjz3sli309i2qrwxic63x1am4hpn8r9gwjnfjb62b954wdhhf97"
   }
  },
  {
@@ -99846,8 +100039,8 @@
     20210715,
     1227
    ],
-   "commit": "09aaba23300b9fa3cfd15ceb0e62da4a3d53e7e5",
-   "sha256": "160ck71cwlzsi59wazxf3nl5sim6rflbs2dxhiavmv9rz2xjgk46"
+   "commit": "b59e0fcca14dd2d8424d8ba0800da2e35bb52cc7",
+   "sha256": "1vz7fvx36r0dmim7n61zi00zvdk03sjxqsh5xcd6vxfv5869hxz5"
   },
   "stable": {
    "version": [
@@ -99957,15 +100150,15 @@
   "repo": "chenyanming/shrface",
   "unstable": {
    "version": [
-    20210829,
-    1013
+    20220523,
+    1440
    ],
    "deps": [
     "language-detection",
     "org"
    ],
-   "commit": "b8a23e097b25d6c7754f9aaf4de89259f8a0b17d",
-   "sha256": "0krd112xglcvkgjl0dj6z4h9gwzh99avh10hlp4idcsm8b7hgdc9"
+   "commit": "b3916e1ebe2477c031db1440d9b57e373c0354fe",
+   "sha256": "0m357d795qcn1l2gynglzdrdc9h197vj68436hkwnc1j72zhcpl4"
   },
   "stable": {
    "version": [
@@ -100464,8 +100657,8 @@
  },
  {
   "ename": "simple-rtm",
-  "commit": "a784f931849ca836557390999b179ef9f6e775f3",
-  "sha256": "0v5f0vr8sh62yvb7znx00wgybb83dfnkvgl8afyk3ry8n9xkhf5b",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "09m5akqrdn22lxr50z3x2zyldh1m62b8sbwkq6pb428bhanvhky2",
   "fetcher": "gitlab",
   "repo": "mbunkus/simple-rtm",
   "unstable": {
@@ -100504,11 +100697,11 @@
   "repo": "rolandwalker/simpleclip",
   "unstable": {
    "version": [
-    20210406,
-    1221
+    20220518,
+    1251
    ],
-   "commit": "67c8c17adbbe6d9407a5ce4159d097a8b8bf6adb",
-   "sha256": "0lggdlgkcxzl1myddis7xy7x2qi1q91grgxpq2rlkkz70rz0xcv0"
+   "commit": "023f239275115169c3a3637ad95fae4a036c005e",
+   "sha256": "1mvjlcmldcx3vd6xkk3nriy8lghp6nqa6l13a6kax5n8dc0hi4qi"
   },
   "stable": {
    "version": [
@@ -100603,11 +100796,11 @@
   "repo": "smallwat3r/emacs-simplicity-theme",
   "unstable": {
    "version": [
-    20220217,
-    1928
+    20220519,
+    1439
    ],
-   "commit": "2a0aaf19cf1e99c50df0d2e6225a2d2931a203d2",
-   "sha256": "0xv1gf0a9i3ajxd6cprr7b62xvar6r6ia5qd4sjvr8pnaw3cav45"
+   "commit": "692d908961990f463632089041d4705cbb1c5912",
+   "sha256": "0a1igxk9jrybrf8qgh8nqdqkk7i7gvq7jq66w34gi9lbckmfvi05"
   }
  },
  {
@@ -100945,15 +101138,15 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20220510,
-    2050
+    20220526,
+    1343
    ],
    "deps": [
     "cl-lib",
     "macrostep"
    ],
-   "commit": "c5342a3086367c371e8d88b3140e6db070365d43",
-   "sha256": "008qav1p8angqczv8l1yd2ics0pyp69x93s8xvapcrxvhv8ishgn"
+   "commit": "1f9a95f3a07b2aa5b01d8be427b90837be5cea6a",
+   "sha256": "12fndsp7rkzvs7r1srrccywv5lmr6xbp7fx96ijymff82fqblcy9"
   },
   "stable": {
    "version": [
@@ -101184,11 +101377,11 @@
   "repo": "joaotavora/sly",
   "unstable": {
    "version": [
-    20220302,
-    1053
+    20220603,
+    843
    ],
-   "commit": "4513c382f07a2a2cedb3c046231b69eae2f5e6f0",
-   "sha256": "10bzxhi5d7h18hqclxqy2z857d0sfbsnyxvrhmfkdi0h75zz7m4n"
+   "commit": "b501b4335096fd4306c2c1eb86382b69e91c09e5",
+   "sha256": "1naj8cm0rd4pimrncmv6dka73l22avypclhr00dmpnh174vizpnp"
   }
  },
  {
@@ -101415,11 +101608,11 @@
   "repo": "hrehfeld/emacs-smart-hungry-delete",
   "unstable": {
    "version": [
-    20211020,
-    1822
+    20220516,
+    1538
    ],
-   "commit": "78acd1f16fb99b66a6c9bd605a988c3c74280577",
-   "sha256": "0c4yrnngq1m5nwis5y26qf0mfp12qnargh7s4hd3wm5xl4n5369x"
+   "commit": "e06525cc1841805ebe470c876d6b966de90bc275",
+   "sha256": "0226lpiqnrjjdnay6nafgm118g8dkr59ilvygk4xrjcb52jjhn7z"
   }
  },
  {
@@ -101636,8 +101829,8 @@
  },
  {
   "ename": "smart-tabs-mode",
-  "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3",
-  "sha256": "0wxrpn145z2ivdadls7p7ha16py9fani3zlwlh6s8rz18hj4ad9x",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1ylzsa069lfnxv6cf4qsqn4jil6ib5zyjwsyhgn7b7knbp00f7v8",
   "fetcher": "github",
   "repo": "jcsalomon/smarttabs",
   "unstable": {
@@ -102724,8 +102917,8 @@
     "cl-lib",
     "deferred"
    ],
-   "commit": "112450888f3f90f0f2a0e43e49eb5a7e49b1b6db",
-   "sha256": "1dmchr5mg84xsyny0xnwwvvqcn09kca4r85amy1h7b0qv7p60vv4"
+   "commit": "f65456e9d91487cde6f4b31134033466e7db716f",
+   "sha256": "06khvgz76gn6d0594rl8g37y8gkx11axv85vhiwvcl8cg0qawikl"
   },
   "stable": {
    "version": [
@@ -103111,11 +103304,11 @@
   "repo": "condy0919/spdx.el",
   "unstable": {
    "version": [
-    20220511,
-    143
+    20220518,
+    117
    ],
-   "commit": "701e7c49c38babaa2b2071febd2b112fef600683",
-   "sha256": "1wkqrlwh9n827x49m71j5ilkgk9xn6smxi11cfbd35hbdkdf5gyn"
+   "commit": "e23ac498e9c96f5e93569271d192e6c247134412",
+   "sha256": "1dyc7ax2idr30ph2y05lxb94pg0qnpj23l17bg0rscv00pg8883c"
   }
  },
  {
@@ -103153,11 +103346,11 @@
   "repo": "brailcom/speechd-el",
   "unstable": {
    "version": [
-    20211231,
-    758
+    20220608,
+    1422
    ],
-   "commit": "a4be22b5b62a6be1e749df6f64b06e16a6b09790",
-   "sha256": "192fw278mmgqcbagigl97rwlj0jks63vmzgdpakhcr8as8ybc9gz"
+   "commit": "7e30c439729d5635ddd341ad5ab16f832a4619ea",
+   "sha256": "18xgqp8r1bgj63g2n08jbx4jwdcjn3p2lpdndyvfm394y2nzkcxr"
   }
  },
  {
@@ -103245,8 +103438,8 @@
     20220507,
     1118
    ],
-   "commit": "2f2fd6de0003edb1038b7c639cf23264d1406993",
-   "sha256": "1p23c2y124xmd3zwfns4zmk460vxd459dds0w0k9mnjnm9p8dkq2"
+   "commit": "1299bfca2ec9bdca0424fcaa330ddadc8f8d1143",
+   "sha256": "0w8ydbl1wnjn4wj8zfypab5pngxgmg4d06srkarfym2v75ksass7"
   }
  },
  {
@@ -103666,6 +103859,21 @@
   }
  },
  {
+  "ename": "sql-trino",
+  "commit": "141f76317967d6561d722b6dc390adf65774654e",
+  "sha256": "075fj37qc6h1hqshybddavppv5dnhnxbsfnfc37j7snqjndzxkmi",
+  "fetcher": "github",
+  "repo": "regadas/sql-trino",
+  "unstable": {
+   "version": [
+    20220502,
+    851
+   ],
+   "commit": "bad7be0bf2f6d2d653a787a4b5bc6a281a8bea88",
+   "sha256": "0b27b8nbghxfqynr6sfadpmwlsixn4hhqqmczc3i9i69sbm2m8a0"
+  }
+ },
+ {
   "ename": "sqlformat",
   "commit": "6bdaa1ccae12f2ea779ac6989607d8027feac2c9",
   "sha256": "07lf2gx629429b41qr04gl98gplb538gb5hw7idzrmi3higrmv8m",
@@ -103725,11 +103933,11 @@
   "repo": "pekingduck/emacs-sqlite3-api",
   "unstable": {
    "version": [
-    20220501,
-    1217
+    20220529,
+    1106
    ],
-   "commit": "68eda59d5f3d29d0a64d6256d58b8c1f93ba3583",
-   "sha256": "0yrfwb3yvhp1ib4izxh1ds68b3zw8gjkjhlk1kivarxnfjnjnly2"
+   "commit": "2f6095201b1d943d92cc017e100eec571a8d2aab",
+   "sha256": "00kxjvfgw3qcy49l5qkkxar32m7kk25knc9kij7xr8fz8pqhr633"
   },
   "stable": {
    "version": [
@@ -103833,11 +104041,11 @@
   "repo": "srfi-explorations/emacs-srfi",
   "unstable": {
    "version": [
-    20220406,
-    1831
+    20220526,
+    2233
    ],
-   "commit": "dbcdc58d3ea9e0767b24bb0f05fc8de8849889fe",
-   "sha256": "1a7s7p3lq5gvgkw9ldzgg8nvjap4j6szdk0gw5njq02jccfzc7ll"
+   "commit": "3e5fbaef46126634c58d0f39be4bc522c05de1f9",
+   "sha256": "1wahhk2fssjasiz691pkh61qd6x8dbabv4vrwzvc32r9vy8xpyg5"
   },
   "stable": {
    "version": [
@@ -103988,14 +104196,14 @@
   "repo": "death/ssh-tunnels",
   "unstable": {
    "version": [
-    20220410,
-    1424
+    20220606,
+    1229
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "a74488a71c2827dcaf42d9381d0d974aca96e27f",
-   "sha256": "0lrfrzxwjrhj90ampkg92pcpblb4i7744kwx2sl6ivkp7ldklyfn"
+   "commit": "191013b83f3ec3214394a1ed698c4cf38e4d9047",
+   "sha256": "0l50d8vkfc5hv1j5j807a398ghv4ap19mpiv75c8l5k1mbrysald"
   }
  },
  {
@@ -104273,11 +104481,11 @@
   "repo": "wavexx/stem-reading-mode.el",
   "unstable": {
    "version": [
-    20220418,
-    1136
+    20220522,
+    1053
    ],
-   "commit": "a8bacd80fab6013c09e4e8d337fd88267cbe2ff8",
-   "sha256": "0ib2rqybwjxclgqy6bp0gmgr6mvyp434mf9ix6m8by3jrkpppvgq"
+   "commit": "6efc9962e3a19a452c7ab9636cf1e2566a51bd38",
+   "sha256": "04kjf6byxp66v6iprp8wcymi283c46fb4w4wiyj64pp76y3g59az"
   }
  },
  {
@@ -104375,28 +104583,28 @@
   "repo": "beacoder/stock-tracker",
   "unstable": {
    "version": [
-    20220430,
-    1144
+    20220523,
+    1424
    ],
    "deps": [
     "async",
     "dash"
    ],
-   "commit": "58018a1747273df23dec08ec5d318da1960428c1",
-   "sha256": "0jbj24pbc07gjb6zk29yzjrd80c4aaqfp2mffc4qqisws0f8gfvb"
+   "commit": "14fe70fcce24a045f34e42617432a2d830906b98",
+   "sha256": "0854qx7vfycf8dfr8amksb0iv4nydbqn0g5357s3dfwmpj6rvvzk"
   },
   "stable": {
    "version": [
     0,
     1,
-    4
+    6
    ],
    "deps": [
     "async",
     "dash"
    ],
-   "commit": "34632dd99903d4ffbb78a2deb5b658291a6cf040",
-   "sha256": "0rq8qimc3xfh1x9g691x2bmmy9a1bglv6180hdc5z6irv5gfszvn"
+   "commit": "58018a1747273df23dec08ec5d318da1960428c1",
+   "sha256": "0jbj24pbc07gjb6zk29yzjrd80c4aaqfp2mffc4qqisws0f8gfvb"
   }
  },
  {
@@ -104476,20 +104684,20 @@
  },
  {
   "ename": "string-edit",
-  "commit": "20fd24f22ef734fe064c66692bf3e18eb896f1ac",
-  "sha256": "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1z2m9dskxcvbrcdx296qy5spbqd9gf1fvgqwsf9jy5487n03nyhh",
   "fetcher": "github",
   "repo": "magnars/string-edit.el",
   "unstable": {
    "version": [
-    20210405,
-    1836
+    20220604,
+    2128
    ],
    "deps": [
     "dash"
    ],
-   "commit": "0e225df6f8740467231c787a50025e4552b3eddb",
-   "sha256": "1x5b3iq1c25c74jb77qw3zijblp6zx9kp9hzsb0wfx66lp4wn2wi"
+   "commit": "d7c4b9db6c4987b5c022a9858e6302a4c53aff5f",
+   "sha256": "1fr17145rk62wc8h4vr164ya8vr6ifyy0h4kzbsgwwkh6qji6aym"
   },
   "stable": {
    "version": [
@@ -104828,14 +105036,14 @@
   "stable": {
    "version": [
     0,
-    3,
+    4,
     0
    ],
    "deps": [
     "transient"
    ],
-   "commit": "ee2b1f20521e647472be7553242eb2253809e1d1",
-   "sha256": "1j8q47vvvsdfb9hg2r72dgmg2a886aa15yrvi6ahp7g5z4jmp19k"
+   "commit": "e9acece0f840bc6ea096ae56e77573939a2c510c",
+   "sha256": "0pynzc34bzppdfl1bxkhb0r7z4c0kd1bil5vblnyn4gnjx00jb94"
   }
  },
  {
@@ -105055,11 +105263,11 @@
   "repo": "bbatsov/super-save",
   "unstable": {
    "version": [
-    20220426,
-    1056
+    20220531,
+    1745
    ],
-   "commit": "71c26cbd47d993fff37e572523ea79c9c49f5caf",
-   "sha256": "1r56g3h7cn2p64lk5d9zw2hmr7f5xzim1ccydzi8i1g7m7rzlgjp"
+   "commit": "6f6512bc44b09f7187e58772892fa330f4518c12",
+   "sha256": "1nbkx8hphszwn42g75f92n22zkp8kjl3pr0rbfpwdzbsla5lm2dz"
   },
   "stable": {
    "version": [
@@ -105169,14 +105377,38 @@
   "repo": "rougier/svg-tag-mode",
   "unstable": {
    "version": [
-    20211229,
-    920
+    20220525,
+    1752
    ],
    "deps": [
     "svg-lib"
    ],
-   "commit": "07640c97a1dcc305010a384fffdaa7788c342da7",
-   "sha256": "0f5p07li2nr65jil57b52qiryp8b5blzcnymx05cc4pm4m539aff"
+   "commit": "efd22edf650fb25e665269ba9fed7ccad0771a2f",
+   "sha256": "1qwbhkl0fd22yymncmsw5ivrhwsl42mch64kai6zpn1q0aclk1dx"
+  }
+ },
+ {
+  "ename": "svgo",
+  "commit": "63366b06071a7c5a54a47cfc7a0529f83e44a1c4",
+  "sha256": "1dg3ziia58jd88y02ndr617cyxvwpwsp70v9226ilgi76xdw58d6",
+  "fetcher": "github",
+  "repo": "hupf/svgo.el",
+  "unstable": {
+   "version": [
+    20220525,
+    2059
+   ],
+   "commit": "40ddd6f47966561344bec8f46235e40dad99115f",
+   "sha256": "1h06dimzii1acnf42jg0irwr5sjlr9br9dkrndx9wl2wwhjnwzdz"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    3
+   ],
+   "commit": "9b01cc9eb1fdf2731cd2b931a7dfe1f601b70786",
+   "sha256": "1qdyzf5k1azqqkhpqm3qwz4h4pm57x141i0z0wq40sf5lwdk9wk9"
   }
  },
  {
@@ -105469,8 +105701,8 @@
    "deps": [
     "ivy"
    ],
-   "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d",
-   "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94"
+   "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22",
+   "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8"
   },
   "stable": {
    "version": [
@@ -105674,20 +105906,20 @@
  },
  {
   "ename": "sxiv",
-  "commit": "7a9ad1ddf9387323c8c3a48f7e1443be01f95440",
-  "sha256": "1yiwdrg3cgxpjijk7hxl7dv7q9l3sk0ga2896110yc2f2prjm9fc",
+  "commit": "4f3fa2076ce777618f2982a7ba69b497d68aebc3",
+  "sha256": "179mqhkm52mccyxbwfl1sa5ky3zrivz6lb2vjnk54117l5ifzv07",
   "fetcher": "git",
-  "url": "https://tildegit.org/contrapunctus/sxiv",
+  "url": "https://codeberg.org/contrapunctus/sxiv.el.git",
   "unstable": {
    "version": [
-    20210514,
-    918
+    20220530,
+    14
    ],
    "deps": [
     "dash"
    ],
-   "commit": "028409c3a9ff7ba33a1cc2158abfc1793ed50717",
-   "sha256": "0zscfz1f6sgf4b9arfj9bmyvxqlpphm7q36k73zn5hn28kzd9di4"
+   "commit": "47f5b2fbb94c569dc5e71cbe4de9c6eabbbc69e8",
+   "sha256": "0j0dqab5br92qz9wz3ssjps84dr0q28x11065cx90b6gis9wvv5j"
   },
   "stable": {
    "version": [
@@ -105838,8 +106070,8 @@
  },
  {
   "ename": "symon",
-  "commit": "3f4bbc6b3d7b2e2a9fbe7ff7f1d47cda9c859cc0",
-  "sha256": "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0xrfvx09qb0pbpr7ck0w3sr6hyw0wl6vkcc9z6qkym37qg9harwm",
   "fetcher": "github",
   "repo": "zk-phi/symon",
   "unstable": {
@@ -106370,14 +106602,14 @@
   "repo": "mclear-tools/tabspaces",
   "unstable": {
    "version": [
-    20220507,
-    607
+    20220607,
+    526
    ],
    "deps": [
     "project"
    ],
-   "commit": "24266c6c9a766261a8c8620692dfa4000f3e1d5d",
-   "sha256": "1fyfpi31qy03qpxw8hpjgykn67pvflgah3agwf053iqpj1krh1gz"
+   "commit": "0ce73ece84027939428ade3d46706cbd0a61ec3f",
+   "sha256": "09li624kg8p5637lq85sl6f4lrmlc71a9cgy1xj0rs63jv2wf3w3"
   }
  },
  {
@@ -106397,8 +106629,8 @@
  },
  {
   "ename": "tagedit",
-  "commit": "8968e2cd0bd49d54a5479b2467bd4f0a97d7a969",
-  "sha256": "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1qykq6y6vqswwj9f6m5srp4imd841l94jhajzkpyaaa51saywp56",
   "fetcher": "github",
   "repo": "magnars/tagedit",
   "unstable": {
@@ -106492,11 +106724,11 @@
   "repo": "tmalsburg/tango-plus-theme",
   "unstable": {
    "version": [
-    20211222,
-    1100
+    20220525,
+    1311
    ],
-   "commit": "774b03f932bbc336ce5f943af175d5faa651f2e0",
-   "sha256": "0nl73ggirjs0a6zapqpp4h2wszkfbj8956qn3yg86fc0hk9jiz05"
+   "commit": "bdf1dd6ea9c43d07b22dfa15fec0dcfd03544c63",
+   "sha256": "01q6c2k9lkz1zpi816b9s99lwrnlf4ni9r0z45jx4fljsy59c0i3"
   }
  },
  {
@@ -106737,15 +106969,15 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20220503,
-    349
+    20220602,
+    2031
    ],
    "deps": [
     "rainbow-identifiers",
     "visual-fill-column"
    ],
-   "commit": "29010616931f52e3a5aa9d155c14873c09c7306b",
-   "sha256": "17cshy0ba7jiq36rj66k6m8swijzvpnwpfrgy0xvhgxsz115bhp6"
+   "commit": "892ac2e88f764af516abc307ff199cb819442e4e",
+   "sha256": "17ysqxb5j2qi3kkjwnb8rvwan6yz90av5967sypdss2by0hlwd97"
   },
   "stable": {
    "version": [
@@ -106998,8 +107230,8 @@
     "key-intercept",
     "term+"
    ],
-   "commit": "fd0771fd66b8c7a909aaac972194485c79ba48c4",
-   "sha256": "1dql2w8xkdw52zlrc2p9x391zn8wv4dj8a6293p4s08if7gg260w"
+   "commit": "2d98e976877a5ca71500ab57377b6e5a129fa2f3",
+   "sha256": "0jyl3jwbx6msbd2x1qlicdfbyrv71f1zwdh43zb7zif4i6r40znq"
   }
  },
  {
@@ -107017,8 +107249,8 @@
     "tab-group",
     "term+"
    ],
-   "commit": "81b60e80cf008472bfd7fad9233af2ef722c208a",
-   "sha256": "12gfvcf7hl29xhg231cx76q04ll7cvfpvhkb0qs3qn1sqb50fs2q"
+   "commit": "cd12a3744d4b7d37a002f4f7fcc4a45ea5be95c3",
+   "sha256": "1qxzs6z0wgzcrfl8mm0fvliax8k8ns0fww03pjjvjfskkfzlwmrk"
   }
  },
  {
@@ -107217,22 +107449,19 @@
   "repo": "davidshepherd7/terminal-here",
   "unstable": {
    "version": [
-    20220510,
-    806
+    20220519,
+    552
    ],
-   "commit": "24cb30dea30195108f85aceea28f086a84d47e5e",
-   "sha256": "0cqj8g1pbq24d6zgsd0dq85sam2sl7w2y29ksnv4a93krjw1i2hr"
+   "commit": "c16a500926416c09cd2faee6ab9541686b51e34f",
+   "sha256": "1iv1c2mbvhn00ha46c6f98j9syc71xhjpk8m5wa5p32sk4wcc9f4"
   },
   "stable": {
    "version": [
-    1,
+    2,
     0
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "e176d1675dc5c41b6aebd05122fb2efc44b6cff0",
-   "sha256": "0dj3z8czvziszb20sizgf1yriv4im811rcfadm7ga9zs2al56kqy"
+   "commit": "c16a500926416c09cd2faee6ab9541686b51e34f",
+   "sha256": "1iv1c2mbvhn00ha46c6f98j9syc71xhjpk8m5wa5p32sk4wcc9f4"
   }
  },
  {
@@ -107707,17 +107936,17 @@
   "repo": "monkeyjunglejuice/matrix-emacs-theme",
   "unstable": {
    "version": [
-    20220503,
-    1325
+    20220607,
+    322
    ],
-   "commit": "f2f69c3aa9c76dc3c27e9bf3c965e66f8b7f61cc",
-   "sha256": "00jylvw3h1r8lvpw50ca9gwiq4g8frxh7rhibdm9zisvjzw27p5w"
+   "commit": "403226efb0c38898a8a848c60b8da0f94470b055",
+   "sha256": "19dqbynjhwcyxdzp0zxx6kxzdb2kz9bal8xhpblf16ajga593g3g"
   }
  },
  {
   "ename": "theme-anchor",
-  "commit": "74f79dc5db5246a2f70e4d4ad76601be8b5c79d8",
-  "sha256": "15819kkxvhk03yfzd0qp78d5ayc33cm064gy7fdpi0aq28nbw6ba",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "12vdip9v2hz16scc936kbxr4jp9cnmkzri5w1sz9w56hfrav927l",
   "fetcher": "github",
   "repo": "GongYiLiao/theme-anchor",
   "unstable": {
@@ -107904,18 +108133,18 @@
     20200212,
     1903
    ],
-   "commit": "200776bcf1296360707c5b8a3f18d2b8817da888",
-   "sha256": "0s1pzpcx6g12hnn48gfyfp9wai5yk6rnsjzn82661rdmhjwm2z64"
+   "commit": "d00a78590a91c6fccb361713d32b846c22164af5",
+   "sha256": "059wbqiij52hxmx0i65baifk421d2i2qrnsp51i5ayk5w8ai1iwh"
   },
   "stable": {
    "version": [
     2022,
-    5,
-    9,
+    6,
+    6,
     0
    ],
-   "commit": "321b08352d043708869d5c15f961610392afca16",
-   "sha256": "0pynyavfwwylqibj4az58a3q45di540d0j6dwdwywihn470cinvz"
+   "commit": "954b49b17037fe12fdcbffadcf42c0e525b3233e",
+   "sha256": "1w4yjqpqah3w2c58m6b73qsamknsy9i1i8rwgqnw9srr1ba6as55"
   }
  },
  {
@@ -107971,8 +108200,8 @@
    "deps": [
     "haskell-mode"
    ],
-   "commit": "39389e4080144c6734dbe3020cc35185f025ebf0",
-   "sha256": "14gb1az5gmlq6j7lx4d2cdkb9kr0jad6whd4b0l9h608s86057v7"
+   "commit": "fda9c1ecb3722698935245e5409ef8ccdfca16c8",
+   "sha256": "117r67apl06z2smyb5j2a45m4a9s2i8izjxllascc18q4vjlrqxl"
   },
   "stable": {
    "version": [
@@ -107995,8 +108224,8 @@
   "repo": "ananthakumaran/tide",
   "unstable": {
    "version": [
-    20220429,
-    1501
+    20220514,
+    614
    ],
    "deps": [
     "cl-lib",
@@ -108005,8 +108234,8 @@
     "s",
     "typescript-mode"
    ],
-   "commit": "83c34c636f47cb0c10c7d1a728fa308bfec40890",
-   "sha256": "19yg6zij9jx39d8b6c41ipa0z99q0af4l59pmnpxv8pfadxvi9qg"
+   "commit": "96bfc5da11a9b83b32368c38e933a405270652de",
+   "sha256": "1py0z8nrkgh3lzsmgxq62bi2nbdx3c97194frjyb5wl81kh4pbbp"
   },
   "stable": {
    "version": [
@@ -108033,11 +108262,11 @@
   "repo": "emiliotorres/tikz",
   "unstable": {
    "version": [
-    20210927,
-    1704
+    20220526,
+    521
    ],
-   "commit": "f9ea0793affa34be29e1861bfa559fd248b7d22e",
-   "sha256": "03jcj6vkb8i7jqfwyiix5achq5bgwvjz97w2pwr46v3hbrf4r62q"
+   "commit": "4b205afc5c88f050639135d1d57f1276db323842",
+   "sha256": "0ykhlyq45r0nzv03kbmdwxbhrydpls6iihcf0g43nq0fhswb20g7"
   }
  },
  {
@@ -108220,19 +108449,19 @@
   "repo": "aimebertrand/timu-rouge-theme",
   "unstable": {
    "version": [
-    20220501,
-    1753
+    20220525,
+    1239
    ],
-   "commit": "935e4907f01fba2c7c2ecaab88eb7c4163955c3b",
-   "sha256": "0651q30pvxqdfv31mn87jxxkhds3f7bqh8bl1dsn7k9l1j6l3xfz"
+   "commit": "5c6f406bf5815e6b72b09093b651b09c7c6769fc",
+   "sha256": "04wjz4xzbb5ps16bfvwd39ifh7y880g4n1di76kn9mylc445a0kq"
   },
   "stable": {
    "version": [
     1,
-    2
+    4
    ],
-   "commit": "fe86f7d9864d986c7c8c430b6100070ab86dbbf1",
-   "sha256": "0651q30pvxqdfv31mn87jxxkhds3f7bqh8bl1dsn7k9l1j6l3xfz"
+   "commit": "02281cde75ab7e5bb624003dc0de035dc14f2469",
+   "sha256": "1xv0cjiwl86hvyb9f8awjwx14b158qpnlmfxlxn7f0z3lzim9d7x"
   }
  },
  {
@@ -108243,19 +108472,19 @@
   "repo": "aimebertrand/timu-spacegrey-theme",
   "unstable": {
    "version": [
-    20220501,
-    1509
+    20220525,
+    1238
    ],
-   "commit": "1318c58a118c6c5a95a82e71da5eda6bfcf8f143",
-   "sha256": "1vav4f6g86fh71ddprql0m8b05f4h8l04n7jfskfmvpfwgw2w87r"
+   "commit": "d9ff61d8e5393952e19da434b9f226be75eee493",
+   "sha256": "0649npmyj4x1hi57dic7gmr49723q0dv5ccj824qjq3jb0ng21hm"
   },
   "stable": {
    "version": [
     2,
-    0
+    1
    ],
-   "commit": "9e1a12a494537472fb1f9f9f23dc38b8bca1f9af",
-   "sha256": "0bndwcpz2alzimlmkcpcdxsl5xvckks22xmqn78rkg9pscl10gjq"
+   "commit": "d8db5dceb95144ad50c1dc3577196eef7a10d5b3",
+   "sha256": "14r325a9qq9xigqbp03dbblc8lnw3hz7hbnmj9d58jshd6avdcnc"
   }
  },
  {
@@ -108341,17 +108570,17 @@
  },
  {
   "ename": "titlecase",
-  "commit": "b82998e77fb69c640077db8d9a37c7c25859f820",
-  "sha256": "1rvlzq2b7rvp91ac689na04mdfirryxmp820xfzvxz4cm483knc8",
-  "fetcher": "github",
-  "repo": "duckwork/titlecase.el",
+  "commit": "eb90d69154a8977fab35f4a272274b34320af4cd",
+  "sha256": "0qc5xqjj742qr46ylb949wagvm06j6xwkh6n00w8h9a76ims1v9c",
+  "fetcher": "git",
+  "url": "https://codeberg.org/acdw/titlecase.el",
   "unstable": {
    "version": [
-    20220510,
-    331
+    20220516,
+    1909
    ],
-   "commit": "8f609e46d4d0c06cd442352ca7d296e2ccb1b62a",
-   "sha256": "12ghq6zcv3ldcfr9c0zhlrq8kscf7fz2irpil7zq926alcqiqxkl"
+   "commit": "ca79d9b25e8bab5eef92b13dc69ac0c38ac39172",
+   "sha256": "179h6pzz2nw6b7zbp6w67xckhh12fibk02wh1jyv1i8nic32sfr1"
   },
   "stable": {
    "version": [
@@ -108474,16 +108703,16 @@
   "repo": "abrochard/emacs-todoist",
   "unstable": {
    "version": [
-    20220412,
-    2337
+    20220517,
+    1814
    ],
    "deps": [
     "dash",
     "org",
     "transient"
    ],
-   "commit": "f6906be346073f082a6d1f9ae14932ec2bfd99f5",
-   "sha256": "0iwsic69cffwiy63dhxmypy89zvadrr82pjcn228ipdnimkgd11p"
+   "commit": "f9ec1e730705f1fc8888f11a2b4ef1a4907e2f0b",
+   "sha256": "0kay18q6nr8skib17hx2sswcxdzgp00wf23avnnqacy90x540pv8"
   }
  },
  {
@@ -108548,8 +108777,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "09166f32d3ece2b297da036f0abbeba63329580e",
-   "sha256": "09j3mxa0803piywmfkvxg0jpgbx6qbvibsik8wsms898bg5n3s4d"
+   "commit": "7725c08f00a463ba7210efcb759c934223c85b00",
+   "sha256": "1dqascm5ds9jzp4m4hdb4l9wwfcnkc1ba3y4m24ybx43gjj38sxn"
   }
  },
  {
@@ -108605,11 +108834,11 @@
   "repo": "topikettunen/tok-theme",
   "unstable": {
    "version": [
-    20220509,
-    1324
+    20220601,
+    708
    ],
-   "commit": "a1a224d96665ee14c059eed63dc4b458f6b7a8d8",
-   "sha256": "0amcvd7x1llfjk2a78rkgia6n7vmrpqnh4xq28aczsi1z6khnkvz"
+   "commit": "3e7e946f0e474fa2d2a5bbdddf7f168e6ed759ba",
+   "sha256": "0jd54rxrc3b26z3d9p4d8bg9dxs5p20s5qkc0h3vfbwfhcjj2vwf"
   }
  },
  {
@@ -108626,8 +108855,8 @@
    "deps": [
     "magit-section"
    ],
-   "commit": "181021cd881eecd604a546d4a717866a81c7a511",
-   "sha256": "0gcjlcfxd4bg123gjf7d0vfvfd6zpd0da8svynglca1qhp77jkx1"
+   "commit": "08db7ef62b3bcab5e1e1abf0a427d478db04420b",
+   "sha256": "01zyk465w5j74jal1nqcn00ppn093mg227zj5glgx21qvym0lms2"
   },
   "stable": {
    "version": [
@@ -108658,8 +108887,8 @@
  },
  {
   "ename": "toml",
-  "commit": "bab369a63ca0e7fcfacfcb9ac3847ac4e631b28c",
-  "sha256": "0kqv6zkywa7kqh8kg1dzcgkbi91lwx335przdakndm1lfai38i9b",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0f081wsvnycbqxpxz61figphw3sn5pg05lxr0vwvzypdkrvwb8xv",
   "fetcher": "github",
   "repo": "gongo/emacs-toml",
   "unstable": {
@@ -108739,20 +108968,20 @@
   "repo": "trevorpogue/topspace",
   "unstable": {
    "version": [
-    20220512,
-    2008
+    20220608,
+    1302
    ],
-   "commit": "86127bf20f241a3c421b13523f0de6590fe42055",
-   "sha256": "1ahi1kgfis3khbgr3ps9ms71nc4b10aydd97q9mpm6h5rxvl2iv8"
+   "commit": "6692cd1346ce0b0a1fbdcbfa496b49365bcd660b",
+   "sha256": "18lj15y63lx57vzximsa0f7rhbr4vr39abj0r4b7fl5ivs46k3gy"
   },
   "stable": {
    "version": [
     0,
-    2,
-    1
+    3,
+    0
    ],
-   "commit": "9760a3ab5ebcde43ab93246fd9cb93732c5d8647",
-   "sha256": "1xk4nyivzhlxigsxbxfhvf7zp8bwbmp5hkzcqnz8xg9b6zdn7lz8"
+   "commit": "6ed32d242666b4a38276de433aca9f6387dd867b",
+   "sha256": "1yxcig19wkr0592iips3bh7mj1g9yhv0v2yaw19jaxqg1rzg3hip"
   }
  },
  {
@@ -108934,32 +109163,32 @@
  },
  {
   "ename": "tr-ime",
-  "commit": "b7ea719d0923650050b252ec0ff6fc8bd7484e99",
-  "sha256": "0py1qq6wnyg3mn0smnrxijvx5spy92cgn0awa0svn375css79kbk",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "1ij930ixa6dcxwsgi4gjwrzrhldyqspqf12flma983ykhn3km39k",
   "fetcher": "github",
   "repo": "trueroad/tr-emacs-ime-module",
   "unstable": {
    "version": [
-    20211120,
-    718
+    20220604,
+    1107
    ],
    "deps": [
     "w32-ime"
    ],
-   "commit": "e6313639afb51d91efcc417bd0c81afd13bb079c",
-   "sha256": "0hcqpvvjndddwcg81c2xz3msjghilym5lvbayc6wj0hk47xs9ylc"
+   "commit": "87f0677220b755f947fe5f373b6a34e1afb82f3c",
+   "sha256": "1xvhagynkhx4l0smbg9lz1kas7y25jpg66m1q5b32z3aagm90sb1"
   },
   "stable": {
    "version": [
     0,
-    4,
-    1
+    5,
+    0
    ],
    "deps": [
     "w32-ime"
    ],
-   "commit": "5cb95d1fa59f46215d637916168a9eb1fc5e857f",
-   "sha256": "1xixsfzkv4hdirwm06d55dvdkfh2jvhpkl8r91a1xlqqg20f6rag"
+   "commit": "87f0677220b755f947fe5f373b6a34e1afb82f3c",
+   "sha256": "1xvhagynkhx4l0smbg9lz1kas7y25jpg66m1q5b32z3aagm90sb1"
   }
  },
  {
@@ -109015,8 +109244,8 @@
     20210713,
     1609
    ],
-   "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c",
-   "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937"
+   "commit": "41cdc116b09818d33f5cb0fc1d72c025c23aa2f1",
+   "sha256": "0hmclqaagnqvyvxb93vi1qdyvqm53hsyjyv1b4zh79hwzvn6s8g3"
   },
   "stable": {
    "version": [
@@ -109113,20 +109342,20 @@
  },
  {
   "ename": "transient",
-  "commit": "325cca8031b99c6abe2ee9858a6b547d1af0cdde",
-  "sha256": "1pq7pimnkx1j5mia4wjahn9bd4c0jzm98bhhr4am8j8pg2pym49s",
+  "commit": "af5c1593052d63146e850683c461a760ab166033",
+  "sha256": "11a2m4vdccn2yfn5aj2g5smiml69vidir9ss8c70pld17z1wzx07",
   "fetcher": "github",
   "repo": "magit/transient",
   "unstable": {
    "version": [
-    20220509,
-    1943
+    20220527,
+    2213
    ],
    "deps": [
     "compat"
    ],
-   "commit": "6fc09a663e408ade0d1b88f47701c96a9b051e34",
-   "sha256": "0xihkzz94s84xkl60hi388lhcdiwnlyq2mpnnqn0vf54amjfdh7x"
+   "commit": "2e4426fe8161893382f09b3f4635e152ee02488e",
+   "sha256": "1ila9yn99vbbllmzn3ysfvwhavc930g9av6faqai8m4abs0j05k5"
   },
   "stable": {
    "version": [
@@ -109279,8 +109508,8 @@
     20200910,
     1636
    ],
-   "commit": "1e151e5fc841688f1c4d68e9acc0f7b410cd754c",
-   "sha256": "1x3xdv789b3j8zm1zpd8v1m0712p1z9xi553yspp714w30dzxrs5"
+   "commit": "4128b85b1ee075a55c88fd53d04823cb48a3cce6",
+   "sha256": "1b8df9bnsyx8gx70inp2waxi00n5bq7j0w7sgjp9bcz3514iwd76"
   },
   "stable": {
    "version": [
@@ -109423,8 +109652,8 @@
  },
  {
   "ename": "tree-sitter",
-  "commit": "f07a741d1a14f99a634041cc9b4c200e75461ae5",
-  "sha256": "0rnk77pk0rmfl9azag4l2q3x2f1achykxjdm0q7aj82rvf60f5mb",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "0y02pqxwpz6q00n2d2m9xnry9ig7kp1f88lshs3crvm1bl7j8609",
   "fetcher": "github",
   "repo": "emacs-tree-sitter/elisp-tree-sitter",
   "unstable": {
@@ -109556,8 +109785,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20220511,
-    1852
+    20220601,
+    1749
    ],
    "deps": [
     "ace-window",
@@ -109569,8 +109798,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
-   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
+   "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030",
+   "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr"
   },
   "stable": {
    "version": [
@@ -109606,8 +109835,8 @@
     "all-the-icons",
     "treemacs"
    ],
-   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
-   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
+   "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030",
+   "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr"
   },
   "stable": {
    "version": [
@@ -109637,8 +109866,8 @@
     "evil",
     "treemacs"
    ],
-   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
-   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
+   "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030",
+   "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr"
   },
   "stable": {
    "version": [
@@ -109667,8 +109896,8 @@
    "deps": [
     "treemacs"
    ],
-   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
-   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
+   "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030",
+   "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr"
   },
   "stable": {
    "version": [
@@ -109698,8 +109927,8 @@
     "pfuture",
     "treemacs"
    ],
-   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
-   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
+   "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030",
+   "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr"
   },
   "stable": {
    "version": [
@@ -109731,8 +109960,8 @@
     "persp-mode",
     "treemacs"
    ],
-   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
-   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
+   "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030",
+   "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr"
   },
   "stable": {
    "version": [
@@ -109764,8 +109993,8 @@
     "perspective",
     "treemacs"
    ],
-   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
-   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
+   "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030",
+   "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr"
   },
   "stable": {
    "version": [
@@ -109796,8 +110025,8 @@
     "projectile",
     "treemacs"
    ],
-   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
-   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
+   "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030",
+   "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr"
   },
   "stable": {
    "version": [
@@ -109827,8 +110056,8 @@
     "dash",
     "treemacs"
    ],
-   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
-   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
+   "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030",
+   "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr"
   },
   "stable": {
    "version": [
@@ -110152,11 +110381,18 @@
  },
  {
   "ename": "ttl-mode",
-  "commit": "f91dc8c20b7b8a06cc2ee25b6f376aac3a6ad2c8",
-  "sha256": "07jryy2dws2q0v3184fzijx68gz65rv83csfwr5llm9ic6xmw5ky",
-  "error": "Not in archive",
+  "commit": "0575169e8fb9a2537582f5aa77fc9950f1f1384c",
+  "sha256": "1fi8xxzwz3h7kgn69h4p1wlvhvia0v8qqh7k64pgh44b2fq040p1",
   "fetcher": "github",
-  "repo": "nxg/ttl-mode"
+  "repo": "nxg/ttl-mode",
+  "unstable": {
+   "version": [
+    20170920,
+    1329
+   ],
+   "commit": "8aa647178942c9be58e5c9cea1e6ede30c8fd562",
+   "sha256": "0sy8v6m4769390mj8qws106m4vky0hkc3dqg5142icsqiybhmsw0"
+  }
  },
  {
   "ename": "tuareg",
@@ -110574,11 +110810,20 @@
   "repo": "md-arif-shaikh/tzc",
   "unstable": {
    "version": [
-    20220126,
-    604
+    20220513,
+    434
    ],
-   "commit": "3af821d2125a67786f93d50d532a71f681f381cc",
-   "sha256": "0zd0g5qdm4w0jj37n0ijcknz74xgb3f9s0w72qz8zapf5n8q9mbp"
+   "commit": "f4e2273b65ace1ea56c9824c3bdb97925c98c8ba",
+   "sha256": "0aij1425cwj7423nls1dywxsr2xvzbmz0y6b2rargicxl066swrf"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "commit": "f4e2273b65ace1ea56c9824c3bdb97925c98c8ba",
+   "sha256": "0aij1425cwj7423nls1dywxsr2xvzbmz0y6b2rargicxl066swrf"
   }
  },
  {
@@ -110852,8 +111097,8 @@
     20200719,
     618
    ],
-   "commit": "b7b5bffe242fd15b9eb8fe5cb7c9b45e474babbc",
-   "sha256": "0rbm3gq1b1w1f3gg7h9sncjp088dg7rd5vn3vakh140p289rwirx"
+   "commit": "1bba7a3d42885a7ce432ca18d3755c40f2af6d27",
+   "sha256": "0hql80w0zl87piwwp2q3ccl71vd3c064kppv9kdrz6lnh3amjh3k"
   },
   "stable": {
    "version": [
@@ -110947,8 +111192,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "ec95d5038425bca375865803701c971a9c748114",
-   "sha256": "0k6mrsbfhacz4ipcggb4x3gln8bqz2nxk8zapidz6vb11fgay8my"
+   "commit": "81350551de9cdc4a9a3e4f00ff5907714eef24dd",
+   "sha256": "0s95cskrkyrz60v7hvsf3s4nkil82xclmkphg1fax7xgf27vnc1l"
   },
   "stable": {
    "version": [
@@ -111275,20 +111520,20 @@
   "repo": "DamienCassou/unify-opening",
   "unstable": {
    "version": [
-    20171122,
-    2012
+    20220521,
+    911
    ],
-   "commit": "502469ddba6d8d52159f53976265f7d956b6b17c",
-   "sha256": "0mni9vnbs50wvgnwfjwgzlwfff38h3wbrpr20nv84dmfh8ac0v61"
+   "commit": "9d537094220f5ec329b196e269e18b45dbdd1fa2",
+   "sha256": "06awa2bmdpxxazy3j24pd11wqmym6p9xzd9dg407wg2v0n3x7im3"
   },
   "stable": {
    "version": [
     2,
-    1,
+    2,
     0
    ],
-   "commit": "502469ddba6d8d52159f53976265f7d956b6b17c",
-   "sha256": "0mni9vnbs50wvgnwfjwgzlwfff38h3wbrpr20nv84dmfh8ac0v61"
+   "commit": "4c6e3447e203a51af116a2117e88d41114950205",
+   "sha256": "0pmln3z3vz3qnxbv79n8lrk28k9759czz6wllk81m1np5k6yjhnj"
   }
  },
  {
@@ -111796,8 +112041,8 @@
     20220220,
     150
    ],
-   "commit": "0cb20745e3889f4eb8ea49c4a748f34f9ddf1fa6",
-   "sha256": "1840m49s0wnk376va05n2vq9877x3siri15da8z6mqrh02sj1fa9"
+   "commit": "4cc7a372f035674f4037a0051c125739bc2e3299",
+   "sha256": "0dpwsfg3nmr39vxidk2jlsd1f4dryalzcbh6fcszpmhijx2pk63p"
   },
   "stable": {
    "version": [
@@ -111932,8 +112177,8 @@
  },
  {
   "ename": "v-mode",
-  "commit": "247cab604cf0ef6078f5b0f5887526bcbbcefb70",
-  "sha256": "0jky9y06fqj06m4mg95h8k3h5fihf9j9qj4w3n836qg5lnb4ywga",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0a5arb0d6r868j4y83d4j8wi1vn5xfx5ccsp41ix5fz5ldpzpw1w",
   "fetcher": "github",
   "repo": "damon-kwok/v-mode",
   "unstable": {
@@ -112204,11 +112449,11 @@
   "repo": "venks1/emacs-fossil",
   "unstable": {
    "version": [
-    20210928,
-    737
+    20220607,
+    617
    ],
-   "commit": "7815c30d739a01e1100961abb3f2b93e0ea9920f",
-   "sha256": "0j33cmnl9ka2r7ahf84dkj6y2lf8m455986y7rms1d62ih9fq6ds"
+   "commit": "8ce6113aa272583130e5f929fefd67115c8f572a",
+   "sha256": "087na2g22dnyw52cwaxkzdgbl13p2ldvby7lmqg05bm02cmsv9c2"
   }
  },
  {
@@ -112243,26 +112488,26 @@
   "repo": "redguardtoo/vc-msg",
   "unstable": {
    "version": [
-    20211224,
-    1354
+    20220526,
+    1435
    ],
    "deps": [
     "popup"
    ],
-   "commit": "3ad560afc1e0610acd1ce4b9509aedae66276b91",
-   "sha256": "02lbjpfyy1hl6kdml9mm7m8aaawaphwqzk3cljw50a0z2m7xrk63"
+   "commit": "720c6f0e699f25463cd37642ee23adb4e23bc60b",
+   "sha256": "0pn4gpxzgxlz12h4yymqdfmvic51jc5s3b973wl3qjizv1j1062l"
   },
   "stable": {
    "version": [
     1,
     1,
-    0
+    1
    ],
    "deps": [
     "popup"
    ],
-   "commit": "6c94578b5c692ade27c8b34bf5d99333ee7b4680",
-   "sha256": "1p54m71ypvz7x5wyzv0lfrxfsx23ipmb4zkq6dm0ppgh9al9hd7k"
+   "commit": "720c6f0e699f25463cd37642ee23adb4e23bc60b",
+   "sha256": "0pn4gpxzgxlz12h4yymqdfmvic51jc5s3b973wl3qjizv1j1062l"
   }
  },
  {
@@ -112389,16 +112634,16 @@
   "repo": "justbur/emacs-vdiff-magit",
   "unstable": {
    "version": [
-    20210908,
-    135
+    20220518,
+    1948
    ],
    "deps": [
     "magit",
     "transient",
     "vdiff"
    ],
-   "commit": "d3a39c3f8cb7ad9a6a769ce45f633b613b067490",
-   "sha256": "0ci5zsmd4r7z8h7g19ddd29y09lja0ikkm9rp8d2whxi9fz37dha"
+   "commit": "413f32c9f7e66f8379c23b5ab6341695dbcc2f20",
+   "sha256": "1zr6j6lw0x5w06sjlx8vnrrp1kx87zhm505plkb31hspf0ggsqlq"
   },
   "stable": {
    "version": [
@@ -112638,8 +112883,8 @@
  },
  {
   "ename": "verona-mode",
-  "commit": "342867cf256c6e6c242387b6d8c439a7a90f17dc",
-  "sha256": "1w94hs8mkd6qfklgm7hxb8j7ykvif25czpha0yq7ghbfc0vb3595",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0qkrfgf9mpf3jphspzpw9sk3d0x9nfx1rcf7ff3s6m470vmg7xbr",
   "fetcher": "github",
   "repo": "damon-kwok/verona-mode",
   "unstable": {
@@ -113071,19 +113316,19 @@
   "url": "https://codeberg.org/joostkremers/visual-fill-column.git",
   "unstable": {
    "version": [
-    20220426,
-    2045
+    20220519,
+    1959
    ],
-   "commit": "cdfe574a51c4fc3519536fa3b169b01d5482d5df",
-   "sha256": "1gimqhpnagv675wsb1yr50wxf8fwxlviks515yhyxn65hgl2x4wn"
+   "commit": "453d698d7fc243a547665f8ba43c55eee574e0db",
+   "sha256": "168wiywaffhhn7j4nfbnq4lfxpxl0x17z9ckk3nwkpaz45d9a2q6"
   },
   "stable": {
    "version": [
     2,
-    4
+    5
    ],
-   "commit": "6fa9e7912af412533aec0da8b8f62c227f9f3f54",
-   "sha256": "1wfww6bqdphv871in80fc84ml8gkl04il6w51z2ycx99km8b723l"
+   "commit": "453d698d7fc243a547665f8ba43c55eee574e0db",
+   "sha256": "168wiywaffhhn7j4nfbnq4lfxpxl0x17z9ckk3nwkpaz45d9a2q6"
   }
  },
  {
@@ -113299,11 +113544,11 @@
   "repo": "emacs-vs/vs-dark-theme",
   "unstable": {
    "version": [
-    20220414,
-    930
+    20220515,
+    714
    ],
-   "commit": "2801a2354d93920dcd12da3d1090954aec9f7402",
-   "sha256": "1w4fkb7yp8cmpyxqyghiz4rqkzajjh1nqf5wjnxhvjv0av1lddhn"
+   "commit": "29694e7951374a8711a0a84a6fd76c70946cc2cb",
+   "sha256": "1h37hrpiiarw8lhqqw92zkxqb4wyl488kw5l3hp7q36p3dxbs4g1"
   },
   "stable": {
    "version": [
@@ -113322,11 +113567,11 @@
   "repo": "emacs-vs/vs-light-theme",
   "unstable": {
    "version": [
-    20220414,
-    931
+    20220515,
+    714
    ],
-   "commit": "73e8431576e5b65c227dcf37c7d1a5c609221ac9",
-   "sha256": "0fxwcxdr7ssj7v5bsx42zinas6fp3iigdh98j1mqm54xm61a58jc"
+   "commit": "718c458901ec58db2844a2960ebe01581574efe4",
+   "sha256": "1fn1s34g3nys5z2rc1w1lm8879043afp9fz4i4zhxyl5dq4ly5jk"
   },
   "stable": {
    "version": [
@@ -113414,14 +113659,14 @@
   "repo": "jixiuf/vterm-toggle",
   "unstable": {
    "version": [
-    20220416,
-    1034
+    20220606,
+    1524
    ],
    "deps": [
     "vterm"
    ],
-   "commit": "644e9df9f741c3338c248291799375a1778eb98b",
-   "sha256": "19c8z0nfhavimxr8nc5m67k8yxfzr7vaanjrxs3c6zip35nqrn8w"
+   "commit": "02519323aa0a2e6af641cd205b230f48a04a5ca3",
+   "sha256": "15na73bil1kfyg3915d1gm7lsl6k4p81x7ybwr79lx8qpw9rlqvg"
   }
  },
  {
@@ -113655,11 +113900,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20220508,
-    2259
+    20220606,
+    2300
    ],
-   "commit": "7baf17355289c29d18f993f383c5d6a187f33b35",
-   "sha256": "1a2m6jkvnv852q07wvi80nbm7437wnvdfdyiq4iffhffmz8c2mrr"
+   "commit": "45155e42ea10990295d47d5ee3cb29be16a1f9f6",
+   "sha256": "1cjz3sli309i2qrwxic63x1am4hpn8r9gwjnfjb62b954wdhhf97"
   }
  },
  {
@@ -113771,10 +114016,10 @@
  },
  {
   "ename": "walkclj",
-  "commit": "44472b35938fe70d4cb3d15397495fe321fcd464",
-  "sha256": "0m971dlazildhgj8jqg4x679i6s6p80mbpri7l24ynxk45wix22m",
+  "commit": "27981293c1787aa41ede18d529b9c2efa30b3608",
+  "sha256": "10d44mxk03dq0vvwy634ca6a15byf9gb5vljzrrqn3bhrh2am8q5",
   "fetcher": "github",
-  "repo": "plexus/walkclj",
+  "repo": "corgi-emacs/walkclj",
   "unstable": {
    "version": [
     20220422,
@@ -113872,15 +114117,11 @@
   "repo": "cmpitg/wand",
   "unstable": {
    "version": [
-    20210511,
-    725
-   ],
-   "deps": [
-    "dash",
-    "s"
+    20220519,
+    1214
    ],
-   "commit": "08c3d9156517a31dd98ea64bfc269fae730b643c",
-   "sha256": "18xgi1anficjl6cnhhv197zbrnb0p63pnj8gshvixb6fr4ybw8k0"
+   "commit": "e4afc0469c818e7ce73ef31c38d911477947d72e",
+   "sha256": "1gcmzqpv8s87s5md3nr2s0vvbp68c4na5zmmwc080x9nf8q3hnm4"
   }
  },
  {
@@ -114169,18 +114410,20 @@
   "repo": "fxbois/web-mode",
   "unstable": {
    "version": [
-    20220319,
-    653
+    20220531,
+    615
    ],
-   "commit": "efa853e5cfff8e0bcacbda9d1c6696b33da91b03",
-   "sha256": "1hpdr9r1wvvh44iqkv1lcfnjlvn16yrsgdq2ald2p6sxh9hkvn66"
+   "commit": "cdbd74b5e71d78ca7cb0768771f38e7b764fa0ac",
+   "sha256": "0ghkdnq1iad2flz49fwjxxn9q1ryiwq65276axbx1j7572rxshwa"
   },
   "stable": {
    "version": [
-    17
+    17,
+    2,
+    1
    ],
-   "commit": "d115f8dc3052e5779938d782d9cdaa4533ef20ff",
-   "sha256": "0jr5a1nzp8nbdng0k2fcaymiiv9ngrbknbrqaswgqn3akvx793jk"
+   "commit": "8edf9048c326e8230c4245d8bf3461395b38af84",
+   "sha256": "0sd2ysysn8x4iwz2fhnvh8knr3pdqgkvhkhsl948smmfl0dwj42f"
   }
  },
  {
@@ -114376,15 +114619,15 @@
   "repo": "etu/webpaste.el",
   "unstable": {
    "version": [
-    20211211,
-    658
+    20220524,
+    1745
    ],
    "deps": [
     "cl-lib",
     "request"
    ],
-   "commit": "78272662e6992b8614e79a571ff2395fa9630357",
-   "sha256": "07hj9nr7x6c9w2dnvc58cfbprgp9cqzdxflp5qlpglzdw0bi9s3c"
+   "commit": "d96da58fe42988d5c433c71ee9f8e6fb75d595a9",
+   "sha256": "0h4cp334ga2vk89gmkhycqzakxsjldql98a687y57ixpq7ri8qsq"
   },
   "stable": {
    "version": [
@@ -114706,11 +114949,11 @@
   "repo": "justbur/emacs-which-key",
   "unstable": {
    "version": [
-    20220419,
-    227
+    20220518,
+    1941
    ],
-   "commit": "129f4ebfc74f207ac82978f6d90d8b4bb1a55cf9",
-   "sha256": "065jfwnz9ymv5xiiyhnhsi5sm03ah5985hnm5psay6z9msskcnx8"
+   "commit": "1ab1d0cc88843c9a614ed3226c5a1070e32e4823",
+   "sha256": "0i4wxihcly3i8pgmw1gv7lriqcyis9q476akvwrdgjwxnn2gmk0w"
   },
   "stable": {
    "version": [
@@ -114845,8 +115088,8 @@
     20210510,
     533
    ],
-   "commit": "b2e35321f03914cae90be4f942d911b7e7175899",
-   "sha256": "14ralz7jn98ckcmwshq1yg35bpybjlfw04cxy9qcnk67sfnp3ggv"
+   "commit": "f60154a992ca4048c71e3815a628be2ec9185c79",
+   "sha256": "03jbi0xrc8zrb9hnynf5b98pmn5xkymcid55km0pxmimsnrl0hk3"
   },
   "stable": {
    "version": [
@@ -114941,11 +115184,11 @@
   "url": "https://codeberg.org/akib/emacs-why-this.git",
   "unstable": {
    "version": [
-    20220510,
-    1146
+    20220601,
+    1132
    ],
-   "commit": "71baf80f9ae7c1117f3b1bf531e23e43bf567424",
-   "sha256": "1cwasg2dyy86c3hh71xqqsl7wy5c6mf9mnaf251l5fa5895xhbff"
+   "commit": "0975f5b57ffc77bf4aa871aa313085b80c5e43cd",
+   "sha256": "1lilp6adi8k1f6ww02mzr729h22paz7daqvlych07qm7aznl37aq"
   }
  },
  {
@@ -115167,8 +115410,8 @@
  },
  {
   "ename": "window-layout",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "061mvxcj4mg2pmkln7nn6gyscs08aid4cfc6xck0x5gzr1snr639",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "1ypr77ygr4g47mykd7kgcyf30fjcb29bj14wjdklkjk08wjj09xg",
   "fetcher": "github",
   "repo": "kiwanami/emacs-window-layout",
   "unstable": {
@@ -115205,8 +115448,8 @@
  },
  {
   "ename": "window-numbering",
-  "commit": "ce1dc80f69894736b276885e4ec3ce571a8612c9",
-  "sha256": "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "0d70c31rxnhxjkpcmjvwkyky1dpyv9ksmw9hx3jzgvxng60wi00g",
   "fetcher": "github",
   "repo": "nschum/window-numbering.el",
   "unstable": {
@@ -115432,11 +115675,11 @@
   "url": "https://hg.sr.ht/~arnebab/wisp",
   "unstable": {
    "version": [
-    20220208,
-    636
+    20220529,
+    1522
    ],
-   "commit": "d266109b95e73281ae3aa1ed9a023346b6d39d28",
-   "sha256": "0fr3p6cfqxxj01bix9aiglfb2ls2grr62l735wdkn2r7lfvf5hjx"
+   "commit": "1a01003d400db8a42838cabcb26c06d627246a17",
+   "sha256": "04sn6k7v8551lzxrbld59kzks55c96siwkr4v8l4havczz6yqcz7"
   }
  },
  {
@@ -115471,20 +115714,20 @@
  },
  {
   "ename": "with-editor",
-  "commit": "2133b10c735ce47fc8d8ff8c51f29ec4b13982a3",
-  "sha256": "1cyq6i54dhmj5pvdq475v39s82k2a0zg55zf7vz38n32cnasdhz1",
+  "commit": "af5c1593052d63146e850683c461a760ab166033",
+  "sha256": "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb",
   "fetcher": "github",
   "repo": "magit/with-editor",
   "unstable": {
    "version": [
-    20220506,
-    420
+    20220608,
+    1017
    ],
    "deps": [
     "compat"
    ],
-   "commit": "4ab8c6148bb2698ff793d4a8acdbd8d0d642e133",
-   "sha256": "1mc0ayfhxl8jpdgw2p6prdi4m3ab3hh7hv0p0kyxmlc9m6f3ablc"
+   "commit": "cfcbc2731e402b9169c0dc03e89b5b57aa988502",
+   "sha256": "02kdsksjn76g4fcqxnidzdy1zql25650fpdjjsx2ccdnbyj9fqax"
   },
   "stable": {
    "version": [
@@ -115791,14 +116034,14 @@
   "url": "https://codeberg.org/martianh/wordreference.el",
   "unstable": {
    "version": [
-    20220504,
-    2021
+    20220601,
+    650
    ],
    "deps": [
     "s"
    ],
-   "commit": "785a5d3245efdc3f32ce61fad1c7596230682f3a",
-   "sha256": "0g23d58lm6fvk2v5z8zvn09c9q3nffdq6w4mdhygj2xc2l3c6rcp"
+   "commit": "f1f0354dee403b0ee9b2187bc346e9badff69ec3",
+   "sha256": "0yq5vrampjibn7p9ixx8fp0jzdhw4acr7i5jxjczypnhp96f6vk0"
   }
  },
  {
@@ -115910,11 +116153,11 @@
   "url": "https://codeberg.org/akib/emacs-workroom.git",
   "unstable": {
    "version": [
-    20220501,
-    1500
+    20220607,
+    1715
    ],
-   "commit": "001fe2777f49ac73b6ab24401094a1c3c5efc887",
-   "sha256": "0haj4w8xcpm1yb3anla4ql2zi339hs6bcznxzl7qla575ff5sivp"
+   "commit": "c38489669e8b0ddc7a6a13544a099fc51b65d388",
+   "sha256": "1jng8a0qwsdxghpisvibjgxd0yr7l4nn5gvv16fpm2vfqjgaglwh"
   }
  },
  {
@@ -116138,11 +116381,11 @@
   "repo": "redguardtoo/wucuo",
   "unstable": {
    "version": [
-    20211201,
-    1214
+    20220526,
+    1431
    ],
-   "commit": "09fc58a02621b6c9615f8289c457e30ca6f63bcb",
-   "sha256": "15jva7qp723fpwv6f24300h8knmxrlsjb2icg9rzr0994g9f36qs"
+   "commit": "fe5dfb4e4db38f9fc944509a687812b8f419b958",
+   "sha256": "05h5wxzwzl5almgsk2mjas8in7h5kfmb06r3lfrwgydwxl3wmqnl"
   },
   "stable": {
    "version": [
@@ -116229,14 +116472,14 @@
   "repo": "jobbflykt/x509-mode",
   "unstable": {
    "version": [
-    20210407,
-    627
+    20220607,
+    715
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "470769edba111aed8eabce58a3f2a02da0767624",
-   "sha256": "19xvfzmsnc271a2zhjbnspb269c5mnps4l94ifrdlqn7y886qr4r"
+   "commit": "2b44e4aec3a733bd22e00a56906eb5151f8b8d81",
+   "sha256": "01w6bddbrx0bh2dkrwd1p98hpnp0k6w5r7nb3p9l95gk8pvvmnby"
   }
  },
  {
@@ -116353,8 +116596,8 @@
  },
  {
   "ename": "xenops",
-  "commit": "605c8ca551d54c79246310bcee678cdd854548b0",
-  "sha256": "0l9pwjbdyfs2mkp2n9xg16pv02y063l92302fmi0h8rwra81xrvv",
+  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
+  "sha256": "0lhi2qv43lfbivr9rz77qhadjqjwk086qn2r8ib2vdp94frwnwgs",
   "fetcher": "github",
   "repo": "dandavison/xenops",
   "unstable": {
@@ -116676,17 +116919,17 @@
  },
  {
   "ename": "xref-rst",
-  "commit": "2f6748512dc546f84b13733086cefb158bc7787c",
-  "sha256": "0crzzalphr4865a78wih085ycscg78h288hlq0dh6qk50siaxk1m",
-  "fetcher": "gitlab",
-  "repo": "ideasman42/emacs-xref-rst",
+  "commit": "6a5393b31e8bd789e14b998d68c25221905617aa",
+  "sha256": "00fmff7ph9wca7yp2iv31cs73h4kmnfjay99y1sglp5248wwqlxc",
+  "fetcher": "git",
+  "url": "https://codeberg.org/ideasman42/emacs-xref-rst.git",
   "unstable": {
    "version": [
-    20220406,
-    2311
+    20220518,
+    1102
    ],
-   "commit": "7964709276ff033cd138efabfafb4f2179e75c22",
-   "sha256": "15sdarz7iqifk9jazgp8l4v8ni48jb6rrixzmf1h60d5r3rf0z68"
+   "commit": "bc76bc228d51f64a2e57be8f230cf8a7746ea54a",
+   "sha256": "1yrvymgqwxib93dd6q57p3glj8ll6385wbnpzf3q7pbmdiihi82y"
   }
  },
  {
@@ -116996,20 +117239,20 @@
   "repo": "zkry/yaml.el",
   "unstable": {
    "version": [
-    20220311,
-    332
+    20220518,
+    1229
    ],
-   "commit": "34c300b08579b72c7c92aefee1f4b500913f0c85",
-   "sha256": "1lwhm3c7xmx1j9ggf9ka0whpm7g5p6b11gfv1bxkdx1j8ypvxn0m"
+   "commit": "adb3e52a214a5154267085639f95a3ffae1ec2d3",
+   "sha256": "0ziqjiszidr6kwnpwnzfsi1as0iawjvbg7nb9jhkbzvbal1mxh2s"
   },
   "stable": {
    "version": [
     0,
     3,
-    4
+    5
    ],
-   "commit": "84b88c9ed178af16da18b230c1f61c57cefedf28",
-   "sha256": "13fjxrr7iyfagbm21p5is5jw1zv56ns2mnac145v8lqli6mrr5gx"
+   "commit": "adb3e52a214a5154267085639f95a3ffae1ec2d3",
+   "sha256": "0ziqjiszidr6kwnpwnzfsi1as0iawjvbg7nb9jhkbzvbal1mxh2s"
   }
  },
  {
@@ -117242,8 +117485,8 @@
     20220212,
     1742
    ],
-   "commit": "25f6bf7415f6821a4097037a8decd03813d08722",
-   "sha256": "1dvrm7paaiy3f8mchhk2wxaaba3qzvl0hcld40k3miyjpdn2lfgs"
+   "commit": "48cad7618fece0d86023d0b1e0f1f0e37f63d2f5",
+   "sha256": "15hpv4sxmhq8g23my75kqzhkvqyanvna7knrsfgcdp0barx027wn"
   },
   "stable": {
    "version": [
@@ -117750,36 +117993,6 @@
   }
  },
  {
-  "ename": "zel",
-  "commit": "25b445a1dea5e8f1042bed6b5372471c25129fd8",
-  "sha256": "0fwc1fghsw2rg4fv10kgc9d6rhbq20xa9diqcvp1f1cqs12rfhpd",
-  "fetcher": "github",
-  "repo": "rudolfochrist/zel",
-  "unstable": {
-   "version": [
-    20171014,
-    832
-   ],
-   "deps": [
-    "frecency"
-   ],
-   "commit": "9dae2d212224d1deae1f62561fa8e4d689fd09f2",
-   "sha256": "1518wp3zjfdvzz5r22cjgn735c4yxr345qzj40b5agww4dsxmwmp"
-  },
-  "stable": {
-   "version": [
-    0,
-    1,
-    2
-   ],
-   "deps": [
-    "frecency"
-   ],
-   "commit": "1d938ac01a42e7a985a3f92f5e97bc09e057676e",
-   "sha256": "1hk84x4aqcfd3jggk9san1v4kr58v2zhikbv9sh3dcii6x5w2nv0"
-  }
- },
- {
   "ename": "zen-and-art-theme",
   "commit": "692cfa0e9edbc1b7114e2ae2f36bef34b20ad17c",
   "sha256": "0b2lflji955z90xl9iz2y1vm04yljghbw4948gh5vv5p7mwibgf2",
@@ -117826,11 +118039,11 @@
   "repo": "bbatsov/zenburn-emacs",
   "unstable": {
    "version": [
-    20220412,
-    2023
+    20220527,
+    1800
    ],
-   "commit": "89c0e39317850d5ccf14dcbbaff06b0a193454a6",
-   "sha256": "06f7jaglgrckfw36l2pb63y1qxn64svc7wa3c6np3hjpjs5y13f5"
+   "commit": "b600814c8ddfe8812582f4ba4b62db817d665860",
+   "sha256": "1d08g55z9m3cj3v9fvw647i6x7dz4g7z9c3y3yq35dlaz6rlsk0m"
   },
   "stable": {
    "version": [
@@ -118033,6 +118246,70 @@
   }
  },
  {
+  "ename": "zetteldesk",
+  "commit": "2d08d8964dbabc93de6a05ea29e9af3edfbe8957",
+  "sha256": "1kghvlbrqcg6fcq90igvjjy6zb544k1vkb0y82mf43n8zfsja12w",
+  "fetcher": "github",
+  "repo": "Vidianos-Giannitsis/zetteldesk.el",
+  "unstable": {
+   "version": [
+    20220528,
+    1904
+   ],
+   "deps": [
+    "org-roam"
+   ],
+   "commit": "177771d7e1eddf86e0b6f6e94332200cf26dedaa",
+   "sha256": "0zncqyzhmcvxprg4ba9wn6mgi35sih465r45bygcc97g19hlxy43"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "org-roam"
+   ],
+   "commit": "0237a5a0f9cc40dc543c9713c37bbb34d548de50",
+   "sha256": "1isqd3a0mkcfqqj386h3glmxq02323a1gdykf8wpsm67x8myjgij"
+  }
+ },
+ {
+  "ename": "zetteldesk-kb",
+  "commit": "6ade7599f12a93517f24f5871091fa74c6c2e387",
+  "sha256": "1mbvjn9hzdzq7bz39y0jyfxqa98zqh00npqrpli33xdjnrrlq6a4",
+  "fetcher": "github",
+  "repo": "Vidianos-Giannitsis/zetteldesk.el",
+  "unstable": {
+   "version": [
+    20220530,
+    2045
+   ],
+   "deps": [
+    "hydra",
+    "major-mode-hydra",
+    "zetteldesk"
+   ],
+   "commit": "177771d7e1eddf86e0b6f6e94332200cf26dedaa",
+   "sha256": "0zncqyzhmcvxprg4ba9wn6mgi35sih465r45bygcc97g19hlxy43"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "hydra",
+    "major-mode-hydra",
+    "zetteldesk"
+   ],
+   "commit": "0237a5a0f9cc40dc543c9713c37bbb34d548de50",
+   "sha256": "1isqd3a0mkcfqqj386h3glmxq02323a1gdykf8wpsm67x8myjgij"
+  }
+ },
+ {
   "ename": "zettelkasten",
   "commit": "ed12df24029a4154fe55588f3e8ca0670af3f5f3",
   "sha256": "07gbkpanzs4rk066gg3nm95mfv3ng1f0si17mv2qax2dfx5k0lzd",
@@ -118064,8 +118341,8 @@
  },
  {
   "ename": "zetz-mode",
-  "commit": "ad2add185cf31a92ca1fcd3a9efcbcdb0aa9e583",
-  "sha256": "0k30c0f2h96vvb8yacpg710gi64swwslm1gljpzcwxni5kdpqkzm",
+  "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
+  "sha256": "121sjp8iy71mp2jm7h9fl05zmy32148y28q7v9l6hm6flz0wmi1j",
   "fetcher": "github",
   "repo": "damon-kwok/zetz-mode",
   "unstable": {
@@ -118102,11 +118379,11 @@
   "repo": "ziglang/zig-mode",
   "unstable": {
    "version": [
-    20211227,
-    1108
+    20220521,
+    1148
    ],
-   "commit": "aa20d630b8c413dab8d6bd120ec3ed5db5c9da70",
-   "sha256": "0d081n6244q4y2sbhdya87gacw742v5f62pfs7c3bwgq0pcng997"
+   "commit": "dbc648f5bca8f3b9ca2cc7827f326f5530115144",
+   "sha256": "0hwkkwhc5b2pzyqa2h0xw8wxijsrp1fk70fhyv8hx19shzlc4la3"
   }
  },
  {
@@ -118157,11 +118434,11 @@
   "repo": "localauthor/zk",
   "unstable": {
    "version": [
-    20220509,
-    2156
+    20220604,
+    1536
    ],
-   "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d",
-   "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6"
+   "commit": "2dee0650892494410c0e0a340c565b79606f53e4",
+   "sha256": "1bf19614bp7954j4d23d7mx30jshvb6dpd4cdpxkxil1h7dc7f5q"
   },
   "stable": {
    "version": [
@@ -118180,14 +118457,14 @@
   "repo": "localauthor/zk",
   "unstable": {
    "version": [
-    20220509,
-    802
+    20220604,
+    1536
    ],
    "deps": [
     "zk"
    ],
-   "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d",
-   "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6"
+   "commit": "2dee0650892494410c0e0a340c565b79606f53e4",
+   "sha256": "1bf19614bp7954j4d23d7mx30jshvb6dpd4cdpxkxil1h7dc7f5q"
   },
   "stable": {
    "version": [
@@ -118423,8 +118700,8 @@
     20201205,
     1038
    ],
-   "commit": "402f85f5d7d18e26289adcd452d42c73dc1df580",
-   "sha256": "1x7awisyb1vizpykmflvxw17x58xd2hj6dxq92xkpbswjj6fk238"
+   "commit": "9b052ac33d4eafe724d0e37d3376926deba91676",
+   "sha256": "1w59qa0xnnqc4pz6hfj3q9qq199ryyzd0nwwi84nyb48cpgbsyxh"
   },
   "stable": {
    "version": [
@@ -118591,8 +118868,8 @@
     20220302,
     522
    ],
-   "commit": "2133eb000b5239b08a1c2532629a19a19f8e6309",
-   "sha256": "15r4v3m9plygnkajaaf2y76a09am7r29d8h4yxh5fk7vb7cfyrw3"
+   "commit": "41c090402816b15eb226ff9368f0ca40c7244f92",
+   "sha256": "09hvl5ddggkgl4ckmnfhlwf2wwli1pw799sy5f5i6dr6r07mqi37"
   },
   "stable": {
    "version": [
diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix
deleted file mode 100644
index 2620a87ce4251..0000000000000
--- a/pkgs/applications/editors/kodestudio/default.nix
+++ /dev/null
@@ -1,135 +0,0 @@
-{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
-, # Patchelf dependencies:
-  alsa-lib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU, libGL
-, openssl, xorg, zlib
-}:
-
-let
-
-  version = "17.1";
-
-  sha256 = if stdenv.hostPlatform.system == "x86_64-linux"  then "1kddisnvlk48jip6k59mw3wlkrl7rkck2lxpaghn0gfx02cvms5f"
-      else if stdenv.hostPlatform.system == "i686-cygwin"   then "1izp42afrlh4yd322ax9w85ki388gnkqfqbw8dwnn4k3j7r5487z"
-      else throw "Unsupported system: ${stdenv.hostPlatform.system}";
-
-  urlBase = "https://github.com/Kode/KodeStudio/releases/download/v${version}/KodeStudio-";
-
-  urlStr = if stdenv.hostPlatform.system == "x86_64-linux"  then urlBase + "linux64.tar.gz"
-      else if stdenv.hostPlatform.system == "i686-cygwin"   then urlBase + "win32.zip"
-      else throw "Unsupported system: ${stdenv.hostPlatform.system}";
-
-in
-
-  stdenv.mkDerivation {
-    pname = "kodestudio";
-    inherit version;
-
-    src = fetchurl {
-        url = urlStr;
-        inherit sha256;
-    };
-
-    nativeBuildInputs = [ makeWrapper ];
-    buildInputs = [ libXScrnSaver ];
-
-    desktopItem = makeDesktopItem {
-      name = "kodestudio";
-      exec = "kodestudio";
-      icon = "kodestudio";
-      comment = "Kode Studio is an IDE for Kha based on Visual Studio Code";
-      desktopName = "Kode Studio";
-      genericName = "Text Editor";
-      categories = [ "GNOME" "GTK" "Utility" "TextEditor" "Development" ];
-    };
-
-    sourceRoot = ".";
-
-    installPhase = ''
-      mkdir -p $out
-      cp -r ./* $out
-    '';
-
-    postFixup = lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") ''
-      # Patch Binaries
-      patchelf \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "$out:${atomEnv.libPath}" \
-          $out/kodestudio
-      patchelf \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsa-lib}/lib:${libGL}/lib:${libGLU}/lib:${lib.getLib openssl}/lib" \
-          $out/resources/app/extensions/krom/Krom/linux/Krom
-      patchelf \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath ".:${stdenv.cc.libc}/lib" \
-          $out/resources/app/extensions/kha/Kha/Kore/Tools/krafix/krafix-linux64
-      patchelf \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath ".:${stdenv.cc.libc}/lib" \
-          $out/resources/app/extensions/kha/Kha/Kore/Tools/kraffiti/kraffiti-linux64
-      patchelf \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" \
-          $out/resources/app/extensions/kha/Kha/Tools/kravur/kravur-linux64
-      patchelf \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath ".:${stdenv.cc.libc}/lib:${zlib}/lib" \
-          $out/resources/app/extensions/kha/Kha/Tools/haxe/haxe-linux64
-      patchelf \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath ".:${stdenv.cc.libc}/lib:${libvorbis}/lib:${libogg}/lib:${flac.out}/lib" \
-          $out/resources/app/extensions/kha/Kha/Tools/oggenc/oggenc-linux64
-
-      # Patch Shared Objects
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/libnode.so
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib" $out/libffmpeg.so
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8_libplatform.so
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libicuuc.so
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8_libbase.so
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8.so
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libicui18n.so
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/RPi/libneko.so
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/Linux64/libneko.so
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/Linux/libneko.so
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/pty.js/build/Release/pty.node
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/gc-signals/build/Release/gcsignals.node
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/gc-signals/build/Release/obj.target/gcsignals.node
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/oniguruma/build/Release/onig_scanner.node
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/oniguruma/build/Release/obj.target/onig_scanner.node
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${xorg.libX11}/lib" $out/resources/app/node_modules/native-keymap/build/Release/keymapping.node
-      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${xorg.libX11}/lib" $out/resources/app/node_modules/native-keymap/build/Release/obj.target/keymapping.node
-
-      # Rewrite VSCODE_PATH inside bin/kodestudio to $out
-      substituteInPlace $out/bin/kodestudio --replace "/usr/share/kodestudio" $out
-
-      # Patch library calls that expects nix store files to be mode 644:
-      #   A stat is made on srcFile (in the nix store), and its mode used
-      #   for destFile, but it expects the mode to be read write, whereas
-      #   all regular files in the nix store are made read only.
-      #   (33188 is 100644 octal, the required mode)
-      substituteInPlace $out/resources/app/extensions/kha/Kha/Tools/khamake/node_modules/fs-extra/lib/copy-sync/copy-file-sync.js --replace "stat.mode" "33188"
-      substituteInPlace $out/resources/app/extensions/kha/Kha/Kore/Tools/koremake/node_modules/fs-extra/lib/copy-sync/copy-file-sync.js --replace "stat.mode" "33188"
-
-      # Wrap preload libXss
-      wrapProgram $out/bin/kodestudio \
-          --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
-    '';
-
-    meta = with lib; {
-      description = ''
-        An IDE for Kha based on Visual Studio Code
-      '';
-      longDescription = ''
-        Kode Studio is an IDE for Kha based on Visual Studio Code.
-
-        Kha and Kore are multimedia frameworks for Haxe and C++ respectively
-        (with JavaScript coming soon). Using Kha or Kore you can access all
-        hardware at the lowest possible level in a completely portable way.
-      '';
-      homepage = "http://kode.tech/";
-      downloadPage = "https://github.com/Kode/KodeStudio/releases";
-      license = licenses.mit;
-      maintainers = [ maintainers.patternspandemic ];
-      platforms = [ "x86_64-linux" "i686-cygwin" ];
-    };
-  }
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index ad934c7054408..aae268df3f540 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2364,8 +2364,8 @@ let
         mktplcRef = {
           name = "vspacecode";
           publisher = "VSpaceCode";
-          version = "0.10.1";
-          sha256 = "sha256-H7SCC/ZhDswMQjLX+qpQa6A1N83MobJRPC4pyIbZ1kA=";
+          version = "0.10.9";
+          sha256 = "sha256-16oC2BghY7mB/W0niTDtKGMAC9pt6m0utSOJ0lgbpAU=";
         };
         meta = {
           license = lib.licenses.mit;
diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index d3f854966406e..674a87dea47e1 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "drawio";
-  version = "19.0.1";
+  version = "19.0.2";
 
   src = fetchurl {
     url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
-    sha256 = "da9fb38970987b7d5b84fd0d91824f206ba7a3681a7354adc6d6e795c7613828";
+    sha256 = "46b4e7269628100ea3c083dee75308d9746780e46eac15d2c5495fdeece7e323";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 75bfe5cff93d2..4a6e28c3cf07a 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -5,7 +5,6 @@
 , cairo
 , cmake
 , fetchurl
-, fetchpatch
 , gettext
 , ghostscript
 , glib
@@ -44,20 +43,25 @@
 let
   python3Env = python3.withPackages
     (ps: with ps; [
+      appdirs
+      beautifulsoup4
+      cachecontrol
       numpy
       lxml
       pillow
       scour
       pyserial
-    ]);
+      requests
+      pygobject3
+    ] ++ inkex.propagatedBuildInputs);
 in
 stdenv.mkDerivation rec {
   pname = "inkscape";
-  version = "1.1.2";
+  version = "1.2";
 
   src = fetchurl {
-    url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz";
-    sha256 = "sha256-P/5UoG0LJaTNi260JFNu8e0gW+E0Q6Oc1DfIx7ibltE=";
+    url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz";
+    sha256 = "jZsxFCVUlFZk7f7+LWtVkQpQmXZfcXanEQfDTx3N5q0=";
   };
 
   # Inkscape hits the ARGMAX when linking on macOS. It appears to be
@@ -73,20 +77,6 @@ stdenv.mkDerivation rec {
       # e.g., those from the "Effects" menu.
       python3 = "${python3Env}/bin/python";
     })
-
-    # Fix build with poppler 22.03
-    # https://gitlab.com/inkscape/inkscape/-/merge_requests/4187
-    (fetchpatch {
-      url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch";
-      sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg=";
-    })
-
-    # Fix build with poppler 22.04
-    # https://gitlab.com/inkscape/inkscape/-/merge_requests/4266
-    (fetchpatch {
-      url = "https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b.patch";
-      sha256 = "2cJZdunbRgPIwhJgz1dQoQRw3ZYZ2Fp6c3hpVBV2PbE=";
-    })
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/graphics/symbolic-preview/default.nix b/pkgs/applications/graphics/symbolic-preview/default.nix
index de49c9d7cd681..85d7004555f51 100644
--- a/pkgs/applications/graphics/symbolic-preview/default.nix
+++ b/pkgs/applications/graphics/symbolic-preview/default.nix
@@ -1,25 +1,21 @@
-{ lib, stdenv, fetchurl, wrapGAppsHook
-, cargo, desktop-file-utils, meson, ninja, pkg-config, python3, rustc
-, gdk-pixbuf, glib, gtk3, libhandy, libxml2
+{ lib, stdenv, fetchurl, wrapGAppsHook4
+, cargo, desktop-file-utils, meson, ninja, pkg-config, rustc
+, glib, gtk4, libadwaita, libxml2
 }:
 
 stdenv.mkDerivation rec {
   pname = "symbolic-preview";
-  version = "0.0.2";
+  version = "0.0.3";
 
   src = fetchurl {
-    url = "https://gitlab.gnome.org/World/design/symbolic-preview/uploads/91fd27bb70553c8d6c3ad2a35446ff6e/symbolic-preview-${version}.tar.xz";
-    sha256 = "1v8l10ppwbjkrq7nvb0wqc3pid6pd8dqpki3jhmjjkmbd7rpdpkq";
+    url = "https://gitlab.gnome.org/World/design/symbolic-preview/uploads/df71a2eee9ea0c90b3d146e7286fec42/symbolic-preview-${version}.tar.xz";
+    sha256 = "08g2sbdb1x5z26mi68nmciq6xwv0chvxw6anj1qdfh7npsg0dm4c";
   };
 
   nativeBuildInputs = [
-    cargo desktop-file-utils meson ninja pkg-config python3 rustc wrapGAppsHook
+    cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook4
   ];
-  buildInputs = [ gdk-pixbuf glib gtk3 libhandy libxml2 ];
-
-  postPatch = ''
-    patchShebangs build-aux/meson_post_install.py
-  '';
+  buildInputs = [ glib gtk4 libadwaita libxml2 ];
 
   meta = with lib; {
     homepage = "https://gitlab.gnome.org/World/design/symbolic-preview";
diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix
index 1dfe075fa8408..c448b86d0c4d0 100644
--- a/pkgs/applications/misc/authy/default.nix
+++ b/pkgs/applications/misc/authy/default.nix
@@ -1,79 +1,21 @@
-{ alsa-lib
-, at-spi2-atk
-, at-spi2-core
-, atk
-, autoPatchelfHook
-, cairo
-, cups
-, dbus
-, electron_9
-, expat
+{ autoPatchelfHook
+, electron
 , fetchurl
-, gdk-pixbuf
-, glib
-, gtk3
 , lib
-, libappindicator-gtk3
-, libdbusmenu-gtk3
-, libuuid
 , makeWrapper
-, nspr
-, nss
-, pango
 , squashfsTools
 , stdenv
-, systemd
-, xorg
 }:
 
-let
-  # Currently only works with electron 9
-  electron = electron_9;
-in
-
 stdenv.mkDerivation rec {
   pname = "authy";
   # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version'
-  version = "2.1.0";
-  rev = "9";
-
-  buildInputs = [
-    alsa-lib
-    at-spi2-atk
-    at-spi2-core
-    atk
-    cairo
-    cups
-    dbus
-    expat
-    gdk-pixbuf
-    glib
-    gtk3
-    libappindicator-gtk3
-    libdbusmenu-gtk3
-    libuuid
-    nspr
-    nss
-    pango
-    stdenv.cc.cc
-    systemd
-    xorg.libX11
-    xorg.libXScrnSaver
-    xorg.libXcomposite
-    xorg.libXcursor
-    xorg.libXdamage
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXi
-    xorg.libXrandr
-    xorg.libXrender
-    xorg.libXtst
-    xorg.libxcb
-  ];
+  version = "2.2.0";
+  rev = "10";
 
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap";
-    sha256 = "sha256-RxjxOYrbneVctyTJTMvoN/UdREohaZWb1kTdEeI6mUU=";
+    sha256 = "sha256-sB9/fVV/qp+DfjxpvzIUHsLkeEu35i2rEv1/JYMytG8=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ];
@@ -95,25 +37,16 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/lib/
-
-    cp -r ./* $out/
-    rm -R ./*
+    mkdir -p $out/bin $out/share/applications $out/share/pixmaps/apps
 
-    # The snap package has the `ffmpeg.so` file which is copied over with other .so files
-    mv $out/*.so $out/lib/
+    # Copy only what is needed
+    cp -r resources* $out/
+    cp -r locales* $out/
+    cp meta/gui/authy.desktop $out/share/applications/
+    cp meta/gui/icon.png $out/share/pixmaps/authy.png
 
     # Replace icon name in Desktop file
-    sed -i 's|''${SNAP}/meta/gui/icon.png|authy|g' "$out/meta/gui/authy.desktop"
-
-    # Move the desktop file, icon, binary to their appropriate locations
-    mkdir -p $out/bin $out/share/applications $out/share/pixmaps/apps
-    cp $out/meta/gui/authy.desktop $out/share/applications/
-    cp $out/meta/gui/icon.png $out/share/pixmaps/authy.png
-    cp $out/${pname} $out/bin/${pname}
-
-    # Cleanup
-    rm -r $out/{data-dir,gnome-platform,meta,scripts,usr,*.sh,*.so}
+    sed -i 's|''${SNAP}/meta/gui/icon.png|authy|g' "$out/share/applications/authy.desktop"
 
     runHook postInstall
   '';
diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix
deleted file mode 100644
index d330a8a5ae28b..0000000000000
--- a/pkgs/applications/misc/cura/stable.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ lib, stdenv, python27Packages, curaengine, makeDesktopItem, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "cura";
-  version = "15.06.03";
-
-  src = fetchFromGitHub {
-    owner = "daid";
-    repo = "Cura";
-    rev = version;
-    sha256 = "sha256-o1cAi4Wi19WOijlRB9iYwNEpSNnmywUj5Bth8rRhqFA=";
-  };
-
-  desktopItem = makeDesktopItem {
-    name = "Cura";
-    exec = "cura";
-    icon = "cura";
-    comment = "Cura";
-    desktopName = "Cura";
-    genericName = "3D printing host software";
-    categories = [ "GNOME" "GTK" "Utility" ];
-  };
-
-  python_deps = with python27Packages; [ pyopengl pyserial numpy wxPython30 power setuptools ];
-
-  pythonPath = python_deps;
-
-  propagatedBuildInputs = python_deps;
-
-  buildInputs = [ curaengine python27Packages.wrapPython ];
-
-  configurePhase = "";
-  buildPhase = "";
-
-  patches = [ ./numpy-cast.patch ];
-
-  installPhase = ''
-    # Install Python code.
-    site_packages=$out/lib/python2.7/site-packages
-    mkdir -p $site_packages
-    cp -r Cura $site_packages/
-
-    # Install resources.
-    resources=$out/share/cura
-    mkdir -p $resources
-    cp -r resources/* $resources/
-    sed -i 's|os.path.join(os.path.dirname(__file__), "../../resources")|"'$resources'"|g' $site_packages/Cura/util/resources.py
-
-    # Install executable.
-    mkdir -p $out/bin
-    cp Cura/cura.py $out/bin/cura
-    chmod +x $out/bin/cura
-    sed -i 's|#!/usr/bin/python|#!/usr/bin/env python|' $out/bin/cura
-    wrapPythonPrograms
-
-    # Make it find CuraEngine.
-    echo "def getEngineFilename(): return '${curaengine}/bin/CuraEngine'" >> $site_packages/Cura/util/sliceEngine.py
-
-    # Install desktop item.
-    mkdir -p "$out"/share/applications
-    cp "$desktopItem"/share/applications/* "$out"/share/applications/
-    mkdir -p "$out"/share/icons
-    ln -s "$resources/images/c.png" "$out"/share/icons/cura.png
-  '';
-
-  meta = with lib; {
-    description = "3D printing host software";
-    homepage = "https://github.com/daid/Cura";
-    license = licenses.agpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix
index 0892f2e2d02c1..ad1660173159c 100644
--- a/pkgs/applications/misc/feedbackd/default.nix
+++ b/pkgs/applications/misc/feedbackd/default.nix
@@ -32,7 +32,9 @@ stdenv.mkDerivation rec {
   # only a Debian package release that is tagged in the upstream repo
   version = "0.0.0+git20220520";
 
-  outputs = [ "out" "dev" "devdoc" ];
+  outputs = [ "out" "dev" ]
+    # remove if cross-compiling gobject-introspection works
+    ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];
 
   src = fetchFromGitLab {
     domain = "source.puri.sm";
@@ -61,7 +63,13 @@ stdenv.mkDerivation rec {
     libgudev
   ];
 
-  mesonFlags = [ "-Dgtk_doc=true" "-Dman=true" ];
+  mesonFlags = [
+    "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
+    "-Dman=true"
+    # TODO(mindavi): introspection broken due to https://github.com/NixOS/nixpkgs/issues/72868
+    #                can be removed if cross-compiling gobject-introspection works.
+    "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}"
+  ];
 
   checkInputs = [
     dbus
diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix
index f937b12302668..6052cf70facb7 100644
--- a/pkgs/applications/misc/gnome-secrets/default.nix
+++ b/pkgs/applications/misc/gnome-secrets/default.nix
@@ -16,7 +16,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gnome-secrets";
-  version = "6.4";
+  version = "6.5";
   format = "other";
   strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
 
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
     owner = "World";
     repo = "secrets";
     rev = version;
-    sha256 = "sha256-qO2DJ/Eb9+G1R3un2+n9Tf6oxpGrEuH3SBrajQ9tCPU=";
+    sha256 = "sha256-Hy2W7cvvzVcKtd/KzTn81awoolnfM3ST0Nm70YBLTYY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index c93d31f66305b..9170af04e61c4 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -16,7 +16,13 @@ let
         };
       });
       # Use click 7
-      click = self.callPackage ../../../development/python2-modules/click/default.nix { };
+      click = super.click.overridePythonAttrs (old: rec {
+        version = "7.1.2";
+        src = old.src.override {
+          inherit version;
+          sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
+        };
+      });
     };
   };
 in
diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index 8daf50f82e70a..8e7acbe8223dc 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -12,7 +12,7 @@
 let
   inherit (stdenv.hostPlatform) system;
   pname = "obsidian";
-  version = "0.14.6";
+  version = "0.14.15";
   appname = "Obsidian";
   meta = with lib; {
     description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
@@ -25,7 +25,7 @@ let
   filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
   src = fetchurl {
     url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
-    sha256 = if stdenv.isDarwin then "1zzccwlim3gi6f5czzyddqjzy1xsk6ayx1hljhw6bmnid72km3q2" else "sha256-KieAE13SIYHDoXTqzk1QY+TPjwF9LRzlfm1yFg9hsTc=";
+    sha256 = if stdenv.isDarwin then "10c5255nbgqiigcwq6kmhzcgafq91k25wnxj3jxabzc0hs7pn4m5" else "sha256-bSLt4EnlCtxZeKIahr618qMuK9ogUhxn+NKO2GPkjOQ=";
   };
 
   icon = fetchurl {
diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 02162a4039e3d..6bd4ee6b3c181 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -2,30 +2,7 @@
   qtbase, mkDerivationWith }:
 
 {
-  stable = with python27Packages; buildPythonPackage rec {
-    pname = "plover";
-    version = "3.1.1";
-
-    meta = with lib; {
-      broken = stdenv.isDarwin;
-      description = "OpenSteno Plover stenography software";
-      maintainers = with maintainers; [ twey kovirobi ];
-      license     = licenses.gpl2;
-    };
-
-    src = fetchFromGitHub {
-      owner = "openstenoproject";
-      repo = "plover";
-      rev = "v${version}";
-      sha256 = "sha256-LIhTwHMphg+xTR9NKvjAZ6p0mmqPNcZd9C4cgnenmYQ=";
-    };
-
-    nativeBuildInputs     = [ setuptools-scm ];
-    buildInputs           = [ pytest mock ];
-    propagatedBuildInputs = [
-      six setuptools pyserial appdirs hidapi wxPython xlib wmctrl dbus-python
-    ];
-  };
+  stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05
 
   dev = with python3Packages; mkDerivationWith buildPythonPackage rec {
     pname = "plover";
diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix
index d89364280795d..5c3afc301556f 100644
--- a/pkgs/applications/misc/privacyidea/default.nix
+++ b/pkgs/applications/misc/privacyidea/default.nix
@@ -65,18 +65,30 @@ let
           sha256 = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo=";
         };
       });
-      # Required by flask-babel
       itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec {
-        version = "2.0.1";
+        version = "1.1.0";
+        src = old.src.override {
+          inherit version;
+          sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19";
+        };
+      });
+      flask = super.flask.overridePythonAttrs (old: rec {
+        version = "1.1.4";
         src = old.src.override {
           inherit version;
-          sha256 = "sha256-nnJNaPwikCoUNTUfhMP7hiPzA//8xWaky5Ut+MVyz/A=";
+          sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196";
         };
       });
-      flask = self.callPackage ../../../development/python2-modules/flask { };
       sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: {
         meta = meta // { broken = false; };
       });
+      click = super.click.overridePythonAttrs (old: rec {
+        version = "7.1.2";
+        src = old.src.override {
+          inherit version;
+          sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
+        };
+      });
     };
   };
 in
diff --git a/pkgs/applications/misc/stw/default.nix b/pkgs/applications/misc/stw/default.nix
new file mode 100644
index 0000000000000..e7c11fd4b9a5c
--- /dev/null
+++ b/pkgs/applications/misc/stw/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, libX11
+, fontconfig
+, libXft
+, libXrender
+}:
+
+stdenv.mkDerivation rec {
+  pname = "stw";
+  version = "unstable-2022-02-04";
+
+  src = fetchFromGitHub {
+    owner = "sineemore";
+    repo = pname;
+    rev = "c034e04ac912c157f9faa35cb769ba93d92486a0";
+    sha256 = "sha256-YohHF1O0lm6QWJv/wkS4RVJvWaOjcYSZNls6tt4hbqo==";
+  };
+
+  buildInputs = [ libX11 fontconfig libXft libXrender ];
+
+  makeFlags = [ "CC:=$(CC)" "PREFIX=$(out)" ];
+
+  meta = with lib; {
+    description = "A simple text widget for X resembling the watch(1) command";
+    license = licenses.mit;
+    maintainers = with maintainers; [ somasis ];
+    platforms = platforms.unix;
+    broken = stdenv.isDarwin;
+  };
+}
diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix
index 7955e5c8ce1d2..b67122965234a 100644
--- a/pkgs/applications/misc/sway-launcher-desktop/default.nix
+++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = [ maintainers.mrhedgehog ];
+    maintainers = [ maintainers.thehedgeh0g ];
     mainProgram = "${pname}";
   };
 }
diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/applications/misc/ydict/default.nix
index 49370870f692a..9440c23681007 100644
--- a/pkgs/applications/misc/ydict/default.nix
+++ b/pkgs/applications/misc/ydict/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ydict";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "TimothyYe";
     repo = "ydict";
     rev = "v${version}";
-    sha256 = "sha256-zhjsXZsRk0UNijjqjGjZh4TiPxAM5p+ic3JMx2wrPeY=";
+    sha256 = "sha256-qrGOrqI+PXsDNCmgcCPDNn6qUYu2emhYSkYsz4sj27M=";
   };
 
-  vendorSha256 = "sha256-O6czDfKD18rGVMIZv6II09oQu1w0ijQRuZRGt2gj9Cs=";
+  vendorSha256 = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs=";
 
   ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
 
diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix
index abe12ffff1a91..358803a3cf379 100644
--- a/pkgs/applications/networking/cluster/fluxcd/default.nix
+++ b/pkgs/applications/networking/cluster/fluxcd/default.nix
@@ -1,9 +1,9 @@
 { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
 
 let
-  version = "0.31.0";
-  sha256 = "073ij9mllxvw6rg8nm8pj6b8m5jzgbiihr9kknhhpp788wya155d";
-  manifestsSha256 = "0kp75h119l9051p2xcjfwcllk4hilmq25fcrx86bm0646krvk0pk";
+  version = "0.31.1";
+  sha256 = "1dhs96r9yi37i5q9wqg7198f6kl59jlj3g1q76r0snqyl16g2jwf";
+  manifestsSha256 = "0wwlwai1hhz69kgaccw3w8ad6bwdd46pm4ns8nqm04927b0b2dqb";
 
   manifests = fetchzip {
     url =
@@ -23,7 +23,7 @@ in buildGoModule rec {
     inherit sha256;
   };
 
-  vendorSha256 = "sha256-XTtVSSqU2jWRZvudE6G5QaNaZxw3oESiMPnnQzDs/1w=";
+  vendorSha256 = "sha256-sPyz6ISFLe+6CJoAcG17KSfo63vuTj30IWw+S2NCszY=";
 
   postUnpack = ''
     cp -r ${manifests} source/cmd/flux/manifests
diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix
index 4d62dad4af6e5..9014ce5202572 100644
--- a/pkgs/applications/networking/cluster/roxctl/default.nix
+++ b/pkgs/applications/networking/cluster/roxctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "roxctl";
-  version = "3.69.1";
+  version = "3.70.0";
 
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = "stackrox";
     rev = version;
-    sha256 = "sha256-fB43C+gMtUOg/Ah1fOTnOWOUmS0TjXkNCzw/TKfMzj4=";
+    sha256 = "sha256-VnnMD2tRixCswO/9nrP3PgXmev6O8QUTbkwmFIpPUyE=";
   };
 
-  vendorSha256 = "sha256-M+ZueycJEaDVzC2bFwQc5EulCrdz6lvzyD8YCoGyW1g=";
+  vendorSha256 = "sha256-xh2bgLSWjQHOjHrgDpQri78LvCL4CDbMteQYARyGLgg=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix
index 8476fc810ba43..da240b337bfc2 100644
--- a/pkgs/applications/networking/cluster/talosctl/default.nix
+++ b/pkgs/applications/networking/cluster/talosctl/default.nix
@@ -1,11 +1,11 @@
 { lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 let
   # look for GO_LDFLAGS getting set in the Makefile
-  version = "1.0.5";
-  sha256 = "sha256-xgzIbhgV1AAUa0tooYtzUMqK4Co3PvWQ0YbZuf0JgFE=";
-  vendorSha256 = "sha256-Gp30qCGV+EaJ1lvfleZHRWVL6rdSj0mvpumWsqr9IT0=";
-  pkgsVersion = "v1.0.0-17-g7567bf4";
-  extrasVersion = "v1.0.0-3-g6327c36";
+  version = "1.0.6";
+  sha256 = "sha256-4cUaQWqVndp06eFgqInOMMGITbTdZO5BOqXW2XEpuWU=";
+  vendorSha256 = "sha256-7q35d+jbIDe7fAy6nL5FWdSovBb/f64HYLHGL+zE6bI=";
+  pkgsVersion = "v1.0.0-25-gcf9709e";
+  extrasVersion = "v1.0.0-4-g05b0920";
 in
 buildGoModule rec {
   pname = "talosctl";
diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
index bf5dc60d88b5e..23914a6a9fe82 100644
--- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
+++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "tektoncd-cli";
-  version = "0.23.1";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "tektoncd";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-fOq67Cxtb2A9Obh2o5/aFy5bYBnyFKYQDPcpxOXMy1s=";
+    sha256 = "sha256-mrTtg60LZpRONrEhX53EhSYpfdfGMvPK4WhTHeAKsoQ=";
   };
 
   vendorSha256 = null;
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index b8f8a3db736cc..db7b11b7c3820 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -518,6 +518,15 @@
     "vendorSha256": "sha256-HrsjhaMlzs+uel5tBlxJD69Kkjl+4qVisWWREANBx40=",
     "version": "5.0.2"
   },
+  "hetznerdns": {
+    "owner": "timohirt",
+    "provider-source-address": "registry.terraform.io/timohirt/hetznerdns",
+    "repo": "terraform-provider-hetznerdns",
+    "rev": "v2.1.0",
+    "sha256": "sha256-QmD9UlQpyvEz4in1I960J0eC6xNtgk5z8tZUxaApOwE=",
+    "vendorSha256": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=",
+    "version": "2.1.0"
+  },
   "htpasswd": {
     "owner": "loafoe",
     "provider-source-address": "registry.terraform.io/loafoe/htpasswd",
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 2df294449f8be..0532dd84868b8 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -196,7 +196,10 @@ rec {
     sha256 = "sha256-LkRCumyNHVBSsXRp1ovNMGCeidK/jVCjh9H1HSE1Lm8=";
     vendorSha256 = "sha256-CVgAmPM0nt0Wx+N0qs+IO5KwCWnbfif70EHjBi0bIsQ=";
     patches = [ ./provider-path-0_15.patch ];
-    passthru = { inherit plugins; };
+    passthru = {
+      inherit plugins;
+      tests = { inherit terraform_plugins_test; };
+    };
   };
 
   # Tests that the plugins are being used. Terraform looks at the specific
diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/applications/networking/cluster/tgswitch/default.nix
index 5f669a6b9d8a3..44c16bd4668df 100644
--- a/pkgs/applications/networking/cluster/tgswitch/default.nix
+++ b/pkgs/applications/networking/cluster/tgswitch/default.nix
@@ -1,5 +1,5 @@
-{ buildGoPackage, lib, fetchFromGitHub }:
-buildGoPackage rec {
+{ buildGoModule, lib, fetchFromGitHub }:
+buildGoModule rec {
   pname = "tgswitch";
   version = "0.5.389";
 
@@ -10,7 +10,14 @@ buildGoPackage rec {
     sha256 = "sha256-6hErfI7LEJFgOoJR8IF9jTSBwqbQYeGiwdeJShqxVQ0=";
   };
 
-  goPackagePath = "github.com/warrensbox/tgswitch";
+  vendorSha256 = null;
+
+  ldflags = [ "-s" "-w" ];
+
+  # There are many modifications need to be done to make tests run. For example:
+  # 1. Network access
+  # 2. Operation on `/var/empty` not permitted on macOS
+  doCheck= false;
 
   meta = with lib; {
     description = "A command line tool to switch between different versions of terragrunt";
@@ -19,3 +26,4 @@ buildGoPackage rec {
     maintainers = with maintainers; [ psibi ];
   };
 }
+
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index 94ffd40364c02..980ff7e9b548d 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -18,17 +18,17 @@
 
 let
   libdeltachat' = libdeltachat.overrideAttrs (old: rec {
-    version = "1.84.0";
+    version = "1.86.0";
     src = fetchFromGitHub {
       owner = "deltachat";
       repo = "deltachat-core-rust";
       rev = version;
-      hash = "sha256-ZG3siulXVHTbdSd9tmenljFODZ3LWX+BXn6OJfrbEYA=";
+      hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0=";
     };
     cargoDeps = rustPlatform.fetchCargoTarball {
       inherit src;
       name = "${old.pname}-${version}";
-      hash = "sha256-vQ+A4dEWh5+BgWOdxd7GTPuHk6M6bHgGnZcWNwR/Urs=";
+      hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk=";
     };
   });
   electronExec = if stdenv.isDarwin then
@@ -46,13 +46,13 @@ let
   });
 in nodePackages.deltachat-desktop.override rec {
   pname = "deltachat-desktop";
-  version = "1.30.0";
+  version = "1.30.1";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-desktop";
     rev = "v${version}";
-    hash = "sha256-vp6vqoQvkAe7QPy4210r/5c1GNaGWgYvG0LyLqtCAxw=";
+    hash = "sha256-gZjZbXiqhFVfThZOsvL/nKkf6MX+E3KB5ldEAIuzBYA=";
   };
 
   nativeBuildInputs = [
@@ -122,6 +122,7 @@ in nodePackages.deltachat-desktop.override rec {
     homepage = "https://github.com/deltachat/deltachat-desktop";
     changelog = "https://github.com/deltachat/deltachat-desktop/blob/${src.rev}/CHANGELOG.md";
     license = licenses.gpl3Plus;
+    mainProgram = "deltachat";
     maintainers = with maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
index f331bdf190eef..96778eda7aa6b 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "deltachat-desktop",
-  "version": "1.30.0",
+  "version": "1.30.1",
   "dependencies": {
     "@blueprintjs/core": "^4.1.2",
     "@deltachat/message_parser_wasm": "^0.4.0",
@@ -9,7 +9,7 @@
     "application-config": "^1.0.1",
     "classnames": "^2.3.1",
     "debounce": "^1.2.0",
-    "deltachat-node": "1.84.0",
+    "deltachat-node": "1.86.0",
     "emoji-js-clean": "^4.0.0",
     "emoji-mart": "^3.0.1",
     "emoji-regex": "^9.2.2",
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 287c23401e064..ab471ef47fb78 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -2,7 +2,7 @@
 let
   inherit (pkgs) callPackage fetchurl;
   versions = if stdenv.isLinux then {
-    stable = "0.0.17";
+    stable = "0.0.18";
     ptb = "0.0.29";
     canary = "0.0.135";
   } else {
@@ -21,7 +21,7 @@ let
       stable = fetchurl {
         url =
           "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        sha256 = "058k0cmbm4y572jqw83bayb2zzl2fw2aaz0zj1gvg6sxblp76qil";
+        sha256 = "1hl01rf3l6kblx5v7rwnwms30iz8zw6dwlkjsx2f1iipljgkh5q4";
       };
       ptb = fetchurl {
         url =
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 3f26cfc4f6d3e..7c18ebf763c8c 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -22,11 +22,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gajim";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchurl {
     url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
-    sha256 = "sha256:151lbz9092z8r2yva5039g867chcid3n804jk7hjawrd9vnw81az";
+    sha256 = "sha256:0n6v96pwgds8655877fjgsphq4rd4gb9mz7cbqp4nkd4m7kvr3xv";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
deleted file mode 100644
index 6a6302e74955e..0000000000000
--- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib, stdenv, fetchurl, python27Packages, file }:
-
-let
-  inherit (python27Packages) python;
-  requirements = (import ./requirements.nix {
-    inherit lib fetchurl;
-    pythonPackages = python27Packages;
-  });
-
-in
-  stdenv.mkDerivation rec {
-    pname = "salut-a-toi";
-    version = "0.6.1";
-
-    src = fetchurl {
-      url = "ftp://ftp.goffi.org/sat/sat-${version}.tar.bz2";
-      sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
-    };
-
-    buildInputs = with python27Packages;
-    [
-      python twisted urwid wxPython pygobject2
-      dbus-python wrapPython setuptools file
-      pycrypto pyxdg
-    ] ++  (with requirements; [
-      pyfeed
-      wokkel
-    ]);
-
-    configurePhase = ''
-      sed -i "/use_setuptools/d" setup.py
-      sed -e "s@sys.prefix@'$out'@g" -i setup.py
-      sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh
-      sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh
-
-      echo 'import wokkel.muc' | python
-    '';
-
-    buildPhase = ''
-      ${python.interpreter} setup.py build
-    '';
-
-    installPhase = ''
-      ${python.interpreter} setup.py install --prefix="$out"
-
-      for i in "$out/bin"/*; do
-      head -n 1 "$i" | grep -E '[/ ]python( |$)' && {
-        wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}"
-      } || true
-      done
-    '';
-
-    meta = with lib; {
-      homepage = "http://sat.goffi.org/";
-      description = "A multi-frontend XMPP client";
-      platforms = platforms.linux;
-      maintainers = [ maintainers.raskin ];
-      license = licenses.gpl3Plus;
-    };
-  }
diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix
deleted file mode 100644
index a8e711c447d57..0000000000000
--- a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ fetchurl
-, lib
-, pythonPackages
-}:
-
-let
-  buildPythonPackage = pythonPackages.buildPythonPackage;
-
-  xe = buildPythonPackage rec {
-    url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz";
-    name = lib.nameFromURL url ".tar";
-    src = fetchurl {
-      inherit url;
-      sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      homepage = "http://home.blarg.net/~steveha/xe.html";
-      description = "XML elements";
-    };
-  };
-
-in {
-
-  pyfeed = (buildPythonPackage rec {
-    url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz";
-
-    name = lib.nameFromURL url ".tar";
-
-    src = fetchurl {
-      inherit url;
-      sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1";
-    };
-
-    propagatedBuildInputs = [ xe ];
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = with lib; {
-      homepage = "http://home.blarg.net/~steveha/pyfeed.html";
-      description = "Tools for syndication feeds";
-    };
-
-  });
-
-  wokkel = buildPythonPackage (rec {
-    url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz";
-    name = lib.nameFromURL url ".tar";
-    src = fetchurl {
-      inherit url;
-      sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml";
-    };
-
-    propagatedBuildInputs = with pythonPackages; [twisted python-dateutil];
-
-    meta = with lib; {
-      description = "Some (mainly XMPP-related) additions to twisted";
-      homepage = "http://wokkel.ik.nu/";
-      license = licenses.mit;
-    };
-  });
-
-}
diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
index 30cc7396c562a..e2135734bd7f0 100644
--- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
@@ -1,18 +1,16 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
-  # https://github.com/erroneousboat/slack-term
+buildGoModule rec {
   pname = "slack-term";
   version = "0.5.0";
 
-  goPackagePath = "github.com/erroneousboat/slack-term";
-
   src = fetchFromGitHub {
     owner = "erroneousboat";
     repo = "slack-term";
     rev = "v${version}";
     sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6";
   };
+  vendorSha256 = null;
 
   meta = with lib; {
     description = "Slack client for your terminal";
diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix
deleted file mode 100644
index 224a70ce9f723..0000000000000
--- a/pkgs/applications/networking/instant-messengers/torchat/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, python2, unzip, tor }:
-
-stdenv.mkDerivation rec {
-  pname = "torchat";
-  version = "0.9.9.553";
-
-  src = fetchFromGitHub {
-    owner = "prof7bit";
-    repo = "TorChat";
-    rev = version;
-    sha256 = "2LHG9qxZDo5rV6wsputdRo2Y1aHs+irMwt1ucFnXQE0=";
-  };
-
-  nativeBuildInputs = [ unzip ];
-  buildInputs = with python2.pkgs; [ python wxPython wrapPython ];
-  pythonPath = with python2.pkgs; [ wxPython ];
-
-  preConfigure = "cd torchat/src; rm portable.txt";
-
-  installPhase = ''
-    substituteInPlace "Tor/tor.sh" --replace "tor -f" "${tor}/bin/tor -f"
-
-    wrapPythonPrograms
-
-    mkdir -p $out/lib/torchat
-    cp -rf * $out/lib/torchat
-    makeWrapper ${python2}/bin/python $out/bin/torchat \
-        --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \
-        --chdir "$out/lib/torchat" \
-        --add-flags "-O $out/lib/torchat/torchat.py"
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/prof7bit/TorChat";
-    description = "Instant messaging application on top of the Tor network and it's location hidden services";
-    license = licenses.gpl3;
-    maintainers = [ ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix
index 247a8d589547b..60f49163be73b 100644
--- a/pkgs/applications/networking/mujmap/default.nix
+++ b/pkgs/applications/networking/mujmap/default.nix
@@ -8,23 +8,23 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mujmap";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "elizagamedev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-O5CbLgs+MkATPtess0gocgPB9kwD8FMR/urwm6jo2rA=";
+    sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E=";
   };
 
-  cargoSha256 = "sha256-nOZ+HnzXhVp+tLrNMZO1NmZIhIqlWz0fRMbHVIQkOxI=";
+  cargoSha256 = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU=";
 
   buildInputs = [
     notmuch
   ] ++ lib.optional stdenv.isDarwin Security;
 
   meta = with lib; {
-    description = "Bridge for synchronizing email and tags between JMAP and notmuch";
+    description = "JMAP integration for notmuch mail";
     homepage = "https://github.com/elizagamedev/mujmap/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ elizagamedev ];
diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix
index 579398c111028..106107899bb22 100644
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
@@ -4,6 +4,60 @@
 
 let
   sources = {
+    "@apidevtools/json-schema-ref-parser-8.0.0" = {
+      name = "_at_apidevtools_slash_json-schema-ref-parser";
+      packageName = "@apidevtools/json-schema-ref-parser";
+      version = "8.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-8.0.0.tgz";
+        sha512 = "n4YBtwQhdpLto1BaUCyAeflizmIbaloGShsPyRtFf5qdFJxfssj+GgLavczgKJFa3Bq+3St2CKcpRJdjtB4EBw==";
+      };
+    };
+    "@apidevtools/json-schema-ref-parser-9.0.9" = {
+      name = "_at_apidevtools_slash_json-schema-ref-parser";
+      packageName = "@apidevtools/json-schema-ref-parser";
+      version = "9.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz";
+        sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w==";
+      };
+    };
+    "@apidevtools/openapi-schemas-2.1.0" = {
+      name = "_at_apidevtools_slash_openapi-schemas";
+      packageName = "@apidevtools/openapi-schemas";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@apidevtools/openapi-schemas/-/openapi-schemas-2.1.0.tgz";
+        sha512 = "Zc1AlqrJlX3SlpupFGpiLi2EbteyP7fXmUOGup6/DnkRgjP9bgMM/ag+n91rsv0U1Gpz0H3VILA/o3bW7Ua6BQ==";
+      };
+    };
+    "@apidevtools/swagger-cli-4.0.0" = {
+      name = "_at_apidevtools_slash_swagger-cli";
+      packageName = "@apidevtools/swagger-cli";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@apidevtools/swagger-cli/-/swagger-cli-4.0.0.tgz";
+        sha512 = "8jDHtZxEkxFNMfqeNhyHjxiS9P3BlSj1WpetsMExs4N+PIa3d0vSNch4Fk9OlgT/2oClCK0YSc+dmmdVpHh0hg==";
+      };
+    };
+    "@apidevtools/swagger-methods-3.0.2" = {
+      name = "_at_apidevtools_slash_swagger-methods";
+      packageName = "@apidevtools/swagger-methods";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@apidevtools/swagger-methods/-/swagger-methods-3.0.2.tgz";
+        sha512 = "QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg==";
+      };
+    };
+    "@apidevtools/swagger-parser-9.0.1" = {
+      name = "_at_apidevtools_slash_swagger-parser";
+      packageName = "@apidevtools/swagger-parser";
+      version = "9.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@apidevtools/swagger-parser/-/swagger-parser-9.0.1.tgz";
+        sha512 = "Irqybg4dQrcHhZcxJc/UM4vO7Ksoj1Id5e+K94XUOzllqX1n47HEA50EKiXTCQbykxuJ4cYGIivjx/MRSTC5OA==";
+      };
+    };
     "@azure/abort-controller-1.1.0" = {
       name = "_at_azure_slash_abort-controller";
       packageName = "@azure/abort-controller";
@@ -166,6 +220,15 @@ let
         sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg==";
       };
     };
+    "@jsdevtools/ono-7.1.3" = {
+      name = "_at_jsdevtools_slash_ono";
+      packageName = "@jsdevtools/ono";
+      version = "7.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz";
+        sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==";
+      };
+    };
     "@kafkajs/confluent-schema-registry-1.0.6" = {
       name = "_at_kafkajs_slash_confluent-schema-registry";
       packageName = "@kafkajs/confluent-schema-registry";
@@ -472,6 +535,15 @@ let
         sha512 = "2oqXStJYYLDHCciNAClY277Ti3kXT+JLvPD7lLm/490i+B7g0GR6M4qiW+bd2V5vpB+yMKY8IelbsHMAYX1D0A==";
       };
     };
+    "@types/json-schema-7.0.11" = {
+      name = "_at_types_slash_json-schema";
+      packageName = "@types/json-schema";
+      version = "7.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz";
+        sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==";
+      };
+    };
     "@types/jsonwebtoken-8.5.8" = {
       name = "_at_types_slash_jsonwebtoken";
       packageName = "@types/jsonwebtoken";
@@ -508,22 +580,31 @@ let
         sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
       };
     };
-    "@types/node-12.20.52" = {
+    "@types/multer-1.4.7" = {
+      name = "_at_types_slash_multer";
+      packageName = "@types/multer";
+      version = "1.4.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.7.tgz";
+        sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==";
+      };
+    };
+    "@types/node-12.20.55" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.20.52";
+      version = "12.20.55";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.20.52.tgz";
-        sha512 = "cfkwWw72849SNYp3Zx0IcIs25vABmFh73xicxhCkTcvtZQeIez15PpwQN8fY3RD7gv1Wrxlc9MEtfMORZDEsGw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz";
+        sha512 = "J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==";
       };
     };
-    "@types/node-17.0.36" = {
+    "@types/node-17.0.41" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "17.0.36";
+      version = "17.0.41";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-17.0.36.tgz";
-        sha512 = "V3orv+ggDsWVHP99K3JlwtH20R7J4IhI1Kksgc+64q5VxgfRkQG8Ws3MFm/FZOKDYGy9feGFlZ70/HpCNe9QaA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-17.0.41.tgz";
+        sha512 = "xA6drNNeqb5YyV5fO3OAEsnXLfO7uF0whiOfPTz5AeDo8KeZFmODKnvwPymMNO8qE/an8pVY/O50tig2SQCrGw==";
       };
     };
     "@types/node-fetch-2.6.1" = {
@@ -589,13 +670,22 @@ let
         sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==";
       };
     };
-    "@types/snowflake-sdk-1.6.6" = {
+    "@types/snowflake-sdk-1.6.7" = {
       name = "_at_types_slash_snowflake-sdk";
       packageName = "@types/snowflake-sdk";
-      version = "1.6.6";
+      version = "1.6.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.7.tgz";
+        sha512 = "qFObD4B02XTgVX1LsAdehdoxzhvJIn2WB5I7oJBr53JC+1X/0AzaUXm7tenuf53FWg6wyVuBgG79yxxBIJpKFA==";
+      };
+    };
+    "@types/swagger-ui-express-4.1.3" = {
+      name = "_at_types_slash_swagger-ui-express";
+      packageName = "@types/swagger-ui-express";
+      version = "4.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.6.tgz";
-        sha512 = "oGdzQJONiv5UxaSsrIS49IvdcQRoPt6HTqIM8c0JTCIqEwGrsuqBq317PdLntM9SVc8BcDOYeAZTNdlISSSzwQ==";
+        url = "https://registry.npmjs.org/@types/swagger-ui-express/-/swagger-ui-express-4.1.3.tgz";
+        sha512 = "jqCjGU/tGEaqIplPy3WyQg+Nrp6y80DCFnDEAvVKWkJyv0VivSSDCChkppHRHAablvInZe6pijDFMnavtN0vqA==";
       };
     };
     "@types/tough-cookie-2.3.8" = {
@@ -616,6 +706,15 @@ let
         sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==";
       };
     };
+    "@types/yamljs-0.2.31" = {
+      name = "_at_types_slash_yamljs";
+      packageName = "@types/yamljs";
+      version = "0.2.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/yamljs/-/yamljs-0.2.31.tgz";
+        sha512 = "QcJ5ZczaXAqbVD3o8mw/mEBhRvO5UAdTtbvgwL/OgoWubvNBh6/MxLBAigtcgIFaq3shon9m3POIxQaLQt4fxQ==";
+      };
+    };
     "@xmldom/xmldom-0.7.5" = {
       name = "_at_xmldom_slash_xmldom";
       packageName = "@xmldom/xmldom";
@@ -805,6 +904,15 @@ let
         sha512 = "qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==";
       };
     };
+    "append-field-1.0.0" = {
+      name = "append-field";
+      packageName = "append-field";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz";
+        sha512 = "klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==";
+      };
+    };
     "aproba-2.0.0" = {
       name = "aproba";
       packageName = "aproba";
@@ -832,6 +940,15 @@ let
         sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
       };
     };
+    "argparse-2.0.1" = {
+      name = "argparse";
+      packageName = "argparse";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz";
+        sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==";
+      };
+    };
     "array-flatten-1.1.1" = {
       name = "array-flatten";
       packageName = "array-flatten";
@@ -940,13 +1057,13 @@ let
         sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==";
       };
     };
-    "async-3.2.3" = {
+    "async-3.2.4" = {
       name = "async";
       packageName = "async";
-      version = "3.2.3";
+      version = "3.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-3.2.3.tgz";
-        sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==";
+        url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz";
+        sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==";
       };
     };
     "async-validator-1.8.5" = {
@@ -985,13 +1102,13 @@ let
         sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
       };
     };
-    "aws-sdk-2.1145.0" = {
+    "aws-sdk-2.1151.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.1145.0";
+      version = "2.1151.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1145.0.tgz";
-        sha512 = "bjZJGFxHJadnp2kbg1etKw7ID1QmmKk1ivML0Xtt6S6GnGSfX8zVuLMkJZaxPMjlyZ6xeilGwzk2F9igxBCPCQ==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1151.0.tgz";
+        sha512 = "VvyzXAmWrX+klvwzA+9gSTY7blDnZOTl0UTKrqmFL4K7tOLieGLYTUkpUegcPxCjYgEg7JwvYolYUnUKiHa4oA==";
       };
     };
     "aws-sign2-0.7.0" = {
@@ -1336,6 +1453,15 @@ let
         sha512 = "MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg==";
       };
     };
+    "busboy-1.6.0" = {
+      name = "busboy";
+      packageName = "busboy";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz";
+        sha512 = "8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==";
+      };
+    };
     "byte-length-1.0.2" = {
       name = "byte-length";
       packageName = "byte-length";
@@ -1372,6 +1498,15 @@ let
         sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==";
       };
     };
+    "call-me-maybe-1.0.1" = {
+      name = "call-me-maybe";
+      packageName = "call-me-maybe";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz";
+        sha512 = "wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==";
+      };
+    };
     "callback-stream-1.1.0" = {
       name = "callback-stream";
       packageName = "callback-stream";
@@ -1399,6 +1534,15 @@ let
         sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==";
       };
     };
+    "camelcase-5.3.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "5.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz";
+        sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
+      };
+    };
     "capital-case-1.0.4" = {
       name = "capital-case";
       packageName = "capital-case";
@@ -1435,6 +1579,15 @@ let
         sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==";
       };
     };
+    "chalk-3.0.0" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz";
+        sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==";
+      };
+    };
     "chalk-4.1.2" = {
       name = "chalk";
       packageName = "chalk";
@@ -1579,6 +1732,15 @@ let
         sha512 = "k8AvUYJon0vv75ufoVo4nALYb/qwFFicO3I0+39C6xEdflqVtr+f9cy+0ZxAduoVSTfhP5DX2tY2XICAd5hy6Q==";
       };
     };
+    "cliui-6.0.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz";
+        sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==";
+      };
+    };
     "cliui-7.0.4" = {
       name = "cliui";
       packageName = "cliui";
@@ -1768,6 +1930,15 @@ let
         sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==";
       };
     };
+    "concat-stream-1.6.2" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
+        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
+      };
+    };
     "concat-stream-2.0.0" = {
       name = "concat-stream";
       packageName = "concat-stream";
@@ -1876,13 +2047,13 @@ let
         sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
       };
     };
-    "core-js-3.22.7" = {
+    "core-js-3.22.8" = {
       name = "core-js";
       packageName = "core-js";
-      version = "3.22.7";
+      version = "3.22.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.22.7.tgz";
-        sha512 = "Jt8SReuDKVNZnZEzyEQT5eK6T2RRCXkfTq7Lo09kpm+fHjgGewSbNjV+Wt4yZMhPDdzz2x1ulI5z/w4nxpBseg==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-3.22.8.tgz";
+        sha512 = "UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -1894,6 +2065,15 @@ let
         sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==";
       };
     };
+    "core-util-is-1.0.3" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz";
+        sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==";
+      };
+    };
     "crc-32-1.2.2" = {
       name = "crc-32";
       packageName = "crc-32";
@@ -2047,6 +2227,15 @@ let
         sha512 = "syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==";
       };
     };
+    "decamelize-1.2.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+        sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==";
+      };
+    };
     "deepmerge-1.5.2" = {
       name = "deepmerge";
       packageName = "deepmerge";
@@ -2272,13 +2461,13 @@ let
         sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==";
       };
     };
-    "element-ui-2.15.8" = {
+    "element-ui-2.15.9" = {
       name = "element-ui";
       packageName = "element-ui";
-      version = "2.15.8";
+      version = "2.15.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.8.tgz";
-        sha512 = "N54zxosRFqpYax3APY3GeRmtOZwIls6Z756WM0kdPZ5Q92PIeKHnZgF1StlamIg9bLxP1k+qdhTZvIeQlim09A==";
+        url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.9.tgz";
+        sha512 = "dx45nQLt4Hn87/Z9eRr3ex6KFZbxlFAwEU3QoW3wA5EsYftvHTyL9Pq7VnXXD7hu1Eiaup2jcs6kp+/VSFmXuA==";
       };
     };
     "emoji-regex-8.0.0" = {
@@ -2524,6 +2713,15 @@ let
         sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==";
       };
     };
+    "express-openapi-validator-4.13.8" = {
+      name = "express-openapi-validator";
+      packageName = "express-openapi-validator";
+      version = "4.13.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express-openapi-validator/-/express-openapi-validator-4.13.8.tgz";
+        sha512 = "89/sdkq+BKBuIyykaMl/vR9grFc3WFUPTjFo0THHbu+5g+q8rA7fKeoMfz+h84yOQIBcztmJ5ZJdk5uhEls31A==";
+      };
+    };
     "extend-3.0.2" = {
       name = "extend";
       packageName = "extend";
@@ -2650,6 +2848,15 @@ let
         sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==";
       };
     };
+    "find-up-4.1.0" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz";
+        sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==";
+      };
+    };
     "flatted-3.2.5" = {
       name = "flatted";
       packageName = "flatted";
@@ -2866,13 +3073,13 @@ let
         sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
       };
     };
-    "get-intrinsic-1.1.1" = {
+    "get-intrinsic-1.1.2" = {
       name = "get-intrinsic";
       packageName = "get-intrinsic";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz";
-        sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==";
+        url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz";
+        sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==";
       };
     };
     "get-port-5.1.1" = {
@@ -3676,13 +3883,13 @@ let
         sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==";
       };
     };
-    "iso-639-1-2.1.13" = {
+    "iso-639-1-2.1.14" = {
       name = "iso-639-1";
       packageName = "iso-639-1";
-      version = "2.1.13";
+      version = "2.1.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.13.tgz";
-        sha512 = "stYt3u6OnVDNcK4IWARGXmTOOY5Wa5g4bUmBsttZp/55ZiEjDUibR3C59ZnorKoSS0tfJmFuGMST3ksnY1zu7Q==";
+        url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.14.tgz";
+        sha512 = "nekI+mmtSpYySPXIXJtWhv/s+06nAU9wQzq4QPu3YSEMmjnkOoippPY+MEdqDP0Pie8/LsOFEuPbUHslLanDag==";
       };
     };
     "isstream-0.1.2" = {
@@ -3721,6 +3928,15 @@ let
         sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
       };
     };
+    "js-yaml-4.1.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz";
+        sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==";
+      };
+    };
     "jsbi-3.2.5" = {
       name = "jsbi";
       packageName = "jsbi";
@@ -3757,6 +3973,15 @@ let
         sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==";
       };
     };
+    "json-schema-ref-parser-9.0.9" = {
+      name = "json-schema-ref-parser";
+      packageName = "json-schema-ref-parser";
+      version = "9.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz";
+        sha512 = "qcP2lmGy+JUoQJ4DOQeLaZDqH9qSkeGCK3suKWxJXS82dg728Mn3j97azDMaOUmJAN4uCq91LdPx4K7E8F1a7Q==";
+      };
+    };
     "json-schema-traverse-0.4.1" = {
       name = "json-schema-traverse";
       packageName = "json-schema-traverse";
@@ -3793,6 +4018,15 @@ let
         sha512 = "m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==";
       };
     };
+    "jsonschema-1.4.1" = {
+      name = "jsonschema";
+      packageName = "jsonschema";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz";
+        sha512 = "S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==";
+      };
+    };
     "jsonwebtoken-8.5.1" = {
       name = "jsonwebtoken";
       packageName = "jsonwebtoken";
@@ -3937,6 +4171,15 @@ let
         sha512 = "n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug==";
       };
     };
+    "locate-path-5.0.0" = {
+      name = "locate-path";
+      packageName = "locate-path";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz";
+        sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==";
+      };
+    };
     "lodash-4.17.21" = {
       name = "lodash";
       packageName = "lodash";
@@ -4099,6 +4342,15 @@ let
         sha512 = "wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==";
       };
     };
+    "lodash.uniq-4.5.0" = {
+      name = "lodash.uniq";
+      packageName = "lodash.uniq";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz";
+        sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==";
+      };
+    };
     "lodash.uniqby-4.7.0" = {
       name = "lodash.uniqby";
       packageName = "lodash.uniqby";
@@ -4117,6 +4369,15 @@ let
         sha512 = "bwKX88k2JhCV9D1vtE8+naDKlLiGrSmf8zi/Y9ivFHwbmRfA8RxS/aVJ+sIht2XOwqoNr4xUPUkGZpc1sHFEKg==";
       };
     };
+    "lodash.zipobject-4.1.3" = {
+      name = "lodash.zipobject";
+      packageName = "lodash.zipobject";
+      version = "4.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.zipobject/-/lodash.zipobject-4.1.3.tgz";
+        sha512 = "A9SzX4hMKWS25MyalwcOnNoplyHbkNVsjidhTp8ru0Sj23wY9GWBKS8gAIGDSAqeWjIjvE4KBEl24XXAs+v4wQ==";
+      };
+    };
     "logform-2.4.0" = {
       name = "logform";
       packageName = "logform";
@@ -4276,7 +4537,16 @@ let
       version = "0.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
-        sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
+        sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==";
+      };
+    };
+    "media-typer-1.1.0" = {
+      name = "media-typer";
+      packageName = "media-typer";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz";
+        sha512 = "aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==";
       };
     };
     "merge-descriptors-1.0.1" = {
@@ -4285,7 +4555,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz";
-        sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
+        sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==";
       };
     };
     "merge2-1.4.1" = {
@@ -4303,7 +4573,7 @@ let
       version = "1.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
-        sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
+        sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==";
       };
     };
     "micromatch-4.0.5" = {
@@ -4321,7 +4591,7 @@ let
       version = "0.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/millisecond/-/millisecond-0.1.2.tgz";
-        sha1 = "6cc5ad386241cab8e78aff964f87028eec92dac5";
+        sha512 = "BJ8XtxY+woL+5TkP6uS6XvOArm0JVrX2otkgtWZseHpIax0oOOPW3cnwhOjRqbEJg7YRO/BDF7fO/PTWNT3T9Q==";
       };
     };
     "mime-1.6.0" = {
@@ -4387,13 +4657,13 @@ let
         sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==";
       };
     };
-    "minipass-3.1.6" = {
+    "minipass-3.2.0" = {
       name = "minipass";
       packageName = "minipass";
-      version = "3.1.6";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz";
-        sha512 = "rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==";
+        url = "https://registry.npmjs.org/minipass/-/minipass-3.2.0.tgz";
+        sha512 = "rosVvUUjMkTW1UoqXVHzNw937MAKv1ewomUBIqYk0IXPYk+LpVCOV1+kBpzAiQrKGjG3Ta81ZNzk/EcL28zABw==";
       };
     };
     "minizlib-2.1.2" = {
@@ -4405,6 +4675,15 @@ let
         sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==";
       };
     };
+    "mkdirp-0.5.6" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz";
+        sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==";
+      };
+    };
     "mkdirp-1.0.4" = {
       name = "mkdirp";
       packageName = "mkdirp";
@@ -4492,7 +4771,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
-        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+        sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==";
       };
     };
     "ms-2.1.2" = {
@@ -4522,6 +4801,15 @@ let
         sha512 = "G1I7mM0gfxcH5TGSNoVmxq13Mve5YnQgRAlonqaMlHEjHjMn1g04bsrIQbVHFRdI6++dw/FGWlh8GoItJMoUDw==";
       };
     };
+    "multer-1.4.5-lts.1" = {
+      name = "multer";
+      packageName = "multer";
+      version = "1.4.5-lts.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz";
+        sha512 = "ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==";
+      };
+    };
     "mute-stream-0.0.8" = {
       name = "mute-stream";
       packageName = "mute-stream";
@@ -4549,49 +4837,49 @@ let
         sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
       };
     };
-    "n8n-core-0.119.0" = {
+    "n8n-core-0.121.0" = {
       name = "n8n-core";
       packageName = "n8n-core";
-      version = "0.119.0";
+      version = "0.121.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.119.0.tgz";
-        sha512 = "NdjFdQTIm8yn7UHV3DxA8xXceYBIWNGL58UVUfHws4BtxEO6EoAHmOpyIgTgE4FNmfna+/Bo2NNPruM9sG1UIw==";
+        url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.121.0.tgz";
+        sha512 = "dPCj0mVw1KkS+GDNIuvleJh8T0NDDQ62QKUh2YXSdQl7mvtAitKS1qqix3P8HnHYYCWBMjG20mLcnqPAzuA3QQ==";
       };
     };
-    "n8n-design-system-0.22.0" = {
+    "n8n-design-system-0.23.0" = {
       name = "n8n-design-system";
       packageName = "n8n-design-system";
-      version = "0.22.0";
+      version = "0.23.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.22.0.tgz";
-        sha512 = "z6Vgtzvz0zxCVKGMym7sU5bgcaRhBSGaTT8ibJgblkQYNFRbSQjLjEki+Igc1SXSD8MopZoDRP9AkbMZRjJv/g==";
+        url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.23.0.tgz";
+        sha512 = "3VD+YUPWJ9andodTS3hqxBzLAvr289JDhX5fcS8F0SZD9PU01coUrfl/H5QZwwW9djVvDVdovGweOviAT6w15A==";
       };
     };
-    "n8n-editor-ui-0.145.0" = {
+    "n8n-editor-ui-0.147.0" = {
       name = "n8n-editor-ui";
       packageName = "n8n-editor-ui";
-      version = "0.145.0";
+      version = "0.147.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.145.0.tgz";
-        sha512 = "+EMtb2yEvfmN8oSQBevrPEKssqX4jyblMRajixVsUn43XMXLt8N+94by2TsaEakWCqxFbOOq1MGBNX+0dSvNGA==";
+        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.147.0.tgz";
+        sha512 = "yjyDFue+ObPDTqp0x5iaAo2vi7nSDqD9ts9DHSUzZgmryMuwdWsukb5YJL7JkoFv8qjtsCp3+fhuD37t7/XymA==";
       };
     };
-    "n8n-nodes-base-0.177.0" = {
+    "n8n-nodes-base-0.179.0" = {
       name = "n8n-nodes-base";
       packageName = "n8n-nodes-base";
-      version = "0.177.0";
+      version = "0.179.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.177.0.tgz";
-        sha512 = "Q+MBYjsqF/WdfGlMwlS6se9cJsuD3OHPVGI4GhBPlVPeb/L/WYga9V7jV5HKf/27HZD1uGxqL8O4Gkwerx9gFw==";
+        url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.179.0.tgz";
+        sha512 = "UM9O5O9i4N/kf0bXIxEAJgNxFxPCym/63MfXPUFy96OzGbNNfreMg2gNFbyTnJuAAEXSjSu3+tCqBfY1Q472bg==";
       };
     };
-    "n8n-workflow-0.101.0" = {
+    "n8n-workflow-0.103.0" = {
       name = "n8n-workflow";
       packageName = "n8n-workflow";
-      version = "0.101.0";
+      version = "0.103.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.101.0.tgz";
-        sha512 = "kl/ODNZcE/sDSWXlBj2QN304G+FLG7PZy9JNHX36/DrRDkxTjQ+KIRCIUR3lEfXLp1RGrcH2GJ5qt0WwV4bW9g==";
+        url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.103.0.tgz";
+        sha512 = "DNt9CzF50zlcSWE4h/ZFolIRJS5jAIAFUeJdgsmAsVMB0vwg1PA01sX3mWJwcRTdhfLKj03tp/C7El6zpF7mvw==";
       };
     };
     "named-placeholders-1.1.2" = {
@@ -4627,7 +4915,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/native-duplexpair/-/native-duplexpair-1.0.0.tgz";
-        sha1 = "7899078e64bf3c8a3d732601b3d40ff05db58fa0";
+        sha512 = "E7QQoM+3jvNtlmyfqRZ0/U75VFgCls+fSkbml2MpgWkWyz3ox8Y58gNhfuziuQYGNNQAbFZJQck55LHCnCK6CA==";
       };
     };
     "nearley-2.20.1" = {
@@ -4681,7 +4969,7 @@ let
       version = "0.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/node-ensure/-/node-ensure-0.0.0.tgz";
-        sha1 = "ecae764150de99861ec5c810fd5d096b183932a7";
+        sha512 = "DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==";
       };
     };
     "node-fetch-2.6.7" = {
@@ -4726,7 +5014,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz";
-        sha1 = "64ab69a7bdbaf03ce107b4f0335c87c0b9e91b1d";
+        sha512 = "n7C2NyEze8GCo/z73KdbjRsBiLbv6eBn1FxwYKQ23IqGo7pQY3mhQan61Sv7eEDJCiyUjTVrVkXTzJCo1dW7Aw==";
       };
     };
     "nodemailer-6.7.3" = {
@@ -4762,7 +5050,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz";
-        sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
+        sha512 = "3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==";
       };
     };
     "normalize-path-3.0.0" = {
@@ -4780,7 +5068,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz";
-        sha1 = "aec886affdb045070d856447df62ecf86146ec45";
+        sha512 = "1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA==";
       };
     };
     "npmlog-5.0.1" = {
@@ -4825,7 +5113,7 @@ let
       version = "4.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
-        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+        sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==";
       };
     };
     "object-inspect-1.12.2" = {
@@ -4888,7 +5176,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
-        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+        sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==";
       };
     };
     "one-time-1.0.0" = {
@@ -4909,6 +5197,15 @@ let
         sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==";
       };
     };
+    "ono-7.1.3" = {
+      name = "ono";
+      packageName = "ono";
+      version = "7.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ono/-/ono-7.1.3.tgz";
+        sha512 = "9jnfVriq7uJM4o5ganUY54ntUm+5EK21EGaQ5NWnkWg3zz5ywbbonlBguRcnmF1/HDiIe3zxNxXcO1YPBmPcQQ==";
+      };
+    };
     "open-7.4.2" = {
       name = "open";
       packageName = "open";
@@ -4918,13 +5215,31 @@ let
         sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==";
       };
     };
+    "openapi-types-1.3.5" = {
+      name = "openapi-types";
+      packageName = "openapi-types";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz";
+        sha512 = "11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg==";
+      };
+    };
+    "openapi-types-10.0.0" = {
+      name = "openapi-types";
+      packageName = "openapi-types";
+      version = "10.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/openapi-types/-/openapi-types-10.0.0.tgz";
+        sha512 = "Y8xOCT2eiKGYDzMW9R4x5cmfc3vGaaI4EL2pwhDmodWw1HlK18YcZ4uJxc7Rdp7/gGzAygzH9SXr6GKYIXbRcQ==";
+      };
+    };
     "openurl-1.1.1" = {
       name = "openurl";
       packageName = "openurl";
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz";
-        sha1 = "3875b4b0ef7a52c156f0db41d4609dbb0f94b387";
+        sha512 = "d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA==";
       };
     };
     "optional-require-1.1.8" = {
@@ -4942,7 +5257,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz";
-        sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e";
+        sha512 = "Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==";
       };
     };
     "os-tmpdir-1.0.2" = {
@@ -4951,7 +5266,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
-        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+        sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==";
       };
     };
     "p-cancelable-2.1.1" = {
@@ -4969,7 +5284,25 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
-        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+        sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==";
+      };
+    };
+    "p-limit-2.3.0" = {
+      name = "p-limit";
+      packageName = "p-limit";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
+        sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
+      };
+    };
+    "p-locate-4.1.0" = {
+      name = "p-locate";
+      packageName = "p-locate";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz";
+        sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==";
       };
     };
     "p-map-2.1.0" = {
@@ -4990,6 +5323,15 @@ let
         sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==";
       };
     };
+    "p-try-2.2.0" = {
+      name = "p-try";
+      packageName = "p-try";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
+        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
+      };
+    };
     "packet-reader-1.0.0" = {
       name = "packet-reader";
       packageName = "packet-reader";
@@ -5014,7 +5356,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz";
-        sha1 = "746a167638083a860b0eef6732cb27ed46c32977";
+        sha512 = "2MXDNZC4aXdkkap+rBBMv0lUsfJqvX5/2FiYYnfCnorZt3Pk06/IOR5KeaoghgS2w07MLWgjbsnyaq6PdHn2LQ==";
       };
     };
     "parse-github-url-1.0.2" = {
@@ -5032,7 +5374,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz";
-        sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
+        sha512 = "1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==";
       };
     };
     "parse-srcset-1.0.2" = {
@@ -5041,7 +5383,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz";
-        sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1";
+        sha512 = "/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==";
       };
     };
     "parse5-5.1.1" = {
@@ -5131,7 +5473,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz";
-        sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4";
+        sha512 = "CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==";
       };
     };
     "path-case-3.0.4" = {
@@ -5149,7 +5491,16 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz";
-        sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
+        sha512 = "ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==";
+      };
+    };
+    "path-exists-4.0.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz";
+        sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==";
       };
     };
     "path-is-absolute-1.0.1" = {
@@ -5158,7 +5509,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
-        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+        sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==";
       };
     };
     "path-to-regexp-0.1.7" = {
@@ -5167,7 +5518,16 @@ let
       version = "0.1.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz";
-        sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
+        sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==";
+      };
+    };
+    "path-to-regexp-6.2.1" = {
+      name = "path-to-regexp";
+      packageName = "path-to-regexp";
+      version = "6.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz";
+        sha512 = "JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==";
       };
     };
     "path-type-4.0.0" = {
@@ -5185,7 +5545,7 @@ let
       version = "0.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
-        sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
+        sha512 = "KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==";
       };
     };
     "pdf-parse-1.1.1" = {
@@ -5212,7 +5572,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
-        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
+        sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==";
       };
     };
     "pg-8.7.1" = {
@@ -5410,7 +5770,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz";
-        sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35";
+        sha512 = "xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==";
       };
     };
     "postgres-date-1.0.7" = {
@@ -5446,7 +5806,7 @@ let
       version = "0.11.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz";
-        sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182";
+        sha512 = "cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==";
       };
     };
     "process-nextick-args-2.0.1" = {
@@ -5473,7 +5833,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz";
-        sha1 = "e5cc9a4c8278e4664ffedc01c7da84842b040175";
+        sha512 = "R9WrbTF3EPkVtWjp7B7umQGVndpsi+rsDAfrR4xAALQpFLa/+2OriecLhawxzvii2gd9+DZFwROWDuUUaqS5yA==";
       };
     };
     "promise-ftp-1.3.5" = {
@@ -5491,7 +5851,7 @@ let
       version = "1.1.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/promise-ftp-common/-/promise-ftp-common-1.1.5.tgz";
-        sha1 = "b4f8082a74035647703506763edb14230d9865da";
+        sha512 = "a84F/zM2Z0Ry/ht3nXfV6Ze7BISOQlWrct/YObrluJn8qy2LVeeQ+IJ7jD4bkmM0N2xfXYy5nurz4L1KEj+rJg==";
       };
     };
     "promise-retry-2.0.1" = {
@@ -5545,7 +5905,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
-        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
+        sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==";
       };
     };
     "psl-1.8.0" = {
@@ -5590,7 +5950,7 @@ let
       version = "1.3.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
-        sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
+        sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==";
       };
     };
     "punycode-2.1.1" = {
@@ -5635,7 +5995,7 @@ let
       version = "0.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz";
-        sha1 = "b209849203bb25df820da756e747005878521620";
+        sha512 = "X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==";
       };
     };
     "querystringify-2.2.0" = {
@@ -5662,7 +6022,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/quoted-printable/-/quoted-printable-1.0.1.tgz";
-        sha1 = "9eebf5eb3d11eef022b264fd2d2b6b2bb3b84cc3";
+        sha512 = "cihC68OcGiQOjGiXuo5Jk6XHANTHl1K4JLk/xlEJRTIXfy19Sg6XzB95XonYgr+1rB88bCpr7WZE7D7AlZow4g==";
       };
     };
     "railroad-diagrams-1.0.0" = {
@@ -5671,7 +6031,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz";
-        sha1 = "eb7e6267548ddedfb899c1b90e57374559cddb7e";
+        sha512 = "cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==";
       };
     };
     "randexp-0.4.6" = {
@@ -5689,7 +6049,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz";
-        sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b";
+        sha512 = "iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==";
       };
     };
     "randombytes-2.1.0" = {
@@ -5725,7 +6085,7 @@ let
       version = "1.1.14";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
-        sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
+        sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==";
       };
     };
     "readable-stream-2.3.7" = {
@@ -5788,7 +6148,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz";
-        sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad";
+        sha512 = "1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==";
       };
     };
     "redis-parser-3.0.0" = {
@@ -5797,7 +6157,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz";
-        sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4";
+        sha512 = "DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==";
       };
     };
     "reflect-metadata-0.1.13" = {
@@ -5842,7 +6202,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz";
-        sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
+        sha512 = "QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==";
       };
     };
     "remove-trailing-separator-1.1.0" = {
@@ -5851,7 +6211,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz";
-        sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
+        sha512 = "/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==";
       };
     };
     "remove-trailing-slash-0.1.1" = {
@@ -5914,7 +6274,16 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
-        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+        sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==";
+      };
+    };
+    "require-main-filename-2.0.0" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz";
+        sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
       };
     };
     "requires-port-1.0.0" = {
@@ -5923,7 +6292,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz";
-        sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
+        sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==";
       };
     };
     "resize-observer-polyfill-1.5.1" = {
@@ -5959,7 +6328,7 @@ let
       version = "0.12.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz";
-        sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b";
+        sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==";
       };
     };
     "reusify-1.0.4" = {
@@ -5995,7 +6364,7 @@ let
       version = "3.0.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/riot-tmpl/-/riot-tmpl-3.0.8.tgz";
-        sha1 = "dd654e72a3a1520cb009cbef70c73856ded584a6";
+        sha512 = "ngv48VQ58LMtuNrXnELxODsRUJ3NxcGQkL2yJPj5cy8WAgGgK+rarEFwfLoRdAfh76ipWiPrYL4nZ2nfW87lJw==";
       };
     };
     "rndm-1.2.0" = {
@@ -6004,7 +6373,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz";
-        sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c";
+        sha512 = "fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw==";
       };
     };
     "rss-parser-3.12.0" = {
@@ -6094,7 +6463,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz";
-        sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
+        sha512 = "8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==";
       };
     };
     "sax-1.2.4" = {
@@ -6139,7 +6508,7 @@ let
       version = "5.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
-        sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
+        sha512 = "mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw==";
       };
     };
     "semver-5.7.1" = {
@@ -6193,7 +6562,7 @@ let
       version = "0.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz";
-        sha1 = "d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e";
+        sha512 = "hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==";
       };
     };
     "serialize-javascript-5.0.1" = {
@@ -6229,7 +6598,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
-        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+        sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==";
       };
     };
     "setheader-1.0.2" = {
@@ -6265,7 +6634,7 @@ let
       version = "0.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/shell-escape/-/shell-escape-0.2.0.tgz";
-        sha1 = "68fd025eb0490b4f567a027f0bf22480b5f84133";
+        sha512 = "uRRBT2MfEOyxuECseCZd28jC1AJ8hmqqneWQ4VWUTgCAFvb3wKU1jLqj6egC4Exrr88ogg3dp+zroH4wJuaXzw==";
       };
     };
     "showdown-2.1.0" = {
@@ -6310,7 +6679,7 @@ let
       version = "0.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
-        sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd";
+        sha512 = "uEv/AFO0ADI7d99OHDmh1QfYzQk/izT1vCmu/riQfh7qjBVUUgRT87E5s5h7CxWCA/+YoZerykpEthzVrW3LIw==";
       };
     };
     "simple-swizzle-0.2.2" = {
@@ -6319,7 +6688,7 @@ let
       version = "0.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz";
-        sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a";
+        sha512 = "JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==";
       };
     };
     "slash-3.0.0" = {
@@ -6400,7 +6769,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
-        sha1 = "04e6926f662895354f3dd015203633b857297e2c";
+        sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==";
       };
     };
     "sprintf-js-1.1.2" = {
@@ -6481,7 +6850,7 @@ let
       version = "0.0.10";
       src = fetchurl {
         url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz";
-        sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
+        sha512 = "KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==";
       };
     };
     "standard-as-callback-2.1.0" = {
@@ -6508,7 +6877,7 @@ let
       version = "1.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz";
-        sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b";
+        sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==";
       };
     };
     "stream-shift-1.0.1" = {
@@ -6520,6 +6889,15 @@ let
         sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==";
       };
     };
+    "streamsearch-1.1.0" = {
+      name = "streamsearch";
+      packageName = "streamsearch";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz";
+        sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==";
+      };
+    };
     "string-similarity-4.0.4" = {
       name = "string-similarity";
       packageName = "string-similarity";
@@ -6562,7 +6940,7 @@ let
       version = "0.10.31";
       src = fetchurl {
         url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
-        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+        sha512 = "ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==";
       };
     };
     "string_decoder-1.1.1" = {
@@ -6574,22 +6952,13 @@ let
         sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
-    "string_decoder-1.3.0" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz";
-        sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==";
-      };
-    };
     "strip-ansi-3.0.1" = {
       name = "strip-ansi";
       packageName = "strip-ansi";
       version = "3.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
-        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+        sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==";
       };
     };
     "strip-ansi-6.0.1" = {
@@ -6628,6 +6997,24 @@ let
         sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==";
       };
     };
+    "swagger-ui-dist-4.12.0" = {
+      name = "swagger-ui-dist";
+      packageName = "swagger-ui-dist";
+      version = "4.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.12.0.tgz";
+        sha512 = "B0Iy2ueXtbByE6OOyHTi3lFQkpPi/L7kFOKFeKTr44za7dJIELa9kzaca6GkndCgpK1QTjArnoXG+aUy0XQp1w==";
+      };
+    };
+    "swagger-ui-express-4.4.0" = {
+      name = "swagger-ui-express";
+      packageName = "swagger-ui-express";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.4.0.tgz";
+        sha512 = "1CzRkHG386VQMVZK406jcpgnW2a9A5A/NiAjKhsFTQqUBWRF+uGbXTU/mA7WSV3mTzyOQDvjBdWP/c2qd5lqKw==";
+      };
+    };
     "tar-6.1.11" = {
       name = "tar";
       packageName = "tar";
@@ -7033,13 +7420,13 @@ let
         sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa";
       };
     };
-    "underscore-1.13.3" = {
+    "underscore-1.13.4" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.13.3";
+      version = "1.13.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.13.3.tgz";
-        sha512 = "QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA==";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.13.4.tgz";
+        sha512 = "BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ==";
       };
     };
     "unique-stream-2.3.1" = {
@@ -7168,22 +7555,22 @@ let
         sha1 = "c8d50370885663879385ab37e333c7e8e3b0218c";
       };
     };
-    "uuid-3.3.2" = {
+    "uuid-3.4.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.3.2";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
-        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
+        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
-    "uuid-3.4.0" = {
+    "uuid-8.0.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.4.0";
+      version = "8.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
-        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz";
+        sha512 = "jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==";
       };
     };
     "uuid-8.3.2" = {
@@ -7258,13 +7645,13 @@ let
         sha512 = "BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw==";
       };
     };
-    "vue-fragment-1.5.2" = {
+    "vue-fragment-1.6.0" = {
       name = "vue-fragment";
       packageName = "vue-fragment";
-      version = "1.5.2";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vue-fragment/-/vue-fragment-1.5.2.tgz";
-        sha512 = "KEW0gkeNOLJjtXN4jqJhTazez5jtrwimHkE5Few/VxblH4F9EcvJiEsahrV5kg5uKd5U8du4ORKS6QjGE0piYA==";
+        url = "https://registry.npmjs.org/vue-fragment/-/vue-fragment-1.6.0.tgz";
+        sha512 = "a5T8ZZZK/EQzgVShEl374HbobUJ0a7v12BzOzS6Z/wd/5EE/5SffcyHC+7bf9hP3L7Yc0hhY/GhMdwFQ25O/8A==";
       };
     };
     "vue-i18n-8.27.1" = {
@@ -7321,6 +7708,15 @@ let
         sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==";
       };
     };
+    "which-module-2.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
+        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
+      };
+    };
     "wide-align-1.1.5" = {
       name = "wide-align";
       packageName = "wide-align";
@@ -7483,13 +7879,13 @@ let
         sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943";
       };
     };
-    "xss-1.0.11" = {
+    "xss-1.0.13" = {
       name = "xss";
       packageName = "xss";
-      version = "1.0.11";
+      version = "1.0.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz";
-        sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ==";
+        url = "https://registry.npmjs.org/xss/-/xss-1.0.13.tgz";
+        sha512 = "clu7dxTm1e8Mo5fz3n/oW3UCXBfV89xZ72jM8yzo1vR/pIS0w3sgB3XV2H8Vm6zfGnHL0FzvLJPJEBhd86/z4Q==";
       };
     };
     "xtend-4.0.2" = {
@@ -7501,6 +7897,15 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
+    "y18n-4.0.3" = {
+      name = "y18n";
+      packageName = "y18n";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz";
+        sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==";
+      };
+    };
     "y18n-5.0.8" = {
       name = "y18n";
       packageName = "y18n";
@@ -7528,6 +7933,15 @@ let
         sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
       };
     };
+    "yamljs-0.3.0" = {
+      name = "yamljs";
+      packageName = "yamljs";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz";
+        sha512 = "C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==";
+      };
+    };
     "yargonaut-1.1.4" = {
       name = "yargonaut";
       packageName = "yargonaut";
@@ -7537,6 +7951,15 @@ let
         sha512 = "rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA==";
       };
     };
+    "yargs-15.4.1" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "15.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz";
+        sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==";
+      };
+    };
     "yargs-16.2.0" = {
       name = "yargs";
       packageName = "yargs";
@@ -7555,6 +7978,15 @@ let
         sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==";
       };
     };
+    "yargs-parser-18.1.3" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "18.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz";
+        sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==";
+      };
+    };
     "yargs-parser-20.2.9" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -7573,18 +8005,36 @@ let
         sha512 = "Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==";
       };
     };
+    "z-schema-4.2.4" = {
+      name = "z-schema";
+      packageName = "z-schema";
+      version = "4.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/z-schema/-/z-schema-4.2.4.tgz";
+        sha512 = "YvBeW5RGNeNzKOUJs3rTL4+9rpcvHXt5I051FJbOcitV8bl40pEfcG0Q+dWSwS0/BIYrMZ/9HHoqLllMkFhD0w==";
+      };
+    };
   };
 in
 {
   n8n = nodeEnv.buildNodePackage {
     name = "n8n";
     packageName = "n8n";
-    version = "0.179.0";
+    version = "0.181.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/n8n/-/n8n-0.179.0.tgz";
-      sha512 = "S6AtNNN3c5rWpPPs1iK23j9eeg2rF8RxuumKtE302ed6m3c0iEIMlZpVWFTJCfE+vi13drBUwffd89C2McVhUA==";
+      url = "https://registry.npmjs.org/n8n/-/n8n-0.181.0.tgz";
+      sha512 = "6hYVCqKmnrssazcosXwCAPtz2HGzWJG15jdxrQ/ZRq2XnmdK0cgC9B60/yohIDdtFtvB4F9Tn18CC7HOlUYTJg==";
     };
     dependencies = [
+      sources."@apidevtools/json-schema-ref-parser-8.0.0"
+      sources."@apidevtools/openapi-schemas-2.1.0"
+      sources."@apidevtools/swagger-cli-4.0.0"
+      sources."@apidevtools/swagger-methods-3.0.2"
+      (sources."@apidevtools/swagger-parser-9.0.1" // {
+        dependencies = [
+          sources."openapi-types-1.3.5"
+        ];
+      })
       (sources."@azure/abort-controller-1.1.0" // {
         dependencies = [
           sources."tslib-2.4.0"
@@ -7644,7 +8094,14 @@ in
       sources."@fontsource/open-sans-4.5.10"
       sources."@fortawesome/fontawesome-common-types-6.1.1"
       sources."@fortawesome/free-regular-svg-icons-6.1.1"
-      sources."@icetee/ftp-0.3.15"
+      (sources."@icetee/ftp-0.3.15" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+        ];
+      })
+      sources."@jsdevtools/ono-7.1.3"
       sources."@kafkajs/confluent-schema-registry-1.0.6"
       sources."@kwsites/file-exists-1.1.1"
       sources."@kwsites/promise-deferred-1.1.1"
@@ -7666,12 +8123,14 @@ in
       (sources."@oclif/help-1.0.1" // {
         dependencies = [
           sources."@oclif/config-1.18.2"
+          sources."chalk-4.1.2"
           sources."tslib-2.4.0"
         ];
       })
       sources."@oclif/linewrap-1.0.0"
       (sources."@oclif/parser-3.8.7" // {
         dependencies = [
+          sources."chalk-4.1.2"
           sources."tslib-2.4.0"
         ];
       })
@@ -7683,7 +8142,7 @@ in
       sources."@sqltools/formatter-1.2.2"
       (sources."@techteamer/ocsp-1.0.0" // {
         dependencies = [
-          sources."async-3.2.3"
+          sources."async-3.2.4"
         ];
       })
       sources."@tokenizer/token-0.3.0"
@@ -7698,11 +8157,13 @@ in
       sources."@types/ftp-0.3.33"
       sources."@types/generic-pool-3.1.10"
       sources."@types/json-diff-0.5.2"
+      sources."@types/json-schema-7.0.11"
       sources."@types/jsonwebtoken-8.5.8"
       sources."@types/lodash-4.14.182"
       sources."@types/lossless-json-1.0.1"
       sources."@types/mime-1.3.2"
-      sources."@types/node-17.0.36"
+      sources."@types/multer-1.4.7"
+      sources."@types/node-17.0.41"
       (sources."@types/node-fetch-2.6.1" // {
         dependencies = [
           sources."form-data-3.0.1"
@@ -7714,9 +8175,11 @@ in
       sources."@types/range-parser-1.2.4"
       sources."@types/readable-stream-2.3.13"
       sources."@types/serve-static-1.13.10"
-      sources."@types/snowflake-sdk-1.6.6"
+      sources."@types/snowflake-sdk-1.6.7"
+      sources."@types/swagger-ui-express-4.1.3"
       sources."@types/tough-cookie-2.3.8"
       sources."@types/tunnel-0.0.3"
+      sources."@types/yamljs-0.2.31"
       sources."@xmldom/xmldom-0.7.5"
       sources."abbrev-1.1.1"
       sources."abort-controller-3.0.0"
@@ -7732,25 +8195,27 @@ in
       sources."adler-32-1.2.0"
       sources."agent-base-6.0.2"
       sources."ajv-6.12.6"
-      sources."amqplib-0.8.0"
+      (sources."amqplib-0.8.0" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+        ];
+      })
       sources."ansi-escapes-4.3.2"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-4.3.0"
       sources."any-promise-1.3.0"
       sources."anymatch-3.1.2"
       sources."app-root-path-3.0.0"
+      sources."append-field-1.0.0"
       sources."aproba-2.0.0"
       (sources."are-we-there-yet-2.0.0" // {
         dependencies = [
           sources."readable-stream-3.6.0"
-          sources."string_decoder-1.3.0"
-        ];
-      })
-      (sources."argparse-1.0.10" // {
-        dependencies = [
-          sources."sprintf-js-1.0.3"
         ];
       })
+      sources."argparse-1.0.10"
       sources."array-flatten-1.1.1"
       sources."array-parallel-0.1.3"
       sources."array-series-0.1.5"
@@ -7771,14 +8236,13 @@ in
         ];
       })
       sources."avsc-5.7.4"
-      (sources."aws-sdk-2.1145.0" // {
+      (sources."aws-sdk-2.1151.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."events-1.1.1"
           sources."ieee754-1.1.13"
-          sources."isarray-1.0.0"
           sources."sax-1.2.1"
-          sources."uuid-3.3.2"
+          sources."uuid-8.0.0"
           sources."xml2js-0.4.19"
           sources."xmlbuilder-9.0.7"
         ];
@@ -7815,21 +8279,7 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      (sources."bl-2.2.1" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          (sources."readable-stream-2.3.7" // {
-            dependencies = [
-              sources."safe-buffer-5.1.2"
-            ];
-          })
-          (sources."string_decoder-1.1.1" // {
-            dependencies = [
-              sources."safe-buffer-5.1.2"
-            ];
-          })
-        ];
-      })
+      sources."bl-2.2.1"
       sources."bluebird-3.7.2"
       sources."bn.js-4.12.0"
       (sources."body-parser-1.20.0" // {
@@ -7850,9 +8300,11 @@ in
       sources."buffer-more-ints-1.0.0"
       sources."buffer-writer-2.0.0"
       sources."bull-3.29.3"
+      sources."busboy-1.6.0"
       sources."byte-length-1.0.2"
       sources."bytes-3.1.2"
       sources."call-bind-1.0.2"
+      sources."call-me-maybe-1.0.1"
       sources."callback-stream-1.1.0"
       sources."callsites-3.1.0"
       (sources."camel-case-4.1.2" // {
@@ -7860,6 +8312,7 @@ in
           sources."tslib-2.4.0"
         ];
       })
+      sources."camelcase-5.3.1"
       (sources."capital-case-1.0.4" // {
         dependencies = [
           sources."tslib-2.4.0"
@@ -7871,7 +8324,7 @@ in
           sources."adler-32-1.3.1"
         ];
       })
-      sources."chalk-4.1.2"
+      sources."chalk-3.0.0"
       (sources."change-case-4.1.2" // {
         dependencies = [
           sources."tslib-2.4.0"
@@ -7890,17 +8343,18 @@ in
       sources."cli-cursor-3.1.0"
       (sources."cli-highlight-2.1.11" // {
         dependencies = [
+          sources."chalk-4.1.2"
+          sources."cliui-7.0.4"
           sources."parse5-5.1.1"
+          sources."wrap-ansi-7.0.0"
+          sources."y18n-5.0.8"
           sources."yargs-16.2.0"
+          sources."yargs-parser-20.2.9"
         ];
       })
       sources."cli-width-3.0.0"
       sources."client-oauth2-4.3.3"
-      (sources."cliui-7.0.4" // {
-        dependencies = [
-          sources."wrap-ansi-7.0.0"
-        ];
-      })
+      sources."cliui-6.0.0"
       sources."cluster-key-slot-1.1.0"
       sources."codepage-1.15.0"
       (sources."color-3.2.1" // {
@@ -7929,12 +8383,7 @@ in
         ];
       })
       sources."concat-map-0.0.1"
-      (sources."concat-stream-2.0.0" // {
-        dependencies = [
-          sources."readable-stream-3.6.0"
-          sources."string_decoder-1.3.0"
-        ];
-      })
+      sources."concat-stream-1.6.2"
       sources."connect-history-api-fallback-1.6.0"
       sources."console-control-strings-1.1.0"
       (sources."constant-case-3.0.4" // {
@@ -7944,12 +8393,16 @@ in
       })
       sources."content-disposition-0.5.4"
       sources."content-type-1.0.4"
-      sources."convict-6.2.3"
+      (sources."convict-6.2.3" // {
+        dependencies = [
+          sources."yargs-parser-20.2.9"
+        ];
+      })
       sources."cookie-0.4.1"
       sources."cookie-parser-1.4.6"
       sources."cookie-signature-1.0.6"
-      sources."core-js-3.22.7"
-      sources."core-util-is-1.0.2"
+      sources."core-js-3.22.8"
+      sources."core-util-is-1.0.3"
       sources."crc-32-1.2.2"
       sources."cron-1.7.2"
       sources."cron-parser-2.18.0"
@@ -7969,6 +8422,7 @@ in
       sources."date-utils-1.2.21"
       sources."debug-4.3.4"
       sources."debuglog-1.0.1"
+      sources."decamelize-1.2.0"
       sources."deepmerge-1.5.2"
       sources."define-properties-1.1.4"
       sources."delayed-stream-1.0.0"
@@ -7992,18 +8446,11 @@ in
       })
       sources."dotenv-8.6.0"
       sources."dreamopt-0.6.0"
-      (sources."duplexify-3.7.1" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
       sources."ecdsa-sig-formatter-1.0.11"
       sources."ee-first-1.1.1"
-      sources."element-ui-2.15.8"
+      sources."element-ui-2.15.9"
       sources."emoji-regex-8.0.0"
       sources."enabled-1.0.2"
       sources."encodeurl-1.0.2"
@@ -8034,6 +8481,12 @@ in
           sources."ms-2.0.0"
         ];
       })
+      (sources."express-openapi-validator-4.13.8" // {
+        dependencies = [
+          sources."media-typer-1.1.0"
+          sources."path-to-regexp-6.2.1"
+        ];
+      })
       sources."extend-3.0.2"
       sources."external-editor-3.1.0"
       sources."extsprintf-1.3.0"
@@ -8057,6 +8510,7 @@ in
           sources."ms-2.0.0"
         ];
       })
+      sources."find-up-4.1.0"
       sources."flatted-3.2.5"
       sources."fn.name-1.1.0"
       sources."follow-redirects-1.15.1"
@@ -8077,7 +8531,7 @@ in
       sources."generate-function-2.3.1"
       sources."generic-pool-3.8.2"
       sources."get-caller-file-2.0.5"
-      sources."get-intrinsic-1.1.1"
+      sources."get-intrinsic-1.1.2"
       sources."get-port-5.1.1"
       sources."get-symbol-description-1.0.0"
       sources."get-system-fonts-2.0.2"
@@ -8088,10 +8542,6 @@ in
         dependencies = [
           sources."glob-parent-3.1.0"
           sources."is-glob-3.1.0"
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
         ];
       })
       sources."globby-11.1.0"
@@ -8141,12 +8591,22 @@ in
       sources."ics-2.35.0"
       sources."ieee754-1.2.1"
       sources."ignore-5.2.0"
-      sources."imap-0.8.19"
+      (sources."imap-0.8.19" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+        ];
+      })
       sources."imap-simple-4.3.0"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."inquirer-7.3.3"
+      (sources."inquirer-7.3.3" // {
+        dependencies = [
+          sources."chalk-4.1.2"
+        ];
+      })
       sources."internal-slot-1.0.3"
       sources."ioredis-4.28.5"
       sources."ip-regex-2.1.0"
@@ -8183,10 +8643,10 @@ in
       sources."is-weakref-1.0.2"
       sources."is-windows-1.0.2"
       sources."is-wsl-2.2.0"
-      sources."isarray-0.0.1"
+      sources."isarray-1.0.0"
       sources."isbot-3.5.0"
       sources."isexe-2.0.0"
-      sources."iso-639-1-2.1.13"
+      sources."iso-639-1-2.1.14"
       sources."isstream-0.1.2"
       sources."jmespath-0.16.0"
       sources."join-component-1.1.0"
@@ -8195,10 +8655,18 @@ in
       sources."jsbn-0.1.1"
       sources."json-diff-0.5.5"
       sources."json-schema-0.4.0"
+      (sources."json-schema-ref-parser-9.0.9" // {
+        dependencies = [
+          sources."@apidevtools/json-schema-ref-parser-9.0.9"
+          sources."argparse-2.0.1"
+          sources."js-yaml-4.1.0"
+        ];
+      })
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."json-stringify-safe-5.0.1"
       sources."jsonfile-4.0.0"
+      sources."jsonschema-1.4.1"
       (sources."jsonwebtoken-8.5.1" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -8223,9 +8691,15 @@ in
       sources."linkify-it-4.0.0"
       (sources."localtunnel-2.0.2" // {
         dependencies = [
+          sources."cliui-7.0.4"
           sources."debug-4.3.2"
+          sources."wrap-ansi-7.0.0"
+          sources."y18n-5.0.8"
+          sources."yargs-17.1.1"
+          sources."yargs-parser-20.2.9"
         ];
       })
+      sources."locate-path-5.0.0"
       sources."lodash-4.17.21"
       sources."lodash-es-4.17.21"
       sources."lodash.clonedeep-4.5.0"
@@ -8244,8 +8718,10 @@ in
       sources."lodash.once-4.1.1"
       sources."lodash.set-4.3.2"
       sources."lodash.throttle-4.1.1"
+      sources."lodash.uniq-4.5.0"
       sources."lodash.uniqby-4.7.0"
       sources."lodash.unset-4.5.2"
+      sources."lodash.zipobject-4.1.3"
       sources."logform-2.4.0"
       sources."long-4.0.0"
       sources."lossless-json-1.0.5"
@@ -8292,9 +8768,9 @@ in
       sources."minimalistic-assert-1.0.1"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
-      sources."minipass-3.1.6"
+      sources."minipass-3.2.0"
       sources."minizlib-2.1.2"
-      sources."mkdirp-1.0.4"
+      sources."mkdirp-0.5.6"
       (sources."mock-require-3.0.3" // {
         dependencies = [
           sources."get-caller-file-1.0.3"
@@ -8308,19 +8784,19 @@ in
       sources."moo-0.5.1"
       (sources."mqtt-4.2.6" // {
         dependencies = [
+          sources."concat-stream-2.0.0"
           sources."readable-stream-3.6.0"
-          sources."string_decoder-1.3.0"
         ];
       })
       (sources."mqtt-packet-6.10.0" // {
         dependencies = [
           sources."bl-4.1.0"
           sources."readable-stream-3.6.0"
-          sources."string_decoder-1.3.0"
         ];
       })
       sources."ms-2.1.2"
       sources."mssql-6.4.1"
+      sources."multer-1.4.5-lts.1"
       sources."mute-stream-0.0.8"
       (sources."mysql2-2.3.3" // {
         dependencies = [
@@ -8329,15 +8805,15 @@ in
         ];
       })
       sources."mz-2.7.0"
-      sources."n8n-core-0.119.0"
-      sources."n8n-design-system-0.22.0"
-      sources."n8n-editor-ui-0.145.0"
-      (sources."n8n-nodes-base-0.177.0" // {
+      sources."n8n-core-0.121.0"
+      sources."n8n-design-system-0.23.0"
+      sources."n8n-editor-ui-0.147.0"
+      (sources."n8n-nodes-base-0.179.0" // {
         dependencies = [
           sources."iconv-lite-0.6.3"
         ];
       })
-      sources."n8n-workflow-0.101.0"
+      sources."n8n-workflow-0.103.0"
       (sources."named-placeholders-1.1.2" // {
         dependencies = [
           sources."lru-cache-4.1.5"
@@ -8384,22 +8860,20 @@ in
       sources."once-1.4.0"
       sources."one-time-1.0.0"
       sources."onetime-5.1.2"
+      sources."ono-7.1.3"
       sources."open-7.4.2"
+      sources."openapi-types-10.0.0"
       sources."openurl-1.1.1"
       sources."optional-require-1.1.8"
-      (sources."ordered-read-streams-1.0.1" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."ordered-read-streams-1.0.1"
       sources."os-tmpdir-1.0.2"
       sources."p-cancelable-2.1.1"
       sources."p-finally-1.0.0"
+      sources."p-limit-2.3.0"
+      sources."p-locate-4.1.0"
       sources."p-map-2.1.0"
       sources."p-timeout-3.2.0"
+      sources."p-try-2.2.0"
       sources."packet-reader-1.0.0"
       (sources."param-case-3.0.4" // {
         dependencies = [
@@ -8429,6 +8903,7 @@ in
         ];
       })
       sources."path-dirname-1.0.2"
+      sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
       sources."path-type-4.0.0"
@@ -8508,7 +8983,11 @@ in
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
       sources."raw-body-2.5.1"
-      sources."readable-stream-1.1.14"
+      (sources."readable-stream-2.3.7" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."readable-web-to-node-stream-2.0.0"
       sources."readdirp-3.6.0"
       sources."redis-3.1.2"
@@ -8538,6 +9017,7 @@ in
       sources."requestretry-7.1.0"
       sources."require-at-1.0.6"
       sources."require-directory-2.1.1"
+      sources."require-main-filename-2.0.0"
       sources."requires-port-1.0.0"
       sources."resize-observer-polyfill-1.5.1"
       sources."restore-cursor-3.1.0"
@@ -8613,6 +9093,7 @@ in
         dependencies = [
           sources."axios-0.27.2"
           sources."debug-3.2.7"
+          sources."mkdirp-1.0.4"
           sources."tmp-0.2.1"
           sources."uuid-3.4.0"
         ];
@@ -8623,40 +9104,55 @@ in
       (sources."split2-3.2.2" // {
         dependencies = [
           sources."readable-stream-3.6.0"
-          sources."string_decoder-1.3.0"
         ];
       })
-      sources."sprintf-js-1.1.2"
+      sources."sprintf-js-1.0.3"
       sources."sqlite3-5.0.8"
       sources."sqlstring-2.3.3"
       sources."sse-channel-3.1.1"
       sources."ssf-0.11.2"
       sources."ssh2-1.10.0"
-      sources."ssh2-sftp-client-7.2.3"
+      (sources."ssh2-sftp-client-7.2.3" // {
+        dependencies = [
+          sources."concat-stream-2.0.0"
+          sources."readable-stream-3.6.0"
+        ];
+      })
       sources."sshpk-1.17.0"
       sources."stack-trace-0.0.10"
       sources."standard-as-callback-2.1.0"
       sources."statuses-2.0.1"
       sources."stealthy-require-1.1.1"
       sources."stream-shift-1.0.1"
+      sources."streamsearch-1.1.0"
       sources."string-similarity-4.0.4"
       sources."string-width-4.2.3"
       sources."string.prototype.trimend-1.0.5"
       sources."string.prototype.trimstart-1.0.5"
-      sources."string_decoder-0.10.31"
+      (sources."string_decoder-1.1.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."strip-ansi-6.0.1"
       sources."strtok3-6.3.0"
       sources."supports-color-7.2.0"
-      sources."tar-6.1.11"
+      sources."swagger-ui-dist-4.12.0"
+      sources."swagger-ui-express-4.4.0"
+      (sources."tar-6.1.11" // {
+        dependencies = [
+          sources."mkdirp-1.0.4"
+        ];
+      })
       sources."tarn-1.1.5"
       sources."tdigest-0.1.2"
       (sources."tedious-6.7.1" // {
         dependencies = [
-          sources."@types/node-12.20.52"
+          sources."@types/node-12.20.55"
           sources."bl-3.0.1"
           sources."iconv-lite-0.5.2"
           sources."readable-stream-3.6.0"
-          sources."string_decoder-1.3.0"
+          sources."sprintf-js-1.1.2"
         ];
       })
       sources."test-console-2.0.0"
@@ -8665,14 +9161,7 @@ in
       sources."thenify-all-1.6.0"
       sources."throttle-debounce-1.1.0"
       sources."through-2.3.8"
-      (sources."through2-2.0.5" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."through2-2.0.5"
       sources."through2-filter-3.0.0"
       sources."throwback-4.1.0"
       sources."timeago.js-4.0.2"
@@ -8708,14 +9197,20 @@ in
       sources."typedarray-to-buffer-3.1.5"
       (sources."typeorm-0.2.30" // {
         dependencies = [
+          sources."chalk-4.1.2"
+          sources."cliui-7.0.4"
+          sources."mkdirp-1.0.4"
+          sources."wrap-ansi-7.0.0"
+          sources."y18n-5.0.8"
           sources."yargs-16.2.0"
+          sources."yargs-parser-20.2.9"
         ];
       })
       sources."uc.micro-1.0.6"
       sources."uid-safe-2.1.5"
       sources."unbox-primitive-1.0.2"
       sources."unc-path-regex-0.1.2"
-      sources."underscore-1.13.3"
+      sources."underscore-1.13.4"
       sources."unique-stream-2.3.1"
       sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
@@ -8750,30 +9245,33 @@ in
       sources."v-click-outside-3.2.0"
       sources."validator-13.7.0"
       sources."vary-1.1.2"
-      sources."verror-1.10.0"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."core-util-is-1.0.2"
+        ];
+      })
       sources."vm2-3.9.9"
       sources."vue-2.6.14"
       sources."vue-color-2.8.1"
-      sources."vue-fragment-1.5.2"
+      sources."vue-fragment-1.6.0"
       sources."vue-i18n-8.27.1"
       sources."vue2-boring-avatars-0.3.4"
       sources."webidl-conversions-3.0.1"
       sources."whatwg-url-5.0.0"
       sources."which-1.3.1"
       sources."which-boxed-primitive-1.0.2"
+      sources."which-module-2.0.0"
       sources."wide-align-1.1.5"
       sources."widest-line-3.1.0"
       (sources."winston-3.7.2" // {
         dependencies = [
-          sources."async-3.2.3"
+          sources."async-3.2.4"
           sources."readable-stream-3.6.0"
-          sources."string_decoder-1.3.0"
         ];
       })
       (sources."winston-transport-4.5.0" // {
         dependencies = [
           sources."readable-stream-3.6.0"
-          sources."string_decoder-1.3.0"
         ];
       })
       sources."wmf-1.0.2"
@@ -8787,14 +9285,15 @@ in
       sources."xmlbuilder-11.0.1"
       sources."xpath.js-1.1.0"
       sources."xregexp-2.0.0"
-      (sources."xss-1.0.11" // {
+      (sources."xss-1.0.13" // {
         dependencies = [
           sources."commander-2.20.3"
         ];
       })
       sources."xtend-4.0.2"
-      sources."y18n-5.0.8"
+      sources."y18n-4.0.3"
       sources."yallist-4.0.0"
+      sources."yamljs-0.3.0"
       (sources."yargonaut-1.1.4" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -8805,9 +9304,10 @@ in
           sources."supports-color-2.0.0"
         ];
       })
-      sources."yargs-17.1.1"
-      sources."yargs-parser-20.2.9"
+      sources."yargs-15.4.1"
+      sources."yargs-parser-18.1.3"
       sources."yup-0.32.11"
+      sources."z-schema-4.2.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 0947686144e54..b74905586192d 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -11,7 +11,7 @@ assert withQt  -> qt5  != null;
 with lib;
 
 let
-  version = "3.6.3";
+  version = "3.6.5";
   variant = if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "sha256-tgNkpMAGihCBGrP9B1ymwesOddRGACcbiKIO2Tou9jE=";
+    sha256 = "sha256-otdB1g/zUWE31LnzjNwH7uVKVuw2BG9MOv7mv7T26qE=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix
index abc8e33fd3701..821447fdfa265 100644
--- a/pkgs/applications/office/appflowy/default.nix
+++ b/pkgs/applications/office/appflowy/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "appflowy";
-  version = "0.0.3";
+  version = "0.0.4";
 
   src = fetchzip {
     url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz";
-    sha256 = "sha256-m9vfgytSKnWLf6hwKjIGcU/7OCmIBiF4hJ/yIRBdSpQ=";
+    sha256 = "sha256-ke3cuRi+ZlBSWawg66cGrV928dOBp0EniNakitmgUso=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix
index 3f82ff7b52a87..1fd2d4ac2adce 100644
--- a/pkgs/applications/science/astronomy/gpredict/default.nix
+++ b/pkgs/applications/science/astronomy/gpredict/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool
 , gtk3, glib, curl, goocanvas2, gpsd
 , hamlib, wrapGAppsHook
 }:
@@ -14,6 +14,16 @@ in stdenv.mkDerivation {
     sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7";
   };
 
+  patches = [
+    # Pull upstream fix for -fno-common toolchains:
+    #   https://github.com/csete/gpredict/issues/195
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch";
+      sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a";
+    })
+  ];
+
   nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
   buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ];
 
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index c85bcd21a0cc8..f91b336cbf6f3 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -49,6 +49,7 @@ let
    "8.15.0".sha256     = "sha256:1ma76wfrpfsl72yh10w1ys2a0vi0mdc2jc79kdc8nrmxkhpw1nxx";
    "8.15.1".sha256     = "sha256:1dsa04jzkx5pw69pmxn0l55q4w88lg6fvz7clbga0bazzsfnsgd6";
    "8.15.2".sha256     = "sha256:0gn8dz69scxnxaq6ycb3x34bjfk9wlp1y2xn8w69kg9fm4b6gkc7";
+   "8.16+rc1".sha256   = "sha256-dU+E0Mz7MVntbQIeG9I59ANBaHaXXSrjCRdoqZ5TO60=";
   };
   releaseRev = v: "V${v}";
   fetched = import ../../../../build-support/coq/meta-fetch/default.nix
diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index b25065c5f1fff..b7e4cad122d75 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonApplication rec {
   pname = "glances";
-  version = "3.2.4.2";
+  version = "3.2.5";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
     rev = "v${version}";
-    sha256 = "0gql61lrav3f7wbsvgc1d6vf8r0xi5xs9rz9d3sqw3wj5m90w0vq";
+    sha256 = "sha256-kTnUP7WvmEw4VazjLrGb0FhSdz+/OadzgwDXs1SA02o=";
   };
 
   # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 3290763468810..295e0e4ac8196 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "2.11.3";
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-b00bP0usTpYr5EShyckmZ+a1Mw48payU/KllSck47fI=";
+    sha256 = "sha256-gJwSnaOJc7W5zA/7D8tmXi3g+or5cNIlJ2J6gS51D6I=";
   };
 
-  vendorSha256 = "sha256-soNQXtpQ217scP606UA05+r9WIrUAMOCDBsfLKrVD+Q=";
+  vendorSha256 = "sha256-du4IQNQPwM245yr0dSe1C7TU6gaFgvZhxaXi3xsKuWY=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index f70034082caeb..91b33d0b1e04e 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -8,16 +8,16 @@ with lib;
 
 buildGoModule rec {
   pname = "gogs";
-  version = "0.12.6";
+  version = "0.12.9";
 
   src = fetchFromGitHub {
     owner = "gogs";
     repo = "gogs";
     rev = "v${version}";
-    sha256 = "sha256-nAMnsRYYS5bZhLDzPdC4sj3rv1kPjckFnLoORY1HqW8=";
+    sha256 = "sha256-oXIA0JY7+pfXk5RnHWCJEkU9bL+ZIc2oXQrLwa1XHMg=";
   };
 
-  vendorSha256 = "sha256-U8rzYSLD9XeO5ai3p3OG74kPRI2IAlvOeZhU1Pa1BAI=";
+  vendorSha256 = "sha256-5AnQ7zF2UK1HNoyr6gwFdVv+KMJEGkjKPpDEpUXckUg=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix
index 350afd07fe196..b8f9a0f1522a3 100644
--- a/pkgs/applications/version-management/sourcehut/builds.nix
+++ b/pkgs/applications/version-management/sourcehut/builds.nix
@@ -1,7 +1,7 @@
 { lib
 , fetchFromSourcehut
-, buildPythonPackage
 , buildGoModule
+, buildPythonPackage
 , srht
 , redis
 , celery
@@ -9,21 +9,29 @@
 , markdown
 , ansi2html
 , python
+, unzip
 }:
 let
-  version = "0.75.2";
+  version = "0.81.0";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = "builds.sr.ht";
     rev = version;
-    sha256 = "sha256-SwyxMzmp9baRQ0vceuEn/OpfIv7z7jwq/l67hdOHXjM=";
+    sha256 = "sha256-oUSzanRFZ2dQTgm/VuNhqUaUAPq7ffxR7OtBKtE61DE=";
   };
 
-  buildWorker = src: buildGoModule {
+  buildsrht-api = buildGoModule ({
     inherit src version;
-    pname = "builds-sr-ht-worker";
+    pname = "buildsrht-api";
+    modRoot = "api";
+    vendorSha256 = "sha256-roTwqtg4Y846PNtLdRN/LV3Jd0LVElqjFy3DJcrwoaI=";
+  } // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
 
+  buildsrht-worker = buildGoModule {
+    inherit src version;
+    sourceRoot = "source/worker";
+    pname = "buildsrht-worker";
     vendorSha256 = "sha256-Pf1M9a43eK4jr6QMi6kRHA8DodXQU0pqq9ua5VC3ER0=";
   };
 in
@@ -31,10 +39,10 @@ buildPythonPackage rec {
   inherit src version;
   pname = "buildsrht";
 
-  patches = [
-    # Revert change breaking Unix socket support for Redis
-    patches/redis-socket/build/0001-Revert-Add-build-submission-and-queue-monitoring.patch
-  ];
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "all: api worker" ""
+  '';
 
   nativeBuildInputs = srht.nativeBuildInputs;
 
@@ -58,7 +66,8 @@ buildPythonPackage rec {
 
     cp -r images $out/lib
     cp contrib/submit_image_build $out/bin/builds.sr.ht
-    cp ${buildWorker "${src}/worker"}/bin/worker $out/bin/builds.sr.ht-worker
+    ln -s ${buildsrht-api}/bin/api $out/bin/buildsrht-api
+    ln -s ${buildsrht-worker}/bin/worker $out/bin/buildsrht-worker
   '';
 
   pythonImportsCheck = [ "buildsrht" ];
diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix
index 805da8c32821f..ff56c62c62e99 100644
--- a/pkgs/applications/version-management/sourcehut/core.nix
+++ b/pkgs/applications/version-management/sourcehut/core.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchgit
+, fetchFromSourcehut
 , fetchNodeModules
 , buildPythonPackage
 , pgpy
@@ -29,12 +29,13 @@
 
 buildPythonPackage rec {
   pname = "srht";
-  version = "0.68.14";
+  version = "0.69.0";
 
-  src = fetchgit {
-    url = "https://git.sr.ht/~sircmpwn/core.sr.ht";
+  src = fetchFromSourcehut {
+    owner = "~sircmpwn";
+    repo = "core.sr.ht";
     rev = version;
-    sha256 = "sha256-BY3W2rwrg0mhH3CltgUqg6Xv8Ve5VZNY/lI1cfbAjYM=";
+    sha256 = "sha256-s/I0wxtPggjTkkTZnhm77PxdQjiT0Vq2MIk7JMvdupc=";
     fetchSubmodules = true;
   };
 
@@ -47,6 +48,8 @@ buildPythonPackage rec {
   patches = [
     # Disable check for npm
     ./disable-npm-install.patch
+    # Fix Unix socket support in RedisQueueCollector
+    patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix
index 00810f208cc57..aee65dee3bbb8 100644
--- a/pkgs/applications/version-management/sourcehut/default.nix
+++ b/pkgs/applications/version-management/sourcehut/default.nix
@@ -2,6 +2,7 @@
 , openssl
 , callPackage
 , recurseIntoAttrs
+, nixosTests
 }:
 
 # To expose the *srht modules, they have to be a python module so we use `buildPythonModule`
@@ -44,4 +45,7 @@ with python.pkgs; recurseIntoAttrs {
   pagessrht = pagessrht;
   pastesrht = toPythonApplication pastesrht;
   todosrht = toPythonApplication todosrht;
+  passthru.tests = {
+    nixos-sourcehut = nixosTests.sourcehut;
+  };
 }
diff --git a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix
new file mode 100644
index 0000000000000..629d767a1caf8
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix
@@ -0,0 +1,32 @@
+{ unzip
+, gqlgenVersion ? "0.17.2"
+}:
+{
+  overrideModAttrs = (_: {
+    # No need to workaround -trimpath: it's not used in go-modules,
+    # but do download `go generate`'s dependencies nonetheless.
+    preBuild = ''
+      go generate ./loaders
+      go generate ./graph
+    '';
+  });
+
+  # Workaround this error:
+  #   go: git.sr.ht/~emersion/go-emailthreads@v0.0.0-20220412093310-4fd792e343ba: module lookup disabled by GOPROXY=off
+  #   tidy failed: go mod tidy failed: exit status 1
+  #   graph/generate.go:10: running "go": exit status 1
+  proxyVendor = true;
+
+  nativeBuildInputs = [ unzip ];
+
+  # Workaround -trimpath in the package derivation:
+  # https://github.com/99designs/gqlgen/issues/1537
+  # This is to give `go generate ./graph` access to gqlgen's *.gotpl files
+  # If it fails, the gqlgenVersion may have to be updated.
+  preBuild = ''
+    unzip ''${GOPROXY#"file://"}/github.com/99designs/gqlgen/@v/v${gqlgenVersion}.zip
+    go generate ./loaders
+    go generate ./graph
+    rm -rf github.com
+  '';
+}
diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix
index 318bee4cf5177..1f76e5cb65f8f 100644
--- a/pkgs/applications/version-management/sourcehut/git.nix
+++ b/pkgs/applications/version-management/sourcehut/git.nix
@@ -1,57 +1,67 @@
 { lib
 , fetchFromSourcehut
-, buildPythonPackage
 , buildGoModule
+, buildPythonPackage
 , python
 , srht
 , pygit2
 , scmsrht
+, unzip
 }:
 let
-  version = "0.77.3";
+  version = "0.78.20";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = "git.sr.ht";
     rev = version;
-    sha256 = "sha256-eJvXCcmdiUzTK0EqNJkLEZsAfr6toD/378HObnMbOWM=";
+    sha256 = "sha256-rZsTtHobsgRVmMOjPa1fiKrPsNyFu/gOsmO0cTl5MqQ=";
   };
 
-  buildShell = src: buildGoModule {
+  gitApi = buildGoModule ({
     inherit src version;
-    pname = "gitsrht-shell";
-    vendorSha256 = "sha256-aqUFICp0C2reqb2p6JCPAUIRsxzSv0t9BHoNWrTYfqk=";
-  };
+    pname = "gitsrht-api";
+    modRoot = "api";
+    vendorSha256 = "sha256-cCs9FUBusaAou9w4TDOg8GKxhRcsPbSNcQpxvFH/+so=";
+  } // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
 
-  buildDispatcher = src: buildGoModule {
+  gitDispatch = buildGoModule {
     inherit src version;
-    pname = "gitsrht-dispatcher";
+    pname = "gitsrht-dispatch";
+    modRoot = "gitsrht-dispatch";
     vendorSha256 = "sha256-qWXPHo86s6iuRBhRMtmD5jxnAWKdrWHtA/iSUkdw89M=";
   };
 
-  buildKeys = src: buildGoModule {
+  gitKeys = buildGoModule {
     inherit src version;
     pname = "gitsrht-keys";
+    modRoot = "gitsrht-keys";
     vendorSha256 = "sha256-9pojS69HCKVHUceyOpGtv9ewcxFD4WsOVsEzkmWJkF4=";
   };
 
-  buildUpdateHook = src: buildGoModule {
+  gitShell = buildGoModule {
     inherit src version;
-    pname = "gitsrht-update-hook";
-    vendorSha256 = "sha256-sBlG7EFqdDm7CkAHVX50Mf4N3sl1rPNmWExG/bfbfGA=";
+    pname = "gitsrht-shell";
+    modRoot = "gitsrht-shell";
+    vendorSha256 = "sha256-WqfvSPuVsOHA//86u33atMfeA11+DJhjLmWy8Ivq0NI=";
   };
 
-  updateHook = buildUpdateHook "${src}/gitsrht-update-hook";
+  gitUpdateHook = buildGoModule {
+    inherit src version;
+    pname = "gitsrht-update-hook";
+    modRoot = "gitsrht-update-hook";
+    vendorSha256 = "sha256-Bc3yPabS2S+qiroHFKrtkII/CfzBDYQ6xWxKHAME+Tc=";
+  };
 
 in
 buildPythonPackage rec {
   inherit src version;
   pname = "gitsrht";
 
-  patches = [
-    # Revert change breaking Unix socket support for Redis
-    patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch
-  ];
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "all: api gitsrht-dispatch gitsrht-keys gitsrht-shell gitsrht-update-hook" ""
+  '';
 
   nativeBuildInputs = srht.nativeBuildInputs;
 
@@ -68,14 +78,12 @@ buildPythonPackage rec {
 
   postInstall = ''
     mkdir -p $out/bin
-    cp ${buildShell "${src}/gitsrht-shell"}/bin/gitsrht-shell $out/bin/gitsrht-shell
-    cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch
-    cp ${buildKeys "${src}/gitsrht-keys"}/bin/gitsrht-keys $out/bin/gitsrht-keys
-    cp ${updateHook}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook
+    ln -s ${gitApi}/bin/api $out/bin/gitsrht-api
+    ln -s ${gitDispatch}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch
+    ln -s ${gitKeys}/bin/gitsrht-keys $out/bin/gitsrht-keys
+    ln -s ${gitShell}/bin/gitsrht-shell $out/bin/gitsrht-shell
+    ln -s ${gitUpdateHook}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook
   '';
-  passthru = {
-    inherit updateHook;
-  };
 
   pythonImportsCheck = [ "gitsrht" ];
 
diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix
index f3e778b2f31bc..c1470c3fc5c6d 100644
--- a/pkgs/applications/version-management/sourcehut/hg.nix
+++ b/pkgs/applications/version-management/sourcehut/hg.nix
@@ -1,21 +1,44 @@
 { lib
-, fetchhg
+, fetchFromSourcehut
+, buildGoModule
 , buildPythonPackage
 , srht
 , hglib
 , scmsrht
 , unidiff
 , python
+, unzip
 }:
 
 buildPythonPackage rec {
   pname = "hgsrht";
-  version = "0.29.4";
+  version = "0.31.3";
 
-  src = fetchhg {
-    url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht";
+  src = fetchFromSourcehut {
+    owner = "~sircmpwn";
+    repo = "hg.sr.ht";
     rev = version;
-    sha256 = "Jn9M/R5tJK/GeJDWGo3LWCK2nwsfI9zh+/yo2M+X6Sk=";
+    sha256 = "4Qe08gqsSTMQVQBchFPEUXuxM8ZAAQGJT1EOcDjkZa0=";
+    vc = "hg";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "all: api hgsrht-keys" ""
+  '';
+
+  hgsrht-api = buildGoModule ({
+    inherit src version;
+    pname = "hgsrht-api";
+    modRoot = "api";
+    vendorSha256 = "sha256-uIP3W7UJkP68HJUF33kz5xfg/KBiaSwMozFYmQJQkys=";
+  } // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
+
+  hgsrht-keys = buildGoModule {
+    inherit src version;
+    pname = "hgsrht-keys";
+    modRoot = "hgsrht-keys";
+    vendorSha256 = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU=";
   };
 
   nativeBuildInputs = srht.nativeBuildInputs;
@@ -32,6 +55,11 @@ buildPythonPackage rec {
     export SRHT_PATH=${srht}/${python.sitePackages}/srht
   '';
 
+  postInstall = ''
+    ln -s ${hgsrht-api}/bin/api $out/bin/hgsrht-api
+    ln -s ${hgsrht-keys}/bin/hgsrht-keys $out/bin/hgsrht-keys
+  '';
+
   pythonImportsCheck = [ "hgsrht" ];
 
   meta = with lib; {
diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix
index 511ec359fc4b0..75d9efe5bd93d 100644
--- a/pkgs/applications/version-management/sourcehut/hub.nix
+++ b/pkgs/applications/version-management/sourcehut/hub.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "hubsrht";
-  version = "0.14.4";
+  version = "0.14.14";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = "hub.sr.ht";
     rev = version;
-    sha256 = "sha256-7HF+jykWGqzPWA0YtJZQZU7pnID1yexcqLkEf2HpnSs=";
+    sha256 = "sha256-4n6oQ+AAvdJY/5KflxAp62chjyrlSUkmt319DKZk33w=";
   };
 
   nativeBuildInputs = srht.nativeBuildInputs;
diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix
index 3ba6375a91380..d981598a7b19a 100644
--- a/pkgs/applications/version-management/sourcehut/lists.nix
+++ b/pkgs/applications/version-management/sourcehut/lists.nix
@@ -1,5 +1,6 @@
 { lib
 , fetchFromSourcehut
+, buildGoModule
 , buildPythonPackage
 , srht
 , asyncpg
@@ -8,23 +9,31 @@
 , emailthreads
 , redis
 , python
+, unzip
 }:
 
 buildPythonPackage rec {
   pname = "listssrht";
-  version = "0.51.7";
+  version = "0.51.11";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = "lists.sr.ht";
     rev = version;
-    sha256 = "sha256-oNY5A98oVoL2JKO0fU/8YVl8u7ywmHb/RHD8A6z9yIM=";
+    sha256 = "sha256-Qb70oOazZfmHpC5r0oMYCFdvfAeKbq3mQA8+M56YYnY=";
   };
 
-  patches = [
-    # Revert change breaking Unix socket support for Redis
-    patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch
-  ];
+  listssrht-api = buildGoModule ({
+    inherit src version;
+    pname = "listssrht-api";
+    modRoot = "api";
+    vendorSha256 = "sha256-xnmMkRSokbhWD+kz0XQ9AinYdm6/50FRBISURPvlzD0=";
+  } // import ./fix-gqlgen-trimpath.nix { inherit unzip;});
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "all: api" ""
+  '';
 
   nativeBuildInputs = srht.nativeBuildInputs;
 
@@ -42,6 +51,10 @@ buildPythonPackage rec {
     export SRHT_PATH=${srht}/${python.sitePackages}/srht
   '';
 
+  postInstall = ''
+    ln -s ${listssrht-api}/bin/api $out/bin/listssrht-api
+  '';
+
   pythonImportsCheck = [ "listssrht" ];
 
   meta = with lib; {
diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix
index 8d43f297a4f88..530101d573520 100644
--- a/pkgs/applications/version-management/sourcehut/man.nix
+++ b/pkgs/applications/version-management/sourcehut/man.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "mansrht";
-  version = "0.15.23";
+  version = "0.15.26";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = "man.sr.ht";
     rev = version;
-    sha256 = "sha256-xrBptXdwMee+YkPup/BYL/iXBhCzSUQ5htSHIw/1Ncc=";
+    sha256 = "sha256-5xZH6DrTXMdWd26OGICp7lZ/QDjACIa7zNUJHB7jzGo=";
   };
 
   nativeBuildInputs = srht.nativeBuildInputs;
diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix
index ab19cc88d25ee..4572fc81b2889 100644
--- a/pkgs/applications/version-management/sourcehut/meta.nix
+++ b/pkgs/applications/version-management/sourcehut/meta.nix
@@ -16,32 +16,34 @@
 , weasyprint
 , prometheus-client
 , python
+, unzip
 }:
 let
-  version = "0.57.5";
+  version = "0.58.18";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = "meta.sr.ht";
     rev = version;
-    sha256 = "sha256-qsCwZaCiqvY445U053OCWD98jlIUi9NB2jWVP2oW3Vk=";
+    sha256 = "sha256-OjbQHAzG2nZwpJUIvhKaCJWZbhZDC2R6C+SkbKUpk8o=";
   };
 
-  buildApi = src: buildGoModule {
+  metasrht-api = buildGoModule ({
     inherit src version;
     pname = "metasrht-api";
-    vendorSha256 = "sha256-8Ubrr9qRlgW2wsLHrPHwulSWLz+gp4VPcTvOZpg8TYM=";
-  };
+    modRoot = "api";
+    vendorSha256 = "sha256-kiEuEYZFbwJ6SbKFtxH4SiRaZmqYriRHPoHdTX28+d0=";
+  } // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
 
 in
 buildPythonPackage rec {
   pname = "metasrht";
   inherit version src;
 
-  patches = [
-    # Revert change breaking Unix socket support for Redis
-    patches/redis-socket/meta/0001-Revert-Add-webhook-queue-monitoring.patch
-  ];
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "all: api" ""
+  '';
 
   nativeBuildInputs = srht.nativeBuildInputs;
 
@@ -68,7 +70,7 @@ buildPythonPackage rec {
 
   postInstall = ''
     mkdir -p $out/bin
-    cp ${buildApi "${src}/api/"}/bin/api $out/bin/metasrht-api
+    ln -s ${metasrht-api}/bin/api $out/bin/metasrht-api
   '';
 
   pythonImportsCheck = [ "metasrht" ];
diff --git a/pkgs/applications/version-management/sourcehut/pages.nix b/pkgs/applications/version-management/sourcehut/pages.nix
index b6a18b5bda770..edb9379c6ded1 100644
--- a/pkgs/applications/version-management/sourcehut/pages.nix
+++ b/pkgs/applications/version-management/sourcehut/pages.nix
@@ -1,20 +1,26 @@
 { lib
 , fetchFromSourcehut
 , buildGoModule
+, unzip
 }:
 
-buildGoModule rec {
+buildGoModule (rec {
   pname = "pagessrht";
-  version = "0.6.2";
+  version = "0.7.4";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = "pages.sr.ht";
     rev = version;
-    sha256 = "sha256-ob0+t9V2o8lhVC6fXbi1rNm0Mnbs+GoyAmhBqVZ13PA=";
+    sha256 = "sha256-WM9T2LS8yIqaR0PQQRgMk/tiMYcw8DZVPMqMWkj/5RY=";
   };
 
-  vendorSha256 = "sha256-b0sHSH0jkKoIVq045N96wszuLJDegkkj0v50nuDFleU=";
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "all: server" ""
+  '';
+
+  vendorSha256 = "sha256-VOqY/nStqGyfWOXnJSZX8UYyp2kzcibQM2NRNysHYEc=";
 
   postInstall = ''
     mkdir -p $out/share/sql/
@@ -27,4 +33,6 @@ buildGoModule rec {
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ eadwu ];
   };
-}
+  # There is no ./loaders but this does not cause troubles
+  # to go generate
+} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion= "0.17.9"; })
diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix
index c411f8e8c954a..e31473bd34361 100644
--- a/pkgs/applications/version-management/sourcehut/paste.nix
+++ b/pkgs/applications/version-management/sourcehut/paste.nix
@@ -8,15 +8,20 @@
 
 buildPythonPackage rec {
   pname = "pastesrht";
-  version = "0.13.6";
+  version = "0.13.8";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = "paste.sr.ht";
     rev = version;
-    sha256 = "sha256-Khcqk86iD9nxiKXN3+8mSLNoDau2qXNFOrLdkVu+rH8=";
+    sha256 = "sha256-Zji9FyYUtsklYz4qyLbtduusteC7WujLCMmvZKcqYis=";
   };
 
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "all: api" ""
+  '';
+
   nativeBuildInputs = srht.nativeBuildInputs;
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/build/0001-Revert-Add-build-submission-and-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/build/0001-Revert-Add-build-submission-and-queue-monitoring.patch
deleted file mode 100644
index ae8e95ddc0c2f..0000000000000
--- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/build/0001-Revert-Add-build-submission-and-queue-monitoring.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 069b03f85847ed4a9223183b62ee53f420838911 Mon Sep 17 00:00:00 2001
-From: Julien Moutinho <julm+srht@sourcephile.fr>
-Date: Thu, 16 Dec 2021 04:54:24 +0100
-Subject: [PATCH builds.sr.ht] Revert "Add build submission and queue
- monitoring"
-
-This reverts commit 690f1aa16c77e418dc40109cd5e8fdf4a7ed947a.
-
-This has broken Unix socket support for Redis
-See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E
----
- buildsrht/app.py    | 3 ---
- buildsrht/runner.py | 9 +--------
- 2 files changed, 1 insertion(+), 11 deletions(-)
-
-diff --git a/buildsrht/app.py b/buildsrht/app.py
-index e5321a2..7c9977c 100644
---- a/buildsrht/app.py
-+++ b/buildsrht/app.py
-@@ -36,9 +36,6 @@ class BuildApp(SrhtFlask):
-         self.register_blueprint(secrets)
-         self.register_blueprint(gql_blueprint)
- 
--        from buildsrht.runner import builds_queue_metrics_collector
--        self.metrics_registry.register(builds_queue_metrics_collector)
--
-         @self.context_processor
-         def inject():
-             return {
-diff --git a/buildsrht/runner.py b/buildsrht/runner.py
-index 7773452..0389c8e 100644
---- a/buildsrht/runner.py
-+++ b/buildsrht/runner.py
-@@ -5,13 +5,10 @@ from srht.config import cfg
- from srht.database import db
- from srht.email import send_email
- from srht.oauth import UserType
--from srht.metrics import RedisQueueCollector
--from prometheus_client import Counter
- 
- allow_free = cfg("builds.sr.ht", "allow-free", default="no") == "yes"
- 
--builds_broker = cfg("builds.sr.ht", "redis")
--runner = Celery('builds', broker=builds_broker, config_source={
-+runner = Celery('builds', broker=cfg("builds.sr.ht", "redis"), config_source={
-     "CELERY_TASK_SERIALIZER": "json",
-     "CELERY_ACCEPT_CONTENT": ["json"],
-     "CELERY_RESULT_SERIALIZER": "json",
-@@ -19,9 +16,6 @@ runner = Celery('builds', broker=builds_broker, config_source={
-     "CELERY_TASK_PROTOCOL": 1
- })
- 
--builds_queue_metrics_collector = RedisQueueCollector(builds_broker, "buildsrht_builds", "Number of builds currently in queue")
--builds_submitted = Counter("buildsrht_builds_submited", "Number of builds submitted")
--
- def queue_build(job, manifest):
-     from buildsrht.types import JobStatus
-     job.status = JobStatus.queued
-@@ -34,7 +28,6 @@ def queue_build(job, manifest):
-                 cfg("sr.ht", "owner-email"),
-                 "Cryptocurrency mining attempt on builds.sr.ht")
-     else:
--        builds_submitted.inc()
-         run_build.delay(job.id, manifest.to_dict())
- 
- def requires_payment(user):
--- 
-2.34.0
-
diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch
new file mode 100644
index 0000000000000..889331f3e07ff
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch
@@ -0,0 +1,42 @@
+From 76dd636151735671be74ba9d55f773e190e22827 Mon Sep 17 00:00:00 2001
+From: Julien Moutinho <julm+srht@sourcephile.fr>
+Date: Fri, 13 May 2022 22:40:46 +0200
+Subject: [PATCH core.sr.ht] Fix Unix socket support in RedisQueueCollector
+
+The broker URL is not necessarily in the format expected by Redis.from_url
+
+Especially, Redis.from_url supports this format for Unix sockets:
+    unix:///run/redis-sourcehut-metasrht/redis.sock?db=0
+See https://redis-py.readthedocs.io/en/stable/#redis.ConnectionPool.from_url
+
+Whereas Celery+Kombu support Redis but also other transports
+and thus expect another scheme:
+    redis+socket:///run/redis-sourcehut-metasrht/redis.sock?virtual_host=1
+See https://docs.celeryproject.org/en/stable/userguide/configuration.html#redis-backend-settings
+and https://github.com/celery/celery/blob/e5d99801e4b56a02af4a2e183879c767228d2817/celery/backends/redis.py#L299-L352
+and https://github.com/celery/kombu/blob/master/kombu/utils/url.py
+---
+ srht/metrics.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/srht/metrics.py b/srht/metrics.py
+index 68caf8e..2df5777 100644
+--- a/srht/metrics.py
++++ b/srht/metrics.py
+@@ -1,11 +1,12 @@
+ import time
++from celery import Celery
+ from prometheus_client.metrics_core import GaugeMetricFamily
+ from redis import Redis, ResponseError
+ 
+ 
+ class RedisQueueCollector:
+     def __init__(self, broker, name, documentation, queue_name="celery"):
+-        self.redis = Redis.from_url(broker)
++        self.redis = Celery("collector", broker=broker).connection_for_read().channel().client
+         self.queue_name = queue_name
+         self.name = name
+         self.documentation = documentation
+-- 
+2.35.1
+
diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch
deleted file mode 100644
index 4c526dd23e119..0000000000000
--- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 5ccb5386304c26f25b0a9eb10ce9edb6da32f91a Mon Sep 17 00:00:00 2001
-From: Julien Moutinho <julm+srht@sourcephile.fr>
-Date: Sat, 12 Feb 2022 00:11:59 +0100
-Subject: [PATCH git.sr.ht] Revert "Add webhook queue monitoring"
-
-This reverts commit 7ea630b776947ab82438d0ffa263b0f9d33ebff3.
-
-Which has broken Unix socket support for Redis.
-See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E
----
- gitsrht/app.py      | 3 ---
- gitsrht/webhooks.py | 5 +----
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/gitsrht/app.py b/gitsrht/app.py
-index e9ccb56..4928851 100644
---- a/gitsrht/app.py
-+++ b/gitsrht/app.py
-@@ -48,9 +48,6 @@ class GitApp(ScmSrhtFlask):
-         self.add_template_filter(url_quote)
-         self.add_template_filter(commit_links)
- 
--        from gitsrht.webhooks import webhook_metrics_collector
--        self.metrics_registry.register(webhook_metrics_collector)
--
-         @self.context_processor
-         def inject():
-             notice = session.get("notice")
-diff --git a/gitsrht/webhooks.py b/gitsrht/webhooks.py
-index 8a203fe..6240d50 100644
---- a/gitsrht/webhooks.py
-+++ b/gitsrht/webhooks.py
-@@ -7,13 +7,10 @@ if not hasattr(db, "session"):
-     db.init()
- from srht.webhook import Event
- from srht.webhook.celery import CeleryWebhook, make_worker
--from srht.metrics import RedisQueueCollector
- from scmsrht.webhooks import UserWebhook
- import sqlalchemy as sa
- 
--webhook_broker = cfg("git.sr.ht", "webhooks")
--worker = make_worker(broker=webhook_broker)
--webhook_metrics_collector = RedisQueueCollector(webhook_broker, "srht_webhooks", "Webhook queue length")
-+worker = make_worker(broker=cfg("git.sr.ht", "webhooks"))
- 
- class RepoWebhook(CeleryWebhook):
-     events = [
--- 
-2.34.1
-
diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch
deleted file mode 100644
index 872d285b9bb07..0000000000000
--- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 730e090f31b150d42be4b4722751f8e4610835b0 Mon Sep 17 00:00:00 2001
-From: Julien Moutinho <julm+srht@sourcephile.fr>
-Date: Sat, 12 Feb 2022 00:38:12 +0100
-Subject: [PATCH lists.sr.ht] Revert "Add webhook queue monitoring"
-
-This reverts commit e74e344808e8d523a9786cefcbf64c9a247d7a0e.
-
-Which has broken Unix socket support for Redis.
-See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E
----
- listssrht/app.py      | 3 ---
- listssrht/webhooks.py | 5 +----
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/listssrht/app.py b/listssrht/app.py
-index aec59f3..83a355d 100644
---- a/listssrht/app.py
-+++ b/listssrht/app.py
-@@ -29,9 +29,6 @@ class ListsApp(SrhtFlask):
-         self.register_blueprint(user)
-         self.register_blueprint(gql_blueprint)
- 
--        from listssrht.webhooks import webhook_metrics_collector
--        self.metrics_registry.register(webhook_metrics_collector)
--
-         @self.context_processor
-         def inject():
-             from listssrht.types import ListAccess
-diff --git a/listssrht/webhooks.py b/listssrht/webhooks.py
-index ae5b1cb..86421ba 100644
---- a/listssrht/webhooks.py
-+++ b/listssrht/webhooks.py
-@@ -8,11 +8,8 @@ if not hasattr(db, "session"):
-     db.init()
- from srht.webhook import Event
- from srht.webhook.celery import CeleryWebhook, make_worker
--from srht.metrics import RedisQueueCollector
- 
--webhook_broker = cfg("lists.sr.ht", "webhooks")
--worker = make_worker(broker=webhook_broker)
--webhook_metrics_collector = RedisQueueCollector(webhook_broker, "srht_webhooks", "Webhook queue length")
-+worker = make_worker(broker=cfg("lists.sr.ht", "webhooks"))
- 
- class ListWebhook(CeleryWebhook):
-     events = [
--- 
-2.34.1
-
diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/meta/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/meta/0001-Revert-Add-webhook-queue-monitoring.patch
deleted file mode 100644
index 9ec37670b0600..0000000000000
--- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/meta/0001-Revert-Add-webhook-queue-monitoring.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d88bee195797c6c294320617ff14798da94cd0f3 Mon Sep 17 00:00:00 2001
-From: Julien Moutinho <julm+srht@sourcephile.fr>
-Date: Thu, 16 Dec 2021 04:52:08 +0100
-Subject: [PATCH meta.sr.ht] Revert "Add webhook queue monitoring"
-
-This reverts commit 9931df3c23094af5179df9ef019ca732b8125dac.
-
-This has broken Unix socket support for Redis.
-See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E
----
- metasrht/app.py      | 3 ---
- metasrht/webhooks.py | 5 +----
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/metasrht/app.py b/metasrht/app.py
-index b190875..89c59bc 100644
---- a/metasrht/app.py
-+++ b/metasrht/app.py
-@@ -49,9 +49,6 @@ class MetaApp(SrhtFlask):
-             from metasrht.blueprints.billing import billing
-             self.register_blueprint(billing)
- 
--        from metasrht.webhooks import webhook_metrics_collector
--        self.metrics_registry.register(webhook_metrics_collector)
--
-         @self.context_processor
-         def inject():
-             return {
-diff --git a/metasrht/webhooks.py b/metasrht/webhooks.py
-index 3e1149e..3f0ba01 100644
---- a/metasrht/webhooks.py
-+++ b/metasrht/webhooks.py
-@@ -7,11 +7,8 @@ if not hasattr(db, "session"):
-     db.init()
- from srht.webhook import Event
- from srht.webhook.celery import CeleryWebhook, make_worker
--from srht.metrics import RedisQueueCollector
- 
--webhook_broker = cfg("meta.sr.ht", "webhooks", "redis://")
--worker = make_worker(broker=webhook_broker)
--webhook_metrics_collector = RedisQueueCollector(webhook_broker, "srht_webhooks", "Webhook queue length")
-+worker = make_worker(broker=cfg("meta.sr.ht", "webhooks", "redis://"))
- 
- class UserWebhook(CeleryWebhook):
-     events = [
--- 
-2.34.0
-
diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch
deleted file mode 100644
index 861608c11843e..0000000000000
--- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 42a27ea60d8454552d54e1f51f1b976d1067fc32 Mon Sep 17 00:00:00 2001
-From: Julien Moutinho <julm+srht@sourcephile.fr>
-Date: Sat, 12 Feb 2022 00:30:29 +0100
-Subject: [PATCH todo.sr.ht] Revert "Add webhook queue monitoring"
-
-This reverts commit 320a5e8f7cd16ca43928c36f0320593f84d986fa.
-
-Which has broken Unix socket support for Redis.
-See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E
----
- todosrht/flask.py    | 3 ---
- todosrht/webhooks.py | 6 +-----
- 2 files changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/todosrht/flask.py b/todosrht/flask.py
-index 5e8ac66..9d0fd27 100644
---- a/todosrht/flask.py
-+++ b/todosrht/flask.py
-@@ -43,9 +43,6 @@ class TodoApp(SrhtFlask):
-         self.add_template_filter(urls.tracker_url)
-         self.add_template_filter(urls.user_url)
- 
--        from todosrht.webhooks import webhook_metrics_collector
--        self.metrics_registry.register(webhook_metrics_collector)
--
-         @self.context_processor
-         def inject():
-             return {
-diff --git a/todosrht/webhooks.py b/todosrht/webhooks.py
-index eb8e08a..950047f 100644
---- a/todosrht/webhooks.py
-+++ b/todosrht/webhooks.py
-@@ -7,13 +7,9 @@ if not hasattr(db, "session"):
-     db.init()
- from srht.webhook import Event
- from srht.webhook.celery import CeleryWebhook, make_worker
--from srht.metrics import RedisQueueCollector
- import sqlalchemy as sa
- 
--
--webhooks_broker = cfg("todo.sr.ht", "webhooks")
--worker = make_worker(broker=webhooks_broker)
--webhook_metrics_collector = RedisQueueCollector(webhooks_broker, "srht_webhooks", "Webhook queue length")
-+worker = make_worker(broker=cfg("todo.sr.ht", "webhooks"))
- 
- import todosrht.tracker_import
- 
--- 
-2.34.1
-
diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix
index 10da3018843ae..49eea05a7a7a2 100644
--- a/pkgs/applications/version-management/sourcehut/scm.nix
+++ b/pkgs/applications/version-management/sourcehut/scm.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "scmsrht";
-  version = "0.22.19"; # Untagged version
+  version = "0.22.22";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = "scm.sr.ht";
     rev = version;
-    sha256 = "sha256-/QryPjWJ2S0Ov9DTdrwbM81HYucHiYcLh0oKacflywI=";
+    sha256 = "sha256-iSzzyI8HZOpOb4dyt520MV/wds14fNag2+UOF09KS7w=";
   };
 
   nativeBuildInputs = srht.nativeBuildInputs;
diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix
index 1446e68fa69dc..0278fb6bd1738 100644
--- a/pkgs/applications/version-management/sourcehut/todo.nix
+++ b/pkgs/applications/version-management/sourcehut/todo.nix
@@ -1,5 +1,6 @@
 { lib
 , fetchFromSourcehut
+, buildGoModule
 , buildPythonPackage
 , srht
 , redis
@@ -8,23 +9,31 @@
 , pytest
 , factory_boy
 , python
+, unzip
 }:
 
 buildPythonPackage rec {
   pname = "todosrht";
-  version = "0.67.2";
+  version = "0.72.2";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = "todo.sr.ht";
     rev = version;
-    sha256 = "sha256-/QHsMlhzyah85ubZyx8j4GDUoITuWcLDJKosbZGeOZU=";
+    sha256 = "sha256-FLjVO8Y/9s2gFfMXwcY7Rj3WNzPEBYs1AEjiVZFWsT8=";
   };
 
-  patches = [
-    # Revert change breaking Unix socket support for Redis
-    patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch
-  ];
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "all: api" ""
+  '';
+
+  todosrht-api = buildGoModule ({
+    inherit src version;
+    pname = "todosrht-api";
+    modRoot = "api";
+    vendorSha256 = "sha256-LB1H4jwnvoEyaaYJ09NI/M6IkgZwRet/fkso6b9EPV0=";
+  } // import ./fix-gqlgen-trimpath.nix {inherit unzip;});
 
   nativeBuildInputs = srht.nativeBuildInputs;
 
@@ -40,6 +49,10 @@ buildPythonPackage rec {
     export SRHT_PATH=${srht}/${python.sitePackages}/srht
   '';
 
+  postInstall = ''
+    ln -s ${todosrht-api}/bin/api $out/bin/todosrht-api
+  '';
+
   # pytest tests fail
   checkInputs = [
     pytest
diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/pkgs/applications/version-management/sourcehut/update.sh
index 97509397aef52..e13ce09da4c71 100755
--- a/pkgs/applications/version-management/sourcehut/update.sh
+++ b/pkgs/applications/version-management/sourcehut/update.sh
@@ -16,7 +16,7 @@ version() {
 }
 
 src_url() {
-  nix-instantiate --eval --strict --expr " with import $root {}; let src = sourcehut.python.pkgs.$1.drvAttrs.src; in src.url or src.meta.homepage" | tr -d '"'
+  nix-instantiate --eval --strict --expr " with import $root {}; let src = sourcehut.python.pkgs.$1.drvAttrs.src; in src.meta.homepage" | tr -d '"'
 }
 
 get_latest_version() {
diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix
index 5fc62912c24a4..dd2a7dadc2f75 100644
--- a/pkgs/applications/video/qarte/default.nix
+++ b/pkgs/applications/video/qarte/default.nix
@@ -1,15 +1,15 @@
 { mkDerivation, lib, fetchbzr, python3, rtmpdump }:
 
 let
-  pythonEnv = python3.withPackages (ps: with ps; [ pyqt5_with_qtmultimedia ]);
+  pythonEnv = python3.withPackages (ps: with ps; [ m3u8 pyqt5_with_qtmultimedia ]);
 in mkDerivation {
   pname = "qarte";
-  version = "4.15.1";
+  version = "4.17.1";
 
   src = fetchbzr {
     url = "http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4";
-    rev = "67";
-    sha256 = "sha256:0ajvrvpyqyyxnq9nv69p3sr6c1kplphvrpph75k76yl0av94j2s3";
+    rev = "74";
+    sha256 = "sha256:18ky9qwfvbifd0xrbmnfm3cm2vyy5jgf9rrca2hby46sjf2745h4";
   };
 
   buildInputs = [ pythonEnv ];
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 29be2112896bb..8c4fbce8e1e9a 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchFromGitHub {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "sha256-WEHhx9xSxzBoViujGc4yNt9K2gSMfU6GFmsYk3WDfu8=";
+    sha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8=";
   };
 
   vendorSha256 = null;
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index dbe434578963b..5649815a70798 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -16,13 +16,13 @@
 
 buildGoModule rec {
   pname = "runc";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "opencontainers";
     repo = "runc";
     rev = "v${version}";
-    sha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8=";
+    sha256 = "sha256-s0VRj/hjevtTZ9rUQsAsI2pg4ygahlrBIfFdETWy9W0=";
   };
 
   vendorSha256 = null;
diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix
index 1a87f29f67cd9..33a313eb8eec5 100644
--- a/pkgs/applications/window-managers/fbpanel/default.nix
+++ b/pkgs/applications/window-managers/fbpanel/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
       --replace "CFLAGSX =" "CFLAGSX = -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
   '';
 
+  # Workaround build failure on -fno-common toolchains like upstream
+  # gcc-10. Otherwise build fails as:
+  #   ld: plugin.o:(.bss+0x0): multiple definition of `stam'; panel.o:(.bss+0x20): first defined here
+  NIX_CFLAGS_COMPILE = "-fcommon";
   NIX_LDFLAGS="-lX11";
 
   meta = with lib; {
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 1e04c9b0e293d..c889b3865f658 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -10,7 +10,6 @@ rec {
   *
   * Examples:
   * runCommand "name" {envVariable = true;} ''echo hello > $out''
-  * runCommandNoCC "name" {envVariable = true;} ''echo hello > $out'' # equivalent to prior
   * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out'';
   *
   * The `*Local` variants force a derivation to be built locally,
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 5894a522434c3..6002f4fc89d45 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "1da63d5bfb88cd1e920fefd1b55650c78edc5539",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1da63d5bfb88cd1e920fefd1b55650c78edc5539.tar.gz",
-  "sha256": "1n8qv8ajfwrj73f81m2zj81jyjx1jxxhjljwp8gch2aq8piz74g6",
-  "msg": "Update from Hackage at 2022-05-29T17:05:02Z"
+  "commit": "a4be9679c308459b390768e6195f3f08ae5366db",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a4be9679c308459b390768e6195f3f08ae5366db.tar.gz",
+  "sha256": "09pr3ag0k1wjiih36p902gcpygxg8f7wqpr5g8j7ka851g0gckqa",
+  "msg": "Update from Hackage at 2022-06-04T09:01:11Z"
 }
diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix
index 8039caa74be6b..acb423f44bd35 100644
--- a/pkgs/desktops/cdesktopenv/default.nix
+++ b/pkgs/desktops/cdesktopenv/default.nix
@@ -49,6 +49,11 @@ in stdenv.mkDerivation rec {
   # build fails otherwise
   enableParallelBuilding = false;
 
+  # Workaround build failure on -fno-common toolchains:
+  #   ld: raima/startup.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: multiple definition of
+  #     `__SK__'; raima/alloc.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: first defined here
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
   makeFlags = [
     "World"
     "BOOTSTRAPCFLAGS=-I${xorgproto}/include/X11"
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 6d0471dacbb50..e6ccc2598035b 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -40,7 +40,10 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "pic" "bindnow" ];
 
-  NIX_CFLAGS_COMPILE = "-fgnu89-inline";
+  # -fcommon: workaround build failure on -fno-common toolchains:
+  #   ld: ./libgclp.a(user_match.o):(.bss+0x18): multiple definition of
+  #     `tf'; ./libpre_gcl.a(main.o):(.bss+0x326d90): first defined here
+  NIX_CFLAGS_COMPILE = "-fgnu89-inline -fcommon";
 
   meta = with lib; {
     description = "GNU Common Lisp compiler working via GCC";
diff --git a/pkgs/development/compilers/gmqcc/default.nix b/pkgs/development/compilers/gmqcc/default.nix
new file mode 100644
index 0000000000000..f3b25e2dbd4ad
--- /dev/null
+++ b/pkgs/development/compilers/gmqcc/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, pkgs
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gmqcc";
+  version = "unstable-2021-07-09";
+
+  src = fetchFromGitHub {
+    owner = "graphitemaster";
+    repo = "gmqcc";
+    rev = "297eab9e5e2c9cc4f41201b68821593a5cf9a725";
+    sha256 = "1hl2qn7402ia03kjkblj4q4wfypxkil99sivsyk2vrnwwpdp4nzx";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    install -m755 gmqcc $out/bin
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://graphitemaster.github.io/gmqcc/";
+    description = "A modern QuakeC compiler";
+    longDescription = ''
+      For an enduring period of time the options for a decent compiler for
+      the Quake C programming language were confined to a specific compiler
+      known as QCC. Attempts were made to extend and improve upon the design
+      of QCC, but many foreseen the consequences of building on a broken
+      foundation. The solution was obvious, a new compiler; one born from
+      the NIH realm of sarcastic wit.
+      We welcome you. You won't find a better Quake C compiler.
+    '';
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ necrophcodr ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
index a53b8199fe96e..798ea04368f85 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -8,6 +8,7 @@ with lib; mkCoqDerivation {
   defaultVersion = if versions.isGe "8.6" coq.coq-version
     then "${coq.coq-version}.0" else null;
 
+  release."8.16.0".sha256 = "sha256-DH3iWwatPlhhCVYVlgL2WLkvneSVzSXUiKo2e0+1zR4=";
   release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns";
   release."8.14.0".sha256 = "0jsgdvj0ddhkls32krprp34r64y1rb5mwxl34fgaxk2k4664yq06";
   release."8.13.0".sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y";
diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
index 03fe8c32d5c33..4b471b55b4824 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -6,20 +6,21 @@ with builtins; with lib; let
     { case = "8.12"; out = { version = "1.12.0"; };}
     { case = "8.13"; out = { version = "1.13.7"; };}
     { case = "8.14"; out = { version = "1.13.7"; };}
-    { case = "8.15"; out = { version = "1.14.1"; };}
-  ] { version = "1.14.1"; } );
+    { case = "8.15"; out = { version = "1.15.0"; };}
+  ] {} );
 in mkCoqDerivation {
   pname = "elpi";
   repo  = "coq-elpi";
   owner = "LPCIC";
   inherit version;
   defaultVersion = lib.switch coq.coq-version [
-    { case = "8.15"; out = "1.13.0"; }
+    { case = "8.15"; out = "1.14.0"; }
     { case = "8.14"; out = "1.11.2"; }
     { case = "8.13"; out = "1.11.1"; }
     { case = "8.12"; out = "1.8.3_8.12"; }
     { case = "8.11"; out = "1.6.3_8.11"; }
   ] null;
+  release."1.14.0".sha256     = "sha256:1v2p5dlpviwzky2i14cj7gcgf8cr0j54bdm9fl5iz1ckx60j6nvp";
   release."1.13.0".sha256     = "1j7s7dlnjbw222gnbrsjgmjck1yrx7h6hwm8zikcyxi0zys17w7n";
   release."1.12.1".sha256     = "sha256-4mO6/co7NcIQSGIQJyoO8lNWXr6dqz+bIYPO/G0cPkY=";
   release."1.11.2".sha256     = "0qk5cfh15y2zrja7267629dybd3irvxk1raz7z8qfir25a81ckd4";
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 4dff2d82848d6..7cab5d38c7b3b 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -41,9 +41,6 @@
 
 , meta ? {}
 
-# disabled
-, runVend ? false
-
 # Not needed with buildGoModule
 , goPackagePath ? ""
 
@@ -55,8 +52,6 @@
 
 with builtins;
 
-assert runVend != false -> throw "`runVend` has been replaced by `proxyVendor`";
-
 assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`";
 
 let
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e7dceb87370d6..e55f32231cfa0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2351,25 +2351,6 @@ self: super: {
   # Invalid CPP in test suite: https://github.com/cdornan/memory-cd/issues/1
   memory-cd = dontCheck super.memory-cd;
 
-  protolude = appendPatches [
-    # Intermediate Patch, so the next one applies
-    (fetchpatch {
-      name = "integer-gmp-only-symbols.patch";
-      url = "https://github.com/protolude/protolude/commit/84d228a3b5a2adfe5c8aec23176a0301012e54eb.patch";
-      sha256 = "0mk0gxcg8vp73wlz764y24gqmxdrhanp12dfam9xsb6cm34jkjdc";
-    })
-    # Compat with GHC 9.0 (not merged yet)
-    (fetchpatch {
-      name = "protolude-ghc-9.0.patch";
-      url = "https://github.com/protolude/protolude/pull/131/commits/1ca4b4564b4d868022d5bab5330e2c7d9cae11a0.patch";
-      sha256 = "0jrm6715kc8v7v4isi79b3w1i51rs332bkak25ik6zv3i5lgcg68";
-      includes = [
-        "protolude.cabal"
-        "src/**"
-      ];
-    })
-  ] super.protolude;
-
   # https://github.com/haskell/fgl/pull/99
   fgl = doJailbreak super.fgl;
   fgl-arbitrary = doJailbreak super.fgl-arbitrary;
@@ -2485,9 +2466,9 @@ self: super: {
   ema = assert super.ema.version == "0.6.0.0";
     super.ema.overrideScope (self: super: { relude = doJailbreak self.relude_0_7_0_0; });
 
-  # attoparsec bump is on v2 branch, but not released yet
-  irc-core = assert super.irc-core.version == "2.10"; doJailbreak super.irc-core;
-  glirc = assert super.irc-core.version == "2.10"; doJailbreak super.glirc;
+  glirc = super.glirc.override {
+    vty = self.vty_5_35_1;
+  };
 
   # 2022-02-25: Unmaintained and to strict upper bounds
   paths = doJailbreak super.paths;
@@ -2568,6 +2549,10 @@ self: super: {
     sha256 = "0wxpqazjnal9naibapg63nm7x6qz0lklcfw2m5mzjrh2q9x2cvnd";
   }) super.debian;
 
+  # Test data missing from sdist
+  # https://github.com/ngless-toolkit/ngless/issues/152
+  NGLess = dontCheck super.NGLess;
+
   # Raise version bounds for hspec
   records-sop = appendPatch (fetchpatch {
     url = "https://github.com/kosmikus/records-sop/pull/11/commits/d88831388ab3041190130fec3cdd679a4217b3c7.patch";
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
index ef625d0db9ab3..02fe3d6a61a0d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@@ -206,9 +206,13 @@ self: super: {
   regex-rure = doDistribute (markUnbroken super.regex-rure);
   jacinda = doDistribute super.jacinda;
   some = doJailbreak super.some;
+
+  # 2022-06-05: this is not the latest version of fourmolu because
+  # hls-fourmolu-plugin 1.0.3.0 doesn‘t support a newer one.
   fourmolu = super.fourmolu_0_6_0_0;
   # hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0
   hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.3.0"; doJailbreak super.hls-fourmolu-plugin;
+
   hls-ormolu-plugin = assert super.hls-ormolu-plugin.version == "1.0.2.1"; doJailbreak super.hls-ormolu-plugin;
   implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
   # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index e4491aca741ae..0dc367e6e2e00 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -571,6 +571,7 @@ broken-packages:
   - call-alloy
   - cal-layout
   - call-haskell-from-anything
+  - call-plantuml
   - camfort
   - canon
   - canonical-filepath
@@ -648,6 +649,7 @@ broken-packages:
   - checked
   - Checked
   - checkmate
+  - chez-grater
   - chiasma
   - Chitra
   - choose
@@ -3782,6 +3784,7 @@ broken-packages:
   - pcf-font
   - pcgen
   - PCLT
+  - pcre2
   - pcre-light-extra
   - pdfname
   - pdf-slave-template
@@ -3943,6 +3946,7 @@ broken-packages:
   - polysemy-check
   - polysemy-keyed-state
   - polysemy-kvstore-jsonfile
+  - polysemy-managed
   - polysemy-mocks
   - polysemy-readline
   - polysemy-req
@@ -5504,6 +5508,7 @@ broken-packages:
   - wai-graceful
   - wai-handler-devel
   - wai-handler-fastcgi
+  - wai-handler-hal
   - wai-handler-scgi
   - wai-handler-webkit
   - wai-hmac-auth
@@ -5564,11 +5569,11 @@ broken-packages:
   - webdriver
   - webdriver-snoy
   - web-encodings
-  - webkitgtk3
   - WeberLogic
   - webex-teams-pipes
   - webfinger-client
   - web-inv-route
+  - webkitgtk3
   - webkit-javascriptcore
   - webmention
   - web-output
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index dece67d927dfb..05ab12f129404 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -87,10 +87,6 @@ default-package-overrides:
   - dhall-nix < 1.1.24
   # Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version
   - distribution-nixpkgs < 1.7.0
-  # glirc 2.39 is broken: https://github.com/glguy/irc-core/issues/99
-  - glirc == 2.38
-  # glirc 2.38 requires hookup 0.6
-  - hookup == 0.6
 
 extra-packages:
   - aeson < 2                           # required by pantry-0.5.2
@@ -138,6 +134,7 @@ extra-packages:
   - hspec-core < 2.8                    # 2022-04-07: Needed for tasty-hspec 1.1.6
   - hspec-discover < 2.8                # 2022-04-07: Needed for tasty-hspec 1.1.6
   - bower-json == 1.0.0.1               # 2022-05-21: Needed for spago 0.20.9
+  - fourmolu == 0.6.0.0                 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0
 
 package-maintainers:
   abbradar:
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index 5339368c6395d..a6a478fb37f4e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@@ -1,4 +1,4 @@
-# Stackage LTS 19.8
+# Stackage LTS 19.9
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -24,7 +24,7 @@ default-package-overrides:
   - aeson-casing ==0.2.0.0
   - aeson-commit ==1.4
   - aeson-compat ==0.3.10
-  - aeson-diff ==1.1.0.12
+  - aeson-diff ==1.1.0.13
   - aeson-extra ==0.5.1
   - aeson-generic-compat ==0.0.1.3
   - aeson-optics ==1.1.1
@@ -368,7 +368,7 @@ default-package-overrides:
   - colour ==2.3.6
   - columnar ==1.0.0.0
   - combinatorial ==0.1.0.1
-  - comfort-array ==0.5.1
+  - comfort-array ==0.5.1.1
   - comfort-array-shape ==0.0
   - comfort-fftw ==0.0
   - comfort-graph ==0.0.3.2
@@ -399,7 +399,7 @@ default-package-overrides:
   - conduit-aeson ==0.1.0.1
   - conduit-algorithms ==0.0.12.0
   - conduit-combinators ==1.3.0
-  - conduit-concurrent-map ==0.1.1
+  - conduit-concurrent-map ==0.1.3
   - conduit-connection ==0.1.0.5
   - conduit-extra ==1.3.6
   - conduit-parse ==0.2.1.1
@@ -426,7 +426,7 @@ default-package-overrides:
   - control-dsl ==0.2.1.3
   - control-monad-free ==0.6.2
   - control-monad-omega ==0.3.2
-  - convertible ==1.1.1.0
+  - convertible ==1.1.1.1
   - cookie ==0.4.5
   - copr-api ==0.1.0
   - core-data ==0.3.2.2
@@ -604,7 +604,7 @@ default-package-overrides:
   - doctest-exitcode-stdio ==0.0
   - doctest-extract ==0.1
   - doctest-lib ==0.1
-  - doctest-parallel ==0.2.2
+  - doctest-parallel ==0.2.3
   - doldol ==0.4.1.2
   - do-list ==1.0.1
   - domain ==0.1.1.3
@@ -672,7 +672,7 @@ default-package-overrides:
   - eq ==4.3
   - equal-files ==0.0.5.3
   - equational-reasoning ==0.7.0.1
-  - equivalence ==0.4
+  - equivalence ==0.4.0.1
   - erf ==2.0.0.0
   - errata ==0.4.0.0
   - error ==0.3.0.0
@@ -761,7 +761,7 @@ default-package-overrides:
   - fixed-length ==0.2.3
   - fixed-vector ==1.2.1.0
   - fixed-vector-hetero ==0.6.1.1
-  - fix-whitespace ==0.0.7
+  - fix-whitespace ==0.0.8
   - flac ==0.2.0
   - flac-picture ==0.1.2
   - flags-applicative ==0.1.0.3
@@ -1328,7 +1328,7 @@ default-package-overrides:
   - json-feed ==2.0.0.1
   - jsonifier ==0.2.0.1
   - jsonpath ==0.2.1.0
-  - json-stream ==0.4.3.0
+  - json-stream ==0.4.4.1
   - JuicyPixels ==3.3.7
   - JuicyPixels-blurhash ==0.1.0.3
   - JuicyPixels-extra ==0.5.2
@@ -1425,7 +1425,7 @@ default-package-overrides:
   - linux-file-extents ==0.2.0.0
   - linux-namespaces ==0.1.3.0
   - List ==0.6.2
-  - ListLike ==4.7.6
+  - ListLike ==4.7.7
   - list-predicate ==0.1.0.1
   - listsafe ==0.1.0.1
   - list-singleton ==2.0.0.0
@@ -1611,7 +1611,7 @@ default-package-overrides:
   - mwc-random-monad ==0.7.3.1
   - mx-state-codes ==1.0.0.0
   - mysql ==0.2.1
-  - mysql-simple ==0.4.7.2
+  - mysql-simple ==0.4.8
   - n2o ==0.11.1
   - n2o-nitro ==0.11.2
   - nagios-check ==0.3.2
@@ -1622,7 +1622,7 @@ default-package-overrides:
   - nanospec ==0.2.2
   - nanovg ==0.8.0.0
   - nats ==1.1.2
-  - natural-arithmetic ==0.1.2.0
+  - natural-arithmetic ==0.1.3.0
   - natural-induction ==0.2.0.0
   - natural-sort ==0.1.2
   - natural-transformation ==0.4
@@ -1681,9 +1681,9 @@ default-package-overrides:
   - numbers ==3000.2.0.2
   - numeric-extras ==0.1
   - numeric-limits ==0.1.0.0
-  - numeric-prelude ==0.4.3.3
+  - numeric-prelude ==0.4.4
   - numeric-quest ==0.2.0.2
-  - numhask ==0.10.0.0
+  - numhask ==0.10.1.0
   - numhask-array ==0.10.0
   - numhask-space ==0.10.0.0
   - NumInstances ==1.4
@@ -2208,7 +2208,7 @@ default-package-overrides:
   - shake ==0.19.6
   - shake-language-c ==0.12.0
   - shake-plus ==0.3.4.0
-  - shakespeare ==2.0.27
+  - shakespeare ==2.0.29
   - shared-memory ==0.2.0.0
   - ShellCheck ==0.8.0
   - shell-conduit ==5.0.0
@@ -2478,7 +2478,7 @@ default-package-overrides:
   - text-regex-replace ==0.1.1.4
   - text-rope ==0.1
   - text-short ==0.1.5
-  - text-show ==3.9.6
+  - text-show ==3.9.7
   - text-show-instances ==3.8.6
   - text-zipper ==0.11
   - tfp ==1.0.2
@@ -2488,7 +2488,7 @@ default-package-overrides:
   - th-compat ==0.1.3
   - th-constraint-compat ==0.0.1.0
   - th-desugar ==1.12
-  - th-env ==0.1.0.3
+  - th-env ==0.1.1
   - these ==1.1.1.1
   - these-lens ==1.0.1.2
   - these-optics ==1.0.1.2
@@ -2613,7 +2613,7 @@ default-package-overrides:
   - unicode-show ==0.1.1.1
   - unicode-transforms ==0.4.0.1
   - unidecode ==0.1.0.4
-  - unification-fd ==0.11.1
+  - unification-fd ==0.11.2
   - union ==0.1.2
   - union-angle ==0.1.0.1
   - union-find ==0.2
@@ -2632,7 +2632,7 @@ default-package-overrides:
   - universe-reverse-instances ==1.1.1
   - universe-some ==1.2.1
   - universum ==1.7.3
-  - unix-bytestring ==0.3.7.6
+  - unix-bytestring ==0.3.7.7
   - unix-compat ==0.5.4
   - unix-time ==0.4.7
   - unliftio ==0.2.22.0
@@ -2735,7 +2735,7 @@ default-package-overrides:
   - wai-transformers ==0.1.0
   - wai-websockets ==3.0.1.2
   - wakame ==0.1.0.0
-  - warp ==3.3.20
+  - warp ==3.3.21
   - warp-tls ==3.3.2
   - warp-tls-uid ==0.2.0.6
   - wave ==0.2.0
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index e44cbdc8571f7..d0668b13a404e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -878,6 +878,7 @@ dont-distribute-packages:
  - cabal-query
  - cabal-test
  - cabal2arch
+ - cabal2json
  - cabalmdvrpm
  - cabalrpmdeps
  - cabocha
@@ -3087,6 +3088,8 @@ dont-distribute-packages:
  - phonetic-languages-simplified-generalized-properties-array
  - phonetic-languages-simplified-lists-examples
  - phonetic-languages-simplified-properties-array
+ - phonetic-languages-simplified-properties-array-common
+ - phonetic-languages-simplified-properties-array-old
  - phonetic-languages-simplified-properties-lists
  - phonetic-languages-simplified-properties-lists-double
  - phonetic-languages-ukrainian
@@ -4200,6 +4203,7 @@ dont-distribute-packages:
  - yesod-auth-fb
  - yesod-auth-ldap
  - yesod-auth-lti13
+ - yesod-auth-simple
  - yesod-colonnade
  - yesod-comments
  - yesod-continuations
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index b7d0911472deb..f1396fd0dd78a 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -924,6 +924,9 @@ self: super: builtins.intersectAttrs super {
       && buildPlatform.isx86;
   } super.hashes;
 
+  # Tries to access network
+  aws-sns-verify = dontCheck super.aws-sns-verify;
+
   # procex relies on close_range which has been introduced in Linux 5.9,
   # the test suite seems to force the use of this feature (or the fallback
   # mechanism is broken), so we can't run the test suite on machines with a
@@ -941,6 +944,13 @@ self: super: builtins.intersectAttrs super {
     '' + (drv.postConfigure or "");
   }) super.procex;
 
+  # Test suite wants to run main executable
+  fourmolu_0_7_0_1 = overrideCabal (drv: {
+    preCheck = drv.preCheck or "" + ''
+      export PATH="$PWD/dist/build/fourmolu:$PATH"
+    '';
+  }) super.fourmolu_0_7_0_1;
+
   # Apply a patch which hardcodes the store path of graphviz instead of using
   # whatever graphviz is in PATH.
   graphviz = overrideCabal (drv: {
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 135dd6ef28bd3..2ddaee1319272 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10931,8 +10931,8 @@ self: {
        pname = "HsOpenSSL";
        version = "0.11.7.2";
        sha256 = "0ysdfl8ck3nzhx597fa13dqf31jq5gzwajlak6r91jajks9w0dl5";
-       revision = "2";
-       editedCabalFile = "1wqk9mnzxwphiza6lwg526nvr6mzbwv0l22kwbsd2r9vv1gix1rk";
+       revision = "3";
+       editedCabalFile = "0nsqxym87s48029laqba4nzwpk7nrk35x7wmpjqfnbrj82ddcshd";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base bytestring network time ];
        librarySystemDepends = [ openssl ];
@@ -12904,27 +12904,6 @@ self: {
      }:
      mkDerivation {
        pname = "ListLike";
-       version = "4.7.6";
-       sha256 = "08jip0q2f9qc95wcqka2lrqpf8r7sswsi5104w73kyrbmfirqnrd";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq dlist fmlist text
-         utf8-string vector
-       ];
-       testHaskellDepends = [
-         array base bytestring containers dlist fmlist HUnit QuickCheck
-         random text utf8-string vector
-       ];
-       description = "Generalized support for list-like structures";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "ListLike_4_7_7" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "ListLike";
        version = "4.7.7";
        sha256 = "0h4yfzrf3ljvzf3x75nx791bpxlmdi7f42ff0xyfk8d498iws08a";
        libraryHaskellDepends = [
@@ -12937,7 +12916,6 @@ self: {
        ];
        description = "Generalized support for list-like structures";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ListT" = callPackage
@@ -13380,26 +13358,26 @@ self: {
     ({ mkDerivation, abstract-par, array, base, bytestring, cgi
      , containers, directory, extensible-exceptions, ghc, ghc-paths
      , hashable, haskell-src, hint, html, monad-par, mtl, mueval
-     , network, network-uri, pretty, process, random, syb
-     , template-haskell, tf-random, time, transformers, unix
+     , network, network-uri, pretty, process, random, splitmix, syb
+     , template-haskell, time, transformers, unix
      }:
      mkDerivation {
        pname = "MagicHaskeller";
-       version = "0.9.6.10";
-       sha256 = "04rfddv8hldjavks7pn3s9p80cgpzlz3x9f9d7y6wyz98zcqxpbf";
+       version = "0.9.7.1";
+       sha256 = "1vdbv8ysn6dfpkj33pxmgpzbwkipk618jq431dxnk6v997vvvscb";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers directory ghc ghc-paths hashable
-         haskell-src html mtl network network-uri pretty random syb
-         template-haskell tf-random time transformers
+         haskell-src html mtl network pretty random splitmix syb
+         template-haskell time transformers
        ];
        executableHaskellDepends = [
          abstract-par array base bytestring cgi containers directory
          extensible-exceptions ghc ghc-paths hashable haskell-src hint html
          monad-par mtl mueval network network-uri pretty process random syb
-         template-haskell tf-random time transformers unix
+         template-haskell time transformers unix
        ];
        description = "Automatic inductive functional programmer by systematic search";
        license = lib.licenses.bsd3;
@@ -14007,16 +13985,20 @@ self: {
      }) {};
 
   "Monadoro" = callPackage
-    ({ mkDerivation, ansi-terminal, base, doctest, hspec, time }:
+    ({ mkDerivation, ansi-terminal, base, doctest, hspec, process, time
+     }:
      mkDerivation {
        pname = "Monadoro";
-       version = "0.2.6.0";
-       sha256 = "0ijiqwx8vy00l1aphbj2kjfdzycsj6hm5828liyj4qig6cr6l1zd";
+       version = "0.2.6.3";
+       sha256 = "0z2pj6677mgc4pa7wz9j3wnk425flq1y3sw6s2i974p8b5sv4y65";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ ansi-terminal base time ];
-       executableHaskellDepends = [ ansi-terminal base time ];
-       testHaskellDepends = [ ansi-terminal base doctest hspec time ];
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ ansi-terminal base process time ];
+       executableHaskellDepends = [ ansi-terminal base process time ];
+       testHaskellDepends = [
+         ansi-terminal base doctest hspec process time
+       ];
        description = "A minimalistic CLI Pomodoro timer";
        license = lib.licenses.mit;
      }) {};
@@ -14278,6 +14260,89 @@ self: {
        broken = true;
      }) {};
 
+  "NGLess" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, async, atomic-write, base
+     , bytestring, bytestring-lexing, bzlib-conduit, conduit
+     , conduit-algorithms, conduit-extra, configurator, containers
+     , convertible, criterion, data-default, deepseq, diagrams-core
+     , diagrams-lib, diagrams-svg, directory, double-conversion
+     , edit-distance, either, errors, exceptions, extra, file-embed
+     , filemanip, filepath, hashable, hashtables, hostname, http-client
+     , http-conduit, HUnit, inline-c, inline-c-cpp, int-interval-map
+     , MissingH, mtl, network, optparse-applicative, parsec, primitive
+     , process, QuickCheck, regex, resourcet, safe, safeio, stm
+     , stm-chans, stm-conduit, strict, tar, tar-conduit, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text
+     , time, transformers, unix, unix-compat, unliftio, unliftio-core
+     , vector, vector-algorithms, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "NGLess";
+       version = "1.4.1";
+       sha256 = "1vnf13zc8as8p98rb3zbi1y68ymf65gpshzx2w9mfk4ibd1xwhry";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal async atomic-write base bytestring
+         bytestring-lexing bzlib-conduit conduit conduit-algorithms
+         conduit-extra configurator containers convertible data-default
+         deepseq diagrams-core diagrams-lib diagrams-svg directory
+         double-conversion edit-distance either errors exceptions extra
+         file-embed filemanip filepath hashable hashtables hostname
+         http-client http-conduit inline-c inline-c-cpp int-interval-map
+         MissingH mtl network optparse-applicative parsec primitive process
+         regex resourcet safe safeio stm stm-chans stm-conduit strict tar
+         tar-conduit template-haskell text time transformers unix
+         unix-compat unliftio unliftio-core vector vector-algorithms yaml
+         zlib
+       ];
+       executableHaskellDepends = [
+         aeson ansi-terminal async atomic-write base bytestring
+         bytestring-lexing bzlib-conduit conduit conduit-algorithms
+         conduit-extra configurator containers convertible data-default
+         deepseq diagrams-core diagrams-lib diagrams-svg directory
+         double-conversion edit-distance either errors exceptions extra
+         file-embed filemanip filepath hashable hashtables hostname
+         http-client http-conduit inline-c inline-c-cpp int-interval-map
+         MissingH mtl network optparse-applicative parsec primitive process
+         regex resourcet safe safeio stm stm-chans stm-conduit strict tar
+         tar-conduit template-haskell text time transformers unix
+         unix-compat unliftio unliftio-core vector vector-algorithms yaml
+         zlib
+       ];
+       testHaskellDepends = [
+         aeson ansi-terminal async atomic-write base bytestring
+         bytestring-lexing bzlib-conduit conduit conduit-algorithms
+         conduit-extra configurator containers convertible data-default
+         deepseq diagrams-core diagrams-lib diagrams-svg directory
+         double-conversion edit-distance either errors exceptions extra
+         file-embed filemanip filepath hashable hashtables hostname
+         http-client http-conduit HUnit inline-c inline-c-cpp
+         int-interval-map MissingH mtl network optparse-applicative parsec
+         primitive process QuickCheck regex resourcet safe safeio stm
+         stm-chans stm-conduit strict tar tar-conduit tasty tasty-hunit
+         tasty-quickcheck tasty-th template-haskell text time transformers
+         unix unix-compat unliftio unliftio-core vector vector-algorithms
+         yaml zlib
+       ];
+       benchmarkHaskellDepends = [
+         aeson ansi-terminal async atomic-write base bytestring
+         bytestring-lexing bzlib-conduit conduit conduit-algorithms
+         conduit-extra configurator containers convertible criterion
+         data-default deepseq diagrams-core diagrams-lib diagrams-svg
+         directory double-conversion edit-distance either errors exceptions
+         extra file-embed filemanip filepath hashable hashtables hostname
+         http-client http-conduit HUnit inline-c inline-c-cpp
+         int-interval-map MissingH mtl network optparse-applicative parsec
+         primitive process regex resourcet safe safeio stm stm-chans
+         stm-conduit strict tar tar-conduit template-haskell text time
+         transformers unix unix-compat unliftio unliftio-core vector
+         vector-algorithms yaml zlib
+       ];
+       description = "NGLess implements ngless, a DSL for processing sequencing data";
+       license = lib.licenses.mit;
+     }) {};
+
   "NGrams" = callPackage
     ({ mkDerivation, base, HCL, HTTP, network, regex-compat }:
      mkDerivation {
@@ -15306,8 +15371,8 @@ self: {
        pname = "OpenGL";
        version = "3.0.3.0";
        sha256 = "069fg8jcxqq2z9iikynd8vi3jxm2b5y3qywdh4bdviyzab3zy1as";
-       revision = "1";
-       editedCabalFile = "1748mrb6r9mpf5jbrx436lwbg8w6dadyy8dhxw2dwnrj5z7zf741";
+       revision = "2";
+       editedCabalFile = "1nhlswxgxn8l1ysjq3fp3w5pvx6651d33036i8dlbqygzrn6iwmh";
        libraryHaskellDepends = [
          base bytestring containers GLURaw ObjectName OpenGLRaw StateVar
          text transformers
@@ -23428,6 +23493,38 @@ self: {
        license = lib.licenses.publicDomain;
      }) {};
 
+  "acid-state_0_16_1_1" = callPackage
+    ({ mkDerivation, array, base, bytestring, cereal, containers
+     , criterion, deepseq, directory, filelock, filepath, hedgehog
+     , hspec, hspec-discover, mtl, network, network-bsd, random
+     , safecopy, stm, system-fileio, system-filepath, template-haskell
+     , text, th-expand-syns, time, unix
+     }:
+     mkDerivation {
+       pname = "acid-state";
+       version = "0.16.1.1";
+       sha256 = "05hcbk5dhwygc29b1jbyh2zzjrxybm44hj02wmv2bhz04b5wldca";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bytestring cereal containers directory filelock filepath
+         mtl network network-bsd safecopy stm template-haskell
+         th-expand-syns unix
+       ];
+       executableHaskellDepends = [ base directory ];
+       testHaskellDepends = [
+         base cereal containers deepseq directory hedgehog hspec
+         hspec-discover mtl network safecopy template-haskell text time
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base criterion directory mtl random system-fileio system-filepath
+       ];
+       description = "Add ACID guarantees to any serializable Haskell data structure";
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "acid-state-dist" = callPackage
     ({ mkDerivation, acid-state, base, bytestring, cereal
      , concurrent-extra, containers, criterion, directory, filepath, mtl
@@ -24944,32 +25041,6 @@ self: {
   "aeson-diff" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-doctest
      , directory, doctest, edit-distance-vector, filepath, Glob
-     , optparse-applicative, QuickCheck, scientific, text, vector
-     }:
-     mkDerivation {
-       pname = "aeson-diff";
-       version = "1.1.0.12";
-       sha256 = "0zr7qjcyklwgg6k9cf12z2cpkyyxb9jkhx7pkb2h31vprzba4b9z";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson base bytestring edit-distance-vector scientific text vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring optparse-applicative
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory doctest filepath Glob QuickCheck
-         vector
-       ];
-       description = "Extract and apply patches to JSON documents";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "aeson-diff_1_1_0_13" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-doctest
-     , directory, doctest, edit-distance-vector, filepath, Glob
      , optparse-applicative, QuickCheck, scientific, text, vector, yaml
      }:
      mkDerivation {
@@ -24991,7 +25062,6 @@ self: {
        ];
        description = "Extract and apply patches to JSON documents";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "aeson-diff-generic" = callPackage
@@ -25717,8 +25787,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-value-parser";
-       version = "0.19.6";
-       sha256 = "0nx0f46vrx94i6jnzh063fxjfwjm1snb9p41q18rlsj5hwgva0xs";
+       version = "0.19.7";
+       sha256 = "13q6jgmvswybfw3wiwm6zdcm1i6xpbg86qm1kklqvqzwpb4axfnd";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable megaparsec mtl scientific
          text transformers unordered-containers vector
@@ -31992,21 +32062,22 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, alex, array, attoparsec, base
      , base16-bytestring, base64-bytestring, bytestring
      , case-insensitive, cborg, containers, criterion, deepseq, happy
-     , lens, QuickCheck, regex-compat-tdfa, safe, safecopy, scientific
-     , serialise, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     , text, time, unordered-containers, vector
+     , lens, QuickCheck, regex-base, regex-tdfa, safe, safecopy
+     , scientific, serialise, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "api-tools";
-       version = "0.9.0.0";
-       sha256 = "04496r4l598i2m14gj1wpz8a976as0gkbw0745h85ap8hy23vfjx";
+       version = "0.10.0.0";
+       sha256 = "0hz4pa0n4wf9kd8r98xd0c39p790fn9iaqzjj2m653641acjbm0w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty array attoparsec base base16-bytestring
          base64-bytestring bytestring case-insensitive cborg containers
-         deepseq lens QuickCheck regex-compat-tdfa safe safecopy scientific
-         serialise template-haskell text time unordered-containers vector
+         deepseq lens QuickCheck regex-base regex-tdfa safe safecopy
+         scientific serialise template-haskell text time
+         unordered-containers vector
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [
@@ -38081,6 +38152,26 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "aws-sns-verify" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, async, base, bytestring, errors
+     , hspec, http-conduit, http-types, memory, pem, text, wai, warp
+     , x509, x509-validation
+     }:
+     mkDerivation {
+       pname = "aws-sns-verify";
+       version = "0.0.0.1";
+       sha256 = "1ayn2176y3011xf4n0axfnlaa9ysy2xdsqszmkhf3yszlkkrhmqi";
+       libraryHaskellDepends = [
+         aeson base bytestring errors http-conduit memory pem text x509
+         x509-validation
+       ];
+       testHaskellDepends = [
+         aeson-qq async base hspec http-types text wai warp x509-validation
+       ];
+       description = "Parse and verify AWS SNS messages";
+       license = lib.licenses.mit;
+     }) {};
+
   "aws-transcribe-ws" = callPackage
     ({ mkDerivation, aeson, am-test, async, base, base16-bytestring
      , binary, bytestring, crc, cryptohash-sha256, lens, stm, text, time
@@ -45601,8 +45692,8 @@ self: {
      }:
      mkDerivation {
        pname = "bloodhound";
-       version = "0.20.0.0";
-       sha256 = "175w602jvjrf2j1jaygj4spznyq66ga5mkbpfi6nzrygv609dbrh";
+       version = "0.20.0.2";
+       sha256 = "1dvs0gbh7wn9bp99b64vdf2as7zr4bcvxrjzpmlkak4vb4g4bqfz";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers exceptions hashable
          http-client http-types mtl network-uri scientific semigroups semver
@@ -46269,8 +46360,8 @@ self: {
     ({ mkDerivation, base, containers, time }:
      mkDerivation {
        pname = "bookhound";
-       version = "0.1.7.0";
-       sha256 = "0811day6w7rgpvp22d1pyjz0bdz175kk9qfzl04wg2bmfg577k2d";
+       version = "0.1.8.0";
+       sha256 = "1rmfhi12p0i6zsw7rlcyb6qdg1asda3n9gxhyh773hh3v99v5qd0";
        libraryHaskellDepends = [ base containers time ];
        description = "Simple Parser Combinators & Parsers";
        license = "LGPL";
@@ -51305,6 +51396,33 @@ self: {
        broken = true;
      }) {};
 
+  "cabal2json" = callPackage
+    ({ mkDerivation, aeson, autodocodec, autodocodec-yaml, base
+     , bytestring, Cabal, hashable, pretty, pretty-show, sydtest
+     , sydtest-aeson, sydtest-discover, text, unordered-containers
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "cabal2json";
+       version = "0.0.0.0";
+       sha256 = "19dy7x643243ryqcc4wimz0pm1f1m0bqb0w7as5jhpvnk7rz06zq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson autodocodec base bytestring Cabal hashable pretty pretty-show
+         text unordered-containers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         autodocodec autodocodec-yaml base Cabal sydtest sydtest-aeson
+         utf8-string
+       ];
+       testToolDepends = [ sydtest-discover ];
+       description = "Turn a .cabal file into a .json file";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "cabal2nix" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
      , containers, deepseq, directory, distribution-nixpkgs, filepath
@@ -52040,31 +52158,29 @@ self: {
      }) {};
 
   "calamity" = callPackage
-    ({ 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, focus, generic-lens, hashable
-     , http-api-data, http-client, http-date, http-types, lens
-     , lens-aeson, megaparsec, mime-types, mtl, polysemy
-     , polysemy-plugin, PyF, random, reflection, req, safe-exceptions
-     , scientific, stm, stm-chans, stm-containers, text, text-show, time
-     , tls, typerep-map, unagi-chan, unboxing-vector
+    ({ mkDerivation, aeson, aeson-optics, async, base, bytestring
+     , calamity-commands, colour, concurrent-extra, connection
+     , containers, data-default-class, data-flags, deepseq, deque, df1
+     , di-core, di-polysemy, exceptions, focus, hashable, http-api-data
+     , http-client, http-date, http-types, megaparsec, mime-types, mtl
+     , optics, polysemy, polysemy-plugin, PyF, random, 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.4.0.0";
-       sha256 = "1imga81akx5z8f4nyd9minac7bspmjhpymbg9j8zcm2zh8wl7mmx";
+       version = "0.5.0.0";
+       sha256 = "1sx4dxvk5xcl5x3rnknl5syg65mzrr8shg75yajixsbhimg226zy";
        libraryHaskellDepends = [
-         aeson async base bytestring calamity-commands colour
+         aeson aeson-optics async base bytestring calamity-commands colour
          concurrent-extra connection containers data-default-class
          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 PyF random 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
+         hashable http-api-data http-client http-date http-types megaparsec
+         mime-types mtl optics polysemy polysemy-plugin PyF random
+         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
        ];
        description = "A library for writing discord bots in haskell";
        license = lib.licenses.mit;
@@ -52073,16 +52189,16 @@ self: {
      }) {};
 
   "calamity-commands" = callPackage
-    ({ mkDerivation, base, generic-lens, lens, megaparsec, polysemy
+    ({ mkDerivation, base, megaparsec, optics, polysemy
      , polysemy-plugin, text, text-show, unordered-containers
      }:
      mkDerivation {
        pname = "calamity-commands";
-       version = "0.3.0.0";
-       sha256 = "0vngcddhxdd4gzjpjh8iq0qqkkybhs8hrf73kjk21hxr0kldrl4b";
+       version = "0.4.0.0";
+       sha256 = "10zfq0dnf5yy1dbi0s08c67svm8rln43wnas6mxid9kcql2cmgfb";
        libraryHaskellDepends = [
-         base generic-lens lens megaparsec polysemy polysemy-plugin text
-         text-show unordered-containers
+         base megaparsec optics polysemy polysemy-plugin text text-show
+         unordered-containers
        ];
        description = "A library for declaring, parsing, and invoking text-input based commands";
        license = lib.licenses.mit;
@@ -52265,6 +52381,21 @@ self: {
        broken = true;
      }) {};
 
+  "call-plantuml" = callPackage
+    ({ mkDerivation, base, bytestring, filepath, hspec, process }:
+     mkDerivation {
+       pname = "call-plantuml";
+       version = "0.0.1";
+       sha256 = "1bx914719566fkhpxxyc22m3x8aq6c134kgs2a6ipf583883yfzh";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base bytestring filepath process ];
+       testHaskellDepends = [ base bytestring filepath hspec process ];
+       description = "A simple library to call PlantUML given a diagram specification";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "call-stack" = callPackage
     ({ mkDerivation, base, filepath, nanospec }:
      mkDerivation {
@@ -52705,8 +52836,8 @@ self: {
      }:
      mkDerivation {
        pname = "capnp";
-       version = "0.15.0.0";
-       sha256 = "15vywgr01as3avmz9q1zp899w39xf6p9pk95bvvdmh9py2jh4sf4";
+       version = "0.16.0.0";
+       sha256 = "1pxg8l5lahx8j1wayq665s2as29zpfmjh0kn3962awxj376fhrwf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56018,6 +56149,31 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "chez-grater" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring
+     , case-insensitive, containers, file-embed, file-path-th, hashable
+     , hspec, http-client, http-client-tls, http-types, network-uri
+     , QuickCheck, scalpel, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "chez-grater";
+       version = "0.0.2";
+       sha256 = "1f7v362b6wbjz7j77r7mhi0942qzds7h7aibss8c3w1l6d3d62r2";
+       libraryHaskellDepends = [
+         aeson attoparsec base case-insensitive containers hashable
+         http-client http-client-tls http-types network-uri scalpel text
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring case-insensitive containers file-embed
+         file-path-th hspec http-client network-uri QuickCheck text
+       ];
+       description = "Parse and scrape recipe blogs";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "chiasma" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, composition
      , composition-extra, conduit, conduit-extra, containers, cornea
@@ -59960,8 +60116,8 @@ self: {
      }:
      mkDerivation {
        pname = "cobot-io";
-       version = "0.1.4.3";
-       sha256 = "1xmdz71ay9jphxabap610qvcm4bcm3dbd06zx6zkhd8xjz1hqsjf";
+       version = "0.1.4.4";
+       sha256 = "04dizmriis6zs7jfwbagnzrszlmky8xkvrsmxb8wra90fnww8l66";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring cobot containers
          data-msgpack deepseq http-conduit hyraxAbif lens linear megaparsec
@@ -61350,29 +61506,6 @@ self: {
      }:
      mkDerivation {
        pname = "comfort-array";
-       version = "0.5.1";
-       sha256 = "0kx4z07a15jrc3dzaxx1335j1wxkgkajmyiraf5wb18l3xyd36b4";
-       libraryHaskellDepends = [
-         base containers deepseq guarded-allocation non-empty prelude-compat
-         primitive QuickCheck semigroups storable-record storablevector
-         tagged transformers utility-ht
-       ];
-       testHaskellDepends = [
-         base ChasingBottoms containers doctest-exitcode-stdio doctest-lib
-         QuickCheck tagged
-       ];
-       description = "Arrays where the index type is a function of the shape type";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "comfort-array_0_5_1_1" = callPackage
-    ({ mkDerivation, base, ChasingBottoms, containers, deepseq
-     , doctest-exitcode-stdio, doctest-lib, guarded-allocation
-     , non-empty, prelude-compat, primitive, QuickCheck, semigroups
-     , storable-record, storablevector, tagged, transformers, utility-ht
-     }:
-     mkDerivation {
-       pname = "comfort-array";
        version = "0.5.1.1";
        sha256 = "07rajrpp495g17naywybkrydd67ixiav5g8rayavwabvyrybnmgy";
        libraryHaskellDepends = [
@@ -61386,7 +61519,6 @@ self: {
        ];
        description = "Arrays where the index type is a function of the shape type";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "comfort-array-shape" = callPackage
@@ -61642,6 +61774,28 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "commonmark-extensions_0_2_3_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.3.2";
+       sha256 = "1k5rlh2grg6g1waszhp565m360n1iynjvbkjz8xmap8y234g1bjj";
+       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
      , pandoc-types, text
@@ -63822,22 +63976,6 @@ self: {
 
   "conduit-concurrent-map" = callPackage
     ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl
-     , resourcet, say, unliftio, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "conduit-concurrent-map";
-       version = "0.1.1";
-       sha256 = "0rn7sry51xiz00hrs2vvqff18lnmmzyadrd858g1ixga76f44z2j";
-       libraryHaskellDepends = [
-         base conduit containers mtl resourcet unliftio unliftio-core vector
-       ];
-       testHaskellDepends = [ base conduit hspec HUnit say ];
-       description = "Concurrent, order-preserving mapping Conduit";
-       license = lib.licenses.mit;
-     }) {};
-
-  "conduit-concurrent-map_0_1_3" = callPackage
-    ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl
      , QuickCheck, resourcet, say, unliftio, unliftio-core, vector
      }:
      mkDerivation {
@@ -63850,7 +63988,6 @@ self: {
        testHaskellDepends = [ base conduit hspec HUnit QuickCheck say ];
        description = "Concurrent, order-preserving mapping Conduit";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "conduit-connection" = callPackage
@@ -66358,25 +66495,6 @@ self: {
      }) {};
 
   "convertible" = callPackage
-    ({ mkDerivation, base, bytestring, containers, mtl, old-locale
-     , old-time, text, time
-     }:
-     mkDerivation {
-       pname = "convertible";
-       version = "1.1.1.0";
-       sha256 = "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9";
-       revision = "1";
-       editedCabalFile = "19rz01rlcflyljzkf47g5xs2w1blnji7s8vsh0wimil4c0wahazj";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers mtl old-locale old-time text time
-       ];
-       description = "Typeclasses and instances for converting between types";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "convertible_1_1_1_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, old-time
      , QuickCheck, text, time
      }:
@@ -66390,7 +66508,6 @@ self: {
        testHaskellDepends = [ base containers old-time QuickCheck time ];
        description = "Typeclasses and instances for converting between types";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "convertible-ascii" = callPackage
@@ -66813,8 +66930,8 @@ self: {
      }:
      mkDerivation {
        pname = "core-telemetry";
-       version = "0.2.2.0";
-       sha256 = "1l2h14x375v5dfamjbmknx28kyi18l2anv46887807bd3yz84552";
+       version = "0.2.3.0";
+       sha256 = "0ln0xhpdq2jvx5xqva0crmqn7zmnav864f3bb9hb3pcjfiilgavg";
        libraryHaskellDepends = [
          async base bytestring chronologique core-data core-program
          core-text exceptions http-streams io-streams mtl network-info
@@ -66863,8 +66980,8 @@ self: {
      }:
      mkDerivation {
        pname = "core-webserver-servant";
-       version = "0.1.1.0";
-       sha256 = "1a5wzw0v5wfkqr856r04pj2l47d0v6n7va7qcx66skkz8q4q3lkl";
+       version = "0.1.1.1";
+       sha256 = "1mbrpm90i0y63h7mkk3chn4mwwyb1bnbywr6crki0j230cy3b294";
        libraryHaskellDepends = [
          base core-program core-telemetry core-webserver-warp mtl
          safe-exceptions servant servant-server vault wai
@@ -66881,8 +66998,8 @@ self: {
      }:
      mkDerivation {
        pname = "core-webserver-warp";
-       version = "0.1.1.5";
-       sha256 = "0i8w0fga1x2hm3hhacyi7xmi86dhglw78786wijghwpqlfgayy9w";
+       version = "0.1.1.6";
+       sha256 = "05r4y1fywxxf4mi3i319vis67b2kdxf3caxq3nnlpc1ssyw37hc0";
        libraryHaskellDepends = [
          async base bytestring core-data core-program core-telemetry
          core-text http-types http2 mtl safe-exceptions vault wai warp
@@ -79559,6 +79676,23 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "direct-sqlite_2_3_27" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, directory
+     , HUnit, temporary, text
+     }:
+     mkDerivation {
+       pname = "direct-sqlite";
+       version = "2.3.27";
+       sha256 = "0bnq7gkia713w1kc6zhwclxsyxlg100i93qbrz59z18j0xwds683";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring directory HUnit temporary text
+       ];
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "directed-cubical" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, hashable
      , parallel, QuickCheck, unordered-containers, vector
@@ -79879,28 +80013,27 @@ self: {
 
   "discord-haskell-voice" = callPackage
     ({ mkDerivation, aeson, async, base, binary, BoundedChan
-     , bytestring, conduit, discord-haskell, lens, mtl, network
-     , optparse-applicative, opus, process, safe-exceptions, saltine
-     , stm, stm-containers, text, time, unliftio, websockets, wuss
+     , bytestring, conduit, discord-haskell, microlens, microlens-th
+     , mtl, network, optparse-applicative, opus, process
+     , safe-exceptions, saltine, stm, stm-containers, text, time
+     , unliftio, websockets, wuss
      }:
      mkDerivation {
        pname = "discord-haskell-voice";
-       version = "2.2.2";
-       sha256 = "0vbp8xdvb9ci49l1ifqghbv6smqx0ll902957yyxym6yj2xjfpmv";
-       revision = "3";
-       editedCabalFile = "0fpm9ch866d0aispl1priz6knkf1q5b99vhjyz6c4nm5p2gl89mc";
+       version = "2.3.0";
+       sha256 = "0rzzgggw02rc5pw3wyimimghf3mrxfwhb91fhg2lmzq2dwqghzva";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson async base binary BoundedChan bytestring conduit
-         discord-haskell lens mtl network opus process safe-exceptions
-         saltine text time unliftio websockets wuss
+         discord-haskell microlens microlens-th mtl network opus process
+         safe-exceptions saltine text time unliftio websockets wuss
        ];
        executableHaskellDepends = [
          aeson async base binary BoundedChan bytestring conduit
-         discord-haskell lens mtl network optparse-applicative opus process
-         safe-exceptions saltine stm stm-containers text time unliftio
-         websockets wuss
+         discord-haskell microlens microlens-th mtl network
+         optparse-applicative opus process safe-exceptions saltine stm
+         stm-containers text time unliftio websockets wuss
        ];
        description = "Voice support for discord-haskell";
        license = lib.licenses.mit;
@@ -82181,36 +82314,6 @@ self: {
      }:
      mkDerivation {
        pname = "doctest-parallel";
-       version = "0.2.2";
-       sha256 = "0m5xvh8j3v7r1882kxd4r4sc5plw0jprd5mc5cbn5zxmzfj30ffy";
-       libraryHaskellDepends = [
-         base base-compat Cabal code-page containers deepseq directory
-         exceptions extra filepath ghc ghc-paths Glob pretty process random
-         syb template-haskell transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         base base-compat code-page containers deepseq directory exceptions
-         filepath ghc ghc-paths hspec hspec-core hspec-discover HUnit
-         mockery process QuickCheck setenv silently stringbuilder syb
-         transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       doHaddock = false;
-       description = "Test interactive Haskell examples";
-       license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "doctest-parallel_0_2_3" = callPackage
-    ({ mkDerivation, base, base-compat, Cabal, code-page, containers
-     , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths
-     , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty
-     , process, QuickCheck, random, setenv, silently, stringbuilder, syb
-     , template-haskell, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "doctest-parallel";
        version = "0.2.3";
        sha256 = "0sk1990ksqcgc13kppbh0xljakn3qsqaxi19990fixwakhzh229v";
        libraryHaskellDepends = [
@@ -88840,25 +88943,6 @@ self: {
      }:
      mkDerivation {
        pname = "equivalence";
-       version = "0.4";
-       sha256 = "0xyj7knshfjknjd13cm7ym9hxllnbr4wvqnz8pgq8154hn7j2f1d";
-       libraryHaskellDepends = [
-         base containers mtl STMonadTrans transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base containers mtl QuickCheck STMonadTrans template-haskell
-         transformers transformers-compat
-       ];
-       description = "Maintaining an equivalence relation implemented as union-find using STT";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "equivalence_0_4_0_1" = callPackage
-    ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
-     , template-haskell, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "equivalence";
        version = "0.4.0.1";
        sha256 = "1pcv64dflv9kknz9smnq4a7pd8jmghi3g4kri1dw0cnb54g7rj7c";
        libraryHaskellDepends = [
@@ -88870,7 +88954,6 @@ self: {
        ];
        description = "Maintaining an equivalence relation implemented as union-find using STT";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "erd" = callPackage
@@ -89533,6 +89616,35 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "esqueleto_3_5_5_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
+     , conduit, containers, exceptions, hspec, hspec-core, monad-logger
+     , mtl, mysql, mysql-simple, persistent, persistent-mysql
+     , persistent-postgresql, persistent-sqlite, postgresql-simple
+     , QuickCheck, resourcet, tagged, text, time, transformers, unliftio
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "esqueleto";
+       version = "3.5.5.0";
+       sha256 = "0ba90p3cqyr0l447dw2xzrk2fs6xv5b2c79rqsnj0bchpsigj8a0";
+       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 hspec-core monad-logger mtl mysql mysql-simple
+         persistent persistent-mysql persistent-postgresql persistent-sqlite
+         postgresql-simple QuickCheck resourcet tagged text time
+         transformers unliftio unordered-containers
+       ];
+       description = "Type-safe EDSL for SQL queries on persistent backends";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "esqueleto-pgcrypto" = callPackage
     ({ mkDerivation, base, esqueleto, hspec, monad-logger, persistent
      , persistent-postgresql, QuickCheck, text, transformers, unliftio
@@ -93808,10 +93920,8 @@ self: {
      }:
      mkDerivation {
        pname = "fbrnch";
-       version = "1.1";
-       sha256 = "11vhm176dm2i4zy7ipg20rsmp7rdabq8gh29byflqxm5s5wp86y6";
-       revision = "1";
-       editedCabalFile = "1p0d2nz1xql0nxi23j893x6dr9hy4hy5frfbjrys5b4728vld3y9";
+       version = "1.1.1";
+       sha256 = "1dgpgphffcy1dxyswg7wvcg9np30gn1h5qa15gqb6p95vm1qlc8b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -93822,7 +93932,7 @@ self: {
          rpmbuild-order simple-cmd simple-cmd-args text time typed-process
          unix utf8-string xdg-basedir
        ];
-       description = "Build and create Fedora package repos and branches";
+       description = "Fedora packager tool to build package branches";
        license = lib.licenses.gpl2Only;
        hydraPlatforms = lib.platforms.none;
      }) {};
@@ -93906,19 +94016,18 @@ self: {
      }) {};
 
   "fcf-containers" = callPackage
-    ({ mkDerivation, base, doctest, first-class-families, ghc-prim
-     , Glob, mtl
+    ({ mkDerivation, base, doctest, first-class-families, ghc-prim, mtl
      }:
      mkDerivation {
        pname = "fcf-containers";
-       version = "0.7.0";
-       sha256 = "0ai2hmcva84z29jxr3inngnicx0wn05vnh9lw460fcfckdfxf5xf";
+       version = "0.7.1";
+       sha256 = "1234vz8ha4wzzbxnw3za5kdhisd37n8v3sd01rdcmnmnhb7fv3qs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base first-class-families ghc-prim mtl ];
        executableHaskellDepends = [ base first-class-families ];
        testHaskellDepends = [
-         base doctest first-class-families ghc-prim Glob
+         base doctest first-class-families ghc-prim
        ];
        description = "Data structures and algorithms for first-class-families";
        license = lib.licenses.bsd3;
@@ -96408,25 +96517,6 @@ self: {
      }:
      mkDerivation {
        pname = "fix-whitespace";
-       version = "0.0.7";
-       sha256 = "1nx56dfgg0i75f007y0r5w0955y3x78drjkvdx278llalyfpc5bg";
-       revision = "1";
-       editedCabalFile = "17n8sdfcnyjm8ykkpw17apb9ah94r77azz9rzlwpfdps5w81s6gg";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base directory extra filepath filepattern text yaml
-       ];
-       description = "Fixes whitespace issues";
-       license = "unknown";
-     }) {};
-
-  "fix-whitespace_0_0_8" = callPackage
-    ({ mkDerivation, base, directory, extra, filepath, filepattern
-     , text, yaml
-     }:
-     mkDerivation {
-       pname = "fix-whitespace";
        version = "0.0.8";
        sha256 = "1vjbh3jx67xdzxnpyh9k2c5qv5axw07wck5jmahg0kxrj1w2nhh6";
        isLibrary = false;
@@ -96436,7 +96526,6 @@ self: {
        ];
        description = "Fixes whitespace issues";
        license = "unknown";
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "fixed" = callPackage
@@ -97123,16 +97212,18 @@ self: {
   "flatparse" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, gauge
      , hspec, HUnit, integer-gmp, megaparsec, parsec, primitive
-     , QuickCheck, template-haskell
+     , QuickCheck, quickcheck-instances, template-haskell
      }:
      mkDerivation {
        pname = "flatparse";
-       version = "0.3.3.0";
-       sha256 = "00ggikjgyb5sivj5aff328gaamxi241y6kign8l9pvrr802xmc0c";
+       version = "0.3.4.0";
+       sha256 = "0q0pn2dwkril6gqh2lzczb5a15jmnhq21y76aljsmab2r3q9yahm";
        libraryHaskellDepends = [
          base bytestring containers integer-gmp template-haskell
        ];
-       testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ];
+       testHaskellDepends = [
+         base bytestring hspec HUnit QuickCheck quickcheck-instances
+       ];
        benchmarkHaskellDepends = [
          attoparsec base bytestring gauge integer-gmp megaparsec parsec
          primitive
@@ -99335,6 +99426,40 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "fourmolu_0_7_0_1" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring
+     , Cabal, containers, Diff, directory, dlist, exceptions, filepath
+     , ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec
+     , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io
+     , pretty, process, QuickCheck, syb, template-haskell, temporary
+     , text, th-lift-instances, yaml
+     }:
+     mkDerivation {
+       pname = "fourmolu";
+       version = "0.7.0.1";
+       sha256 = "016lklwcvw6vgpkmv23gfhn31w462w8jd2gl9fy03n9gp8y771ga";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal array base bytestring Cabal containers Diff
+         directory dlist exceptions filepath ghc-lib-parser megaparsec
+         MemoTrie mtl syb template-haskell text th-lift-instances yaml
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath ghc-lib-parser gitrev
+         optparse-applicative text yaml
+       ];
+       testHaskellDepends = [
+         base containers Diff directory filepath ghc-lib-parser hspec
+         hspec-megaparsec megaparsec path path-io pretty process QuickCheck
+         temporary text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A formatter for Haskell source code";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "fp-ieee" = callPackage
     ({ mkDerivation, base, doctest, ghc-bignum, hspec, hspec-core
      , integer-logarithms, QuickCheck, random, tasty-bench
@@ -100030,14 +100155,15 @@ self: {
 
   "free-vector-spaces" = callPackage
     ({ mkDerivation, base, lens, linear, MemoTrie, pragmatic-show
-     , vector, vector-space
+     , template-haskell, vector, vector-space
      }:
      mkDerivation {
        pname = "free-vector-spaces";
-       version = "0.1.5.1";
-       sha256 = "14mch3p12sd44y272gg3qr6v0fp689y48fjbvhjbp62lipvxc9i4";
+       version = "0.1.5.2";
+       sha256 = "0p0flpai3n9ism9dd3kyf1fa8s8rpb4cc00m3bplb9s8zb6aghpb";
        libraryHaskellDepends = [
-         base lens linear MemoTrie pragmatic-show vector vector-space
+         base lens linear MemoTrie pragmatic-show template-haskell vector
+         vector-space
        ];
        description = "Instantiate the classes from the vector-space package with types from linear";
        license = lib.licenses.bsd3;
@@ -106095,8 +106221,8 @@ self: {
     ({ mkDerivation, base, clock }:
      mkDerivation {
        pname = "ghc-gc-hook";
-       version = "0.2.0.0";
-       sha256 = "0k7w7imrlg2gdcibkm6b02phk163xv4lnsab316jcfdid53zi7j2";
+       version = "0.2.1.0";
+       sha256 = "0d98j3wyrwq6rgfdcky5ag3rxx1kzawvhnncr9nab058n2zksi7x";
        libraryHaskellDepends = [ base clock ];
        testHaskellDepends = [ base clock ];
        description = "GHC garbage collection hook";
@@ -107722,8 +107848,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcprofview";
-       version = "0.1.0.1";
-       sha256 = "0lk5ky0vrymzhdzfrdvq25kpphg69f1m6524jhr57dnss5syz1iv";
+       version = "0.1.0.2";
+       sha256 = "077sjwrnpawaq6psp0bbb8psfd6bhqxibhpp2im8hmz1h56ah2c5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -111045,37 +111171,6 @@ self: {
   "glirc" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , bytestring, Cabal, config-schema, config-value, containers
-     , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL
-     , HUnit, irc-core, kan-extensions, lens, network, process, psqueues
-     , random, regex-tdfa, split, stm, template-haskell, text, time
-     , transformers, unix, unordered-containers, vector, vty
-     }:
-     mkDerivation {
-       pname = "glirc";
-       version = "2.38";
-       sha256 = "1azykkb9rc4q97v9xiqfjv0iys0wswa3nsy10smdkpp7yvv4mca7";
-       revision = "2";
-       editedCabalFile = "082ndcgp9z1w5pa3s5ss7kqhg66y01lbj57k14zq6zs6c54s4b5i";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal filepath ];
-       libraryHaskellDepends = [
-         async attoparsec base base64-bytestring bytestring config-schema
-         config-value containers directory filepath free gitrev hashable
-         hookup HsOpenSSL irc-core kan-extensions lens network process
-         psqueues random regex-tdfa split stm template-haskell text time
-         transformers unix unordered-containers vector vty
-       ];
-       executableHaskellDepends = [ base lens text vty ];
-       testHaskellDepends = [ base HUnit ];
-       description = "Console IRC client";
-       license = lib.licenses.isc;
-       maintainers = with lib.maintainers; [ kiwi ];
-     }) {};
-
-  "glirc_2_39" = callPackage
-    ({ mkDerivation, async, attoparsec, base, base64-bytestring
-     , bytestring, Cabal, config-schema, config-value, containers
      , curve25519, directory, filepath, free, githash, hashable, hookup
      , HsOpenSSL, HUnit, irc-core, kan-extensions, lens, network
      , process, psqueues, random, regex-tdfa, split, stm
@@ -111084,8 +111179,8 @@ self: {
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.39";
-       sha256 = "1ws5hvz37lkf3bg4wlx4vfk5pdgf5hnkwzdlwgr22pfmr7p5nc2z";
+       version = "2.39.0.1";
+       sha256 = "0jaywb43jfv6kzyz540k02mxdgw1shc6hn7kia21alssszkilh4r";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -111100,7 +111195,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Console IRC client";
        license = lib.licenses.isc;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ kiwi ];
      }) {};
 
@@ -121723,8 +121817,8 @@ self: {
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.4.4.0";
-       sha256 = "18nf6ssr3ccd4kyh9az5i9yj9771mzckw100d55rybd5hl1dc7kq";
+       version = "0.4.5.0";
+       sha256 = "0pjm9flkqkpwmiv6jqgghf3isvq2hqxy2z80jnj4slm7gkm8kq40";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127545,8 +127639,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskus-utils-variant";
-       version = "3.2.1";
-       sha256 = "1a15jm4rbvw2gmv5dzzwv0cwsq0qgxnxvq4x3qpr19dmnmq77vn2";
+       version = "3.3";
+       sha256 = "16z1w07gd3bf7c4566yv21szss08wmjgy7v4i2000nnr1xj6k28a";
        libraryHaskellDepends = [
          base deepseq exceptions haskus-utils-data haskus-utils-types mtl
          template-haskell transformers
@@ -127750,6 +127844,33 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "hasql_1_5_0_3" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring
+     , bytestring-strict-builder, contravariant, contravariant-extras
+     , dlist, gauge, hashable, hashtables, mtl, postgresql-binary
+     , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances
+     , rerebase, tasty, tasty-hunit, tasty-quickcheck, text
+     , text-builder, transformers, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "1.5.0.3";
+       sha256 = "1ai1vq1l58r4k6ri78gl0zlbc4sgkp3mcyi2dsm37f7ah9r38hsz";
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-strict-builder contravariant
+         dlist hashable hashtables mtl postgresql-binary postgresql-libpq
+         profunctors text text-builder transformers vector
+       ];
+       testHaskellDepends = [
+         contravariant-extras QuickCheck quickcheck-instances rerebase tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ gauge rerebase ];
+       description = "An efficient PostgreSQL driver with a flexible mapping API";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hasql-backend" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, either, free
      , list-t, text, transformers, vector
@@ -127973,6 +128094,26 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "hasql-notifications_0_2_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, hasql, hasql-pool, hspec
+     , postgresql-libpq, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "hasql-notifications";
+       version = "0.2.0.1";
+       sha256 = "191591sif15khm3qhkkr2y4406fi9ikvhfchhq3jszqxhjmjwpkv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring hasql hasql-pool postgresql-libpq text
+       ];
+       executableHaskellDepends = [ base hasql ];
+       testHaskellDepends = [ base bytestring hasql hspec QuickCheck ];
+       description = "LISTEN/NOTIFY support for Hasql";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hasql-optparse-applicative" = callPackage
     ({ mkDerivation, base-prelude, hasql, hasql-pool
      , optparse-applicative
@@ -127988,6 +128129,22 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "hasql-optparse-applicative_0_4" = callPackage
+    ({ mkDerivation, base-prelude, hasql, hasql-pool
+     , optparse-applicative
+     }:
+     mkDerivation {
+       pname = "hasql-optparse-applicative";
+       version = "0.4";
+       sha256 = "1caw85628qw7vcs34nf74pra1zsc9mxnlgarhc2wam0bfjq2xabw";
+       libraryHaskellDepends = [
+         base-prelude hasql hasql-pool optparse-applicative
+       ];
+       description = "\"optparse-applicative\" parsers for \"hasql\"";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hasql-pipes" = callPackage
     ({ mkDerivation, base, bytestring-tree-builder, hasql, pipes
      , pipes-safe, protolude
@@ -128015,6 +128172,21 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "hasql-pool_0_7_1_3" = callPackage
+    ({ mkDerivation, base, hasql, hspec, rerebase, stm, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hasql-pool";
+       version = "0.7.1.3";
+       sha256 = "0li8cbpzka85qlrgad5gy0pil9c4i0zvj961i3anmldd9n4f7m3m";
+       libraryHaskellDepends = [ base hasql stm time transformers ];
+       testHaskellDepends = [ hasql hspec rerebase stm ];
+       description = "A pool of connections for Hasql";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hasql-postgres" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
      , criterion-plus, deepseq, directory, doctest, either, filepath
@@ -131140,19 +131312,17 @@ self: {
 
   "helf" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty
-     , QuickCheck
+     , QuickCheck, transformers
      }:
      mkDerivation {
        pname = "helf";
-       version = "0.2021.8.12";
-       sha256 = "020ri4yjlascjmj4ywc2hji05673bszsb3q5frg1a66nbadzbi2h";
-       revision = "1";
-       editedCabalFile = "1573q8d39hgb4jq1bwpb7glxcv5bxv9vi27smhngk2wxxby9l4w3";
+       version = "0.2022.5.30";
+       sha256 = "18lskhwsagv5zz6l73qgp9z3k4llf8jfjlkig38z8d061a4rc8k2";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
-         array base containers mtl pretty QuickCheck
+         array base containers mtl pretty QuickCheck transformers
        ];
        executableToolDepends = [ alex happy ];
        description = "Typechecking terms of the Edinburgh Logical Framework (LF)";
@@ -133447,26 +133617,26 @@ self: {
 
   "hhp" = callPackage
     ({ mkDerivation, base, Cabal, containers, deepseq, directory
-     , doctest, filepath, ghc, ghc-boot, hlint, hspec, process, syb
+     , doctest, exceptions, extra, filepath, ghc, ghc-boot, hlint, hspec
+     , hspec-discover, process, syb
      }:
      mkDerivation {
        pname = "hhp";
-       version = "0.0.3";
-       sha256 = "1d9hhsnf21f2v0hcmw5wpj33qdqw6xbcz979lkp2ilk8mxqgwf32";
+       version = "1.0.0";
+       sha256 = "0jwn10k2v3i8w57mx5w8czvgaw483dp9fdf1w214qr9dz654sb9a";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base Cabal containers deepseq directory filepath ghc ghc-boot hlint
-         process syb
-       ];
-       executableHaskellDepends = [
-         base containers directory filepath ghc
+         base Cabal containers deepseq directory exceptions filepath ghc
+         ghc-boot hlint process syb
        ];
+       executableHaskellDepends = [ base containers directory filepath ];
        testHaskellDepends = [
-         base Cabal containers deepseq directory doctest filepath ghc
-         ghc-boot hlint hspec process syb
+         base Cabal containers deepseq directory doctest exceptions extra
+         filepath ghc ghc-boot hlint hspec process syb
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Happy Haskell Programming";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -138825,24 +138995,6 @@ self: {
      }:
      mkDerivation {
        pname = "hookup";
-       version = "0.6";
-       sha256 = "09rhsq0j2m1j87qsbsd3l1q3dv2zs4wrhcz2jhn4a6dx273w5528";
-       revision = "1";
-       editedCabalFile = "0dm7i3g8hlrg0rzfhfcryypgqlil2p8ny12bn49yir2b1qfd47dc";
-       libraryHaskellDepends = [
-         async attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system
-         network stm
-       ];
-       description = "Abstraction over creating network connections with SOCKS5 and TLS";
-       license = lib.licenses.isc;
-     }) {};
-
-  "hookup_0_7" = callPackage
-    ({ mkDerivation, async, attoparsec, base, bytestring, HsOpenSSL
-     , HsOpenSSL-x509-system, network, stm
-     }:
-     mkDerivation {
-       pname = "hookup";
        version = "0.7";
        sha256 = "02prkwj4rj8g330z17bpjh7hpwfdvasaxsk74mcvbi03gjpydrib";
        libraryHaskellDepends = [
@@ -138851,7 +139003,6 @@ self: {
        ];
        description = "Abstraction over creating network connections with SOCKS5 and TLS";
        license = lib.licenses.isc;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hoop" = callPackage
@@ -155545,6 +155696,27 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "int-interval-map" = callPackage
+    ({ mkDerivation, base, containers, deepseq, either, hedgehog
+     , primitive, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck
+     , tasty-th, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "int-interval-map";
+       version = "0.0.1.0";
+       sha256 = "03rlqrmz5dgqzanh0flb6n0da26llx8q0l9w2bjhfbw7389kp1yv";
+       libraryHaskellDepends = [
+         base containers deepseq either primitive vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base containers deepseq either hedgehog primitive tasty
+         tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th vector
+         vector-algorithms
+       ];
+       description = "Interval map";
+       license = lib.licenses.mit;
+     }) {};
+
   "int-like" = callPackage
     ({ mkDerivation, algebraic-graphs, base, containers, deepseq
      , hashable, tasty, tasty-hunit
@@ -156225,8 +156397,8 @@ self: {
      }:
      mkDerivation {
        pname = "interval-patterns";
-       version = "0.1.0.0";
-       sha256 = "0h31ajkkiv4j15h655rbf7gqjbnddki1vwl6kcbi8y7s9bh63rz8";
+       version = "0.2.0.1";
+       sha256 = "1zb83sfiggcl4f23imgbvgprnizdy79s4zh1vr334w8sslc6sy98";
        libraryHaskellDepends = [
          base containers groups lattices relude semirings time time-compat
        ];
@@ -157334,8 +157506,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "2.10";
-       sha256 = "1x1vmpzmgwxkwcza20yzmymgb7bj04f17xiqvcqg29h53pimnvxj";
+       version = "2.11";
+       sha256 = "13jkfb30kynqd55c2slxjg98lr076rn1ymsxniwp0bssjzizgnfc";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring hashable primitive
          text time vector
@@ -159486,6 +159658,8 @@ self: {
        pname = "jira-wiki-markup";
        version = "1.4.0";
        sha256 = "0p6axj6km4440ss5naw68r3r85si4qxqgrklp6ssfyapawy0s88w";
+       revision = "1";
+       editedCabalFile = "043x87s8lyg0ck2krwdn1ncr0sxc7p03jmgykwyvg8c7i56n3m7n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec text ];
@@ -160943,35 +161117,13 @@ self: {
 
   "json-stream" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, hspec
-     , QuickCheck, quickcheck-unicode, scientific, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "json-stream";
-       version = "0.4.3.0";
-       sha256 = "1bxddz84knxhnh92chg58g66xrnz9cq805p0fs7rpa8v2wgf06yy";
-       libraryHaskellDepends = [
-         aeson base bytestring scientific text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory hspec QuickCheck quickcheck-unicode
-         scientific text unordered-containers vector
-       ];
-       description = "Incremental applicative JSON parser";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "json-stream_0_4_4_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, hspec
      , primitive, QuickCheck, quickcheck-unicode, scientific, text
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "json-stream";
-       version = "0.4.4.0";
-       sha256 = "1rjvrkrjmh5kvrajd6n2q3h68dkh1m5jhm7f6hq723zvxzl98wij";
+       version = "0.4.4.1";
+       sha256 = "1czl29nn2i4li6m1dn151l5rbiwrb3c47njnmlk3pqk138k0czgy";
        libraryHaskellDepends = [
          aeson base bytestring primitive scientific text
          unordered-containers vector
@@ -161268,6 +161420,27 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "jsonifier_0_2_1_1" = callPackage
+    ({ mkDerivation, aeson, base, buffer-builder, bytestring, gauge
+     , hedgehog, numeric-limits, ptr-poker, rerebase, scientific, text
+     , text-builder
+     }:
+     mkDerivation {
+       pname = "jsonifier";
+       version = "0.2.1.1";
+       sha256 = "0wih0m3g2wj06zwl2wbs9y2bfbc593vmh25imy6hki2iq7wwr3l0";
+       libraryHaskellDepends = [
+         base bytestring ptr-poker scientific text
+       ];
+       testHaskellDepends = [ aeson hedgehog numeric-limits rerebase ];
+       benchmarkHaskellDepends = [
+         aeson buffer-builder gauge rerebase text-builder
+       ];
+       description = "Fast and simple JSON encoding toolkit";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "jsonl" = callPackage
     ({ mkDerivation, aeson, base, bytestring }:
      mkDerivation {
@@ -192256,26 +192429,28 @@ self: {
      }:
      mkDerivation {
        pname = "mysql-simple";
-       version = "0.4.7.2";
-       sha256 = "0wi4zqgnf4kfw95sm1wrl4260f2v5wz2k9kvgngb640y6sb034mc";
+       version = "0.4.8";
+       sha256 = "077psr65rszk06bxx67bhvfk8ajmsr56bwynx7d57lqdvzvm4691";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring blaze-builder bytestring
          containers mysql old-locale pcre-light text time vector
        ];
-       testHaskellDepends = [ base blaze-builder bytestring hspec text ];
+       testHaskellDepends = [
+         base blaze-builder bytestring hspec mysql text time
+       ];
        description = "A mid-level MySQL client library";
        license = lib.licenses.bsd3;
      }) {};
 
-  "mysql-simple_0_4_8" = callPackage
+  "mysql-simple_0_4_8_1" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
      , bytestring, containers, hspec, mysql, old-locale, pcre-light
      , text, time, vector
      }:
      mkDerivation {
        pname = "mysql-simple";
-       version = "0.4.8";
-       sha256 = "077psr65rszk06bxx67bhvfk8ajmsr56bwynx7d57lqdvzvm4691";
+       version = "0.4.8.1";
+       sha256 = "18w6mp7s1dmvwzqdgdzywhp5li3h4kisrhgxllwi578nddwg2yx3";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring blaze-builder bytestring
          containers mysql old-locale pcre-light text time vector
@@ -193259,23 +193434,11 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "natural-arithmetic";
-       version = "0.1.2.0";
-       sha256 = "0zw1dax3a67cpilq57ykbrjybz9kc45qflpr6mwfz79hpx9pcld0";
-       libraryHaskellDepends = [ base ];
-       description = "Arithmetic of natural numbers";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "natural-arithmetic_0_1_3_0" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "natural-arithmetic";
        version = "0.1.3.0";
        sha256 = "13ihizfvkl5bjy5rn966y22lgs8f1dgwyqky3k9gjsqxczlg44xa";
        libraryHaskellDepends = [ base ];
        description = "Arithmetic of natural numbers";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "natural-induction" = callPackage
@@ -198698,29 +198861,6 @@ self: {
      }:
      mkDerivation {
        pname = "numeric-prelude";
-       version = "0.4.3.3";
-       sha256 = "0kqz3xzg0j3cqaidmdzmg47h564ivp4iz5ys8zs5g41k2wd06ild";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base containers deepseq non-negative parsec QuickCheck random
-         semigroups storable-record utility-ht
-       ];
-       testHaskellDepends = [
-         base doctest-exitcode-stdio doctest-lib QuickCheck random
-         utility-ht
-       ];
-       description = "An experimental alternative hierarchy of numeric type classes";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "numeric-prelude_0_4_4" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq
-     , doctest-exitcode-stdio, doctest-lib, non-negative, parsec
-     , QuickCheck, random, semigroups, storable-record, utility-ht
-     }:
-     mkDerivation {
-       pname = "numeric-prelude";
        version = "0.4.4";
        sha256 = "04x6ry2sxr5hsiz4098dn2gqyjqywiq2xk0anf6wc4xrvasgccjs";
        isLibrary = true;
@@ -198735,7 +198875,6 @@ self: {
        ];
        description = "An experimental alternative hierarchy of numeric type classes";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "numeric-qq" = callPackage
@@ -198834,25 +198973,12 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "numhask";
-       version = "0.10.0.0";
-       sha256 = "132s0yccg8fhigd6a463lrg2cqx032xfpdirvvfhrczdzirbm7xy";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base QuickCheck ];
-       description = "A numeric class hierarchy";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "numhask_0_10_1_0" = callPackage
-    ({ mkDerivation, base, QuickCheck }:
-     mkDerivation {
-       pname = "numhask";
        version = "0.10.1.0";
        sha256 = "1zxp98svs872qpc0d8pycdbnf47phw4xbrvpi4vrzwyri5wahsxb";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "A numeric class hierarchy";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "numhask-array" = callPackage
@@ -200141,6 +200267,30 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {OIS = null;};
 
+  "okapi" = callPackage
+    ({ mkDerivation, aeson, base, base64, bytestring, containers
+     , http-api-data, http-types, lucid, mmorph, mtl, stm, text
+     , transformers, unagi-chan, uuid, vault, wai, wai-extra, warp
+     , warp-tls
+     }:
+     mkDerivation {
+       pname = "okapi";
+       version = "0.1.0.2";
+       sha256 = "1b1viabmd09phx1nffwply2d6m309blp9wiqcman093wq1hk4ky8";
+       libraryHaskellDepends = [
+         aeson base base64 bytestring containers http-api-data http-types
+         lucid mmorph mtl stm text transformers unagi-chan uuid vault wai
+         wai-extra warp warp-tls
+       ];
+       testHaskellDepends = [
+         aeson base base64 bytestring containers http-api-data http-types
+         lucid mmorph mtl stm text transformers unagi-chan uuid vault wai
+         wai-extra warp warp-tls
+       ];
+       description = "A microframework based on monadic parsing";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "old-locale" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -205036,6 +205186,29 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "pandoc-lua-marshal_0_1_6" = callPackage
+    ({ mkDerivation, base, bytestring, containers, exceptions, hslua
+     , hslua-marshalling, lua, pandoc-types, QuickCheck, safe, tasty
+     , tasty-hunit, tasty-lua, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "pandoc-lua-marshal";
+       version = "0.1.6";
+       sha256 = "1z7hwvqaspapv97l36gq975cmhn11q0z2h1axz33bml7zf2z4bwc";
+       libraryHaskellDepends = [
+         base bytestring containers exceptions hslua hslua-marshalling lua
+         pandoc-types safe text
+       ];
+       testHaskellDepends = [
+         base bytestring containers exceptions hslua hslua-marshalling lua
+         pandoc-types QuickCheck safe tasty tasty-hunit tasty-lua
+         tasty-quickcheck text
+       ];
+       description = "Use pandoc types in Lua";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "pandoc-markdown-ghci-filter" = callPackage
     ({ mkDerivation, aeson, base, containers, ghcid, pandoc
      , pandoc-types, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -208496,6 +208669,8 @@ self: {
        ];
        description = "Regular expressions via the PCRE2 C library (included)";
        license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcre2_2_2_1" = callPackage
@@ -208521,6 +208696,7 @@ self: {
        description = "Regular expressions via the PCRE2 C library (included)";
        license = lib.licenses.asl20;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdc" = callPackage
@@ -211264,6 +211440,17 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "phonetic-languages-basis" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "phonetic-languages-basis";
+       version = "0.1.0.0";
+       sha256 = "1qdyg9f8hk0cklf15x7akchrvfj7rya7rmzc16i8fk0bl4lyfall";
+       libraryHaskellDepends = [ base ];
+       description = "A basics of the phonetic-languages functionality";
+       license = lib.licenses.mit;
+     }) {};
+
   "phonetic-languages-common" = callPackage
     ({ mkDerivation, base, subG, subG-instances, vector }:
      mkDerivation {
@@ -211426,8 +211613,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-plus";
-       version = "0.5.3.0";
-       sha256 = "09wqch3ajsxqm4w10k95qg7ljv6s5rznxrniljcnl4pram4xfr8d";
+       version = "0.6.0.0";
+       sha256 = "03zfn9ql0gfgk2j0rgzkvbp8pd16khbc99hxzbv00ih5rjwyhzn5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -211475,16 +211662,18 @@ self: {
      }) {};
 
   "phonetic-languages-simplified-base" = callPackage
-    ({ mkDerivation, base, phonetic-languages-permutations-array, subG
+    ({ mkDerivation, base, phonetic-languages-basis
+     , phonetic-languages-permutations-array, subG
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-base";
-       version = "0.4.6.0";
-       sha256 = "0pnq92xg0zkbvq8a9jqw75v7zfqazg6r1ja35hjwdr8rl991nvjr";
+       version = "0.5.0.0";
+       sha256 = "02jxqqwcws8wl5a1s2q97w364bv6vwy4mwrlzmmwh5cp60p3dm20";
        libraryHaskellDepends = [
-         base phonetic-languages-permutations-array subG
+         base phonetic-languages-basis phonetic-languages-permutations-array
+         subG
        ];
-       description = "A basics of the phonetic-languages functionality";
+       description = "A basics of the phonetic-languages functionality that can be groupped";
        license = lib.licenses.mit;
        hydraPlatforms = lib.platforms.none;
      }) {};
@@ -211508,43 +211697,46 @@ self: {
   "phonetic-languages-simplified-examples-array" = callPackage
     ({ mkDerivation, base, cli-arguments, heaps, lists-flines
      , mmsyn2-array, mmsyn2-array-ukrainian-data, parallel
-     , phonetic-languages-constraints-array
+     , phonetic-languages-basis, phonetic-languages-constraints-array
      , phonetic-languages-filters-array
      , phonetic-languages-permutations-array, phonetic-languages-plus
      , phonetic-languages-rhythmicity
      , phonetic-languages-simplified-base
      , phonetic-languages-simplified-examples-common
      , phonetic-languages-simplified-properties-array
+     , phonetic-languages-simplified-properties-array-common
      , phonetic-languages-ukrainian-array, string-interpreter, subG
      , ukrainian-phonetics-basic-array, uniqueness-periods-vector-stats
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-examples-array";
-       version = "0.18.0.2";
-       sha256 = "0m79iv739cakgpfbixg613fhwjnvy4nidqvfrvqgq53wn4x9pdm3";
+       version = "0.19.0.0";
+       sha256 = "0y9mmfjxkbxpw4iggafvm80324zjrljwkc314439gydhf4961sf9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base cli-arguments heaps lists-flines mmsyn2-array
-         mmsyn2-array-ukrainian-data parallel
+         mmsyn2-array-ukrainian-data parallel phonetic-languages-basis
          phonetic-languages-constraints-array
          phonetic-languages-filters-array
          phonetic-languages-permutations-array phonetic-languages-plus
          phonetic-languages-rhythmicity phonetic-languages-simplified-base
          phonetic-languages-simplified-examples-common
          phonetic-languages-simplified-properties-array
+         phonetic-languages-simplified-properties-array-common
          phonetic-languages-ukrainian-array string-interpreter subG
          ukrainian-phonetics-basic-array uniqueness-periods-vector-stats
        ];
        executableHaskellDepends = [
          base cli-arguments heaps lists-flines mmsyn2-array
-         mmsyn2-array-ukrainian-data parallel
+         mmsyn2-array-ukrainian-data parallel phonetic-languages-basis
          phonetic-languages-constraints-array
          phonetic-languages-filters-array
          phonetic-languages-permutations-array phonetic-languages-plus
          phonetic-languages-rhythmicity phonetic-languages-simplified-base
          phonetic-languages-simplified-examples-common
          phonetic-languages-simplified-properties-array
+         phonetic-languages-simplified-properties-array-common
          phonetic-languages-ukrainian-array string-interpreter subG
          ukrainian-phonetics-basic-array uniqueness-periods-vector-stats
        ];
@@ -211568,7 +211760,7 @@ self: {
 
   "phonetic-languages-simplified-generalized-examples-array" = callPackage
     ({ mkDerivation, base, cli-arguments, foldable-ix, heaps
-     , mmsyn2-array, mmsyn3, parallel
+     , mmsyn2-array, mmsyn3, parallel, phonetic-languages-basis
      , phonetic-languages-constraints-array
      , phonetic-languages-filters-array
      , phonetic-languages-permutations-array
@@ -211580,11 +211772,11 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-generalized-examples-array";
-       version = "0.16.0.0";
-       sha256 = "16ia1kd217hy0wpdjd60l1qdz2ivcm1n0sncp106x4dksy4xc1pv";
+       version = "0.17.0.0";
+       sha256 = "0gm5pn7qass74x7xjgshq1hlyjvdm9jvfjvnwh6g0f607g7zzsrp";
        libraryHaskellDepends = [
          base cli-arguments foldable-ix heaps mmsyn2-array mmsyn3 parallel
-         phonetic-languages-constraints-array
+         phonetic-languages-basis phonetic-languages-constraints-array
          phonetic-languages-filters-array
          phonetic-languages-permutations-array
          phonetic-languages-phonetics-basics phonetic-languages-plus
@@ -211614,17 +211806,17 @@ self: {
      }) {};
 
   "phonetic-languages-simplified-generalized-properties-array" = callPackage
-    ({ mkDerivation, base, phonetic-languages-phonetics-basics
+    ({ mkDerivation, base, phonetic-languages-basis
+     , phonetic-languages-phonetics-basics
      , phonetic-languages-rhythmicity
-     , phonetic-languages-simplified-base
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-generalized-properties-array";
-       version = "0.9.0.0";
-       sha256 = "17zr8j9slvimjv1vx6bzq1d86n5ap1j17yglxvviyd3xbhnp2qq2";
+       version = "0.10.1.0";
+       sha256 = "04z1xm1da9rhiajkfdyflsbmd0dqpzsjhh1xl469p4795xfv3k2l";
        libraryHaskellDepends = [
-         base phonetic-languages-phonetics-basics
-         phonetic-languages-rhythmicity phonetic-languages-simplified-base
+         base phonetic-languages-basis phonetic-languages-phonetics-basics
+         phonetic-languages-rhythmicity
        ];
        description = "Some 'properties' of the phonetic languages approach text";
        license = lib.licenses.mit;
@@ -211667,17 +211859,59 @@ self: {
      }) {};
 
   "phonetic-languages-simplified-properties-array" = callPackage
-    ({ mkDerivation, base, phonetic-languages-rhythmicity
+    ({ mkDerivation, base, phonetic-languages-basis
+     , phonetic-languages-rhythmicity
      , phonetic-languages-simplified-base
+     , phonetic-languages-simplified-properties-array-common
      , ukrainian-phonetics-basic-array
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-properties-array";
-       version = "0.13.1.0";
-       sha256 = "17p6hpljkvcsjyfc7dpk8pf2ws1rimmnwc93gaa2a473ifk4a1sd";
+       version = "0.14.0.0";
+       sha256 = "0b8vi0f4phz9jd6n92cv9fravqx6dz8dkfs0gk0qavln13p6nj98";
        libraryHaskellDepends = [
-         base phonetic-languages-rhythmicity
-         phonetic-languages-simplified-base ukrainian-phonetics-basic-array
+         base phonetic-languages-basis phonetic-languages-rhythmicity
+         phonetic-languages-simplified-base
+         phonetic-languages-simplified-properties-array-common
+         ukrainian-phonetics-basic-array
+       ];
+       description = "Some properties of the data related to rhythmicity";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "phonetic-languages-simplified-properties-array-common" = callPackage
+    ({ mkDerivation, base, phonetic-languages-basis
+     , phonetic-languages-rhythmicity
+     }:
+     mkDerivation {
+       pname = "phonetic-languages-simplified-properties-array-common";
+       version = "0.1.0.0";
+       sha256 = "19c7y4v5fk3dkxpm1hj6xdw0kgfaqv148ws9if26cyjjhzsqkxl9";
+       libraryHaskellDepends = [
+         base phonetic-languages-basis phonetic-languages-rhythmicity
+       ];
+       description = "Common functionality for 'with-tuples' and old version of properties";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "phonetic-languages-simplified-properties-array-old" = callPackage
+    ({ mkDerivation, base, phonetic-languages-basis
+     , phonetic-languages-rhythmicity
+     , phonetic-languages-simplified-base
+     , phonetic-languages-simplified-properties-array-common
+     , ukrainian-phonetics-basic-array
+     }:
+     mkDerivation {
+       pname = "phonetic-languages-simplified-properties-array-old";
+       version = "0.1.0.0";
+       sha256 = "0zv3fax6pi7kz6z4bvgmphz0fbkip743d5js3169sbw97mzbn2nc";
+       libraryHaskellDepends = [
+         base phonetic-languages-basis phonetic-languages-rhythmicity
+         phonetic-languages-simplified-base
+         phonetic-languages-simplified-properties-array-common
+         ukrainian-phonetics-basic-array
        ];
        description = "Some properties of the data related to rhythmicity";
        license = lib.licenses.mit;
@@ -215936,6 +216170,29 @@ self: {
        license = "BSD-2-Clause-Patent";
      }) {};
 
+  "polysemy-managed" = callPackage
+    ({ mkDerivation, base, exceptions, hedgehog, hspec, hspec-discover
+     , hw-hspec-hedgehog, mtl, polysemy, resourcet, transformers
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "polysemy-managed";
+       version = "0.1.0.0";
+       sha256 = "1k7f8cmg9r06s3ks38gki85b0ww7ihf3f2kwj3pr06s1zzxcrzzg";
+       libraryHaskellDepends = [
+         base polysemy resourcet transformers unliftio-core
+       ];
+       testHaskellDepends = [
+         base exceptions hedgehog hspec hw-hspec-hedgehog mtl polysemy
+         resourcet transformers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Primitive functions and data types";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "polysemy-methodology" = callPackage
     ({ mkDerivation, base, polysemy, polysemy-kvstore, polysemy-several
      }:
@@ -216131,6 +216388,8 @@ self: {
        pname = "polysemy-req";
        version = "0.1.0";
        sha256 = "1vji169hk7an0dal8chk3h3jb6yxjh037arp15zkc8y5m0r5wbnm";
+       revision = "1";
+       editedCabalFile = "1gn5zjms5r8wasw5429zlc2g3mwyjvz9gyn54phldbcgizsvw7s6";
        libraryHaskellDepends = [ base polysemy req ];
        description = "Polysemy effect for req";
        license = lib.licenses.bsd3;
@@ -216406,8 +216665,8 @@ self: {
        pname = "polyvariadic";
        version = "0.3.0.4";
        sha256 = "17895458cfciv5lkcd26b5a96d9mwklish8xjhn14bd2himyczx0";
-       revision = "1";
-       editedCabalFile = "1z4wg7cb4akanch7cdmmvr8ibrv7il63gi2mchq8pasqad6150f0";
+       revision = "2";
+       editedCabalFile = "1n7g0j0gx09l7dw0dqbw1hgx5vnz2gln05mz9j80m5y5nvc8hgd7";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "Creation and application of polyvariadic functions";
@@ -218011,8 +218270,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-simple-named";
-       version = "0.0.2.0";
-       sha256 = "1bk6r67jy533zskwmg251vlb2imzyh60hx9lwag2rqclgb7fgplr";
+       version = "0.0.3.0";
+       sha256 = "19jyr3ai75hcks342yxrqsb1mklr6rjrzczs3al9666rll8silw9";
        libraryHaskellDepends = [
          base bytestring mtl postgresql-simple text
        ];
@@ -222563,16 +222822,16 @@ self: {
     ({ mkDerivation, base, bytestring, cereal, containers, deepseq
      , doctest, ghc-prim, hashable, parameterized, primitive, QuickCheck
      , safe, tasty, tasty-hunit, tasty-quickcheck, text, transformers
-     , unordered-containers, vector
+     , unordered-containers, vector, word-compat
      }:
      mkDerivation {
        pname = "proto3-wire";
-       version = "1.2.2";
-       sha256 = "1fdzml0nsbz1bqf3lskvmfn46pgl5rnrc4b7azq8f0csm0v9ah4d";
+       version = "1.3.0";
+       sha256 = "1m9yv7cvswkzz32cxm57ay68gh4rdklcz15m3v8rzywp5fqsly26";
        libraryHaskellDepends = [
          base bytestring cereal containers deepseq ghc-prim hashable
          parameterized primitive QuickCheck safe text transformers
-         unordered-containers vector
+         unordered-containers vector word-compat
        ];
        testHaskellDepends = [
          base bytestring cereal doctest QuickCheck tasty tasty-hunit
@@ -222774,8 +223033,8 @@ self: {
      }:
      mkDerivation {
        pname = "protolude";
-       version = "0.3.0";
-       sha256 = "1b6wprbwfdjyvds2bm6na0fbqgzdkj5ikkk33whbkyh3krd3i0s0";
+       version = "0.3.1";
+       sha256 = "0cwy2apaghbxxf4w3k8gpd8npiy8d9yw0cd6ixqvis28q0b8snvi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -229438,28 +229697,27 @@ self: {
     ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base
      , base64-bytestring, bytestring, cassava, cereal, colour
      , containers, cryptohash-sha256, cubicbezier, directory, filelock
-     , filepath, fingertree, fsnotify, geojson, hashable, hgeometry
-     , hgeometry-combinatorial, JuicyPixels, lens, linear, matrix, mtl
-     , neat-interpolation, network, open-browser, optparse-applicative
-     , parallel, process, QuickCheck, random, random-shuffle
-     , reanimate-svg, split, tasty, tasty-expected-failure, tasty-golden
-     , tasty-hunit, tasty-quickcheck, tasty-rerun, temporary, text, time
-     , unix, unordered-containers, vector, vector-space, websockets, xml
+     , filepath, fingertree, fsnotify, geojson, hashable, JuicyPixels
+     , lens, linear, matrix, mtl, neat-interpolation, network
+     , open-browser, optparse-applicative, parallel, process, QuickCheck
+     , random, random-shuffle, reanimate-svg, split, tasty
+     , tasty-expected-failure, tasty-golden, tasty-hunit
+     , tasty-quickcheck, tasty-rerun, temporary, text, time, unix
+     , unordered-containers, vector, vector-space, websockets, xml
      }:
      mkDerivation {
        pname = "reanimate";
-       version = "1.1.5.0";
-       sha256 = "0gy5s68d00szs1ljfcyisp19g3vz4i1mlbxpym0mymzc5v723wfa";
+       version = "1.1.6.0";
+       sha256 = "1c560cm4vqk9zvvzjhns0qs19h09fjhxpinbgw5hzw351669nri7";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal array attoparsec base base64-bytestring
          bytestring cassava cereal colour containers cryptohash-sha256
          cubicbezier directory filelock filepath fingertree fsnotify geojson
-         hashable hgeometry hgeometry-combinatorial JuicyPixels lens linear
-         matrix mtl neat-interpolation network open-browser
-         optparse-applicative parallel process random random-shuffle
-         reanimate-svg split temporary text time unix unordered-containers
-         vector vector-space websockets xml
+         hashable JuicyPixels lens linear matrix mtl neat-interpolation
+         network open-browser optparse-applicative parallel process random
+         random-shuffle reanimate-svg split temporary text time unix
+         unordered-containers vector vector-space websockets xml
        ];
        testHaskellDepends = [
          base bytestring directory filepath linear process QuickCheck tasty
@@ -232473,8 +232731,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry-messagepack";
-       version = "0.2.0.0";
-       sha256 = "0hkz80kbsmvlcvy4py1vwsr4z5blmkcp6b24ay9qzayqdjx03r2w";
+       version = "0.3.0.0";
+       sha256 = "0fwzbxflrkmg4hj9gydpkfnrj2ah10ln4rrm2qp96z1r7wpscvps";
        libraryHaskellDepends = [
          base containers msgpack protolude registry template-haskell text
          transformers vector
@@ -234419,6 +234677,18 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "resource-pool_0_3_0_0" = callPackage
+    ({ mkDerivation, base, primitive, time }:
+     mkDerivation {
+       pname = "resource-pool";
+       version = "0.3.0.0";
+       sha256 = "04g2hwjd8w5nwxlfkj33rv11n78bb1knr5fwy4l19gsg1nm9j39v";
+       libraryHaskellDepends = [ base primitive time ];
+       description = "A high-performance striped resource pooling implementation";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "resource-pool-catchio" = callPackage
     ({ mkDerivation, base, hashable, MonadCatchIO-transformers, stm
      , time, transformers, transformers-base, vector
@@ -234666,8 +234936,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-rewrite";
-       version = "0.2.0";
-       sha256 = "05s5c9j6afswy0ix8m543csk1blknncrh4kz2ihyw90yfgpjjb3b";
+       version = "0.3.0";
+       sha256 = "1j4ja0fv0jgjxbi4yz06pgplw57vfi5d7h8swc0ip2cnkzsi4zjs";
        libraryHaskellDepends = [
          base containers hashable monad-loops mtl parsec process QuickCheck
          text time unordered-containers
@@ -237836,6 +238106,31 @@ self: {
        broken = true;
      }) {};
 
+  "rpmbuild-order_0_4_7" = callPackage
+    ({ mkDerivation, base, case-insensitive, directory, extra, fgl
+     , filepath, graphviz, hspec, optparse-applicative, simple-cmd
+     , simple-cmd-args, unix
+     }:
+     mkDerivation {
+       pname = "rpmbuild-order";
+       version = "0.4.7";
+       sha256 = "10qwndr8hxvgy386jy4zxkjsw4cj79fr9rh6qivivx6y0q2d2jnr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base case-insensitive directory extra fgl filepath graphviz
+         simple-cmd
+       ];
+       executableHaskellDepends = [
+         base directory extra fgl optparse-applicative simple-cmd-args
+       ];
+       testHaskellDepends = [ base extra hspec simple-cmd unix ];
+       description = "Sort RPM packages in dependency order";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "rrb-vector" = callPackage
     ({ mkDerivation, base, deepseq, indexed-traversable, primitive
      , tasty, tasty-bench, tasty-quickcheck
@@ -248654,32 +248949,6 @@ self: {
      }:
      mkDerivation {
        pname = "shakespeare";
-       version = "2.0.27";
-       sha256 = "1bnl7m96x8qr2rvkfzjy01d720xb3c55l3vg0zm2lfbz3gpml1jz";
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions file-embed ghc-prim parsec process scientific
-         template-haskell text th-lift time transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions ghc-prim hspec HUnit parsec process template-haskell
-         text time transformers
-       ];
-       description = "A toolkit for making compile-time interpolated templates";
-       license = lib.licenses.mit;
-       maintainers = with lib.maintainers; [ psibi ];
-     }) {};
-
-  "shakespeare_2_0_29" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , containers, directory, exceptions, file-embed, ghc-prim, hspec
-     , HUnit, parsec, process, scientific, template-haskell, text
-     , th-lift, time, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "shakespeare";
        version = "2.0.29";
        sha256 = "016vkhn2g91cip5w06kh0z577s90sd768rmx044n4b5sa135c89j";
        libraryHaskellDepends = [
@@ -248695,7 +248964,6 @@ self: {
        ];
        description = "A toolkit for making compile-time interpolated templates";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ psibi ];
      }) {};
 
@@ -258146,6 +258414,27 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "sqlite-simple_0_4_18_2" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
+     , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only
+     , template-haskell, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "sqlite-simple";
+       version = "0.4.18.2";
+       sha256 = "14axfc9ii08g7yx3j9n5hrfrsmab3pjv7n0cshcg4a2lvnkv25fw";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-textual bytestring containers
+         direct-sqlite Only template-haskell text time transformers
+       ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring direct-sqlite HUnit text time
+       ];
+       description = "Mid-Level SQLite client library";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "sqlite-simple-errors" = callPackage
     ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }:
      mkDerivation {
@@ -258160,6 +258449,23 @@ self: {
        broken = true;
      }) {};
 
+  "sqlite-simple-interpolate" = callPackage
+    ({ mkDerivation, base, haskell-src-meta, mtl, parsec, sqlite-simple
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "sqlite-simple-interpolate";
+       version = "0.1";
+       sha256 = "0cjkk3zy3kasddkicwy8wklcj7i6bg779b82f1liaimsiwnmjpf3";
+       revision = "1";
+       editedCabalFile = "04dpspiia4mlpwfpdnsnyb24qsvy7da25rcbbyxyavadz3ri44hm";
+       libraryHaskellDepends = [
+         base haskell-src-meta mtl parsec sqlite-simple template-haskell
+       ];
+       description = "Interpolated SQLite queries via quasiquotation";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "sqlite-simple-typed" = callPackage
     ({ mkDerivation, base, haskell-src-meta, sqlite, sqlite-simple
      , template-haskell, typedquery, utf8-string
@@ -263727,16 +264033,22 @@ self: {
      }) {};
 
   "strongweak" = callPackage
-    ({ mkDerivation, base, prettyprinter, refined, validation
-     , vector-sized
+    ({ mkDerivation, base, either, generic-random, hspec
+     , hspec-discover, prettyprinter, QuickCheck, quickcheck-instances
+     , refined, vector, vector-sized
      }:
      mkDerivation {
        pname = "strongweak";
-       version = "0.1.0";
-       sha256 = "1vr7kb410455mli4iy8dpdvbk2lr1ss4khdkhpnxpi626lbr7khf";
+       version = "0.2.0";
+       sha256 = "1acx0rf2xrsxbj8b1zla92j46igghlij0s0mjaiwys15w98xg8lx";
        libraryHaskellDepends = [
-         base prettyprinter refined validation vector-sized
+         base either prettyprinter refined vector vector-sized
+       ];
+       testHaskellDepends = [
+         base either generic-random hspec prettyprinter QuickCheck
+         quickcheck-instances refined vector vector-sized
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Convert between strong and weak representations of types";
        license = lib.licenses.mit;
        hydraPlatforms = lib.platforms.none;
@@ -270883,6 +271195,18 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "template-haskell-compat-v0208_0_1_9" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "template-haskell-compat-v0208";
+       version = "0.1.9";
+       sha256 = "082i7m3chwcxggfx5mgd716w83dxw6l9v8y4gl3p37f8rd2lqbrj";
+       libraryHaskellDepends = [ base template-haskell ];
+       description = "A backwards compatibility layer for Template Haskell newer than 2.8";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "template-haskell-optics" = callPackage
     ({ mkDerivation, base, containers, optics-core, template-haskell
      , th-abstraction
@@ -272677,15 +273001,15 @@ self: {
        license = lib.licenses.gpl2Only;
      }) {};
 
-  "texmath_0_12_5" = callPackage
+  "texmath_0_12_5_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty
      , tasty-golden, text, xml
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.12.5";
-       sha256 = "16i40va03v04222wn92fz62jri3094mfim6kdqk29335gamn0yk9";
+       version = "0.12.5.1";
+       sha256 = "1g8zy0hqwjbg5xfp6kf94zhf44xq6g17g0lbf4m7gxa072wwgd59";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -273570,36 +273894,6 @@ self: {
      }:
      mkDerivation {
        pname = "text-show";
-       version = "3.9.6";
-       sha256 = "1wcnwfshsscwy96jg709m2vrprcy4hi65n7f65a45q9rr81jiriw";
-       libraryHaskellDepends = [
-         array base base-compat-batteries bifunctors bytestring
-         bytestring-builder containers generic-deriving ghc-boot-th ghc-prim
-         template-haskell text th-abstraction th-lift transformers
-         transformers-compat
-       ];
-       testHaskellDepends = [
-         array base base-compat-batteries base-orphans bytestring
-         bytestring-builder deriving-compat generic-deriving ghc-prim hspec
-         QuickCheck quickcheck-instances template-haskell text transformers
-         transformers-compat
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
-       description = "Efficient conversion of values into Text";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "text-show_3_9_7" = callPackage
-    ({ mkDerivation, array, base, base-compat-batteries, base-orphans
-     , bifunctors, bytestring, bytestring-builder, containers, criterion
-     , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim
-     , hspec, hspec-discover, QuickCheck, quickcheck-instances
-     , template-haskell, text, th-abstraction, th-lift, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "text-show";
        version = "3.9.7";
        sha256 = "1zc47qh38jmg19fdki9isjcq4v115w2q61dnmxkypahhgiaqgkb3";
        libraryHaskellDepends = [
@@ -273618,7 +273912,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
        description = "Efficient conversion of values into Text";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "text-show-instances" = callPackage
@@ -274239,20 +274532,6 @@ self: {
      }:
      mkDerivation {
        pname = "th-env";
-       version = "0.1.0.3";
-       sha256 = "1ksw93npbgr74jy4jhfl4qvbzh4qxy5zvspmfhy1apkl793rs8c1";
-       libraryHaskellDepends = [ base template-haskell th-compat ];
-       testHaskellDepends = [ base markdown-unlit ];
-       testToolDepends = [ markdown-unlit ];
-       description = "Template Haskell splice that expands to an environment variable";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "th-env_0_1_1" = callPackage
-    ({ mkDerivation, base, markdown-unlit, template-haskell, th-compat
-     }:
-     mkDerivation {
-       pname = "th-env";
        version = "0.1.1";
        sha256 = "01gmycna12sg2f0zslhjnjx8s86shsvmw5jpw5n5z93bvxkb20gw";
        libraryHaskellDepends = [ base template-haskell th-compat ];
@@ -274260,7 +274539,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Template Haskell splices that expand to an environment variable";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "th-expand-syns" = callPackage
@@ -277336,6 +277614,34 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "tls_1_5_8" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
+     , cereal, cryptonite, data-default-class, gauge, hourglass, memory
+     , mtl, network, QuickCheck, tasty, tasty-quickcheck, transformers
+     , x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "tls";
+       version = "1.5.8";
+       sha256 = "0rxdv8ab98kd4nqql7djmmi51k4vayq21s38s43sx3rzn0iyla3b";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types async base bytestring cereal cryptonite
+         data-default-class hourglass memory mtl network transformers x509
+         x509-store x509-validation
+       ];
+       testHaskellDepends = [
+         asn1-types async base bytestring cryptonite data-default-class
+         hourglass QuickCheck tasty tasty-quickcheck x509 x509-validation
+       ];
+       benchmarkHaskellDepends = [
+         asn1-types async base bytestring cryptonite data-default-class
+         gauge hourglass QuickCheck tasty-quickcheck x509 x509-validation
+       ];
+       description = "TLS/SSL protocol native implementation (Server and Client)";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "tls-debug" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, pem, tls, tls-session-manager, x509, x509-store
@@ -282861,8 +283167,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "type-safe-avl";
-       version = "1.0.0.0";
-       sha256 = "0xkv97bzmj89q15hm9kzq7zw2b4y522gnyn4fwxwbsc1368n42q7";
+       version = "1.0.0.1";
+       sha256 = "0s7qkm6hk5qf0a54jmk3dv1cfzivc4c0jbx7gn20w5pfmv08zj1c";
        libraryHaskellDepends = [ base ];
        description = "Type safe BST and AVL trees";
        license = lib.licenses.gpl3Only;
@@ -283191,6 +283497,26 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "typed-process_0_2_10_1" = callPackage
+    ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
+     , process, stm, temporary, transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "typed-process";
+       version = "0.2.10.1";
+       sha256 = "17h9jl7gi26v3cxb4jdcksbp755sqqp8w7303q8x8r36rmf8fdp4";
+       libraryHaskellDepends = [
+         async base bytestring process stm transformers unliftio-core
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring bytestring hspec process stm temporary
+         transformers unliftio-core
+       ];
+       description = "Run external processes, with strong typing of streams";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "typed-spreadsheet" = callPackage
     ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk
      , diagrams-lib, foldl, gtk, microlens, stm, text, transformers
@@ -284759,6 +285085,19 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "unfork" = callPackage
+    ({ mkDerivation, async, base, safe-exceptions, stm }:
+     mkDerivation {
+       pname = "unfork";
+       version = "1.0.0.0";
+       sha256 = "0k770q549f1rcdhx21nb6n1van00za2wv50angdw5gkxihzczcjq";
+       revision = "1";
+       editedCabalFile = "1vwlyyrczrkma8ggzn29b6vwfbq51h3m1si1jfh6v5c99vajr33y";
+       libraryHaskellDepends = [ async base safe-exceptions stm ];
+       description = "Make any action thread safe";
+       license = lib.licenses.asl20;
+     }) {};
+
   "ungadtagger" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -285116,23 +285455,11 @@ self: {
     ({ mkDerivation, base, containers, logict, mtl }:
      mkDerivation {
        pname = "unification-fd";
-       version = "0.11.1";
-       sha256 = "0xvc3xa0yhxjxd1nf6d1cnixlbjaz2ww08hg1vldsf6c1h4lvs05";
-       libraryHaskellDepends = [ base containers logict mtl ];
-       description = "Simple generic unification algorithms";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "unification-fd_0_11_2" = callPackage
-    ({ mkDerivation, base, containers, logict, mtl }:
-     mkDerivation {
-       pname = "unification-fd";
        version = "0.11.2";
        sha256 = "1lyx3g10llkr7vl7c2j15ddlqrkz2r684d1laza7nvq97amrqnqv";
        libraryHaskellDepends = [ base containers logict mtl ];
        description = "Simple generic unification algorithms";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "uniform-algebras" = callPackage
@@ -285635,8 +285962,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "uniqueness-periods-vector-stats";
-       version = "0.2.2.0";
-       sha256 = "0j6n6maqjm1jvwl8s08v2ykv23yzkk6cnqkbv2af3p8fnd6m83sy";
+       version = "0.3.0.0";
+       sha256 = "0vfkjmp730w9f0174fx0mpfrrbd2grwd838wnrrlxnv39y345i6h";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "A very basic descriptive statistics";
        license = lib.licenses.mit;
@@ -286035,23 +286362,11 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "unix-bytestring";
-       version = "0.3.7.6";
-       sha256 = "1f9hf7blxy8ckakd0klrs16q0hfvxfarbjgyrc7azgbb86m1skb3";
-       libraryHaskellDepends = [ base bytestring ];
-       description = "Unix/Posix-specific functions for ByteStrings";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "unix-bytestring_0_3_7_7" = callPackage
-    ({ mkDerivation, base, bytestring }:
-     mkDerivation {
-       pname = "unix-bytestring";
        version = "0.3.7.7";
        sha256 = "1fpv8f6x2z0qncdjxpg3v3qjjs747bf3vw319c9hlygrhg5pnkx6";
        libraryHaskellDepends = [ base bytestring ];
        description = "Unix/Posix-specific functions for ByteStrings";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "unix-compat" = callPackage
@@ -292297,22 +292612,29 @@ self: {
      }) {inherit (pkgs) fcgi;};
 
   "wai-handler-hal" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring
-     , case-insensitive, hal, http-types, network, text
-     , unordered-containers, vault, wai
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , case-insensitive, hal, http-types, network, pretty-simple, tasty
+     , tasty-discover, tasty-golden, text, unordered-containers, vault
+     , wai
      }:
      mkDerivation {
        pname = "wai-handler-hal";
-       version = "0.1.1.0";
-       sha256 = "1l9adjrh0iffph40pqymikr5h52ldlyp2q9l7qclcamwdwkawmz0";
-       revision = "1";
-       editedCabalFile = "1lvhld1f6j3ligwc5mpxx8lf9md128v11dadbjalgzwchx0vj53s";
+       version = "0.1.2.0";
+       sha256 = "05q0aig70yfrhq73q8i79y4kvjkb2hlrbgza5m9sz5g3i0w21l3y";
        libraryHaskellDepends = [
          base base64-bytestring bytestring case-insensitive hal http-types
          network text unordered-containers vault wai
        ];
+       testHaskellDepends = [
+         aeson base base64-bytestring bytestring case-insensitive hal
+         http-types network pretty-simple tasty tasty-golden text
+         unordered-containers vault wai
+       ];
+       testToolDepends = [ tasty-discover ];
        description = "Wrap WAI applications to run on AWS Lambda";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-handler-launch" = callPackage
@@ -293992,15 +294314,15 @@ self: {
   "warp" = callPackage
     ({ 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, network, process, QuickCheck
+     , ghc-prim, hashable, hspec, hspec-discover, 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
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.3.20";
-       sha256 = "0jkgnb2pzl72q1y5yp6j8ijmaqhnj01b58dm4xs09f692yg4lxlj";
+       version = "3.3.21";
+       sha256 = "0vrzsj1spa5ygplqpkl4nflqxqbvy641dsjij64ix3n6rzhgqxcg";
        libraryHaskellDepends = [
          array auto-update base bsb-http-chunked bytestring case-insensitive
          containers ghc-prim hashable http-date http-types http2 iproute
@@ -294014,6 +294336,7 @@ self: {
          process QuickCheck simple-sendfile stm streaming-commons text time
          time-manager unix unix-compat unliftio vault wai word8 x509
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          auto-update base bytestring containers gauge hashable http-date
          http-types network time-manager unix unix-compat unliftio x509
@@ -296628,8 +296951,8 @@ self: {
      }:
      mkDerivation {
        pname = "winery";
-       version = "1.3.2";
-       sha256 = "0ll6zm6zmhl9xmlbhj8is33zny4l7hwvf8lpvgqw0jcvz7j955a2";
+       version = "1.4";
+       sha256 = "1bgahm8jiwhcn3gq5z809c2mw5wkqpin6gwn9ppajn31ljahvk3f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -296644,7 +296967,7 @@ self: {
        ];
        testHaskellDepends = [
          barbies barbies-th base bytestring containers fast-builder
-         QuickCheck quickcheck-instances scientific text time
+         prettyprinter QuickCheck quickcheck-instances scientific text time
          unordered-containers vector
        ];
        benchmarkHaskellDepends = [
@@ -298859,6 +299182,28 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "x509_1_7_7" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
+     , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
+     , tasty, tasty-quickcheck, transformers
+     }:
+     mkDerivation {
+       pname = "x509";
+       version = "1.7.7";
+       sha256 = "1zk8lll1hmzl5xvrd16dhyz25151y59xhsqp2mm1wgymwl7r5ijr";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-parse asn1-types base bytestring containers
+         cryptonite hourglass memory pem transformers
+       ];
+       testHaskellDepends = [
+         asn1-types base bytestring cryptonite hourglass mtl tasty
+         tasty-quickcheck
+       ];
+       description = "X509 reader and writer";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "x509-store" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
      , containers, cryptonite, directory, filepath, mtl, pem, tasty
@@ -303173,13 +303518,13 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-oidc";
-       version = "0.1.0";
-       sha256 = "1kxki50zwyqblpglm8rgmhvf8rm0fr38vzygigxpky4qaraqxpk6";
+       version = "0.1.1";
+       sha256 = "12x4wypjmqvlz2y59j1p9ckf7pgl1sz3zz45xzhqa6axzzf6ln20";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base base64-bytestring classy-prelude-yesod cryptonite
-         http-client jose-jwt oidc-client shakespeare text time
+         aeson base base64-bytestring classy-prelude-yesod containers
+         cryptonite http-client jose-jwt oidc-client shakespeare text time
          unordered-containers yesod-auth yesod-core yesod-form
        ];
        executableHaskellDepends = [
@@ -303226,6 +303571,47 @@ self: {
        broken = true;
      }) {};
 
+  "yesod-auth-simple" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
+     , blaze-html, bytestring, classy-prelude, classy-prelude-yesod
+     , cryptonite, directory, email-validate, fast-logger, hspec
+     , hspec-discover, http-types, memory, monad-logger, persistent
+     , persistent-sqlite, scrypt, shakespeare, text, time, vector, wai
+     , yesod, yesod-auth, yesod-core, yesod-form, yesod-test, zxcvbn-hs
+     }:
+     mkDerivation {
+       pname = "yesod-auth-simple";
+       version = "1.1.0";
+       sha256 = "1q65a4aya8icz58vmsz25bgjlybhmma5ahvnnyh1pmlsfir89z85";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base16-bytestring base64-bytestring blaze-html
+         bytestring classy-prelude classy-prelude-yesod cryptonite
+         email-validate http-types memory persistent scrypt shakespeare text
+         time vector wai yesod-auth yesod-core yesod-form zxcvbn-hs
+       ];
+       executableHaskellDepends = [
+         aeson base base64-bytestring blaze-html bytestring classy-prelude
+         classy-prelude-yesod cryptonite directory email-validate
+         fast-logger hspec http-types memory monad-logger persistent
+         persistent-sqlite scrypt shakespeare text time vector wai yesod
+         yesod-auth yesod-core yesod-form yesod-test zxcvbn-hs
+       ];
+       executableToolDepends = [ hspec-discover ];
+       testHaskellDepends = [
+         aeson base base64-bytestring blaze-html bytestring classy-prelude
+         classy-prelude-yesod cryptonite directory email-validate
+         fast-logger hspec http-types memory monad-logger persistent
+         persistent-sqlite scrypt shakespeare text time vector wai yesod
+         yesod-auth yesod-core yesod-form yesod-test zxcvbn-hs
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Traditional email/pass auth for Yesod";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "yesod-auth-smbclient" = callPackage
     ({ mkDerivation, base, hamlet, sys-auth-smbclient, text, yesod-auth
      , yesod-core, yesod-form
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 8518a5391de77..4c8bf8c2d2824 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -49,9 +49,12 @@ buildPackages.stdenv.mkDerivation {
   # compiling databases takes less time than copying the results
   # between machines.
   preferLocalBuild = true;
-  # Plus, you need a complete database for each possible combination
-  # of dependencies, caching them does not make sense.
-  allowSubstitutes = false;
+
+  # we still allow substitutes because a database is relatively small and if it
+  # is already built downloading is probably faster.  The substitution will only
+  # trigger for users who have already cached the database on a substituter and
+  # thus probably intend to substitute it.
+  allowSubstitutes = true;
 
   inherit docPackages;
 
diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index 03d08e0c4ef49..dccf6d0ce2e1f 100644
--- a/pkgs/development/interpreters/clojure/babashka.nix
+++ b/pkgs/development/interpreters/clojure/babashka.nix
@@ -2,11 +2,11 @@
 
 buildGraalvmNativeImage rec {
   pname = "babashka";
-  version = "0.8.2";
+  version = "0.8.156";
 
   src = fetchurl {
     url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
-    sha256 = "sha256-rdA/pV2EGYPs1UuuTq4dIuce3i8haJOyyyTDAWpOeR8=";
+    sha256 = "sha256-vexJg/RGdc3TZTOhjY0oe9GJ1sgobNWaISyBG3EF12g=";
   };
 
   executable = "bb";
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index 7551c15649e67..a98a06118550c 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -14,12 +14,12 @@
 assert withGmp -> gmp != null;
 
 stdenv.mkDerivation rec {
-  version = "4.65";
+  version = "5.0";
   pname = "glpk";
 
   src = fetchurl {
     url = "mirror://gnu/glpk/${pname}-${version}.tar.gz";
-    sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2";
+    sha256 = "sha256-ShAT7rtQ9yj8YBvdgzsLKHAzPDs+WoFu66kh2VvsbxU=";
   };
 
   buildInputs =
@@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
     # https://trac.sagemath.org/ticket/20710#comment:18
     (fetchpatch {
       name = "error_recovery.patch";
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
-      sha256 = "0z99z9gd31apb6x5n5n26411qzx0ma3s6dnznc4x61x86bhq31qf";
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=d3c1f607e32f964bf0cab877a63767c86fd00266";
+      sha256 = "sha256-2hNtUEoGTFt3JgUvLH3tPWnz+DZcXNhjXzS+/V89toA=";
     })
   ];
 
diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix
index ffe534ede4af2..b29b64c2a7577 100644
--- a/pkgs/development/libraries/hidapi/default.nix
+++ b/pkgs/development/libraries/hidapi/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hidapi";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "libusb";
     repo = "hidapi";
     rev = "${pname}-${version}";
-    sha256 = "sha256-zSAhnvnDI3+q8VwZ8fIx/YmvwTpL87PBJ2C1mTmD7Ko=";
+    sha256 = "sha256-SMhlcB7LcViC6UFVYACjunxsGkvSOKC3mbLBH4XQSzM=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix
index d4712efd6f1e1..19efea263c07d 100644
--- a/pkgs/development/libraries/libagar/libagar_test.nix
+++ b/pkgs/development/libraries/libagar/libagar_test.nix
@@ -7,6 +7,12 @@ stdenv.mkDerivation {
 
   sourceRoot = "agar-1.5.0/tests";
 
+  # Workaround build failure on -fno-common toolchains:
+  #   ld: textdlg.o:(.bss+0x0): multiple definition of `someString';
+  #     configsettings.o:(.bss+0x0): first defined here
+  # TODO: the workaround can be removed once nixpkgs updates to 1.6.0.
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
   preConfigure = ''
     substituteInPlace configure.in \
       --replace '_BSD_SOURCE' '_DEFAULT_SOURCE'
diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix
index a8915e92e58a5..db7db4cce626e 100644
--- a/pkgs/development/libraries/libdeltachat/default.nix
+++ b/pkgs/development/libraries/libdeltachat/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.85.0";
+  version = "1.86.0";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-core-rust";
     rev = version;
-    hash = "sha256-bgx1j2ESAv9cRe3Iv6nYOS7bUAQcXj3Ta4rAC800Nf8=";
+    hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0=";
   };
 
   patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-7ZdN/7CKFuFOIReM7BkMsO/E2lPyDnl4ssPhK5BPLh8=";
+    hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix
index 7f9c4d6ac94b2..531ff8584facc 100644
--- a/pkgs/development/libraries/libmediaart/default.nix
+++ b/pkgs/development/libraries/libmediaart/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libmediaart";
-  version = "1.9.5";
+  version = "1.9.6";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1mlw1qgj8nkd9ll6b6h54r1gfdy3zp8a8xqz7qfyfaj85jjgbph7";
+    sha256 = "w7xQJdfbOAWH+cjrgAxhH2taFta0t4/P+T9ih2pnfxc=";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix
index 66134eaffe094..e136fc1a5585c 100644
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ b/pkgs/development/libraries/libnftnl/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, pkg-config, libmnl }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.1";
+  version = "1.2.2";
   pname = "libnftnl";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
-    sha256 = "0z4khm2mnys9mcl8ckwf19cw20jgrv8650nfncy3xcgs2k2aa23m";
+    hash = "sha256-nvwAT50VkY1o+emOGU1V4DAWjzO7Z8PnpUW3QMntbQo=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index a1dd23357decd..894aee90ff4b8 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-olLgD8WA3rIdoNqMCqA7jDHoRAuESMi5gUP6tHfTIwU=";
   };
 
-  outputs = [ "out" "dev" "devdoc" ];
+  outputs = [ "out" "dev" ]
+    ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index d83a4e0a707a6..da3bc925c820c 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -1,5 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkg-config, doxygen,
-  autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }:
+{ lib, stdenv, fetchFromGitHub
+, mpfr, gnuplot
+, readline
+, libxml2, curl
+, intltool, libiconv, icu, gettext
+, pkg-config, doxygen, autoreconfHook, buildPackages
+}:
 
 stdenv.mkDerivation rec {
   pname = "libqalculate";
@@ -16,6 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ intltool pkg-config autoreconfHook doxygen ];
   buildInputs = [ curl gettext libiconv readline ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
   propagatedBuildInputs = [ libxml2 mpfr icu ];
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/development/libraries/libzim/default.nix
index 5191da60ce261..3f290d4ffa3ca 100644
--- a/pkgs/development/libraries/libzim/default.nix
+++ b/pkgs/development/libraries/libzim/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libzim";
-  version = "7.2.0";
+  version = "7.2.2";
 
   src = fetchFromGitHub {
     owner = "openzim";
     repo = pname;
     rev = version;
-    sha256 = "sha256-H4YUAbH4X6oJIZyhI23LemngtOtKNrHHl3KSU1ilAmo=";
+    sha256 = "sha256-AEhhjinnnMA4NbYL7NVHYeRZX/zfNiidbY/VeFjZuQs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
index ca328e2bac46a..77ad6e201a32b 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -53,6 +53,11 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS = [ "-Wno-return-type" ];
 
+  # Workaround build failure on -fno-common toolchains:
+  # ld: libpacklib.a(kedit.o):kuip/klink1.h:11: multiple definition of `klnkaddr';
+  #   libzftplib.a(zftpcdf.o):zftp/zftpcdf.c:155: first defined here
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
   makeFlags = [
     "FORTRANOPTIONS=$(FFLAGS)"
     "CCOPTIONS=$(NIX_CFLAGS)"
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index f5613d493680e..17a1717812fe0 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -35,13 +35,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "poppler-${suffix}";
-  version = "22.04.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
+  version = "22.06.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
-    sha256 = "sha256-gT+0uQ572mPfUyBcVIYCuucoiHpg9ASKrk29mxkn3v8=";
+    sha256 = "sha256-oPmqo5GLrXgQOfwwemNWUqFNGzkc1Vm2bt7Evtujxdc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/sptk/default.nix b/pkgs/development/libraries/sptk/default.nix
new file mode 100644
index 0000000000000..6b62b831cb98c
--- /dev/null
+++ b/pkgs/development/libraries/sptk/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, stdenv
+, cmake
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "sptk";
+  version = "4.0";
+
+  src = fetchFromGitHub {
+    owner = "sp-nitech";
+    repo = "SPTK";
+    rev = "v${version}";
+    hash = "sha256-Be3Pbg+vt/P3FplZN7yBL+HVq/BmzaBcwKOBsbH7r9g=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  doCheck = true;
+
+  meta = with lib; {
+    changelog = "https://github.com/sp-nitech/SPTK/releases/tag/v${version}";
+    description = "Suite of speech signal processing tools";
+    homepage = "https://github.com/sp-nitech/SPTK";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 10600b44db375..336793be1f6e3 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -481,31 +481,31 @@ let
         sha512 = "+D3xnPD5985iphgAqgUerBDs371a2WzzoEVi7eHJUMMsP/gEnSTdSH0HNxsqhYv6CW4EdKtvDAQdAwA1VtCf2A==";
       };
     };
-    "@aws-sdk/client-s3-3.100.0" = {
+    "@aws-sdk/client-s3-3.105.0" = {
       name = "_at_aws-sdk_slash_client-s3";
       packageName = "@aws-sdk/client-s3";
-      version = "3.100.0";
+      version = "3.105.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.100.0.tgz";
-        sha512 = "UmgFdJabWtiUS4dWsC3kZ+ZMvH5QUUbDnLS8pT12duwLGt+xlWPn3PUkV8kL6qjG6XePLUgCqFTLjDD4tsTZNg==";
+        url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.105.0.tgz";
+        sha512 = "aYHUW8r+YrMPULRBKaFnEKMeWiWf4vE7qEOzRdyucSViyl9ZGqlbxBBAFVRlfGtIRb783DDeeR2j94ruGqMP5Q==";
       };
     };
-    "@aws-sdk/client-sso-3.100.0" = {
+    "@aws-sdk/client-sso-3.105.0" = {
       name = "_at_aws-sdk_slash_client-sso";
       packageName = "@aws-sdk/client-sso";
-      version = "3.100.0";
+      version = "3.105.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.100.0.tgz";
-        sha512 = "nmBRUO5QfQ2IO8fHb37p8HT3n1ZooPb3sfTQejrpFH9Eq82VEOatIGt6yH3yTQ8+mhbabEhV5aY2wt/0D7wGVA==";
+        url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.105.0.tgz";
+        sha512 = "Lp92m3ayckXpAElpgZ8E6JEGB7B5sBsjCkTmYeZq3uVXF8uCVMQFmFo4v2yndLQ3NFCEE8qN2PE8obLDOAsNIA==";
       };
     };
-    "@aws-sdk/client-sts-3.100.0" = {
+    "@aws-sdk/client-sts-3.105.0" = {
       name = "_at_aws-sdk_slash_client-sts";
       packageName = "@aws-sdk/client-sts";
-      version = "3.100.0";
+      version = "3.105.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.100.0.tgz";
-        sha512 = "WHy0e6COf6/LfMsYqG9H4SGaQRDjuckMtwOLtu6cYr4cro3bOU5pNuyEjAdUHCpuhZgiE6gkZozhTlxMJqIuRQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.105.0.tgz";
+        sha512 = "ZZyw5hu0Ip/jHc9umpWTnWNUHV270fS25LB7fecUwQeC/cok+EvaG5QGBVI5t0GSUynEIC0sNlG9SDc1wLTZPA==";
       };
     };
     "@aws-sdk/config-resolver-3.80.0" = {
@@ -535,22 +535,22 @@ let
         sha512 = "BHopP+gaovTYj+4tSrwCk8NNCR48gE9CWmpIOLkP9ell0gOL81Qh7aCEiIK0BZBZkccv1s16cYq1MSZZGS7PEQ==";
       };
     };
-    "@aws-sdk/credential-provider-ini-3.100.0" = {
+    "@aws-sdk/credential-provider-ini-3.105.0" = {
       name = "_at_aws-sdk_slash_credential-provider-ini";
       packageName = "@aws-sdk/credential-provider-ini";
-      version = "3.100.0";
+      version = "3.105.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.100.0.tgz";
-        sha512 = "2pCtth/Iv4mATRwb2g1nJdd9TolMyhTnhcskopukFvzp13VS5cgtz0hgYmJNnztTF8lpKJhJaidtKS5JJTWnHg==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.105.0.tgz";
+        sha512 = "qYEUciSpeIBkIDt3ljWkVphG7OUIvQOMklYjtEYjYGFjHX7GuyNbV0NI0T6W/edV0aU/a/KpBi0uKd93Gi43Lg==";
       };
     };
-    "@aws-sdk/credential-provider-node-3.100.0" = {
+    "@aws-sdk/credential-provider-node-3.105.0" = {
       name = "_at_aws-sdk_slash_credential-provider-node";
       packageName = "@aws-sdk/credential-provider-node";
-      version = "3.100.0";
+      version = "3.105.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.100.0.tgz";
-        sha512 = "PMIPnn/dhv9tlWR0qXnANJpTumujWfhKnLAsV3BUqB1K9IzWqz/zXjCT0jcSUTY8X/VkSuehtBdCKvOOM5mMqg==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.105.0.tgz";
+        sha512 = "A781wWAcghqw21Vddj2jZo1BeKDyqqMcBYIuXJxjwK4fq+IBxlnI6De1vzv3H7QxosDyDS4mKWGW2FqUQI8ofg==";
       };
     };
     "@aws-sdk/credential-provider-process-3.80.0" = {
@@ -562,13 +562,13 @@ let
         sha512 = "3Ro+kMMyLUJHefOhGc5pOO/ibGcJi8bkj0z/Jtqd5I2Sm1qi7avoztST67/k48KMW1OqPnD/FUqxz5T8B2d+FQ==";
       };
     };
-    "@aws-sdk/credential-provider-sso-3.100.0" = {
+    "@aws-sdk/credential-provider-sso-3.105.0" = {
       name = "_at_aws-sdk_slash_credential-provider-sso";
       packageName = "@aws-sdk/credential-provider-sso";
-      version = "3.100.0";
+      version = "3.105.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.100.0.tgz";
-        sha512 = "DwJvrh77vBJ1/fS9z0i2QuIvSk4pATA4DH8AEWoQ8LQX97tp3es7gZV5Wu93wFsEyIYC8penz6pNVq5QajMk2A==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.105.0.tgz";
+        sha512 = "oHvMZ0uHfOzFkepX29GPXUrI7HTQklQl01laVxEdCNtgZGfos9gjz+xPUDBCaoiEzM+xF9uu4wtaQ15c1bCclQ==";
       };
     };
     "@aws-sdk/credential-provider-web-identity-3.78.0" = {
@@ -760,6 +760,15 @@ let
         sha512 = "GBhwxNjhCJUIeQQDaGasX/C23Jay77al2vRyGwmxf8no0DdFsa4J1Ik6/2hhIqkqko+WM4SpCnpZrY4MtnxNvA==";
       };
     };
+    "@aws-sdk/middleware-recursion-detection-3.105.0" = {
+      name = "_at_aws-sdk_slash_middleware-recursion-detection";
+      packageName = "@aws-sdk/middleware-recursion-detection";
+      version = "3.105.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.105.0.tgz";
+        sha512 = "KksW6cBQ3BWTNlN+4eMW8//oqsuKLYJsSUsdSLQb7MFBHnw+6r8GS9WXMYN0IBswlhdYi9fv83zlKDTV21ZL+g==";
+      };
+    };
     "@aws-sdk/middleware-retry-3.80.0" = {
       name = "_at_aws-sdk_slash_middleware-retry";
       packageName = "@aws-sdk/middleware-retry";
@@ -769,13 +778,13 @@ let
         sha512 = "CTk+tA4+WMUNOcUfR6UQrkhwvPYFpnMsQ1vuHlpLFOGG3nCqywA2hueLMRQmVcDXzP0sGeygce6dzRI9dJB/GA==";
       };
     };
-    "@aws-sdk/middleware-sdk-s3-3.86.0" = {
+    "@aws-sdk/middleware-sdk-s3-3.105.0" = {
       name = "_at_aws-sdk_slash_middleware-sdk-s3";
       packageName = "@aws-sdk/middleware-sdk-s3";
-      version = "3.86.0";
+      version = "3.105.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.86.0.tgz";
-        sha512 = "1L9q8iJXy/KNyVR8JRs4DZ5SJse6nJPiK4AR8c2xF5FWHdGoFaLcdqpg2/TLB1kpdcfGgNp96uCROxh+IPXtDQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.105.0.tgz";
+        sha512 = "GI2vYiboOc3GNpjNUtGyBVi9R6hwLhjId2PPqchyiRntlzz9CfF4F2qMjH/Vv0kE383hT8TN+5kGmaVSmeJqmg==";
       };
     };
     "@aws-sdk/middleware-sdk-sts-3.78.0" = {
@@ -886,13 +895,13 @@ let
         sha512 = "csaH8YTyN+KMNczeK6fBS8l7iJaqcQcKOIbpQFg5upX4Ly5A56HJn4sVQhY1LSgfSk4xRsNfMy5mu6BlsIiaXA==";
       };
     };
-    "@aws-sdk/s3-request-presigner-3.100.0" = {
+    "@aws-sdk/s3-request-presigner-3.105.0" = {
       name = "_at_aws-sdk_slash_s3-request-presigner";
       packageName = "@aws-sdk/s3-request-presigner";
-      version = "3.100.0";
+      version = "3.105.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.100.0.tgz";
-        sha512 = "32j9o2ChP2pzsua5+Ci9XFKBsFXxlE5muVD9CSpEG9UfUieORAvXsZVChu86IWBFR2nQRm0vebrwJC2tKsgu1A==";
+        url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.105.0.tgz";
+        sha512 = "qnHScqU8PgY5mB1QmhkiRM6sz++RmUJKqzVjulpEv5iYzk3ey+eCf+4m3mDj7dx6Siw+ThAwTxVzkilnJNvJZg==";
       };
     };
     "@aws-sdk/service-error-classification-3.78.0" = {
@@ -3685,22 +3694,22 @@ let
         sha512 = "na1+hTRDg2xHSu3Vrr8ITrQpoFChOCSpqTYjLvdRD081p8o61hk9DeaXkUWr8E+2TZ06BXi2t0VyL4wfrYLU8Q==";
       };
     };
-    "@fluentui/font-icons-mdl2-8.4.0" = {
+    "@fluentui/font-icons-mdl2-8.4.1" = {
       name = "_at_fluentui_slash_font-icons-mdl2";
       packageName = "@fluentui/font-icons-mdl2";
-      version = "8.4.0";
+      version = "8.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.4.0.tgz";
-        sha512 = "AV3XEOXfMwpXPdK+MJhJqCd9F9SLHTwsLEgP7Veebcg6cHxnYLcQME/QjwOjlVSdApg7pa1anJ0Fmjy4P85s5Q==";
+        url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.4.1.tgz";
+        sha512 = "nKVb7Jd52EQYASNHNtOVXT01SIzB4MoCPdKxXkwU1rvLe5u6RzAd4UHxjes09/KuvKrIG/Ixo0nv5mb+6NN2sw==";
       };
     };
-    "@fluentui/foundation-legacy-8.2.7" = {
+    "@fluentui/foundation-legacy-8.2.8" = {
       name = "_at_fluentui_slash_foundation-legacy";
       packageName = "@fluentui/foundation-legacy";
-      version = "8.2.7";
+      version = "8.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.7.tgz";
-        sha512 = "/ehXnwMj2UkjJZc2pdhgBtmpEs4sghxbw2avm4vybFMeLpqyF7stXAGou3/v1ifjMqbYkSYo06uG/kk1B8vqSw==";
+        url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.8.tgz";
+        sha512 = "9K99k/Cexcn6+U5bbJe8sojd3U6/WID7zmqyDhlVfQDL5napa4Myv9049ToUQ6IUnDJSTZOnuHrWMoK5maUOdw==";
       };
     };
     "@fluentui/keyboard-key-0.4.1" = {
@@ -3721,22 +3730,22 @@ let
         sha512 = "ax8izl48JJuymEuvJzvNH22GHmpPEWLP+h4doyFZ/9IhR9AEycNc2rGBthZ5FiuktnFgusNag1AHr/WCj5pttw==";
       };
     };
-    "@fluentui/react-8.72.1" = {
+    "@fluentui/react-8.72.2" = {
       name = "_at_fluentui_slash_react";
       packageName = "@fluentui/react";
-      version = "8.72.1";
+      version = "8.72.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react/-/react-8.72.1.tgz";
-        sha512 = "Uumnx5JzeSgirc/cfgXlgx95FExid2bgOp4n2X5YKViHwlqGrI5FTfcMQ47W8iwjK4RKBWlu+3yiYajlQ3kYAQ==";
+        url = "https://registry.npmjs.org/@fluentui/react/-/react-8.72.2.tgz";
+        sha512 = "/Wn2qIhHl5fJ7zhTNURbs3KzgXe3NuJOBirpZUd/RkLaWxEgb+1+ylw9ijae4Ll65LmEC3Qyu98o+ALxVS83Ww==";
       };
     };
-    "@fluentui/react-focus-8.6.0" = {
+    "@fluentui/react-focus-8.6.1" = {
       name = "_at_fluentui_slash_react-focus";
       packageName = "@fluentui/react-focus";
-      version = "8.6.0";
+      version = "8.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.6.0.tgz";
-        sha512 = "mQWAHZHmKd8hlUqNeagbIYMANECtFVPyizmDl1GIlhpT6bP7LR8xSf5oZ+Yv52tjhWjY4KWfivH9+fiBEUh5Wg==";
+        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.6.1.tgz";
+        sha512 = "0DasQ31xEqND3OMd+svWto68+U5p6Z8Z+U92jZAlahfh5A6dRcDixu42hQkETmYg8oYaF0zMsVHAZKPx5EVy7w==";
       };
     };
     "@fluentui/react-hooks-8.5.5" = {
@@ -3775,13 +3784,13 @@ let
         sha512 = "SZMP2P7RSUuVHYWIBcnlxYruvchlnoqensCvoaGeiH0FisO7etwJdFwKNegV7WEA9uS5ZOK3qVmyvD71DxaSng==";
       };
     };
-    "@fluentui/style-utilities-8.6.7" = {
+    "@fluentui/style-utilities-8.7.0" = {
       name = "_at_fluentui_slash_style-utilities";
       packageName = "@fluentui/style-utilities";
-      version = "8.6.7";
+      version = "8.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.6.7.tgz";
-        sha512 = "FVMXM9cuCuEVWvyJLE7rXVmbIvnY6lmyTbJcOwiyZMmQbQkggZnuJPJhDSCHjDW1DiVhEKjqBqOoiV7WqnDvMQ==";
+        url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.7.0.tgz";
+        sha512 = "coba9Xj85nlAtToSCV0dD5sHq4BSQk/pUD9y4ZfNhm7vAlju5caQFhpwCs+qsZQ2OIkkpeF2YzJ/SHjNrMECqw==";
       };
     };
     "@fluentui/theme-2.6.6" = {
@@ -3919,13 +3928,13 @@ let
         sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg==";
       };
     };
-    "@graphql-tools/batch-execute-8.4.9" = {
+    "@graphql-tools/batch-execute-8.4.10" = {
       name = "_at_graphql-tools_slash_batch-execute";
       packageName = "@graphql-tools/batch-execute";
-      version = "8.4.9";
+      version = "8.4.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.4.9.tgz";
-        sha512 = "McfAPdxP4mRGqm+NKQ0AN8aZXG7AnCcKqQxu5k0RP8Llg/81rImHqgBPO8L8GUW8E0Sx+PzeXmipHjS0MceN2Q==";
+        url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.4.10.tgz";
+        sha512 = "rugHElhKYZgb6w3mBuNdgjMIo0LW5QbwIwJ1bc9VKWh51dCQmNwJS1Nx8qFWUjhmjVJWbvKWqYb6Z7wTGnOc3g==";
       };
     };
     "@graphql-tools/delegate-7.1.5" = {
@@ -3937,13 +3946,13 @@ let
         sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g==";
       };
     };
-    "@graphql-tools/delegate-8.7.10" = {
+    "@graphql-tools/delegate-8.7.11" = {
       name = "_at_graphql-tools_slash_delegate";
       packageName = "@graphql-tools/delegate";
-      version = "8.7.10";
+      version = "8.7.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.10.tgz";
-        sha512 = "gzkXErvQEuCQF3Fn6ImADeuVHgiqIVE64Va4p3LMK2D/gDwwLeTVc7jY5rjd9oZwxz6JkVD77inbFjA/Nnqlxg==";
+        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.11.tgz";
+        sha512 = "Rm9ThQHPOz/78OsoB8pZF+8YJm7cHsFMbGa67Q2hLmEAf2xLmNKvsfKfnxYuLnfmpdRxdSmab/ecHZ0qW/DS5w==";
       };
     };
     "@graphql-tools/graphql-file-loader-6.2.7" = {
@@ -3955,22 +3964,22 @@ let
         sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ==";
       };
     };
-    "@graphql-tools/graphql-file-loader-7.3.14" = {
+    "@graphql-tools/graphql-file-loader-7.3.15" = {
       name = "_at_graphql-tools_slash_graphql-file-loader";
       packageName = "@graphql-tools/graphql-file-loader";
-      version = "7.3.14";
+      version = "7.3.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.14.tgz";
-        sha512 = "BuzHyfml0SMxJuzHGO1Bl9kx6e6qrAyy47KNKOOpot3E0YYnQL53zCYCDQJ+sYjZIrE7Qi4wnMVHb44+juqN+g==";
+        url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.15.tgz";
+        sha512 = "Sw9XadW3bxH3ACNXE8Tsjh+BVedRCJTuRn3NfO//zOYQZiC3HDTzq9MvnW1a00SmPCXg47rxQpq9L3bdLX0Ohg==";
       };
     };
-    "@graphql-tools/import-6.6.16" = {
+    "@graphql-tools/import-6.6.17" = {
       name = "_at_graphql-tools_slash_import";
       packageName = "@graphql-tools/import";
-      version = "6.6.16";
+      version = "6.6.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.16.tgz";
-        sha512 = "IKQMKysNL2Pq+aFpR28N9F7jGAUSRYS9q0RRwl9Ocr4UofqQDmUboECM9BiYUDmT3/h7dQTimb0tdNqHP+QCjA==";
+        url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.17.tgz";
+        sha512 = "rnKT2ZaFM+IbSFE0iOGG5sqdaDDv/XHHH43VIpV4ozryKoK9re3qrhEgfDOHaW47zMLGKrHLPCC/QGf0IpJquw==";
       };
     };
     "@graphql-tools/json-file-loader-6.2.6" = {
@@ -3982,13 +3991,13 @@ let
         sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA==";
       };
     };
-    "@graphql-tools/json-file-loader-7.3.14" = {
+    "@graphql-tools/json-file-loader-7.3.15" = {
       name = "_at_graphql-tools_slash_json-file-loader";
       packageName = "@graphql-tools/json-file-loader";
-      version = "7.3.14";
+      version = "7.3.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.14.tgz";
-        sha512 = "3/KJ52gTQrbF1HvUlN3/yKkA2ImiavgF2LGqsd+P4KmWt1nWpsu30M5VboECmLyLGjv7CQkM2ISE8GXy9IdzhA==";
+        url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.15.tgz";
+        sha512 = "aPxIWBahYVPAVeGxzAsoEsLm+KVfxPcx/wIUZZX8+02YYmuICNT0TeSAk6Q6iuKMJCS7gtU5eYVdEM7qzC2EfA==";
       };
     };
     "@graphql-tools/load-6.2.4" = {
@@ -4000,13 +4009,13 @@ let
         sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg==";
       };
     };
-    "@graphql-tools/load-7.5.13" = {
+    "@graphql-tools/load-7.5.14" = {
       name = "_at_graphql-tools_slash_load";
       packageName = "@graphql-tools/load";
-      version = "7.5.13";
+      version = "7.5.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.13.tgz";
-        sha512 = "GQ/RyVZUUVfxJ8jEg2sU0WK5i5VR7WLxMutbIvkYP3dcf1QpXSmQvCDP97smfJA34SYlkGUTP/B3PagfnAmhqQ==";
+        url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.14.tgz";
+        sha512 = "K7H4tKKGFliRyjbG92KCuv2fS2pHlRxkcNcDtuEQlA8dhthS9qGB14Ld4eHDuRq1RvHTS6mye5NE1alyY44K9g==";
       };
     };
     "@graphql-tools/merge-6.2.17" = {
@@ -4018,13 +4027,13 @@ let
         sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow==";
       };
     };
-    "@graphql-tools/merge-8.2.13" = {
+    "@graphql-tools/merge-8.2.14" = {
       name = "_at_graphql-tools_slash_merge";
       packageName = "@graphql-tools/merge";
-      version = "8.2.13";
+      version = "8.2.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.13.tgz";
-        sha512 = "lhzjCa6wCthOYl7B6UzER3SGjU2WjSGnW0WGr8giMYsrtf6G3vIRotMcSVMlhDzyyMIOn7uPULOUt3/kaJ/rIA==";
+        url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.14.tgz";
+        sha512 = "od6lTF732nwPX91G79eiJf+dyRBHxCaKe7QL4IYeH4d1k+NYqx/ihYpFJNjDaqxmpHH92Hr+TxsP9SYRK3/QKg==";
       };
     };
     "@graphql-tools/schema-7.1.5" = {
@@ -4036,13 +4045,13 @@ let
         sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA==";
       };
     };
-    "@graphql-tools/schema-8.3.13" = {
+    "@graphql-tools/schema-8.3.14" = {
       name = "_at_graphql-tools_slash_schema";
       packageName = "@graphql-tools/schema";
-      version = "8.3.13";
+      version = "8.3.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.13.tgz";
-        sha512 = "e+bx1VHj1i5v4HmhCYCar0lqdoLmkRi/CfV07rTqHR6CRDbIb/S/qDCajHLt7FCovQ5ozlI5sRVbBhzfq5H0PQ==";
+        url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.14.tgz";
+        sha512 = "ntA4pKwyyPHFFKcIw17FfqGZAiTNZl0tHieQpPIkN5fPc4oHcXOfaj1vBjtIC/Qn6H7XBBu3l2kMA8FpobdxTQ==";
       };
     };
     "@graphql-tools/url-loader-6.10.1" = {
@@ -4054,13 +4063,13 @@ let
         sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw==";
       };
     };
-    "@graphql-tools/url-loader-7.9.23" = {
+    "@graphql-tools/url-loader-7.9.24" = {
       name = "_at_graphql-tools_slash_url-loader";
       packageName = "@graphql-tools/url-loader";
-      version = "7.9.23";
+      version = "7.9.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.23.tgz";
-        sha512 = "6IYn5bIaqlWHQksvuPCEPqr8pIuuXBaF8/XbcVdT7otPkyGIQjTxoOkLiWIQj5682aEgZ9Ky21KKcp7qOTWmDQ==";
+        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.24.tgz";
+        sha512 = "DpIP9EVZSyhSJgX3P2/ka7lzmpDLqOQ4hDkt1oCBcRDzkeyMOKl5XQAg5/X6AaIonhss+/el0ELqTVOHt9zDxQ==";
       };
     };
     "@graphql-tools/utils-6.2.4" = {
@@ -4090,13 +4099,13 @@ let
         sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ==";
       };
     };
-    "@graphql-tools/utils-8.6.12" = {
+    "@graphql-tools/utils-8.6.13" = {
       name = "_at_graphql-tools_slash_utils";
       packageName = "@graphql-tools/utils";
-      version = "8.6.12";
+      version = "8.6.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.12.tgz";
-        sha512 = "WQ91O40RC+UJgZ9K+IzevSf8oolR1QE+WQ21Oyc2fgDYYiqT0eSf+HVyhZr/8x9rVjn3N9HeqCsywbdmbljg0w==";
+        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.13.tgz";
+        sha512 = "FiVqrQzj4cgz0HcZ3CxUs8NtBGPZFpmsVyIgwmL6YCwIhjJQnT72h8G3/vk5zVfjfesht85YGp0inWWuoCKWzg==";
       };
     };
     "@graphql-tools/wrap-7.0.8" = {
@@ -4108,22 +4117,13 @@ let
         sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg==";
       };
     };
-    "@graphql-tools/wrap-8.4.19" = {
+    "@graphql-tools/wrap-8.4.20" = {
       name = "_at_graphql-tools_slash_wrap";
       packageName = "@graphql-tools/wrap";
-      version = "8.4.19";
+      version = "8.4.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.19.tgz";
-        sha512 = "S+1zh+9+4MK3HSQMPjwerLybMtD8LCfte/wsZK4JgYhls2INrLJZEMquMxhQTma4jkKBL48GZtESIP0hFTP4Ow==";
-      };
-    };
-    "@grpc/grpc-js-1.5.7" = {
-      name = "_at_grpc_slash_grpc-js";
-      packageName = "@grpc/grpc-js";
-      version = "1.5.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.7.tgz";
-        sha512 = "RAlSbZ9LXo0wNoHKeUlwP9dtGgVBDUbnBKFpfAv5iSqMG4qWz9um2yLH215+Wow1I48etIa1QMS+WAGmsE/7HQ==";
+        url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.20.tgz";
+        sha512 = "qzlrOg9ddaA+30OdG8NU/zDPV2sbJ4Rvool+Zf0nLVRqkAUP/1uxXTQBLgEJKO1xxTlhJ+27FCJ42lG6JG9ZrA==";
       };
     };
     "@grpc/grpc-js-1.6.1" = {
@@ -4909,544 +4909,544 @@ let
         sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==";
       };
     };
-    "@lerna/add-5.0.0" = {
+    "@lerna/add-5.1.0" = {
       name = "_at_lerna_slash_add";
       packageName = "@lerna/add";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/add/-/add-5.0.0.tgz";
-        sha512 = "KdIOQL+88iHU9zuAU8Be1AL4cOVmm77nlckylsNaVVTiomNipr/h7lStiBO52BoMkwKzNwOH6He5HGY0Yo7s2w==";
+        url = "https://registry.npmjs.org/@lerna/add/-/add-5.1.0.tgz";
+        sha512 = "JK6ezKNQCfXnuHuxd63HcFbgVzfXMcyC0HFKCU5juPaIvqVCXBFR2xNy4gYcMPE9dZS9THT719hf3c0RgWMl0w==";
       };
     };
-    "@lerna/bootstrap-5.0.0" = {
+    "@lerna/bootstrap-5.1.0" = {
       name = "_at_lerna_slash_bootstrap";
       packageName = "@lerna/bootstrap";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-5.0.0.tgz";
-        sha512 = "2m1BxKbYwDABy+uE/Da3EQM61R58bI3YQ0o1rsFQq1u0ltL9CJxw1o0lMg84hwMsBb4D+kLIXLqetYlLVgbr0Q==";
+        url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-5.1.0.tgz";
+        sha512 = "TAIoRLiHfmFB1wZlHQ+YkkSaniqWshcxz2703U5iwrCeSOtWRE5+4G7d0wvNAXTLou8Azxjx+gXzU32IHS7k1g==";
       };
     };
-    "@lerna/changed-5.0.0" = {
+    "@lerna/changed-5.1.0" = {
       name = "_at_lerna_slash_changed";
       packageName = "@lerna/changed";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/changed/-/changed-5.0.0.tgz";
-        sha512 = "A24MHipPGODmzQBH1uIMPPUUOc1Zm7Qe/eSYzm52bFHtVxWH0nIVXfunadoMX32NhzKQH3Sw8X2rWHPQSRoUvA==";
+        url = "https://registry.npmjs.org/@lerna/changed/-/changed-5.1.0.tgz";
+        sha512 = "u6yHa/CLG9rQd0+TZLNSYTjiDIqN6hCfLbXrnT3oVsGmu2Agp/uSGvMS9SXsQEmztQLevOEZ/Rl7LCPVBa21dg==";
       };
     };
-    "@lerna/check-working-tree-5.0.0" = {
+    "@lerna/check-working-tree-5.1.0" = {
       name = "_at_lerna_slash_check-working-tree";
       packageName = "@lerna/check-working-tree";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-5.0.0.tgz";
-        sha512 = "PnUMdpT2qS4o+vs+7l5fFIizstGdqSkhLG+Z9ZiY5OMtnGd+pmAFQFlbLSZSmdvQSOSobl9fhB1St8qhPD60xQ==";
+        url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-5.1.0.tgz";
+        sha512 = "Vd6Roa0TIXZVXXplx/EP/A4QtHFeCFHbk2MbK7t7CWiCK9pEU9nhF/j6SJhuPes3z1mSOn/FjaN2JjShvJII1w==";
       };
     };
-    "@lerna/child-process-5.0.0" = {
+    "@lerna/child-process-5.1.0" = {
       name = "_at_lerna_slash_child-process";
       packageName = "@lerna/child-process";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-5.0.0.tgz";
-        sha512 = "cFVNkedrlU8XTt15EvUtQ84hqtV4oToQW/elKNv//mhCz06HY8Y+Ia6XevK2zrIhZjS6DT576F/7SmTk3vnpmg==";
+        url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-5.1.0.tgz";
+        sha512 = "BkPkeFpApuPYBYvnqLjdY3/qQV/6zouchrtMUnaQ3N8pdkU/NkSDEeBtl4hR5Coyb1jGjpYt63IrrD4i4Snyvg==";
       };
     };
-    "@lerna/clean-5.0.0" = {
+    "@lerna/clean-5.1.0" = {
       name = "_at_lerna_slash_clean";
       packageName = "@lerna/clean";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/clean/-/clean-5.0.0.tgz";
-        sha512 = "7B+0Nx6MEPmCfnEa1JFyZwJsC7qlGrikWXyLglLb/wcbapYVsuDauOl9AT1iOFoXKw82P77HWYUKWeD9DQgw/w==";
+        url = "https://registry.npmjs.org/@lerna/clean/-/clean-5.1.0.tgz";
+        sha512 = "hX0Y6cumy3Gn21WriFUEJgznbfaZQQYrOQJDu5FOd9EShKb0gfWpX8l/DmnDfcQoIXJSYV85oHPuB619sdZwUA==";
       };
     };
-    "@lerna/cli-5.0.0" = {
+    "@lerna/cli-5.1.0" = {
       name = "_at_lerna_slash_cli";
       packageName = "@lerna/cli";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/cli/-/cli-5.0.0.tgz";
-        sha512 = "g8Nifko8XNySOl8u2molSHVl+fk/E1e5FSn/W2ekeijmc3ezktp+xbPWofNq71N/d297+KPQpLBfwzXSo9ufIQ==";
+        url = "https://registry.npmjs.org/@lerna/cli/-/cli-5.1.0.tgz";
+        sha512 = "Mwod1swfQvYat60S2/otQVe64WQMUtdnNz/GaKoIbyIekqUC0Ozo6Ui0Qv9UdmowADdIRpHPEb3tK1i8Ze7rew==";
       };
     };
-    "@lerna/collect-uncommitted-5.0.0" = {
+    "@lerna/collect-uncommitted-5.1.0" = {
       name = "_at_lerna_slash_collect-uncommitted";
       packageName = "@lerna/collect-uncommitted";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-5.0.0.tgz";
-        sha512 = "mga/2S9rK0TP5UCulWiCTrC/uKaiIlOro1n8R3oCw6eRw9eupCSRx5zGI7pdh8CPD82MDL7w0a6OTep3WBSBVA==";
+        url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-5.1.0.tgz";
+        sha512 = "NTE0z3mRILv/NY5iWUCbXt0W3LWYr5oBHXPRDwYOtb4K3c7WXHIZ6v4ZtsGFG++K+74Ak1sZj8wCQjntUklx9w==";
       };
     };
-    "@lerna/collect-updates-5.0.0" = {
+    "@lerna/collect-updates-5.1.0" = {
       name = "_at_lerna_slash_collect-updates";
       packageName = "@lerna/collect-updates";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-5.0.0.tgz";
-        sha512 = "X82i8SVgBXLCk8vbKWfQPRLTAXROCANL8Z/bU1l6n7yycsHKdjrrlNi1+KprFdfRsMvSm10R4qPNcl9jgsp/IA==";
+        url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-5.1.0.tgz";
+        sha512 = "MKRTTZpBNeMsSp2FAjbczGN08ni2Cxrb4Y+RRX3FFNi46T+hfugkWWJraXRXJ+D4HNt6IsndxK0/5J6G3sIl9A==";
       };
     };
-    "@lerna/command-5.0.0" = {
+    "@lerna/command-5.1.0" = {
       name = "_at_lerna_slash_command";
       packageName = "@lerna/command";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/command/-/command-5.0.0.tgz";
-        sha512 = "j7/apU5d/nhSc1qIZgcV03KyO5jz3y7cwSum3IuK8/XF6rKwt3FVnbue1V3l9sJ6IRJjsRGKyViB1IdP5nSX4Q==";
+        url = "https://registry.npmjs.org/@lerna/command/-/command-5.1.0.tgz";
+        sha512 = "lPHtnvjsYVEqMQ06YjHcSqZrH7jjMPLC9vCo6lkm43QvtLmow5tGzUSt+ZkXJFa5iQp3/Qdzuf3KV2Oq2FAFbw==";
       };
     };
-    "@lerna/conventional-commits-5.0.0" = {
+    "@lerna/conventional-commits-5.1.0" = {
       name = "_at_lerna_slash_conventional-commits";
       packageName = "@lerna/conventional-commits";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-5.0.0.tgz";
-        sha512 = "tUCRTAycDCtSlCEI0hublq4uKHeV0UHpwIb3Fdt6iv2AoTSPBSX/Dwu/6VqguysOSEkkR4M2JCOLvJCl4IMxwg==";
+        url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-5.1.0.tgz";
+        sha512 = "bC0oITKwaAGbM3I7pE3jf5NwwzjUoQH68DC1WAtaJurCtSvvuM00irtz8KqXeWsW9nUtY68gYUuV5btSkEZ4FA==";
       };
     };
-    "@lerna/create-5.0.0" = {
+    "@lerna/create-5.1.0" = {
       name = "_at_lerna_slash_create";
       packageName = "@lerna/create";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/create/-/create-5.0.0.tgz";
-        sha512 = "sdFTVTLOVuhHpzIYhFAwK0Ry3p4d7uMe9ZG/Ii128/pB9kEEfCth+1WBq6mBpYZ5mOLLgxJbWalbiJFl0toQRw==";
+        url = "https://registry.npmjs.org/@lerna/create/-/create-5.1.0.tgz";
+        sha512 = "5xw46aZrAQhJByKMyNs78Nl3SZI6yxqNA12pQR7HWf+2/VX29dxKao6W+4658OQIOw2G148TTadP4G9zRiRKRw==";
       };
     };
-    "@lerna/create-symlink-5.0.0" = {
+    "@lerna/create-symlink-5.1.0" = {
       name = "_at_lerna_slash_create-symlink";
       packageName = "@lerna/create-symlink";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-5.0.0.tgz";
-        sha512 = "nHYNacrh15Y0yEofVlUVu9dhf4JjIn9hY7v7rOUXzUeQ91iXY5Q3PVHkBeRUigyT5CWP5qozZwraCMwp+lDWYg==";
+        url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-5.1.0.tgz";
+        sha512 = "FYCNdgP0xf65CokOyFFI63sAA2MfZbSPyDqRHyIJXkrjLCXIl6NZDsu6ppM2XqczDtawmo9YFPAUGZ2QgfowIQ==";
       };
     };
-    "@lerna/describe-ref-5.0.0" = {
+    "@lerna/describe-ref-5.1.0" = {
       name = "_at_lerna_slash_describe-ref";
       packageName = "@lerna/describe-ref";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-5.0.0.tgz";
-        sha512 = "iLvMHp3nl4wcMR3/lVkz0ng7pAHfLQ7yvz2HsYBq7wllCcEzpchzPgyVzyvbpJ+Ke/MKjQTsrHE/yOGOH67GVw==";
+        url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-5.1.0.tgz";
+        sha512 = "eM7H4JJUyzpDoonSuH0kl3/UggvZUAE5UNFhkW2dTJESABusg7UOOnw615iwfiFcm9VeqEs7rXdhRpeBorPj4A==";
       };
     };
-    "@lerna/diff-5.0.0" = {
+    "@lerna/diff-5.1.0" = {
       name = "_at_lerna_slash_diff";
       packageName = "@lerna/diff";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/diff/-/diff-5.0.0.tgz";
-        sha512 = "S4XJ6i9oP77cSmJ3oRUJGMgrI+jOTmkYWur2nqgSdyJBE1J2eClgTJknb3WAHg2cHALT18WzFqNghFOGM+9dRA==";
+        url = "https://registry.npmjs.org/@lerna/diff/-/diff-5.1.0.tgz";
+        sha512 = "IfI9wLklqM9PRtdLXd3nZL0B/Dh0AdQ4hkEUexxQQYa9vGSk8f1oZ8W/mMQ43yvF+HrLOq9ggR0ZFR+9rm9fDA==";
       };
     };
-    "@lerna/exec-5.0.0" = {
+    "@lerna/exec-5.1.0" = {
       name = "_at_lerna_slash_exec";
       packageName = "@lerna/exec";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/exec/-/exec-5.0.0.tgz";
-        sha512 = "g5i+2RclCGWLsl88m11j99YM2Gqnwa2lxZ5tDeqqWZFno6Dlvop17Yl6/MFH42EgM2DQHUUCammvcLIAJ2XwEA==";
+        url = "https://registry.npmjs.org/@lerna/exec/-/exec-5.1.0.tgz";
+        sha512 = "JgHz/hTF47mRPd3o+gRtHSv7DMOvnXAkVdj/YLTCPgJ4IMvIeVY70sCWuvnJPo728k4fdIrgmw0BWpUBD64q9w==";
       };
     };
-    "@lerna/filter-options-5.0.0" = {
+    "@lerna/filter-options-5.1.0" = {
       name = "_at_lerna_slash_filter-options";
       packageName = "@lerna/filter-options";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-5.0.0.tgz";
-        sha512 = "un73aYkXlzKlnDPx2AlqNW+ArCZ20XaX+Y6C0F+av9VZriiBsCgZTnflhih9fiSMnXjN5r9CA8YdWvZqa3oAcQ==";
+        url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-5.1.0.tgz";
+        sha512 = "FeUb2jjbNNm1pBbEclktQ7Yqxy5KBxpHAuHic4Arruaai2lxYEQaJKb3NoTFT+cBlY1zFPQcjc8bPbEshu0vuA==";
       };
     };
-    "@lerna/filter-packages-5.0.0" = {
+    "@lerna/filter-packages-5.1.0" = {
       name = "_at_lerna_slash_filter-packages";
       packageName = "@lerna/filter-packages";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-5.0.0.tgz";
-        sha512 = "+EIjVVaMPDZ05F/gZa+kcXjBOLXqEamcEIDr+2ZXRgJmnrLx9BBY1B7sBEFHg7JXbeOKS+fKtMGVveV0SzgH3Q==";
+        url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-5.1.0.tgz";
+        sha512 = "X5FuSDeYBcEPPKmea/uA3FLz4Vheqv9Dmm3ZkVE+w9TRb1t52azavPm/bm99I/7aKr4+clOgf7AZ4NqFOaA+aQ==";
       };
     };
-    "@lerna/get-npm-exec-opts-5.0.0" = {
+    "@lerna/get-npm-exec-opts-5.1.0" = {
       name = "_at_lerna_slash_get-npm-exec-opts";
       packageName = "@lerna/get-npm-exec-opts";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-5.0.0.tgz";
-        sha512 = "ZOg3kc5FXYA1kVFD2hfJOl64hNASWD6panwD0HlyzXgfKKTDRm/P/qtAqS8WGCzQWgEdx4wvsDe/58Lzzh6QzQ==";
+        url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-5.1.0.tgz";
+        sha512 = "54lkBLpuwq9XTaiejkNOvBk75SUNOj6YxZY+lbZzfMxqy107w4Fcwp3MdvYFaRO+0q8aderdYOUysv0X4q62Xg==";
       };
     };
-    "@lerna/get-packed-5.0.0" = {
+    "@lerna/get-packed-5.1.0" = {
       name = "_at_lerna_slash_get-packed";
       packageName = "@lerna/get-packed";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-5.0.0.tgz";
-        sha512 = "fks7Tg7DvcCZxRWPS3JAWVuLnwjPC/hLlNsdYmK9nN3+RtPhmYQgBjLSONcENw1E46t4Aph72lA9nLcYBLksqw==";
+        url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-5.1.0.tgz";
+        sha512 = "waCjBLhIJ2Y1C3H3ny6zMFLH3Y8z6+ZiGYGgKXFuBD6ovmqZz7QInY63i+6FWIgwTE4FakbDsTK0xhaJEjz6/g==";
       };
     };
-    "@lerna/github-client-5.0.0" = {
+    "@lerna/github-client-5.1.0" = {
       name = "_at_lerna_slash_github-client";
       packageName = "@lerna/github-client";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-5.0.0.tgz";
-        sha512 = "NoEyRkQ8XgBnrjRfC9ph1npfg1/4OdYG+r8lG/1WkJbdt1Wlym4VNZU2BYPMWwSQYMJuppoEr0LL2uuVcS4ZUw==";
+        url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-5.1.0.tgz";
+        sha512 = "wow6KytR+pPXU+0DyCWnNuMdCTRotQCtGf5K+2PziJI0zfow4uFh60hs58bRrv3GgotnXeEB6433tYdajNa+nA==";
       };
     };
-    "@lerna/gitlab-client-5.0.0" = {
+    "@lerna/gitlab-client-5.1.0" = {
       name = "_at_lerna_slash_gitlab-client";
       packageName = "@lerna/gitlab-client";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-5.0.0.tgz";
-        sha512 = "WREAT7qzta9hxNxktTX0x1/sEMpBP+4Gc00QSJYXt+ZzxY0t5RUx/ZK5pQl+IDhtkajrvXT6fSfZjMxxyE8hhQ==";
+        url = "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-5.1.0.tgz";
+        sha512 = "nXUK6h8SpYRdocrzhA3wJDZ6ghQREBBxPbA5v2jVSY2xR3NxOcWjYOpq2BaQ5KE0j4OYenFL1kNn6baAQsw/XQ==";
       };
     };
-    "@lerna/global-options-5.0.0" = {
+    "@lerna/global-options-5.1.0" = {
       name = "_at_lerna_slash_global-options";
       packageName = "@lerna/global-options";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-5.0.0.tgz";
-        sha512 = "PZYy/3mTZwtA9lNmHHRCc/Ty1W20qGJ/BdDIo4bw/Bk0AOcoBCLT9b3Mjijkl4AbC9+eSGk3flUYapCGVuS32Q==";
+        url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-5.1.0.tgz";
+        sha512 = "yh66x9+gQk5Wcjoys10DyzJ6EkCdx2+wjW9gdY+1KyfKHY3v4sLgHohGi8o7lKLr3ihaT/MgZSKmN9oLGpJVow==";
       };
     };
-    "@lerna/has-npm-version-5.0.0" = {
+    "@lerna/has-npm-version-5.1.0" = {
       name = "_at_lerna_slash_has-npm-version";
       packageName = "@lerna/has-npm-version";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-5.0.0.tgz";
-        sha512 = "zJPgcml86nhJFJTpT+kjkcafuCFvK7PSq3oDC2KJxwB1bhlYwy+SKtAEypHSsHQ2DwP0YgPITcy1pvtHkie1SA==";
+        url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-5.1.0.tgz";
+        sha512 = "qihV4JthS3RG2w/GoioPIuU5MCauWI9+dddNgh5rHGfOuOudE4kPOLBa0CpcV06fjpgFNiyL0QOoSok2LVvnBQ==";
       };
     };
-    "@lerna/import-5.0.0" = {
+    "@lerna/import-5.1.0" = {
       name = "_at_lerna_slash_import";
       packageName = "@lerna/import";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/import/-/import-5.0.0.tgz";
-        sha512 = "cD+Is7eV/I+ZU0Wlg+yAgKaZbOvfzA7kBj2Qu1HtxeLhc7joTR8PFW1gNjEsvrWOTiaHAtObbo1A+MKYQ/T12g==";
+        url = "https://registry.npmjs.org/@lerna/import/-/import-5.1.0.tgz";
+        sha512 = "oG7KmYCiXikYFk8VXvew2hioFKNUgve0NGXpIW3eHM5vtWUoGa2EA+5TDJnzXWNDiW27PULrD/MBBfLchWfIpA==";
       };
     };
-    "@lerna/info-5.0.0" = {
+    "@lerna/info-5.1.0" = {
       name = "_at_lerna_slash_info";
       packageName = "@lerna/info";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/info/-/info-5.0.0.tgz";
-        sha512 = "k9TMK81apTjxxpnjfFOABKXndTtHBPgB8UO+I6zKhsfRqVb9FCz2MHOx8cQiSyolvNyGSQdSylSo4p7EBBomQQ==";
+        url = "https://registry.npmjs.org/@lerna/info/-/info-5.1.0.tgz";
+        sha512 = "RS25MvC2PpbPg8110e1FXo4rgU8VH0749/Kt4qwoMjXOxx/XecLWB69+YT1XZwi42XnzmfTSBWpi7ZuKZF++HA==";
       };
     };
-    "@lerna/init-5.0.0" = {
+    "@lerna/init-5.1.0" = {
       name = "_at_lerna_slash_init";
       packageName = "@lerna/init";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/init/-/init-5.0.0.tgz";
-        sha512 = "2n68x7AIqVa+Vev9xF3NV9ba0C599KYf7JsIrQ5ESv4593ftInJpwgMwjroLT3X/Chi4BK7y2/xGmrfFVwgILg==";
+        url = "https://registry.npmjs.org/@lerna/init/-/init-5.1.0.tgz";
+        sha512 = "Nhc6rUCYLo17zqZF3ONoyw7d6TEhQwADdEiDe3LWe2lv/AuTGFI7ZNgo5gduLkAsfw54i8kGUQNh2/lvfGqB1g==";
       };
     };
-    "@lerna/link-5.0.0" = {
+    "@lerna/link-5.1.0" = {
       name = "_at_lerna_slash_link";
       packageName = "@lerna/link";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/link/-/link-5.0.0.tgz";
-        sha512 = "00YxQ06TVhQJthOjcuxCCJRjkAM+qM/8Lv0ckdCzBBCSr4RdAGBp6QcAX/gjLNasgmNpyiza3ADet7mCH7uodw==";
+        url = "https://registry.npmjs.org/@lerna/link/-/link-5.1.0.tgz";
+        sha512 = "OHShGKIe83/GcBVivmFWO6R9g3K8MDZfKwtcgBxy6GeLNQ+IfxxwOIbPEcn2afpBrEuGaisaNHKf00YnnmCdRQ==";
       };
     };
-    "@lerna/list-5.0.0" = {
+    "@lerna/list-5.1.0" = {
       name = "_at_lerna_slash_list";
       packageName = "@lerna/list";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/list/-/list-5.0.0.tgz";
-        sha512 = "+B0yFil2AFdiYO8hyU1bFbKXGBAUUQQ43/fp2XS2jBFCipLme4eTILL5gMKOhr2Xg9AsfYPXRMRer5VW7qTeeQ==";
+        url = "https://registry.npmjs.org/@lerna/list/-/list-5.1.0.tgz";
+        sha512 = "MW+2ebEm/eEcHfEpdS/JM8XC0OrBbVH1HbTTHba7WUHTvjIeKj8qFD6wJa4YSqVWLC415Ev9ET9JnesIfL375w==";
       };
     };
-    "@lerna/listable-5.0.0" = {
+    "@lerna/listable-5.1.0" = {
       name = "_at_lerna_slash_listable";
       packageName = "@lerna/listable";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/listable/-/listable-5.0.0.tgz";
-        sha512 = "Rd5sE7KTbqA8u048qThH5IyBuJIwMcUnEObjFyJyKpc1SEWSumo4yAYmcEeN/9z62tcdud5wHYPSbVgfXJq37g==";
+        url = "https://registry.npmjs.org/@lerna/listable/-/listable-5.1.0.tgz";
+        sha512 = "L+zlyn+6LltxzER8c1GXq4k1EaRluuzQmEBIXnlHYgAQxrYpZ/L8U8h4zXWyaxUoJULHBCoLWxGq2cgJFxHE3w==";
       };
     };
-    "@lerna/log-packed-5.0.0" = {
+    "@lerna/log-packed-5.1.0" = {
       name = "_at_lerna_slash_log-packed";
       packageName = "@lerna/log-packed";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-5.0.0.tgz";
-        sha512 = "0TxKX+XnlEYj0du9U2kg3HEyIb/0QsM0Slt8utuCxALUnXRHTEKohjqVKsBdvh1QmJpnUbL5I+vfoYqno4Y42w==";
+        url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-5.1.0.tgz";
+        sha512 = "nHoVWnq01RkIC4BDfGWRjaGSuKuVx31eY/JDx0NV+eVGoaTAp5YgMmZilRBSIQPRBlGMxEex89YLfXmOWfXuPg==";
       };
     };
-    "@lerna/npm-conf-5.0.0" = {
+    "@lerna/npm-conf-5.1.0" = {
       name = "_at_lerna_slash_npm-conf";
       packageName = "@lerna/npm-conf";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-5.0.0.tgz";
-        sha512 = "KSftxtMNVhLol1JNwFFNgh5jiCG010pewM+uKeSrUe0BCB3lnidiEDzu2CCn8JYYfIXqAiou/pScUiOxVLpcAA==";
+        url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-5.1.0.tgz";
+        sha512 = "S//5yGukBEhVveGxrjKkGd7YUhAD2Es9wz5ec5GkfxH3jmPtc0Uxn/v87p7P6zxR/elt0fnFiwyK9Za1CDcmaA==";
       };
     };
-    "@lerna/npm-dist-tag-5.0.0" = {
+    "@lerna/npm-dist-tag-5.1.0" = {
       name = "_at_lerna_slash_npm-dist-tag";
       packageName = "@lerna/npm-dist-tag";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-5.0.0.tgz";
-        sha512 = "ccUFhp9Wu/FHW5/5fL+vLiSTcUZXtKQ7c0RMXtNRzIdTXBxPBkVi1k5QAnBAAffsz6Owc/K++cb+/zQ/asrG3g==";
+        url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-5.1.0.tgz";
+        sha512 = "PlLJKsSUfdizQRMhvVCvnpGparTO9JTdybkiOeKApbz+BEnL+eANodY+eJs+ubO2mMsku8LEGyyUs2OyCP/23Q==";
       };
     };
-    "@lerna/npm-install-5.0.0" = {
+    "@lerna/npm-install-5.1.0" = {
       name = "_at_lerna_slash_npm-install";
       packageName = "@lerna/npm-install";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-5.0.0.tgz";
-        sha512 = "72Jf05JCIdeSBWXAiNjd/y2AQH4Ojgas55ojV2sAcEYz2wgyR7wSpiI6fHBRlRP+3XPjV9MXKxI3ZwOnznQxqQ==";
+        url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-5.1.0.tgz";
+        sha512 = "uUiAN9eLyrvTjGKPLSgRtFi6Bu9QDGNu/EbYG14iBPLOmFbFVyhAQr4QHJ8lA/orJDKrTgEMWVl/rI++MX9Hxw==";
       };
     };
-    "@lerna/npm-publish-5.0.0" = {
+    "@lerna/npm-publish-5.1.0" = {
       name = "_at_lerna_slash_npm-publish";
       packageName = "@lerna/npm-publish";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-5.0.0.tgz";
-        sha512 = "jnapZ2jRajSzshSfd1Y3rHH5R7QC+JJlYST04FBebIH3VePwDT7uAglDCI4um2THvxkW4420EzE4BUMUwKlnXA==";
+        url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-5.1.0.tgz";
+        sha512 = "vGCxUG1T2TmSzSlIMs8FGpdyLjv3kD8Wl68mI4g3NC4uOHuOPGCXlLjbgYlcT/v+d3L69jDfTFgiZhTiPFx8Jg==";
       };
     };
-    "@lerna/npm-run-script-5.0.0" = {
+    "@lerna/npm-run-script-5.1.0" = {
       name = "_at_lerna_slash_npm-run-script";
       packageName = "@lerna/npm-run-script";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-5.0.0.tgz";
-        sha512 = "qgGf0Wc/E2YxPwIiF8kC/OB9ffPf0/HVtPVkqrblVuNE9XVP80WilOH966PIDiXzwXaCo/cTswFoBeseccYRGw==";
+        url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-5.1.0.tgz";
+        sha512 = "zaBfisZVSd0q8Q9+Dm4p9d1GoWdLjSbMpIs00QA/dTXtMr+X64AVcgZVsiXqxCzK/ZJh6uOPsUbv6NNMhFQERA==";
       };
     };
-    "@lerna/otplease-5.0.0" = {
+    "@lerna/otplease-5.1.0" = {
       name = "_at_lerna_slash_otplease";
       packageName = "@lerna/otplease";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-5.0.0.tgz";
-        sha512 = "QLLkEy1DPN1XFRAAZDHxAD26MHFQDHfzB6KKSzRYxbHc6lH/YbDaMH1RloSWIm7Hwkxl/3NgpokgN4Lj5XFuzg==";
+        url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-5.1.0.tgz";
+        sha512 = "s3ps5aPcUlSUMVQ92UZSEairm+9MXOtlZ1P0BEolUL+e/Fj6jKL2r8A+RRfTXXoIDNLmAiM7BXkkUqvtHTWScw==";
       };
     };
-    "@lerna/output-5.0.0" = {
+    "@lerna/output-5.1.0" = {
       name = "_at_lerna_slash_output";
       packageName = "@lerna/output";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/output/-/output-5.0.0.tgz";
-        sha512 = "/7sUJQWPcvnLudjVIdN7t9MlfBLuP4JCDAWgQMqZe+wpQRuKNyKQ5dLBH5NHU/ElJCjAwMPfWuk3mh3GuvuiGA==";
+        url = "https://registry.npmjs.org/@lerna/output/-/output-5.1.0.tgz";
+        sha512 = "UKkyTFmZrDYOXKtXlub8K8uQ3FrbA59x6lxjCV1ucUuodIVuFU5zT604ae5zPy8eLPDSy3UmjkxkAlnbEw13OA==";
       };
     };
-    "@lerna/pack-directory-5.0.0" = {
+    "@lerna/pack-directory-5.1.0" = {
       name = "_at_lerna_slash_pack-directory";
       packageName = "@lerna/pack-directory";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-5.0.0.tgz";
-        sha512 = "E1SNDS7xSWhJrTSmRzJK7DibneljrymviKcsZW3mRl4TmF4CpYJmNXCMlhEtKEy6ghnGQvnl3/4+eslHDJ5J/w==";
+        url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-5.1.0.tgz";
+        sha512 = "OBYtkUz5GpDvU+JCZSIPwB7XCv6B9xILd3pYYCM5ditkwI3te+J9AZt+aleYa1/NfJdTxenPdBjui656dCEMdw==";
       };
     };
-    "@lerna/package-5.0.0" = {
+    "@lerna/package-5.1.0" = {
       name = "_at_lerna_slash_package";
       packageName = "@lerna/package";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/package/-/package-5.0.0.tgz";
-        sha512 = "/JiUU88bhbYEUTzPqoGLGwrrdWWTIVMlBb1OPxCGNGDEqYYNySX+OTTSs3zGMcmJnRNI0UyQALiEd0sh3JFN5w==";
+        url = "https://registry.npmjs.org/@lerna/package/-/package-5.1.0.tgz";
+        sha512 = "Y2HF4Lrv4E7AwT97+G1lx6qIJB4Wzi4nHsNOgRC/dK4Hr7b5Qubv2bPEcb0mMqWlwSrvYQI4Zacelgy/mgxPsA==";
       };
     };
-    "@lerna/package-graph-5.0.0" = {
+    "@lerna/package-graph-5.1.0" = {
       name = "_at_lerna_slash_package-graph";
       packageName = "@lerna/package-graph";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-5.0.0.tgz";
-        sha512 = "Z3QeUQVjux0Blo64rA3/NivoLDlsQBjsZRIgGLbcQh7l7pJrqLK1WyNCBbPJ0KQNljQqUXthCKzdefnEWe37Ew==";
+        url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-5.1.0.tgz";
+        sha512 = "Ero1z9fnu65WxzrAzw9/I5+kfbT7HkyV9F9MTxYpnk7zOAAYvR4qSCkc/yNEJPr4kN8NvcY8CifNEQtORxkVXg==";
       };
     };
-    "@lerna/prerelease-id-from-version-5.0.0" = {
+    "@lerna/prerelease-id-from-version-5.1.0" = {
       name = "_at_lerna_slash_prerelease-id-from-version";
       packageName = "@lerna/prerelease-id-from-version";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-5.0.0.tgz";
-        sha512 = "bUZwyx6evRn2RxogOQXaiYxRK1U/1Mh/KLO4n49wUhqb8S8Vb9aG3+7lLOgg4ZugHpj9KAlD3YGEKvwYQiWzhg==";
+        url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-5.1.0.tgz";
+        sha512 = "sNjthszV+VkBVHPfTVquxoUQ+p8mtBxPFFoLjK+Bq+57xdmV6VGhZ/QL8HTQ7H7y8KzWuqVNMl0Z7G6PZXON9g==";
       };
     };
-    "@lerna/profiler-5.0.0" = {
+    "@lerna/profiler-5.1.0" = {
       name = "_at_lerna_slash_profiler";
       packageName = "@lerna/profiler";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/profiler/-/profiler-5.0.0.tgz";
-        sha512 = "hFX+ZtoH7BdDoGI+bqOYaSptJTFI58wNK9qq/pHwL5ksV7vOhxP2cQAuo1SjgBKHGl0Ex/9ZT080YVV4jP1ehw==";
+        url = "https://registry.npmjs.org/@lerna/profiler/-/profiler-5.1.0.tgz";
+        sha512 = "/CCYMtkF2xj3kjD9w29k7TDe40K/gk7goR2fvUf/6akPBG2KhFY+sQ0TQ2Ojnaym75OAn4WXta+FLdTQSdAFRQ==";
       };
     };
-    "@lerna/project-5.0.0" = {
+    "@lerna/project-5.1.0" = {
       name = "_at_lerna_slash_project";
       packageName = "@lerna/project";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/project/-/project-5.0.0.tgz";
-        sha512 = "+izHk7D/Di2b0s69AzKzAa/qBz32H9s67oN9aKntrjNylpY7iN5opU157l60Kh4TprYHU5bLisqzFLZsHHADGw==";
+        url = "https://registry.npmjs.org/@lerna/project/-/project-5.1.0.tgz";
+        sha512 = "QLrF+2CzPjP3ew8MJejI4pupRZDJvhpTDx/2f1sSfmHOiPsyxmx7DNhc/p9780MOhrSlokqDNfXDKph8bN3TrQ==";
       };
     };
-    "@lerna/prompt-5.0.0" = {
+    "@lerna/prompt-5.1.0" = {
       name = "_at_lerna_slash_prompt";
       packageName = "@lerna/prompt";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-5.0.0.tgz";
-        sha512 = "cq2k04kOPY1yuJNHJn4qfBDDrCi9PF4Q228JICa6bxaONRf/C/TRsEQXHVIdlax8B3l53LnlGv5GECwRuvkQbA==";
+        url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-5.1.0.tgz";
+        sha512 = "CiQEtULXK3zF+mwP5bKhXvPKpw2fqXxLZ4InfokYVcLcR3PgUyu8wmmDxFqkaG7hZnBcDPsn/QAE2P9yYvvoDQ==";
       };
     };
-    "@lerna/publish-5.0.0" = {
+    "@lerna/publish-5.1.0" = {
       name = "_at_lerna_slash_publish";
       packageName = "@lerna/publish";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/publish/-/publish-5.0.0.tgz";
-        sha512 = "QEWFtN8fW1M+YXEQOWb2XBBCT137CrwHYK29ojMXW9HShvSZezf8Q/niH91nZ4kIhWdpOGz4w3rKopsumAM5SA==";
+        url = "https://registry.npmjs.org/@lerna/publish/-/publish-5.1.0.tgz";
+        sha512 = "7WlmuY5SxlFQz80EAziv0vgO0wbUufns9RYZZv8QKM6c17tBJJbRxguc3oxCx8m7V3BvrBeyvLBZUJhIKcyGNw==";
       };
     };
-    "@lerna/pulse-till-done-5.0.0" = {
+    "@lerna/pulse-till-done-5.1.0" = {
       name = "_at_lerna_slash_pulse-till-done";
       packageName = "@lerna/pulse-till-done";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-5.0.0.tgz";
-        sha512 = "qFeVybGIZbQSWKasWIzZmHsvCQMC/AwTz5B44a0zTt5eSNQuI65HRpKKUgmFFu/Jzd7u+yp7eP+NQ53gjOcQlQ==";
+        url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-5.1.0.tgz";
+        sha512 = "CSYYtWk2/FMx7D7J/91MKstX+/zHdhtxAnSl+c+MDcf8gOtrcEdI41h4UDJi/q7E1STWvIhcq5OmFTOipoP37w==";
       };
     };
-    "@lerna/query-graph-5.0.0" = {
+    "@lerna/query-graph-5.1.0" = {
       name = "_at_lerna_slash_query-graph";
       packageName = "@lerna/query-graph";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-5.0.0.tgz";
-        sha512 = "C/HXssBI8DVsZ/7IDW6JG9xhoHtWywi3L5oZB9q84MBYpQ9otUv6zbB+K4JCj7w9WHcuFWe2T/mc9wsaFuvB5g==";
+        url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-5.1.0.tgz";
+        sha512 = "O/c7frgoQFzmgOOWqm+EcY8s2zDKZBq3zyoy5xCbx5ohG5OBA7pHti3SvOP2Ex+YnAwl50r6Eb9Jdixo5ydWHg==";
       };
     };
-    "@lerna/resolve-symlink-5.0.0" = {
+    "@lerna/resolve-symlink-5.1.0" = {
       name = "_at_lerna_slash_resolve-symlink";
       packageName = "@lerna/resolve-symlink";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-5.0.0.tgz";
-        sha512 = "O1EMQh3O3nKjLyI2guCCaxmi9xzZXpiMZhrz2ki5ENEDB2N1+f7cZ2THT0lEOIkLRuADI6hrzoN1obJ+TTk+KQ==";
+        url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-5.1.0.tgz";
+        sha512 = "dNIdtQMgsTLkeAZ5U7VH2oPt/ha81XgEiutIvgjjQH87Y5lYRNkX++ahN2/ccnDbv4aPf0tMxFEtRU6Jbh88Lw==";
       };
     };
-    "@lerna/rimraf-dir-5.0.0" = {
+    "@lerna/rimraf-dir-5.1.0" = {
       name = "_at_lerna_slash_rimraf-dir";
       packageName = "@lerna/rimraf-dir";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-5.0.0.tgz";
-        sha512 = "hWJg/13CiSUrWWEek3B/A1mkvBbcPvG5z69/Ugyerdpzlw44ubf02MAZ0/kXPJjkICI2hMrS07YotQ60LdYpCw==";
+        url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-5.1.0.tgz";
+        sha512 = "RkLxq2SveLuhEFeVb6tRBzdxiOVJcV56CfcKupCAHmhewEI2At+T/mbqTSzIr+dX3tIWni1uDg2ASWdfgQbGZw==";
       };
     };
-    "@lerna/run-5.0.0" = {
+    "@lerna/run-5.1.0" = {
       name = "_at_lerna_slash_run";
       packageName = "@lerna/run";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/run/-/run-5.0.0.tgz";
-        sha512 = "8nBZstqKSO+7wHlKk1g+iexSYRVVNJq/u5ZbAzBiHNrABtqA6/0G7q9vsAEMsnPZ8ARAUYpwvbfKTipjpWH0VA==";
+        url = "https://registry.npmjs.org/@lerna/run/-/run-5.1.0.tgz";
+        sha512 = "RoBRZCoGklAbCvhPXh9CjUkB0IhdR0FciiFXlB+Wl1y6LZeNB5QEztCArrWiMO17gpa8+ZWAguPaWXhOcH1LZw==";
       };
     };
-    "@lerna/run-lifecycle-5.0.0" = {
+    "@lerna/run-lifecycle-5.1.0" = {
       name = "_at_lerna_slash_run-lifecycle";
       packageName = "@lerna/run-lifecycle";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-5.0.0.tgz";
-        sha512 = "36mAm9rC5DSliFShI0Y4ICjgrJXdIIVt7VW9rdbdJ8/XYjRHDzhGPB9Sc1neJOVlGL4DmaArvh5tGgo62KPJYQ==";
+        url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-5.1.0.tgz";
+        sha512 = "CJ9LunNtzsLIt9wemwirBaIGGmwrHuEWWa7wIqPKee0R3LZJoUP471A/xK7eAkzmo2rty1JriMPsqg2SyfFDZg==";
       };
     };
-    "@lerna/run-topologically-5.0.0" = {
+    "@lerna/run-topologically-5.1.0" = {
       name = "_at_lerna_slash_run-topologically";
       packageName = "@lerna/run-topologically";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-5.0.0.tgz";
-        sha512 = "B2s1N/+r3sfPOLRA2svNk+C52JpXQleMuGap0yhOx5mZzR1M2Lo4vpe9Ody4hCvXQjfdLx/U342fxVmgugUtfQ==";
+        url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-5.1.0.tgz";
+        sha512 = "CZs9GhiTVkfPsMivOzfrf8eWzSoKxJY57arwfPwSFmUdUTok6uZKmC4bo6uqd1eyRGIba6j03ivg0ehUbr7APQ==";
       };
     };
-    "@lerna/symlink-binary-5.0.0" = {
+    "@lerna/symlink-binary-5.1.0" = {
       name = "_at_lerna_slash_symlink-binary";
       packageName = "@lerna/symlink-binary";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-5.0.0.tgz";
-        sha512 = "uYyiiNjkdL1tWf8MDXIIyCa/a2gmYaUxagqMgEZ4wRtOk+PDypDwMUFVop/EQtUWZqG5CAJBJYOztG3DdapTbA==";
+        url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-5.1.0.tgz";
+        sha512 = "D357qFkPhADU/bjK3vSPydG85gQGspgGg83EupAyocCPUyH0vE2YGNF713CXRTaMOkV8oxoH/QDcUVmqGybTVA==";
       };
     };
-    "@lerna/symlink-dependencies-5.0.0" = {
+    "@lerna/symlink-dependencies-5.1.0" = {
       name = "_at_lerna_slash_symlink-dependencies";
       packageName = "@lerna/symlink-dependencies";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-5.0.0.tgz";
-        sha512 = "wlZGOOB87XMy278hpF4fOwGNnjTXf1vJ/cFHIdKsJAiDipyhtnuCiJLBDPh4NzEGb02o4rhaqt8Nl5yWRu9CNA==";
+        url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-5.1.0.tgz";
+        sha512 = "DN+Zk/aAbfhDx5dxbccb0n6AFj27cO3Tu+RITmzt1N4KfIrVpcsrxRN+dt+pc945SE8ccdO5vkKrybijjlGb4Q==";
       };
     };
-    "@lerna/temp-write-5.0.0" = {
+    "@lerna/temp-write-5.1.0" = {
       name = "_at_lerna_slash_temp-write";
       packageName = "@lerna/temp-write";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/temp-write/-/temp-write-5.0.0.tgz";
-        sha512 = "JOkRR6xyASuBy1udyS/VD52Wgywnz7cSKppD+QKIDseNzTq27I9mNmb702BSXNXIdD19lLVQ7q6WoAlpnelnZg==";
+        url = "https://registry.npmjs.org/@lerna/temp-write/-/temp-write-5.1.0.tgz";
+        sha512 = "IvtYcrnWISEe9nBjhvq+o1mfn85Kup6rd+/PHb3jFmxx7E6ON4BnuqGPOOjmEjboMIRaopWQrkuCoIVotP+sDw==";
       };
     };
-    "@lerna/timer-5.0.0" = {
+    "@lerna/timer-5.1.0" = {
       name = "_at_lerna_slash_timer";
       packageName = "@lerna/timer";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/timer/-/timer-5.0.0.tgz";
-        sha512 = "p2vevkpB6V/b0aR8VyMLDfg0Arp9VvMxcZOEu+IfZ9XKTtnbwjWPHKUOS34x/VGa6bnOIWjE046ixWymOs/fTw==";
+        url = "https://registry.npmjs.org/@lerna/timer/-/timer-5.1.0.tgz";
+        sha512 = "ukVB3eDBKjZd8TjOSB3uHJWpPBtf7Ryk5AfA1yAotVd0Uk4wztGE6ULpGteAAS4AyJ1Tw9Ux7OLWu6QGVNvYLQ==";
       };
     };
-    "@lerna/validation-error-5.0.0" = {
+    "@lerna/validation-error-5.1.0" = {
       name = "_at_lerna_slash_validation-error";
       packageName = "@lerna/validation-error";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-5.0.0.tgz";
-        sha512 = "fu/MhqRXiRQM2cirP/HoSkfwc5XtJ21G60WHv74RnanKBqWEZAUALWa3MQN2sYhVV/FpDW3GLkO008IW5NWzdg==";
+        url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-5.1.0.tgz";
+        sha512 = "Csogf+BzsMa8vxj51KcHIg3RVWr0FbIkRXXALRT5c/shUsV7NClV/cpz35r3DzBIXdh168LftHBW49wxPXX5uw==";
       };
     };
-    "@lerna/version-5.0.0" = {
+    "@lerna/version-5.1.0" = {
       name = "_at_lerna_slash_version";
       packageName = "@lerna/version";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/version/-/version-5.0.0.tgz";
-        sha512 = "M8KvdyG5kR/d3wgg5S46Q2YMf0L9iw9MiumTvlDP4ckysTt+04kS74Vp4+aClgPM4xaoI5OuMrs6wy5ICcd3Pw==";
+        url = "https://registry.npmjs.org/@lerna/version/-/version-5.1.0.tgz";
+        sha512 = "KXvrudKfAUl/Fx1QkZXIaQ62O6/hcUZO48vCDG5ngEIfCUYxSneNgC/mp1J1rh3qC5ame9T3crP//ixYjGyHqQ==";
       };
     };
-    "@lerna/write-log-file-5.0.0" = {
+    "@lerna/write-log-file-5.1.0" = {
       name = "_at_lerna_slash_write-log-file";
       packageName = "@lerna/write-log-file";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-5.0.0.tgz";
-        sha512 = "kpPNxe9xm36QbCWY7DwO96Na6FpCHzZinJtw6ttBHslIcdR38lZuCp+/2KfJcVsRIPNOsp1VvgP7EZIKiBhgjw==";
+        url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-5.1.0.tgz";
+        sha512 = "azYryoUcNnpKmV09PhyvkBManGvdWWdY3Zb6MGF73/mDeM4G9UoM/6mpNrcPwS3oEzKrc0hTwquuP3QyPiSuWw==";
       };
     };
     "@lezer/common-0.15.12" = {
@@ -5827,13 +5827,13 @@ let
         sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA==";
       };
     };
-    "@microsoft/load-themed-styles-1.10.267" = {
+    "@microsoft/load-themed-styles-1.10.268" = {
       name = "_at_microsoft_slash_load-themed-styles";
       packageName = "@microsoft/load-themed-styles";
-      version = "1.10.267";
+      version = "1.10.268";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.267.tgz";
-        sha512 = "KlmENglyBXXtPfou+1kUtSIHZHmJrmDHYMvTXe82Ibucv+bpFg3xt3qd6UnqqwtaIM3SA+nKu8AhaL9FX6uk4A==";
+        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.268.tgz";
+        sha512 = "2n4beGOWbxJp6D+eatPWocpywcJUlNCtkjQ6k7RSHiLWuv23HetqmESqrqZTTDjQ3JG0jOv+wVkXVNqXcfVlPw==";
       };
     };
     "@mischnic/json-sourcemap-0.1.0" = {
@@ -6727,13 +6727,13 @@ let
         sha512 = "hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ==";
       };
     };
-    "@opentelemetry/semantic-conventions-1.3.0" = {
+    "@opentelemetry/semantic-conventions-1.3.1" = {
       name = "_at_opentelemetry_slash_semantic-conventions";
       packageName = "@opentelemetry/semantic-conventions";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.3.0.tgz";
-        sha512 = "7lmGpLL/7EHQcLVBxxOesgQQS7JSxzF/Xqx7VNMxAQbo14dzJEX6Ks0hb4LHqEMpCrKpErWXi4JxYCGrRJgx9A==";
+        url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.3.1.tgz";
+        sha512 = "wU5J8rUoo32oSef/rFpOT1HIjLjAv3qIDHkw1QIhODV3OpAVHi5oVzlouozg9obUmZKtbZ0qUe/m7FP0y0yBzA==";
       };
     };
     "@ot-builder/bin-composite-types-1.5.2" = {
@@ -7717,22 +7717,22 @@ let
         sha512 = "DiIjtous4XPuR2deTctD3/RVZy/vRzVYBgYYvHV313MmTfkbVP60qLH5txrT3/bYNvnb0poNDelLS6U0kqlvHA==";
       };
     };
-    "@prisma/engines-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a" = {
+    "@prisma/engines-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372" = {
       name = "_at_prisma_slash_engines";
       packageName = "@prisma/engines";
-      version = "3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a";
+      version = "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a.tgz";
-        sha512 = "LwZvI3FY6f43xFjQNRuE10JM5R8vJzFTSmbV9X0Wuhv9kscLkjRlZt0BEoiHmO+2HA3B3xxbMfB5du7ZoSFXGg==";
+        url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372.tgz";
+        sha512 = "S5T0NuVF2+NoKoxY5bN6O/7avv4ifcjqqk5+JFZ6C4g+P7JMM3nY0wGBPI+46A8yGIDsyyFmvFTYiIDsEUwUeQ==";
       };
     };
-    "@prisma/prisma-fmt-wasm-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a" = {
+    "@prisma/prisma-fmt-wasm-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372" = {
       name = "_at_prisma_slash_prisma-fmt-wasm";
       packageName = "@prisma/prisma-fmt-wasm";
-      version = "3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a";
+      version = "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a.tgz";
-        sha512 = "YwiGDAfUqLPz1NIyd6y6LyT1ViiTCXNx7AFWuMwb7aGhBmzhfuTeo/MQpzlA9x90wKh2ACJ4Fa3nZS5Wvr8xbg==";
+        url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372.tgz";
+        sha512 = "WZPmtF1rejy5aWyldms+zwP2IvI/g/j09fOD9+PnJJYAzgOXqGcp9lp0StTWZI0mZ1xNMlF5EIbcQHTWxGDYnw==";
       };
     };
     "@protobufjs/aspromise-1.1.2" = {
@@ -9625,15 +9625,6 @@ let
         sha512 = "ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==";
       };
     };
-    "@types/node-17.0.21" = {
-      name = "_at_types_slash_node";
-      packageName = "@types/node";
-      version = "17.0.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz";
-        sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==";
-      };
-    };
     "@types/node-17.0.23" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
@@ -10273,15 +10264,6 @@ let
         sha512 = "JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==";
       };
     };
-    "@types/ws-8.5.2" = {
-      name = "_at_types_slash_ws";
-      packageName = "@types/ws";
-      version = "8.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.2.tgz";
-        sha512 = "VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw==";
-      };
-    };
     "@types/ws-8.5.3" = {
       name = "_at_types_slash_ws";
       packageName = "@types/ws";
@@ -10354,13 +10336,13 @@ let
         sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==";
       };
     };
-    "@typescript-eslint/eslint-plugin-5.27.0" = {
+    "@typescript-eslint/eslint-plugin-5.27.1" = {
       name = "_at_typescript-eslint_slash_eslint-plugin";
       packageName = "@typescript-eslint/eslint-plugin";
-      version = "5.27.0";
+      version = "5.27.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.27.0.tgz";
-        sha512 = "DDrIA7GXtmHXr1VCcx9HivA39eprYBIFxbQEHI6NyraRDxCGpxAFiYQAT/1Y0vh1C+o2vfBiy4IuPoXxtTZCAQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.27.1.tgz";
+        sha512 = "6dM5NKT57ZduNnJfpY81Phe9nc9wolnMCnknb1im6brWi1RYv84nbMS3olJa27B6+irUVV1X/Wb+Am0FjJdGFw==";
       };
     };
     "@typescript-eslint/experimental-utils-4.33.0" = {
@@ -10381,13 +10363,13 @@ let
         sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==";
       };
     };
-    "@typescript-eslint/parser-5.27.0" = {
+    "@typescript-eslint/parser-5.27.1" = {
       name = "_at_typescript-eslint_slash_parser";
       packageName = "@typescript-eslint/parser";
-      version = "5.27.0";
+      version = "5.27.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.0.tgz";
-        sha512 = "8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.1.tgz";
+        sha512 = "7Va2ZOkHi5NP+AZwb5ReLgNF6nWLGTeUJfxdkVUAPPSaAdbWNnFZzLZ4EGGmmiCTg+AwlbE1KyUYTBglosSLHQ==";
       };
     };
     "@typescript-eslint/scope-manager-4.33.0" = {
@@ -10399,22 +10381,22 @@ let
         sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==";
       };
     };
-    "@typescript-eslint/scope-manager-5.27.0" = {
+    "@typescript-eslint/scope-manager-5.27.1" = {
       name = "_at_typescript-eslint_slash_scope-manager";
       packageName = "@typescript-eslint/scope-manager";
-      version = "5.27.0";
+      version = "5.27.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz";
-        sha512 = "VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g==";
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.1.tgz";
+        sha512 = "fQEOSa/QroWE6fAEg+bJxtRZJTH8NTskggybogHt4H9Da8zd4cJji76gA5SBlR0MgtwF7rebxTbDKB49YUCpAg==";
       };
     };
-    "@typescript-eslint/type-utils-5.27.0" = {
+    "@typescript-eslint/type-utils-5.27.1" = {
       name = "_at_typescript-eslint_slash_type-utils";
       packageName = "@typescript-eslint/type-utils";
-      version = "5.27.0";
+      version = "5.27.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.27.0.tgz";
-        sha512 = "vpTvRRchaf628Hb/Xzfek+85o//zEUotr1SmexKvTfs7czXfYjXVT/a5yDbpzLBX1rhbqxjDdr1Gyo0x1Fc64g==";
+        url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.27.1.tgz";
+        sha512 = "+UC1vVUWaDHRnC2cQrCJ4QtVjpjjCgjNFpg8b03nERmkHv9JV9X5M19D7UFMd+/G7T/sgFwX2pGmWK38rqyvXw==";
       };
     };
     "@typescript-eslint/types-4.33.0" = {
@@ -10426,13 +10408,13 @@ let
         sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==";
       };
     };
-    "@typescript-eslint/types-5.27.0" = {
+    "@typescript-eslint/types-5.27.1" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
-      version = "5.27.0";
+      version = "5.27.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz";
-        sha512 = "lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==";
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.1.tgz";
+        sha512 = "LgogNVkBhCTZU/m8XgEYIWICD6m4dmEDbKXESCbqOXfKZxRKeqpiJXQIErv66sdopRKZPo5l32ymNqibYEH/xg==";
       };
     };
     "@typescript-eslint/typescript-estree-4.33.0" = {
@@ -10444,22 +10426,22 @@ let
         sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==";
       };
     };
-    "@typescript-eslint/typescript-estree-5.27.0" = {
+    "@typescript-eslint/typescript-estree-5.27.1" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "5.27.0";
+      version = "5.27.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz";
-        sha512 = "QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.1.tgz";
+        sha512 = "DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw==";
       };
     };
-    "@typescript-eslint/utils-5.27.0" = {
+    "@typescript-eslint/utils-5.27.1" = {
       name = "_at_typescript-eslint_slash_utils";
       packageName = "@typescript-eslint/utils";
-      version = "5.27.0";
+      version = "5.27.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.27.0.tgz";
-        sha512 = "nZvCrkIJppym7cIbP3pOwIkAefXOmfGPnCM0LQfzNaKxJHI6VjI8NC662uoiPlaf5f6ymkTy9C3NQXev2mdXmA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.27.1.tgz";
+        sha512 = "mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w==";
       };
     };
     "@typescript-eslint/visitor-keys-4.33.0" = {
@@ -10471,13 +10453,13 @@ let
         sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==";
       };
     };
-    "@typescript-eslint/visitor-keys-5.27.0" = {
+    "@typescript-eslint/visitor-keys-5.27.1" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
-      version = "5.27.0";
+      version = "5.27.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz";
-        sha512 = "46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.1.tgz";
+        sha512 = "xYs6ffo01nhdJgPieyk7HAOpjhTsx7r/oB9LWEhwAXgwn33tkr+W8DI2ChboqhZlC4q3TC6geDYPoiX8ROqyOQ==";
       };
     };
     "@ungap/promise-all-settled-1.1.2" = {
@@ -10543,13 +10525,13 @@ let
         sha512 = "klR5oN7S3WJsZz0r6Xsq7o8YlFEyU3/00VmlpZzIPVFzKfbcEjXo/sVR5lQBUqNKuOzhcbxaFtzW9aOyHjmPYA==";
       };
     };
-    "@vercel/node-2.0.0" = {
+    "@vercel/node-2.0.1" = {
       name = "_at_vercel_slash_node";
       packageName = "@vercel/node";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/node/-/node-2.0.0.tgz";
-        sha512 = "wGEZ/Ge2GrmcBQmuJHFq2h0gTy4XOn2oYJyceVnOsMPwSZXMdZet2E3xSff5VfmrK2yGxO4mUIBeYjsPH+ZwWg==";
+        url = "https://registry.npmjs.org/@vercel/node/-/node-2.0.1.tgz";
+        sha512 = "49VaRMz7R5H1I0fjLowF+y1rM7f7maLxxXZV2cKYZgkw8/6KnHOopfLtLWAVoiY8rIyLmGSxM1zT4ZrlyKMdww==";
       };
     };
     "@vercel/node-bridge-3.0.0" = {
@@ -10732,40 +10714,40 @@ let
         sha512 = "KmJUazIEZWhy0UaFHV5Uy8AXpTqJgCPizEHhtxs3f8mIkUnwWjcQFG7FGfsAW7RgsN8hwcSZ5ZFjmXhllVwrkw==";
       };
     };
-    "@vue/compiler-core-3.2.36" = {
+    "@vue/compiler-core-3.2.37" = {
       name = "_at_vue_slash_compiler-core";
       packageName = "@vue/compiler-core";
-      version = "3.2.36";
+      version = "3.2.37";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.36.tgz";
-        sha512 = "bbyZM5hvBicv0PW3KUfVi+x3ylHnfKG7DOn5wM+f2OztTzTjLEyBb/5yrarIYpmnGitVGbjZqDbODyW4iK8hqw==";
+        url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz";
+        sha512 = "81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==";
       };
     };
-    "@vue/compiler-dom-3.2.36" = {
+    "@vue/compiler-dom-3.2.37" = {
       name = "_at_vue_slash_compiler-dom";
       packageName = "@vue/compiler-dom";
-      version = "3.2.36";
+      version = "3.2.37";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.36.tgz";
-        sha512 = "tcOTAOiW4s24QLnq+ON6J+GRONXJ+A/mqKCORi0LSlIh8XQlNnlm24y8xIL8la+ZDgkdbjarQ9ZqYSvEja6gVA==";
+        url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz";
+        sha512 = "yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==";
       };
     };
-    "@vue/compiler-sfc-3.2.36" = {
+    "@vue/compiler-sfc-3.2.37" = {
       name = "_at_vue_slash_compiler-sfc";
       packageName = "@vue/compiler-sfc";
-      version = "3.2.36";
+      version = "3.2.37";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.36.tgz";
-        sha512 = "AvGb4bTj4W8uQ4BqaSxo7UwTEqX5utdRSMyHy58OragWlt8nEACQ9mIeQh3K4di4/SX+41+pJrLIY01lHAOFOA==";
+        url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz";
+        sha512 = "+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==";
       };
     };
-    "@vue/compiler-ssr-3.2.36" = {
+    "@vue/compiler-ssr-3.2.37" = {
       name = "_at_vue_slash_compiler-ssr";
       packageName = "@vue/compiler-ssr";
-      version = "3.2.36";
+      version = "3.2.37";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.36.tgz";
-        sha512 = "+KugInUFRvOxEdLkZwE+W43BqHyhBh0jpYXhmqw1xGq2dmE6J9eZ8UUSOKNhdHtQ/iNLWWeK/wPZkVLUf3YGaw==";
+        url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz";
+        sha512 = "7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==";
       };
     };
     "@vue/component-compiler-utils-3.3.0" = {
@@ -10804,40 +10786,40 @@ let
         sha512 = "LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==";
       };
     };
-    "@vue/reactivity-3.2.36" = {
+    "@vue/reactivity-3.2.37" = {
       name = "_at_vue_slash_reactivity";
       packageName = "@vue/reactivity";
-      version = "3.2.36";
+      version = "3.2.37";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.36.tgz";
-        sha512 = "c2qvopo0crh9A4GXi2/2kfGYMxsJW4tVILrqRPydVGZHhq0fnzy6qmclWOhBFckEhmyxmpHpdJtIRYGeKcuhnA==";
+        url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz";
+        sha512 = "/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==";
       };
     };
-    "@vue/reactivity-transform-3.2.36" = {
+    "@vue/reactivity-transform-3.2.37" = {
       name = "_at_vue_slash_reactivity-transform";
       packageName = "@vue/reactivity-transform";
-      version = "3.2.36";
+      version = "3.2.37";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.36.tgz";
-        sha512 = "Jk5o2BhpODC9XTA7o4EL8hSJ4JyrFWErLtClG3NH8wDS7ri9jBDWxI7/549T7JY9uilKsaNM+4pJASLj5dtRwA==";
+        url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz";
+        sha512 = "IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==";
       };
     };
-    "@vue/runtime-core-3.2.36" = {
+    "@vue/runtime-core-3.2.37" = {
       name = "_at_vue_slash_runtime-core";
       packageName = "@vue/runtime-core";
-      version = "3.2.36";
+      version = "3.2.37";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.36.tgz";
-        sha512 = "PTWBD+Lub+1U3/KhbCExrfxyS14hstLX+cBboxVHaz+kXoiDLNDEYAovPtxeTutbqtClIXtft+wcGdC+FUQ9qQ==";
+        url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz";
+        sha512 = "JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==";
       };
     };
-    "@vue/shared-3.2.36" = {
+    "@vue/shared-3.2.37" = {
       name = "_at_vue_slash_shared";
       packageName = "@vue/shared";
-      version = "3.2.36";
+      version = "3.2.37";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.36.tgz";
-        sha512 = "JtB41wXl7Au3+Nl3gD16Cfpj7k/6aCroZ6BbOiCMFCMvrOpkg/qQUXTso2XowaNqBbnkuGHurLAqkLBxNGc1hQ==";
+        url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz";
+        sha512 = "4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==";
       };
     };
     "@vue/web-component-wrapper-1.3.0" = {
@@ -13351,13 +13333,13 @@ let
         sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==";
       };
     };
-    "arg-5.0.1" = {
+    "arg-5.0.2" = {
       name = "arg";
       packageName = "arg";
-      version = "5.0.1";
+      version = "5.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz";
-        sha512 = "e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==";
+        url = "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz";
+        sha512 = "PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==";
       };
     };
     "argparse-1.0.10" = {
@@ -14242,6 +14224,15 @@ let
         sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==";
       };
     };
+    "async-3.2.4" = {
+      name = "async";
+      packageName = "async";
+      version = "3.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz";
+        sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==";
+      };
+    };
     "async-append-only-log-3.1.4" = {
       name = "async-append-only-log";
       packageName = "async-append-only-log";
@@ -14593,13 +14584,22 @@ let
         sha512 = "545VawhsCQ7yEx9jZKV0hTTW3FS/waycISWMvnNwqRfpU9o4FQ4DSu3je7ekn5yFKM+91dxJC+IfJgtIV8WaUw==";
       };
     };
-    "aws-sdk-2.1148.0" = {
+    "aws-sdk-2.1149.0" = {
+      name = "aws-sdk";
+      packageName = "aws-sdk";
+      version = "2.1149.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1149.0.tgz";
+        sha512 = "wNb3YMLhXoK4UkjXhGAWMjRdrXT/Zhv3KdgPmd7VWlr3nXMViLwVJEEYdVmALUdkzCefdzY1JUTRLMgCxtn9EA==";
+      };
+    };
+    "aws-sdk-2.1150.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.1148.0";
+      version = "2.1150.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1148.0.tgz";
-        sha512 = "FUYAyveKmS5eqIiGQgrGVsLZwwtI+K6S6Gz8oJf56pgypZCo9dV+cXO4aaS+vN0+LSmGh6dSKc6G8h8FYASIJg==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1150.0.tgz";
+        sha512 = "SNbVXNlFGNFVcztPk7iWnjtGL+Afm1nyidpvX2rEqYdap2Ow57njZJXvghQUici4Xhqe+BUuG+x1orlFjapo4g==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -15700,13 +15700,13 @@ let
         sha512 = "O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ==";
       };
     };
-    "bipf-1.6.5" = {
+    "bipf-1.9.0" = {
       name = "bipf";
       packageName = "bipf";
-      version = "1.6.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bipf/-/bipf-1.6.5.tgz";
-        sha512 = "d3OnzFUE2G1nwJYP2pPGzLUz6PrMRWgRKi9ssfMN1GPDVCl8qGVDq+c+8I5p8Nnog0vZN4IOq1ojUufHfFRk8w==";
+        url = "https://registry.npmjs.org/bipf/-/bipf-1.9.0.tgz";
+        sha512 = "B/d8IADy5Y4v/CTMRWxLD8ONd2qRkF+2DbZLeIUql7PukfAiBhlGlw5qJcIU03l21qMEyvbi4PdntatH+j40vA==";
       };
     };
     "bit-field-1.5.3" = {
@@ -16330,13 +16330,13 @@ let
         sha512 = "RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg==";
       };
     };
-    "bonjour-service-1.0.12" = {
+    "bonjour-service-1.0.13" = {
       name = "bonjour-service";
       packageName = "bonjour-service";
-      version = "1.0.12";
+      version = "1.0.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.12.tgz";
-        sha512 = "pMmguXYCu63Ug37DluMKEHdxc+aaIf/ay4YbF8Gxtba+9d3u+rmEWy61VK3Z3hp8Rskok3BunHYnG0dUHAsblw==";
+        url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.13.tgz";
+        sha512 = "LWKRU/7EqDUC9CTAQtuZl5HzBALoCYwtLhffW3et7vZMwv3bWLpJf8bRYlMD5OCcDpTfnPgNCV4yo9ZIaJGMiA==";
       };
     };
     "boolbase-1.0.0" = {
@@ -16843,13 +16843,13 @@ let
         sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==";
       };
     };
-    "browserslist-4.20.3" = {
+    "browserslist-4.20.4" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.20.3";
+      version = "4.20.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz";
-        sha512 = "NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.4.tgz";
+        sha512 = "ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==";
       };
     };
     "brq-0.1.8" = {
@@ -17978,13 +17978,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001346" = {
+    "caniuse-lite-1.0.30001349" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001346";
+      version = "1.0.30001349";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001346.tgz";
-        sha512 = "q6ibZUO2t88QCIPayP/euuDREq+aMAxFE5S70PkrLh0iTDj/zEhgvJRKC2+CvXY6EWc6oQwUR48lL5vCW6jiXQ==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001349.tgz";
+        sha512 = "VFaWW3jeo6DLU5rwdiasosxhYSduJgSGil4cSyX3/85fbctlE58pXAkWyuRmVA0r2RxsOSVYUTZcySJ8WpbTxw==";
       };
     };
     "canvas-2.9.1" = {
@@ -18149,22 +18149,22 @@ let
         sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==";
       };
     };
-    "cdk8s-2.3.17" = {
+    "cdk8s-2.3.19" = {
       name = "cdk8s";
       packageName = "cdk8s";
-      version = "2.3.17";
+      version = "2.3.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.3.17.tgz";
-        sha512 = "NOQwj7YlbGd0ySr9E0VNCY3zoSv26Ijnq8o1tunNZziLprghnIGQvqVYScKlWGukm7spZ9X659xjVg+BupLEbQ==";
+        url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.3.19.tgz";
+        sha512 = "TxAMyZPDMbglBlJMS0X1keCbKm2ObWI9keQKgVrtHt24REdYoaMrwJ4ap+IqweTgYGjiOs+XgStQqd7Exfrjvg==";
       };
     };
-    "cdk8s-plus-22-2.0.0-rc.7" = {
+    "cdk8s-plus-22-2.0.0-rc.11" = {
       name = "cdk8s-plus-22";
       packageName = "cdk8s-plus-22";
-      version = "2.0.0-rc.7";
+      version = "2.0.0-rc.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-2.0.0-rc.7.tgz";
-        sha512 = "GPsowxakBJndHtn11cC028Uu8pxzjMbpv4lgNk6jbvUZ9WrHv4xH7hTQ6E916IY5eG0NAqBiTRR3zih28h1Ihw==";
+        url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-2.0.0-rc.11.tgz";
+        sha512 = "wxumx8Tt/ZM1EHfK9Me/1sO4wP1bD5VdbodvMdPrz8izJPghzJ496DD5b4MWtaldOK+iDMMqx/bxCCR+QOXNrQ==";
       };
     };
     "cdktf-0.11.1" = {
@@ -20840,13 +20840,13 @@ let
         sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==";
       };
     };
-    "constructs-10.1.27" = {
+    "constructs-10.1.31" = {
       name = "constructs";
       packageName = "constructs";
-      version = "10.1.27";
+      version = "10.1.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/constructs/-/constructs-10.1.27.tgz";
-        sha512 = "OZwFH5VTPlPg5/PODDhusBPfRUw2OYVamuUJsoVIxdHfb/F8KSY6d4EKcQiwSU+xSSfTRtBjGCbty/ZkMEzqfg==";
+        url = "https://registry.npmjs.org/constructs/-/constructs-10.1.31.tgz";
+        sha512 = "rL5Vmy65kr+7n4swyEmD8gwrpiCtoUfhb1wNdg8UsdfzZT5AoU+fYx1shDOBpwAibm6yTim3Vjs/ZPR2iUFFQw==";
       };
     };
     "consume-http-header-1.0.0" = {
@@ -21741,13 +21741,13 @@ let
         sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw==";
       };
     };
-    "create-gatsby-2.15.1" = {
+    "create-gatsby-2.16.0" = {
       name = "create-gatsby";
       packageName = "create-gatsby";
-      version = "2.15.1";
+      version = "2.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.15.1.tgz";
-        sha512 = "oFZtU5NP5jUa/A/y6p8L2pNkW+BoE0aTPTYbZ+pwQw9sE7MfYeI+t9yNDBA/9qVaaAqUt7104NkQbix/mT1GVw==";
+        url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.16.0.tgz";
+        sha512 = "X/4fu+C8qBtfI9JTnnhI+zBFwe2V7uC27XEnA/9GbCp507xuiqkO6MuUJGDxdhe0cDBub+KD+3TLQ94XaXiJpg==";
       };
     };
     "create-graphback-1.0.1" = {
@@ -23667,13 +23667,13 @@ let
         sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==";
       };
     };
-    "dayjs-1.11.2" = {
+    "dayjs-1.11.3" = {
       name = "dayjs";
       packageName = "dayjs";
-      version = "1.11.2";
+      version = "1.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz";
-        sha512 = "F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw==";
+        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz";
+        sha512 = "xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A==";
       };
     };
     "dayjs-1.8.36" = {
@@ -24531,13 +24531,13 @@ let
         sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==";
       };
     };
-    "deltachat-node-1.84.0" = {
+    "deltachat-node-1.86.0" = {
       name = "deltachat-node";
       packageName = "deltachat-node";
-      version = "1.84.0";
+      version = "1.86.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deltachat-node/-/deltachat-node-1.84.0.tgz";
-        sha512 = "/7tF4782VhWYtGgT1pbbodG0rkyhNQHhpkTLSrejJzl+PddC0CzOXYN8L7lcx5T9Pkxa3UPTsf7lDtlrNphRjg==";
+        url = "https://registry.npmjs.org/deltachat-node/-/deltachat-node-1.86.0.tgz";
+        sha512 = "mePZbE0tyYlOj7hXrQNyvMVn2NI6/K0obP9uIxZC11iTZMhFtJVUG+O18yWOLUCsDeCIDFJnrXDUc4HRbBndWw==";
       };
     };
     "denodeify-1.2.1" = {
@@ -26124,13 +26124,13 @@ let
         sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw==";
       };
     };
-    "electron-to-chromium-1.4.146" = {
+    "electron-to-chromium-1.4.147" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.4.146";
+      version = "1.4.147";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.146.tgz";
-        sha512 = "4eWebzDLd+hYLm4csbyMU2EbBnqhwl8Oe9eF/7CBDPWcRxFmqzx4izxvHH+lofQxzieg8UbB8ZuzNTxeukzfTg==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.147.tgz";
+        sha512 = "czclPqxLMPqPMkahKcske4TaS5lcznsc26ByBlEFDU8grTBVK9C5W6K9I6oEEhm4Ai4jTihGnys90xY1yjXcRg==";
       };
     };
     "electrum-client-git+https://github.com/janoside/electrum-client" = {
@@ -26819,13 +26819,13 @@ let
         sha512 = "XHJk60ufE+TG/ydwp4lilOog549iiQF2OAPhkk9DdiYWMrltz5yhDz/xnKuenNwP7gy3dsibssO5QpVhkrSzzg==";
       };
     };
-    "error-stack-parser-2.0.7" = {
+    "error-stack-parser-2.1.4" = {
       name = "error-stack-parser";
       packageName = "error-stack-parser";
-      version = "2.0.7";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.7.tgz";
-        sha512 = "chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA==";
+        url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz";
+        sha512 = "Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==";
       };
     };
     "errorhandler-1.5.1" = {
@@ -30914,13 +30914,13 @@ let
         sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==";
       };
     };
-    "fuse.js-6.4.1" = {
+    "fuse.js-6.6.2" = {
       name = "fuse.js";
       packageName = "fuse.js";
-      version = "6.4.1";
+      version = "6.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.1.tgz";
-        sha512 = "+hAS7KYgLXontDh/vqffs7wIBw0ceb9Sx8ywZQhOsiQGcSO5zInGhttWOUYQYlvV/yYMJOacQ129Xs3mP3+oZQ==";
+        url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz";
+        sha512 = "cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==";
       };
     };
     "fuzzy-0.1.3" = {
@@ -30968,22 +30968,22 @@ let
         sha512 = "mDc8EQJKtxjp9PMYS3PbpjjbX3oXhBTxoGaPahw620XZBIHJ4+nvw5KN/tRtmmSDR9dypstGNvqQ3C29QGoGHQ==";
       };
     };
-    "gatsby-core-utils-3.15.0" = {
+    "gatsby-core-utils-3.16.0" = {
       name = "gatsby-core-utils";
       packageName = "gatsby-core-utils";
-      version = "3.15.0";
+      version = "3.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.15.0.tgz";
-        sha512 = "aLNrH3gGUIeD9XGk3z/27N5qaVx7y3AAgs/Vu6PJm69t25kTwuOHKNzhlnHkIZypznZkkVeN7QbHBkIKam/ZIQ==";
+        url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.16.0.tgz";
+        sha512 = "cr3aIlzfzQkXSKng0dfAkg+v+Q0WOFJ1CCpM6HFvMykYtw5vSdaLxs6gwNmtPowG1wmCHkQ+pcyqppP+IdmVsg==";
       };
     };
-    "gatsby-telemetry-3.15.0" = {
+    "gatsby-telemetry-3.16.0" = {
       name = "gatsby-telemetry";
       packageName = "gatsby-telemetry";
-      version = "3.15.0";
+      version = "3.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.15.0.tgz";
-        sha512 = "pXHnw79qmfN5bAVkgdQMCnq7rZFxfGU1YkZJQAG+gCsLRpDgYxgxZYhkbdRJzyF8vMYiCp7HlNsCMvBA75Rpug==";
+        url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.16.0.tgz";
+        sha512 = "u7s3/VoWwYO7gyqiEn7J1YiNxsdn26WSFL9egFM5jH1IMnj86fiFM4EnDfcaZ5MSTEA1dFqBa6hidwhrpv2rhw==";
       };
     };
     "gauge-1.2.7" = {
@@ -32166,15 +32166,6 @@ let
         sha512 = "wYGVAa8/sh9ggF5qWoOs6eArcAgwEPkDNvf637jHRHkMUznvs7m/Q2vrc0KLN6B8px3nnRJqJcXK4mTK6lLFmg==";
       };
     };
-    "goldengate-11.1.0" = {
-      name = "goldengate";
-      packageName = "goldengate";
-      version = "11.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/goldengate/-/goldengate-11.1.0.tgz";
-        sha512 = "nwrFxarqF2kxQXEzgcfvfqh64eokhcfyPl5i/RXGueRwUUSV7XW64A4BehcPcjKMKMxPM9RZarBTwa4vdnSZMA==";
-      };
-    };
     "goldengate-11.2.1" = {
       name = "goldengate";
       packageName = "goldengate";
@@ -32391,15 +32382,6 @@ let
         sha512 = "8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==";
       };
     };
-    "grammy-1.8.2" = {
-      name = "grammy";
-      packageName = "grammy";
-      version = "1.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grammy/-/grammy-1.8.2.tgz";
-        sha512 = "mD3E/QxYJYfT8jPxWDxJPszVQteMtPoLHAMvXT1EsjEBvxCbrFVg5U3TKaA6Xgl6fhinBcv2yFT6tWw3h+xJzQ==";
-      };
-    };
     "grammy-1.8.3" = {
       name = "grammy";
       packageName = "grammy";
@@ -35595,15 +35577,6 @@ let
         sha512 = "0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ==";
       };
     };
-    "inquirer-8.2.2" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "8.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.2.tgz";
-        sha512 = "pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow==";
-      };
-    };
     "inquirer-8.2.4" = {
       name = "inquirer";
       packageName = "inquirer";
@@ -38187,13 +38160,13 @@ let
         sha512 = "Ni9PffhJtYtdD7VwxH6V2MnievekGfUefosGCHadog0/jAevRu6HPjYeMHbUemn0IPE8d4wGa8UsOGsX+iKy2g==";
       };
     };
-    "jpeg-js-0.4.3" = {
+    "jpeg-js-0.4.4" = {
       name = "jpeg-js";
       packageName = "jpeg-js";
-      version = "0.4.3";
+      version = "0.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.3.tgz";
-        sha512 = "ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==";
+        url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz";
+        sha512 = "WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==";
       };
     };
     "jpeg-turbo-0.4.0" = {
@@ -38602,13 +38575,13 @@ let
         sha512 = "aJgfBwn3srai/4HGwYx5si+W4kuzaQh2/1xCzgpiOKwu/n0UZg0IB7z59IG6HQ/G5Yfu8Mc6AEfjAsi0kj2dbA==";
       };
     };
-    "jsii-srcmak-0.1.581" = {
+    "jsii-srcmak-0.1.583" = {
       name = "jsii-srcmak";
       packageName = "jsii-srcmak";
-      version = "0.1.581";
+      version = "0.1.583";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.581.tgz";
-        sha512 = "Jcq1NJWZ4TaQDm/Awrh5uW8WwyPzLlz4nKEG5yKVCFE3eIBu2X0On39TFDoxWRICNe2bln/0vyja2J/t40mH9g==";
+        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.583.tgz";
+        sha512 = "xuNRWTcnjLqJyEWDY5CBnK4eg5KUXGVkQiTFJs0YQOEfw0MLo5RzHrIlG/XST30wF0vkuPccSHVnjCIpUbGjzQ==";
       };
     };
     "json-bigint-1.0.0" = {
@@ -38899,13 +38872,13 @@ let
         sha512 = "YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA==";
       };
     };
-    "json2jsii-0.3.31" = {
+    "json2jsii-0.3.33" = {
       name = "json2jsii";
       packageName = "json2jsii";
-      version = "0.3.31";
+      version = "0.3.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.31.tgz";
-        sha512 = "KcemeN9+s2gZj7Di2Xp05TSEx1U64SiBvOq91vKlLmRvpWxtL7gGjnOzZhHdlbL4xSUQkufLg/T3ZcoR1ZxmQw==";
+        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.33.tgz";
+        sha512 = "yD0aMAWTRmsdM+n7WyCRg17/TvY/O9+/dI1245scj1nGd1KnK1SJrR307N9G9625+/NzFFc2E87CwPLSAhpg5A==";
       };
     };
     "json3-3.2.6" = {
@@ -40510,15 +40483,6 @@ let
         sha512 = "qKbf39l3k4xoY8ia0uDOvUkw8Zm3hlfiSrZasVdELlo4TJvrfZmHF5YadlWHdYFz9zFEeF4jINL3KQKGcYwliQ==";
       };
     };
-    "lightning-5.8.2" = {
-      name = "lightning";
-      packageName = "lightning";
-      version = "5.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lightning/-/lightning-5.8.2.tgz";
-        sha512 = "ryJlD9qhbUSq4ZS6Q0WXnTgmj3IMqN1iBfUJoGAMzSbSGZAS8E8eejci88naBbbDA0N34hALpSsa5Ok7JayAdQ==";
-      };
-    };
     "lightning-5.9.0" = {
       name = "lightning";
       packageName = "lightning";
@@ -40771,15 +40735,6 @@ let
         sha512 = "gspWk34tDANhjn+brdqZstJMptGiwj4qFNVg0Zey9ds+BUlif+Lgf5szrfOVzZ8gVRkk1Lgbz7i78+V7YK7SCA==";
       };
     };
-    "ln-accounting-5.0.6" = {
-      name = "ln-accounting";
-      packageName = "ln-accounting";
-      version = "5.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-5.0.6.tgz";
-        sha512 = "ep+JDvgqQTINsUskIAlLgXE2mVsR01Atl0kFbd5D41RjCvr6tnTGocKG5CSxmp5USIpQnY2Jan1VQkXjrLukBg==";
-      };
-    };
     "ln-accounting-5.0.7" = {
       name = "ln-accounting";
       packageName = "ln-accounting";
@@ -40843,15 +40798,6 @@ let
         sha512 = "cmPDZUENkwB3Wvef16qvpYgpyEFE8eSpdkf00eMIWgUWqMcw4YYxMYrHlMvq0mELcyzQRmYld5yXUAQdQ43VAw==";
       };
     };
-    "ln-service-53.9.3" = {
-      name = "ln-service";
-      packageName = "ln-service";
-      version = "53.9.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ln-service/-/ln-service-53.9.3.tgz";
-        sha512 = "vB7pnTJveZSMHbyO6qyGbxNqo+rNTYexb3PONon2+Ow4fBUQW5eeBTj+LguuQdN7AgpXX/PHZUQM0TPFeHlVWw==";
-      };
-    };
     "ln-sync-3.12.0" = {
       name = "ln-sync";
       packageName = "ln-sync";
@@ -40870,13 +40816,13 @@ let
         sha512 = "Wr1g/H0Vi322P7oLmSksNJxSgDbmyIAuVwSwHbo+tVpDRdJUSw/RxhRquLdFz/8ienXm2S9ylcaI8e21Xh6xJA==";
       };
     };
-    "ln-telegram-3.21.5" = {
+    "ln-telegram-3.22.1" = {
       name = "ln-telegram";
       packageName = "ln-telegram";
-      version = "3.21.5";
+      version = "3.22.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.21.5.tgz";
-        sha512 = "/x9yM8h9LyHMwZL/mjV95rS6zpKZDgATtSiPwYlsh+ZhAswVk3jcitgLckIJHV6I9kzgZb61ZIbPCk6o530MJQ==";
+        url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.22.1.tgz";
+        sha512 = "chYAssyd0UN97gCIoN1WDm4Ymlhs1xGIIsl9F5QHYV/ogpSZPsWHWyDPnQPMNhC3ik27H+LD5R7YjmQj8fEPlA==";
       };
     };
     "load-bmfont-1.4.1" = {
@@ -42869,13 +42815,13 @@ let
         sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==";
       };
     };
-    "luxon-2.3.2" = {
+    "luxon-2.4.0" = {
       name = "luxon";
       packageName = "luxon";
-      version = "2.3.2";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/luxon/-/luxon-2.3.2.tgz";
-        sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw==";
+        url = "https://registry.npmjs.org/luxon/-/luxon-2.4.0.tgz";
+        sha512 = "w+NAwWOUL5hO0SgwOHsMBAmZ15SoknmQXhSO0hIbJCAmPKSsGeK8MlmhYh2w6Iib38IxN2M+/ooXWLbeis7GuA==";
       };
     };
     "lzma-native-8.0.6" = {
@@ -45812,13 +45758,13 @@ let
         sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==";
       };
     };
-    "mongodb-4.6.0" = {
+    "mongodb-4.7.0" = {
       name = "mongodb";
       packageName = "mongodb";
-      version = "4.6.0";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mongodb/-/mongodb-4.6.0.tgz";
-        sha512 = "1gsxVXmjFTPJ+CkMG9olE4bcVsyY8lBJN9m5B5vj+LZ7wkBqq3PO8RVmNX9GwCBOBz1KV0zM00vPviUearSv7A==";
+        url = "https://registry.npmjs.org/mongodb/-/mongodb-4.7.0.tgz";
+        sha512 = "HhVar6hsUeMAVlIbwQwWtV36iyjKd9qdhY+s4wcU8K6TOj4Q331iiMy+FoPuxEntDIijTYWivwFJkLv8q/ZgvA==";
       };
     };
     "mongodb-connection-string-url-2.5.2" = {
@@ -50440,15 +50386,6 @@ let
         sha512 = "RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw==";
       };
     };
-    "p2tr-1.3.0" = {
-      name = "p2tr";
-      packageName = "p2tr";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p2tr/-/p2tr-1.3.0.tgz";
-        sha512 = "LdnkVwu808S7ngeKpUjJZDWXsWXqMLYtTGE2pXtKjpIs5Nn2qL6d84Sh+/gxyeJHtTz0qmOEuYnFfn61/TuU0A==";
-      };
-    };
     "p2tr-1.3.1" = {
       name = "p2tr";
       packageName = "p2tr";
@@ -50980,13 +50917,13 @@ let
         sha512 = "1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==";
       };
     };
-    "parse-path-4.0.3" = {
+    "parse-path-4.0.4" = {
       name = "parse-path";
       packageName = "parse-path";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.3.tgz";
-        sha512 = "9Cepbp2asKnWTJ9x2kpw6Fe8y9JDbqwahGCTvklzd/cEq5C5JC59x2Xb0Kx+x0QZ8bvNquGO8/BWP0cwBHzSAA==";
+        url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.4.tgz";
+        sha512 = "Z2lWUis7jlmXC1jeOG9giRO2+FsuyNipeQ43HAjqAZjwSe3SEf+q/84FGPHoso3kyntbxa4c4i77t3m6fGf8cw==";
       };
     };
     "parse-png-2.1.0" = {
@@ -55273,13 +55210,13 @@ let
         sha512 = "U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA==";
       };
     };
-    "puppeteer-14.2.1" = {
+    "puppeteer-14.3.0" = {
       name = "puppeteer";
       packageName = "puppeteer";
-      version = "14.2.1";
+      version = "14.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-14.2.1.tgz";
-        sha512 = "cIEsAbEbNYqHbkvdZY4+YSdxVwh4YFqOHSezuLpu46XAYlKkQeAMdJQ+mDAxg9v77gIn8PHJ6PlftIVsWKRACA==";
+        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-14.3.0.tgz";
+        sha512 = "pDtg1+vyw1UPIhUjh2/VW1HUdQnaZJHfMacrJciR3AVm+PBiqdCEcFeFb3UJ/CDEQlHOClm3/WFa7IjY25zIGg==";
       };
     };
     "purest-3.1.0" = {
@@ -55498,6 +55435,15 @@ let
         sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==";
       };
     };
+    "qs-6.10.5" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.10.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.10.5.tgz";
+        sha512 = "O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ==";
+      };
+    };
     "qs-6.2.3" = {
       name = "qs";
       packageName = "qs";
@@ -56449,7 +56395,7 @@ let
       version = "1.0.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/read/-/read-1.0.5.tgz";
-        sha1 = "007a3d169478aa710a491727e453effb92e76203";
+        sha512 = "hDLATrzYLoMu23c/69pMC6u3fO3Y0qLTIygJkEZHLOn+AO2gSapu6QgrgwX9ehyVtaRoZVZbF4IuiZPPRdGgdg==";
       };
     };
     "read-1.0.7" = {
@@ -56458,7 +56404,7 @@ let
       version = "1.0.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz";
-        sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
+        sha512 = "rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==";
       };
     };
     "read-all-stream-3.1.0" = {
@@ -56467,7 +56413,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz";
-        sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
+        sha512 = "DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w==";
       };
     };
     "read-cache-1.0.0" = {
@@ -56476,7 +56422,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz";
-        sha1 = "e664ef31161166c9751cdbe8dbcf86b5fb58f774";
+        sha512 = "Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==";
       };
     };
     "read-chunk-2.1.0" = {
@@ -56485,7 +56431,7 @@ let
       version = "2.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-chunk/-/read-chunk-2.1.0.tgz";
-        sha1 = "6a04c0928005ed9d42e1a6ac5600e19cbc7ff655";
+        sha512 = "QQqB2O9KX/BnztP1xkTRsBxABcWHCXTqQYmEm/DdNId1nw+leKkZvV/g5oCKUrXolGtU3zouoIxMLToAYyDgDw==";
       };
     };
     "read-chunk-3.2.0" = {
@@ -56530,7 +56476,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-metadata/-/read-metadata-1.0.0.tgz";
-        sha1 = "6df9cbe51184e8ceb7d0668b40ee5191e6f3dac6";
+        sha512 = "XJdiOrkzOlIac9vXNvgp/4I8qj9EPuHlbf/eoX2rusLFjdKjp0TQ82V3cj+AFjXBzzoZ1TaqAtHnGsR3UdO1Gw==";
       };
     };
     "read-only-stream-2.0.0" = {
@@ -56539,7 +56485,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz";
-        sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0";
+        sha512 = "3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w==";
       };
     };
     "read-package-json-3.0.1" = {
@@ -56584,7 +56530,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz";
-        sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28";
+        sha512 = "7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==";
       };
     };
     "read-pkg-2.0.0" = {
@@ -56593,7 +56539,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
-        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
+        sha512 = "eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA==";
       };
     };
     "read-pkg-3.0.0" = {
@@ -56602,7 +56548,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz";
-        sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389";
+        sha512 = "BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==";
       };
     };
     "read-pkg-5.2.0" = {
@@ -56629,7 +56575,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz";
-        sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02";
+        sha512 = "WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==";
       };
     };
     "read-pkg-up-2.0.0" = {
@@ -56638,7 +56584,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
-        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+        sha512 = "1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w==";
       };
     };
     "read-pkg-up-3.0.0" = {
@@ -56647,7 +56593,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz";
-        sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07";
+        sha512 = "YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==";
       };
     };
     "read-pkg-up-4.0.0" = {
@@ -56692,7 +56638,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz";
-        sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4";
+        sha512 = "El0AJ9aGxDbvoPzWx9rlD84bzmrhdoxytBbN4R4+fb9Wjx2UHdY9ghDTQPIFYw/eL7KwaKgyrTv2iH6IvCk3Ig==";
       };
     };
     "readable-stream-1.0.27-1" = {
@@ -56701,7 +56647,7 @@ let
       version = "1.0.27-1";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
-        sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
+        sha512 = "uQE31HGhpMrqZwtDjRliOs2aC3XBi+DdkhLs+Xa0dvVD5eDiZr3+k8rKVZcyTzxosgtMw7B/twQsK3P1KTZeVg==";
       };
     };
     "readable-stream-1.0.34" = {
@@ -56710,7 +56656,7 @@ let
       version = "1.0.34";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz";
-        sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
+        sha512 = "ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==";
       };
     };
     "readable-stream-1.1.14" = {
@@ -56719,7 +56665,7 @@ let
       version = "1.1.14";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
-        sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
+        sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==";
       };
     };
     "readable-stream-2.0.6" = {
@@ -56728,7 +56674,7 @@ let
       version = "2.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
-        sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
+        sha512 = "TXcFfb63BQe1+ySzsHZI/5v1aJPCShfqvWJ64ayNImXMsN1Cd0YGk/wm8KB7/OeessgPc9QvS9Zou8QTkFzsLw==";
       };
     };
     "readable-stream-2.3.0" = {
@@ -56827,7 +56773,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz";
-        sha1 = "c580d77ef2cfc8752b132498060dc9793a7ac01c";
+        sha512 = "k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==";
       };
     };
     "readline-sync-1.4.10" = {
@@ -56845,7 +56791,7 @@ let
       version = "0.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz";
-        sha1 = "99443ba6e83b830ef3051bfd7dc241a82728d568";
+        sha512 = "qs8GGG+hLGMaDOGjd+mDglDoYcHDkjIY7z5RU0/ApsGT0qypyrWskNeemUqD+UxIXiZoMYT5aLwGp4ehoyZhIg==";
       };
     };
     "readline2-1.0.1" = {
@@ -56854,7 +56800,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz";
-        sha1 = "41059608ffc154757b715d9989d199ffbf372e35";
+        sha512 = "8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g==";
       };
     };
     "real-require-0.1.0" = {
@@ -56872,7 +56818,7 @@ let
       version = "0.10.43";
       src = fetchurl {
         url = "https://registry.npmjs.org/recast/-/recast-0.10.43.tgz";
-        sha1 = "b95d50f6d60761a5f6252e15d80678168491ce7f";
+        sha512 = "GC1g4P336t8WOpzVGFOo83m14xQfHbVqe+eDus+4oubobkWb/kONwMWSG6+K3BUtBOoUdUU+GT9kmNCSOBv9+g==";
       };
     };
     "recast-0.11.23" = {
@@ -56881,7 +56827,7 @@ let
       version = "0.11.23";
       src = fetchurl {
         url = "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz";
-        sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3";
+        sha512 = "+nixG+3NugceyR8O1bLU45qs84JgI3+8EauyRZafLgC9XbdAOIVgwV1Pe2da0YzGo62KzWoZwUpVEQf6qNAXWA==";
       };
     };
     "recast-0.17.2" = {
@@ -56908,7 +56854,7 @@ let
       version = "0.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz";
-        sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
+        sha512 = "HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==";
       };
     };
     "rechoir-0.7.1" = {
@@ -56944,7 +56890,7 @@ let
       version = "1.0.6";
       src = fetchurl {
         url = "https://registry.npmjs.org/recursive-readdir-sync/-/recursive-readdir-sync-1.0.6.tgz";
-        sha1 = "1dbf6d32f3c5bb8d3cde97a6c588d547a9e13d56";
+        sha512 = "QhkBh/V7T3L2m8FrwZEZ/VnSZU35bv7DSy/VlKVfcq10zvwwuxeuDLH7DZYFGHFyXefHchZmsHFLELR7poGjog==";
       };
     };
     "recursive-watch-1.1.4" = {
@@ -56962,7 +56908,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz";
-        sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde";
+        sha512 = "qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==";
       };
     };
     "redent-2.0.0" = {
@@ -56971,7 +56917,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz";
-        sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa";
+        sha512 = "XNwrTx77JQCEMXTeb8movBKuK75MgH0RZkujNuDKCezemx/voapl9i2gCSi8WWm8+ox5ycJi1gxF22fR7c0Ciw==";
       };
     };
     "redent-3.0.0" = {
@@ -56998,7 +56944,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz";
-        sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b";
+        sha512 = "FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==";
       };
     };
     "redis-3.1.1" = {
@@ -57034,7 +56980,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz";
-        sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad";
+        sha512 = "1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==";
       };
     };
     "redis-parser-3.0.0" = {
@@ -57043,7 +56989,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz";
-        sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4";
+        sha512 = "DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==";
       };
     };
     "redoc-2.0.0-rc.72" = {
@@ -57061,7 +57007,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
-        sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da";
+        sha512 = "y0wyCcdQul3hI3xHfIs0vg/jSbboQc/YTOAqaxjFG7At+XSexduuOqBVL9SmOLSwa/ldkbzVzdwuk9s2EKTAZg==";
       };
     };
     "reduce-flatten-1.0.1" = {
@@ -57070,7 +57016,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz";
-        sha1 = "258c78efd153ddf93cb561237f61184f3696e327";
+        sha512 = "j5WfFJfc9CoXv/WbwVLHq74i/hdTUpy+iNC534LxczMRP67vJeK3V9JOdnL0N1cIRbn9mYhE2yVjvvKXDxvNXQ==";
       };
     };
     "redux-3.7.2" = {
@@ -57241,7 +57187,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/register-protocol-win32/-/register-protocol-win32-1.1.0.tgz";
-        sha1 = "ac961c69caaa2d609eec368aa0e4daf81a2dfee3";
+        sha512 = "Ca1loTkt5v1zZYBOCHDLiw21A/68iWbukmoCqauoczcXOBz14U8/tBeTa78ftdmrk7TgJIjLqbq5B8w3MettlQ==";
       };
     };
     "registry-auth-token-3.3.2" = {
@@ -57277,7 +57223,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
-        sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
+        sha512 = "ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA==";
       };
     };
     "registry-url-5.1.0" = {
@@ -57367,7 +57313,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz";
-        sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
+        sha512 = "QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==";
       };
     };
     "relateurl-0.2.7" = {
@@ -57376,7 +57322,7 @@ let
       version = "0.2.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz";
-        sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9";
+        sha512 = "G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==";
       };
     };
     "relative-3.0.2" = {
@@ -57385,7 +57331,7 @@ let
       version = "3.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/relative/-/relative-3.0.2.tgz";
-        sha1 = "0dcd8ec54a5d35a3c15e104503d65375b5a5367f";
+        sha512 = "Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA==";
       };
     };
     "relative-url-1.0.2" = {
@@ -57394,7 +57340,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/relative-url/-/relative-url-1.0.2.tgz";
-        sha1 = "d21c52a72d6061018bcee9f9c9fc106bf7d65287";
+        sha512 = "jI1AmBVFFMXwQ3I6tIYVmVOjy8f+ogHbqkeb8/LL9tszEQiTV8I0l8XT4oEomUOoxfm698f92gYlNKeA/9LJVQ==";
       };
     };
     "relaxed-json-1.0.3" = {
@@ -57421,7 +57367,7 @@ let
       version = "3.2.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/remark/-/remark-3.2.3.tgz";
-        sha1 = "802a38c3aa98c9e1e3ea015eeba211d27cb65e1f";
+        sha512 = "E+WibagMmLjs7y5d6qWRiwbL2/z0zbkLwCqvmNlxBTx2Y1ufZ06sir+ZdyQXTxDiEbkbsrX6kG883ItjrEkaSQ==";
       };
     };
     "remark-footnotes-3.0.0" = {
@@ -57484,7 +57430,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/remark-html/-/remark-html-2.0.2.tgz";
-        sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92";
+        sha512 = "2yj8Oad44uo/IWOssZs3Y4AvfrA9nGZqiHsL7ePyZuntPKjtljHZDcroljlQQ+sJryO3Bjnnj30e7wi8aTp/hQ==";
       };
     };
     "remark-lint-8.0.0" = {
@@ -58051,7 +57997,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz";
-        sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523";
+        sha512 = "wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==";
       };
     };
     "remove-markdown-0.1.0" = {
@@ -58060,7 +58006,7 @@ let
       version = "0.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/remove-markdown/-/remove-markdown-0.1.0.tgz";
-        sha1 = "cf8b66e9e6fcb4acc9721048adeee7a357698ba9";
+        sha512 = "MQ7eQbVShqsGdx4rO1wg0THlPUUKYGWDATsk7od6oH0FuPYUNW+yu/MUMluV5v+eKyJBlqcW4xBb8fZNS1ch6g==";
       };
     };
     "remove-trailing-separator-1.1.0" = {
@@ -58069,7 +58015,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz";
-        sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
+        sha512 = "/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==";
       };
     };
     "remove-trailing-slash-0.1.1" = {
@@ -58114,7 +58060,7 @@ let
       version = "1.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
-        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
+        sha512 = "PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==";
       };
     };
     "repeating-1.1.3" = {
@@ -58123,7 +58069,7 @@ let
       version = "1.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
-        sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
+        sha512 = "Nh30JLeMHdoI+AsQ5eblhZ7YlTsM9wiJQe/AHIunlK3KWzvXhXb36IJ7K1IOeRjIOtzMjdUHjwXUFxKJoPTSOg==";
       };
     };
     "repeating-2.0.1" = {
@@ -58132,7 +58078,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz";
-        sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
+        sha512 = "ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==";
       };
     };
     "replace-buffer-1.2.1" = {
@@ -58150,7 +58096,7 @@ let
       version = "0.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz";
-        sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924";
+        sha512 = "AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==";
       };
     };
     "replace-ext-1.0.0" = {
@@ -58159,7 +58105,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz";
-        sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb";
+        sha512 = "vuNYXC7gG7IeVNBC1xUllqCcZKRbJoSPOBhnTEcAIiKCsbuef6zO3F0Rve3isPMMoNoQRWjQwbAgAjHUHniyEA==";
       };
     };
     "replace-ext-1.0.1" = {
@@ -58177,7 +58123,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz";
-        sha1 = "e87f6d513b928dde808260c12be7fec6ff6e798c";
+        sha512 = "CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==";
       };
     };
     "request-2.76.0" = {
@@ -58186,7 +58132,7 @@ let
       version = "2.76.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/request/-/request-2.76.0.tgz";
-        sha1 = "be44505afef70360a0436955106be3945d95560e";
+        sha512 = "oAqKWlLKtLtHlLa/dxjQ0Q03rXvGeNd4Kdj63cIbxmi2VulqWTuccD5V8a7GtI3QjtJ9294dltpp4PMBokIsww==";
       };
     };
     "request-2.81.0" = {
@@ -58195,7 +58141,7 @@ let
       version = "2.81.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
-        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
+        sha512 = "IZnsR7voF0miGSu29EXPRgPTuEsI/+aibNSBbN1pplrfartF5wDYGADz3iD9vmBVf2r00rckWZf8BtS5kk7Niw==";
       };
     };
     "request-2.88.0" = {
@@ -58222,7 +58168,7 @@ let
       version = "2.9.203";
       src = fetchurl {
         url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz";
-        sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
+        sha512 = "OWtna9w7yRI/gcfu3VaURgIwE1FHgbz5+fHGQ9GJTHcJ4+uvHnDjXd+N7mVDOv5+1fp1CRPzUSY2wcM345Z2Fw==";
       };
     };
     "request-as-curl-0.1.0" = {
@@ -58231,7 +58177,7 @@ let
       version = "0.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/request-as-curl/-/request-as-curl-0.1.0.tgz";
-        sha1 = "f017ac5b2060e1c4fc9677575c381a08249d5bf7";
+        sha512 = "dl51G1i9HLy2TGuNoBqYvo1qWV6dmMJtO8Z7ua7SrHBTpxoz9IR+bOlYUxGKzM27VaSeNN06xAJSIKG6CjnUNg==";
       };
     };
     "request-compose-1.2.3" = {
@@ -58285,7 +58231,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
-        sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
+        sha512 = "dxdraeZVUNEn9AvLrxkgB2k6buTlym71dJk1fk4v8j3Ou3RKNm07BcgbHdj2lLgYGfqX71F+awb1MR+tWPFJzA==";
       };
     };
     "request-promise-4.2.6" = {
@@ -58330,7 +58276,7 @@ let
       version = "2.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
-        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+        sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==";
       };
     };
     "require-from-string-2.0.2" = {
@@ -58357,7 +58303,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+        sha512 = "IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==";
       };
     };
     "require-main-filename-2.0.0" = {
@@ -58375,7 +58321,7 @@ let
       version = "0.8.7";
       src = fetchurl {
         url = "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz";
-        sha1 = "7999539fc9e047a37928fa196f8e1563dabd36de";
+        sha512 = "AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg==";
       };
     };
     "require-uncached-1.0.3" = {
@@ -58384,7 +58330,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz";
-        sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3";
+        sha512 = "Xct+41K3twrbBHdxAgMoOS+cNcoqIjfM2/VxBF4LL2hVph7YsF8VSKyQ3BDFZwEVbok9yeDl2le/qo0S77WG2w==";
       };
     };
     "requireg-0.2.2" = {
@@ -58411,7 +58357,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz";
-        sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
+        sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==";
       };
     };
     "requizzle-0.2.3" = {
@@ -58423,13 +58369,13 @@ let
         sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==";
       };
     };
-    "reselect-4.1.5" = {
+    "reselect-4.1.6" = {
       name = "reselect";
       packageName = "reselect";
-      version = "4.1.5";
+      version = "4.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/reselect/-/reselect-4.1.5.tgz";
-        sha512 = "uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ==";
+        url = "https://registry.npmjs.org/reselect/-/reselect-4.1.6.tgz";
+        sha512 = "ZovIuXqto7elwnxyXbBtCPo9YFEr3uJqj2rRbcOOog1bmu2Ag85M4hixSwFWyaBMKXNgvPaJ9OSu9SkBPIeJHQ==";
       };
     };
     "reserved-words-0.1.2" = {
@@ -58438,7 +58384,7 @@ let
       version = "0.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz";
-        sha1 = "00a0940f98cd501aeaaac316411d9adc52b31ab1";
+        sha512 = "0S5SrIUJ9LfpbVl4Yzij6VipUdafHrOTzvmfazSw/jeZrZtQK303OPZW+obtkaw7jQlTQppy0UvZWm9872PbRw==";
       };
     };
     "resize-observer-polyfill-1.5.1" = {
@@ -58483,7 +58429,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz";
-        sha1 = "00a9f7387556e27038eae232caa372a6a59b665a";
+        sha512 = "ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg==";
       };
     };
     "resolve-cwd-3.0.0" = {
@@ -58501,7 +58447,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz";
-        sha1 = "79a40644c362be82f26effe739c9bb5382046f43";
+        sha512 = "R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==";
       };
     };
     "resolve-from-1.0.1" = {
@@ -58510,7 +58456,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz";
-        sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226";
+        sha512 = "kT10v4dhrlLNcnO084hEjvXCI1wUG9qZLoz2RogxqDQQYy7IxjI/iMUkOtQTNEh6rzHxvdQWHsJyel1pKOVCxg==";
       };
     };
     "resolve-from-2.0.0" = {
@@ -58519,7 +58465,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz";
-        sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57";
+        sha512 = "qpFcKaXsq8+oRoLilkwyc7zHGF5i9Q2/25NIgLQQ/+VVv9rU4qvr6nXVAw1DsnXJyQkZsR4Ytfbtg5ehfcUssQ==";
       };
     };
     "resolve-from-3.0.0" = {
@@ -58528,7 +58474,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz";
-        sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748";
+        sha512 = "GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==";
       };
     };
     "resolve-from-4.0.0" = {
@@ -58564,7 +58510,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz";
-        sha1 = "32bb9e39c06d67338dc9378c0d6d6074566ad131";
+        sha512 = "NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==";
       };
     };
     "resolve-package-1.0.1" = {
@@ -58573,7 +58519,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve-package/-/resolve-package-1.0.1.tgz";
-        sha1 = "686f70b188bd7d675f5bbc4282ccda060abb9d27";
+        sha512 = "rzB7NnQpOkPHBWFPP3prUMqOP6yg3HkRGgcvR+lDyvyHoY3fZLFLYDkPXh78SPVBAE6VTCk/V+j8we4djg6o4g==";
       };
     };
     "resolve-path-1.4.0" = {
@@ -58582,7 +58528,7 @@ let
       version = "1.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve-path/-/resolve-path-1.4.0.tgz";
-        sha1 = "c4bda9f5efb2fce65247873ab36bb4d834fe16f7";
+        sha512 = "i1xevIst/Qa+nA9olDxLWnLk8YZbi8R/7JPbCMcgyWaFR6bKWaexgJgEB5oc2PKMjYdrHynyz0NY+if+H98t1w==";
       };
     };
     "resolve-protobuf-schema-2.1.0" = {
@@ -58600,7 +58546,7 @@ let
       version = "0.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz";
-        sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a";
+        sha512 = "ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==";
       };
     };
     "resp-modifier-6.0.2" = {
@@ -58609,7 +58555,7 @@ let
       version = "6.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz";
-        sha1 = "b124de5c4fbafcba541f48ffa73970f4aa456b4f";
+        sha512 = "U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw==";
       };
     };
     "responselike-1.0.2" = {
@@ -58618,7 +58564,7 @@ let
       version = "1.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz";
-        sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7";
+        sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==";
       };
     };
     "responselike-2.0.0" = {
@@ -58636,7 +58582,7 @@ let
       version = "4.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/restify/-/restify-4.0.3.tgz";
-        sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc";
+        sha512 = "Wj+p3Y+5KFv+bzb7X+4H+RKaITS7y84xhR8KH1BfytpX6K1mnUVDqq2Kp0/jk/awSDQrWrkLtf0gzWfsmT1zcg==";
       };
     };
     "restify-clients-1.5.2" = {
@@ -58645,7 +58591,7 @@ let
       version = "1.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/restify-clients/-/restify-clients-1.5.2.tgz";
-        sha1 = "d4b13d82f287e77e2eb5daae14e6ef8534aa7389";
+        sha512 = "y4aJHEdQnAmQ8MyAuGSfVJCjAdArjPC5lmMTiWT1zDWi7GHQ1vTDoRng76mYZo1ev7bzd5YY/F3W3O/RRH//nQ==";
       };
     };
     "restify-clients-1.6.0" = {
@@ -58654,7 +58600,7 @@ let
       version = "1.6.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/restify-clients/-/restify-clients-1.6.0.tgz";
-        sha1 = "1eaac176185162104dcc546f944950b70229f8e5";
+        sha512 = "q5kF/KHkwC10PhEjZkgQnWCIVCq5rlKF+fbqjl51e28ArkztJNI5czFzwCd/4Qz3HRrfwidk1XcAKLxY75dT6w==";
       };
     };
     "restify-errors-3.0.0" = {
@@ -58663,7 +58609,7 @@ let
       version = "3.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/restify-errors/-/restify-errors-3.0.0.tgz";
-        sha1 = "3b17177d43954acece4291465a97ce1b58cf3d57";
+        sha512 = "FvaN/X/a8uz1MJ9o/VsdHZ+GSbRoWdye8mUxpBab+U+tsXu5LZ5ywF/not/b0QnA6A3SBIPmiForlaXnMGRnNQ==";
       };
     };
     "restify-errors-3.1.0" = {
@@ -58672,7 +58618,7 @@ let
       version = "3.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/restify-errors/-/restify-errors-3.1.0.tgz";
-        sha1 = "06b5479477874c0856d782a12c8707dcdad53f16";
+        sha512 = "4RDQs4zirMPXH03y5LKIFoAs+LvO9HTd5Ig4KfD5h4yRtTC5aWK/F2L1g9O2CSjTsgNIc+d0ib0f1rSob3FjNg==";
       };
     };
     "restore-cursor-1.0.1" = {
@@ -58681,7 +58627,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz";
-        sha1 = "34661f46886327fed2991479152252df92daa541";
+        sha512 = "reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==";
       };
     };
     "restore-cursor-2.0.0" = {
@@ -58690,7 +58636,7 @@ let
       version = "2.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
-        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
+        sha512 = "6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==";
       };
     };
     "restore-cursor-3.1.0" = {
@@ -58717,7 +58663,7 @@ let
       version = "0.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz";
-        sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759";
+        sha512 = "Fn9X8rX8yYF4m81rZCK/5VmrmsSbqS/i3rDLl6ZZHAXgC2nTAx3dhwG8q8odP/RmdLa2YrybDJaAMg+X1ajY3w==";
       };
     };
     "ret-0.1.15" = {
@@ -58807,7 +58753,7 @@ let
       version = "0.10.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
-        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
+        sha512 = "ZXUSQYTHdl3uS7IuCehYfMzKyIDBNoAuUblvy5oGO5UJSUTmStUUVPXbA9Qxd173Bgre53yCQczQuHgRWAdvJQ==";
       };
     };
     "retry-0.12.0" = {
@@ -58816,7 +58762,7 @@ let
       version = "0.12.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz";
-        sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b";
+        sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==";
       };
     };
     "retry-0.13.1" = {
@@ -58834,7 +58780,7 @@ let
       version = "0.6.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/retry/-/retry-0.6.1.tgz";
-        sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
+        sha512 = "txv1qsctZq8ei9J/uCXgaKKFPjlBB0H2hvtnzw9rjKWFNUFtKh59WprXxpAeAey3/QeWwHdxMFqStPaOAgy+dA==";
       };
     };
     "retry-0.9.0" = {
@@ -58843,7 +58789,7 @@ let
       version = "0.9.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz";
-        sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d";
+        sha512 = "bkzdIZ5Xyim12j0jq6CQAHpfdsa2VqieWF6eN8vT2MXxCxLAZhgVUyu5EEMevJyXML+XWTxVbZ7mLaKx5F/DZw==";
       };
     };
     "retry-request-4.2.2" = {
@@ -58870,7 +58816,7 @@ let
       version = "0.1.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
-        sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
+        sha512 = "xcBILK2pA9oh4SiinPEZfhP8HfrB/ha+a2fTMyl7Om2WjlDVrOQy99N2MXXlUHqGJz4qEu2duXxHJjDWuK/0xg==";
       };
     };
     "reveal.js-4.3.1" = {
@@ -58888,7 +58834,7 @@ let
       version = "1.3.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/reverse-http/-/reverse-http-1.3.0.tgz";
-        sha1 = "61a9644bdea483aa281ffb62706e642f1a73a239";
+        sha512 = "Bf9dO6G+st4L0Qj0qliH0djWf2w6NY5ijOyYQpMOZduS6kw+7xAZ3Li6ApISbSeIhpGVNgr+MpF5B0kuXwt2gg==";
       };
     };
     "rfc-3986-1.0.1" = {
@@ -58897,7 +58843,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/rfc-3986/-/rfc-3986-1.0.1.tgz";
-        sha1 = "eeeb88342fadbe8027c0f36ada921a13e6f96206";
+        sha512 = "4LMcbvBonVhsufIwa7Po+HhK0rznNyvQxIG/14/wTm7W88eFQy1jU+T7i5afaWOQ53czEJlaI3ua9pzZtqXE0w==";
       };
     };
     "rfdc-1.3.0" = {
@@ -58915,7 +58861,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz";
-        sha1 = "c0e0d6882df0e23be254a475e8edd41915feaeb1";
+        sha512 = "gDK5mkALDFER2YLqH6imYvK6g02gpNGM4ILDZ472EwWfXZnC2ZEpoB2ECXTyOVUKuk/bPJZMzwQPBYICzP+D3w==";
       };
     };
     "rgba-regex-1.0.0" = {
@@ -58924,7 +58870,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz";
-        sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3";
+        sha512 = "zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==";
       };
     };
     "rgbcolor-1.0.1" = {
@@ -58933,7 +58879,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz";
-        sha1 = "d6505ecdb304a6595da26fa4b43307306775945d";
+        sha512 = "9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==";
       };
     };
     "right-align-0.1.3" = {
@@ -58942,7 +58888,7 @@ let
       version = "0.1.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
-        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+        sha512 = "yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==";
       };
     };
     "right-pad-1.0.1" = {
@@ -58951,7 +58897,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz";
-        sha1 = "8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0";
+        sha512 = "bYBjgxmkvTAfgIYy328fmkwhp39v8lwVgWhhrzxPV3yHtcSqyYKe9/XOhvW48UFjATg3VuJbpsp5822ACNvkmw==";
       };
     };
     "rimraf-2.2.8" = {
@@ -58960,7 +58906,7 @@ let
       version = "2.2.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
-        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+        sha512 = "R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==";
       };
     };
     "rimraf-2.4.4" = {
@@ -58969,7 +58915,7 @@ let
       version = "2.4.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz";
-        sha1 = "b528ce2ebe0e6d89fb03b265de11d61da0dbcf82";
+        sha512 = "vM55sE6DOvNEHSEIQ7uCej02DKQYcGdnl1ToNfGy9t2jNrfNYcP5OwSkdeDXEpMtDqHEEFOORhvP0jA3/kBk1w==";
       };
     };
     "rimraf-2.4.5" = {
@@ -58978,7 +58924,7 @@ let
       version = "2.4.5";
       src = fetchurl {
         url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
-        sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
+        sha512 = "J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==";
       };
     };
     "rimraf-2.6.3" = {
@@ -59041,7 +58987,7 @@ let
       version = "1.2.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz";
-        sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c";
+        sha512 = "fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw==";
       };
     };
     "rng-0.2.2" = {
@@ -59050,7 +58996,7 @@ let
       version = "0.2.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/rng/-/rng-0.2.2.tgz";
-        sha1 = "df43e80d9bc82ad4430bcfef03f49c717e8b2e8c";
+        sha512 = "3F/A3swXdqb4JLpF22zwlCllyXlUWEE3T35GzJ+Vvtx4HnUYVAXovaK2TyUC04UlpxdVxB+E7HaKdDrGeOcJuA==";
       };
     };
     "roarr-2.15.4" = {
@@ -59095,7 +59041,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/root-check/-/root-check-1.0.0.tgz";
-        sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697";
+        sha512 = "lt1ts72QmU7jh1DlOJqFN/le/aiRGAbchSSMhNpLQubDWPEOe0YKCcrhprkgyMxxFAcrEhyfTTUfc+Dj/bo4JA==";
       };
     };
     "round-to-6.0.0" = {
@@ -59113,7 +59059,7 @@ let
       version = "0.6.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/router/-/router-0.6.2.tgz";
-        sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d";
+        sha512 = "tTMBCMVSP+sfSQyBbFrUuVPfxfKBhy6Hciz/SttYRxKteFqjPljrH2GqXoPSCOeubSgxPDRAbQOCvQzp2hNTOA==";
       };
     };
     "router-1.3.7" = {
@@ -59131,7 +59077,7 @@ let
       version = "1.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/router-ips/-/router-ips-1.0.0.tgz";
-        sha1 = "44e00858ebebc0133d58e40b2cd8a1fbb04203f5";
+        sha512 = "yBo6F52Un/WYioXbedBGvrKIiofbwt+4cUhdqDb9fNMJBI4D4jOy7jlxxaRVEvICPKU7xMmJDtDFR6YswX/sFQ==";
       };
     };
     "rss-parser-3.12.0" = {
@@ -59176,7 +59122,7 @@ let
       version = "4.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/rttc/-/rttc-4.5.2.tgz";
-        sha1 = "ba6a3e92898b4274f123bbac49485d7616a37cbc";
+        sha512 = "6zLypmR2nKV20f9MHIsdR3+P8l7k4CxzKRn7nI/6Wlt5h4K8Gu64mXGTjaRAo/Cr8UVGRWdeFOtvpzixgA7SSA==";
       };
     };
     "rttc-7.4.0" = {
@@ -59185,7 +59131,7 @@ let
       version = "7.4.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/rttc/-/rttc-7.4.0.tgz";
-        sha1 = "bc9cacd46add923deb62495a01934eb7ef619fb4";
+        sha512 = "IcG+W2xwl+Ywsupu1ytLTtgnOz4PDOFJeTeSB2jG+xDTpBCFSf4tBGsS+VijwEJEXdJZ6+/3sYZuOv7KTX29Sw==";
       };
     };
     "run-async-0.1.0" = {
@@ -59194,7 +59140,7 @@ let
       version = "0.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz";
-        sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389";
+        sha512 = "qOX+w+IxFgpUpJfkv2oGN0+ExPs68F4sZHfaRRx4dDexAQkG83atugKVEylyT5ARees3HBbfmuvnjbrd8j9Wjw==";
       };
     };
     "run-async-2.4.1" = {
@@ -59239,7 +59185,7 @@ let
       version = "1.0.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz";
-        sha1 = "e848396f057d223f24386924618e25694161ec47";
+        sha512 = "ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==";
       };
     };
     "run-series-1.1.9" = {
@@ -59266,7 +59212,7 @@ let
       version = "0.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/rw/-/rw-0.1.4.tgz";
-        sha1 = "4903cbd80248ae0ede685bf58fd236a7a9b29a3e";
+        sha512 = "vSj3D96kMcjNyqPcp65wBRIDImGSrUuMxngNNxvw8MQaO+aQ6llzRPH7XcJy5zrpb3wU++045+Uz/IDIM684iw==";
       };
     };
     "rw-1.3.3" = {
@@ -59275,7 +59221,7 @@ let
       version = "1.3.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz";
-        sha1 = "3f862dfa91ab766b14885ef4d01124bfda074fb4";
+        sha512 = "PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==";
       };
     };
     "rwlock-5.0.0" = {
@@ -59284,7 +59230,7 @@ let
       version = "5.0.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/rwlock/-/rwlock-5.0.0.tgz";
-        sha1 = "888d6a77a3351cc1a209204ef2ee1722093836cf";
+        sha512 = "XgzRqLMfCcm9QfZuPav9cV3Xin5TRcIlp4X/SH3CvB+x5D2AakdlEepfJKDd8ByncvfpcxNWdRZVUl38PS6ZJg==";
       };
     };
     "rx-2.5.3" = {
@@ -59293,7 +59239,7 @@ let
       version = "2.5.3";
       src = fetchurl {
         url = "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz";
-        sha1 = "21adc7d80f02002af50dae97fd9dbf248755f566";
+        sha512 = "u5qvfulb7NXoY/+OE28920WEgFi6aiDjf5iF9rA2f9tBXejLgTLd0WxkclvIQWjFFHfNJlb7pSTsrjgiDh+Uug==";
       };
     };
     "rx-4.1.0" = {
@@ -59302,7 +59248,7 @@ let
       version = "4.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz";
-        sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782";
+        sha512 = "CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==";
       };
     };
     "rx-lite-3.1.2" = {
@@ -59311,7 +59257,7 @@ let
       version = "3.1.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz";
-        sha1 = "19ce502ca572665f3b647b10939f97fd1615f102";
+        sha512 = "1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ==";
       };
     };
     "rx-lite-4.0.8" = {
@@ -59320,7 +59266,7 @@ let
       version = "4.0.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz";
-        sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444";
+        sha512 = "Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==";
       };
     };
     "rx-lite-aggregates-4.0.8" = {
@@ -59329,7 +59275,7 @@ let
       version = "4.0.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz";
-        sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be";
+        sha512 = "3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg==";
       };
     };
     "rxjs-5.5.12" = {
@@ -59365,7 +59311,7 @@ let
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/s3-stream-upload/-/s3-stream-upload-2.0.2.tgz";
-        sha1 = "60342f12d4aa06ea8f389fb761a5393aedca017f";
+        sha512 = "hSfGZ4InIUMH29niWCAkcDvmOGwADSy7j2Ktm6+nKI+ub6nPoLOboo1D+Q3mEIutTHu0J4+Sv92J0GOk5hAonQ==";
       };
     };
     "s3signed-0.1.0" = {
@@ -59374,7 +59320,7 @@ let
       version = "0.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/s3signed/-/s3signed-0.1.0.tgz";
-        sha1 = "ae03b86259413215ed43e99285c8c347579735fb";
+        sha512 = "08Jc0+GAaFjXgvl8qQytu6+wVBfcUUyCJDocj5kBUeq9YA+6mAM/6psDNxrg4PVkkLBvAK75mnjlaGckfOtDKA==";
       };
     };
     "s3urls-1.5.2" = {
@@ -59383,7 +59329,7 @@ let
       version = "1.5.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/s3urls/-/s3urls-1.5.2.tgz";
-        sha1 = "182a991208fc1ab5214443eb250fc8f53b4bc9ea";
+        sha512 = "3f4kprxnwAqoiVdR/XFoc997YEt0b6oY1VKrhl+kuWnHaUQ2cVe73TcQaww8geX5FKPuGBHl90xv70q7SlbBew==";
       };
     };
     "sade-1.8.1" = {
@@ -59401,7 +59347,7 @@ let
       version = "5.0.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
-        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
+        sha512 = "cr7dZWLwOeaFBLTIuZeYdkfO7UzGIKhjYENJFAxUOMKWGaWDm2nJM2rzxNRm5Owu0DH3ApwNo6kx5idXZfb/Iw==";
       };
     };
     "safe-buffer-5.1.1" = {
@@ -59455,7 +59401,7 @@ let
       version = "1.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz";
-        sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e";
+        sha512 = "aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==";
       };
     };
     "safe-stable-stringify-2.3.1" = {
@@ -59482,7 +59428,7 @@ let
       version = "0.5.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/sander/-/sander-0.5.1.tgz";
-        sha1 = "741e245e231f07cafb6fdf0f133adfa216a502ad";
+        sha512 = "3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA==";
       };
     };
     "sandwich-stream-2.0.2" = {
@@ -59509,7 +59455,7 @@ let
       version = "0.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/sasl-anonymous/-/sasl-anonymous-0.1.0.tgz";
-        sha1 = "f544c7e824df2a40d9ad4733829572cc8d9ed5a5";
+        sha512 = "x+0sdsV0Gie2EexxAUsx6ZoB+X6OCthlNBvAQncQxreEWQJByAPntj0EAgTlJc2kZicoc+yFzeR6cl8VfsQGfA==";
       };
     };
     "sasl-plain-0.1.0" = {
@@ -59518,7 +59464,7 @@ let
       version = "0.1.0";
       src = fetchurl {
         url = "https://registry.npmjs.org/sasl-plain/-/sasl-plain-0.1.0.tgz";
-        sha1 = "cf145e7c02222b64d60c0806d9cd2ae5380426cc";
+        sha512 = "X8mCSfR8y0NryTu0tuVyr4IS2jBunBgyG+3a0gEEkd0nlHGiyqJhlc4EIkzmSwaa7F8S4yo+LS6Cu5qxRkJrmg==";
       };
     };
     "sasl-scram-sha-1-1.2.1" = {
@@ -59527,7 +59473,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/sasl-scram-sha-1/-/sasl-scram-sha-1-1.2.1.tgz";
-        sha1 = "d88d51feaa0ff320d8eb1d6fc75657653f9dcd4b";
+        sha512 = "o63gNo+EGsk1ML0bNeUAjRomIIcG7VaUyA+ffhd9MME5BjqVEpp42YkmBBZqzz1KmJG3YqpRLE4PfUe7FjexaA==";
       };
     };
     "saslmechanisms-0.1.1" = {
@@ -59536,7 +59482,7 @@ let
       version = "0.1.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/saslmechanisms/-/saslmechanisms-0.1.1.tgz";
-        sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182";
+        sha512 = "pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg==";
       };
     };
     "saslprep-1.0.3" = {
@@ -59581,7 +59527,7 @@ let
       version = "0.5.8";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
-        sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
+        sha512 = "c0YL9VcSfcdH3F1Qij9qpYJFpKFKMXNOkLWFssBL3RuF7ZS8oZhllR2rWlCRjDTJsfq3R6wbSsaRU6o0rkEdNw==";
       };
     };
     "sax-1.1.4" = {
@@ -59590,7 +59536,7 @@ let
       version = "1.1.4";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz";
-        sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9";
+        sha512 = "5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg==";
       };
     };
     "sax-1.2.1" = {
@@ -59599,7 +59545,7 @@ let
       version = "1.2.1";
       src = fetchurl {
         url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz";
-        sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
+        sha512 = "8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==";
       };
     };
     "sax-1.2.4" = {
@@ -63050,13 +62996,13 @@ let
         sha512 = "EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ==";
       };
     };
-    "stackframe-1.2.1" = {
+    "stackframe-1.3.4" = {
       name = "stackframe";
       packageName = "stackframe";
-      version = "1.2.1";
+      version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stackframe/-/stackframe-1.2.1.tgz";
-        sha512 = "h88QkzREN/hy8eRdyNhhsO7RSJ5oyTqxxmmn0dzBIMUclZsjpfmrsg81vp8mjjAs2vAZ72nyWxRUwSwmh0e4xg==";
+        url = "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz";
+        sha512 = "oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==";
       };
     };
     "stampit-1.2.0" = {
@@ -64994,13 +64940,13 @@ let
         sha512 = "dJp4qg+x4JwSEW1HibAuMi0IIrBI3wuQr2GimmqB7OXR50wmwzfdusG+p39R9w3R6aFtZ2mzvxvWKQ3Bd/vx3g==";
       };
     };
-    "sync-fetch-0.3.1" = {
+    "sync-fetch-0.4.1" = {
       name = "sync-fetch";
       packageName = "sync-fetch";
-      version = "0.3.1";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sync-fetch/-/sync-fetch-0.3.1.tgz";
-        sha512 = "xj5qiCDap/03kpci5a+qc5wSJjc8ZSixgG2EUmH1B8Ea2sfWclQA7eH40hiHPCtkCn6MCk4Wb+dqcXdCy2PP3g==";
+        url = "https://registry.npmjs.org/sync-fetch/-/sync-fetch-0.4.1.tgz";
+        sha512 = "JDtyFEvnKUzt1CxRtzzsGgkBanEv8XRmLyJo0F0nGkpCR8EjYmpOJJXz8GA/SWtlPU0nAYh0+CNMNnFworGyOA==";
       };
     };
     "syntax-error-1.4.0" = {
@@ -67515,15 +67461,6 @@ let
         sha512 = "yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==";
       };
     };
-    "type-fest-2.12.0" = {
-      name = "type-fest";
-      packageName = "type-fest";
-      version = "2.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-fest/-/type-fest-2.12.0.tgz";
-        sha512 = "Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA==";
-      };
-    };
     "type-fest-2.12.2" = {
       name = "type-fest";
       packageName = "type-fest";
@@ -67857,13 +67794,13 @@ let
         sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==";
       };
     };
-    "uglify-js-3.15.5" = {
+    "uglify-js-3.16.0" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.15.5";
+      version = "3.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.5.tgz";
-        sha512 = "hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.0.tgz";
+        sha512 = "FEikl6bR30n0T3amyBh3LoiBdqHRy/f4H80+My34HOesOKyHfOsxAPAxOoqC0JUnC1amnO0IwkYC3sko51caSw==";
       };
     };
     "uglify-js-3.4.10" = {
@@ -73573,13 +73510,13 @@ let
         sha1 = "f164263325ae671f53836fb210c7ddbcfda46598";
       };
     };
-    "xss-1.0.12" = {
+    "xss-1.0.13" = {
       name = "xss";
       packageName = "xss";
-      version = "1.0.12";
+      version = "1.0.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xss/-/xss-1.0.12.tgz";
-        sha512 = "8pXgz5BUUfKMrb81tmcbvLNA97ab4d6HdoBHYF5XYHa8oarc2s64hF+oqI4FhBHVBWvEM1wHGy+vqt8kZhCaNw==";
+        url = "https://registry.npmjs.org/xss/-/xss-1.0.13.tgz";
+        sha512 = "clu7dxTm1e8Mo5fz3n/oW3UCXBfV89xZ72jM8yzo1vR/pIS0w3sgB3XV2H8Vm6zfGnHL0FzvLJPJEBhd86/z4Q==";
       };
     };
     "xstream-11.14.0" = {
@@ -74957,7 +74894,7 @@ in
       sources."to-regex-range-5.0.1"
       sources."to-through-2.0.0"
       sources."type-fest-1.4.0"
-      sources."uglify-js-3.15.5"
+      sources."uglify-js-3.16.0"
       sources."unc-path-regex-0.1.2"
       sources."unique-stream-2.3.1"
       sources."unxhr-1.0.1"
@@ -75014,22 +74951,22 @@ in
           sources."vscode-uri-2.1.2"
         ];
       })
-      (sources."@vue/compiler-core-3.2.36" // {
+      (sources."@vue/compiler-core-3.2.37" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
-      sources."@vue/compiler-dom-3.2.36"
-      (sources."@vue/compiler-sfc-3.2.36" // {
+      sources."@vue/compiler-dom-3.2.37"
+      (sources."@vue/compiler-sfc-3.2.37" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
-      sources."@vue/compiler-ssr-3.2.36"
-      sources."@vue/reactivity-3.2.36"
-      sources."@vue/reactivity-transform-3.2.36"
-      sources."@vue/runtime-core-3.2.36"
-      sources."@vue/shared-3.2.36"
+      sources."@vue/compiler-ssr-3.2.37"
+      sources."@vue/reactivity-3.2.37"
+      sources."@vue/reactivity-transform-3.2.37"
+      sources."@vue/runtime-core-3.2.37"
+      sources."@vue/shared-3.2.37"
       sources."dedent-js-1.0.1"
       sources."emmet-2.3.6"
       sources."estree-walker-2.0.2"
@@ -75261,7 +75198,7 @@ in
       sources."proper-lockfile-4.1.2"
       sources."psl-1.8.0"
       sources."punycode-2.1.1"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       (sources."raw-body-2.5.1" // {
         dependencies = [
           sources."depd-2.0.0"
@@ -75804,7 +75741,7 @@ in
       sources."picomatch-2.3.1"
       sources."prepend-http-3.0.1"
       sources."pump-3.0.0"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."querystringify-2.2.0"
       sources."quick-lru-5.1.1"
       (sources."read-pkg-6.0.0" // {
@@ -77104,7 +77041,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."uc.micro-1.0.6"
-      sources."uglify-js-3.15.5"
+      sources."uglify-js-3.16.0"
       sources."underscore-1.13.4"
       sources."union-value-1.0.1"
       (sources."universal-url-2.0.0" // {
@@ -77366,11 +77303,11 @@ in
       sources."bl-4.1.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       sources."buffer-5.7.1"
       sources."buffer-from-1.1.2"
       sources."callsites-3.1.0"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       sources."chalk-3.0.0"
       sources."chardet-0.7.0"
       sources."chokidar-3.5.3"
@@ -77388,7 +77325,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."enhanced-resolve-5.9.3"
@@ -77768,7 +77705,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.1148.0" // {
+      (sources."aws-sdk-2.1149.0" // {
         dependencies = [
           sources."uuid-8.0.0"
         ];
@@ -77861,7 +77798,7 @@ in
       sources."graceful-fs-4.2.10"
       (sources."grant-4.7.0" // {
         dependencies = [
-          sources."qs-6.10.3"
+          sources."qs-6.10.5"
         ];
       })
       sources."har-schema-2.0.0"
@@ -78264,9 +78201,9 @@ in
       })
       sources."@vue/cli-ui-addon-webpack-5.0.4"
       sources."@vue/cli-ui-addon-widgets-5.0.4"
-      sources."@vue/compiler-core-3.2.36"
-      sources."@vue/compiler-dom-3.2.36"
-      sources."@vue/shared-3.2.36"
+      sources."@vue/compiler-core-3.2.37"
+      sources."@vue/compiler-dom-3.2.37"
+      sources."@vue/shared-3.2.37"
       (sources."@wry/equality-0.1.11" // {
         dependencies = [
           sources."tslib-1.14.1"
@@ -78357,7 +78294,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
@@ -78376,7 +78313,7 @@ in
       })
       sources."call-bind-1.0.2"
       sources."camelcase-6.3.0"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       sources."caw-2.0.1"
       sources."chalk-4.1.2"
       sources."chardet-0.7.0"
@@ -78497,7 +78434,7 @@ in
       sources."easy-stack-1.0.1"
       sources."ee-first-1.1.1"
       sources."ejs-3.1.8"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       sources."emoji-regex-8.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
@@ -78741,7 +78678,7 @@ in
       sources."iterall-1.3.0"
       (sources."jake-10.8.5" // {
         dependencies = [
-          sources."async-3.2.3"
+          sources."async-3.2.4"
         ];
       })
       sources."javascript-stringify-2.1.0"
@@ -79189,7 +79126,7 @@ in
       sources."ws-7.5.8"
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
-      (sources."xss-1.0.12" // {
+      (sources."xss-1.0.13" // {
         dependencies = [
           sources."commander-2.20.3"
         ];
@@ -79943,11 +79880,11 @@ in
       sources."JSV-4.0.2"
       sources."ansi-styles-3.2.1"
       sources."array-unique-0.3.2"
-      sources."async-3.2.3"
+      sources."async-3.2.4"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-2.0.1"
-      sources."browserslist-4.20.3"
-      sources."caniuse-lite-1.0.30001346"
+      sources."browserslist-4.20.4"
+      sources."caniuse-lite-1.0.30001349"
       sources."chalk-2.4.2"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -79957,7 +79894,7 @@ in
       sources."convert-source-map-1.8.0"
       sources."debug-4.3.4"
       sources."ejs-3.1.6"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       sources."ensure-posix-path-1.1.1"
       sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
@@ -80342,9 +80279,9 @@ in
       sha512 = "ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==";
     };
     dependencies = [
-      sources."browserslist-4.20.3"
-      sources."caniuse-lite-1.0.30001346"
-      sources."electron-to-chromium-1.4.146"
+      sources."browserslist-4.20.4"
+      sources."caniuse-lite-1.0.30001349"
+      sources."electron-to-chromium-1.4.147"
       sources."escalade-3.1.1"
       sources."fraction.js-4.2.0"
       sources."node-releases-2.0.5"
@@ -80379,7 +80316,7 @@ in
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-4.3.0"
       sources."ast-types-0.13.4"
-      (sources."aws-sdk-2.1148.0" // {
+      (sources."aws-sdk-2.1149.0" // {
         dependencies = [
           sources."uuid-8.0.0"
         ];
@@ -80999,10 +80936,10 @@ in
   balanceofsatoshis = nodeEnv.buildNodePackage {
     name = "balanceofsatoshis";
     packageName = "balanceofsatoshis";
-    version = "12.10.0";
+    version = "12.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-12.10.0.tgz";
-      sha512 = "pJeuMYSv09VEXOfHmF7/B8kWXdVkUAnN8hoyzGJFbpchiopyvahKYHwdgav4RzSQ1CzuhnDC1LGMtwCOXekctA==";
+      url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-12.11.0.tgz";
+      sha512 = "ajrj5cYPvL1MAEwFi7i3PQA3eYwJ/Pyr74P/xoQELHPgTz6hq+HY3KWGJMc8A6UF10QsgySW/nMAeAkJcb5/5w==";
     };
     dependencies = [
       (sources."@alexbosworth/caporal-1.4.4" // {
@@ -81149,7 +81086,7 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."color-string-1.9.1"
-      sources."colorette-2.0.16"
+      sources."colorette-2.0.17"
       sources."colors-1.4.0"
       sources."colorspace-1.1.4"
       sources."combined-stream-1.0.8"
@@ -81357,6 +81294,7 @@ in
           sources."@types/node-17.0.33"
           sources."bn.js-5.2.0"
           sources."bolt07-1.8.1"
+          sources."colorette-2.0.16"
           (sources."lightning-5.16.0" // {
             dependencies = [
               sources."psbt-2.0.1"
@@ -81372,156 +81310,7 @@ in
           sources."ws-8.6.0"
         ];
       })
-      (sources."ln-telegram-3.21.5" // {
-        dependencies = [
-          sources."@grpc/grpc-js-1.6.4"
-          sources."@grpc/proto-loader-0.6.9"
-          sources."@types/node-17.0.23"
-          sources."@types/ws-8.5.2"
-          sources."bn.js-5.2.0"
-          sources."body-parser-1.19.2"
-          sources."bolt01-1.2.4"
-          sources."bolt07-1.8.1"
-          sources."bolt09-0.2.2"
-          sources."cookie-0.4.2"
-          (sources."debug-4.3.4" // {
-            dependencies = [
-              sources."ms-2.1.2"
-            ];
-          })
-          sources."depd-1.1.2"
-          sources."destroy-1.0.4"
-          sources."express-4.17.3"
-          sources."finalhandler-1.1.2"
-          (sources."goldengate-11.2.1" // {
-            dependencies = [
-              sources."ln-service-53.11.0"
-            ];
-          })
-          sources."grammy-1.8.2"
-          sources."http-errors-1.8.1"
-          sources."invoices-2.0.5"
-          (sources."lightning-5.10.1" // {
-            dependencies = [
-              sources."@grpc/grpc-js-1.6.2"
-              sources."body-parser-1.20.0"
-              sources."bolt09-0.2.3"
-              sources."depd-2.0.0"
-              sources."destroy-1.2.0"
-              sources."http-errors-2.0.0"
-              sources."on-finished-2.4.1"
-              sources."qs-6.10.3"
-              sources."raw-body-2.5.1"
-              sources."statuses-2.0.1"
-            ];
-          })
-          (sources."ln-accounting-5.0.6" // {
-            dependencies = [
-              sources."@grpc/grpc-js-1.5.7"
-              sources."@types/node-17.0.21"
-              sources."bolt07-1.8.0"
-              sources."bolt09-0.2.1"
-              (sources."goldengate-11.1.0" // {
-                dependencies = [
-                  sources."asyncjs-util-1.2.8"
-                  sources."ln-service-53.9.3"
-                ];
-              })
-              sources."invoices-2.0.4"
-              (sources."lightning-5.8.2" // {
-                dependencies = [
-                  sources."asyncjs-util-1.2.8"
-                  sources."bolt09-0.2.2"
-                  sources."tiny-secp256k1-2.2.1"
-                ];
-              })
-              (sources."ln-service-53.10.0" // {
-                dependencies = [
-                  sources."@grpc/grpc-js-1.6.1"
-                  sources."@types/node-17.0.23"
-                  sources."@types/ws-8.5.3"
-                  sources."asyncjs-util-1.2.8"
-                  sources."bolt09-0.2.2"
-                  sources."lightning-5.9.0"
-                  sources."tiny-secp256k1-2.2.1"
-                  sources."type-fest-2.12.2"
-                ];
-              })
-              sources."psbt-2.0.0"
-              sources."type-fest-2.12.0"
-              sources."uint8array-tools-0.0.7"
-            ];
-          })
-          (sources."ln-service-53.15.0" // {
-            dependencies = [
-              sources."@grpc/grpc-js-1.6.7"
-              sources."@types/node-17.0.25"
-              sources."@types/ws-8.5.3"
-              sources."body-parser-1.20.0"
-              sources."bolt09-0.2.3"
-              sources."debug-2.6.9"
-              sources."depd-2.0.0"
-              sources."destroy-1.2.0"
-              sources."http-errors-2.0.0"
-              sources."invoices-2.0.6"
-              sources."lightning-5.14.0"
-              sources."ms-2.0.0"
-              sources."on-finished-2.4.1"
-              sources."qs-6.10.3"
-              sources."raw-body-2.5.1"
-              sources."statuses-2.0.1"
-              sources."tiny-secp256k1-2.2.1"
-              sources."uint8array-tools-0.0.7"
-            ];
-          })
-          (sources."ln-sync-3.12.0" // {
-            dependencies = [
-              sources."@grpc/grpc-js-1.6.1"
-              sources."@types/ws-8.5.3"
-              sources."bolt09-0.2.1"
-              (sources."invoices-2.0.4" // {
-                dependencies = [
-                  sources."bolt07-1.8.0"
-                  sources."tiny-secp256k1-2.2.0"
-                ];
-              })
-              (sources."lightning-5.9.0" // {
-                dependencies = [
-                  sources."asyncjs-util-1.2.8"
-                  sources."bolt07-1.8.0"
-                  sources."bolt09-0.2.2"
-                  sources."psbt-2.0.0"
-                ];
-              })
-              (sources."ln-service-53.10.0" // {
-                dependencies = [
-                  sources."bolt07-1.8.0"
-                ];
-              })
-              sources."tiny-secp256k1-2.2.1"
-              sources."uint8array-tools-0.0.7"
-            ];
-          })
-          sources."ms-2.1.3"
-          sources."on-finished-2.3.0"
-          (sources."p2tr-1.3.0" // {
-            dependencies = [
-              sources."tiny-secp256k1-2.2.1"
-              sources."uint8array-tools-0.0.7"
-            ];
-          })
-          sources."psbt-2.0.1"
-          sources."qs-6.9.7"
-          sources."raw-body-2.4.3"
-          sources."safe-buffer-5.2.1"
-          sources."send-0.17.2"
-          sources."serve-static-1.14.2"
-          sources."statuses-1.5.0"
-          sources."tiny-secp256k1-2.2.0"
-          sources."type-fest-2.12.2"
-          sources."ws-8.5.0"
-        ];
-      })
+      sources."ln-telegram-3.22.1"
       sources."lodash-4.17.21"
       sources."lodash.camelcase-4.3.0"
       sources."lodash.difference-4.5.0"
@@ -81548,7 +81337,7 @@ in
       sources."long-4.0.0"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-6.0.0"
-      sources."luxon-2.3.2"
+      sources."luxon-2.4.0"
       sources."macaroon-3.0.4"
       (sources."make-dir-3.1.0" // {
         dependencies = [
@@ -81619,6 +81408,7 @@ in
           sources."bolt01-1.2.4"
           sources."bolt07-1.8.1"
           sources."bolt09-0.2.2"
+          sources."colorette-2.0.16"
           sources."cookie-0.4.2"
           sources."depd-1.1.2"
           sources."destroy-1.0.4"
@@ -82626,7 +82416,7 @@ in
       sources."asn1-0.2.6"
       sources."assert-never-1.2.1"
       sources."assert-plus-1.0.0"
-      sources."async-3.2.3"
+      sources."async-3.2.4"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
@@ -84079,10 +83869,10 @@ in
   cdk8s-cli = nodeEnv.buildNodePackage {
     name = "cdk8s-cli";
     packageName = "cdk8s-cli";
-    version = "2.0.11";
+    version = "2.0.13";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.0.11.tgz";
-      sha512 = "mZKk7BqqEJXbls3+hqwx93c/31E+mSV4B7lc9PP2KdbmdRt2Qfgql3Q/AKIqrnMXMXpQkEh4tM0HqxMjA/Jeqw==";
+      url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.0.13.tgz";
+      sha512 = "bupth/QUGwryG8KIjgBb8catXS8OcgzUj6tZPJ+OGC4rppGLZOfkiyW0+rQsQ5BRGos8SZi9iGiFltSZVSM9PA==";
     };
     dependencies = [
       sources."@jsii/check-node-1.59.0"
@@ -84101,8 +83891,8 @@ in
       sources."call-bind-1.0.2"
       sources."camelcase-6.3.0"
       sources."case-1.6.3"
-      sources."cdk8s-2.3.17"
-      sources."cdk8s-plus-22-2.0.0-rc.7"
+      sources."cdk8s-2.3.19"
+      sources."cdk8s-plus-22-2.0.0-rc.11"
       sources."chalk-4.1.2"
       sources."cliui-7.0.4"
       sources."clone-2.1.2"
@@ -84115,7 +83905,7 @@ in
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."commonmark-0.30.0"
-      sources."constructs-10.1.27"
+      sources."constructs-10.1.31"
       sources."date-format-4.0.11"
       sources."debug-4.3.4"
       sources."decamelize-5.0.1"
@@ -84205,14 +83995,14 @@ in
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.581" // {
+      (sources."jsii-srcmak-0.1.583" // {
         dependencies = [
           sources."fs-extra-9.1.0"
         ];
       })
       sources."json-schema-0.4.0"
       sources."json-schema-traverse-1.0.0"
-      sources."json2jsii-0.3.31"
+      sources."json2jsii-0.3.33"
       sources."jsonfile-6.1.0"
       sources."jsonschema-1.4.1"
       sources."locate-path-5.0.0"
@@ -84389,7 +84179,7 @@ in
       sources."combined-stream-1.0.8"
       sources."commonmark-0.30.0"
       sources."concat-map-0.0.1"
-      sources."constructs-10.1.27"
+      sources."constructs-10.1.31"
       sources."cookie-0.4.2"
       sources."cross-spawn-7.0.3"
       sources."date-format-4.0.11"
@@ -84537,7 +84327,7 @@ in
           sources."yargs-parser-20.2.9"
         ];
       })
-      (sources."jsii-srcmak-0.1.581" // {
+      (sources."jsii-srcmak-0.1.583" // {
         dependencies = [
           sources."fs-extra-9.1.0"
           sources."jsonfile-6.1.0"
@@ -84946,10 +84736,10 @@ in
   coc-diagnostic = nodeEnv.buildNodePackage {
     name = "coc-diagnostic";
     packageName = "coc-diagnostic";
-    version = "0.23.3";
+    version = "0.23.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.3.tgz";
-      sha512 = "IJ6Z7wmyhufVD69rzc0NI4g4OH7fw88bJhfhZCeqTikk50IKBfd7D3hikuF8hbilu0M+67Z2RlZkaFFUgrnLhQ==";
+      url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.4.tgz";
+      sha512 = "XaA+RgnSMLmGpJnXLGWZCH5sONP80uYLpzNlwObMvs0AOuN3vXsu7qTE90qc5Jt/S6RIkF+u/XGDVb/z51E12g==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -85771,11 +85561,11 @@ in
         ];
       })
       sources."braces-3.0.2"
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       (sources."chalk-4.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -85812,7 +85602,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -86812,7 +86602,7 @@ in
     dependencies = [
       sources."@colors/colors-1.5.0"
       sources."@dabh/diagnostics-2.0.3"
-      sources."async-3.2.3"
+      sources."async-3.2.4"
       sources."bintrees-1.0.2"
       sources."color-3.2.1"
       sources."color-convert-1.9.3"
@@ -87054,7 +86844,7 @@ in
       sources."through2-4.0.2"
       sources."trim-newlines-3.0.1"
       sources."type-fest-0.18.1"
-      sources."uglify-js-3.15.5"
+      sources."uglify-js-3.16.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."validate-npm-package-license-3.0.4"
@@ -87944,7 +87734,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."pseudomap-1.0.2"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."quicktask-1.1.0"
       sources."raf-3.3.2"
       sources."readable-stream-2.3.7"
@@ -88958,7 +88748,7 @@ in
   "deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop" = nodeEnv.buildNodePackage {
     name = "deltachat-desktop";
     packageName = "deltachat-desktop";
-    version = "1.30.0";
+    version = "1.30.1";
     src = ../../applications/networking/instant-messengers/deltachat-desktop;
     dependencies = [
       sources."@ampproject/remapping-2.2.0"
@@ -89151,7 +88941,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       sources."buffer-crc32-0.2.13"
       sources."buffer-from-1.1.2"
       sources."cache-base-1.0.1"
@@ -89163,7 +88953,7 @@ in
       })
       sources."call-bind-1.0.2"
       sources."camel-case-4.1.2"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       sources."capital-case-1.0.4"
       sources."chalk-2.4.2"
       sources."change-case-4.1.2"
@@ -89191,20 +88981,10 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."component-emitter-1.3.0"
-      (sources."concat-stream-1.6.2" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."concat-stream-1.6.2"
       sources."config-chain-1.1.13"
       sources."constant-case-3.0.4"
-      (sources."convert-source-map-1.8.0" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."convert-source-map-1.8.0"
       sources."copy-descriptor-0.1.1"
       (sources."core-js-compat-3.22.8" // {
         dependencies = [
@@ -89223,7 +89003,7 @@ in
       sources."defer-to-connect-1.1.3"
       sources."define-properties-1.1.4"
       sources."define-property-2.0.2"
-      sources."deltachat-node-1.84.0"
+      sources."deltachat-node-1.86.0"
       sources."detect-node-2.1.0"
       sources."dom-helpers-5.2.1"
       sources."dom4-2.1.6"
@@ -89235,14 +89015,14 @@ in
           sources."@types/node-16.11.38"
         ];
       })
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       sources."emoji-js-clean-4.0.0"
       sources."emoji-mart-3.0.1"
       sources."emoji-regex-9.2.2"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."env-paths-2.2.1"
-      sources."error-stack-parser-2.0.7"
+      sources."error-stack-parser-2.1.4"
       sources."es6-error-4.1.1"
       sources."esbuild-0.12.29"
       sources."escalade-3.1.1"
@@ -89481,14 +89261,8 @@ in
       sources."react-window-1.8.7"
       sources."react-window-infinite-loader-1.0.7"
       sources."react-zoom-pan-pinch-2.1.3"
-      sources."readable-stream-3.6.0"
-      (sources."readdirp-2.2.1" // {
-        dependencies = [
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."readable-stream-2.3.7"
+      sources."readdirp-2.2.1"
       sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-10.0.1"
       sources."regenerator-runtime-0.13.9"
@@ -89514,7 +89288,7 @@ in
       sources."roarr-2.15.4"
       sources."rtcpeerconnection-shim-1.2.15"
       sources."rw-0.1.4"
-      sources."safe-buffer-5.2.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       (sources."sass-1.52.2" // {
         dependencies = [
@@ -89581,9 +89355,8 @@ in
       sources."source-map-support-0.5.21"
       sources."source-map-url-0.4.1"
       sources."split-string-3.1.0"
-      sources."split2-3.2.2"
       sources."sprintf-js-1.1.2"
-      sources."stackframe-1.2.1"
+      sources."stackframe-1.3.4"
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -89602,7 +89375,7 @@ in
         ];
       })
       sources."stream-exhaust-1.0.2"
-      sources."string_decoder-1.3.0"
+      sources."string_decoder-1.1.1"
       sources."strip-json-comments-2.0.1"
       sources."sumchecker-3.0.1"
       sources."supercluster-7.1.5"
@@ -90643,13 +90416,13 @@ in
       sources."auto-bind-4.0.0"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-1.1.11"
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       sources."caller-callsite-4.1.0"
       sources."caller-path-3.0.1"
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       sources."chalk-2.4.2"
       sources."ci-info-2.0.0"
       sources."cli-boxes-2.2.1"
@@ -90678,7 +90451,7 @@ in
         ];
       })
       sources."dot-prop-5.3.0"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       sources."emoji-regex-8.0.0"
       sources."emojilib-2.4.0"
       sources."end-of-stream-1.4.4"
@@ -90943,17 +90716,17 @@ in
       })
       sources."@fluentui/date-time-utilities-8.5.1"
       sources."@fluentui/dom-utilities-2.2.1"
-      sources."@fluentui/font-icons-mdl2-8.4.0"
-      sources."@fluentui/foundation-legacy-8.2.7"
+      sources."@fluentui/font-icons-mdl2-8.4.1"
+      sources."@fluentui/foundation-legacy-8.2.8"
       sources."@fluentui/keyboard-key-0.4.1"
       sources."@fluentui/merge-styles-8.5.2"
-      sources."@fluentui/react-8.72.1"
-      sources."@fluentui/react-focus-8.6.0"
+      sources."@fluentui/react-8.72.2"
+      sources."@fluentui/react-focus-8.6.1"
       sources."@fluentui/react-hooks-8.5.5"
       sources."@fluentui/react-portal-compat-context-9.0.0-rc.2"
       sources."@fluentui/react-window-provider-2.2.1"
       sources."@fluentui/set-version-8.2.1"
-      sources."@fluentui/style-utilities-8.6.7"
+      sources."@fluentui/style-utilities-8.7.0"
       sources."@fluentui/theme-2.6.6"
       sources."@fluentui/utilities-8.8.3"
       (sources."@gulp-sourcemaps/identity-map-2.0.1" // {
@@ -90977,7 +90750,7 @@ in
         ];
       })
       sources."@humanwhocodes/object-schema-1.2.1"
-      sources."@microsoft/load-themed-styles-1.10.267"
+      sources."@microsoft/load-themed-styles-1.10.268"
       sources."@node-rs/crc32-1.5.1"
       sources."@node-rs/crc32-android-arm-eabi-1.5.1"
       sources."@node-rs/crc32-android-arm64-1.5.1"
@@ -91903,7 +91676,7 @@ in
         ];
       })
       sources."mkdirp-1.0.4"
-      sources."mongodb-4.6.0"
+      sources."mongodb-4.7.0"
       sources."mongodb-connection-string-url-2.5.2"
       (sources."morgan-1.10.0" // {
         dependencies = [
@@ -92849,7 +92622,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       sources."buffer-4.9.2"
       sources."buffer-from-1.1.2"
       sources."buffer-indexof-1.1.1"
@@ -92891,7 +92664,7 @@ in
       sources."camel-case-3.0.0"
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       sources."case-sensitive-paths-webpack-plugin-2.4.0"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
@@ -93132,7 +92905,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -93157,7 +92930,7 @@ in
       sources."entities-2.2.0"
       sources."errno-0.1.8"
       sources."error-ex-1.3.2"
-      sources."error-stack-parser-2.0.7"
+      sources."error-stack-parser-2.1.4"
       sources."es-abstract-1.20.1"
       sources."es-array-method-boxes-properly-1.0.0"
       sources."es-to-primitive-1.2.1"
@@ -94105,7 +93878,7 @@ in
       sources."sshpk-1.17.0"
       sources."ssri-6.0.2"
       sources."stable-0.1.8"
-      sources."stackframe-1.2.1"
+      sources."stackframe-1.3.4"
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -95017,7 +94790,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      (sources."browserslist-4.20.3" // {
+      (sources."browserslist-4.20.4" // {
         dependencies = [
           sources."picocolors-1.0.0"
         ];
@@ -95050,7 +94823,7 @@ in
       })
       sources."camelcase-6.3.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       (sources."chalk-4.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -95309,7 +95082,7 @@ in
       sources."duplexer3-0.1.4"
       sources."duplexify-3.7.1"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -96868,7 +96641,7 @@ in
       sources."base64-js-1.5.1"
       sources."bl-4.1.0"
       sources."brace-expansion-1.1.11"
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       sources."buffer-5.7.1"
       sources."buffer-crc32-0.2.13"
       sources."caller-callsite-4.1.0"
@@ -96876,7 +96649,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       sources."chalk-2.4.2"
       sources."chownr-1.1.4"
       sources."ci-info-2.0.0"
@@ -96901,7 +96674,7 @@ in
       })
       sources."delay-5.0.0"
       sources."devtools-protocol-0.0.981744"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
@@ -97511,7 +97284,7 @@ in
         ];
       })
       sources."@opentelemetry/api-1.1.0"
-      sources."@opentelemetry/semantic-conventions-1.3.0"
+      sources."@opentelemetry/semantic-conventions-1.3.1"
       sources."@protobufjs/aspromise-1.1.2"
       sources."@protobufjs/base64-1.1.2"
       sources."@protobufjs/codegen-2.0.4"
@@ -97571,7 +97344,7 @@ in
       sources."asn1-0.2.6"
       sources."assert-plus-1.0.0"
       sources."ast-types-0.13.4"
-      sources."async-3.2.3"
+      sources."async-3.2.4"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
@@ -99259,7 +99032,7 @@ in
       sources."which-typed-array-1.1.8"
       (sources."winston-3.7.2" // {
         dependencies = [
-          sources."async-3.2.3"
+          sources."async-3.2.4"
           sources."readable-stream-3.6.0"
         ];
       })
@@ -99367,10 +99140,10 @@ in
   gatsby-cli = nodeEnv.buildNodePackage {
     name = "gatsby-cli";
     packageName = "gatsby-cli";
-    version = "4.15.1";
+    version = "4.16.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.15.1.tgz";
-      sha512 = "PlwcfOYVpG1/YsctnY8M2sNt1wNR46AQD0SKg/lTMdjB/EhBp4jNQNYTEp5eZihOu7Ap98/igM+RMrAUFttj5g==";
+      url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.16.0.tgz";
+      sha512 = "VBQK46y5ZFKNQT4rCH134Du//y2hrxf7NXPB4WN+WzzplwtSo6wmU7cG1rPZWVNDCwZcJ1fpJCVIgKA62zAivw==";
     };
     dependencies = [
       sources."@ampproject/remapping-2.2.0"
@@ -99466,7 +99239,7 @@ in
       sources."boolbase-1.0.0"
       sources."boxen-5.1.2"
       sources."brace-expansion-1.1.11"
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       sources."cacheable-lookup-5.0.4"
       (sources."cacheable-request-7.0.2" // {
         dependencies = [
@@ -99475,7 +99248,7 @@ in
       })
       sources."call-bind-1.0.2"
       sources."camelcase-6.3.0"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       (sources."chalk-4.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -99513,7 +99286,7 @@ in
       sources."configstore-5.0.1"
       sources."convert-hrtime-3.0.0"
       sources."convert-source-map-1.8.0"
-      sources."create-gatsby-2.15.1"
+      sources."create-gatsby-2.16.0"
       (sources."cross-spawn-6.0.5" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -99540,7 +99313,7 @@ in
       sources."domutils-2.8.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-2.2.0"
@@ -99575,8 +99348,8 @@ in
       sources."fs-extra-10.1.0"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
-      sources."gatsby-core-utils-3.15.0"
-      (sources."gatsby-telemetry-3.15.0" // {
+      sources."gatsby-core-utils-3.16.0"
+      (sources."gatsby-telemetry-3.16.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."boxen-4.2.0"
@@ -99720,7 +99493,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."parse-path-4.0.3"
+      sources."parse-path-4.0.4"
       sources."parse-url-6.0.0"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
@@ -99735,7 +99508,7 @@ in
       sources."protocols-1.4.8"
       sources."pump-3.0.0"
       sources."pupa-2.1.1"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."query-string-6.14.1"
       sources."quick-lru-5.1.1"
       (sources."rc-1.2.8" // {
@@ -99781,7 +99554,6 @@ in
       sources."side-channel-1.0.4"
       sources."signal-exit-3.0.7"
       sources."sisteransi-1.0.5"
-      sources."source-map-0.7.3"
       sources."split-on-first-1.1.0"
       sources."stack-trace-0.0.10"
       sources."strict-uri-encode-2.0.0"
@@ -100403,7 +100175,7 @@ in
       })
       sources."p-cancelable-2.1.1"
       sources."pump-3.0.0"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."query-string-7.1.1"
       sources."quick-lru-5.1.1"
       sources."readable-stream-3.6.0"
@@ -100437,10 +100209,10 @@ in
   gitmoji-cli = nodeEnv.buildNodePackage {
     name = "gitmoji-cli";
     packageName = "gitmoji-cli";
-    version = "5.0.0";
+    version = "5.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-5.0.0.tgz";
-      sha512 = "DFiHpvCtnsX/e80RZSFhLZz7e9Ev102M3vLy9UYGi4XUaB5A1d158rLvVNi2Z66+5eKgaGi0k6L83i2QhI06ow==";
+      url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-5.0.1.tgz";
+      sha512 = "+uivild4BxNtPJhPU/iArWJx2cEcOqzwNmzca567AAiWB8RhDxTeXwoTPxbg15P6W1ykyWnfGKKvvfSuUNL++Q==";
     };
     dependencies = [
       sources."@babel/code-frame-7.16.7"
@@ -100553,7 +100325,7 @@ in
         ];
       })
       sources."function-bind-1.1.1"
-      sources."fuse.js-6.4.1"
+      sources."fuse.js-6.6.2"
       sources."get-stream-6.0.1"
       sources."get-uri-3.0.2"
       sources."global-dirs-3.0.0"
@@ -100580,7 +100352,7 @@ in
       sources."indent-string-4.0.0"
       sources."inherits-2.0.4"
       sources."ini-2.0.0"
-      (sources."inquirer-8.2.2" // {
+      (sources."inquirer-8.2.4" // {
         dependencies = [
           sources."chalk-4.1.2"
         ];
@@ -101030,9 +100802,9 @@ in
           sources."tslib-2.1.0"
         ];
       })
-      (sources."@graphql-tools/import-6.6.16" // {
+      (sources."@graphql-tools/import-6.6.17" // {
         dependencies = [
-          sources."@graphql-tools/utils-8.6.12"
+          sources."@graphql-tools/utils-8.6.13"
           sources."tslib-2.4.0"
         ];
       })
@@ -101057,10 +100829,10 @@ in
           sources."tslib-2.3.1"
         ];
       })
-      (sources."@graphql-tools/schema-8.3.13" // {
+      (sources."@graphql-tools/schema-8.3.14" // {
         dependencies = [
-          sources."@graphql-tools/merge-8.2.13"
-          sources."@graphql-tools/utils-8.6.12"
+          sources."@graphql-tools/merge-8.2.14"
+          sources."@graphql-tools/utils-8.6.13"
           sources."tslib-2.4.0"
         ];
       })
@@ -101584,21 +101356,21 @@ in
       })
       sources."@cronvel/get-pixels-3.4.0"
       sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2"
-      sources."@graphql-tools/batch-execute-8.4.9"
-      sources."@graphql-tools/delegate-8.7.10"
-      sources."@graphql-tools/graphql-file-loader-7.3.14"
-      sources."@graphql-tools/import-6.6.16"
-      sources."@graphql-tools/json-file-loader-7.3.14"
-      sources."@graphql-tools/load-7.5.13"
-      sources."@graphql-tools/merge-8.2.13"
-      sources."@graphql-tools/schema-8.3.13"
-      (sources."@graphql-tools/url-loader-7.9.23" // {
+      sources."@graphql-tools/batch-execute-8.4.10"
+      sources."@graphql-tools/delegate-8.7.11"
+      sources."@graphql-tools/graphql-file-loader-7.3.15"
+      sources."@graphql-tools/import-6.6.17"
+      sources."@graphql-tools/json-file-loader-7.3.15"
+      sources."@graphql-tools/load-7.5.14"
+      sources."@graphql-tools/merge-8.2.14"
+      sources."@graphql-tools/schema-8.3.14"
+      (sources."@graphql-tools/url-loader-7.9.24" // {
         dependencies = [
           sources."ws-8.7.0"
         ];
       })
-      sources."@graphql-tools/utils-8.6.12"
-      sources."@graphql-tools/wrap-8.4.19"
+      sources."@graphql-tools/utils-8.6.13"
+      sources."@graphql-tools/wrap-8.4.20"
       sources."@iarna/toml-2.2.5"
       sources."@n1ru4l/graphql-live-query-0.9.0"
       sources."@nodelib/fs.scandir-2.1.5"
@@ -101788,7 +101560,7 @@ in
       sources."isomorphic-fetch-3.0.0"
       sources."isomorphic-ws-4.0.1"
       sources."iterall-1.3.0"
-      sources."jpeg-js-0.4.3"
+      sources."jpeg-js-0.4.4"
       sources."js-tokens-4.0.0"
       sources."json-parse-even-better-errors-2.3.1"
       sources."jsonfile-4.0.0"
@@ -101891,7 +101663,7 @@ in
         ];
       })
       sources."symbol-observable-1.2.0"
-      sources."sync-fetch-0.3.1"
+      sources."sync-fetch-0.4.1"
       sources."terminal-kit-1.49.4"
       sources."to-regex-range-5.0.1"
       sources."tr46-0.0.3"
@@ -103131,7 +102903,7 @@ in
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
       sources."source-map-0.6.1"
-      sources."uglify-js-3.15.5"
+      sources."uglify-js-3.16.0"
       sources."upper-case-1.1.3"
     ];
     buildInputs = globalBuildInputs;
@@ -103228,7 +103000,7 @@ in
       sources."object-inspect-1.12.2"
       sources."opener-1.5.2"
       sources."portfinder-1.0.28"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."requires-port-1.0.0"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -103432,7 +103204,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.4"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.1148.0"
+      sources."aws-sdk-2.1150.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."base64-js-1.5.1"
@@ -103603,7 +103375,7 @@ in
       sources."verror-1.10.1"
       (sources."winston-2.4.6" // {
         dependencies = [
-          sources."async-3.2.3"
+          sources."async-3.2.4"
           sources."colors-1.0.3"
         ];
       })
@@ -104468,7 +104240,7 @@ in
       sources."proxy-agent-4.0.1"
       sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."raw-body-2.5.1"
       sources."readable-stream-3.6.0"
       sources."restore-cursor-2.0.0"
@@ -104745,7 +104517,7 @@ in
     };
     dependencies = [
       sources."ansi-styles-4.3.0"
-      sources."async-3.2.3"
+      sources."async-3.2.4"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-2.0.1"
       sources."chalk-4.1.2"
@@ -104914,13 +104686,13 @@ in
       sources."@aws-sdk/abort-controller-3.78.0"
       sources."@aws-sdk/chunked-blob-reader-3.55.0"
       sources."@aws-sdk/chunked-blob-reader-native-3.58.0"
-      (sources."@aws-sdk/client-s3-3.100.0" // {
+      (sources."@aws-sdk/client-s3-3.105.0" // {
         dependencies = [
           sources."fast-xml-parser-3.19.0"
         ];
       })
-      sources."@aws-sdk/client-sso-3.100.0"
-      (sources."@aws-sdk/client-sts-3.100.0" // {
+      sources."@aws-sdk/client-sso-3.105.0"
+      (sources."@aws-sdk/client-sts-3.105.0" // {
         dependencies = [
           sources."fast-xml-parser-3.19.0"
         ];
@@ -104928,10 +104700,10 @@ in
       sources."@aws-sdk/config-resolver-3.80.0"
       sources."@aws-sdk/credential-provider-env-3.78.0"
       sources."@aws-sdk/credential-provider-imds-3.81.0"
-      sources."@aws-sdk/credential-provider-ini-3.100.0"
-      sources."@aws-sdk/credential-provider-node-3.100.0"
+      sources."@aws-sdk/credential-provider-ini-3.105.0"
+      sources."@aws-sdk/credential-provider-node-3.105.0"
       sources."@aws-sdk/credential-provider-process-3.80.0"
-      sources."@aws-sdk/credential-provider-sso-3.100.0"
+      sources."@aws-sdk/credential-provider-sso-3.105.0"
       sources."@aws-sdk/credential-provider-web-identity-3.78.0"
       sources."@aws-sdk/eventstream-marshaller-3.78.0"
       sources."@aws-sdk/eventstream-serde-browser-3.78.0"
@@ -104953,12 +104725,13 @@ in
       sources."@aws-sdk/middleware-host-header-3.78.0"
       sources."@aws-sdk/middleware-location-constraint-3.78.0"
       sources."@aws-sdk/middleware-logger-3.78.0"
+      sources."@aws-sdk/middleware-recursion-detection-3.105.0"
       (sources."@aws-sdk/middleware-retry-3.80.0" // {
         dependencies = [
           sources."uuid-8.3.2"
         ];
       })
-      sources."@aws-sdk/middleware-sdk-s3-3.86.0"
+      sources."@aws-sdk/middleware-sdk-s3-3.105.0"
       sources."@aws-sdk/middleware-sdk-sts-3.78.0"
       sources."@aws-sdk/middleware-serde-3.78.0"
       sources."@aws-sdk/middleware-signing-3.78.0"
@@ -104971,7 +104744,7 @@ in
       sources."@aws-sdk/protocol-http-3.78.0"
       sources."@aws-sdk/querystring-builder-3.78.0"
       sources."@aws-sdk/querystring-parser-3.78.0"
-      sources."@aws-sdk/s3-request-presigner-3.100.0"
+      sources."@aws-sdk/s3-request-presigner-3.105.0"
       sources."@aws-sdk/service-error-classification-3.78.0"
       sources."@aws-sdk/shared-ini-file-loader-3.80.0"
       sources."@aws-sdk/signature-v4-3.78.0"
@@ -105110,7 +104883,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.1148.0" // {
+      (sources."aws-sdk-2.1150.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-8.0.0"
@@ -105456,7 +105229,7 @@ in
       sources."isobject-2.1.0"
       sources."isstream-0.1.2"
       sources."jmespath-0.16.0"
-      sources."jpeg-js-0.4.3"
+      sources."jpeg-js-0.4.4"
       sources."js-tokens-4.0.0"
       sources."js-yaml-4.1.0"
       sources."jsbn-0.1.1"
@@ -105687,7 +105460,7 @@ in
         ];
       })
       sources."requires-port-1.0.0"
-      sources."reselect-4.1.5"
+      sources."reselect-4.1.6"
       sources."resolve-url-0.2.1"
       sources."retry-0.10.1"
       sources."rimraf-2.7.1"
@@ -106160,7 +105933,7 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."readable-stream-2.3.7"
       sources."safe-buffer-5.1.2"
       sources."side-channel-1.0.4"
@@ -107203,7 +106976,7 @@ in
       sources."picomatch-2.3.1"
       sources."pkg-up-3.1.0"
       sources."punycode-2.1.1"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."queue-microtask-1.2.3"
       sources."redeyed-2.1.1"
       sources."restore-cursor-3.1.0"
@@ -107257,10 +107030,10 @@ in
   katex = nodeEnv.buildNodePackage {
     name = "katex";
     packageName = "katex";
-    version = "0.15.6";
+    version = "0.16.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/katex/-/katex-0.15.6.tgz";
-      sha512 = "UpzJy4yrnqnhXvRPhjEuLA4lcPn6eRngixW7Q3TJErjg3Aw2PuLFBzTkdUb89UtumxjhHTqL3a5GDGETMSwgJA==";
+      url = "https://registry.npmjs.org/katex/-/katex-0.16.0.tgz";
+      sha512 = "wPRB4iUPysfH97wTgG5/tRLYxmKVq6Q4jRAWRVOUxXB1dsiv4cvcNjqabHkrOvJHM1Bpk3WrgmllSO1vIvP24w==";
     };
     dependencies = [
       sources."commander-8.3.0"
@@ -107587,12 +107360,12 @@ in
       sources."braces-3.0.2"
       sources."browser-or-node-1.3.0"
       sources."browser-process-hrtime-1.0.0"
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       sources."buffer-5.7.1"
       sources."buffer-from-1.1.2"
       sources."bytes-3.1.2"
       sources."call-bind-1.0.2"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       sources."chalk-2.4.2"
       sources."chardet-1.4.0"
       sources."chownr-1.1.4"
@@ -107660,7 +107433,7 @@ in
       })
       sources."dotenv-8.6.0"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       sources."emoji-regex-8.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
@@ -108652,10 +108425,10 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "5.0.0";
+    version = "5.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-5.0.0.tgz";
-      sha512 = "dUYmJ7H9k/xHtwKpQWLTNUa1jnFUiW4o4K2LFkRchlIijoIUT4yK/RprIxNvYCrLrEaOdZryvY5UZvSHI2tBxA==";
+      url = "https://registry.npmjs.org/lerna/-/lerna-5.1.0.tgz";
+      sha512 = "Ur55ZCdELQzpMmJmcw3qzk0khqMQizYvpsOE9j0Q7rPtJ/5NfsDo3moMgLwTevmT3LeijyBaJmXVAU/z6rbPDg==";
     };
     dependencies = [
       sources."@babel/code-frame-7.16.7"
@@ -108673,56 +108446,56 @@ in
       sources."@gar/promisify-1.1.3"
       sources."@hutson/parse-repository-url-3.0.2"
       sources."@isaacs/string-locale-compare-1.1.0"
-      sources."@lerna/add-5.0.0"
-      sources."@lerna/bootstrap-5.0.0"
-      sources."@lerna/changed-5.0.0"
-      sources."@lerna/check-working-tree-5.0.0"
-      sources."@lerna/child-process-5.0.0"
-      sources."@lerna/clean-5.0.0"
-      sources."@lerna/cli-5.0.0"
-      sources."@lerna/collect-uncommitted-5.0.0"
-      sources."@lerna/collect-updates-5.0.0"
-      sources."@lerna/command-5.0.0"
-      (sources."@lerna/conventional-commits-5.0.0" // {
+      sources."@lerna/add-5.1.0"
+      sources."@lerna/bootstrap-5.1.0"
+      sources."@lerna/changed-5.1.0"
+      sources."@lerna/check-working-tree-5.1.0"
+      sources."@lerna/child-process-5.1.0"
+      sources."@lerna/clean-5.1.0"
+      sources."@lerna/cli-5.1.0"
+      sources."@lerna/collect-uncommitted-5.1.0"
+      sources."@lerna/collect-updates-5.1.0"
+      sources."@lerna/command-5.1.0"
+      (sources."@lerna/conventional-commits-5.1.0" // {
         dependencies = [
           sources."pify-5.0.0"
         ];
       })
-      (sources."@lerna/create-5.0.0" // {
+      (sources."@lerna/create-5.1.0" // {
         dependencies = [
           sources."pify-5.0.0"
           sources."yargs-parser-20.2.4"
         ];
       })
-      sources."@lerna/create-symlink-5.0.0"
-      sources."@lerna/describe-ref-5.0.0"
-      sources."@lerna/diff-5.0.0"
-      sources."@lerna/exec-5.0.0"
-      sources."@lerna/filter-options-5.0.0"
-      sources."@lerna/filter-packages-5.0.0"
-      sources."@lerna/get-npm-exec-opts-5.0.0"
-      (sources."@lerna/get-packed-5.0.0" // {
+      sources."@lerna/create-symlink-5.1.0"
+      sources."@lerna/describe-ref-5.1.0"
+      sources."@lerna/diff-5.1.0"
+      sources."@lerna/exec-5.1.0"
+      sources."@lerna/filter-options-5.1.0"
+      sources."@lerna/filter-packages-5.1.0"
+      sources."@lerna/get-npm-exec-opts-5.1.0"
+      (sources."@lerna/get-packed-5.1.0" // {
         dependencies = [
           sources."ssri-8.0.1"
         ];
       })
-      sources."@lerna/github-client-5.0.0"
-      sources."@lerna/gitlab-client-5.0.0"
-      sources."@lerna/global-options-5.0.0"
-      sources."@lerna/has-npm-version-5.0.0"
-      sources."@lerna/import-5.0.0"
-      sources."@lerna/info-5.0.0"
-      sources."@lerna/init-5.0.0"
-      sources."@lerna/link-5.0.0"
-      sources."@lerna/list-5.0.0"
-      sources."@lerna/listable-5.0.0"
-      sources."@lerna/log-packed-5.0.0"
-      (sources."@lerna/npm-conf-5.0.0" // {
+      sources."@lerna/github-client-5.1.0"
+      sources."@lerna/gitlab-client-5.1.0"
+      sources."@lerna/global-options-5.1.0"
+      sources."@lerna/has-npm-version-5.1.0"
+      sources."@lerna/import-5.1.0"
+      sources."@lerna/info-5.1.0"
+      sources."@lerna/init-5.1.0"
+      sources."@lerna/link-5.1.0"
+      sources."@lerna/list-5.1.0"
+      sources."@lerna/listable-5.1.0"
+      sources."@lerna/log-packed-5.1.0"
+      (sources."@lerna/npm-conf-5.1.0" // {
         dependencies = [
           sources."pify-5.0.0"
         ];
       })
-      (sources."@lerna/npm-dist-tag-5.0.0" // {
+      (sources."@lerna/npm-dist-tag-5.1.0" // {
         dependencies = [
           sources."cacache-15.3.0"
           sources."make-fetch-happen-8.0.14"
@@ -108731,30 +108504,30 @@ in
           sources."ssri-8.0.1"
         ];
       })
-      sources."@lerna/npm-install-5.0.0"
-      (sources."@lerna/npm-publish-5.0.0" // {
+      sources."@lerna/npm-install-5.1.0"
+      (sources."@lerna/npm-publish-5.1.0" // {
         dependencies = [
           sources."normalize-package-data-3.0.3"
           sources."pify-5.0.0"
           sources."read-package-json-3.0.1"
         ];
       })
-      sources."@lerna/npm-run-script-5.0.0"
-      sources."@lerna/otplease-5.0.0"
-      sources."@lerna/output-5.0.0"
-      (sources."@lerna/pack-directory-5.0.0" // {
+      sources."@lerna/npm-run-script-5.1.0"
+      sources."@lerna/otplease-5.1.0"
+      sources."@lerna/output-5.1.0"
+      (sources."@lerna/pack-directory-5.1.0" // {
         dependencies = [
           sources."ignore-walk-3.0.4"
           sources."npm-packlist-2.2.2"
         ];
       })
-      sources."@lerna/package-5.0.0"
-      sources."@lerna/package-graph-5.0.0"
-      sources."@lerna/prerelease-id-from-version-5.0.0"
-      sources."@lerna/profiler-5.0.0"
-      sources."@lerna/project-5.0.0"
-      sources."@lerna/prompt-5.0.0"
-      (sources."@lerna/publish-5.0.0" // {
+      sources."@lerna/package-5.1.0"
+      sources."@lerna/package-graph-5.1.0"
+      sources."@lerna/prerelease-id-from-version-5.1.0"
+      sources."@lerna/profiler-5.1.0"
+      sources."@lerna/project-5.1.0"
+      sources."@lerna/prompt-5.1.0"
+      (sources."@lerna/publish-5.1.0" // {
         dependencies = [
           sources."cacache-15.3.0"
           sources."make-fetch-happen-8.0.14"
@@ -108763,25 +108536,25 @@ in
           sources."ssri-8.0.1"
         ];
       })
-      sources."@lerna/pulse-till-done-5.0.0"
-      sources."@lerna/query-graph-5.0.0"
-      sources."@lerna/resolve-symlink-5.0.0"
-      sources."@lerna/rimraf-dir-5.0.0"
-      sources."@lerna/run-5.0.0"
-      sources."@lerna/run-lifecycle-5.0.0"
-      sources."@lerna/run-topologically-5.0.0"
-      sources."@lerna/symlink-binary-5.0.0"
-      sources."@lerna/symlink-dependencies-5.0.0"
-      (sources."@lerna/temp-write-5.0.0" // {
+      sources."@lerna/pulse-till-done-5.1.0"
+      sources."@lerna/query-graph-5.1.0"
+      sources."@lerna/resolve-symlink-5.1.0"
+      sources."@lerna/rimraf-dir-5.1.0"
+      sources."@lerna/run-5.1.0"
+      sources."@lerna/run-lifecycle-5.1.0"
+      sources."@lerna/run-topologically-5.1.0"
+      sources."@lerna/symlink-binary-5.1.0"
+      sources."@lerna/symlink-dependencies-5.1.0"
+      (sources."@lerna/temp-write-5.1.0" // {
         dependencies = [
           sources."make-dir-3.1.0"
           sources."semver-6.3.0"
         ];
       })
-      sources."@lerna/timer-5.0.0"
-      sources."@lerna/validation-error-5.0.0"
-      sources."@lerna/version-5.0.0"
-      (sources."@lerna/write-log-file-5.0.0" // {
+      sources."@lerna/timer-5.1.0"
+      sources."@lerna/validation-error-5.1.0"
+      sources."@lerna/version-5.1.0"
+      (sources."@lerna/write-log-file-5.1.0" // {
         dependencies = [
           sources."write-file-atomic-3.0.3"
         ];
@@ -109268,7 +109041,7 @@ in
       sources."parent-module-1.0.1"
       sources."parse-conflict-json-2.0.2"
       sources."parse-json-5.2.0"
-      sources."parse-path-4.0.3"
+      sources."parse-path-4.0.4"
       sources."parse-url-6.0.0"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
@@ -109289,7 +109062,7 @@ in
       sources."protocols-1.4.8"
       sources."punycode-2.1.1"
       sources."q-1.5.1"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."query-string-6.14.1"
       sources."queue-microtask-1.2.3"
       sources."quick-lru-4.0.1"
@@ -109386,7 +109159,7 @@ in
       sources."type-fest-0.4.1"
       sources."typedarray-0.0.6"
       sources."typedarray-to-buffer-3.1.5"
-      sources."uglify-js-3.15.5"
+      sources."uglify-js-3.16.0"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
       sources."universal-user-agent-6.0.0"
@@ -110735,7 +110508,7 @@ in
     };
     dependencies = [
       sources."ansi-styles-4.3.0"
-      sources."async-3.2.3"
+      sources."async-3.2.4"
       sources."boolbase-1.0.0"
       sources."chalk-4.1.2"
       sources."cheerio-1.0.0-rc.11"
@@ -110794,7 +110567,7 @@ in
       sources."accepts-1.3.8"
       sources."after-0.8.2"
       sources."arraybuffer.slice-0.0.7"
-      sources."async-3.2.3"
+      sources."async-3.2.4"
       sources."async-limiter-1.0.1"
       sources."backo2-1.0.2"
       sources."base64-arraybuffer-0.1.5"
@@ -111397,7 +111170,7 @@ in
       sources."progress-2.0.3"
       sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
-      sources."puppeteer-14.2.1"
+      sources."puppeteer-14.3.0"
       sources."readable-stream-3.6.0"
       sources."rimraf-3.0.2"
       sources."robust-predicates-3.0.1"
@@ -111586,7 +111359,7 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."readable-stream-2.3.7"
       sources."safe-buffer-5.1.2"
       sources."side-channel-1.0.4"
@@ -112067,7 +111840,7 @@ in
       sources."@colors/colors-1.5.0"
       sources."@dabh/diagnostics-2.0.3"
       sources."@msgpack/msgpack-2.7.2"
-      sources."async-3.2.3"
+      sources."async-3.2.4"
       sources."color-3.2.1"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -114680,7 +114453,7 @@ in
           sources."pako-1.0.11"
         ];
       })
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       (sources."buffer-4.9.2" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -114697,7 +114470,7 @@ in
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -114834,7 +114607,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -115590,10 +115363,10 @@ in
       sources."ansi-styles-3.2.1"
       sources."base-x-3.0.9"
       sources."boolbase-1.0.0"
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       sources."buffer-from-1.1.2"
       sources."callsites-3.1.0"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       (sources."chalk-4.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -115624,7 +115397,7 @@ in
       sources."domutils-2.8.0"
       sources."dotenv-7.0.0"
       sources."dotenv-expand-5.1.0"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       sources."entities-3.0.1"
       sources."error-ex-1.3.2"
       sources."escalade-3.1.1"
@@ -115960,7 +115733,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
-      sources."uglify-js-3.15.5"
+      sources."uglify-js-3.16.0"
       sources."unix-dgram-2.0.4"
       sources."unpipe-1.0.0"
       sources."uri-js-4.4.1"
@@ -117016,7 +116789,7 @@ in
         ];
       })
       sources."ast-types-0.13.4"
-      sources."async-3.2.3"
+      sources."async-3.2.4"
       (sources."async-listener-0.6.10" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -117202,10 +116975,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "7.1.8";
+    version = "7.1.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-7.1.8.tgz";
-      sha512 = "6E+iGdkAcEtEvmxgLGpHiK51ArFK8mBUFIQ6/x5LeL+YCWbi1r1Fy2UPN1dDWUjy2xauLjgIMp/KQ5s5b85EBA==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-7.1.9.tgz";
+      sha512 = "YWA+iqayHb0MndHTyqvVPKQVYVCOoBYlQNLP3hAf2DT/Iw2EHVcP18yCT+xnsPNvkC4VYfQepE6AZvySQue1TA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -117512,13 +117285,13 @@ in
   prisma = nodeEnv.buildNodePackage {
     name = "prisma";
     packageName = "prisma";
-    version = "3.14.0";
+    version = "3.15.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prisma/-/prisma-3.14.0.tgz";
-      sha512 = "l9MOgNCn/paDE+i1K2fp9NZ+Du4trzPTJsGkaQHVBufTGqzoYHuNk8JfzXuIn0Gte6/ZjyKj652Jq/Lc1tp2yw==";
+      url = "https://registry.npmjs.org/prisma/-/prisma-3.15.0.tgz";
+      sha512 = "HL1kGDuFi9PdhbVLYsQO9vAH9uRFAHk7ifUOQxSrzUDs7R4VfLtg45VvXz8VHwcgLY5h0OrDVe1TdEX7a4o9tg==";
     };
     dependencies = [
-      sources."@prisma/engines-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a"
+      sources."@prisma/engines-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -117533,21 +117306,21 @@ in
   "@prisma/language-server" = nodeEnv.buildNodePackage {
     name = "_at_prisma_slash_language-server";
     packageName = "@prisma/language-server";
-    version = "3.14.0";
+    version = "3.15.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.14.0.tgz";
-      sha512 = "KP562fcqP010ja+Srt6Hi3XOooVQ11SwMAFvY9SxJfdRaLvU/vLxGW3+SnkAjq3tbQ0ij1ZyJTmshMWh/Vwevw==";
+      url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.15.0.tgz";
+      sha512 = "zTftMfWBTa2fA2PLUsAiWTML8RbhFceX2/xD02Rajv3zaslDDAmfoe/+KHJ7BUpcP9yACLENUJIEA43qeT9uHQ==";
     };
     dependencies = [
-      sources."@prisma/prisma-fmt-wasm-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a"
+      sources."@prisma/prisma-fmt-wasm-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372"
       sources."@types/js-levenshtein-1.1.1"
       sources."js-levenshtein-1.1.6"
       sources."klona-2.0.5"
-      sources."vscode-jsonrpc-6.0.0"
-      sources."vscode-languageserver-7.0.0"
-      sources."vscode-languageserver-protocol-3.16.0"
+      sources."vscode-jsonrpc-8.0.1"
+      sources."vscode-languageserver-8.0.1"
+      sources."vscode-languageserver-protocol-3.17.1"
       sources."vscode-languageserver-textdocument-1.0.4"
-      sources."vscode-languageserver-types-3.16.0"
+      sources."vscode-languageserver-types-3.17.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -118037,7 +117810,7 @@ in
       sources."prepend-http-2.0.0"
       sources."prompts-2.4.2"
       sources."pump-3.0.0"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."rc-1.2.8"
       sources."readline-sync-1.4.10"
       sources."register-protocol-win32-1.1.0"
@@ -118318,7 +118091,7 @@ in
     version = "2.0.1";
     src = fetchurl {
       url = "https://registry.npmjs.org/react-native-cli/-/react-native-cli-2.0.1.tgz";
-      sha1 = "f2cd3c7aa1b83828cdfba630e2dfd817df766d54";
+      sha512 = "QgkB1urUhGe9q1vcqQLIfNdCd/Qf3MdNQe19QO6lVjhIVKljlVMKtaK8RaZ8PCNB/cdXlO/G3tKUGk+ghMXE6w==";
     };
     dependencies = [
       sources."ansi-regex-2.1.1"
@@ -118737,7 +118510,7 @@ in
         ];
       })
       sources."browserify-zlib-0.1.4"
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
@@ -118771,7 +118544,7 @@ in
       sources."camel-case-3.0.0"
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       sources."case-sensitive-paths-webpack-plugin-2.4.0"
       sources."caw-2.0.1"
       sources."chalk-2.4.2"
@@ -118992,7 +118765,7 @@ in
       sources."duplexify-3.7.1"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -120205,7 +119978,7 @@ in
     version = "0.13.3";
     src = fetchurl {
       url = "https://registry.npmjs.org/react-tools/-/react-tools-0.13.3.tgz";
-      sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c";
+      sha512 = "lmdjIRNk2cVUdlF/dyy6oP0nG2qrlX5qKFYRtiC5zK5Sg5QqgUEOrcS7Jz+kPNeOj9OWT7NfrR/cDvbGGSjCyg==";
     };
     dependencies = [
       sources."acorn-5.7.4"
@@ -120636,7 +120409,7 @@ in
       sources."to-regex-range-5.0.1"
       sources."tr46-0.0.3"
       sources."tty-browserify-0.0.0"
-      sources."uglify-js-3.15.5"
+      sources."uglify-js-3.16.0"
       (sources."uri-js-4.4.1" // {
         dependencies = [
           sources."punycode-2.1.1"
@@ -121180,10 +120953,10 @@ in
   rollup = nodeEnv.buildNodePackage {
     name = "rollup";
     packageName = "rollup";
-    version = "2.75.5";
+    version = "2.75.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/rollup/-/rollup-2.75.5.tgz";
-      sha512 = "JzNlJZDison3o2mOxVmb44Oz7t74EfSd1SQrplQk0wSaXV7uLQXtVdHbxlcT3w+8tZ1TL4r/eLfc7nAbz38BBA==";
+      url = "https://registry.npmjs.org/rollup/-/rollup-2.75.6.tgz";
+      sha512 = "OEf0TgpC9vU6WGROJIk1JA3LR5vk/yvqlzxqdrE2CzzXnqKXNzbAwlWUXis8RS3ZPe7LAq+YUxsRa0l3r27MLA==";
     };
     dependencies = [
       sources."fsevents-2.3.2"
@@ -121215,14 +120988,14 @@ in
       sources."@types/json-schema-7.0.11"
       sources."@types/node-14.17.34"
       sources."@types/vscode-1.66.0"
-      sources."@typescript-eslint/eslint-plugin-5.27.0"
-      sources."@typescript-eslint/parser-5.27.0"
-      sources."@typescript-eslint/scope-manager-5.27.0"
-      sources."@typescript-eslint/type-utils-5.27.0"
-      sources."@typescript-eslint/types-5.27.0"
-      sources."@typescript-eslint/typescript-estree-5.27.0"
-      sources."@typescript-eslint/utils-5.27.0"
-      sources."@typescript-eslint/visitor-keys-5.27.0"
+      sources."@typescript-eslint/eslint-plugin-5.27.1"
+      sources."@typescript-eslint/parser-5.27.1"
+      sources."@typescript-eslint/scope-manager-5.27.1"
+      sources."@typescript-eslint/type-utils-5.27.1"
+      sources."@typescript-eslint/types-5.27.1"
+      sources."@typescript-eslint/typescript-estree-5.27.1"
+      sources."@typescript-eslint/utils-5.27.1"
+      sources."@typescript-eslint/visitor-keys-5.27.1"
       sources."@vscode/test-electron-2.1.3"
       sources."acorn-8.7.1"
       sources."acorn-jsx-5.3.2"
@@ -121487,7 +121260,7 @@ in
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."queue-microtask-1.2.3"
       (sources."rc-1.2.8" // {
         dependencies = [
@@ -121628,7 +121401,7 @@ in
     version = "0.0.5";
     src = fetchurl {
       url = "https://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz";
-      sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198";
+      sha512 = "AvzoPrG52y/LXjDmKiRoLrZbTJHXdfGYqzHlVLTrdK/+aeCI+RyGB/F1gd9qs6qwP4c1Ntdgvx9W5FziivG4+Q==";
     };
     dependencies = [
       sources."aws-sdk-1.18.0"
@@ -121691,7 +121464,7 @@ in
       sources."object-inspect-1.12.2"
       (sources."openid-2.0.10" // {
         dependencies = [
-          sources."qs-6.10.3"
+          sources."qs-6.10.5"
         ];
       })
       sources."pause-0.0.1"
@@ -121956,10 +121729,10 @@ in
       sources."archiver-utils-2.1.0"
       sources."argparse-1.0.10"
       sources."array-union-2.1.0"
-      sources."async-3.2.3"
+      sources."async-3.2.4"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.1148.0" // {
+      (sources."aws-sdk-2.1150.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -122052,7 +121825,7 @@ in
           sources."type-1.2.0"
         ];
       })
-      sources."dayjs-1.11.2"
+      sources."dayjs-1.11.3"
       sources."debug-4.3.4"
       (sources."decompress-4.2.1" // {
         dependencies = [
@@ -122274,7 +122047,7 @@ in
       sources."promise-queue-2.2.5"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."querystring-0.2.1"
       sources."queue-microtask-1.2.3"
       sources."quick-lru-5.1.1"
@@ -123032,10 +122805,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.946.0";
+    version = "1.947.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.946.0.tgz";
-      sha512 = "3XE1rk5qF1DOb5t5bQlOFDyp4x1V7HjpppH+RDVIqq7is0Hf9NTHeOpeNALplJjVVyEIfAzqiJThKupWDx5ptg==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.947.0.tgz";
+      sha512 = "/u+HyhaIaFhnrpn+aOiGR0ts9ZR7mr6uiqgRn5EQIwaFKpCFOEnOJTlQAM25ggomqmxRldArMMXe4dBWw855LA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -123330,7 +123103,7 @@ in
       sources."binary-search-1.3.6"
       sources."binary-search-bounds-2.0.5"
       sources."bindings-1.5.0"
-      sources."bipf-1.6.5"
+      sources."bipf-1.9.0"
       sources."blake2s-1.1.0"
       sources."brace-expansion-1.1.11"
       sources."braces-1.8.5"
@@ -124297,7 +124070,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.1148.0" // {
+      (sources."aws-sdk-2.1150.0" // {
         dependencies = [
           sources."uuid-8.0.0"
         ];
@@ -124692,7 +124465,7 @@ in
       sources."once-1.4.0"
       (sources."openid-2.0.10" // {
         dependencies = [
-          sources."qs-6.10.3"
+          sources."qs-6.10.5"
         ];
       })
       sources."options-0.0.6"
@@ -124894,7 +124667,7 @@ in
         dependencies = [
           sources."debug-3.2.7"
           sources."form-data-2.5.1"
-          sources."qs-6.10.3"
+          sources."qs-6.10.5"
           sources."readable-stream-2.3.7"
           sources."string_decoder-1.1.1"
         ];
@@ -124908,7 +124681,7 @@ in
           sources."esprima-4.0.1"
           sources."js-yaml-3.14.1"
           sources."lodash-3.10.1"
-          sources."qs-6.10.3"
+          sources."qs-6.10.5"
         ];
       })
       sources."swagger-schema-official-2.0.0-bab6bed"
@@ -124993,7 +124766,7 @@ in
       sources."window-size-0.1.0"
       (sources."winston-2.4.6" // {
         dependencies = [
-          sources."async-3.2.3"
+          sources."async-3.2.4"
         ];
       })
       sources."with-5.1.1"
@@ -126070,7 +125843,7 @@ in
         dependencies = [
           sources."debug-3.2.7"
           sources."ms-2.1.3"
-          sources."qs-6.10.3"
+          sources."qs-6.10.5"
           sources."superagent-3.8.3"
         ];
       })
@@ -126250,7 +126023,7 @@ in
       sources."truncate-utf8-bytes-1.0.2"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.15.5"
+      sources."uglify-js-3.16.0"
       sources."undefsafe-2.0.5"
       (sources."union-value-1.0.1" // {
         dependencies = [
@@ -126323,7 +126096,7 @@ in
       sources."acorn-node-1.8.2"
       sources."acorn-walk-7.2.0"
       sources."anymatch-3.1.2"
-      sources."arg-5.0.1"
+      sources."arg-5.0.2"
       sources."binary-extensions-2.2.0"
       sources."braces-3.0.2"
       sources."camelcase-css-2.0.1"
@@ -128688,7 +128461,7 @@ in
       sources."psl-1.8.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."range-parser-1.2.1"
       sources."raw-body-2.4.0"
       sources."rc-1.2.8"
@@ -130439,7 +130212,7 @@ in
       sources."ajv-6.12.6"
       sources."asn1-0.2.6"
       sources."assert-plus-1.0.0"
-      sources."async-3.2.3"
+      sources."async-3.2.4"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
       sources."aws-sign2-0.7.0"
@@ -130882,10 +130655,10 @@ in
   typescript-language-server = nodeEnv.buildNodePackage {
     name = "typescript-language-server";
     packageName = "typescript-language-server";
-    version = "0.10.1";
+    version = "0.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.10.1.tgz";
-      sha512 = "Lk98jYbHthLOhldFziQhk0TubE7RvUtQaVW5un7hOR2uDVH78lQHf5RZsgtmlAECgZRxWXgTOJUZ+BWJ+v/a7A==";
+      url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.11.0.tgz";
+      sha512 = "8nfW0+Ei7/h6c2/KCeduPbFxMDVJWok/H593v+gajxXrOCX4VMyoEVsu7BswMyyah8GWDbcNdNi9c812eBtH2A==";
     };
     dependencies = [
       sources."@nodelib/fs.scandir-2.1.5"
@@ -130955,7 +130728,7 @@ in
       sources."vscode-jsonrpc-6.0.0"
       sources."vscode-languageserver-7.0.0"
       sources."vscode-languageserver-protocol-3.16.0"
-      sources."vscode-languageserver-textdocument-1.0.4"
+      sources."vscode-languageserver-textdocument-1.0.5"
       sources."vscode-languageserver-types-3.16.0"
       sources."vscode-uri-3.0.3"
       sources."which-2.0.2"
@@ -130974,10 +130747,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.15.5";
+    version = "3.16.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.5.tgz";
-      sha512 = "hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ==";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.0.tgz";
+      sha512 = "FEikl6bR30n0T3amyBh3LoiBdqHRy/f4H80+My34HOesOKyHfOsxAPAxOoqC0JUnC1amnO0IwkYC3sko51caSw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -131041,7 +130814,7 @@ in
       })
       sources."any-promise-1.3.0"
       sources."array-flatten-1.1.1"
-      sources."async-3.2.3"
+      sources."async-3.2.4"
       sources."balanced-match-1.0.2"
       sources."base64id-2.0.0"
       sources."blueimp-md5-2.19.0"
@@ -131651,10 +131424,10 @@ in
   vercel = nodeEnv.buildNodePackage {
     name = "vercel";
     packageName = "vercel";
-    version = "25.0.0";
+    version = "25.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/vercel/-/vercel-25.0.0.tgz";
-      sha512 = "vBv5rKPiONRhE2Sh4QLzw77xwT0xKLPW3fF2kplF5JhKNonppC2Yvx+ktV2mUNzkCkNM7ruaVPktCiTgoJIBWQ==";
+      url = "https://registry.npmjs.org/vercel/-/vercel-25.0.1.tgz";
+      sha512 = "/IOCUIvxXw1by90fSOeTCgWQ8qMDgE7Mmcs7pb3CVLVdcZRJt6LJ97x49daFaLU/y4UKsPPGpB3brzdvqHVTBg==";
     };
     dependencies = [
       sources."@babel/runtime-7.18.3"
@@ -131684,7 +131457,7 @@ in
       sources."@vercel/go-2.0.0"
       sources."@vercel/next-3.0.0"
       sources."@vercel/nft-0.19.1"
-      sources."@vercel/node-2.0.0"
+      sources."@vercel/node-2.0.1"
       sources."@vercel/node-bridge-3.0.0"
       sources."@vercel/python-3.0.0"
       sources."@vercel/redwood-1.0.0"
@@ -132475,12 +132248,12 @@ in
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."browser-stdout-1.3.1"
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       sources."buffer-crc32-0.2.13"
       sources."buffer-from-1.1.2"
       sources."call-bind-1.0.2"
       sources."camelcase-6.3.0"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       (sources."chalk-4.1.2" // {
         dependencies = [
           sources."supports-color-7.2.0"
@@ -132520,7 +132293,7 @@ in
       sources."domelementtype-2.3.0"
       sources."domhandler-5.0.3"
       sources."domutils-3.0.1"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
       sources."enhanced-resolve-5.9.3"
@@ -132655,7 +132428,7 @@ in
       sources."process-nextick-args-2.0.1"
       sources."prr-1.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.10.3"
+      sources."qs-6.10.5"
       sources."randombytes-2.1.0"
       sources."read-1.0.7"
       sources."readable-stream-1.0.34"
@@ -133031,7 +132804,7 @@ in
       sources."tslib-1.14.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uglify-js-3.15.5"
+      sources."uglify-js-3.16.0"
       sources."uid-0.0.2"
       sources."unbzip2-stream-1.4.3"
       sources."unyield-0.0.1"
@@ -134754,7 +134527,7 @@ in
       sources."yauzl-2.10.0"
       (sources."zip-dir-2.0.0" // {
         dependencies = [
-          sources."async-3.2.3"
+          sources."async-3.2.4"
         ];
       })
     ];
@@ -134809,12 +134582,12 @@ in
       sources."acorn-import-assertions-1.8.0"
       sources."ajv-6.12.6"
       sources."ajv-keywords-3.5.2"
-      sources."browserslist-4.20.3"
+      sources."browserslist-4.20.4"
       sources."buffer-from-1.1.2"
-      sources."caniuse-lite-1.0.30001346"
+      sources."caniuse-lite-1.0.30001349"
       sources."chrome-trace-event-1.0.3"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.4.146"
+      sources."electron-to-chromium-1.4.147"
       sources."enhanced-resolve-5.9.3"
       sources."es-module-lexer-0.9.3"
       sources."escalade-3.1.1"
@@ -134938,10 +134711,10 @@ in
   webpack-dev-server = nodeEnv.buildNodePackage {
     name = "webpack-dev-server";
     packageName = "webpack-dev-server";
-    version = "4.9.1";
+    version = "4.9.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.1.tgz";
-      sha512 = "CTMfu2UMdR/4OOZVHRpdy84pNopOuigVIsRbGX3LVDMWNP8EUgC5mUBMErbwBlHTEX99ejZJpVqrir6EXAEajA==";
+      url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz";
+      sha512 = "H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q==";
     };
     dependencies = [
       sources."@leichtgewicht/ip-codec-2.0.4"
@@ -134977,7 +134750,7 @@ in
           sources."bytes-3.1.2"
         ];
       })
-      sources."bonjour-service-1.0.12"
+      sources."bonjour-service-1.0.13"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."bytes-3.0.0"
@@ -136153,7 +135926,7 @@ in
       (sources."jake-10.8.5" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
-          sources."async-3.2.3"
+          sources."async-3.2.4"
           sources."chalk-4.1.2"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
diff --git a/pkgs/development/ocaml-modules/cry/default.nix b/pkgs/development/ocaml-modules/cry/default.nix
new file mode 100644
index 0000000000000..510c8fd0e2825
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cry/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildDunePackage, fetchFromGitHub }:
+
+buildDunePackage rec {
+  pname = "cry";
+  version = "0.6.5";
+
+  src = fetchFromGitHub {
+    owner = "savonet";
+    repo = "ocaml-cry";
+    rev = version;
+    sha256 = "1g4smccj27sv8pb9az5hbzxi99swg3d55mp7j25lz30xyabvksc3";
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/savonet/ocaml-cry";
+    description = "OCaml client for the various icecast & shoutcast source protocols";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ dandellion ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index 40d1c3d9b31c6..3b133407c30a5 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -1,13 +1,18 @@
 { lib
 , buildDunePackage, camlp5
+, ocaml
+, menhir, menhirLib
+, stdlib-shims
 , re, perl, ncurses
 , ppxlib, ppx_deriving
 , ppxlib_0_15, ppx_deriving_0_15
 , coqPackages
-, version ? "1.14.1"
+, version ? if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1"
 }:
 with lib;
 let fetched = coqPackages.metaFetch ({
+    release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s=";
+    release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar";
     release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis=";
     release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r";
     release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka";
@@ -23,11 +28,16 @@ buildDunePackage rec {
   pname = "elpi";
   inherit (fetched) version src;
 
-  minimumOCamlVersion = "4.04";
+  minimalOCamlVersion = "4.04";
 
-  buildInputs = [ perl ncurses ];
+  buildInputs = [ perl ncurses ]
+  ++ optional (versionAtLeast version "1.15" || version == "dev") menhir;
 
-  propagatedBuildInputs = [ camlp5 re ]
+  propagatedBuildInputs = [ re stdlib-shims ]
+  ++ (if versionAtLeast version "1.15" || version == "dev"
+     then [ menhirLib ]
+     else [ camlp5 ]
+  )
   ++ (if lib.versionAtLeast version "1.13" || version == "dev"
      then [ ppxlib ppx_deriving ]
      else [ ppxlib_0_15 ppx_deriving_0_15 ]
@@ -43,6 +53,4 @@ buildDunePackage rec {
   postPatch = ''
     substituteInPlace elpi_REPL.ml --replace "tput cols" "${ncurses}/bin/tput cols"
   '';
-
-  useDune2 = true;
 }
diff --git a/pkgs/development/ocaml-modules/faad/default.nix b/pkgs/development/ocaml-modules/faad/default.nix
new file mode 100644
index 0000000000000..a2705a27d929e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/faad/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, faad2, pkg-config }:
+
+buildDunePackage rec {
+  pname = "faad";
+  version = "0.5.1";
+
+  src = fetchFromGitHub {
+    owner = "savonet";
+    repo = "ocaml-faad";
+    rev = "v${version}";
+    sha256 = "sha256-3ayKZhgJAgsoOqn0InSrM5f3TImRHOQMtWETICo4t3o=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ dune-configurator ];
+  propagatedBuildInputs = [ faad2 ];
+
+  meta = with lib; {
+    homepage = "https://github.com/savonet/ocaml-faad";
+    description = "Bindings for the faad library which provides functions for decoding AAC audio files";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ dandellion ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/frei0r/default.nix b/pkgs/development/ocaml-modules/frei0r/default.nix
new file mode 100644
index 0000000000000..4f4a64d220a45
--- /dev/null
+++ b/pkgs/development/ocaml-modules/frei0r/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, frei0r }:
+
+buildDunePackage rec {
+  pname = "frei0r";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "savonet";
+    repo = "ocaml-frei0r";
+    rev = "v${version}";
+    sha256 = "sha256-eh/ymZO/3a1z6uvZdnXgma/7AU2NBVs2lddA+R/kuQA=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ dune-configurator ];
+  propagatedBuildInputs = [ frei0r ];
+
+  meta = with lib; {
+    homepage = "https://github.com/savonet/ocaml-frei0r";
+    description = "Bindings for the frei0r API which provides video effects";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ dandellion ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/lame/default.nix b/pkgs/development/ocaml-modules/lame/default.nix
new file mode 100644
index 0000000000000..85d02538ab0ba
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lame/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildDunePackage, fetchFromGitHub, pkg-config, dune-configurator, lame }:
+
+buildDunePackage rec {
+  pname = "lame";
+  version = "0.3.6";
+
+  minimalOCamlVersion = "4.03";
+
+  src = fetchFromGitHub {
+    owner = "savonet";
+    repo = "ocaml-lame";
+    rev = "v${version}";
+    sha256 = "sha256-oRxP1OM0pGdz8CB+ou7kbbrNaB1x9z9KTfciLsivFnI=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ dune-configurator ];
+  propagatedBuildInputs = [ lame ];
+
+  meta = with lib; {
+    homepage = "https://github.com/savonet/ocaml-lame";
+    description = "Bindings for the lame library which provides functions for encoding mp3 files";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ dandellion ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/lilv/default.nix b/pkgs/development/ocaml-modules/lilv/default.nix
new file mode 100644
index 0000000000000..501182db7a96a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lilv/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ctypes, lilv }:
+
+buildDunePackage rec {
+  pname = "lilv";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "savonet";
+    repo = "ocaml-lilv";
+    rev = "v${version}";
+    sha256 = "080ja8c4sxprk5qnldpfzxriag57m9603vny3b4bnwh5xm1id08c";
+  };
+
+  minimalOCamlVersion = "4.03.0";
+
+  buildInputs = [ dune-configurator ];
+  propagatedBuildInputs = [ ctypes lilv ];
+
+  meta = with lib; {
+    homepage = "https://github.com/savonet/ocaml-lilv";
+    description = "OCaml bindings for lilv";
+    license = licenses.lgpl21Only;
+    maintainers = with maintainers; [ dandellion ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix
index 5e815d4dca6bc..cb3c70198dc61 100644
--- a/pkgs/development/ocaml-modules/ocurl/default.nix
+++ b/pkgs/development/ocaml-modules/ocurl/default.nix
@@ -1,21 +1,18 @@
-{ stdenv, lib, pkg-config, ocaml, findlib, fetchurl, curl, ncurses, lwt }:
-
-if lib.versionOlder ocaml.version "4.02"
+{ lib, stdenv, fetchurl, pkg-config, ocaml, findlib, curl, lwt, lwt_ppx }:
+if lib.versionOlder ocaml.version "4.04"
 then throw "ocurl is not available for OCaml ${ocaml.version}"
 else
-
 stdenv.mkDerivation rec {
   pname = "ocurl";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchurl {
-    url = "http://ygrek.org.ua/p/release/ocurl/ocurl-${version}.tar.gz";
-    sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6";
+    url = "https://github.com/ygrek/ocurl/releases/download/${version}/ocurl-${version}.tar.gz";
+    sha256 = "sha256-4DWXGMh02s1VwLWW5d7h0jtMOUubWmBPGm1hghfWd2M=";
   };
 
   nativeBuildInputs = [ pkg-config ocaml findlib ];
-  buildInputs = [ ncurses ];
-  propagatedBuildInputs = [ curl lwt ];
+  propagatedBuildInputs = [ curl lwt lwt_ppx ];
 
   strictDeps = true;
 
@@ -24,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "OCaml bindings to libcurl";
     license = lib.licenses.mit;
     homepage = "http://ygrek.org.ua/p/ocurl/";
-    maintainers = with lib.maintainers; [ bennofs ];
+    maintainers = with lib.maintainers; [ dandellion bennofs ];
     platforms = ocaml.meta.platforms or [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/soundtouch/default.nix b/pkgs/development/ocaml-modules/soundtouch/default.nix
new file mode 100644
index 0000000000000..fc79664d06bbe
--- /dev/null
+++ b/pkgs/development/ocaml-modules/soundtouch/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, soundtouch }:
+
+buildDunePackage rec {
+  pname = "soundtouch";
+  version = "0.1.9";
+
+  src = fetchFromGitHub {
+    owner = "savonet";
+    repo = "ocaml-soundtouch";
+    rev = "v${version}";
+    sha256 = "sha256-81Mhk4PZx4jGrVIevzMslvVbKzipzDzHWnbtOjeZCI8=";
+  };
+
+  buildInputs = [ dune-configurator ];
+  propagatedBuildInputs = [ soundtouch ];
+
+  meta = with lib; {
+    homepage = "https://github.com/savonet/ocaml-soundtouch";
+    description = "Bindings for the soundtouch library which provides functions for changing pitch and timestretching audio data";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ dandellion ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/taglib/default.nix b/pkgs/development/ocaml-modules/taglib/default.nix
new file mode 100644
index 0000000000000..ecd33145614c9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/taglib/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, taglib, zlib }:
+
+buildDunePackage rec {
+  pname = "taglib";
+  version = "0.3.9";
+
+  src = fetchFromGitHub {
+    owner = "savonet";
+    repo = "ocaml-taglib";
+    rev = "v${version}";
+    sha256 = "sha256-n8Vv8Vepvhx7anZdWIdBfw+HSQShKWjNe6l0gqRRsSs=";
+  };
+
+  minimalOCamlVersion = "4.05.0"; # Documented version 4.02.0. 4.05.0 actually required.
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ dune-configurator ];
+  propagatedBuildInputs = [ taglib zlib ];
+
+  meta = with lib; {
+    homepage = "https://github.com/savonet/ocaml-taglib";
+    description = "Bindings for the taglib library which provides functions for reading tags in headers of audio files";
+    license = with licenses; [ lgpl21Plus "link-exception" ]; # GNU Library Public License 2 Linking Exception
+    maintainers = with maintainers; [ dandellion ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix
index 5d53d6db4186c..3af1bd00a19b4 100644
--- a/pkgs/development/ocaml-modules/wasm/default.nix
+++ b/pkgs/development/ocaml-modules/wasm/default.nix
@@ -1,19 +1,18 @@
 { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
 
-if lib.versionOlder ocaml.version "4.03"
-|| lib.versionOlder "4.13" ocaml.version
+if lib.versionOlder ocaml.version "4.08"
 then throw "wasm is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-wasm";
-  version = "1.1.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "spec";
     rev = "opam-${version}";
-    sha256 = "1kp72yv4k176i94np0m09g10cviqp2pnpm7jmiq6ik7fmmbknk7c";
+    sha256 = "sha256:09s0v79x0ymzcp2114zkm3phxavdfnkkq67qz1ndnknbkziwqf3v";
   };
 
   nativeBuildInputs = [ ocaml findlib ocamlbuild ];
diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix
index bc10948f070fb..f117167c8df00 100644
--- a/pkgs/development/python-modules/adb-shell/default.nix
+++ b/pkgs/development/python-modules/adb-shell/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "adb-shell";
-  version = "0.4.2";
+  version = "0.4.3";
   format = "setuptools";
 
   disabled = !isPy3k;
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "JeffLIrion";
     repo = "adb_shell";
     rev = "v${version}";
-    hash = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY=";
+    hash = "sha256-+RU3nyJpHq0r/9erEbjUILpwIPWq14HdOX7LkSxySs4=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix
index 277eb3513cd07..4fc5854f63dc3 100644
--- a/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "async-upnp-client";
-  version = "0.31.0";
+  version = "0.31.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "StevenLooman";
     repo = "async_upnp_client";
     rev = version;
-    sha256 = "sha256-jxipSHSsipnKJF+d7tez9M6bBlwV4r8XGQ2elI0jsVc=";
+    sha256 = "sha256-edoP4YvMp9ImfeS9bUwNBdx6eAUj5/J1tLymkOc6jwQ=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix
index dd0a4662ce7cb..ea5cd735577e9 100644
--- a/pkgs/development/python-modules/black/default.nix
+++ b/pkgs/development/python-modules/black/default.nix
@@ -60,10 +60,9 @@ buildPythonPackage rec {
     # Fail on Hydra, see https://github.com/NixOS/nixpkgs/pull/130785
     "test_bpo_2142_workaround"
     "test_skip_magic_trailing_comma"
-  ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
-    # exceeds max open files on hydra builders
-    "test_blackd_supported_version"
   ];
+  # multiple tests exceed max open files on hydra builders
+  doCheck = !(stdenv.isLinux && stdenv.isAarch64);
 
   propagatedBuildInputs = [
     aiohttp
diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix
index d613bb9e89700..e5ecff7837f94 100644
--- a/pkgs/development/python-modules/canonicaljson/default.nix
+++ b/pkgs/development/python-modules/canonicaljson/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "canonicaljson";
-  version = "1.6.1";
+  version = "1.6.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qTZk9phVbb1Lq5w/xPs1g0zyU12h6gC2t3WNj+K7uCQ=";
+    hash = "sha256-rwC+jOnFiYV98Xa7lFlPDUOw4CfwJ6jXz4l4/bgZAko=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix
index 6aaabe3c744a5..eb2e641910915 100644
--- a/pkgs/development/python-modules/dash/default.nix
+++ b/pkgs/development/python-modules/dash/default.nix
@@ -1,22 +1,27 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
-, plotly
-, flask
-, flask-compress
+, celery
 , dash-core-components
 , dash-html-components
 , dash-table
-, pytest-mock
+, diskcache
+, fetchFromGitHub
+, flask
+, flask-compress
 , mock
-, pyyaml
+, multiprocess
+, plotly
+, psutil
+, pytest-mock
 , pytestCheckHook
 , pythonOlder
+, pyyaml
+, redis
 }:
 
 buildPythonPackage rec {
   pname = "dash";
-  version = "2.4.1";
+  version = "2.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -25,7 +30,7 @@ buildPythonPackage rec {
     owner = "plotly";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-7B1LEcEgUGJ/gDCDD4oURqli8I5YTJo9jl7l4E1aLVQ=";
+    hash = "sha256-Qh5oOkTxEbxXXDX+g9TDa5DiYBlMpnx0yKsn/XMfMF0=";
   };
 
   propagatedBuildInputs = [
@@ -37,6 +42,18 @@ buildPythonPackage rec {
     dash-table
   ];
 
+  passthru.optional-dependencies = {
+    celery = [
+      celery
+      redis
+    ];
+    diskcache = [
+      diskcache
+      multiprocess
+      psutil
+    ];
+  };
+
   checkInputs = [
     pytestCheckHook
     pytest-mock
@@ -50,12 +67,14 @@ buildPythonPackage rec {
     "tests/integration"
   ];
 
-  pythonImportsCheck = [ "dash" ];
+  pythonImportsCheck = [
+    "dash"
+  ];
 
   meta = with lib; {
     description = "Python framework for building analytical web applications";
     homepage = "https://dash.plot.ly/";
     license = licenses.mit;
-    maintainers = [ maintainers.antoinerg ];
+    maintainers = with maintainers; [ antoinerg ];
   };
 }
diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix
index 2a67ef167c540..b271861e27897 100644
--- a/pkgs/development/python-modules/databricks-connect/default.nix
+++ b/pkgs/development/python-modules/databricks-connect/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "databricks-connect";
-  version = "9.1.16";
+  version = "9.1.17";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-agdky7AhRuObU9GT8IpdgB3SWdHDBRnuoaAtYAlCv/4=";
+    sha256 = "sha256-QBGeXZ8zvRRjmKGs0vyBWTvcug3PF/BFV2asYTqsScw=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix
index ef8b091b0c4e6..c94f3d205ce84 100644
--- a/pkgs/development/python-modules/deezer-python/default.nix
+++ b/pkgs/development/python-modules/deezer-python/default.nix
@@ -13,16 +13,16 @@
 
 buildPythonPackage rec {
   pname = "deezer-python";
-  version = "5.3.2";
+  version = "5.3.3";
   format = "pyproject";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "browniebroke";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-lOVHSYL57hwzvdC+pJFDkDGFuu29jdZ36BYscw82uDE=";
+    hash = "sha256-eiznL23Pt7bwBLxNG8V3ITSNMnwMBjFdiGgu0cSoSw0=";
   };
 
   nativeBuildInputs = [
@@ -46,7 +46,9 @@ buildPythonPackage rec {
       --replace " --cov=deezer" ""
   '';
 
-  pythonImportsCheck = [ "deezer" ];
+  pythonImportsCheck = [
+    "deezer"
+  ];
 
   meta = with lib; {
     description = "Python wrapper around the Deezer API";
diff --git a/pkgs/development/python-modules/docopt-ng/default.nix b/pkgs/development/python-modules/docopt-ng/default.nix
index 7a18bfbc7cfa2..60d14fa8e98f8 100644
--- a/pkgs/development/python-modules/docopt-ng/default.nix
+++ b/pkgs/development/python-modules/docopt-ng/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "docopt-ng";
-  version = "0.7.2";
+  version = "0.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-hs7qAy8M+lnmB3brDPOKxzZTWBAihyMg9H3IdGeNckQ=";
+    sha256 = "sha256-6mphooj8hk7uayLW/iiqIC1Z/Ib60F8W/145zE6n9uM=";
   };
 
   pythonImportsCheck = [ "docopt" ];
diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 570598e1a993a..ccd816753a9ac 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -17,7 +17,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.20.42";
+  version = "0.20.43";
   pname = "dulwich";
   format = "setuptools";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cro7YK5qVU0TMrO0CjRf6+FuxGnPYBS7RDtxmQLjPvA=";
+    hash = "sha256-/MIWTgE7OQqe46EJ1+97ldjeKDsueJuwfpSqMRXjKeo=";
   };
 
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index b42ecc5bd2619..02f0d49279511 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "fakeredis";
-  version = "1.8";
+  version = "1.8.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dsoftwareinc";
     repo = "fakeredis-py";
-    rev = "v${version}";
-    hash = "sha256-HWt2EE25h8zUarknrNMBJmizP3rNM9W8IEUMxLyUii8=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-gmQuQIlpE4PdgZ1J5aucSQkJpfrh1qTJNLfyI+cMCJU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix
index fabc324126696..9ce21b794927b 100644
--- a/pkgs/development/python-modules/fastapi-mail/default.nix
+++ b/pkgs/development/python-modules/fastapi-mail/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "fastapi-mail";
-  version = "1.0.8";
+  version = "1.0.9";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -27,8 +27,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sabuhish";
     repo = pname;
-    rev = version;
-    hash = "sha256-PkA7qkdDUd7mrtvb6IbCzFRq6X0M3iKY+FKuNConJ5A=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-2Nb+FzmhsKvauT/yOCLHCEld8r+6niu9kV6EmjhC6S0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix
index e550fe89ec78a..129d18639234e 100644
--- a/pkgs/development/python-modules/fido2/default.nix
+++ b/pkgs/development/python-modules/fido2/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "fido2";
-  version = "0.9.3";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b45e89a6109cfcb7f1bb513776aa2d6408e95c4822f83a253918b944083466ec";
+    sha256 = "sha256-JQmklYtmbXR/1XVN+pNX2i2BtS7cDs/3W2jOqTkVTAI=";
   };
 
   propagatedBuildInputs = [ six cryptography ];
diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
index c6f17c8d8b007..ec355d51fd076 100644
--- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-appengine-logging";
-  version = "1.1.1";
+  version = "1.1.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-NhRQ7X17/Y79DvJT4haArrb23zzwV+XoJT9YUfjLvKc=";
+    hash = "sha256-undhXBAPB+3akWVu3ht0ZZBwErhmOq18TnXvloeZQjc=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix
index 0e8281f41847c..63b989f4faf0e 100644
--- a/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/pkgs/development/python-modules/google-cloud-asset/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-asset";
-  version = "3.9.0";
+  version = "3.9.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-DMRBAzGlByjcdLr/HnVxFxbNWK1TbYFpYKEjDdzfEeg=";
+    hash = "sha256-rGN3P4EfSs7bLLca4Y2J1jF1/wPR5Oc1d6iZFjeQHTM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index 2717af605ef3c..e67b32272e54e 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-datatransfer";
-  version = "3.6.1";
+  version = "3.6.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
- 
+
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk=";
+    hash = "sha256-y8W0qwm4rTHlDO8L+/fhIJlfW5PonUhAYBU5wLIZJ94=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
index c26d7582c23d1..59859e4ccea78 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-logging";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-i8Bh39MnQRQtE4WwDNhHdxFX2bGL6txT+sV8RcvXiZw=";
+    sha256 = "sha256-hIwKcQNPG6AHudqjy2dotACk51IeivwRbJZZaiFweqs=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
index 1b59bc8ddbf81..e013cac9f610e 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-storage";
-  version = "2.13.1";
+  version = "2.13.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7a25148f635a04ca9ff568d47e64be275d3a4a3c90772524879e8f88f270d92d";
+    sha256 = "sha256-rEznNOgFrKfnOmlhexTTHmkKETRGE26SKSp04diz47I=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix
index ae3c6a8be74a0..41b85f50a43ee 100644
--- a/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-container";
-  version = "2.10.7";
+  version = "2.10.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-I3oYldj915GBCX5VLEZRqGS7jMHWasQGVIvj50EUTK4=";
+    hash = "sha256-cQ5wFAwgqT2NT+jTfsg13wA7OOq8bk/QIRiIsK2ZyJ0=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
index 304899f0c8aec..f38b604ddb391 100644
--- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datacatalog";
-  version = "3.8.0";
+  version = "3.8.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-kGYfdvAnvdFm/1u0CS+n6rGKhV5GtGhW1zF7SVUu8PY=";
+    hash = "sha256-t7kFCkyH3/MNGFX8S4OzgWnW/NSomAFDbDPCx9hV40g=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 88d4e0bd6620c..05b61dd958d2a 100644
--- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dataproc";
-  version = "4.0.2";
+  version = "4.0.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-C2hAkWSb3h+lFC3pUIHlttme44Ugfae8opmFQbVWYTE=";
+    sha256 = "sha256-9PqMYqZpcy+Lv/3sh5Ru0X0wQWW5VW7CDsFGgHvErpU=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix
index 73c887748a04a..2a04cca972f98 100644
--- a/pkgs/development/python-modules/google-cloud-datastore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datastore";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-2ItUrY5oMTtWig2UIC2IEOKgaaYsVuy9ralDitzQzdc=";
+    sha256 = "sha256-Ie/SyTY8AkmDXRKWwZiukD76HpwJEtp7IBusWj+Y4HE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 5dfc976865308..279893faf33ec 100644
--- a/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dlp";
-  version = "3.7.0";
+  version = "3.7.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-aUabWEz+ou12Lgys7PZnldjHnifPWPPqO8iJqkDgx9U=";
+    hash = "sha256-q2I3ku8f55rSJQE5oiDttQOJFYtGPjmrW7htrZ+BMPU=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
index 7ae7babaebf54..67351536ad7c1 100644
--- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
+++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-error-reporting";
-  version = "1.5.2";
+  version = "1.5.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wjRUPBZwyGP+2528vZ/x4EqiZwqH+9ZvK5rx4ISklHE=";
+    hash = "sha256-J+MzM6aaVy4xmlNUFhSOgAomT007p3ODYVXN71UmZJA=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
index 017634fd52738..b867c40140ba6 100644
--- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-iam-logging";
-  version = "1.0.1";
+  version = "1.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ZmoBaY0OM2pQcqasGCJQIeN6Rmbo4xlYK7LtH7SecgY=";
+    hash = "sha256-f5ZETn1zLrC+1Gil47zzJGanx7cFBisdoFPoDe1FFwo=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix
index 26c89af2addbf..c1d6152297fb9 100644
--- a/pkgs/development/python-modules/google-cloud-iam/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-iam";
-  version = "2.6.1";
+  version = "2.6.2";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-c1XPE5PBDXRgpiKGBfAhHB6yTPyvby3aZ5nF40+qFiQ=";
+    sha256 = "sha256-IOl5ZWekpiikOOMQ/afryiP+0lPLt4idSmVARRJj8LE=";
   };
 
   propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix
index d00d05f5431ed..77dd863f2b52a 100644
--- a/pkgs/development/python-modules/google-cloud-iot/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iot/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-iot";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-bZ2Zn4r+hQ2MfkgXmJPYWbKy3tYlTkYh6ohmWQA/75U=";
+    sha256 = "sha256-Y71v505bwXEV1u28WFAHs12Qx0tKY7BDjFCc+oBgZcw=";
   };
 
   propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix
index 6317d621a0b9a..6a55519f79e96 100644
--- a/pkgs/development/python-modules/google-cloud-kms/default.nix
+++ b/pkgs/development/python-modules/google-cloud-kms/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-kms";
-  version = "2.11.1";
+  version = "2.11.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-n0alfJIsaqhQ4Wr4/d2JRXTCE24JTrRJBsYOnRhpV00=";
+    sha256 = "sha256-X95xD/L18dXPYxCbvxIPjaOolMSDr7vpyQnzb5oMFEQ=";
   };
 
   propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix
index 2eb6869492f51..366341dc153d6 100644
--- a/pkgs/development/python-modules/google-cloud-language/default.nix
+++ b/pkgs/development/python-modules/google-cloud-language/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-language";
-  version = "2.4.2";
+  version = "2.4.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-kxJySGikHdichitekEiPjzs48bDqWaXMBhmI6IAwKRM=";
+    sha256 = "sha256-1N5nnT22ILyaubDrpj2bS260AP4YrjrMQ0tgBA3OChg=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix
index 495623b3342a4..d270a1efe72ac 100644
--- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix
+++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-org-policy";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-i60DIRtWtB1MEB2/MuNycy7T9MFPnlRtJ7lnFhDVJbE=";
+    sha256 = "sha256-hZzujuHtj5g/dBJUhZBV4h8zJjtI1xitfjkcVzURfKU=";
   };
 
   propagatedBuildInputs = [ google-api-core proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix
index 6f6223f1be984..d2235b44cf606 100644
--- a/pkgs/development/python-modules/google-cloud-os-config/default.nix
+++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-os-config";
-  version = "1.11.1";
+  version = "1.11.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-i4STXwnFyfXauRx4zvYMO1uWMechvNUOxolOcY3Z5us=";
+    sha256 = "sha256-n3bCKr+fszqHsi6uDmOXSfzoPP8JfpZRAGXIzE3gOVU=";
   };
 
   propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 6871296a763de..aac222df0ac34 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "2.12.1";
+  version = "2.13.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mTphUjL61NwaE7vKDgeCv+0WeA15FNQzvnY/6fHZ/QU=";
+    hash = "sha256-pcLgXIPWC7F6FS5Znn9DJMn/tsjNpE/7YlCxYoDDg+Y=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix
index ab432454bbafc..4a4e0e9a555f3 100644
--- a/pkgs/development/python-modules/google-cloud-redis/default.nix
+++ b/pkgs/development/python-modules/google-cloud-redis/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-redis";
-  version = "2.8.0";
+  version = "2.8.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7L3SjViQmzTp//5LWWG9VG+TQuPay70KZdUuzhy7HS0=";
+    hash = "sha256-qI7bGk+BkLIfhrJHAfk2DVBp8vRc5dPLKjdKH0FPj8s=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
index b5c9f186fe559..edb73853cacec 100644
--- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-secret-manager";
-  version = "2.11.0";
+  version = "2.11.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-naE1e7T1E0P3MxJCMYc3YZ79v/3VTW19D/LhzRie7jk=";
+    hash = "sha256-tSy0d8kdyDSE+/gcg4B+fplnLJ4ipoa+TZvUoExaYVU=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
index 1df89058a6f59..5be79fd38fa50 100644
--- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
+++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-securitycenter";
-  version = "1.11.0";
+  version = "1.11.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+etRN3Q7Y1oYtQy0Fkoj6ujhx4gD5y+fUriu/eitIQM=";
+    hash = "sha256-XvjxdrGgdXaJqbArwdEWT31one+I43cpZ97PciM8yIA=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix
index cd797240cc768..8c46aec477e02 100644
--- a/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-speech";
-  version = "2.14.0";
+  version = "2.14.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-D8t8+rscImUvpHCEFGTzLU5FpAMZ62iHhRfLzUXqGV8=";
+    hash = "sha256-ImE08djcrhhC0VQJmL69hbfUDBALPUyW9IaSh1CIJqs=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index c252b608f775e..8746510b505b1 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-storage";
-  version = "2.3.0";
+  version = "2.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9Muw3l4XIo6cCc3Il9geqnDiw5b1hRP3neDoJFhMj1s=";
+    hash = "sha256-X+JvE4GzDjzDKPRuE1McqFJUWPhwweMDxha963t/XGY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix
index 6bc9353262fab..7f4c314198396 100644
--- a/pkgs/development/python-modules/google-cloud-tasks/default.nix
+++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-tasks";
-  version = "2.9.0";
+  version = "2.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-MjXGDlqRDFn2whxnEm1lf0G+vU9U/S3BmNvi47aEJro=";
+    sha256 = "sha256-wIO22BScrDJdbia6oOEuuXptedxrCehqWKLXmxTJmKE=";
   };
 
   propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index a7c49f0cabe96..92d2272440e9f 100644
--- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-texttospeech";
-  version = "2.11.0";
+  version = "2.11.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-UJSP3a9G6k1arMpoh4/rWrnR4gYtPW6d6LGwWuk5WGg=";
+    sha256 = "sha256-4I7zmjZMjXjkxjEtwWNbev0ryTOIyOWsVkC46tgRyqc=";
   };
 
   propagatedBuildInputs = [ libcst google-api-core proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix
index bb9eb5f477acf..8665718fb00f6 100644
--- a/pkgs/development/python-modules/google-cloud-trace/default.nix
+++ b/pkgs/development/python-modules/google-cloud-trace/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-trace";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-JkKW9vJAAkw3sHYDapRvu5jjunV8oWSg/ykDmd1wpyA=";
+    sha256 = "sha256-nxyd8zE8PEQupVutLWhLD4I1jNhhJ0ARpTi52f21iBE=";
   };
 
   propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix
index 4a9398ac4b42a..ca961844a027a 100644
--- a/pkgs/development/python-modules/google-cloud-translate/default.nix
+++ b/pkgs/development/python-modules/google-cloud-translate/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-translate";
-  version = "3.7.3";
+  version = "3.7.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-c++DP97IhMKHKZqXWpVO/9Rw1q8eYs1ybNZDhviwB/A=";
+    hash = "sha256-B5MBpdcS6NN7rwvjLwbY55rV0dLDwWtnAadWsH2AwXE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index 2ea8de6f139fd..b1d7c8d5da19a 100644
--- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-websecurityscanner";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-yK4xEu9rfFkA6RDNDjul0V+Xjc8TehJ6f8lv1k2WULc=";
+    sha256 = "sha256-JDuMhyk1018pMYNOhRVmP7XyF2wsK5temDTP5033Dxk=";
   };
 
   propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix
index b77dcaaa9d375..977d94e8a20c9 100644
--- a/pkgs/development/python-modules/hidapi/default.nix
+++ b/pkgs/development/python-modules/hidapi/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "hidapi";
-  version = "0.11.2";
+  version = "0.12.0.post2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-yYS37C/C6ph81EzwaUflVXJJjtLUPGSJC0q1iymvcrw=";
+    sha256 = "8ebb2117be8b27af5c780936030148e1971b6b7fda06e0581ff0bfb15e94ed76";
   };
 
   nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ];
diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix
index 815765b8a40a4..0df01749e953c 100644
--- a/pkgs/development/python-modules/huum/default.nix
+++ b/pkgs/development/python-modules/huum/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "huum";
-  version = "0.5.0";
+  version = "0.6.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ldhAg9zGCEYvya01s6AHzALI4dS+d0R73c62YZyk19M=";
+    sha256 = "sha256-PYOjfLPa/vZZP0IZuUZnQ74IrTRvizgYhKOmhd83aMQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix
index c1c5479dfd8ff..3f8bc99eeb6b7 100644
--- a/pkgs/development/python-modules/inkex/default.nix
+++ b/pkgs/development/python-modules/inkex/default.nix
@@ -1,6 +1,9 @@
 { buildPythonPackage
 , inkscape
+, cssselect
 , lxml
+, numpy
+, pygobject3
 , python
 }:
 
@@ -11,7 +14,10 @@ buildPythonPackage {
   format = "other";
 
   propagatedBuildInputs = [
+    cssselect
     lxml
+    numpy
+    pygobject3
   ];
 
   # We just copy the files.
diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix
index a55ca5cb2924c..1cdf9d883a7dc 100644
--- a/pkgs/development/python-modules/mkdocs-material/default.nix
+++ b/pkgs/development/python-modules/mkdocs-material/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonApplication rec {
   pname = "mkdocs-material";
-  version = "8.3.2";
+  version = "8.3.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonApplication rec {
     owner = "squidfunk";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-VcyBsIU2PJ2xh365kNAlO3wno3xushlaj43dIh1GkP8=";
+    hash = "sha256-4rJ1fKYIQli4j6x1/xipQeCXMfbILyroxrwbpcPGYiU=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix
index 6f89cd6157439..519084e073e95 100644
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "peaqevcore";
-  version = "0.2.0";
+  version = "0.3.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-M7jBwpo9yMggd81xiWH9SSJ1axGXiC5uQo/jnRcQ3/4=";
+    hash = "sha256-s2OPHA3uBoWFnEz51itif3icErYkXhayvQ3+0b6jyjE=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index cf5b79fb7114c..b8900b0f55067 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -1,10 +1,11 @@
-{ lib
+ { lib
 , aiohttp
 , async-timeout
 , buildPythonPackage
 , crcmod
 , defusedxml
 , fetchFromGitHub
+, freezegun
 , jsonpickle
 , munch
 , mypy
@@ -20,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "plugwise";
-  version = "0.18.5";
+  version = "0.19.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -29,7 +30,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "python-plugwise";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-J6RwPkObcoXIQ93nD8FNNjwllHoID4nFzqilArBS1C8=";
+    sha256 = "sha256-ST7eC7IXW47b1AlX25ubUPTi6Hkcjd+7L0tzht3fz9s=";
   };
 
   propagatedBuildInputs = [
@@ -45,6 +46,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    freezegun
     jsonpickle
     mypy
     pytest-aiohttp
diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix
index db598b368c5b6..282dd59a05c0f 100644
--- a/pkgs/development/python-modules/pre-commit-hooks/default.nix
+++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix
@@ -11,16 +11,16 @@
 
 buildPythonPackage rec {
   pname = "pre-commit-hooks";
-  version = "4.2.0";
+  version = "4.3.0";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "pre-commit";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-jSu4LutEgpeAbCgSHgk6VXQKLZo00T3TrQVZxsNU1co=";
+    sha256 = "sha256-qdsSM+7ScSfxhmLAqwi1iraGHrhb5NBee/j+TKr2WUA=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix
index e38157c69071c..3fb33af88958f 100644
--- a/pkgs/development/python-modules/pulumi/default.nix
+++ b/pkgs/development/python-modules/pulumi/default.nix
@@ -66,20 +66,19 @@ buildPythonPackage rec {
     black
   ];
 
-  pythonImportsCheck = ["pulumi"];
-
+  sourceRoot="source/sdk/python/lib";
+  # we apply the modifications done in the pulumi/sdk/python/Makefile
+  # but without the venv code
   postPatch = ''
-    cp README.md sdk/python/lib
-    patchShebangs .
-    cd sdk/python/lib
-
-    substituteInPlace setup.py \
-      --replace "{VERSION}" "${version}"
+    cp ../../README.md .
+    sed -i "s/\''${VERSION}/${version}/g" setup.py
   '';
 
   # disabled because tests try to fetch go packages from the net
   doCheck = false;
 
+  pythonImportsCheck = ["pulumi"];
+
   meta = with lib; {
     description = "Modern Infrastructure as Code. Any cloud, any language";
     homepage = "https://github.com/pulumi/pulumi";
diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix
index eb5403c2b9685..46a25e2c6bba3 100644
--- a/pkgs/development/python-modules/pyfxa/default.nix
+++ b/pkgs/development/python-modules/pyfxa/default.nix
@@ -1,37 +1,64 @@
-{ lib, buildPythonPackage, fetchPypi
-, requests, cryptography, pybrowserid, hawkauthlib, six
-, grequests, mock, responses, pytest, pyjwt }:
+{ lib
+, buildPythonPackage
+, cryptography
+, fetchPypi
+, grequests
+, hawkauthlib
+, mock
+, pybrowserid
+, pyjwt
+, pytestCheckHook
+, pythonOlder
+, requests
+, responses
+, setuptools
+, six
+}:
 
 buildPythonPackage rec {
-  pname = "PyFxA";
+  pname = "pyfxa";
   version = "0.7.7";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "6c85cd08cf05f7138dee1cf2a8a1d68fd428b7b5ad488917c70a2a763d651cdb";
+    pname = "PyFxA";
+    inherit version;
+    hash = "sha256-bIXNCM8F9xON7hzyqKHWj9Qot7WtSIkXxwoqdj1lHNs=";
   };
 
-  postPatch = ''
-    # Requires network access
-    rm fxa/tests/test_core.py
-  '';
-
   propagatedBuildInputs = [
-    pyjwt requests cryptography pybrowserid hawkauthlib six
+    cryptography
+    hawkauthlib
+    pybrowserid
+    pyjwt
+    requests
+    setuptools # imports pkg_resources
+    six
   ];
 
   checkInputs = [
-    grequests mock responses pytest
+    grequests
+    mock
+    responses
+    pytestCheckHook
   ];
 
-  # test_oath is mostly network calls
-  checkPhase = ''
-    pytest --ignore=fxa/tests/test_oauth.py
-  '';
+  pythonImportsCheck = [
+    "fxa"
+  ];
+
+  disabledTestPaths = [
+    # Requires network access
+    "fxa/tests/test_core.py"
+    "fxa/tests/test_oauth.py"
+  ];
 
   meta = with lib; {
-    description = "Firefox Accounts client library for Python";
+    description = "Firefox Accounts client library";
     homepage = "https://github.com/mozilla/PyFxA";
     license = licenses.mpl20;
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix
index 3676ce9a469c5..096085a271036 100644
--- a/pkgs/development/python-modules/pyroute2-core/default.nix
+++ b/pkgs/development/python-modules/pyroute2-core/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-core";
-  version = "0.6.10";
+  version = "0.6.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.core";
     inherit version;
-    hash = "sha256-hwI7sSaR0938VeCShzZ39b2CAU5SJLqui8Ri3CGXPwk=";
+    hash = "sha256-9Odxls1lje7pUCu0UkhfQIgbL2dOZQkiV1J/kgfgxGw=";
   };
 
   # pyroute2 sub-modules have no tests
diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix
index 515bdfb2d6d8f..ba0f2a054e119 100644
--- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix
+++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-ethtool";
-  version = "0.6.10";
+  version = "0.6.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.ethtool";
     inherit version;
-    hash = "sha256-5i1zbKs40RXCQB1cn3jrDOX+Fgl0nknTFLsvI69udxw=";
+    hash = "sha256-3xFsK50WtnRS8ImEWU4Hke9Ndp1Asm4wPEBfQT1rYXU=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix
index 5a3b4d186556e..944b1ab4cfc17 100644
--- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix
+++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-ipdb";
-  version = "0.6.10";
+  version = "0.6.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.ipdb";
     inherit version;
-    hash = "sha256-emPIh94LqN/QCCLC6Mr+IiVyXtjdsmhduBdPko1V83A=";
+    hash = "sha256-UTP5LuZbBukfDpQPJ+N5ZFtKGFJppZfpsISnsm9eabs=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix
index 783405f0eafca..967b232cd2345 100644
--- a/pkgs/development/python-modules/pyroute2-ipset/default.nix
+++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-ipset";
-  version = "0.6.10";
+  version = "0.6.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.ipset";
     inherit version;
-    hash = "sha256-1Fk3imqMz9qx1zBcQ/Uyp2eVrTygGIklVF5/QBbuSoI=";
+    hash = "sha256-uIfclrm1tujUickd5R4uyDHvPExyC2M9mpm5NLF1rts=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix
index b0e123bc4c4be..9bf7414c79ffd 100644
--- a/pkgs/development/python-modules/pyroute2-ndb/default.nix
+++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-ndb";
-  version = "0.6.10";
+  version = "0.6.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.ndb";
     inherit version;
-    hash = "sha256-kjgeA7PV6JLvCvaZxe4y984wTo8ExU7Yf1Wr+7jNwu4=";
+    hash = "sha256-jz956VgO9Z9ZPlMQobB34wd04Og/XV7IP+J58htdk+Y=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix
index 04f9b29bd56f8..a251c34a8b282 100644
--- a/pkgs/development/python-modules/pyroute2-nftables/default.nix
+++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-nftables";
-  version = "0.6.10";
+  version = "0.6.11";
 
   src = fetchPypi {
     pname = "pyroute2.nftables";
     inherit version;
-    sha256 = "sha256-dUuCTGs7RaEehsAgK7yNw11tE3VGtT5LxDilMVWpCNU=";
+    sha256 = "sha256-2SHAH4HBcXknCa2rdHk1s+ju+IN5ndcLPD8dgSGagqU=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix
index 368e9cc9fb55e..af4d6a7a01d1d 100644
--- a/pkgs/development/python-modules/pyroute2-nslink/default.nix
+++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-nslink";
-  version = "0.6.10";
+  version = "0.6.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.nslink";
     inherit version;
-    hash = "sha256-PynJRg2pXZIeB4Ucz/tvghdEt1iWAr8azjET9hsnUPE=";
+    hash = "sha256-R94n1UEceOMmXXbCCkgq6N2JLnp2eqAW4qweIpNI2CI=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix
index 401786f7cd602..9cf62994c3a1e 100644
--- a/pkgs/development/python-modules/pyroute2-protocols/default.nix
+++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-protocols";
-  version = "0.6.10";
+  version = "0.6.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.protocols";
     inherit version;
-    hash = "sha256-xMTKAJC++X1zO7rm+cUr0IuEDxkllyje00Omv9tLZ6E=";
+    hash = "sha256-AnmW9ILlcZh2mwO5fbhY4ZazWSAy2wHJgLp5Anlmxk4=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 54540197f72ba..a95356d581992 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.6.10";
+  version = "0.6.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Vj7W3/yQPYIUFEdvNv3AS9OqddqtISRbcmWUJxc5JiI=";
+    hash = "sha256-E2NGvmbVUuRUHQZ52/+say4SN9/TnuGpUGL4UCRJF70=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix
index ded9bcbbc4eda..a0ba11a4a3703 100644
--- a/pkgs/development/python-modules/pyshark/default.nix
+++ b/pkgs/development/python-modules/pyshark/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyshark";
-  version = "0.4.5";
+  version = "0.4.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
     repo = pname;
     # 0.4.5 was the last release which was tagged
     # https://github.com/KimiNewt/pyshark/issues/541
-    rev = "8f8f13aba6ae716aa0a48175255063fe542fdc3b";
-    hash = "sha256-v9CC9hgTABAiJ0qiFZ/9/zMmHzJXKq3neGtTq/ucnT4=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-yEpUFihETKta3+Xb8eSyTZ1uSi7ao4OqWzsCgDLLhe8=";
   };
 
   sourceRoot = "${src.name}/src";
diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix
index 46346f466b20d..b9d82584a503c 100644
--- a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pysigma-backend-insightidr";
-  version = "0.1.5";
+  version = "0.1.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "SigmaHQ";
     repo = "pySigma-backend-insightidr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-RjBRFNMIpjW/x5vShXUgi25oOmvRlD2zP6mNQJ7sG8M=";
+    hash = "sha256-Sg+AYoEbCmcqxw5dl8wmQcI+lFrAfFgDnQjiQh6r9Yc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix
index a8c0b3d6ea67c..b270fa79c88d2 100644
--- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pysigma-backend-splunk";
-  version = "0.3.2";
+  version = "0.3.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "SigmaHQ";
     repo = "pySigma-backend-splunk";
     rev = "v${version}";
-    hash = "sha256-wcAqXFou20V2ZPOXCsF1Nky008q2xkfuI0RbTsatC6k=";
+    hash = "sha256-VRHrlcty3EpGnQkVJvsNWOJSW6rNE97Lqt36HmMR53A=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix
index 5ed92014fc2e9..14129f148b19c 100644
--- a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix
+++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pysigma-pipeline-crowdstrike";
-  version = "0.1.5";
+  version = "0.1.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "SigmaHQ";
     repo = "pySigma-pipeline-crowdstrike";
     rev = "v${version}";
-    hash = "sha256-TmvEWrkNu8gJ8rPFoRWd+uYob2rmmdasqxH1CYmz4Rk=";
+    hash = "sha256-5xX7NwM+Us0ToJa2miAw9KsCt2T+TqBnqHtwphZNxJI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix
index 26f058c3e197a..d308d72d805f5 100644
--- a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix
+++ b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pysigma-pipeline-sysmon";
-  version = "0.1.5";
+  version = "0.1.6";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "SigmaHQ";
     repo = "pySigma-pipeline-sysmon";
     rev = "v${version}";
-    hash = "sha256-Bh0Qh+pY22lm/0vtJC4tFIl1KRF3zFQ8vcH0JEfYGAc=";
+    hash = "sha256-hKXnM3iqt6PnV+cMV3gEleBChd263sy2DovpIKg22fs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix
index ef8595fa873cd..a9eda723eb2cd 100644
--- a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix
+++ b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix
@@ -29,6 +29,11 @@ buildPythonPackage rec {
     pysigma
   ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'pysigma = "^0.5.0"' 'pysigma = "^0.6.0"'
+  '';
+
   checkInputs = [
     pytestCheckHook
   ];
diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix
index 210e90405817c..17e6a27ea57db 100644
--- a/pkgs/development/python-modules/pysigma/default.nix
+++ b/pkgs/development/python-modules/pysigma/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pysigma";
-  version = "0.5.2";
+  version = "0.6.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "SigmaHQ";
     repo = "pySigma";
     rev = "v${version}";
-    hash = "sha256-U5jBFnWC73W9tFco5faiqGmk8K+Ig18f9HhXJ4vhhGs=";
+    hash = "sha256-/SZe4pzlhlkzW84WOjPOibfdznf5uLHL5RsNnT/EL9M=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix
index 6f7456480638d..fd54ccf3d9745 100644
--- a/pkgs/development/python-modules/pywemo/default.nix
+++ b/pkgs/development/python-modules/pywemo/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pywemo";
-  version = "0.9.0";
+  version = "0.9.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-x4wIn+X70z5cCIhOfpQCj7qy0kEagnMcscxUls1697o=";
+    hash = "sha256-RgG2bKA7ifuOPX0ZDKv92S4Gpp9zaansKiEpYrYfPt4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/quantum-gateway/default.nix b/pkgs/development/python-modules/quantum-gateway/default.nix
index 19b9ae22264a3..272899a6bbbde 100644
--- a/pkgs/development/python-modules/quantum-gateway/default.nix
+++ b/pkgs/development/python-modules/quantum-gateway/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "quantum-gateway";
-  version = "0.0.6";
+  version = "0.0.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "cisasteelersfan";
     repo = "quantum_gateway";
     rev = version;
-    sha256 = "f2LYOr9xJSfbA/1aHfll5lg7r05o855Zkkk9HuRamP8=";
+    hash = "sha256-jwLfth+UaisPR0p+UHfm6qMXT2eSYWnsYEp0BqyeI9U=";
   };
 
   propagatedBuildInputs = [
@@ -39,6 +39,11 @@ buildPythonPackage rec {
     "quantum_gateway"
   ];
 
+  disabledTests = [
+    # Tests require network features
+    "TestGateway3100"
+  ];
+
   meta = with lib; {
     description = "Python library for interacting with Verizon Fios Quantum gateway devices";
     homepage = "https://github.com/cisasteelersfan/quantum_gateway";
diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix
index 5e750bbc195d5..35257708ae056 100644
--- a/pkgs/development/python-modules/questionary/default.nix
+++ b/pkgs/development/python-modules/questionary/default.nix
@@ -44,7 +44,6 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
     description = "Python library to build command line user prompts";
     homepage = "https://github.com/tmbo/questionary";
     license = with licenses; [ mit ];
diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix
index 2ce16013ce49c..0493459a7aa7d 100644
--- a/pkgs/development/python-modules/regenmaschine/default.nix
+++ b/pkgs/development/python-modules/regenmaschine/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "regenmaschine";
-  version = "2022.06.0";
+  version = "2022.06.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "bachya";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-fmoq0mOhD8Y3P9IgghxiTuS9b3gMUUyCCXmYnqN9ue0=";
+    sha256 = "sha256-Q29e2f/6r0QFN5EPL8Gs1Z4CcvKXrZaYcEMgCJ9uuW8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/rollbar/default.nix b/pkgs/development/python-modules/rollbar/default.nix
index 7ce7dd9a950ce..93a0349b9bdc8 100644
--- a/pkgs/development/python-modules/rollbar/default.nix
+++ b/pkgs/development/python-modules/rollbar/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "rollbar";
-  version = "0.16.2";
+  version = "0.16.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "aa3b570062dd8dfb0e11537ba858f9e1633a604680e062a525434b8245540f87";
+    sha256 = "sha256-AjE9/GBxDsc2qwM9D4yWnYV6i5kc1n4MGpFiDooE7eI=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 979eb71d7c4a3..2976f89e9c6e1 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker";
-  version = "2.93.0";
+  version = "2.93.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-rVEYiX0e7dP2CQK4ceEPZu395vas69aZkQzJCana53c=";
+    hash = "sha256-EzIJ9+eo5eaXu4TdsvktHtA/wuqr8HUMqsl2pGyvs40=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 40bd609520f6a..ee8b773c8b853 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "3.3.0";
+  version = "3.3.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-xJ1Q++NxWtxXQUGTZ7OaRo0lVmSEIvELb8Tt846uLLM=";
+    hash = "sha256-f4fb2xBNhRrmul/Tp2ouFOIuBIE1kD6YuvCFcaOqgcA=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix
index 0c1a698aa63c0..e8621d8e954dd 100644
--- a/pkgs/development/python-modules/staticjinja/default.nix
+++ b/pkgs/development/python-modules/staticjinja/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "staticjinja";
-  version = "4.1.2";
+  version = "4.1.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "staticjinja";
     repo = pname;
     rev = version;
-    sha256 = "0qqyadhqsn66b7qrpfj08qc899pjwfa2byqqzh73xq1n22i4cy30";
+    sha256 = "sha256-w6ge5MQXNRHCM43jKnagTlbquJJys7mprgBOS2uuwHQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index d277bf2970c2e..b070b9f117de4 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "3.2.0";
+  version = "3.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2aR959ljz2mogPPQSWG3ksQPRWx04Jh4VRVV3jwiYfA=";
+    hash = "sha256-2sYMEC+2eorJqhZWmwr9DWO5bGK+BkCIUZ4cZhs/Ofo=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/validphys2/default.nix b/pkgs/development/python-modules/validphys2/default.nix
index d434cbcc621c1..c417cb47e2d31 100644
--- a/pkgs/development/python-modules/validphys2/default.nix
+++ b/pkgs/development/python-modules/validphys2/default.nix
@@ -1,7 +1,12 @@
 { lib
 , buildPythonPackage
+, lhapdf
 , nnpdf
+, prompt-toolkit
 , reportengine
+, requests
+, seaborn
+, validobj
 }:
 
 buildPythonPackage rec {
@@ -21,8 +26,13 @@ buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [
+    lhapdf
     nnpdf
+    prompt-toolkit
     reportengine
+    requests
+    seaborn
+    validobj
   ];
 
   doCheck = false; # no tests
diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix
index 0fdd4ed6d9625..5836069d99927 100644
--- a/pkgs/development/python-modules/vertica-python/default.nix
+++ b/pkgs/development/python-modules/vertica-python/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "vertica-python";
-  version = "1.0.5";
+  version = "1.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-m9r6P8GTehx33QO/aCuKArrpJ/ycVHWPkQ9sPc3tmeo=";
+    hash = "sha256-XccIN5lmrRTNAmK52XeMBZzuNOxSvXFK7COLh5lacDY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix
index e70cdfd96c864..1e81e90af9a60 100644
--- a/pkgs/development/python-modules/webexteamssdk/default.nix
+++ b/pkgs/development/python-modules/webexteamssdk/default.nix
@@ -3,19 +3,23 @@
 , fetchFromGitHub
 , future
 , pyjwt
+, pythonOlder
 , requests
 , requests-toolbelt
 }:
 
 buildPythonPackage rec {
   pname = "webexteamssdk";
-  version = "1.6";
+  version = "1.6.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "CiscoDevNet";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0bw28ag1iqyqlxz83m4qb3r94kipv5mpf3bsvc8zv5vh4dv52bp2";
+    hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo=";
   };
 
   propagatedBuildInputs = [
@@ -27,7 +31,10 @@ buildPythonPackage rec {
 
   # Tests require a Webex Teams test domain
   doCheck = false;
-  pythonImportsCheck = [ "webexteamssdk" ];
+
+  pythonImportsCheck = [
+    "webexteamssdk"
+  ];
 
   meta = with lib; {
     description = "Python module for Webex Teams APIs";
diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index 87a0fd54d2d90..5b5de10973f56 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "xknx";
-  version = "0.21.3";
+  version = "0.21.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "XKNX";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-AGKozbVdXfRPvaU1Et8GFu3vdNRLA8ZiV8Xc6T7BhOQ=";
+    sha256 = "sha256-eKbEeW+pa8lUbbzcvexURa6raN3HFzIWjwqE3L80KTY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix
index 5dcfb9030550f..17cd0d345fafd 100644
--- a/pkgs/development/python-modules/yolink-api/default.nix
+++ b/pkgs/development/python-modules/yolink-api/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "yolink-api";
-  version = "0.0.7";
+  version = "0.0.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "YoSmart-Inc";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-zdCHKckt28abeJ6PQjX50e/4wOl/xx0TKFEQaUIqrYo=";
+    hash = "sha256-jKyugylgV9B8+PxUPsz4YtQjCfhB8NA2BYMxJOqkIP8=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python2-modules/click/default.nix b/pkgs/development/python2-modules/click/default.nix
deleted file mode 100644
index fcbd4d0981af7..0000000000000
--- a/pkgs/development/python2-modules/click/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook }:
-
-buildPythonPackage rec {
-  pname = "click";
-  version = "7.1.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
-  };
-
-  postPatch = ''
-    substituteInPlace src/click/_unicodefun.py \
-      --replace "'locale'" "'${locale}/bin/locale'"
-  '';
-
-  checkInputs = [ pytestCheckHook ];
-
-  meta = with lib; {
-    homepage = "https://click.palletsprojects.com/";
-    description = "Create beautiful command line interfaces in Python";
-    longDescription = ''
-      A Python package for creating beautiful command line interfaces in a
-      composable way, with as little code as necessary.
-    '';
-    license = licenses.bsd3;
-  };
-}
diff --git a/pkgs/development/python2-modules/cryptography/default.nix b/pkgs/development/python2-modules/cryptography/default.nix
deleted file mode 100644
index 0b4e2ae394cdb..0000000000000
--- a/pkgs/development/python2-modules/cryptography/default.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ lib
-, stdenv
-, callPackage
-, buildPythonPackage
-, fetchPypi
-, isPy27
-, ipaddress
-, openssl
-, darwin
-, packaging
-, six
-, isPyPy
-, cffi
-, pytest
-, pretend
-, iso8601
-, pytz
-, hypothesis
-, enum34
-}:
-
-let
-  cryptography-vectors = callPackage ./vectors.nix { };
-in
-buildPythonPackage rec {
-  pname = "cryptography";
-  version = "3.3.2"; # Also update the hash in vectors-3.3.nix
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s";
-  };
-
-  patches = [ ./cryptography-py27-warning.patch ];
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = lib.optionals (!isPyPy) [
-    cffi
-  ];
-
-  buildInputs = [ openssl ]
-    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
-  propagatedBuildInputs = [
-    packaging
-    six
-  ] ++ lib.optionals (!isPyPy) [
-    cffi
-  ] ++ lib.optionals isPy27 [
-    ipaddress
-    enum34
-  ];
-
-  checkInputs = [
-    cryptography-vectors
-    hypothesis
-    iso8601
-    pretend
-    pytest
-    pytz
-  ];
-
-  checkPhase = ''
-    py.test --disable-pytest-warnings tests
-  '';
-
-  # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
-  # can do until nix 1.11's release
-  __impureHostDeps = [ "/usr/lib" ];
-
-  meta = with lib; {
-    description = "A package which provides cryptographic recipes and primitives";
-    longDescription = ''
-      Cryptography includes both high level recipes and low level interfaces to
-      common cryptographic algorithms such as symmetric ciphers, message
-      digests, and key derivation functions.
-      Our goal is for it to be your "cryptographic standard library". It
-      supports Python 2.7, Python 3.5+, and PyPy 5.4+.
-    '';
-    homepage = "https://github.com/pyca/cryptography";
-    changelog = "https://cryptography.io/en/latest/changelog/#v"
-      + replaceStrings [ "." ] [ "-" ] version;
-    license = with licenses; [ asl20 bsd3 psfl ];
-    maintainers = with maintainers; [ primeos ];
-  };
-}
diff --git a/pkgs/development/python2-modules/cryptography/vectors.nix b/pkgs/development/python2-modules/cryptography/vectors.nix
deleted file mode 100644
index 4d6214807e73e..0000000000000
--- a/pkgs/development/python2-modules/cryptography/vectors.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ buildPythonPackage, fetchPypi, lib, cryptography }:
-
-buildPythonPackage rec {
-  pname = "cryptography-vectors";
-  # The test vectors must have the same version as the cryptography package:
-  version = cryptography.version;
-
-  src = fetchPypi {
-    pname = "cryptography_vectors";
-    inherit version;
-    sha256 = "1yhaps0f3h2yjb6lmz953z1l1d84y9swk4k3gj9nqyk4vbx5m7cc";
-  };
-
-  # No tests included
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Test vectors for the cryptography package";
-    homepage = "https://cryptography.io/en/latest/development/test-vectors/";
-    # Source: https://github.com/pyca/cryptography/tree/master/vectors;
-    license = with licenses; [ asl20 bsd3 ];
-    maintainers = with maintainers; [ primeos ];
-  };
-}
diff --git a/pkgs/development/python2-modules/decorator/default.nix b/pkgs/development/python2-modules/decorator/default.nix
deleted file mode 100644
index 8e8fd28f0b543..0000000000000
--- a/pkgs/development/python2-modules/decorator/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
-  pname = "decorator";
-  version = "4.4.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1rxzhk5zwiggk45hl53zydvy70lk654kg0nc1p54090p402jz9p3";
-  };
-
-  meta = with lib; {
-    homepage = "https://pypi.python.org/pypi/decorator";
-    description = "Better living through Python with decorators";
-    license = lib.licenses.mit;
-    maintainers = [ maintainers.costrouc ];
-  };
-}
diff --git a/pkgs/development/python2-modules/flask/default.nix b/pkgs/development/python2-modules/flask/default.nix
deleted file mode 100644
index 27f436c3c53cb..0000000000000
--- a/pkgs/development/python2-modules/flask/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, itsdangerous, click, werkzeug, jinja2, pytest }:
-
-buildPythonPackage rec {
-  version = "1.1.2";
-  pname = "Flask";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060";
-  };
-
-  checkInputs = [ pytest ];
-  propagatedBuildInputs = [ itsdangerous click werkzeug jinja2 ];
-
-  checkPhase = ''
-    py.test
-  '';
-
-  # Tests require extra dependencies
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "http://flask.pocoo.org/";
-    description = "A microframework based on Werkzeug, Jinja 2, and good intentions";
-    license = licenses.bsd3;
-  };
-}
diff --git a/pkgs/development/python2-modules/freezegun/default.nix b/pkgs/development/python2-modules/freezegun/default.nix
deleted file mode 100644
index 7f77616f2a4ec..0000000000000
--- a/pkgs/development/python2-modules/freezegun/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, python-dateutil
-, six
-, mock
-, nose
-, pytest
-}:
-
-buildPythonPackage rec {
-  pname = "freezegun";
-  version = "0.3.15";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b";
-  };
-
-  propagatedBuildInputs = [ python-dateutil six ];
-  checkInputs = [ mock nose pytest ];
-
-  meta = with lib; {
-    description = "FreezeGun: Let your Python tests travel through time";
-    homepage = "https://github.com/spulec/freezegun";
-    license = licenses.asl20;
-  };
-
-}
diff --git a/pkgs/development/python2-modules/ipaddr/default.nix b/pkgs/development/python2-modules/ipaddr/default.nix
deleted file mode 100644
index b29ee91792870..0000000000000
--- a/pkgs/development/python2-modules/ipaddr/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
-  pname = "ipaddr";
-  version = "2.2.0";
-  disabled = isPy3k;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0";
-  };
-
-  meta = with lib; {
-    description = "Google's IP address manipulation library";
-    homepage = "https://github.com/google/ipaddr-py";
-    license = licenses.asl20;
-  };
-
-}
diff --git a/pkgs/development/python2-modules/itsdangerous/default.nix b/pkgs/development/python2-modules/itsdangerous/default.nix
deleted file mode 100644
index d1669a1ed5bf5..0000000000000
--- a/pkgs/development/python2-modules/itsdangerous/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
-  pname = "itsdangerous";
-  version = "1.1.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19";
-  };
-
-  meta = with lib; {
-    description = "Helpers to pass trusted data to untrusted environments and back";
-    homepage = "https://pypi.python.org/pypi/itsdangerous/";
-    license = licenses.bsd0;
-  };
-
-}
diff --git a/pkgs/development/python2-modules/libcloud/default.nix b/pkgs/development/python2-modules/libcloud/default.nix
deleted file mode 100644
index 504e7753a9785..0000000000000
--- a/pkgs/development/python2-modules/libcloud/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, isPy27
-, mock
-, pycrypto
-, requests
-, pytest-runner
-, pytest
-, requests-mock
-, typing
-, backports_ssl_match_hostname
-}:
-
-buildPythonPackage rec {
-  pname = "apache-libcloud";
-  version = "2.8.3";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "70096690b24a7832cc5abdfda1954b49fddc1c09a348a1e6caa781ac867ed4c6";
-  };
-
-  checkInputs = [ mock pytest pytest-runner requests-mock ];
-  propagatedBuildInputs = [ pycrypto requests ]
-    ++ lib.optionals isPy27 [ typing backports_ssl_match_hostname ];
-
-  preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py";
-
-  # requires a certificates file
-  doCheck = false;
-
-  meta = with lib; {
-    description = "A unified interface to many cloud providers";
-    homepage = "https://libcloud.apache.org/";
-    license = licenses.asl20;
-  };
-
-}
diff --git a/pkgs/development/python2-modules/lpod/default.nix b/pkgs/development/python2-modules/lpod/default.nix
deleted file mode 100644
index 9c719d234f897..0000000000000
--- a/pkgs/development/python2-modules/lpod/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, lxml
-, docutils
-, pillow
-, isPy3k
-}:
-
-buildPythonPackage {
-  version = "1.1.7";
-  pname = "python-lpod";
-  # lpod library currently does not support Python 3.x
-  disabled = isPy3k;
-
-  propagatedBuildInputs = [ lxml docutils pillow ];
-
-  src = fetchFromGitHub {
-    owner = "lpod";
-    repo = "lpod-python";
-    rev = "dee32120ee582ff337b0c52a95a9a87cca71fd67";
-    sha256 = "1mikvzp27wxkzpr2lii4wg1hhx8h610agckqynvsrdc8v3nw9ciw";
-  };
-
-  meta = with lib; {
-    homepage = "https://github.com/lpod/lpod-python/";
-    description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) ";
-    license = licenses.gpl3;
-  };
-
-}
diff --git a/pkgs/development/python2-modules/pyjwt/default.nix b/pkgs/development/python2-modules/pyjwt/default.nix
deleted file mode 100644
index 011f526e520f7..0000000000000
--- a/pkgs/development/python2-modules/pyjwt/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, cryptography
-, ecdsa
-, pytestCheckHook
-, pythonOlder
-}:
-
-buildPythonPackage rec {
-  pname = "pyjwt";
-  version = "1.7.1";
-
-  src = fetchPypi {
-    pname = "PyJWT";
-    inherit version;
-    sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
-  };
-
-  postPatch = ''
-    sed -i '/^addopts/d' setup.cfg
-  '';
-
-  propagatedBuildInputs = [
-    cryptography
-    ecdsa
-  ];
-
-  checkInputs = [
-    pytestCheckHook
-  ];
-
-  disabledTests = [
-    "test_ec_verify_should_return_false_if_signature_invalid"
-  ];
-
-  pythonImportsCheck = [ "jwt" ];
-
-  meta = with lib; {
-    description = "JSON Web Token implementation in Python";
-    homepage = "https://github.com/jpadilla/pyjwt";
-    license = licenses.mit;
-    knownVulnerabilities = [
-      "CVE-2022-29217"
-    ];
-  };
-}
diff --git a/pkgs/development/python2-modules/urllib3/default.nix b/pkgs/development/python2-modules/urllib3/default.nix
deleted file mode 100644
index c23835ce4dc2d..0000000000000
--- a/pkgs/development/python2-modules/urllib3/default.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{ lib
-, brotli
-, buildPythonPackage
-, certifi
-, cryptography
-, python-dateutil
-, fetchpatch
-, fetchPypi
-, idna
-, mock
-, pyopenssl
-, pysocks
-, pytest-freezegun
-, pytest-timeout
-, pytestCheckHook
-, tornado
-, trustme
-}:
-
-buildPythonPackage rec {
-  pname = "urllib3";
-  version = "1.26.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "CVE-2021-28363.patch";
-      url = "https://github.com/urllib3/urllib3/commit/8d65ea1ecf6e2cdc27d42124e587c1b83a3118b0.patch";
-      sha256 = "1lqhrd11p03iv14bp89rh67ynf000swmwsfvr3jpfdycdqr3ka9q";
-    })
-  ];
-
-  propagatedBuildInputs = [
-    brotli
-    certifi
-    cryptography
-    idna
-    pyopenssl
-    pysocks
-  ];
-
-  checkInputs = [
-    python-dateutil
-    mock
-    pytest-freezegun
-    pytest-timeout
-    pytestCheckHook
-    tornado
-    trustme
-  ];
-
-  # Tests in urllib3 are mostly timeout-based instead of event-based and
-  # are therefore inherently flaky. On your own machine, the tests will
-  # typically build fine, but on a loaded cluster such as Hydra random
-  # timeouts will occur.
-  #
-  # The urllib3 test suite has two different timeouts in their test suite
-  # (see `test/__init__.py`):
-  # - SHORT_TIMEOUT
-  # - LONG_TIMEOUT
-  # When CI is in the env, LONG_TIMEOUT will be significantly increased.
-  # Still, failures can occur and for that reason tests are disabled.
-  doCheck = false;
-
-  preCheck = ''
-    export CI # Increases LONG_TIMEOUT
-  '';
-
-  pythonImportsCheck = [ "urllib3" ];
-
-  meta = with lib; {
-    description = "Powerful, sanity-friendly HTTP client for Python";
-    homepage = "https://github.com/shazow/urllib3";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-    knownVulnerabilities = [
-      "CVE-2021-33503"
-    ];
-  };
-}
diff --git a/pkgs/development/python2-modules/vcrpy/default.nix b/pkgs/development/python2-modules/vcrpy/default.nix
deleted file mode 100644
index ddd4015aad1e7..0000000000000
--- a/pkgs/development/python2-modules/vcrpy/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ buildPythonPackage
-, lib
-, six
-, fetchPypi
-, pyyaml
-, mock
-, contextlib2
-, wrapt
-, pytest
-, pytest-httpbin
-, yarl
-, pythonOlder
-, pythonAtLeast
-}:
-
-buildPythonPackage rec {
-  pname = "vcrpy";
-  version = "3.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "21168d5ae14263a833d4b71acfd8278d8841114f24be1b4ab4a5719d0c7f07bc";
-  };
-
-  checkInputs = [
-    pytest
-    pytest-httpbin
-  ];
-
-  propagatedBuildInputs = [
-    pyyaml
-    wrapt
-    six
-  ]
-  ++ lib.optionals (pythonOlder "3.3") [ contextlib2 mock ]
-  ++ lib.optionals (pythonAtLeast "3.4") [ yarl ];
-
-  checkPhase = ''
-    py.test --ignore=tests/integration -k "not TestVCRConnection"
-  '';
-
-  meta = with lib; {
-    description = "Automatically mock your HTTP interactions to simplify and speed up testing";
-    homepage = "https://github.com/kevin1024/vcrpy";
-    license = licenses.mit;
-  };
-}
-
diff --git a/pkgs/development/python2-modules/werkzeug/default.nix b/pkgs/development/python2-modules/werkzeug/default.nix
deleted file mode 100644
index c03cc6935d2f1..0000000000000
--- a/pkgs/development/python2-modules/werkzeug/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi
-, itsdangerous, hypothesis
-, pytestCheckHook, requests
-, pytest-timeout
- }:
-
-buildPythonPackage rec {
-  pname = "Werkzeug";
-  version = "1.0.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c";
-  };
-
-  propagatedBuildInputs = [ itsdangerous ];
-  checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ];
-
-  postPatch = ''
-    # ResourceWarning causes tests to fail
-    rm tests/test_routing.py
-  '';
-
-  disabledTests = [
-    "test_save_to_pathlib_dst"
-    "test_cookie_maxsize"
-    "test_cookie_samesite_attribute"
-    "test_cookie_samesite_invalid"
-    "test_range_parsing"
-    "test_content_range_parsing"
-    "test_http_date_lt_1000"
-    "test_best_match_works"
-    "test_date_to_unix"
-    "test_easteregg"
-
-    # Seems to be a problematic test-case:
-    #
-    # > warnings.warn(pytest.PytestUnraisableExceptionWarning(msg))
-    # E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO [closed]>
-    # E
-    # E Traceback (most recent call last):
-    # E   File "/nix/store/cwv8aj4vsqvimzljw5dxsxy663vjgibj-python3.9-Werkzeug-1.0.1/lib/python3.9/site-packages/werkzeug/formparser.py", line 318, in parse_multipart_headers
-    # E     return Headers(result)
-    # E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True>
-    "test_basic_routing"
-    "test_merge_slashes_match"
-    "test_merge_slashes_build"
-    "TestMultiPart"
-    "TestHTTPUtility"
-  ] ++ lib.optionals stdenv.isDarwin [
-    "test_get_machine_id"
-  ];
-
-  meta = with lib; {
-    homepage = "https://palletsprojects.com/p/werkzeug/";
-    description = "A WSGI utility library for Python";
-    license = licenses.bsd3;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/python2-modules/wsproto/default.nix b/pkgs/development/python2-modules/wsproto/default.nix
deleted file mode 100644
index a8488d8c4ab8c..0000000000000
--- a/pkgs/development/python2-modules/wsproto/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, h11, enum34, pytest }:
-
-buildPythonPackage rec {
-  pname = "wsproto";
-  version = "0.14.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd";
-  };
-
-  propagatedBuildInputs = [ h11 enum34 ];
-
-  checkInputs = [ pytest ];
-
-  checkPhase = ''
-    py.test
-  '';
-
-  meta = with lib; {
-    description = "Pure Python, pure state-machine WebSocket implementation";
-    homepage = "https://github.com/python-hyper/wsproto/";
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/development/python2-modules/wxPython/default.nix b/pkgs/development/python2-modules/wxPython/default.nix
deleted file mode 100644
index 6649c5f693154..0000000000000
--- a/pkgs/development/python2-modules/wxPython/default.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ fetchurl
-, lib
-, stdenv
-, darwin
-, openglSupport ? true
-, libX11
-, wxGTK
-, wxmac
-, pkg-config
-, buildPythonPackage
-, pyopengl
-, isPy3k
-, isPyPy
-, python
-, cairo
-, pango
-}:
-
-assert wxGTK.unicode;
-
-buildPythonPackage rec {
-  pname = "wxPython";
-  version = "3.0.2.0";
-
-  disabled = isPy3k || isPyPy;
-  doCheck = false;
-
-  src = fetchurl {
-    url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
-    sha256 = "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm";
-  };
-
-  dontUseSetuptoolsBuild = true;
-  dontUsePipInstall = true;
-
-  hardeningDisable = [ "format" ];
-
-  nativeBuildInputs = [ pkg-config ]
-    ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ])
-    ++ (lib.optionals stdenv.isDarwin [ wxmac ]);
-
-  buildInputs = [ ]
-    ++ (lib.optionals (!stdenv.isDarwin) [  (wxGTK.gtk) ])
-    ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-      ApplicationServices
-      AudioToolbox
-      CFNetwork
-      Carbon
-      Cocoa
-      CoreGraphics
-      CoreServices
-      CoreText
-      DiskArbitration
-      IOKit
-      ImageIO
-      OpenGL
-      Security
-    ]))
-    ++ (lib.optional openglSupport pyopengl);
-
-  preConfigure = ''
-    cd wxPython
-    # remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch
-    substituteInPlace config.py \
-      --replace "distutils.unixccompiler.UnixCCompiler = MyUnixCCompiler" ""
-    # set the WXPREFIX to $out instead of the storepath of wxwidgets
-    substituteInPlace config.py \
-      --replace "WXPREFIX   = getWxConfigValue('--prefix')" "WXPREFIX   = '$out'"
-    # this check is supposed to only return false on older systems running non-framework python
-    substituteInPlace src/osx_cocoa/_core_wrap.cpp \
-      --replace "return wxPyTestDisplayAvailable();" "return true;"
-  '' + lib.optionalString (!stdenv.isDarwin) ''
-    substituteInPlace wx/lib/wxcairo.py \
-      --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")'
-    substituteInPlace wx/lib/wxcairo.py \
-      --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [
-        ("gdk",        "${wxGTK.gtk}/lib/libgtk-x11-2.0.so"),
-        ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
-        ("appsvc",     None)
-      ]}'
-  '';
-
-  buildPhase = "";
-
-  installPhase = ''
-    ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=0 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out
-    wrapPythonPrograms
-  '';
-
-  passthru = { inherit wxGTK openglSupport; };
-}
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index b5977e61acdcd..280354ebf516f 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -32,17 +32,18 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "checkov";
-  version = "2.0.1195";
+  version = "2.0.1206";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = pname;
     rev = version;
-    hash = "sha256-YzM/YzTeFqNe7ThNH138g13aSzEXK8rzTWit1g27GVw=";
+    hash = "sha256-5pnT9JcE1BY4kgqycfNLm3PiTqZdw2V9ksz2E+jfFkY=";
   };
 
   nativeBuildInputs = with py.pkgs; [
+    pythonRelaxDepsHook
     setuptools-scm
   ];
 
@@ -94,12 +95,10 @@ buildPythonApplication rec {
     responses
   ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "bc-python-hcl2==" "bc-python-hcl2>=" \
-      --replace "prettytable>=3.0.0" "prettytable" \
-      --replace "pycep-parser==0.3.6" "pycep-parser"
-  '';
+  pythonRelaxDeps = [
+    "bc-python-hcl2"
+    "pycep-parser"
+  ];
 
   preCheck = ''
     export HOME=$(mktemp -d);
diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix
index 158f6545b714b..9d1487ea99b6b 100644
--- a/pkgs/development/tools/analysis/eresi/default.nix
+++ b/pkgs/development/tools/analysis/eresi/default.nix
@@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
       url = "https://github.com/thorkill/eresi/commit/a79406344cc21d594d27fa5ec5922abe9f7475e7.patch";
       sha256 = "1mjjc6hj7r06iarvai7prcdvjk9g0k5vwrmkwcm7b8ivd5xzxp2z";
     })
+
+    # Pull patch pending upstream inclusion for -fno-common toolchains:
+    #   https://github.com/thorkill/eresi/pull/166
+    (fetchpatch {
+      url = "https://github.com/thorkill/eresi/commit/bc5b9a75c326f277e5f89e01a3b8f7f0519a99f6.patch";
+      sha256 = "0lqwrnkkhhd3vi1r8ngvziyqkk09h98h93rrs3ndqi048a898ys1";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/development/tools/apksigner/default.nix
index e7afa7189c22d..854e913dd58e8 100644
--- a/pkgs/development/tools/apksigner/default.nix
+++ b/pkgs/development/tools/apksigner/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     cat >> build.gradle <<EOF
 
     apply plugin: 'application'
+    mainClassName = "com.android.apksigner.ApkSignerTool"
     sourceSets.main.java.srcDirs = [ 'src/apksigner/java', 'src/main/java' ]
     jar {
         manifest { attributes "Main-Class": "com.android.apksigner.ApkSignerTool" }
diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix
index 71ac08d267617..70fb91789a805 100644
--- a/pkgs/development/tools/circup/default.nix
+++ b/pkgs/development/tools/circup/default.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "circup";
-  version = "1.0.4";
+  version = "1.1.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "adafruit";
     repo = pname;
-    rev = version;
-    hash = "sha256-qX3kSlqA2qP8+XiLYx/hKYfyeB6p3tnXEhESox0c/lY=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-6UzMAKrK2fp4XKoi42Uo6dfPQB17p/w+b3nXa3JVdV4=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/tools/easyjson/deps.nix b/pkgs/development/tools/easyjson/deps.nix
deleted file mode 100644
index d5d7e1f15bc9b..0000000000000
--- a/pkgs/development/tools/easyjson/deps.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/josharian/intern";
-    fetch = {
-      type = "git";
-      url = "https://github.com/josharian/intern";
-      rev = "8e6ff32b3e7c0b018c43953085fe2ac330fe9acd";
-      sha256 = "1za48ppvwd5vg8vv25ldmwz1biwpb3p6qhf8vazhsfdg9m07951c";
-    };
-  }
-]
diff --git a/pkgs/development/tools/goa/deps.nix b/pkgs/development/tools/goa/deps.nix
deleted file mode 100644
index bfe862a4006a0..0000000000000
--- a/pkgs/development/tools/goa/deps.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
-[
-  {
-    goPackagePath = "github.com/dimfeld/httppath";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dimfeld/httppath";
-      rev = "ee938bf735983d53694d79138ad9820efff94c92";
-      sha256 = "1c1kic8g3r78g6h4xl8n2ac1waxsb9fqz40k20ypi08k24mv3ha9";
-    };
-  }
-  {
-    goPackagePath = "github.com/gofrs/uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gofrs/uuid";
-      rev = "e684523faa0581e44663968f097d478c499d4276";
-      sha256 = "1p2md0bmfnn7kaa866fnb8lfnmlzzb8wfhp4ym5915p8mv4whxgz";
-    };
-  }
-  {
-    goPackagePath = "github.com/manveru/faker";
-    fetch = {
-      type = "git";
-      url = "https://github.com/manveru/faker";
-      rev = "9fbc68a78c4dbc7914e1a23f88f126bea4383b97";
-      sha256 = "1cnrf4wdjhxd9fryhlp2krl9acz6dzwic89gshs49pg3aajlf4dy";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/cobra";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cobra";
-      rev = "4dab30cb33e6633c33c787106bafbfbfdde7842d";
-      sha256 = "1g7p7c2azqaxbfkx5yaznk0z1inqnajlbwv921k6vh8i1xdblxk5";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/pflag";
-      rev = "1ce0cc6db4029d97571db82f85092fccedb572ce";
-      sha256 = "02wsc01npnpc7srqw7rzaihn2hjmrkfy2x412fxbb675j2hk9cx6";
-    };
-  }
-  {
-    goPackagePath = "github.com/zach-klippenstein/goregen";
-    fetch = {
-      type = "git";
-      url = "https://github.com/zach-klippenstein/goregen";
-      rev = "795b5e3961ea1912fde60af417ad85e86acc0d6a";
-      sha256 = "113kx47ryhyb803v8ckizlrc34cmwcwb0h28v34bahd2mir8nq3l";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/tools";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/tools";
-      rev = "a754db16a40a9d94359b6600b825419c0ca6f986";
-      sha256 = "0n0cwb2szcjbyncqhdia77spcjsbm05jcgpnh0i8rdr16ixwanyq";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
-      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
-    };
-  }
-]
diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/development/tools/goresym/default.nix
new file mode 100644
index 0000000000000..199d3f468f05e
--- /dev/null
+++ b/pkgs/development/tools/goresym/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+  pname = "goresym";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "mandiant";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-XDy6qALE2xuOVQHuuvU/gOyTRZ/6CWpyjN3i7VmznoI=";
+  };
+
+  subPackages = [ "." ];
+
+  vendorSha256 = "sha256-dnQ/tP4RS6WkACobfW7jTTJSHbLrdlZDy1fmO65743Q=";
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Go symbol recovery tool";
+    homepage = "https://github.com/mandiant/GoReSym";
+    license = licenses.mit;
+    maintainers = with maintainers; [ thehedgeh0g ];
+  };
+}
diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix
index e1aacd3067387..8e537c7a0e095 100644
--- a/pkgs/development/tools/kubernetes-controller-tools/default.nix
+++ b/pkgs/development/tools/kubernetes-controller-tools/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "controller-tools";
-  version = "0.6.2";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0hbai8pi59yhgsmmmxk3nghhy9hj3ma98jq2d1k46n46gr64a0q5";
+    sha256 = "sha256-+nn/lj/MEtmC5NcvPOp1VZE13qJsGG+6eQaG+Yi8FTM=";
   };
 
-  vendorSha256 = "061qvq8z98d39vyk1gr46fw5ynxra154s90n3pb7k1q7q45rg76j";
+  vendorSha256 = "sha256-QCF3sfBUAjiIGb2EFrLKj5wHJ6HxJVqLEjxUTpMiX6E=";
 
   doCheck = false;
 
diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index 4281a1d9e3916..45ea829299a08 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "metals";
-  version = "0.11.5";
+  version = "0.11.6";
 
   deps = stdenv.mkDerivation {
     name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "sha256-kw+8688E1b7XjEb7AqOExSVu88NqPprKaCuINWqL2wk=";
+    outputHash = "sha256-/tFc7xAuUtx2JgEMLhGaq2FXpt7KQNMi82ODr/gTfhM=";
   };
 
   nativeBuildInputs = [ makeWrapper setJavaClassPath ];
diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix
index b382cc51fa1ee..8c5671605d552 100644
--- a/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/pkgs/development/tools/misc/inotify-tools/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "inotify-tools";
-  version = "3.22.1.0";
+  version = "3.22.6.0";
 
   src = fetchFromGitHub {
     repo = "inotify-tools";
     owner = "inotify-tools";
     rev = version;
-    sha256 = "sha256-I0kr+wFUWnovH9MXVsGaCBtp4+RnnMWD7sPecI3xz+Y=";
+    sha256 = "sha256-EYWVSgwoMjAlc/V5kv+2jfxEqWVW/lEoIxVd+ctEMsk=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix
deleted file mode 100644
index cd81975ee4452..0000000000000
--- a/pkgs/development/tools/misc/kibana/6.x.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ elk6Version
-, enableUnfree ? true
-, lib, stdenv
-, makeWrapper
-, fetchurl
-, nodejs-10_x
-, coreutils
-, which
-}:
-
-with lib;
-let
-  nodejs = nodejs-10_x;
-  inherit (builtins) elemAt;
-  info = splitString "-" stdenv.hostPlatform.system;
-  arch = elemAt info 0;
-  plat = elemAt info 1;
-  shas =
-    if enableUnfree
-    then {
-      x86_64-linux  = "1a501lavxhckb3l93sbrbqyshicwkk6p89frry4x8p037xcfpy0x";
-      x86_64-darwin = "0zm45af30shhcg3mdhcma6rms1hyrx62rm5jzwnz9kxv4d30skbw";
-    }
-    else {
-      x86_64-linux  = "0wfdipf21apyily7mvlqgyc7m5jpr96zgrryzwa854z3xb2vw8zg";
-      x86_64-darwin = "1nklfx4yz6hsxlljvnvwjy7pncv9mzngl84710xad5jlyras3sdj";
-    };
-
-in stdenv.mkDerivation rec {
-  pname = "kibana${optionalString (!enableUnfree) "-oss"}";
-  version = elk6Version;
-
-  src = fetchurl {
-    url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${arch}.tar.gz";
-    sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
-  };
-
-  patches = [
-    # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3.
-    # The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just
-    # disable the version check.
-    ./disable-nodejs-version-check.patch
-  ];
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    mkdir -p $out/libexec/kibana $out/bin
-    mv * $out/libexec/kibana/
-    rm -r $out/libexec/kibana/node
-    makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
-      --prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}"
-    sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
-  '';
-
-  meta = {
-    description = "Visualize logs and time-stamped data";
-    homepage = "http://www.elasticsearch.org/overview/kibana";
-    license = if enableUnfree then licenses.elastic else licenses.asl20;
-    maintainers = with maintainers; [ offline basvandijk ];
-    platforms = with platforms; unix;
-  };
-}
diff --git a/pkgs/development/tools/misc/pwninit/default.nix b/pkgs/development/tools/misc/pwninit/default.nix
new file mode 100644
index 0000000000000..7d3808f554c08
--- /dev/null
+++ b/pkgs/development/tools/misc/pwninit/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rustPlatform
+, openssl
+, pkg-config
+, xz
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "pwninit";
+  version = "3.2.0";
+
+  src = fetchFromGitHub {
+    owner = "io12";
+    repo = "pwninit";
+    rev = version;
+    sha256 = "sha256-XKDYJH2SG3TkwL+FN6rXDap8la07icR0GPFiYcnOHeI=";
+  };
+
+  buildInputs = [ openssl xz ] ++ lib.optionals stdenv.isDarwin [ Security ];
+  nativeBuildInputs = [ pkg-config ];
+  doCheck = false; # there are no tests to run
+
+  cargoSha256 = "sha256-2HCHiU309hbdwohUKVT3TEfGvOfxQWtEGj7FIS8OS7s=";
+
+  meta = {
+    description = "Automate starting binary exploit challenges";
+    homepage = "https://github.com/io12/pwninit";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.scoder12 ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix
index 0597b7abbeccd..64a17d8071124 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-generate";
-  version = "0.12.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "ashleygwilliams";
     repo = "cargo-generate";
     rev = "v${version}";
-    sha256 = "sha256-VMcyBa8bjH4n8hKS+l5xcaQCBYkBVWjDV2uk4JmhxFs=";
+    sha256 = "sha256-OYYGOB1NfNnOl8bd8KozgMCyW4Gb39LoFtD80DPzpdw=";
   };
 
-  cargoSha256 = "sha256-9RMzvZLGRFGJ0Bw2is2aeRCoLzHsZZ6LCfoCTrKjHbo=";
+  cargoSha256 = "sha256-qmRKjPhPLpzVVuTHuoo0iTlX3BnT2Udo1kFXvA3zNQE=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix
index 6782a7418a68b..963e134075ed7 100644
--- a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix
@@ -1,5 +1,5 @@
-{ runCommandNoCC, cargo, neovim, rust-analyzer, rustc }:
-runCommandNoCC "test-neovim-rust-analyzer" {
+{ runCommand, cargo, neovim, rust-analyzer, rustc }:
+runCommand "test-neovim-rust-analyzer" {
   nativeBuildInputs = [ cargo neovim rust-analyzer rustc ];
 
   testRustSrc = /* rust */ ''
diff --git a/pkgs/development/tools/vend/default.nix b/pkgs/development/tools/vend/default.nix
deleted file mode 100644
index 0b037a9068c18..0000000000000
--- a/pkgs/development/tools/vend/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
-  pname = "vend";
-
-  /*
-  This package is used to generate vendor folders for
-  packages that use the `runVend` option with `buildGoModule`.
-
-  Do not update this package without checking that the vendorSha256
-  hashes of packages using the `runVend` option are unchanged
-  or updating their vendorSha256 hashes if necessary.
-  */
-  version = "1.0.2";
-  # Disable the bot
-  # nixpkgs-update: no auto update
-
-  # Disable `mod tidy`, patch was refused upstream
-  # https://github.com/nomad-software/vend/pull/9
-  patches = [ ./remove_tidy.patch ];
-
-  src = fetchFromGitHub {
-    owner = "nomad-software";
-    repo = "vend";
-    rev = "v${version}";
-    sha256 = "0h9rwwb56nzs46xsvl92af71i8b3wz3pf9ngi8v0i2bpk7p3p89d";
-  };
-
-  vendorSha256 = null;
-
-  meta = with lib; {
-    homepage = "https://github.com/nomad-software/vend";
-    description = "A utility which vendors go code including c dependencies";
-    maintainers = with maintainers; [ c00w mic92 zowoq ];
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/development/tools/vend/remove_tidy.patch b/pkgs/development/tools/vend/remove_tidy.patch
deleted file mode 100644
index d5db74a1bd70c..0000000000000
--- a/pkgs/development/tools/vend/remove_tidy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cli/cmd.go b/cli/cmd.go
-index c766559..3a133fd 100644
---- a/cli/cmd.go
-+++ b/cli/cmd.go
-@@ -12,7 +12,7 @@ import (
- // UpdateModule makes sure the module is updated ready to vendor the
- // dependencies.
- func UpdateModule() {
--	var commands = []string{"tidy", "download", "vendor"}
-+	var commands = []string{"download", "vendor"}
- 
- 	for _, command := range commands {
- 		cmd := exec.Command("go", "mod", command)
diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix
deleted file mode 100644
index 5c107b20f4a4c..0000000000000
--- a/pkgs/development/web/nodejs/v10.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ callPackage, openssl, icu, python2, lib, stdenv, enableNpm ? true }:
-
-let
-  buildNodejs = callPackage ./nodejs.nix {
-    inherit openssl icu;
-    python = python2;
-  };
-in
-  buildNodejs {
-    inherit enableNpm;
-    version = "10.24.1";
-    sha256 = "032801kg24j04xmf09m0vxzlcz86sv21s24lv9l4cfv08k1c4byp";
-    patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
-  }
diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix
index 7bbdb6c252c23..2f044b44f2134 100644
--- a/pkgs/development/web/nodejs/v16.nix
+++ b/pkgs/development/web/nodejs/v16.nix
@@ -8,8 +8,8 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "16.15.1";
-    sha256 = "sha256-1OmdPB9pcREJpnUlVxBY5gCc3bwijn1yO4+0pFQWm30=";
+    version = "16.15.0"; # Do not upgrade until #176127 is solved
+    sha256 = "sha256-oPgS78Q/eDIeygiVeWCkj15r+XAE1QWMjdOwPGRupPc=";
     patches = [
       ./disable-darwin-v8-system-instrumentation.patch
     ];
diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix
index 7058f680f4e24..f5d23091b482e 100644
--- a/pkgs/games/gargoyle/default.nix
+++ b/pkgs/games/gargoyle/default.nix
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ]
     ++ lib.optionals stdenv.isDarwin [ smpeg libvorbis ];
 
+  # Workaround build failure on -fno-common toolchains:
+  #   ld: build/linux.release/alan3/Location.o:(.bss+0x0): multiple definition of
+  #     `logFile'; build/linux.release/alan3/act.o:(.bss+0x0): first defined here
+  # TODO: drop once updated to 2022.1 or later.
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
   buildPhase = jamenv + "jam -j$NIX_BUILD_CORES";
 
   installPhase =
diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix
index 8f226f3cef065..5541b3b9d0fa1 100644
--- a/pkgs/games/macopix/default.nix
+++ b/pkgs/games/macopix/default.nix
@@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # Workaround build failure on -fno-common toolchains:
+  #   ld: dnd.o:src/main.h:136: multiple definition of
+  #     `MENU_EXT'; main.o:src/main.h:136: first defined here
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
   NIX_LDFLAGS = "-lX11";
 
   meta = {
diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix
index 64e2dcc379b15..537a3f83a0360 100644
--- a/pkgs/games/stuntrally/default.nix
+++ b/pkgs/games/stuntrally/default.nix
@@ -18,25 +18,21 @@
 
 stdenv.mkDerivation rec {
   pname = "stunt-rally";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "stuntrally";
     repo = "stuntrally";
     rev = version;
-    hash = "sha256-1+Cc9I6TTa3b++/7Z2V+vAXcmFb2+wX7TnXEH6CRDWU=";
+    hash = "sha256-9I6hXsosqx+yYiEOEnPXQJHZkGtSU+JqThorwjemlc0=";
   };
   tracks = fetchFromGitHub {
     owner = "stuntrally";
     repo = "tracks";
     rev = version;
-    hash = "sha256-FbZc87j/9cp4LxNaEO2wNTvwk1Aq/IWcKD3rTGkzqj0=";
+    hash = "sha256-eZJAvkKe3PrXDzxTa5WFBHfltB3jhQh8puzOFDO9lso=";
   };
 
-  # include/OGRE/OgreException.h:265:126: error: invalid conversion from
-  # 'int' to 'Ogre::Exception::ExceptionCodes' [-fpermissive]
-  NIX_CFLAGS_COMPILE = "-fpermissive";
-
   preConfigure = ''
     ln -s ${tracks} data/tracks
   '';
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
index 3e7e89642c26f..1f13cbef9fc91 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
@@ -4,7 +4,9 @@
 appleDerivation {
   nativeBuildInputs = [ xcbuildHook flex bison fixDarwinDylibNames ];
   buildInputs = [ CoreSymbolication darling xnu ];
-  NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration";
+  # -fcommon: workaround build failure on -fno-common toolchains:
+  #   duplicate symbol '_kCSRegionMachHeaderName' in: libproc.o dt_module_apple.o
+  NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration -fcommon";
   NIX_LDFLAGS = "-L./Products/Release";
   xcbuildFlags = [ "-target" "dtrace_frameworks" "-target" "dtrace" ];
 
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index bbb3a1daab698..a8188caf18be9 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -53,6 +53,29 @@ stdenv.mkDerivation rec {
     # Upstream fix: https://github.com/netblue30/firejail/pull/5132
     # Hopefully fixed upstream in version > 0.9.68
     ./fix-opengl-support.patch
+
+    # Fix CVE-2022-31214 by patching in 4 commits from upstream
+    # https://seclists.org/oss-sec/2022/q2/188
+    (fetchpatch {
+      name = "CVE-2022-31214-patch1"; # "fixing CVE-2022-31214"
+      url  = "https://github.com/netblue30/firejail/commit/27cde3d7d1e4e16d4190932347c7151dc2a84c50.patch";
+      sha256 = "sha256-XXmnYCn4TPUvU43HifZDk4tEZQvOho9/7ehU6889nN4=";
+    })
+    (fetchpatch {
+      name = "CVE-2022-31214-patch2"; # "shutdown testing"
+      url  = "https://github.com/netblue30/firejail/commit/04ff0edf74395ddcbbcec955279c74ed9a6c0f86.patch";
+      sha256 = "sha256-PV73hRlvYEQihuljSCQMNO34KJ0hDVFexhirpHcTK1I=";
+    })
+    (fetchpatch {
+      name = "CVE-2022-31214-patch3"; # "CVE-2022-31214: fixing the fix"
+      url  = "https://github.com/netblue30/firejail/commit/dab835e7a0eb287822016f5ae4e87f46e1d363e7.patch";
+      sha256 = "sha256-6plBIliW/nLKR7TdGeB88eQ65JHEasnaRsP3HPXAFyA=";
+    })
+    (fetchpatch {
+      name = "CVE-2022-31214-patch4"; # "CVE-2022-31214: fixing the fix, one more time "
+      url  = "https://github.com/netblue30/firejail/commit/1884ea22a90d225950d81c804f1771b42ae55f54.patch";
+      sha256 = "sha256-inkpcdC5rl5w+CTAwwQVBOELlHTXb8UGlpU+8kMY95s=";
+    })
   ];
 
   prePatch = ''
diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
index 70ac299f16199..69bbdf648d226 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
@@ -1,4 +1,4 @@
-{ buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args:
+{ buildPackages, fetchFromGitHub, fetchurl, perl, buildLinux, libelf, util-linux, kernelPatches ? [], ... } @ args:
 
 buildLinux (args // rec {
   version = "4.14.180-176";
@@ -16,6 +16,14 @@ buildLinux (args // rec {
     sha256 = "0n7i7a2bkrm9p1wfr20h54cqm32fbjvwyn703r6zm1f6ivqhk43v";
   };
 
+  kernelPatches = args.kernelPatches ++ [{
+    name = "usbip-tools-fno-common";
+    patch = fetchurl {
+      url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=d5efc2e6b98fe661dbd8dd0d5d5bfb961728e57a";
+      hash = "sha256-1CXYCV5zMLA4YdbCr8cO2N4CHEDzQChS9qbKYHPm3U4=";
+    };
+  }];
+
   defconfig = "odroidxu4_defconfig";
 
   # This extraConfig is (only) required because the gator module fails to build as-is.
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 051ca1963051b..8339eabb495ae 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -1,25 +1,25 @@
-{ lib, stdenv, fetchurl, pkg-config, bison, file, flex
+{ lib, stdenv, fetchurl, pkg-config, bison, flex
 , asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl
 , libmnl, libnftnl, libpcap
 , gmp, jansson, libedit
-, autoreconfHook, fetchpatch
+, autoreconfHook
 , withDebugSymbols ? false
 , withPython ? false , python3
 , withXtables ? true , iptables
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.2";
+  version = "1.0.4";
   pname = "nftables";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2";
-    sha256 = "00jcjn1pl7qyqpg8pd4yhlkys7wbj4vkzgg73n27nmplzips6a0b";
+    hash = "sha256-kn+x/qH2haMowQz3ketlXX4e1J0xDupcsxAd/Y1sujU=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
-    pkg-config bison file flex
+    pkg-config bison flex
     asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt
   ];
 
@@ -29,18 +29,6 @@ stdenv.mkDerivation rec {
   ] ++ lib.optional withXtables iptables
     ++ lib.optional withPython python3;
 
-  preConfigure = ''
-    substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
-  '';
-
-  patches = [
-    # fix build after 1.0.2 release, drop when updating to a newer release
-    (fetchpatch {
-      url = "https://git.netfilter.org/nftables/patch/?id=18a08fb7f0443f8bde83393bd6f69e23a04246b3";
-      sha256 = "03dzhd7fhg0d20ly4rffk4ra7wlxp731892dhp8zw67jwhys9ywz";
-    })
-  ];
-
   configureFlags = [
     "--with-json"
     "--with-cli=editline"
diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix
index 43c22a8fd12af..cadf38b106ccc 100644
--- a/pkgs/os-specific/linux/usbip/default.nix
+++ b/pkgs/os-specific/linux/usbip/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, kernel, udev, autoconf, automake, libtool, hwdata, kernelOlder }:
+{ lib, stdenv, fetchpatch, kernel, udev, autoconf, automake, libtool, hwdata, kernelOlder }:
 
 stdenv.mkDerivation {
   name = "usbip-${kernel.name}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     ./fix-snprintf-truncation.patch
     # fixes build with gcc9
     ./fix-strncpy-truncation.patch
-  ];
+  ] ++ kernel.patches;
 
   nativeBuildInputs = [ autoconf automake libtool ];
   buildInputs = [ udev ];
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index cb46b63dd0c49..fc52128a7e999 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -357,7 +357,7 @@ rec {
           } // lib.mapAttrs (_name: type: elixirOr type) lib.types;
         };
 
-      generate = name: value: pkgs.runCommandNoCC name
+      generate = name: value: pkgs.runCommand name
         {
           value = toConf value;
           passAsFile = [ "value" ];
diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix
index bbcc7cf54897d..d2346d7ff5ed2 100644
--- a/pkgs/servers/adguardhome/bins.nix
+++ b/pkgs/servers/adguardhome/bins.nix
@@ -1,23 +1,23 @@
 { fetchurl, fetchzip }:
 {
 x86_64-darwin = fetchzip {
-  sha256 = "sha256-vUOdHDyvVg+8GhctW925WfjONi7TnPRfVfXmehOweB4=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_darwin_amd64.zip";
+  sha256 = "sha256-z7QFnx414sdGazUZIenAVA+7LcSZT0tTb/ldv1SGV3Q=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_amd64.zip";
 };
 aarch64-darwin = fetchzip {
-  sha256 = "sha256-3JmMvxd317Qmyrv7vWyfQsLol+yPuKBXHByt5YRrbX8=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_darwin_arm64.zip";
+  sha256 = "sha256-Pbl7YaDVxdER/ubOiPq54ASB4ILnH0B3GiQlQBe7gFs=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_arm64.zip";
 };
 i686-linux = fetchurl {
-  sha256 = "sha256-A6IsDRbRHyU0+IUKkrudKvlKiJkVNNs12MrKQ6RlpMQ=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_386.tar.gz";
+  sha256 = "sha256-P2PsSdpW5i2hwBPUKb+viYewlVHTER/eBkwPp3koawo=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_386.tar.gz";
 };
 x86_64-linux = fetchurl {
-  sha256 = "sha256-nPcqAk0m1e9izkylBuNcatHESgvSewR+MKmVdz+HBec=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_amd64.tar.gz";
+  sha256 = "sha256-cbTlVBlGdFgEz2b6pb0SJ7yUf4wFXnZwLCkmvX75FzU=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_amd64.tar.gz";
 };
 aarch64-linux = fetchurl {
-  sha256 = "sha256-ITkZdVU03FG9AUAMgD6nlCyioPJX357wB9m1jYdPlS4=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_arm64.tar.gz";
+  sha256 = "sha256-TKZ3bOM5oq30GtLn9ifNyY6+2Li4nf1+r2L0ExG/10c=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_arm64.tar.gz";
 };
 }
diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix
index be3943c9fad80..dbf9e14ebc67d 100644
--- a/pkgs/servers/adguardhome/default.nix
+++ b/pkgs/servers/adguardhome/default.nix
@@ -7,7 +7,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "adguardhome";
-  version = "0.107.6";
+  version = "0.107.7";
   src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
 
   installPhase = ''
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix
index d076f763bf96c..695c881e9f667 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -35,6 +35,13 @@ stdenv.mkDerivation rec {
     ./pure-configure.patch
   ];
 
+  # Workaround build failure on -fno-common toolchains like upstream
+  # gcc-10. Otherwise build fails as:
+  #   ld: ...-libprom-0.1.1/include/prom_collector_registry.h:37: multiple definition of
+  #     `PROM_COLLECTOR_REGISTRY_DEFAULT'; ...-libprom-0.1.1/include/prom_collector_registry.h:37: first defined here
+  # Should be fixed in libprom-1.2.0 and later: https://github.com/digitalocean/prometheus-client-c/pull/25
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
   passthru.tests.coturn = nixosTests.coturn;
 
   meta = with lib; {
diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix
index 71843ee8c7639..9a8a1a369843b 100644
--- a/pkgs/servers/dendrite/default.nix
+++ b/pkgs/servers/dendrite/default.nix
@@ -3,16 +3,16 @@
 
 buildGoModule rec {
   pname = "matrix-dendrite";
-  version = "0.8.5";
+  version = "0.8.7";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "dendrite";
     rev = "v${version}";
-    sha256 = "sha256-MPWvBUI6Mqt3f5UY6lpTBwPpihW+QSNq1M3FnIff+mM=";
+    sha256 = "sha256-grMMD85hiJ6Ka8KU0fIAcpflFyZrPEZSZxFsGls5NEI=";
   };
 
-  vendorSha256 = "sha256-OXy2xuwTLPNvBnVB6wj/YRW/XMiekjTubRRPVX9bxdQ=";
+  vendorSha256 = "sha256-yTlg1K0Pf1AmF227ca73gLDx12ea5yMamnOUksKGN4U=";
 
   checkInputs = [
     postgresqlTestHook
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 9cc272f62a43c..91573f635b2a9 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2022.6.3";
+  version = "2022.6.4";
   components = {
     "abode" = ps: with ps; [
       abodepy
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 62d996bb9a326..913c7318ebc9d 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -166,7 +166,7 @@ let
   extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "2022.6.3";
+  hassVersion = "2022.6.4";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -184,7 +184,7 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    hash = "sha256-dYJbYrOwjJ2OO+gYT9UmCam+gNvSycFGUEeHBoGTqSM=";
+    hash = "sha256-ec6f8H9nU2edsailp1OCPwTFXnPm+NRqNha6Gk3xN44=";
   };
 
   # leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix
index 0d9fb54396b50..c19866cf8d87a 100644
--- a/pkgs/servers/http/webhook/default.nix
+++ b/pkgs/servers/http/webhook/default.nix
@@ -1,12 +1,12 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "webhook";
   version = "2.8.0";
 
-  goPackagePath = "github.com/adnanh/webhook";
-  excludedPackages = [ "test" ];
-
   src = fetchFromGitHub {
     owner = "adnanh";
     repo = "webhook";
@@ -14,9 +14,16 @@ buildGoPackage rec {
     sha256 = "0n03xkgwpzans0cymmzb0iiks8mi2c76xxdak780dk0jbv6qgp5i";
   };
 
+  vendorSha256 = null;
+
+  subPackages = [ "." ];
+
+  doCheck = false;
+
   meta = with lib; {
+    description = "Incoming webhook server that executes shell commands";
     homepage = "https://github.com/adnanh/webhook";
-    license = [ licenses.mit ];
-    description = "incoming webhook server that executes shell commands";
+    license = licenses.mit;
+    maintainers = with maintainers; [ azahi ];
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/pkgs/servers/monitoring/prometheus/nats-exporter.nix
new file mode 100644
index 0000000000000..e6a838a6b017c
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/nats-exporter.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "prometheus-nats-exporter";
+  version = "0.9.3";
+
+  src = fetchFromGitHub {
+    owner = "nats-io";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-2+nkWwa5n7DyVitnJ8gt7b72Y6XiiLM7ddTM2Cp9/LQ=";
+  };
+
+  vendorSha256 = "sha256-bsk6htRnb4NiaJXTHNjPGN9NEy8owRJujancK3nVIsA=";
+
+  meta = with lib; {
+    description = "Exporter for NATS metrics";
+    homepage = "https://github.com/nats-io/prometheus-nats-exporter";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ bbigras ];
+  };
+}
diff --git a/pkgs/servers/nosql/dragonflydb/default.nix b/pkgs/servers/nosql/dragonflydb/default.nix
new file mode 100644
index 0000000000000..ff4833cfaa603
--- /dev/null
+++ b/pkgs/servers/nosql/dragonflydb/default.nix
@@ -0,0 +1,109 @@
+{ fetchFromGitHub
+, fetchurl
+, lib
+, stdenv
+, double-conversion
+, gperftools
+, mimalloc
+, rapidjson
+, liburing
+, xxHash
+, abseil-cpp_202111
+, gbenchmark
+, glog
+, gtest
+, jemalloc
+, gcc-unwrapped
+, autoconf
+, autoconf-archive
+, automake
+, cmake
+, ninja
+, boost
+, libunwind
+, libtool
+, openssl
+}:
+
+let
+  pname = "dragonflydb";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = "dragonfly";
+    rev = "v${version}";
+    hash = "sha256-P6WMW/n+VezWDXGagT4B+ZYyCp8oufDV6MTrpKpLZcs=";
+    fetchSubmodules = true;
+  };
+
+  # Needed exactly 5.4.4 for patch to work
+  lua = fetchurl {
+    url = "https://github.com/lua/lua/archive/refs/tags/v5.4.4.tar.gz";
+    hash = "sha256-L/ibvqIqfIuRDWsAb1ukVZ7c9GiiVTfO35mI7ZD2tFA=";
+  };
+in
+stdenv.mkDerivation {
+  inherit pname version src;
+
+  postPatch = ''
+    mkdir -p ./build/{third_party,_deps}
+    ln -s ${double-conversion.src} ./build/third_party/dconv
+    ln -s ${mimalloc.src} ./build/third_party/mimalloc
+    ln -s ${rapidjson.src} ./build/third_party/rapidjson
+    ln -s ${gbenchmark.src} ./build/_deps/benchmark-src
+    ln -s ${gtest.src} ./build/_deps/gtest-src
+    cp -R --no-preserve=mode,ownership ${gperftools.src} ./build/third_party/gperf
+    cp -R --no-preserve=mode,ownership ${liburing.src} ./build/third_party/uring
+    cp -R --no-preserve=mode,ownership ${xxHash.src} ./build/third_party/xxhash
+    cp -R --no-preserve=mode,ownership ${abseil-cpp_202111.src} ./build/_deps/abseil_cpp-src
+    cp -R --no-preserve=mode,ownership ${glog.src} ./build/_deps/glog-src
+    chmod u+x ./build/third_party/uring/configure
+    cp ./build/third_party/xxhash/cli/xxhsum.{1,c} ./build/third_party/xxhash
+    patch -p1 -d ./build/_deps/glog-src < ${./glog.patch}
+    sed '
+    s@REPLACEJEMALLOCURL@file://${jemalloc.src}@
+    s@REPLACELUAURL@file://${lua}@
+    ' ${./fixes.patch} | patch -p1
+  '';
+
+  nativeBuildInputs = [
+    autoconf
+    autoconf-archive
+    automake
+    cmake
+    ninja
+  ];
+
+  buildInputs = [
+    boost
+    libunwind
+    libtool
+    openssl
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar"
+    "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib"
+  ];
+
+  ninjaFlags = "dragonfly";
+
+  doCheck = false;
+  dontUseNinjaInstall = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp ./dragonfly $out/bin
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A modern replacement for Redis and Memcached";
+    homepage = "https://dragonflydb.io/";
+    license = licenses.bsl11;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ yureien ];
+  };
+}
diff --git a/pkgs/servers/nosql/dragonflydb/fixes.patch b/pkgs/servers/nosql/dragonflydb/fixes.patch
new file mode 100644
index 0000000000000..d2992fbbaf824
--- /dev/null
+++ b/pkgs/servers/nosql/dragonflydb/fixes.patch
@@ -0,0 +1,132 @@
+diff --git a/helio/cmake/third_party.cmake b/helio/cmake/third_party.cmake
+index aeb78d9..e9d4e6b 100644
+--- a/helio/cmake/third_party.cmake
++++ b/helio/cmake/third_party.cmake
+@@ -143,7 +143,7 @@ endfunction()
+ 
+ FetchContent_Declare(
+   gtest
+-  URL https://github.com/google/googletest/archive/release-1.11.0.zip
++  DOWNLOAD_COMMAND true
+ )
+ 
+ FetchContent_GetProperties(gtest)
+@@ -154,7 +154,7 @@ endif ()
+ 
+ FetchContent_Declare(
+   benchmark
+-  URL https://github.com/google/benchmark/archive/v1.6.1.tar.gz
++  DOWNLOAD_COMMAND true
+ )
+ 
+ FetchContent_GetProperties(benchmark)
+@@ -169,7 +169,7 @@ endif ()
+ 
+ FetchContent_Declare(
+   abseil_cpp
+-  URL https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz
++  DOWNLOAD_COMMAND true
+   PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-20211102.patch"
+ )
+ 
+@@ -183,11 +183,7 @@ endif()
+ 
+ FetchContent_Declare(
+   glog
+-  GIT_REPOSITORY https://github.com/romange/glog
+-  GIT_TAG Absl
+-
+-  GIT_PROGRESS    TRUE
+-  GIT_SHALLOW     TRUE
++  DOWNLOAD_COMMAND true
+ )
+ 
+ FetchContent_GetProperties(glog)
+@@ -233,10 +229,7 @@ endif()
+ 
+ add_third_party(
+   gperf
+-  URL https://github.com/gperftools/gperftools/archive/gperftools-2.9.1.tar.gz
+-  #GIT_REPOSITORY https://github.com/gperftools/gperftools
+-  #GIT_TAG gperftools-2.9.1
+-  GIT_SHALLOW TRUE
++  DOWNLOAD_COMMAND true
+   PATCH_COMMAND autoreconf -i   # update runs every time for some reason
+   # CMAKE_PASS_FLAGS "-DGPERFTOOLS_BUILD_HEAP_PROFILER=OFF -DGPERFTOOLS_BUILD_HEAP_CHECKER=OFF \
+   #                   -DGPERFTOOLS_BUILD_DEBUGALLOC=OFF -DBUILD_TESTING=OFF  \
+@@ -260,11 +253,12 @@ else()
+ endif()
+ 
+ add_third_party(mimalloc
+-  URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.5.tar.gz
++  DOWNLOAD_COMMAND true
+ 
+   # Add -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-O0 to debug
+   CMAKE_PASS_FLAGS "-DCMAKE_BUILD_TYPE=Release -DMI_BUILD_SHARED=OFF -DMI_BUILD_TESTS=OFF \
+-                    -DMI_INSTALL_TOPLEVEL=ON -DMI_OVERRIDE=${MI_OVERRIDE} -DCMAKE_C_FLAGS=-g"
++                    -DMI_INSTALL_TOPLEVEL=ON -DMI_OVERRIDE=${MI_OVERRIDE} -DCMAKE_C_FLAGS=-g \
++                    -DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/mimalloc/lib"
+ 
+   BUILD_COMMAND make -j4 mimalloc-static
+   INSTALL_COMMAND make install
+@@ -274,7 +268,7 @@ add_third_party(mimalloc
+ )
+ 
+ add_third_party(jemalloc
+-  URL https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
++  URL REPLACEJEMALLOCURL
+   PATCH_COMMAND ./autogen.sh
+   CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/jemalloc --with-jemalloc-prefix=je_ --disable-libdl
+ )
+@@ -282,24 +276,23 @@ add_third_party(jemalloc
+ 
+ add_third_party(
+   xxhash
+-  URL https://github.com/Cyan4973/xxHash/archive/v0.8.0.tar.gz
++  DOWNLOAD_COMMAND true
+   SOURCE_SUBDIR cmake_unofficial
+-  CMAKE_PASS_FLAGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF"
++  CMAKE_PASS_FLAGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF \
++                    -DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/xxhash/lib"
+ )
+ 
+ 
+ add_third_party(
+   uring
+-  GIT_REPOSITORY https://github.com/axboe/liburing.git
+-  GIT_TAG liburing-2.1
++  DOWNLOAD_COMMAND true
+   CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/uring
+   BUILD_IN_SOURCE 1
+ )
+ 
+ add_third_party(
+   rapidjson
+-  GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
+-  GIT_TAG 1a803826f1197b5e30703afe4b9c0e7dd48074f5
++  DOWNLOAD_COMMAND true
+   CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \
+                     -DRAPIDJSON_BUILD_DOC=OFF"
+   LIB "none"
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0dc0824..d5b38b3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ add_third_party(
+   lua
+-  URL https://github.com/lua/lua/archive/refs/tags/v5.4.4.tar.gz
++  URL REPLACELUAURL
+   PATCH_COMMAND patch -p1 -i "${CMAKE_SOURCE_DIR}/patches/lua-v5.4.4.patch"
+   CONFIGURE_COMMAND echo
+   BUILD_IN_SOURCE 1
+@@ -11,7 +11,8 @@ add_third_party(
+ 
+ add_third_party(
+   dconv
+-  URL https://github.com/google/double-conversion/archive/refs/tags/v3.2.0.tar.gz
++  DOWNLOAD_COMMAND true
++  CMAKE_PASS_FLAGS "-DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/dconv/lib"
+   LIB libdouble-conversion.a
+ )
+ 
diff --git a/pkgs/servers/nosql/dragonflydb/glog.patch b/pkgs/servers/nosql/dragonflydb/glog.patch
new file mode 100644
index 0000000000000..2fb9c0733b875
--- /dev/null
+++ b/pkgs/servers/nosql/dragonflydb/glog.patch
@@ -0,0 +1,553 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 846b4448..b4900ead 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,6 +39,7 @@ option (PRINT_UNSYMBOLIZED_STACK_TRACES
+   "Print file offsets in traces instead of symbolizing" OFF)
+ option (WITH_CUSTOM_PREFIX "Enable support for user-generated message prefixes" ON)
+ option (WITH_GFLAGS "Use gflags" ON)
++option (WITH_ABSL "Use absl flags" OFF)
+ option (WITH_GTEST "Use Google Test" ON)
+ option (WITH_PKGCONFIG "Enable pkg-config support" ON)
+ option (WITH_SYMBOLIZE "Enable symbolize module" ON)
+@@ -87,6 +88,13 @@ if (WITH_GFLAGS)
+   endif (gflags_FOUND)
+ endif (WITH_GFLAGS)
+ 
++if (WITH_ABSL)
++  set (HAVE_ABSL_FLAGS 1)
++  set (ac_cv_have_abslflags 1)
++else (WITH_ABSL)
++set (ac_cv_have_abslflags 0)
++endif (WITH_ABSL)
++
+ find_package (Threads)
+ find_package (Unwind)
+ 
+@@ -1025,7 +1033,7 @@ write_basic_package_version_file (
+   ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake
+   COMPATIBILITY SameMajorVersion)
+ 
+-export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake)
++# export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake)
+ export (PACKAGE glog)
+ 
+ get_filename_component (_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
+diff --git a/src/base/commandlineflags.h b/src/base/commandlineflags.h
+index bcb12dea..1c9d9294 100644
+--- a/src/base/commandlineflags.h
++++ b/src/base/commandlineflags.h
+@@ -57,6 +57,25 @@
+ 
+ #include <gflags/gflags.h>
+ 
++#else
++#ifdef HAVE_ABSL_FLAGS
++#include <absl/flags/flag.h>
++
++#define FLAG(name) absl::GetFlag(FLAGS_##name)
++
++#define DEFINE_bool(name, value, meaning) \
++  ABSL_FLAG(bool, name, value, meaning)
++
++#define DEFINE_int32(name, value, meaning) \
++  ABSL_FLAG(GOOGLE_NAMESPACE::int32, name, value, meaning)
++
++#define DEFINE_uint32(name, value, meaning) \
++  ABSL_FLAG(GOOGLE_NAMESPACE::uint32, name, value, meaning)
++
++#define DEFINE_string(name, value, meaning) \
++  ABSL_FLAG(std::string, name, value, meaning)
++
++
+ #else
+ 
+ #include <glog/logging.h>
+@@ -108,6 +127,7 @@
+   }                                                           \
+   using fLS::FLAGS_##name
+ 
++#endif
+ #endif  // HAVE_LIB_GFLAGS
+ 
+ // Define GLOG_DEFINE_* using DEFINE_* . By using these macros, we
+diff --git a/src/base/mutex.h b/src/base/mutex.h
+index e82c597f..a58c1412 100644
+--- a/src/base/mutex.h
++++ b/src/base/mutex.h
+@@ -319,11 +319,6 @@ class WriterMutexLock {
+   void operator=(const WriterMutexLock&);
+ };
+ 
+-// Catch bug where variable name is omitted, e.g. MutexLock (&mu);
+-#define MutexLock(x) COMPILE_ASSERT(0, mutex_lock_decl_missing_var_name)
+-#define ReaderMutexLock(x) COMPILE_ASSERT(0, rmutex_lock_decl_missing_var_name)
+-#define WriterMutexLock(x) COMPILE_ASSERT(0, wmutex_lock_decl_missing_var_name)
+-
+ }  // namespace MUTEX_NAMESPACE
+ 
+ using namespace MUTEX_NAMESPACE;
+diff --git a/src/config.h.cmake.in b/src/config.h.cmake.in
+index b225b7ec..a4c58c96 100644
+--- a/src/config.h.cmake.in
++++ b/src/config.h.cmake.in
+@@ -34,6 +34,8 @@
+ /* define if you have google gflags library */
+ #cmakedefine HAVE_LIB_GFLAGS
+ 
++#cmakedefine HAVE_ABSL_FLAGS
++
+ /* define if you have google gmock library */
+ #cmakedefine HAVE_LIB_GMOCK
+ 
+diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
+index 95a573b1..54cd838f 100644
+--- a/src/glog/logging.h.in
++++ b/src/glog/logging.h.in
+@@ -89,6 +89,10 @@
+ #include <gflags/gflags.h>
+ #endif
+ 
++#if @ac_cv_have_abslflags@
++#include <absl/flags/declare.h>
++#endif
++
+ #if @ac_cv_cxx11_atomic@ && __cplusplus >= 201103L
+ #include <atomic>
+ #elif defined(GLOG_OS_WINDOWS)
+@@ -395,6 +399,14 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo
+ #undef DECLARE_uint32
+ #endif
+ 
++#if @ac_cv_have_abslflags@
++#define DECLARE_VARIABLE 1
++#define DECLARE_bool(name) ABSL_DECLARE_FLAG(bool, name)
++#define DECLARE_int32(name) ABSL_DECLARE_FLAG(@ac_google_namespace@::int32, name)
++#define DECLARE_uint32(name) ABSL_DECLARE_FLAG(@ac_google_namespace@::uint32, name)
++#define DECLARE_string(name) ABSL_DECLARE_FLAG(std::string, name)
++#endif
++
+ #ifndef DECLARE_VARIABLE
+ #define DECLARE_VARIABLE(type, shorttype, name, tn)                     \
+   namespace fL##shorttype {                                             \
+diff --git a/src/glog/vlog_is_on.h.in b/src/glog/vlog_is_on.h.in
+index 7526fc34..16e60f46 100644
+--- a/src/glog/vlog_is_on.h.in
++++ b/src/glog/vlog_is_on.h.in
+@@ -64,6 +64,14 @@
+ #include <glog/log_severity.h>
+ 
+ #if defined(__GNUC__)
++
++#if @ac_cv_have_abslflags@
++  extern int32_t absl_proxy_v;
++  #define VLEVEL (@ac_google_namespace@::absl_proxy_v)
++#else
++  #define VLEVEL (FLAGS_v)
++#endif
++
+ // We emit an anonymous static int* variable at every VLOG_IS_ON(n) site.
+ // (Normally) the first time every VLOG_IS_ON(n) site is hit,
+ // we determine what variable will dynamically control logging at this site:
+@@ -74,7 +82,7 @@
+   __extension__  \
+   ({ static @ac_google_namespace@::SiteFlag vlocal__ = {NULL, NULL, 0, NULL};       \
+      @ac_google_namespace@::int32 verbose_level__ = (verboselevel);                    \
+-     (vlocal__.level == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &FLAGS_v, \
++     (vlocal__.level == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &VLEVEL, \
+                         __FILE__, verbose_level__) : *vlocal__.level >= verbose_level__); \
+   })
+ #else
+diff --git a/src/logging.cc b/src/logging.cc
+index 4028ccc0..fc618d3a 100644
+--- a/src/logging.cc
++++ b/src/logging.cc
+@@ -103,7 +103,9 @@ using std::fdopen;
+ #endif
+ 
+ // There is no thread annotation support.
++#ifndef EXCLUSIVE_LOCKS_REQUIRED
+ #define EXCLUSIVE_LOCKS_REQUIRED(mu)
++#endif
+ 
+ static bool BoolFromEnv(const char *varname, bool defval) {
+   const char* const valstr = getenv(varname);
+@@ -351,8 +353,9 @@ static const char* GetAnsiColorCode(GLogColor color) {
+ 
+ // Safely get max_log_size, overriding to 1 if it somehow gets defined as 0
+ static uint32 MaxLogSize() {
+-  return (FLAGS_max_log_size > 0 && FLAGS_max_log_size < 4096
+-              ? FLAGS_max_log_size
++  uint32 maxlogsize = FLAG(max_log_size);
++  return (maxlogsize > 0 && maxlogsize < 4096
++              ? maxlogsize
+               : 1);
+ }
+ 
+@@ -721,7 +724,7 @@ inline void LogDestination::SetStderrLogging(LogSeverity min_severity) {
+   // Prevent any subtle race conditions by wrapping a mutex lock around
+   // all this stuff.
+   MutexLock l(&log_mutex);
+-  FLAGS_stderrthreshold = min_severity;
++  absl::SetFlag(&FLAGS_stderrthreshold, min_severity);
+ }
+ 
+ inline void LogDestination::LogToStderr() {
+@@ -747,8 +750,8 @@ static void ColoredWriteToStderrOrStdout(FILE* output, LogSeverity severity,
+                                          const char* message, size_t len) {
+   bool is_stdout = (output == stdout);
+   const GLogColor color = (LogDestination::terminal_supports_color() &&
+-                           ((!is_stdout && FLAGS_colorlogtostderr) ||
+-                            (is_stdout && FLAGS_colorlogtostdout)))
++                           ((!is_stdout && FLAG(colorlogtostderr)) ||
++                            (is_stdout && FLAG(colorlogtostdout))))
+                               ? SeverityToColor(severity)
+                               : COLOR_DEFAULT;
+ 
+@@ -789,7 +792,7 @@ static void ColoredWriteToStdout(LogSeverity severity, const char* message,
+   FILE* output = stdout;
+   // We also need to send logs to the stderr when the severity is
+   // higher or equal to the stderr threshold.
+-  if (severity >= FLAGS_stderrthreshold) {
++  if (severity >= FLAG(stderrthreshold)) {
+     output = stderr;
+   }
+   ColoredWriteToStderrOrStdout(output, severity, message, len);
+@@ -808,7 +811,7 @@ static void WriteToStderr(const char* message, size_t len) {
+ 
+ inline void LogDestination::MaybeLogToStderr(LogSeverity severity,
+ 					     const char* message, size_t message_len, size_t prefix_len) {
+-  if ((severity >= FLAGS_stderrthreshold) || FLAGS_alsologtostderr) {
++  if ((severity >= FLAG(stderrthreshold)) || FLAG(alsologtostderr)) {
+     ColoredWriteToStderr(severity, message, message_len);
+ #ifdef GLOG_OS_WINDOWS
+     (void) prefix_len;
+@@ -835,8 +838,8 @@ inline void LogDestination::MaybeLogToStderr(LogSeverity severity,
+ inline void LogDestination::MaybeLogToEmail(LogSeverity severity,
+ 					    const char* message, size_t len) {
+   if (severity >= email_logging_severity_ ||
+-      severity >= FLAGS_logemaillevel) {
+-    string to(FLAGS_alsologtoemail);
++      severity >= FLAG(logemaillevel)) {
++    string to(FLAG(alsologtoemail));
+     if (!addresses_.empty()) {
+       if (!to.empty()) {
+         to += ",";
+@@ -862,7 +865,7 @@ inline void LogDestination::MaybeLogToLogfile(LogSeverity severity,
+                                               time_t timestamp,
+ 					      const char* message,
+ 					      size_t len) {
+-  const bool should_flush = severity > FLAGS_logbuflevel;
++  const bool should_flush = severity > FLAG(logbuflevel);
+   LogDestination* destination = log_destination(severity);
+   destination->logger_->Write(should_flush, timestamp, message, len);
+ }
+@@ -871,9 +874,9 @@ inline void LogDestination::LogToAllLogfiles(LogSeverity severity,
+                                              time_t timestamp,
+                                              const char* message,
+                                              size_t len) {
+-  if (FLAGS_logtostdout) {  // global flag: never log to file
++  if (FLAG(logtostdout)) {  // global flag: never log to file
+     ColoredWriteToStdout(severity, message, len);
+-  } else if (FLAGS_logtostderr) {  // global flag: never log to file
++  } else if (FLAG(logtostderr)) {  // global flag: never log to file
+     ColoredWriteToStderr(severity, message, len);
+   } else {
+     for (int i = severity; i >= 0; --i) {
+@@ -1032,25 +1035,25 @@ void LogFileObject::FlushUnlocked(){
+     bytes_since_flush_ = 0;
+   }
+   // Figure out when we are due for another flush.
+-  const int64 next = (FLAGS_logbufsecs
++  const int64 next = (FLAG(logbufsecs)
+                       * static_cast<int64>(1000000));  // in usec
+   next_flush_time_ = CycleClock_Now() + UsecToCycles(next);
+ }
+ 
+ bool LogFileObject::CreateLogfile(const string& time_pid_string) {
+   string string_filename = base_filename_;
+-  if (FLAGS_timestamp_in_logfile_name) {
++  if (FLAG(timestamp_in_logfile_name)) {
+     string_filename += time_pid_string;
+   }
+   string_filename += filename_extension_;
+   const char* filename = string_filename.c_str();
+   //only write to files, create if non-existant.
+   int flags = O_WRONLY | O_CREAT;
+-  if (FLAGS_timestamp_in_logfile_name) {
++  if (FLAG(timestamp_in_logfile_name)) {
+     //demand that the file is unique for our timestamp (fail if it exists).
+     flags = flags | O_EXCL;
+   }
+-  int fd = open(filename, flags, FLAGS_logfile_mode);
++  int fd = open(filename, flags, FLAG(logfile_mode));
+   if (fd == -1) return false;
+ #ifdef HAVE_FCNTL
+   // Mark the file close-on-exec. We don't really care if this fails
+@@ -1083,7 +1086,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) {
+   file_ = fdopen(fd, "a");  // Make a FILE*.
+   if (file_ == NULL) {  // Man, we're screwed!
+     close(fd);
+-    if (FLAGS_timestamp_in_logfile_name) {
++    if (FLAG(timestamp_in_logfile_name)) {
+       unlink(filename);  // Erase the half-baked evidence: an unusable log file, only if we just created it.
+     }
+     return false;
+@@ -1125,8 +1128,8 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) {
+ 
+     // Make an additional link to the log file in a place specified by
+     // FLAGS_log_link, if indicated
+-    if (!FLAGS_log_link.empty()) {
+-      linkpath = FLAGS_log_link + "/" + linkname;
++    if (!FLAG(log_link).empty()) {
++      linkpath = FLAG(log_link) + "/" + linkname;
+       unlink(linkpath.c_str());                  // delete old one if it exists
+       if (symlink(filename, linkpath.c_str()) != 0) {
+         // silently ignore failures
+@@ -1165,7 +1168,7 @@ void LogFileObject::Write(bool force_flush,
+     rollover_attempt_ = 0;
+ 
+     struct ::tm tm_time;
+-    if (FLAGS_log_utc_time) {
++    if (FLAG(log_utc_time)) {
+       gmtime_r(&timestamp, &tm_time);
+     } else {
+       localtime_r(&timestamp, &tm_time);
+@@ -1253,14 +1256,14 @@ void LogFileObject::Write(bool force_flush,
+                        << ' '
+                        << setw(2) << tm_time.tm_hour << ':'
+                        << setw(2) << tm_time.tm_min << ':'
+-                       << setw(2) << tm_time.tm_sec << (FLAGS_log_utc_time ? " UTC\n" : "\n")
++                       << setw(2) << tm_time.tm_sec << (FLAG(log_utc_time) ? " UTC\n" : "\n")
+                        << "Running on machine: "
+                        << LogDestination::hostname() << '\n';
+ 
+     if(!g_application_fingerprint.empty()) {
+       file_header_stream << "Application fingerprint: " << g_application_fingerprint << '\n';
+     }
+-    const char* const date_time_format = FLAGS_log_year_in_prefix
++    const char* const date_time_format = FLAG(log_year_in_prefix)
+                                              ? "yyyymmdd hh:mm:ss.uuuuuu"
+                                              : "mmdd hh:mm:ss.uuuuuu";
+     file_header_stream << "Running duration (h:mm:ss): "
+@@ -1284,7 +1287,7 @@ void LogFileObject::Write(bool force_flush,
+     // greater than 4096, thereby indicating an error.
+     errno = 0;
+     fwrite(message, 1, message_len, file_);
+-    if ( FLAGS_stop_logging_if_full_disk &&
++    if ( FLAG(stop_logging_if_full_disk) &&
+          errno == ENOSPC ) {  // disk full, stop writing to disk
+       stop_writing = true;  // until the disk is
+       return;
+@@ -1307,7 +1310,7 @@ void LogFileObject::Write(bool force_flush,
+     FlushUnlocked();
+ #ifdef GLOG_OS_LINUX
+     // Only consider files >= 3MiB
+-    if (FLAGS_drop_log_memory && file_length_ >= (3U << 20U)) {
++    if (FLAG(drop_log_memory) && file_length_ >= (3U << 20U)) {
+       // Don't evict the most recent 1-2MiB so as not to impact a tailer
+       // of the log file and to avoid page rounding issue on linux < 4.7
+       uint32 total_drop_length =
+@@ -1348,7 +1351,7 @@ void LogCleaner::Disable() {
+ }
+ 
+ void LogCleaner::UpdateCleanUpTime() {
+-  const int64 next = (FLAGS_logcleansecs
++  const int64 next = (FLAG(logcleansecs)
+                       * 1000000);  // in usec
+   next_cleanup_time_ = CycleClock_Now() + UsecToCycles(next);
+ }
+@@ -1664,7 +1667,7 @@ void LogMessage::Init(const char* file,
+   //    I20201018 160715 f5d4fbb0 logging.cc:1153]
+   //    (log level, GMT year, month, date, time, thread_id, file basename, line)
+   // We exclude the thread_id for the default thread.
+-  if (FLAGS_log_prefix && (line != kNoLogPrefix)) {
++  if (FLAG(log_prefix) && (line != kNoLogPrefix)) {
+       std::ios saved_fmt(NULL);
+       saved_fmt.copyfmt(stream());
+       stream().fill('0');
+@@ -1672,7 +1675,7 @@ void LogMessage::Init(const char* file,
+       if (custom_prefix_callback == NULL) {
+     #endif
+           stream() << LogSeverityNames[severity][0];
+-          if (FLAGS_log_year_in_prefix) {
++          if (FLAG(log_year_in_prefix)) {
+             stream() << setw(4) << 1900 + logmsgtime_.year();
+           }
+           stream() << setw(2) << 1 + logmsgtime_.month()
+@@ -1703,11 +1706,11 @@ void LogMessage::Init(const char* file,
+   }
+   data_->num_prefix_chars_ = data_->stream_.pcount();
+ 
+-  if (!FLAGS_log_backtrace_at.empty()) {
++  if (!FLAG(log_backtrace_at).empty()) {
+     char fileline[128];
+     snprintf(fileline, sizeof(fileline), "%s:%d", data_->basename_, line);
+ #ifdef HAVE_STACKTRACE
+-    if (FLAGS_log_backtrace_at == fileline) {
++    if (FLAG(log_backtrace_at) == fileline) {
+       string stacktrace;
+       DumpStackTraceToString(&stacktrace);
+       stream() << " (stacktrace:\n" << stacktrace << ") ";
+@@ -1746,7 +1749,7 @@ ostream& LogMessage::stream() {
+ // Flush buffered message, called by the destructor, or any other function
+ // that needs to synchronize the log.
+ void LogMessage::Flush() {
+-  if (data_->has_been_flushed_ || data_->severity_ < FLAGS_minloglevel) {
++  if (data_->has_been_flushed_ || data_->severity_ < FLAG(minloglevel)) {
+     return;
+   }
+ 
+@@ -1808,7 +1811,7 @@ static char fatal_message[256];
+ void ReprintFatalMessage() {
+   if (fatal_message[0]) {
+     const size_t n = strlen(fatal_message);
+-    if (!FLAGS_logtostderr) {
++    if (!FLAG(logtostderr)) {
+       // Also write to stderr (don't color to avoid terminal checks)
+       WriteToStderr(fatal_message, n);
+     }
+@@ -1837,8 +1840,8 @@ void LogMessage::SendToLog() EXCLUSIVE_LOCKS_REQUIRED(log_mutex) {
+   // global flag: never log to file if set.  Also -- don't log to a
+   // file if we haven't parsed the command line flags to get the
+   // program name.
+-  if (FLAGS_logtostderr || FLAGS_logtostdout || !IsGoogleLoggingInitialized()) {
+-    if (FLAGS_logtostdout) {
++  if (FLAG(logtostderr) || FLAG(logtostdout) || !IsGoogleLoggingInitialized()) {
++    if (FLAG(logtostdout)) {
+       ColoredWriteToStdout(data_->severity_, data_->message_text_,
+                            data_->num_chars_to_log_);
+     } else {
+@@ -1891,7 +1894,7 @@ void LogMessage::SendToLog() EXCLUSIVE_LOCKS_REQUIRED(log_mutex) {
+       fatal_time = logmsgtime_.timestamp();
+     }
+ 
+-    if (!FLAGS_logtostderr && !FLAGS_logtostdout) {
++    if (!FLAG(logtostderr) && !FLAG(logtostdout)) {
+       for (int i = 0; i < NUM_SEVERITIES; ++i) {
+         if (LogDestination::log_destinations_[i]) {
+           LogDestination::log_destinations_[i]->logger_->Write(true, 0, "", 0);
+@@ -2238,7 +2241,7 @@ static bool SendEmailInternal(const char*dest, const char *subject,
+               subject, body, dest);
+     }
+ 
+-    string logmailer = FLAGS_logmailer;
++    string logmailer = FLAG(logmailer);
+     if (logmailer.empty()) {
+         logmailer = "/bin/mail";
+     }
+@@ -2338,9 +2341,9 @@ const vector<string>& GetLoggingDirectories() {
+   if (logging_directories_list == NULL) {
+     logging_directories_list = new vector<string>;
+ 
+-    if ( !FLAGS_log_dir.empty() ) {
++    if ( !FLAG(log_dir).empty() ) {
+       // A dir was specified, we should use it
+-      logging_directories_list->push_back(FLAGS_log_dir);
++      logging_directories_list->push_back(FLAG(log_dir));
+     } else {
+       GetTempDirectories(logging_directories_list);
+ #ifdef GLOG_OS_WINDOWS
+@@ -2654,7 +2657,7 @@ LogMessageTime::LogMessageTime(std::tm t) {
+ 
+ LogMessageTime::LogMessageTime(std::time_t timestamp, WallTime now) {
+   std::tm t;
+-  if (FLAGS_log_utc_time)
++  if (FLAG(log_utc_time))
+     gmtime_r(&timestamp, &t);
+   else
+     localtime_r(&timestamp, &t);
+@@ -2673,7 +2676,7 @@ void LogMessageTime::init(const std::tm& t, std::time_t timestamp,
+ void LogMessageTime::CalcGmtOffset() {
+   std::tm gmt_struct;
+   int isDst = 0;
+-  if ( FLAGS_log_utc_time ) {
++  if ( FLAG(log_utc_time )) {
+     localtime_r(&timestamp_, &gmt_struct);
+     isDst = gmt_struct.tm_isdst;
+     gmt_struct = time_struct_;
+diff --git a/src/raw_logging.cc b/src/raw_logging.cc
+index 43159832..8532362b 100644
+--- a/src/raw_logging.cc
++++ b/src/raw_logging.cc
+@@ -123,8 +123,8 @@ static char crash_buf[kLogBufSize + 1] = { 0 };  // Will end in '\0'
+ GLOG_ATTRIBUTE_FORMAT(printf, 4, 5)
+ void RawLog__(LogSeverity severity, const char* file, int line,
+               const char* format, ...) {
+-  if (!(FLAGS_logtostdout || FLAGS_logtostderr ||
+-        severity >= FLAGS_stderrthreshold || FLAGS_alsologtostderr ||
++  if (!(FLAG(logtostdout) || FLAG(logtostderr) ||
++        severity >= FLAG(stderrthreshold) || FLAG(alsologtostderr) ||
+         !IsGoogleLoggingInitialized())) {
+     return;  // this stderr log message is suppressed
+   }
+diff --git a/src/utilities.cc b/src/utilities.cc
+index a332f1a1..a9d5102a 100644
+--- a/src/utilities.cc
++++ b/src/utilities.cc
+@@ -141,7 +141,7 @@ static void DumpStackTrace(int skip_count, DebugWriter *writerfn, void *arg) {
+   int depth = GetStackTrace(stack, ARRAYSIZE(stack), skip_count+1);
+   for (int i = 0; i < depth; i++) {
+ #if defined(HAVE_SYMBOLIZE)
+-    if (FLAGS_symbolize_stacktrace) {
++    if (FLAG(symbolize_stacktrace)) {
+       DumpPCAndSymbol(writerfn, arg, stack[i], "    ");
+     } else {
+       DumpPC(writerfn, arg, stack[i], "    ");
+diff --git a/src/vlog_is_on.cc b/src/vlog_is_on.cc
+index e478a366..4b7a5cae 100644
+--- a/src/vlog_is_on.cc
++++ b/src/vlog_is_on.cc
+@@ -43,14 +43,24 @@
+ #include <glog/logging.h>
+ #include <glog/raw_logging.h>
+ #include "base/googleinit.h"
++#include "config.h"
+ 
+ // glog doesn't have annotation
+ #define ANNOTATE_BENIGN_RACE(address, description)
+ 
+ using std::string;
+ 
++#ifdef HAVE_ABSL_FLAGS
++
++ABSL_FLAG(int32_t, v, 0, "Show all VLOG(m) messages for m <= this."
++" Overridable by --vmodule.").OnUpdate([] {
++      GOOGLE_NAMESPACE::absl_proxy_v = absl::GetFlag(FLAGS_v);
++    });
++
++#else
+ GLOG_DEFINE_int32(v, 0, "Show all VLOG(m) messages for m <= this."
+ " Overridable by --vmodule.");
++#endif
+ 
+ GLOG_DEFINE_string(vmodule, "", "per-module verbose level."
+ " Argument is a comma-separated list of <module name>=<log level>."
+@@ -60,6 +70,8 @@ GLOG_DEFINE_string(vmodule, "", "per-module verbose level."
+ 
+ _START_GOOGLE_NAMESPACE_
+ 
++int32_t absl_proxy_v = 0;
++
+ namespace glog_internal_namespace_ {
+ 
+ // Used by logging_unittests.cc so can't make it static here.
+@@ -132,7 +144,8 @@ static void VLOG2Initializer() {
+   // Can now parse --vmodule flag and initialize mapping of module-specific
+   // logging levels.
+   inited_vmodule = false;
+-  const char* vmodule = FLAGS_vmodule.c_str();
++  string vmodule_str = FLAG(vmodule);
++  const char* vmodule = vmodule_str.c_str();
+   const char* sep;
+   VModuleInfo* head = NULL;
+   VModuleInfo* tail = NULL;
+@@ -164,7 +177,7 @@ static void VLOG2Initializer() {
+ 
+ // This can be called very early, so we use SpinLock and RAW_VLOG here.
+ int SetVLOGLevel(const char* module_pattern, int log_level) {
+-  int result = FLAGS_v;
++  int result = FLAG(v);
+   size_t const pattern_len = strlen(module_pattern);
+   bool found = false;
+   {
diff --git a/pkgs/servers/persistent-evdev/default.nix b/pkgs/servers/persistent-evdev/default.nix
new file mode 100644
index 0000000000000..c666e9c8d799e
--- /dev/null
+++ b/pkgs/servers/persistent-evdev/default.nix
@@ -0,0 +1,42 @@
+{ lib, buildPythonPackage, fetchFromGitHub, python3Packages }:
+
+buildPythonPackage rec {
+  pname = "persistent-evdev";
+  version = "unstable-2022-05-07";
+
+  src = fetchFromGitHub {
+    owner = "aiberia";
+    repo = pname;
+    rev = "52bf246464e09ef4e6f2e1877feccc7b9feba164";
+    sha256 = "d0i6DL/qgDELet4ew2lyVqzd9TApivRxL3zA3dcsQXY=";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    evdev pyudev
+  ];
+
+  postPatch = ''
+    patchShebangs bin/persistent-evdev.py
+  '';
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/persistent-evdev.py $out/bin
+
+    mkdir -p $out/etc/udev/rules.d
+    cp udev/60-persistent-input-uinput.rules $out/etc/udev/rules.d
+  '';
+
+  # has no tests
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "https://github.com/aiberia/persistent-evdev";
+    description = "Persistent virtual input devices for qemu/libvirt/evdev hotplug support";
+    license = licenses.mit;
+    maintainers = [ maintainers.lodi ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index 03bb24d9a390f..cb595de6a13e6 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -38,7 +38,7 @@ in
     src = fetchurl {
       url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
       sha256 =
-        if version == "7.16.1" then "1sz858m9963xqr5kzjlwnq7k0a146rn60v6xijyfbp8y3brg618p"
+        if version == "7.17.4" then "a4e881d86694ae70ab6b18f72ea700415971200145d33d438e57c0374d9fc16f"
         else if version == "6.8.21" then "06b1pavyggzfp4wwdql0q9nm3r7i9px9cagp4yh4nhxhnk4w5fiq"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -55,7 +55,7 @@ in
     src = fetchurl {
       url = "https://github.com/vhyza/elasticsearch-${pluginName}/releases/download/v${version}/elasticsearch-${pluginName}-${version}-plugin.zip";
       sha256 =
-        if version == "7.16.1" then "0yjy9yhw77lmalivxnmv2rq8fk93ddxszkk73lgmpffladx2ikir"
+        if version == "7.17.3" then "1835f374230cb17193859cee22ac90e3d7a67fb41a55fd4578e840d708287a08"
         else if version == "6.8.21" then "0m80cn7vkcvk95v4pdmi6vk5ww7p01k0hj2iqb9g870vs6x2qjzv"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -72,7 +72,7 @@ in
     src = fetchurl {
       url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
       sha256 =
-        if version == "7.16.1" then "1w5ndgffqzj5ijglmykifrk1jsgh7qwn8m7sbpiv0r7n3aayhz1x"
+        if version == "7.17.4" then "1c8175b2dac54277c1f41981fb4a784829e74e6e74268381fe0c27bc6652704b"
         else if version == "6.8.21" then "07w8s4a5gvr9lzjzf629y8rx3kvs6zd1vl07ksw1paghp42yb354"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -89,7 +89,7 @@ in
     src = fetchurl {
       url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
       sha256 =
-        if version == "7.16.1" then "16mv7b9nl96bcygabvjqidxp2sjk340va19mrmliblpq3mxa2sii"
+        if version == "7.17.4" then "702e446997bde5cb38af120a1cb4271d976fdd23444be49e53b6be3801d845a9"
         else if version == "6.8.21" then "1kdpbrasxwr3dn21zjrklp1s389rwa51fairygdwl8px9liwwfa5"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -106,7 +106,7 @@ in
     src = fetchurl {
       url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
       sha256 =
-        if version == "7.16.1" then "0bf8f8cybsp6s2ai3j04yay9kbhsafpgxivxjvzn2iy9qgc84ls4"
+        if version == "7.17.4" then "7d1574a585a9db0988ee248159d51f62cce5578a8c082096ef3e26efdb24aee7"
         else if version == "6.8.21" then "0v31yyhjcdlqnjw1f9kihh7z3c6d31whc57hqqd1dn579n4s9rlz"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -123,7 +123,7 @@ in
     src = fetchurl {
       url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
       sha256 =
-        if version == "7.16.1" then "0sfa0ql3hh8jmha230dyhr51bvsvwmazyycf36ngpmxsysm8ccml"
+        if version == "7.17.4" then "cad923a662db705d40ca29698aa118e9e4cc50ae564c426a76d5acb777a4f57c"
         else if version == "6.8.21" then "0sfh1az30q4f34zxig2fz8wn9gk53fmmxyg5pbi1svn9761p5awq"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -140,7 +140,7 @@ in
     src = fetchurl {
       url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
       sha256 =
-        if version == "7.16.1" then "1b95hjr4qhiavm7r7k19bwk5c64r00f1g5s0ydnb6gzym9hdb5s1"
+        if version == "7.17.4" then "a50be4cea5c68ad7615f87d672ba160d027fdfde2be0578bb2dabd6384cc8108"
         else if version == "6.8.21" then "00lwj00rfdk6850gk1n86chiz2w6afpqn7jn588jdbwv41qh5mrv"
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
@@ -157,14 +157,14 @@ in
     pluginName = "search-guard";
     version =
       # https://docs.search-guard.com/latest/search-guard-versions
-      if esVersion == "7.16.1" then "${esVersion}-52.5.0"
+      if esVersion == "7.17.3" then "${esVersion}-53.1.0"
       else if esVersion == "6.8.21" then "${esVersion}-25.6"
       else throw "unsupported version ${esVersion} for plugin ${pluginName}";
     src =
-      if esVersion == "7.16.1" then
+      if esVersion == "7.17.3" then
         fetchurl {
           url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip";
-          sha256 = "1m3nj35qyrkkh3mhmn66nippavima8h8qpaxddalhjsvf70lhnjb";
+          sha256 = "b49b24f7b74043cb5bab93f18316ea71656a7668e61bf063ccaa7b0ee2302a31";
         }
       else if esVersion == "6.8.21" then
         fetchurl {
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index e69eabdc3612d..96e46165b537a 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "tailscale";
-  version = "1.24.2";
+  version = "1.26.0";
 
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tailscale";
     rev = "v${version}";
-    sha256 = "sha256-PBYxbi7KqwZedP1m3W3gbhFR+9UhvTAftGi6eTv05ro=";
+    sha256 = "sha256-n8g8ciK3QZYeoGdD6SUAkATlklAzjH9QYnXLyOGB1Bw=";
   };
-  vendorSha256 = "sha256-WjAd7EV/9IbrJMGGVbmSkfEUxqmwWEPkB0Yp3rrjCRU=";
+  vendorSha256 = "sha256-rIYDpGrUPVrDQjiT3zsNmiojNXrIM1wV5/Ci5+lQDqc=";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
 
diff --git a/pkgs/shells/fish/plugins/hydro.nix b/pkgs/shells/fish/plugins/hydro.nix
index eddb88a225d20..cd8705d547166 100644
--- a/pkgs/shells/fish/plugins/hydro.nix
+++ b/pkgs/shells/fish/plugins/hydro.nix
@@ -15,6 +15,6 @@ buildFishPlugin rec {
     description = "Ultra-pure, lag-free prompt with async Git status";
     homepage = "https://github.com/jorgebucaran/hydro";
     license = licenses.mit;
-    maintainers = with maintainers; [ mrhedgehog ];
+    maintainers = with maintainers; [ thehedgeh0g ];
   };
 }
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 70e296196b2ea..60bf482a82e15 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
 , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
 
 stdenv.mkDerivation rec {
-  version = "2022-06-05";
+  version = "2022-06-06";
   pname = "oh-my-zsh";
-  rev = "6622210d7d4afe859f11c5d50c177bd5e500f2c6";
+  rev = "d41ca84af1271e8bfbe26f581cebe3b86521d0db";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "3+3ekdryhiILou+8yJpq7axS2PEHDCWnBCQ5373m1uo=";
+    sha256 = "87jAe5cEPj6e1raovj8sD4LZB1sfrSZkCleW8of2HP8=";
   };
 
   strictDeps = true;
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 02eb112451bd4..2665330206e1c 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -1,11 +1,16 @@
 {system ? builtins.currentSystem}:
 
 let
+  inherit (releaseLib) lib;
+  releaseLib = import ../../top-level/release-lib.nix {
+    # We're not using any functions from release-lib.nix that look at
+    # supportedSystems.
+    supportedSystems = [];
+  };
+
   make = crossSystem: import ./make-bootstrap-tools.nix {
-    localSystem = { inherit system; };
-    inherit crossSystem;
+    pkgs = releaseLib.pkgsForCross crossSystem system;
   };
-  lib = import ../../../lib;
 in lib.mapAttrs (n: make) (with lib.systems.examples; {
   armv5tel   = sheevaplug;
   pogoplug4  = pogoplug4;
diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix
index 541f23058ef2c..d2914dbf95ae7 100644
--- a/pkgs/tools/admin/certigo/default.nix
+++ b/pkgs/tools/admin/certigo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
 
 buildGoModule rec {
   pname = "certigo";
@@ -11,12 +11,21 @@ buildGoModule rec {
     sha256 = "sha256-XGR6xIXdFLnJTFd+mJneRb/WkLmi0Jscta9Bj3paM1M=";
   };
 
-  vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs=";
+  patches = [
+    (fetchpatch {
+      name = "backport_TestConnect-Apple-Fixes.patch";
+      url = "https://github.com/square/certigo/commit/5332ac7ca20bdea63657cc8319e8b8fda4326938.patch";
+      sha256 = "sha256-mSNuiui2dxkXnCrXJ/asIzC8F1mtPecOVOIu6mE5jq4=";
+    })
+
+    (fetchpatch {
+      name = "backport_TestConnect-Expected-CipherSuite-Fixes.patch";
+      url = "https://github.com/square/certigo/commit/7ef0417bde4aafc69cbb72f0dd6d3577a56054a1.patch";
+      sha256 = "sha256-TUQ8B23HKheaPUjj4NkvjmZBAAhDNTyo2c8jf4qukds=";
+    })
+  ];
 
-  # Go running under Hydra Darwin x86_64 picks CHAPOLY instead of AES-GCM as
-  # the default TLS ciphersuite, and breaks the arguably flakey `TestConnect`
-  # test.
-  doCheck = !(stdenv.isDarwin && stdenv.isx86_64);
+  vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs=";
 
   meta = with lib; {
     description = "A utility to examine and validate certificates in a variety of formats";
diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix
index 6a093710151de..95af146a742f0 100644
--- a/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/pkgs/tools/admin/exoscale-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "exoscale-cli";
-  version = "1.54.0";
+  version = "1.56.0";
 
   src = fetchFromGitHub {
     owner = "exoscale";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-uvPJ1cOKMpDf1KfEPkSTWMIMNojUlfpqI1ESomX1MlM=";
+    sha256 = "sha256-YhVMlGSpigkzwppRnm5or0OErC01Mp93i1/uZcHskcQ=";
   };
 
   vendorSha256 = null;
diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
index 33e9831416f2a..73e9bf51636e2 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -1,108 +1,99 @@
 { lib, stdenv, makeWrapper, fetchurl, which, pkg-config
-, fetchFromGitLab
-, fetchFromGitHub
+, libjpeg
 , ocamlPackages
-, libao, portaudio, alsa-lib, libpulseaudio, libjack2
-, libsamplerate, libmad, taglib, lame, libogg
-, libvorbis, speex, libtheora, libopus, zlib
-, faad2, flac, ladspaH, ffmpeg, frei0r, dssi
+, awscli2, curl, ffmpeg, youtube-dl
+, runtimePackages ? [ awscli2 curl ffmpeg youtube-dl ]
 }:
 
 let
   pname = "liquidsoap";
-  version = "1.4.2";
-
-  ocaml-ffmpeg = fetchurl {
-    url = "https://github.com/savonet/ocaml-ffmpeg/releases/download/v0.4.2/ocaml-ffmpeg-0.4.2.tar.gz";
-    sha256 = "1lx5s1avds9fsh77828ifn71r2g89rxakhs8pp995a675phm9viw";
-  };
-
-  packageFilters = map (p: "-e '/ocaml-${p}/d'" )
-    [ "gstreamer" "shine" "aacplus" "schroedinger"
-      "voaacenc" "soundtouch" "gavl" "lo"
-    ];
+  version = "2.0.5";
 in
-
-# Liquidsoap 1.4.2 is not compatible with menhir ≥ 20220210
-# Locally override menhir to an earlier version
-let
-  menhirLib = ocamlPackages.menhirLib.overrideAttrs (o: rec {
-    version = "20211128";
-    src = fetchFromGitLab {
-      domain = "gitlab.inria.fr";
-      owner = "fpottier";
-      repo = "menhir";
-      rev = version;
-      sha256 = "sha256-L/zfjPZfn9L7qqqqJGk3Ge52rvujOVPiL8jxfH5R60g=";
-    };
-  });
-
-  menhirSdk = ocamlPackages.menhirSdk.override { inherit menhirLib; };
-
-  menhir = ocamlPackages.menhir.override {
-    inherit menhirLib menhirSdk;
-  };
-
-  srt = ocamlPackages.srt.overrideAttrs (old: rec {
-    version = "0.1.1";
-    src = fetchFromGitHub {
-      owner = "savonet";
-      repo = "ocaml-srt";
-      rev = "v${version}";
-      sha256 = "0xh89w4j7lljvpy2n08x6m9kw88f82snmzf23kp0gw637sjnrj6f";
-    };
-  });
-in
-
 stdenv.mkDerivation {
-  name = "${pname}-full-${version}";
+  inherit pname version;
 
   src = fetchurl {
-    url = "https://github.com/savonet/${pname}/releases/download/v${version}/${pname}-${version}-full.tar.gz";
-    sha256 = "0wkwnzj1a0vizv7sr1blwk5gzm2qi0n02ndijnq1i50cwrgxs1a4";
+    url = "https://github.com/savonet/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
+    sha256 = "sha256-+BHRAnO2sKK504EhXc6LPabnOzcOAAHmtmqVNQ8OeZU=";
   };
 
-  # Use ocaml-srt and ocaml-fdkaac from nixpkgs
-  # Use ocaml-ffmpeg at 0.4.2 for compatibility with ffmpeg 4.3
-  prePatch = ''
-    rm -rf ocaml-srt*/ ocaml-fdkaac*/ ocaml-ffmpeg*/
-    tar xzf ${ocaml-ffmpeg}
-  '';
-
-  preConfigure = /* we prefer system-wide libs */ ''
-    sed -i "s|gsed|sed|" Makefile
-    make bootstrap
-    # autoreconf -vi # use system libraries
-
-    sed ${toString packageFilters} PACKAGES.default > PACKAGES
-  '';
-
   postFixup = ''
-    wrapProgram $out/bin/liquidsoap --set LIQ_LADSPA_PATH /run/current-system/sw/lib/ladspa
+    wrapProgram $out/bin/liquidsoap \
+      --set LIQ_LADSPA_PATH /run/current-system/sw/lib/ladspa \
+      --prefix PATH : ${lib.makeBinPath runtimePackages}
   '';
 
-  configureFlags = [ "--localstatedir=/var" ];
-
   nativeBuildInputs = [ makeWrapper pkg-config ];
-  buildInputs =
-    [ which ocamlPackages.ocaml ocamlPackages.findlib
-      libao portaudio alsa-lib libpulseaudio libjack2
-      libsamplerate libmad taglib lame libogg
-      libvorbis speex libtheora libopus zlib
-      faad2 flac ladspaH ffmpeg frei0r dssi
-      ocamlPackages.xmlm ocamlPackages.ocaml_pcre
+  buildInputs = [
+      libjpeg
+      which
+      ocamlPackages.ocaml ocamlPackages.findlib
+
+      # Mandatory dependencies
+      ocamlPackages.dtools
+      ocamlPackages.duppy
+      ocamlPackages.mm
+      ocamlPackages.ocaml_pcre
+      ocamlPackages.menhir ocamlPackages.menhirLib
+      ocamlPackages.sedlex
+
+      # Recommended dependencies
       ocamlPackages.camomile
+      ocamlPackages.samplerate
+
+      # Optional dependencies
+      ocamlPackages.camlimages
+      ocamlPackages.gd4o
+      ocamlPackages.alsa
+      ocamlPackages.ao
+      ocamlPackages.bjack
+      ocamlPackages.cry
+      ocamlPackages.dssi
+      ocamlPackages.faad
       ocamlPackages.fdkaac
-      srt ocamlPackages.sedlex menhir menhirLib
+      ocamlPackages.srt
+      ocamlPackages.ffmpeg
+      ocamlPackages.flac
+      ocamlPackages.frei0r
+      ocamlPackages.gstreamer
+      ocamlPackages.inotify
+      ocamlPackages.ladspa
+      ocamlPackages.lame
+      ocamlPackages.lastfm
+      ocamlPackages.lo
+      ocamlPackages.mad
+      ocamlPackages.magic
+      ocamlPackages.ogg
+      ocamlPackages.opus
+      ocamlPackages.portaudio
+      ocamlPackages.pulseaudio
+      ocamlPackages.shine
+      ocamlPackages.soundtouch
+      ocamlPackages.speex
+      ocamlPackages.srt
+      ocamlPackages.ssl
+      ocamlPackages.taglib
+      ocamlPackages.theora
+      ocamlPackages.vorbis
+      ocamlPackages.xmlplaylist
+      ocamlPackages.posix-time2
+      ocamlPackages.tsdl
+      ocamlPackages.tsdl-image
+      ocamlPackages.tsdl-ttf
+
+      # Undocumented dependencies
+      ocamlPackages.ocurl
+      ocamlPackages.lilv
+      ocamlPackages.graphics
+      ocamlPackages.yojson
+      ocamlPackages.cohttp-lwt-unix
     ];
 
-  hardeningDisable = [ "format" "fortify" ];
-
   meta = with lib; {
     description = "Swiss-army knife for multimedia streaming";
     homepage = "https://www.liquidsoap.info/";
-    maintainers = with maintainers; [ ehmry ];
-    license = licenses.gpl2;
+    maintainers = with maintainers; [ dandellion ehmry ];
+    license = licenses.gpl2Plus;
     platforms = ocamlPackages.ocaml.meta.platforms or [];
   };
 }
diff --git a/pkgs/tools/bluetooth/bluewalker/default.nix b/pkgs/tools/bluetooth/bluewalker/default.nix
new file mode 100644
index 0000000000000..06241b1436ae1
--- /dev/null
+++ b/pkgs/tools/bluetooth/bluewalker/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildGoModule, fetchFromGitLab }:
+
+buildGoModule rec {
+  pname = "bluewalker";
+  version = "0.3.0";
+
+  src = fetchFromGitLab {
+    owner = "jtaimisto";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-spuJRiNiaBV4EsetUq8vUfR6ejUNZxLhVzS3AZZyrrQ=";
+  };
+
+  vendorSha256 = "189qs6vmx63vwsjmc4qgf1y8xjsi7x6l1f5c3kd8j8jnagl26z4h";
+
+  ldflags = [
+    "-w"
+    "-s"
+  ];
+
+  meta = with lib; {
+    description = "Simple command line Bluetooth LE scanner";
+    homepage = "https://gitlab.com/jtaimisto/bluewalker";
+    changelog = "https://gitlab.com/jtaimisto/bluewalker/-/tags/v${version}";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ cimm ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix
index 7fce055ce9fcc..fa9b5d0845df7 100644
--- a/pkgs/tools/compression/bzip3/default.nix
+++ b/pkgs/tools/compression/bzip3/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-arch-native"
-  ];
+  ] ++ lib.optionals stdenv.isDarwin [ "--disable-link-time-optimization" ];
 
   meta = {
     description = "A better and stronger spiritual successor to BZip2";
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/kspalaiologos/bzip3/blob/${src.rev}/NEWS";
     license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ dotlambda ];
-    # upstream supports Darwin but I couldn't get it to work
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/compression/efficient-compression-tool/default.nix b/pkgs/tools/compression/efficient-compression-tool/default.nix
new file mode 100644
index 0000000000000..6a96156012766
--- /dev/null
+++ b/pkgs/tools/compression/efficient-compression-tool/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, boost
+, cmake
+, nasm
+, libpng
+}:
+
+stdenv.mkDerivation rec {
+  pname = "efficient-compression-tool";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "fhanau";
+    repo = "Efficient-Compression-Tool";
+    rev = "v${version}";
+    sha256 = "sha256-TSV5QXf6GuHAwQrde3Zo9MA1rtpAhtRg0UTzMkBnHB8=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ cmake nasm ];
+
+  patches = [ ./use-nixpkgs-libpng.patch ];
+
+  buildInputs = [ boost libpng  ];
+
+  cmakeDir = "../src";
+
+  cmakeFlags = [ "-DECT_FOLDER_SUPPORT=ON" ];
+
+  meta = with lib; {
+    description = "Fast and effective C++ file optimizer";
+    homepage = "https://github.com/fhanau/Efficient-Compression-Tool";
+    license = licenses.asl20;
+    maintainers = [ maintainers.lunik1 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch b/pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch
new file mode 100644
index 0000000000000..f165b2b955064
--- /dev/null
+++ b/pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch
@@ -0,0 +1,108 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d18843c..a9df1fb 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -8,11 +8,6 @@ if(NOT CMAKE_BUILD_TYPE)
+ 	set(CMAKE_BUILD_TYPE Release)
+ endif()
+ 
+-# Check that submodules are present only if source was downloaded with git
+-if(EXISTS "${CMAKE_SOURCE_DIR}/../.git" AND NOT EXISTS "${CMAKE_SOURCE_DIR}/../src/libpng/README")
+-    message (FATAL_ERROR "Submodules are not initialized. Run \n\tgit submodule update --init --recursive\n within the repository")
+-endif()
+-
+ add_executable(ect
+ 	main.cpp
+ 	gztools.cpp
+@@ -56,7 +51,6 @@ add_subdirectory(lodepng EXCLUDE_FROM_ALL)
+ add_subdirectory(miniz EXCLUDE_FROM_ALL)
+ add_subdirectory(zlib EXCLUDE_FROM_ALL)
+ add_subdirectory(zopfli EXCLUDE_FROM_ALL)
+-file(COPY ${CMAKE_SOURCE_DIR}/pngusr.h DESTINATION ${CMAKE_SOURCE_DIR}/libpng/)
+ add_subdirectory(optipng EXCLUDE_FROM_ALL)
+ # Mozjpeg changes the install prefix if it thinks the current is defaulted
+ set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE)
+diff --git a/src/Makefile b/src/Makefile
+index cc24367..7aa9f0a 100755
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -18,7 +18,7 @@ CXXSRC = support.cpp zopflipng.cpp zopfli/deflate.cpp zopfli/zopfli_gzip.cpp zop
+ lodepng/lodepng.cpp lodepng/lodepng_util.cpp optipng/codec.cpp optipng/optipng.cpp jpegtran.cpp gztools.cpp \
+ leanify/zip.cpp leanify/leanify.cpp
+ 
+-.PHONY: libpng mozjpeg deps bin all install
++.PHONY: mozjpeg deps bin all install
+ all: deps bin
+ 
+ bin: deps
+@@ -33,9 +33,6 @@ libz.a:
+ 	cd zlib/; \
+ 	$(CC) $(UCFLAGS) -c adler32.c crc32.c deflate.c inffast.c inflate.c inftrees.c trees.c zutil.c gzlib.c gzread.c; \
+ 	ar rcs ../libz.a adler32.o crc32.o deflate.o inffast.o inflate.o inftrees.o trees.o zutil.o gzlib.o gzread.o
+-libpng:
+-	cp pngusr.h libpng/pngusr.h
+-	make -C libpng/ -f scripts/makefile.linux-opt CC="$(CC)" CFLAGS="$(UCFLAGS) -DPNG_USER_CONFIG -Wno-macro-redefined" libpng.a
+ mozjpeg:
+ 	cd mozjpeg/; \
+ 	export CC="$(CC)"; \
+diff --git a/src/optipng/CMakeLists.txt b/src/optipng/CMakeLists.txt
+index 1037a20..3c751e9 100644
+--- a/src/optipng/CMakeLists.txt
++++ b/src/optipng/CMakeLists.txt
+@@ -16,16 +16,14 @@ add_library(optipng
+ add_library(optipng::optipng ALIAS optipng)
+ 
+ #make sure that we are using custom zlib and custom libpng options
+-set(PNG_BUILD_ZLIB ON CACHE BOOL "use custom zlib within libpng" FORCE)
+ set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../zlib/ CACHE FILEPATH "custom zlib directory" FORCE)
+ if(NOT WIN32)
+ 	add_compile_options(-Wno-macro-redefined)
+ endif()
+ add_compile_definitions(PNG_USER_CONFIG)
+ 
+-add_subdirectory(../libpng libpng EXCLUDE_FROM_ALL)
+ target_link_libraries(optipng
+-	png_static)
++	png)
+ 
+ # libpng generates some header files that we need to be able to include
+ target_include_directories(optipng
+diff --git a/src/optipng/image.h b/src/optipng/image.h
+index c439f84..8255fa0 100755
+--- a/src/optipng/image.h
++++ b/src/optipng/image.h
+@@ -13,7 +13,7 @@
+ #ifndef OPNGCORE_IMAGE_H
+ #define OPNGCORE_IMAGE_H
+ 
+-#include "../libpng/png.h"
++#include <png.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
+diff --git a/src/optipng/opngreduc/opngreduc.h b/src/optipng/opngreduc/opngreduc.h
+index a7e6553..06ef956 100755
+--- a/src/optipng/opngreduc/opngreduc.h
++++ b/src/optipng/opngreduc/opngreduc.h
+@@ -13,7 +13,7 @@
+ 
+ #include <stdbool.h>
+ 
+-#include "../../libpng/png.h"
++#include <png.h>
+ 
+ 
+ #ifdef __cplusplus
+diff --git a/src/optipng/trans.h b/src/optipng/trans.h
+index a2f7f3e..c0e8dc4 100755
+--- a/src/optipng/trans.h
++++ b/src/optipng/trans.h
+@@ -13,7 +13,7 @@
+ #ifndef OPNGTRANS_TRANS_H
+ #define OPNGTRANS_TRANS_H
+ 
+-#include "../libpng/png.h"
++#include <png.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 1a482de62d911..66f5b695287ac 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "btrfs-progs";
-  version = "5.18";
+  version = "5.18.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "sha256-HeYQdiKwvi9tdyYfl6K91AKR27aCqsfc4IYy0XH3oTQ=";
+    sha256 = "sha256-bpinXM/1LpNU2qGtKExhTEkPhEJzovpSTLrJ64QcclU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch b/pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch
new file mode 100644
index 0000000000000..5e896063ba6a7
--- /dev/null
+++ b/pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch
@@ -0,0 +1,98 @@
+diff --git a/configure.ac b/configure.ac
+index 9aa25bd5..c7c0437b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -185,6 +185,30 @@ AC_ARG_ENABLE(
+ 	]
+ )
+ 
++AC_ARG_WITH(
++	[mount-helper],
++	[AS_HELP_STRING([--with-mount-helper=BIN],[use the specified binary as mount helper @<:@default=/sbin/mount@:>@])],
++	[mount_helper="$withval"],
++	[mount_helper="/sbin/mount"]
++)
++AC_DEFINE_UNQUOTED([MOUNT_HELPER], ["$mount_helper"], [Binary used as mount helper.])
++
++AC_ARG_WITH(
++	[umount-helper],
++	[AS_HELP_STRING([--with-umount-helper=BIN],[use the specified binary as umount helper @<:@default=/sbin/umount@:>@])],
++	[umount_helper="$withval"],
++	[umount_helper="/sbin/umount"]
++)
++AC_DEFINE_UNQUOTED([UMOUNT_HELPER], ["$umount_helper"], [Binary used as umount helper.])
++
++AC_ARG_WITH(
++	[modprobe-helper],
++	[AS_HELP_STRING([--with-modprobe-helper=BIN],[use the specified binary as modprobe helper @<:@default=/sbin/modprobe@:>@])],
++	[modprobe_helper="$withval"],
++	[modprobe_helper="/sbin/modprobe"]
++)
++AC_DEFINE_UNQUOTED([MODPROBE_HELPER], ["$modprobe_helper"], [Binary used as modprobe helper.])
++
+ # pthread_rwlock_t requires _GNU_SOURCE
+ AC_GNU_SOURCE
+ 
+diff --git a/libfuse-lite/mount_util.c b/libfuse-lite/mount_util.c
+index 8b317224..ee75ace6 100644
+--- a/libfuse-lite/mount_util.c
++++ b/libfuse-lite/mount_util.c
+@@ -89,10 +89,10 @@ int fuse_mnt_add_mount(const char *progname, const char *fsname,
+             exit(1);
+         }
+         rmdir(tmp);
+-        execle("/sbin/mount", "/sbin/mount", "-F", type, "-o", opts,
++        execle(MOUNT_HELPER, MOUNT_HELPER, "-F", type, "-o", opts,
+               fsname, mnt, NULL, &env);
+-        fprintf(stderr, "%s: failed to execute /sbin/mount: %s\n", progname,
+-                strerror(errno));
++        fprintf(stderr, "%s: failed to execute %s: %s\n", progname,
++                MOUNT_HELPER, strerror(errno));
+         exit(1);
+     }
+     res = waitpid(res, &status, 0);
+@@ -126,14 +126,14 @@ int fuse_mnt_umount(const char *progname, const char *mnt, int lazy)
+ 
+         setuid(geteuid());
+         if (lazy) {
+-            execle("/sbin/umount", "/sbin/umount", mnt,
++            execle(UMOUNT_HELPER, UMOUNT_HELPER, mnt,
+                    NULL, &env);
+         } else {
+-            execle("/sbin/umount", "/sbin/umount", "-f", mnt,
++            execle(UMOUNT_HELPER, UMOUNT_HELPER, "-f", mnt,
+                    NULL, &env);
+         }
+-        fprintf(stderr, "%s: failed to execute /sbin/umount: %s\n", progname,
+-                strerror(errno));
++        fprintf(stderr, "%s: failed to execute %s: %s\n", progname,
++                UMOUNT_HELPER, strerror(errno));
+         exit(1);
+     }
+     res = waitpid(res, &status, 0);
+diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
+index 9330500c..dd18a93f 100644
+--- a/src/lowntfs-3g.c
++++ b/src/lowntfs-3g.c
+@@ -4463,7 +4463,7 @@ static fuse_fstype load_fuse_module(void)
+ 	int i;
+ 	struct stat st;
+ 	pid_t pid;
+-	const char *cmd = "/sbin/modprobe";
++	const char *cmd = MODPROBE_HELPER;
+ 	char *env = (char*)NULL;
+ 	struct timespec req = { 0, 100000000 };   /* 100 msec */
+ 	fuse_fstype fstype;
+diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c
+index d8227e71..f5d77252 100644
+--- a/src/ntfs-3g.c
++++ b/src/ntfs-3g.c
+@@ -4171,7 +4171,7 @@ static fuse_fstype load_fuse_module(void)
+ 	int i;
+ 	struct stat st;
+ 	pid_t pid;
+-	const char *cmd = "/sbin/modprobe";
++	const char *cmd = MODPROBE_HELPER;
+ 	char *env = (char*)NULL;
+ 	struct timespec req = { 0, 100000000 };   /* 100 msec */
+ 	fuse_fstype fstype;
diff --git a/pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch b/pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch
new file mode 100644
index 0000000000000..29a35ecb1dd10
--- /dev/null
+++ b/pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch
@@ -0,0 +1,48 @@
+diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am
+index 08228322..a390d8c7 100644
+--- a/ntfsprogs/Makefile.am
++++ b/ntfsprogs/Makefile.am
+@@ -165,7 +165,7 @@ extras:	libs $(EXTRA_PROGRAMS)
+ 
+ if ENABLE_MOUNT_HELPER
+ install-exec-hook:
+-	$(INSTALL) -d $(DESTDIR)/$(sbindir)
++	$(INSTALL) -d $(DESTDIR)$(sbindir)
+ 	$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)$(sbindir)/mkfs.ntfs
+ 
+ install-data-hook:
+@@ -173,7 +173,7 @@ install-data-hook:
+ 	$(LN_S) -f mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8
+ 
+ uninstall-local:
+-	$(RM) -f $(DESTDIR)/sbin/mkfs.ntfs
++	$(RM) -f $(DESTDIR)$(sbindir)/mkfs.ntfs
+ 	$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
+ endif
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8d984083..ea407067 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -66,9 +66,9 @@ endif
+ 
+ if ENABLE_MOUNT_HELPER
+ install-exec-local:	install-rootbinPROGRAMS
+-	$(MKDIR_P) "$(DESTDIR)/sbin"
+-	$(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
+-	$(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
++	$(MKDIR_P) "$(DESTDIR)$(rootsbindir)"
++	$(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.ntfs-3g"
++	$(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.lowntfs-3g"
+ 
+ install-data-local:	install-man8
+ 	$(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
+@@ -76,7 +76,7 @@ install-data-local:	install-man8
+ 
+ uninstall-local:
+ 	$(RM) -f "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
+-	$(RM) -f "$(DESTDIR)/sbin/mount.ntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
++	$(RM) -f "$(DESTDIR)$(rootsbindir)/mount.ntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.lowntfs-3g"
+ endif
+ 
+ endif # ENABLE_NTFS_3G
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index de110f61dd81c..fe0ae20f557ba 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -1,30 +1,34 @@
-{ lib, stdenv, fetchurl, pkg-config, mount, libuuid
-, macfuse-stubs, DiskArbitration
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
+, gettext, mount, libuuid, kmod, macfuse-stubs, DiskArbitration
 , crypto ? false, libgcrypt, gnutls
 }:
 
 stdenv.mkDerivation rec {
   pname = "ntfs3g";
-  version = "2021.8.22";
+  version = "2022.5.17";
 
   outputs = [ "out" "dev" "man" "doc" ];
 
-  buildInputs = [ libuuid ] ++ lib.optionals crypto [ gnutls libgcrypt ]
+  src = fetchFromGitHub {
+    owner = "tuxera";
+    repo = "ntfs-3g";
+    rev = version;
+    sha256 = "sha256-xh8cMNIHeJ1rtk5zwOsmcxeedgZ3+MSiWn2UC7y+gtQ=";
+  };
+
+  buildInputs = [ gettext libuuid ]
+    ++ lib.optionals crypto [ gnutls libgcrypt ]
     ++ lib.optionals stdenv.isDarwin [ macfuse-stubs DiskArbitration ];
-  nativeBuildInputs = [ pkg-config ];
 
-  src = fetchurl {
-    url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
-    sha256 = "55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb";
-  };
+  # Note: libgcrypt is listed here non-optionally because its m4 macros are
+  # being used in ntfs-3g's configure.ac.
+  nativeBuildInputs = [ autoreconfHook libgcrypt pkg-config ];
 
-  patchPhase = ''
-    substituteInPlace src/Makefile.in --replace /sbin '@sbindir@'
-    substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@'
-    substituteInPlace libfuse-lite/mount_util.c \
-      --replace /bin/mount ${mount}/bin/mount \
-      --replace /bin/umount ${mount}/bin/umount
-  '';
+  patches = [
+    # https://github.com/tuxera/ntfs-3g/pull/39
+    ./autoconf-sbin-helpers.patch
+    ./consistent-sbindir-usage.patch
+  ];
 
   configureFlags = [
     "--disable-ldconfig"
@@ -34,6 +38,9 @@ stdenv.mkDerivation rec {
     "--enable-xattr-mappings"
     "--${if crypto then "enable" else "disable"}-crypto"
     "--enable-extras"
+    "--with-mount-helper=${mount}/bin/mount"
+    "--with-umount-helper=${mount}/bin/umount"
+    "--with-modprobe-helper=${kmod}/bin/modprobe"
   ];
 
   postInstall =
@@ -42,6 +49,8 @@ stdenv.mkDerivation rec {
       ln -sv mount.ntfs-3g $out/sbin/mount.ntfs
     '';
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
     homepage = "https://github.com/tuxera/ntfs-3g";
     description = "FUSE-based NTFS driver with full write support";
diff --git a/pkgs/tools/filesystems/rmfuse/poetry.lock b/pkgs/tools/filesystems/rmfuse/poetry.lock
index 9dd2c1ae80cde..4c588fc99e9f3 100644
--- a/pkgs/tools/filesystems/rmfuse/poetry.lock
+++ b/pkgs/tools/filesystems/rmfuse/poetry.lock
@@ -104,7 +104,7 @@ python-versions = ">=3.5"
 
 [[package]]
 name = "lxml"
-version = "4.8.0"
+version = "4.9.0"
 description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
 category = "main"
 optional = false
@@ -137,7 +137,7 @@ python-versions = "*"
 
 [[package]]
 name = "pillow"
-version = "9.1.0"
+version = "9.1.1"
 description = "Python Imaging Library (Fork)"
 category = "main"
 optional = false
@@ -251,7 +251,7 @@ python-versions = "*"
 
 [[package]]
 name = "svglib"
-version = "1.2.1"
+version = "1.3.0"
 description = "A pure-Python library for reading and converting SVG"
 category = "main"
 optional = false
@@ -401,67 +401,69 @@ idna = [
     {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
 ]
 lxml = [
-    {file = "lxml-4.8.0-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:e1ab2fac607842ac36864e358c42feb0960ae62c34aa4caaf12ada0a1fb5d99b"},
-    {file = "lxml-4.8.0-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:28d1af847786f68bec57961f31221125c29d6f52d9187c01cd34dc14e2b29430"},
-    {file = "lxml-4.8.0-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b92d40121dcbd74831b690a75533da703750f7041b4bf951befc657c37e5695a"},
-    {file = "lxml-4.8.0-cp27-cp27m-win32.whl", hash = "sha256:e01f9531ba5420838c801c21c1b0f45dbc9607cb22ea2cf132844453bec863a5"},
-    {file = "lxml-4.8.0-cp27-cp27m-win_amd64.whl", hash = "sha256:6259b511b0f2527e6d55ad87acc1c07b3cbffc3d5e050d7e7bcfa151b8202df9"},
-    {file = "lxml-4.8.0-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1010042bfcac2b2dc6098260a2ed022968dbdfaf285fc65a3acf8e4eb1ffd1bc"},
-    {file = "lxml-4.8.0-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:fa56bb08b3dd8eac3a8c5b7d075c94e74f755fd9d8a04543ae8d37b1612dd170"},
-    {file = "lxml-4.8.0-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:31ba2cbc64516dcdd6c24418daa7abff989ddf3ba6d3ea6f6ce6f2ed6e754ec9"},
-    {file = "lxml-4.8.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:31499847fc5f73ee17dbe1b8e24c6dafc4e8d5b48803d17d22988976b0171f03"},
-    {file = "lxml-4.8.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:5f7d7d9afc7b293147e2d506a4596641d60181a35279ef3aa5778d0d9d9123fe"},
-    {file = "lxml-4.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:a3c5f1a719aa11866ffc530d54ad965063a8cbbecae6515acbd5f0fae8f48eaa"},
-    {file = "lxml-4.8.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:6268e27873a3d191849204d00d03f65c0e343b3bcb518a6eaae05677c95621d1"},
-    {file = "lxml-4.8.0-cp310-cp310-win32.whl", hash = "sha256:330bff92c26d4aee79c5bc4d9967858bdbe73fdbdbacb5daf623a03a914fe05b"},
-    {file = "lxml-4.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:b2582b238e1658c4061ebe1b4df53c435190d22457642377fd0cb30685cdfb76"},
-    {file = "lxml-4.8.0-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a2bfc7e2a0601b475477c954bf167dee6d0f55cb167e3f3e7cefad906e7759f6"},
-    {file = "lxml-4.8.0-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:a1547ff4b8a833511eeaceacbcd17b043214fcdb385148f9c1bc5556ca9623e2"},
-    {file = "lxml-4.8.0-cp35-cp35m-win32.whl", hash = "sha256:a9f1c3489736ff8e1c7652e9dc39f80cff820f23624f23d9eab6e122ac99b150"},
-    {file = "lxml-4.8.0-cp35-cp35m-win_amd64.whl", hash = "sha256:530f278849031b0eb12f46cca0e5db01cfe5177ab13bd6878c6e739319bae654"},
-    {file = "lxml-4.8.0-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:078306d19a33920004addeb5f4630781aaeabb6a8d01398045fcde085091a169"},
-    {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:86545e351e879d0b72b620db6a3b96346921fa87b3d366d6c074e5a9a0b8dadb"},
-    {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:24f5c5ae618395ed871b3d8ebfcbb36e3f1091fd847bf54c4de623f9107942f3"},
-    {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:bbab6faf6568484707acc052f4dfc3802bdb0cafe079383fbaa23f1cdae9ecd4"},
-    {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:7993232bd4044392c47779a3c7e8889fea6883be46281d45a81451acfd704d7e"},
-    {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6d6483b1229470e1d8835e52e0ff3c6973b9b97b24cd1c116dca90b57a2cc613"},
-    {file = "lxml-4.8.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:ad4332a532e2d5acb231a2e5d33f943750091ee435daffca3fec0a53224e7e33"},
-    {file = "lxml-4.8.0-cp36-cp36m-win32.whl", hash = "sha256:db3535733f59e5605a88a706824dfcb9bd06725e709ecb017e165fc1d6e7d429"},
-    {file = "lxml-4.8.0-cp36-cp36m-win_amd64.whl", hash = "sha256:5f148b0c6133fb928503cfcdfdba395010f997aa44bcf6474fcdd0c5398d9b63"},
-    {file = "lxml-4.8.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:8a31f24e2a0b6317f33aafbb2f0895c0bce772980ae60c2c640d82caac49628a"},
-    {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:719544565c2937c21a6f76d520e6e52b726d132815adb3447ccffbe9f44203c4"},
-    {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:c0b88ed1ae66777a798dc54f627e32d3b81c8009967c63993c450ee4cbcbec15"},
-    {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:fa9b7c450be85bfc6cd39f6df8c5b8cbd76b5d6fc1f69efec80203f9894b885f"},
-    {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e9f84ed9f4d50b74fbc77298ee5c870f67cb7e91dcdc1a6915cb1ff6a317476c"},
-    {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:1d650812b52d98679ed6c6b3b55cbb8fe5a5460a0aef29aeb08dc0b44577df85"},
-    {file = "lxml-4.8.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:80bbaddf2baab7e6de4bc47405e34948e694a9efe0861c61cdc23aa774fcb141"},
-    {file = "lxml-4.8.0-cp37-cp37m-win32.whl", hash = "sha256:6f7b82934c08e28a2d537d870293236b1000d94d0b4583825ab9649aef7ddf63"},
-    {file = "lxml-4.8.0-cp37-cp37m-win_amd64.whl", hash = "sha256:e1fd7d2fe11f1cb63d3336d147c852f6d07de0d0020d704c6031b46a30b02ca8"},
-    {file = "lxml-4.8.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:5045ee1ccd45a89c4daec1160217d363fcd23811e26734688007c26f28c9e9e7"},
-    {file = "lxml-4.8.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:0c1978ff1fd81ed9dcbba4f91cf09faf1f8082c9d72eb122e92294716c605428"},
-    {file = "lxml-4.8.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:52cbf2ff155b19dc4d4100f7442f6a697938bf4493f8d3b0c51d45568d5666b5"},
-    {file = "lxml-4.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ce13d6291a5f47c1c8dbd375baa78551053bc6b5e5c0e9bb8e39c0a8359fd52f"},
-    {file = "lxml-4.8.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e11527dc23d5ef44d76fef11213215c34f36af1608074561fcc561d983aeb870"},
-    {file = "lxml-4.8.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:60d2f60bd5a2a979df28ab309352cdcf8181bda0cca4529769a945f09aba06f9"},
-    {file = "lxml-4.8.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:62f93eac69ec0f4be98d1b96f4d6b964855b8255c345c17ff12c20b93f247b68"},
-    {file = "lxml-4.8.0-cp38-cp38-win32.whl", hash = "sha256:20b8a746a026017acf07da39fdb10aa80ad9877046c9182442bf80c84a1c4696"},
-    {file = "lxml-4.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:891dc8f522d7059ff0024cd3ae79fd224752676447f9c678f2a5c14b84d9a939"},
-    {file = "lxml-4.8.0-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:b6fc2e2fb6f532cf48b5fed57567ef286addcef38c28874458a41b7837a57807"},
-    {file = "lxml-4.8.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:74eb65ec61e3c7c019d7169387d1b6ffcfea1b9ec5894d116a9a903636e4a0b1"},
-    {file = "lxml-4.8.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:627e79894770783c129cc5e89b947e52aa26e8e0557c7e205368a809da4b7939"},
-    {file = "lxml-4.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:545bd39c9481f2e3f2727c78c169425efbfb3fbba6e7db4f46a80ebb249819ca"},
-    {file = "lxml-4.8.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5a58d0b12f5053e270510bf12f753a76aaf3d74c453c00942ed7d2c804ca845c"},
-    {file = "lxml-4.8.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:ec4b4e75fc68da9dc0ed73dcdb431c25c57775383fec325d23a770a64e7ebc87"},
-    {file = "lxml-4.8.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5804e04feb4e61babf3911c2a974a5b86f66ee227cc5006230b00ac6d285b3a9"},
-    {file = "lxml-4.8.0-cp39-cp39-win32.whl", hash = "sha256:aa0cf4922da7a3c905d000b35065df6184c0dc1d866dd3b86fd961905bbad2ea"},
-    {file = "lxml-4.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:dd10383f1d6b7edf247d0960a3db274c07e96cf3a3fc7c41c8448f93eac3fb1c"},
-    {file = "lxml-4.8.0-pp37-pypy37_pp73-macosx_10_14_x86_64.whl", hash = "sha256:2403a6d6fb61c285969b71f4a3527873fe93fd0abe0832d858a17fe68c8fa507"},
-    {file = "lxml-4.8.0-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:986b7a96228c9b4942ec420eff37556c5777bfba6758edcb95421e4a614b57f9"},
-    {file = "lxml-4.8.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:6fe4ef4402df0250b75ba876c3795510d782def5c1e63890bde02d622570d39e"},
-    {file = "lxml-4.8.0-pp38-pypy38_pp73-macosx_10_14_x86_64.whl", hash = "sha256:f10ce66fcdeb3543df51d423ede7e238be98412232fca5daec3e54bcd16b8da0"},
-    {file = "lxml-4.8.0-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:730766072fd5dcb219dd2b95c4c49752a54f00157f322bc6d71f7d2a31fecd79"},
-    {file = "lxml-4.8.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:8b99ec73073b37f9ebe8caf399001848fced9c08064effdbfc4da2b5a8d07b93"},
-    {file = "lxml-4.8.0.tar.gz", hash = "sha256:f63f62fc60e6228a4ca9abae28228f35e1bd3ce675013d1dfb828688d50c6e23"},
+    {file = "lxml-4.9.0-cp27-cp27m-macosx_10_15_x86_64.whl", hash = "sha256:b5031d151d6147eac53366d6ec87da84cd4d8c5e80b1d9948a667a7164116e39"},
+    {file = "lxml-4.9.0-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5d52e1173f52020392f593f87a6af2d4055dd800574a5cb0af4ea3878801d307"},
+    {file = "lxml-4.9.0-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:3af00ee88376022589ceeb8170eb67dacf5f7cd625ea59fa0977d719777d4ae8"},
+    {file = "lxml-4.9.0-cp27-cp27m-win32.whl", hash = "sha256:1057356b808d149bc14eb8f37bb89129f237df488661c1e0fc0376ca90e1d2c3"},
+    {file = "lxml-4.9.0-cp27-cp27m-win_amd64.whl", hash = "sha256:f6d23a01921b741774f35e924d418a43cf03eca1444f3fdfd7978d35a5aaab8b"},
+    {file = "lxml-4.9.0-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:56e19fb6e4b8bd07fb20028d03d3bc67bcc0621347fbde64f248e44839771756"},
+    {file = "lxml-4.9.0-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:4cd69bca464e892ea4ed544ba6a7850aaff6f8d792f8055a10638db60acbac18"},
+    {file = "lxml-4.9.0-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:94b181dd2777890139e49a5336bf3a9a3378ce66132c665fe8db4e8b7683cde2"},
+    {file = "lxml-4.9.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:607224ffae9a0cf0a2f6e14f5f6bce43e83a6fbdaa647891729c103bdd6a5593"},
+    {file = "lxml-4.9.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:11d62c97ceff9bab94b6b29c010ea5fb6831743459bb759c917f49ba75601cd0"},
+    {file = "lxml-4.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:70a198030d26f5e569367f0f04509b63256faa76a22886280eea69a4f535dd40"},
+    {file = "lxml-4.9.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:3cf816aed8125cfc9e6e5c6c31ff94278320d591bd7970c4a0233bee0d1c8790"},
+    {file = "lxml-4.9.0-cp310-cp310-win32.whl", hash = "sha256:65b3b5f12c6fb5611e79157214f3cd533083f9b058bf2fc8a1c5cc5ee40fdc5a"},
+    {file = "lxml-4.9.0-cp310-cp310-win_amd64.whl", hash = "sha256:0aa4cce579512c33373ca4c5e23c21e40c1aa1a33533a75e51b654834fd0e4f2"},
+    {file = "lxml-4.9.0-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:63419db39df8dc5564f6f103102c4665f7e4d9cb64030e98cf7a74eae5d5760d"},
+    {file = "lxml-4.9.0-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:d8e5021e770b0a3084c30dda5901d5fce6d4474feaf0ced8f8e5a82702502fbb"},
+    {file = "lxml-4.9.0-cp35-cp35m-win32.whl", hash = "sha256:f17b9df97c5ecdfb56c5e85b3c9df9831246df698f8581c6e111ac664c7c656e"},
+    {file = "lxml-4.9.0-cp35-cp35m-win_amd64.whl", hash = "sha256:75da29a0752c8f2395df0115ac1681cefbdd4418676015be8178b733704cbff2"},
+    {file = "lxml-4.9.0-cp36-cp36m-macosx_10_15_x86_64.whl", hash = "sha256:e4d020ecf3740b7312bacab2cb966bb720fd4d3490562d373b4ad91dd1857c0d"},
+    {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:b71c52d69b91af7d18c13aef1b0cc3baee36b78607c711eb14a52bf3aa7c815e"},
+    {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28cf04a1a38e961d4a764d2940af9b941b66263ed5584392ef875ee9c1e360a3"},
+    {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:915ecf7d486df17cc65aeefdb680d5ad4390cc8c857cf8db3fe241ed234f856a"},
+    {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e564d5a771b4015f34166a05ea2165b7e283635c41b1347696117f780084b46d"},
+    {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:c2a57755e366e0ac7ebdb3e9207f159c3bf1afed02392ab18453ce81f5ee92ee"},
+    {file = "lxml-4.9.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:00f3a6f88fd5f4357844dd91a1abac5f466c6799f1b7f1da2df6665253845b11"},
+    {file = "lxml-4.9.0-cp36-cp36m-win32.whl", hash = "sha256:9093a359a86650a3dbd6532c3e4d21a6f58ba2cb60d0e72db0848115d24c10ba"},
+    {file = "lxml-4.9.0-cp36-cp36m-win_amd64.whl", hash = "sha256:d1690c4d37674a5f0cdafbc5ed7e360800afcf06928c2a024c779c046891bf09"},
+    {file = "lxml-4.9.0-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:6af7f51a6010748fc1bb71917318d953c9673e4ae3f6d285aaf93ef5b2eb11c1"},
+    {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:eabdbe04ee0a7e760fa6cd9e799d2b020d098c580ba99107d52e1e5e538b1ecb"},
+    {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:b1e22f3ee4d75ca261b6bffbf64f6f178cb194b1be3191065a09f8d98828daa9"},
+    {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:53b0410b220766321759f7f9066da67b1d0d4a7f6636a477984cbb1d98483955"},
+    {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d76da27f5e3e9bc40eba6ed7a9e985f57547e98cf20521d91215707f2fb57e0f"},
+    {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:686565ac77ff94a8965c11829af253d9e2ce3bf0d9225b1d2eb5c4d4666d0dca"},
+    {file = "lxml-4.9.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b62d1431b4c40cda43cc986f19b8c86b1d2ae8918cfc00f4776fdf070b65c0c4"},
+    {file = "lxml-4.9.0-cp37-cp37m-win32.whl", hash = "sha256:4becd16750ca5c2a1b1588269322b2cebd10c07738f336c922b658dbab96a61c"},
+    {file = "lxml-4.9.0-cp37-cp37m-win_amd64.whl", hash = "sha256:e35a298691b9e10e5a5631f8f0ba605b30ebe19208dc8f58b670462f53753641"},
+    {file = "lxml-4.9.0-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:aa7447bf7c1a15ef24e2b86a277b585dd3f055e8890ac7f97374d170187daa97"},
+    {file = "lxml-4.9.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:612ef8f2795a89ba3a1d4c8c1af84d8453fd53ee611aa5ad460fdd2cab426fc2"},
+    {file = "lxml-4.9.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:1bfb791a8fcdbf55d1d41b8be940393687bec0e9b12733f0796668086d1a23ff"},
+    {file = "lxml-4.9.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:024684e0c5cfa121c22140d3a0898a3a9b2ea0f0fd2c229b6658af4bdf1155e5"},
+    {file = "lxml-4.9.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:81c29c8741fa07ecec8ec7417c3d8d1e2f18cf5a10a280f4e1c3f8c3590228b2"},
+    {file = "lxml-4.9.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6467626fa74f96f4d80fc6ec2555799e97fff8f36e0bfc7f67769f83e59cff40"},
+    {file = "lxml-4.9.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9cae837b988f44925d14d048fa6a8c54f197c8b1223fd9ee9c27084f84606143"},
+    {file = "lxml-4.9.0-cp38-cp38-win32.whl", hash = "sha256:5a49ad78543925e1a4196e20c9c54492afa4f1502c2a563f73097e2044c75190"},
+    {file = "lxml-4.9.0-cp38-cp38-win_amd64.whl", hash = "sha256:bb7c1b029e54e26e01b1d1d912fc21abb65650d16ea9a191d026def4ed0859ed"},
+    {file = "lxml-4.9.0-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:d0d03b9636f1326772e6854459728676354d4c7731dae9902b180e2065ba3da6"},
+    {file = "lxml-4.9.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:9af19eb789d674b59a9bee5005779757aab857c40bf9cc313cb01eafac55ce55"},
+    {file = "lxml-4.9.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:dd00d28d1ab5fa7627f5abc957f29a6338a7395b724571a8cbff8fbed83aaa82"},
+    {file = "lxml-4.9.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:754a1dd04bff8a509a31146bd8f3a5dc8191a8694d582dd5fb71ff09f0722c22"},
+    {file = "lxml-4.9.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b7679344f2270840dc5babc9ccbedbc04f7473c1f66d4676bb01680c0db85bcc"},
+    {file = "lxml-4.9.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:d882c2f3345261e898b9f604be76b61c901fbfa4ac32e3f51d5dc1edc89da3cb"},
+    {file = "lxml-4.9.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4e97c8fc761ad63909198acc892f34c20f37f3baa2c50a62d5ec5d7f1efc68a1"},
+    {file = "lxml-4.9.0-cp39-cp39-win32.whl", hash = "sha256:cf9ec915857d260511399ab87e1e70fa13d6b2972258f8e620a3959468edfc32"},
+    {file = "lxml-4.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:1254a79f8a67a3908de725caf59eae62d86738f6387b0a34b32e02abd6ae73db"},
+    {file = "lxml-4.9.0-pp37-pypy37_pp73-macosx_10_15_x86_64.whl", hash = "sha256:03370ec37fe562238d385e2c53089076dee53aabf8325cab964fdb04a9130fa0"},
+    {file = "lxml-4.9.0-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:f386def57742aacc3d864169dfce644a8c396f95aa35b41b69df53f558d56dd0"},
+    {file = "lxml-4.9.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ea3f2e9eb41f973f73619e88bf7bd950b16b4c2ce73d15f24a11800ce1eaf276"},
+    {file = "lxml-4.9.0-pp38-pypy38_pp73-macosx_10_15_x86_64.whl", hash = "sha256:2d10659e6e5c53298e6d718fd126e793285bff904bb71d7239a17218f6a197b7"},
+    {file = "lxml-4.9.0-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:fcdf70191f0d1761d190a436db06a46f05af60e1410e1507935f0332280c9268"},
+    {file = "lxml-4.9.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:2b9c2341d96926b0d0e132e5c49ef85eb53fa92ae1c3a70f9072f3db0d32bc07"},
+    {file = "lxml-4.9.0-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:615886ee84b6f42f1bdf1852a9669b5fe3b96b6ff27f1a7a330b67ad9911200a"},
+    {file = "lxml-4.9.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:94f2e45b054dd759bed137b6e14ae8625495f7d90ddd23cf62c7a68f72b62656"},
+    {file = "lxml-4.9.0.tar.gz", hash = "sha256:520461c36727268a989790aef08884347cd41f2d8ae855489ccf40b50321d8d7"},
 ]
 outcome = [
     {file = "outcome-1.1.0-py2.py3-none-any.whl", hash = "sha256:c7dd9375cfd3c12db9801d080a3b63d4b0a261aa996c4c13152380587288d958"},
@@ -472,44 +474,44 @@ pdfrw = [
     {file = "pdfrw-0.4.tar.gz", hash = "sha256:0dc0494a0e6561b268542b28ede2280387c2728114f117d3bb5d8e4787b93ef4"},
 ]
 pillow = [
-    {file = "Pillow-9.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:af79d3fde1fc2e33561166d62e3b63f0cc3e47b5a3a2e5fea40d4917754734ea"},
-    {file = "Pillow-9.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:55dd1cf09a1fd7c7b78425967aacae9b0d70125f7d3ab973fadc7b5abc3de652"},
-    {file = "Pillow-9.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:66822d01e82506a19407d1afc104c3fcea3b81d5eb11485e593ad6b8492f995a"},
-    {file = "Pillow-9.1.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a5eaf3b42df2bcda61c53a742ee2c6e63f777d0e085bbc6b2ab7ed57deb13db7"},
-    {file = "Pillow-9.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01ce45deec9df310cbbee11104bae1a2a43308dd9c317f99235b6d3080ddd66e"},
-    {file = "Pillow-9.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:aea7ce61328e15943d7b9eaca87e81f7c62ff90f669116f857262e9da4057ba3"},
-    {file = "Pillow-9.1.0-cp310-cp310-win32.whl", hash = "sha256:7a053bd4d65a3294b153bdd7724dce864a1d548416a5ef61f6d03bf149205160"},
-    {file = "Pillow-9.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:97bda660702a856c2c9e12ec26fc6d187631ddfd896ff685814ab21ef0597033"},
-    {file = "Pillow-9.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:21dee8466b42912335151d24c1665fcf44dc2ee47e021d233a40c3ca5adae59c"},
-    {file = "Pillow-9.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b6d4050b208c8ff886fd3db6690bf04f9a48749d78b41b7a5bf24c236ab0165"},
-    {file = "Pillow-9.1.0-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5cfca31ab4c13552a0f354c87fbd7f162a4fafd25e6b521bba93a57fe6a3700a"},
-    {file = "Pillow-9.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ed742214068efa95e9844c2d9129e209ed63f61baa4d54dbf4cf8b5e2d30ccf2"},
-    {file = "Pillow-9.1.0-cp37-cp37m-win32.whl", hash = "sha256:c9efef876c21788366ea1f50ecb39d5d6f65febe25ad1d4c0b8dff98843ac244"},
-    {file = "Pillow-9.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:de344bcf6e2463bb25179d74d6e7989e375f906bcec8cb86edb8b12acbc7dfef"},
-    {file = "Pillow-9.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:17869489de2fce6c36690a0c721bd3db176194af5f39249c1ac56d0bb0fcc512"},
-    {file = "Pillow-9.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:25023a6209a4d7c42154073144608c9a71d3512b648a2f5d4465182cb93d3477"},
-    {file = "Pillow-9.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8782189c796eff29dbb37dd87afa4ad4d40fc90b2742704f94812851b725964b"},
-    {file = "Pillow-9.1.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:463acf531f5d0925ca55904fa668bb3461c3ef6bc779e1d6d8a488092bdee378"},
-    {file = "Pillow-9.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f42364485bfdab19c1373b5cd62f7c5ab7cc052e19644862ec8f15bb8af289e"},
-    {file = "Pillow-9.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3fddcdb619ba04491e8f771636583a7cc5a5051cd193ff1aa1ee8616d2a692c5"},
-    {file = "Pillow-9.1.0-cp38-cp38-win32.whl", hash = "sha256:4fe29a070de394e449fd88ebe1624d1e2d7ddeed4c12e0b31624561b58948d9a"},
-    {file = "Pillow-9.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:c24f718f9dd73bb2b31a6201e6db5ea4a61fdd1d1c200f43ee585fc6dcd21b34"},
-    {file = "Pillow-9.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fb89397013cf302f282f0fc998bb7abf11d49dcff72c8ecb320f76ea6e2c5717"},
-    {file = "Pillow-9.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c870193cce4b76713a2b29be5d8327c8ccbe0d4a49bc22968aa1e680930f5581"},
-    {file = "Pillow-9.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69e5ddc609230d4408277af135c5b5c8fe7a54b2bdb8ad7c5100b86b3aab04c6"},
-    {file = "Pillow-9.1.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:35be4a9f65441d9982240e6966c1eaa1c654c4e5e931eaf580130409e31804d4"},
-    {file = "Pillow-9.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:82283af99c1c3a5ba1da44c67296d5aad19f11c535b551a5ae55328a317ce331"},
-    {file = "Pillow-9.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a325ac71914c5c043fa50441b36606e64a10cd262de12f7a179620f579752ff8"},
-    {file = "Pillow-9.1.0-cp39-cp39-win32.whl", hash = "sha256:a598d8830f6ef5501002ae85c7dbfcd9c27cc4efc02a1989369303ba85573e58"},
-    {file = "Pillow-9.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:0c51cb9edac8a5abd069fd0758ac0a8bfe52c261ee0e330f363548aca6893595"},
-    {file = "Pillow-9.1.0-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:a336a4f74baf67e26f3acc4d61c913e378e931817cd1e2ef4dfb79d3e051b481"},
-    {file = "Pillow-9.1.0-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eb1b89b11256b5b6cad5e7593f9061ac4624f7651f7a8eb4dfa37caa1dfaa4d0"},
-    {file = "Pillow-9.1.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:255c9d69754a4c90b0ee484967fc8818c7ff8311c6dddcc43a4340e10cd1636a"},
-    {file = "Pillow-9.1.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5a3ecc026ea0e14d0ad7cd990ea7f48bfcb3eb4271034657dc9d06933c6629a7"},
-    {file = "Pillow-9.1.0-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5b0ff59785d93b3437c3703e3c64c178aabada51dea2a7f2c5eccf1bcf565a3"},
-    {file = "Pillow-9.1.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c7110ec1701b0bf8df569a7592a196c9d07c764a0a74f65471ea56816f10e2c8"},
-    {file = "Pillow-9.1.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:8d79c6f468215d1a8415aa53d9868a6b40c4682165b8cb62a221b1baa47db458"},
-    {file = "Pillow-9.1.0.tar.gz", hash = "sha256:f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97"},
+    {file = "Pillow-9.1.1-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:42dfefbef90eb67c10c45a73a9bc1599d4dac920f7dfcbf4ec6b80cb620757fe"},
+    {file = "Pillow-9.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffde4c6fabb52891d81606411cbfaf77756e3b561b566efd270b3ed3791fde4e"},
+    {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c857532c719fb30fafabd2371ce9b7031812ff3889d75273827633bca0c4602"},
+    {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:59789a7d06c742e9d13b883d5e3569188c16acb02eeed2510fd3bfdbc1bd1530"},
+    {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4d45dbe4b21a9679c3e8b3f7f4f42a45a7d3ddff8a4a16109dff0e1da30a35b2"},
+    {file = "Pillow-9.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:e9ed59d1b6ee837f4515b9584f3d26cf0388b742a11ecdae0d9237a94505d03a"},
+    {file = "Pillow-9.1.1-cp310-cp310-win32.whl", hash = "sha256:b3fe2ff1e1715d4475d7e2c3e8dabd7c025f4410f79513b4ff2de3d51ce0fa9c"},
+    {file = "Pillow-9.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:5b650dbbc0969a4e226d98a0b440c2f07a850896aed9266b6fedc0f7e7834108"},
+    {file = "Pillow-9.1.1-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:0b4d5ad2cd3a1f0d1df882d926b37dbb2ab6c823ae21d041b46910c8f8cd844b"},
+    {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9370d6744d379f2de5d7fa95cdbd3a4d92f0b0ef29609b4b1687f16bc197063d"},
+    {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b761727ed7d593e49671d1827044b942dd2f4caae6e51bab144d4accf8244a84"},
+    {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a66fe50386162df2da701b3722781cbe90ce043e7d53c1fd6bd801bca6b48d4"},
+    {file = "Pillow-9.1.1-cp37-cp37m-win32.whl", hash = "sha256:2b291cab8a888658d72b575a03e340509b6b050b62db1f5539dd5cd18fd50578"},
+    {file = "Pillow-9.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:1d4331aeb12f6b3791911a6da82de72257a99ad99726ed6b63f481c0184b6fb9"},
+    {file = "Pillow-9.1.1-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:8844217cdf66eabe39567118f229e275f0727e9195635a15e0e4b9227458daaf"},
+    {file = "Pillow-9.1.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b6617221ff08fbd3b7a811950b5c3f9367f6e941b86259843eab77c8e3d2b56b"},
+    {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20d514c989fa28e73a5adbddd7a171afa5824710d0ab06d4e1234195d2a2e546"},
+    {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:088df396b047477dd1bbc7de6e22f58400dae2f21310d9e2ec2933b2ef7dfa4f"},
+    {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53c27bd452e0f1bc4bfed07ceb235663a1df7c74df08e37fd6b03eb89454946a"},
+    {file = "Pillow-9.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3f6c1716c473ebd1649663bf3b42702d0d53e27af8b64642be0dd3598c761fb1"},
+    {file = "Pillow-9.1.1-cp38-cp38-win32.whl", hash = "sha256:c67db410508b9de9c4694c57ed754b65a460e4812126e87f5052ecf23a011a54"},
+    {file = "Pillow-9.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:f054b020c4d7e9786ae0404278ea318768eb123403b18453e28e47cdb7a0a4bf"},
+    {file = "Pillow-9.1.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:c17770a62a71718a74b7548098a74cd6880be16bcfff5f937f900ead90ca8e92"},
+    {file = "Pillow-9.1.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f3f6a6034140e9e17e9abc175fc7a266a6e63652028e157750bd98e804a8ed9a"},
+    {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f372d0f08eff1475ef426344efe42493f71f377ec52237bf153c5713de987251"},
+    {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09e67ef6e430f90caa093528bd758b0616f8165e57ed8d8ce014ae32df6a831d"},
+    {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:66daa16952d5bf0c9d5389c5e9df562922a59bd16d77e2a276e575d32e38afd1"},
+    {file = "Pillow-9.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d78ca526a559fb84faaaf84da2dd4addef5edb109db8b81677c0bb1aad342601"},
+    {file = "Pillow-9.1.1-cp39-cp39-win32.whl", hash = "sha256:55e74faf8359ddda43fee01bffbc5bd99d96ea508d8a08c527099e84eb708f45"},
+    {file = "Pillow-9.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:7c150dbbb4a94ea4825d1e5f2c5501af7141ea95825fadd7829f9b11c97aaf6c"},
+    {file = "Pillow-9.1.1-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:769a7f131a2f43752455cc72f9f7a093c3ff3856bf976c5fb53a59d0ccc704f6"},
+    {file = "Pillow-9.1.1-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:488f3383cf5159907d48d32957ac6f9ea85ccdcc296c14eca1a4e396ecc32098"},
+    {file = "Pillow-9.1.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b525a356680022b0af53385944026d3486fc8c013638cf9900eb87c866afb4c"},
+    {file = "Pillow-9.1.1-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:6e760cf01259a1c0a50f3c845f9cad1af30577fd8b670339b1659c6d0e7a41dd"},
+    {file = "Pillow-9.1.1-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4165205a13b16a29e1ac57efeee6be2dfd5b5408122d59ef2145bc3239fa340"},
+    {file = "Pillow-9.1.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:937a54e5694684f74dcbf6e24cc453bfc5b33940216ddd8f4cd8f0f79167f765"},
+    {file = "Pillow-9.1.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:baf3be0b9446a4083cc0c5bb9f9c964034be5374b5bc09757be89f5d2fa247b8"},
+    {file = "Pillow-9.1.1.tar.gz", hash = "sha256:7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0"},
 ]
 pycparser = [
     {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"},
@@ -574,7 +576,7 @@ sortedcontainers = [
     {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"},
 ]
 svglib = [
-    {file = "svglib-1.2.1.tar.gz", hash = "sha256:c77a0702fafd367c0fdca08ca1b7e1ee10058bde3bae252f49a3836e51e54519"},
+    {file = "svglib-1.3.0.tar.gz", hash = "sha256:a38998b95d1bb99564dc9dffaf15e4e9453761f2790d2dd4147a4ad5fbac1078"},
 ]
 tinycss2 = [
     {file = "tinycss2-1.1.1-py3-none-any.whl", hash = "sha256:fe794ceaadfe3cf3e686b22155d0da5780dd0e273471a51846d0a02bc204fec8"},
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index c44157a2f026f..d24e418a08651 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xfsprogs";
-  version = "5.16.0";
+  version = "5.18.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
-    hash = "sha256-eLjImZmb1pBEHLU9fAKrZxKUlAMZxpT/fILiPo5Gu58=";
+    hash = "sha256-Ho2IAb3sjNTK02DOO70Sw1qX8ryPfIyVgNGQOw6Mw1s=";
   };
 
   outputs = [ "bin" "dev" "out" "doc" ];
diff --git a/pkgs/tools/graphics/esshader/default.nix b/pkgs/tools/graphics/esshader/default.nix
new file mode 100644
index 0000000000000..c48306480713f
--- /dev/null
+++ b/pkgs/tools/graphics/esshader/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, pkg-config, libGL, glfw, soil, lib }:
+
+stdenv.mkDerivation {
+  pname = "esshader";
+  version = "unstable-2020-08-09";
+
+  src = fetchFromGitHub {
+    owner = "cmcsun";
+    repo = "esshader";
+    rev = "506eb02f3de52d3d1f4d81ac9ee145655216dee5";
+    sha256 = "sha256-euxJw7CqOwi6Ndzalps37kDr5oOIL3tZICCfmxsujfk=";
+  };
+
+  postPatch = ''
+    substituteInPlace config.mk \
+      --replace "-lGLESv2" "-lGL -lGLESv2"
+  '';
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+  buildInputs = [
+    libGL glfw soil
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a esshader $out/bin/
+  '';
+
+  meta = with lib; {
+    description = "Offline ShaderToy-compatible GLSL shader viewer using OpenGL ES 2.0";
+    homepage = "https://github.com/cmcsun/esshader";
+    license = licenses.mit;
+    maintainers = with maintainers; [ astro ];
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/tools/graphics/ifm/default.nix b/pkgs/tools/graphics/ifm/default.nix
index 8478395a874f1..7b9d49b1273ff 100644
--- a/pkgs/tools/graphics/ifm/default.nix
+++ b/pkgs/tools/graphics/ifm/default.nix
@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ perl tk ]; # perl and wish are not run but written as shebangs.
 
+  # Workaround build failure on -fno-common toolchains:
+  #   ld: libvars.a(vars-freeze-lex.o):src/libvars/vars-freeze-lex.l:23:
+  #     multiple definition of `line_number'; ifm-main.o:src/ifm-main.c:46: first defined here
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
   enableParallelBuilding = false; # ifm-scan.l:16:10: fatal error: ifm-parse.h: No such file or directory
 
   meta = with lib; {
diff --git a/pkgs/tools/misc/csvs-to-sqlite/default.nix b/pkgs/tools/misc/csvs-to-sqlite/default.nix
index 1deae6b3f8330..736cc1c3dc5a3 100644
--- a/pkgs/tools/misc/csvs-to-sqlite/default.nix
+++ b/pkgs/tools/misc/csvs-to-sqlite/default.nix
@@ -8,7 +8,13 @@ let
   python = python3.override {
     packageOverrides = self: super: {
       # Use click 7
-      click = self.callPackage ../../../development/python2-modules/click/default.nix { };
+      click = super.click.overridePythonAttrs (old: rec {
+        version = "7.1.2";
+        src = old.src.override {
+          inherit version;
+          sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
+        };
+      });
     };
   };
 in with python.pkgs; buildPythonApplication rec {
diff --git a/pkgs/tools/misc/mprocs/default.nix b/pkgs/tools/misc/mprocs/default.nix
index 2a14f252f4ad4..a91b2a4d6acbc 100644
--- a/pkgs/tools/misc/mprocs/default.nix
+++ b/pkgs/tools/misc/mprocs/default.nix
@@ -2,21 +2,21 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mprocs";
-  version = "0.2.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "pvolok";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-9wac2jlh8MLggcYuEHVUPYPjhfzGN+4o1XT8B9pj4f8=";
+    sha256 = "sha256-IzaXcEm4eUpLWsn59ZSiIJ0mCegLhBiA3ONKI1Djemk=";
   };
 
-  cargoSha256 = "sha256-vGhoM5VMJO+ppLk8DetNZ8UteU6ifdtRe1HNJ0dSB+0=";
+  cargoSha256 = "sha256-nTFCFmmS3IIm+D2PjvDxUKQGTn2h0ajXtxLuosa9rRY=";
 
   meta = with lib; {
     description = "A TUI tool to run multiple commands in parallel and show the output of each command separately";
     homepage = "https://github.com/pvolok/mprocs";
     license = licenses.mit;
-    maintainers = [ maintainers.GaetanLepage ];
+    maintainers = with maintainers; [ GaetanLepage thehedgeh0g ];
   };
 }
diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix
index 421c7d21d305b..a97402e7ba90a 100644
--- a/pkgs/tools/misc/zellij/default.nix
+++ b/pkgs/tools/misc/zellij/default.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zellij";
-  version = "0.29.1";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "zellij-org";
     repo = "zellij";
     rev = "v${version}";
-    sha256 = "sha256-KuelmMQdCazwTlolH5xvvNXZfzHQDUV6rrlk037GFb8=";
+    sha256 = "sha256-T2mkkE7z6AhHnn/77HcrvbY+32EOwE8jjh+veVOE1CY=";
   };
 
-  cargoSha256 = "sha256-He8rMY8n15ZSF/GcbuYTx2JfZgqQnsZLfqP+lUYxnzw=";
+  cargoSha256 = "sha256-XTaQbMK7R43CE03niUaBzlYN4xRo7pUFdNYvUeA+MwA=";
 
   nativeBuildInputs = [
     mandown
@@ -61,6 +61,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://zellij.dev/";
     changelog = "https://github.com/zellij-org/zellij/blob/v${version}/Changelog.md";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ therealansh _0x4A6F abbe ];
+    maintainers = with maintainers; [ therealansh _0x4A6F abbe thehedgeh0g ];
   };
 }
diff --git a/pkgs/tools/networking/go-shadowsocks2/default.nix b/pkgs/tools/networking/go-shadowsocks2/default.nix
index 0c8505c7001eb..a5679c8562bc2 100644
--- a/pkgs/tools/networking/go-shadowsocks2/default.nix
+++ b/pkgs/tools/networking/go-shadowsocks2/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "go-shadowsocks2";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "shadowsocks";
     repo = "go-shadowsocks2";
     rev = "v${version}";
-    sha256 = "sha256-ouJGrVribymak4SWaLbGhlp41iuw07VdxCypoBr1hWA=";
+    sha256 = "sha256-z2+5q8XlxMN7x86IOMJ0qbrW4Wrm1gp8GWew51yBRFg=";
   };
 
   vendorSha256 = "sha256-RrHksWET5kicbdQ5HRDWhNxx4rTi2zaVeaPoLdg4uQw=";
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b91ee5c9ee600..1d2928f3ad6e9 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -86,16 +86,8 @@ in lib.makeExtensible (self: {
   };
 
   nix_2_9 = common {
-    version = "2.9.0";
-    sha256 = "sha256-W6aTsTpCTb+vXQEXDjnKqetOuJmEfSuK2CXvAMqwo74=";
-    patches = [
-      # can be removed when updated to 2.9.1
-      (fetchpatch {
-        name = "fix-segfault-in-git-fetcher";
-        url = "https://github.com/NixOS/nix/commit/bc4759345538c89e1f045aaabcc0cafe4ecca12a.patch";
-        sha256 = "sha256-UrfH4M7a02yfE9X3tA1Pwhw4RacBW+rShYkl7ybG64I=";
-      })
-    ];
+    version = "2.9.1";
+    sha256 = "sha256-qNL3lQPBsnStkru3j1ajN/H+knXI+X3dku8/dBfSw3g=";
   };
 
   stable = self.nix_2_9;
diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix
index d21c9b3c568f8..e65d28a6af9b8 100644
--- a/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/pkgs/tools/package-management/nixpkgs-review/default.nix
@@ -1,24 +1,36 @@
 { lib
 , python3
 , fetchFromGitHub
-, nix
+
+, bubblewrap
+, cacert
 , git
+, nix
+
+, withSandboxSupport ? false
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nixpkgs-review";
-  version = "2.6.4";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nixpkgs-review";
     rev = version;
-    sha256 = "sha256-6vKMaCTilPXd8K3AuLqtYInVyyFhdun0o9cX1WRMmWo=";
+    sha256 = "sha256-hGOcLrVPb+bSNA72ZfKE9Mjm2dr/qnuaCkjveHXPcws=";
   };
 
-  makeWrapperArgs = [
-    "--prefix" "PATH" ":" "${lib.makeBinPath [ nix git ]}"
-  ];
+  makeWrapperArgs =
+    let
+      binPath = [ nix git ] ++ lib.optional withSandboxSupport bubblewrap;
+    in
+    [
+      "--prefix PATH : ${lib.makeBinPath binPath}"
+      "--set NIX_SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt"
+      # we don't have any runtime deps but nix-review shells might inject unwanted dependencies
+      "--unset PYTHONPATH"
+    ];
 
   doCheck = false;
 
diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix
index 076b907d880e8..8487d8a260509 100644
--- a/pkgs/tools/security/nuclei/default.nix
+++ b/pkgs/tools/security/nuclei/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "nuclei";
-  version = "2.7.1";
+  version = "2.7.2";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ra8BxM+zpe5UKlJ28wc8yE5ta4ro4o2OHfmu9fBqFTA=";
+    sha256 = "sha256-knpsoDVDGxG85YiD7pc+XDV7BgCSpNRFRuN+qM3Gv/U=";
   };
 
-  vendorSha256 = "sha256-4E9nHBaojkOwnSPxRn2JGFcQTF4WowTOtzE5zRjkqhk=";
+  vendorSha256 = "sha256-e17QpSXttso1crvBj0vrfuJliIDcXoXJzWt87ulSZXQ=";
 
   modRoot = "./v2";
   subPackages = [
diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix
index 6f2ac26ebdc2e..5a3ed90a41824 100644
--- a/pkgs/tools/security/sigma-cli/default.nix
+++ b/pkgs/tools/security/sigma-cli/default.nix
@@ -36,7 +36,8 @@ python3.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace 'prettytable = "^3.1.1"' 'prettytable = "*"'
+      --replace 'prettytable = "^3.1.1"' 'prettytable = "*"' \
+      --replace 'pysigma = "^0.5.0"' 'pysigma = "*"'
   '';
 
   pythonImportsCheck = [
diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/tools/system/runitor/default.nix
index 965813f6e3718..1108362010caa 100644
--- a/pkgs/tools/system/runitor/default.nix
+++ b/pkgs/tools/system/runitor/default.nix
@@ -2,26 +2,18 @@
 
 buildGoModule rec {
   pname = "runitor";
-  version = "0.10.0";
+  version = "0.10.1";
   vendorSha256 = null;
 
   src = fetchFromGitHub {
     owner = "bdd";
     repo = "runitor";
     rev = "v${version}";
-    sha256 = "sha256-96WKMeRkkG6en9JXaZjjnqeZOcLSII3knx8cdjTBAKw=";
+    sha256 = "sha256-qqfaA1WAHkuiyzyQbrSvnmwuRXElArErJ6PtLPOxzsg=";
   };
 
   ldflags = [
-    "-s" "-X main.Version=v${version}"
-  ];
-
-  patches = [
-    (fetchpatch {
-      name = "backport_TestPostRetries-timeout-fix.patch";
-      url = "https://github.com/bdd/runitor/commit/418142585a8387224825637cca3fe275d3c3d147.patch";
-      sha256 = "sha256-cl+KYoiHm2ioFuJVKokZkglIzL/NaEd5JNUuj4g8MUg=";
-    })
+    "-s" "-w" "-X main.Version=v${version}"
   ];
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix
index 9a3f37cc64a55..6a004253a4f08 100644
--- a/pkgs/tools/text/ispell/default.nix
+++ b/pkgs/tools/text/ispell/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ispell";
-  version = "3.4.04";
+  version = "3.4.05";
 
   src = fetchurl {
     url = "https://www.cs.hmc.edu/~geoff/tars/${pname}-${version}.tar.gz";
-    sha256 = "sha256-h7zW8FIdhaCjp4NCFZVtdOvEkxRMx8eR+HvmhyzP4T4=";
+    sha256 = "sha256-zwxt7eP9JfraQ3XYasr+WDy5bY/lRt50apLrtt+JVgI=";
   };
 
   buildInputs = [ bison ncurses ];
diff --git a/pkgs/tools/text/ltex-ls/default.nix b/pkgs/tools/text/ltex-ls/default.nix
new file mode 100644
index 0000000000000..c21ab2e038ab6
--- /dev/null
+++ b/pkgs/tools/text/ltex-ls/default.nix
@@ -0,0 +1,34 @@
+{ lib, stdenv, fetchurl, makeBinaryWrapper, jre_headless }:
+
+stdenv.mkDerivation rec {
+  pname = "ltex-ls";
+  version = "15.2.0";
+
+  src = fetchurl {
+    url = "https://github.com/valentjn/ltex-ls/releases/download/${version}/ltex-ls-${version}.tar.gz";
+    sha256 = "sha256-ygjCFjYaP9Lc5BLuOHe5+lyaKpfDhicR783skkBgo7I=";
+  };
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    cp -rfv bin/ lib/ $out
+    rm -fv $out/bin/*.bat
+    for file in $out/bin/{ltex-ls,ltex-cli}; do
+      wrapProgram $file --set JAVA_HOME "${jre_headless}"
+    done
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://valentjn.github.io/ltex/";
+    description = "LSP language server for LanguageTool";
+    license = licenses.mpl20;
+    maintainers = [ maintainers.marsam ];
+    platforms = jre_headless.meta.platforms;
+  };
+}
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 9da4290dadded..a2e156f2a10b7 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -51,6 +51,7 @@ python3.pkgs.buildPythonApplication rec {
     jsonschema
     netifaces
     oauthlib
+    pyserial
     pyyaml
     requests
   ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 68dc5bfb37dcd..0b9e938fd00a1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -267,6 +267,7 @@ mapAliases ({
   cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18
   cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18
   cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18
+  cura_stable = throw "cura_stable was removed because it was broken and used Python 2"; # added 2022-06-05
   curl_unix_socket = throw "curl_unix_socket has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02
   cutensor = throw "cutensor is now part of cudaPackages*"; # Added 2022-04-04
   cutensor_cudatoolkit_10 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
@@ -661,6 +662,7 @@ mapAliases ({
   kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned"; # Added 2020-04-28
   kino = throw "kino has been removed because it was broken and abandoned"; # Added 2021-04-25
   knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned"; # Added 2022-01-01
+  kodestudio = throw "kodestudio has been removed from nixpkgs, as the nix package has been long unmaintained and out of date."; # Added 2022-06-07
   kodiGBM = kodi-gbm;
   kodiPlain = kodi;
   kodiPlainWayland = kodi-wayland;
@@ -895,6 +897,7 @@ mapAliases ({
   mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15
   mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative"; # Added 2021-04-15
   mysqlWorkbench = throw "'mysqlWorkbench' has been renamed to/replaced by 'mysql-workbench'"; # Converted to throw 2022-02-22
+  myxer = throw "Myxer has been removed from nixpkgs, as it has been unmaintained since Jul 31, 2021"; # Added 2022-06-08
 
   ### N ###
 
@@ -934,6 +937,7 @@ mapAliases ({
   nmap-unfree = nmap; # Added 2021-04-06
   nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26
   nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26
+  nodejs-10_x = throw "nodejs-10_X has been removed. Use a newer version instead."; # Added 2022-05-31
   nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22
   nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22
   nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27
@@ -1226,6 +1230,7 @@ mapAliases ({
   s6Networking = throw "'s6Networking' has been renamed to/replaced by 's6-networking'"; # Converted to throw 2022-02-22
   s6PortableUtils = throw "'s6PortableUtils' has been renamed to/replaced by 's6-portable-utils'"; # Converted to throw 2022-02-22
   sagemath = throw "'sagemath' has been renamed to/replaced by 'sage'"; # Converted to throw 2022-02-22
+  salut_a_toi = throw "salut_a_toi was removed because it was broken and used Python 2"; # added 2022-06-05
   sam = throw "'sam' has been renamed to/replaced by 'deadpixi-sam'"; # Converted to throw 2022-02-22
   samsungUnifiedLinuxDriver = throw "'samsungUnifiedLinuxDriver' has been renamed to/replaced by 'samsung-unified-linux-driver'"; # Converted to throw 2022-02-22
   sane-backends-git = sane-backends; # Added 2021-02-19
@@ -1354,6 +1359,7 @@ mapAliases ({
   tex-gyre-pagella-math = throw "'tex-gyre-pagella-math' has been renamed to/replaced by 'tex-gyre-math.pagella'"; # Converted to throw 2022-02-22
   tex-gyre-schola-math = throw "'tex-gyre-schola-math' has been renamed to/replaced by 'tex-gyre-math.schola'"; # Converted to throw 2022-02-22
   tex-gyre-termes-math = throw "'tex-gyre-termes-math' has been renamed to/replaced by 'tex-gyre-math.termes'"; # Converted to throw 2022-02-22
+  textadept11 = textadept; # Added 2022-06-07
   tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22
   thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25";
   thunderbird-bin-68 = thunderbird-68;
@@ -1587,6 +1593,7 @@ mapAliases ({
   todolist = throw "todolist is now ultralist"; # Added 2020-12-27
   tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10
   tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10
+  torchat = throw "torchat was removed because it was broken and requires Python 2"; # added 2022-06-05
   ttyrec = ovh-ttyrec; # Added 2021-01-02
   zplugin = zinit; # Added 2021-01-30
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a358298ae7a16..ceacfe4022298 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -386,6 +386,8 @@ with pkgs;
 
   eclipse-mat = callPackage ../development/tools/eclipse-mat { };
 
+  efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { };
+
   evans = callPackage ../development/tools/evans { };
 
   firefly-desktop = callPackage ../applications/misc/firefly-desktop { };
@@ -2710,6 +2712,8 @@ with pkgs;
 
   bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
 
+  bluewalker = callPackage ../tools/bluetooth/bluewalker { };
+
   blur-effect = callPackage ../tools/graphics/blur-effect { };
 
   bootiso = callPackage ../tools/cd-dvd/bootiso { };
@@ -4755,6 +4759,8 @@ with pkgs;
 
   evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { };
 
+  persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { };
+
   evscript = callPackage ../tools/inputmethods/evscript { };
 
   gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; };
@@ -5664,6 +5670,8 @@ with pkgs;
 
   escrotum = callPackage ../tools/graphics/escrotum { };
 
+  esshader = callPackage ../tools/graphics/esshader { };
+
   etcher = callPackage ../tools/misc/etcher {
     electron = electron_12;
   };
@@ -7466,13 +7474,8 @@ with pkgs;
 
   kfctl = callPackage ../applications/networking/cluster/kfctl { };
 
-  kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { };
-  kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix {
-    enableUnfree = false;
-  };
   kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { };
-  kibana = kibana6;
-  kibana-oss = kibana6-oss;
+  kibana = kibana7;
 
   kibi = callPackage ../applications/editors/kibi { };
 
@@ -7852,14 +7855,6 @@ with pkgs;
 
   nodejs-slim = nodejs-slim-16_x;
 
-
-  nodejs-10_x = callPackage ../development/web/nodejs/v10.nix {
-    icu = icu67;
-  };
-  nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix {
-    enableNpm = false;
-    icu = icu67;
-  };
   nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { };
   nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
     enableNpm = false;
@@ -9609,6 +9604,10 @@ with pkgs;
 
   pwndbg = callPackage ../development/tools/misc/pwndbg { };
 
+  pwninit = callPackage ../development/tools/misc/pwninit {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot;
 
   pydf = callPackage ../applications/misc/pydf { };
@@ -10102,8 +10101,6 @@ with pkgs;
 
   salt = callPackage ../tools/admin/salt {};
 
-  salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {};
-
   samim-fonts = callPackage ../data/fonts/samim-fonts {};
 
   saml2aws = callPackage ../tools/security/saml2aws {
@@ -11284,8 +11281,6 @@ with pkgs;
 
   vcstool = callPackage ../development/tools/vcstool { };
 
-  vend = callPackage ../development/tools/vend { };
-
   verco = callPackage ../applications/version-management/verco { };
 
   verilator = callPackage ../applications/science/electronics/verilator {};
@@ -13021,6 +13016,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  gmqcc = callPackage ../development/compilers/gmqcc {};
+
   gtk-server = callPackage ../development/interpreters/gtk-server {};
 
   # Haskell and GHC
@@ -17169,6 +17166,10 @@ with pkgs;
       VideoDecodeAcceleration;
   };
 
+  ffmpeg_5-full = ffmpeg-full.override {
+    ffmpeg = ffmpeg_5;
+  };
+
   ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };
 
   ffmpeg-normalize = python3Packages.callPackage ../applications/video/ffmpeg-normalize { };
@@ -22446,6 +22447,7 @@ with pkgs;
   prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { };
   prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { };
   prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { };
+  prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix { };
   prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { };
   prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { };
   prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { };
@@ -23560,6 +23562,8 @@ with pkgs;
 
   gore = callPackage ../development/tools/gore { };
 
+  goresym = callPackage ../development/tools/goresym { };
+
   gotests = callPackage ../development/tools/gotests { };
 
   gotestsum = callPackage ../development/tools/gotestsum { };
@@ -25237,9 +25241,7 @@ with pkgs;
 
   atlassian-cli = callPackage ../applications/office/atlassian-cli { };
 
-  atomEnv = callPackage ../applications/editors/atom/env.nix {
-    gconf = gnome2.GConf;
-  };
+  atomEnv = callPackage ../applications/editors/atom/env.nix { };
 
   atomPackages = dontRecurseIntoAttrs (callPackage ../applications/editors/atom { });
 
@@ -25865,6 +25867,8 @@ with pkgs;
 
   dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { };
 
+  dragonflydb = callPackage ../servers/nosql/dragonflydb { };
+
   dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { };
 
   drawing = callPackage ../applications/graphics/drawing { };
@@ -27580,8 +27584,6 @@ with pkgs;
 
   kn = callPackage ../applications/networking/cluster/kn { };
 
-  kodestudio = callPackage ../applications/editors/kodestudio { };
-
   kondo = callPackage ../applications/misc/kondo { };
 
   konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { };
@@ -27889,6 +27891,8 @@ with pkgs;
 
   lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php74; };
 
+  ltex-ls = callPackage ../tools/text/ltex-ls { };
+
   luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { };
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
@@ -28852,8 +28856,6 @@ with pkgs;
 
   pamixer = callPackage ../applications/audio/pamixer { };
 
-  myxer = callPackage ../applications/audio/myxer { };
-
   ncpamixer = callPackage ../applications/audio/ncpamixer { };
 
   pan = callPackage ../applications/networking/newsreaders/pan { };
@@ -29567,10 +29569,14 @@ with pkgs;
 
   sptlrx = callPackage ../applications/audio/sptlrx { };
 
+  sptk = callPackage ../development/libraries/sptk { };
+
   squishyball = callPackage ../applications/audio/squishyball {
     ncurses = ncurses5;
   };
 
+  stw = callPackage ../applications/misc/stw { };
+
   styx = callPackage ../applications/misc/styx { };
 
   sway-launcher-desktop = callPackage ../applications/misc/sway-launcher-desktop { };
@@ -29649,9 +29655,6 @@ with pkgs;
   };
 
   curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { };
-  cura_stable = callPackage ../applications/misc/cura/stable.nix {
-    curaengine = curaengine_stable;
-  };
 
   curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; };
 
@@ -29820,9 +29823,7 @@ with pkgs;
 
   sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { };
 
-  symbolic-preview = callPackage ../applications/graphics/symbolic-preview {
-    libhandy = libhandy_0;
-  };
+  symbolic-preview = callPackage ../applications/graphics/symbolic-preview { };
 
   symlinks = callPackage ../tools/system/symlinks { };
 
@@ -30069,8 +30070,6 @@ with pkgs;
 
   topydo = callPackage ../applications/misc/topydo {};
 
-  torchat = callPackage ../applications/networking/instant-messengers/torchat { };
-
   torrential = callPackage ../applications/networking/p2p/torrential { };
 
   tortoisehg = callPackage ../applications/version-management/tortoisehg { };
@@ -32284,7 +32283,7 @@ with pkgs;
   stt = callPackage ../tools/audio/stt { };
 
   stuntrally = callPackage ../games/stuntrally
-    { stdenv = gcc10StdenvCompat; ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; };
+    { ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; };
 
   superTux = callPackage ../games/supertux { };
 
@@ -33248,6 +33247,7 @@ with pkgs;
     coqPackages_8_13 coq_8_13
     coqPackages_8_14 coq_8_14
     coqPackages_8_15 coq_8_15
+    coqPackages_8_16 coq_8_16
     coqPackages      coq
   ;
 
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 6cfd34aa279b4..91894bfaa9e7f 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -151,6 +151,7 @@ in rec {
   coq_8_13 = mkCoq "8.13";
   coq_8_14 = mkCoq "8.14";
   coq_8_15 = mkCoq "8.15";
+  coq_8_16 = mkCoq "8.16";
 
   coqPackages_8_5 = mkCoqPackages coq_8_5;
   coqPackages_8_6 = mkCoqPackages coq_8_6;
@@ -163,6 +164,7 @@ in rec {
   coqPackages_8_13 = mkCoqPackages coq_8_13;
   coqPackages_8_14 = mkCoqPackages coq_8_14;
   coqPackages_8_15 = mkCoqPackages coq_8_15;
+  coqPackages_8_16 = mkCoqPackages coq_8_16;
   coqPackages = recurseIntoAttrs coqPackages_8_15;
   coq = coqPackages.coq;
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 053af5e6677bb..5083f1733cd09 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -239,6 +239,8 @@ let
 
     crunch = callPackage ../development/tools/ocaml/crunch { };
 
+    cry = callPackage ../development/ocaml-modules/cry { };
+
     cryptokit = callPackage ../development/ocaml-modules/cryptokit { };
 
     csexp = callPackage ../development/ocaml-modules/csexp { };
@@ -397,6 +399,8 @@ let
 
     ezxmlm = callPackage ../development/ocaml-modules/ezxmlm { };
 
+    faad = callPackage ../development/ocaml-modules/faad { };
+
     facile = callPackage ../development/ocaml-modules/facile { };
 
     faraday = callPackage ../development/ocaml-modules/faraday { };
@@ -460,6 +464,10 @@ let
 
     fpath = callPackage ../development/ocaml-modules/fpath { };
 
+    frei0r = callPackage ../development/ocaml-modules/frei0r {
+      inherit (pkgs) frei0r;
+    };
+
     functoria = callPackage ../development/ocaml-modules/functoria { };
 
     functoria-runtime = callPackage ../development/ocaml-modules/functoria/runtime.nix { };
@@ -684,6 +692,10 @@ let
 
     lambda-term = callPackage ../development/ocaml-modules/lambda-term { };
 
+    lame = callPackage ../development/ocaml-modules/lame {
+      inherit (pkgs) lame;
+    };
+
     lastfm = callPackage ../development/ocaml-modules/lastfm { };
 
     lens = callPackage ../development/ocaml-modules/lens { };
@@ -694,6 +706,10 @@ let
 
     letsencrypt-dns = callPackage ../development/ocaml-modules/letsencrypt/dns.nix { };
 
+    lilv = callPackage ../development/ocaml-modules/lilv {
+      inherit (pkgs) lilv;
+    };
+
     linenoise = callPackage ../development/ocaml-modules/linenoise { };
 
     llvm = callPackage ../development/ocaml-modules/llvm {
@@ -1179,6 +1195,10 @@ let
 
     sosa = callPackage ../development/ocaml-modules/sosa { };
 
+    soundtouch = callPackage ../development/ocaml-modules/soundtouch {
+      inherit (pkgs) soundtouch;
+    };
+
     spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
 
     speex = callPackage ../development/ocaml-modules/speex {
@@ -1377,6 +1397,10 @@ let
 
     stringext = callPackage ../development/ocaml-modules/stringext { };
 
+    taglib = callPackage ../development/ocaml-modules/taglib {
+      inherit (pkgs) taglib;
+    };
+
     tcslib = callPackage ../development/ocaml-modules/tcslib { };
 
     telegraml = callPackage ../development/ocaml-modules/telegraml { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f24b11399206f..a548d11563ae1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -22117,10 +22117,10 @@ let
 
   TestLWPUserAgent = buildPerlPackage {
     pname = "Test-LWP-UserAgent";
-    version = "0.034";
+    version = "0.036";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.034.tar.gz";
-      sha256 = "1ybhl9zpxkz77d25h96kbgh16zy9f27n95p6j9jg52kvdg0r2lbp";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.036.tar.gz";
+      sha256 = "sha256-BTJ1MNNGuAphpulD+9dJmGvcqJIRpOswHAjC0XkxThE=";
     };
     propagatedBuildInputs = [ LWP SafeIsa namespaceclean ];
     buildInputs = [ PathTiny Plack TestDeep TestFatal TestNeeds TestRequiresInternet TestWarnings ];
@@ -22128,7 +22128,6 @@ let
       description = "A LWP::UserAgent suitable for simulating and testing network calls";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
       homepage = "https://github.com/karenetheridge/Test-LWP-UserAgent";
-      broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TestLWPUserAgent.x86_64-darwin
     };
   };
 
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index c915fc5c8c506..717c167857043 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -18,8 +18,6 @@ with self; with super; {
 
   cheetah = callPackage ../development/python2-modules/cheetah { };
 
-  click = callPackage ../development/python2-modules/click { };
-
   configparser = callPackage ../development/python2-modules/configparser { };
 
   construct = callPackage ../development/python2-modules/construct { };
@@ -28,18 +26,10 @@ with self; with super; {
 
   coverage = callPackage ../development/python2-modules/coverage { };
 
-  cryptography = callPackage ../development/python2-modules/cryptography { };
-
-  decorator = callPackage ../development/python2-modules/decorator { };
-
   enum = callPackage ../development/python2-modules/enum { };
 
   filelock =  callPackage ../development/python2-modules/filelock { };
 
-  flask = callPackage ../development/python2-modules/flask { };
-
-  freezegun = callPackage ../development/python2-modules/freezegun { };
-
   futures = callPackage ../development/python2-modules/futures { };
 
   google-apputils = callPackage ../development/python2-modules/google-apputils { };
@@ -54,16 +44,8 @@ with self; with super; {
 
   importlib-metadata = callPackage ../development/python2-modules/importlib-metadata { };
 
-  ipaddr = callPackage ../development/python2-modules/ipaddr { };
-
-  itsdangerous = callPackage ../development/python2-modules/itsdangerous { };
-
   jinja2 = callPackage ../development/python2-modules/jinja2 { };
 
-  libcloud = callPackage ../development/python2-modules/libcloud { };
-
-  lpod = callPackage ../development/python2-modules/lpod { };
-
   marisa = callPackage ../development/python2-modules/marisa {
     inherit (pkgs) marisa;
   };
@@ -110,8 +92,6 @@ with self; with super; {
 
   pygtk = callPackage ../development/python2-modules/pygtk { };
 
-  pyjwt = callPackage ../development/python2-modules/pyjwt { };
-
   pyparsing = callPackage ../development/python2-modules/pyparsing { };
 
   pyroma = callPackage ../development/python2-modules/pyroma { };
@@ -160,20 +140,6 @@ with self; with super; {
 
   typing = callPackage ../development/python2-modules/typing { };
 
-  urllib3 = callPackage ../development/python2-modules/urllib3 { };
-
-  werkzeug = callPackage ../development/python2-modules/werkzeug { };
-
-  wsproto = callPackage ../development/python2-modules/wsproto { };
-
-  wxPython30 = callPackage ../development/python2-modules/wxPython {
-    wxGTK = pkgs.wxGTK30;
-  };
-
-  wxPython = self.wxPython30;
-
-  vcrpy = callPackage ../development/python2-modules/vcrpy { };
-
   zeek = disabled super.zeek;
 
   zipp = callPackage ../development/python2-modules/zipp { };