about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.github/CODEOWNERS5
-rw-r--r--doc/languages-frameworks/go.section.md6
-rw-r--r--lib/modules.nix90
-rw-r--r--lib/strings.nix9
-rw-r--r--lib/tests/misc.nix7
-rw-r--r--maintainers/maintainer-list.nix27
-rwxr-xr-xmaintainers/scripts/dep-licenses.sh2
-rw-r--r--maintainers/scripts/pluginupdate.py187
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-1803.section.xml8
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2205.section.xml19
-rw-r--r--nixos/doc/manual/release-notes/rl-1803.section.md2
-rw-r--r--nixos/doc/manual/release-notes/rl-2205.section.md8
-rw-r--r--nixos/lib/make-disk-image.nix1
-rw-r--r--nixos/lib/make-options-doc/mergeJSON.py4
-rw-r--r--nixos/modules/programs/ssh.nix25
-rw-r--r--nixos/modules/services/misc/ethminer.nix2
-rw-r--r--nixos/modules/services/misc/nix-daemon.nix8
-rw-r--r--nixos/modules/services/network-filesystems/ipfs.nix14
-rw-r--r--nixos/modules/services/x11/window-managers/qtile.nix15
-rw-r--r--nixos/modules/system/boot/networkd.nix4
-rw-r--r--nixos/modules/system/boot/stage-1-init.sh3
-rw-r--r--nixos/modules/system/boot/stage-1.nix20
-rw-r--r--nixos/modules/system/boot/systemd/initrd.nix52
-rw-r--r--nixos/modules/system/boot/timesyncd.nix22
-rw-r--r--nixos/modules/tasks/lvm.nix32
-rw-r--r--nixos/tests/all-tests.nix1
-rw-r--r--nixos/tests/atop.nix8
-rw-r--r--nixos/tests/docker-tools-cross.nix4
-rw-r--r--nixos/tests/docker-tools.nix2
-rw-r--r--nixos/tests/installer.nix1
-rw-r--r--nixos/tests/lvm2/default.nix27
-rw-r--r--nixos/tests/lvm2/thinpool.nix32
-rw-r--r--nixos/tests/lvm2/vdo.nix27
-rw-r--r--nixos/tests/nixops/default.nix2
-rw-r--r--nixos/tests/vaultwarden.nix1
-rw-r--r--pkgs/applications/audio/flac/default.nix12
-rw-r--r--pkgs/applications/audio/jacktrip/default.nix61
-rw-r--r--pkgs/applications/audio/praat/default.nix4
-rw-r--r--pkgs/applications/audio/sfizz/default.nix7
-rw-r--r--pkgs/applications/audio/sfxr-qt/default.nix7
-rw-r--r--pkgs/applications/blockchains/ledger-live-desktop/default.nix4
-rw-r--r--pkgs/applications/blockchains/lndmanage/default.nix4
-rw-r--r--pkgs/applications/editors/apostrophe/default.nix4
-rw-r--r--pkgs/applications/editors/eclipse/default.nix26
-rw-r--r--pkgs/applications/editors/eclipse/plugins.nix4
-rw-r--r--pkgs/applications/editors/emacs/27.nix5
-rw-r--r--pkgs/applications/editors/helix/default.nix20
-rw-r--r--pkgs/applications/editors/kakoune/plugins/default.nix2
-rw-r--r--pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names39
-rw-r--r--pkgs/applications/editors/marker/default.nix5
-rw-r--r--pkgs/applications/editors/poke/default.nix4
-rw-r--r--pkgs/applications/editors/vim/plugins/default.nix2
-rw-r--r--pkgs/applications/editors/vim/plugins/generated.nix1869
-rw-r--r--pkgs/applications/editors/vim/plugins/vim-plugin-names2022
-rw-r--r--pkgs/applications/editors/vscode/extensions/default.nix2
-rw-r--r--pkgs/applications/emulators/epsxe/default.nix52
-rw-r--r--pkgs/applications/graphics/apitrace/default.nix6
-rw-r--r--pkgs/applications/graphics/apitrace/glibc-2.34-compat.patch13
-rw-r--r--pkgs/applications/graphics/imgbrd-grabber/default.nix2
-rw-r--r--pkgs/applications/graphics/jpegrescan/default.nix6
-rw-r--r--pkgs/applications/graphics/shotwell/default.nix4
-rw-r--r--pkgs/applications/graphics/synfigstudio/default.nix4
-rw-r--r--pkgs/applications/kde/fetch.sh2
-rw-r--r--pkgs/applications/kde/kitinerary.nix11
-rw-r--r--pkgs/applications/kde/srcs.nix1840
-rw-r--r--pkgs/applications/misc/bottles/default.nix4
-rw-r--r--pkgs/applications/misc/gnome-solanum/default.nix10
-rw-r--r--pkgs/applications/misc/pdfslicer/default.nix6
-rw-r--r--pkgs/applications/misc/pytrainer/default.nix4
-rw-r--r--pkgs/applications/misc/trenchbroom/default.nix13
-rw-r--r--pkgs/applications/misc/wlclock/default.nix46
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.json26
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/release_sources.nix786
-rw-r--r--pkgs/applications/networking/browsers/firefox/packages.nix8
-rw-r--r--pkgs/applications/networking/browsers/lagrange/default.nix4
-rw-r--r--pkgs/applications/networking/cluster/argocd-autopilot/default.nix9
-rw-r--r--pkgs/applications/networking/cluster/argocd/default.nix18
-rw-r--r--pkgs/applications/networking/cluster/arkade/default.nix4
-rw-r--r--pkgs/applications/networking/cluster/istioctl/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/kube3d/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/kubeless/default.nix38
-rw-r--r--pkgs/applications/networking/cluster/kubeseal/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/tektoncd-cli/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/terraform-providers/default.nix2
-rw-r--r--pkgs/applications/networking/feedreaders/rss2email/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/alfaview/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix10
-rw-r--r--pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json2
-rw-r--r--pkgs/applications/networking/instant-messengers/ferdi/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/gtmess/default.nix20
-rw-r--r--pkgs/applications/networking/instant-messengers/pond/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/signal-desktop/default.nix4
-rw-r--r--pkgs/applications/networking/mailreaders/claws-mail/default.nix18
-rw-r--r--pkgs/applications/networking/nextdns/default.nix8
-rw-r--r--pkgs/applications/networking/sniffers/wireshark/default.nix11
-rw-r--r--pkgs/applications/science/chemistry/jmol/default.nix4
-rw-r--r--pkgs/applications/science/electronics/eagle/eagle7.nix97
-rw-r--r--pkgs/applications/science/logic/potassco/clingcon.nix5
-rw-r--r--pkgs/applications/science/math/caffe/default.nix2
-rw-r--r--pkgs/applications/science/misc/bada-bib/default.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix11
-rw-r--r--pkgs/applications/version-management/git-and-tools/hut/default.nix13
-rw-r--r--pkgs/applications/version-management/github-desktop/default.nix4
-rw-r--r--pkgs/applications/version-management/gogs/default.nix6
-rw-r--r--pkgs/applications/version-management/mercurial/default.nix11
-rw-r--r--pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch12
-rw-r--r--pkgs/applications/version-management/rcs/default.nix8
-rw-r--r--pkgs/applications/video/ani-cli/default.nix4
-rw-r--r--pkgs/applications/video/pitivi/default.nix8
-rw-r--r--pkgs/applications/video/quvi/library.nix1
-rw-r--r--pkgs/applications/video/quvi/scripts.nix1
-rw-r--r--pkgs/applications/video/quvi/tool.nix1
-rw-r--r--pkgs/applications/virtualization/docker/compose.nix6
-rw-r--r--pkgs/applications/window-managers/berry/default.nix4
-rw-r--r--pkgs/build-support/docker/default.nix18
-rw-r--r--pkgs/build-support/docker/examples.nix2
-rw-r--r--pkgs/build-support/make-desktopitem/default.nix11
-rw-r--r--pkgs/build-support/test-equal-derivation.nix2
-rw-r--r--pkgs/build-support/trivial-builders.nix5
-rw-r--r--pkgs/build-support/trivial-builders/test/write-text-file.nix34
-rw-r--r--pkgs/build-support/writers/default.nix2
-rw-r--r--pkgs/data/icons/hicolor-icon-theme/default.nix5
-rw-r--r--pkgs/data/misc/cldr-annotations/default.nix24
-rw-r--r--pkgs/data/misc/iana-etc/default.nix5
-rw-r--r--pkgs/data/misc/tzdata/default.nix6
-rw-r--r--pkgs/data/misc/unicode-emoji/default.nix16
-rw-r--r--pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix7
-rw-r--r--pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix11
-rw-r--r--pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix7
-rw-r--r--pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix7
-rw-r--r--pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix7
-rw-r--r--pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix7
-rw-r--r--pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix10
-rw-r--r--pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix5
-rw-r--r--pkgs/desktops/gnome-2/bindings/gnome-python/default.nix8
-rw-r--r--pkgs/desktops/gnome-2/default.nix2
-rw-r--r--pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix10
-rw-r--r--pkgs/desktops/gnome-2/platform/ORBit2/default.nix6
-rw-r--r--pkgs/desktops/gnome-2/platform/gnome-common/default.nix8
-rw-r--r--pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix9
-rw-r--r--pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix8
-rw-r--r--pkgs/desktops/gnome-2/platform/gtkhtml/default.nix7
-rw-r--r--pkgs/desktops/gnome-2/platform/libIDL/default.nix8
-rw-r--r--pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix7
-rw-r--r--pkgs/desktops/gnome-2/platform/libbonobo/default.nix8
-rw-r--r--pkgs/desktops/gnome-2/platform/libbonoboui/default.nix8
-rw-r--r--pkgs/desktops/gnome-2/platform/libglade/default.nix7
-rw-r--r--pkgs/desktops/gnome-2/platform/libgnome/default.nix8
-rw-r--r--pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix8
-rw-r--r--pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix9
-rw-r--r--pkgs/desktops/gnome-2/platform/libgnomecups/default.nix7
-rw-r--r--pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix5
-rw-r--r--pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix9
-rw-r--r--pkgs/desktops/gnome-2/platform/libgnomeui/default.nix8
-rw-r--r--pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix9
-rw-r--r--pkgs/desktops/gnome/core/eog/default.nix7
-rw-r--r--pkgs/desktops/gnome/core/eog/fix-gir-lib-path.patch13
-rw-r--r--pkgs/desktops/gnome/default.nix2
-rw-r--r--pkgs/desktops/gnome/extensions/arcmenu/default.nix4
-rw-r--r--pkgs/desktops/gnome/extensions/default.nix2
-rw-r--r--pkgs/desktops/gnome/extensions/system-monitor/default.nix35
-rw-r--r--pkgs/desktops/pantheon/apps/elementary-code/default.nix14
-rw-r--r--pkgs/desktops/pantheon/default.nix2
-rw-r--r--pkgs/desktops/plasma-5/default.nix2
-rw-r--r--pkgs/desktops/plasma-5/fetch.sh2
-rw-r--r--pkgs/desktops/plasma-5/kscreen.nix4
-rw-r--r--pkgs/desktops/plasma-5/srcs.nix428
-rw-r--r--pkgs/desktops/xfce/default.nix2
-rw-r--r--pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix7
-rw-r--r--pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix6
-rw-r--r--pkgs/development/compilers/gcc/10/default.nix13
-rw-r--r--pkgs/development/compilers/gcc/10/gcc10-asan-glibc-2.34.patch70
-rw-r--r--pkgs/development/compilers/gcc/11/default.nix9
-rw-r--r--pkgs/development/compilers/gcc/4.8/default.nix9
-rw-r--r--pkgs/development/compilers/gcc/4.9/default.nix9
-rw-r--r--pkgs/development/compilers/gcc/6/default.nix10
-rw-r--r--pkgs/development/compilers/gcc/6/gnat-glibc234.patch30
-rw-r--r--pkgs/development/compilers/gcc/7/default.nix12
-rw-r--r--pkgs/development/compilers/gcc/7/gcc8-asan-glibc-2.34.patch70
-rw-r--r--pkgs/development/compilers/gcc/8/default.nix9
-rw-r--r--pkgs/development/compilers/gcc/9/default.nix16
-rw-r--r--pkgs/development/compilers/gcc/9/gcc9-asan-glibc-2.34.patch70
-rw-r--r--pkgs/development/compilers/gcc/builder.sh4
-rw-r--r--pkgs/development/compilers/go/1.17.nix4
-rw-r--r--pkgs/development/compilers/julia/1.6-bin.nix4
-rw-r--r--pkgs/development/compilers/llvm/multi.nix4
-rw-r--r--pkgs/development/compilers/ocaml/4.10.nix3
-rw-r--r--pkgs/development/compilers/ocaml/4.11.nix3
-rw-r--r--pkgs/development/compilers/ocaml/4.12.nix5
-rw-r--r--pkgs/development/compilers/ocaml/Makefile.nixpkgs16
-rw-r--r--pkgs/development/compilers/ocaml/generic.nix26
-rw-r--r--pkgs/development/compilers/ocaml/glibc-2.34-for-ocaml-4.10-and-11.patch37
-rw-r--r--pkgs/development/compilers/openjdk/11.nix1
-rw-r--r--pkgs/development/compilers/openjdk/16.nix1
-rw-r--r--pkgs/development/compilers/openjdk/fix-glibc-2.34.patch24
-rw-r--r--pkgs/development/compilers/polyml/5.6.nix10
-rw-r--r--pkgs/development/compilers/polyml/5.7.nix12
-rw-r--r--pkgs/development/compilers/polyml/default.nix8
-rw-r--r--pkgs/development/compilers/rust/1_59.nix (renamed from pkgs/development/compilers/rust/1_58.nix)31
-rw-r--r--pkgs/development/compilers/rust/binary.nix4
-rw-r--r--pkgs/development/compilers/rust/cargo.nix2
-rw-r--r--pkgs/development/compilers/rust/rustfmt.nix4
-rw-r--r--pkgs/development/coq-modules/aac-tactics/default.nix8
-rw-r--r--pkgs/development/coq-modules/coqprime/default.nix3
-rw-r--r--pkgs/development/coq-modules/relation-algebra/default.nix9
-rw-r--r--pkgs/development/embedded/platformio/core.nix3
-rw-r--r--pkgs/development/go-modules/generic/default.nix16
-rw-r--r--pkgs/development/go-packages/generic/default.nix13
-rw-r--r--pkgs/development/idris-modules/default.nix2
-rw-r--r--pkgs/development/interpreters/clojure/babashka.nix4
-rw-r--r--pkgs/development/interpreters/janet/default.nix4
-rw-r--r--pkgs/development/interpreters/maude/default.nix4
-rw-r--r--pkgs/development/interpreters/perl/default.nix5
-rw-r--r--pkgs/development/interpreters/python/default.nix10
-rwxr-xr-xpkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py18
-rw-r--r--pkgs/development/interpreters/ruby/rubygems/default.nix2
-rw-r--r--pkgs/development/interpreters/scsh/default.nix4
-rw-r--r--pkgs/development/libraries/SDL2/default.nix8
-rw-r--r--pkgs/development/libraries/SDL2/find-headers.patch34
-rw-r--r--pkgs/development/libraries/aspell/default.nix21
-rw-r--r--pkgs/development/libraries/avahi/default.nix6
-rw-r--r--pkgs/development/libraries/avro-c/default.nix4
-rw-r--r--pkgs/development/libraries/boost/1.69.nix2
-rw-r--r--pkgs/development/libraries/boost/1.70.nix2
-rw-r--r--pkgs/development/libraries/boost/1.72.nix2
-rw-r--r--pkgs/development/libraries/boost/pthread-stack-min-fix.patch15
-rw-r--r--pkgs/development/libraries/botan/default.nix17
-rw-r--r--pkgs/development/libraries/catch/default.nix6
-rw-r--r--pkgs/development/libraries/cpp-hocon/default.nix4
-rw-r--r--pkgs/development/libraries/cwiid/default.nix4
-rw-r--r--pkgs/development/libraries/cxxopts/default.nix4
-rw-r--r--pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch23
-rw-r--r--pkgs/development/libraries/cyrus-sasl/default.nix25
-rw-r--r--pkgs/development/libraries/cyrus-sasl/missing-size_t.patch13
-rw-r--r--pkgs/development/libraries/dav1d/default.nix6
-rw-r--r--pkgs/development/libraries/dotconf/default.nix2
-rw-r--r--pkgs/development/libraries/expat/default.nix5
-rw-r--r--pkgs/development/libraries/fltk/common.nix11
-rw-r--r--pkgs/development/libraries/gcc/libgcc/default.nix2
-rw-r--r--pkgs/development/libraries/gdcm/default.nix4
-rw-r--r--pkgs/development/libraries/ggz_base_libs/default.nix5
-rw-r--r--pkgs/development/libraries/glib/default.nix8
-rw-r--r--pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch131
-rw-r--r--pkgs/development/libraries/glibc/2.33-master.patch.gzbin155232 -> 0 bytes
-rw-r--r--pkgs/development/libraries/glibc/2.34-master.patch.gzbin0 -> 122816 bytes
-rw-r--r--pkgs/development/libraries/glibc/common.nix22
-rw-r--r--pkgs/development/libraries/glibc/default.nix11
-rw-r--r--pkgs/development/libraries/glibc/nix-locale-archive.patch45
-rw-r--r--pkgs/development/libraries/globalplatform/default.nix21
-rw-r--r--pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix21
-rw-r--r--pkgs/development/libraries/gmp/6.x.nix2
-rw-r--r--pkgs/development/libraries/grpc/default.nix4
-rw-r--r--pkgs/development/libraries/gtkmm/2.x.nix6
-rw-r--r--pkgs/development/libraries/hivex/default.nix4
-rw-r--r--pkgs/development/libraries/hspell/dicts.nix8
-rw-r--r--pkgs/development/libraries/http-parser/default.nix11
-rw-r--r--pkgs/development/libraries/igraph/default.nix11
-rw-r--r--pkgs/development/libraries/ijs/default.nix5
-rw-r--r--pkgs/development/libraries/isl/generic.nix3
-rw-r--r--pkgs/development/libraries/jcal/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/attica.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/baloo.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/bluez-qt.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/breeze-icons.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/default.nix7
-rw-r--r--pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/fetch.sh2
-rw-r--r--pkgs/development/libraries/kde-frameworks/frameworkintegration.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kactivities-stats.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kactivities.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kapidox.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/karchive.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kauth/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kbookmarks.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kcalendarcore.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kcmutils/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kcodecs.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kcompletion.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kconfig.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kcontacts.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kcoreaddons.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kcrash.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kdav.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kdbusaddons.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kdeclarative.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kded.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kdesu/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kdewebkit.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kdnssd.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kdoctools/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kemoticons.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kglobalaccel.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kguiaddons.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kholidays.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/khtml.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/ki18n.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kidletime.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kimageformats.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kinit/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kio/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kirigami2.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kitemmodels.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kitemviews.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kjobwidgets.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kjs.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kjsembed.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kmediaplayer.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/knewstuff/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/knotifications.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/knotifyconfig.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kpackage/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kparts.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kpeople.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kplotting.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kpty.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kquickcharts.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kross.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/krunner.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kservice/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/ktexteditor.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/ktextwidgets.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kunitconversion.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kwallet.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kwayland.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kxmlgui.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/plasma-framework.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/prison.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/purpose.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/solid.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/sonnet.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/srcs.nix664
-rw-r--r--pkgs/development/libraries/kde-frameworks/syndication.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks/threadweaver.nix2
-rw-r--r--pkgs/development/libraries/kerberos/krb5.nix2
-rw-r--r--pkgs/development/libraries/khronos-ocl-icd-loader/default.nix2
-rw-r--r--pkgs/development/libraries/languagemachines/frog.nix2
-rw-r--r--pkgs/development/libraries/languagemachines/frogdata.nix2
-rw-r--r--pkgs/development/libraries/languagemachines/libfolia.nix2
-rw-r--r--pkgs/development/libraries/languagemachines/mbt.nix2
-rw-r--r--pkgs/development/libraries/languagemachines/ticcutils.nix2
-rw-r--r--pkgs/development/libraries/languagemachines/timbl.nix2
-rw-r--r--pkgs/development/libraries/languagemachines/timblserver.nix2
-rw-r--r--pkgs/development/libraries/languagemachines/ucto.nix2
-rw-r--r--pkgs/development/libraries/languagemachines/uctodata.nix2
-rw-r--r--pkgs/development/libraries/leatherman/default.nix2
-rw-r--r--pkgs/development/libraries/libappindicator/default.nix4
-rw-r--r--pkgs/development/libraries/libcbor/default.nix4
-rw-r--r--pkgs/development/libraries/libcollectdclient/default.nix3
-rw-r--r--pkgs/development/libraries/libfido2/default.nix4
-rw-r--r--pkgs/development/libraries/libfive/default.nix1
-rw-r--r--pkgs/development/libraries/libinput/default.nix24
-rw-r--r--pkgs/development/libraries/libjpeg-turbo/default.nix4
-rw-r--r--pkgs/development/libraries/libnetfilter_conntrack/default.nix14
-rw-r--r--pkgs/development/libraries/libosmscout/default.nix2
-rw-r--r--pkgs/development/libraries/libowfat/default.nix3
-rw-r--r--pkgs/development/libraries/libressl/fix-build-with-glibc.patch92
-rw-r--r--pkgs/development/libraries/libsecret/default.nix35
-rw-r--r--pkgs/development/libraries/libspf2/default.nix10
-rw-r--r--pkgs/development/libraries/libusb1/default.nix14
-rw-r--r--pkgs/development/libraries/libuv/default.nix5
-rw-r--r--pkgs/development/libraries/libva/1.0.0.nix37
-rw-r--r--pkgs/development/libraries/libva/1.nix50
-rw-r--r--pkgs/development/libraries/libva/default.nix8
-rw-r--r--pkgs/development/libraries/libva/utils.nix6
-rw-r--r--pkgs/development/libraries/libwacom/default.nix4
-rw-r--r--pkgs/development/libraries/mesa/default.nix8
-rw-r--r--pkgs/development/libraries/mustache-hpp/default.nix6
-rw-r--r--pkgs/development/libraries/nghttp2/default.nix106
-rw-r--r--pkgs/development/libraries/nlopt/default.nix4
-rw-r--r--pkgs/development/libraries/notcurses/default.nix2
-rw-r--r--pkgs/development/libraries/nss/default.nix8
-rw-r--r--pkgs/development/libraries/openmpi/default.nix4
-rw-r--r--pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch12
-rw-r--r--pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch16
-rw-r--r--pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch13
-rw-r--r--pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch13
-rw-r--r--pkgs/development/libraries/openssl/chacha.nix82
-rw-r--r--pkgs/development/libraries/openssl/default.nix14
-rw-r--r--pkgs/development/libraries/polkit/default.nix6
-rw-r--r--pkgs/development/libraries/qt-5/5.12/default.nix14
-rw-r--r--pkgs/development/libraries/qt-5/5.14/default.nix14
-rw-r--r--pkgs/development/libraries/qt-5/5.15/default.nix6
-rw-r--r--pkgs/development/libraries/qt-5/modules/qtwayland-app_id.patch36
-rw-r--r--pkgs/development/libraries/rapidcheck/default.nix2
-rw-r--r--pkgs/development/libraries/recastnavigation/default.nix8
-rw-r--r--pkgs/development/libraries/seasocks/default.nix8
-rw-r--r--pkgs/development/libraries/soci/default.nix2
-rw-r--r--pkgs/development/libraries/spdlog/default.nix13
-rw-r--r--pkgs/development/libraries/sqlite/default.nix6
-rw-r--r--pkgs/development/libraries/sqlite/tools.nix4
-rw-r--r--pkgs/development/libraries/symengine/default.nix5
-rw-r--r--pkgs/development/libraries/wxwidgets/wxGTK28.nix2
-rw-r--r--pkgs/development/libraries/wxwidgets/wxGTK29.nix1
-rw-r--r--pkgs/development/libraries/wxwidgets/wxGTK30.nix5
-rw-r--r--pkgs/development/libraries/wxwidgets/wxGTK31.nix8
-rw-r--r--pkgs/development/libraries/wxwidgets/wxmac30.nix12
-rw-r--r--pkgs/development/libraries/zeroc-ice/3.6.nix59
-rw-r--r--pkgs/development/libraries/zeroc-ice/default.nix13
-rw-r--r--pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch20
-rw-r--r--pkgs/development/libraries/zlib/default.nix6
-rw-r--r--pkgs/development/libraries/zlib/disable-cygwin-widechar.patch13
-rw-r--r--pkgs/development/lua-modules/overrides.nix3
-rw-r--r--pkgs/development/misc/breakpad/default.nix5
-rw-r--r--pkgs/development/node-packages/default.nix5
-rw-r--r--pkgs/development/node-packages/node-packages.nix4989
-rw-r--r--pkgs/development/ocaml-modules/asn1-combinators/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/eliom/default.nix12
-rw-r--r--pkgs/development/ocaml-modules/ocsigen-server/default.nix8
-rw-r--r--pkgs/development/ocaml-modules/ocsigen-start/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/ocsipersist/default.nix20
-rw-r--r--pkgs/development/ocaml-modules/ocsipersist/lib.nix27
-rw-r--r--pkgs/development/ocaml-modules/ocsipersist/pgsql.nix24
-rw-r--r--pkgs/development/ocaml-modules/ocsipersist/sqlite.nix23
-rw-r--r--pkgs/development/ocaml-modules/sqlite3EZ/default.nix36
-rw-r--r--pkgs/development/ocaml-modules/torch/default.nix1
-rw-r--r--pkgs/development/python-modules/Cython/default.nix11
-rw-r--r--pkgs/development/python-modules/XlsxWriter/default.nix38
-rw-r--r--pkgs/development/python-modules/adafruit-platformdetect/default.nix4
-rw-r--r--pkgs/development/python-modules/adblock/default.nix8
-rw-r--r--pkgs/development/python-modules/afsapi/default.nix4
-rw-r--r--pkgs/development/python-modules/aioftp/default.nix4
-rw-r--r--pkgs/development/python-modules/aioguardian/default.nix4
-rw-r--r--pkgs/development/python-modules/aiohttp/default.nix4
-rw-r--r--pkgs/development/python-modules/aionotify/default.nix5
-rw-r--r--pkgs/development/python-modules/alembic/default.nix4
-rw-r--r--pkgs/development/python-modules/amazon-ion/default.nix36
-rw-r--r--pkgs/development/python-modules/ansi/default.nix28
-rw-r--r--pkgs/development/python-modules/ansi2html/default.nix5
-rw-r--r--pkgs/development/python-modules/anybadge/default.nix4
-rw-r--r--pkgs/development/python-modules/anyconfig/default.nix4
-rw-r--r--pkgs/development/python-modules/anyio/default.nix13
-rw-r--r--pkgs/development/python-modules/apache-airflow/default.nix4
-rw-r--r--pkgs/development/python-modules/apache-beam/default.nix4
-rw-r--r--pkgs/development/python-modules/approvaltests/default.nix4
-rw-r--r--pkgs/development/python-modules/apsw/default.nix8
-rw-r--r--pkgs/development/python-modules/arrow/default.nix4
-rw-r--r--pkgs/development/python-modules/asdf/default.nix4
-rw-r--r--pkgs/development/python-modules/astropy/default.nix4
-rw-r--r--pkgs/development/python-modules/async-lru/default.nix4
-rw-r--r--pkgs/development/python-modules/authcaptureproxy/default.nix4
-rw-r--r--pkgs/development/python-modules/autobahn/default.nix4
-rw-r--r--pkgs/development/python-modules/aws-adfs/default.nix4
-rw-r--r--pkgs/development/python-modules/awscrt/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-common/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-core/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-identity/default.nix5
-rw-r--r--pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix4
-rw-r--r--pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix2
-rw-r--r--pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix6
-rw-r--r--pkgs/development/python-modules/azure-servicebus/default.nix4
-rw-r--r--pkgs/development/python-modules/backports-zoneinfo/default.nix3
-rw-r--r--pkgs/development/python-modules/basemap/default.nix4
-rw-r--r--pkgs/development/python-modules/bc-python-hcl2/default.nix4
-rw-r--r--pkgs/development/python-modules/behave/default.nix4
-rw-r--r--pkgs/development/python-modules/bip_utils/default.nix4
-rw-r--r--pkgs/development/python-modules/bitbox02/default.nix4
-rw-r--r--pkgs/development/python-modules/bitcoin-price-api/default.nix24
-rw-r--r--pkgs/development/python-modules/bjoern/default.nix15
-rw-r--r--pkgs/development/python-modules/blessed/default.nix4
-rw-r--r--pkgs/development/python-modules/boto3/default.nix4
-rw-r--r--pkgs/development/python-modules/botocore/default.nix4
-rw-r--r--pkgs/development/python-modules/bottleneck/default.nix4
-rw-r--r--pkgs/development/python-modules/boxx/default.nix4
-rw-r--r--pkgs/development/python-modules/bsblan/default.nix15
-rw-r--r--pkgs/development/python-modules/buildbot/default.nix3
-rw-r--r--pkgs/development/python-modules/can/default.nix9
-rw-r--r--pkgs/development/python-modules/cattrs/default.nix8
-rw-r--r--pkgs/development/python-modules/cbor2/default.nix4
-rw-r--r--pkgs/development/python-modules/certbot/default.nix4
-rw-r--r--pkgs/development/python-modules/chalice/default.nix4
-rw-r--r--pkgs/development/python-modules/chiavdf/default.nix4
-rw-r--r--pkgs/development/python-modules/ciscoconfparse/default.nix1
-rw-r--r--pkgs/development/python-modules/click/default.nix4
-rw-r--r--pkgs/development/python-modules/clldutils/default.nix10
-rw-r--r--pkgs/development/python-modules/cma/default.nix4
-rw-r--r--pkgs/development/python-modules/cmd2/default.nix4
-rw-r--r--pkgs/development/python-modules/collections-extended/default.nix4
-rw-r--r--pkgs/development/python-modules/commoncode/default.nix7
-rw-r--r--pkgs/development/python-modules/construct/default.nix4
-rw-r--r--pkgs/development/python-modules/convertdate/default.nix17
-rw-r--r--pkgs/development/python-modules/coverage/default.nix4
-rw-r--r--pkgs/development/python-modules/cssselect2/default.nix10
-rw-r--r--pkgs/development/python-modules/cx_freeze/default.nix4
-rw-r--r--pkgs/development/python-modules/cyclonedx-python-lib/default.nix4
-rw-r--r--pkgs/development/python-modules/dask/default.nix4
-rw-r--r--pkgs/development/python-modules/datadog/default.nix10
-rw-r--r--pkgs/development/python-modules/datasets/default.nix4
-rw-r--r--pkgs/development/python-modules/datatable/default.nix12
-rw-r--r--pkgs/development/python-modules/deepdiff/default.nix9
-rw-r--r--pkgs/development/python-modules/detect-secrets/default.nix4
-rw-r--r--pkgs/development/python-modules/devtools/default.nix7
-rw-r--r--pkgs/development/python-modules/diff-cover/default.nix2
-rw-r--r--pkgs/development/python-modules/distributed/default.nix4
-rw-r--r--pkgs/development/python-modules/distro/default.nix4
-rw-r--r--pkgs/development/python-modules/django-appconf/default.nix45
-rw-r--r--pkgs/development/python-modules/django-raster/default.nix4
-rw-r--r--pkgs/development/python-modules/django-statici18n/default.nix4
-rw-r--r--pkgs/development/python-modules/django-widget-tweaks/default.nix41
-rw-r--r--pkgs/development/python-modules/django/1.10-gis-libs.template.patch24
-rw-r--r--pkgs/development/python-modules/django/2.nix39
-rw-r--r--pkgs/development/python-modules/django_appconf/default.nix35
-rw-r--r--pkgs/development/python-modules/django_compressor/default.nix4
-rw-r--r--pkgs/development/python-modules/django_contrib_comments/default.nix4
-rw-r--r--pkgs/development/python-modules/django_reversion/default.nix4
-rw-r--r--pkgs/development/python-modules/dm-haiku/default.nix4
-rw-r--r--pkgs/development/python-modules/dnspython/default.nix16
-rw-r--r--pkgs/development/python-modules/doit/default.nix7
-rw-r--r--pkgs/development/python-modules/dotmap/default.nix4
-rw-r--r--pkgs/development/python-modules/dunamai/default.nix4
-rw-r--r--pkgs/development/python-modules/dynalite-devices/default.nix4
-rw-r--r--pkgs/development/python-modules/easyprocess/default.nix4
-rw-r--r--pkgs/development/python-modules/entrypoints/default.nix29
-rw-r--r--pkgs/development/python-modules/faker/default.nix4
-rw-r--r--pkgs/development/python-modules/faraday-plugins/default.nix4
-rw-r--r--pkgs/development/python-modules/fasteners/default.nix37
-rw-r--r--pkgs/development/python-modules/filelock/default.nix4
-rw-r--r--pkgs/development/python-modules/findpython/default.nix53
-rw-r--r--pkgs/development/python-modules/flask-compress/default.nix34
-rw-r--r--pkgs/development/python-modules/flask-security-too/default.nix4
-rw-r--r--pkgs/development/python-modules/flask/default.nix4
-rw-r--r--pkgs/development/python-modules/fonttools/default.nix4
-rw-r--r--pkgs/development/python-modules/fs/default.nix4
-rw-r--r--pkgs/development/python-modules/ftfy/default.nix10
-rw-r--r--pkgs/development/python-modules/genshi/default.nix4
-rw-r--r--pkgs/development/python-modules/gidgethub/default.nix4
-rw-r--r--pkgs/development/python-modules/github3_py/default.nix4
-rw-r--r--pkgs/development/python-modules/goodwe/default.nix4
-rw-r--r--pkgs/development/python-modules/google-api-python-client/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-bigtable/default.nix4
-rw-r--r--pkgs/development/python-modules/google-cloud-secret-manager/default.nix8
-rw-r--r--pkgs/development/python-modules/graphql-relay/default.nix4
-rw-r--r--pkgs/development/python-modules/graphql-subscription-manager/default.nix4
-rw-r--r--pkgs/development/python-modules/graphviz/default.nix4
-rw-r--r--pkgs/development/python-modules/graspologic/default.nix4
-rw-r--r--pkgs/development/python-modules/grpcio-status/default.nix4
-rw-r--r--pkgs/development/python-modules/grpcio-tools/default.nix4
-rw-r--r--pkgs/development/python-modules/gssapi/default.nix4
-rw-r--r--pkgs/development/python-modules/gym/default.nix6
-rw-r--r--pkgs/development/python-modules/h11/default.nix4
-rw-r--r--pkgs/development/python-modules/hachoir/default.nix12
-rw-r--r--pkgs/development/python-modules/hahomematic/default.nix4
-rw-r--r--pkgs/development/python-modules/hass-nabucasa/default.nix3
-rw-r--r--pkgs/development/python-modules/hatasmota/default.nix4
-rw-r--r--pkgs/development/python-modules/hatchling/default.nix79
-rw-r--r--pkgs/development/python-modules/hg-git/default.nix20
-rw-r--r--pkgs/development/python-modules/hmmlearn/default.nix4
-rw-r--r--pkgs/development/python-modules/httpcore/default.nix11
-rw-r--r--pkgs/development/python-modules/httplib2/default.nix8
-rw-r--r--pkgs/development/python-modules/httptools/default.nix4
-rw-r--r--pkgs/development/python-modules/httpx/default.nix4
-rw-r--r--pkgs/development/python-modules/huggingface-hub/default.nix4
-rw-r--r--pkgs/development/python-modules/humanize/default.nix4
-rw-r--r--pkgs/development/python-modules/hypothesis/default.nix4
-rw-r--r--pkgs/development/python-modules/hypothesmith/default.nix6
-rw-r--r--pkgs/development/python-modules/hyppo/default.nix4
-rw-r--r--pkgs/development/python-modules/imageio/default.nix39
-rw-r--r--pkgs/development/python-modules/imageio/libgl-path.patch13
-rw-r--r--pkgs/development/python-modules/importlib-metadata/default.nix6
-rw-r--r--pkgs/development/python-modules/intbitset/default.nix25
-rw-r--r--pkgs/development/python-modules/intbitset/remove-impure-tuning.patch24
-rw-r--r--pkgs/development/python-modules/intensity-normalization/default.nix7
-rw-r--r--pkgs/development/python-modules/ipykernel/default.nix4
-rw-r--r--pkgs/development/python-modules/ipympl/default.nix4
-rw-r--r--pkgs/development/python-modules/ipython/default.nix4
-rw-r--r--pkgs/development/python-modules/itsdangerous/default.nix4
-rw-r--r--pkgs/development/python-modules/jaraco_itertools/default.nix5
-rw-r--r--pkgs/development/python-modules/jaraco_text/default.nix4
-rw-r--r--pkgs/development/python-modules/joblib/default.nix2
-rw-r--r--pkgs/development/python-modules/jsondiff/default.nix4
-rw-r--r--pkgs/development/python-modules/jsonpickle/default.nix4
-rw-r--r--pkgs/development/python-modules/jupyter-client/default.nix4
-rw-r--r--pkgs/development/python-modules/jupyter_core/default.nix35
-rw-r--r--pkgs/development/python-modules/jupyterlab-git/default.nix4
-rw-r--r--pkgs/development/python-modules/jupytext/default.nix6
-rw-r--r--pkgs/development/python-modules/karton-core/default.nix6
-rw-r--r--pkgs/development/python-modules/keepalive/default.nix1
-rw-r--r--pkgs/development/python-modules/keras/default.nix4
-rw-r--r--pkgs/development/python-modules/labelbox/default.nix6
-rw-r--r--pkgs/development/python-modules/lektor/default.nix79
-rw-r--r--pkgs/development/python-modules/levenshtein/default.nix4
-rw-r--r--pkgs/development/python-modules/libcst/default.nix21
-rw-r--r--pkgs/development/python-modules/libevdev/default.nix4
-rw-r--r--pkgs/development/python-modules/limits/default.nix4
-rw-r--r--pkgs/development/python-modules/lxml/default.nix4
-rw-r--r--pkgs/development/python-modules/lz4/default.nix17
-rw-r--r--pkgs/development/python-modules/magicgui/default.nix4
-rw-r--r--pkgs/development/python-modules/manticore/default.nix4
-rw-r--r--pkgs/development/python-modules/markupsafe/default.nix4
-rw-r--r--pkgs/development/python-modules/matrix-nio/default.nix1
-rw-r--r--pkgs/development/python-modules/md-toc/default.nix4
-rw-r--r--pkgs/development/python-modules/meshio/default.nix6
-rw-r--r--pkgs/development/python-modules/mezzanine/default.nix4
-rw-r--r--pkgs/development/python-modules/minio/default.nix4
-rw-r--r--pkgs/development/python-modules/mongoengine/default.nix9
-rw-r--r--pkgs/development/python-modules/moonraker-api/default.nix4
-rw-r--r--pkgs/development/python-modules/moto/default.nix272
-rw-r--r--pkgs/development/python-modules/msal-extensions/default.nix4
-rw-r--r--pkgs/development/python-modules/multidict/default.nix4
-rw-r--r--pkgs/development/python-modules/mutagen/default.nix65
-rw-r--r--pkgs/development/python-modules/mypy/default.nix8
-rw-r--r--pkgs/development/python-modules/napari/default.nix4
-rw-r--r--pkgs/development/python-modules/nassl/default.nix170
-rw-r--r--pkgs/development/python-modules/nats-py/default.nix6
-rw-r--r--pkgs/development/python-modules/nbclient/default.nix4
-rw-r--r--pkgs/development/python-modules/nbconvert/default.nix4
-rw-r--r--pkgs/development/python-modules/net2grid/default.nix4
-rw-r--r--pkgs/development/python-modules/networkx/default.nix4
-rw-r--r--pkgs/development/python-modules/nibabel/default.nix13
-rw-r--r--pkgs/development/python-modules/nilearn/default.nix4
-rw-r--r--pkgs/development/python-modules/nodeenv/default.nix9
-rw-r--r--pkgs/development/python-modules/nose-cover3/default.nix27
-rw-r--r--pkgs/development/python-modules/notebook/default.nix4
-rw-r--r--pkgs/development/python-modules/nplusone/default.nix3
-rw-r--r--pkgs/development/python-modules/numba/cuda_path.patch79
-rw-r--r--pkgs/development/python-modules/numba/default.nix37
-rw-r--r--pkgs/development/python-modules/numpydoc/default.nix4
-rw-r--r--pkgs/development/python-modules/nunavut/default.nix4
-rw-r--r--pkgs/development/python-modules/oauthlib/default.nix26
-rw-r--r--pkgs/development/python-modules/objax/default.nix4
-rw-r--r--pkgs/development/python-modules/onnx/default.nix4
-rw-r--r--pkgs/development/python-modules/openai/default.nix2
-rw-r--r--pkgs/development/python-modules/openapi-core/default.nix2
-rw-r--r--pkgs/development/python-modules/openapi-schema-validator/default.nix4
-rw-r--r--pkgs/development/python-modules/openapi-spec-validator/default.nix14
-rw-r--r--pkgs/development/python-modules/openshift/default.nix4
-rw-r--r--pkgs/development/python-modules/ordered-set/default.nix37
-rw-r--r--pkgs/development/python-modules/osc-lib/default.nix8
-rw-r--r--pkgs/development/python-modules/oslo-context/default.nix4
-rw-r--r--pkgs/development/python-modules/oslo-log/default.nix12
-rw-r--r--pkgs/development/python-modules/packageurl-python/default.nix4
-rw-r--r--pkgs/development/python-modules/pandas/default.nix4
-rw-r--r--pkgs/development/python-modules/parameterizedtestcase/default.nix1
-rw-r--r--pkgs/development/python-modules/parse-type/default.nix6
-rw-r--r--pkgs/development/python-modules/pathlib2/default.nix20
-rw-r--r--pkgs/development/python-modules/pdm-pep517/default.nix4
-rw-r--r--pkgs/development/python-modules/peewee/default.nix4
-rw-r--r--pkgs/development/python-modules/pelican/default.nix4
-rw-r--r--pkgs/development/python-modules/perfplot/default.nix4
-rw-r--r--pkgs/development/python-modules/pex/default.nix4
-rw-r--r--pkgs/development/python-modules/pgspecial/default.nix9
-rw-r--r--pkgs/development/python-modules/phonenumbers/default.nix4
-rw-r--r--pkgs/development/python-modules/pip/default.nix4
-rw-r--r--pkgs/development/python-modules/platformdirs/default.nix4
-rw-r--r--pkgs/development/python-modules/plotly/default.nix4
-rw-r--r--pkgs/development/python-modules/plumbum/default.nix8
-rw-r--r--pkgs/development/python-modules/poetry-core/default.nix4
-rw-r--r--pkgs/development/python-modules/pooch/default.nix5
-rw-r--r--pkgs/development/python-modules/portalocker/default.nix4
-rw-r--r--pkgs/development/python-modules/prettytable/default.nix4
-rw-r--r--pkgs/development/python-modules/prometheus-client/default.nix4
-rw-r--r--pkgs/development/python-modules/promise/default.nix5
-rw-r--r--pkgs/development/python-modules/prompt-toolkit/default.nix4
-rw-r--r--pkgs/development/python-modules/proto-plus/default.nix4
-rw-r--r--pkgs/development/python-modules/proxy-py/default.nix4
-rw-r--r--pkgs/development/python-modules/pybind11/default.nix4
-rw-r--r--pkgs/development/python-modules/pybluez/default.nix3
-rw-r--r--pkgs/development/python-modules/pycognito/default.nix10
-rw-r--r--pkgs/development/python-modules/pydmd/default.nix7
-rw-r--r--pkgs/development/python-modules/pyee/default.nix4
-rw-r--r--pkgs/development/python-modules/pyfaidx/default.nix4
-rw-r--r--pkgs/development/python-modules/pyfakefs/default.nix4
-rw-r--r--pkgs/development/python-modules/pygit2/default.nix4
-rw-r--r--pkgs/development/python-modules/pygls/default.nix3
-rw-r--r--pkgs/development/python-modules/pyhaversion/default.nix6
-rw-r--r--pkgs/development/python-modules/pyicu/default.nix4
-rw-r--r--pkgs/development/python-modules/pyisy/default.nix6
-rw-r--r--pkgs/development/python-modules/pylama/default.nix18
-rw-r--r--pkgs/development/python-modules/pylint-django/default.nix4
-rw-r--r--pkgs/development/python-modules/pymemcache/default.nix4
-rw-r--r--pkgs/development/python-modules/pymongo/default.nix4
-rw-r--r--pkgs/development/python-modules/pynetgear/default.nix6
-rw-r--r--pkgs/development/python-modules/pynndescent/default.nix10
-rw-r--r--pkgs/development/python-modules/pyomo/default.nix4
-rw-r--r--pkgs/development/python-modules/pyopengl-accelerate/default.nix2
-rw-r--r--pkgs/development/python-modules/pyopengl/default.nix4
-rw-r--r--pkgs/development/python-modules/pyownet/default.nix4
-rw-r--r--pkgs/development/python-modules/pypandoc/default.nix4
-rw-r--r--pkgs/development/python-modules/pyparsing/default.nix4
-rw-r--r--pkgs/development/python-modules/pypdf3/default.nix4
-rw-r--r--pkgs/development/python-modules/pyperf/default.nix4
-rw-r--r--pkgs/development/python-modules/pyplaato/default.nix4
-rw-r--r--pkgs/development/python-modules/pyres/default.nix19
-rw-r--r--pkgs/development/python-modules/pyrsistent/default.nix4
-rw-r--r--pkgs/development/python-modules/pyscss/default.nix6
-rw-r--r--pkgs/development/python-modules/pysigma/default.nix4
-rw-r--r--pkgs/development/python-modules/pysimplegui/default.nix4
-rw-r--r--pkgs/development/python-modules/pyspark/default.nix4
-rw-r--r--pkgs/development/python-modules/pyspnego/default.nix4
-rw-r--r--pkgs/development/python-modules/pytesseract/default.nix13
-rw-r--r--pkgs/development/python-modules/pytest-asyncio/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-cid/default.nix5
-rw-r--r--pkgs/development/python-modules/pytest-httpx/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-isort/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-mpl/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-mypy/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-pythonpath/default.nix26
-rw-r--r--pkgs/development/python-modules/pytest-regressions/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-runner/default.nix19
-rw-r--r--pkgs/development/python-modules/pytest-socket/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-subtests/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-testmon/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-timeout/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest/default.nix19
-rw-r--r--pkgs/development/python-modules/python-daemon/default.nix5
-rw-r--r--pkgs/development/python-modules/python-dbusmock/default.nix4
-rw-r--r--pkgs/development/python-modules/python-glanceclient/default.nix4
-rw-r--r--pkgs/development/python-modules/python-heatclient/default.nix4
-rw-r--r--pkgs/development/python-modules/python-ironicclient/default.nix4
-rw-r--r--pkgs/development/python-modules/python-kasa/default.nix6
-rw-r--r--pkgs/development/python-modules/python-manilaclient/default.nix4
-rw-r--r--pkgs/development/python-modules/python-slugify/default.nix4
-rw-r--r--pkgs/development/python-modules/python-snappy/default.nix18
-rw-r--r--pkgs/development/python-modules/python-swiftclient/default.nix4
-rw-r--r--pkgs/development/python-modules/python3-saml/default.nix4
-rw-r--r--pkgs/development/python-modules/pytomlpp/default.nix8
-rw-r--r--pkgs/development/python-modules/pytools/default.nix26
-rw-r--r--pkgs/development/python-modules/pytorch-lightning/default.nix8
-rw-r--r--pkgs/development/python-modules/pytorch-metric-learning/default.nix4
-rw-r--r--pkgs/development/python-modules/pytorch-pfn-extras/default.nix4
-rw-r--r--pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch13
-rw-r--r--pkgs/development/python-modules/pytorch/default.nix34
-rw-r--r--pkgs/development/python-modules/pyudev/default.nix4
-rw-r--r--pkgs/development/python-modules/pyuv/default.nix2
-rw-r--r--pkgs/development/python-modules/pyvcf/default.nix1
-rw-r--r--pkgs/development/python-modules/pyverilog/default.nix7
-rw-r--r--pkgs/development/python-modules/pyvesync/default.nix4
-rw-r--r--pkgs/development/python-modules/pywbem/default.nix4
-rw-r--r--pkgs/development/python-modules/pywebview/default.nix4
-rw-r--r--pkgs/development/python-modules/qiskit-machine-learning/default.nix4
-rw-r--r--pkgs/development/python-modules/qutip/default.nix116
-rw-r--r--pkgs/development/python-modules/rasterio/default.nix79
-rw-r--r--pkgs/development/python-modules/rdflib/default.nix50
-rw-r--r--pkgs/development/python-modules/readme_renderer/default.nix6
-rw-r--r--pkgs/development/python-modules/redis/default.nix4
-rw-r--r--pkgs/development/python-modules/regex/default.nix4
-rw-r--r--pkgs/development/python-modules/reportlab/default.nix4
-rw-r--r--pkgs/development/python-modules/requests-oauthlib/default.nix4
-rw-r--r--pkgs/development/python-modules/requests/default.nix2
-rw-r--r--pkgs/development/python-modules/respx/default.nix4
-rw-r--r--pkgs/development/python-modules/restructuredtext_lint/default.nix4
-rw-r--r--pkgs/development/python-modules/rich/default.nix8
-rw-r--r--pkgs/development/python-modules/robotstatuschecker/default.nix2
-rw-r--r--pkgs/development/python-modules/s3fs/default.nix4
-rw-r--r--pkgs/development/python-modules/sagemaker/default.nix4
-rw-r--r--pkgs/development/python-modules/sanic-testing/default.nix32
-rw-r--r--pkgs/development/python-modules/sanic-testing/tests.nix26
-rw-r--r--pkgs/development/python-modules/sanic/default.nix11
-rw-r--r--pkgs/development/python-modules/schema-salad/default.nix4
-rw-r--r--pkgs/development/python-modules/scikit-build/default.nix6
-rw-r--r--pkgs/development/python-modules/scikit-image/default.nix151
-rw-r--r--pkgs/development/python-modules/scipy/default.nix4
-rw-r--r--pkgs/development/python-modules/scmrepo/default.nix5
-rw-r--r--pkgs/development/python-modules/sentry-sdk/default.nix2
-rw-r--r--pkgs/development/python-modules/setuptools/default.nix5
-rw-r--r--pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch216
-rw-r--r--pkgs/development/python-modules/simple-salesforce/default.nix4
-rw-r--r--pkgs/development/python-modules/sip/default.nix4
-rw-r--r--pkgs/development/python-modules/smbprotocol/default.nix4
-rw-r--r--pkgs/development/python-modules/socksio/default.nix41
-rw-r--r--pkgs/development/python-modules/spacy-transformers/default.nix4
-rw-r--r--pkgs/development/python-modules/sphinx/default.nix2
-rw-r--r--pkgs/development/python-modules/spyder/default.nix4
-rw-r--r--pkgs/development/python-modules/sqlalchemy/default.nix4
-rw-r--r--pkgs/development/python-modules/sqlmap/default.nix4
-rw-r--r--pkgs/development/python-modules/sslyze/default.nix113
-rw-r--r--pkgs/development/python-modules/starlette/default.nix4
-rw-r--r--pkgs/development/python-modules/stone/default.nix29
-rw-r--r--pkgs/development/python-modules/stumpy/default.nix6
-rw-r--r--pkgs/development/python-modules/suds-jurko/default.nix1
-rw-r--r--pkgs/development/python-modules/sunpy/default.nix4
-rw-r--r--pkgs/development/python-modules/superqt/default.nix12
-rw-r--r--pkgs/development/python-modules/teletype/default.nix18
-rw-r--r--pkgs/development/python-modules/tempora/default.nix49
-rw-r--r--pkgs/development/python-modules/tensorboard/default.nix (renamed from pkgs/development/python-modules/tensorflow-tensorboard/default.nix)11
-rw-r--r--pkgs/development/python-modules/tensorboardx/default.nix6
-rw-r--r--pkgs/development/python-modules/tensorflow-datasets/default.nix4
-rw-r--r--pkgs/development/python-modules/tensorflow-estimator/default.nix4
-rw-r--r--pkgs/development/python-modules/tensorflow-metadata/build.patch9
-rw-r--r--pkgs/development/python-modules/tensorflow-metadata/default.nix9
-rw-r--r--pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix65
-rw-r--r--pkgs/development/python-modules/tensorflow/bin.nix6
-rw-r--r--pkgs/development/python-modules/tensorflow/default.nix71
-rw-r--r--pkgs/development/python-modules/tensorflow/system-protobuf.patch13
-rw-r--r--pkgs/development/python-modules/terminado/default.nix4
-rw-r--r--pkgs/development/python-modules/teslajsonpy/default.nix6
-rw-r--r--pkgs/development/python-modules/test-tube/default.nix4
-rw-r--r--pkgs/development/python-modules/testpath/default.nix10
-rw-r--r--pkgs/development/python-modules/tiledb/default.nix4
-rw-r--r--pkgs/development/python-modules/toggl-cli/default.nix4
-rw-r--r--pkgs/development/python-modules/tomli/default.nix29
-rw-r--r--pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch21
-rw-r--r--pkgs/development/python-modules/tomli/tests.nix21
-rw-r--r--pkgs/development/python-modules/tomlkit/default.nix4
-rw-r--r--pkgs/development/python-modules/torch-tb-profiler/default.nix4
-rw-r--r--pkgs/development/python-modules/tornado/5.nix3
-rw-r--r--pkgs/development/python-modules/towncrier/default.nix10
-rw-r--r--pkgs/development/python-modules/tpm2-pytss/default.nix4
-rw-r--r--pkgs/development/python-modules/tqdm/default.nix4
-rw-r--r--pkgs/development/python-modules/trio/default.nix44
-rw-r--r--pkgs/development/python-modules/trytond/default.nix4
-rw-r--r--pkgs/development/python-modules/tweepy/default.nix4
-rw-r--r--pkgs/development/python-modules/twilio/default.nix16
-rw-r--r--pkgs/development/python-modules/twine/default.nix4
-rw-r--r--pkgs/development/python-modules/txaio/default.nix4
-rw-r--r--pkgs/development/python-modules/typed-settings/default.nix4
-rw-r--r--pkgs/development/python-modules/typeguard/default.nix17
-rw-r--r--pkgs/development/python-modules/typing-extensions/default.nix4
-rw-r--r--pkgs/development/python-modules/typing-inspect/default.nix14
-rw-r--r--pkgs/development/python-modules/ufo2ft/default.nix4
-rw-r--r--pkgs/development/python-modules/unittest-xml-reporting/default.nix11
-rw-r--r--pkgs/development/python-modules/uproot/default.nix4
-rw-r--r--pkgs/development/python-modules/uvicorn/default.nix4
-rw-r--r--pkgs/development/python-modules/uvloop/default.nix8
-rw-r--r--pkgs/development/python-modules/virtualenv/default.nix4
-rw-r--r--pkgs/development/python-modules/wandb/default.nix4
-rw-r--r--pkgs/development/python-modules/watchdog/default.nix5
-rw-r--r--pkgs/development/python-modules/weasyprint/default.nix4
-rw-r--r--pkgs/development/python-modules/websocket-client/default.nix4
-rw-r--r--pkgs/development/python-modules/weconnect-mqtt/default.nix4
-rw-r--r--pkgs/development/python-modules/weconnect/default.nix8
-rw-r--r--pkgs/development/python-modules/werkzeug/default.nix4
-rw-r--r--pkgs/development/python-modules/wsproto/default.nix4
-rw-r--r--pkgs/development/python-modules/xarray/default.nix4
-rw-r--r--pkgs/development/python-modules/xgboost/default.nix3
-rw-r--r--pkgs/development/python-modules/xmlsec/default.nix10
-rw-r--r--pkgs/development/python-modules/xmltodict/default.nix15
-rw-r--r--pkgs/development/python-modules/xxhash/default.nix4
-rw-r--r--pkgs/development/python-modules/yq/default.nix4
-rw-r--r--pkgs/development/python-modules/zarr/default.nix4
-rw-r--r--pkgs/development/python-modules/zeep/default.nix9
-rw-r--r--pkgs/development/python-modules/zimports/default.nix4
-rw-r--r--pkgs/development/python-modules/zope_exceptions/default.nix4
-rw-r--r--pkgs/development/python-modules/zopfli/default.nix4
-rw-r--r--pkgs/development/python2-modules/pycairo/default.nix10
-rw-r--r--pkgs/development/r-modules/default.nix2
-rw-r--r--pkgs/development/r-modules/generic-builder.nix2
-rw-r--r--pkgs/development/tools/analysis/checkov/default.nix9
-rw-r--r--pkgs/development/tools/build-managers/cmake/default.nix4
-rw-r--r--pkgs/development/tools/build-managers/meson/default.nix8
-rw-r--r--pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch12
-rw-r--r--pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch100
-rw-r--r--pkgs/development/tools/build-managers/meson/fix-rpath.patch8
-rw-r--r--pkgs/development/tools/build-managers/qbs/default.nix4
-rw-r--r--pkgs/development/tools/buildpack/default.nix4
-rw-r--r--pkgs/development/tools/container-linux-config-transpiler/default.nix34
-rw-r--r--pkgs/development/tools/continuous-integration/buildkite-agent/default.nix8
-rw-r--r--pkgs/development/tools/database/indradb/default.nix9
-rw-r--r--pkgs/development/tools/database/prisma-engines/default.nix9
-rw-r--r--pkgs/development/tools/ddosify/default.nix4
-rw-r--r--pkgs/development/tools/deadcode/default.nix2
-rw-r--r--pkgs/development/tools/delve/default.nix2
-rw-r--r--pkgs/development/tools/documentation/doxygen/default.nix21
-rw-r--r--pkgs/development/tools/gauge/default.nix2
-rw-r--r--pkgs/development/tools/ginkgo/default.nix2
-rw-r--r--pkgs/development/tools/go-motion/default.nix1
-rw-r--r--pkgs/development/tools/gocode-gomod/default.nix2
-rw-r--r--pkgs/development/tools/gocode/default.nix1
-rw-r--r--pkgs/development/tools/gogetdoc/default.nix2
-rw-r--r--pkgs/development/tools/golint/default.nix2
-rw-r--r--pkgs/development/tools/gotools/default.nix4
-rw-r--r--pkgs/development/tools/govers/default.nix14
-rw-r--r--pkgs/development/tools/ineffassign/default.nix1
-rw-r--r--pkgs/development/tools/interfacer/default.nix31
-rw-r--r--pkgs/development/tools/interfacer/deps.nix29
-rw-r--r--pkgs/development/tools/kube-aws/default.nix36
-rw-r--r--pkgs/development/tools/kustomize/default.nix8
-rw-r--r--pkgs/development/tools/misc/gef/default.nix8
-rw-r--r--pkgs/development/tools/misc/gpshell/default.nix27
-rw-r--r--pkgs/development/tools/misc/grcov/default.nix6
-rw-r--r--pkgs/development/tools/misc/nix-bisect/default.nix44
-rw-r--r--pkgs/development/tools/misc/patchelf/default.nix4
-rw-r--r--pkgs/development/tools/misc/patchelf/unstable.nix14
-rw-r--r--pkgs/development/tools/misc/texinfo/6.8.nix4
-rw-r--r--pkgs/development/tools/misc/texinfo/common.nix4
-rw-r--r--pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch186
-rw-r--r--pkgs/development/tools/neil/default.nix4
-rw-r--r--pkgs/development/tools/ocaml/utop/default.nix4
-rw-r--r--pkgs/development/tools/phantomjs2/default.nix3
-rw-r--r--pkgs/development/tools/reftools/default.nix2
-rw-r--r--pkgs/development/tools/rust/cargo-flash/default.nix6
-rw-r--r--pkgs/development/tools/rust/ograc/default.nix21
-rw-r--r--pkgs/development/tools/sentry-cli/default.nix6
-rw-r--r--pkgs/development/tools/skaffold/default.nix4
-rw-r--r--pkgs/development/tools/skopeo/default.nix5
-rw-r--r--pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix2
-rw-r--r--pkgs/development/tools/yq-go/default.nix2
-rw-r--r--pkgs/development/web/nodejs/v12.nix4
-rw-r--r--pkgs/games/bugdom/default.nix66
-rw-r--r--pkgs/games/cataclysm-dda/common.nix2
-rw-r--r--pkgs/games/nethack/default.nix11
-rw-r--r--pkgs/games/openmw/default.nix5
-rw-r--r--pkgs/games/steam/fhsenv.nix8
-rw-r--r--pkgs/misc/drivers/argononed/default.nix48
-rw-r--r--pkgs/misc/drivers/argononed/fix-hardcoded-reboot-poweroff-paths.patch18
-rw-r--r--pkgs/misc/ghostscript/default.nix4
-rw-r--r--pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix2
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix4
-rw-r--r--pkgs/os-specific/linux/apfs/default.nix6
-rw-r--r--pkgs/os-specific/linux/apparmor/default.nix30
-rw-r--r--pkgs/os-specific/linux/autofs/default.nix13
-rw-r--r--pkgs/os-specific/linux/busybox/default.nix10
-rw-r--r--pkgs/os-specific/linux/conky/default.nix6
-rw-r--r--pkgs/os-specific/linux/cryptsetup/default.nix8
-rw-r--r--pkgs/os-specific/linux/ell/default.nix4
-rw-r--r--pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix5
-rw-r--r--pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix2
-rw-r--r--pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix2
-rw-r--r--pkgs/os-specific/linux/fuse/common.nix8
-rw-r--r--pkgs/os-specific/linux/iwd/default.nix5
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix8
-rw-r--r--pkgs/os-specific/linux/kernel/generate-config.pl2
-rw-r--r--pkgs/os-specific/linux/kmod/default.nix2
-rw-r--r--pkgs/os-specific/linux/kvdo/default.nix31
-rw-r--r--pkgs/os-specific/linux/libcap/default.nix11
-rw-r--r--pkgs/os-specific/linux/lvm2/common.nix7
-rw-r--r--pkgs/os-specific/linux/nftables/default.nix20
-rw-r--r--pkgs/os-specific/linux/pam_usb/default.nix6
-rw-r--r--pkgs/os-specific/linux/shadow/default.nix6
-rw-r--r--pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch4
-rw-r--r--pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch8
-rw-r--r--pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch10
-rw-r--r--pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch6
-rw-r--r--pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch18
-rw-r--r--pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch8
-rw-r--r--pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch10
-rw-r--r--pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch4
-rw-r--r--pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch22
-rw-r--r--pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch8
-rw-r--r--pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch12
-rw-r--r--pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch8
-rw-r--r--pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch6
-rw-r--r--pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch10
-rw-r--r--pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch6
-rw-r--r--pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch23
-rw-r--r--pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch6
-rw-r--r--pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch4
-rw-r--r--pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch14
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix280
-rw-r--r--pkgs/os-specific/linux/systemd/musl.diff12
-rw-r--r--pkgs/os-specific/linux/tiscamera/default.nix5
-rw-r--r--pkgs/os-specific/linux/util-linux/default.nix4
-rw-r--r--pkgs/os-specific/linux/vdo/default.nix64
-rw-r--r--pkgs/servers/echoip/default.nix2
-rw-r--r--pkgs/servers/home-assistant/default.nix12
-rw-r--r--pkgs/servers/http/trafficserver/default.nix3
-rw-r--r--pkgs/servers/imgproxy/default.nix2
-rw-r--r--pkgs/servers/mail/postfix/default.nix7
-rw-r--r--pkgs/servers/mattermost/default.nix6
-rw-r--r--pkgs/servers/memcached/default.nix4
-rw-r--r--pkgs/servers/misc/oven-media-engine/default.nix2
-rw-r--r--pkgs/servers/monitoring/grafana/default.nix2
-rw-r--r--pkgs/servers/monitoring/heapster/default.nix28
-rw-r--r--pkgs/servers/monitoring/munin/default.nix5
-rw-r--r--pkgs/servers/monitoring/prometheus/blackbox-exporter.nix15
-rw-r--r--pkgs/servers/monitoring/prometheus/mesos-exporter.nix23
-rw-r--r--pkgs/servers/monitoring/thanos/default.nix6
-rw-r--r--pkgs/servers/nosql/arangodb/default.nix10
-rw-r--r--pkgs/servers/owncast/default.nix2
-rw-r--r--pkgs/servers/rt/default.nix2
-rw-r--r--pkgs/servers/traefik/default.nix6
-rw-r--r--pkgs/servers/ursadb/default.nix8
-rwxr-xr-xpkgs/servers/web-apps/ethercalc/generate.sh1
-rw-r--r--pkgs/servers/web-apps/ethercalc/node-packages-generated.nix81
-rw-r--r--pkgs/servers/web-apps/ethercalc/node-packages.nix2
-rw-r--r--pkgs/servers/web-apps/whitebophir/default.nix5
-rwxr-xr-xpkgs/servers/web-apps/whitebophir/generate.sh6
-rw-r--r--pkgs/servers/web-apps/whitebophir/node-packages-generated.nix278
-rw-r--r--pkgs/servers/web-apps/whitebophir/node-packages.json2
-rw-r--r--pkgs/servers/xmpp/prosody/default.nix12
-rw-r--r--pkgs/shells/fish/plugins/fzf-fish.nix4
-rw-r--r--pkgs/shells/zsh/oh-my-zsh/default.nix6
-rw-r--r--pkgs/stdenv/generic/make-derivation.nix9
-rw-r--r--pkgs/stdenv/generic/setup.sh4
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools.nix3
-rw-r--r--pkgs/test/default.nix1
-rw-r--r--pkgs/tools/X11/obconf/default.nix2
-rw-r--r--pkgs/tools/X11/xnee/default.nix6
-rw-r--r--pkgs/tools/admin/awscli/default.nix4
-rw-r--r--pkgs/tools/admin/awscli2/default.nix5
-rw-r--r--pkgs/tools/admin/azure-cli/default.nix4
-rw-r--r--pkgs/tools/admin/azure-cli/python-packages.nix67
-rw-r--r--pkgs/tools/admin/eksctl/default.nix6
-rw-r--r--pkgs/tools/admin/intecture/agent.nix29
-rw-r--r--pkgs/tools/admin/intecture/auth.nix29
-rw-r--r--pkgs/tools/admin/intecture/cli.nix32
-rw-r--r--pkgs/tools/admin/pulumi/data.nix6
-rw-r--r--pkgs/tools/admin/trivy/default.nix6
-rw-r--r--pkgs/tools/audio/spotdl/default.nix4
-rw-r--r--pkgs/tools/compression/bzip2/default.nix4
-rw-r--r--pkgs/tools/filesystems/btrfs-progs/default.nix4
-rw-r--r--pkgs/tools/filesystems/buttersink/default.nix30
-rw-r--r--pkgs/tools/filesystems/djmount/default.nix8
-rw-r--r--pkgs/tools/filesystems/securefs/default.nix4
-rw-r--r--pkgs/tools/filesystems/xfsdump/default.nix59
-rw-r--r--pkgs/tools/inputmethods/ibus/default.nix4
-rw-r--r--pkgs/tools/misc/antimicrox/default.nix2
-rw-r--r--pkgs/tools/misc/aspcud/default.nix7
-rw-r--r--pkgs/tools/misc/chezmoi/default.nix6
-rw-r--r--pkgs/tools/misc/docui/default.nix2
-rw-r--r--pkgs/tools/misc/dsq/default.nix6
-rw-r--r--pkgs/tools/misc/ethtool/default.nix4
-rw-r--r--pkgs/tools/misc/findutils/default.nix2
-rw-r--r--pkgs/tools/misc/fontforge/default.nix20
-rw-r--r--pkgs/tools/misc/fzf/default.nix4
-rw-r--r--pkgs/tools/misc/gparted/default.nix4
-rw-r--r--pkgs/tools/misc/kisslicer/default.nix5
-rw-r--r--pkgs/tools/misc/logstash/6.x.nix6
-rw-r--r--pkgs/tools/misc/logstash/7.x.nix5
-rw-r--r--pkgs/tools/misc/mongodb-compass/default.nix4
-rw-r--r--pkgs/tools/misc/plantuml/default.nix4
-rw-r--r--pkgs/tools/misc/plfit/default.nix54
-rw-r--r--pkgs/tools/misc/pre-commit/default.nix119
-rw-r--r--pkgs/tools/misc/proxytunnel/default.nix22
-rw-r--r--pkgs/tools/misc/svtplay-dl/default.nix4
-rw-r--r--pkgs/tools/misc/teleconsole/default.nix41
-rw-r--r--pkgs/tools/misc/xvfb-run/default.nix62
-rwxr-xr-xpkgs/tools/misc/xvfb-run/update.sh21
-rw-r--r--pkgs/tools/networking/babeld/default.nix4
-rw-r--r--pkgs/tools/networking/curl/default.nix4
-rw-r--r--pkgs/tools/networking/eternal-terminal/default.nix7
-rw-r--r--pkgs/tools/networking/findomain/default.nix6
-rw-r--r--pkgs/tools/networking/gost/default.nix29
-rw-r--r--pkgs/tools/networking/modemmanager/default.nix4
-rw-r--r--pkgs/tools/networking/mosh/default.nix5
-rw-r--r--pkgs/tools/networking/nethogs/default.nix16
-rw-r--r--pkgs/tools/networking/ntp/default.nix5
-rw-r--r--pkgs/tools/networking/ntp/glibc-2.34-fix.patch28
-rw-r--r--pkgs/tools/networking/openconnect/default.nix4
-rw-r--r--pkgs/tools/networking/openssh/default.nix4
-rw-r--r--pkgs/tools/networking/smartdns/default.nix20
-rw-r--r--pkgs/tools/networking/unbound/default.nix20
-rw-r--r--pkgs/tools/package-management/nix/default.nix11
-rw-r--r--pkgs/tools/package-management/pdm/default.nix28
-rw-r--r--pkgs/tools/security/aeskeyfind/default.nix30
-rw-r--r--pkgs/tools/security/aws-okta/default.nix30
-rw-r--r--pkgs/tools/security/cipherscan/default.nix43
-rw-r--r--pkgs/tools/security/cosign/default.nix6
-rw-r--r--pkgs/tools/security/ffuf/default.nix4
-rw-r--r--pkgs/tools/security/fprintd/default.nix4
-rw-r--r--pkgs/tools/security/gobuster/default.nix2
-rw-r--r--pkgs/tools/security/pbis/default.nix70
-rw-r--r--pkgs/tools/security/vaultwarden/vault.nix4
-rw-r--r--pkgs/tools/security/wapiti/default.nix14
-rw-r--r--pkgs/tools/system/s-tui/default.nix18
-rw-r--r--pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch177
-rw-r--r--pkgs/tools/text/jumanpp/default.nix3
-rw-r--r--pkgs/tools/typesetting/tex/texlive/default.nix48
-rw-r--r--pkgs/tools/typesetting/tex/texlive/fixedHashes.nix1550
-rw-r--r--pkgs/tools/typesetting/tex/texlive/pkgs.nix3689
-rw-r--r--pkgs/tools/virtualization/awsebcli/default.nix17
-rw-r--r--pkgs/tools/virtualization/ovftool/default.nix230
-rw-r--r--pkgs/top-level/aliases.nix38
-rw-r--r--pkgs/top-level/all-packages.nix171
-rw-r--r--pkgs/top-level/config.nix18
-rw-r--r--pkgs/top-level/kodi-packages.nix2
-rw-r--r--pkgs/top-level/linux-kernels.nix4
-rw-r--r--pkgs/top-level/ocaml-packages.nix10
-rw-r--r--pkgs/top-level/perl-packages.nix2
-rw-r--r--pkgs/top-level/python-aliases.nix6
-rw-r--r--pkgs/top-level/python-packages.nix94
-rw-r--r--pkgs/top-level/release-python.nix11
-rw-r--r--pkgs/top-level/stage.nix2
1077 files changed, 17174 insertions, 13928 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 008d51b29aa43..07dfe176f49a0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -242,9 +242,8 @@
 
 # Docker tools
 /pkgs/build-support/docker                   @roberth
-/nixos/tests/docker-tools-overlay.nix        @roberth
-/nixos/tests/docker-tools.nix                @roberth
-/doc/builders/images/dockertools.xml         @roberth
+/nixos/tests/docker-tools*                   @roberth
+/doc/builders/images/dockertools.section.md  @roberth
 
 # Blockchains
 /pkgs/applications/blockchains  @mmahut @RaghavSood
diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md
index 411205d08e430..9c67a514335ed 100644
--- a/doc/languages-frameworks/go.section.md
+++ b/doc/languages-frameworks/go.section.md
@@ -142,4 +142,8 @@ Removes the pre-existing vendor directory. This should only be used if the depen
 
 ### `subPackages` {#var-go-subPackages}
 
-Limits the builder from building child packages that have not been listed. If `subPackages` is not specified, all child packages will be built.
+Specified as a string or list of strings. Limits the builder from building child packages that have not been listed. If `subPackages` is not specified, all child packages will be built.
+
+### `excludedPackages` {#var-go-excludedPackages}
+
+Specified as a string or list of strings. Causes the builder to skip building child packages that match any of the provided values. If `excludedPackages` is not specified, all child packages will be built.
diff --git a/lib/modules.nix b/lib/modules.nix
index 894104cc57907..abcdd1a894cca 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -46,6 +46,7 @@ let
     showFiles
     showOption
     unknownModule
+    literalExpression
     ;
 
   showDeclPrefix = loc: decl: prefix:
@@ -140,7 +141,7 @@ rec {
       # this module is used, to avoid conflicts and allow chaining of
       # extendModules.
       internalModule = rec {
-        _file = ./modules.nix;
+        _file = "lib/modules.nix";
 
         key = _file;
 
@@ -153,8 +154,91 @@ rec {
             # a `_module.args.pkgs = import (fetchTarball { ... }) {}` won't
             # start a download when `pkgs` wasn't evaluated.
             type = types.lazyAttrsOf types.raw;
-            internal = true;
-            description = "Arguments passed to each module.";
+            # Only render documentation once at the root of the option tree,
+            # not for all individual submodules.
+            internal = prefix != [];
+            # TODO: Change the type of this option to a submodule with a
+            # freeformType, so that individual arguments can be documented
+            # separately
+            description = ''
+              Additional arguments passed to each module in addition to ones
+              like <literal>lib</literal>, <literal>config</literal>,
+              and <literal>pkgs</literal>, <literal>modulesPath</literal>.
+              </para>
+              <para>
+              This option is also available to all submodules. Submodules do not
+              inherit args from their parent module, nor do they provide args to
+              their parent module or sibling submodules. The sole exception to
+              this is the argument <literal>name</literal> which is provided by
+              parent modules to a submodule and contains the attribute name
+              the submodule is bound to, or a unique generated name if it is
+              not bound to an attribute.
+              </para>
+              <para>
+              Some arguments are already passed by default, of which the
+              following <emphasis>cannot</emphasis> be changed with this option:
+              <itemizedlist>
+               <listitem>
+                <para>
+                 <varname>lib</varname>: The nixpkgs library.
+                </para>
+               </listitem>
+               <listitem>
+                <para>
+                 <varname>config</varname>: The results of all options after merging the values from all modules together.
+                </para>
+               </listitem>
+               <listitem>
+                <para>
+                 <varname>options</varname>: The options declared in all modules.
+                </para>
+               </listitem>
+               <listitem>
+                <para>
+                 <varname>specialArgs</varname>: The <literal>specialArgs</literal> argument passed to <literal>evalModules</literal>.
+                </para>
+               </listitem>
+               <listitem>
+                <para>
+                 All attributes of <varname>specialArgs</varname>
+                </para>
+                <para>
+                 Whereas option values can generally depend on other option values
+                 thanks to laziness, this does not apply to <literal>imports</literal>, which
+                 must be computed statically before anything else.
+                </para>
+                <para>
+                 For this reason, callers of the module system can provide <literal>specialArgs</literal>
+                 which are available during import resolution.
+                </para>
+                <para>
+                 For NixOS, <literal>specialArgs</literal> includes
+                 <varname>modulesPath</varname>, which allows you to import
+                 extra modules from the nixpkgs package tree without having to
+                 somehow make the module aware of the location of the
+                 <literal>nixpkgs</literal> or NixOS directories.
+              <programlisting>
+              { modulesPath, ... }: {
+                imports = [
+                  (modulesPath + "/profiles/minimal.nix")
+                ];
+              }
+              </programlisting>
+                </para>
+               </listitem>
+              </itemizedlist>
+              </para>
+              <para>
+              For NixOS, the default value for this option includes at least this argument:
+              <itemizedlist>
+               <listitem>
+                <para>
+                 <varname>pkgs</varname>: The nixpkgs package set according to
+                 the <option>nixpkgs.pkgs</option> option.
+                </para>
+               </listitem>
+              </itemizedlist>
+            '';
           };
 
           _module.check = mkOption {
diff --git a/lib/strings.nix b/lib/strings.nix
index d34263c994948..820d1901f945b 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -756,7 +756,14 @@ rec {
        sanitizeDerivationName pkgs.hello
        => "-nix-store-2g75chlbpxlrqn15zlby2dfh8hr9qwbk-hello-2.10"
   */
-  sanitizeDerivationName = string: lib.pipe string [
+  sanitizeDerivationName =
+  let okRegex = match "[[:alnum:]+_?=-][[:alnum:]+._?=-]*";
+  in
+  string:
+  # First detect the common case of already valid strings, to speed those up
+  if stringLength string <= 207 && okRegex string != null
+  then unsafeDiscardStringContext string
+  else lib.pipe string [
     # Get rid of string context. This is safe under the assumption that the
     # resulting string is only used as a derivation name
     unsafeDiscardStringContext
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 1eb2d953ebbe9..9012bba2b5675 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -649,6 +649,11 @@ runTests {
     expected = "foo";
   };
 
+  testSanitizeDerivationNameUnicode = testSanitizeDerivationName {
+    name = "fö";
+    expected = "f-";
+  };
+
   testSanitizeDerivationNameAscii = testSanitizeDerivationName {
     name = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
     expected = "-+--.-0123456789-=-?-ABCDEFGHIJKLMNOPQRSTUVWXYZ-_-abcdefghijklmnopqrstuvwxyz-";
@@ -691,7 +696,7 @@ runTests {
 
         locs = filter (o: ! o.internal) (optionAttrSetToDocList options);
       in map (o: o.loc) locs;
-    expected = [ [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ];
+    expected = [ [ "_module" "args" ] [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ];
   };
 
   testCartesianProductOfEmptySet = {
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3412e2e03cc65..d0d012856d657 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5423,6 +5423,12 @@
     githubId = 41924494;
     name = "Ivar";
   };
+  iwanb = {
+    email = "tracnar@gmail.com";
+    github = "iwanb";
+    githubId = 4035835;
+    name = "Iwan";
+  };
   ixmatus = {
     email = "parnell@digitalmentat.com";
     github = "ixmatus";
@@ -8258,6 +8264,17 @@
     githubId = 1776903;
     name = "Andrew Abbott";
   };
+  misterio77 = {
+    email = "eu@misterio.me";
+    github = "misterio77";
+    githubId = 5727578;
+    matrix = "@misterio:matrix.org";
+    name = "Gabriel Fontes";
+    keys = [{
+      longkeyid = "rsa3072/0x245CAB70B4C225E9";
+      fingerprint = "7088 C742 1873 E0DB 97FF  17C2 245C AB70 B4C2 25E9";
+    }];
+  };
   mitchmindtree = {
     email = "mail@mitchellnordine.com";
     github = "mitchmindtree";
@@ -11123,6 +11140,16 @@
     email = "schristopher@konputa.com";
     name = "Scott Christopher";
   };
+  sciencentistguy = {
+    email = "jamie@quigley.xyz";
+    name = "Jamie Quigley";
+    github = "Sciencentistguy";
+    githubId = 4983935;
+    keys = [{
+      longkeyid = "rsa2048/0x8E8FF66E2AE8D970";
+      fingerprint = "30BB FF3F AB0B BB3E 0435  F83C 8E8F F66E 2AE8 D970";
+    }];
+};
   scode = {
     email = "peter.schuller@infidyne.com";
     github = "scode";
diff --git a/maintainers/scripts/dep-licenses.sh b/maintainers/scripts/dep-licenses.sh
index 28ad22c334fc1..816dcf6d7f768 100755
--- a/maintainers/scripts/dep-licenses.sh
+++ b/maintainers/scripts/dep-licenses.sh
@@ -9,7 +9,7 @@ tmp=$(mktemp --tmpdir -d nixpkgs-dep-license.XXXXXX)
 exitHandler() {
     exitCode=$?
     rm -rf "$tmp"
-    exit $exitCode
+    return $exitCode
 }
 
 trap "exitHandler" EXIT
diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py
index 017e3ac758ac2..3cfdb1387053d 100644
--- a/maintainers/scripts/pluginupdate.py
+++ b/maintainers/scripts/pluginupdate.py
@@ -8,6 +8,7 @@
 # $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py
 
 import argparse
+import csv
 import functools
 import http
 import json
@@ -28,7 +29,7 @@ from pathlib import Path
 from typing import Dict, List, Optional, Tuple, Union, Any, Callable
 from urllib.parse import urljoin, urlparse
 from tempfile import NamedTemporaryFile
-from dataclasses import dataclass
+from dataclasses import dataclass, asdict
 
 import git
 
@@ -85,21 +86,30 @@ def make_request(url: str, token=None) -> urllib.request.Request:
         headers["Authorization"] = f"token {token}"
     return urllib.request.Request(url, headers=headers)
 
+
+Redirects = Dict['Repo', 'Repo']
+
 class Repo:
     def __init__(
-        self, uri: str, branch: str, alias: Optional[str]
+        self, uri: str, branch: str
     ) -> None:
         self.uri = uri
         '''Url to the repo'''
-        self.branch = branch
-        self.alias = alias
-        self.redirect: Dict[str, str] = {}
+        self._branch = branch
+        # {old_uri: new_uri}
+        self.redirect: Redirects = {}
         self.token = "dummy_token"
 
     @property
     def name(self):
         return self.uri.split('/')[-1]
 
+    @property
+    def branch(self):
+        return self._branch or "HEAD"
+
+    def __str__(self) -> str:
+        return f"{self.uri}"
     def __repr__(self) -> str:
         return f"Repo({self.name}, {self.uri})"
 
@@ -109,6 +119,7 @@ class Repo:
 
     @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
     def latest_commit(self) -> Tuple[str, datetime]:
+        log.debug("Latest commit")
         loaded = self._prefetch(None)
         updated = datetime.strptime(loaded['date'], "%Y-%m-%dT%H:%M:%S%z")
 
@@ -124,6 +135,7 @@ class Repo:
         return loaded
 
     def prefetch(self, ref: Optional[str]) -> str:
+        print("Prefetching")
         loaded = self._prefetch(ref)
         return loaded["sha256"]
 
@@ -137,21 +149,22 @@ class Repo:
 
 class RepoGitHub(Repo):
     def __init__(
-        self, owner: str, repo: str, branch: str, alias: Optional[str]
+        self, owner: str, repo: str, branch: str
     ) -> None:
         self.owner = owner
         self.repo = repo
         self.token = None
         '''Url to the repo'''
-        super().__init__(self.url(""), branch, alias)
-        log.debug("Instantiating github repo %s/%s", self.owner, self.repo)
+        super().__init__(self.url(""), branch)
+        log.debug("Instantiating github repo owner=%s and repo=%s", self.owner, self.repo)
 
     @property
     def name(self):
         return self.repo
 
     def url(self, path: str) -> str:
-        return urljoin(f"https://github.com/{self.owner}/{self.name}/", path)
+        res = urljoin(f"https://github.com/{self.owner}/{self.repo}/", path)
+        return res
 
     @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
     def has_submodules(self) -> bool:
@@ -168,6 +181,7 @@ class RepoGitHub(Repo):
     @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
     def latest_commit(self) -> Tuple[str, datetime]:
         commit_url = self.url(f"commits/{self.branch}.atom")
+        log.debug("Sending request to %s", commit_url)
         commit_req = make_request(commit_url, self.token)
         with urllib.request.urlopen(commit_req, timeout=10) as req:
             self._check_for_redirect(commit_url, req)
@@ -191,12 +205,9 @@ class RepoGitHub(Repo):
             new_owner, new_name = (
                 urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2]
             )
-            end_line = "\n" if self.alias is None else f" as {self.alias}\n"
-            plugin_line = "{owner}/{name}" + end_line
 
-            old_plugin = plugin_line.format(owner=self.owner, name=self.name)
-            new_plugin = plugin_line.format(owner=new_owner, name=new_name)
-            self.redirect[old_plugin] = new_plugin
+            new_repo = RepoGitHub(owner=new_owner, repo=new_name, branch=self.branch)
+            self.redirect[self] = new_repo
 
 
     def prefetch(self, commit: str) -> str:
@@ -207,9 +218,9 @@ class RepoGitHub(Repo):
         return sha256
 
     def prefetch_github(self, ref: str) -> str:
-        data = subprocess.check_output(
-            ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")]
-        )
+        cmd = ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")]
+        log.debug("Running %s", cmd)
+        data = subprocess.check_output(cmd)
         return data.strip().decode("utf-8")
 
     def as_nix(self, plugin: "Plugin") -> str:
@@ -239,21 +250,38 @@ class PluginDesc:
         else:
             return self.alias
 
+    def __lt__(self, other):
+        return self.repo.name < other.repo.name
+
+    @staticmethod
+    def load_from_csv(config: FetchConfig, row: Dict[str, str]) -> 'PluginDesc':
+        branch = row["branch"]
+        repo = make_repo(row['repo'], branch.strip())
+        repo.token = config.github_token
+        return PluginDesc(repo, branch.strip(), row["alias"])
+
+
+    @staticmethod
+    def load_from_string(config: FetchConfig, line: str) -> 'PluginDesc':
+        branch = "HEAD"
+        alias = None
+        uri = line
+        if " as " in uri:
+            uri, alias = uri.split(" as ")
+            alias = alias.strip()
+        if "@" in uri:
+            uri, branch = uri.split("@")
+        repo = make_repo(uri.strip(), branch.strip())
+        repo.token = config.github_token
+        return PluginDesc(repo, branch.strip(), alias)
 
+@dataclass
 class Plugin:
-    def __init__(
-        self,
-        name: str,
-        commit: str,
-        has_submodules: bool,
-        sha256: str,
-        date: Optional[datetime] = None,
-    ) -> None:
-        self.name = name
-        self.commit = commit
-        self.has_submodules = has_submodules
-        self.sha256 = sha256
-        self.date = date
+    name: str
+    commit: str
+    has_submodules: bool
+    sha256: str
+    date: Optional[datetime] = None
 
     @property
     def normalized_name(self) -> str:
@@ -270,6 +298,17 @@ class Plugin:
         return copy
 
 
+def load_plugins_from_csv(config: FetchConfig, input_file: Path,) -> List[PluginDesc]:
+    log.debug("Load plugins from csv %s", input_file)
+    plugins = []
+    with open(input_file, newline='') as csvfile:
+        log.debug("Writing into %s", input_file)
+        reader = csv.DictReader(csvfile,)
+        for line in reader:
+            plugin = PluginDesc.load_from_csv(config, line)
+            plugins.append(plugin)
+
+    return plugins
 
 class Editor:
     """The configuration of the update script."""
@@ -298,14 +337,8 @@ class Editor:
         return get_current_plugins(self)
 
     def load_plugin_spec(self, config: FetchConfig, plugin_file) -> List[PluginDesc]:
-        plugins = []
-        with open(plugin_file) as f:
-            for line in f:
-                if line.startswith("#"):
-                    continue
-                plugin = parse_plugin_line(config, line)
-                plugins.append(plugin)
-        return plugins
+        '''CSV spec'''
+        return load_plugins_from_csv(config, plugin_file)
 
     def generate_nix(self, plugins, outfile: str):
         '''Returns nothing for now, writes directly to outfile'''
@@ -316,11 +349,11 @@ class Editor:
         _prefetch = functools.partial(prefetch, cache=cache)
 
         def update() -> dict:
-            plugin_names = self.load_plugin_spec(config, input_file)
+            plugins = self.load_plugin_spec(config, input_file)
 
             try:
                 pool = Pool(processes=config.proc)
-                results = pool.map(_prefetch, plugin_names)
+                results = pool.map(_prefetch, plugins)
             finally:
                 cache.store()
 
@@ -423,6 +456,7 @@ def get_current_plugins(editor: Editor) -> List[Plugin]:
     data = json.loads(out)
     plugins = []
     for name, attr in data.items():
+        print("get_current_plugins: name %s" % name)
         p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])
         plugins.append(p)
     return plugins
@@ -431,7 +465,7 @@ def get_current_plugins(editor: Editor) -> List[Plugin]:
 def prefetch_plugin(
     p: PluginDesc,
     cache: "Optional[Cache]" = None,
-) -> Tuple[Plugin, Dict[str, str]]:
+) -> Tuple[Plugin, Redirects]:
     repo, branch, alias = p.repo, p.branch, p.alias
     name = alias or p.repo.name
     commit = None
@@ -454,11 +488,6 @@ def prefetch_plugin(
     )
 
 
-def fetch_plugin_from_pluginline(config: FetchConfig, plugin_line: str) -> Plugin:
-    plugin, _ = prefetch_plugin(parse_plugin_line(config, plugin_line))
-    return plugin
-
-
 def print_download_error(plugin: str, ex: Exception):
     print(f"{plugin}: {ex}", file=sys.stderr)
     ex_traceback = ex.__traceback__
@@ -468,14 +497,14 @@ def print_download_error(plugin: str, ex: Exception):
     ]
     print("\n".join(tb_lines))
 
-
 def check_results(
-    results: List[Tuple[PluginDesc, Union[Exception, Plugin], Dict[str, str]]]
-) -> Tuple[List[Tuple[PluginDesc, Plugin]], Dict[str, str]]:
+    results: List[Tuple[PluginDesc, Union[Exception, Plugin], Redirects]]
+) -> Tuple[List[Tuple[PluginDesc, Plugin]], Redirects]:
     ''' '''
     failures: List[Tuple[str, Exception]] = []
     plugins = []
-    redirects: Dict[str, str] = {}
+    # {old: new} plugindesc
+    redirects: Dict[Repo, Repo] = {}
     for (pdesc, result, redirect) in results:
         if isinstance(result, Exception):
             failures.append((pdesc.name, result))
@@ -495,31 +524,17 @@ def check_results(
 
         sys.exit(1)
 
-def make_repo(uri, branch, alias) -> Repo:
+def make_repo(uri: str, branch) -> Repo:
     '''Instantiate a Repo with the correct specialization depending on server (gitub spec)'''
     # dumb check to see if it's of the form owner/repo (=> github) or https://...
-    res = uri.split('/')
-    if len(res) <= 2:
-        repo = RepoGitHub(res[0], res[1], branch, alias)
+    res = urlparse(uri)
+    if res.netloc in [ "github.com", ""]:
+        res = res.path.strip('/').split('/')
+        repo = RepoGitHub(res[0], res[1], branch)
     else:
-        repo = Repo(uri.strip(), branch, alias)
+        repo = Repo(uri.strip(), branch)
     return repo
 
-def parse_plugin_line(config: FetchConfig, line: str) -> PluginDesc:
-    branch = "HEAD"
-    alias = None
-    uri = line
-    if " as " in uri:
-        uri, alias = uri.split(" as ")
-        alias = alias.strip()
-    if "@" in uri:
-        uri, branch = uri.split("@")
-
-    repo = make_repo(uri.strip(), branch.strip(), alias)
-    repo.token = config.github_token
-
-    return PluginDesc(repo, branch.strip(), alias)
-
 
 def get_cache_path(cache_file_name: str) -> Optional[Path]:
     xdg_cache = os.environ.get("XDG_CACHE_HOME", None)
@@ -585,27 +600,27 @@ def prefetch(
         return (pluginDesc, e, {})
 
 
+
 def rewrite_input(
     config: FetchConfig,
     input_file: Path,
     deprecated: Path,
-    redirects: Dict[str, str] = None,
-    append: Tuple = (),
+    # old pluginDesc and the new
+    redirects: Dict[PluginDesc, PluginDesc] = {},
+    append: List[PluginDesc] = [],
 ):
-    with open(input_file, "r") as f:
-        lines = f.readlines()
+    plugins = load_plugins_from_csv(config, input_file,)
 
-    lines.extend(append)
+    plugins.extend(append)
 
     if redirects:
-        lines = [redirects.get(line, line) for line in lines]
 
         cur_date_iso = datetime.now().strftime("%Y-%m-%d")
         with open(deprecated, "r") as f:
             deprecations = json.load(f)
         for old, new in redirects.items():
-            old_plugin = fetch_plugin_from_pluginline(config, old)
-            new_plugin = fetch_plugin_from_pluginline(config, new)
+            old_plugin, _ = prefetch_plugin(old)
+            new_plugin, _ = prefetch_plugin(new)
             if old_plugin.normalized_name != new_plugin.normalized_name:
                 deprecations[old_plugin.normalized_name] = {
                     "new": new_plugin.normalized_name,
@@ -615,10 +630,14 @@ def rewrite_input(
             json.dump(deprecations, f, indent=4, sort_keys=True)
             f.write("\n")
 
-    lines = sorted(lines, key=str.casefold)
-
     with open(input_file, "w") as f:
-        f.writelines(lines)
+        log.debug("Writing into %s", input_file)
+        # fields = dataclasses.fields(PluginDesc)
+        fieldnames = ['repo', 'branch', 'alias']
+        writer = csv.DictWriter(f, fieldnames, dialect='unix', quoting=csv.QUOTE_NONE)
+        writer.writeheader()
+        for plugin in sorted(plugins):
+            writer.writerow(asdict(plugin))
 
 
 def commit(repo: git.Repo, message: str, files: List[Path]) -> None:
@@ -660,9 +679,11 @@ def update_plugins(editor: Editor, args):
             )
 
     for plugin_line in args.add_plugins:
-        editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=(plugin_line + "\n",))
+        pdesc = PluginDesc.load_from_string(fetch_config, plugin_line)
+        append = [ pdesc ]
+        editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=append)
         update()
-        plugin = fetch_plugin_from_pluginline(fetch_config, plugin_line)
+        plugin, _ = prefetch_plugin(pdesc, )
         if autocommit:
             commit(
                 nixpkgs_repo,
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml
index f54f6129e0db9..910cad467e9d8 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml
@@ -866,6 +866,14 @@
           package.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          The vim/kakoune plugin updater now reads from a CSV file:
+          check
+          <literal>pkgs/applications/editors/vim/plugins/vim-plugin-names</literal>
+          out to see the new format
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
 </section>
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 38dd7b3894ddc..dc428b533e36d 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -70,6 +70,11 @@
       </listitem>
       <listitem>
         <para>
+          Systemd has been upgraded to the version 250.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <link xlink:href="https://kops.sigs.k8s.io"><literal>kops</literal></link>
           defaults to 1.22.4, which will enable
           <link xlink:href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html">Instance
@@ -446,6 +451,12 @@
       </listitem>
       <listitem>
         <para>
+          <literal>openssh</literal> has been update to 8.9p1, changing
+          the FIDO security key middleware interface.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <literal>services.k3s.enable</literal> no longer implies
           <literal>systemd.enableUnifiedCgroupHierarchy = false</literal>,
           and will default to the <quote>systemd</quote> cgroup driver
@@ -1512,9 +1523,11 @@
         <para>
           <link linkend="opt-programs.ssh.knownHosts">programs.ssh.knownHosts</link>
           has gained an <literal>extraHostNames</literal> option to
-          replace <literal>hostNames</literal>.
-          <literal>hostNames</literal> is deprecated, but still
-          available for now.
+          augment <literal>hostNames</literal>. It is now possible to
+          use the attribute name of a <literal>knownHosts</literal>
+          entry as the primary host name and specify secondary host
+          names using <literal>extraHostNames</literal> without having
+          to duplicate the primary host name.
         </para>
       </listitem>
       <listitem>
diff --git a/nixos/doc/manual/release-notes/rl-1803.section.md b/nixos/doc/manual/release-notes/rl-1803.section.md
index e4e467981047b..c5146015d4499 100644
--- a/nixos/doc/manual/release-notes/rl-1803.section.md
+++ b/nixos/doc/manual/release-notes/rl-1803.section.md
@@ -282,3 +282,5 @@ When upgrading from a previous release, please be aware of the following incompa
 - The NixOS test driver supports user services declared by `systemd.user.services`. The methods `waitForUnit`, `getUnitInfo`, `startJob` and `stopJob` provide an optional `$user` argument for that purpose.
 
 - Enabling bash completion on NixOS, `programs.bash.enableCompletion`, will now also enable completion for the Nix command line tools by installing the [nix-bash-completions](https://github.com/hedning/nix-bash-completions) package.
+
+- The vim/kakoune plugin updater now reads from a CSV file: check `pkgs/applications/editors/vim/plugins/vim-plugin-names` out to see the new format
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 82f1b97d5cbdd..b8b070bd6cf46 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -25,6 +25,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - systemd services can now set [systemd.services.\<name\>.reloadTriggers](#opt-systemd.services) instead of `reloadIfChanged` for a more granular distinction between reloads and restarts.
 
+- Systemd has been upgraded to the version 250.
+
 - [`kops`](https://kops.sigs.k8s.io) defaults to 1.22.4, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes 1.22. This will increase security by default, but may break some types of workloads. See the [release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) for details.
 
 - Module authors can use `mkRenamedOptionModuleWith` to automate the deprecation cycle without annoying out-of-tree module authors and their users.
@@ -143,6 +145,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading.
 
+- `openssh` has been update to 8.9p1, changing the FIDO security key middleware interface.
+
 - `services.k3s.enable` no longer implies `systemd.enableUnifiedCgroupHierarchy = false`, and will default to the 'systemd' cgroup driver when using `services.k3s.docker = true`.
   This change may require a reboot to take effect, and k3s may not be able to run if the boot cgroup hierarchy does not match its configuration.
   The previous behavior may be retained by explicitly setting `systemd.enableUnifiedCgroupHierarchy = false` in your configuration.
@@ -537,7 +541,9 @@ In addition to numerous new and upgraded packages, this release has the followin
   e.g. Wayland.
 
 - [programs.ssh.knownHosts](#opt-programs.ssh.knownHosts) has gained an `extraHostNames`
-  option to replace `hostNames`. `hostNames` is deprecated, but still available for now.
+  option to augment `hostNames`. It is now possible to use the attribute name of a `knownHosts`
+  entry as the primary host name and specify secondary host names using `extraHostNames` without
+  having to duplicate the primary host name.
 
 - The `services.stubby` module was converted to a [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration.
 
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 15302ae824144..e784ec9e67787 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -170,6 +170,7 @@ let format' = format; in let
       config.system.build.nixos-install
       config.system.build.nixos-enter
       nix
+      systemdMinimal
     ] ++ stdenv.initialPath);
 
   # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate
diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py
index 8e2ea322dc896..44a188a08c999 100644
--- a/nixos/lib/make-options-doc/mergeJSON.py
+++ b/nixos/lib/make-options-doc/mergeJSON.py
@@ -48,7 +48,9 @@ overrides = pivot(json.load(open(sys.argv[2 + optOffset], 'r')))
 
 # fix up declaration paths in lazy options, since we don't eval them from a full nixpkgs dir
 for (k, v) in options.items():
-    v.value['declarations'] = list(map(lambda s: f'nixos/modules/{s}', v.value['declarations']))
+    # The _module options are not declared in nixos/modules
+    if v.value['loc'][0] != "_module":
+        v.value['declarations'] = list(map(lambda s: f'nixos/modules/{s}', v.value['declarations']))
 
 # merge both descriptions
 for (k, v) in overrides.items():
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index b31fce9152404..75685de4f04e3 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -157,9 +157,13 @@ in
               default = [ name ] ++ config.extraHostNames;
               defaultText = literalExpression "[ ${name} ] ++ config.${options.extraHostNames}";
               description = ''
-                DEPRECATED, please use <literal>extraHostNames</literal>.
                 A list of host names and/or IP numbers used for accessing
-                the host's ssh service.
+                the host's ssh service. This list includes the name of the
+                containing <literal>knownHosts</literal> attribute by default
+                for convenience. If you wish to configure multiple host keys
+                for the same host use multiple <literal>knownHosts</literal>
+                entries with different attribute names and the same
+                <literal>hostNames</literal> list.
               '';
             };
             extraHostNames = mkOption {
@@ -167,7 +171,8 @@ in
               default = [];
               description = ''
                 A list of additional host names and/or IP numbers used for
-                accessing the host's ssh service.
+                accessing the host's ssh service. This list is ignored if
+                <literal>hostNames</literal> is set explicitly.
               '';
             };
             publicKey = mkOption {
@@ -198,7 +203,12 @@ in
           };
         }));
         description = ''
-          The set of system-wide known SSH hosts.
+          The set of system-wide known SSH hosts. To make simple setups more
+          convenient the name of an attribute in this set is used as a host name
+          for the entry. This behaviour can be disabled by setting
+          <literal>hostNames</literal> explicitly. You can use
+          <literal>extraHostNames</literal> to add additional host names without
+          disabling this default.
         '';
         example = literalExpression ''
           {
@@ -207,6 +217,10 @@ in
               publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
             };
             "myhost2.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILIRuJ8p1Fi+m6WkHV0KWnRfpM1WxoW8XAS+XvsSKsTK";
+            "myhost2.net/dsa" = {
+              hostNames = [ "myhost2.net" ];
+              publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub;
+            };
           }
         '';
       };
@@ -279,9 +293,6 @@ in
         message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
       });
 
-    warnings = mapAttrsToList (name: _: ''programs.ssh.knownHosts.${name}.hostNames is deprecated, use programs.ssh.knownHosts.${name}.extraHostNames'')
-      (filterAttrs (name: {hostNames, extraHostNames, ...}: hostNames != [ name ] ++ extraHostNames) cfg.knownHosts);
-
     # SSH configuration. Slight duplication of the sshd_config
     # generation in the sshd service.
     environment.etc."ssh/ssh_config".text =
diff --git a/nixos/modules/services/misc/ethminer.nix b/nixos/modules/services/misc/ethminer.nix
index a6c52e394996c..253476d1a23e5 100644
--- a/nixos/modules/services/misc/ethminer.nix
+++ b/nixos/modules/services/misc/ethminer.nix
@@ -97,7 +97,7 @@ in
         Restart = "always";
       };
 
-      environment = {
+      environment = mkIf (cfg.toolkit == "cuda") {
         LD_LIBRARY_PATH = "${config.boot.kernelPackages.nvidia_x11}/lib";
       };
 
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 4bc5b04d3a08b..a4d2d10af70f4 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -708,6 +708,14 @@ in
 
     systemd.packages = [ nixPackage ];
 
+    # Will only work once https://github.com/NixOS/nix/pull/6285 is merged
+    # systemd.tmpfiles.packages = [ nixPackage ];
+
+    # Can be dropped for Nix > https://github.com/NixOS/nix/pull/6285
+    systemd.tmpfiles.rules = [
+      "d /nix/var/nix/daemon-socket 0755 root root - -"
+    ];
+
     systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];
 
     systemd.services.nix-daemon =
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 7e96179b3cabf..a670551d9f3bf 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -267,11 +267,15 @@ in
       '' + ''
         ipfs --offline config show \
           | ${pkgs.jq}/bin/jq '. * $extraConfig' --argjson extraConfig ${
-              escapeShellArg (builtins.toJSON ({
-                Addresses.API = cfg.apiAddress;
-                Addresses.Gateway = cfg.gatewayAddress;
-                Addresses.Swarm = cfg.swarmAddress;
-              } // cfg.extraConfig))
+              escapeShellArg (builtins.toJSON (
+                recursiveUpdate
+                  {
+                    Addresses.API = cfg.apiAddress;
+                    Addresses.Gateway = cfg.gatewayAddress;
+                    Addresses.Swarm = cfg.swarmAddress;
+                  }
+                  cfg.extraConfig
+              ))
             } \
           | ipfs --offline config replace -
       '';
diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix
index 835b41d4ada94..4d455fdf7b2d5 100644
--- a/nixos/modules/services/x11/window-managers/qtile.nix
+++ b/nixos/modules/services/x11/window-managers/qtile.nix
@@ -7,19 +7,26 @@ let
 in
 
 {
-  options = {
-    services.xserver.windowManager.qtile.enable = mkEnableOption "qtile";
+  options.services.xserver.windowManager.qtile = {
+    enable = mkEnableOption "qtile";
+
+    package = mkPackageOption pkgs "qtile" { };
   };
 
   config = mkIf cfg.enable {
     services.xserver.windowManager.session = [{
       name = "qtile";
       start = ''
-        ${pkgs.qtile}/bin/qtile start &
+        ${cfg.package}/bin/qtile start &
         waitPID=$!
       '';
     }];
 
-    environment.systemPackages = [ pkgs.qtile ];
+    environment.systemPackages = [
+      # pkgs.qtile is currently a buildenv of qtile and its dependencies.
+      # For userland commands, we want the underlying package so that
+      # packages such as python don't bleed into userland and overwrite intended behavior.
+      (cfg.package.unwrapped or cfg.package)
+    ];
   };
 }
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 092b7b8863aed..1e9f870b32fb7 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -281,6 +281,8 @@ let
           "PrivateKeyFile"
           "ListenPort"
           "FirewallMark"
+          "RouteTable"
+          "RouteMetric"
         ])
         (assertInt "FirewallMark")
         (assertRange "FirewallMark" 1 4294967295)
@@ -296,6 +298,8 @@ let
           "AllowedIPs"
           "Endpoint"
           "PersistentKeepalive"
+          "RouteTable"
+          "RouteMetric"
         ])
         (assertInt "PersistentKeepalive")
         (assertRange "PersistentKeepalive" 0 65535)
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 8fcc1f029723e..3175836698091 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -232,7 +232,8 @@ done
 mkdir -p /lib
 ln -s @modulesClosure@/lib/modules /lib/modules
 ln -s @modulesClosure@/lib/firmware /lib/firmware
-echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe
+# see comment in stage-1.nix for explanation
+echo @extraUtils@/bin/modprobe-kernel > /proc/sys/kernel/modprobe
 for i in @kernelModules@; do
     info "loading module $(basename $i)..."
     modprobe $i
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 1bafec30b53d4..04753a6767d98 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -131,6 +131,26 @@ let
       copy_bin_and_libs ${pkgs.kmod}/bin/kmod
       ln -sf kmod $out/bin/modprobe
 
+      # Dirty hack to make sure the kernel properly loads modules
+      # such as ext4 on demand (e.g. on a `mount(2)` syscall). This is necessary
+      # because `kmod` isn't linked against `libpthread.so.0` anymore (since
+      # it was merged into `libc.so.6` since version `2.34`), but still needs
+      # to access it for some reason. This is not an issue in stage-1 itself
+      # because of the `LD_LIBRARY_PATH`-variable and anytime later because the rpath of
+      # kmod/modprobe points to glibc's `$out/lib` where `libpthread.so.6` exists.
+      # However, this is a problem when the kernel calls `modprobe` inside
+      # the initial ramdisk because it doesn't know about the
+      # `LD_LIBRARY_PATH` and the rpath was nuked.
+      #
+      # Also, we can't use `makeWrapper` here because `kmod` only does
+      # `modprobe` functionality if `argv[0] == "modprobe"`.
+      cat >$out/bin/modprobe-kernel <<EOF
+      #!$out/bin/ash
+      export LD_LIBRARY_PATH=$out/lib
+      exec $out/bin/modprobe "\$@"
+      EOF
+      chmod +x $out/bin/modprobe-kernel
+
       # Copy resize2fs if any ext* filesystems are to be resized
       ${optionalString (any (fs: fs.autoResize && (lib.hasPrefix "ext" fs.fsType)) fileSystems) ''
         # We need mke2fs in the initrd.
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 36a14d7a82565..c383486bb0bcc 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -108,7 +108,7 @@ let
 
   fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems;
 
-  fstab = pkgs.writeText "fstab" (lib.concatMapStringsSep "\n"
+  fstab = pkgs.writeText "initrd-fstab" (lib.concatMapStringsSep "\n"
     ({ fsType, mountPoint, device, options, autoFormat, autoResize, ... }@fs: let
         opts = options ++ optional autoFormat "x-systemd.makefs" ++ optional autoResize "x-systemd.growfs";
       in "${device} /sysroot${mountPoint} ${fsType} ${lib.concatStringsSep "," opts}") fileSystems);
@@ -128,11 +128,7 @@ let
     name = "initrd-emergency-env";
     paths = map getBin cfg.initrdBin;
     pathsToLink = ["/bin" "/sbin"];
-    # Make recovery easier
-    postBuild = ''
-      ln -s ${cfg.package.util-linux}/bin/mount $out/bin/
-      ln -s ${cfg.package.util-linux}/bin/umount $out/bin/
-    '';
+    postBuild = concatStringsSep "\n" (mapAttrsToList (n: v: "ln -s '${v}' $out/bin/'${n}'") cfg.extraBin);
   };
 
   initialRamdisk = pkgs.makeInitrdNG {
@@ -150,7 +146,7 @@ in {
     '';
 
     package = (mkPackageOption pkgs "systemd" {
-      default = "systemdMinimal";
+      default = "systemdStage1";
     }) // {
       visible = false;
     };
@@ -205,6 +201,19 @@ in {
       default = [];
     };
 
+    extraBin = mkOption {
+      description = ''
+        Tools to add to /bin
+      '';
+      example = literalExpression ''
+        {
+          umount = ''${pkgs.util-linux}/bin/umount;
+        }
+      '';
+      type = types.attrsOf types.path;
+      default = {};
+    };
+
     suppressedStorePaths = mkOption {
       description = ''
         Store paths specified in the storePaths option that
@@ -342,8 +351,15 @@ in {
 
   config = mkIf (config.boot.initrd.enable && cfg.enable) {
     system.build = { inherit initialRamdisk; };
+
+    boot.initrd.availableKernelModules = [ "autofs4" ]; # systemd needs this for some features
+
     boot.initrd.systemd = {
       initrdBin = [pkgs.bash pkgs.coreutils pkgs.kmod cfg.package] ++ config.system.fsPackages;
+      extraBin = {
+        mount = "${cfg.package.util-linux}/bin/mount";
+        umount = "${cfg.package.util-linux}/bin/umount";
+      };
 
       contents = {
         "/init".source = "${cfg.package}/lib/systemd/systemd";
@@ -367,12 +383,28 @@ in {
         "/sbin".source = "${initrdBinEnv}/sbin";
 
         "/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe";
+        "/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf";
       };
 
       storePaths = [
-        # TODO: Limit this to the bare necessities
-        "${cfg.package}/lib"
-
+        # systemd tooling
+        "${cfg.package}/lib/systemd/systemd-fsck"
+        "${cfg.package}/lib/systemd/systemd-growfs"
+        "${cfg.package}/lib/systemd/systemd-hibernate-resume"
+        "${cfg.package}/lib/systemd/systemd-journald"
+        "${cfg.package}/lib/systemd/systemd-makefs"
+        "${cfg.package}/lib/systemd/systemd-modules-load"
+        "${cfg.package}/lib/systemd/systemd-remount-fs"
+        "${cfg.package}/lib/systemd/systemd-sulogin-shell"
+        "${cfg.package}/lib/systemd/systemd-sysctl"
+        "${cfg.package}/lib/systemd/systemd-udevd"
+        "${cfg.package}/lib/systemd/systemd-vconsole-setup"
+
+        # additional systemd directories
+        "${cfg.package}/lib/systemd/system-generators"
+        "${cfg.package}/lib/udev"
+
+        # utilities needed by systemd
         "${cfg.package.util-linux}/bin/mount"
         "${cfg.package.util-linux}/bin/umount"
         "${cfg.package.util-linux}/bin/sulogin"
diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix
index 5f35a15476965..6279957fcd63b 100644
--- a/nixos/modules/system/boot/timesyncd.nix
+++ b/nixos/modules/system/boot/timesyncd.nix
@@ -60,15 +60,27 @@ with lib;
     };
     users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync;
 
-    system.activationScripts.systemd-timesyncd-migration = mkIf (versionOlder config.system.stateVersion "19.09") ''
+    system.activationScripts.systemd-timesyncd-migration =
       # workaround an issue of systemd-timesyncd not starting due to upstream systemd reverting their dynamic users changes
       #  - https://github.com/NixOS/nixpkgs/pull/61321#issuecomment-492423742
       #  - https://github.com/systemd/systemd/issues/12131
-      if [ -L /var/lib/systemd/timesync ]; then
-        rm /var/lib/systemd/timesync
-        mv /var/lib/private/systemd/timesync /var/lib/systemd/timesync
+      mkIf (versionOlder config.system.stateVersion "19.09") ''
+        if [ -L /var/lib/systemd/timesync ]; then
+          rm /var/lib/systemd/timesync
+          mv /var/lib/private/systemd/timesync /var/lib/systemd/timesync
+        fi
+      '';
+    system.activationScripts.systemd-timesyncd-init-clock =
+      # Ensure that we have some stored time to prevent systemd-timesyncd to
+      # resort back to the fallback time.
+      # If the file doesn't exist we assume that our current system clock is
+      # good enough to provide an initial value.
+      ''
+      if ! [ -f /var/lib/systemd/timesync/clock ]; then
+        test -d /var/lib/systemd/timesync || mkdir -p /var/lib/systemd/timesync
+        touch /var/lib/systemd/timesync/clock
       fi
-    '';
+      '';
   };
 
 }
diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix
index 35316603c38f2..59711f90dce3d 100644
--- a/nixos/modules/tasks/lvm.nix
+++ b/nixos/modules/tasks/lvm.nix
@@ -7,17 +7,18 @@ in {
   options.services.lvm = {
     package = mkOption {
       type = types.package;
-      default = if cfg.dmeventd.enable then pkgs.lvm2_dmeventd else pkgs.lvm2;
+      default = pkgs.lvm2;
       internal = true;
       defaultText = literalExpression "pkgs.lvm2";
       description = ''
         This option allows you to override the LVM package that's used on the system
         (udev rules, tmpfiles, systemd services).
-        Defaults to pkgs.lvm2, or pkgs.lvm2_dmeventd if dmeventd is enabled.
+        Defaults to pkgs.lvm2, pkgs.lvm2_dmeventd if dmeventd or pkgs.lvm2_vdo if vdo is enabled.
       '';
     };
     dmeventd.enable = mkEnableOption "the LVM dmevent daemon";
     boot.thin.enable = mkEnableOption "support for booting from ThinLVs";
+    boot.vdo.enable = mkEnableOption "support for booting from VDOLVs";
   };
 
   config = mkMerge [
@@ -40,6 +41,7 @@ in {
       environment.etc."lvm/lvm.conf".text = ''
         dmeventd/executable = "${cfg.package}/bin/dmeventd"
       '';
+      services.lvm.package = mkDefault pkgs.lvm2_dmeventd;
     })
     (mkIf cfg.boot.thin.enable {
       boot.initrd = {
@@ -61,6 +63,32 @@ in {
       environment.etc."lvm/lvm.conf".text = concatMapStringsSep "\n"
         (bin: "global/${bin}_executable = ${pkgs.thin-provisioning-tools}/bin/${bin}")
         [ "thin_check" "thin_dump" "thin_repair" "cache_check" "cache_dump" "cache_repair" ];
+
+      environment.systemPackages = [ pkgs.thin-provisioning-tools ];
+    })
+    (mkIf cfg.boot.vdo.enable {
+      boot = {
+        initrd = {
+          kernelModules = [ "kvdo" ];
+
+          extraUtilsCommands = ''
+            ls ${pkgs.vdo}/bin/ | grep -v adaptLVMVDO | while read BIN; do
+              copy_bin_and_libs ${pkgs.vdo}/bin/$BIN
+            done
+          '';
+
+          extraUtilsCommandsTest = ''
+            ls ${pkgs.vdo}/bin/ | grep -v adaptLVMVDO | while read BIN; do
+              $out/bin/$(basename $BIN) --help > /dev/null
+            done
+          '';
+        };
+        extraModulePackages = [ config.boot.kernelPackages.kvdo ];
+      };
+
+      services.lvm.package = mkOverride 999 pkgs.lvm2_vdo;  # this overrides mkDefault
+
+      environment.systemPackages = [ pkgs.vdo ];
     })
     (mkIf (cfg.dmeventd.enable || cfg.boot.thin.enable) {
       boot.initrd.preLVMCommands = ''
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index dcbdf34e9441c..799ce9b4017e9 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -274,6 +274,7 @@ in
   login = handleTest ./login.nix {};
   logrotate = handleTest ./logrotate.nix {};
   loki = handleTest ./loki.nix {};
+  lvm2 = handleTest ./lvm2 {};
   lxd = handleTest ./lxd.nix {};
   lxd-image = handleTest ./lxd-image.nix {};
   lxd-nftables = handleTest ./lxd-nftables.nix {};
diff --git a/nixos/tests/atop.nix b/nixos/tests/atop.nix
index d9304834692c8..ec10369a24fd6 100644
--- a/nixos/tests/atop.nix
+++ b/nixos/tests/atop.nix
@@ -182,10 +182,6 @@ in
   atopgpu = makeTest {
     name = "atop-atopgpu";
     nodes.machine = {
-      nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (getName pkg) [
-        "cudatoolkit"
-      ];
-
       programs.atop = {
         enable = true;
         atopgpu.enable = true;
@@ -205,10 +201,6 @@ in
   everything = makeTest {
     name = "atop-everthing";
     nodes.machine = {
-      nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (getName pkg) [
-        "cudatoolkit"
-      ];
-
       programs.atop = {
         enable = true;
         settings = {
diff --git a/nixos/tests/docker-tools-cross.nix b/nixos/tests/docker-tools-cross.nix
index a7a6a31475d67..8791ec2581279 100644
--- a/nixos/tests/docker-tools-cross.nix
+++ b/nixos/tests/docker-tools-cross.nix
@@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
 let
 
   remoteSystem =
-    if pkgs.system == "aarch64-linux"
+    if pkgs.stdenv.hostPlatform.system == "aarch64-linux"
     then "x86_64-linux"
     else "aarch64-linux";
 
@@ -18,7 +18,7 @@ let
 
     # NOTE: Since this file can't control where the test will be _run_ we don't
     #       cross-compile _to_ a different system but _from_ a different system
-    crossSystem = pkgs.system;
+    crossSystem = pkgs.stdenv.hostPlatform.system;
   };
 
   hello1 = remoteCrossPkgs.dockerTools.buildImage {
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 8a240ddb17f24..80859ac7a96ec 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -315,7 +315,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
                 "docker inspect ${pkgs.dockerTools.examples.cross.imageName} "
                 + "| ${pkgs.jq}/bin/jq -r .[].Architecture"
             ).strip()
-            == "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64"}"
+            == "${if pkgs.stdenv.hostPlatform.system == "aarch64-linux" then "amd64" else "arm64"}"
         )
 
     with subtest("buildLayeredImage doesn't dereference /nix/store symlink layers"):
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 2cfadf85c9358..30a5b5c45b366 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -312,6 +312,7 @@ let
             desktop-file-utils
             docbook5
             docbook_xsl_ns
+            kmod.dev
             libxml2.bin
             libxslt.bin
             nixos-artwork.wallpapers.simple-dark-gray-bottom
diff --git a/nixos/tests/lvm2/default.nix b/nixos/tests/lvm2/default.nix
new file mode 100644
index 0000000000000..2ba17809569a6
--- /dev/null
+++ b/nixos/tests/lvm2/default.nix
@@ -0,0 +1,27 @@
+{ system ? builtins.currentSystem
+, config ? { }
+, pkgs ? import ../../.. { inherit system config; }
+, lib ? pkgs.lib
+, kernelVersionsToTest ? [ "4.19" "5.4" "5.10" "5.15" "latest" ]
+}:
+
+# For quickly running a test, the nixosTests.lvm2.lvm-thinpool-linux-latest attribute is recommended
+let
+  tests = let callTest = p: lib.flip (import p) { inherit system pkgs; }; in {
+    thinpool = { test = callTest ./thinpool.nix; kernelFilter = lib.id; };
+    # we would like to test all versions, but the kernel module currently does not compile against the other versions
+    vdo = { test = callTest ./vdo.nix; kernelFilter = lib.filter (v: v == "5.15"); };
+  };
+in
+lib.listToAttrs (
+  lib.filter (x: x.value != {}) (
+    lib.flip lib.concatMap kernelVersionsToTest (version:
+      let
+        v' = lib.replaceStrings [ "." ] [ "_" ] version;
+      in
+      lib.flip lib.mapAttrsToList tests (name: t:
+        lib.nameValuePair "lvm-${name}-linux-${v'}" (lib.optionalAttrs (builtins.elem version (t.kernelFilter kernelVersionsToTest)) (t.test { kernelPackages = pkgs."linuxPackages_${v'}"; }))
+      )
+    )
+  )
+)
diff --git a/nixos/tests/lvm2/thinpool.nix b/nixos/tests/lvm2/thinpool.nix
new file mode 100644
index 0000000000000..82c6460a890a0
--- /dev/null
+++ b/nixos/tests/lvm2/thinpool.nix
@@ -0,0 +1,32 @@
+{ kernelPackages ? null }:
+import ../make-test-python.nix ({ pkgs, ... }: {
+  name = "lvm2-thinpool";
+  meta.maintainers = with pkgs.lib.maintainers; [ ajs124 ];
+
+  nodes.machine = { pkgs, lib, ... }: {
+    virtualisation.emptyDiskImages = [ 4096 ];
+    services.lvm = {
+      boot.thin.enable = true;
+      dmeventd.enable = true;
+    };
+    environment.systemPackages = with pkgs; [ xfsprogs ];
+    environment.etc."lvm/lvm.conf".text = ''
+      activation/thin_pool_autoextend_percent = 10
+      activation/thin_pool_autoextend_threshold = 80
+    '';
+    boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
+  };
+
+  testScript = ''
+    machine.succeed("vgcreate test_vg /dev/vdb")
+    machine.succeed("lvcreate -L 512M -T test_vg/test_thin_pool")
+    machine.succeed("lvcreate -n test_lv -V 16G --thinpool test_thin_pool test_vg")
+    machine.succeed("mkfs.xfs /dev/test_vg/test_lv")
+    machine.succeed("mkdir /mnt; mount /dev/test_vg/test_lv /mnt")
+    assert "/dev/mapper/test_vg-test_lv" == machine.succeed("findmnt -no SOURCE /mnt").strip()
+    machine.succeed("dd if=/dev/zero of=/mnt/empty.file bs=1M count=1024")
+    machine.succeed("journalctl -u dm-event.service | grep \"successfully resized\"")
+    machine.succeed("umount /mnt")
+    machine.succeed("vgchange -a n")
+  '';
+})
diff --git a/nixos/tests/lvm2/vdo.nix b/nixos/tests/lvm2/vdo.nix
new file mode 100644
index 0000000000000..5b014c2f72223
--- /dev/null
+++ b/nixos/tests/lvm2/vdo.nix
@@ -0,0 +1,27 @@
+{ kernelPackages ? null }:
+import ../make-test-python.nix ({ pkgs, ... }: {
+  name = "lvm2-vdo";
+  meta.maintainers = with pkgs.lib.maintainers; [ ajs124 ];
+
+  nodes.machine = { pkgs, lib, ... }: {
+    # Minimum required size for VDO volume: 5063921664 bytes
+    virtualisation.emptyDiskImages = [ 8192 ];
+    services.lvm = {
+      boot.vdo.enable = true;
+      dmeventd.enable = true;
+    };
+    environment.systemPackages = with pkgs; [ xfsprogs ];
+    boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
+  };
+
+  testScript = ''
+    machine.succeed("vgcreate test_vg /dev/vdb")
+    machine.succeed("lvcreate --type vdo -n vdo_lv -L 6G -V 12G test_vg/vdo_pool_lv")
+    machine.succeed("mkfs.xfs -K /dev/test_vg/vdo_lv")
+    machine.succeed("mkdir /mnt; mount /dev/test_vg/vdo_lv /mnt")
+    assert "/dev/mapper/test_vg-vdo_lv" == machine.succeed("findmnt -no SOURCE /mnt").strip()
+    machine.succeed("umount /mnt")
+    machine.succeed("vdostats")
+    machine.succeed("vgchange -a n")
+  '';
+})
diff --git a/nixos/tests/nixops/default.nix b/nixos/tests/nixops/default.nix
index f0834c51f0b4f..227b388150737 100644
--- a/nixos/tests/nixops/default.nix
+++ b/nixos/tests/nixops/default.nix
@@ -97,7 +97,7 @@ let
     derivations and all build dependency outputs, all the way down.
   */
   allDrvOutputs = pkg:
-    let name = lib.strings.sanitizeDerivationName "allDrvOutputs-${pkg.pname or pkg.name or "unknown"}";
+    let name = "allDrvOutputs-${pkg.pname or pkg.name or "unknown"}";
     in
     pkgs.runCommand name { refs = pkgs.writeReferencesToFile pkg.drvPath; } ''
       touch $out
diff --git a/nixos/tests/vaultwarden.nix b/nixos/tests/vaultwarden.nix
index 56f1d245d5052..814d8d7c0ab3e 100644
--- a/nixos/tests/vaultwarden.nix
+++ b/nixos/tests/vaultwarden.nix
@@ -113,7 +113,6 @@ let
                   driver.find_element_by_css_selector('input#masterPasswordRetype').send_keys(
                     '${userPassword}'
                   )
-                  driver.find_element_by_css_selector('input#acceptPolicies').click()
 
                   driver.find_element_by_xpath("//button[contains(., 'Submit')]").click()
 
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 0b1a2edc3baab..621804840bf02 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -2,21 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flac";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/flac/${pname}-${version}.tar.xz";
-    sha256 = "0j0p9sf56a2fm2hkjnf7x3py5ir49jyavg4q5zdyd7bcf6yq4gi1";
+    sha256 = "0dz7am8kbc97a6afml1h4yp085274prg8j7csryds8m3fmz61w4g";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2020-0499.patch";
-      url = "https://github.com/xiph/flac/commit/2e7931c27eb15e387da440a37f12437e35b22dd4.patch";
-      sha256 = "160qzq9ms5addz7sx06pnyjjkqrffr54r4wd8735vy4x008z71ah";
-    })
-  ];
-
   buildInputs = [ libogg ];
 
   #doCheck = true; # takes lots of time
diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix
new file mode 100644
index 0000000000000..7dd60a6c4d1b8
--- /dev/null
+++ b/pkgs/applications/audio/jacktrip/default.nix
@@ -0,0 +1,61 @@
+{ lib, mkDerivation, fetchFromGitHub
+, pkg-config
+, help2man
+, qmake
+, alsa-lib
+, libjack2
+, dbus
+, qtbase
+, qttools
+, qtx11extras
+, meson
+, python3
+, rtaudio
+, ninja
+}:
+
+mkDerivation rec {
+  version = "1.5.3";
+  pname = "jacktrip";
+
+  src = fetchFromGitHub {
+    owner = "jacktrip";
+    repo = "jacktrip";
+    rev = "v${version}";
+    sha256 = "sha256-sfAYMTnBjT4LkgksyzDGGy97NLX5ljjhNDFioQnTzLs=";
+  };
+
+  preConfigure = ''
+    rm build
+  '';
+
+  buildInputs = [
+    rtaudio
+    qtbase
+    qtx11extras
+    libjack2
+    dbus
+  ];
+
+  nativeBuildInputs = [
+    python3
+    python3.pkgs.pyaml
+    python3.pkgs.jinja2
+    ninja
+    help2man
+    meson
+    qmake
+    qttools
+    pkg-config
+  ];
+
+  qmakeFlags = [ "jacktrip.pro" ];
+
+  meta = with lib; {
+    description = "Multi-machine audio network performance over the Internet";
+    homepage = "https://jacktrip.github.io/jacktrip/";
+    license = with licenses; [ gpl3 lgpl3 mit ];
+    maintainers = [ maintainers.iwanb ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index b4f450b31016b..24da2efa907fb 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "praat";
-  version = "6.2.09";
+  version = "6.2.10";
 
   src = fetchFromGitHub {
     owner = "praat";
     repo = "praat";
     rev = "v${version}";
-    sha256 = "sha256-BhsbTFwxgWwMwe1ow0ppVsLjfMC7QMA/fq09Utwe+KA=";
+    sha256 = "sha256-IYbPMjKWDQQrF+JiqBQ2wsjY+Ms93tEdsG75CxipwaI=";
   };
 
   configurePhase = ''
diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix
index 54acc782c6037..aaa79bd3e3922 100644
--- a/pkgs/applications/audio/sfizz/default.nix
+++ b/pkgs/applications/audio/sfizz/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchFromGitHub, libjack2, libsndfile, xorg, freetype
 , libxkbcommon, cairo, glib, gnome, flac, libogg, libvorbis, libopus, cmake
-, pango, pkg-config }:
+, pango, pkg-config, catch2
+}:
 
 stdenv.mkDerivation rec {
   pname = "sfizz";
@@ -40,6 +41,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkg-config ];
 
   postPatch = ''
+    cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp
+
     substituteInPlace plugins/editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \
       --replace 'zenitypath = "zenity"' 'zenitypath = "${gnome.zenity}/bin/zenity"'
     substituteInPlace plugins/editor/src/editor/NativeHelpers.cpp \
@@ -48,6 +51,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DSFIZZ_TESTS=ON" ];
 
+  doCheck = true;
+
   meta = with lib; {
     homepage = "https://github.com/sfztools/sfizz";
     description = "SFZ jack client and LV2 plugin";
diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix
index 0ffd754c04766..2b264cfd56b99 100644
--- a/pkgs/applications/audio/sfxr-qt/default.nix
+++ b/pkgs/applications/audio/sfxr-qt/default.nix
@@ -8,6 +8,7 @@
 , qtquickcontrols2
 , SDL
 , python3
+, catch2
 , callPackage
 , nixosTests
 }:
@@ -24,6 +25,10 @@ mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  postPatch = ''
+    cp ${catch2}/include/catch2/catch.hpp 3rdparty/catch2/single_include/catch2/catch.hpp
+  '';
+
   # Remove on next release
   patches = [(fetchpatch {
     name = "sfxr-qr-missing-qpainterpath-include";
@@ -43,6 +48,8 @@ mkDerivation rec {
     SDL
   ];
 
+  doCheck = true;
+
   passthru.tests = {
     export-square-wave = callPackage ./test-export-square-wave {};
     sfxr-qt-starts = nixosTests.sfxr-qt;
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 6dc644fbb968a..d72da2c060f17 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.39.2";
+  version = "2.40.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-zVefF5CsyVVMNffec/xwA3KmMtZepM51C3Xh0ZCGl0c=";
+    hash = "sha256-2L1iVPLCCIQ6qBqkg+GmiqMmknHmdDLUrysN8vcW2YQ=";
   };
 
   appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/applications/blockchains/lndmanage/default.nix b/pkgs/applications/blockchains/lndmanage/default.nix
index ebbe653c96b20..c9e655448d28d 100644
--- a/pkgs/applications/blockchains/lndmanage/default.nix
+++ b/pkgs/applications/blockchains/lndmanage/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "lndmanage";
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "bitromortac";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-wPr/R+WGACyhv2Qh9JeLJwvr2vQfxpqj2XjEkrRoSX4=";
+    hash = "sha256-c36AbND01bUr0Klme4fU7GrY1oYcmoEREQI9cwsK7YM=";
   };
 
   propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix
index 1f9f64822f1bc..ce8d32f465e29 100644
--- a/pkgs/applications/editors/apostrophe/default.nix
+++ b/pkgs/applications/editors/apostrophe/default.nix
@@ -13,14 +13,14 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "apostrophe";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitLab {
     owner  = "World";
     repo   = pname;
     domain = "gitlab.gnome.org";
     rev    = "v${version}";
-    sha256 = "awaXXSUiEIzOAj9Zw8K961HuIKsLFi3QKETUTTIaTjk=";
+    sha256 = "sha256-At3kaVJE07j/QWXerYnvxleE2Cbn0FjlBXH69tkuFys=";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index c97cbaf60ea54..ea763ecb39ad8 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -16,11 +16,11 @@ assert stdenv ? glibc;
 
 let
   platform_major = "4";
-  platform_minor = "22";
-  year = "2021";
-  month = "12"; #release month
-  buildmonth = "11"; #sometimes differs from release month
-  timestamp = "${year}${buildmonth}241800";
+  platform_minor = "23";
+  year = "2022";
+  month = "03"; #release month
+  buildmonth = "03"; #sometimes differs from release month
+  timestamp = "${year}${buildmonth}080310";
   gtk = gtk3;
 in rec {
 
@@ -40,7 +40,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        hash = "sha512-Lniaw8aUptHI0a75olTNHaMba+ugUdJKf9sJ0hGzKqY94vvfU3N2TH5eQBeXb1MyQdRdBL1D8Vs3+LD9lWlTMg==";
+        hash = "sha512-IKoHGBH8pQ1mkdMz11exO1u5T3hCPk662nPYoFunCyrQHOVA6KDAVHzEo1dxNUSJVGvW9YHDbGlZphXniTBJHw==";
       };
   };
 
@@ -52,7 +52,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        hash = "sha512-F/5yroFDbrSclmUP5vTNSkYR+OZ1dkPv2FPZT1XM5HFoynitYkDxnj+uTcJIBOWv3Zu1plU4yweW0DF1E9jLcg==";
+        hash = "sha512-cG3mMEJiuNrVfFy5nNkVqC2OpMeE5C1iu26E+LKGwwIBwqPoJtFBPRhLdGVC73KwDDRK8DEyurXsiFal60dv/g==";
       };
   };
 
@@ -64,7 +64,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
-        hash = "sha512-3XsBk8/KHtTjit/WMneOghuOkqEHOIdLwof7718dsrDP4vfgcfhb47V7fPYDOw2eld88pHk+85mTGpZOTTywxw==";
+        hash = "sha512-AEGENE5AXXUmIRwv8Hp3LByfPtuG/HvipqkMoq+K4A+8Y7NZCRQM9YSf8zr42S0aYTr6rwP6VJajpFiz4ixULg==";
       };
   };
 
@@ -90,7 +90,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
-        hash = "sha512-7bTYIFnX8oUPaqDrMOlGNnpyC+xvDQsNmgZUps/epGkzM9Fjlc2lPr75VR7UaezBCoAuNTSHCYtG5d6TJOKjmQ==";
+        hash = "sha512-CTSuI6Dc2wKe0RduPKAacQmXbEBtF4J7Q5b9gC1MIkXXWPLW7Yp+lL/a167TXgDHG3kqNWbonjZ2JwU2T0FRjg==";
       };
   };
 
@@ -102,7 +102,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        hash = "sha512-ahykujYH9RLvxVMPFlFILGYJO0LXHvuhnILifeAo5v5Tp5ktGVlZWG461iZHETlt8Zr76liGAqm1ytQcuzCyQA==";
+        hash = "sha512-6QOtNFYCRhdSiclEwijBcp2EODnlp8qtO56NJLuRdgwpEe+3A567L/vsZe/E72YTGZOFh9yJ7+XehIEjonfUIw==";
       };
   };
 
@@ -114,7 +114,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        hash = "sha512-CuKxjcnvkROURtavZJN0AhCuA0x7NayZTpIOn9oE21rUzVqR0p7x7C5RPtMZ9gS4ZMWcYyQDJ0BVgRHBoKsYqQ==";
+        hash = "sha512-bgaRM7l4WOoGA8doR/nqjV4Hnszx3N4cZANYfq/Fq5Agspocu4m1F4ofetQC4BdlLkx0o+moKSN6sm34aT5H4Q==";
       };
   };
 
@@ -126,7 +126,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        hash = "sha512-CqUbxUUMIJsXsx4XEOQ1d2L3U22VpAfQP+R8HNoVetDawhR+b2tyDVnTQRKTL4dJ0fjLXDeoHvTlPm1EXi/ahA==";
+        hash = "sha512-YyyATAL0pJVrinrLixIW3p+bz3WfD7L/WL0EGnUWgCGsiVDzF2CGoXXT8YsH34uc+6Hn8z23JCoNX4Sqdo8i7Q==";
       };
   };
 
@@ -138,7 +138,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        hash = "sha256-ys3MjIBr2hLZC/GB8Am/Qlto4+dSzOoK9p7QF+GS0Eg=";
+        hash = "sha256-1Go3e1HDRJlba8ySYRfi0+aU6aHjKmd3fc/IgeKw18c=";
       };
   };
 
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 32b0dfd864f0b..8abf835eb4d86 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -248,12 +248,12 @@ rec {
   cdt = buildEclipseUpdateSite rec {
     name = "cdt-${version}";
     # find current version at https://www.eclipse.org/cdt/downloads.php
-    version = "10.5.0";
+    version = "10.6.0";
 
     src = fetchzip {
       stripRoot = false;
       url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip";
-      hash = "sha256-0sf38Ekw9mMjiEmJDcunVL3VS3KqWVXKZlQIGBk4V4g=";
+      hash = "sha256-eMvZ2UvPpUq1J4DDg6f+R1g217bnRjxmr5zWUAhef/c=";
     };
 
     meta = with lib; {
diff --git a/pkgs/applications/editors/emacs/27.nix b/pkgs/applications/editors/emacs/27.nix
index 436785c34f686..064231b24565c 100644
--- a/pkgs/applications/editors/emacs/27.nix
+++ b/pkgs/applications/editors/emacs/27.nix
@@ -7,5 +7,10 @@ import ./generic.nix (rec {
       url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082";
       sha256 = "sha256-RF9b5PojFUAjh2TDUW4+HaWveV30Spy1iAXhaWf1ZVg=";
     })
+    # glibc 2.34 compat
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/emacs/raw/181aafcdb7ee2fded9fce4cfc448f27edccc927f/f/emacs-glibc-2.34.patch";
+      sha256 = "sha256-2o3C/jhZPl2OW/LmVPt/fhdwbS9NOdF9lVEF1Kn9aEk=";
+    })
   ];
 })
diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix
index 6cc5714fb83fe..fb1abcd6cffe3 100644
--- a/pkgs/applications/editors/helix/default.nix
+++ b/pkgs/applications/editors/helix/default.nix
@@ -1,18 +1,18 @@
-{ fetchFromGitHub, lib, rustPlatform, makeWrapper }:
+{ fetchzip, lib, rustPlatform, makeWrapper }:
 
 rustPlatform.buildRustPackage rec {
   pname = "helix";
-  version = "0.6.0";
+  version = "22.03";
 
-  src = fetchFromGitHub {
-    owner = "helix-editor";
-    repo = pname;
-    rev = "v${version}";
-    fetchSubmodules = true;
-    sha256 = "sha256-d/USOtcPLjdgzN7TBCouBRmoSDH5LZD4R5Qq7lUrWZw=";
+  # This release tarball includes source code for the tree-sitter grammars,
+  # which is not ordinarily part of the repository.
+  src = fetchzip {
+    url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz";
+    sha256 = "DP/hh6JfnyHdW2bg0cvhwlWvruNDvL9bmXM46iAUQzA=";
+    stripRoot = false;
   };
 
-  cargoSha256 = "sha256-/EATU7HsGNB35YOBp8sofbPd1nl4d3Ggj1ay3QuHkCI=";
+  cargoSha256 = "zJQ+KvO+6iUIb0eJ+LnMbitxaqTxfqgu7XXj3j0GiX4=";
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://helix-editor.com";
     license = licenses.mpl20;
     mainProgram = "hx";
-    maintainers = with maintainers; [ yusdacra ];
+    maintainers = with maintainers; [ danth yusdacra ];
   };
 }
diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix
index 1fe16a4e60c11..dc4381446b97a 100644
--- a/pkgs/applications/editors/kakoune/plugins/default.nix
+++ b/pkgs/applications/editors/kakoune/plugins/default.nix
@@ -18,7 +18,7 @@ let
     inherit buildKakounePluginFrom2Nix;
   };
 
-  aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib plugins);
+  aliases = lib.optionalAttrs config.allowAliases (import ./aliases.nix lib plugins);
 
 in
 
diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
index 6cf7d30f27492..a6cae7a4505b3 100644
--- a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
+++ b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
@@ -1,19 +1,20 @@
-alexherbo2/auto-pairs.kak
-alexherbo2/replace-mode.kak
-alexherbo2/sleuth.kak
-andreyorst/fzf.kak
-andreyorst/powerline.kak
-basbebe/pandoc.kak
-danr/kakoune-easymotion
-Delapouite/kakoune-buffers
-Delapouite/kakoune-registers
-enricozb/tabs.kak@main
-greenfork/active-window.kak
-kakoune-editor/kakoune-extra-filetypes
-kakounedotcom/connect.kak
-kakounedotcom/prelude.kak
-lePerdu/kakboard
-listentolist/kakoune-rainbow
-mayjs/openscad.kak
-occivink/kakoune-buffer-switcher
-occivink/kakoune-vertical-selection
+repo,branch,alias
+alexherbo2/auto-pairs.kak,,
+alexherbo2/replace-mode.kak,,
+alexherbo2/sleuth.kak,,
+andreyorst/fzf.kak,,
+andreyorst/powerline.kak,,
+basbebe/pandoc.kak,,
+danr/kakoune-easymotion,,
+Delapouite/kakoune-buffers,,
+Delapouite/kakoune-registers,,
+enricozb/tabs.kak@main,,
+greenfork/active-window.kak,,
+kakoune-editor/kakoune-extra-filetypes,,
+kakounedotcom/connect.kak,,
+kakounedotcom/prelude.kak,,
+lePerdu/kakboard,,
+listentolist/kakoune-rainbow,,
+mayjs/openscad.kak,,
+occivink/kakoune-buffer-switcher,,
+occivink/kakoune-vertical-selection,,
diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix
index c6779b8fba874..93b8dabb6814e 100644
--- a/pkgs/applications/editors/marker/default.nix
+++ b/pkgs/applications/editors/marker/default.nix
@@ -1,5 +1,7 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchFromGitHub
+, itstool
 , meson
 , ninja
 , pkg-config
@@ -24,6 +26,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
+    itstool
     meson
     ninja
     pkg-config
diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix
index c2ade207d6093..77466cfdbea86 100644
--- a/pkgs/applications/editors/poke/default.nix
+++ b/pkgs/applications/editors/poke/default.nix
@@ -22,11 +22,11 @@ let
   isCross = stdenv.hostPlatform != stdenv.buildPlatform;
 in stdenv.mkDerivation rec {
   pname = "poke";
-  version = "2.2";
+  version = "2.3";
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-xF6k5xpRohhTZzhcAc65dZbsW3EDOGm+xKYLHLciWQM=";
+    sha256 = "sha256-NpDPERbafLOp7GtPcAPiU+JotRAhKiiP04qv7Q68x2Y=";
   };
 
   outputs = [ "out" "dev" "info" "lib" "man" ];
diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix
index 9bfcf44318637..1e847e695403f 100644
--- a/pkgs/applications/editors/vim/plugins/default.nix
+++ b/pkgs/applications/editors/vim/plugins/default.nix
@@ -35,7 +35,7 @@ let
     inherit llvmPackages luaPackages;
   };
 
-  aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else final: prev: {};
+  aliases = if config.allowAliases then (import ./aliases.nix lib) else final: prev: {};
 
   extensible-self = lib.makeExtensible
     (extends aliases
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 92578520b98ec..59fe030b24121 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -3,6 +3,451 @@
 
 final: prev:
 {
+  BetterLua-vim = buildVimPluginFrom2Nix {
+    pname = "BetterLua.vim";
+    version = "2020-08-14";
+    src = fetchFromGitHub {
+      owner = "euclidianAce";
+      repo = "BetterLua.vim";
+      rev = "d2d6c115575d09258a794a6f20ac60233eee59d5";
+      sha256 = "1rvlx21kw8865dg6q97hx9i2s1n8mn1nyhn0m7dkx625pghsx3js";
+    };
+    meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/";
+  };
+
+  BufOnly-vim = buildVimPluginFrom2Nix {
+    pname = "BufOnly.vim";
+    version = "2010-10-18";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "BufOnly.vim";
+      rev = "43dd92303979bdb234a3cb2f5662847f7a3affe7";
+      sha256 = "1gvpaqvvxjma0dl1zai68bpv42608api4054appwkw9pgczkkcdl";
+    };
+    meta.homepage = "https://github.com/vim-scripts/BufOnly.vim/";
+  };
+
+  CheckAttach = buildVimPluginFrom2Nix {
+    pname = "CheckAttach";
+    version = "2019-05-08";
+    src = fetchFromGitHub {
+      owner = "chrisbra";
+      repo = "CheckAttach";
+      rev = "8f0b1350431d1d34655a147e6f1cfe6cb5dda5f7";
+      sha256 = "1z9a40nbdjd3pnp28nfsi2bijsbaiphc0ia816f5flkchn07gmmj";
+    };
+    meta.homepage = "https://github.com/chrisbra/CheckAttach/";
+  };
+
+  Colour-Sampler-Pack = buildVimPluginFrom2Nix {
+    pname = "Colour-Sampler-Pack";
+    version = "2012-11-30";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "Colour-Sampler-Pack";
+      rev = "05cded87b2ef29aaa9e930230bb88e23abff4441";
+      sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3";
+    };
+    meta.homepage = "https://github.com/vim-scripts/Colour-Sampler-Pack/";
+  };
+
+  Coqtail = buildVimPluginFrom2Nix {
+    pname = "Coqtail";
+    version = "2022-03-28";
+    src = fetchFromGitHub {
+      owner = "whonore";
+      repo = "Coqtail";
+      rev = "cb8f43b2f09f3d41e2821e458901666a82a61298";
+      sha256 = "0h5r0r7hh4g7p874l7fajq30k4z3a88vm3db6583q611h9bwcfrf";
+    };
+    meta.homepage = "https://github.com/whonore/Coqtail/";
+  };
+
+  DoxygenToolkit-vim = buildVimPluginFrom2Nix {
+    pname = "DoxygenToolkit.vim";
+    version = "2010-11-06";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "DoxygenToolkit.vim";
+      rev = "afd8663d36d2ec19d26befdb10e89e912d26bbd3";
+      sha256 = "1za8li02j4nhqjjsyxg4p78638h5af4izim37zc0p1x55zr3i85r";
+    };
+    meta.homepage = "https://github.com/vim-scripts/DoxygenToolkit.vim/";
+  };
+
+  FTerm-nvim = buildVimPluginFrom2Nix {
+    pname = "FTerm.nvim";
+    version = "2022-03-13";
+    src = fetchFromGitHub {
+      owner = "numToStr";
+      repo = "FTerm.nvim";
+      rev = "233633a5f6fe8398187a4eba93eba0828ef3d5f3";
+      sha256 = "0sxnii921xia4mrf67qz7ichi9xqr9zf193hb9dx199l7hl6k1p8";
+    };
+    meta.homepage = "https://github.com/numToStr/FTerm.nvim/";
+  };
+
+  FixCursorHold-nvim = buildVimPluginFrom2Nix {
+    pname = "FixCursorHold.nvim";
+    version = "2022-02-17";
+    src = fetchFromGitHub {
+      owner = "antoinemadec";
+      repo = "FixCursorHold.nvim";
+      rev = "1bfb32e7ba1344925ad815cb0d7f901dbc0ff7c1";
+      sha256 = "0b1iffk6pa2zwd9fvlgqli72r8qj74b7hqkhlw6awhc7r1qj8m1q";
+    };
+    meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/";
+  };
+
+  Improved-AnsiEsc = buildVimPluginFrom2Nix {
+    pname = "Improved-AnsiEsc";
+    version = "2015-08-26";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "Improved-AnsiEsc";
+      rev = "e1c59a8e9203fab6b9150721f30548916da73351";
+      sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz";
+    };
+    meta.homepage = "https://github.com/vim-scripts/Improved-AnsiEsc/";
+  };
+
+  Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
+    pname = "Jenkinsfile-vim-syntax";
+    version = "2021-01-26";
+    src = fetchFromGitHub {
+      owner = "martinda";
+      repo = "Jenkinsfile-vim-syntax";
+      rev = "0d05729168ea44d60862f17cffa80024ab30bcc9";
+      sha256 = "05z30frs4f5z0l4qgxk08r7mb19bzhqs36hi213yin78cz62b9gy";
+    };
+    meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/";
+  };
+
+  LanguageClient-neovim = buildVimPluginFrom2Nix {
+    pname = "LanguageClient-neovim";
+    version = "2020-12-10";
+    src = fetchFromGitHub {
+      owner = "autozimu";
+      repo = "LanguageClient-neovim";
+      rev = "a42594c9c320b1283e9b9058b85a8097d8325fed";
+      sha256 = "0lj9na3g2cl0vj56jz8rhz9lm2d3xps5glk8ds491i2ixy4vdm37";
+    };
+    meta.homepage = "https://github.com/autozimu/LanguageClient-neovim/";
+  };
+
+  LanguageTool-nvim = buildVimPluginFrom2Nix {
+    pname = "LanguageTool.nvim";
+    version = "2020-10-19";
+    src = fetchFromGitHub {
+      owner = "vigoux";
+      repo = "LanguageTool.nvim";
+      rev = "809e7d77fec834597f495fec737c59292a10025b";
+      sha256 = "1g12dz85xq8qd92dgna0a3w6zgxa74njlvmvly4k20610r63bzrn";
+    };
+    meta.homepage = "https://github.com/vigoux/LanguageTool.nvim/";
+  };
+
+  LeaderF = buildVimPluginFrom2Nix {
+    pname = "LeaderF";
+    version = "2022-04-05";
+    src = fetchFromGitHub {
+      owner = "Yggdroot";
+      repo = "LeaderF";
+      rev = "7292967624ba89e2c3ab2f374959d5a25d5c9d9f";
+      sha256 = "0l2vnickmgcvnlqv13bcqgvpsygkbwzgc70bx253cfbnddqssbpj";
+    };
+    meta.homepage = "https://github.com/Yggdroot/LeaderF/";
+  };
+
+  MatchTagAlways = buildVimPluginFrom2Nix {
+    pname = "MatchTagAlways";
+    version = "2017-05-20";
+    src = fetchFromGitHub {
+      owner = "Valloric";
+      repo = "MatchTagAlways";
+      rev = "352eb479a4ad1608e0880b79ab2357aac2cf4bed";
+      sha256 = "0y8gq4cs0wm2ijagc2frpmm664z355iridxyl5893576v5aqp8z1";
+    };
+    meta.homepage = "https://github.com/Valloric/MatchTagAlways/";
+  };
+
+  Navigator-nvim = buildVimPluginFrom2Nix {
+    pname = "Navigator.nvim";
+    version = "2022-03-28";
+    src = fetchFromGitHub {
+      owner = "numToStr";
+      repo = "Navigator.nvim";
+      rev = "6c50f278482dc5388743cb5c6eddb146059252f9";
+      sha256 = "1qr2blrr6ihr1adld1cyc98b64s2s4y2876bmlbxg4q17y1zv3l6";
+    };
+    meta.homepage = "https://github.com/numToStr/Navigator.nvim/";
+  };
+
+  NeoSolarized = buildVimPluginFrom2Nix {
+    pname = "NeoSolarized";
+    version = "2020-08-07";
+    src = fetchFromGitHub {
+      owner = "overcache";
+      repo = "NeoSolarized";
+      rev = "b94b1a9ad51e2de015266f10fdc6e142f97bd617";
+      sha256 = "019nz56yirpg1ahg8adfafrxznalw056qwm3xjm9kzg6da8j6v48";
+    };
+    meta.homepage = "https://github.com/overcache/NeoSolarized/";
+  };
+
+  NrrwRgn = buildVimPluginFrom2Nix {
+    pname = "NrrwRgn";
+    version = "2022-02-13";
+    src = fetchFromGitHub {
+      owner = "chrisbra";
+      repo = "NrrwRgn";
+      rev = "e027db9d94f94947153cd7b5ac9abd04371ab2b0";
+      sha256 = "0mcwyqbfc2m865w44s96ra2k0v1mn5kkkxf8i71iqhvc7fvnrfah";
+    };
+    meta.homepage = "https://github.com/chrisbra/NrrwRgn/";
+  };
+
+  PreserveNoEOL = buildVimPluginFrom2Nix {
+    pname = "PreserveNoEOL";
+    version = "2013-06-14";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "PreserveNoEOL";
+      rev = "940e3ce90e54d8680bec1135a21dcfbd6c9bfb62";
+      sha256 = "1726jpr2zf6jrb00pp082ikbx4mll3a877pnzs6i18f9fgpaqqgd";
+    };
+    meta.homepage = "https://github.com/vim-scripts/PreserveNoEOL/";
+  };
+
+  QFEnter = buildVimPluginFrom2Nix {
+    pname = "QFEnter";
+    version = "2020-10-09";
+    src = fetchFromGitHub {
+      owner = "yssl";
+      repo = "QFEnter";
+      rev = "df0a75b287c210f98ae353a12bbfdaf73d858beb";
+      sha256 = "0gdp7nmjlp8ng2rp2v66d8bincnkwrqqpbggb079f0f9szrqlp54";
+    };
+    meta.homepage = "https://github.com/yssl/QFEnter/";
+  };
+
+  Recover-vim = buildVimPluginFrom2Nix {
+    pname = "Recover.vim";
+    version = "2015-08-14";
+    src = fetchFromGitHub {
+      owner = "chrisbra";
+      repo = "Recover.vim";
+      rev = "efa491f6121f65e025f42d79a93081abb8db69d4";
+      sha256 = "17szim82bwnhf9q4n0n4jfmqkmhq6p0lh0j4y77a2x6lkn0pns5s";
+    };
+    meta.homepage = "https://github.com/chrisbra/Recover.vim/";
+  };
+
+  Rename = buildVimPluginFrom2Nix {
+    pname = "Rename";
+    version = "2011-08-31";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "Rename";
+      rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34";
+      sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r";
+    };
+    meta.homepage = "https://github.com/vim-scripts/Rename/";
+  };
+
+  ReplaceWithRegister = buildVimPluginFrom2Nix {
+    pname = "ReplaceWithRegister";
+    version = "2014-10-31";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "ReplaceWithRegister";
+      rev = "832efc23111d19591d495dc72286de2fb0b09345";
+      sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g";
+    };
+    meta.homepage = "https://github.com/vim-scripts/ReplaceWithRegister/";
+  };
+
+  SchemaStore-nvim = buildVimPluginFrom2Nix {
+    pname = "SchemaStore.nvim";
+    version = "2022-04-03";
+    src = fetchFromGitHub {
+      owner = "b0o";
+      repo = "SchemaStore.nvim";
+      rev = "6598caa4ca4f6fa28f975025bec411611abbcb4d";
+      sha256 = "1p0w9i471gqknb8w89ifggsa4hdgdx5zm09mzypqq9344w68fsds";
+    };
+    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
+  };
+
+  Shade-nvim = buildVimPluginFrom2Nix {
+    pname = "Shade.nvim";
+    version = "2022-02-01";
+    src = fetchFromGitHub {
+      owner = "sunjon";
+      repo = "Shade.nvim";
+      rev = "4286b5abc47d62d0c9ffb22a4f388b7bf2ac2461";
+      sha256 = "0mb0cnf8065qmjq85hlgb4a1mqk1nwl7966l1imb54hpzw828rzl";
+    };
+    meta.homepage = "https://github.com/sunjon/Shade.nvim/";
+  };
+
+  ShowMultiBase = buildVimPluginFrom2Nix {
+    pname = "ShowMultiBase";
+    version = "2010-10-18";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "ShowMultiBase";
+      rev = "85a39fd12668ce973d3d9282263912b2b8f0d338";
+      sha256 = "0hg5352ahzgh2kwqha5v8ai024fld93xag93hb53wjf5b8nzsz8i";
+    };
+    meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/";
+  };
+
+  SimpylFold = buildVimPluginFrom2Nix {
+    pname = "SimpylFold";
+    version = "2021-11-04";
+    src = fetchFromGitHub {
+      owner = "tmhedberg";
+      repo = "SimpylFold";
+      rev = "b4a87e509c3d873238a39d1c85d0b97d6819f283";
+      sha256 = "0ff5x7ay67wn9c0mi8sb6110i93zrf97c4whg0bd7pr2nmadpvk0";
+    };
+    meta.homepage = "https://github.com/tmhedberg/SimpylFold/";
+  };
+
+  SpaceCamp = buildVimPluginFrom2Nix {
+    pname = "SpaceCamp";
+    version = "2021-04-07";
+    src = fetchFromGitHub {
+      owner = "jaredgorski";
+      repo = "SpaceCamp";
+      rev = "376af5c2204de61726ea86b596acb2dab9795e1f";
+      sha256 = "0h3wxkswd5z9y46d6272sr210i73j5pwf5faw7qhr1plilfgx4gb";
+    };
+    meta.homepage = "https://github.com/jaredgorski/SpaceCamp/";
+  };
+
+  SpaceVim = buildVimPluginFrom2Nix {
+    pname = "SpaceVim";
+    version = "2022-04-05";
+    src = fetchFromGitHub {
+      owner = "SpaceVim";
+      repo = "SpaceVim";
+      rev = "77378e06df9c7ac4345fee932b9c1923a15e8ef9";
+      sha256 = "1274xhabkhkla2qljsdby4klyr05hf5vpbrra6i08pm5jhzp5h90";
+    };
+    meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
+  };
+
+  Spacegray-vim = buildVimPluginFrom2Nix {
+    pname = "Spacegray.vim";
+    version = "2021-07-06";
+    src = fetchFromGitHub {
+      owner = "ackyshake";
+      repo = "Spacegray.vim";
+      rev = "c699ca10ed421c462bd1c87a158faaa570dc8e28";
+      sha256 = "0ma8w6p5jh6llka49x5j5ql8fmhv0bx5hhsn5b2phak79yqg1k61";
+    };
+    meta.homepage = "https://github.com/ackyshake/Spacegray.vim/";
+  };
+
+  SudoEdit-vim = buildVimPluginFrom2Nix {
+    pname = "SudoEdit.vim";
+    version = "2020-02-27";
+    src = fetchFromGitHub {
+      owner = "chrisbra";
+      repo = "SudoEdit.vim";
+      rev = "e203eada5b563e9134ce2aae26b09edae0904fd7";
+      sha256 = "0pf9iix50pw3p430ky51rv11ra1hppdpwa5flzcd5kciybr76n0n";
+    };
+    meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/";
+  };
+
+  TrueZen-nvim = buildVimPluginFrom2Nix {
+    pname = "TrueZen.nvim";
+    version = "2021-10-12";
+    src = fetchFromGitHub {
+      owner = "Pocco81";
+      repo = "TrueZen.nvim";
+      rev = "508b977d71650da5c9243698614a9a1416f116d4";
+      sha256 = "0sr4y1mg83l28l5ias2pv0gxkcgwailfjn2skx35z63f2il3zkbx";
+    };
+    meta.homepage = "https://github.com/Pocco81/TrueZen.nvim/";
+  };
+
+  VimCompletesMe = buildVimPluginFrom2Nix {
+    pname = "VimCompletesMe";
+    version = "2022-02-18";
+    src = fetchFromGitHub {
+      owner = "ackyshake";
+      repo = "VimCompletesMe";
+      rev = "9adf692d7ae6424038458a89d4a411f0a27d1388";
+      sha256 = "1sndgb3291dyifaa8adri2mb8cgbinbar3nw1fnf67k9ahwycaz0";
+    };
+    meta.homepage = "https://github.com/ackyshake/VimCompletesMe/";
+  };
+
+  VimOrganizer = buildVimPluginFrom2Nix {
+    pname = "VimOrganizer";
+    version = "2020-12-15";
+    src = fetchFromGitHub {
+      owner = "hsitz";
+      repo = "VimOrganizer";
+      rev = "09636aed78441a9de2767fcef6d7c567f322cc40";
+      sha256 = "0phpcxmyz562yyp88rbx9pqg46w8r1lyapb700nvxwvqkcd82pfw";
+    };
+    meta.homepage = "https://github.com/hsitz/VimOrganizer/";
+  };
+
+  Vundle-vim = buildVimPluginFrom2Nix {
+    pname = "Vundle.vim";
+    version = "2019-08-17";
+    src = fetchFromGitHub {
+      owner = "VundleVim";
+      repo = "Vundle.vim";
+      rev = "b255382d6242d7ea3877bf059d2934125e0c4d95";
+      sha256 = "0fkmklcq3fgvd6x6irz9bgyvcdaxafykk3k89gsi9p6b0ikw3rw6";
+    };
+    meta.homepage = "https://github.com/VundleVim/Vundle.vim/";
+  };
+
+  YUNOcommit-vim = buildVimPluginFrom2Nix {
+    pname = "YUNOcommit.vim";
+    version = "2014-11-26";
+    src = fetchFromGitHub {
+      owner = "esneider";
+      repo = "YUNOcommit.vim";
+      rev = "981082055a73ef076d7e27477874d2303153a448";
+      sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab";
+    };
+    meta.homepage = "https://github.com/esneider/YUNOcommit.vim/";
+  };
+
+  YankRing-vim = buildVimPluginFrom2Nix {
+    pname = "YankRing.vim";
+    version = "2015-07-29";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "YankRing.vim";
+      rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65";
+      sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw";
+    };
+    meta.homepage = "https://github.com/vim-scripts/YankRing.vim/";
+  };
+
+  YouCompleteMe = buildVimPluginFrom2Nix {
+    pname = "YouCompleteMe";
+    version = "2022-04-02";
+    src = fetchFromGitHub {
+      owner = "ycm-core";
+      repo = "YouCompleteMe";
+      rev = "3ededaed2f9923d50bf3860ba8dace0f7d2724cd";
+      sha256 = "1n2h5wsp9vclsvzr40m1ffb6kjmcg0mccfj790giw77qa2i9s1rl";
+      fetchSubmodules = true;
+    };
+    meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
+  };
+
   a-vim = buildVimPluginFrom2Nix {
     pname = "a.vim";
     version = "2010-11-06";
@@ -41,12 +486,12 @@ final: prev:
 
   aerial-nvim = buildVimPluginFrom2Nix {
     pname = "aerial.nvim";
-    version = "2022-03-24";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "aerial.nvim";
-      rev = "b9f6067529ef123b8ace705ea356869f66aad320";
-      sha256 = "1wcdshvq2nw1dx8xxzplvq519bzzb3qgf7lh0sqafjd19nzgwiji";
+      rev = "85c9bbb69f0cdf7949ace27030e4d130cb9ffca3";
+      sha256 = "1lpl9f96m9vkz8lzpq68rvycapy29dbzfm0sdmpx6mccygdb6ds1";
     };
     meta.homepage = "https://github.com/stevearc/aerial.nvim/";
   };
@@ -77,12 +522,12 @@ final: prev:
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2022-03-23";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "80dcd648d389965603246c2c5a4554e3e4aa184c";
-      sha256 = "1a38q83sgv13aw3iy40mjzkg1wsc5zmf5mmkjqpdcgv5aixyb8m5";
+      rev = "cae550f07b608ab591f7fd37ffcab78a07caad8f";
+      sha256 = "0dfhqbfarynnw6p3fq81k2wadinm1fz3z6c3as5kv1bn34y528rn";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
   };
@@ -101,12 +546,12 @@ final: prev:
 
   aniseed = buildVimPluginFrom2Nix {
     pname = "aniseed";
-    version = "2022-03-21";
+    version = "2022-03-26";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "aniseed";
-      rev = "bd79727af8a21037222a08ec9bcaf1c85488aaa4";
-      sha256 = "0l4hvhmf9cgw921956rh97x6aqhjzs2jxsdnk2m38a9fr738hknk";
+      rev = "68ad878e7d7546b291ebff43fd53544b2f6de401";
+      sha256 = "16jsvpfacks2nw4s7qk8qh1xf9jkg6hnvnryp4p2gi0s3x5rfsws";
     };
     meta.homepage = "https://github.com/Olical/aniseed/";
   };
@@ -161,12 +606,12 @@ final: prev:
 
   async-vim = buildVimPluginFrom2Nix {
     pname = "async.vim";
-    version = "2022-01-04";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "async.vim";
-      rev = "f20569020d65bec3249222606c073c0943045b5e";
-      sha256 = "0lff0v2vd06amcjirnpa4wc4l4nsbngcrdqcv34kszyqgzd7phka";
+      rev = "2082d13bb195f3203d41a308b89417426a7deca1";
+      sha256 = "08mblrrkxn1hivj1yjrn3vx3skd6l3xl96800i6qrsbsjlx5s5k3";
     };
     meta.homepage = "https://github.com/prabirshrestha/async.vim/";
   };
@@ -365,28 +810,16 @@ final: prev:
 
   better-escape-nvim = buildVimPluginFrom2Nix {
     pname = "better-escape.nvim";
-    version = "2022-03-14";
+    version = "2022-03-28";
     src = fetchFromGitHub {
       owner = "max397574";
       repo = "better-escape.nvim";
-      rev = "d2efbf0093235525e81f537f8f4e63f23acedf06";
-      sha256 = "1xx23v9jgpzdhyp1diyq0vc36vlxzljx36qnax2cms36kfnc398l";
+      rev = "d5ee0cef56a7e41a86048c14f25e964876ac20c1";
+      sha256 = "04hi2zmaz02fiyvjs94lqn7imp20fn2vpwww37sg7gim18b1mpl4";
     };
     meta.homepage = "https://github.com/max397574/better-escape.nvim/";
   };
 
-  BetterLua-vim = buildVimPluginFrom2Nix {
-    pname = "BetterLua.vim";
-    version = "2020-08-14";
-    src = fetchFromGitHub {
-      owner = "euclidianAce";
-      repo = "BetterLua.vim";
-      rev = "d2d6c115575d09258a794a6f20ac60233eee59d5";
-      sha256 = "1rvlx21kw8865dg6q97hx9i2s1n8mn1nyhn0m7dkx625pghsx3js";
-    };
-    meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/";
-  };
-
   bitbake-vim = buildVimPluginFrom2Nix {
     pname = "bitbake.vim";
     version = "2021-02-06";
@@ -461,28 +894,16 @@ final: prev:
 
   bufferline-nvim = buildVimPluginFrom2Nix {
     pname = "bufferline.nvim";
-    version = "2022-03-21";
+    version = "2022-04-01";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "bufferline.nvim";
-      rev = "e1202c6569353d03ef0cb3da11b839dba26854dd";
-      sha256 = "1nd5pvbg0yw8jl4rn56dzhabmiwkvlzb8iv595rrkqdb2msdl4qx";
+      rev = "004cd5734fb21e39d48c1fb1469fa63e2797880b";
+      sha256 = "1rr69n4mpkr6ky093fxabf3dcnngam3a01zl71ylvz27lv7gphqh";
     };
     meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
   };
 
-  BufOnly-vim = buildVimPluginFrom2Nix {
-    pname = "BufOnly.vim";
-    version = "2010-10-18";
-    src = fetchFromGitHub {
-      owner = "vim-scripts";
-      repo = "BufOnly.vim";
-      rev = "43dd92303979bdb234a3cb2f5662847f7a3affe7";
-      sha256 = "1gvpaqvvxjma0dl1zai68bpv42608api4054appwkw9pgczkkcdl";
-    };
-    meta.homepage = "https://github.com/vim-scripts/BufOnly.vim/";
-  };
-
   calendar-vim = buildVimPluginFrom2Nix {
     pname = "calendar.vim";
     version = "2022-03-21";
@@ -507,18 +928,6 @@ final: prev:
     meta.homepage = "https://github.com/bkad/camelcasemotion/";
   };
 
-  catppuccin-nvim = buildVimPluginFrom2Nix {
-    pname = "catppuccin-nvim";
-    version = "2022-03-20";
-    src = fetchFromGitHub {
-      owner = "catppuccin";
-      repo = "nvim";
-      rev = "f079dda3dc23450d69b4bad11bfbd9af2c77f6f3";
-      sha256 = "1w0n96fbrkm3vdl64v1yzkly8wpcn5g9qflmpb8r1ww9hhig7a38";
-    };
-    meta.homepage = "https://github.com/catppuccin/nvim/";
-  };
-
   caw-vim = buildVimPluginFrom2Nix {
     pname = "caw.vim";
     version = "2021-09-20";
@@ -531,18 +940,6 @@ final: prev:
     meta.homepage = "https://github.com/tyru/caw.vim/";
   };
 
-  chadtree = buildVimPluginFrom2Nix {
-    pname = "chadtree";
-    version = "2022-03-24";
-    src = fetchFromGitHub {
-      owner = "ms-jpq";
-      repo = "chadtree";
-      rev = "e9606bfa350f277d54a61742d560e6122dc4d32c";
-      sha256 = "1vyg48ghr8fd15fh41pk5qlgngdqkw8gwhkkyq9hbvs2mxw8x80c";
-    };
-    meta.homepage = "https://github.com/ms-jpq/chadtree/";
-  };
-
   changeColorScheme-vim = buildVimPluginFrom2Nix {
     pname = "changeColorScheme.vim";
     version = "2010-10-18";
@@ -567,18 +964,6 @@ final: prev:
     meta.homepage = "https://github.com/sudormrfbin/cheatsheet.nvim/";
   };
 
-  CheckAttach = buildVimPluginFrom2Nix {
-    pname = "CheckAttach";
-    version = "2019-05-08";
-    src = fetchFromGitHub {
-      owner = "chrisbra";
-      repo = "CheckAttach";
-      rev = "8f0b1350431d1d34655a147e6f1cfe6cb5dda5f7";
-      sha256 = "1z9a40nbdjd3pnp28nfsi2bijsbaiphc0ia816f5flkchn07gmmj";
-    };
-    meta.homepage = "https://github.com/chrisbra/CheckAttach/";
-  };
-
   ci_dark = buildVimPluginFrom2Nix {
     pname = "ci_dark";
     version = "2022-03-27";
@@ -821,12 +1206,12 @@ final: prev:
 
   cmp-tabnine = buildVimPluginFrom2Nix {
     pname = "cmp-tabnine";
-    version = "2022-01-26";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "tzachar";
       repo = "cmp-tabnine";
-      rev = "2a051347190a22b738e9784426199b9db745e1da";
-      sha256 = "1z3imhw4jgswd957aqhf1yf5dihb1k9dfd22abshziv45fb0fggy";
+      rev = "1c6e5c55f3a879354891c59cf27da733890bfc88";
+      sha256 = "1hmif83kl2h4zz4xqkxb0xc003wzlirr26znx0r1f8z54f1j1hik";
     };
     meta.homepage = "https://github.com/tzachar/cmp-tabnine/";
   };
@@ -881,12 +1266,12 @@ final: prev:
 
   cmp_luasnip = buildVimPluginFrom2Nix {
     pname = "cmp_luasnip";
-    version = "2022-03-26";
+    version = "2022-04-01";
     src = fetchFromGitHub {
       owner = "saadparwaiz1";
       repo = "cmp_luasnip";
-      rev = "85f2767842a35064f61128b71b8dab1e38c413c4";
-      sha256 = "13s04x9vx3n854q9abb0knls5aycxigbwqgllfmp2xgaycgxqksa";
+      rev = "b10829736542e7cc9291e60bab134df1273165c9";
+      sha256 = "1qygdas99m7py98rqxyza88lmk2as8yi9khjac603x6anxmq766l";
     };
     meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";
   };
@@ -989,12 +1374,12 @@ final: prev:
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc.nvim";
-    version = "2022-03-26";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "16e74f9b31d20b8dfc8933132beed4c175d824ea";
-      sha256 = "0nrfm8517fz31qrg0gfh888q7wcbxxkbpcp39ycvwkdfxpq1bzwr";
+      rev = "1d85f511f9966b445b5200f35f8db8d4cc0af805";
+      sha256 = "0yk9wghix3mh63p7w6hqk7crv4z6c2hi7ywdg6cnnkhnxviih7lp";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -1035,18 +1420,6 @@ final: prev:
     meta.homepage = "https://github.com/lilydjwg/colorizer/";
   };
 
-  Colour-Sampler-Pack = buildVimPluginFrom2Nix {
-    pname = "Colour-Sampler-Pack";
-    version = "2012-11-30";
-    src = fetchFromGitHub {
-      owner = "vim-scripts";
-      repo = "Colour-Sampler-Pack";
-      rev = "05cded87b2ef29aaa9e930230bb88e23abff4441";
-      sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3";
-    };
-    meta.homepage = "https://github.com/vim-scripts/Colour-Sampler-Pack/";
-  };
-
   command-t = buildVimPluginFrom2Nix {
     pname = "command-t";
     version = "2022-02-25";
@@ -1062,12 +1435,12 @@ final: prev:
 
   comment-nvim = buildVimPluginFrom2Nix {
     pname = "comment.nvim";
-    version = "2022-03-25";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "numtostr";
       repo = "comment.nvim";
-      rev = "03b2a8f81102f2994f4888760e0f08385d841c3f";
-      sha256 = "1ilzpdyis41p1x6wbkavjpva5hvxclagw6hjn76vpmwibnz99pfy";
+      rev = "0aaea32f27315e2a99ba4c12ab9def5cbb4842e4";
+      sha256 = "17vs6k71x6j6gzs1xhsvsmwh2lvpvwgshi2axg9b6ad20wv2v4dr";
     };
     meta.homepage = "https://github.com/numtostr/comment.nvim/";
   };
@@ -1206,12 +1579,12 @@ final: prev:
 
   conjure = buildVimPluginFrom2Nix {
     pname = "conjure";
-    version = "2022-02-15";
+    version = "2022-03-28";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "6c53d863c0843be0f68a138def146d6b8f725b22";
-      sha256 = "1f5z99ac72433f2nj714fk6xd76mq7yr5i5z1afwgrhx61zbwn5h";
+      rev = "0c85b2ecce542ce8ee336bf01f433950cf51f31e";
+      sha256 = "15nqxzf2q8iwkc3b09crd66cb38cnh2sv4q49vv9x6nkxar69hgc";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
   };
@@ -1254,28 +1627,16 @@ final: prev:
 
   coq_nvim = buildVimPluginFrom2Nix {
     pname = "coq_nvim";
-    version = "2022-03-26";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "ad255350b66809d4af3aae75f4fb4dd576a06ab4";
-      sha256 = "17l6ajaj03d5v8abi8m754ypqwhz1nw232n15y8av15ll0pb7gk0";
+      rev = "60df9082402acb1d9d258fb9f9763a085ca04952";
+      sha256 = "0gv4h0imxbfgw0g3z6xwqk7iczcs1zq5jdvpbn20gwsizrfgk6ap";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
   };
 
-  Coqtail = buildVimPluginFrom2Nix {
-    pname = "Coqtail";
-    version = "2022-03-25";
-    src = fetchFromGitHub {
-      owner = "whonore";
-      repo = "Coqtail";
-      rev = "7a1cb8fb1cbdf136bba50a22ddcc056e83dc435c";
-      sha256 = "0jj966bansbfzbhbfgyqciis36s7z46n9n8ihy2m7vxynibbf9yp";
-    };
-    meta.homepage = "https://github.com/whonore/Coqtail/";
-  };
-
   cosco-vim = buildVimPluginFrom2Nix {
     pname = "cosco.vim";
     version = "2018-08-07";
@@ -1772,12 +2133,12 @@ final: prev:
 
   diffview-nvim = buildVimPluginFrom2Nix {
     pname = "diffview.nvim";
-    version = "2022-02-21";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "sindrets";
       repo = "diffview.nvim";
-      rev = "cf32c3fcdbc2f6855f6bb883302c9f290e9c3d88";
-      sha256 = "0vikawxr40pkprsn8yzpacs33hfakpb98j5lmpf7sjmvyzkb1x8b";
+      rev = "71e972ecec34cc9b4917ccdacbbd29062ef9657c";
+      sha256 = "0ksq9d0glhn4d4s0png3pbvf7a5rbv1xgna49fz81d5qy5ih0rsl";
     };
     meta.homepage = "https://github.com/sindrets/diffview.nvim/";
   };
@@ -1796,48 +2157,24 @@ final: prev:
 
   doki-theme-vim = buildVimPluginFrom2Nix {
     pname = "doki-theme-vim";
-    version = "2022-02-16";
+    version = "2022-03-31";
     src = fetchFromGitHub {
       owner = "doki-theme";
       repo = "doki-theme-vim";
-      rev = "fe7112ce7db0c8c65420e82aabfe7a98be2b538b";
-      sha256 = "07vy5kf7pqsdqsz5jmqj6lm2aizcncfi4j1vmkpnjw9rpp3c733r";
+      rev = "047caeccfe2052d5be42f0e26986c31bd2e0d5f0";
+      sha256 = "0zbq3c25q03frav7scch5sghwa27swbamlrdnvkmiqw1qfk27r72";
     };
     meta.homepage = "https://github.com/doki-theme/doki-theme-vim/";
   };
 
-  DoxygenToolkit-vim = buildVimPluginFrom2Nix {
-    pname = "DoxygenToolkit.vim";
-    version = "2010-11-06";
-    src = fetchFromGitHub {
-      owner = "vim-scripts";
-      repo = "DoxygenToolkit.vim";
-      rev = "afd8663d36d2ec19d26befdb10e89e912d26bbd3";
-      sha256 = "1za8li02j4nhqjjsyxg4p78638h5af4izim37zc0p1x55zr3i85r";
-    };
-    meta.homepage = "https://github.com/vim-scripts/DoxygenToolkit.vim/";
-  };
-
-  dracula-vim = buildVimPluginFrom2Nix {
-    pname = "dracula-vim";
-    version = "2022-03-24";
-    src = fetchFromGitHub {
-      owner = "dracula";
-      repo = "vim";
-      rev = "d7723a842a6cfa2f62cf85530ab66eb418521dc2";
-      sha256 = "1qzil8rwpdzf64gq63ds0cf509ldam77l3fz02g1mia5dry75r02";
-    };
-    meta.homepage = "https://github.com/dracula/vim/";
-  };
-
   dressing-nvim = buildVimPluginFrom2Nix {
     pname = "dressing.nvim";
-    version = "2022-03-24";
+    version = "2022-03-31";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "dressing.nvim";
-      rev = "31f12fff6e71a14ddce30bfc7ec9b29a2137ccde";
-      sha256 = "0kjx04q2hnbvw68wh3d9li9p9s5d07j308kfhawpnhnmv6g57nzw";
+      rev = "cad08fac5ed6d5e8384d8c0759268e2f6b89b217";
+      sha256 = "0lc04cvq6iasg724zhpzp1j3bhwj4gphvqbzfh41ikzsy8d2jrpy";
     };
     meta.homepage = "https://github.com/stevearc/dressing.nvim/";
   };
@@ -1856,12 +2193,12 @@ final: prev:
 
   edge = buildVimPluginFrom2Nix {
     pname = "edge";
-    version = "2022-03-21";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "edge";
-      rev = "36c08622c4420129fa576ceafa4ed3388d3beb56";
-      sha256 = "0hai4ns9chvqb8x7vgcl0i0lxqvqwxwhpa489zsqsp1lb436bwqc";
+      rev = "ee4c9b797bce2d5fdcdb3904d2f3916d4ef3e615";
+      sha256 = "123xp6hqjz3ys34dii8rbl6l9i5s2sbnjh80sax7d9l22jqcv1qf";
     };
     meta.homepage = "https://github.com/sainnhe/edge/";
   };
@@ -1905,28 +2242,16 @@ final: prev:
 
   elvish-vim = buildVimPluginFrom2Nix {
     pname = "elvish.vim";
-    version = "2019-06-29";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "dmix";
       repo = "elvish.vim";
-      rev = "67ef8e89bff7cb8ea936f2164c8c268bbb3295f0";
-      sha256 = "133hr3i7zxysf2gnnimhz3gf3nda3fyfxmqq7mhq544v2mki4x9m";
+      rev = "ab3f9cff31fb3c2871d437dd058b13526ddf66a0";
+      sha256 = "1y1adg42iv0xhww2vxmxw3pky5syjc3djc1h2s7mm0bjg2marlha";
     };
     meta.homepage = "https://github.com/dmix/elvish.vim/";
   };
 
-  embark-vim = buildVimPluginFrom2Nix {
-    pname = "embark-vim";
-    version = "2022-03-26";
-    src = fetchFromGitHub {
-      owner = "embark-theme";
-      repo = "vim";
-      rev = "3f7f03aa2ae0d4185792aaf9b960bca0d22c48fd";
-      sha256 = "0gv2ivrwsrhnsr2kh56yj3m1l4ydwq27vllzxa5vkpbb11jydf3d";
-    };
-    meta.homepage = "https://github.com/embark-theme/vim/";
-  };
-
   emmet-vim = buildVimPluginFrom2Nix {
     pname = "emmet-vim";
     version = "2021-12-04";
@@ -1954,12 +2279,12 @@ final: prev:
 
   everforest = buildVimPluginFrom2Nix {
     pname = "everforest";
-    version = "2022-03-21";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "everforest";
-      rev = "764e36cf49a5845217ef09281adf708ab5abd9e3";
-      sha256 = "03byh70krkcgcj6yis7x73bzs8b21qic5qhi01az057rp7mx462l";
+      rev = "1a2c447fc014e55b5347b85df090b67af6ed28a6";
+      sha256 = "1cx5gm629r23prrn3j9awcmqi7zslzgk6aikws38x0mm9jlr3bxg";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
   };
@@ -2038,12 +2363,12 @@ final: prev:
 
   fern-vim = buildVimPluginFrom2Nix {
     pname = "fern.vim";
-    version = "2022-03-24";
+    version = "2022-03-28";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "fern.vim";
-      rev = "45950d39965150a6c6bff1979303e735460379d0";
-      sha256 = "067aild4sr5zd08fn2dna9ndycf5i4w524kkz88yzhyr7h5rc0w4";
+      rev = "53d8cf7cd96fcde4138ba1ad67971a594b4abbd4";
+      sha256 = "1dicpzqmpxclrv3v48ipk79yfblhlva42kzrl8hxly95isq2kznp";
     };
     meta.homepage = "https://github.com/lambdalisue/fern.vim/";
   };
@@ -2084,18 +2409,6 @@ final: prev:
     meta.homepage = "https://github.com/bogado/file-line/";
   };
 
-  FixCursorHold-nvim = buildVimPluginFrom2Nix {
-    pname = "FixCursorHold.nvim";
-    version = "2022-02-17";
-    src = fetchFromGitHub {
-      owner = "antoinemadec";
-      repo = "FixCursorHold.nvim";
-      rev = "1bfb32e7ba1344925ad815cb0d7f901dbc0ff7c1";
-      sha256 = "0b1iffk6pa2zwd9fvlgqli72r8qj74b7hqkhlw6awhc7r1qj8m1q";
-    };
-    meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/";
-  };
-
   flake8-vim = buildVimPluginFrom2Nix {
     pname = "flake8-vim";
     version = "2020-10-20";
@@ -2147,12 +2460,12 @@ final: prev:
 
   formatter-nvim = buildVimPluginFrom2Nix {
     pname = "formatter.nvim";
-    version = "2022-03-22";
+    version = "2022-03-29";
     src = fetchFromGitHub {
       owner = "mhartington";
       repo = "formatter.nvim";
-      rev = "cc42c16a793cba102ac75574ab187a77995ba06b";
-      sha256 = "1qz87l2da378wcbbck6n9p82apl594x2kxldl4sxhy88rbbqi2vb";
+      rev = "bec8a57d6e990a503e87eb71ae530cd2c1402e31";
+      sha256 = "14llli9s5x58m7z4ay5b9d2pypq378h3i4062rasdqi5c5and07n";
     };
     meta.homepage = "https://github.com/mhartington/formatter.nvim/";
   };
@@ -2193,18 +2506,6 @@ final: prev:
     meta.homepage = "https://github.com/raghur/fruzzy/";
   };
 
-  FTerm-nvim = buildVimPluginFrom2Nix {
-    pname = "FTerm.nvim";
-    version = "2022-03-13";
-    src = fetchFromGitHub {
-      owner = "numToStr";
-      repo = "FTerm.nvim";
-      rev = "233633a5f6fe8398187a4eba93eba0828ef3d5f3";
-      sha256 = "0sxnii921xia4mrf67qz7ichi9xqr9zf193hb9dx199l7hl6k1p8";
-    };
-    meta.homepage = "https://github.com/numToStr/FTerm.nvim/";
-  };
-
   fugitive-gitlab-vim = buildVimPluginFrom2Nix {
     pname = "fugitive-gitlab.vim";
     version = "2021-09-20";
@@ -2339,12 +2640,12 @@ final: prev:
 
   gina-vim = buildVimPluginFrom2Nix {
     pname = "gina.vim";
-    version = "2021-06-12";
+    version = "2022-03-30";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "gina.vim";
-      rev = "abdbe0fe33f3b6fc59e94f7cc3072768f8dfd8ac";
-      sha256 = "1f3shh6jxr5i1an2dbb1vmc0l2xg03fm6ava25ahxg4b5ka59bc5";
+      rev = "ff6c2ddeca98f886b57fb42283c12e167d6ab575";
+      sha256 = "09jlnpix2dy6kggiz96mrm5l1f9x1gl5afpdmfrxgkighn2rwpzq";
     };
     meta.homepage = "https://github.com/lambdalisue/gina.vim/";
   };
@@ -2411,12 +2712,12 @@ final: prev:
 
   gitsigns-nvim = buildVimPluginFrom2Nix {
     pname = "gitsigns.nvim";
-    version = "2022-03-25";
+    version = "2022-04-02";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "gitsigns.nvim";
-      rev = "2a107231d92fa37224efdbc475abfba71f94b5ee";
-      sha256 = "0i17r2c48csff7pl0k1vvc5j61xh3qv4xq6v75raz937w0kj6hfg";
+      rev = "83ab3ca26ff5038f823060dfddda7a053e579b67";
+      sha256 = "1hrzk6nr1w9747h0fn9h5cm1pgx1sw6njyf3pyr7p220gnh87vzp";
     };
     meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
   };
@@ -2529,18 +2830,6 @@ final: prev:
     meta.homepage = "https://github.com/morhetz/gruvbox/";
   };
 
-  gruvbox-community = buildVimPluginFrom2Nix {
-    pname = "gruvbox-community";
-    version = "2022-03-06";
-    src = fetchFromGitHub {
-      owner = "gruvbox-community";
-      repo = "gruvbox";
-      rev = "b6f47ae7031f6746a1f1918c17574aa12c474ef0";
-      sha256 = "0m8rrm5v542a2c30sg7hlgm7r6gs4ah1n6nr5dc101l2064kg97g";
-    };
-    meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
-  };
-
   gruvbox-flat-nvim = buildVimPluginFrom2Nix {
     pname = "gruvbox-flat.nvim";
     version = "2022-01-19";
@@ -2555,12 +2844,12 @@ final: prev:
 
   gruvbox-material = buildVimPluginFrom2Nix {
     pname = "gruvbox-material";
-    version = "2022-03-21";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "gruvbox-material";
-      rev = "b8b63c81637c845e8a7c2dff4c206b714f7b93e4";
-      sha256 = "0ds72yyca1sgrr5b7i683i0lpfz6n75vrij94vc8z07ivn33qy2r";
+      rev = "5b98f2121ff3ece1e0b2ea037b86dd9ce0a346ad";
+      sha256 = "0gp4dmrf33m6hpsnqqqv8ab8hflqgwdinr8c8w1k4qkipvg6xkpf";
     };
     meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
   };
@@ -2603,12 +2892,12 @@ final: prev:
 
   harpoon = buildVimPluginFrom2Nix {
     pname = "harpoon";
-    version = "2022-02-16";
+    version = "2022-03-31";
     src = fetchFromGitHub {
       owner = "ThePrimeagen";
       repo = "harpoon";
-      rev = "b2bb0d6f2b8a55895afda53f0ad04527998d3411";
-      sha256 = "0izsscglfk6lpisxvarr0qw4m9br8854wi6jhyp2msd8r9gcrzi7";
+      rev = "b6a363c037505c30a41042580729dc09e9bd00ed";
+      sha256 = "0v917h34fha7ww2shrnwaqajp5f0s6qb9rbcmf4f504rpkfbnavl";
     };
     meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
   };
@@ -2759,28 +3048,16 @@ final: prev:
 
   impatient-nvim = buildVimPluginFrom2Nix {
     pname = "impatient.nvim";
-    version = "2022-03-22";
+    version = "2022-03-31";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "impatient.nvim";
-      rev = "989eefca3539b9958df100e8e3130f55eafe1709";
-      sha256 = "0cypb6nm0jlgf4cbsazwplvniiqrnda32nk2nkaqm0dbprs920sv";
+      rev = "2337df7d778e17a58d8709f651653b9039946d8d";
+      sha256 = "06gz1qsdqil1f2wsfyslk8vsdxxjjrsak0gfar2298ardaqb3dhp";
     };
     meta.homepage = "https://github.com/lewis6991/impatient.nvim/";
   };
 
-  Improved-AnsiEsc = buildVimPluginFrom2Nix {
-    pname = "Improved-AnsiEsc";
-    version = "2015-08-26";
-    src = fetchFromGitHub {
-      owner = "vim-scripts";
-      repo = "Improved-AnsiEsc";
-      rev = "e1c59a8e9203fab6b9150721f30548916da73351";
-      sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz";
-    };
-    meta.homepage = "https://github.com/vim-scripts/Improved-AnsiEsc/";
-  };
-
   increment-activator = buildVimPluginFrom2Nix {
     pname = "increment-activator";
     version = "2021-09-16";
@@ -2819,12 +3096,12 @@ final: prev:
 
   indent-blankline-nvim = buildVimPluginFrom2Nix {
     pname = "indent-blankline.nvim";
-    version = "2022-03-25";
+    version = "2022-03-28";
     src = fetchFromGitHub {
       owner = "lukas-reineke";
       repo = "indent-blankline.nvim";
-      rev = "ebedbed53690a53cd15b53c124eb29f9faffc1d2";
-      sha256 = "1wsxvlpq78vyvgz6g0ji07dy1b10bsfr1qk9qdpj2n5592zp8zlk";
+      rev = "9920ceb79bffd0e6b7064be63439e38da0741d03";
+      sha256 = "15wqnd72j98w15i7dhzjdxbyxk766vcb844xdrvany3zwqn5p58x";
     };
     meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
   };
@@ -2962,18 +3239,6 @@ final: prev:
     meta.homepage = "https://github.com/nanotech/jellybeans.vim/";
   };
 
-  Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
-    pname = "Jenkinsfile-vim-syntax";
-    version = "2021-01-26";
-    src = fetchFromGitHub {
-      owner = "martinda";
-      repo = "Jenkinsfile-vim-syntax";
-      rev = "0d05729168ea44d60862f17cffa80024ab30bcc9";
-      sha256 = "05z30frs4f5z0l4qgxk08r7mb19bzhqs36hi213yin78cz62b9gy";
-    };
-    meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/";
-  };
-
   jq-vim = buildVimPluginFrom2Nix {
     pname = "jq.vim";
     version = "2019-05-21";
@@ -3058,30 +3323,6 @@ final: prev:
     meta.homepage = "https://github.com/qnighy/lalrpop.vim/";
   };
 
-  LanguageClient-neovim = buildVimPluginFrom2Nix {
-    pname = "LanguageClient-neovim";
-    version = "2020-12-10";
-    src = fetchFromGitHub {
-      owner = "autozimu";
-      repo = "LanguageClient-neovim";
-      rev = "a42594c9c320b1283e9b9058b85a8097d8325fed";
-      sha256 = "0lj9na3g2cl0vj56jz8rhz9lm2d3xps5glk8ds491i2ixy4vdm37";
-    };
-    meta.homepage = "https://github.com/autozimu/LanguageClient-neovim/";
-  };
-
-  LanguageTool-nvim = buildVimPluginFrom2Nix {
-    pname = "LanguageTool.nvim";
-    version = "2020-10-19";
-    src = fetchFromGitHub {
-      owner = "vigoux";
-      repo = "LanguageTool.nvim";
-      rev = "809e7d77fec834597f495fec737c59292a10025b";
-      sha256 = "1g12dz85xq8qd92dgna0a3w6zgxa74njlvmvly4k20610r63bzrn";
-    };
-    meta.homepage = "https://github.com/vigoux/LanguageTool.nvim/";
-  };
-
   last256 = buildVimPluginFrom2Nix {
     pname = "last256";
     version = "2020-12-09";
@@ -3118,26 +3359,14 @@ final: prev:
     meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
   };
 
-  LeaderF = buildVimPluginFrom2Nix {
-    pname = "LeaderF";
-    version = "2022-03-22";
-    src = fetchFromGitHub {
-      owner = "Yggdroot";
-      repo = "LeaderF";
-      rev = "60e14a5bbd52a22578d6335c606d0539067b9327";
-      sha256 = "05bx5wm8r5rs4y51pkgb2m6bxzddacn7f3bdsgnmbvxz0rxyq8dp";
-    };
-    meta.homepage = "https://github.com/Yggdroot/LeaderF/";
-  };
-
   lean-nvim = buildVimPluginFrom2Nix {
     pname = "lean.nvim";
-    version = "2022-03-23";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "c22a0a6d288488a05a74aaa53dac4d2d71f7a30d";
-      sha256 = "0rb1gw3ndrjw5k1l2ckm936xp83krrwi3ylr27il8mdf4xllw3y8";
+      rev = "ca6a46c5ecba9f8957948e26b71c226d738f1efa";
+      sha256 = "0mxd9xgnfgal9dd56vchqhkg0hhw4jn6mrqm0b885j9krl78hbvq";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
   };
@@ -3192,12 +3421,12 @@ final: prev:
 
   lf-vim = buildVimPluginFrom2Nix {
     pname = "lf.vim";
-    version = "2021-02-18";
+    version = "2022-03-30";
     src = fetchFromGitHub {
       owner = "ptzz";
       repo = "lf.vim";
-      rev = "73fb502c6d1470243b1f4d8afa81e289d9edd94b";
-      sha256 = "1whrzpavv46r64l3b7vax4sj23kjdfjiwmhfpssb6bprhc9c4j97";
+      rev = "eab8f04b2953f08e3fcd425585598d176369ae4b";
+      sha256 = "125qdj8grw1vilhfqzmjwcwk3r4f1m2kxnxga9klmgypjmcgnkxd";
     };
     meta.homepage = "https://github.com/ptzz/lf.vim/";
   };
@@ -3288,12 +3517,12 @@ final: prev:
 
   lightspeed-nvim = buildVimPluginFrom2Nix {
     pname = "lightspeed.nvim";
-    version = "2022-03-09";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "lightspeed.nvim";
-      rev = "58c9e321b188e040703b01f16922623911f11117";
-      sha256 = "1x9w6nk69a6xzhr9jpcvnw3jby09k49y7gikasxyq5gpq6rp9dfs";
+      rev = "cfde2b2fe0dafc5684780399961595357998f611";
+      sha256 = "0zcippcfv87vcsbld0kka4mn2lixg0r6m2c82g9bssf304skfhfr";
     };
     meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
   };
@@ -3360,12 +3589,12 @@ final: prev:
 
   litee-filetree-nvim = buildVimPluginFrom2Nix {
     pname = "litee-filetree.nvim";
-    version = "2022-03-08";
+    version = "2022-03-26";
     src = fetchFromGitHub {
       owner = "ldelossa";
       repo = "litee-filetree.nvim";
-      rev = "4f54ff9708c59385dd2f08aad1ba7df879e638fc";
-      sha256 = "076wyp90mr43xniv0zc7wh6rfk1wr50cpfw5lvaj6ai7dyys466n";
+      rev = "59259b0d0716b628a3e4f44098bd87ff54cf9cba";
+      sha256 = "02awfwdzgcqsvs8p8a4m29c648phy6h5x1l49gklrmp8ymg2xgq3";
     };
     meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/";
   };
@@ -3515,24 +3744,24 @@ final: prev:
 
   lualine-nvim = buildVimPluginFrom2Nix {
     pname = "lualine.nvim";
-    version = "2022-03-27";
+    version = "2022-04-01";
     src = fetchFromGitHub {
       owner = "nvim-lualine";
       repo = "lualine.nvim";
-      rev = "f14175e142825c69c5b39e8f1564b9945a97d4aa";
-      sha256 = "0x6f88ixb6xd5nh3d8y5sql8yfyqs5fnpvdkdv9ywp7swzaydgqc";
+      rev = "c8e5a69085e89c2bac6bd01c74fcb98f9ffa5cdc";
+      sha256 = "0b2fwz1kxg0j8pgb1bzr82k916ii4k2vnbyz69w657v5mqmlpcbm";
     };
     meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
   };
 
   luasnip = buildVimPluginFrom2Nix {
     pname = "luasnip";
-    version = "2022-03-27";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "l3mon4d3";
       repo = "luasnip";
-      rev = "d03f0c32b2aa763915401421f6b084315936590f";
-      sha256 = "0qrryj40v70wl1mwn3jc0f50ygslc0848gppki5sxv1aq56a58ps";
+      rev = "69cb81cf7490666890545fef905d31a414edc15b";
+      sha256 = "1dj86wljkhxri6k536ihds9v27wvs672rgmaj5i4migwxjlh6jb8";
     };
     meta.homepage = "https://github.com/l3mon4d3/luasnip/";
   };
@@ -3587,12 +3816,12 @@ final: prev:
 
   marks-nvim = buildVimPluginFrom2Nix {
     pname = "marks.nvim";
-    version = "2022-03-03";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "chentau";
       repo = "marks.nvim";
-      rev = "74885b10abf792f61a612f5724030678b9704dab";
-      sha256 = "12653fd7h1s0hf55399vdk2w3aqyx8n8v62kgpvb62mywbg37bam";
+      rev = "8e80a20a170434bc77decc97bc4364c3ba848925";
+      sha256 = "0bah5xjrwq43ihw37gw8nxsj3qdh9fjqs9n7fkfhsg6hyp1qy4fc";
     };
     meta.homepage = "https://github.com/chentau/marks.nvim/";
   };
@@ -3609,42 +3838,18 @@ final: prev:
     meta.homepage = "https://github.com/vim-scripts/matchit.zip/";
   };
 
-  MatchTagAlways = buildVimPluginFrom2Nix {
-    pname = "MatchTagAlways";
-    version = "2017-05-20";
-    src = fetchFromGitHub {
-      owner = "Valloric";
-      repo = "MatchTagAlways";
-      rev = "352eb479a4ad1608e0880b79ab2357aac2cf4bed";
-      sha256 = "0y8gq4cs0wm2ijagc2frpmm664z355iridxyl5893576v5aqp8z1";
-    };
-    meta.homepage = "https://github.com/Valloric/MatchTagAlways/";
-  };
-
   material-nvim = buildVimPluginFrom2Nix {
     pname = "material.nvim";
-    version = "2022-03-25";
+    version = "2022-04-01";
     src = fetchFromGitHub {
       owner = "marko-cerovac";
       repo = "material.nvim";
-      rev = "82f74e8ec5d21a8ec9ebe1175c330a0b6e490212";
-      sha256 = "0hgcgj84d92js6i6skwzznz0ym8cgzwr4pz5aqi038g8ldpcx0ki";
+      rev = "fc3e3d04f9646404dcbf3692e83ad0eecee8bfe8";
+      sha256 = "0zqs3hn946gzcsm4qggakd45qnw5mvas1j6i71l8i55xabkgiffj";
     };
     meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
   };
 
-  mattn-calendar-vim = buildVimPluginFrom2Nix {
-    pname = "mattn-calendar-vim";
-    version = "2022-02-10";
-    src = fetchFromGitHub {
-      owner = "mattn";
-      repo = "calendar-vim";
-      rev = "2083a41e2d310f9bbbbf644517f30e901f1fb04d";
-      sha256 = "13wakcprkh93i7afykkpavxqvxssjh573pjjljsgip3y3778ms5q";
-    };
-    meta.homepage = "https://github.com/mattn/calendar-vim/";
-  };
-
   mayansmoke = buildVimPluginFrom2Nix {
     pname = "mayansmoke";
     version = "2010-10-18";
@@ -3659,12 +3864,12 @@ final: prev:
 
   mini-nvim = buildVimPluginFrom2Nix {
     pname = "mini.nvim";
-    version = "2022-03-26";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "b0763e58ccb8b203f87fcd58fe2fecb095119f96";
-      sha256 = "0qbyvz7l9p9iia7mh41119zdgz2v8xrkp8wcxl6hyxqri18j49yn";
+      rev = "10b1fb8ead63309be01f48da78d7d83d0f2b041f";
+      sha256 = "015ls360cwifh1jdzf6zxbqlc0dd0mgl029vs3brsn8h7b78rbv0";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
   };
@@ -3729,18 +3934,6 @@ final: prev:
     meta.homepage = "https://github.com/tomasr/molokai/";
   };
 
-  moonlight-nvim = buildVimPluginFrom2Nix {
-    pname = "moonlight.nvim";
-    version = "2021-05-16";
-    src = fetchFromGitHub {
-      owner = "shaunsingh";
-      repo = "moonlight.nvim";
-      rev = "e24e4218ec680b6396532808abf57ca0ada82e66";
-      sha256 = "0m9w3fpypsqxydjd93arbjqb5576nl40iy27i4ijlrqhgdhl49y3";
-    };
-    meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/";
-  };
-
   mru = buildVimPluginFrom2Nix {
     pname = "mru";
     version = "2022-03-12";
@@ -3753,18 +3946,6 @@ final: prev:
     meta.homepage = "https://github.com/yegappan/mru/";
   };
 
-  Navigator-nvim = buildVimPluginFrom2Nix {
-    pname = "Navigator.nvim";
-    version = "2022-03-25";
-    src = fetchFromGitHub {
-      owner = "numToStr";
-      repo = "Navigator.nvim";
-      rev = "58d07e658c15b61ef7b6e375073b1f06934bc28f";
-      sha256 = "0d40rilwcxi7q36fnk4xpyx1cq3nb4yf22j8k8zq6mwg5h4j648r";
-    };
-    meta.homepage = "https://github.com/numToStr/Navigator.nvim/";
-  };
-
   ncm2 = buildVimPluginFrom2Nix {
     pname = "ncm2";
     version = "2022-03-17";
@@ -4103,12 +4284,12 @@ final: prev:
 
   neorg = buildVimPluginFrom2Nix {
     pname = "neorg";
-    version = "2022-03-26";
+    version = "2022-04-02";
     src = fetchFromGitHub {
       owner = "nvim-neorg";
       repo = "neorg";
-      rev = "8f8c1ae889ffe666423a89271933272ebffec3ef";
-      sha256 = "10fgkrr9wn6jj35qa42c353k4rnys9a2wrckjk0kwrx6kvx7m6l6";
+      rev = "aec45ca94975c0072516523fec32d69044db36b6";
+      sha256 = "1g1kyhwqdxbshbfqzrwzav9afkl7psys8w5i2h4gkn8dda1h59g6";
     };
     meta.homepage = "https://github.com/nvim-neorg/neorg/";
   };
@@ -4127,12 +4308,12 @@ final: prev:
 
   neosnippet-snippets = buildVimPluginFrom2Nix {
     pname = "neosnippet-snippets";
-    version = "2021-10-02";
+    version = "2022-04-01";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet-snippets";
-      rev = "8a6655a034eb7c12138dad505ef1004bf383a45d";
-      sha256 = "0mwvcjdrk324azqy5m2lpl3z1gi92jspxvmcjcxqnppfjsv1iyhd";
+      rev = "725c989f18e9c134cddd63a7c6b15bed5c244657";
+      sha256 = "0657ial95l0jgyj9ld6qbncnnrl5qkh6pqp40lr703ddqkz10s03";
     };
     meta.homepage = "https://github.com/Shougo/neosnippet-snippets/";
   };
@@ -4149,18 +4330,6 @@ final: prev:
     meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
   };
 
-  NeoSolarized = buildVimPluginFrom2Nix {
-    pname = "NeoSolarized";
-    version = "2020-08-07";
-    src = fetchFromGitHub {
-      owner = "overcache";
-      repo = "NeoSolarized";
-      rev = "b94b1a9ad51e2de015266f10fdc6e142f97bd617";
-      sha256 = "019nz56yirpg1ahg8adfafrxznalw056qwm3xjm9kzg6da8j6v48";
-    };
-    meta.homepage = "https://github.com/overcache/NeoSolarized/";
-  };
-
   neoterm = buildVimPluginFrom2Nix {
     pname = "neoterm";
     version = "2022-01-20";
@@ -4295,12 +4464,12 @@ final: prev:
 
   nightfox-nvim = buildVimPluginFrom2Nix {
     pname = "nightfox.nvim";
-    version = "2022-03-27";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "EdenEast";
       repo = "nightfox.nvim";
-      rev = "2b19e2ad758f078b607408b15bdaf39f3beafac6";
-      sha256 = "0xn78z74wldjq7p5xzlbv4562b6i5nha3lj0bc2hv6w9n3m7q494";
+      rev = "0670b85c5322da682498be9f355e050507fa6622";
+      sha256 = "11gzi6kx1f57a6b5w7rqjwh0qah757g9814fw7qv76wc9cwbki1v";
     };
     meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
   };
@@ -4377,18 +4546,6 @@ final: prev:
     meta.homepage = "https://github.com/andersevenrud/nordic.nvim/";
   };
 
-  NrrwRgn = buildVimPluginFrom2Nix {
-    pname = "NrrwRgn";
-    version = "2022-02-13";
-    src = fetchFromGitHub {
-      owner = "chrisbra";
-      repo = "NrrwRgn";
-      rev = "e027db9d94f94947153cd7b5ac9abd04371ab2b0";
-      sha256 = "0mcwyqbfc2m865w44s96ra2k0v1mn5kkkxf8i71iqhvc7fvnrfah";
-    };
-    meta.homepage = "https://github.com/chrisbra/NrrwRgn/";
-  };
-
   nterm-nvim = buildVimPluginFrom2Nix {
     pname = "nterm.nvim";
     version = "2021-11-10";
@@ -4415,12 +4572,12 @@ final: prev:
 
   null-ls-nvim = buildVimPluginFrom2Nix {
     pname = "null-ls.nvim";
-    version = "2022-03-25";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "null-ls.nvim";
-      rev = "7253974f8bd8c805a2a1cf7456b4d47913f4a094";
-      sha256 = "0xy80c1wra3ir8v0ywrrmyswprbzknlwf69q9g33g29zsmgfx9dr";
+      rev = "f3107c3b211d62f53d34cbf0ca100fc948bc42d4";
+      sha256 = "07x55chr28f9azqgjjwv0dnn9l0gm0n4z1wdf6libikbnh9jm522";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
   };
@@ -4463,36 +4620,36 @@ final: prev:
 
   nvim-autopairs = buildVimPluginFrom2Nix {
     pname = "nvim-autopairs";
-    version = "2022-03-25";
+    version = "2022-04-02";
     src = fetchFromGitHub {
       owner = "windwp";
       repo = "nvim-autopairs";
-      rev = "f3ebca37d6ef1ff22d1f2c764a9e619d1fe5f3c7";
-      sha256 = "0w5xsj55iz30khiw4y47h43i40z2ly607bm8hvddpvrd50i5vcz1";
+      rev = "06535b1f1aefc98df464d180efa693bb696736c4";
+      sha256 = "12ii6vap3s2c58fmr01r900cidifr50pdpbl2ssx78w26qvc7qz4";
     };
     meta.homepage = "https://github.com/windwp/nvim-autopairs/";
   };
 
   nvim-base16 = buildVimPluginFrom2Nix {
     pname = "nvim-base16";
-    version = "2022-03-13";
+    version = "2022-03-28";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "nvim-base16";
-      rev = "9893a06a11b448e05c0bd1f44970acbb7712e8ba";
-      sha256 = "0hhlyw9nacyc4pyx2537y145lm9p3s4m4ckh8cwbambp5ypnn8kl";
+      rev = "f3c8eaa6c8c0dcd752aa28042f9435c464349776";
+      sha256 = "18xlhyyg9yq54p6jnq4dri47zfw62xfnx4ci9j9iiiii1dyzwr2z";
     };
     meta.homepage = "https://github.com/RRethy/nvim-base16/";
   };
 
   nvim-bqf = buildVimPluginFrom2Nix {
     pname = "nvim-bqf";
-    version = "2022-03-21";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "kevinhwang91";
       repo = "nvim-bqf";
-      rev = "7d3630f1616c2e5cf9f1c8efc1cf186b9249ce7b";
-      sha256 = "0y9kp05qgs7mmivs52ab26jhiqj1izz4jhj1n4x26zmaqbpw4viw";
+      rev = "d67a9b5173806e3f2297ee42b298d1345acb9c24";
+      sha256 = "1g6jvlx78s4a56p0nxg5z3s2g06snnsyq3bllvqf48qy2s43g286";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
   };
@@ -4523,12 +4680,12 @@ final: prev:
 
   nvim-cmp = buildVimPluginFrom2Nix {
     pname = "nvim-cmp";
-    version = "2022-03-22";
+    version = "2022-04-01";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "nvim-cmp";
-      rev = "272cbdca3e327bf43e8df85c6f4f00921656c4e4";
-      sha256 = "1z3nsrkla35sl6d66bjnk0qvqn1a5m8vn670qyb8y9nqs344fy8d";
+      rev = "7dbe34e36d9de4912a5f3aa5279540445765814c";
+      sha256 = "0v5z1m7n6q183l9a6pajfqbg6n2cxdkcpx7xmalyh99x9ax0pazf";
     };
     meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
   };
@@ -4607,24 +4764,24 @@ final: prev:
 
   nvim-dap = buildVimPluginFrom2Nix {
     pname = "nvim-dap";
-    version = "2022-03-25";
+    version = "2022-04-02";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "e6d7ba5847fbe5f33ba211cf28d3cea72cfa9865";
-      sha256 = "0w57cxj07law5igbxvblfk59pv5c8z714dm80njb168ldgy26kz6";
+      rev = "c20c78d7c6c82f16a2d1abec31f4273194e3987b";
+      sha256 = "16vlsydx950s6v1nzpw0h38vmykcp9f3wsaxg09sjvc2isgd4f8b";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
   };
 
   nvim-dap-ui = buildVimPluginFrom2Nix {
     pname = "nvim-dap-ui";
-    version = "2022-03-21";
+    version = "2022-03-29";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "nvim-dap-ui";
-      rev = "45805d69273f1ca0753a096abd419e89af8e5f8a";
-      sha256 = "03jjhsdl0w5w0s7d9a64fmvwdpm1pkvjvd5gh1hgsavbpf0w71mb";
+      rev = "33f33dfced1d7d98e2b934bd663175a062d8db39";
+      sha256 = "00achlynnv1qhs0vqp0q40pzx95bxf9cgsgrpwg6p3fwb2f4ssdi";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
   };
@@ -4667,12 +4824,12 @@ final: prev:
 
   nvim-fzf-commands = buildVimPluginFrom2Nix {
     pname = "nvim-fzf-commands";
-    version = "2021-05-31";
+    version = "2022-03-31";
     src = fetchFromGitHub {
       owner = "vijaymarupudi";
       repo = "nvim-fzf-commands";
-      rev = "c6188c8618ca6b579af37cbc242414e1016bcd45";
-      sha256 = "0nn04gpz3n0jqb9kyxbmipkixzp1lk2f67knxqzzzlxm27m839fy";
+      rev = "015e77ea3185ca9175544e879e2cbb2cfb08323f";
+      sha256 = "1w6s1kl83fyvwycym3i5azcx4q5ryzsjszh6wvk5pxqm2pmzs8lx";
     };
     meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf-commands/";
   };
@@ -4691,12 +4848,12 @@ final: prev:
 
   nvim-gps = buildVimPluginFrom2Nix {
     pname = "nvim-gps";
-    version = "2022-03-27";
+    version = "2022-03-29";
     src = fetchFromGitHub {
       owner = "smiteshp";
       repo = "nvim-gps";
-      rev = "1ad35eada2972c055b181c73852438a6ea51b484";
-      sha256 = "1kv7p2lcilvkvzl9whdkxgg94vk9fa9d1bikwhahxv2zxzk10qkz";
+      rev = "9f2adbce23a383243458f41654c07e57dc1b7635";
+      sha256 = "1gwq7qrbcmh4nqdgl4pv83b8x5wxaks4vxgq3yryjj6n4x5b56fw";
     };
     meta.homepage = "https://github.com/smiteshp/nvim-gps/";
   };
@@ -4715,12 +4872,12 @@ final: prev:
 
   nvim-hlslens = buildVimPluginFrom2Nix {
     pname = "nvim-hlslens";
-    version = "2022-03-20";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "kevinhwang91";
       repo = "nvim-hlslens";
-      rev = "22f7df73283c6f947a56fef0355f5a3ee2971152";
-      sha256 = "1qjy4n0ly5vmkpfyjanqb76jvh6qa5ldqvhgfgxk91b9l35ca95l";
+      rev = "1944094111217db8d40aac697ffc71f16136d9ec";
+      sha256 = "0f0lqldrgzi72qrafzwqk3i71v74xvsrhgrfnidnbnvd3jc7sa0b";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
   };
@@ -4787,36 +4944,36 @@ final: prev:
 
   nvim-lint = buildVimPluginFrom2Nix {
     pname = "nvim-lint";
-    version = "2022-03-09";
+    version = "2022-04-01";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "8cc31931859dc3cc187fd68509f8649599f72cba";
-      sha256 = "006d9l0p86s08vhr5jjm6gi2j27wjbk3c3vfdbq9yi3bz974hgf1";
+      rev = "4040e71c86022cf7937bef5d483156c163df8ca1";
+      sha256 = "0492x97bl0p9kn2fsb6p587m6lsbn4qgdg7k7sr7vrfi73xw4s3k";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
   };
 
   nvim-lsp-ts-utils = buildVimPluginFrom2Nix {
     pname = "nvim-lsp-ts-utils";
-    version = "2022-03-15";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "nvim-lsp-ts-utils";
-      rev = "1d2c585cb69a91cf53f17a90d2544ed10eb03193";
-      sha256 = "07vf3xzcld2h3j6hnrrib60p2gnjkcb96h33sm8kfdvaj1578pbd";
+      rev = "1826275ee0fc7fded65e8716b231db86a17080e3";
+      sha256 = "129zjds8c69hahv307wnpdsjzfh29flsr99lkjma8dymsan96lb0";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/";
   };
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2022-03-23";
+    version = "2022-03-28";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "7d5a6dc46dd2ebaeb74b573922f289ae33089fe7";
-      sha256 = "1dz2q6n2ibq9l2js088wfp2y5md6z8lqs6hy02xajglvb0d9g3fg";
+      rev = "3d1baa811b351078e5711be1a1158e33b074be9e";
+      sha256 = "0470h3vaw6zmmayfd9rzlh5myzmdc2wa5qlfmax21k0jna62zzr1";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -4835,12 +4992,12 @@ final: prev:
 
   nvim-metals = buildVimPluginFrom2Nix {
     pname = "nvim-metals";
-    version = "2022-03-20";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "scalameta";
       repo = "nvim-metals";
-      rev = "3312490ef74ea149121a82fde578a13b1921cef9";
-      sha256 = "0xi13qji716kdbbq579pj7rxbjfkwjrsdp3qvfb937spwzbak2jc";
+      rev = "6da18b24f1215f05c7c7edbf460c93cefb9b5688";
+      sha256 = "1mv41ryxsx6wm909yby6z84xmhw3ibigw8zk34prhyvszz3psmvl";
     };
     meta.homepage = "https://github.com/scalameta/nvim-metals/";
   };
@@ -4895,12 +5052,12 @@ final: prev:
 
   nvim-scrollview = buildVimPluginFrom2Nix {
     pname = "nvim-scrollview";
-    version = "2022-03-15";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "dstein64";
       repo = "nvim-scrollview";
-      rev = "f1cdec5869de70359c8dff06e9057b99a56a0e48";
-      sha256 = "028wvmdbj2fllkw6nr2sasxpamqpl3gmrzdn8lw2bjfzy5xf88x1";
+      rev = "0e463065dd2b213d9c6adb00c88000c1bdb5c633";
+      sha256 = "1k47r446a850bxwb70n00w5wz835jgj7sg175nldp6brq4lrd1x5";
     };
     meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
   };
@@ -4919,12 +5076,12 @@ final: prev:
 
   nvim-spectre = buildVimPluginFrom2Nix {
     pname = "nvim-spectre";
-    version = "2022-03-22";
+    version = "2022-03-28";
     src = fetchFromGitHub {
       owner = "nvim-pack";
       repo = "nvim-spectre";
-      rev = "3bbf9cb2e36200d67c150d71d49011c133d3bbb8";
-      sha256 = "1jif3knz78mqf6sgckfwin1wx6ad4wppdc2y0hcxlj2kwm17xqzk";
+      rev = "fbb03990539d5d484fe10de805772b4b86792c1a";
+      sha256 = "1iw4gnsc72r5rj7z5g3jbxqcnfzzhi9r84zpik8pfjnx8r79ncnj";
     };
     meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
   };
@@ -4943,24 +5100,24 @@ final: prev:
 
   nvim-tree-lua = buildVimPluginFrom2Nix {
     pname = "nvim-tree.lua";
-    version = "2022-03-27";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "kyazdani42";
       repo = "nvim-tree.lua";
-      rev = "524758a207f9c5bf3888b446d9f93192a837b8a7";
-      sha256 = "0kz7qhirm7gkklmyysanndm4pimvfm0p0qzz3q96hv01hpm3d17y";
+      rev = "924aa290921426682f86495cf64f48fcdab3c2fd";
+      sha256 = "01wn4vfk23ciyd69drh49jz67x254dn0q6k55akqc9pxlllds4pg";
     };
     meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
   };
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2022-03-27";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "b995eebe84df88092a41cbfd591bfc1565f70d8e";
-      sha256 = "1738mssq22n1njrpi004apgfv00fxn7yx00r3175qn57bjw9bks9";
+      rev = "f083b7bbfe9480df00a45ab5a0978cb2586dddf2";
+      sha256 = "0zhgkbzr2hnwy94zfg2mk9l364rcmw7z2bvhbbriywg5k7drpla8";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -5003,12 +5160,12 @@ final: prev:
 
   nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-textobjects";
-    version = "2022-03-25";
+    version = "2022-03-29";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-textobjects";
-      rev = "2885b60e9f9b90b4e2a32b0f8adf8571bf1f390e";
-      sha256 = "0q1dph3pz2ygz1wccjgcdfqyb4faj47rv2v9a4p4ngw2vd00qjgy";
+      rev = "c4b41e42dad700b23c6ea86ecb69c9deb55a8fbb";
+      sha256 = "1l8fbn1rvyifvaplmyp38sf73payy1wlglnrb5xl4dxpcfd6yvzc";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
   };
@@ -5039,12 +5196,12 @@ final: prev:
 
   nvim-ts-rainbow = buildVimPluginFrom2Nix {
     pname = "nvim-ts-rainbow";
-    version = "2022-03-20";
+    version = "2022-04-02";
     src = fetchFromGitHub {
       owner = "p00f";
       repo = "nvim-ts-rainbow";
-      rev = "af1a18d2577ba0be5b59bc4b32aebd2569ff085e";
-      sha256 = "1z100akjipzp3zyr7d54vbwwf53dj4f8y8qzf7fv32la142a7idq";
+      rev = "dee11b86ae2419e3f7484197c597a0e634a37a56";
+      sha256 = "1rmv8lmxx4ji4lacgws3vfaaj8df2zbc3vs6sbj9mmzmfg3q38py";
     };
     meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
   };
@@ -5099,12 +5256,12 @@ final: prev:
 
   nvimdev-nvim = buildVimPluginFrom2Nix {
     pname = "nvimdev.nvim";
-    version = "2022-03-15";
+    version = "2022-03-28";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvimdev.nvim";
-      rev = "cb0fcc1cdbe3864554a7b1ecbe706eb4de4ec680";
-      sha256 = "063fyzawn6i67cv3221s282ln5gpms3qw97blrd80l18syykj2b9";
+      rev = "ebe8f689a9867c6ce57d748a80a2157b49764f13";
+      sha256 = "0r07x8i7w9rk8n1zrdyvqr9pfjv3dihb2hy1100jl4xxc11g43an";
     };
     meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
   };
@@ -5135,12 +5292,12 @@ final: prev:
 
   octo-nvim = buildVimPluginFrom2Nix {
     pname = "octo.nvim";
-    version = "2022-02-28";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "5e461b944fbf9b6207cf06102ca09fd7778854f7";
-      sha256 = "0s04m3xg98sj74fhhvdmafijmjhpa70hgcylg43yxlgdcscqbd72";
+      rev = "50d58b195ea1f1ac620d775f39c95fe524f051d1";
+      sha256 = "0cmzb6cp8n8jwzjmv3h0ikv5gn3dn3aq8kgsnmrkqlafh19692rr";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
   };
@@ -5183,12 +5340,12 @@ final: prev:
 
   onedarkpro-nvim = buildVimPluginFrom2Nix {
     pname = "onedarkpro.nvim";
-    version = "2022-03-25";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "onedarkpro.nvim";
-      rev = "46b0ffb97f3778a1f6f5da6471a42f3f64bbf238";
-      sha256 = "13gyfz9fxgzvmcwwv19f8csmanv52144gvr5xdgvcg5nygkmydcp";
+      rev = "86d633963bfbd6ff5448589a20a41deb8c19f90e";
+      sha256 = "0nrq65gd2arxg4r0sqh4y4ikaadlrsbgcz1zq7yfpfbb76cia26w";
     };
     meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
   };
@@ -5231,12 +5388,12 @@ final: prev:
 
   orgmode = buildVimPluginFrom2Nix {
     pname = "orgmode";
-    version = "2022-03-10";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "nvim-orgmode";
       repo = "orgmode";
-      rev = "e1f3054987ce054525258d9a3cc5837bf6e75212";
-      sha256 = "0hwsajd7lhc04da7yzx770f3bgn2jsibcg1pjhxyib1prr17mpy0";
+      rev = "8e52714a1851bb3c781a744489c31bf8fb2c4e28";
+      sha256 = "1h3rzab981y0yp7kfkjpgjlj03kf6lyxxg2wikbdbkyz1c2bbkvk";
     };
     meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
   };
@@ -5363,24 +5520,24 @@ final: prev:
 
   playground = buildVimPluginFrom2Nix {
     pname = "playground";
-    version = "2022-02-16";
+    version = "2022-03-30";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "playground";
-      rev = "9df82a27a49e1c14e9d7416b537517a79d675086";
-      sha256 = "1hhrcsrgcy3vqxn9gsm68r77n6z5bw4cr0r47darffan5rxykz21";
+      rev = "7dbcd4d647010a80d135804b3fc1da3fb77083d6";
+      sha256 = "0g7rqw2vm00rrbbnhc8b9hyljc7q8qc0lywg63lkj63ks9j4m8y7";
     };
     meta.homepage = "https://github.com/nvim-treesitter/playground/";
   };
 
   plenary-nvim = buildVimPluginFrom2Nix {
     pname = "plenary.nvim";
-    version = "2022-03-20";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "plenary.nvim";
-      rev = "0d660152000a40d52158c155625865da2aa7aa1b";
-      sha256 = "0r8amnlaqxg9jpqk6v4rzlfrc8q161jy1bpy35jrk7gva76kp9hm";
+      rev = "f9c65cd76ffa76a0818923c6bce5771687dfe64c";
+      sha256 = "1kgi4q7n8m0hv6hn82bs8xhm8n34qmzcq4l8prki1127gfa2gpqj";
     };
     meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
   };
@@ -5436,28 +5593,16 @@ final: prev:
 
   presenting-vim = buildVimPluginFrom2Nix {
     pname = "presenting.vim";
-    version = "2021-06-02";
+    version = "2022-03-27";
     src = fetchFromGitHub {
       owner = "sotte";
       repo = "presenting.vim";
-      rev = "fd826318582ffccf2f79aff7bef365d68f2ca4fc";
-      sha256 = "1s2c44ngv5vpszwg0nkcghb5flzq9pby1m0l7gr7vwb9p7xl3b83";
+      rev = "e960e204d8e4526d2650c23eaea908317c6becb9";
+      sha256 = "1hpid82gdczis0g0pxvx445n2wg7j4zx66fm43zxq08kcv3k5ara";
     };
     meta.homepage = "https://github.com/sotte/presenting.vim/";
   };
 
-  PreserveNoEOL = buildVimPluginFrom2Nix {
-    pname = "PreserveNoEOL";
-    version = "2013-06-14";
-    src = fetchFromGitHub {
-      owner = "vim-scripts";
-      repo = "PreserveNoEOL";
-      rev = "940e3ce90e54d8680bec1135a21dcfbd6c9bfb62";
-      sha256 = "1726jpr2zf6jrb00pp082ikbx4mll3a877pnzs6i18f9fgpaqqgd";
-    };
-    meta.homepage = "https://github.com/vim-scripts/PreserveNoEOL/";
-  };
-
   prev_indent = buildVimPluginFrom2Nix {
     pname = "prev_indent";
     version = "2014-03-08";
@@ -5539,23 +5684,10 @@ final: prev:
       repo = "pywal.nvim";
       rev = "bd58195939d31dd0f15a720fba2956e91598cefe";
       sha256 = "10fs5assp96rvlcxckd8cwnkfwfckjmf0j8cqq91vb2wx8knxc8g";
-      fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/";
   };
 
-  QFEnter = buildVimPluginFrom2Nix {
-    pname = "QFEnter";
-    version = "2020-10-09";
-    src = fetchFromGitHub {
-      owner = "yssl";
-      repo = "QFEnter";
-      rev = "df0a75b287c210f98ae353a12bbfdaf73d858beb";
-      sha256 = "0gdp7nmjlp8ng2rp2v66d8bincnkwrqqpbggb079f0f9szrqlp54";
-    };
-    meta.homepage = "https://github.com/yssl/QFEnter/";
-  };
-
   quick-scope = buildVimPluginFrom2Nix {
     pname = "quick-scope";
     version = "2022-01-29";
@@ -5676,18 +5808,6 @@ final: prev:
     meta.homepage = "https://github.com/ryvnf/readline.vim/";
   };
 
-  Recover-vim = buildVimPluginFrom2Nix {
-    pname = "Recover.vim";
-    version = "2015-08-14";
-    src = fetchFromGitHub {
-      owner = "chrisbra";
-      repo = "Recover.vim";
-      rev = "efa491f6121f65e025f42d79a93081abb8db69d4";
-      sha256 = "17szim82bwnhf9q4n0n4jfmqkmhq6p0lh0j4y77a2x6lkn0pns5s";
-    };
-    meta.homepage = "https://github.com/chrisbra/Recover.vim/";
-  };
-
   refactoring-nvim = buildVimPluginFrom2Nix {
     pname = "refactoring.nvim";
     version = "2022-03-23";
@@ -5712,18 +5832,6 @@ final: prev:
     meta.homepage = "https://github.com/tversteeg/registers.nvim/";
   };
 
-  Rename = buildVimPluginFrom2Nix {
-    pname = "Rename";
-    version = "2011-08-31";
-    src = fetchFromGitHub {
-      owner = "vim-scripts";
-      repo = "Rename";
-      rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34";
-      sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r";
-    };
-    meta.homepage = "https://github.com/vim-scripts/Rename/";
-  };
-
   renamer-nvim = buildVimPluginFrom2Nix {
     pname = "renamer.nvim";
     version = "2022-01-15";
@@ -5736,18 +5844,6 @@ final: prev:
     meta.homepage = "https://github.com/filipdutescu/renamer.nvim/";
   };
 
-  ReplaceWithRegister = buildVimPluginFrom2Nix {
-    pname = "ReplaceWithRegister";
-    version = "2014-10-31";
-    src = fetchFromGitHub {
-      owner = "vim-scripts";
-      repo = "ReplaceWithRegister";
-      rev = "832efc23111d19591d495dc72286de2fb0b09345";
-      sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g";
-    };
-    meta.homepage = "https://github.com/vim-scripts/ReplaceWithRegister/";
-  };
-
   rest-nvim = buildVimPluginFrom2Nix {
     pname = "rest.nvim";
     version = "2022-01-26";
@@ -5880,18 +5976,6 @@ final: prev:
     meta.homepage = "https://github.com/vmware-archive/salt-vim/";
   };
 
-  SchemaStore-nvim = buildVimPluginFrom2Nix {
-    pname = "SchemaStore.nvim";
-    version = "2022-03-25";
-    src = fetchFromGitHub {
-      owner = "b0o";
-      repo = "SchemaStore.nvim";
-      rev = "f665a87f88b7b891aa5e1f91236b5bab29c2faaf";
-      sha256 = "1i90yyrm7ji8wf3if431al9ggcnps37k3lsnga3ixqa5pr7xsrg9";
-    };
-    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
-  };
-
   scrollbar-nvim = buildVimPluginFrom2Nix {
     pname = "scrollbar.nvim";
     version = "2021-11-16";
@@ -5976,30 +6060,6 @@ final: prev:
     meta.homepage = "https://github.com/osyo-manga/shabadou.vim/";
   };
 
-  Shade-nvim = buildVimPluginFrom2Nix {
-    pname = "Shade.nvim";
-    version = "2022-02-01";
-    src = fetchFromGitHub {
-      owner = "sunjon";
-      repo = "Shade.nvim";
-      rev = "4286b5abc47d62d0c9ffb22a4f388b7bf2ac2461";
-      sha256 = "0mb0cnf8065qmjq85hlgb4a1mqk1nwl7966l1imb54hpzw828rzl";
-    };
-    meta.homepage = "https://github.com/sunjon/Shade.nvim/";
-  };
-
-  ShowMultiBase = buildVimPluginFrom2Nix {
-    pname = "ShowMultiBase";
-    version = "2010-10-18";
-    src = fetchFromGitHub {
-      owner = "vim-scripts";
-      repo = "ShowMultiBase";
-      rev = "85a39fd12668ce973d3d9282263912b2b8f0d338";
-      sha256 = "0hg5352ahzgh2kwqha5v8ai024fld93xag93hb53wjf5b8nzsz8i";
-    };
-    meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/";
-  };
-
   sideways-vim = buildVimPluginFrom2Nix {
     pname = "sideways.vim";
     version = "2022-02-12";
@@ -6013,18 +6073,6 @@ final: prev:
     meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
   };
 
-  SimpylFold = buildVimPluginFrom2Nix {
-    pname = "SimpylFold";
-    version = "2021-11-04";
-    src = fetchFromGitHub {
-      owner = "tmhedberg";
-      repo = "SimpylFold";
-      rev = "b4a87e509c3d873238a39d1c85d0b97d6819f283";
-      sha256 = "0ff5x7ay67wn9c0mi8sb6110i93zrf97c4whg0bd7pr2nmadpvk0";
-    };
-    meta.homepage = "https://github.com/tmhedberg/SimpylFold/";
-  };
-
   skim-vim = buildVimPluginFrom2Nix {
     pname = "skim.vim";
     version = "2020-11-11";
@@ -6051,12 +6099,12 @@ final: prev:
 
   slimv = buildVimPluginFrom2Nix {
     pname = "slimv";
-    version = "2022-02-11";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "kovisoft";
       repo = "slimv";
-      rev = "1b88c3a67948b446720883ed8eadb8c2b83a21ef";
-      sha256 = "0m0kkc75ifg7lvk8p3vgq5iy8hr254ywj7hhjgxwzm2zbrwkr04s";
+      rev = "eb5856c616466b0f463e27a30965ea142003a552";
+      sha256 = "1c4hprzqzxkf0yqkqc8261qr7xk817nm28cp38dw4z1rmjcg1l04";
     };
     meta.homepage = "https://github.com/kovisoft/slimv/";
   };
@@ -6099,12 +6147,12 @@ final: prev:
 
   sonokai = buildVimPluginFrom2Nix {
     pname = "sonokai";
-    version = "2022-03-21";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "sonokai";
-      rev = "774ccdb95a04539530be34fa17a34c0f64139aca";
-      sha256 = "1myz05j6i7h0yyffbip6a2gpfb61y35w48aa1wlh8i3m9bhy7g4a";
+      rev = "444e40de8dac0afb3654b860d4d005cb34547840";
+      sha256 = "10jnvax4fmvmgham3s632j7v7f3cbz96yxciscx9rrsfgcrlm9d4";
     };
     meta.homepage = "https://github.com/sainnhe/sonokai/";
   };
@@ -6133,30 +6181,6 @@ final: prev:
     meta.homepage = "https://github.com/liuchengxu/space-vim/";
   };
 
-  SpaceCamp = buildVimPluginFrom2Nix {
-    pname = "SpaceCamp";
-    version = "2021-04-07";
-    src = fetchFromGitHub {
-      owner = "jaredgorski";
-      repo = "SpaceCamp";
-      rev = "376af5c2204de61726ea86b596acb2dab9795e1f";
-      sha256 = "0h3wxkswd5z9y46d6272sr210i73j5pwf5faw7qhr1plilfgx4gb";
-    };
-    meta.homepage = "https://github.com/jaredgorski/SpaceCamp/";
-  };
-
-  Spacegray-vim = buildVimPluginFrom2Nix {
-    pname = "Spacegray.vim";
-    version = "2021-07-06";
-    src = fetchFromGitHub {
-      owner = "ackyshake";
-      repo = "Spacegray.vim";
-      rev = "c699ca10ed421c462bd1c87a158faaa570dc8e28";
-      sha256 = "0ma8w6p5jh6llka49x5j5ql8fmhv0bx5hhsn5b2phak79yqg1k61";
-    };
-    meta.homepage = "https://github.com/ackyshake/Spacegray.vim/";
-  };
-
   spacevim = buildVimPluginFrom2Nix {
     pname = "spacevim";
     version = "2018-03-29";
@@ -6169,18 +6193,6 @@ final: prev:
     meta.homepage = "https://github.com/ctjhoa/spacevim/";
   };
 
-  SpaceVim = buildVimPluginFrom2Nix {
-    pname = "SpaceVim";
-    version = "2022-03-27";
-    src = fetchFromGitHub {
-      owner = "SpaceVim";
-      repo = "SpaceVim";
-      rev = "a8d183fdd97de3c1ee54c0e5f0efe9e95a19d866";
-      sha256 = "0rhpasj5jw7jhij6pqjrsb48gwf4hrpadh8ab9d611v6akkkxlvv";
-    };
-    meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
-  };
-
   sparkup = buildVimPluginFrom2Nix {
     pname = "sparkup";
     version = "2012-06-11";
@@ -6231,12 +6243,12 @@ final: prev:
 
   splitjoin-vim = buildVimPluginFrom2Nix {
     pname = "splitjoin.vim";
-    version = "2022-03-21";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "AndrewRadev";
       repo = "splitjoin.vim";
-      rev = "c32b18751a81715e3c13cff22fea9fb5ce31ef35";
-      sha256 = "12kp185ndag507b7l4qvhr369zyikwgh0wyi9lrjyr2ar5impjqc";
+      rev = "dbcd3069fb2b4ecfdd964c1e93aa59fcf7f850b6";
+      sha256 = "1rgc9cbfpjnk8pf7wh9pyyljckbn1i88z5bggyn15q3lfhskvidc";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -6326,18 +6338,6 @@ final: prev:
     meta.homepage = "https://github.com/lambdalisue/suda.vim/";
   };
 
-  SudoEdit-vim = buildVimPluginFrom2Nix {
-    pname = "SudoEdit.vim";
-    version = "2020-02-27";
-    src = fetchFromGitHub {
-      owner = "chrisbra";
-      repo = "SudoEdit.vim";
-      rev = "e203eada5b563e9134ce2aae26b09edae0904fd7";
-      sha256 = "0pf9iix50pw3p430ky51rv11ra1hppdpwa5flzcd5kciybr76n0n";
-    };
-    meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/";
-  };
-
   supertab = buildVimPluginFrom2Nix {
     pname = "supertab";
     version = "2021-04-30";
@@ -6510,12 +6510,12 @@ final: prev:
 
   tagbar = buildVimPluginFrom2Nix {
     pname = "tagbar";
-    version = "2022-03-15";
+    version = "2022-03-28";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "tagbar";
-      rev = "69659cfc9d081caf31c8d548dd4c19593839317b";
-      sha256 = "1wdrn0zvqhz7pd0rgl5z3zri3sy4hb947nmw9imvwi62mpdhsh7d";
+      rev = "2137c1437012afc82b5d50404b1404aec8699f7b";
+      sha256 = "099000mv3d2l7aidvrwgfrks48xa5xv38fvqrs6svabqg20k2wwk";
     };
     meta.homepage = "https://github.com/preservim/tagbar/";
   };
@@ -6594,12 +6594,12 @@ final: prev:
 
   telescope-coc-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-coc.nvim";
-    version = "2022-02-21";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "fannheyward";
       repo = "telescope-coc.nvim";
-      rev = "33a8785dc0d0a5fdd243875eba48bfec95e2cebc";
-      sha256 = "1zf4x7jwy0p52nq2yhzap9bi8kc4npbdvxs6gbwy9kd1ddidfrkb";
+      rev = "9748123aafbe915f34ddcfe583fc868f301f51ba";
+      sha256 = "0kvwp5bpqw5vygacrq9cdr3237w7fmj3sqx1vk12sxbx85cdcvz9";
     };
     meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/";
   };
@@ -6787,12 +6787,12 @@ final: prev:
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope.nvim";
-    version = "2022-03-26";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "cf2d6d34282afd90f0f5d2aba265a23b068494c2";
-      sha256 = "042w0l8hdcxaj3pmbp0w1mqmivfm48pv3vlcz6d423qiljbkrk9k";
+      rev = "6e7ee3829225d5c97c1ebfff686050142ffe5867";
+      sha256 = "0qlv63jll4ja4x2njxvz1h9mlh92akzif06qy8gr7f61gfvfaaca";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -6968,12 +6968,12 @@ final: prev:
 
   toggleterm-nvim = buildVimPluginFrom2Nix {
     pname = "toggleterm.nvim";
-    version = "2022-03-24";
+    version = "2022-04-02";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "toggleterm.nvim";
-      rev = "9f969e7f72d19966756318d61f2562f67dbb1f9c";
-      sha256 = "118hwkn9cw2wsqigqvbpvbhbag6ywc325lvn088dfpzbn9k7vfmr";
+      rev = "5733b24c684d202f978ccedca4a8c7571889bf28";
+      sha256 = "00z21wvgjks5mqrqja1kc1wnwxpjyy2fl3sn8f16692hz2wcavrd";
     };
     meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
   };
@@ -7038,18 +7038,6 @@ final: prev:
     meta.homepage = "https://github.com/folke/trouble.nvim/";
   };
 
-  TrueZen-nvim = buildVimPluginFrom2Nix {
-    pname = "TrueZen.nvim";
-    version = "2021-10-12";
-    src = fetchFromGitHub {
-      owner = "Pocco81";
-      repo = "TrueZen.nvim";
-      rev = "508b977d71650da5c9243698614a9a1416f116d4";
-      sha256 = "0sr4y1mg83l28l5ias2pv0gxkcgwailfjn2skx35z63f2il3zkbx";
-    };
-    meta.homepage = "https://github.com/Pocco81/TrueZen.nvim/";
-  };
-
   tslime-vim = buildVimPluginFrom2Nix {
     pname = "tslime.vim";
     version = "2020-09-09";
@@ -7148,12 +7136,12 @@ final: prev:
 
   urlview-nvim = buildVimPluginFrom2Nix {
     pname = "urlview.nvim";
-    version = "2022-03-29";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "axieax";
       repo = "urlview.nvim";
-      rev = "4ca1b22d914ff3187acd5a9486421769928c9d8f";
-      sha256 = "1vy977y7favs76mpk6v3x18ph40y0d20kmm6bssvnlql1nh3ihbd";
+      rev = "8815c06145f36dce7734ba4b95eb50c3e24074c4";
+      sha256 = "1n46x1v2rw70ad6b6z04ik9rjvpkl8bbw62l8wfn7lkzdjgwi50d";
     };
     meta.homepage = "https://github.com/axieax/urlview.nvim/";
   };
@@ -7170,18 +7158,6 @@ final: prev:
     meta.homepage = "https://github.com/vim-scripts/utl.vim/";
   };
 
-  vader-vim = buildVimPluginFrom2Nix {
-    pname = "vader.vim";
-    version = "2020-02-13";
-    src = fetchFromGitHub {
-      owner = "junegunn";
-      repo = "vader.vim";
-      rev = "6fff477431ac3191c69a3a5e5f187925466e275a";
-      sha256 = "153cr1mrf5w5lyr8374brwx1z5yl9h0cnijxnd3xikh3yi3pbmwk";
-    };
-    meta.homepage = "https://github.com/junegunn/vader.vim/";
-  };
-
   vCoolor-vim = buildVimPluginFrom2Nix {
     pname = "vCoolor.vim";
     version = "2020-10-14";
@@ -7194,6 +7170,18 @@ final: prev:
     meta.homepage = "https://github.com/KabbAmine/vCoolor.vim/";
   };
 
+  vader-vim = buildVimPluginFrom2Nix {
+    pname = "vader.vim";
+    version = "2020-02-13";
+    src = fetchFromGitHub {
+      owner = "junegunn";
+      repo = "vader.vim";
+      rev = "6fff477431ac3191c69a3a5e5f187925466e275a";
+      sha256 = "153cr1mrf5w5lyr8374brwx1z5yl9h0cnijxnd3xikh3yi3pbmwk";
+    };
+    meta.homepage = "https://github.com/junegunn/vader.vim/";
+  };
+
   venn-nvim = buildVimPluginFrom2Nix {
     pname = "venn.nvim";
     version = "2021-10-19";
@@ -7220,16 +7208,88 @@ final: prev:
 
   vifm-vim = buildVimPluginFrom2Nix {
     pname = "vifm.vim";
-    version = "2022-03-24";
+    version = "2022-03-28";
     src = fetchFromGitHub {
       owner = "vifm";
       repo = "vifm.vim";
-      rev = "11d8fb106515a4c4e6016742053356c9f0434fed";
-      sha256 = "1gjaqmkrxg5x6mpb7dnznbbzrv3iadcw7snxjx7bzmr0b24mddcp";
+      rev = "069349e5dbba9fbb24b88ebedb89f728387fae79";
+      sha256 = "1rrzhg8qpvgvcm9fkr05hmkw95gn37pys0h0d6rii6qhbx9z95vs";
     };
     meta.homepage = "https://github.com/vifm/vifm.vim/";
   };
 
+  vim-CtrlXA = buildVimPluginFrom2Nix {
+    pname = "vim-CtrlXA";
+    version = "2021-08-09";
+    src = fetchFromGitHub {
+      owner = "Konfekt";
+      repo = "vim-CtrlXA";
+      rev = "404ea1e055921db5679b3734108d72850d6faa76";
+      sha256 = "10bgyqnwcqly3sxl27np1b690hnj1snqbcvg8pzh4zgdysfgy9xg";
+    };
+    meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/";
+  };
+
+  vim-DetectSpellLang = buildVimPluginFrom2Nix {
+    pname = "vim-DetectSpellLang";
+    version = "2022-03-15";
+    src = fetchFromGitHub {
+      owner = "konfekt";
+      repo = "vim-DetectSpellLang";
+      rev = "d5b55e3307e72e45f8d736818c76884016583538";
+      sha256 = "0l9bdgqaxfpndpf4v5kxn34zx5pnhf62chp4flzyyhhzlz52dqjw";
+    };
+    meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/";
+  };
+
+  vim-LanguageTool = buildVimPluginFrom2Nix {
+    pname = "vim-LanguageTool";
+    version = "2021-02-08";
+    src = fetchFromGitHub {
+      owner = "dpelle";
+      repo = "vim-LanguageTool";
+      rev = "0372ffae78aa3eac3bfa48ba3bf2f4015a86385a";
+      sha256 = "00476l49lczj1rw5gb6vs7s9r0zi1khw0g1v6bsfwl5r32699l7r";
+    };
+    meta.homepage = "https://github.com/dpelle/vim-LanguageTool/";
+  };
+
+  vim-ReplaceWithRegister = buildVimPluginFrom2Nix {
+    pname = "vim-ReplaceWithRegister";
+    version = "2021-07-05";
+    src = fetchFromGitHub {
+      owner = "inkarkat";
+      repo = "vim-ReplaceWithRegister";
+      rev = "aad1e8fa31cb4722f20fe40679caa56e25120032";
+      sha256 = "1cfgixq5smwbp55x2baaj1kw736w2mykysppphair44vb4w9rlgm";
+    };
+    meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithRegister/";
+  };
+
+  vim-ReplaceWithSameIndentRegister = buildVimPluginFrom2Nix {
+    pname = "vim-ReplaceWithSameIndentRegister";
+    version = "2020-06-17";
+    src = fetchFromGitHub {
+      owner = "inkarkat";
+      repo = "vim-ReplaceWithSameIndentRegister";
+      rev = "0b7f542560bd21822a004e8accdf472eb477c9cf";
+      sha256 = "04zvhqh9rjfiwfk8r0zci608pw09svqb42nvp8pvqb11xp2ydg2y";
+    };
+    meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithSameIndentRegister/";
+  };
+
+  vim-SyntaxRange = buildVimPluginFrom2Nix {
+    pname = "vim-SyntaxRange";
+    version = "2021-01-16";
+    src = fetchFromGitHub {
+      owner = "inkarkat";
+      repo = "vim-SyntaxRange";
+      rev = "3a7fd9ff50fabafe61df12522ed2f275c8e2f45e";
+      sha256 = "1b5xyacbn87z8wkacjpnjk82xmxzivlb111427kwb5kxxdh4w7gq";
+    };
+    meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/";
+  };
+
   vim-abolish = buildVimPluginFrom2Nix {
     pname = "vim-abolish";
     version = "2021-03-20";
@@ -7484,12 +7544,12 @@ final: prev:
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2022-03-23";
+    version = "2022-03-30";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "a306a7abfd8b4450fcfdc0384dadb996148d2c1b";
-      sha256 = "0qvz41rpdbcsszh0n4jhjrw9anyzsh4r1j694a3ryjj58gg9smjy";
+      rev = "dc65eea5d9225758d4556278b3d808baa6ab4d0e";
+      sha256 = "1mkfssssgsaqx770rarpgryp4zimfq7ljv14jzmb2bqx9iyqz5xb";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline/";
   };
@@ -7784,12 +7844,12 @@ final: prev:
 
   vim-bufkill = buildVimPluginFrom2Nix {
     pname = "vim-bufkill";
-    version = "2020-08-04";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "qpkorr";
       repo = "vim-bufkill";
-      rev = "2bd6d7e791668ea52bb26be2639406fcf617271f";
-      sha256 = "1cvma03bg9psil67kg1x90lny7a31ljz5shybcl1jrfpzsybcqvg";
+      rev = "ba6253de82f982722ef7eaee6751d788aefd568a";
+      sha256 = "187pj4dw78xd3wlpf24nll89kggk4q38gi51dnq95qywfk4w2k5h";
     };
     meta.homepage = "https://github.com/qpkorr/vim-bufkill/";
   };
@@ -8024,12 +8084,12 @@ final: prev:
 
   vim-cool = buildVimPluginFrom2Nix {
     pname = "vim-cool";
-    version = "2020-04-18";
+    version = "2022-03-30";
     src = fetchFromGitHub {
       owner = "romainl";
       repo = "vim-cool";
-      rev = "27ad4ecf7532b750fadca9f36e1c5498fc225af2";
-      sha256 = "1in44gf7hs978nc9328zh1kj3jh04kcinw0m8spcbgj079782sg8";
+      rev = "0ad6a212a910cef0aac7af244ee008ddd39a75c2";
+      sha256 = "1jv3nl6vdn562zhd387yggwflncmy7vf89md5kkacmkvjz8rkis5";
     };
     meta.homepage = "https://github.com/romainl/vim-cool/";
   };
@@ -8082,18 +8142,6 @@ final: prev:
     meta.homepage = "https://github.com/ap/vim-css-color/";
   };
 
-  vim-CtrlXA = buildVimPluginFrom2Nix {
-    pname = "vim-CtrlXA";
-    version = "2021-08-09";
-    src = fetchFromGitHub {
-      owner = "Konfekt";
-      repo = "vim-CtrlXA";
-      rev = "404ea1e055921db5679b3734108d72850d6faa76";
-      sha256 = "10bgyqnwcqly3sxl27np1b690hnj1snqbcvg8pzh4zgdysfgy9xg";
-    };
-    meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/";
-  };
-
   vim-cue = buildVimPluginFrom2Nix {
     pname = "vim-cue";
     version = "2021-06-18";
@@ -8178,18 +8226,6 @@ final: prev:
     meta.homepage = "https://github.com/sunaku/vim-dasht/";
   };
 
-  vim-DetectSpellLang = buildVimPluginFrom2Nix {
-    pname = "vim-DetectSpellLang";
-    version = "2022-03-15";
-    src = fetchFromGitHub {
-      owner = "konfekt";
-      repo = "vim-DetectSpellLang";
-      rev = "d5b55e3307e72e45f8d736818c76884016583538";
-      sha256 = "0l9bdgqaxfpndpf4v5kxn34zx5pnhf62chp4flzyyhhzlz52dqjw";
-    };
-    meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/";
-  };
-
   vim-deus = buildVimPluginFrom2Nix {
     pname = "vim-deus";
     version = "2021-03-28";
@@ -8298,18 +8334,6 @@ final: prev:
     meta.homepage = "https://github.com/jhradilek/vim-docbk/";
   };
 
-  vim-docbk-snippets = buildVimPluginFrom2Nix {
-    pname = "vim-docbk-snippets";
-    version = "2021-07-30";
-    src = fetchFromGitHub {
-      owner = "jhradilek";
-      repo = "vim-snippets";
-      rev = "81a8dcb66886a0717e9ca73c8857ee90c3989063";
-      sha256 = "0d6532qx66aiawpq2fdji0mnmvnlg5dnbvds5s4pgzafydikpr70";
-    };
-    meta.homepage = "https://github.com/jhradilek/vim-snippets/";
-  };
-
   vim-easy-align = buildVimPluginFrom2Nix {
     pname = "vim-easy-align";
     version = "2019-04-29";
@@ -8348,12 +8372,12 @@ final: prev:
 
   vim-easymotion = buildVimPluginFrom2Nix {
     pname = "vim-easymotion";
-    version = "2020-12-17";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "easymotion";
       repo = "vim-easymotion";
-      rev = "d75d9591e415652b25d9e0a3669355550325263d";
-      sha256 = "1j2kgh1iri0fqkbgbgvfjqgsksfipnmr1xbj554i602pnm0hbg19";
+      rev = "b3cfab2a6302b3b39f53d9fd2cd997e1127d7878";
+      sha256 = "1h30ak0ir5320asd5p7a9bqiv5whakv3022b3rakgnsjg503nxz1";
     };
     meta.homepage = "https://github.com/easymotion/vim-easymotion/";
   };
@@ -8384,12 +8408,12 @@ final: prev:
 
   vim-elixir = buildVimPluginFrom2Nix {
     pname = "vim-elixir";
-    version = "2022-01-26";
+    version = "2022-03-29";
     src = fetchFromGitHub {
       owner = "elixir-editors";
       repo = "vim-elixir";
-      rev = "ff7a1223dfc5386c41bb582039a90a262d488607";
-      sha256 = "0a82c6vmdjfq1cjiakdxd9mz0ivqivrjcrppqpwch9rzp98qspag";
+      rev = "edf880c41ec1768faafc480433ae72ceffaf4362";
+      sha256 = "14jgwgwynynlipvmr02i9h4q2mc459fz4jyflcngvpyc9ady9ald";
     };
     meta.homepage = "https://github.com/elixir-editors/vim-elixir/";
   };
@@ -8420,12 +8444,12 @@ final: prev:
 
   vim-endwise = buildVimPluginFrom2Nix {
     pname = "vim-endwise";
-    version = "2022-03-24";
+    version = "2022-03-29";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-endwise";
-      rev = "8faf48b69b04af120e162ce113ea21eac322e3b4";
-      sha256 = "0zfgsqs2mal1yh8x4lj1kx2ib80clsh9s9swh44cq5ga5glfkyn8";
+      rev = "720b3ee46a86fe8858baeed473e11bca54b997a9";
+      sha256 = "1rql1zbzi1ffj0bdw4qkm1rbb5zscxqaml0rx0rh4y3zr7ny7vny";
     };
     meta.homepage = "https://github.com/tpope/vim-endwise/";
   };
@@ -8480,12 +8504,12 @@ final: prev:
 
   vim-eunuch = buildVimPluginFrom2Nix {
     pname = "vim-eunuch";
-    version = "2022-03-23";
+    version = "2022-03-31";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-eunuch";
-      rev = "01aa41b276b45e2df2cb680ab38e78ea7e5786c1";
-      sha256 = "149hnk9ja9vnw5vr7axliyqh0l2xz6i4l3lngdlzi1xic0xfwxf5";
+      rev = "c70b0ed50b5c0d806df012526104fc5342753749";
+      sha256 = "1pj6rzdwalnv3x8xdgfsqh79pc21b0lhlp6ry5yzjcprghw1547d";
     };
     meta.homepage = "https://github.com/tpope/vim-eunuch/";
   };
@@ -8540,12 +8564,12 @@ final: prev:
 
   vim-fireplace = buildVimPluginFrom2Nix {
     pname = "vim-fireplace";
-    version = "2022-03-11";
+    version = "2022-04-02";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fireplace";
-      rev = "49f213283ffd79e1a397a30ce9e11849eaacf8e1";
-      sha256 = "0lk6xxbf111p1d75vagfhf1qydm1mzm4xycmyydfr46acy6a8hbk";
+      rev = "2e4540d62fd49523a3aefeab896a33ed6bbcb43b";
+      sha256 = "0h6ij4r5i6i72hkn8w7gw69asga7ka5addl74n2i1jhaznn7q1kb";
     };
     meta.homepage = "https://github.com/tpope/vim-fireplace/";
   };
@@ -8672,12 +8696,12 @@ final: prev:
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2022-03-26";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "321328c6c5901a597348155fc0e83b800544dcb0";
-      sha256 = "11sd87c9vw1gs9pkvv0y24yqhkack0yxv5mg50ss6v7mjjdngv66";
+      rev = "cba863444c9e970bc7282f76df0f559b5fc830bd";
+      sha256 = "09g9cgs89c02qsjyp3n343dkqkwzr9jwrhn6l51c8c3dclp07870";
     };
     meta.homepage = "https://github.com/tpope/vim-fugitive/";
   };
@@ -8816,12 +8840,12 @@ final: prev:
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2022-03-19";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "dcefd64ba251ffc3d497f8758036735c8f6cc824";
-      sha256 = "1j5jrs7kk59ilqsjs0qk5213psv33xnnifsqrjc7h63p28sv3pnw";
+      rev = "119797938eeb875e91182d6bd86eb001d0ef9029";
+      sha256 = "1rclpd2nf26slz38imq8g5h1pknkwdbgnv4iz04vhq7k3gvls6vk";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
   };
@@ -8922,18 +8946,6 @@ final: prev:
     meta.homepage = "https://github.com/chkno/vim-haskell-module-name/";
   };
 
-  vim-haskellconceal = buildVimPluginFrom2Nix {
-    pname = "vim-haskellconceal";
-    version = "2017-06-15";
-    src = fetchFromGitHub {
-      owner = "twinside";
-      repo = "vim-haskellconceal";
-      rev = "802f82a5afee56e9e1251e6f756104a3bd114234";
-      sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r";
-    };
-    meta.homepage = "https://github.com/twinside/vim-haskellconceal/";
-  };
-
   vim-haskellConcealPlus = buildVimPluginFrom2Nix {
     pname = "vim-haskellConcealPlus";
     version = "2020-01-21";
@@ -8946,6 +8958,18 @@ final: prev:
     meta.homepage = "https://github.com/enomsg/vim-haskellConcealPlus/";
   };
 
+  vim-haskellconceal = buildVimPluginFrom2Nix {
+    pname = "vim-haskellconceal";
+    version = "2017-06-15";
+    src = fetchFromGitHub {
+      owner = "twinside";
+      repo = "vim-haskellconceal";
+      rev = "802f82a5afee56e9e1251e6f756104a3bd114234";
+      sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r";
+    };
+    meta.homepage = "https://github.com/twinside/vim-haskellconceal/";
+  };
+
   vim-hcl = buildVimPluginFrom2Nix {
     pname = "vim-hcl";
     version = "2022-02-25";
@@ -9117,12 +9141,12 @@ final: prev:
 
   vim-illuminate = buildVimPluginFrom2Nix {
     pname = "vim-illuminate";
-    version = "2022-03-13";
+    version = "2022-04-02";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "vim-illuminate";
-      rev = "487563de7ed6195fd46da178cb38dc1ff110c1ce";
-      sha256 = "1k4pzq1gxqpcrx828ywypff1cjrns34rh8q7yz1j8nhlqvgrda9s";
+      rev = "3b9b6481a659bdc37a55f488c92839e3804ca098";
+      sha256 = "1vki4g6gvmr6l9yb1xhv92yix2595b17j7m75ak15k25w1dnig7h";
     };
     meta.homepage = "https://github.com/RRethy/vim-illuminate/";
   };
@@ -9201,12 +9225,12 @@ final: prev:
 
   vim-jack-in = buildVimPluginFrom2Nix {
     pname = "vim-jack-in";
-    version = "2021-03-27";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "clojure-vim";
       repo = "vim-jack-in";
-      rev = "80c69cc021486d1cfa5dac7d9d6ab6954ff20c27";
-      sha256 = "11dw8kngzznzf91n6iyvw7yi1l35vgpva32dck3n25vpxc24krpn";
+      rev = "5467e00e26f15680b0a7998f8aa20d5a7dd44cd5";
+      sha256 = "1wi379l8d793v6hjx11v0dhgdn8a9ihx64gv51v9wpmjlvp9xbzd";
     };
     meta.homepage = "https://github.com/clojure-vim/vim-jack-in/";
   };
@@ -9346,28 +9370,16 @@ final: prev:
 
   vim-kitty-navigator = buildVimPluginFrom2Nix {
     pname = "vim-kitty-navigator";
-    version = "2022-02-04";
+    version = "2022-03-27";
     src = fetchFromGitHub {
       owner = "knubie";
       repo = "vim-kitty-navigator";
-      rev = "8d9af030c8a74cdda6ab9a510d9a13bca80e8f9b";
-      sha256 = "03rf49w3x67aayfn6hl0jhf4gik1scq4khhnvicp1zabdn8cq175";
+      rev = "7bf84bc1253bebb86cbf63efa274a656e1faadc6";
+      sha256 = "126z01zqrpnkhi7kprl8kqwkr5ahxyrnx3pvzzmfqb9320v98d18";
     };
     meta.homepage = "https://github.com/knubie/vim-kitty-navigator/";
   };
 
-  vim-LanguageTool = buildVimPluginFrom2Nix {
-    pname = "vim-LanguageTool";
-    version = "2021-02-08";
-    src = fetchFromGitHub {
-      owner = "dpelle";
-      repo = "vim-LanguageTool";
-      rev = "0372ffae78aa3eac3bfa48ba3bf2f4015a86385a";
-      sha256 = "00476l49lczj1rw5gb6vs7s9r0zi1khw0g1v6bsfwl5r32699l7r";
-    };
-    meta.homepage = "https://github.com/dpelle/vim-LanguageTool/";
-  };
-
   vim-lastplace = buildVimPluginFrom2Nix {
     pname = "vim-lastplace";
     version = "2022-02-22";
@@ -9538,12 +9550,12 @@ final: prev:
 
   vim-lsp = buildVimPluginFrom2Nix {
     pname = "vim-lsp";
-    version = "2022-03-04";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "bfb7541eb88eb9804287af39aca70102e60d2bf0";
-      sha256 = "1kaa92ylw5i8ysb2yxyqf666194wwcixgagi7gq3apkddr35a6g0";
+      rev = "edd6629f0940e37ca988620e404e79e600962a6f";
+      sha256 = "0qc2x0la72xhbbwdrm6iyjlip3pcfj0wk4msi6zfz9zmyrzcfnhb";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
   };
@@ -9911,12 +9923,12 @@ final: prev:
 
   vim-obsession = buildVimPluginFrom2Nix {
     pname = "vim-obsession";
-    version = "2022-03-25";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-obsession";
-      rev = "d2818a614ec3a5d174c6bb19e87e2eeb207f4900";
-      sha256 = "08scgvpc5rmcc6xwbqir1b8y4fx58im5gn55fpg33s5346lxwd62";
+      rev = "7d39576149d17bde3c096fd57e3a2cdae65deaf5";
+      sha256 = "0g716c3dvd7068lfgcbxlzn86529kji4zms5n2xgrn3h0vn722zz";
     };
     meta.homepage = "https://github.com/tpope/vim-obsession/";
   };
@@ -10199,12 +10211,12 @@ final: prev:
 
   vim-plug = buildVimPluginFrom2Nix {
     pname = "vim-plug";
-    version = "2022-01-03";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
-      rev = "e300178a0e2fb04b56de8957281837f13ecf0b27";
-      sha256 = "0bfgadn31n516x0m0kr88jk9x79rl6zllnwij759wpazmw1p0xg8";
+      rev = "93ab5909784e09134e90f15cafa8a5edcc9a00fe";
+      sha256 = "0cq2ilqqq90bpp8pzylqi759hqb9ni6l1rqkvj6aj7a4b29a59nv";
     };
     meta.homepage = "https://github.com/junegunn/vim-plug/";
   };
@@ -10295,12 +10307,12 @@ final: prev:
 
   vim-projectionist = buildVimPluginFrom2Nix {
     pname = "vim-projectionist";
-    version = "2022-03-13";
+    version = "2022-03-29";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
-      rev = "93b2af188fe0937edea414b8e05a362b74f4b31d";
-      sha256 = "13x66y0dp70s2wcz5jkcqyp1r44sn3xdn70khzgl3jlv94ij3s1y";
+      rev = "37f6867fb186191bbc99bfc9d7c465dce4b7f94e";
+      sha256 = "0siigy1p5iwn5nms94w22kzgajyscdzn8mcnwkmhxdzbs2c4nv9w";
     };
     meta.homepage = "https://github.com/tpope/vim-projectionist/";
   };
@@ -10497,30 +10509,6 @@ final: prev:
     meta.homepage = "https://github.com/tpope/vim-repeat/";
   };
 
-  vim-ReplaceWithRegister = buildVimPluginFrom2Nix {
-    pname = "vim-ReplaceWithRegister";
-    version = "2021-07-05";
-    src = fetchFromGitHub {
-      owner = "inkarkat";
-      repo = "vim-ReplaceWithRegister";
-      rev = "aad1e8fa31cb4722f20fe40679caa56e25120032";
-      sha256 = "1cfgixq5smwbp55x2baaj1kw736w2mykysppphair44vb4w9rlgm";
-    };
-    meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithRegister/";
-  };
-
-  vim-ReplaceWithSameIndentRegister = buildVimPluginFrom2Nix {
-    pname = "vim-ReplaceWithSameIndentRegister";
-    version = "2020-06-17";
-    src = fetchFromGitHub {
-      owner = "inkarkat";
-      repo = "vim-ReplaceWithSameIndentRegister";
-      rev = "0b7f542560bd21822a004e8accdf472eb477c9cf";
-      sha256 = "04zvhqh9rjfiwfk8r0zci608pw09svqb42nvp8pvqb11xp2ydg2y";
-    };
-    meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithSameIndentRegister/";
-  };
-
   vim-rhubarb = buildVimPluginFrom2Nix {
     pname = "vim-rhubarb";
     version = "2021-09-13";
@@ -10739,12 +10727,12 @@ final: prev:
 
   vim-sleuth = buildVimPluginFrom2Nix {
     pname = "vim-sleuth";
-    version = "2022-03-26";
+    version = "2022-04-02";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sleuth";
-      rev = "edffd9ee2cfafa3aba291f105a1d4f9f0e2d5701";
-      sha256 = "1rkn4qawz3p0h1pz0g712k3iz72qvapqd8k1f05kbabxymw6yqd7";
+      rev = "aade27e2b1a47ae2261d95a4dd622ca2c3d34227";
+      sha256 = "1xwav2657qhqaxsql50dh20n7r5n97xb2xb990wikf34mi9j4pn4";
     };
     meta.homepage = "https://github.com/tpope/vim-sleuth/";
   };
@@ -10835,12 +10823,12 @@ final: prev:
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2022-03-27";
+    version = "2022-04-02";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "57d23f6f44203374edcbb7d41903a491ec8cbed7";
-      sha256 = "0371pv4pl99icxhbqbqfx7ds1i1kwv1k9p28i5pxayngkyhd7l39";
+      rev = "c6d4b1cfa7a349ca561b86227cb46c4147b9c23c";
+      sha256 = "0idmrcb4xigmds1iwz5rixvdcanqvv0qx7v3yg4d4p1xd4yjsiw1";
     };
     meta.homepage = "https://github.com/honza/vim-snippets/";
   };
@@ -11013,18 +11001,6 @@ final: prev:
     meta.homepage = "https://github.com/machakann/vim-swap/";
   };
 
-  vim-SyntaxRange = buildVimPluginFrom2Nix {
-    pname = "vim-SyntaxRange";
-    version = "2021-01-16";
-    src = fetchFromGitHub {
-      owner = "inkarkat";
-      repo = "vim-SyntaxRange";
-      rev = "3a7fd9ff50fabafe61df12522ed2f275c8e2f45e";
-      sha256 = "1b5xyacbn87z8wkacjpnjk82xmxzivlb111427kwb5kxxdh4w7gq";
-    };
-    meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/";
-  };
-
   vim-table-mode = buildVimPluginFrom2Nix {
     pname = "vim-table-mode";
     version = "2022-03-01";
@@ -11088,12 +11064,12 @@ final: prev:
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2022-03-26";
+    version = "2022-04-04";
     src = fetchFromGitHub {
       owner = "vim-test";
       repo = "vim-test";
-      rev = "56bbfa295fe62123d2ebe8ed57dd002afab46097";
-      sha256 = "0ggk1c5767hjjfg1nwdm880bj9cgj6bgvf25dgjhwx83xxhzpp6d";
+      rev = "d340f840725e6ee1b8abc63e852d80ded496ffc9";
+      sha256 = "08y4x97l0749i6d7qc512irql5zpxdwyzrbsw6h507jq7cvaw8hb";
     };
     meta.homepage = "https://github.com/vim-test/vim-test/";
   };
@@ -11662,18 +11638,6 @@ final: prev:
     meta.homepage = "https://github.com/jreybert/vimagit/";
   };
 
-  VimCompletesMe = buildVimPluginFrom2Nix {
-    pname = "VimCompletesMe";
-    version = "2022-02-18";
-    src = fetchFromGitHub {
-      owner = "ackyshake";
-      repo = "VimCompletesMe";
-      rev = "9adf692d7ae6424038458a89d4a411f0a27d1388";
-      sha256 = "1sndgb3291dyifaa8adri2mb8cgbinbar3nw1fnf67k9ahwycaz0";
-    };
-    meta.homepage = "https://github.com/ackyshake/VimCompletesMe/";
-  };
-
   vimelette = buildVimPluginFrom2Nix {
     pname = "vimelette";
     version = "2019-05-02";
@@ -11698,18 +11662,6 @@ final: prev:
     meta.homepage = "https://github.com/Shougo/vimfiler.vim/";
   };
 
-  VimOrganizer = buildVimPluginFrom2Nix {
-    pname = "VimOrganizer";
-    version = "2020-12-15";
-    src = fetchFromGitHub {
-      owner = "hsitz";
-      repo = "VimOrganizer";
-      rev = "09636aed78441a9de2767fcef6d7c567f322cc40";
-      sha256 = "0phpcxmyz562yyp88rbx9pqg46w8r1lyapb700nvxwvqkcd82pfw";
-    };
-    meta.homepage = "https://github.com/hsitz/VimOrganizer/";
-  };
-
   vimoutliner = buildVimPluginFrom2Nix {
     pname = "vimoutliner";
     version = "2021-04-24";
@@ -11772,12 +11724,12 @@ final: prev:
 
   vimspector = buildVimPluginFrom2Nix {
     pname = "vimspector";
-    version = "2022-03-23";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "puremourning";
       repo = "vimspector";
-      rev = "99ce7a74699f12e05bf6059125d767b05ceb212b";
-      sha256 = "0hj26vyq8cbw5zsq94i4hay27fs9z5xxyniflz975ddii8189qa9";
+      rev = "da851334c72c44de95d00a152f98ee8e628be68f";
+      sha256 = "16390g548y5bp6c08d481jafav83rbg4zd69r6fbfcnhzxmv7vhs";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -11785,12 +11737,12 @@ final: prev:
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2022-03-24";
+    version = "2022-04-01";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "4eccec4e9fc46a52ba832ac2f8ab749ea33d6790";
-      sha256 = "07mydwxqhk9l0ciqpczd51x4s58asmqa3f0bznw7cdvp9qa6a6sn";
+      rev = "3c14f6912318ac3d92d32eca7d66c7c1c4f3e92c";
+      sha256 = "1wnj1j38gs6xcdyhia6cmd010rv2g85s816hxd1qc1zlimfvi5gr";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };
@@ -11855,18 +11807,6 @@ final: prev:
     meta.homepage = "https://github.com/liuchengxu/vista.vim/";
   };
 
-  Vundle-vim = buildVimPluginFrom2Nix {
-    pname = "Vundle.vim";
-    version = "2019-08-17";
-    src = fetchFromGitHub {
-      owner = "VundleVim";
-      repo = "Vundle.vim";
-      rev = "b255382d6242d7ea3877bf059d2934125e0c4d95";
-      sha256 = "0fkmklcq3fgvd6x6irz9bgyvcdaxafykk3k89gsi9p6b0ikw3rw6";
-    };
-    meta.homepage = "https://github.com/VundleVim/Vundle.vim/";
-  };
-
   wal-vim = buildVimPluginFrom2Nix {
     pname = "wal.vim";
     version = "2020-11-08";
@@ -11905,12 +11845,12 @@ final: prev:
 
   wilder-nvim = buildVimPluginFrom2Nix {
     pname = "wilder.nvim";
-    version = "2022-03-13";
+    version = "2022-04-03";
     src = fetchFromGitHub {
       owner = "gelguy";
       repo = "wilder.nvim";
-      rev = "b59648ad8588bcba377f4eecdea317796ebd1f9d";
-      sha256 = "0aic96isjssgmlqkr30m9j3895v27f3hgkgsqbl3zwkvjqa218d6";
+      rev = "9c33d9423a3ba205ecdb90ce8a677c2b26f04908";
+      sha256 = "19dv7ai4hs04m00w37d7bmb4c5zakfpj3mhgl15ddc6bpk3sbd7h";
     };
     meta.homepage = "https://github.com/gelguy/wilder.nvim/";
   };
@@ -12011,18 +11951,6 @@ final: prev:
     meta.homepage = "https://github.com/guns/xterm-color-table.vim/";
   };
 
-  YankRing-vim = buildVimPluginFrom2Nix {
-    pname = "YankRing.vim";
-    version = "2015-07-29";
-    src = fetchFromGitHub {
-      owner = "vim-scripts";
-      repo = "YankRing.vim";
-      rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65";
-      sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw";
-    };
-    meta.homepage = "https://github.com/vim-scripts/YankRing.vim/";
-  };
-
   yats-vim = buildVimPluginFrom2Nix {
     pname = "yats.vim";
     version = "2022-01-05";
@@ -12036,31 +11964,6 @@ final: prev:
     meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";
   };
 
-  YouCompleteMe = buildVimPluginFrom2Nix {
-    pname = "YouCompleteMe";
-    version = "2022-03-23";
-    src = fetchFromGitHub {
-      owner = "ycm-core";
-      repo = "YouCompleteMe";
-      rev = "89bba25c96866662ca38c2428f73eb64b0351ba3";
-      sha256 = "0yrhvd9c0g6ay02b77sr657hn7ambcifwjfqsjywmnirr4zja45p";
-      fetchSubmodules = true;
-    };
-    meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
-  };
-
-  YUNOcommit-vim = buildVimPluginFrom2Nix {
-    pname = "YUNOcommit.vim";
-    version = "2014-11-26";
-    src = fetchFromGitHub {
-      owner = "esneider";
-      repo = "YUNOcommit.vim";
-      rev = "981082055a73ef076d7e27477874d2303153a448";
-      sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab";
-    };
-    meta.homepage = "https://github.com/esneider/YUNOcommit.vim/";
-  };
-
   zeavim-vim = buildVimPluginFrom2Nix {
     pname = "zeavim.vim";
     version = "2019-06-07";
@@ -12145,4 +12048,112 @@ final: prev:
     meta.homepage = "https://github.com/nanotee/zoxide.vim/";
   };
 
+  catppuccin-nvim = buildVimPluginFrom2Nix {
+    pname = "catppuccin-nvim";
+    version = "2022-03-20";
+    src = fetchFromGitHub {
+      owner = "catppuccin";
+      repo = "nvim";
+      rev = "f079dda3dc23450d69b4bad11bfbd9af2c77f6f3";
+      sha256 = "1w0n96fbrkm3vdl64v1yzkly8wpcn5g9qflmpb8r1ww9hhig7a38";
+    };
+    meta.homepage = "https://github.com/catppuccin/nvim/";
+  };
+
+  chad = buildVimPluginFrom2Nix {
+    pname = "chad";
+    version = "2022-04-05";
+    src = fetchFromGitHub {
+      owner = "ms-jpq";
+      repo = "chadtree";
+      rev = "e03f7c8cbaeb85272d2d3d2c24af5065be4f5e71";
+      sha256 = "08971zkma4zwz5511vzhgi99000xin5psy1hkancxr4v2bw68dh3";
+    };
+    meta.homepage = "https://github.com/ms-jpq/chadtree/";
+  };
+
+  dracula-vim = buildVimPluginFrom2Nix {
+    pname = "dracula-vim";
+    version = "2022-03-24";
+    src = fetchFromGitHub {
+      owner = "dracula";
+      repo = "vim";
+      rev = "d7723a842a6cfa2f62cf85530ab66eb418521dc2";
+      sha256 = "1qzil8rwpdzf64gq63ds0cf509ldam77l3fz02g1mia5dry75r02";
+    };
+    meta.homepage = "https://github.com/dracula/vim/";
+  };
+
+  embark-vim = buildVimPluginFrom2Nix {
+    pname = "embark-vim";
+    version = "2022-03-28";
+    src = fetchFromGitHub {
+      owner = "embark-theme";
+      repo = "vim";
+      rev = "a57dbdbd2790c52563e1194c17e6de38a0c941cf";
+      sha256 = "07yzy4yjxaf59b6pyf05jrawvc4y37v2x07n1vfc2dbsxkxdygq1";
+    };
+    meta.homepage = "https://github.com/embark-theme/vim/";
+  };
+
+  gruvbox-community = buildVimPluginFrom2Nix {
+    pname = "gruvbox-community";
+    version = "2022-03-06";
+    src = fetchFromGitHub {
+      owner = "gruvbox-community";
+      repo = "gruvbox";
+      rev = "b6f47ae7031f6746a1f1918c17574aa12c474ef0";
+      sha256 = "0m8rrm5v542a2c30sg7hlgm7r6gs4ah1n6nr5dc101l2064kg97g";
+    };
+    meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
+  };
+
+  mattn-calendar-vim = buildVimPluginFrom2Nix {
+    pname = "mattn-calendar-vim";
+    version = "2022-02-10";
+    src = fetchFromGitHub {
+      owner = "mattn";
+      repo = "calendar-vim";
+      rev = "2083a41e2d310f9bbbbf644517f30e901f1fb04d";
+      sha256 = "13wakcprkh93i7afykkpavxqvxssjh573pjjljsgip3y3778ms5q";
+    };
+    meta.homepage = "https://github.com/mattn/calendar-vim/";
+  };
+
+  pure-lua = buildVimPluginFrom2Nix {
+    pname = "pure-lua";
+    version = "2021-05-16";
+    src = fetchFromGitHub {
+      owner = "shaunsingh";
+      repo = "moonlight.nvim";
+      rev = "e24e4218ec680b6396532808abf57ca0ada82e66";
+      sha256 = "0m9w3fpypsqxydjd93arbjqb5576nl40iy27i4ijlrqhgdhl49y3";
+    };
+    meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/";
+  };
+
+  rose-pine = buildVimPluginFrom2Nix {
+    pname = "rose-pine";
+    version = "2022-04-01";
+    src = fetchFromGitHub {
+      owner = "rose-pine";
+      repo = "neovim";
+      rev = "40c4fd7f5551710e388e0df85bb43d6e1627ca80";
+      sha256 = "0ihzf18146q9bkqa22jq6xa2i394y6bn3fnjjgjz3zf8g8pcr6bl";
+    };
+    meta.homepage = "https://github.com/rose-pine/neovim/";
+  };
+
+  vim-docbk-snippets = buildVimPluginFrom2Nix {
+    pname = "vim-docbk-snippets";
+    version = "2021-07-30";
+    src = fetchFromGitHub {
+      owner = "jhradilek";
+      repo = "vim-snippets";
+      rev = "81a8dcb66886a0717e9ca73c8857ee90c3989063";
+      sha256 = "0d6532qx66aiawpq2fdji0mnmvnlg5dnbvds5s4pgzafydikpr70";
+    };
+    meta.homepage = "https://github.com/jhradilek/vim-snippets/";
+  };
+
 }
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index f138c6d42d9c1..065063091a5c1 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1,1010 +1,1012 @@
-907th/vim-auto-save
-aca/completion-tabnine
-AckslD/nvim-neoclip.lua
-AckslD/nvim-whichkey-setup.lua
-ackyshake/Spacegray.vim
-ackyshake/VimCompletesMe
-ahmedkhalf/lsp-rooter.nvim
-ahmedkhalf/project.nvim
-airblade/vim-gitgutter
-airblade/vim-rooter
-ajmwagar/vim-deus
-akinsho/bufferline.nvim
-akinsho/toggleterm.nvim
-aklt/plantuml-syntax
-allendang/nvim-expand-expr
-AlphaTechnolog/pywal.nvim
-altercation/vim-colors-solarized
-alvan/vim-closetag
-alvarosevilla95/luatab.nvim
-alx741/vim-hindent
-alx741/vim-stylishask
-AmeerTaweel/todo.nvim
-amiorin/ctrlp-z
-andersevenrud/cmp-tmux
-andersevenrud/nordic.nvim
-andrep/vimacs
-andreshazard/vim-logreview
-AndrewRadev/sideways.vim
-AndrewRadev/splitjoin.vim
-AndrewRadev/switch.vim
-AndrewRadev/tagalong.vim
-andsild/peskcolor.vim
-andviro/flake8-vim
-andweeb/presence.nvim
-andymass/vim-matchup
-andys8/vim-elm-syntax
-antoinemadec/coc-fzf
-antoinemadec/FixCursorHold.nvim
-ap/vim-css-color
-arcticicestudio/nord-vim@master
-arkav/lualine-lsp-progress
-arthurxavierx/vim-unicoder
-artur-shaik/vim-javacomplete2
-autozimu/LanguageClient-neovim
-axelf4/vim-strip-trailing-whitespace
-axieax/urlview.nvim
-ayu-theme/ayu-vim
-b0o/SchemaStore.nvim
-b3nj5m1n/kommentary
-bakpakin/fennel.vim
-bazelbuild/vim-bazel
-bbchung/clighter8
-BeneCollyridam/futhark-vim
-benizi/vim-automkdir
-bhurlow/vim-parinfer
-bitc/vim-hdevtools
-bkad/camelcasemotion
-bling/vim-bufferline
-blueballs-theme/blueballs-neovim
-blueyed/vim-diminactive
-bogado/file-line
-bohlender/vim-smt2
-brennanfee/vim-gui-position
-bronson/vim-trailing-whitespace
-brooth/far.vim
-buoto/gotests-vim
-camspiers/lens.vim
-camspiers/snap
-carlitux/deoplete-ternjs
-catppuccin/nvim as catppuccin-nvim
-ccarpita/rtorrent-syntax-file
-cespare/vim-toml
-chaoren/vim-wordmotion
-chentau/marks.nvim
-chikatoike/concealedyank.vim
-chikatoike/sourcemap.vim
-chkno/vim-haskell-module-name
-chr4/nginx.vim
-chr4/sslsecure.vim
-chrisbra/CheckAttach
-chrisbra/csv.vim
-chrisbra/NrrwRgn
-chrisbra/Recover.vim
-chrisbra/SudoEdit.vim
-chrisbra/unicode.vim
-chrisgeo/sparkup
-chriskempson/base16-vim
-ChristianChiarulli/nvcode-color-schemes.vim
-christoomey/vim-sort-motion
-christoomey/vim-tmux-navigator
-ciaranm/inkpot
-ckarnell/antonys-macro-repeater
-clojure-vim/vim-jack-in
-cloudhead/neovim-fuzzy
-CoatiSoftware/vim-sourcetrail
-coc-extensions/coc-svelte
-cocopon/iceberg.vim
-codota/tabnine-vim
-cohama/lexima.vim
-ConradIrwin/vim-bracketed-paste
-crusoexia/vim-monokai
-ctjhoa/spacevim
-ctrlpvim/ctrlp.vim
-dag/vim-fish
-dag/vim2hs
-dannyob/quickfixstatus
-darfink/starsearch.vim
-dart-lang/dart-vim-plugin
-david-a-wheeler/vim-metamath
-davidhalter/jedi-vim
-dcharbon/vim-flatbuffers
-dense-analysis/ale
-deoplete-plugins/deoplete-clang
-deoplete-plugins/deoplete-dictionary
-deoplete-plugins/deoplete-go
-deoplete-plugins/deoplete-jedi
-deoplete-plugins/deoplete-lsp
-deoplete-plugins/deoplete-zsh
-derekelkins/agda-vim
-derekwyatt/vim-scala
-dhruvasagar/vim-prosession
-dhruvasagar/vim-table-mode
-digitaltoad/vim-pug
-direnv/direnv.vim
-dleonard0/pony-vim-syntax
-dmix/elvish.vim
-doki-theme/doki-theme-vim
-dominikduda/vim_current_word
-dpelle/vim-LanguageTool
-dracula/vim as dracula-vim
-drewtempelmeyer/palenight.vim
-drmingdrmer/xptemplate
-dstein64/nvim-scrollview
-dstein64/vim-startuptime
-dylanaraps/wal.vim
-eagletmt/ghcmod-vim
-eagletmt/neco-ghc
-easymotion/vim-easymotion
-echasnovski/mini.nvim
-eddiebergman/nvim-treesitter-pyfold
-eddyekofo94/gruvbox-flat.nvim
-EdenEast/nightfox.nvim
-editorconfig/editorconfig-vim
-edkolev/tmuxline.vim
-edluffy/hologram.nvim
-edluffy/specs.nvim
-edwinb/idris2-vim
-ehamberg/vim-cute-python
-eigenfoo/stan-vim
-eikenb/acp
-elixir-editors/vim-elixir
-ellisonleao/glow.nvim
-ellisonleao/gruvbox.nvim
-elmcast/elm-vim
-elzr/vim-json
-embark-theme/vim as embark-vim
-embear/vim-localvimrc
-enomsg/vim-haskellConcealPlus
-enricobacis/vim-airline-clock
-ervandew/supertab
-esneider/YUNOcommit.vim
-euclidianAce/BetterLua.vim
-euclio/vim-markdown-composer
-evanleck/vim-svelte
-f-person/git-blame.nvim
-f3fora/cmp-spell
-famiu/bufdelete.nvim
-fannheyward/telescope-coc.nvim
-farmergreg/vim-lastplace
-fatih/vim-go
-fcpg/vim-osc52
-FelikZ/ctrlp-py-matcher
-feline-nvim/feline.nvim
-fenetikm/falcon
-fhill2/floating.nvim
-fhill2/telescope-ultisnips.nvim
-fiatjaf/neuron.vim
-filipdutescu/renamer.nvim
-fisadev/vim-isort
-flazz/vim-colorschemes
-floobits/floobits-neovim
-folke/lsp-colors.nvim
-folke/lua-dev.nvim
-folke/todo-comments.nvim
-folke/tokyonight.nvim
-folke/trouble.nvim
-folke/twilight.nvim
-folke/which-key.nvim
-folke/zen-mode.nvim
-FooSoft/vim-argwrap
-freitass/todo.txt-vim
-frigoeu/psc-ide-vim
-fruit-in/brainfuck-vim
-fruit-in/vim-nong-theme
-fsharp/vim-fsharp
-garbas/vim-snipmate
-gbrlsnchs/telescope-lsp-handlers.nvim
-gcmt/taboo.vim
-gcmt/wildfire.vim
-gelguy/wilder.nvim
-gennaro-tedesco/nvim-jqx
-gennaro-tedesco/nvim-peekup
-gentoo/gentoo-syntax
-GEverding/vim-hocon
-gfanto/fzf-lsp.nvim
-ggandor/lightspeed.nvim
-gibiansky/vim-textobj-haskell
-gioele/vim-autoswap
-github/copilot.vim
-gleam-lang/gleam.vim
-glepnir/dashboard-nvim
-glepnir/oceanic-material
-glepnir/zephyr-nvim
-glts/vim-textobj-comment
-godlygeek/csapprox
-godlygeek/tabular
-GoldsteinE/compe-latex-symbols
-google/vim-codefmt
-google/vim-jsonnet
-google/vim-maktaba
-gorkunov/smartpairs.vim
-gotcha/vimelette
-gpanders/editorconfig.nvim
-gregsexton/gitv
-gruvbox-community/gruvbox as gruvbox-community
-gu-fan/riv.vim
-guns/vim-clojure-highlight
-guns/vim-clojure-static
-guns/vim-sexp
-guns/xterm-color-table.vim
-GustavoKatel/telescope-asynctasks.nvim
-gyim/vim-boxdraw
-haringsrob/nvim_context_vt
-hashivim/vim-packer
-hashivim/vim-terraform
-hashivim/vim-vagrant
-hauleth/sad.vim
-haya14busa/incsearch-easymotion.vim
-haya14busa/incsearch.vim
-haya14busa/is.vim
-haya14busa/vim-asterisk
-haya14busa/vim-poweryank
-heavenshell/vim-jsdoc
-hecal3/vim-leader-guide
-henrik/vim-indexed-search
-HerringtonDarkholme/yats.vim
-honza/vim-snippets
-hotwatermorning/auto-git-diff
-hrsh7th/cmp-buffer
-hrsh7th/cmp-calc
-hrsh7th/cmp-cmdline
-hrsh7th/cmp-emoji
-hrsh7th/cmp-nvim-lsp
-hrsh7th/cmp-nvim-lsp-document-symbol
-hrsh7th/cmp-nvim-lua
-hrsh7th/cmp-omni
-hrsh7th/cmp-path
-hrsh7th/cmp-vsnip
-hrsh7th/nvim-cmp
-hrsh7th/nvim-compe
-hrsh7th/vim-vsnip
-hrsh7th/vim-vsnip-integ
-hsanson/vim-android
-hsitz/VimOrganizer
-https://git.sr.ht/~whynothugo/lsp_lines.nvim
-hura/vim-asymptote
-iamcco/coc-spell-checker
-iamcco/coc-tailwindcss
-iamcco/markdown-preview.nvim
-ianks/vim-tsx
-idanarye/vim-merginal
-idris-hackers/idris-vim
-Inazuma110/deoplete-greek
-inkarkat/vim-ReplaceWithRegister
-inkarkat/vim-ReplaceWithSameIndentRegister
-inkarkat/vim-SyntaxRange
-int3/vim-extradite
-Iron-E/nvim-highlite
-ishan9299/nvim-solarized-lua
-itchyny/calendar.vim
-itchyny/lightline.vim
-itchyny/thumbnail.vim
-itchyny/vim-cursorword
-itchyny/vim-gitbranch
-itspriddle/vim-shellcheck
-ivalkeen/vim-simpledb
-ivanov/vim-ipython
-j-hui/fidget.nvim
-jackguo380/vim-lsp-cxx-highlight
-jacoborus/tender.vim
-jakwings/vim-pony
-jamessan/vim-gnupg
-jaredgorski/SpaceCamp
-jasonccox/vim-wayland-clipboard
-jaxbot/semantic-highlight.vim
-JazzCore/ctrlp-cmatcher
-jbyuki/venn.nvim
-jc-doyle/cmp-pandoc-references
-jceb/vim-hier
-jceb/vim-orgmode
-jeetsukumaran/vim-buffergator
-jeetsukumaran/vim-indentwise
-jeffkreeftmeijer/neovim-sensible
-jeffkreeftmeijer/vim-numbertoggle
-jelera/vim-javascript-syntax
-jgdavey/tslime.vim
-jghauser/mkdir.nvim@main
-jhradilek/vim-docbk
-jhradilek/vim-snippets as vim-docbk-snippets
-jiangmiao/auto-pairs
-jistr/vim-nerdtree-tabs
-jjo/vim-cue
-jlanzarotta/bufexplorer
-jlesquembre/nterm.nvim
-jnurmine/zenburn
-jonbri/vim-colorstepper
-jonsmithers/vim-html-template-literals
-joonty/vim-xdebug
-joosepalviste/nvim-ts-context-commentstring
-jordwalke/vim-reasonml
-josa42/coc-lua
-josa42/nvim-lightline-lsp
-josa42/vim-lightline-coc
-jose-elias-alvarez/minsnip.nvim
-jose-elias-alvarez/null-ls.nvim
-jose-elias-alvarez/nvim-lsp-ts-utils
-joshdick/onedark.vim
-jpalardy/vim-slime
-jparise/vim-graphql
-jparise/vim-phabricator
-jreybert/vimagit
-jsfaint/gen_tags.vim
-JuliaEditorSupport/deoplete-julia
-JuliaEditorSupport/julia-vim
-Julian/lean.nvim
-Julian/vim-textobj-variable-segment
-juliosueiras/vim-terraform-completion
-junegunn/fzf.vim
-junegunn/goyo.vim
-junegunn/gv.vim
-junegunn/limelight.vim
-junegunn/seoul256.vim
-junegunn/vader.vim
-junegunn/vim-after-object
-junegunn/vim-easy-align
-junegunn/vim-emoji
-junegunn/vim-github-dashboard
-junegunn/vim-peekaboo
-junegunn/vim-plug
-junegunn/vim-slash
-justincampbell/vim-eighties
-justinj/vim-pico8-syntax
-justinmk/vim-dirvish
-justinmk/vim-sneak
-jvgrootveld/telescope-zoxide
-jvirtanen/vim-hcl
-jvoorhis/coq.vim
-KabbAmine/vCoolor.vim
-KabbAmine/zeavim.vim
-kalbasit/vim-colemak
-kana/vim-niceblock
-kana/vim-operator-replace
-kana/vim-operator-user
-kana/vim-tabpagecd
-kana/vim-textobj-entire
-kana/vim-textobj-function
-kana/vim-textobj-user
-karb94/neoscroll.nvim
-kassio/neoterm
-kbenzie/vim-spirv
-kchmck/vim-coffee-script
-kdheepak/cmp-latex-symbols
-kdheepak/lazygit.nvim
-kdheepak/tabline.nvim
-KeitaNakamura/neodark.vim
-KeitaNakamura/tex-conceal.vim
-keith/investigate.vim
-keith/rspec.vim
-keith/swift.vim
-kevinhwang91/nvim-bqf
-kevinhwang91/nvim-hlslens
-kevinhwang91/rnvimr
-kien/rainbow_parentheses.vim
-knubie/vim-kitty-navigator
-konfekt/fastfold
-Konfekt/vim-alias
-Konfekt/vim-CtrlXA
-konfekt/vim-DetectSpellLang
-kosayoda/nvim-lightbulb
-kovisoft/slimv
-kristijanhusak/defx-git
-kristijanhusak/defx-icons
-kristijanhusak/deoplete-phpactor
-kristijanhusak/vim-carbon-now-sh
-kristijanhusak/vim-dadbod-completion
-kristijanhusak/vim-dadbod-ui
-kristijanhusak/vim-dirvish-git
-kristijanhusak/vim-hybrid-material
-kshenoy/vim-signature
-kyazdani42/nvim-tree.lua
-kyazdani42/nvim-web-devicons
-l3mon4d3/luasnip
-lambdalisue/fern.vim
-lambdalisue/gina.vim
-lambdalisue/suda.vim
-lambdalisue/vim-gista
-lambdalisue/vim-manpager
-lambdalisue/vim-pager
-latex-box-team/latex-box
-ldelossa/litee-calltree.nvim
-ldelossa/litee-filetree.nvim
-ldelossa/litee-symboltree.nvim
-ldelossa/litee.nvim
-leafgarland/typescript-vim
-leanprover/lean.vim
-ledger/vim-ledger
-lepture/vim-jinja
-lervag/vimtex
-lewis6991/gitsigns.nvim
-lewis6991/impatient.nvim
-lf-lang/lingua-franca.vim
-lfe-support/vim-lfe
-lfilho/cosco.vim
-lifepillar/pgsql.vim
-lifepillar/vim-gruvbox8
-lifepillar/vim-mucomplete
-lighttiger2505/deoplete-vim-lsp
-lilydjwg/colorizer
-lilydjwg/fcitx.vim@fcitx5
-liuchengxu/graphviz.vim
-liuchengxu/space-vim
-liuchengxu/vim-clap
-liuchengxu/vim-which-key
-liuchengxu/vista.vim
-LnL7/vim-nix
-lotabout/skim.vim
-luan/vim-concourse
-LucHermitte/lh-brackets
-LucHermitte/lh-vim-lib
-ludovicchabant/vim-gutentags
-ludovicchabant/vim-lawrencium
-lukas-reineke/cmp-under-comparator
-lukas-reineke/indent-blankline.nvim
-lukaszkorecki/workflowish
-lumiliet/vim-twig
-luochen1990/rainbow
-luukvbaal/stabilize.nvim
-lyokha/vim-xkbswitch
-m-pilia/vim-ccls
-machakann/vim-highlightedyank
-machakann/vim-sandwich
-machakann/vim-swap
-maksimr/vim-jsbeautify
-MarcWeber/vim-addon-actions
-MarcWeber/vim-addon-async
-MarcWeber/vim-addon-background-cmd
-MarcWeber/vim-addon-commenting
-MarcWeber/vim-addon-completion
-MarcWeber/vim-addon-errorformats
-MarcWeber/vim-addon-goto-thing-at-cursor
-MarcWeber/vim-addon-local-vimrc
-MarcWeber/vim-addon-manager
-MarcWeber/vim-addon-mru
-MarcWeber/vim-addon-mw-utils
-MarcWeber/vim-addon-nix
-MarcWeber/vim-addon-other
-MarcWeber/vim-addon-php-manual
-MarcWeber/vim-addon-signs
-MarcWeber/vim-addon-sql
-MarcWeber/vim-addon-syntax-checker
-MarcWeber/vim-addon-toggle-buffer
-MarcWeber/vim-addon-xdebug
-marko-cerovac/material.nvim
-markonm/traces.vim
-martinda/Jenkinsfile-vim-syntax
-MattesGroeger/vim-bookmarks
-mattn/calendar-vim as mattn-calendar-vim
-mattn/emmet-vim
-mattn/vim-gist
-mattn/webapi-vim
-matze/vim-move
-max397574/better-escape.nvim
-maximbaz/lightline-ale
-maxjacobson/vim-fzf-coauthorship
-MaxMEllon/vim-jsx-pretty
-mbbill/undotree
-mboughaba/i3config.vim
-mcchrish/nnn.vim
-megaannum/forms
-megaannum/self
-mengelbrecht/lightline-bufferline
-metakirby5/codi.vim
-metalelf0/jellybeans-nvim
-mfukar/robotframework-vim
-mfussenegger/nvim-dap
-mfussenegger/nvim-jdtls
-mfussenegger/nvim-lint
-mg979/vim-visual-multi
-mg979/vim-xtabline
-mhartington/formatter.nvim
-mhartington/oceanic-next
-mhinz/vim-crates
-mhinz/vim-grepper
-mhinz/vim-janah
-mhinz/vim-sayonara@7e774f58c5865d9c10d40396850b35ab95af17c5
-mhinz/vim-signify
-mhinz/vim-startify
-michaeljsmith/vim-indent-object
-mileszs/ack.vim
-milkypostman/vim-togglelist
-mindriot101/vim-yapf
-mk12/vim-lean
-mkasa/lushtags
-mlr-msft/vim-loves-dafny
-moll/vim-bbye
-mopp/sky-color-clock.vim
-morhetz/gruvbox
-motus/pig.vim
-mpickering/hlint-refactor-vim
-ms-jpq/chadtree@chad
-ms-jpq/coq_nvim
-mtikekar/vim-bsv
-MunifTanjim/nui.nvim@main
-mustache/vim-mustache-handlebars
-mzlogin/vim-markdown-toc
-mzlogin/vim-smali
-nacro90/numb.nvim
-nanotech/jellybeans.vim
-nanotee/zoxide.vim
-natebosch/vim-lsc
-nathanaelkane/vim-indent-guides
-nathangrigg/vim-beancount
-nathanmsmith/nvim-ale-diagnostic
-navarasu/onedark.nvim
-navicore/vissort.vim
-nbouscal/vim-stylish-haskell
-ncm2/float-preview.nvim
-ncm2/ncm2
-ncm2/ncm2-bufword
-ncm2/ncm2-cssomni
-ncm2/ncm2-github
-ncm2/ncm2-html-subscope
-ncm2/ncm2-jedi
-ncm2/ncm2-markdown-subscope
-ncm2/ncm2-neoinclude
-ncm2/ncm2-neosnippet
-ncm2/ncm2-path
-ncm2/ncm2-syntax
-ncm2/ncm2-tagprefix
-ncm2/ncm2-tmux
-ncm2/ncm2-ultisnips
-ncm2/ncm2-vim
-ndmitchell/ghcid
-neoclide/coc-denite
-neoclide/coc-neco
-neoclide/coc.nvim@release
-neoclide/denite-extra
-neoclide/denite-git
-neoclide/jsonc.vim
-neoclide/vim-easygit
-neomake/neomake
-neovim/nvim-lspconfig
-neovim/nvimdev.nvim
-neovimhaskell/haskell-vim
-neovimhaskell/nvim-hs.vim
-neutaaaaan/iosvkem
-nfnty/vim-nftables
-nicoe/deoplete-khard
-nishigori/increment-activator
-nixprime/cpsm
-NLKNguyen/papercolor-theme
-noahfrederick/vim-noctu
-noc7c9/vim-iced-coffee-script
-norcalli/nvim-colorizer.lua
-norcalli/nvim-terminal.lua
-norcalli/snippets.nvim
-NTBBloodbath/galaxyline.nvim
-NTBBloodbath/rest.nvim
-ntpeters/vim-better-whitespace
-numirias/semshi
-numtostr/comment.nvim
-numToStr/FTerm.nvim
-numToStr/Navigator.nvim
-nvie/vim-flake8
-nvim-lua/completion-nvim
-nvim-lua/diagnostic-nvim
-nvim-lua/lsp-status.nvim
-nvim-lua/lsp_extensions.nvim
-nvim-lua/plenary.nvim
-nvim-lua/popup.nvim
-nvim-lualine/lualine.nvim
-nvim-neorg/neorg
-nvim-orgmode/orgmode
-nvim-pack/nvim-spectre
-nvim-telescope/telescope-cheat.nvim
-nvim-telescope/telescope-dap.nvim
-nvim-telescope/telescope-file-browser.nvim
-nvim-telescope/telescope-frecency.nvim
-nvim-telescope/telescope-fzf-native.nvim
-nvim-telescope/telescope-fzf-writer.nvim
-nvim-telescope/telescope-fzy-native.nvim
-nvim-telescope/telescope-github.nvim
-nvim-telescope/telescope-project.nvim
-nvim-telescope/telescope-symbols.nvim
-nvim-telescope/telescope-ui-select.nvim
-nvim-telescope/telescope-z.nvim
-nvim-telescope/telescope.nvim
-nvim-treesitter/completion-treesitter
-nvim-treesitter/nvim-treesitter
-nvim-treesitter/nvim-treesitter-refactor
-nvim-treesitter/nvim-treesitter-textobjects
-nvim-treesitter/playground
-oberblastmeister/neuron.nvim
-oberblastmeister/termwrapper.nvim
-ocaml/vim-ocaml
-octol/vim-cpp-enhanced-highlight
-ojroques/nvim-bufdel
-ojroques/vim-oscyank
-Olical/aniseed
-Olical/conjure
-olimorris/onedarkpro.nvim
-onsails/diaglist.nvim
-onsails/lspkind-nvim
-OrangeT/vim-csharp
-osyo-manga/shabadou.vim
-osyo-manga/vim-anzu
-osyo-manga/vim-over
-osyo-manga/vim-textobj-multiblock
-osyo-manga/vim-watchdogs
-overcache/NeoSolarized
-p00f/nvim-ts-rainbow
-pangloss/vim-javascript
-pantharshit00/vim-prisma
-parsonsmatt/intero-neovim
-PaterJason/cmp-conjure
-pearofducks/ansible-vim
-peitalin/vim-jsx-typescript
-peterbjorgensen/sved
-peterhoeg/vim-qml
-PeterRincker/vim-argumentative
-petRUShka/vim-opencl
-phaazon/hop.nvim
-phanviet/vim-monokai-pro
-Pocco81/TrueZen.nvim
-ponko2/deoplete-fish
-posva/vim-vue
-powerman/vim-plugin-AnsiEsc
-PProvost/vim-ps1
-prabirshrestha/async.vim
-prabirshrestha/asyncomplete-lsp.vim
-prabirshrestha/asyncomplete.vim
-prabirshrestha/vim-lsp
-preservim/nerdcommenter
-preservim/nerdtree
-preservim/tagbar
-preservim/vim-markdown
-preservim/vim-pencil
-preservim/vim-wordy
-preservim/vimux
-prettier/vim-prettier
-projekt0n/circles.nvim
-psliwka/vim-smoothie
-ptzz/lf.vim
-puremourning/vimspector
-purescript-contrib/purescript-vim
-pwntester/octo.nvim
-python-mode/python-mode
-qnighy/lalrpop.vim
-qpkorr/vim-bufkill
-quangnguyen30192/cmp-nvim-ultisnips
-Quramy/tsuquyomi
-racer-rust/vim-racer
-radenling/vim-dispatch-neovim
-rafamadriz/friendly-snippets
-rafamadriz/neon
-rafaqz/ranger.vim
-rafi/awesome-vim-colorschemes
-raghur/fruzzy
-raghur/vim-ghost
-Raimondi/delimitMate
-rakr/vim-one
-ray-x/aurora
-ray-x/cmp-treesitter
-ray-x/lsp_signature.nvim
-rbgrouleff/bclose.vim
-rbong/vim-flog
-rcarriga/nvim-dap-ui
-rcarriga/nvim-notify
-rcarriga/vim-ultest
-rebelot/kanagawa.nvim
-rhysd/clever-f.vim
-rhysd/committia.vim
-rhysd/conflict-marker.vim
-rhysd/devdocs.vim
-rhysd/git-messenger.vim
-rhysd/vim-clang-format
-rhysd/vim-grammarous
-rhysd/vim-operator-surround
-RishabhRD/nvim-lsputils
-RishabhRD/popfix
-rktjmp/fwatch.nvim
-rktjmp/hotpot.nvim
-rktjmp/lush.nvim
-rmagatti/auto-session
-rmagatti/goto-preview
-RobertAudi/securemodelines
-rodjek/vim-puppet
-romainl/vim-cool
-romainl/vim-qf
-romainl/vim-qlist
-roman/golden-ratio
-romgrk/barbar.nvim
-romgrk/nvim-treesitter-context
-ron-rs/ron.vim
-ron89/thesaurus_query.vim
-roxma/nvim-cm-racer
-roxma/nvim-completion-manager
-roxma/nvim-yarp
-roxma/vim-tmux-clipboard
-RRethy/nvim-base16
-RRethy/vim-hexokinase
-RRethy/vim-illuminate
-rstacruz/vim-closer
-ruanyl/vim-gh-line
-ruifm/gitlinker.nvim
-rust-lang/rust.vim
-ryanoasis/vim-devicons
-ryvnf/readline.vim
-saadparwaiz1/cmp_luasnip
-saecki/crates.nvim
-sainnhe/edge
-sainnhe/everforest
-sainnhe/gruvbox-material
-sainnhe/sonokai
-sakhnik/nvim-gdb
-samoshkin/vim-mergetool
-sbdchd/neoformat
-sblumentritt/bitbake.vim
-scalameta/nvim-metals
-sdiehl/vim-ormolu
-sebastianmarkow/deoplete-rust
-SevereOverfl0w/deoplete-github
-Shatur/neovim-ayu
-shaunsingh/moonlight.nvim@pure-lua
-shaunsingh/nord.nvim
-sheerun/vim-polyglot
-shinchu/lightline-gruvbox.vim
-Shougo/context_filetype.vim
-Shougo/defx.nvim
-Shougo/denite.nvim
-Shougo/deol.nvim
-Shougo/deoplete.nvim
-Shougo/echodoc.vim
-Shougo/neco-syntax
-Shougo/neco-vim
-Shougo/neocomplete.vim
-Shougo/neoinclude.vim
-Shougo/neomru.vim
-Shougo/neosnippet-snippets
-Shougo/neosnippet.vim
-Shougo/neoyank.vim
-Shougo/tabpagebuffer.vim
-Shougo/unite.vim
-Shougo/vimfiler.vim
-Shougo/vimproc.vim
-Shougo/vimshell.vim
-shumphrey/fugitive-gitlab.vim
-sickill/vim-pasta
-SidOfc/mkdx
-simnalamburt/vim-mundo
-simrat39/rust-tools.nvim
-simrat39/symbols-outline.nvim
-sindrets/diffview.nvim
-sindrets/winshift.nvim
-SirVer/ultisnips
-sjl/gundo.vim
-sjl/splice.vim
-sk1418/last256
-skywind3000/asyncrun.vim
-skywind3000/asynctasks.vim
-slashmili/alchemist.vim
-smiteshp/nvim-gps
-sodapopcan/vim-twiggy
-solarnz/arcanist.vim
-sonph/onehalf
-sotte/presenting.vim
-SpaceVim/SpaceVim
-spywhere/lightline-lsp
-srcery-colors/srcery-vim
-steelsojka/completion-buffers
-steelsojka/pears.nvim
-stefandtw/quickfix-reflector.vim
-stephpy/vim-yaml
-stevearc/aerial.nvim
-stevearc/dressing.nvim
-stsewd/fzf-checkout.vim
-sudormrfbin/cheatsheet.nvim
-sunaku/vim-dasht
-sunjon/Shade.nvim
-svermeulen/vim-subversive
-symphorien/vim-nixhash
-t9md/vim-choosewin
-t9md/vim-smalls
-TaDaa/vimade
-takac/vim-hardtime
-tamago324/compe-zsh
-tamago324/lir.nvim
-tami5/compe-conjure
-tami5/lispdocs.nvim
-tami5/lspsaga.nvim
-tami5/sqlite.lua
-tbastos/vim-lua
-tbodt/deoplete-tabnine
-ternjs/tern_for_vim
-terrortylor/nvim-comment
-terryma/vim-expand-region
-terryma/vim-multiple-cursors
-tex/vimpreviewpandoc
-Th3Whit3Wolf/one-nvim
-theHamsta/nvim-dap-virtual-text
-ThePrimeagen/git-worktree.nvim
-ThePrimeagen/harpoon
-theprimeagen/refactoring.nvim
-ThePrimeagen/vim-apm
-thinca/vim-ft-diff_fold
-thinca/vim-prettyprint
-thinca/vim-quickrun
-thinca/vim-scouter
-thinca/vim-themis
-thinca/vim-visualstar
-thirtythreeforty/lessspace.vim
-thosakwe/vim-flutter
-tiagofumo/vim-nerdtree-syntax-highlight
-tikhomirov/vim-glsl
-TimUntersberger/neogit
-tjdevries/colorbuddy.nvim
-tjdevries/nlua.nvim
-tjdevries/train.nvim
-tmhedberg/SimpylFold
-tmsvg/pear-tree
-tmux-plugins/vim-tmux
-tmux-plugins/vim-tmux-focus-events
-tom-anders/telescope-vim-bookmarks.nvim
-tomasiser/vim-code-dark
-tomasr/molokai
-tomlion/vim-solidity
-tommcdo/vim-exchange
-tommcdo/vim-fubitive
-tommcdo/vim-lion
-tommcdo/vim-ninja-feet
-tomtom/tcomment_vim
-tomtom/tlib_vim
-tools-life/taskwiki
-towolf/vim-helm
-tpope/vim-abolish
-tpope/vim-capslock
-tpope/vim-commentary
-tpope/vim-dadbod
-tpope/vim-dispatch
-tpope/vim-endwise
-tpope/vim-eunuch
-tpope/vim-fireplace
-tpope/vim-flagship
-tpope/vim-fugitive
-tpope/vim-git
-tpope/vim-liquid
-tpope/vim-obsession
-tpope/vim-pathogen
-tpope/vim-projectionist
-tpope/vim-ragtag
-tpope/vim-rails
-tpope/vim-repeat
-tpope/vim-rhubarb
-tpope/vim-rsi
-tpope/vim-salve
-tpope/vim-scriptease
-tpope/vim-sensible
-tpope/vim-sexp-mappings-for-regular-people
-tpope/vim-sleuth
-tpope/vim-speeddating
-tpope/vim-surround
-tpope/vim-tbone
-tpope/vim-unimpaired
-tpope/vim-vinegar
-travitch/hasksyn
-tremor-rs/tremor-vim
-triglav/vim-visual-increment
-troydm/zoomwintab.vim
-turbio/bracey.vim
-tversteeg/registers.nvim
-tweekmonster/wstrip.vim
-twerth/ir_black
-twinside/vim-haskellconceal
-Twinside/vim-hoogle
-tyru/caw.vim
-tyru/open-browser-github.vim
-tyru/open-browser.vim
-tzachar/cmp-tabnine
-tzachar/compe-tabnine
-uarun/vim-protobuf
-udalov/kotlin-vim
-ujihisa/neco-look
-unblevable/quick-scope
-ur4ltz/surround.nvim
-urbit/hoon.vim
-Valloric/MatchTagAlways
-Valodim/deoplete-notmuch
-vhda/verilog_systemverilog.vim
-vifm/vifm.vim
-vigoux/LanguageTool.nvim
-vijaymarupudi/nvim-fzf
-vijaymarupudi/nvim-fzf-commands
-vim-airline/vim-airline
-vim-airline/vim-airline-themes
-vim-autoformat/vim-autoformat
-vim-erlang/vim-erlang-compiler
-vim-erlang/vim-erlang-omnicomplete
-vim-erlang/vim-erlang-runtime
-vim-erlang/vim-erlang-tags
-vim-pandoc/vim-pandoc
-vim-pandoc/vim-pandoc-after
-vim-pandoc/vim-pandoc-syntax
-vim-python/python-syntax
-vim-ruby/vim-ruby
-vim-scripts/a.vim
-vim-scripts/align
-vim-scripts/argtextobj.vim
-vim-scripts/autoload_cscope.vim
-vim-scripts/bats.vim
-vim-scripts/BufOnly.vim
-vim-scripts/changeColorScheme.vim
-vim-scripts/Colour-Sampler-Pack
-vim-scripts/DoxygenToolkit.vim
-vim-scripts/emodeline
-vim-scripts/gitignore.vim
-vim-scripts/Improved-AnsiEsc
-vim-scripts/jdaddy.vim
-vim-scripts/matchit.zip
-vim-scripts/mayansmoke
-vim-scripts/PreserveNoEOL
-vim-scripts/prev_indent
-vim-scripts/random.vim
-vim-scripts/rcshell.vim
-vim-scripts/Rename
-vim-scripts/ReplaceWithRegister
-vim-scripts/ShowMultiBase
-vim-scripts/tabmerge
-vim-scripts/taglist.vim
-vim-scripts/timestamp.vim
-vim-scripts/utl.vim
-vim-scripts/vis
-vim-scripts/wombat256.vim
-vim-scripts/YankRing.vim
-vim-syntastic/syntastic
-vim-test/vim-test
-vim-utils/vim-husk
-Vimjas/vim-python-pep8-indent
-vimlab/split-term.vim
-vimoutliner/vimoutliner
-vimpostor/vim-tpipeline
-vimsence/vimsence
-vimwiki/vimwiki
-vito-c/jq.vim
-vmchale/ats-vim
-vmchale/dhall-vim
-vmware-archive/salt-vim
-vn-ki/coc-clap
-voldikss/vim-floaterm
-vuki656/package-info.nvim
-VundleVim/Vundle.vim
-w0ng/vim-hybrid
-wakatime/vim-wakatime
-wannesm/wmgraphviz.vim
-wbthomason/packer.nvim
-weilbith/nvim-code-action-menu
-wellle/targets.vim
-wellle/tmux-complete.vim
-wesQ3/vim-windowswap
-wfxr/minimap.vim
-whonore/Coqtail
-will133/vim-dirdiff
-wincent/command-t
-wincent/ferret
-wincent/terminus
-windwp/nvim-autopairs
-windwp/nvim-ts-autotag
-winston0410/cmd-parser.nvim
-winston0410/range-highlight.nvim
-wlangstroth/vim-racket
-wsdjeg/vim-fetch
-xavierd/clang_complete
-xolox/vim-easytags
-xolox/vim-misc
-xuhdev/vim-latex-live-preview
-Xuyuanp/nerdtree-git-plugin
-Xuyuanp/scrollbar.nvim
-yamatsum/nvim-cursorline
-yamatsum/nvim-nonicons
-ycm-core/YouCompleteMe
-yegappan/mru
-Yggdroot/hiPairs
-Yggdroot/indentLine
-Yggdroot/LeaderF
-Yilin-Yang/vim-markbar
-yssl/QFEnter
-yuki-yano/ncm2-dictionary
-yunlingz/ci_dark
-zah/nim.vim
-zhou13/vim-easyescape
-ziglang/zig.vim
+repo,branch,alias
+https://github.com/euclidianAce/BetterLua.vim/,,
+https://github.com/vim-scripts/BufOnly.vim/,,
+https://github.com/chrisbra/CheckAttach/,,
+https://github.com/vim-scripts/Colour-Sampler-Pack/,,
+https://github.com/whonore/Coqtail/,,
+https://github.com/vim-scripts/DoxygenToolkit.vim/,,
+https://github.com/numToStr/FTerm.nvim/,,
+https://github.com/antoinemadec/FixCursorHold.nvim/,,
+https://github.com/vim-scripts/Improved-AnsiEsc/,,
+https://github.com/martinda/Jenkinsfile-vim-syntax/,,
+https://github.com/autozimu/LanguageClient-neovim/,,
+https://github.com/vigoux/LanguageTool.nvim/,,
+https://github.com/Yggdroot/LeaderF/,,
+https://github.com/Valloric/MatchTagAlways/,,
+https://github.com/numToStr/Navigator.nvim/,,
+https://github.com/overcache/NeoSolarized/,,
+https://github.com/chrisbra/NrrwRgn/,,
+https://github.com/vim-scripts/PreserveNoEOL/,,
+https://github.com/yssl/QFEnter/,,
+https://github.com/chrisbra/Recover.vim/,,
+https://github.com/vim-scripts/Rename/,,
+https://github.com/vim-scripts/ReplaceWithRegister/,,
+https://github.com/b0o/SchemaStore.nvim/,,
+https://github.com/sunjon/Shade.nvim/,,
+https://github.com/vim-scripts/ShowMultiBase/,,
+https://github.com/tmhedberg/SimpylFold/,,
+https://github.com/jaredgorski/SpaceCamp/,,
+https://github.com/SpaceVim/SpaceVim/,,
+https://github.com/ackyshake/Spacegray.vim/,,
+https://github.com/chrisbra/SudoEdit.vim/,,
+https://github.com/Pocco81/TrueZen.nvim/,,
+https://github.com/ackyshake/VimCompletesMe/,,
+https://github.com/hsitz/VimOrganizer/,,
+https://github.com/VundleVim/Vundle.vim/,,
+https://github.com/esneider/YUNOcommit.vim/,,
+https://github.com/vim-scripts/YankRing.vim/,,
+https://github.com/ycm-core/YouCompleteMe/,,
+https://github.com/vim-scripts/a.vim/,,
+https://github.com/mileszs/ack.vim/,,
+https://github.com/eikenb/acp/,,
+https://github.com/stevearc/aerial.nvim/,,
+https://github.com/derekelkins/agda-vim/,,
+https://github.com/slashmili/alchemist.vim/,,
+https://github.com/dense-analysis/ale/,,
+https://github.com/vim-scripts/align/,,
+https://github.com/Olical/aniseed/,,
+https://github.com/pearofducks/ansible-vim/,,
+https://github.com/ckarnell/antonys-macro-repeater/,,
+https://github.com/solarnz/arcanist.vim/,,
+https://github.com/vim-scripts/argtextobj.vim/,,
+https://github.com/prabirshrestha/async.vim/,,
+https://github.com/prabirshrestha/asyncomplete-lsp.vim/,,
+https://github.com/prabirshrestha/asyncomplete.vim/,,
+https://github.com/skywind3000/asyncrun.vim/,,
+https://github.com/skywind3000/asynctasks.vim/,,
+https://github.com/vmchale/ats-vim/,,
+https://github.com/ray-x/aurora/,,
+https://github.com/hotwatermorning/auto-git-diff/,,
+https://github.com/jiangmiao/auto-pairs/,,
+https://github.com/rmagatti/auto-session/,,
+https://github.com/vim-scripts/autoload_cscope.vim/,,
+https://github.com/rafi/awesome-vim-colorschemes/,,
+https://github.com/ayu-theme/ayu-vim/,,
+https://github.com/romgrk/barbar.nvim/,,
+https://github.com/chriskempson/base16-vim/,,
+https://github.com/vim-scripts/bats.vim/,,
+https://github.com/rbgrouleff/bclose.vim/,,
+https://github.com/max397574/better-escape.nvim/,,
+https://github.com/sblumentritt/bitbake.vim/,,
+https://github.com/blueballs-theme/blueballs-neovim/,,
+https://github.com/turbio/bracey.vim/,,
+https://github.com/fruit-in/brainfuck-vim/,,
+https://github.com/famiu/bufdelete.nvim/,,
+https://github.com/jlanzarotta/bufexplorer/,,
+https://github.com/akinsho/bufferline.nvim/,,
+https://github.com/mattn/calendar-vim/,,mattn-calendar-vim
+https://github.com/itchyny/calendar.vim/,,
+https://github.com/bkad/camelcasemotion/,,
+https://github.com/tyru/caw.vim/,,
+https://github.com/ms-jpq/chadtree/,,chad
+https://github.com/vim-scripts/changeColorScheme.vim/,,
+https://github.com/sudormrfbin/cheatsheet.nvim/,,
+https://github.com/yunlingz/ci_dark/,,
+https://github.com/projekt0n/circles.nvim/,,
+https://github.com/xavierd/clang_complete/,,
+https://github.com/rhysd/clever-f.vim/,,
+https://github.com/bbchung/clighter8/,,
+https://github.com/winston0410/cmd-parser.nvim/,,
+https://github.com/hrsh7th/cmp-buffer/,,
+https://github.com/hrsh7th/cmp-calc/,,
+https://github.com/hrsh7th/cmp-cmdline/,,
+https://github.com/PaterJason/cmp-conjure/,,
+https://github.com/hrsh7th/cmp-emoji/,,
+https://github.com/kdheepak/cmp-latex-symbols/,,
+https://github.com/hrsh7th/cmp-nvim-lsp/,,
+https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/,,
+https://github.com/hrsh7th/cmp-nvim-lua/,,
+https://github.com/quangnguyen30192/cmp-nvim-ultisnips/,,
+https://github.com/hrsh7th/cmp-omni/,,
+https://github.com/jc-doyle/cmp-pandoc-references/,,
+https://github.com/hrsh7th/cmp-path/,,
+https://github.com/f3fora/cmp-spell/,,
+https://github.com/tzachar/cmp-tabnine/,,
+https://github.com/andersevenrud/cmp-tmux/,,
+https://github.com/ray-x/cmp-treesitter/,,
+https://github.com/lukas-reineke/cmp-under-comparator/,,
+https://github.com/hrsh7th/cmp-vsnip/,,
+https://github.com/saadparwaiz1/cmp_luasnip/,,
+https://github.com/vn-ki/coc-clap/,,
+https://github.com/neoclide/coc-denite/,,
+https://github.com/antoinemadec/coc-fzf/,,
+https://github.com/josa42/coc-lua/,,
+https://github.com/neoclide/coc-neco/,,
+https://github.com/iamcco/coc-spell-checker/,,
+https://github.com/coc-extensions/coc-svelte/,,
+https://github.com/iamcco/coc-tailwindcss/,,
+https://github.com/neoclide/coc.nvim/,release,
+https://github.com/metakirby5/codi.vim/,,
+https://github.com/tjdevries/colorbuddy.nvim/,,
+https://github.com/lilydjwg/colorizer/,,
+https://github.com/wincent/command-t/,,
+https://github.com/numtostr/comment.nvim/,,
+https://github.com/rhysd/committia.vim/,,
+https://github.com/tami5/compe-conjure/,,
+https://github.com/GoldsteinE/compe-latex-symbols/,,
+https://github.com/tzachar/compe-tabnine/,,
+https://github.com/tamago324/compe-zsh/,,
+https://github.com/steelsojka/completion-buffers/,,
+https://github.com/nvim-lua/completion-nvim/,,
+https://github.com/aca/completion-tabnine/,,
+https://github.com/nvim-treesitter/completion-treesitter/,,
+https://github.com/chikatoike/concealedyank.vim/,,
+https://github.com/rhysd/conflict-marker.vim/,,
+https://github.com/Olical/conjure/,,
+https://github.com/Shougo/context_filetype.vim/,,
+https://github.com/github/copilot.vim/,,
+https://github.com/jvoorhis/coq.vim/,,
+https://github.com/ms-jpq/coq_nvim/,,
+https://github.com/lfilho/cosco.vim/,,
+https://github.com/nixprime/cpsm/,,
+https://github.com/saecki/crates.nvim/,,
+https://github.com/godlygeek/csapprox/,,
+https://github.com/chrisbra/csv.vim/,,
+https://github.com/JazzCore/ctrlp-cmatcher/,,
+https://github.com/FelikZ/ctrlp-py-matcher/,,
+https://github.com/amiorin/ctrlp-z/,,
+https://github.com/ctrlpvim/ctrlp.vim/,,
+https://github.com/dart-lang/dart-vim-plugin/,,
+https://github.com/glepnir/dashboard-nvim/,,
+https://github.com/kristijanhusak/defx-git/,,
+https://github.com/kristijanhusak/defx-icons/,,
+https://github.com/Shougo/defx.nvim/,,
+https://github.com/Raimondi/delimitMate/,,
+https://github.com/neoclide/denite-extra/,,
+https://github.com/neoclide/denite-git/,,
+https://github.com/Shougo/denite.nvim/,,
+https://github.com/Shougo/deol.nvim/,,
+https://github.com/deoplete-plugins/deoplete-clang/,,
+https://github.com/deoplete-plugins/deoplete-dictionary/,,
+https://github.com/ponko2/deoplete-fish/,,
+https://github.com/SevereOverfl0w/deoplete-github/,,
+https://github.com/deoplete-plugins/deoplete-go/,,
+https://github.com/Inazuma110/deoplete-greek/,,
+https://github.com/deoplete-plugins/deoplete-jedi/,,
+https://github.com/JuliaEditorSupport/deoplete-julia/,,
+https://github.com/nicoe/deoplete-khard/,,
+https://github.com/deoplete-plugins/deoplete-lsp/,,
+https://github.com/Valodim/deoplete-notmuch/,,
+https://github.com/kristijanhusak/deoplete-phpactor/,,
+https://github.com/sebastianmarkow/deoplete-rust/,,
+https://github.com/tbodt/deoplete-tabnine/,,
+https://github.com/carlitux/deoplete-ternjs/,,
+https://github.com/lighttiger2505/deoplete-vim-lsp/,,
+https://github.com/deoplete-plugins/deoplete-zsh/,,
+https://github.com/Shougo/deoplete.nvim/,,
+https://github.com/rhysd/devdocs.vim/,,
+https://github.com/vmchale/dhall-vim/,,
+https://github.com/onsails/diaglist.nvim/,,
+https://github.com/nvim-lua/diagnostic-nvim/,,
+https://github.com/sindrets/diffview.nvim/,,
+https://github.com/direnv/direnv.vim/,,
+https://github.com/doki-theme/doki-theme-vim/,,
+https://github.com/stevearc/dressing.nvim/,,
+https://github.com/Shougo/echodoc.vim/,,
+https://github.com/sainnhe/edge/,,
+https://github.com/editorconfig/editorconfig-vim/,,
+https://github.com/gpanders/editorconfig.nvim/,,
+https://github.com/elmcast/elm-vim/,,
+https://github.com/dmix/elvish.vim/,,
+https://github.com/mattn/emmet-vim/,,
+https://github.com/vim-scripts/emodeline/,,
+https://github.com/sainnhe/everforest/,,
+https://github.com/fenetikm/falcon/,,
+https://github.com/brooth/far.vim/,,
+https://github.com/konfekt/fastfold/,,
+https://github.com/lilydjwg/fcitx.vim/,fcitx5,
+https://github.com/feline-nvim/feline.nvim/,,
+https://github.com/bakpakin/fennel.vim/,,
+https://github.com/lambdalisue/fern.vim/,,
+https://github.com/wincent/ferret/,,
+https://github.com/j-hui/fidget.nvim/,,
+https://github.com/bogado/file-line/,,
+https://github.com/andviro/flake8-vim/,,
+https://github.com/ncm2/float-preview.nvim/,,
+https://github.com/fhill2/floating.nvim/,,
+https://github.com/floobits/floobits-neovim/,,
+https://github.com/mhartington/formatter.nvim/,,
+https://github.com/megaannum/forms/,,
+https://github.com/rafamadriz/friendly-snippets/,,
+https://github.com/raghur/fruzzy/,,
+https://github.com/shumphrey/fugitive-gitlab.vim/,,
+https://github.com/BeneCollyridam/futhark-vim/,,
+https://github.com/rktjmp/fwatch.nvim/,,
+https://github.com/stsewd/fzf-checkout.vim/,,
+https://github.com/gfanto/fzf-lsp.nvim/,,
+https://github.com/junegunn/fzf.vim/,,
+https://github.com/NTBBloodbath/galaxyline.nvim/,,
+https://github.com/jsfaint/gen_tags.vim/,,
+https://github.com/gentoo/gentoo-syntax/,,
+https://github.com/ndmitchell/ghcid/,,
+https://github.com/eagletmt/ghcmod-vim/,,
+https://github.com/lambdalisue/gina.vim/,,
+https://github.com/f-person/git-blame.nvim/,,
+https://github.com/rhysd/git-messenger.vim/,,
+https://github.com/ThePrimeagen/git-worktree.nvim/,,
+https://github.com/vim-scripts/gitignore.vim/,,
+https://github.com/ruifm/gitlinker.nvim/,,
+https://github.com/lewis6991/gitsigns.nvim/,,
+https://github.com/gregsexton/gitv/,,
+https://github.com/gleam-lang/gleam.vim/,,
+https://github.com/ellisonleao/glow.nvim/,,
+https://github.com/roman/golden-ratio/,,
+https://github.com/buoto/gotests-vim/,,
+https://github.com/rmagatti/goto-preview/,,
+https://github.com/junegunn/goyo.vim/,,
+https://github.com/liuchengxu/graphviz.vim/,,
+https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
+https://github.com/morhetz/gruvbox/,,
+https://github.com/eddyekofo94/gruvbox-flat.nvim/,,
+https://github.com/sainnhe/gruvbox-material/,,
+https://github.com/ellisonleao/gruvbox.nvim/,,
+https://github.com/sjl/gundo.vim/,,
+https://github.com/junegunn/gv.vim/,,
+https://github.com/ThePrimeagen/harpoon/,,
+https://github.com/neovimhaskell/haskell-vim/,,
+https://github.com/travitch/hasksyn/,,
+https://github.com/Yggdroot/hiPairs/,,
+https://github.com/mpickering/hlint-refactor-vim/,,
+https://github.com/edluffy/hologram.nvim/,,
+https://github.com/urbit/hoon.vim/,,
+https://github.com/phaazon/hop.nvim/,,
+https://github.com/rktjmp/hotpot.nvim/,,
+https://github.com/mboughaba/i3config.vim/,,
+https://github.com/cocopon/iceberg.vim/,,
+https://github.com/idris-hackers/idris-vim/,,
+https://github.com/edwinb/idris2-vim/,,
+https://github.com/lewis6991/impatient.nvim/,,
+https://github.com/nishigori/increment-activator/,,
+https://github.com/haya14busa/incsearch-easymotion.vim/,,
+https://github.com/haya14busa/incsearch.vim/,,
+https://github.com/lukas-reineke/indent-blankline.nvim/,,
+https://github.com/Yggdroot/indentLine/,,
+https://github.com/ciaranm/inkpot/,,
+https://github.com/parsonsmatt/intero-neovim/,,
+https://github.com/keith/investigate.vim/,,
+https://github.com/neutaaaaan/iosvkem/,,
+https://github.com/twerth/ir_black/,,
+https://github.com/haya14busa/is.vim/,,
+https://github.com/vim-scripts/jdaddy.vim/,,
+https://github.com/davidhalter/jedi-vim/,,
+https://github.com/metalelf0/jellybeans-nvim/,,
+https://github.com/nanotech/jellybeans.vim/,,
+https://github.com/vito-c/jq.vim/,,
+https://github.com/neoclide/jsonc.vim/,,
+https://github.com/JuliaEditorSupport/julia-vim/,,
+https://github.com/rebelot/kanagawa.nvim/,,
+https://github.com/b3nj5m1n/kommentary/,,
+https://github.com/udalov/kotlin-vim/,,
+https://github.com/qnighy/lalrpop.vim/,,
+https://github.com/sk1418/last256/,,
+https://github.com/latex-box-team/latex-box/,,
+https://github.com/kdheepak/lazygit.nvim/,,
+https://github.com/Julian/lean.nvim/,,
+https://github.com/leanprover/lean.vim/,,
+https://github.com/camspiers/lens.vim/,,
+https://github.com/thirtythreeforty/lessspace.vim/,,
+https://github.com/cohama/lexima.vim/,,
+https://github.com/ptzz/lf.vim/,,
+https://github.com/LucHermitte/lh-brackets/,,
+https://github.com/LucHermitte/lh-vim-lib/,,
+https://github.com/maximbaz/lightline-ale/,,
+https://github.com/mengelbrecht/lightline-bufferline/,,
+https://github.com/shinchu/lightline-gruvbox.vim/,,
+https://github.com/spywhere/lightline-lsp/,,
+https://github.com/itchyny/lightline.vim/,,
+https://github.com/ggandor/lightspeed.nvim/,,
+https://github.com/junegunn/limelight.vim/,,
+https://github.com/lf-lang/lingua-franca.vim/,,
+https://github.com/tamago324/lir.nvim/,,
+https://github.com/tami5/lispdocs.nvim/,,
+https://github.com/ldelossa/litee-calltree.nvim/,,
+https://github.com/ldelossa/litee-filetree.nvim/,,
+https://github.com/ldelossa/litee-symboltree.nvim/,,
+https://github.com/ldelossa/litee.nvim/,,
+https://github.com/folke/lsp-colors.nvim/,,
+https://github.com/ahmedkhalf/lsp-rooter.nvim/,,
+https://github.com/nvim-lua/lsp-status.nvim/,,
+https://github.com/nvim-lua/lsp_extensions.nvim/,,
+https://git.sr.ht/~whynothugo/lsp_lines.nvim,,
+https://github.com/ray-x/lsp_signature.nvim/,,
+https://github.com/onsails/lspkind-nvim/,,
+https://github.com/tami5/lspsaga.nvim/,,
+https://github.com/folke/lua-dev.nvim/,,
+https://github.com/arkav/lualine-lsp-progress/,,
+https://github.com/nvim-lualine/lualine.nvim/,,
+https://github.com/l3mon4d3/luasnip/,,
+https://github.com/alvarosevilla95/luatab.nvim/,,
+https://github.com/rktjmp/lush.nvim/,,
+https://github.com/mkasa/lushtags/,,
+https://github.com/iamcco/markdown-preview.nvim/,,
+https://github.com/chentau/marks.nvim/,,
+https://github.com/vim-scripts/matchit.zip/,,
+https://github.com/marko-cerovac/material.nvim/,,
+https://github.com/vim-scripts/mayansmoke/,,
+https://github.com/echasnovski/mini.nvim/,,
+https://github.com/wfxr/minimap.vim/,,
+https://github.com/jose-elias-alvarez/minsnip.nvim/,,
+https://github.com/jghauser/mkdir.nvim/,main,
+https://github.com/SidOfc/mkdx/,,
+https://github.com/tomasr/molokai/,,
+https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
+https://github.com/yegappan/mru/,,
+https://github.com/ncm2/ncm2/,,
+https://github.com/ncm2/ncm2-bufword/,,
+https://github.com/ncm2/ncm2-cssomni/,,
+https://github.com/yuki-yano/ncm2-dictionary/,,
+https://github.com/ncm2/ncm2-github/,,
+https://github.com/ncm2/ncm2-html-subscope/,,
+https://github.com/ncm2/ncm2-jedi/,,
+https://github.com/ncm2/ncm2-markdown-subscope/,,
+https://github.com/ncm2/ncm2-neoinclude/,,
+https://github.com/ncm2/ncm2-neosnippet/,,
+https://github.com/ncm2/ncm2-path/,,
+https://github.com/ncm2/ncm2-syntax/,,
+https://github.com/ncm2/ncm2-tagprefix/,,
+https://github.com/ncm2/ncm2-tmux/,,
+https://github.com/ncm2/ncm2-ultisnips/,,
+https://github.com/ncm2/ncm2-vim/,,
+https://github.com/eagletmt/neco-ghc/,,
+https://github.com/ujihisa/neco-look/,,
+https://github.com/Shougo/neco-syntax/,,
+https://github.com/Shougo/neco-vim/,,
+https://github.com/Shougo/neocomplete.vim/,,
+https://github.com/KeitaNakamura/neodark.vim/,,
+https://github.com/sbdchd/neoformat/,,
+https://github.com/TimUntersberger/neogit/,,
+https://github.com/Shougo/neoinclude.vim/,,
+https://github.com/neomake/neomake/,,
+https://github.com/Shougo/neomru.vim/,,
+https://github.com/rafamadriz/neon/,,
+https://github.com/nvim-neorg/neorg/,,
+https://github.com/karb94/neoscroll.nvim/,,
+https://github.com/Shougo/neosnippet-snippets/,,
+https://github.com/Shougo/neosnippet.vim/,,
+https://github.com/kassio/neoterm/,,
+https://github.com/rose-pine/neovim/,main,rose-pine
+https://github.com/Shatur/neovim-ayu/,,
+https://github.com/cloudhead/neovim-fuzzy/,,
+https://github.com/jeffkreeftmeijer/neovim-sensible/,,
+https://github.com/Shougo/neoyank.vim/,,
+https://github.com/preservim/nerdcommenter/,,
+https://github.com/preservim/nerdtree/,,
+https://github.com/Xuyuanp/nerdtree-git-plugin/,,
+https://github.com/oberblastmeister/neuron.nvim/,,
+https://github.com/fiatjaf/neuron.vim/,,
+https://github.com/chr4/nginx.vim/,,
+https://github.com/EdenEast/nightfox.nvim/,,
+https://github.com/zah/nim.vim/,,
+https://github.com/tjdevries/nlua.nvim/,,
+https://github.com/mcchrish/nnn.vim/,,
+https://github.com/arcticicestudio/nord-vim/,master,
+https://github.com/shaunsingh/nord.nvim/,,
+https://github.com/andersevenrud/nordic.nvim/,,
+https://github.com/jlesquembre/nterm.nvim/,,
+https://github.com/MunifTanjim/nui.nvim/,main,
+https://github.com/jose-elias-alvarez/null-ls.nvim/,,
+https://github.com/nacro90/numb.nvim/,,
+https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,,
+https://github.com/catppuccin/nvim/,,catppuccin-nvim
+https://github.com/nathanmsmith/nvim-ale-diagnostic/,,
+https://github.com/windwp/nvim-autopairs/,,
+https://github.com/RRethy/nvim-base16/,,
+https://github.com/kevinhwang91/nvim-bqf/,,
+https://github.com/ojroques/nvim-bufdel/,,
+https://github.com/roxma/nvim-cm-racer/,,
+https://github.com/hrsh7th/nvim-cmp/,,
+https://github.com/weilbith/nvim-code-action-menu/,,
+https://github.com/norcalli/nvim-colorizer.lua/,,
+https://github.com/terrortylor/nvim-comment/,,
+https://github.com/hrsh7th/nvim-compe/,,
+https://github.com/roxma/nvim-completion-manager/,,
+https://github.com/yamatsum/nvim-cursorline/,,
+https://github.com/mfussenegger/nvim-dap/,,
+https://github.com/rcarriga/nvim-dap-ui/,,
+https://github.com/theHamsta/nvim-dap-virtual-text/,,
+https://github.com/allendang/nvim-expand-expr/,,
+https://github.com/vijaymarupudi/nvim-fzf/,,
+https://github.com/vijaymarupudi/nvim-fzf-commands/,,
+https://github.com/sakhnik/nvim-gdb/,,
+https://github.com/smiteshp/nvim-gps/,,
+https://github.com/Iron-E/nvim-highlite/,,
+https://github.com/kevinhwang91/nvim-hlslens/,,
+https://github.com/neovimhaskell/nvim-hs.vim/,,
+https://github.com/mfussenegger/nvim-jdtls/,,
+https://github.com/gennaro-tedesco/nvim-jqx/,,
+https://github.com/kosayoda/nvim-lightbulb/,,
+https://github.com/josa42/nvim-lightline-lsp/,,
+https://github.com/mfussenegger/nvim-lint/,,
+https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,,
+https://github.com/neovim/nvim-lspconfig/,,
+https://github.com/RishabhRD/nvim-lsputils/,,
+https://github.com/scalameta/nvim-metals/,,
+https://github.com/AckslD/nvim-neoclip.lua/,,
+https://github.com/yamatsum/nvim-nonicons/,,
+https://github.com/rcarriga/nvim-notify/,,
+https://github.com/gennaro-tedesco/nvim-peekup/,,
+https://github.com/dstein64/nvim-scrollview/,,
+https://github.com/ishan9299/nvim-solarized-lua/,,
+https://github.com/nvim-pack/nvim-spectre/,,
+https://github.com/norcalli/nvim-terminal.lua/,,
+https://github.com/kyazdani42/nvim-tree.lua/,,
+https://github.com/nvim-treesitter/nvim-treesitter/,,
+https://github.com/romgrk/nvim-treesitter-context/,,
+https://github.com/eddiebergman/nvim-treesitter-pyfold/,,
+https://github.com/nvim-treesitter/nvim-treesitter-refactor/,,
+https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,,
+https://github.com/windwp/nvim-ts-autotag/,,
+https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
+https://github.com/p00f/nvim-ts-rainbow/,,
+https://github.com/kyazdani42/nvim-web-devicons/,,
+https://github.com/AckslD/nvim-whichkey-setup.lua/,,
+https://github.com/roxma/nvim-yarp/,,
+https://github.com/haringsrob/nvim_context_vt/,,
+https://github.com/neovim/nvimdev.nvim/,,
+https://github.com/glepnir/oceanic-material/,,
+https://github.com/mhartington/oceanic-next/,,
+https://github.com/pwntester/octo.nvim/,,
+https://github.com/Th3Whit3Wolf/one-nvim/,,
+https://github.com/navarasu/onedark.nvim/,,
+https://github.com/joshdick/onedark.vim/,,
+https://github.com/olimorris/onedarkpro.nvim/,,
+https://github.com/sonph/onehalf/,,
+https://github.com/tyru/open-browser-github.vim/,,
+https://github.com/tyru/open-browser.vim/,,
+https://github.com/nvim-orgmode/orgmode/,,
+https://github.com/vuki656/package-info.nvim/,,
+https://github.com/wbthomason/packer.nvim/,,
+https://github.com/drewtempelmeyer/palenight.vim/,,
+https://github.com/NLKNguyen/papercolor-theme/,,
+https://github.com/tmsvg/pear-tree/,,
+https://github.com/steelsojka/pears.nvim/,,
+https://github.com/andsild/peskcolor.vim/,,
+https://github.com/lifepillar/pgsql.vim/,,
+https://github.com/motus/pig.vim/,,
+https://github.com/aklt/plantuml-syntax/,,
+https://github.com/nvim-treesitter/playground/,,
+https://github.com/nvim-lua/plenary.nvim/,,
+https://github.com/dleonard0/pony-vim-syntax/,,
+https://github.com/RishabhRD/popfix/,,
+https://github.com/nvim-lua/popup.nvim/,,
+https://github.com/andweeb/presence.nvim/,,
+https://github.com/sotte/presenting.vim/,,
+https://github.com/vim-scripts/prev_indent/,,
+https://github.com/ahmedkhalf/project.nvim/,,
+https://github.com/frigoeu/psc-ide-vim/,,
+https://github.com/purescript-contrib/purescript-vim/,,
+https://github.com/python-mode/python-mode/,,
+https://github.com/vim-python/python-syntax/,,
+https://github.com/AlphaTechnolog/pywal.nvim/,,
+https://github.com/unblevable/quick-scope/,,
+https://github.com/stefandtw/quickfix-reflector.vim/,,
+https://github.com/dannyob/quickfixstatus/,,
+https://github.com/luochen1990/rainbow/,,
+https://github.com/kien/rainbow_parentheses.vim/,,
+https://github.com/vim-scripts/random.vim/,,
+https://github.com/winston0410/range-highlight.nvim/,,
+https://github.com/rafaqz/ranger.vim/,,
+https://github.com/vim-scripts/rcshell.vim/,,
+https://github.com/ryvnf/readline.vim/,,
+https://github.com/theprimeagen/refactoring.nvim/,,
+https://github.com/tversteeg/registers.nvim/,,
+https://github.com/filipdutescu/renamer.nvim/,,
+https://github.com/NTBBloodbath/rest.nvim/,,
+https://github.com/gu-fan/riv.vim/,,
+https://github.com/kevinhwang91/rnvimr/,,
+https://github.com/mfukar/robotframework-vim/,,
+https://github.com/ron-rs/ron.vim/,,
+https://github.com/keith/rspec.vim/,,
+https://github.com/ccarpita/rtorrent-syntax-file/,,
+https://github.com/simrat39/rust-tools.nvim/,,
+https://github.com/rust-lang/rust.vim/,,
+https://github.com/hauleth/sad.vim/,,
+https://github.com/vmware-archive/salt-vim/,,
+https://github.com/Xuyuanp/scrollbar.nvim/,,
+https://github.com/RobertAudi/securemodelines/,,
+https://github.com/megaannum/self/,,
+https://github.com/jaxbot/semantic-highlight.vim/,,
+https://github.com/numirias/semshi/,,
+https://github.com/junegunn/seoul256.vim/,,
+https://github.com/osyo-manga/shabadou.vim/,,
+https://github.com/AndrewRadev/sideways.vim/,,
+https://github.com/lotabout/skim.vim/,,
+https://github.com/mopp/sky-color-clock.vim/,,
+https://github.com/kovisoft/slimv/,,
+https://github.com/gorkunov/smartpairs.vim/,,
+https://github.com/camspiers/snap/,,
+https://github.com/norcalli/snippets.nvim/,,
+https://github.com/sainnhe/sonokai/,,
+https://github.com/chikatoike/sourcemap.vim/,,
+https://github.com/liuchengxu/space-vim/,,
+https://github.com/ctjhoa/spacevim/,,
+https://github.com/chrisgeo/sparkup/,,
+https://github.com/edluffy/specs.nvim/,,
+https://github.com/sjl/splice.vim/,,
+https://github.com/vimlab/split-term.vim/,,
+https://github.com/AndrewRadev/splitjoin.vim/,,
+https://github.com/tami5/sqlite.lua/,,
+https://github.com/srcery-colors/srcery-vim/,,
+https://github.com/chr4/sslsecure.vim/,,
+https://github.com/luukvbaal/stabilize.nvim/,,
+https://github.com/eigenfoo/stan-vim/,,
+https://github.com/darfink/starsearch.vim/,,
+https://github.com/lambdalisue/suda.vim/,,
+https://github.com/ervandew/supertab/,,
+https://github.com/ur4ltz/surround.nvim/,,
+https://github.com/peterbjorgensen/sved/,,
+https://github.com/keith/swift.vim/,,
+https://github.com/AndrewRadev/switch.vim/,,
+https://github.com/simrat39/symbols-outline.nvim/,,
+https://github.com/vim-syntastic/syntastic/,,
+https://github.com/kdheepak/tabline.nvim/,,
+https://github.com/vim-scripts/tabmerge/,,
+https://github.com/codota/tabnine-vim/,,
+https://github.com/gcmt/taboo.vim/,,
+https://github.com/Shougo/tabpagebuffer.vim/,,
+https://github.com/godlygeek/tabular/,,
+https://github.com/AndrewRadev/tagalong.vim/,,
+https://github.com/preservim/tagbar/,,
+https://github.com/vim-scripts/taglist.vim/,,
+https://github.com/wellle/targets.vim/,,
+https://github.com/tools-life/taskwiki/,,
+https://github.com/tomtom/tcomment_vim/,,
+https://github.com/GustavoKatel/telescope-asynctasks.nvim/,,
+https://github.com/nvim-telescope/telescope-cheat.nvim/,,
+https://github.com/fannheyward/telescope-coc.nvim/,,
+https://github.com/nvim-telescope/telescope-dap.nvim/,,
+https://github.com/nvim-telescope/telescope-file-browser.nvim/,,
+https://github.com/nvim-telescope/telescope-frecency.nvim/,,
+https://github.com/nvim-telescope/telescope-fzf-native.nvim/,,
+https://github.com/nvim-telescope/telescope-fzf-writer.nvim/,,
+https://github.com/nvim-telescope/telescope-fzy-native.nvim/,,
+https://github.com/nvim-telescope/telescope-github.nvim/,,
+https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,,
+https://github.com/nvim-telescope/telescope-project.nvim/,,
+https://github.com/nvim-telescope/telescope-symbols.nvim/,,
+https://github.com/nvim-telescope/telescope-ui-select.nvim/,,
+https://github.com/fhill2/telescope-ultisnips.nvim/,,
+https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,,
+https://github.com/nvim-telescope/telescope-z.nvim/,,
+https://github.com/jvgrootveld/telescope-zoxide/,,
+https://github.com/nvim-telescope/telescope.nvim/,,
+https://github.com/jacoborus/tender.vim/,,
+https://github.com/wincent/terminus/,,
+https://github.com/oberblastmeister/termwrapper.nvim/,,
+https://github.com/ternjs/tern_for_vim/,,
+https://github.com/KeitaNakamura/tex-conceal.vim/,,
+https://github.com/ron89/thesaurus_query.vim/,,
+https://github.com/itchyny/thumbnail.vim/,,
+https://github.com/vim-scripts/timestamp.vim/,,
+https://github.com/tomtom/tlib_vim/,,
+https://github.com/wellle/tmux-complete.vim/,,
+https://github.com/edkolev/tmuxline.vim/,,
+https://github.com/folke/todo-comments.nvim/,,
+https://github.com/AmeerTaweel/todo.nvim/,,
+https://github.com/freitass/todo.txt-vim/,,
+https://github.com/akinsho/toggleterm.nvim/,,
+https://github.com/folke/tokyonight.nvim/,,
+https://github.com/markonm/traces.vim/,,
+https://github.com/tjdevries/train.nvim/,,
+https://github.com/tremor-rs/tremor-vim/,,
+https://github.com/folke/trouble.nvim/,,
+https://github.com/jgdavey/tslime.vim/,,
+https://github.com/Quramy/tsuquyomi/,,
+https://github.com/folke/twilight.nvim/,,
+https://github.com/leafgarland/typescript-vim/,,
+https://github.com/SirVer/ultisnips/,,
+https://github.com/mbbill/undotree/,,
+https://github.com/chrisbra/unicode.vim/,,
+https://github.com/Shougo/unite.vim/,,
+https://github.com/axieax/urlview.nvim/,,
+https://github.com/vim-scripts/utl.vim/,,
+https://github.com/KabbAmine/vCoolor.vim/,,
+https://github.com/junegunn/vader.vim/,,
+https://github.com/jbyuki/venn.nvim/,,
+https://github.com/vhda/verilog_systemverilog.vim/,,
+https://github.com/vifm/vifm.vim/,,
+https://github.com/dracula/vim/,,dracula-vim
+https://github.com/embark-theme/vim/,,embark-vim
+https://github.com/Konfekt/vim-CtrlXA/,,
+https://github.com/konfekt/vim-DetectSpellLang/,,
+https://github.com/dpelle/vim-LanguageTool/,,
+https://github.com/inkarkat/vim-ReplaceWithRegister/,,
+https://github.com/inkarkat/vim-ReplaceWithSameIndentRegister/,,
+https://github.com/inkarkat/vim-SyntaxRange/,,
+https://github.com/tpope/vim-abolish/,,
+https://github.com/MarcWeber/vim-addon-actions/,,
+https://github.com/MarcWeber/vim-addon-async/,,
+https://github.com/MarcWeber/vim-addon-background-cmd/,,
+https://github.com/MarcWeber/vim-addon-commenting/,,
+https://github.com/MarcWeber/vim-addon-completion/,,
+https://github.com/MarcWeber/vim-addon-errorformats/,,
+https://github.com/MarcWeber/vim-addon-goto-thing-at-cursor/,,
+https://github.com/MarcWeber/vim-addon-local-vimrc/,,
+https://github.com/MarcWeber/vim-addon-manager/,,
+https://github.com/MarcWeber/vim-addon-mru/,,
+https://github.com/MarcWeber/vim-addon-mw-utils/,,
+https://github.com/MarcWeber/vim-addon-nix/,,
+https://github.com/MarcWeber/vim-addon-other/,,
+https://github.com/MarcWeber/vim-addon-php-manual/,,
+https://github.com/MarcWeber/vim-addon-signs/,,
+https://github.com/MarcWeber/vim-addon-sql/,,
+https://github.com/MarcWeber/vim-addon-syntax-checker/,,
+https://github.com/MarcWeber/vim-addon-toggle-buffer/,,
+https://github.com/MarcWeber/vim-addon-xdebug/,,
+https://github.com/junegunn/vim-after-object/,,
+https://github.com/vim-airline/vim-airline/,,
+https://github.com/enricobacis/vim-airline-clock/,,
+https://github.com/vim-airline/vim-airline-themes/,,
+https://github.com/Konfekt/vim-alias/,,
+https://github.com/hsanson/vim-android/,,
+https://github.com/osyo-manga/vim-anzu/,,
+https://github.com/ThePrimeagen/vim-apm/,,
+https://github.com/PeterRincker/vim-argumentative/,,
+https://github.com/FooSoft/vim-argwrap/,,
+https://github.com/haya14busa/vim-asterisk/,,
+https://github.com/hura/vim-asymptote/,,
+https://github.com/907th/vim-auto-save/,,
+https://github.com/vim-autoformat/vim-autoformat/,,
+https://github.com/benizi/vim-automkdir/,,
+https://github.com/gioele/vim-autoswap/,,
+https://github.com/bazelbuild/vim-bazel/,,
+https://github.com/moll/vim-bbye/,,
+https://github.com/nathangrigg/vim-beancount/,,
+https://github.com/ntpeters/vim-better-whitespace/,,
+https://github.com/MattesGroeger/vim-bookmarks/,,
+https://github.com/gyim/vim-boxdraw/,,
+https://github.com/ConradIrwin/vim-bracketed-paste/,,
+https://github.com/mtikekar/vim-bsv/,,
+https://github.com/jeetsukumaran/vim-buffergator/,,
+https://github.com/bling/vim-bufferline/,,
+https://github.com/qpkorr/vim-bufkill/,,
+https://github.com/tpope/vim-capslock/,,
+https://github.com/kristijanhusak/vim-carbon-now-sh/,,
+https://github.com/m-pilia/vim-ccls/,,
+https://github.com/t9md/vim-choosewin/,,
+https://github.com/rhysd/vim-clang-format/,,
+https://github.com/liuchengxu/vim-clap/,,
+https://github.com/guns/vim-clojure-highlight/,,
+https://github.com/guns/vim-clojure-static/,,
+https://github.com/rstacruz/vim-closer/,,
+https://github.com/alvan/vim-closetag/,,
+https://github.com/tomasiser/vim-code-dark/,,
+https://github.com/google/vim-codefmt/,,
+https://github.com/kchmck/vim-coffee-script/,,
+https://github.com/kalbasit/vim-colemak/,,
+https://github.com/altercation/vim-colors-solarized/,,
+https://github.com/flazz/vim-colorschemes/,,
+https://github.com/jonbri/vim-colorstepper/,,
+https://github.com/tpope/vim-commentary/,,
+https://github.com/luan/vim-concourse/,,
+https://github.com/romainl/vim-cool/,,
+https://github.com/octol/vim-cpp-enhanced-highlight/,,
+https://github.com/mhinz/vim-crates/,,
+https://github.com/OrangeT/vim-csharp/,,
+https://github.com/ap/vim-css-color/,,
+https://github.com/jjo/vim-cue/,,
+https://github.com/itchyny/vim-cursorword/,,
+https://github.com/ehamberg/vim-cute-python/,,
+https://github.com/tpope/vim-dadbod/,,
+https://github.com/kristijanhusak/vim-dadbod-completion/,,
+https://github.com/kristijanhusak/vim-dadbod-ui/,,
+https://github.com/sunaku/vim-dasht/,,
+https://github.com/ajmwagar/vim-deus/,,
+https://github.com/ryanoasis/vim-devicons/,,
+https://github.com/blueyed/vim-diminactive/,,
+https://github.com/will133/vim-dirdiff/,,
+https://github.com/justinmk/vim-dirvish/,,
+https://github.com/kristijanhusak/vim-dirvish-git/,,
+https://github.com/tpope/vim-dispatch/,,
+https://github.com/radenling/vim-dispatch-neovim/,,
+https://github.com/jhradilek/vim-docbk/,,
+https://github.com/junegunn/vim-easy-align/,,
+https://github.com/zhou13/vim-easyescape/,,
+https://github.com/neoclide/vim-easygit/,,
+https://github.com/easymotion/vim-easymotion/,,
+https://github.com/xolox/vim-easytags/,,
+https://github.com/justincampbell/vim-eighties/,,
+https://github.com/elixir-editors/vim-elixir/,,
+https://github.com/andys8/vim-elm-syntax/,,
+https://github.com/junegunn/vim-emoji/,,
+https://github.com/tpope/vim-endwise/,,
+https://github.com/vim-erlang/vim-erlang-compiler/,,
+https://github.com/vim-erlang/vim-erlang-omnicomplete/,,
+https://github.com/vim-erlang/vim-erlang-runtime/,,
+https://github.com/vim-erlang/vim-erlang-tags/,,
+https://github.com/tpope/vim-eunuch/,,
+https://github.com/tommcdo/vim-exchange/,,
+https://github.com/terryma/vim-expand-region/,,
+https://github.com/int3/vim-extradite/,,
+https://github.com/wsdjeg/vim-fetch/,,
+https://github.com/tpope/vim-fireplace/,,
+https://github.com/dag/vim-fish/,,
+https://github.com/tpope/vim-flagship/,,
+https://github.com/nvie/vim-flake8/,,
+https://github.com/dcharbon/vim-flatbuffers/,,
+https://github.com/voldikss/vim-floaterm/,,
+https://github.com/rbong/vim-flog/,,
+https://github.com/thosakwe/vim-flutter/,,
+https://github.com/fsharp/vim-fsharp/,,
+https://github.com/thinca/vim-ft-diff_fold/,,
+https://github.com/tommcdo/vim-fubitive/,,
+https://github.com/tpope/vim-fugitive/,,
+https://github.com/maxjacobson/vim-fzf-coauthorship/,,
+https://github.com/ruanyl/vim-gh-line/,,
+https://github.com/raghur/vim-ghost/,,
+https://github.com/mattn/vim-gist/,,
+https://github.com/lambdalisue/vim-gista/,,
+https://github.com/tpope/vim-git/,,
+https://github.com/itchyny/vim-gitbranch/,,
+https://github.com/airblade/vim-gitgutter/,,
+https://github.com/junegunn/vim-github-dashboard/,,
+https://github.com/tikhomirov/vim-glsl/,,
+https://github.com/jamessan/vim-gnupg/,,
+https://github.com/fatih/vim-go/,,
+https://github.com/rhysd/vim-grammarous/,,
+https://github.com/jparise/vim-graphql/,,
+https://github.com/mhinz/vim-grepper/,,
+https://github.com/lifepillar/vim-gruvbox8/,,
+https://github.com/brennanfee/vim-gui-position/,,
+https://github.com/ludovicchabant/vim-gutentags/,,
+https://github.com/takac/vim-hardtime/,,
+https://github.com/chkno/vim-haskell-module-name/,,
+https://github.com/enomsg/vim-haskellConcealPlus/,,
+https://github.com/twinside/vim-haskellconceal/,,
+https://github.com/jvirtanen/vim-hcl/,,
+https://github.com/bitc/vim-hdevtools/,,
+https://github.com/towolf/vim-helm/,,
+https://github.com/RRethy/vim-hexokinase/,,
+https://github.com/jceb/vim-hier/,,
+https://github.com/machakann/vim-highlightedyank/,,
+https://github.com/alx741/vim-hindent/,,
+https://github.com/GEverding/vim-hocon/,,
+https://github.com/Twinside/vim-hoogle/,,
+https://github.com/jonsmithers/vim-html-template-literals/,,
+https://github.com/vim-utils/vim-husk/,,
+https://github.com/w0ng/vim-hybrid/,,
+https://github.com/kristijanhusak/vim-hybrid-material/,,
+https://github.com/noc7c9/vim-iced-coffee-script/,,
+https://github.com/RRethy/vim-illuminate/,,
+https://github.com/nathanaelkane/vim-indent-guides/,,
+https://github.com/michaeljsmith/vim-indent-object/,,
+https://github.com/jeetsukumaran/vim-indentwise/,,
+https://github.com/henrik/vim-indexed-search/,,
+https://github.com/ivanov/vim-ipython/,,
+https://github.com/fisadev/vim-isort/,,
+https://github.com/clojure-vim/vim-jack-in/,,
+https://github.com/mhinz/vim-janah/,,
+https://github.com/artur-shaik/vim-javacomplete2/,,
+https://github.com/pangloss/vim-javascript/,,
+https://github.com/jelera/vim-javascript-syntax/,,
+https://github.com/lepture/vim-jinja/,,
+https://github.com/maksimr/vim-jsbeautify/,,
+https://github.com/heavenshell/vim-jsdoc/,,
+https://github.com/elzr/vim-json/,,
+https://github.com/google/vim-jsonnet/,,
+https://github.com/MaxMEllon/vim-jsx-pretty/,,
+https://github.com/peitalin/vim-jsx-typescript/,,
+https://github.com/knubie/vim-kitty-navigator/,,
+https://github.com/farmergreg/vim-lastplace/,,
+https://github.com/xuhdev/vim-latex-live-preview/,,
+https://github.com/ludovicchabant/vim-lawrencium/,,
+https://github.com/hecal3/vim-leader-guide/,,
+https://github.com/mk12/vim-lean/,,
+https://github.com/ledger/vim-ledger/,,
+https://github.com/lfe-support/vim-lfe/,,
+https://github.com/josa42/vim-lightline-coc/,,
+https://github.com/tommcdo/vim-lion/,,
+https://github.com/tpope/vim-liquid/,,
+https://github.com/embear/vim-localvimrc/,,
+https://github.com/andreshazard/vim-logreview/,,
+https://github.com/mlr-msft/vim-loves-dafny/,,
+https://github.com/natebosch/vim-lsc/,,
+https://github.com/prabirshrestha/vim-lsp/,,
+https://github.com/jackguo380/vim-lsp-cxx-highlight/,,
+https://github.com/tbastos/vim-lua/,,
+https://github.com/google/vim-maktaba/,,
+https://github.com/lambdalisue/vim-manpager/,,
+https://github.com/Yilin-Yang/vim-markbar/,,
+https://github.com/preservim/vim-markdown/,,
+https://github.com/euclio/vim-markdown-composer/,,
+https://github.com/mzlogin/vim-markdown-toc/,,
+https://github.com/andymass/vim-matchup/,,
+https://github.com/samoshkin/vim-mergetool/,,
+https://github.com/idanarye/vim-merginal/,,
+https://github.com/david-a-wheeler/vim-metamath/,,
+https://github.com/xolox/vim-misc/,,
+https://github.com/crusoexia/vim-monokai/,,
+https://github.com/phanviet/vim-monokai-pro/,,
+https://github.com/matze/vim-move/,,
+https://github.com/lifepillar/vim-mucomplete/,,
+https://github.com/terryma/vim-multiple-cursors/,,
+https://github.com/simnalamburt/vim-mundo/,,
+https://github.com/mustache/vim-mustache-handlebars/,,
+https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/,,
+https://github.com/jistr/vim-nerdtree-tabs/,,
+https://github.com/nfnty/vim-nftables/,,
+https://github.com/kana/vim-niceblock/,,
+https://github.com/tommcdo/vim-ninja-feet/,,
+https://github.com/LnL7/vim-nix/,,
+https://github.com/symphorien/vim-nixhash/,,
+https://github.com/noahfrederick/vim-noctu/,,
+https://github.com/fruit-in/vim-nong-theme/,,
+https://github.com/jeffkreeftmeijer/vim-numbertoggle/,,
+https://github.com/tpope/vim-obsession/,,
+https://github.com/ocaml/vim-ocaml/,,
+https://github.com/rakr/vim-one/,,
+https://github.com/petRUShka/vim-opencl/,,
+https://github.com/kana/vim-operator-replace/,,
+https://github.com/rhysd/vim-operator-surround/,,
+https://github.com/kana/vim-operator-user/,,
+https://github.com/jceb/vim-orgmode/,,
+https://github.com/sdiehl/vim-ormolu/,,
+https://github.com/fcpg/vim-osc52/,,
+https://github.com/ojroques/vim-oscyank/,,
+https://github.com/osyo-manga/vim-over/,,
+https://github.com/hashivim/vim-packer/,,
+https://github.com/lambdalisue/vim-pager/,,
+https://github.com/vim-pandoc/vim-pandoc/,,
+https://github.com/vim-pandoc/vim-pandoc-after/,,
+https://github.com/vim-pandoc/vim-pandoc-syntax/,,
+https://github.com/bhurlow/vim-parinfer/,,
+https://github.com/sickill/vim-pasta/,,
+https://github.com/tpope/vim-pathogen/,,
+https://github.com/junegunn/vim-peekaboo/,,
+https://github.com/preservim/vim-pencil/,,
+https://github.com/jparise/vim-phabricator/,,
+https://github.com/justinj/vim-pico8-syntax/,,
+https://github.com/junegunn/vim-plug/,,
+https://github.com/powerman/vim-plugin-AnsiEsc/,,
+https://github.com/sheerun/vim-polyglot/,,
+https://github.com/jakwings/vim-pony/,,
+https://github.com/haya14busa/vim-poweryank/,,
+https://github.com/prettier/vim-prettier/,,
+https://github.com/thinca/vim-prettyprint/,,
+https://github.com/pantharshit00/vim-prisma/,,
+https://github.com/tpope/vim-projectionist/,,
+https://github.com/dhruvasagar/vim-prosession/,,
+https://github.com/uarun/vim-protobuf/,,
+https://github.com/PProvost/vim-ps1/,,
+https://github.com/digitaltoad/vim-pug/,,
+https://github.com/rodjek/vim-puppet/,,
+https://github.com/Vimjas/vim-python-pep8-indent/,,
+https://github.com/romainl/vim-qf/,,
+https://github.com/romainl/vim-qlist/,,
+https://github.com/peterhoeg/vim-qml/,,
+https://github.com/thinca/vim-quickrun/,,
+https://github.com/racer-rust/vim-racer/,,
+https://github.com/wlangstroth/vim-racket/,,
+https://github.com/tpope/vim-ragtag/,,
+https://github.com/tpope/vim-rails/,,
+https://github.com/jordwalke/vim-reasonml/,,
+https://github.com/tpope/vim-repeat/,,
+https://github.com/tpope/vim-rhubarb/,,
+https://github.com/airblade/vim-rooter/,,
+https://github.com/tpope/vim-rsi/,,
+https://github.com/vim-ruby/vim-ruby/,,
+https://github.com/tpope/vim-salve/,,
+https://github.com/machakann/vim-sandwich/,,
+https://github.com/mhinz/vim-sayonara/,7e774f58c5865d9c10d40396850b35ab95af17c5,
+https://github.com/derekwyatt/vim-scala/,,
+https://github.com/thinca/vim-scouter/,,
+https://github.com/tpope/vim-scriptease/,,
+https://github.com/tpope/vim-sensible/,,
+https://github.com/guns/vim-sexp/,,
+https://github.com/tpope/vim-sexp-mappings-for-regular-people/,,
+https://github.com/itspriddle/vim-shellcheck/,,
+https://github.com/kshenoy/vim-signature/,,
+https://github.com/mhinz/vim-signify/,,
+https://github.com/ivalkeen/vim-simpledb/,,
+https://github.com/junegunn/vim-slash/,,
+https://github.com/tpope/vim-sleuth/,,
+https://github.com/jpalardy/vim-slime/,,
+https://github.com/mzlogin/vim-smali/,,
+https://github.com/t9md/vim-smalls/,,
+https://github.com/psliwka/vim-smoothie/,,
+https://github.com/bohlender/vim-smt2/,,
+https://github.com/justinmk/vim-sneak/,,
+https://github.com/garbas/vim-snipmate/,,
+https://github.com/honza/vim-snippets/,,
+https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets
+https://github.com/tomlion/vim-solidity/,,
+https://github.com/christoomey/vim-sort-motion/,,
+https://github.com/CoatiSoftware/vim-sourcetrail/,,
+https://github.com/tpope/vim-speeddating/,,
+https://github.com/kbenzie/vim-spirv/,,
+https://github.com/mhinz/vim-startify/,,
+https://github.com/dstein64/vim-startuptime/,,
+https://github.com/axelf4/vim-strip-trailing-whitespace/,,
+https://github.com/nbouscal/vim-stylish-haskell/,,
+https://github.com/alx741/vim-stylishask/,,
+https://github.com/svermeulen/vim-subversive/,,
+https://github.com/tpope/vim-surround/,,
+https://github.com/evanleck/vim-svelte/,,
+https://github.com/machakann/vim-swap/,,
+https://github.com/dhruvasagar/vim-table-mode/,,
+https://github.com/kana/vim-tabpagecd/,,
+https://github.com/tpope/vim-tbone/,,
+https://github.com/hashivim/vim-terraform/,,
+https://github.com/juliosueiras/vim-terraform-completion/,,
+https://github.com/vim-test/vim-test/,,
+https://github.com/glts/vim-textobj-comment/,,
+https://github.com/kana/vim-textobj-entire/,,
+https://github.com/kana/vim-textobj-function/,,
+https://github.com/gibiansky/vim-textobj-haskell/,,
+https://github.com/osyo-manga/vim-textobj-multiblock/,,
+https://github.com/kana/vim-textobj-user/,,
+https://github.com/Julian/vim-textobj-variable-segment/,,
+https://github.com/thinca/vim-themis/,,
+https://github.com/tmux-plugins/vim-tmux/,,
+https://github.com/roxma/vim-tmux-clipboard/,,
+https://github.com/tmux-plugins/vim-tmux-focus-events/,,
+https://github.com/christoomey/vim-tmux-navigator/,,
+https://github.com/milkypostman/vim-togglelist/,,
+https://github.com/cespare/vim-toml/,,
+https://github.com/vimpostor/vim-tpipeline/,,
+https://github.com/bronson/vim-trailing-whitespace/,,
+https://github.com/ianks/vim-tsx/,,
+https://github.com/lumiliet/vim-twig/,,
+https://github.com/sodapopcan/vim-twiggy/,,
+https://github.com/rcarriga/vim-ultest/,,
+https://github.com/arthurxavierx/vim-unicoder/,,
+https://github.com/tpope/vim-unimpaired/,,
+https://github.com/hashivim/vim-vagrant/,,
+https://github.com/tpope/vim-vinegar/,,
+https://github.com/triglav/vim-visual-increment/,,
+https://github.com/mg979/vim-visual-multi/,,
+https://github.com/thinca/vim-visualstar/,,
+https://github.com/hrsh7th/vim-vsnip/,,
+https://github.com/hrsh7th/vim-vsnip-integ/,,
+https://github.com/posva/vim-vue/,,
+https://github.com/wakatime/vim-wakatime/,,
+https://github.com/osyo-manga/vim-watchdogs/,,
+https://github.com/jasonccox/vim-wayland-clipboard/,,
+https://github.com/liuchengxu/vim-which-key/,,
+https://github.com/wesQ3/vim-windowswap/,,
+https://github.com/chaoren/vim-wordmotion/,,
+https://github.com/preservim/vim-wordy/,,
+https://github.com/joonty/vim-xdebug/,,
+https://github.com/lyokha/vim-xkbswitch/,,
+https://github.com/mg979/vim-xtabline/,,
+https://github.com/stephpy/vim-yaml/,,
+https://github.com/mindriot101/vim-yapf/,,
+https://github.com/dag/vim2hs/,,
+https://github.com/dominikduda/vim_current_word/,,
+https://github.com/andrep/vimacs/,,
+https://github.com/TaDaa/vimade/,,
+https://github.com/jreybert/vimagit/,,
+https://github.com/gotcha/vimelette/,,
+https://github.com/Shougo/vimfiler.vim/,,
+https://github.com/vimoutliner/vimoutliner/,,
+https://github.com/tex/vimpreviewpandoc/,,
+https://github.com/Shougo/vimproc.vim/,,
+https://github.com/vimsence/vimsence/,,
+https://github.com/Shougo/vimshell.vim/,,
+https://github.com/puremourning/vimspector/,,
+https://github.com/lervag/vimtex/,,
+https://github.com/preservim/vimux/,,
+https://github.com/vimwiki/vimwiki/,,
+https://github.com/vim-scripts/vis/,,
+https://github.com/navicore/vissort.vim/,,
+https://github.com/liuchengxu/vista.vim/,,
+https://github.com/dylanaraps/wal.vim/,,
+https://github.com/mattn/webapi-vim/,,
+https://github.com/folke/which-key.nvim/,,
+https://github.com/gelguy/wilder.nvim/,,
+https://github.com/gcmt/wildfire.vim/,,
+https://github.com/sindrets/winshift.nvim/,,
+https://github.com/wannesm/wmgraphviz.vim/,,
+https://github.com/vim-scripts/wombat256.vim/,,
+https://github.com/lukaszkorecki/workflowish/,,
+https://github.com/tweekmonster/wstrip.vim/,,
+https://github.com/drmingdrmer/xptemplate/,,
+https://github.com/guns/xterm-color-table.vim/,,
+https://github.com/HerringtonDarkholme/yats.vim/,,
+https://github.com/KabbAmine/zeavim.vim/,,
+https://github.com/folke/zen-mode.nvim/,,
+https://github.com/jnurmine/zenburn/,,
+https://github.com/glepnir/zephyr-nvim/,,
+https://github.com/ziglang/zig.vim/,,
+https://github.com/troydm/zoomwintab.vim/,,
+https://github.com/nanotee/zoxide.vim/,,
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index a5c8dcfb50f54..ab5250a48e686 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2329,7 +2329,7 @@ let
   # then apply extension specific modifcations to packages.
 
   # overlays will be applied left to right, overrides should come after aliases.
-  overlays = lib.optionals (config.allowAliases or true) [ aliases ];
+  overlays = lib.optionals config.allowAliases [ aliases ];
 
   toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays;
 in
diff --git a/pkgs/applications/emulators/epsxe/default.nix b/pkgs/applications/emulators/epsxe/default.nix
deleted file mode 100644
index f39c2ae74ac46..0000000000000
--- a/pkgs/applications/emulators/epsxe/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib, stdenv, fetchurl, alsa-lib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL,
-  libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }:
-
-with lib;
-
-stdenv.mkDerivation rec {
-  pname = "epsxe";
-  version = "2.0.5";
-
-  src = let
-    version2 = replaceStrings ["."] [""] version;
-    platform = "linux" + (optionalString stdenv.is64bit "_x64");
-  in fetchurl {
-    url = "https://www.epsxe.com/files/ePSXe${version2}${platform}.zip";
-    sha256 = if stdenv.is64bit
-             then "16fa9qc2xhaz1f6294m0b56s5l86cbmclwm9w3mqnch0yjsrvab0"
-             else "1677lclam557kp8jwvchdrk27zfj50fqx2q9i3bcx26d9k61q3kl";
-  };
-
-  nativeBuildInputs = [ unzip wrapGAppsHook autoPatchelfHook ];
-  sourceRoot = ".";
-
-  buildInputs = [
-    alsa-lib
-    curl
-    gdk-pixbuf
-    glib
-    gtk3
-    libX11
-    libGLU libGL
-    openssl_1_0_2
-    ncurses5
-    SDL
-    SDL_ttf
-    stdenv.cc.cc.lib
-    zlib
-  ];
-
-  dontStrip = true;
-
-  installPhase = ''
-    install -D ${if stdenv.is64bit then "epsxe_x64" else "ePSXe"} $out/bin/epsxe
-  '';
-
-  meta = {
-    homepage = "http://epsxe.com/";
-    description = "Enhanced PSX (PlayStation 1) emulator";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ yana ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index f842cf6f5c4b8..756f0da9f3481 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
     owner = "apitrace";
   };
 
+  patches = [
+    # glibc 2.34 compat
+    # derived from https://github.com/apitrace/apitrace/commit/d28a980802ad48568c87da02d630c8babfe163bb
+    ./glibc-2.34-compat.patch
+  ];
+
   # LD_PRELOAD wrappers need to be statically linked to work against all kinds
   # of games -- so it's fine to use e.g. bundled snappy.
   buildInputs = [ libX11 procps python2 libdwarf qtbase qtwebkit ];
diff --git a/pkgs/applications/graphics/apitrace/glibc-2.34-compat.patch b/pkgs/applications/graphics/apitrace/glibc-2.34-compat.patch
new file mode 100644
index 0000000000000..3f8cebe030c04
--- /dev/null
+++ b/pkgs/applications/graphics/apitrace/glibc-2.34-compat.patch
@@ -0,0 +1,13 @@
+diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp
+index 2eda082..0c0c8ee 100644
+--- a/wrappers/dlsym.cpp
++++ b/wrappers/dlsym.cpp
+@@ -34,7 +34,7 @@
+ #include "os.hpp"
+ 
+ 
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 34
+ 
+ 
+ #include <dlfcn.h>
diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix
index 59d1e6817bd9e..b9f838c016f82 100644
--- a/pkgs/applications/graphics/imgbrd-grabber/default.nix
+++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix
@@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     openssl
-    makeWrapper
     libpulseaudio
     typescript
   ];
 
   nativeBuildInputs = [
+    makeWrapper
     qtmultimedia
     qtbase
     qtdeclarative
diff --git a/pkgs/applications/graphics/jpegrescan/default.nix b/pkgs/applications/graphics/jpegrescan/default.nix
index 1a7320bf6930e..f96742e6c067b 100644
--- a/pkgs/applications/graphics/jpegrescan/default.nix
+++ b/pkgs/applications/graphics/jpegrescan/default.nix
@@ -28,8 +28,12 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ perlPackages.FileSlurp ];
 
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
   buildInputs = [
-    perl libjpeg_turbo makeWrapper
+    perl libjpeg_turbo
   ];
 
   meta = with lib; {
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 56d41d3dd503b..098d330f004a1 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -41,11 +41,11 @@
 
 stdenv.mkDerivation rec {
   pname = "shotwell";
-  version = "0.30.14";
+  version = "0.30.15";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-McLkgzkI02GcssNnWgXw2lnCuqduKLkFOF/VbADBKJU=";
+    sha256 = "sha256-OlKtYLEC2g31902wMcRdTM8mNRPJVGFu4WZL9PTpvck=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 2b9fee974b377..57f3560233609 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -103,10 +103,10 @@ stdenv.mkDerivation {
 
   preConfigure = "./bootstrap.sh";
 
-  nativeBuildInputs = [ pkg-config autoreconfHook gettext ];
+  nativeBuildInputs = [ pkg-config autoreconfHook gettext makeWrapper ];
   buildInputs = [
     ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool
-    libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5
+    libjack2 libsigcxx libxmlxx mlt-qt5
     synfig which gnome.adwaita-icon-theme
   ];
 
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 72b76131f64a0..a24ef563f3e9b 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.2/src -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.3/src -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix
index 83763ba965afc..f69e705bb2f92 100644
--- a/pkgs/applications/kde/kitinerary.nix
+++ b/pkgs/applications/kde/kitinerary.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchpatch, lib, extra-cmake-modules
+{ mkDerivation, lib, extra-cmake-modules
 , qtdeclarative, ki18n, kmime, kpkpass
 , poppler, kcontacts, kcalendarcore
 , shared-mime-info
@@ -10,15 +10,6 @@ mkDerivation {
     license = with lib.licenses; [ lgpl21 ];
     maintainers = [ lib.maintainers.bkchr ];
   };
-
-  patches = [
-    # Fix build with poppler 22.03
-    (fetchpatch {
-      url = "https://github.com/KDE/kitinerary/commit/e21d1ffc5fa81a636245f49c97fe7cda63abbb1d.patch";
-      sha256 = "1/zgq9QIOCPplqplDqgpoqzuYFf/m1Ixxawe50t2F04=";
-    })
-  ];
-
   nativeBuildInputs = [
     extra-cmake-modules
     shared-mime-info # for update-mime-database
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index af8e47dd7493c..3d5948c290dc8 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -4,1843 +4,1843 @@
 
 {
   akonadi = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/akonadi-21.12.2.tar.xz";
-      sha256 = "1i1q8zda3hl564w02478wyqv35wj8npkqayy7b13shkq9b9j3nj8";
-      name = "akonadi-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/akonadi-21.12.3.tar.xz";
+      sha256 = "026srxk7da20vfhbj7jh8aip3sylpm61czwblj3wxxps0vbxxs2g";
+      name = "akonadi-21.12.3.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/akonadi-calendar-21.12.2.tar.xz";
-      sha256 = "001ndvgqn6x70s7gdya1f1vr080mfkypam3k6z0i2ivlpymc3wly";
-      name = "akonadi-calendar-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/akonadi-calendar-21.12.3.tar.xz";
+      sha256 = "0hzy6y9pxa06k0pp5yr84i0sv15qgzjn7nrlmsylm6iy7fspqqbq";
+      name = "akonadi-calendar-21.12.3.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/akonadi-calendar-tools-21.12.2.tar.xz";
-      sha256 = "0f0l6wj3h2afbmvnq60cg0x03a412849dg4l9dwgdn8yxvnxkhw6";
-      name = "akonadi-calendar-tools-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/akonadi-calendar-tools-21.12.3.tar.xz";
+      sha256 = "1idh6kf8h9158rgw3b5lld7z9mvvif00jrvpz891cziblvr19p4a";
+      name = "akonadi-calendar-tools-21.12.3.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/akonadi-contacts-21.12.2.tar.xz";
-      sha256 = "1aq81569kz529n66dl5jjzamy6kxw0xk5bcmjfvb3wpxznhiigqm";
-      name = "akonadi-contacts-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/akonadi-contacts-21.12.3.tar.xz";
+      sha256 = "04ixj09s27q8pbmfrb1475bc0h84sb5ikfxzpc4i5b3whx40g9dm";
+      name = "akonadi-contacts-21.12.3.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/akonadi-import-wizard-21.12.2.tar.xz";
-      sha256 = "0b4mphxbqzf3akhafxc4fvil83l3z4qcf8xnblw23ficqqs8s0di";
-      name = "akonadi-import-wizard-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/akonadi-import-wizard-21.12.3.tar.xz";
+      sha256 = "1fbxx53zdcqp98mzdx45ccncppnxqfhc7j9qwwxcik0ygrmg9wcj";
+      name = "akonadi-import-wizard-21.12.3.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/akonadi-mime-21.12.2.tar.xz";
-      sha256 = "1nd6bf26lb5wfhzh4kn37iwmb6savcq9wsaph5c7jg6m0bdix1fn";
-      name = "akonadi-mime-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/akonadi-mime-21.12.3.tar.xz";
+      sha256 = "1bcrbf5z9175p206cvm5s6zq882nb32cf9akdcbnadqiibrpxkxv";
+      name = "akonadi-mime-21.12.3.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/akonadi-notes-21.12.2.tar.xz";
-      sha256 = "1s3bxnqsjnlgsnia0nvqyc3m1ppzanzna9598lgwbmz053rgn7ck";
-      name = "akonadi-notes-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/akonadi-notes-21.12.3.tar.xz";
+      sha256 = "0xkcw9izgxfzglciig2i4wiz6iflzjg0d6dp1nq6p1kwxwc899sb";
+      name = "akonadi-notes-21.12.3.tar.xz";
     };
   };
   akonadi-search = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/akonadi-search-21.12.2.tar.xz";
-      sha256 = "1hp2x8y59azl59znrqhrjn4n1bs2iqnkdsldv1f2k1ima6z5f4qy";
-      name = "akonadi-search-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/akonadi-search-21.12.3.tar.xz";
+      sha256 = "1id6zzjxc9zvpz1ryj2zn1yff5ak04r1mlk9cklbj99frzf0wv6p";
+      name = "akonadi-search-21.12.3.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/akonadiconsole-21.12.2.tar.xz";
-      sha256 = "1rqfmhi1mzh6yzjg7jf6adf1xqvpbhcxgld2pp4rd9g5mi9rlxlk";
-      name = "akonadiconsole-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/akonadiconsole-21.12.3.tar.xz";
+      sha256 = "1chb0ars9w05pq6ij2l8qfj1ac7pmzwg2mq1i4z8syhdklyryir1";
+      name = "akonadiconsole-21.12.3.tar.xz";
     };
   };
   akregator = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/akregator-21.12.2.tar.xz";
-      sha256 = "1srsm25qvbww0hl7r878n32b71g0p222zxyys7chzrg8izrh12b8";
-      name = "akregator-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/akregator-21.12.3.tar.xz";
+      sha256 = "1yy5c29zxpli4cddknmdvjkgii3j7pvw6lhwqfrqjc8jh83gm8f8";
+      name = "akregator-21.12.3.tar.xz";
     };
   };
   analitza = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/analitza-21.12.2.tar.xz";
-      sha256 = "1ak2wyfx67cwx85d5053f6flxwas973mhnm25mf4jw0qll72vid4";
-      name = "analitza-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/analitza-21.12.3.tar.xz";
+      sha256 = "0rgims4c80nficibg3lh764csh0kjsfnf7h303kyfd9yk59xa3in";
+      name = "analitza-21.12.3.tar.xz";
     };
   };
   ark = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ark-21.12.2.tar.xz";
-      sha256 = "1g05lyv8ll85myw0i62bxr4kmfd3dhldvmbgpgym9r1rgan12q90";
-      name = "ark-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ark-21.12.3.tar.xz";
+      sha256 = "1p30bgnb3aw0f2jnaksz7jfqqcz45b2x3bjrri0w5w580204a5s8";
+      name = "ark-21.12.3.tar.xz";
     };
   };
   artikulate = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/artikulate-21.12.2.tar.xz";
-      sha256 = "1g0h0dqqsf3x8q292hfhrizl9dlqzm8gjynzcyrzx0gvbfadj2l1";
-      name = "artikulate-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/artikulate-21.12.3.tar.xz";
+      sha256 = "0fbgmd3yfyv1pzz24874a0v7cl4yk6wlfryn8sn21smi054wqz6z";
+      name = "artikulate-21.12.3.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/audiocd-kio-21.12.2.tar.xz";
-      sha256 = "07nk060vkyn94ihs9v054zhsckfwpn8z911gy3hnyf1wdmnpfh2n";
-      name = "audiocd-kio-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/audiocd-kio-21.12.3.tar.xz";
+      sha256 = "1alyn7w0v1by3fkb6xfnwj0hayjrrnmwnajnrnpvn8skbqsbzlgc";
+      name = "audiocd-kio-21.12.3.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/baloo-widgets-21.12.2.tar.xz";
-      sha256 = "1ax7pak9qb60yzdca8frkb8qs4khs6f2wbkwyb48s7zmdxqyw1bj";
-      name = "baloo-widgets-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/baloo-widgets-21.12.3.tar.xz";
+      sha256 = "0cfcfmsgbaxi53a3r0f013lskm5yll7zaxw98nlj6r8fsq2slrhv";
+      name = "baloo-widgets-21.12.3.tar.xz";
     };
   };
   blinken = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/blinken-21.12.2.tar.xz";
-      sha256 = "0h0nw79zr891f54y2r3d3n837bzn24pfvkxsab1f0a228kjakw09";
-      name = "blinken-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/blinken-21.12.3.tar.xz";
+      sha256 = "1pbwb7q4p705k31kd62gira0x9qccjsn07d6h1w44wydc3lfdjnc";
+      name = "blinken-21.12.3.tar.xz";
     };
   };
   bomber = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/bomber-21.12.2.tar.xz";
-      sha256 = "1348mdiykfg1c3gr5fkcf71mxf7lyapwg5ym3jqp9vyc56vhwfjs";
-      name = "bomber-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/bomber-21.12.3.tar.xz";
+      sha256 = "1mlxs2dbsycq7mw9g1hl2l17gl0z33mrry5r0zmz74i67nfijg8w";
+      name = "bomber-21.12.3.tar.xz";
     };
   };
   bovo = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/bovo-21.12.2.tar.xz";
-      sha256 = "0i2i5ici9v402lrh83mhfsrxmqi0fs75rkfvhsbza3wab7b165kc";
-      name = "bovo-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/bovo-21.12.3.tar.xz";
+      sha256 = "1jzvazqy5vcwkyhnbzw7sh8ngff5clclq98vbbhzd9dmnacirdbq";
+      name = "bovo-21.12.3.tar.xz";
     };
   };
   calendarsupport = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/calendarsupport-21.12.2.tar.xz";
-      sha256 = "021rr06ln7l0v2xjzsij4r71jwpy1w1r761bjad0ywprwkdc93bm";
-      name = "calendarsupport-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/calendarsupport-21.12.3.tar.xz";
+      sha256 = "0annni037cp1ga2lj2gkjxlkygnaxna4fs095lbaqp5zljz3g8vp";
+      name = "calendarsupport-21.12.3.tar.xz";
     };
   };
   cantor = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/cantor-21.12.2.tar.xz";
-      sha256 = "0vq8yvdglf43y5r2f9bvamm9bp82q92hw9sr8xmgb5hqz5mkap78";
-      name = "cantor-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/cantor-21.12.3.tar.xz";
+      sha256 = "0v0xcgaz3rag044wmpiq8gs7pp6n7wcca0q1hzav7i651pgqjjks";
+      name = "cantor-21.12.3.tar.xz";
     };
   };
   cervisia = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/cervisia-21.12.2.tar.xz";
-      sha256 = "1vpm3cjknpa4s9mjdfngpvidqihfh5sb427yhnydr1q2dmllr9nn";
-      name = "cervisia-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/cervisia-21.12.3.tar.xz";
+      sha256 = "106x0xrscc6xvgijmqy892r1hrirjh32nj8lqhc7g7dzjaa7lhsj";
+      name = "cervisia-21.12.3.tar.xz";
     };
   };
   dolphin = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/dolphin-21.12.2.tar.xz";
-      sha256 = "0c0gk1djgl1d1qzibw5f1w29cnlxl6kan8pkg0izaqvnbmmx53wn";
-      name = "dolphin-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/dolphin-21.12.3.tar.xz";
+      sha256 = "0m5nqa8j0mcsrx9wxfcf8z39kxas51k03lschr721vm4x65j64jq";
+      name = "dolphin-21.12.3.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/dolphin-plugins-21.12.2.tar.xz";
-      sha256 = "1mrsampq1zq5rri1kx77dz0afz4a6s8pvb1255q0pl7imgxhiaqc";
-      name = "dolphin-plugins-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/dolphin-plugins-21.12.3.tar.xz";
+      sha256 = "0rbz6fw98c71h10ry1xjc0pgzvphajmj18lnjm4hf7bbrizsmdb5";
+      name = "dolphin-plugins-21.12.3.tar.xz";
     };
   };
   dragon = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/dragon-21.12.2.tar.xz";
-      sha256 = "07zn4ishffh9g8hvkpfgm7j9cimw3plcabzk9p157nhgxr62z4sb";
-      name = "dragon-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/dragon-21.12.3.tar.xz";
+      sha256 = "09iwwlbv4jmxs92dz20z9fqg1sfnqih54izz8459ibl8vydfgfp1";
+      name = "dragon-21.12.3.tar.xz";
     };
   };
   elisa = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/elisa-21.12.2.tar.xz";
-      sha256 = "0zwy0bi4s25y6adgjhrhw992i2c1kjwpgvp9yg902h8zpsdynwh5";
-      name = "elisa-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/elisa-21.12.3.tar.xz";
+      sha256 = "0cg9v438fclqnv1rgx2k86mzfp5ggfcp7d5kr8xh4kjbmy17rzca";
+      name = "elisa-21.12.3.tar.xz";
     };
   };
   eventviews = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/eventviews-21.12.2.tar.xz";
-      sha256 = "1v3bpd0b3ph7v0kg8pyp4rr4j8cxy7y4csym5dlqn6l81db7d3gr";
-      name = "eventviews-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/eventviews-21.12.3.tar.xz";
+      sha256 = "01x9ccwspn1dwkmcxcr8p6pazj6w31pxhx0bzlfr6bgpccicp2w2";
+      name = "eventviews-21.12.3.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ffmpegthumbs-21.12.2.tar.xz";
-      sha256 = "17cyrimlnf1npffmxinnj3q5ynqg3agx35b55iqnw3xixrz4snzr";
-      name = "ffmpegthumbs-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ffmpegthumbs-21.12.3.tar.xz";
+      sha256 = "0x2gpx30azkz61p3xj1nm7hckyrmyh0qhs29ah30z6a5xw7336ws";
+      name = "ffmpegthumbs-21.12.3.tar.xz";
     };
   };
   filelight = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/filelight-21.12.2.tar.xz";
-      sha256 = "0khhwnms2ysy9ijpmmagm68w1zixmxs7svaaldd30xb3w52f78v2";
-      name = "filelight-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/filelight-21.12.3.tar.xz";
+      sha256 = "1w3q0l9p5ry2crwdzcyb1d4ms2y4gp3y0a3j5drpy8clmxn0gz18";
+      name = "filelight-21.12.3.tar.xz";
     };
   };
   granatier = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/granatier-21.12.2.tar.xz";
-      sha256 = "0j7yizbljqx1a4wd4prmb3463r67f3lk5gv5x8j1yx2zmiaq0qki";
-      name = "granatier-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/granatier-21.12.3.tar.xz";
+      sha256 = "16yriharl66frglmdy6750nixczh0l4c19nnr6dav15m8qfb3g6b";
+      name = "granatier-21.12.3.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/grantlee-editor-21.12.2.tar.xz";
-      sha256 = "0wxkg56s83i61i17cb2y6ziminaq2gammynrwm5jvkpi5vqwvi2s";
-      name = "grantlee-editor-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/grantlee-editor-21.12.3.tar.xz";
+      sha256 = "00qy1ncgwylc995g051x5l679s16wjpcj7il62ck7d0j02rah0n2";
+      name = "grantlee-editor-21.12.3.tar.xz";
     };
   };
   grantleetheme = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/grantleetheme-21.12.2.tar.xz";
-      sha256 = "0z1p0s7fakfbscppmrgp1irf3dm2ayadyd3yb5zdsr9xahs0b9md";
-      name = "grantleetheme-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/grantleetheme-21.12.3.tar.xz";
+      sha256 = "1w83slbkj2y1wk78srq2k95ybs66sb4mbaa0zm7fl9pkwhqxbnb7";
+      name = "grantleetheme-21.12.3.tar.xz";
     };
   };
   gwenview = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/gwenview-21.12.2.tar.xz";
-      sha256 = "1jkv34llga981dq08npk8alrg9h27prdpffcxkm368i77mvp9hv6";
-      name = "gwenview-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/gwenview-21.12.3.tar.xz";
+      sha256 = "0zbsyrwlwbc9zmdxcgk02dvcb0f8izhlcbbzqw8cgr4l2c90xl98";
+      name = "gwenview-21.12.3.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/incidenceeditor-21.12.2.tar.xz";
-      sha256 = "151jhn84d5amv3abvp6cd2q10mf4mmv3q5hn0inqrmapy3v6bn8i";
-      name = "incidenceeditor-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/incidenceeditor-21.12.3.tar.xz";
+      sha256 = "1sbflfggpqhwhg3iw46462z3p83sjhlx6f1fvgz251m020vqq9xa";
+      name = "incidenceeditor-21.12.3.tar.xz";
     };
   };
   itinerary = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/itinerary-21.12.2.tar.xz";
-      sha256 = "02w6696kdzgz2r9677nr1jyhd9mfhc2zhmasy70nblz0jn22bcq7";
-      name = "itinerary-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/itinerary-21.12.3.tar.xz";
+      sha256 = "0gvkhwnxichvpwrsb6wjiv5q80v8k2yqvgpvfdapxnd7sx6qp7fp";
+      name = "itinerary-21.12.3.tar.xz";
     };
   };
   juk = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/juk-21.12.2.tar.xz";
-      sha256 = "1qgxpy1ksrgvdik69vppzdl1crscn69284q4wvwc5qh9v6rhv1xn";
-      name = "juk-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/juk-21.12.3.tar.xz";
+      sha256 = "1ipzx031996h83f9w3fzbx5vf5nnskq9kf71a6aypqckk65vcqcs";
+      name = "juk-21.12.3.tar.xz";
     };
   };
   k3b = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/k3b-21.12.2.tar.xz";
-      sha256 = "0rjg3zs85gw62r3z3msp438jnf0ghc6y577br59ig19m10x33rz9";
-      name = "k3b-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/k3b-21.12.3.tar.xz";
+      sha256 = "0igqb6zw76j2hl9xclcwfny2831phdg9s2msa1y87zyc3c7g9nxc";
+      name = "k3b-21.12.3.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kaccounts-integration-21.12.2.tar.xz";
-      sha256 = "0c4yxrhbas0wsmrxr0pwkpgw9gzdvvf5r5nxd15f656bwwhmqlwy";
-      name = "kaccounts-integration-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kaccounts-integration-21.12.3.tar.xz";
+      sha256 = "13q4d7ln98vdpb6ryk49zakx5bysdnjxifi7cma10fgk9gcqqhpb";
+      name = "kaccounts-integration-21.12.3.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kaccounts-providers-21.12.2.tar.xz";
-      sha256 = "1srz43xf6kz7xfz8np94pdnhmvashk7y2f2a275rwpnlrl0yw1yd";
-      name = "kaccounts-providers-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kaccounts-providers-21.12.3.tar.xz";
+      sha256 = "0kcyvpa0b872q7s4amagqcrzpl8cxlb91nwc9yg91wg56mmfv7m0";
+      name = "kaccounts-providers-21.12.3.tar.xz";
     };
   };
   kaddressbook = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kaddressbook-21.12.2.tar.xz";
-      sha256 = "04ac5z9603lxylc6x55chnc0w59mx3z92nyvfnvjvp1ga77si36b";
-      name = "kaddressbook-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kaddressbook-21.12.3.tar.xz";
+      sha256 = "1hzq0fdy99l1kqw14d582l0s56gvrw86abihib6k4az4c6g3c0md";
+      name = "kaddressbook-21.12.3.tar.xz";
     };
   };
   kajongg = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kajongg-21.12.2.tar.xz";
-      sha256 = "04s3f8nj0rh1zy7sfa5kq0smbfsyylz9w3lxm2z69g7x5sb08k53";
-      name = "kajongg-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kajongg-21.12.3.tar.xz";
+      sha256 = "1sffssfpzsd83ippkwpmqdx8rfh9cpd7i22nsv8asnaylylvy3zd";
+      name = "kajongg-21.12.3.tar.xz";
     };
   };
   kalarm = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kalarm-21.12.2.tar.xz";
-      sha256 = "0f3hcsql20lim9nqb0ha5lpsrbh131rwcla9i6aax5sgw4m6nyfh";
-      name = "kalarm-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kalarm-21.12.3.tar.xz";
+      sha256 = "1miwcxim46hiabp2rbs874np544ip4x5nl1dc62h9li9784a9k3i";
+      name = "kalarm-21.12.3.tar.xz";
     };
   };
   kalarmcal = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kalarmcal-21.12.2.tar.xz";
-      sha256 = "15l893iv4smlppk7k682m9hwrph84p5chx5mgxixjxl28c1blcc8";
-      name = "kalarmcal-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kalarmcal-21.12.3.tar.xz";
+      sha256 = "160pmr702b68hys9l02azvrv6pagy1r2whw0zp3jlf6863p9fkqr";
+      name = "kalarmcal-21.12.3.tar.xz";
     };
   };
   kalgebra = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kalgebra-21.12.2.tar.xz";
-      sha256 = "0w1h3as6dip4hrp2ay61sz9gixf4s887jp42v7zjajwwhjs6xs1m";
-      name = "kalgebra-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kalgebra-21.12.3.tar.xz";
+      sha256 = "0870kdqha0nk2cm8hq8d9l2fqfw6hn0rx2qc9f9w8l4014rcn127";
+      name = "kalgebra-21.12.3.tar.xz";
     };
   };
   kalzium = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kalzium-21.12.2.tar.xz";
-      sha256 = "0kvrmvd2vgl6fklxq9sr46p6nnh0fk0l6licj9b5q9rz82xwbr50";
-      name = "kalzium-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kalzium-21.12.3.tar.xz";
+      sha256 = "1qha1dh638ms785j1b73j19pj8y3c7v1n4jd1m93026a292m8jll";
+      name = "kalzium-21.12.3.tar.xz";
     };
   };
   kamera = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kamera-21.12.2.tar.xz";
-      sha256 = "07n1xlmg7m6p5ca0i4hjjyv564cqrn4p6h5yqx4pw3pcq8nizqfz";
-      name = "kamera-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kamera-21.12.3.tar.xz";
+      sha256 = "1xwxmlnra9qdhvf1hhy04v72ar02pqxkg0l16a53809ilyss2wrm";
+      name = "kamera-21.12.3.tar.xz";
     };
   };
   kamoso = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kamoso-21.12.2.tar.xz";
-      sha256 = "09qn1px0mmcjhw9ikaz8xcjbdabh657ij3sa4ps37jbfzyyv45fb";
-      name = "kamoso-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kamoso-21.12.3.tar.xz";
+      sha256 = "1q98f6ni4p19pk0svbfw4mbfwnc9i5p9csms2aj76mp2dn78xpib";
+      name = "kamoso-21.12.3.tar.xz";
     };
   };
   kanagram = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kanagram-21.12.2.tar.xz";
-      sha256 = "1l4j2fy8mwdywp0prswng1f06rpwkfi54dc8z5z02b13p47hz5cy";
-      name = "kanagram-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kanagram-21.12.3.tar.xz";
+      sha256 = "131flw9pjvin4w1m36qkwgzna3llvxp1vq0ynzwfnvhs49i3g5gc";
+      name = "kanagram-21.12.3.tar.xz";
     };
   };
   kapman = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kapman-21.12.2.tar.xz";
-      sha256 = "0n1iz9jfgzpcpavb4ijfqp3hym7z53wzp5a5hiad8i6nws408grn";
-      name = "kapman-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kapman-21.12.3.tar.xz";
+      sha256 = "1974z7g3ylvf48xh3xhf3gr7iphgmj83ir9hss1a2ba0hpgg463k";
+      name = "kapman-21.12.3.tar.xz";
     };
   };
   kapptemplate = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kapptemplate-21.12.2.tar.xz";
-      sha256 = "1sjyji533x9ph9l63zf0llsb0m5fzb1lka03h5blm7fdyw570bad";
-      name = "kapptemplate-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kapptemplate-21.12.3.tar.xz";
+      sha256 = "16jgybcq3ixqwi7wli11ns7w4zdlj8rgw4chzsjcqxn6c0sqy8zq";
+      name = "kapptemplate-21.12.3.tar.xz";
     };
   };
   kate = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kate-21.12.2.tar.xz";
-      sha256 = "0r59rfyrbs50w9brl4rrq1wdfmrr3sz7plw2pqlc5xpzngrdlhs1";
-      name = "kate-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kate-21.12.3.tar.xz";
+      sha256 = "1pp0k00kvih0xkkv1q1gha4na2bwqc7dhyyrla7c2vvln8gi99dg";
+      name = "kate-21.12.3.tar.xz";
     };
   };
   katomic = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/katomic-21.12.2.tar.xz";
-      sha256 = "123ls2p6az9bpy741xg85azs0p1qbssgcg4fh8cqazkz0kgzr0hf";
-      name = "katomic-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/katomic-21.12.3.tar.xz";
+      sha256 = "1y4mnvkd6ajk0m0j2xph5zbw3a14clm2sswc4y8c9r4ipk3hqsgh";
+      name = "katomic-21.12.3.tar.xz";
     };
   };
   kbackup = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kbackup-21.12.2.tar.xz";
-      sha256 = "1yadxlqfz2a4lirxf2xmivggvdpbjiaw5zn7aw72jb3yjs7x6j03";
-      name = "kbackup-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kbackup-21.12.3.tar.xz";
+      sha256 = "0r1cqkfzpdqpwv5pds8l0p7lxlwpv0mr7rjys1icsp8gl4hbpv60";
+      name = "kbackup-21.12.3.tar.xz";
     };
   };
   kblackbox = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kblackbox-21.12.2.tar.xz";
-      sha256 = "1y5l5l5p3s2gf69rih3mjdv42h9ydfk66v10ad5na3b4sqbi2qi7";
-      name = "kblackbox-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kblackbox-21.12.3.tar.xz";
+      sha256 = "10j8rnpr3gjaqspx4mxqj9cncqj6v2jn5rkldr46bv7yxgjb5rw3";
+      name = "kblackbox-21.12.3.tar.xz";
     };
   };
   kblocks = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kblocks-21.12.2.tar.xz";
-      sha256 = "13anvyy3br7ybl74jcrnjmw5qjfyk4z6s7ncziw8l37ggg4k7n91";
-      name = "kblocks-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kblocks-21.12.3.tar.xz";
+      sha256 = "1n3jc96ws8078gk1il61dc96p3pzvj3z9brnwi274pk4cif63bli";
+      name = "kblocks-21.12.3.tar.xz";
     };
   };
   kbounce = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kbounce-21.12.2.tar.xz";
-      sha256 = "07k5vmfkh9l4b4sb4an5qlnq0b9hmhh6dax0bjgia0ng9vxd011q";
-      name = "kbounce-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kbounce-21.12.3.tar.xz";
+      sha256 = "1am4j11cjzlmav2zh5802kasy0kdcx78slycadnf96bmhxs8hvyv";
+      name = "kbounce-21.12.3.tar.xz";
     };
   };
   kbreakout = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kbreakout-21.12.2.tar.xz";
-      sha256 = "08rykfi82hgzg5l2bhs8nvh8si06nisy60653n6r7m8g327yyn1m";
-      name = "kbreakout-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kbreakout-21.12.3.tar.xz";
+      sha256 = "0vqlxaggzvvrb439ybsvd5kr9j2jzpwk4xy3yni83y830h1mmhhc";
+      name = "kbreakout-21.12.3.tar.xz";
     };
   };
   kbruch = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kbruch-21.12.2.tar.xz";
-      sha256 = "0vvl2rk636zpg27hj2jly1awg4z3fm6mk75qrda3hl6gm8rddw1v";
-      name = "kbruch-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kbruch-21.12.3.tar.xz";
+      sha256 = "1kcwbpa5lawkqqwn40r6d7savwvi7kkdgdxfxqxkviwnif2qkssx";
+      name = "kbruch-21.12.3.tar.xz";
     };
   };
   kcachegrind = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kcachegrind-21.12.2.tar.xz";
-      sha256 = "1fg7fn8a3bjbjr6bi298gqr4mr838v96bz9773pd7rnhffvvip8z";
-      name = "kcachegrind-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kcachegrind-21.12.3.tar.xz";
+      sha256 = "1cssjywnhfbnsvly4mralpx3af2pqkmhg1jj2q3cjiqx44i3gkyx";
+      name = "kcachegrind-21.12.3.tar.xz";
     };
   };
   kcalc = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kcalc-21.12.2.tar.xz";
-      sha256 = "037xk57gjfbjpw1q4gm9k1xkc3x5xxjr4d8xmnrnc6ni090648q4";
-      name = "kcalc-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kcalc-21.12.3.tar.xz";
+      sha256 = "15yqzhrlzcix8wvgaah8wf12msylgzyqwk58f58k5agxh97ahv4q";
+      name = "kcalc-21.12.3.tar.xz";
     };
   };
   kcalutils = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kcalutils-21.12.2.tar.xz";
-      sha256 = "0i474by8pyv64b7i807kym2q4wkhnyyn21vn56dbgp1awpi198i8";
-      name = "kcalutils-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kcalutils-21.12.3.tar.xz";
+      sha256 = "006sfkjzyid8byl2mmyn1is4nra9wjqh21ksd5g1kv948hf1jdcs";
+      name = "kcalutils-21.12.3.tar.xz";
     };
   };
   kcharselect = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kcharselect-21.12.2.tar.xz";
-      sha256 = "1czkni7wrl2l5v0zpvxfwdaqd5i0x6knzbjhzh8shdg3h19sgqrm";
-      name = "kcharselect-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kcharselect-21.12.3.tar.xz";
+      sha256 = "1aaiz9f9y2fmf284617pfnncgxjjjyfvdv08h900sc0bdlfmh4y7";
+      name = "kcharselect-21.12.3.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kcolorchooser-21.12.2.tar.xz";
-      sha256 = "12s2vfa3i7b5dh8c10xbqsy1xi9pq13vdj2xcpm5chkgw22595hv";
-      name = "kcolorchooser-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kcolorchooser-21.12.3.tar.xz";
+      sha256 = "0jnnbwaj9xb0ifcc95xay8yc4bx9f29wqkj3h4kffzdlwvw3vp7s";
+      name = "kcolorchooser-21.12.3.tar.xz";
     };
   };
   kcron = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kcron-21.12.2.tar.xz";
-      sha256 = "0ddgl61vw4mj8sa6zg1m4s6qagwygdkvw9pjmfs8fsa1anhlillk";
-      name = "kcron-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kcron-21.12.3.tar.xz";
+      sha256 = "0ffc71inp1kyd4xh39x6vbfggz0kpipd6r6vabfn187lpnpwcmpm";
+      name = "kcron-21.12.3.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kde-dev-scripts-21.12.2.tar.xz";
-      sha256 = "1vdssqwyi25j3saz5cw8n40y2i6bhq5l0rxbarh8m3iwcvx4ki3c";
-      name = "kde-dev-scripts-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kde-dev-scripts-21.12.3.tar.xz";
+      sha256 = "04w4kk7vpfkjj2fzylmq590kk7xskw3a0id3wndw8066pfafsfg3";
+      name = "kde-dev-scripts-21.12.3.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kde-dev-utils-21.12.2.tar.xz";
-      sha256 = "0flzc0kl252imng2mpg9mp71k8jrxc3yy7dzqlfdnpjz36dwpaqf";
-      name = "kde-dev-utils-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kde-dev-utils-21.12.3.tar.xz";
+      sha256 = "1jdqv5zdigwazh3m580rmnylr6h6a6l5g2cpxy54v9sdvh3qb1yr";
+      name = "kde-dev-utils-21.12.3.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdebugsettings-21.12.2.tar.xz";
-      sha256 = "0cimipq45c36nwk3alg738jl93zxja3xi77zjqk0k28ffn6qn7c2";
-      name = "kdebugsettings-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdebugsettings-21.12.3.tar.xz";
+      sha256 = "19ng7hvqpyh3kh0pahrknh89c113mqx1kxjq4r26xbww1ypkz8zq";
+      name = "kdebugsettings-21.12.3.tar.xz";
     };
   };
   kdeconnect-kde = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdeconnect-kde-21.12.2.tar.xz";
-      sha256 = "0crw0navhdsix0rpsya4vhffj35vlascpcflrs04vyws3v8xr026";
-      name = "kdeconnect-kde-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdeconnect-kde-21.12.3.tar.xz";
+      sha256 = "1n9km7czif19cvrsdfcjbb02i1xgpa1z4ycn20d3g8azmli4zj4g";
+      name = "kdeconnect-kde-21.12.3.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdeedu-data-21.12.2.tar.xz";
-      sha256 = "1cpbi5gkbq7xrv276vm0jlcjc5y9x1kw8l8x0z7syy06s4s3pvg9";
-      name = "kdeedu-data-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdeedu-data-21.12.3.tar.xz";
+      sha256 = "11mxxcca6jxz4qcmba12p6xbv845xa16b8ag529409f3276w4915";
+      name = "kdeedu-data-21.12.3.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdegraphics-mobipocket-21.12.2.tar.xz";
-      sha256 = "0zbiz47mqa176gcina8v03fw2qqrc5v1l8mg2fcpnl5dxc9d56c4";
-      name = "kdegraphics-mobipocket-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdegraphics-mobipocket-21.12.3.tar.xz";
+      sha256 = "091ix343p9vs4iyj8abq6mw9lbm1fx5167gykhm4g8bjk5vdri2q";
+      name = "kdegraphics-mobipocket-21.12.3.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdegraphics-thumbnailers-21.12.2.tar.xz";
-      sha256 = "09adinkdfbn5hfic92zbdhq9ldxpnbgf9pybsp4ibpw2097l2k5f";
-      name = "kdegraphics-thumbnailers-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdegraphics-thumbnailers-21.12.3.tar.xz";
+      sha256 = "0shdrl6n1724i8jrkmy8z6ayhflg93401jia87mcc1apaw9s8y83";
+      name = "kdegraphics-thumbnailers-21.12.3.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdenetwork-filesharing-21.12.2.tar.xz";
-      sha256 = "0q7gndwvki3r9vhkxmwr8xzc54cjpk9nzhk2665wsk1msfp3xqw6";
-      name = "kdenetwork-filesharing-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdenetwork-filesharing-21.12.3.tar.xz";
+      sha256 = "1y6sa22j2165j3x6ql1cfm30vv9ifb94mczbqbcjzmhqsypp5pw2";
+      name = "kdenetwork-filesharing-21.12.3.tar.xz";
     };
   };
   kdenlive = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdenlive-21.12.2.tar.xz";
-      sha256 = "1h668q91pcq3km7pq75krgq06x8gglmp8al52b0imyc9g9wy28z6";
-      name = "kdenlive-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdenlive-21.12.3.tar.xz";
+      sha256 = "1hamdi2v3rx5zjmvpx1bximdppmzgsk9gbjxwgr691lkybkgx8vs";
+      name = "kdenlive-21.12.3.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdepim-addons-21.12.2.tar.xz";
-      sha256 = "00j67rvkvm1sri6ij5ziqjh340cmpsyfwwmw8hr1dsi3vlva4gk1";
-      name = "kdepim-addons-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdepim-addons-21.12.3.tar.xz";
+      sha256 = "1pv780z29ccx05z12l2w5zdmby9d1q993jr0cyzvpapnmck9146h";
+      name = "kdepim-addons-21.12.3.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdepim-runtime-21.12.2.tar.xz";
-      sha256 = "0y1hgab16h9ypqh9isabbb4km2907vzdydfkd1m5b63vfbambz0j";
-      name = "kdepim-runtime-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdepim-runtime-21.12.3.tar.xz";
+      sha256 = "1ahrnnc9vn0556s4nrsjgc9vbf5rb6yby7fn33p3jjnpgja0mc7m";
+      name = "kdepim-runtime-21.12.3.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdesdk-kioslaves-21.12.2.tar.xz";
-      sha256 = "0vz6dk5an0bhnyglyqdgf3lqxdlc61k4vsbh8a4fky1zpvpwya84";
-      name = "kdesdk-kioslaves-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdesdk-kioslaves-21.12.3.tar.xz";
+      sha256 = "1nhsvx5pznm3adf0scrcqqb2ibl52a241ki2gbwvxk2qpwwwx6jd";
+      name = "kdesdk-kioslaves-21.12.3.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdesdk-thumbnailers-21.12.2.tar.xz";
-      sha256 = "1w90zjnwnqh1a47kgmijr8xp6z096f6ij250qfcl3bwvhxqmsrb0";
-      name = "kdesdk-thumbnailers-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdesdk-thumbnailers-21.12.3.tar.xz";
+      sha256 = "0337rhgil42wychi5anq2v61xq8mbcvma4gb50smapcrjfl7fkdy";
+      name = "kdesdk-thumbnailers-21.12.3.tar.xz";
     };
   };
   kdev-php = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdev-php-21.12.2.tar.xz";
-      sha256 = "0ghxfllh8pkyrvsaz4iwc9bm98mkq6z3wr558w4wjykgjp69r08j";
-      name = "kdev-php-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdev-php-21.12.3.tar.xz";
+      sha256 = "0z5iqgsh7w0hw0pw2522zlh5sd88zlplrxm3vjp3yvmza65471aa";
+      name = "kdev-php-21.12.3.tar.xz";
     };
   };
   kdev-python = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdev-python-21.12.2.tar.xz";
-      sha256 = "05jj7q7agkgpbrxzwh0n2ipc854cgm8skjyjkqmxp2kdf3fdm8lj";
-      name = "kdev-python-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdev-python-21.12.3.tar.xz";
+      sha256 = "1iyg1cfldf5mk62anw8schiw3ii0gp20qwg6ljk1r9hv583iwrq6";
+      name = "kdev-python-21.12.3.tar.xz";
     };
   };
   kdevelop = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdevelop-21.12.2.tar.xz";
-      sha256 = "13kgkxvbjcb60ckapqrcr4m0y5kyag948xx6gwrvzhrhn46ynfgz";
-      name = "kdevelop-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdevelop-21.12.3.tar.xz";
+      sha256 = "1shp8zlxr7iyysn1c8d3fp6rg6g2krj2v3zw5apalxcnal16bww6";
+      name = "kdevelop-21.12.3.tar.xz";
     };
   };
   kdf = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdf-21.12.2.tar.xz";
-      sha256 = "1fs8bab6q7imfpqqgasvr98k57nm68ignfch2i76rdcywhx3q268";
-      name = "kdf-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdf-21.12.3.tar.xz";
+      sha256 = "179ygy4kxkapfyxqj8h5xlvp1160vd72af34vd0a4r5az7wfd1m7";
+      name = "kdf-21.12.3.tar.xz";
     };
   };
   kdialog = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdialog-21.12.2.tar.xz";
-      sha256 = "1k6zlh1gbpj0y40h1i8pan28d8chqjsnhd6pvsvr95b91d0pj2xn";
-      name = "kdialog-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdialog-21.12.3.tar.xz";
+      sha256 = "04d1dqc5f02s867lllx1ix0nc55xw9hrpg7jxiy3v4c8vlzg0w53";
+      name = "kdialog-21.12.3.tar.xz";
     };
   };
   kdiamond = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kdiamond-21.12.2.tar.xz";
-      sha256 = "08b2a13bmxw3h6rhip619jvzgjrjgpz2v83i2azbqccfynisjnyh";
-      name = "kdiamond-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kdiamond-21.12.3.tar.xz";
+      sha256 = "1d3c4pckddnri9i19g2pi2ygpqakllrgy6azgvnh5hn20kgsw7d9";
+      name = "kdiamond-21.12.3.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/keditbookmarks-21.12.2.tar.xz";
-      sha256 = "1fxm0mm3sqp2frk2fcs2jw86wjxb2j5z9vyb34x7g80k5j17j57m";
-      name = "keditbookmarks-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/keditbookmarks-21.12.3.tar.xz";
+      sha256 = "0wfb7j1lhhdfw2x03p692mglmy9i9qys8mn4f3gxlb5imrd2hmnk";
+      name = "keditbookmarks-21.12.3.tar.xz";
     };
   };
   kfind = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kfind-21.12.2.tar.xz";
-      sha256 = "0kx6p4hyyalx5i8g4aq81aj30c9ac0380xvia9130g95pgkzd96c";
-      name = "kfind-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kfind-21.12.3.tar.xz";
+      sha256 = "1v1yxsbmzv4q5m5rbvl9n095d9fq0b1zphnl6vrzff5r8i53pzx0";
+      name = "kfind-21.12.3.tar.xz";
     };
   };
   kfloppy = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kfloppy-21.12.2.tar.xz";
-      sha256 = "10245c87379576n11xcjkll3rkvzv815qsavr4alsj1jr8w6zyg8";
-      name = "kfloppy-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kfloppy-21.12.3.tar.xz";
+      sha256 = "1phkigxd6bkwlcjrsfhlhn44ra9imfq0flcvp4vmza6c9ylsx6m8";
+      name = "kfloppy-21.12.3.tar.xz";
     };
   };
   kfourinline = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kfourinline-21.12.2.tar.xz";
-      sha256 = "1kz7ff31h8lvz7snqmjs6cma9i3py7dyd91i6ik2pwiar80sin1x";
-      name = "kfourinline-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kfourinline-21.12.3.tar.xz";
+      sha256 = "0rb5jcmmf19bidwywj56dn0wfrnrfi5kc75c20d7mxnlgygfdnkg";
+      name = "kfourinline-21.12.3.tar.xz";
     };
   };
   kgeography = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kgeography-21.12.2.tar.xz";
-      sha256 = "09h5zp8pxzr47s7j50l6xfssvk9zk56cqgnsjx75yh1n077z1d0j";
-      name = "kgeography-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kgeography-21.12.3.tar.xz";
+      sha256 = "1s1xyfffqkhmf4n74a4ksjz62rdiyl1fk1v57s9gnr6qw71wqql0";
+      name = "kgeography-21.12.3.tar.xz";
     };
   };
   kget = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kget-21.12.2.tar.xz";
-      sha256 = "0jmy2yxzrgq592dq075k7gp7ynk42i899jsbw0gbn79x69cxlkmv";
-      name = "kget-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kget-21.12.3.tar.xz";
+      sha256 = "1w249gvzz47ac7n1mnxxf20d9l7jmbh18m5dijy55ck61s4zcq4l";
+      name = "kget-21.12.3.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kgoldrunner-21.12.2.tar.xz";
-      sha256 = "0by6cq31jsls3qaqn4agrdhvd9jqg84plm6nbgh3rc85pnj5h22p";
-      name = "kgoldrunner-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kgoldrunner-21.12.3.tar.xz";
+      sha256 = "0gzz58407zjmk311kyyj5l2c1ciczcq9i8ckpwbd341dvwaww27q";
+      name = "kgoldrunner-21.12.3.tar.xz";
     };
   };
   kgpg = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kgpg-21.12.2.tar.xz";
-      sha256 = "1f193fyn1azwhm7b8gd5ffyb11acg1269mh1d2ly60ax83qjs48c";
-      name = "kgpg-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kgpg-21.12.3.tar.xz";
+      sha256 = "1mzq3g4xwg459k0mp9xvg8bhilizadbh4gck1764wq69bxlcyav3";
+      name = "kgpg-21.12.3.tar.xz";
     };
   };
   khangman = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/khangman-21.12.2.tar.xz";
-      sha256 = "0xih54w33vigvm3x2xp5lf29k4aga4yil0qv263965nxn9djnlaw";
-      name = "khangman-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/khangman-21.12.3.tar.xz";
+      sha256 = "000vn11pp4hwfh2689rmnwrrssrmrhx5569k02h4ynswkiykvbv6";
+      name = "khangman-21.12.3.tar.xz";
     };
   };
   khelpcenter = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/khelpcenter-21.12.2.tar.xz";
-      sha256 = "09ddkc7kiayx852mpgdmv04l19vrrc0yrf30hnyzkci58kbavvcq";
-      name = "khelpcenter-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/khelpcenter-21.12.3.tar.xz";
+      sha256 = "1fj1c57bqs009rx9db4ifvfmhhl4b35r5sfly3wvbfr4dapjqfqr";
+      name = "khelpcenter-21.12.3.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kidentitymanagement-21.12.2.tar.xz";
-      sha256 = "00fwjax3kfvr8jsy04hp1jyihvskvprbg83z2avhcy6lvr7g25kk";
-      name = "kidentitymanagement-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kidentitymanagement-21.12.3.tar.xz";
+      sha256 = "18xwvlmqhih5jmig2mj3a6mc5awlxdv8f81da6cgm123imhrirk4";
+      name = "kidentitymanagement-21.12.3.tar.xz";
     };
   };
   kig = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kig-21.12.2.tar.xz";
-      sha256 = "100ds4728lfnb6r6c52rdzk2n4rcpc5jiv35q5qd7d6cszmxvhvx";
-      name = "kig-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kig-21.12.3.tar.xz";
+      sha256 = "0rl0z1djsf9ha0q94v0cnj5qm4ij6yjsil2s57r3v666h64yradn";
+      name = "kig-21.12.3.tar.xz";
     };
   };
   kigo = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kigo-21.12.2.tar.xz";
-      sha256 = "0g1sl7bw9aln7fm2786sgh0m44da6vfxc9g0rizw31ff8papnyb8";
-      name = "kigo-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kigo-21.12.3.tar.xz";
+      sha256 = "14pp73b9mbf0ny75b90vs7z9l61m7zp8cll7hl4bplqh1kig1szf";
+      name = "kigo-21.12.3.tar.xz";
     };
   };
   killbots = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/killbots-21.12.2.tar.xz";
-      sha256 = "1qryy2g2i6iqc6rsw8jz4c14x67glpm3zvcx2dghyll6q9hns43z";
-      name = "killbots-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/killbots-21.12.3.tar.xz";
+      sha256 = "1ncr55xq04vrx6bss1ahk86c3l9ckhv4zjbc6gq4krhjw0lkdfiv";
+      name = "killbots-21.12.3.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kimagemapeditor-21.12.2.tar.xz";
-      sha256 = "11j55jvfxdpam3gkfv7355av9d6mz8z6djhplhmfd56llkmvw4n2";
-      name = "kimagemapeditor-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kimagemapeditor-21.12.3.tar.xz";
+      sha256 = "0qdmyrlf0jp3737p7x31wk428676xv77lx0mgyd9h2hdl0ipnbvr";
+      name = "kimagemapeditor-21.12.3.tar.xz";
     };
   };
   kimap = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kimap-21.12.2.tar.xz";
-      sha256 = "0sdas8knk6wa8hhgc3w62famdpq6pcxfhl4vmpw0r3aqskaci4q3";
-      name = "kimap-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kimap-21.12.3.tar.xz";
+      sha256 = "11jd9zkvflfh3gqs36fhj8mla3k44xf7zdb0z4nl9sk5nhhgm5px";
+      name = "kimap-21.12.3.tar.xz";
     };
   };
   kio-extras = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kio-extras-21.12.2.tar.xz";
-      sha256 = "0133cww4k2svn7cvw0fbdcwwv0zg09d27gz59gkpfswjmpsxdqj4";
-      name = "kio-extras-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kio-extras-21.12.3.tar.xz";
+      sha256 = "11zpnjdri7z4sz6zx26d9iv52aj4vf5lr9c114gg4pvz2l4h4h5i";
+      name = "kio-extras-21.12.3.tar.xz";
     };
   };
   kio-gdrive = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kio-gdrive-21.12.2.tar.xz";
-      sha256 = "1n3khrx5fczffwzg4bzxjhzy2kxf72dmb7fqs9hqfn1qkaahfv49";
-      name = "kio-gdrive-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kio-gdrive-21.12.3.tar.xz";
+      sha256 = "0bm3c7g6q7z2ydnha2x5c456x9wlgachi9453mlrd2zcsc7c5h87";
+      name = "kio-gdrive-21.12.3.tar.xz";
     };
   };
   kipi-plugins = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kipi-plugins-21.12.2.tar.xz";
-      sha256 = "11f3qmgqxdlzvv2zldjawn7a3kdigj5pb535rc9v9a8fp8mjvk88";
-      name = "kipi-plugins-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kipi-plugins-21.12.3.tar.xz";
+      sha256 = "1h6107d2a6jcyjsd191cg2ykgwm580j7wr0blg328ff6wwk1aizy";
+      name = "kipi-plugins-21.12.3.tar.xz";
     };
   };
   kirigami-gallery = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kirigami-gallery-21.12.2.tar.xz";
-      sha256 = "0rg9lg4iqxycfbhs62qs4ms4qadz1ii1dcv3ykkgn3w2brx77wad";
-      name = "kirigami-gallery-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kirigami-gallery-21.12.3.tar.xz";
+      sha256 = "0pjd9bq965v9x433p8rbhd7w3fj0808qd7x4c11ziyhy4cg9gwml";
+      name = "kirigami-gallery-21.12.3.tar.xz";
     };
   };
   kiriki = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kiriki-21.12.2.tar.xz";
-      sha256 = "1blj3vl87jdrr8qv2cyng20nr4d54gbk7w72z9rl02l62c9gkw5j";
-      name = "kiriki-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kiriki-21.12.3.tar.xz";
+      sha256 = "0qbm0zjjqnbcdm39zi8h240nblpa1pa7g1ls9mghzbqrdrh7n3a0";
+      name = "kiriki-21.12.3.tar.xz";
     };
   };
   kiten = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kiten-21.12.2.tar.xz";
-      sha256 = "18kxqrhfgch32583ra4422h7csd5ajijf9989bxz9hwi9mn3r2vl";
-      name = "kiten-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kiten-21.12.3.tar.xz";
+      sha256 = "0z0haqxxkh7m2510b5qfwbx8s45vcahbk503jp1x0bwz03mrwflw";
+      name = "kiten-21.12.3.tar.xz";
     };
   };
   kitinerary = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kitinerary-21.12.2.tar.xz";
-      sha256 = "0g7z6408nhrv54h6xxd2rd9wj2hmwzc3lg5risyqbg2zii9j0sp2";
-      name = "kitinerary-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kitinerary-21.12.3.tar.xz";
+      sha256 = "0kccrjiyib2zljr6rnc89y29jgi8cnhwfh1yq8psyzmca2n8lpxi";
+      name = "kitinerary-21.12.3.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kjumpingcube-21.12.2.tar.xz";
-      sha256 = "1abv3yi716n88b19rmimhw0vnnwyw28ab6fbcy9g1lgpbi69g5ax";
-      name = "kjumpingcube-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kjumpingcube-21.12.3.tar.xz";
+      sha256 = "1wlk6my6pawmdv3zgcpnyyzpjwz0wii0h8i1z0gxhbpg9nc8iy1r";
+      name = "kjumpingcube-21.12.3.tar.xz";
     };
   };
   kldap = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kldap-21.12.2.tar.xz";
-      sha256 = "1xda42f1q5ih3hdhmcbdz0fx2nchirlwips3gq0jb6lfzi5dbqpl";
-      name = "kldap-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kldap-21.12.3.tar.xz";
+      sha256 = "13llsfhx9lfvhf90a3vmpkyh02fjg5sp4fmrwrqyx9hjrbmy1g0a";
+      name = "kldap-21.12.3.tar.xz";
     };
   };
   kleopatra = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kleopatra-21.12.2.tar.xz";
-      sha256 = "1b2nq823gq1v20dnh3hm298fva7cmbn9hh0kmbq22kh98kv8chhh";
-      name = "kleopatra-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kleopatra-21.12.3.tar.xz";
+      sha256 = "10f61m0qrs0qipn94jd32gibyj8pcvprs8j7gmac0mym0b3djjls";
+      name = "kleopatra-21.12.3.tar.xz";
     };
   };
   klettres = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/klettres-21.12.2.tar.xz";
-      sha256 = "1wi1byr36x7z9scsy1gffna36m8x9vyfcqzndvx6042i2y0smhwz";
-      name = "klettres-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/klettres-21.12.3.tar.xz";
+      sha256 = "0l4zgfqd6l2bk67s2a0zldbcy8v7nwbv7yahvnyw4jf4jyv9q9rv";
+      name = "klettres-21.12.3.tar.xz";
     };
   };
   klickety = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/klickety-21.12.2.tar.xz";
-      sha256 = "19rn9p7cbxhn471b65nhwhpnfnhykjwj6n5lrsd431391dyhvshc";
-      name = "klickety-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/klickety-21.12.3.tar.xz";
+      sha256 = "03liv3fax764ngfkwp3ga96irn8qb509b08ljnhz5aw5v9yrssnk";
+      name = "klickety-21.12.3.tar.xz";
     };
   };
   klines = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/klines-21.12.2.tar.xz";
-      sha256 = "1r004rsy98lxh5vd3r4bc0l4d7ymija13barg9xglj53xzbyij3k";
-      name = "klines-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/klines-21.12.3.tar.xz";
+      sha256 = "1ypi64wdsw1zsj03wcxj02v27y1by113v89as8dyk9wr0pfmbpqf";
+      name = "klines-21.12.3.tar.xz";
     };
   };
   kmag = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kmag-21.12.2.tar.xz";
-      sha256 = "03kzahsr80wnbx6ky112ka3zm01pnc5h85l28a4186617swx344l";
-      name = "kmag-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kmag-21.12.3.tar.xz";
+      sha256 = "067x65gmip89rdgii2nwnxn7zi96cf7vfbhqzg0499pd2d69p3sl";
+      name = "kmag-21.12.3.tar.xz";
     };
   };
   kmahjongg = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kmahjongg-21.12.2.tar.xz";
-      sha256 = "1w8v6fchrkvsbyvnx8vvs801cvg52pr78ihvdjv6c0vpd0q7z9rz";
-      name = "kmahjongg-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kmahjongg-21.12.3.tar.xz";
+      sha256 = "02yvvpwkk5gbj445zv5xhfragk8220rlx0pkxf32pj0jsv7dnz1x";
+      name = "kmahjongg-21.12.3.tar.xz";
     };
   };
   kmail = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kmail-21.12.2.tar.xz";
-      sha256 = "003bnp00figa09qcp2hl45sivdk3d0j3amxdidyrn47q9vy40554";
-      name = "kmail-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kmail-21.12.3.tar.xz";
+      sha256 = "1knh6cf72hidc6jyiw250b708b410fla0c5w83zaavmwv37ah8z0";
+      name = "kmail-21.12.3.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kmail-account-wizard-21.12.2.tar.xz";
-      sha256 = "1nmg8qns3iglcc4l4g5nffnji1vgg43a9fa9rz1hacvlkarm98m4";
-      name = "kmail-account-wizard-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kmail-account-wizard-21.12.3.tar.xz";
+      sha256 = "0ar2rm6viissfipbak07fxivrgqgsdfilsprsqmvab44inw2g4pg";
+      name = "kmail-account-wizard-21.12.3.tar.xz";
     };
   };
   kmailtransport = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kmailtransport-21.12.2.tar.xz";
-      sha256 = "0rs6qihzy8q2n204zkhakgnjxwqy9pz9i0kv1j3amw2xv3f51rvw";
-      name = "kmailtransport-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kmailtransport-21.12.3.tar.xz";
+      sha256 = "0l3pgs781a6is937i0bkz9ykr40l36rwlrirsr4g8wh0gkc3ifi6";
+      name = "kmailtransport-21.12.3.tar.xz";
     };
   };
   kmbox = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kmbox-21.12.2.tar.xz";
-      sha256 = "1mfwaw4d480kbb60wb0kvl5z35ly2hn6h73kx9wdb5y7mz05rvn1";
-      name = "kmbox-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kmbox-21.12.3.tar.xz";
+      sha256 = "04cl2khj3a7n81nlmxsg8kgszrl22qm6s2kvbrhz39yfzi31cwqr";
+      name = "kmbox-21.12.3.tar.xz";
     };
   };
   kmime = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kmime-21.12.2.tar.xz";
-      sha256 = "0qxb0gf4pqfa0540fsbnf24nh9qwiamwl65q7vaanb80b211qp2g";
-      name = "kmime-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kmime-21.12.3.tar.xz";
+      sha256 = "03s7l4lywdvp97h4qjgq06qqcclvnhy83qsrfzv0w2wcl631nnpw";
+      name = "kmime-21.12.3.tar.xz";
     };
   };
   kmines = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kmines-21.12.2.tar.xz";
-      sha256 = "0dsqlqmbaggab38zzjyhnx318sn2mw6y51k52c7blm2l53a8zp3j";
-      name = "kmines-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kmines-21.12.3.tar.xz";
+      sha256 = "1wxy0cyz733wvnxfjhirqf41wnda4f6aqdiqmb5r1ngzzllgbglc";
+      name = "kmines-21.12.3.tar.xz";
     };
   };
   kmix = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kmix-21.12.2.tar.xz";
-      sha256 = "0fyjzzv6x9xf0g222jjsvrywnm3blhbzm2zwhxagrfkjvjpb2cvk";
-      name = "kmix-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kmix-21.12.3.tar.xz";
+      sha256 = "1zk2xljis1pv3m4vs5zr6wza6iv5y6wmh1csx3rn8ylfkrpk7h8k";
+      name = "kmix-21.12.3.tar.xz";
     };
   };
   kmousetool = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kmousetool-21.12.2.tar.xz";
-      sha256 = "1hh7sql04hpwvb8hbi7snvh2d6922a2yraah9hd1jiwniv3cv175";
-      name = "kmousetool-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kmousetool-21.12.3.tar.xz";
+      sha256 = "013qr1md3gbin7hcahnv14y9i2cg35r433s2w81fvgcakd38qvkj";
+      name = "kmousetool-21.12.3.tar.xz";
     };
   };
   kmouth = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kmouth-21.12.2.tar.xz";
-      sha256 = "0vxssxchh23bl237qw9pznbrkwyqx1bhbnp2fq9baw1bn88d18i5";
-      name = "kmouth-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kmouth-21.12.3.tar.xz";
+      sha256 = "0xvkp2pm2szbgzdsfmwrykma8npmlwmx2pb1iakbx3x1wyyjsbim";
+      name = "kmouth-21.12.3.tar.xz";
     };
   };
   kmplot = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kmplot-21.12.2.tar.xz";
-      sha256 = "025n51s7i5nr63knsd78pg48wfs4cldhplr68jmwv2k8pb5w9kxs";
-      name = "kmplot-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kmplot-21.12.3.tar.xz";
+      sha256 = "1vmrzfcdyaxgvyp9la2gvy3h5fhksmn24lsnrpvr6alj880mh8bq";
+      name = "kmplot-21.12.3.tar.xz";
     };
   };
   knavalbattle = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/knavalbattle-21.12.2.tar.xz";
-      sha256 = "1z1qqr5jjinm49p7rhr0pzf8ir2nvdq157zqxnnr6i11xqk2mnkj";
-      name = "knavalbattle-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/knavalbattle-21.12.3.tar.xz";
+      sha256 = "1mpj1783za6b7a7cjawy4v0z24dvcd34gdb25qch4gi9cx1lc28z";
+      name = "knavalbattle-21.12.3.tar.xz";
     };
   };
   knetwalk = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/knetwalk-21.12.2.tar.xz";
-      sha256 = "1gnir7h1iam51frdajp4h6xw4biz545nljdfcck17jiw6ad9py4j";
-      name = "knetwalk-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/knetwalk-21.12.3.tar.xz";
+      sha256 = "0ahms3imvkdknp1z2h6j42k9g1i20ygd2633icjv37d2cbij128m";
+      name = "knetwalk-21.12.3.tar.xz";
     };
   };
   knights = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/knights-21.12.2.tar.xz";
-      sha256 = "0k9hqgz3zw7vhrgbwnmy0v3j9kflz6wx8wavckg1i2l4qadprc1y";
-      name = "knights-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/knights-21.12.3.tar.xz";
+      sha256 = "1m2big16rdw3w347m5vi0qhypnb2rgz6804kkxs7ln0yx658y4x4";
+      name = "knights-21.12.3.tar.xz";
     };
   };
   knotes = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/knotes-21.12.2.tar.xz";
-      sha256 = "0f8ra6nkgndgkfnw194y5976kkrm7qdj1w7l27znwalzaydnxvjg";
-      name = "knotes-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/knotes-21.12.3.tar.xz";
+      sha256 = "07pj0aqwsy1xi5mx7x0h3zmxfg0n4afgjax9a9ihc553xs6k48d7";
+      name = "knotes-21.12.3.tar.xz";
     };
   };
   kolf = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kolf-21.12.2.tar.xz";
-      sha256 = "0as18rc45daak3xsmwn6k789yni46nsdkv83bfmbj3jcjhzv9x5k";
-      name = "kolf-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kolf-21.12.3.tar.xz";
+      sha256 = "00dhjy82d9964z94nn4vkkwynql3bfa6djwrgsq93f9d7grgkd7g";
+      name = "kolf-21.12.3.tar.xz";
     };
   };
   kollision = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kollision-21.12.2.tar.xz";
-      sha256 = "1ycim9gjn9p6w6yyzsipqn7zpvi946s287mp4br35zavsf25gzn0";
-      name = "kollision-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kollision-21.12.3.tar.xz";
+      sha256 = "0avin6s1lglfps6qlvz19i27nb0x0hgrl4q2brpq4kax7azs1nc3";
+      name = "kollision-21.12.3.tar.xz";
     };
   };
   kolourpaint = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kolourpaint-21.12.2.tar.xz";
-      sha256 = "0z53hp31sq4ksarvpzqmx9f3gac8ygrcj0ncppgbwwjkq63wr6v1";
-      name = "kolourpaint-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kolourpaint-21.12.3.tar.xz";
+      sha256 = "0kbz8jz33bk4zr7kk6mb1y42mdq6nykdfqm2cs08sxldd3nrs6fj";
+      name = "kolourpaint-21.12.3.tar.xz";
     };
   };
   kompare = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kompare-21.12.2.tar.xz";
-      sha256 = "0ps6ng77kzcqf6b2sh8xmqh5d4jwkmj3qnbyxh4v4xxjbwy0mrwm";
-      name = "kompare-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kompare-21.12.3.tar.xz";
+      sha256 = "097aawmziplsndj42bdjf3x3smal1fy67c2y7cik9p1qw9wgn24h";
+      name = "kompare-21.12.3.tar.xz";
     };
   };
   konqueror = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/konqueror-21.12.2.tar.xz";
-      sha256 = "0ia8qqas9x261ixa6jzih273ypqhdv5hijk042bcdmqd1z1s4n55";
-      name = "konqueror-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/konqueror-21.12.3.tar.xz";
+      sha256 = "0z3zq71n0lnpx5ggfg835zbmgf2ly4zsmz01yyyxn9n9d9b6d3px";
+      name = "konqueror-21.12.3.tar.xz";
     };
   };
   konquest = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/konquest-21.12.2.tar.xz";
-      sha256 = "1arxp4x8pcmv8yqg1xy5b23avh5a7x660vvh6kaviimysad5wmc5";
-      name = "konquest-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/konquest-21.12.3.tar.xz";
+      sha256 = "0lrahq9s70rx24dw4cgpvchr4s6pcl565vh343ggg24s1rd3ly80";
+      name = "konquest-21.12.3.tar.xz";
     };
   };
   konsole = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/konsole-21.12.2.tar.xz";
-      sha256 = "00gyzhcacd3467sv5ijihqva7pnvcy1chywfpy8qh2hcdkkvyfxa";
-      name = "konsole-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/konsole-21.12.3.tar.xz";
+      sha256 = "06sqm2xmairicrdcxnf7imvyvw0wyknrrym334scx2w7mfhjg5qs";
+      name = "konsole-21.12.3.tar.xz";
     };
   };
   kontact = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kontact-21.12.2.tar.xz";
-      sha256 = "16ld08sx5lvrm9r0ync7r8bpd540gxsssvhxj5p43chq6b9hr5lm";
-      name = "kontact-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kontact-21.12.3.tar.xz";
+      sha256 = "16p17b4llral0g48l3s9yg838x6hhc4dprlcpd00b8sy58c27f90";
+      name = "kontact-21.12.3.tar.xz";
     };
   };
   kontactinterface = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kontactinterface-21.12.2.tar.xz";
-      sha256 = "1qvjm27v797hcdqbr6jwdkwn3vpsy3f1i92slrwks03zj498ydlj";
-      name = "kontactinterface-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kontactinterface-21.12.3.tar.xz";
+      sha256 = "1qwx0q4bbk3d720ij37wbd54g9alw6ispjl1mq19hkk3gs5l1c78";
+      name = "kontactinterface-21.12.3.tar.xz";
     };
   };
   kontrast = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kontrast-21.12.2.tar.xz";
-      sha256 = "0mk2i2x1yz0ykbnqvdbdpi9kplyzjxlwhhsvl4rbq0726g3q6pas";
-      name = "kontrast-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kontrast-21.12.3.tar.xz";
+      sha256 = "1rp279mfq18p5kzw3788m8w6kkj8w7zfdv97rnl3n5jir4j94yxl";
+      name = "kontrast-21.12.3.tar.xz";
     };
   };
   konversation = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/konversation-21.12.2.tar.xz";
-      sha256 = "0lpkah6z12c4f77z6r5z31q5np3xwyb3y6xnsv1iq1rdzj0daxch";
-      name = "konversation-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/konversation-21.12.3.tar.xz";
+      sha256 = "05dxzkpadz29b5fm6pf225xqq0gaz9w50paz9341kzz4k3rnzq80";
+      name = "konversation-21.12.3.tar.xz";
     };
   };
   kopeninghours = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kopeninghours-21.12.2.tar.xz";
-      sha256 = "1s4wcnk7p0vjqdhyf8131l3s6bn86gfkwl45zwpi7lpyacwgdf6k";
-      name = "kopeninghours-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kopeninghours-21.12.3.tar.xz";
+      sha256 = "0pfkrns576ll6wc33c8i6pgzd9wf543w2isbvh393zyb1rr3bzgd";
+      name = "kopeninghours-21.12.3.tar.xz";
     };
   };
   kopete = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kopete-21.12.2.tar.xz";
-      sha256 = "1py45nk6bv5x2hnfzh5srq17lprkqrmpqr2h0fpmkmffx66njz5q";
-      name = "kopete-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kopete-21.12.3.tar.xz";
+      sha256 = "1v519sw2lzlap6xci3j55k8c48755sc9p3mgvj566b6jjq64xi5k";
+      name = "kopete-21.12.3.tar.xz";
     };
   };
   korganizer = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/korganizer-21.12.2.tar.xz";
-      sha256 = "1kablp0x65jmdz5n3y19rgplcvvmq8vxz0ljw7lkrwr3pvvhyv3q";
-      name = "korganizer-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/korganizer-21.12.3.tar.xz";
+      sha256 = "072pyzs38dv07mwi4hlfb4rh9jx40dpxac3ywy7kj6nyvbfjmh0r";
+      name = "korganizer-21.12.3.tar.xz";
     };
   };
   kosmindoormap = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kosmindoormap-21.12.2.tar.xz";
-      sha256 = "0max3mfwd5x8m3kqybnkrb4v93rdk1r007xw31l52j2rq2gh8pj2";
-      name = "kosmindoormap-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kosmindoormap-21.12.3.tar.xz";
+      sha256 = "06i616c873lkkpy2iwdjcgwnm6adjrr6rcain2rrb1j4pgzmmbvw";
+      name = "kosmindoormap-21.12.3.tar.xz";
     };
   };
   kpat = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kpat-21.12.2.tar.xz";
-      sha256 = "0vra8n9xsba67as0ybmbjy235v3s7dmrwlf18avnb3ygxy0h8swf";
-      name = "kpat-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kpat-21.12.3.tar.xz";
+      sha256 = "1jd9457hf15d2l6njkfyj9a7lfyabcm80vz3zjb2cykm16x3sdb8";
+      name = "kpat-21.12.3.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kpimtextedit-21.12.2.tar.xz";
-      sha256 = "06d42k433dvkfrnzfdx0b1qarrnmhnb4gyq7vgy6251ah8smild8";
-      name = "kpimtextedit-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kpimtextedit-21.12.3.tar.xz";
+      sha256 = "19hrqbjcmpi81vmnggrkrv0fcc9inhz5aa5klx0141aylnzfgwsl";
+      name = "kpimtextedit-21.12.3.tar.xz";
     };
   };
   kpkpass = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kpkpass-21.12.2.tar.xz";
-      sha256 = "0p2l1z4blfq1iz3x9cnwwx2p9cs6bb4vw1csj29s09i6237ippzx";
-      name = "kpkpass-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kpkpass-21.12.3.tar.xz";
+      sha256 = "05f88hlqxfak94jy8afiv91dgzxd9qgrkarnqi9rv1f5a3j7k3k7";
+      name = "kpkpass-21.12.3.tar.xz";
     };
   };
   kpmcore = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kpmcore-21.12.2.tar.xz";
-      sha256 = "1iyirvf04br0r8vclcpx0qrlm8wgqm9ww6xds3h9qjyqj1w8ng41";
-      name = "kpmcore-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kpmcore-21.12.3.tar.xz";
+      sha256 = "19h0ag54xzv4hwh950hshjghd4fb9xkdg8rlx6lvqa0w9b8admva";
+      name = "kpmcore-21.12.3.tar.xz";
     };
   };
   kpublictransport = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kpublictransport-21.12.2.tar.xz";
-      sha256 = "02ffpgki4mdyczxa5bqb9wmg2c6anwxnsmlfdn1k47ry7ny2k9sl";
-      name = "kpublictransport-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kpublictransport-21.12.3.tar.xz";
+      sha256 = "1jcba5bq320afzfs5ly3vyyicdix8fprpr02x67v8p7mdzg58cq6";
+      name = "kpublictransport-21.12.3.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kqtquickcharts-21.12.2.tar.xz";
-      sha256 = "1sjm1vaksvp73866w09xadd1d0lakh00fwiic498siws4dvhhpif";
-      name = "kqtquickcharts-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kqtquickcharts-21.12.3.tar.xz";
+      sha256 = "0gl9c8zfn440202l82y4nfng0hyhivby8a4hf91rphi8f1xfxxmr";
+      name = "kqtquickcharts-21.12.3.tar.xz";
     };
   };
   krdc = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/krdc-21.12.2.tar.xz";
-      sha256 = "005i3a7l9aq63nxsivj28kzjy2zdl759snwm56cgwq9rgc6sc003";
-      name = "krdc-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/krdc-21.12.3.tar.xz";
+      sha256 = "09np9clvmdll7v2p9aswnlhz4cgsnly82za7k3k9fs66h5c8q20j";
+      name = "krdc-21.12.3.tar.xz";
     };
   };
   kreversi = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kreversi-21.12.2.tar.xz";
-      sha256 = "03b4c28297dzdzplmg818r27r9gpqj48rha9884h22fz9davgmhw";
-      name = "kreversi-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kreversi-21.12.3.tar.xz";
+      sha256 = "0lbypkh6lc5af43c2p19gs2c53icxd26abxf5rhs2c8182gr39b8";
+      name = "kreversi-21.12.3.tar.xz";
     };
   };
   krfb = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/krfb-21.12.2.tar.xz";
-      sha256 = "1989q0mig516hz0lbq2m8p85x8ikpyrhj36cvq4c32sd2nasxkvc";
-      name = "krfb-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/krfb-21.12.3.tar.xz";
+      sha256 = "1r8lvvh2z8xi0l3pizlpl12nm4fnbpgiwqmx18w8i51x4j27dv0n";
+      name = "krfb-21.12.3.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kross-interpreters-21.12.2.tar.xz";
-      sha256 = "14j7z6lwl0j7zdz29c1kjyhw0my6qfgnyxibwn9z87paxl8nv6z0";
-      name = "kross-interpreters-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kross-interpreters-21.12.3.tar.xz";
+      sha256 = "0wyr3xwdkb2fiadzh5lhjli1g0mbxjw353q7k1vbi2wxg5b9042g";
+      name = "kross-interpreters-21.12.3.tar.xz";
     };
   };
   kruler = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kruler-21.12.2.tar.xz";
-      sha256 = "1w5dw3qda69d4ycbiaj18gfn6w28dj2lc37x2d86kx5skv8adxbw";
-      name = "kruler-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kruler-21.12.3.tar.xz";
+      sha256 = "0jmb3a907jx0s80865lmd7in8ggdf30gdbgykpalzfrv7nkjamzr";
+      name = "kruler-21.12.3.tar.xz";
     };
   };
   kshisen = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kshisen-21.12.2.tar.xz";
-      sha256 = "0wjr9fnkmbylfq13zy3hifr4byj4y46f8cwh0w61ypgc0wjxnhhg";
-      name = "kshisen-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kshisen-21.12.3.tar.xz";
+      sha256 = "1i11gh87gfza58rpdd44pjb423an9a44cls117ba9gznxm67cph5";
+      name = "kshisen-21.12.3.tar.xz";
     };
   };
   ksirk = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ksirk-21.12.2.tar.xz";
-      sha256 = "1lif8n8n2pj4vaf7zifqj7mjv5dbhki75wbwjd4q061wpr434vfj";
-      name = "ksirk-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ksirk-21.12.3.tar.xz";
+      sha256 = "1ipnkg2mgj37g5s5ihlys176kn2c11f3d57xr9zhqf8fvkvrkfm0";
+      name = "ksirk-21.12.3.tar.xz";
     };
   };
   ksmtp = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ksmtp-21.12.2.tar.xz";
-      sha256 = "0hg5g401map67kjcgrd1a07iwyss5jnryhpsajffwz19sra855jp";
-      name = "ksmtp-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ksmtp-21.12.3.tar.xz";
+      sha256 = "0kdy5gsg1sgccvdk1fpf866xl9m8v8z034jpgf6s7n2pr5r5mni2";
+      name = "ksmtp-21.12.3.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ksnakeduel-21.12.2.tar.xz";
-      sha256 = "0rdbsyfd3bink5cb0k5l713jw4syhz82kchn95cbg5zgc2iclfw4";
-      name = "ksnakeduel-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ksnakeduel-21.12.3.tar.xz";
+      sha256 = "06rill73xhhxra7kmbvwwriv9vbi91641z334ry1m4rr1qm2cdd6";
+      name = "ksnakeduel-21.12.3.tar.xz";
     };
   };
   kspaceduel = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kspaceduel-21.12.2.tar.xz";
-      sha256 = "1kmwn55a4555g5m21jcr88k3f9aj87yifgrab6sx6gcw5q51d7vz";
-      name = "kspaceduel-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kspaceduel-21.12.3.tar.xz";
+      sha256 = "0dv539jlpkj8hr4cz0ncqm3scg6ja3s41p37bpqd94zicfvzxw84";
+      name = "kspaceduel-21.12.3.tar.xz";
     };
   };
   ksquares = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ksquares-21.12.2.tar.xz";
-      sha256 = "12k09lasxyaxq4bp4fhczj8bpi8l6h1gn4nj6ka3zbc4mxxz34yc";
-      name = "ksquares-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ksquares-21.12.3.tar.xz";
+      sha256 = "1wbrakq1wnwp558y140j9vbid3g0k332rwbilky7z11c0giiv76x";
+      name = "ksquares-21.12.3.tar.xz";
     };
   };
   ksudoku = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ksudoku-21.12.2.tar.xz";
-      sha256 = "1din2i3d9lhca5kw06ivixgk2prh1kfy8ikm0byl8qaqj4v89lji";
-      name = "ksudoku-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ksudoku-21.12.3.tar.xz";
+      sha256 = "1gw0ybwhvg1z8pcs72f73y52jvzvrw367g275axf2rw50iik6jwv";
+      name = "ksudoku-21.12.3.tar.xz";
     };
   };
   ksystemlog = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ksystemlog-21.12.2.tar.xz";
-      sha256 = "0cvx13859bm4kfz75iia3chzi5pbbv70lkmspvjpa6cpsn05zy53";
-      name = "ksystemlog-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ksystemlog-21.12.3.tar.xz";
+      sha256 = "0jkd0rx0xlzwsxa3s40sp5x4r19a9rg1x9klpnjfw0b326vgf2m9";
+      name = "ksystemlog-21.12.3.tar.xz";
     };
   };
   kteatime = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kteatime-21.12.2.tar.xz";
-      sha256 = "1m7ni3w82lqykgs5qfi0a43p9973244k8lr6rk30x7w551rc7yyw";
-      name = "kteatime-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kteatime-21.12.3.tar.xz";
+      sha256 = "0i3ps1a8y8crmxf1631q4zjfa0zglqhq1rk6id5v2xx8f10rkh54";
+      name = "kteatime-21.12.3.tar.xz";
     };
   };
   ktimer = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktimer-21.12.2.tar.xz";
-      sha256 = "0jprayxn54pw7brrcb1b70y5sal9j6pfpwrphd2nyw5rkb2a484l";
-      name = "ktimer-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktimer-21.12.3.tar.xz";
+      sha256 = "0s6zbygxnk69dciyz1iv1d6whfcv637licsd07n7fc8bsygqjl5p";
+      name = "ktimer-21.12.3.tar.xz";
     };
   };
   ktnef = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktnef-21.12.2.tar.xz";
-      sha256 = "0cl589z0v6h1z3aszk4160y99gpihpk203rn73dmb7c6qsk11cbl";
-      name = "ktnef-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktnef-21.12.3.tar.xz";
+      sha256 = "1in991n8alkxf40p0wvkr7gdaaz8w4kdw1rsq6sbjil6cs4cr5nl";
+      name = "ktnef-21.12.3.tar.xz";
     };
   };
   ktorrent = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktorrent-21.12.2.tar.xz";
-      sha256 = "1zwakqp5j2795j4pln4sq595bc2zlw8cy8qdzwj365clfbpcbyc3";
-      name = "ktorrent-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktorrent-21.12.3.tar.xz";
+      sha256 = "021x6qcbk4kdh5ay5mqmf92129s42j2rhrs0q350b0wcnpad55zd";
+      name = "ktorrent-21.12.3.tar.xz";
     };
   };
   ktouch = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktouch-21.12.2.tar.xz";
-      sha256 = "1rq2n8395sb17rqd295axv2pbwzhqs8ikjqx5ryn4lv1713alabl";
-      name = "ktouch-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktouch-21.12.3.tar.xz";
+      sha256 = "0wi01gr85sxs4qhvnwkkp1230wnvz7gdr74zar03rc3wzwgv22nd";
+      name = "ktouch-21.12.3.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktp-accounts-kcm-21.12.2.tar.xz";
-      sha256 = "14niidb9kza6sms9rhhnvrba6rdwhc890b5inmlhdllnqbdrrcbl";
-      name = "ktp-accounts-kcm-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktp-accounts-kcm-21.12.3.tar.xz";
+      sha256 = "1ydsfiw67avgwswvpy85s3siggyi4w610yqz5dyl535i6my1kl5n";
+      name = "ktp-accounts-kcm-21.12.3.tar.xz";
     };
   };
   ktp-approver = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktp-approver-21.12.2.tar.xz";
-      sha256 = "11scv978silxrprkyd66b4xkdww05xpgk8kvrknlwp33rmhm05sn";
-      name = "ktp-approver-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktp-approver-21.12.3.tar.xz";
+      sha256 = "0mvczpc0dy2m0dn25r2h2js3hw7s0qr8zl3syvqbyqqs51s59xnl";
+      name = "ktp-approver-21.12.3.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktp-auth-handler-21.12.2.tar.xz";
-      sha256 = "006an8bva8zawnirv3ai3kjb59ffgany124ip546r5wg06zkk069";
-      name = "ktp-auth-handler-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktp-auth-handler-21.12.3.tar.xz";
+      sha256 = "0lgg0ify9mbsd8has8ingkq3m0g91r9gvfq85s2xf90cwc1s429c";
+      name = "ktp-auth-handler-21.12.3.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktp-call-ui-21.12.2.tar.xz";
-      sha256 = "0n8yirlsig37839rl73azg8vf8ppdxlf1dqgkf5bz8g3jcs92gcm";
-      name = "ktp-call-ui-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktp-call-ui-21.12.3.tar.xz";
+      sha256 = "1npr8qbpxx25pm9mky9sd0qngc5wphmy5blvl6qy7nvs2rqszgam";
+      name = "ktp-call-ui-21.12.3.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktp-common-internals-21.12.2.tar.xz";
-      sha256 = "0c7kfrgf8bqm7q9hp9fd8q49vakiihzl0dgdklpvgly48zfa2yan";
-      name = "ktp-common-internals-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktp-common-internals-21.12.3.tar.xz";
+      sha256 = "0spr2gs5d561agvipkipwcxk2zjlhzvp6swdh8rcv23qr6igqjq6";
+      name = "ktp-common-internals-21.12.3.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktp-contact-list-21.12.2.tar.xz";
-      sha256 = "0pw5kl0lh0ph3y9hyws7h7phh475lw07gydxxjsfxsd4nb70hkz8";
-      name = "ktp-contact-list-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktp-contact-list-21.12.3.tar.xz";
+      sha256 = "1qn3bmwl4kvm5ikbr0ycy2znm4c2yv4m5863d4vakr8xhhappamp";
+      name = "ktp-contact-list-21.12.3.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktp-contact-runner-21.12.2.tar.xz";
-      sha256 = "0as41gba7ra65i6ml8j8fqh70x165cnmp9ry13ijrdf9vx21a45k";
-      name = "ktp-contact-runner-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktp-contact-runner-21.12.3.tar.xz";
+      sha256 = "0bwi0j733jnwiqlxv8nik1whdvk4aggfayy2bcwwpj5zdzr3mbga";
+      name = "ktp-contact-runner-21.12.3.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktp-desktop-applets-21.12.2.tar.xz";
-      sha256 = "0675hlcjq6xyzl1sz3a45inc3g69z5ilxyhhicxns8by3ydmb82x";
-      name = "ktp-desktop-applets-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktp-desktop-applets-21.12.3.tar.xz";
+      sha256 = "01h26jsdb7mkw8isxpy4sfpdn11q209xqhhpnk7xvchs8fpl5fni";
+      name = "ktp-desktop-applets-21.12.3.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktp-filetransfer-handler-21.12.2.tar.xz";
-      sha256 = "1cw2y06zcdfm9vixw99gbipgkl63vpkf73giq5ibal2g2yq9c2r5";
-      name = "ktp-filetransfer-handler-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktp-filetransfer-handler-21.12.3.tar.xz";
+      sha256 = "0aq5ii7b2kk0qan4qph9glapp81sgqm2zzbdknggxz7vkhj5y6lk";
+      name = "ktp-filetransfer-handler-21.12.3.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktp-kded-module-21.12.2.tar.xz";
-      sha256 = "1mwmdnr2c6ilhhjlq8bwd7gwvjmiq1k3lph5vlb5hy8nrp9x2p1r";
-      name = "ktp-kded-module-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktp-kded-module-21.12.3.tar.xz";
+      sha256 = "0921lahpqjx094ngk68pphkv306ajgxbp6yb0hkckmlic4f2hm37";
+      name = "ktp-kded-module-21.12.3.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktp-send-file-21.12.2.tar.xz";
-      sha256 = "0083z5al3jgl1szmzddzkjln9ci37906mmnrcy9f0yxfq5v2gr44";
-      name = "ktp-send-file-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktp-send-file-21.12.3.tar.xz";
+      sha256 = "0vvg0qz2zxckqqwfibsl88w0mpa7a0lzskwhzbvzir03x14rwjlc";
+      name = "ktp-send-file-21.12.3.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktp-text-ui-21.12.2.tar.xz";
-      sha256 = "0lhbsmhp23sil3rckk51156qhz15hjyp943mgh4s3w49lwxgjpc8";
-      name = "ktp-text-ui-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktp-text-ui-21.12.3.tar.xz";
+      sha256 = "046611abkdn7qqh6n4v8ssdzg10q4g14rji7klypmccfng0px2xg";
+      name = "ktp-text-ui-21.12.3.tar.xz";
     };
   };
   ktuberling = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/ktuberling-21.12.2.tar.xz";
-      sha256 = "0w9gx0i895vd0gi8wgd6hqikqjz5ir4li14i15k4akc7i7niy46r";
-      name = "ktuberling-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/ktuberling-21.12.3.tar.xz";
+      sha256 = "1awsn285j9nggyypkra9ladgi46w2m7m09d8364w5d0sygpzmgsg";
+      name = "ktuberling-21.12.3.tar.xz";
     };
   };
   kturtle = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kturtle-21.12.2.tar.xz";
-      sha256 = "0xkl12albs66vnsbilkwpnw5qaqx2ss8wldsnigmf0x5d5hd554k";
-      name = "kturtle-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kturtle-21.12.3.tar.xz";
+      sha256 = "1689skwk2dwm4mrl2mrakb1cn74nyxd6xa8ipxsip5zhjgkkvg23";
+      name = "kturtle-21.12.3.tar.xz";
     };
   };
   kubrick = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kubrick-21.12.2.tar.xz";
-      sha256 = "1sd8biyndnc7y4d3zsy4bmi409js9viyd4q5ql6fd2wcz656y1im";
-      name = "kubrick-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kubrick-21.12.3.tar.xz";
+      sha256 = "0hx81cp1lql74c9067dw7mi78c6sp6p1a035j2nzjn9drpxal6p2";
+      name = "kubrick-21.12.3.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kwalletmanager-21.12.2.tar.xz";
-      sha256 = "0d2ma7dzn0nc25fj7lwaysfjfgqfl5nsisc01lp42n9k1bg0s0i5";
-      name = "kwalletmanager-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kwalletmanager-21.12.3.tar.xz";
+      sha256 = "01xif44iz1ik32swlrzzjycizy4hjlis1f336qc9p7affjyv2797";
+      name = "kwalletmanager-21.12.3.tar.xz";
     };
   };
   kwave = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kwave-21.12.2.tar.xz";
-      sha256 = "01bjsm3aj7m1mq3nr6iwmcxswq8sxdxhhdyc5zlgffifpym53dc5";
-      name = "kwave-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kwave-21.12.3.tar.xz";
+      sha256 = "07xbbii5gpllbpmkxfv5kwxawd390zp0angh94xjk0yq71lvdav2";
+      name = "kwave-21.12.3.tar.xz";
     };
   };
   kwordquiz = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/kwordquiz-21.12.2.tar.xz";
-      sha256 = "1na113adrd9djxk016riz3ajwrn9rbpc0ib34adfvp6nw48d9snp";
-      name = "kwordquiz-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/kwordquiz-21.12.3.tar.xz";
+      sha256 = "1p06ki75zy4il6k9siavqddpr9j02z3lbnd14pxwk42fhfmbx057";
+      name = "kwordquiz-21.12.3.tar.xz";
     };
   };
   libgravatar = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libgravatar-21.12.2.tar.xz";
-      sha256 = "0xj3v0cknkvr8ac5iipxpz1azr0hk42zgaaip5ivn7qjfhp0zvv0";
-      name = "libgravatar-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libgravatar-21.12.3.tar.xz";
+      sha256 = "1bihy3dfagwc7aday40myqjbn555mkzzaaq7c14ywkmhh99dhvh7";
+      name = "libgravatar-21.12.3.tar.xz";
     };
   };
   libkcddb = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libkcddb-21.12.2.tar.xz";
-      sha256 = "07bcbmf3z5l0v5b6ra1h36yvbjpim1kzz1npd2h30iq09ibx6dr8";
-      name = "libkcddb-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libkcddb-21.12.3.tar.xz";
+      sha256 = "14f1mzsfm0vyqzsyja0p8ln1105sw5dr6fssj25j0qw4rnf9yw32";
+      name = "libkcddb-21.12.3.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libkcompactdisc-21.12.2.tar.xz";
-      sha256 = "08abnybd0fa0vvpaixi18ljfz0s8a5pmbblzpcc8rvwzdjc7az6q";
-      name = "libkcompactdisc-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libkcompactdisc-21.12.3.tar.xz";
+      sha256 = "1vmaf3b41sj0sm4k9zdliy5ba4ps5z0cwabggfish152wzw34kgn";
+      name = "libkcompactdisc-21.12.3.tar.xz";
     };
   };
   libkdcraw = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libkdcraw-21.12.2.tar.xz";
-      sha256 = "0mzq0nha7mq5v3lb03xbspc0y2a7mg1mzlwbp3706ph6jp4m7mwa";
-      name = "libkdcraw-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libkdcraw-21.12.3.tar.xz";
+      sha256 = "1pyqsaaficwxbg6hk8xg8srq79i6xdxvghkn2rf54zj1435d9kva";
+      name = "libkdcraw-21.12.3.tar.xz";
     };
   };
   libkdegames = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libkdegames-21.12.2.tar.xz";
-      sha256 = "1m1qz59fb82bsj9ri3b8a1ph2ihgs97wlqq91pbgqw0kgvyvka1j";
-      name = "libkdegames-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libkdegames-21.12.3.tar.xz";
+      sha256 = "0x5mw25c8hmnxhcxc2xm19xmgdxfbx89nrxfl6mzfrh8myr3ybsb";
+      name = "libkdegames-21.12.3.tar.xz";
     };
   };
   libkdepim = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libkdepim-21.12.2.tar.xz";
-      sha256 = "0qqz9b17fz3kgh3gcyq30ds8fq7zkm14k85g4mywsn3lnn8bj6z9";
-      name = "libkdepim-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libkdepim-21.12.3.tar.xz";
+      sha256 = "0g9jx6z5jf9yqn01xc1k038b4ljr9sil7bwvifc64s38qxl9wmww";
+      name = "libkdepim-21.12.3.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libkeduvocdocument-21.12.2.tar.xz";
-      sha256 = "16vh1bycq92bh47phv7nk62r5vjaiv1p8fvq5p5idsz9ipzb1wzp";
-      name = "libkeduvocdocument-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libkeduvocdocument-21.12.3.tar.xz";
+      sha256 = "16kk7ij2qxy5abgv9hgk1ycbx0f2gnpc9lxqbhl5sq9vxd4nblv0";
+      name = "libkeduvocdocument-21.12.3.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libkexiv2-21.12.2.tar.xz";
-      sha256 = "1j1p1pw2l32q7lk8kp6r0nz9mzjdw6mxr2gi0p770k3k0arrsg87";
-      name = "libkexiv2-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libkexiv2-21.12.3.tar.xz";
+      sha256 = "0r2m6d9rw0r6rm6xqpj1i3w0hplhivy8h90zggqynfzvfyr9c529";
+      name = "libkexiv2-21.12.3.tar.xz";
     };
   };
   libkgapi = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libkgapi-21.12.2.tar.xz";
-      sha256 = "0n6x0vdirv5qbi9qmd8956i307dz0lp80bw5cqxgk4gr4f8hzi8w";
-      name = "libkgapi-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libkgapi-21.12.3.tar.xz";
+      sha256 = "1vbk8786mk1irm94bsm97270gnd149nz7w0zqnvwz499f72d21jx";
+      name = "libkgapi-21.12.3.tar.xz";
     };
   };
   libkipi = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libkipi-21.12.2.tar.xz";
-      sha256 = "0zlga9gy45cs3icx56gvq2nab7i3z5ydrmisa46vpca63w8swmys";
-      name = "libkipi-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libkipi-21.12.3.tar.xz";
+      sha256 = "0w2kwi6djwp8mhmpfrr16v8fgmwjmsc89rcwpfhgii1p68xia8gc";
+      name = "libkipi-21.12.3.tar.xz";
     };
   };
   libkleo = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libkleo-21.12.2.tar.xz";
-      sha256 = "0vqgycmj2v91car7ckksnjxbq3b5nzk31p4x3577dgck9jmi30zd";
-      name = "libkleo-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libkleo-21.12.3.tar.xz";
+      sha256 = "19q128ldi0aspy7vc03r54vrf7wz7l1181x9pbmax8340nbnaz7l";
+      name = "libkleo-21.12.3.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libkmahjongg-21.12.2.tar.xz";
-      sha256 = "10fgk8nhcr3rbdnh8az46jvl6w6xankdxzw4djj3qs4dpkl52vk4";
-      name = "libkmahjongg-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libkmahjongg-21.12.3.tar.xz";
+      sha256 = "114viyqq7zlwsdnm96iyyvj8ma4p06m69hs641yv42xlbkspwbal";
+      name = "libkmahjongg-21.12.3.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libkomparediff2-21.12.2.tar.xz";
-      sha256 = "07yzzc6ns1yx92gpcvhnxw0xna6ly1j4l4lx1rbw3d94z796694z";
-      name = "libkomparediff2-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libkomparediff2-21.12.3.tar.xz";
+      sha256 = "1j93lf9adyw581a9i8kc1pj6vadscibw49wvwfs750f0kxn5p0d2";
+      name = "libkomparediff2-21.12.3.tar.xz";
     };
   };
   libksane = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libksane-21.12.2.tar.xz";
-      sha256 = "1iksfjwkibn1i8n541nngalrp8krc94qy9in801q10d291clwz9i";
-      name = "libksane-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libksane-21.12.3.tar.xz";
+      sha256 = "0ci2284ysh4q8sbhqcg5bis2v02bp5x64h8n0qik14yy24x852zg";
+      name = "libksane-21.12.3.tar.xz";
     };
   };
   libksieve = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libksieve-21.12.2.tar.xz";
-      sha256 = "03aaqqb5g9iv49crrf7zbmsri8jjszn5wfvmcw559swalmmyzb4i";
-      name = "libksieve-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libksieve-21.12.3.tar.xz";
+      sha256 = "1li9cc5y6xbn4m4qa21qmsjd4xzshp67mxwh2nvr17mfs8ray7vd";
+      name = "libksieve-21.12.3.tar.xz";
     };
   };
   libktorrent = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/libktorrent-21.12.2.tar.xz";
-      sha256 = "06ak3bsy5x6a0r3l9hbfih9m41y3l357rpd42x8qp08djbs11xbf";
-      name = "libktorrent-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/libktorrent-21.12.3.tar.xz";
+      sha256 = "0i976al9bsc3gbplqbxkxr03sdhxv3yzjlfkdaghga8fkihzkkl0";
+      name = "libktorrent-21.12.3.tar.xz";
     };
   };
   lokalize = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/lokalize-21.12.2.tar.xz";
-      sha256 = "1x6sb1fw0fqvk3vg299xvih1v2xm9hviv5h1b624maasw071nfyy";
-      name = "lokalize-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/lokalize-21.12.3.tar.xz";
+      sha256 = "1gzfiajy377kx0iar85z72zqxh7y9vhp1hs03zzqymazawm9lqnn";
+      name = "lokalize-21.12.3.tar.xz";
     };
   };
   lskat = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/lskat-21.12.2.tar.xz";
-      sha256 = "0v16rg6d2l41xgkrkj8ibh5a0zjyb4jn7am6rbgl6k9g9mfqwdx7";
-      name = "lskat-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/lskat-21.12.3.tar.xz";
+      sha256 = "1cfs1lfwgxwpn2g56y7jb2c6ijd81bi8ba8ap0yyx6nhv6na072b";
+      name = "lskat-21.12.3.tar.xz";
     };
   };
   mailcommon = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/mailcommon-21.12.2.tar.xz";
-      sha256 = "01kirl4lk1xq7y474438jv0av3ccg18krlchllcigd9c0vcp67qj";
-      name = "mailcommon-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/mailcommon-21.12.3.tar.xz";
+      sha256 = "1zi8zkhv9g4vsylqzjm2wr9v6b20irfxhf4q467cmpqqrqpcp3af";
+      name = "mailcommon-21.12.3.tar.xz";
     };
   };
   mailimporter = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/mailimporter-21.12.2.tar.xz";
-      sha256 = "1ng8w4byq4iiwfzh4acl2glndlr7r9hr62qpj10kpn4fi0qblakb";
-      name = "mailimporter-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/mailimporter-21.12.3.tar.xz";
+      sha256 = "0lcr9zzdf16f82spr9x33jnzr23sx7xk2zvfpzdki3b5jxvapnsk";
+      name = "mailimporter-21.12.3.tar.xz";
     };
   };
   marble = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/marble-21.12.2.tar.xz";
-      sha256 = "093drig77dyxwfavx30h2nzdqkn52h6pjn54j7fnwygz4742qv7n";
-      name = "marble-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/marble-21.12.3.tar.xz";
+      sha256 = "0v6qd9cl6g8k55mjq2lswsfcxzf88w33nlm1193ps3ac0awjaaa4";
+      name = "marble-21.12.3.tar.xz";
     };
   };
   markdownpart = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/markdownpart-21.12.2.tar.xz";
-      sha256 = "0g7j15s15blqr0lfagmhvxxggdplvmnkf8g2b9ysjkrr49lgk7b6";
-      name = "markdownpart-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/markdownpart-21.12.3.tar.xz";
+      sha256 = "1drvjrvmd2c36xj3x7kxb7lvk23cmaw8mi976pdfnxn5pdamv6wl";
+      name = "markdownpart-21.12.3.tar.xz";
     };
   };
   mbox-importer = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/mbox-importer-21.12.2.tar.xz";
-      sha256 = "0qakmg86978zjm2m98602zbaiyiryrmlx2vk93yyv5xg352gphjb";
-      name = "mbox-importer-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/mbox-importer-21.12.3.tar.xz";
+      sha256 = "01bh0yzv23vkicc7lj217rp8c36kyyjlxmkwylss3hakr4b3afan";
+      name = "mbox-importer-21.12.3.tar.xz";
     };
   };
   messagelib = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/messagelib-21.12.2.tar.xz";
-      sha256 = "0ln473gdwsscjpsh50h2cbazxbc8qy1mmll9lsfngfw1qq49dwsp";
-      name = "messagelib-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/messagelib-21.12.3.tar.xz";
+      sha256 = "0xrhnkahqirsz37lbvx505ll7bfhr25lbq89yqq81bxbzkbvamsw";
+      name = "messagelib-21.12.3.tar.xz";
     };
   };
   minuet = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/minuet-21.12.2.tar.xz";
-      sha256 = "050pmw3srfb800h91x6pqn1vz7s6458w94r2innwc1j04pr8jaxv";
-      name = "minuet-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/minuet-21.12.3.tar.xz";
+      sha256 = "0r68z3j0j2gbwzj77wvsx1idrfkagj0pjai9j7fbqa0r6q833flr";
+      name = "minuet-21.12.3.tar.xz";
     };
   };
   okular = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/okular-21.12.2.tar.xz";
-      sha256 = "1k0bwyhk73gshc7f0j6mply2m9ykfd07mhkxwnzj874sby5rxhv9";
-      name = "okular-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/okular-21.12.3.tar.xz";
+      sha256 = "054rzdqsqkjx2sncyfcnfdvm9bp45sdw3rycmpzicnwpn5j4hcb3";
+      name = "okular-21.12.3.tar.xz";
     };
   };
   palapeli = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/palapeli-21.12.2.tar.xz";
-      sha256 = "0v5456hm56c7f9d49l5zjql6f4ap72wmkf8in8s95lqmpn42dl17";
-      name = "palapeli-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/palapeli-21.12.3.tar.xz";
+      sha256 = "076igql89sx55hfxjb79248ih4cjbkr1s1jnz46y3dk793rscm8g";
+      name = "palapeli-21.12.3.tar.xz";
     };
   };
   parley = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/parley-21.12.2.tar.xz";
-      sha256 = "1cwnlv57yqjm52i0jwl33pz4h9h448h0ljrg598ghby8p3b2i5w7";
-      name = "parley-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/parley-21.12.3.tar.xz";
+      sha256 = "10hv885l0gz5aymf72f42bhkncfarj768nb12q9fxqk4x5rviiw0";
+      name = "parley-21.12.3.tar.xz";
     };
   };
   partitionmanager = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/partitionmanager-21.12.2.tar.xz";
-      sha256 = "0rr7ic2ivm7lp3lj20b8rfbx1sr91s24fzxfzfwnw9znl9vj410q";
-      name = "partitionmanager-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/partitionmanager-21.12.3.tar.xz";
+      sha256 = "0x0k3vsbngcb7kvcgqj2w025fn9xvfd2232lx51xfar5r3jb7h1p";
+      name = "partitionmanager-21.12.3.tar.xz";
     };
   };
   picmi = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/picmi-21.12.2.tar.xz";
-      sha256 = "0qp8b1di3qnv4xrnpcmyi6myrrwzdlijhvxmacx4ijv7b7wlg4r7";
-      name = "picmi-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/picmi-21.12.3.tar.xz";
+      sha256 = "0gk1yq5ac55k6lxbxszxpd393fb9k6yphisb71lx2zv9gchl44n6";
+      name = "picmi-21.12.3.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/pim-data-exporter-21.12.2.tar.xz";
-      sha256 = "0m4dq3x5kbncnvixjigb85j6siws6q600piw53qabiwd6w6rp1xy";
-      name = "pim-data-exporter-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/pim-data-exporter-21.12.3.tar.xz";
+      sha256 = "0qcwsbb4zsjgc15fhq9pp341wwm35y9v1lq8gnpjdsvfq2pczq5q";
+      name = "pim-data-exporter-21.12.3.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/pim-sieve-editor-21.12.2.tar.xz";
-      sha256 = "1cpazs6q6hv15ib6isif5syvpywxfdi7d3w8vc4pnfj94wkcq3gm";
-      name = "pim-sieve-editor-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/pim-sieve-editor-21.12.3.tar.xz";
+      sha256 = "1gp4gpagv6pfiy6gyfh14z1rb16iqm1npmngw6ybjlhh6d424n90";
+      name = "pim-sieve-editor-21.12.3.tar.xz";
     };
   };
   pimcommon = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/pimcommon-21.12.2.tar.xz";
-      sha256 = "1pnhjhnjx98wdc3dg71qgjjj3dsncl56d86cagkk2spicv901p69";
-      name = "pimcommon-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/pimcommon-21.12.3.tar.xz";
+      sha256 = "1k1d100lr277lgwyzn2ssxsx9x2yd9nfd5657r95vmdnkh2qs517";
+      name = "pimcommon-21.12.3.tar.xz";
     };
   };
   poxml = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/poxml-21.12.2.tar.xz";
-      sha256 = "1zzw9jwwd5nx12ma2ihffj6nhr3zlpahnj8k0r8mxcyn99j51kyn";
-      name = "poxml-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/poxml-21.12.3.tar.xz";
+      sha256 = "19hrb75fbh102fw8ajflj4777s7hq7vxv6kbwjir6wzsvdfanwdb";
+      name = "poxml-21.12.3.tar.xz";
     };
   };
   print-manager = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/print-manager-21.12.2.tar.xz";
-      sha256 = "0xqv7f9p27maa0p20nc92g6240qkcin9s3dldr5b5q944hkkxizq";
-      name = "print-manager-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/print-manager-21.12.3.tar.xz";
+      sha256 = "1q9vv5v9hivm583hcx8qa7xik9yv4zicrd02abcsn6hvgwmdav8b";
+      name = "print-manager-21.12.3.tar.xz";
     };
   };
   rocs = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/rocs-21.12.2.tar.xz";
-      sha256 = "1mjrgh0vfc1kvici5m1dx23s1c7qpvfx1br91yglgll1biajzqlq";
-      name = "rocs-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/rocs-21.12.3.tar.xz";
+      sha256 = "1fgjap71qnaydar9q155is7vwjlkpa8wi1162dsqxr5ywy464wrg";
+      name = "rocs-21.12.3.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/signon-kwallet-extension-21.12.2.tar.xz";
-      sha256 = "0qfim8ahklwkixpxcm9sj1w49cmb0wz5r8np6ga3r2rh4vlqdxbf";
-      name = "signon-kwallet-extension-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/signon-kwallet-extension-21.12.3.tar.xz";
+      sha256 = "0sv0g50bxxd442ia7wzk2lkqwr8lsjxk5wm3zsskxhql851y0ybm";
+      name = "signon-kwallet-extension-21.12.3.tar.xz";
     };
   };
   skanlite = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/skanlite-21.12.2.tar.xz";
-      sha256 = "1fvdrzyvps0iqb9irnpdn81gmlmfhgfsfb5mg4i259sms6rq3h8m";
-      name = "skanlite-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/skanlite-21.12.3.tar.xz";
+      sha256 = "06dwmdjrss7cqqigg4rwsy5dya35577qwdaxj2jbvs2pkzp9rq3p";
+      name = "skanlite-21.12.3.tar.xz";
     };
   };
   spectacle = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/spectacle-21.12.2.tar.xz";
-      sha256 = "1966ynfdkaya1iydi2hfmcr13adk7agjr9ndz2hjrwgjagd29pyr";
-      name = "spectacle-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/spectacle-21.12.3.tar.xz";
+      sha256 = "155xin26lkjr0swb281afha906nqy2821lf2spmzzxa3xalzq3sv";
+      name = "spectacle-21.12.3.tar.xz";
     };
   };
   step = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/step-21.12.2.tar.xz";
-      sha256 = "1paq5wpya82s92zwacwbjf96nj52gy1sydk0gndyqi8jdplhlnps";
-      name = "step-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/step-21.12.3.tar.xz";
+      sha256 = "0j3w63bxj3b4lrfb0mnchlvsr987v5zwwjw5jrgvqidrhv1rh7dc";
+      name = "step-21.12.3.tar.xz";
     };
   };
   svgpart = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/svgpart-21.12.2.tar.xz";
-      sha256 = "15624gfcn85xkh6lypkw73iidnclprhqhpxrjggbng1x22jg2iwc";
-      name = "svgpart-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/svgpart-21.12.3.tar.xz";
+      sha256 = "0yg8sn1z9zfb7a6y61nw7vya516sfaydkgxh7cfwiz7sljl87z8j";
+      name = "svgpart-21.12.3.tar.xz";
     };
   };
   sweeper = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/sweeper-21.12.2.tar.xz";
-      sha256 = "07rqshzjjzqgmm5z0fn1hjd09prcwlnyilp3s61nl5fciby6m8fh";
-      name = "sweeper-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/sweeper-21.12.3.tar.xz";
+      sha256 = "1l4ag2nhy0da9z4nlf7fmjrim7pmwpm3m4v4y50jlpdv73f63246";
+      name = "sweeper-21.12.3.tar.xz";
     };
   };
   umbrello = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/umbrello-21.12.2.tar.xz";
-      sha256 = "07bp3rf31x5c1vag6pw0lal9b6zmvsqa8wg8a30kj7k9wabvjprb";
-      name = "umbrello-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/umbrello-21.12.3.tar.xz";
+      sha256 = "1i94l5hnn8hl0dgdq8sj5xm2vk372zfcnch9qvf9gcvhg08gdif6";
+      name = "umbrello-21.12.3.tar.xz";
     };
   };
   yakuake = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/yakuake-21.12.2.tar.xz";
-      sha256 = "1xkdyn944ga1xvwbbblnffvlnwgypspr909yvdy6xf5j0qaldsdk";
-      name = "yakuake-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/yakuake-21.12.3.tar.xz";
+      sha256 = "10mkr8svkjf2s023mf21cil2c5v986s5b2yp1hm0fzdgmawpwrh9";
+      name = "yakuake-21.12.3.tar.xz";
     };
   };
   zanshin = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/zanshin-21.12.2.tar.xz";
-      sha256 = "1ilgswm4jbjk1mbvcrdi451f1w4vwx3ah6y32a3y5a9blbh9bh6c";
-      name = "zanshin-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/zanshin-21.12.3.tar.xz";
+      sha256 = "1cwawpmx5hc60zkdkyh484lp3bwiipn6c3yh164gzw769vz9zr71";
+      name = "zanshin-21.12.3.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "21.12.2";
+    version = "21.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/21.12.2/src/zeroconf-ioslave-21.12.2.tar.xz";
-      sha256 = "0b59npqhmf3yvp9x0jm29bwzlyl0vm9l56jlsgwgiq7pwis5njwd";
-      name = "zeroconf-ioslave-21.12.2.tar.xz";
+      url = "${mirror}/stable/release-service/21.12.3/src/zeroconf-ioslave-21.12.3.tar.xz";
+      sha256 = "09jmf233njbqam1swzvpzfgdplpjzdx48vjy6kcpmjvg2qlm7i2l";
+      name = "zeroconf-ioslave-21.12.3.tar.xz";
     };
   };
 }
diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix
index b0b1718c87b57..8ecb1cf1d01da 100644
--- a/pkgs/applications/misc/bottles/default.nix
+++ b/pkgs/applications/misc/bottles/default.nix
@@ -20,8 +20,8 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "bottles";
-  version = "2022.3.14-trento-3";
-  sha256 = "0wdqj9l69a9pnray2zcfgl2yw0hmrh23njbgwgqccimch014ckdq";
+  version = "2022.3.28-trento-1";
+  sha256 = "1mpvym7b88pb0xxij32arj31q5m6b3z47p8zv9njvkfs0151b2v4";
   # Note: Update via pkgs/applications/misc/bottles/update.py
   # mostly copypasted from pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
 
diff --git a/pkgs/applications/misc/gnome-solanum/default.nix b/pkgs/applications/misc/gnome-solanum/default.nix
index 8ad1267afa932..e7d2489bdb540 100644
--- a/pkgs/applications/misc/gnome-solanum/default.nix
+++ b/pkgs/applications/misc/gnome-solanum/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitLab
+, fetchpatch
 , rustPlatform
 , desktop-file-utils
 , meson
@@ -27,6 +28,15 @@ stdenv.mkDerivation rec {
     sha256 = "0cga6cz6jfbipzp008rjznkz7844licdc34lk133fcyqil0cg0ap";
   };
 
+  patches = [
+    # Fix build with meson 0.61, can be removed on next update
+    # https://gitlab.gnome.org/World/Solanum/-/merge_requests/49
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/World/Solanum/-/commit/e5c5d88f95b0fe4145c9ed346b8ca98a613d7cfe.patch";
+      sha256 = "j84P9KzMr0o38u4OD4ZPst+yqw1LCRoa1awT3nelFDI=";
+    })
+  ];
+
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
diff --git a/pkgs/applications/misc/pdfslicer/default.nix b/pkgs/applications/misc/pdfslicer/default.nix
index 31bc471401592..ed20f460a1677 100644
--- a/pkgs/applications/misc/pdfslicer/default.nix
+++ b/pkgs/applications/misc/pdfslicer/default.nix
@@ -24,6 +24,12 @@ stdenv.mkDerivation rec {
     sha256 = "0sja0ddd9c8wjjpzk2ag8q1lxpj09adgmhd7wnsylincqnj2jyls";
   };
 
+  postPatch = ''
+    # Don't build tests, vendored catch doesn't build with latest glibc.
+    substituteInPlace CMakeLists.txt \
+      --replace "add_subdirectory (tests)" ""
+  '';
+
   nativeBuildInputs = [
     cmake
     gettext
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix
index d7969155370eb..675df5d5ba3ed 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@@ -26,13 +26,13 @@ let
   };
 in python.pkgs.buildPythonApplication rec {
   pname = "pytrainer";
-  version = "2.0.2";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "pytrainer";
     repo = "pytrainer";
     rev = "v${version}";
-    sha256 = "sha256-i3QC6ct7tS8B0QQjtVqPcd03LLIxo6djQe4YX35syzk=";
+    sha256 = "sha256-U2SVQKkr5HF7LB0WuCZ1xc7TljISjCNO26QUDGR+W/4=";
   };
 
   propagatedBuildInputs = with python.pkgs; [
diff --git a/pkgs/applications/misc/trenchbroom/default.nix b/pkgs/applications/misc/trenchbroom/default.nix
index 8a7025060607f..a49fbf71191e8 100644
--- a/pkgs/applications/misc/trenchbroom/default.nix
+++ b/pkgs/applications/misc/trenchbroom/default.nix
@@ -21,6 +21,19 @@ stdenv.mkDerivation rec {
       --subst-var-by APP_VERSION_YEAR ${lib.versions.major version} \
       --subst-var-by APP_VERSION_NUMBER ${lib.versions.minor version} \
       --subst-var-by GIT_DESCRIBE v${version}
+
+    # Tests don't compile because of vendored `catch2` being incompatible with glibc-2.34.
+    # Also, no need to since we don't even run them.
+    substituteInPlace lib/CMakeLists.txt \
+      --replace "add_subdirectory(Catch2)" ""
+    substituteInPlace lib/vecmath/CMakeLists.txt \
+      --replace "add_subdirectory(test)" "" \
+      --replace "add_subdirectory(lib)" ""
+    substituteInPlace lib/kdl/CMakeLists.txt \
+      --replace "add_subdirectory(test)" ""
+    substituteInPlace common/CMakeLists.txt \
+      --replace "add_subdirectory(test)" "" \
+      --replace "add_subdirectory(benchmark)" ""
   '';
 
   nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems ];
diff --git a/pkgs/applications/misc/wlclock/default.nix b/pkgs/applications/misc/wlclock/default.nix
new file mode 100644
index 0000000000000..64b728f4ac9d0
--- /dev/null
+++ b/pkgs/applications/misc/wlclock/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, stdenv
+, fetchFromSourcehut
+, meson
+, ninja
+, cmake
+, pkg-config
+, wayland-protocols
+, wayland
+, cairo
+, scdoc
+}:
+
+stdenv.mkDerivation rec {
+  pname = "wlclock";
+  version = "1.0.1";
+
+  src = fetchFromSourcehut {
+    owner = "~leon_plickat";
+    repo = "wlclock";
+    rev = "v${version}";
+    sha256 = "sha256-aHA4kXHYH+KvAJSep5X3DqsiK6WFpXr3rGQl/KNiUcY=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    wayland-protocols
+    wayland
+    cairo
+    scdoc
+  ];
+
+  meta = with lib; {
+    description = "A digital analog clock for Wayland desktops";
+    homepage = "https://git.sr.ht/~leon_plickat/wlclock";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ nomisiv ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 35610f1537a78..c19bb1dfe8a55 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,8 +1,8 @@
 {
   "stable": {
-    "version": "100.0.4896.60",
-    "sha256": "1p7zggnhsz9gj3zil0nyas4ym5bd94vs0z6mdg7r1l0s0vrsaphf",
-    "sha256bin64": "07wavs9r6ilwx5rzyqvydcjskg6sml5b8m6mw7qzykvhs8bnvfh5",
+    "version": "100.0.4896.75",
+    "sha256": "1h60l1g340gvm4lz2lps6dqpvahpzn24hz47y2qvc6mavx9d6ki4",
+    "sha256bin64": "0nrrkgwcnqg4l8x1nk1rdxnv9xa0c24ync1yls7s9rc34wkk8sc5",
     "deps": {
       "gn": {
         "version": "2022-01-21",
@@ -12,10 +12,10 @@
       }
     },
     "chromedriver": {
-      "version": "100.0.4896.20",
-      "sha256_linux": "1d3g43s5adn1vs7iv5ccp0f376qvnvf67mhid7kxkysnqv55bxdw",
-      "sha256_darwin": "129vw1ablb6xyr7j30zxkh7n835wi82ksd8c5m11mmdnrmrcdabv",
-      "sha256_darwin_aarch64": "0zgnisvdvcc726q22jn1cyfg41zz1af5l3fy3m81jlfhph2ibbra"
+      "version": "100.0.4896.60",
+      "sha256_linux": "0q9ddwhccd0jmzi8jksxlfjavmm913c9bmb4lz1ahxplsnxd8z31",
+      "sha256_darwin": "0q0ikhf5pkbrqln91fklbbfmqi33nfcjdg5dm7zb66b4alxwwas9",
+      "sha256_darwin_aarch64": "1vf3s0gq61riqsv85pr6xj0c2afdnv1b2w4gp2bwlfq4ffkfq38y"
     }
   },
   "beta": {
@@ -32,15 +32,15 @@
     }
   },
   "dev": {
-    "version": "101.0.4951.15",
-    "sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y",
-    "sha256bin64": "0m1q85ai9pyam9anh8aiv7hyadam0hjkkhnsa6s05d82k8kz5rvc",
+    "version": "102.0.4972.0",
+    "sha256": "1aihdym7h8sd52wiybnrgjrd618f3yby4bpbkc26xyrl8gviz31d",
+    "sha256bin64": "0mb67cfr397aclkiy0v9xqga07c166qdylq257k2kmhj7df1gcvn",
     "deps": {
       "gn": {
-        "version": "2022-03-14",
+        "version": "2022-03-29",
         "url": "https://gn.googlesource.com/gn",
-        "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
-        "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
+        "rev": "e39d5251c25155b9dfdb96adeab31b795095fd3b",
+        "sha256": "1clr0f847rmwwpmsl9zv4q6rw1shn09my775666v480szpahj9pk"
       }
     }
   },
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 080fec91c1ca9..407bf2ba37534 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "98.0.2";
+  version = "99.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ach/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ach/firefox-99.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "e40a11afbb7a464eb7817457cf360ec2b4e0d77b8d5db5d7856c5b79cdb1425e";
+      sha256 = "86cf773e1637f17ce85810712c6fae9a2e5d9d7ee0bf7b265a30f4a469c87215";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/af/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/af/firefox-99.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "8d0570e82ec73708933cbe2cacd53d89503cdc7d1e97cc57edaa066960340a1c";
+      sha256 = "72e525fee2e85110b77057178e77ddb277dd9c58609befbad04653e40cba6842";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/an/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/an/firefox-99.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "04403b0d68911dde99880c76d1e87f1315d1c463a63711e37e0f40abbfd9c2eb";
+      sha256 = "373700cebfc90fad01f5add0d5a0ff49ccab3ce8286adf3b3c91f2d69c51a18a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ar/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ar/firefox-99.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "57ab64dfa19fead2a828333456921465cd77e37a36d2030f81b7c022062fe215";
+      sha256 = "50dcb4b8bf1a6df6fd17975c9f5c3a2b54b23697191c853d48e08a01429ea102";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ast/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ast/firefox-99.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "3dfb8f3c288e6c910d929da7c0228c52c490e33a1fbc99ce90c231e81cd9896d";
+      sha256 = "947401a336c715809de254d7e6381b902dc663e350bc1f89bf4ad08819a1f811";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/az/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/az/firefox-99.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "b5fc1a8d7decd2372026f9e4d4d8bb4d5fd839b165168f01e08a9641c0d7f92e";
+      sha256 = "87115f184011114f54110b3dcdbe2c7833a90be44f38294395274971710f6162";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/be/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/be/firefox-99.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "8b1fffc493c20318533879ecf9a006d0215d7c6f2323134fadecdfea68aaaa6f";
+      sha256 = "ea0844501b10ece23edc98781a2428de1f9a1b012a06c062765b1558c0d66706";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/bg/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/bg/firefox-99.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "852016bb71423b058a195d1b8631331a6da144a20c0d74b641d6189c93730ad5";
+      sha256 = "9cf618bfc8f46e9ec787274b320879d56bb1437685b3a8d057def285a1ab3621";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/bn/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/bn/firefox-99.0.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "748e7303d01ca41fed55dc31d0bb57458c69180499bb5915ca4c835f7fdb56c4";
+      sha256 = "c41c3fd72734b6f81e4b92682a2b004058dab570e29721d227cc32719c5d7433";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/br/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/br/firefox-99.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "efc2e20d5201621c76411ffc3c7df227c9462bb6994f7ad19d735c986c362aa1";
+      sha256 = "627f1cf6109a6c529cabd537ac47a4ba907b7f4a2c2b565f715535d08696d8f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/bs/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/bs/firefox-99.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "adb507af1a64e2c72193942b2c3a839576ca7d493541bdfed06b0f838f3bef43";
+      sha256 = "283f229ea9b0430613988fce636ee11a91d73e1e5caba2671965b57df39127ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ca-valencia/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ca-valencia/firefox-99.0.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "1cb7d989fcb1ca726d022a2e20523427d9aa0718d2129cea5102971624edff61";
+      sha256 = "1fb7e3474af461ea33769c8ac2bf3f0c7d6376caf7d8de549f11987fd83be198";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ca/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ca/firefox-99.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "0d746e8c8ca233d4f4161134f920a44e1a3593a2277101e20184087f76a443b5";
+      sha256 = "68045b6c2fae1024fd85c759e3da18857a7ab335da055c105c428244ef98127c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/cak/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/cak/firefox-99.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "fac629e27bb9e60fef81fa58268f9367a95af59b299a628ffe692731fd5ae4c8";
+      sha256 = "b6bd14470ec62436e99d72097e7f82566cefe70a2a0d57be729b9e3665070004";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/cs/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/cs/firefox-99.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "7f6f30ea9afac44b1d1fde8abe2701f8f83b3014aa1c98fba1e2c4ae6c841140";
+      sha256 = "ad005d5e99575a0773882f933344453a73478e58c7d48769735a69ed39ca59f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/cy/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/cy/firefox-99.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "63c2b0bf442365c7db1cf96f192db016c4ddd4233a32190d657779a254871a2f";
+      sha256 = "6f22fe5b3bc4649b4f73220530571140d94291f69c4fd7c512b88a3471291e3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/da/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/da/firefox-99.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "f7d18039814a6310ce4a4e37d10d131639868a6f5ae85c4718ca1f9ceb90ae13";
+      sha256 = "2b1b37cd8e270f410a1bfa1e0e04dfb5acb17853d4f9a184eb52655b79f9d29b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/de/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/de/firefox-99.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "736f10e89507455708e40c9cdbd093fb1cb802ada7dd5d3e0d612cb0e11db096";
+      sha256 = "a115c9b1a29baa75579dd6fea40f7f498177dba0ba901f4c6de35a07fbcbb9a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/dsb/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/dsb/firefox-99.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "50ca85b163011ebdda69be8772a76ff4a912653a03d527784b18bbffd7c63a16";
+      sha256 = "ecdf01b499c393e06caeba03be7e3c89303a3f770859f228155bceb8c1a9c49b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/el/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/el/firefox-99.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "4b3a28670c6a7577f65dba7f857e8c68009a8d1e80089707d8d830e02a5f7fa3";
+      sha256 = "0205616cbfa802c67abff6cbb8e23e26b45fb8b224b5d7c02dece0ff3da4b924";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/en-CA/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/en-CA/firefox-99.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "f3a7c9de172b6ec0673d2600537ab9265cf3cde3e2fa614424e9f4c08986eb7c";
+      sha256 = "764ed326f89e0e3ef0cab0252cbfafe8b1b739268f787f5893d1110e4cfde4b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/en-GB/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/en-GB/firefox-99.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "49f044b0b5f841d5e42b9c6275dc7c78e2b2f903aa28f0d6a02a25a41d781d23";
+      sha256 = "dcfe8088136427476353c2797ee9ca159414f60b09fffe126eeb009ea041ebdd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/en-US/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/en-US/firefox-99.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "07c5f3dad0850a92d5c609278fb1fe682b2562fa55e6733c09a6b4da7373bfcc";
+      sha256 = "b6d895047c8911a49d944f78f710718091957f0057344cea735096ab4a8c07d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/eo/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/eo/firefox-99.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "98626ef3b514d1ddf0d9d530ef7b3ac8bb504717eb633f036fe9cb9437d8ea56";
+      sha256 = "acdf7d24ac1c91802938e8151c2876765532d935c3add9028a15ff47e0dedb38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/es-AR/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/es-AR/firefox-99.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "86a57a29b086fbc1d59731f94b792d1116a358e4735d9a8d08c022a2d5c7d0d6";
+      sha256 = "6d350750f744ff633168008d364b70a07a3becae1eb102c73bd2ddb6ddd8fbf5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/es-CL/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/es-CL/firefox-99.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "834bbbe0388631cae1e87e464c0b4e0151c37341828d71dd99fccc2d56c179c2";
+      sha256 = "9a4720bdf50e13bea6c98ba2e48b85dcca13683594e7b4d1e280649ac069ac3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/es-ES/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/es-ES/firefox-99.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "590efa38b4a374ccac89128a0e84de77492f1a8702e70b3b13d9a456575963f6";
+      sha256 = "cb78b97c05002db97bd15038b2c34f582199934302c1157912f95a7304112536";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/es-MX/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/es-MX/firefox-99.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "f64ac621daa5f891541d836727d91cb56d5eb8db6093aa7f83af19adfc49ffc9";
+      sha256 = "10965923df9ed49c0dbe7a00154f70eb7fcc2254de77d0eacb115a0466881dbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/et/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/et/firefox-99.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "08374c6ae7b8eff3b6ce748c87f18136c86f73abf6238383ba3c4b1555f8a003";
+      sha256 = "dafe509497714b9fa6d97ff279cb0f79b8ab0ddec1a1ca0f538301875acbf22c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/eu/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/eu/firefox-99.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "3ce288c26201feca071bfd56f66fca69da7a68b3a468405ff6a665cb666cd799";
+      sha256 = "fa3098d1dc3fe3a4775fb431465ff9f1d6bea286cd0753afe373b907a09a7a41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/fa/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/fa/firefox-99.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "3bfac0751b251dbd3ddb253973bb1ad7afe58f7cb824bef59d4f6c7dc5acec78";
+      sha256 = "cc7374de92c433d30e98f01e0cc742bb0fe3ec90894953423ead3e756b2377aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ff/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ff/firefox-99.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "2b962a0442a12c7f2dd7d2c716fbac0ad9435debf06d1c1e9f95fcb62fb90d50";
+      sha256 = "41765b0971f3185b0124726983de84dbfa6ce9f2018ba53cdb69703302ee50f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/fi/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/fi/firefox-99.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "705b21bdfa9826563042d0014a9225870c87b3351b9920cca35e203d1375f9b6";
+      sha256 = "b34ac17ab0e2aa8dfce3dbf4f3f50fcc748ad57cb2c5dcfc5026e74243df4b54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/fr/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/fr/firefox-99.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "e1d9cbb1c529508bb8262b0498506c30c7932b17a7d86d9b5877f44877cea60e";
+      sha256 = "62c1a24620ab6010c4a279d3e440e654fb446f8a8cd2c2906253d623d3d6a2a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/fy-NL/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/fy-NL/firefox-99.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "c1b40fb366281b9df839083af4aaaaa7a264e1ce380f9ffe46a2fe181bddd3f7";
+      sha256 = "34c6bd8a1400f35f970ba5cad69c32826550e3d429e63002a1c34ef5f9c0c98a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ga-IE/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ga-IE/firefox-99.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "466ff81e255bed9c03669c974581ee2cfc796e77456dea25af75adb501855c54";
+      sha256 = "0e4954e566f128fe93a970d41df9a05c631fc22fd500b7cae43559ba836c1bba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/gd/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/gd/firefox-99.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "0e1de18ab0b75b43ee8caff97c2963b7047f1000fa8dfdcc4e3fe87f29794c17";
+      sha256 = "1dd639f39a95a50d41a7759a43ac0eabea36e1ff80c557222d6b4e8dcf85701c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/gl/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/gl/firefox-99.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "56f259c9f2f13d3f366e921aae1fbd069f00d59131cd3a3b31cb0f3e16f2ad74";
+      sha256 = "ba2525bc4c25c74b0aaaa77dae6c05dd4a7519086d756d34fc462ea907840b8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/gn/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/gn/firefox-99.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "b532c79002184bb13a3f197b5c0faf4a24e0b71f737de31c242f9fd286f05aa9";
+      sha256 = "6566afd98454031eca6ad3020323b82e1a8beb20a0e1f1ceacd3785a6e53725a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/gu-IN/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/gu-IN/firefox-99.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "12ec5c968d852a7a72221373813fca48a4e524e552d22aca50ae99111a7128fa";
+      sha256 = "afc0da597d00fe408574e4036d2e928c644ff57857f6bf4b3182947e119cde73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/he/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/he/firefox-99.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "3c1c1222a4ffcac6679849c94da395440d417284a922cae16b5edd1cf4ba678d";
+      sha256 = "5ec824f60e9b8df7a570eae973489751a2167e423fccdf750ee9320b9a1dee2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hi-IN/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hi-IN/firefox-99.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "6ae96b87b251917d2c11684ae58ac3df54496cf047b115145a5f85cfb1575b9a";
+      sha256 = "6640405a9361c4f080b552a4da9757cd7b81030fec328a96793a7cc752e00371";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hr/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hr/firefox-99.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "4a77fb11f0d27a4abfc1426136d93404baaa730ffea2a31fe337f11ad92bcc8a";
+      sha256 = "75072debad6b291a051dc2af60a52554e9db3e5d87cc3fca2ea2974adfa3c3d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hsb/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hsb/firefox-99.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "725e2f719720c84ba06a28c5f025a16a951642c1102f7fe5faa41baede1b6a5d";
+      sha256 = "8ce2a5cf8e65d3d5de31105a7db1280c0379c77186af8deae17e6c23c6bd3edf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hu/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hu/firefox-99.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "4a128951a5466189b703fbf3055a9e65af64f08a7fcd979448611b91a63bb456";
+      sha256 = "595be31ce2c0671916bf8ad66f03e81bd8e53d7136d4e62d50fc7f250629bd05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hy-AM/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hy-AM/firefox-99.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "70e44a8105ef260b3e10271f1a9c36a5149a485130d5a1219397aff93500639a";
+      sha256 = "2a3bcd22400dfe87e6dfcb38b0d4e970a49b9b4386c3d7bb3598299fbdd06c6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ia/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ia/firefox-99.0.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "a121636fb2513557f8e7e0a1b30e3d855202db14f997437cc5a6d7863214d385";
+      sha256 = "d13f9cb95fc78bf4f744ada47f2758c61d85ed231b2195ea579635c2aca4c749";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/id/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/id/firefox-99.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "eccb423ef76aab7725cd21efda222ed63c030d494c294998f4e9837ecccbbf06";
+      sha256 = "b6e02073e442960c773a5b77f66d54685dc617f3f6c9ad085caa923e84be5b4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/is/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/is/firefox-99.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "86aac8ae944846967e472d6fd893c40ac988c25a2c2ee9af40485e216bb67b2d";
+      sha256 = "c6f45c0ea25b560e1f3f5a8f4c38d3732e7a944fbaf7ea766eef1a6162830631";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/it/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/it/firefox-99.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "f0ccf0977b3f3e05ed0d07980eca2179a808e0f62930690fb33f17b68c3bdca7";
+      sha256 = "adf2da8dce907f184cfbcad8ee7cc645fe707b0fb2ccec480f5baf503a03ed0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ja/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ja/firefox-99.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "217159ae769b050bf9ff1b04ed80ad85a384625e2ccbf0d9f98c0786dc2e6c5a";
+      sha256 = "6698d549fdc42794372a32d6a435ebb90300ba42594de94d9ffeaf5aca53002f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ka/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ka/firefox-99.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "c4aa9e994cad797afc081d2031296cac780e76966a7f231e6a0e3187d9e8aef2";
+      sha256 = "a16e4e6b86c9d1f62f6267417711a668d8899c2ed3414e32da13ac592bbc70c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/kab/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/kab/firefox-99.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "cc8333cb75f48ea82b752023162a270f18e33cbec610571624a38919737b00c7";
+      sha256 = "2ee4c463d31a388d22a4039365ed18103b4b56a3b584d32ebe393cfb956b34ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/kk/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/kk/firefox-99.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "3482645b2581284503f72569caedc750706c439346917c07673ed0a27b0bbf36";
+      sha256 = "f4d9a8d6e6fec7f38664dd3c1fa9512dcf734481ffa20029295a86c4944c7b23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/km/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/km/firefox-99.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "b70fcfa2b4b4bed16d4fe8af2d57d8b7a4af346f321ece425895c10f7ac058d1";
+      sha256 = "04fd804bbd428f8441ff1900d356104160dda63ac5c6bdcc54c5fd6ada23185a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/kn/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/kn/firefox-99.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "63550bf8572312f3c69c90f65de89423fc0ac926736723be3034d5d441ceb1e4";
+      sha256 = "ab8a5e9c60a9bbe1d44ad4c997491e7fed9cdfe7a2c83dbfeda60d7f1a90e1ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ko/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ko/firefox-99.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "de17cda5324ca6d179b9d576b62cde0ed21718b72896b161631513b654540cf0";
+      sha256 = "bf741c3962de3277a00c5aed83e45af14743767000365153a28cbc558a6778d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/lij/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/lij/firefox-99.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "67cafe6a9f0c01aadb1fb55afe273fb58e4baeb38be2b472ed90a83c72b07ed6";
+      sha256 = "bd40f1f0126d60e539baeb2264b275a0983d83ab56dd8881c838f1d40a7299b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/lt/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/lt/firefox-99.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "135773dc11e691c20f20b0a1d37e2b25d92062c573846127c113896708e649d8";
+      sha256 = "29f3ea64fbe0e8fd4c53789de1819c29d497688180c5573fadeedd48182d5044";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/lv/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/lv/firefox-99.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "44bfaf12e5d34e1b8e281d00c7d9a26c2d0aa0a8ffbd74df9a5026e15ac12b66";
+      sha256 = "f1a6dbf6fb72733e681c000c1ee96b895ad28bd14925185c1f1ba4445e589513";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/mk/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/mk/firefox-99.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "94d7db6bc2ba9de25207a058d29d8abc57e967dfaf59c3388438953098da9580";
+      sha256 = "bc8826ad43d8c51379f4479366b1c52635c69660b7bcc3bcb9897e6be15fc370";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/mr/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/mr/firefox-99.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "e2ef6708ed116e40d3cc776c483d3cd42c91988673b91d2d29f4da8ea996f1c0";
+      sha256 = "7ef006861e0b17df49a08ebd877e91ea78d741c6966569df95554b813d0ad615";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ms/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ms/firefox-99.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "e376a479d170ff881d6de21f9c03ffc7a4968fccde7347e9fa261de7bb11e427";
+      sha256 = "2ffd658538429e5dbee797c12a95f5c294622bf110a607bf5cb0219680bde05b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/my/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/my/firefox-99.0.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "a1143bce18aaadd340b69403f064574664f202765ee5a8553ac6d3372ab33134";
+      sha256 = "0d533237d125a3c73d36d8a86d58026daf8338df3034cef661510c387109b774";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/nb-NO/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/nb-NO/firefox-99.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "eebdd022202cb7140db46995a3925c990e614233f3e15b850e5176b1f2c07907";
+      sha256 = "aeef86125435a840bfc23c23d9648e1d49a51079bda1e63276495512c8164391";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ne-NP/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ne-NP/firefox-99.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "084a278fe0b67a51126518d9aa62cae7cf78d96e3f6cf5b191f136a5c20acf84";
+      sha256 = "30618d33a48ac7cf990e669ff009b36d4ca491f266fb7d917ad64b213d0e47ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/nl/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/nl/firefox-99.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "fdae25ccd979bdb5b4bb23f4e9e82e432df98059d82732ee187f37c8cb3547d4";
+      sha256 = "fa30128a44619961b3144b338612b8677bec82c5bb4a3ee37dfda9bc0d54f5bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/nn-NO/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/nn-NO/firefox-99.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "7ec4c099c7a282a5b38df9a124ea6f2ee3a1704746aa308431aa8c356a57bec5";
+      sha256 = "96e31471625624ab0bfeecd2abec6b78bc4414a451ae3b5488ff09fecfac23d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/oc/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/oc/firefox-99.0.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "7f6d8ed3a7511d6af408c47c626a3e141425925df364f26a622a088491d7fe5d";
+      sha256 = "3802cce7288bf14780f78e117c528324611683dc1e8bf4db7f4c875958dd5610";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/pa-IN/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/pa-IN/firefox-99.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "9fa3699918286b6f9f8829beac8cd45e59f35f389a09e0cbb34dc393885ec8f6";
+      sha256 = "177241ad04a1d18154657e753c7058e709d260af767bc53d786f5ca76ff2250a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/pl/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/pl/firefox-99.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "e2ebf0346fb5b626a048a720782e325eefd04f1fe62de5c57826ebdd3ab1bec5";
+      sha256 = "1691326be5d01826c8ebd207a2fe3f00021a8edfcf3b44ab7f28024466118ebb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/pt-BR/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/pt-BR/firefox-99.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "dc79e634319ffc7221245e2a081cf6bfc15ddcd4bd8bf110d5dc15732aaab33f";
+      sha256 = "6b789a430c5c7b80f230fff69b20429a9329deb6c30f174882d71c80e3af9e02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/pt-PT/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/pt-PT/firefox-99.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "f94ba01eca76939d1ecbfccfd9647c96244effb080df98b4e04d3edfd80ffa48";
+      sha256 = "e45567074b0573a3023e6c70241e0203cb8707e4d8c8a250d42aa29f207a969c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/rm/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/rm/firefox-99.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "6b27aee9330a94e659da34f17213522687859263ed8500daf1d62fc496cff033";
+      sha256 = "8e4ca7411436f910d6a2c271924fd61deb295081d7a1218cd19023635f76b18e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ro/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ro/firefox-99.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "b6029f72497173e8aef444cb42437d6035354fe4a2bfe6359c50eefa4d6e1850";
+      sha256 = "9df7c85feafd6611c29c38ca25371b224e36fbbd602e74a986c26ef1f6f7c361";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ru/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ru/firefox-99.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "73cbafa190a5083cfeba8ad0971d28eaaa228b9a9345ddc72d4f5d6490ebbad1";
+      sha256 = "61015fdab4d7791a2eae09a99440df7a65828a5092d04a7376049dd7f1b5c062";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sco/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sco/firefox-99.0.tar.bz2";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "dd2d86ddcd270d2bb58c7152d15072341460a09b2da1639a76ac70afc9a714e6";
+      sha256 = "0481eec6bbe61c586c0a14416d7fc03df661432f2e2ad10c342fd6f6a6132e29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/si/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/si/firefox-99.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "0cf0281b2d082b3861947e5002f843df050586e96027ec30acba2913ce588daf";
+      sha256 = "1443ac2cfcea8fc577e341efc3d87406c01c94af9fadcf9672fd5283794d0107";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sk/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sk/firefox-99.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "8853372fdbe0834f6322e2e1c03d909b2c21f60496d7e679266dfc35e5835191";
+      sha256 = "4ffc688b2c38af18d28c7110f51a7a910b6671612b3a9ab657b579fabf9fb7f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sl/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sl/firefox-99.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "ce97423a4ad380fb019b3e4c8d57a44bb15ca0b0afc7778a10fd23cb9382c143";
+      sha256 = "7eba5fe498e694650047a2d5a9bcd0ef12f65b32c554ddb64fe79ba16a097927";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/son/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/son/firefox-99.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "468b642210c8c52ef5a8b91ddf81b9ff9c25768d7b0481f361e7c95861dfa5d0";
+      sha256 = "3dec0e49c906b0923229789fac38927a19e43c27a7a6004223f50bf267fb83e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sq/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sq/firefox-99.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "8a079436e4be7ceb82b56f02d50054066906b2f819b787ba964d20c64ba731d1";
+      sha256 = "c2f9c4ad474223a18b11f8b0f7453b0e2a8800030ae506c7c6aabe56440e9677";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sr/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sr/firefox-99.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "e9f0f1a8d6bf3bcb6df32a27560e952e3373d712cee08fb97e1c41b76052d370";
+      sha256 = "87d70164fa38d2c8ce13bb7af9c86c84d546bba9e2bd9f37ea345664edb27a76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sv-SE/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sv-SE/firefox-99.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "eb4b4092f1f667661afbce19e0d3ef75301976689f1ea2ee11104d11fea2ddd0";
+      sha256 = "e6a167e9b9e10232ca338560f80eeeedc4b32854893905e97881102c718f8ef7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/szl/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/szl/firefox-99.0.tar.bz2";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "29c9fcd787fafc93480fabb59573dd500d557847079f032a6f3ca6e9c4422c80";
+      sha256 = "49ca939d4a7f714ae4318a13c1229c1f6f5e8b903cba2a31f4ebd98469f6bb14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ta/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ta/firefox-99.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "f07b8a79048b55d6fd8f7d19858ea2f1b5f53bde782c65ea7fb3f34d9cd5ac40";
+      sha256 = "5f8951a89a1dbe81d5327597373738a87bc5316601714ec759a4dd9d020e7ab6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/te/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/te/firefox-99.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "14882f8a3c425dd512c37f80fd45bdf9d34c4d7163454e1533c6306713935d36";
+      sha256 = "ad4b82cdacbd019a06acdcc7f76385edcd167efa8127a5bb6456ba53bc879298";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/th/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/th/firefox-99.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "c91bb2249cd2b22ae86b1b51fe6c34062a4da7772eab97b1e39915a2c2782488";
+      sha256 = "cbd3ecc7e51e35aad4ab16f91e014e502005903b2a1d2fc3bebcac987e033ba3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/tl/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/tl/firefox-99.0.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "1c6fe06f19821a7a77a26bedf38ed3fea20561df0589c672027b2108e080e6b3";
+      sha256 = "b0466b793df5feb08eb8ff8f53b70e7d58c56602acf6c7b1dc1c97c96a881348";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/tr/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/tr/firefox-99.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "c06881993063dcdf6fbfebe139f9fdafe2ca37667375683ae85497603517b5a0";
+      sha256 = "9ef3e70378c059075017ab8e3c104651e4845ceb6a981d9da85278881ea05b18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/trs/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/trs/firefox-99.0.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "fcfd9120933339006f1868b27e0fff1d60f562a3d11e826bbf9996f69d4256ae";
+      sha256 = "c31471dd116db01c888753a77bdd3078a84ad2bbc19d93b91e54ab79fb4b7de7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/uk/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/uk/firefox-99.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "01cabeeb98988d4478d381b34e7c0e6cde887d2ea83feeb349763ee454760924";
+      sha256 = "4fde8729334a29c38d8bccad9d6632b8ba99a4faa769ce34d59b748aded50a93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ur/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ur/firefox-99.0.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "db7de84fed953da53998ae6ff2456a02de833de22d13d1aa7e16f53d3bcb7fb1";
+      sha256 = "b1476c1b0bdbcc9cc6722db50f12b7fc92dcab3848478a184b6879a927e38d3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/uz/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/uz/firefox-99.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "9fe0fc4851f005160de9562123e48c19216cb013dcdd2b8bd2b745d7838062ea";
+      sha256 = "3efae069d67253c450de209a3b028910aa3a3d0c14aae259d8096414d86d6ab5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/vi/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/vi/firefox-99.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "e335f20bd5a63c2fa17ce15fdebe0c5af5c6787d37bd49ad2da156b450383ae3";
+      sha256 = "d781e5fd73bb219fdfeb9be8e6fc861886724c48aaa4bf480605e1d641ff1c80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/xh/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/xh/firefox-99.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "9cd953e87b70c979a8c03fde8c989f626a23f62a7d59be8796a09c8a8950127f";
+      sha256 = "1db80ed81fd431373338693ea81961089e0251dadeeaf9f4e5179b0f5abd657a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/zh-CN/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/zh-CN/firefox-99.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "2c7d059be4474164fddd349fc3f18d1f380af5f9ba82f8e01b04e2f18bcd09e8";
+      sha256 = "b0c1d1cb71947cdab88859e08c09910120a2117440c03ea29f1c2d0b40d29918";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/zh-TW/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/zh-TW/firefox-99.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "37b5a0275b137b0ef578591ccf5a54518bdbb449915f4ad50c276952a0bcccd8";
+      sha256 = "d4807ad378d61e01d8dcf53530deec5d4fad7b8d7df50f3df0918d2b591e6d46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ach/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ach/firefox-99.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "b3b734eb8d62112f7983e86dbd49d2d3be3ed6d2f80fd2d7bc189f12e03ab0b6";
+      sha256 = "79b90de5371b68c404db32c4498b4866b4ed6b10dbf58f9a2e4ebcc6d7b17478";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/af/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/af/firefox-99.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "fcf6a355f70392606ec2ed5853b1d14e8d5923fd92c10774c776c43e6c8a6cdb";
+      sha256 = "2a6f75faef4006c878b8a5156412a490c667dd970779d48a891b4d898c664e27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/an/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/an/firefox-99.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "388532ad380bf43c287ca3e7e29a3a6f97fbbc0e02c2ae5207ac07587c3faa2d";
+      sha256 = "613f776853c37115f610206f6769f36adff86ed3b5b46cbe81a2ccece469cacd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ar/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ar/firefox-99.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "178a38e6bec65a59679944fdd6882774d23bb15e62f2e697cf369742bc4c8196";
+      sha256 = "a436337365e0865801fab136f710cb3134dfcf93896cf59aa78bf28bd70bb5a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ast/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ast/firefox-99.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "5fa0aea769c7f7fba13168fb404f03b2cb8f6df5ab733054118df67015ab665f";
+      sha256 = "85a937e65ac45dde5235e85194c9764056fcbf531f53a443c849fc727bfc5b8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/az/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/az/firefox-99.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "62816d95c32f04090a5e23bc38ebc774355ac77dfdd1a41a2d6e10ce983c53ac";
+      sha256 = "7a154cf0086ee80e03d88740f3b05d3de288dcab25ac151bc5ebc81af30e1220";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/be/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/be/firefox-99.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "918447a5f57647ed5d846a0a0bbbcbaa55559722de7b8dca2ed2e744eb14ce36";
+      sha256 = "c05628994a45f2bebd6b912175b012aca3af563ec70b85c93f65106ccfa5b4f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/bg/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/bg/firefox-99.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "74851892da2c6c0a9a75d822aeef2c0a275fb5bbc32b88abb28e67f9310bb2ba";
+      sha256 = "9fc5b8266fb107b6ace769a0a75ed47bc4af5a9de6e215c4e0cd59e0f99c0711";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/bn/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/bn/firefox-99.0.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "2a6f53aa3fec578a76368120bca30240bb631db9767159aedb3b5480c1ab661a";
+      sha256 = "3010fdb412c86b282b6a6bb9531124e8e06c409c64f3738d7c142be7d83277f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/br/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/br/firefox-99.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "5d1d9478f459bcc3e6b148ff42d6f9f589b8fb395672e3b8ce8f333832b523dd";
+      sha256 = "acf68c7dbc8f702f1280136f2443effbc8af793bc8be8621e617a757440c6f72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/bs/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/bs/firefox-99.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "ed99ea471d6e30c0304bbb27bbdf88b479fee4df7f8cbba481d03de13954131a";
+      sha256 = "233b6b37d7e4f15bc971d48c1a0d55be146bdd430bb281472367a5526867f8af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ca-valencia/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ca-valencia/firefox-99.0.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "5dd1447b3fea23f08551b2ab5a80581c3e0e09f5602709cbdce751d491faa60a";
+      sha256 = "ee80548107642ed65feacfe480c7fa219b77ec6376244865e0deda14ffea8a7e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ca/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ca/firefox-99.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "21f6c622de4016a8e372ae7d249a07800b4393ba02ab59994356869a01cef571";
+      sha256 = "244107e338a2a290987d452953b93049642eb5008c897216d952851895011adc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/cak/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/cak/firefox-99.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "e9895877763157132e390f31c859b561c7d62adb011e209ab9cc0092ecfccb1a";
+      sha256 = "8db4e710b982e6f4f0c5e09b170884a8bd44db72a01ebb69f1eb899772132538";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/cs/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/cs/firefox-99.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "13c94b8b12fcbee4d41c6f7289f0cf2f199ef3d750628cc0ea11a60534ab6954";
+      sha256 = "768976418cae1fdeddd8ebbbc53edda46c7b05b997db813573705bcb6dc80d80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/cy/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/cy/firefox-99.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "c21d9e83d14ac46effb9e12a5210d7b56e3d765eef877f8ac4ed5104582d2631";
+      sha256 = "26705ed485b8436861032e74da2ef27b06b0d4471b6f019003175b8ef99e411b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/da/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/da/firefox-99.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "74a4a14ae8d8f64c56ce4409851f3e8e51bac61e2223c022f40d56d341fdcc65";
+      sha256 = "2828700cbc12e6d349b862bc49258752602ad9ea74a8ad1b52a8171caff3e0ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/de/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/de/firefox-99.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "d3449eec8075f3b6d07b2e6d7adecbec60a7e29b12c2016f642a90c5555971ed";
+      sha256 = "b27bf803ca3ac8f4530339f648c2c7248e674f5e52a327d4d62d5dc8055c8683";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/dsb/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/dsb/firefox-99.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "0dfac7916796d4ec7943963e28d7ca65f78661b6f22c226afb2dd00db47917e0";
+      sha256 = "b3a31746bf575bf2c06227eb01cd07013b59ec2e17f6603babacc3be76222254";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/el/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/el/firefox-99.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "c2769489e0947a7eeb0cb1f9d99d51317fd037e2a7bb06134403df1d4560a767";
+      sha256 = "b220df0d42dee179c02066677db3edc3526d1f91df9399d6555f79dc96212ae6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/en-CA/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/en-CA/firefox-99.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "87bb7162b58f7632ddf733fbdd4f195d75a9a6d467355c2625344171c72f4e9f";
+      sha256 = "a87252dfa797e7777823a84e80d6f9d8de6d1f17d29f8d2ee4ece46ab8d1b917";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/en-GB/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/en-GB/firefox-99.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "89bbf10bb75effa9e8064b6c42d0a4d7fd21ac2cd6e4ed3625d92c6b55ba1ee6";
+      sha256 = "37001a756bf9ea4e042ec043339e86eba4abaa4bc248bc699836ac8338f56ff8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/en-US/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/en-US/firefox-99.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "888db6752eb5703af5fe5ab4b1575f2a35dbd204614552fbe3a276042a3509d5";
+      sha256 = "c6e074e4083c366793dbc6d96968fd323fe0ffec1b8629be16e7c984ab1c3bef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/eo/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/eo/firefox-99.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "a2004dc59269fb2b37e568767593bcc0a7862a109df18f548eb1a0b829cf4293";
+      sha256 = "a5b6b630d5e58e20d6af73d6646954f0842ef537f8e0fdd4a424e6d34ccd2d7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/es-AR/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/es-AR/firefox-99.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "9e2c0f6cb231c469660cc7fe63489e69a2616553d17c52f5e7a2a86a171bc6e9";
+      sha256 = "84f7042e098eecf4974fef594c3640bd0e4c1c9fdab373c287ed580b2bac0a8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/es-CL/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/es-CL/firefox-99.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "dfe6f1229a6f80b6fab3a22fc8a8a6ecf3137b31805339a489ec53e5af63f040";
+      sha256 = "15a9ee9c9765ad5e0303cd94d22c61af50c723ba5241102d327e88eed2e8110e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/es-ES/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/es-ES/firefox-99.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "01020488ee2ad2e2357bbaf83857a2ad0820fb9f97302d1447cf4148b22d2bd4";
+      sha256 = "acd612f04297eed5f09b47615412e3b19099610c7a62ea8468382fdbfccf7d1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/es-MX/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/es-MX/firefox-99.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "3c7bacc6f703cdff7adb9097bfc39f52a67aa6a9814d7a8f451d4ef50c591714";
+      sha256 = "e86c3e1a68e7b33413b0c97ac1ad63535faa618228db207abd1d0fbdae4f5f08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/et/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/et/firefox-99.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "f2bc8e4200c89cf74ae6c984543e97b2523782dae70ecf6135f47943a01f1d83";
+      sha256 = "dcb820763848a5bbe5b32dba6be949877bc38e123c9d7553ed569316ed1d436e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/eu/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/eu/firefox-99.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "62bf0d826adb66d755f38bf25199eaf3850c37bfddca627b597802a20f8d3367";
+      sha256 = "dd1b5cbb48ea9aef8d3acab9f6a4c8de44128584b9d95fd50b2ed1b1ca79d367";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/fa/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/fa/firefox-99.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "9d4dfff33db462c71eb12067f56f2e20b0a557f9cbf1234b617e1c2ab5832ea8";
+      sha256 = "e4e66fb13ac850712bfa9946c05b97bc69f1d750037f8524ad766d6fcde67d86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ff/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ff/firefox-99.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "5b3a271207003e25776a55b7ee6adba2f83e844d4b0a738209d21be7db82ac33";
+      sha256 = "a793ad05230d98cfb4a003263082a64de86998eb5148ab3827b3e999e242a758";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/fi/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/fi/firefox-99.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "50a9408303ac8fc7c22da96f993b0b251407261d35598b4fe06f1c545788ef0b";
+      sha256 = "0567d3400a281bd569c81c406b462a101d3dcf041c4ec4e0e9753301ec0aa629";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/fr/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/fr/firefox-99.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "65db55f518be2abd8da5b52654bdf0efecd94b21ab843b76a6ad9e9ccb516a55";
+      sha256 = "fbb0392b310297e0ee974486092f7e6ed74f63d1f190218c63796bedf4e2b90d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/fy-NL/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/fy-NL/firefox-99.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "b3da8b5a077e4955bf2c662840005adaba2dd77af4724e965403da3139b5fb3f";
+      sha256 = "8eccc6e66de2b523e4e811d5d57b8eb17496ea9c5566c29ae7fedeb751876bf9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ga-IE/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ga-IE/firefox-99.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "f4812b90fa0a0391d2a372e7bf45a3393d59714209046618e7b1ed72f1889e2f";
+      sha256 = "239f4dfc4e5fc29b32a75ce0c4397a8785f3cc0b5e10b61b08565b6902342cbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/gd/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/gd/firefox-99.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "769c42c86d5b3866f9ad38bc833f5f1f1b01c7f5ed6898eba064ce6f31c9f550";
+      sha256 = "312c89bee7911e74fb87ce7cd128d55c7e4b0f706dba5950e7b45d39cfd5a817";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/gl/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/gl/firefox-99.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "b75ed9efccd63053589a3f60fbabb6ce5fc1c027a1a00789ff23b6971b0ebad5";
+      sha256 = "98d7ee9fb9dc4442d475db37925128858d807f3e686e9624902e62a872322a91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/gn/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/gn/firefox-99.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "bf60ba48f5d5a18ef9aeaf631d564412788ca102990b69b176ac66c1b8e3535c";
+      sha256 = "5d1e387fc779d0226347dbc6abfa9acd5ed5c39f30da22f36789dc1b2d68326e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/gu-IN/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/gu-IN/firefox-99.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "19f568337cfba71d7e1626099b1c6cee4d69a0332065779e5375da648d70a3f4";
+      sha256 = "51f5f582d2b2bda10ac528a2b0842ca86b29d20421ba83ae56493d791613bbc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/he/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/he/firefox-99.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "7d6a55d76f74d85e2f9da77ee071df31aed1c37f9fb139e448624a105b6ef19d";
+      sha256 = "d0192b6ad1508b1ebae13cbd3bc3d7fbf5b5e222d5f5cba1857d2b3d73c1c048";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hi-IN/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hi-IN/firefox-99.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "12451d7cc49ca2629ffedeebd1d77f8ac96d5839ed165ea91f55a249427ebf09";
+      sha256 = "9bf5814ada09f878d484ccd4a37d56054316372caf9766b8da70cd81f817f208";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hr/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hr/firefox-99.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "b2197d6d51847848cd849fef446e8b84725fc2b9539824e65719c4fd1d7f29ba";
+      sha256 = "4c2453a9ac74a71d7f5dfea3474ae68cd5fc2d4a85aeb04e367116d80df9cdbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hsb/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hsb/firefox-99.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "5000e21630440a446416de3cc38bcfc7c22bb8bc8d1a1a027c14b9548acff74a";
+      sha256 = "c3904c1a8b1ecedded23ceef7d8168865a0f18f08b81600e013f7cfebc5d5ce7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hu/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hu/firefox-99.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "dee75736596f5f0dc1d6952327274d07f927ff42e7c9a0ed8c8ba8dc78a6b3f9";
+      sha256 = "e05debfc803f3752dfaffef6b30e0079f5af44107217c362325e1e5922eb18a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hy-AM/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hy-AM/firefox-99.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "4b7dcb46864b058bdbeb35404de32c88e2822dd0315f105e95f61be857288282";
+      sha256 = "364a7408f1d2a150f04ab759da6a45021fad3bca5ba2811931df46960671c1ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ia/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ia/firefox-99.0.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "e89e07b1d71e1b2ccfd4d412dabea164bae8448f57a5f99a07ab04f9dcaa0bab";
+      sha256 = "5dc2a481ce5e9bd54241363fb88b62a655584293fd9d3f7ddf13dd0195d8cea0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/id/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/id/firefox-99.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "398ee6ed278cec1ceb489dd06d8f4c2671309a3e0d61f3202fd5280a5b596ca7";
+      sha256 = "b9d5b10461130d5c2895b04604be7eccf8979b87c4e8acc03173709979185eb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/is/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/is/firefox-99.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "a3531b8f68ee22452390ff8e1c70d7f6b842e10ab60ca6666f79fd958284d099";
+      sha256 = "6e4506fd90b7f3ee316a500f5e2fd3e2063fbeea79f3a86dcfc8573b8c355469";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/it/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/it/firefox-99.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "fe8fd2e7b0e87cb3b12ab6d8d973c422ef763d9d3a78620fe5a9f374455ccecc";
+      sha256 = "2bdc9c8aa3f8b0b86b0310a95e4f3aa74de418aef7dadd7ef3c24af51c4bf0ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ja/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ja/firefox-99.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "5d52ec4afd7de44806b804b5de6e597228d7061c10b0cc8d6fabeca505a0b207";
+      sha256 = "8e035fa783b64ec5e8503bf329346799aec628df03b013319586cf04969d36f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ka/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ka/firefox-99.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "902abc9df459c6dd2168050764cb2301ffee566f4deb11b2ef7c694cf429cc58";
+      sha256 = "59d2b9eaed8a898be979286d7ecf963e4f2241dfcbed9ac8e0d0b1821fb9e2fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/kab/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/kab/firefox-99.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "aa96307da2c832df7ea7ea418d3dae6dd9f2aed56432a8ed6e43fabe71aa9828";
+      sha256 = "2506702d67e1576df307bfcfcb9e20809352a37be3650c9a454e906a5d78fd2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/kk/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/kk/firefox-99.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "addb689db7bb19f28db963ca61dd0ece3813f5ca21f3437c1320c3f972e19029";
+      sha256 = "df0e505fd8552384ea55024531378e7228e35d9a40b66288631f524a565b94c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/km/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/km/firefox-99.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "7a982cdb847d162c6cedf724adebfab904cfacdbe3d4e48ee9af3e644e74cc14";
+      sha256 = "fc2202caadc90364dca89329a335869dd9bc8a2240fb95d5b3c6fcfdd6586be1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/kn/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/kn/firefox-99.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "d2cb6eb8c004d9c0e0929d8047d93902a2235b5068b86672c693edef1a2b8911";
+      sha256 = "8b4fe5e47aeaf7d1f15fa00d74088689f40a9d92df893b79d6c3c950f182c234";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ko/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ko/firefox-99.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "63770f2a873b520e5b1c1bece82ea4a987a2ae6535f9c4047e99b68f62c91748";
+      sha256 = "ce2a3f64b6d2b4ca319ed020ef621974977216aa468811609431a618aee9b77e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/lij/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/lij/firefox-99.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "ff130a01dc266b5b49f39f9c4355a6576211c0008cd5008290266daff222e18d";
+      sha256 = "6b8ebcebb1c9ffec9993663ef6040007909136d99dc9a2f724d16d9b9dc1f647";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/lt/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/lt/firefox-99.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "04105e0614b660d0e156b0aa2307af9d0d11236119b6667718d7f0f1f13ae505";
+      sha256 = "798c36f256f173fc5662d5edca6c4eaa55bc0c4f794a481524871aebabcf9b0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/lv/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/lv/firefox-99.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "50dd34d558800dafc84d714f5cf08a26eb4970c3aa6b8850430aa156d8869549";
+      sha256 = "4ea59a53fcbfd93959540edd12b4760586ca3f0a26fcdbdafa13cad70db7ca0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/mk/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/mk/firefox-99.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "8ca0b1cc9ff39757f2cc513d61a77d1d95a607862ea654d6743bf4a8f7bde99c";
+      sha256 = "c4bab25688564f1dc34b14d96695bb03881af3e2551040a8cd3e4543d8107338";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/mr/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/mr/firefox-99.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "b24884486692dfcad578026498a3654d34ae78cd39e977b3708053bd7754d37b";
+      sha256 = "e440be0dcd8714e7f08dad0800ccb642677e98444fd115c9a8ee5684f6b619e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ms/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ms/firefox-99.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "c43f2f10d928a3cf875e81afb54c09c1ef49ff8457069c054df2f62e0a43979f";
+      sha256 = "4d09e9925b2c67c1ea082b895f62db8f1282dbad073a851504187ff9b1725e74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/my/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/my/firefox-99.0.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "296d3860c2224deaa43184fa85dfce21eb9fc9b11d080d7f71cc189c4a790ed3";
+      sha256 = "be56fa7ae49aa26d174633d7e2bf426fb6931901176d8ecd26fdcc6e02749b6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/nb-NO/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/nb-NO/firefox-99.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "b0ce5e0157ff9f64434b38cf9338960870bbf6bdb4b75494b82c8ba871868ff3";
+      sha256 = "52a14a147126a49314425fb9ce2c964786cf409e176e1fc949ecf9a1c67627aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ne-NP/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ne-NP/firefox-99.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "58b7a719e7fb10bf7bfbe23f4ffcf002434652f792a3a1ffbadb13a5e06a04ba";
+      sha256 = "25fa25a6d63008badc2bdab5242c0620520b427df68de45fab873c230f7e948f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/nl/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/nl/firefox-99.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "2951dae0cbb3bec0e47ae44b70e6796ace16c8fbac18d7d04da84a51ded6a650";
+      sha256 = "0d751560dfd83afdbe69aab576449ab25a3b2b66ebed28ff4d13ddfefe520f9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/nn-NO/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/nn-NO/firefox-99.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "6f44201f301931e3b51144d57a79c484b776c37cb29dda93b57795c0a756c62f";
+      sha256 = "baf6b5ae7d2848344648fe3b3fa95991ccea45d2302eec5c657671a5736cbc7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/oc/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/oc/firefox-99.0.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "899a48b47dd642a64de0ac9226b4655e74bba9f0f6d1eccebc1c1875e1d3ea12";
+      sha256 = "bcf9df67acd24f0bdd4794820863f91b60bfe745471b0e88d29a22a225922665";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/pa-IN/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/pa-IN/firefox-99.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "392b6e6cb3ca1ef3e17f73ca327bf7fd49d453ee0216f922dfc3bfc7b2ce18da";
+      sha256 = "c0d8aaab99ddfa3b0be3bc323483f99094feaa67aa3d94bab4f5cf2ca8612fb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/pl/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/pl/firefox-99.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "f4f6124c3520c58ee00b7f4f00a39a904657b21072fe3d822a17b072c8e69473";
+      sha256 = "df2d1ba0a3db60f32c9031db067d14a56f06ebb8a3e04b540d4d7f15e2bc4367";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/pt-BR/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/pt-BR/firefox-99.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "b19e3aee72fb779ab139535295d3279cd06c125349fb5ee71c12737ab2aff733";
+      sha256 = "8f038e619e5380491b2002909930ac254a60f92215ba922a7fb2ec0895047a91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/pt-PT/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/pt-PT/firefox-99.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "0924bc137f6eaaf6686249f59540eadfd9b09aa843a071bd7db5d62f742258af";
+      sha256 = "749ba7ce1e93dad3a95f28f5ec6bb81e9bcf63a7c4d436487422126d2f04d8c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/rm/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/rm/firefox-99.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "ea9b082ba495a19162c0945b865eae6f66c689962807873bf27ad59a3e83c85e";
+      sha256 = "1b3ff965145535d0c3275366c27c4ed3a0d95a47e42d8baa7088dcdd58fb5e13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ro/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ro/firefox-99.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "3bbd902b4ace383d914f51553bce3de83c2ca4f6366e3f2dc42268795c7bf72b";
+      sha256 = "51640a0f3792d962a31ab494fe9c8f6a31cb6c2093d06f2293b2d2614d82e17a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ru/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ru/firefox-99.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "84296b00a3646cf8d0e7ba3ec6cbc90592b8fe8b2dcc36b8c904d1e15c264575";
+      sha256 = "01e25d1e39ad93fdaad2382039dbf3b0d9a7e1c6f7993ebe6088a7f0d6545ad1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sco/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sco/firefox-99.0.tar.bz2";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "8f966e6fa33e9e0242dd422818c9c46c5ffe37ebeb34e01a7eb57258e0aea481";
+      sha256 = "cf27b720e94a69df2a18ff9846108672bfe757224b71625a1ff1445ab11d5489";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/si/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/si/firefox-99.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "3ce96976ec5e920b20fdb1ff7fa8d20db2a67c0797ac4307f7e387db91306719";
+      sha256 = "4e64606407dfb9d9bbd44dc8eeb493208d546cb8d79c526a3e261a18b899b050";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sk/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sk/firefox-99.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "1a4d37ac6777185230343dceb4902b55e0adad62d144347d09f031228583370c";
+      sha256 = "7917d08b5870a3e02c7d2393a9bfae39e9bc45114ce37c1e2cebbe81d6ed3f60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sl/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sl/firefox-99.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "e1875f0077c3c03f34d7fa33e807d0297f831d451a045cd55accc493c3dce366";
+      sha256 = "12c7b3b525fc7fa1ab76f12bb837f481ccb30b317202f185cf5e71bda80048d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/son/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/son/firefox-99.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "1d13d9d3f9d8cfc03e5e45cd1c62a08b24437ed9feeb27ce42b07a75f0aefc04";
+      sha256 = "b0d0d04af3623eca737b8325e607e330636531525b92e23150d05204b29ba7e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sq/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sq/firefox-99.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "e2ae3fa32c56258069cdb95231a5d3b44218d32f0b10afc4174ac204bda7acf5";
+      sha256 = "4ee2854ec755ef5c1e4f4761819cd7125bbcff832d7c8ce6f3ee96e92c343b8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sr/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sr/firefox-99.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "96a5178bdbca9f6d1434610aa0d35c32b6eb542d6d3e760ce778a8e4181515f7";
+      sha256 = "6a2e415702701fb082beacababab5cf9368790a9876114eb2186f5691f32d265";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sv-SE/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sv-SE/firefox-99.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "fabe9274a8ac78ba84a394a7a5e7cfa22c41e3b58c8e6b94496fda6490bad644";
+      sha256 = "cdae3c72e5f79fb2a5ed988d39eac0f21e321feebe9ca67d8b7362c80160d7d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/szl/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/szl/firefox-99.0.tar.bz2";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "d77505b5fe04946002e5d1a28081c7e2933ce910a8d67f4e5ed31508808cfd41";
+      sha256 = "d39ec7a68195af2bded9826a251904b5f501c58dcb3c92789a2ab5251fe2618f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ta/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ta/firefox-99.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "a34e5b28526f9861bdc7af910e0a3418404f4316ad5792607493a698f480c9a1";
+      sha256 = "a7220a78f600010125b20c22205865169330c45bb9eacf4496c26ccf780257d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/te/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/te/firefox-99.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "c3b8653af6ed8f4cf7e9f3e5a4a0c622a163f7c45dd0d1ddcb3936e1504ea1af";
+      sha256 = "8c4973de96cda2a3448a30ec4776e488ceac9b27a9f5142f2256b92ac5c31102";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/th/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/th/firefox-99.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "a6456037b76bf2adaa6a6d68f8b20f293f8a4fdbbc3e533c8a6a22aedcc3bf4d";
+      sha256 = "aefbf224abd9b77303b90437a5ab87bacd4f04334d84c29c3d41c4b9922282e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/tl/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/tl/firefox-99.0.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "51ff115845f3d70a9fb08f08fcd3c1f86a41b3570f81f460c24a5a87605a779d";
+      sha256 = "d0c1e4c099482fbcbfdea2f45b3f6e1ec6744b3073d5c0ab840ed6eab129aa26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/tr/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/tr/firefox-99.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "3ccb5735a16622dafe6ae465ba167ea164843c85df436e7cd20cf6e7a4fbb610";
+      sha256 = "97b7f1c90fe846a4eb8c1a0dbef7eb9fa8f3a536f8e37b24565b4cb42ede27bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/trs/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/trs/firefox-99.0.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "7d1a71033460524506082087ce1b3ddc424207ea3ade6e0bbdbb00310e74cfea";
+      sha256 = "3910053c3e0ab255cd595cdebbbb0e0720a32cc1f20d6e74b5fdd3427fbb5137";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/uk/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/uk/firefox-99.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "6db06ed2f126c5307ef6380dff4dae14cc39ca58d23b827835d3e702acf33c72";
+      sha256 = "4736b57b2beea7f6a09a289b3ce6921082541acf20faf9d6165658ba96e06dc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ur/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ur/firefox-99.0.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "d00bcd6b3c70919999e748046b3291279d313f850c3daedae37259b695cb351d";
+      sha256 = "072b4f58064362f74eef2984c94cf42302bff9e61d0f9d8adf13124cef699386";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/uz/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/uz/firefox-99.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "1d77240a5f6d7542a7035fd32fd73e07bee1e1e880800cabd01e357a3da30907";
+      sha256 = "42f99dd9d61f29491ba55edb806131a4768768145676b42c886b5848d09dd451";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/vi/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/vi/firefox-99.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "9469a1c6613ea83a8e367c0e25e188ea9b9fddcc1497725a3ebb008fb5d5d73e";
+      sha256 = "d9c9cf96117b7e759291d7731fb53b51fc9f7d07b95ec7d479f6a03c34227b9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/xh/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/xh/firefox-99.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "af3144bfcb52df706182fa04badf39be51e5774335af21d8ec38dcbebe3bdf13";
+      sha256 = "929005cf3eba0a59e13e9af9f1595e218757a1d08c7c9a50cfc2323cd8d2de1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/zh-CN/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/zh-CN/firefox-99.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "fe6fc7bda0e52d64abcef8cbfc5e8576c64067b8746605e80790bde6dcd9b03d";
+      sha256 = "06bef0564337cfeab47ce84a095e9bcd347df4f6c821eb5d0404d984689c9e6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/zh-TW/firefox-98.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/zh-TW/firefox-99.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "18da6dcf61bba9a22b5487f695793d65b952cfc7065ff334b0faf8e7ec82d90f";
+      sha256 = "7eda1a1131117ceb3b513dc345c62397542bcb58cda1e97ade47fedb4fe704c9";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 94aa4d74feb6d..cdaf631795128 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,10 +7,10 @@ in
 rec {
   firefox = common rec {
     pname = "firefox";
-    version = "98.0.2";
+    version = "99.0";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e";
+      sha512 = "08f6d5a668140c4275aba6df463ed3af596043dfe5f27573583afbc1e9f6b27ebca79a52ce2c9598261c631b400b5378744e9e70f51ef9c4098b419e9904aa7c";
     };
 
     meta = {
@@ -32,10 +32,10 @@ rec {
 
   firefox-esr-91 = common rec {
     pname = "firefox-esr";
-    version = "91.7.1esr";
+    version = "91.8.0esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "c56aa38e9d706ff1f1838d2639dac82109dcffb54a7ea17326ae306604d78967ac32da13676756999bc1aa0bf50dc4e7072936ceb16e2e834bea48382ae4b48c";
+      sha512 = "edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3";
     };
 
     meta = {
diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index 00d0bc8f6fd5d..53d5733bb5849 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lagrange";
-  version = "1.11.1";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "skyjake";
     repo = "lagrange";
     rev = "v${version}";
-    sha256 = "sha256-RrdD+G8DKOBm0TpmRQg1uMGNFAlAADFeK3h6oyo5RZ4=";
+    sha256 = "sha256-1eWd4En14p8E04kLWbsbJSEdjManQ87N/P3klFbUQx4=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix
index 674db790f2237..58f5dfed85186 100644
--- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix
+++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix
@@ -2,17 +2,16 @@
 
 buildGoModule rec {
   pname = "argocd-autopilot";
-  version = "0.3.0";
-  commit = "c8d17bef976649e4dc2428c14c39e30a0f846552";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "argoproj-labs";
     repo = "argocd-autopilot";
     rev = "v${version}";
-    sha256 = "sha256-tggE1T+oD/dJS9tD9xOExjhy+T1GDd0vwTerD3P2KvA=";
+    sha256 = "sha256-L8+sb0lGPuc6smOFwijRGFS+oSCxEqB5c1tG55MPlgE=";
   };
 
-  vendorSha256 = "sha256-v8UMSObE6w+ULzueEK0UFeebLqoamy/788SQLBmJZ8U=";
+  vendorSha256 = "sha256-sxPTOao3scTmiVKFyGeWPMzXQz/d0HSVmUYocNGm1vA=";
 
   proxyVendor = true;
 
@@ -24,7 +23,7 @@ buildGoModule rec {
       "-X ${package_url}.binaryName=${pname}"
       "-X ${package_url}.version=${src.rev}"
       "-X ${package_url}.buildDate=unknown"
-      "-X ${package_url}.gitCommit=${commit}"
+      "-X ${package_url}.gitCommit=${src.rev}"
       "-X ${package_url}.installationManifestURL=github.com/argoproj-labs/argocd-autopilot/manifests/base?ref=${src.rev}"
       "-X ${package_url}.installationManifestsNamespacedURL=github.com/argoproj-labs/argocd-autopilot/manifests/insecure?ref=${src.rev}"
     ];
diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
index 211c2ce211eb5..9ce9286e610c8 100644
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,20 +2,16 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "2.3.2";
-  tag = "v${version}";
-  # Update commit to match the tag above
-  # TODO make updadeScript
-  commit = "ecc2af9dcaa12975e654cde8cbbeaffbb315f75c";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
-    rev = tag;
-    sha256 = "sha256-n+C4l4U3cDU+fgCnGWOYLdyjknw7n/xPEtC1i8AaU4o=";
+    rev = "v${version}";
+    sha256 = "sha256-ChgWqhkzVKhbyEA+g2flWK/WMxur7UHWXJUcLzp9RTE=";
   };
 
-  vendorSha256 = "sha256-Km+1o6yuuxJs+DNTQ/XVTUFurD5gM5ohwDc7MwJuu5s=";
+  vendorSha256 = "sha256-XrIIMnn65Y10KnVTsmw6vLE53Zra1lWNFgklmaj3gF8=";
 
   # Set target as ./cmd per release-cli
   # https://github.com/argoproj/argo-cd/blob/master/Makefile#L222
@@ -27,8 +23,8 @@ buildGoModule rec {
       "-s" "-w"
       "-X ${package_url}.version=${version}"
       "-X ${package_url}.buildDate=unknown"
-      "-X ${package_url}.gitCommit=${commit}"
-      "-X ${package_url}.gitTag=${tag}"
+      "-X ${package_url}.gitCommit=${src.rev}"
+      "-X ${package_url}.gitTag=${src.rev}"
       "-X ${package_url}.gitTreeState=clean"
     ];
 
@@ -43,7 +39,7 @@ buildGoModule rec {
 
   doInstallCheck = true;
   installCheckPhase = ''
-    $out/bin/argocd version --client | grep ${tag} > /dev/null
+    $out/bin/argocd version --client | grep ${src.rev} > /dev/null
   '';
 
   postInstall = ''
diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix
index 297e12a80a208..57a56e20c2e5b 100644
--- a/pkgs/applications/networking/cluster/arkade/default.nix
+++ b/pkgs/applications/networking/cluster/arkade/default.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "arkade";
-  version = "0.8.18";
+  version = "0.8.20";
 
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "arkade";
     rev = version;
-    sha256 = "sha256-VQI2eAxOkOkwYkTM/UyyK6lnXFoLFHWE/ekm5qLN9OE=";
+    sha256 = "sha256-DIXvsYYckNlxFzeJqk3TYRQIAtafAfylyDc/a20kl+0=";
   };
 
   CGO_ENABLED = 0;
diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix
index da633af2b8f7f..84ba5330da106 100644
--- a/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -12,8 +12,6 @@ buildGoModule rec {
   };
   vendorSha256 = "sha256-AOcWkcw+2DcgBxvxRO/sdb339a7hmI7Oy5I4kW4oE+k=";
 
-  doCheck = false;
-
   nativeBuildInputs = [ installShellFiles ];
 
   # Bundle release metadata
diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 0da63fae4215c..ebcb3bda73815 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  excludedPackages = "\\(tools\\|docgen\\)";
+  excludedPackages = [ "tools" "docgen" ];
 
   ldflags =
     let t = "github.com/rancher/k3d/v5/version"; in
diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix
deleted file mode 100644
index 537fb611783ea..0000000000000
--- a/pkgs/applications/networking/cluster/kubeless/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
-
-buildGoPackage rec {
-  pname = "kubeless";
-  version = "1.0.7";
-
-  src = fetchFromGitHub {
-    owner = "kubeless";
-    repo = "kubeless";
-    rev = "v${version}";
-    sha256 = "0x2hydywnnlh6arzz71p7gg9yzq5z2y2lppn1jszvkbgh11kkqfr";
-  };
-
-  goPackagePath = "github.com/kubeless/kubeless";
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  subPackages = [ "cmd/kubeless" ];
-
-  ldflags = [
-    "-s" "-w" "-X github.com/kubeless/kubeless/pkg/version.Version=${version}"
-  ];
-
-  postInstall = ''
-    for shell in bash; do
-      $out/bin/kubeless completion $shell > kubeless.$shell
-      installShellCompletion kubeless.$shell
-    done
-  '';
-
-  meta = with lib; {
-    homepage = "https://kubeless.io";
-    description = "The Kubernetes Native Serverless Framework";
-    license = licenses.asl20;
-    maintainers = with maintainers; [];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix
index b42a98405d2d1..72218fa2209b7 100644
--- a/pkgs/applications/networking/cluster/kubeseal/default.nix
+++ b/pkgs/applications/networking/cluster/kubeseal/default.nix
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   vendorSha256 = null;
 
-  doCheck = false;
-
   subPackages = [ "cmd/kubeseal" ];
 
   ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
index bdd538ef804d3..673a8c9a8f0a9 100644
--- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
+++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
 
   # third_party/VENDOR-LICENSE breaks build/check as go files are still included
   # docs is a tool for generating docs
-  excludedPackages = "\\(third_party\\|cmd/docs\\)";
+  excludedPackages = [ "third_party" "cmd/docs" ];
 
   preCheck = ''
     # some tests try to write to the home dir
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 93be46bc79274..0bdb6289a6116 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -68,7 +68,7 @@ let
       archived = date: throw "the provider has been archived by upstream on ${date}";
       removed = date: throw "removed from nixpkgs on ${date}";
     in
-    lib.optionalAttrs (config.allowAliases or false) {
+    lib.optionalAttrs config.allowAliases {
       arukas = archived "2022/01";
       chef = archived "2022/01";
       cherryservers = archived "2022/01";
diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix
index 9f0ebc7d930f5..ae98133f18992 100644
--- a/pkgs/applications/networking/feedreaders/rss2email/default.nix
+++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix
@@ -42,7 +42,7 @@ buildPythonApplication rec {
     description = "A tool that converts RSS/Atom newsfeeds to email";
     homepage = "https://pypi.python.org/pypi/rss2email";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ jb55 Profpatsch ekleog ];
+    maintainers = with maintainers; [ Profpatsch ekleog ];
   };
   passthru.tests = {
     smoke-test = nixosTests.rss2email;
diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix
index ebed984c4d538..a810dbdc3a1f9 100644
--- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix
+++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "alfaview";
-  version = "8.40.0";
+  version = "8.41.0";
 
   src = fetchurl {
     url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb";
-    sha256 = "sha256-meiIDIG7OXxF2aclHA/8FN8aSz5KWJliDbm2p/flD4k=";
+    sha256 = "sha256-qW+MB71sylKJQycSX6hiBgxAO4MuhnBaPGFjm+6y4vk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
index 543a5f52c979f..4450eefa6eb08 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
     homepage = "https://github.com/sm00th/bitlbee-discord";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ lassulus jb55 ];
+    maintainers = with maintainers; [ lassulus ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index f80d8cab8b117..03d1d74305e62 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -1,6 +1,6 @@
 { lib
 , copyDesktopItems
-, electron_14
+, electron_16
 , esbuild
 , fetchFromGitHub
 , fetchpatch
@@ -33,9 +33,9 @@ let
     };
   });
   electronExec = if stdenv.isDarwin then
-    "${electron_14}/Applications/Electron.app/Contents/MacOS/Electron"
+    "${electron_16}/Applications/Electron.app/Contents/MacOS/Electron"
   else
-    "${electron_14}/bin/electron";
+    "${electron_16}/bin/electron";
   esbuild' = esbuild.overrideAttrs (old: rec {
     version = "0.12.29";
     src = fetchFromGitHub {
@@ -47,13 +47,13 @@ let
   });
 in nodejs-14_x.pkgs.deltachat-desktop.override rec {
   pname = "deltachat-desktop";
-  version = "1.28.0";
+  version = "1.28.1";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-desktop";
     rev = "v${version}";
-    hash = "sha256-Ur0UxaKEWp+y7lGz2Khsg4npOf+gjCiOoijkSbnp0hg=";
+    hash = "sha256-i2Cb2HfapYTaxg5IUl4pGWYUM6o/4mWgMO7QsBqDHoU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
index ca584702765a3..0f4e421a762af 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.28.0",
+  "version": "1.28.1",
   "dependencies": {
     "@blueprintjs/core": "^3.22.3",
     "@deltachat/message_parser_wasm": "^0.3.0",
diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix
index 0a44a37cf4bca..6e0e39043ee05 100644
--- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix
@@ -17,10 +17,10 @@ in
 mkFranzDerivation' rec {
   pname = "ferdi";
   name = "Ferdi";
-  version = "5.8.0";
+  version = "5.8.1";
   src = fetchurl {
     url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
-    sha256 = "sha256-Dd/iH9dtr4WvM++bSURF8kI6BsF6uBiSFviC/ik2H+o=";
+    sha256 = "sha256-Bl7bM5iDQlfPSZxksqlg7GbuwWlm53QkOf/TQEg3/n0=";
   };
   extraBuildInputs = [ xorg.libxshmfence ];
   meta = with lib; {
diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix
deleted file mode 100644
index 3474e5729316e..0000000000000
--- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{lib, stdenv, fetchurl, ncurses, openssl, tcl, tk}:
-
-stdenv.mkDerivation rec {
-  pname = "gtmess";
-  version = "0.97";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/gtmess/gtmess-${version}.tar.gz";
-    sha256 = "1ipmqsrj0r1ssbgs2fpr4x5vnzlxlqhx9jrnadp1jw7s0sxpjqv0";
-  };
-
-  buildInputs = [ ncurses openssl tcl tk];
-
-  meta = {
-    description = "Console MSN Messenger client for Linux and other unix systems";
-    homepage = "http://gtmess.sourceforge.net/";
-    license = lib.licenses.gpl2Plus;
-    platforms = with lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix
index c7b5d56dbba34..568a2a5bd51b1 100644
--- a/pkgs/applications/networking/instant-messengers/pond/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pond/default.nix
@@ -24,7 +24,7 @@ buildGoPackage rec {
     ++ lib.optional stdenv.hostPlatform.isx86_64 dclxvi
     ++ lib.optionals gui [ wrapGAppsHook ];
   tags = lib.optionals (!gui) [ "nogui" ];
-  excludedPackages = "\\(appengine\\|bn256cgo\\)";
+  excludedPackages = [ "appengine" "bn256cgo" ];
   postPatch = lib.optionalString stdenv.hostPlatform.isx86_64 ''
     grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \
       -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index e3fa08e3df3a7..72bd18163e68a 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -24,7 +24,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "5.36.0"; # Please backport all updates to the stable channel.
+  version = "5.37.0"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "sha256-x1PUEDq/0B1T14mBs2FuKtcGpJHWOIvHAs8hptpzhZk=";
+    sha256 = "sha256-hnRS/7CZPk1bbBjpHLAywKVu2u7jgg3p5/pxEdkzMJ8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 93dfc4d8a1db4..af1099cbcf3e3 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, fetchpatch, wrapGAppsHook, autoreconfHook, bison, flex
+{ stdenv, lib, fetchgit, wrapGAppsHook, autoreconfHook, bison, flex
 , curl, gtk3, pkg-config, python3, shared-mime-info
 , glib-networking, gsettings-desktop-schemas
 
@@ -96,28 +96,18 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "claws-mail";
-  version = "4.0.0";
+  version = "4.1.0";
 
   src = fetchgit {
     rev = version;
     url = "git://git.claws-mail.org/claws.git";
-    sha256 = "0mwnjiqg2sj61va0y9yi3v52iyr5kzmbnvsqxav3a48m2f8p27qn";
-    };
+    sha256 = "1pgl7z87qs3ksh1pazq9cml3h0vb7kr9b97gkkrzgsgfg1vbx390";
+  };
 
   outputs = [ "out" "dev" ];
 
   patches = [
     ./mime.patch
-
-    # Fixes a bug with the automatic authentication method, resulting in errors
-    # with certain mail providers.
-    # <https://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=4497>
-    # This MUST be removed for the next release.
-    (fetchpatch {
-      name = "fix-automatic-auth.patch";
-      url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=9c2585c58b49815a0eab8d683f0a94f75cbbe64e";
-      sha256 = "0v8v5q2p4h93lp7yq3gnlvarsrcssv96aks1wqy3187vsr4kdw7a";
-    })
   ];
 
   preConfigure = ''
diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix
index c06291c719e8e..d3d6d5aa8069e 100644
--- a/pkgs/applications/networking/nextdns/default.nix
+++ b/pkgs/applications/networking/nextdns/default.nix
@@ -2,18 +2,16 @@
 
 buildGoModule rec {
   pname = "nextdns";
-  version = "1.37.10";
+  version = "1.37.11";
 
   src = fetchFromGitHub {
     owner = "nextdns";
     repo = "nextdns";
     rev = "v${version}";
-    sha256 = "sha256-iwxgDBIuTClikvXF+3mCjFKKV0upN+K+aL85ewYkMXo=";
+    sha256 = "sha256-BOmu4OjDq1IwsPjbqzV2OtvKpaYFqP/XdYL2Ug28TbU=";
   };
 
-  vendorSha256 = "sha256-6hWD05lXteqL7egj9tiRVHlevKM33i+a+zBUZs7PF7I=";
-
-  doCheck = false;
+  vendorSha256 = "sha256-M2PlvUsEG3Um+NqbpHdtu9g+Gj6jSXZ9YZ7t1MwjjdI=";
 
   ldflags = [ "-s" "-w" "-X main.version=${version}" ];
 
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 931606f324898..468a06af2091e 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
 , gnutls, libgcrypt, libgpg-error, geoip, openssl, lua5, python3, libcap, glib
-, libssh, nghttp2, zlib, cmake, makeWrapper
+, libssh, nghttp2, zlib, cmake, makeWrapper, wrapGAppsHook
 , withQt ? true, qt5 ? null
 , ApplicationServices, SystemConfiguration, gmp
 , asciidoctor
@@ -34,7 +34,8 @@ in stdenv.mkDerivation {
   # Avoid referencing -dev paths because of debug assertions.
   NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
 
-  nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook;
+  nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config ]
+    ++ optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ];
 
   buildInputs = [
     gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt
@@ -85,6 +86,12 @@ in stdenv.mkDerivation {
 
   dontFixCmake = true;
 
+  # Prevent double-wrapping, inject wrapper args manually instead.
+  dontWrapGApps = true;
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   shellHook = ''
     # to be able to run the resulting binary
     export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1
diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index a747b96dd1809..fe3e05b65627e 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -25,14 +25,14 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "14.32.39";
+  version = "14.32.45";
   pname = "jmol";
 
   src = let
     baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
   in fetchurl {
     url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-    sha256 = "sha256-ekwipWWGsXYECJBOmw0+uIWHDpdF8T8jZUo6LeqD6Io=";
+    sha256 = "sha256-9bcOwORHLZfn95RFur4JdP3Djpq8K8utnWIsniqKAI4=";
   };
 
   patchPhase = ''
diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix
deleted file mode 100644
index f48d08d407995..0000000000000
--- a/pkgs/applications/science/electronics/eagle/eagle7.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{ lib, stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig
-, openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi
-, libxcb, cups, xkeyboardconfig, runtimeShell
-}:
-
-let
-
-  libPath = lib.makeLibraryPath
-    [ zlib freetype fontconfig openssl libXrender libXrandr libXcursor libX11
-      libXext libXi libxcb cups
-    ];
-
-in
-
-stdenv.mkDerivation rec {
-  pname = "eagle";
-  version = "7.7.0";
-
-  src =
-    if stdenv.hostPlatform.system == "i686-linux" then
-      fetchurl {
-        url = "ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin32-${version}.run";
-        sha256 = "16fa66p77xigc7zvzfm7737mllrcs6nrgk2p7wvkjw3p9lvbz7z1";
-      }
-    else if stdenv.hostPlatform.system == "x86_64-linux" then
-      fetchurl {
-        url = "ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin64-${version}.run";
-        sha256 = "18dcn6wqph1sqh0ah98qzfi05wip8a8ifbkaq79iskbrsi8iqnrg";
-      }
-    else
-      throw "Unsupported system: ${stdenv.hostPlatform.system}";
-
-  desktopItem = makeDesktopItem {
-    name = "eagle";
-    exec = "eagle";
-    icon = "eagle";
-    comment = "Schematic capture and PCB layout";
-    desktopName = "Eagle";
-    genericName = "Schematic editor";
-    categories = [ "Development" ];
-  };
-
-  buildInputs =
-    [ patchelf zlib freetype fontconfig openssl libXrender libXrandr libXcursor
-      libX11 libXext libXi
-    ];
-
-  dontUnpack = true;
-
-  # NOTES:
-  # Eagle for Linux comes as a self-extracting shell script with embedded
-  # tarball. The tarball data (.tar.bz2) starts after a __DATA__ marker.
-  #
-  # Eagle apparently doesn't like binary patching. This is what happens:
-  #   $ ./result/eagle-6.4.0/bin/eagle
-  #   argv[0] (/home/bfo/nixpkgs/result/eagle-6.4.0/bin/eagle) is not the currently executed program version!
-  installPhase = ''
-    # Extract eagle tarball
-    mkdir "$out"
-    sed '1,/^__DATA__$/d' "$src" | tar -xjf - -C "$out"
-
-    # Install manpage
-    mkdir -p "$out"/share/man/man1
-    ln -s "$out"/eagle-${version}/doc/eagle.1 "$out"/share/man/man1/eagle.1
-
-    # Build LD_PRELOAD library that redirects license file access to the home
-    # directory of the user
-    mkdir -p "$out"/lib
-    gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle7_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl
-
-    # Make wrapper script
-    dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)"
-    mkdir -p "$out"/bin
-    cat > "$out"/bin/eagle << EOF
-    #!${runtimeShell}
-    export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:${libPath}"
-    export LD_PRELOAD="$out/lib/eagle_fixer.so"
-    export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"
-    exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@"
-    EOF
-    chmod a+x "$out"/bin/eagle
-
-    # Make desktop item
-    mkdir -p "$out"/share/applications
-    cp "$desktopItem"/share/applications/* "$out"/share/applications/
-    mkdir -p "$out"/share/icons
-    ln -s "$out/eagle-${version}/bin/eagleicon50.png" "$out"/share/icons/eagle.png
-  '';
-
-  meta = with lib; {
-    description = "Schematic editor and PCB layout tool from CadSoft";
-    homepage = "https://www.autodesk.com/products/eagle/overview";
-    license = licenses.unfree;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
-  };
-}
diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix
index 1614adf45537e..d7ec2e72433e3 100644
--- a/pkgs/applications/science/logic/potassco/clingcon.nix
+++ b/pkgs/applications/science/logic/potassco/clingcon.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , cmake
 , clingo
+, catch2
 }:
 
 stdenv.mkDerivation rec {
@@ -15,6 +16,10 @@ stdenv.mkDerivation rec {
     sha256 = "1g2xkz9nsgqnrw3fdf5jchl16f0skj5mm32va61scc2yrchll166";
    };
 
+  postPatch = ''
+    cp ${catch2}/include/catch2/catch.hpp libclingcon/tests/catch.hpp
+  '';
+
   nativeBuildInputs = [ cmake clingo ];
 
   cmakeFlags = [
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index 462a05d300cec..74b89ed98c550 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
       Center (BVLC) and by community contributors.
     '';
     homepage = "http://caffe.berkeleyvision.org/";
-    maintainers = with maintainers; [ jb55 ];
+    maintainers = with maintainers; [ ];
     license = licenses.bsd2;
     platforms = platforms.linux ++ platforms.darwin;
   };
diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix
index 3ca998643ac25..6dfc6f7ea55ac 100644
--- a/pkgs/applications/science/misc/bada-bib/default.nix
+++ b/pkgs/applications/science/misc/bada-bib/default.nix
@@ -17,7 +17,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bada-bib";
-  version = "0.6.0";
+  version = "0.6.1";
   format = "other";
   strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
 
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
     owner = "RogerCrocker";
     repo = "BadaBib";
     rev = "v${version}";
-    sha256 = "sha256-gfZc3R8hrYy4Nco+XwG29lzZd537ByEgd3RL8h7f6DQ=";
+    sha256 = "sha256-fuGGKBScdo9rI3tLSBWIcWEME8nSuct0IUyfmI7PzCc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 13da857b790ed..1f08cd26ef368 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -32,7 +32,9 @@ let
 in
 
 stdenv.mkDerivation {
-  pname = "git";
+  pname = "git"
+    + lib.optionalString svnSupport "-with-svn"
+    + lib.optionalString (!svnSupport && !guiSupport && !sendEmailSupport && !withManual && !pythonSupport && !withpcre2) "-minimal";
   inherit version;
 
   src = fetchurl {
@@ -166,8 +168,13 @@ stdenv.mkDerivation {
       cp -a contrib $out/share/git/
       mkdir -p $out/share/bash-completion/completions
       ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git
-      mkdir -p $out/share/bash-completion/completions
       ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/
+      # only readme, developed in another repo
+      rm -r contrib/hooks/multimail
+      mkdir -p $out/share/git-core/contrib
+      cp -a contrib/hooks/ $out/share/git-core/contrib/
+      substituteInPlace $out/share/git-core/contrib/hooks/pre-auto-gc-battery \
+        --replace ' grep' ' ${gnugrep}/bin/grep' \
 
       # grep is a runtime dependency, need to patch so that it's found
       substituteInPlace $out/libexec/git-core/git-sh-setup \
diff --git a/pkgs/applications/version-management/git-and-tools/hut/default.nix b/pkgs/applications/version-management/git-and-tools/hut/default.nix
index ad0c02aa2e0d6..49e5fa675a948 100644
--- a/pkgs/applications/version-management/git-and-tools/hut/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hut/default.nix
@@ -2,21 +2,20 @@
 , buildGoModule
 , fetchFromSourcehut
 , scdoc
-, unstableGitUpdater
 }:
 
-buildGoModule {
+buildGoModule rec {
   pname = "hut";
-  version = "unstable-2022-03-02";
+  version = "0.1.0";
 
   src = fetchFromSourcehut {
     owner = "~emersion";
     repo = "hut";
-    rev = "55ad2fbd9ceeeb9e7dc203c15476fa785f1209e0";
-    sha256 = "sha256-j2IVwCm7iq3JKccPL8noRBhqw+V+4qfcpAwV65xhZk0=";
+    rev = "v${version}";
+    sha256 = "sha256-2YUrDPulpLQQGw31nEasHoQ/AppECg7acwwqu6JDT5U=";
   };
 
-  vendorSha256 = "sha256-zdQvk0M1a+Y90pnhqIpKxLJnlVJqMoSycewTep2Oux4=";
+  vendorSha256 = "sha256-EmokL3JlyM6C5/NOarCAJuqNsDO2tgHwqQdv0rAk+Xk=";
 
   nativeBuildInputs = [
     scdoc
@@ -32,8 +31,6 @@ buildGoModule {
     make $makeFlags install
   '';
 
-  passthru.updateScript = unstableGitUpdater { };
-
   meta = with lib; {
     homepage = "https://sr.ht/~emersion/hut/";
     description = "A CLI tool for Sourcehut / sr.ht";
diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix
index 83991407fd419..6017d105fed71 100644
--- a/pkgs/applications/version-management/github-desktop/default.nix
+++ b/pkgs/applications/version-management/github-desktop/default.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   pname = "github-desktop";
-  version = "2.9.9";
+  version = "2.9.12";
 
   src = fetchurl {
     url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb";
-    sha256 = "sha256-LMKOxQR3Bgw00LnKqAe2hq+eASgwC7y0cxNSSt/sjWA=";
+    sha256 = "sha256-tr1u6q7sHI1Otor53d1F7J0f9eV9tKtLZx8+40I16y8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index cf0622a6b0ecf..f70034082caeb 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.5";
+  version = "0.12.6";
 
   src = fetchFromGitHub {
     owner = "gogs";
     repo = "gogs";
     rev = "v${version}";
-    sha256 = "sha256-I3kFRKgVMGMKgHU5VEeNai8FseN/ea6MzEP94AR2Zfo=";
+    sha256 = "sha256-nAMnsRYYS5bZhLDzPdC4sj3rv1kPjckFnLoORY1HqW8=";
   };
 
-  vendorSha256 = "sha256-3dT5D+oDd0mpJp/cP53TQcRUkmqh6g3sRBWWAUqhaAo=";
+  vendorSha256 = "sha256-U8rzYSLD9XeO5ai3p3OG74kPRI2IAlvOeZhU1Pa1BAI=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 9dc3e0329e3c0..4898729159907 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -21,18 +21,13 @@ let
 
   self = python3Packages.buildPythonApplication rec {
     pname = "mercurial${lib.optionalString fullBuild "-full"}";
-    version = "6.1";
+    version = "6.1.1";
 
     src = fetchurl {
       url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
-      sha256 = "sha256-hvmGReRWWpJWmR3N4it3uOfSLKb7tgwfTNvYRpo4zB8=";
+      sha256 = "sha256-V7ikYdDOE9muOBfYqL35Ay407fqsPbzLO2a4NdzpM4g=";
     };
 
-    patches = [
-      # Fix the type of libc buffer for aarch64-linux
-      ./fix-rhg-type-aarch64.patch
-    ];
-
     format = "other";
 
     passthru = { inherit python; }; # pass it so that the same version can be used in hg2git
@@ -40,7 +35,7 @@ let
     cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
       inherit src;
       name = "mercurial-${version}";
-      sha256 = "sha256-+Y91gEC8vmyutNpVFAAL4MSg4KnpFbhH12CIuMRx0Mc=";
+      sha256 = "sha256-HYH7+OD11kdZdxFrx1KVle1NesS3fAgwVXJpAeiXDTo=";
       sourceRoot = "mercurial-${version}/rust";
     } else null;
     cargoRoot = if rustSupport then "rust" else null;
diff --git a/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch b/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch
deleted file mode 100644
index 84417b497c0aa..0000000000000
--- a/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/rust/hg-core/src/lock.rs b/rust/hg-core/src/lock.rs
---- a/rust/hg-core/src/lock.rs
-+++ b/rust/hg-core/src/lock.rs
-@@ -145,7 +145,7 @@ lazy_static::lazy_static! {
- 
-         /// Same as https://github.com/python/cpython/blob/v3.10.0/Modules/socketmodule.c#L5414
-         const BUFFER_SIZE: usize = 1024;
--        let mut buffer = [0_i8; BUFFER_SIZE];
-+        let mut buffer = [0 as libc::c_char; BUFFER_SIZE];
-         let hostname_bytes = unsafe {
-             let result = libc::gethostname(buffer.as_mut_ptr(), BUFFER_SIZE);
-             if result != 0 {
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index d46a67a8601e0..6982bd43b2632 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Q93+EHJKi4XiRo9kA7YABzcYbwHmDgvWL95p2EIjTMU=";
   };
 
+  patches = [
+    # glibc 2.34 compat
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/rcs/raw/f8e07cd37f4abfb36e37d41852bb8f9e234d3fb1/f/rcs-5.10.0-SIGSTKSZ.patch";
+      sha256 = "sha256-mc6Uye9mdEsLBcOnf1m1TUb1BV0ncNU//iKBpLGBjho=";
+    })
+  ];
+
   ac_cv_path_ED = "${ed}/bin/ed";
   DIFF = "${diffutils}/bin/diff";
   DIFF3 = "${diffutils}/bin/diff3";
diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix
index 6883587b4b810..1cd44bd34883b 100644
--- a/pkgs/applications/video/ani-cli/default.nix
+++ b/pkgs/applications/video/ani-cli/default.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "ani-cli";
-  version = "1.9";
+  version = "2.0";
 
   src = fetchFromGitHub {
     owner = "pystardust";
     repo = "ani-cli";
     rev = "v${version}";
-    sha256 = "sha256-oYiq3Mnuhba5NELJXqVN3gY/d0RfQIqW13YtdcmYKK4=";
+    sha256 = "sha256-cDxb/IcpzR5akWnA8RN+fKQn0+QnpBV8tAbUjjPICsA=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 7ae463b987300..1b97fa9b7c665 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,5 +1,6 @@
 { lib
 , fetchurl
+, fetchpatch
 , pkg-config
 , gettext
 , itstool
@@ -36,6 +37,13 @@ python3Packages.buildPythonApplication rec {
     # and saves them to the generated binary. This would make the build-time
     # dependencies part of the closure so we remove it.
     ./prevent-closure-contamination.patch
+
+    # Fix build with meson 0.61
+    # https://gitlab.gnome.org/GNOME/pitivi/-/merge_requests/414
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6fddd63f676cc905a8b8e96291a4c.patch";
+      sha256 = "MC4naGnqhrYlFBFHZaSzbOzrqaNK5/Xv5jBmCu0fLQE=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix
index 071e67a172116..548b3d7f9724d 100644
--- a/pkgs/applications/video/quvi/library.nix
+++ b/pkgs/applications/video/quvi/library.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
     maintainers = [ ];
+    broken = true; # missing glibc-2.34 support, no upstream activity
   };
 }
diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix
index 676d073900c52..a31ef6e72ae6a 100644
--- a/pkgs/applications/video/quvi/scripts.nix
+++ b/pkgs/applications/video/quvi/scripts.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
     maintainers = [ ];
+    broken = true; # missing glibc-2.34 support, no upstream activity
   };
 }
diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix
index 87c8066a976c5..ad6233cbd0012 100644
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/pkgs/applications/video/quvi/tool.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
     maintainers = [ ];
+    broken = true; # missing glibc-2.34 support, no upstream activity
   };
 }
diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index 59a9a7606ef1a..16c25aea9ae48 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "docker-compose";
-  version = "2.3.4";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "compose";
     rev = "v${version}";
-    sha256 = "sha256-ZFnrfGM2LUZZC8IPPCh3GS95jz7NGraOlr3wQaw5K0k=";
+    sha256 = "sha256-dHq1t1ebPSAS5H14Kd03xCiHV9UhAH0dIxikQK0rHQk=";
   };
 
-  vendorSha256 = "sha256-Y2rE5/XLmQLqBA8xiCd9v30gTaO9qbiBFa4jKucKU6M=";
+  vendorSha256 = "sha256-N+paN3zEXzzUFb2JPVIDZYZ0h0iu7naiw4pSVnGsuKQ=";
 
   ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
 
diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix
index f6ba52013f6f5..5c2c7dcb5ce45 100644
--- a/pkgs/applications/window-managers/berry/default.nix
+++ b/pkgs/applications/window-managers/berry/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "berry";
-  version = "0.1.10";
+  version = "0.1.11";
 
   src = fetchFromGitHub {
     owner = "JLErvin";
     repo = pname;
     rev = version;
-    hash = "sha256-6asph0QXzhmHuYcfrLcQ8RTP4QzX8m6AcCp5ImA++9M=";
+    hash = "sha256-cs1NVwaANMIteCQuGqPcEWuUbfJulhjmfWnlU8Eb2OM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 96ea363c811e0..5a4e30ede8a3e 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -16,8 +16,8 @@
 , makeWrapper
 , moreutils
 , nix
+, nixosTests
 , pigz
-, pkgs
 , rsync
 , runCommand
 , runtimeShell
@@ -26,6 +26,7 @@
 , storeDir ? builtins.storeDir
 , substituteAll
 , symlinkJoin
+, tarsum
 , util-linux
 , vmTools
 , writeReferencesToFile
@@ -81,6 +82,15 @@ rec {
     inherit buildImage buildLayeredImage fakeNss pullImage shadowSetup buildImageWithNixDb;
   };
 
+  tests = {
+    inherit (nixosTests)
+      docker-tools
+      docker-tools-overlay
+      # requires remote builder
+      # docker-tools-cross
+      ;
+  };
+
   pullImage =
     let
       fixName = name: builtins.replaceStrings [ "/" ":" ] [ "-" "-" ] name;
@@ -113,7 +123,7 @@ rec {
         outputHashAlgo = "sha256";
         outputHash = sha256;
 
-        nativeBuildInputs = lib.singleton skopeo;
+        nativeBuildInputs = [ skopeo ];
         SSL_CERT_FILE = "${cacert.out}/etc/ssl/certs/ca-bundle.crt";
 
         sourceURL = "docker://${imageName}@${imageDigest}";
@@ -132,7 +142,7 @@ rec {
 
   # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
   # And we cannot untar it, because then we cannot preserve permissions etc.
-  tarsum = pkgs.tarsum;
+  inherit tarsum; # pkgs.dockerTools.tarsum
 
   # buildEnv creates symlinks to dirs, which is hard to edit inside the overlay VM
   mergeDrvs =
@@ -754,7 +764,7 @@ rec {
   # "#!/usr/bin/env executable" shebang.
   usrBinEnv = runCommand "usr-bin-env" { } ''
     mkdir -p $out/usr/bin
-    ln -s ${pkgs.coreutils}/bin/env $out/usr/bin
+    ln -s ${coreutils}/bin/env $out/usr/bin
   '';
 
   # This provides /bin/sh, pointing to bashInteractive.
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 941ee048666d0..169edb171db41 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -486,7 +486,7 @@ rec {
   cross = let
     # Cross compile for x86_64 if on aarch64
     crossPkgs =
-      if pkgs.system == "aarch64-linux" then pkgsCross.gnu64
+      if pkgs.stdenv.hostPlatform.system == "aarch64-linux" then pkgsCross.gnu64
       else pkgsCross.aarch64-multiplatform;
   in crossPkgs.dockerTools.buildImage {
     name = "hello-cross";
diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix
index d831fe24d33b2..e09fd0e20f226 100644
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/pkgs/build-support/make-desktopitem/default.nix
@@ -34,11 +34,6 @@
 , extraConfig ? {} # Additional values to be added literally to the final item, e.g. vendor extensions
 }:
 let
-  # FIXME: workaround until https://github.com/NixOS/nixpkgs/pull/162246 lands
-  cleanName = if lib.hasInfix " " name
-                then throw "makeDesktopItem: name must not contain spaces!"
-                else name;
-
   # There are multiple places in the FDO spec that make "boolean" values actually tristate,
   # e.g. StartupNotify, where "unset" is literally defined as "do something reasonable".
   # So, handle null values separately.
@@ -116,8 +111,8 @@ let
   content = [ mainSectionRendered ] ++ actionsRendered;
 in
 writeTextFile {
-  name = "${cleanName}.desktop";
-  destination = "/share/applications/${cleanName}.desktop";
+  name = "${name}.desktop";
+  destination = "/share/applications/${name}.desktop";
   text = builtins.concatStringsSep "\n" content;
-  checkPhase = "${buildPackages.desktop-file-utils}/bin/desktop-file-validate $target";
+  checkPhase = ''${buildPackages.desktop-file-utils}/bin/desktop-file-validate "$target"'';
 }
diff --git a/pkgs/build-support/test-equal-derivation.nix b/pkgs/build-support/test-equal-derivation.nix
index 5d2185ce16525..652f3716b2a7f 100644
--- a/pkgs/build-support/test-equal-derivation.nix
+++ b/pkgs/build-support/test-equal-derivation.nix
@@ -23,7 +23,7 @@ let
   drvB = builtins.unsafeDiscardOutputDependency b.drvPath or (throw "testEqualDerivation third argument must be a package");
   name =
     if a?name
-    then lib.strings.sanitizeDerivationName "testEqualDerivation-${a.name}"
+    then "testEqualDerivation-${a.name}"
     else "testEqualDerivation";
 in
 if drvA == drvB then
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 68f0f1bc4ddcb..4a3d37788814e 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -70,8 +70,7 @@ rec {
     # name of the resulting derivation
     }: buildCommand:
     stdenv.mkDerivation ({
-      name = lib.strings.sanitizeDerivationName name;
-      inherit buildCommand;
+      inherit buildCommand name;
       passAsFile = [ "buildCommand" ]
         ++ (derivationArgs.passAsFile or []);
     }
@@ -121,7 +120,7 @@ rec {
         allowSubstitutes = false;
       }
       ''
-        target=$out${destination}
+        target=$out${lib.escapeShellArg destination}
         mkdir -p "$(dirname "$target")"
 
         if [ -e "$textPath" ]; then
diff --git a/pkgs/build-support/trivial-builders/test/write-text-file.nix b/pkgs/build-support/trivial-builders/test/write-text-file.nix
new file mode 100644
index 0000000000000..ac83a75fca4ab
--- /dev/null
+++ b/pkgs/build-support/trivial-builders/test/write-text-file.nix
@@ -0,0 +1,34 @@
+{ writeTextFile }:
+let
+  veryWeirdName = ''here's a name with some "bad" characters, like spaces and quotes'';
+in writeTextFile {
+  name = "weird-names";
+  destination = "/etc/${veryWeirdName}";
+  text = ''passed!'';
+  checkPhase = ''
+    # intentionally hardcode everything here, to make sure
+    # Nix does not mess with file paths
+
+    name="here's a name with some \"bad\" characters, like spaces and quotes"
+    fullPath="$out/etc/$name"
+
+    if [ -f "$fullPath" ]; then
+      echo "[PASS] File exists!"
+    else
+      echo "[FAIL] File was not created at expected path!"
+      exit 1
+    fi
+
+    content=$(<"$fullPath")
+    expected="passed!"
+
+    if [ "$content" = "$expected" ]; then
+      echo "[PASS] Contents match!"
+    else
+      echo "[FAIL] File contents don't match!"
+      echo "       Expected: $expected"
+      echo "       Got:      $content"
+      exit 2
+    fi
+  '';
+}
diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index 0fb9bd939a585..2eb021236f9f5 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -1,7 +1,7 @@
 { pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gawk, gnused, gixy }:
 
 let
-  aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else prev: {};
+  aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {};
 
   writers = with lib; rec {
   # Base implementation for non-compiled executables.
diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix
index 3a8839844f118..4a58b8fb89ad7 100644
--- a/pkgs/data/icons/hicolor-icon-theme/default.nix
+++ b/pkgs/data/icons/hicolor-icon-theme/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hicolor-icon-theme-0.17";
+  pname = "hicolor-icon-theme";
+  version = "0.17";
 
   src = fetchurl {
-    url = "https://icon-theme.freedesktop.org/releases/${name}.tar.xz";
+    url = "https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-${version}.tar.xz";
     sha256 = "1n59i3al3zx6p90ff0l43gzpzmlqnzm6hf5cryxqrlbi48sq8x1i";
   };
 
diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix
new file mode 100644
index 0000000000000..14c8d36f28bf2
--- /dev/null
+++ b/pkgs/data/misc/cldr-annotations/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchzip }:
+
+let
+  version = "40.0";
+in fetchzip rec {
+  name = "cldr-annotations-${version}";
+
+  url = "https://unicode.org/Public/cldr/40/cldr-common-${version}.zip";
+
+  postFetch = ''
+    mkdir -p $out/share/unicode/cldr
+    unzip -d $out/share/unicode/cldr $downloadedFile 'common/annotations/*' 'common/annotationsDerived/*'
+  '';
+
+  sha256 = "sha256-L4NSMNFYKJWV3qKQhio9eMABtDlLieT9VeMZfzeAkbM=";
+
+  meta = with lib; {
+    description = "Names and keywords for Unicode characters from the Common Locale Data Repository";
+    homepage = "https://cldr.unicode.org";
+    license = licenses.unicode-dfs-2016;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ DeeUnderscore ];
+  };
+}
diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index 5e7e70a1b05d5..cab93d737c348 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -1,9 +1,8 @@
 { lib, fetchzip, stdenvNoCC, writeText }:
 
-let
+stdenvNoCC.mkDerivation rec {
+  pname = "iana-etc";
   version = "20211124";
-in stdenvNoCC.mkDerivation {
-  name = "iana-etc-${version}";
   src = fetchzip {
     url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
     sha256 = "sha256-4mM/ZeGd91e1AklGHFK5UB4llg9IgCo9DKcM0iXcBls=";
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 78c93b05033ef..b149f448da72e 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "tzdata";
-  version = "2021e";
+  version = "2022a";
 
   srcs =
     [ (fetchurl {
         url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
-        sha256 = "1cdjdcxl0s9xf0dg1z64kh7llm80byxqlzrkkjzcdlyh6yvl5v07";
+        sha256 = "0r0nhwpk9nyxj5kkvjy58nr5d85568m04dcb69c4y3zmykczyzzg";
       })
       (fetchurl {
         url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
-        sha256 = "0x8pcfmjvxk29yfh8bklchv2f0vpl4yih0gc4wyx292l78wncijq";
+        sha256 = "1iysv8fdkm79k8wh8jizmjmq075q4qjhk090vxjy57my6dz5wmzq";
       })
     ];
 
diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix
index b91afb08f60e0..9fe9ff78f8047 100644
--- a/pkgs/data/misc/unicode-emoji/default.nix
+++ b/pkgs/data/misc/unicode-emoji/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "12.1";
+  version = "14.0";
 
   fetchData = { file, sha256 }: fetchurl {
     url = "https://www.unicode.org/Public/emoji/${version}/${file}";
@@ -19,25 +19,17 @@ let
   };
 
   srcs = {
-    emoji-data = fetchData {
-      file = "emoji-data.txt";
-      sha256 = "17gfm5a28lsymx36prbjy2g0b27gf3rcgggy0yxdshbxwf6zpf9k";
-    };
     emoji-sequences = fetchData {
       file = "emoji-sequences.txt";
-      sha256 = "1fckw5hfyvz5jfp2jczzx8qcs79vf0zyq0z2942230j99arq70vc";
+      sha256 = "sha256-4helD/0oe+UmNIuVxPx/P0R9V10EY/RccewdeemeGxE=";
     };
     emoji-test = fetchData {
       file = "emoji-test.txt";
-      sha256 = "0w29lva7gp9g9lf7bz1i24qdalvf440bcq8npsbwr3cpp7na95kh";
-    };
-    emoji-variation-sequences = fetchData {
-      file = "emoji-variation-sequences.txt";
-      sha256 = "0akpib3cinr8xcs045hda5wnpfj6qfdjlkzmq5vgdc50gyhrd2z3";
+      sha256 = "sha256-DDOVhnFzfvowINzBZ7dGYMZnL4khyRWVzrLL95djsUg=";
     };
     emoji-zwj-sequences = fetchData {
       file = "emoji-zwj-sequences.txt";
-      sha256 = "0s2mvy1nr2v1x0rr1fxlsv8ly1vyf9978rb4hwry5vnr678ls522";
+      sha256 = "sha256-owlGLICFkyEsIHz/DUZucxjBmgVO40A69BCJPbIYDA0=";
     };
   };
 in
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
index 1c6e57b3e7a73..6be2e89dcd2ef 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "docbook-xml-ebnf-1.2b1";
+stdenv.mkDerivation rec {
+  pname = "docbook-xml-ebnf";
+  version = "1.2b1";
 
   dtd = fetchurl {
-    url = "http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd";
+    url = "https://docbook.org/xml/ebnf/${version}/dbebnf.dtd";
     sha256 = "0min5dsc53my13b94g2yd65q1nkjcf4x1dak00bsc4ckf86mrx95";
   };
   catalog = ./docbook-ebnf.cat;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
index 8a10defa0fb53..c367e2a1d0cdf 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
@@ -1,27 +1,22 @@
 {lib, stdenv, fetchurl, unzip, findXMLCatalogs}:
 
 let
-
   # Urgh, DocBook 4.1.2 doesn't come with an XML catalog.  Use the one
   # from 4.2.
   docbook42catalog = fetchurl {
-    url = "http://www.docbook.org/xml/4.2/catalog.xml";
+    url = "https://docbook.org/xml/4.2/catalog.xml";
     sha256 = "18lhp6q2l0753s855r638shkbdwq9blm6akdjsc9nrik24k38j17";
   };
-
 in
 
 import ./generic.nix {
   inherit lib stdenv unzip findXMLCatalogs;
-  name = "docbook-xml-4.1.2";
+  version = "4.1.2";
   src = fetchurl {
-    url = "http://www.docbook.org/xml/4.1.2/docbkx412.zip";
+    url = "https://docbook.org/xml/4.1.2/docbkx412.zip";
     sha256 = "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h";
   };
   postInstall = "
     sed 's|V4.2|V4.1.2|g' < ${docbook42catalog} > catalog.xml
   ";
-  meta = {
-    branch = "4.1.2";
-  };
 }
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
index 9a9abc0588bd9..8f778ea7505d9 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
@@ -2,12 +2,9 @@
 
 import ./generic.nix {
   inherit lib stdenv unzip findXMLCatalogs;
-  name = "docbook-xml-4.2";
+  version = "4.2";
   src = fetchurl {
-    url = "http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip";
+    url = "https://docbook.org/xml/4.2/docbook-xml-4.2.zip";
     sha256 = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2";
   };
-  meta = {
-    branch = "4.2";
-  };
 }
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
index 4d821ce2ffb85..a58370ec4ac66 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
@@ -2,12 +2,9 @@
 
 import ./generic.nix {
   inherit lib stdenv unzip findXMLCatalogs;
-  name = "docbook-xml-4.3";
+  version = "4.3";
   src = fetchurl {
-    url = "http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip";
+    url = "https://docbook.org/xml/4.3/docbook-xml-4.3.zip";
     sha256 = "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3";
   };
-  meta = {
-    branch = "4.3";
-  };
 }
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
index ca847d3e436ea..3b46fe81bd7a8 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
@@ -2,12 +2,9 @@
 
 import ./generic.nix {
   inherit lib stdenv unzip findXMLCatalogs;
-  name = "docbook-xml-4.4";
+  version = "4.4";
   src = fetchurl {
-    url = "http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip";
+    url = "https://docbook.org/xml/4.4/docbook-xml-4.4.zip";
     sha256 = "141h4zsyc71sfi2zzd89v4bb4qqq9ca1ri9ix2als9f4i3mmkw82";
   };
-  meta = {
-    branch = "4.4";
-  };
 }
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
index 7be810fe30712..c4ab1f6f3a9bd 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
@@ -2,12 +2,9 @@
 
 import ./generic.nix {
   inherit lib stdenv unzip findXMLCatalogs;
-  name = "docbook-xml-4.5";
+  version = "4.5";
   src = fetchurl {
-    url = "http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip";
+    url = "https://docbook.org/xml/4.5/docbook-xml-4.5.zip";
     sha256 = "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf";
   };
-  meta = {
-    branch = "4.5";
-  };
 }
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
index 3d6edd300ec35..7a635f612af8f 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
@@ -1,9 +1,10 @@
-{ lib, stdenv, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }:
+{ lib, stdenv, unzip, src, version, postInstall ? "true", findXMLCatalogs }:
 
 stdenv.mkDerivation {
-  inherit src name postInstall;
+  inherit version src postInstall;
+  pname = "docbook-xml";
 
-  nativeBuildInputs = [unzip];
+  nativeBuildInputs = [ unzip ];
   propagatedNativeBuildInputs = [ findXMLCatalogs ];
 
   unpackPhase = ''
@@ -17,7 +18,8 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = meta // {
+  meta = {
+    branch = version;
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
index c698098e6c127..f05788076a69d 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libxml2 }:
 
 stdenv.mkDerivation {
-  name = "xhtml1-20020801";
+  pname = "xhtml1";
+  version = "unstable-2002-08-01";
 
   src = fetchurl {
-    url = "http://www.w3.org/TR/xhtml1/xhtml1.tgz";
+    url = "https://www.w3.org/TR/xhtml1/xhtml1.tgz";
     sha256 = "0rr0d89i0z75qvjbm8il93bippx09hbmjwy0y2sj44n9np69x3hl";
   };
 
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
index 1e7d726d557c6..0c636ffa54177 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
@@ -5,11 +5,11 @@ with lib;
 let
   inherit (python2.pkgs) python pygobject2 pygtk dbus-python;
 in stdenv.mkDerivation rec {
-  version = "2.28";
-  name = "gnome-python-${version}.1";
+  pname = "gnome-python";
+  version = "2.28.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-python/${version}/${name}.tar.bz2";
+    url = "mirror://gnome/sources/gnome-python/${lib.versions.majorMinor version}/gnome-python-${version}.tar.bz2";
     sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8";
   };
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   # gnome-python expects that .pth file is already installed by PyGTK in the
   # same directory. This is not the case for Nix.
   postInstall = ''
-    echo "gtk-2.0" > $out/${python2.sitePackages}/${name}.pth
+    echo "gtk-2.0" > $out/${python2.sitePackages}/gnome-python-${version}.pth
   '';
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index a8ff7b58ed30f..29dbbdd2f12d2 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -62,7 +62,7 @@ lib.makeScope pkgs.newScope (self: with self; {
     autoreconfHook = pkgs.autoreconfHook269;
   };
 
-} // lib.optionalAttrs (config.allowAliases or true) {
+} // lib.optionalAttrs config.allowAliases {
   inherit (pkgs)
     # GTK Libs
     glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
index 258789140c8d5..521800b4aa07d 100644
--- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
@@ -1,9 +1,11 @@
-{stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}:
+{ lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext }:
+
+stdenv.mkDerivation rec {
+  pname = "scrollkeeper";
+  version = "0.3.14";
 
-stdenv.mkDerivation {
-  name = "scrollkeeper-0.3.14";
   src = fetchurl {
-    url = "mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2";
+    url = "mirror://gnome/sources/scrollkeeper/${lib.versions.majorMinor version}/scrollkeeper-${version}.tar.bz2";
     sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
index bf5ae4ebbb1a5..a45095ba49780 100644
--- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib, libIDL, libintl }:
 
 stdenv.mkDerivation rec {
-  name = "ORBit2-${minVer}.19";
-  minVer = "2.14";
+  pname = "ORBit2";
+  version = "2.14.19";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/ORBit2/${minVer}/${name}.tar.bz2";
+    url = "mirror://gnome/sources/ORBit2/${lib.versions.majorMinor version}/ORBit2-${version}.tar.bz2";
     sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
index 54a2bd526a945..eba913c80c2d9 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, which }:
+{ lib, stdenv, fetchurl, which }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-common-${minVer}.0";
-  minVer = "2.34";
+  pname = "gnome-common";
+  version = "2.34.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-common/${minVer}/${name}.tar.bz2";
+    url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/gnome-common-${version}.tar.bz2";
     sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix
index d5af0e362b435..1604dbe0cf08f 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix
@@ -1,9 +1,10 @@
-{stdenv, fetchurl, intltool}:
+{ lib, stdenv, fetchurl, intltool }:
 
-stdenv.mkDerivation {
-  name = "gnome-mime-data-2.18.0";
+stdenv.mkDerivation rec {
+  pname = "gnome-mime-data";
+  version = "2.18.0";
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2";
+    url = "mirror://gnome/sources/gnome-mime-data/${lib.versions.majorMinor version}/gnome-mime-data-${version}.tar.bz2";
     sha256 = "1mvg8glb2a40yilmyabmb7fkbzlqd3i3d31kbkabqnq86xdnn69p";
   };
   nativeBuildInputs = [ intltool ];
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index 4196cf21c2742..4c9f28230c31e 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib
 , glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-vfs-${minVer}.4";
-  minVer = "2.24";
+  pname = "gnome-vfs";
+  version = "2.24.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-vfs/${minVer}/${name}.tar.bz2";
+    url = "mirror://gnome/sources/gnome-vfs/${lib.versions.majorMinor version}/gnome-vfs-${version}.tar.bz2";
     sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
index ec87bafc99808..4f4e0503f819b 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchurl, pkg-config, gtk2, intltool,
+{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool,
 GConf, enchant, isocodes, gnome-icon-theme }:
 
 stdenv.mkDerivation rec {
-  name = "gtkhtml-3.32.2";
+  pname = "gtkhtml";
+  version = "3.32.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtkhtml/3.32/${name}.tar.bz2";
+    url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/gtkhtml-${version}.tar.bz2";
     sha256 = "17z3jwvpn8waz7bhwrk7a6vs9pad6sqmlxxcqwvxxq89ywy0ail7";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
index 4e9376d5c8242..61b21ba88c015 100644
--- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl, flex, bison, pkg-config, glib, gettext}:
+{ lib, stdenv, fetchurl, flex, bison, pkg-config, glib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "libIDL-${minVer}.14";
-  minVer = "0.8";
+  pname = "libIDL";
+  version = "0.8.14";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libIDL/${minVer}/${name}.tar.bz2";
+    url = "mirror://gnome/sources/libIDL/${lib.versions.majorMinor version}/libIDL-${version}.tar.bz2";
     sha256 = "08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
index 7b1ccb97dc4b0..80ea3d02d939c 100644
--- a/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
@@ -1,9 +1,10 @@
-{stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libart_lgpl-2.3.21";
+  pname = "libart_lgpl";
+  version = "2.3.21";
   src = fetchurl {
-    url = "mirror://gnome/sources/libart_lgpl/2.3/${name}.tar.bz2";
+    url = "mirror://gnome/sources/libart_lgpl/${lib.versions.majorMinor version}/libart_lgpl-${version}.tar.bz2";
     sha256 = "1yknfkyzgz9s616is0l9gp5aray0f2ry4dw533jgzj8gq5s1xhgx";
   };
 }
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
index 8d991d743bec9..e928052a47642 100644
--- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, flex, bison, pkg-config, glib, libxml2, popt
+{ lib, stdenv, fetchurl, flex, bison, pkg-config, glib, libxml2, popt
 , intltool, ORBit2, procps }:
 
 stdenv.mkDerivation rec {
-  name = "libbonobo-${minVer}.1";
-  minVer = "2.32";
+  pname = "libbonobo";
+  version = "2.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libbonobo/${minVer}/${name}.tar.bz2";
+    url = "mirror://gnome/sources/libbonobo/${lib.versions.majorMinor version}/libbonobo-${version}.tar.bz2";
     sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
index 4f9176acf103e..36ab293f5f12e 100644
--- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, bison, pkg-config, popt, libxml2, gtk2, libtool
+{ lib, stdenv, fetchurl, bison, pkg-config, popt, libxml2, gtk2, libtool
 , intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
 
 stdenv.mkDerivation rec {
-  name = "libbonoboui-${minVer}.5";
-  minVer = "2.24";
+  pname = "libbonoboui";
+  version = "2.24.5";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libbonoboui/${minVer}/${name}.tar.bz2";
+    url = "mirror://gnome/sources/libbonoboui/${lib.versions.majorMinor version}/libbonoboui-${version}.tar.bz2";
     sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix
index 3eb7b533f09e3..3ed162cd8d5ee 100644
--- a/pkgs/desktops/gnome-2/platform/libglade/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix
@@ -2,11 +2,12 @@
 
 assert withLibgladeConvert -> python2 != null;
 
-stdenv.mkDerivation {
-  name = "libglade-2.6.4";
+stdenv.mkDerivation rec {
+  pname = "libglade";
+  version = "2.6.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2";
+    url = "mirror://gnome/sources/libglade/${lib.versions.majorMinor version}/libglade-${version}.tar.bz2";
     sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
index ee477cb63c1b6..2c70338a9005a 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, pkg-config, glib, popt, zlib, libcanberra-gtk2
+{ lib, stdenv, fetchurl, pkg-config, glib, popt, zlib, libcanberra-gtk2
 , intltool, libbonobo, GConf, gnome_vfs, libtool, libogg
 }:
 
 stdenv.mkDerivation rec {
-  name = "libgnome-${minVer}.1";
-  minVer = "2.32";
+  pname = "libgnome";
+  version = "2.32.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgnome/${minVer}/${name}.tar.bz2";
+    url = "mirror://gnome/sources/libgnome/${lib.versions.majorMinor version}/libgnome-${version}.tar.bz2";
     sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
index eb40c5ec0b5b4..b856442290a4a 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkg-config, gtk2, intltool, libart_lgpl, libglade }:
+{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, libart_lgpl, libglade }:
 
 stdenv.mkDerivation rec {
-  name = "libgnomecanvas-${minVer}.3";
-  minVer = "2.30";
+  pname = "libgnomecanvas";
+  version = "2.30.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgnomecanvas/${minVer}/${name}.tar.bz2";
+    url = "mirror://gnome/sources/libgnomecanvas/${lib.versions.majorMinor version}/libgnomecanvas-${version}.tar.bz2";
     sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
index 2811a138cb631..9cc2d169b7c39 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, pkg-config, libgnomecanvas, gtkmm2 }:
+{ lib, stdenv, fetchurl, pkg-config, libgnomecanvas, gtkmm2 }:
 
-stdenv.mkDerivation {
-  name = "libgnomecanvasmm-2.26.0";
+stdenv.mkDerivation rec {
+  pname = "libgnomecanvasmm";
+  version = "2.26.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgnomecanvasmm/2.26/libgnomecanvasmm-2.26.0.tar.bz2";
+    url = "mirror://gnome/sources/libgnomecanvasmm/${lib.versions.majorMinor version}/libgnomecanvasmm-${version}.tar.bz2";
     sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
index 7e33ee91285f0..42de8c2471a3b 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl }:
+{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl }:
 
 stdenv.mkDerivation rec {
-  name = "libgnomecups-0.2.3";
+  pname = "libgnomecups";
+  version = "0.2.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgnomecups/0.2/${name}.tar.bz2";
+    url = "mirror://gnome/sources/libgnomecups/${lib.versions.majorMinor version}/libgnomecups-${version}.tar.bz2";
     sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
index b67be2b7f5b20..bb2e435f422d0 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
@@ -2,10 +2,11 @@
 , libgnomecups, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "libgnomeprint-2.18.8";
+  pname = "libgnomeprint";
+  version = "2.18.8";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgnomeprint/2.18/${name}.tar.bz2";
+    url = "mirror://gnome/sources/libgnomeprint/${lib.versions.majorMinor version}/libgnomeprint-${version}.tar.bz2";
     sha256 = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
index 80d2c2050afea..a95ee70bca107 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
@@ -1,10 +1,11 @@
-{stdenv, fetchurl, pkg-config, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme}:
+{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme }:
 
-stdenv.mkDerivation {
-  name = "libgnomeprintui-2.18.6";
+stdenv.mkDerivation rec {
+  pname = "libgnomeprintui";
+  version = "2.18.6";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2";
+    url = "mirror://gnome/sources/libgnomeprintui/${lib.versions.majorMinor version}/libgnomeprintui-${version}.tar.bz2";
     sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
index 0fa3847d9bdab..0a84e0ea3ec58 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango
 , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
 , gnome_vfs, libgnome-keyring, libglade }:
 
 stdenv.mkDerivation rec {
-  name = "libgnomeui-${minVer}.5";
-  minVer = "2.24";
+  pname = "libgnomeui";
+  version = "2.24.5";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgnomeui/${minVer}/${name}.tar.bz2";
+    url = "mirror://gnome/sources/libgnomeui/${lib.versions.majorMinor version}/libgnomeui-${version}.tar.bz2";
     sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
index e7cf117ecdbcc..9c7189c117ac8 100644
--- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
@@ -1,10 +1,11 @@
-{stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2 }:
+{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2 }:
 
-stdenv.mkDerivation {
-  name = "libgtkhtml-2.11.1";
+stdenv.mkDerivation rec {
+  pname = "libgtkhtml";
+  version = "2.11.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgtkhtml/2.11/libgtkhtml-2.11.1.tar.bz2";
+    url = "mirror://gnome/sources/libgtkhtml/${lib.versions.majorMinor version}/libgtkhtml-${version}.tar.bz2";
     sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw";
   };
 
diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix
index 08baf9022f71d..9a152921994d2 100644
--- a/pkgs/desktops/gnome/core/eog/default.nix
+++ b/pkgs/desktops/gnome/core/eog/default.nix
@@ -38,6 +38,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-+zW/tRZ6QhIfWae5t6wNdbvQUXua/W2Rgx6E01c13fg=";
   };
 
+  patches = [
+    # Fix path to libeog.so in the gir file.
+    # We patch gobject-introspection to hardcode absolute paths but
+    # our Meson patch will only pass the info when install_dir is absolute as well.
+    ./fix-gir-lib-path.patch
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
diff --git a/pkgs/desktops/gnome/core/eog/fix-gir-lib-path.patch b/pkgs/desktops/gnome/core/eog/fix-gir-lib-path.patch
new file mode 100644
index 0000000000000..eb087b58a3176
--- /dev/null
+++ b/pkgs/desktops/gnome/core/eog/fix-gir-lib-path.patch
@@ -0,0 +1,13 @@
+diff --git a/src/meson.build b/src/meson.build
+index cc9d3856..f909836d 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -165,7 +165,7 @@ libeog = shared_library(
+   link_args: ldflags,
+   link_depends: symbol_map,
+   install: true,
+-  install_dir: eog_pkglibdir,
++  install_dir: eog_prefix / eog_pkglibdir,
+ )
+ 
+ libeog_dep = declare_dependency(
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 1fc15fc6406f1..1809604bec521 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -278,7 +278,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   gnome-autoar = callPackage ./misc/gnome-autoar { };
 
   gnome-packagekit = callPackage ./misc/gnome-packagekit { };
-}) // lib.optionalAttrs (config.allowAliases or true) {
+}) // lib.optionalAttrs config.allowAliases {
 #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
 
   gnome-desktop = pkgs.gnome-desktop; # added 2022-03-16
diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix
index 7bc997a4bf1ae..6e60854853060 100644
--- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix
+++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-arcmenu";
-  version = "24";
+  version = "27";
 
   src = fetchFromGitLab {
     owner = "arcmenu";
     repo = "ArcMenu";
     rev = "v${version}";
-    sha256 = "sha256-GbZt6JC+uAPkb4GU1Q7WRJ6Pf95Uh48cYwvoTgLimHs=";
+    sha256 = "sha256-X5oA475Wl3SKVLLcg47Hv91VV8HGeNHhaQLfNi3xt8k=";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix
index d01c28be92c63..2fb5216467be6 100644
--- a/pkgs/desktops/gnome/extensions/default.nix
+++ b/pkgs/desktops/gnome/extensions/default.nix
@@ -69,7 +69,7 @@ in rec {
     (lib.attrValues)
     (mapReadableNames)
     # Add some aliases
-    (extensions: extensions // lib.optionalAttrs (config.allowAliases or true) {
+    (extensions: extensions // lib.optionalAttrs config.allowAliases {
       unite-shell = gnomeExtensions.unite; # added 2021-01-19
       arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14
       disable-unredirect = gnomeExtensions.disable-unredirect-fullscreen-windows; # added 2021-11-20
diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix
index d770acfec16f9..216a1d4c77de4 100644
--- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix
@@ -1,20 +1,19 @@
-{ lib, stdenv, substituteAll, fetchFromGitHub, fetchpatch, glib, glib-networking, libgtop, gnome }:
+{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-system-monitor";
-  version = "unstable-2021-09-07";
+  version = "unstable-2022-02-04";
 
   src = fetchFromGitHub {
     owner = "paradoxxxzero";
     repo = "gnome-shell-system-monitor-applet";
-    rev = "133f9f32bca5d159515d709bbdee81bf497ebdc5";
-    sha256 = "1vz1s1x22xmmzaayrzv5jyzlmxslhfaybbnv959szvfp4mdrhch9";
+    rev = "2c6eb0a447bfc9f1a07c61956c92a55c874baf16";
+    hash = "sha256-JuRRlvqlqneqUdgezKGl2yg7wFYGCCo51q9CBwrxTBY=";
   };
 
-  buildInputs = [
+  nativeBuildInputs = [
     glib
-    glib-networking
-    libgtop
+    gnome.gnome-shell
   ];
 
   patches = [
@@ -24,25 +23,13 @@ stdenv.mkDerivation rec {
       gtop_path = "${libgtop}/lib/girepository-1.0";
       glib_net_path = "${glib-networking}/lib/girepository-1.0";
     })
-    # Support GNOME 41
-    (fetchpatch {
-      url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/718/commits/f4ebc29afa707326b977230329e634db169f55b1.patch";
-      sha256 = "0ndnla41mvrww6ldf9d55ar1ibyj8ak5pp1dkjg75jii9slgzjqb";
-    })
   ];
 
-  buildPhase = ''
-    runHook preBuild
-    glib-compile-schemas --targetdir="system-monitor@paradoxxx.zero.gmail.com/schemas" "system-monitor@paradoxxx.zero.gmail.com/schemas"
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/gnome-shell/extensions
-    cp -r "system-monitor@paradoxxx.zero.gmail.com" $out/share/gnome-shell/extensions
-    runHook postInstall
-  '';
+  makeFlags = [
+    "VERSION=${version}"
+    "INSTALLBASE=$(out)/share/gnome-shell/extensions"
+    "SUDO="
+  ];
 
   passthru = {
     extensionUuid = "system-monitor@paradoxxx.zero.gmail.com";
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index f1cd335459e70..25acfc28062b4 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , appstream
 , desktop-file-utils
@@ -28,24 +27,15 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-code";
-  version = "6.1.0";
+  version = "6.2.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "code";
     rev = version;
-    sha256 = "sha256-AXmMcPj2hf33G5v3TUg+eZwaKOdVlRvoVXglMJFHRjw=";
+    sha256 = "sha256-QhJNRhYgGbPMd7B1X3kG+pnC/lGUoF7gc7O1PdG49LI=";
   };
 
-  patches = [
-    # Fix build with meson 0.61
-    # https://github.com/elementary/code/pull/1165
-    (fetchpatch {
-      url = "https://github.com/elementary/code/commit/a2607cce3a6b1bb62d02456456d3cbc3c6530bb0.patch";
-      sha256 = "sha256-VKR83IOUYsQhBRlU9JUTlMJtXWv/AyG4wDsjMU2vmU8=";
-    })
-  ];
-
   nativeBuildInputs = [
     appstream
     desktop-file-utils
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index 7f28109ad1013..ea65a09224f5a 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -226,7 +226,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   # Please call these packages in pkgs/top-level/all-packages.nix instead of this file.
   # https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
 
-}) // lib.optionalAttrs (config.allowAliases or true) {
+}) // lib.optionalAttrs config.allowAliases {
 
   ### ALIASES
 
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 54534f63f7d1c..87f89330afe0d 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -166,7 +166,7 @@ let
         parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { };
       };
 
-    } // lib.optionalAttrs (config.allowAliases or true) {
+    } // lib.optionalAttrs config.allowAliases {
       ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
       plasma-phone-components = throw "'plasma-phone-components' has been renamed to/replaced by 'plasma-mobile'";
     };
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index f517cc6371f2f..c7b7599c31955 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.4/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index 36eea905739e1..49f77fc5ff8c9 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules,
   kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n,
   kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors,
-  kwindowsystem, kdeclarative, plasma-framework
+  kwindowsystem, kdeclarative, plasma-framework, qtx11extras
 }:
 
 mkDerivation {
@@ -12,6 +12,6 @@ mkDerivation {
   buildInputs = [
     kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n
     kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors
-    kwindowsystem kdeclarative plasma-framework
+    kwindowsystem kdeclarative plasma-framework qtx11extras
   ];
 }
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index e98a769f60fe1..fc9e97c7f6860 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -4,427 +4,427 @@
 
 {
   bluedevil = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/bluedevil-5.24.3.tar.xz";
-      sha256 = "1hlyqhn14yq7960zfjwjygkpkvbmrlsanm1g1wrr7dwbmrp5dlcx";
-      name = "bluedevil-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/bluedevil-5.24.4.tar.xz";
+      sha256 = "1mph04r6l9bxml1brwifbnk6lkjxkzxx75b3g3myzijjv6f8wxw3";
+      name = "bluedevil-5.24.4.tar.xz";
     };
   };
   breeze = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/breeze-5.24.3.tar.xz";
-      sha256 = "0h19m6wmhjw8v6ys47kgzcb0h2nb9w2fcjzypnvmkvbjbkjr53sb";
-      name = "breeze-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/breeze-5.24.4.tar.xz";
+      sha256 = "01cqji6figwb95drcq9vrqlkv7xmpn2csbi2mvixbcdawqhywsg3";
+      name = "breeze-5.24.4.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/breeze-grub-5.24.3.tar.xz";
-      sha256 = "15cpmqp7klp4dhcil3i78iff4kjasfx273v36ml8y05hm8w0igjq";
-      name = "breeze-grub-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/breeze-grub-5.24.4.tar.xz";
+      sha256 = "1p154g2x1g00iam2gkv7pml1r0b91b21s8fgrfrqg5pj45ysp5bc";
+      name = "breeze-grub-5.24.4.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/breeze-gtk-5.24.3.tar.xz";
-      sha256 = "1922s17mh4ifaqbf4b7p6yj8pwd6z3qwpbf21j1fqhmdk4pvn499";
-      name = "breeze-gtk-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/breeze-gtk-5.24.4.tar.xz";
+      sha256 = "0s51azc2xmh7agbqlm9rn39c5qh6rfwyc2dq4sfv6vspm1883zmj";
+      name = "breeze-gtk-5.24.4.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/breeze-plymouth-5.24.3.tar.xz";
-      sha256 = "0nkf0ll4hcawmkd7nrh8gcf6hhbl0ajxiz2azf9njab9pv2lcz1j";
-      name = "breeze-plymouth-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/breeze-plymouth-5.24.4.tar.xz";
+      sha256 = "038pglghl40nyq6lzydijy3wnr5agvfzddjxrf6lc9m6qapqd37v";
+      name = "breeze-plymouth-5.24.4.tar.xz";
     };
   };
   discover = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/discover-5.24.3.tar.xz";
-      sha256 = "097m5njz86vi4innap1mvizas60r1qcrdzdgsid1hd6p5a92rwca";
-      name = "discover-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/discover-5.24.4.tar.xz";
+      sha256 = "0smhys51chvjh2ij4mk03cfnq09n8cq22iag1ld9j2125l5iwa99";
+      name = "discover-5.24.4.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/drkonqi-5.24.3.tar.xz";
-      sha256 = "1n6psvr3washk796zrc8ag011fwy677h2mdkw9ijx8dhrk80br0k";
-      name = "drkonqi-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/drkonqi-5.24.4.tar.xz";
+      sha256 = "1yn7yj8nwnxm1s0si2353wl17jv7c7l5dc7833ndl56phv2999x0";
+      name = "drkonqi-5.24.4.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kactivitymanagerd-5.24.3.tar.xz";
-      sha256 = "0qxf3j36dj1yklnl27znsi9qdjmn6nr779cnzms38x76dq9kxblw";
-      name = "kactivitymanagerd-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kactivitymanagerd-5.24.4.tar.xz";
+      sha256 = "0aamfgc4bdrysq7ps134pf5v4bgiwrsxffi0nb6d8zazswgkfa41";
+      name = "kactivitymanagerd-5.24.4.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kde-cli-tools-5.24.3.tar.xz";
-      sha256 = "00z8yxic5ibk05x8c25dsc4ijvk6yv0aw1iyfhnpnzmdwdydlr7y";
-      name = "kde-cli-tools-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kde-cli-tools-5.24.4.tar.xz";
+      sha256 = "1w2rhz32xaqhmq5lyvfmjrbssqf9f35k5fk02f05fz79yk9wir7z";
+      name = "kde-cli-tools-5.24.4.tar.xz";
     };
   };
-  kdecoration = {
-    version = "5.24.3";
+  kde-gtk-config = {
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kdecoration-5.24.3.tar.xz";
-      sha256 = "0dpnaf5myn1h368cnkq9g6xfm1sqmyam6bxyidbd5j3dyy1kvz5v";
-      name = "kdecoration-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kde-gtk-config-5.24.4.tar.xz";
+      sha256 = "02spbx2rniiyvzj4qb6lgzj0f83k4vq53fk4i1m45438z7aslymi";
+      name = "kde-gtk-config-5.24.4.tar.xz";
     };
   };
-  kde-gtk-config = {
-    version = "5.24.3";
+  kdecoration = {
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kde-gtk-config-5.24.3.tar.xz";
-      sha256 = "0p50kf34csdrgck1y09d3lnz0r9ly0ca4778achrc59yr4qcsjzv";
-      name = "kde-gtk-config-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kdecoration-5.24.4.tar.xz";
+      sha256 = "05ccyb314mxf0d4ivj71l9lh13s3fqr7f4d2rmg6qshsql39569c";
+      name = "kdecoration-5.24.4.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kdeplasma-addons-5.24.3.tar.xz";
-      sha256 = "0g7jcvd6abnlzz9ibnc7phzm58pn6dv3795w4hhy47738jkhizl6";
-      name = "kdeplasma-addons-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kdeplasma-addons-5.24.4.tar.xz";
+      sha256 = "03b8d3kdzwpyqrqkmpswryksrhav3mwcnbyzdc3g2kpk2qnx68fp";
+      name = "kdeplasma-addons-5.24.4.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kgamma5-5.24.3.tar.xz";
-      sha256 = "0rwqvz14a50s43p74n19v1zzd9y8f2lylfappxmhrdyxmbgkpnk6";
-      name = "kgamma5-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kgamma5-5.24.4.tar.xz";
+      sha256 = "0z1zrw5id455idjbaqracs1vcwgs93an7w27ggfqs6i8nabrivbk";
+      name = "kgamma5-5.24.4.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/khotkeys-5.24.3.tar.xz";
-      sha256 = "1jxg91rpz09sh13fz270pxfw40qdy6p50j5xw7cpnyqlk2l5zx0p";
-      name = "khotkeys-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/khotkeys-5.24.4.tar.xz";
+      sha256 = "033dgz8wbsw2nj133hnmygz1izmcpxdn80jbjbm66nhbbyq7bb2s";
+      name = "khotkeys-5.24.4.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kinfocenter-5.24.3.tar.xz";
-      sha256 = "08z2044bl0v4ydlx2chv849y6m4py0yd4lnw76sycd14lnvsrxfj";
-      name = "kinfocenter-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kinfocenter-5.24.4.tar.xz";
+      sha256 = "0f5q6ajyd794p1z9j3il8sajlqkdcnf06xq4612qxdp49nb88nyw";
+      name = "kinfocenter-5.24.4.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kmenuedit-5.24.3.tar.xz";
-      sha256 = "1yivrdix4jiycfbw9g6pzx8zkmdq4g8g51ndc7sy3r0qxzgx1icb";
-      name = "kmenuedit-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kmenuedit-5.24.4.tar.xz";
+      sha256 = "0ril8jxqkaavc4bkpksnyxn3bww7b81gnp9bnb17acrr2nd7wyhl";
+      name = "kmenuedit-5.24.4.tar.xz";
     };
   };
   kscreen = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kscreen-5.24.3.tar.xz";
-      sha256 = "1wjbd33h8473v8i5qxdccxrsv04v6jyd7scrqdxqaln9n8ylp08f";
-      name = "kscreen-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kscreen-5.24.4.tar.xz";
+      sha256 = "0shvhymdfxw1gz49y1s79zik9kkg5qh0mqdj6dx0s6r3w6vysj1h";
+      name = "kscreen-5.24.4.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kscreenlocker-5.24.3.tar.xz";
-      sha256 = "1dh3z55hwakj11ffn2fm79vnlw7gcg1nkcxbxvcdcpq84ahpq583";
-      name = "kscreenlocker-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kscreenlocker-5.24.4.tar.xz";
+      sha256 = "1xzc80awsapsg65kk21ssp7y0jb374k1w2bb7gvzj8j40rrn48pv";
+      name = "kscreenlocker-5.24.4.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/ksshaskpass-5.24.3.tar.xz";
-      sha256 = "0ivq9nyyqm1rrm6ck26jlsh8qv9q98dz5qwvcnpgpmxb3mr1dgiv";
-      name = "ksshaskpass-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/ksshaskpass-5.24.4.tar.xz";
+      sha256 = "1pa41w793dbi3rv6mm1a4xp46n80qwdpdlwhi6z4x76hjvqx9i9l";
+      name = "ksshaskpass-5.24.4.tar.xz";
     };
   };
   ksystemstats = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/ksystemstats-5.24.3.tar.xz";
-      sha256 = "03ikpd3m0qk8cb92g63i7q9c8bks7ggf1pmmig559cmg7gbknc2c";
-      name = "ksystemstats-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/ksystemstats-5.24.4.tar.xz";
+      sha256 = "1pa7xrw5ij32bm66pn72zkzz8y70fq71n4kigm9ixc1s2glkbiwd";
+      name = "ksystemstats-5.24.4.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kwallet-pam-5.24.3.tar.xz";
-      sha256 = "0zxdrpjq8sg3qw2gfkvjs567b41labi940cq4qrix395v7251p9k";
-      name = "kwallet-pam-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kwallet-pam-5.24.4.tar.xz";
+      sha256 = "0s6z7ds42a7kba25jd7pzylw7d2mc27xgymmdrpkg2afqanf3m4r";
+      name = "kwallet-pam-5.24.4.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kwayland-integration-5.24.3.tar.xz";
-      sha256 = "1kq5vrrplbdxri8610h89apfz07a6xi1gnlvmr8gbsvas5zicvwz";
-      name = "kwayland-integration-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kwayland-integration-5.24.4.tar.xz";
+      sha256 = "1cnfb81yv6m37m2kyk523skqbk5in1kpbpxq60ivjri91sm4pryj";
+      name = "kwayland-integration-5.24.4.tar.xz";
     };
   };
   kwayland-server = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kwayland-server-5.24.3.tar.xz";
-      sha256 = "0fq61qk3cp4xg9759ylqqw5ncx9s7kayjf0bilg5m725bfhj02sn";
-      name = "kwayland-server-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kwayland-server-5.24.4.tar.xz";
+      sha256 = "1279nqhy1qyz84dkn23rvzak8bg71hbrp09jlhv9mkjdb3bhnyfi";
+      name = "kwayland-server-5.24.4.tar.xz";
     };
   };
   kwin = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kwin-5.24.3.tar.xz";
-      sha256 = "0szlrcsj4h4fa5yf27nmza7c4dyc0xcwdrihs05pl5qk5bivfkfq";
-      name = "kwin-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kwin-5.24.4.tar.xz";
+      sha256 = "1qwcd6iw6yvpchiwmvq5nwsr465jmrmscf286mjrc65im4hj6572";
+      name = "kwin-5.24.4.tar.xz";
     };
   };
   kwrited = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kwrited-5.24.3.tar.xz";
-      sha256 = "1sgd3iik647pz2zr5cpsbwm2ll8f11xyw2jv2sfxkbiiw53qaxid";
-      name = "kwrited-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kwrited-5.24.4.tar.xz";
+      sha256 = "0j86ih4g762a94cyzilcbigh7iv04a80bqrlxm02fbqhffv01mv2";
+      name = "kwrited-5.24.4.tar.xz";
     };
   };
   layer-shell-qt = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/layer-shell-qt-5.24.3.tar.xz";
-      sha256 = "0h3xlvmgyxyzxvazgbbn0a9l14hg5d38cl9hclnwmrnpwbn0bqax";
-      name = "layer-shell-qt-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/layer-shell-qt-5.24.4.tar.xz";
+      sha256 = "03qyf6pvk36ig6ilimq02q19frdlsmrkbng2iz3d59k15zdrz5x0";
+      name = "layer-shell-qt-5.24.4.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/libkscreen-5.24.3.tar.xz";
-      sha256 = "18777lwn5j0isc347dks25731byyfdyls79lj6hnxqb6807lz1x6";
-      name = "libkscreen-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/libkscreen-5.24.4.tar.xz";
+      sha256 = "1xv7vml5lxj1lnansisfbfym35h265ggwsyjplz76aibj5nyqv81";
+      name = "libkscreen-5.24.4.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/libksysguard-5.24.3.tar.xz";
-      sha256 = "18piiy24rd5fzvp4cnhgx0d4x4m6fnxx01zm1mx0sh676g7m31hl";
-      name = "libksysguard-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/libksysguard-5.24.4.tar.xz";
+      sha256 = "00i4l2kc02wymmiqh7wam8dp4h9hvn8nsxfv258waq7pnxzjmnkn";
+      name = "libksysguard-5.24.4.tar.xz";
     };
   };
   milou = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/milou-5.24.3.tar.xz";
-      sha256 = "06xx4afym92hfpvbiqrv7mx30bdm3dhdfn8vki5zxq2k0rv0pmri";
-      name = "milou-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/milou-5.24.4.tar.xz";
+      sha256 = "0z7kmygvjzj30llwg8gpibjja2gzc09nh9pxrpy78pa1jxnas29i";
+      name = "milou-5.24.4.tar.xz";
     };
   };
   oxygen = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/oxygen-5.24.3.tar.xz";
-      sha256 = "02j0drc24mf2pfhdgzri5sdcscq1bbj4lhhmhp6bn1v74wybv381";
-      name = "oxygen-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/oxygen-5.24.4.tar.xz";
+      sha256 = "1d3sz2qc1cz9x6g04r0scvw9fmrazfn5v3iav4cn7wdkz8x06kc0";
+      name = "oxygen-5.24.4.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-browser-integration-5.24.3.tar.xz";
-      sha256 = "1msib3c8arybqbv1vfj1ijx74a34a02hn8gvjy4sf95zcl07mc20";
-      name = "plasma-browser-integration-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-browser-integration-5.24.4.tar.xz";
+      sha256 = "1havd775d4x2y36nkba2k6vdf839dspk10mxccnk2wkhdxmzfyk7";
+      name = "plasma-browser-integration-5.24.4.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-desktop-5.24.3.tar.xz";
-      sha256 = "1lwizprs6nk6nibydwkwmpi9c7c50lvg2k188pb6ddz2sb7pwgjq";
-      name = "plasma-desktop-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-desktop-5.24.4.tar.xz";
+      sha256 = "09fhqz2sp4caabr1li1shjd8l052vp4d10ci7pwsqj8f61331qmh";
+      name = "plasma-desktop-5.24.4.tar.xz";
     };
   };
   plasma-disks = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-disks-5.24.3.tar.xz";
-      sha256 = "0nklcimxyvci3xa6nc5jxbcxds4a14vkkwihgc6xfpc7xcca0wcy";
-      name = "plasma-disks-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-disks-5.24.4.tar.xz";
+      sha256 = "1mi5fp3305kjw41zhbccxyg666gcmmrvckipjhnnnfwd3gl372ng";
+      name = "plasma-disks-5.24.4.tar.xz";
     };
   };
   plasma-firewall = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-firewall-5.24.3.tar.xz";
-      sha256 = "0r7gh3asnc5lbfsp1jb33lmgcxfpjmlrqlyz41g0wv9aj9x6pwxz";
-      name = "plasma-firewall-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-firewall-5.24.4.tar.xz";
+      sha256 = "0f9g5m2ddbp2axfxqc4d92fzg6r4z1l56i6nsry6nlz6cqky3fm2";
+      name = "plasma-firewall-5.24.4.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-integration-5.24.3.tar.xz";
-      sha256 = "031w205icblf50ps7bw7wp5q4azbqpcp4bnig2wh5d1lc8xqzvvs";
-      name = "plasma-integration-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-integration-5.24.4.tar.xz";
+      sha256 = "1d2d7cmhdhmdzs91vpc2p3fg413daqhqilp8d2qbpsks5hyrkm3k";
+      name = "plasma-integration-5.24.4.tar.xz";
     };
   };
   plasma-mobile = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-mobile-5.24.3.tar.xz";
-      sha256 = "1bwmy7xvd8wmh0snqqjh9jjgawib8ks2g30w48sqxwhplhf3da58";
-      name = "plasma-mobile-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-mobile-5.24.4.tar.xz";
+      sha256 = "1hgcnb4flw224j57fxkhaiwapymq6ccjwqj8s6jgqzc3ax0py0vr";
+      name = "plasma-mobile-5.24.4.tar.xz";
     };
   };
   plasma-nano = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-nano-5.24.3.tar.xz";
-      sha256 = "13jxhfi3c3dhg7zdyfqnsii661h1am0w9dsv82dalqvwr1mw28l5";
-      name = "plasma-nano-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-nano-5.24.4.tar.xz";
+      sha256 = "1fdq4r5zlkf3qb0a47zv3apgnqs4gqqfj8pdlcmzkyn9xykzs9vw";
+      name = "plasma-nano-5.24.4.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-nm-5.24.3.tar.xz";
-      sha256 = "1z9vzj2mbvqklnjxf2izpx9s6cq097im0kz41fy4c5cjxna4xxic";
-      name = "plasma-nm-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-nm-5.24.4.tar.xz";
+      sha256 = "0bzc48vdrnd6n9qcm8ms7wrjm2yl7h9dik32arwdxx56vb7jhv08";
+      name = "plasma-nm-5.24.4.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-pa-5.24.3.tar.xz";
-      sha256 = "0n87rb04izd0ix50iy2dgj6yzzr626vhpfk76lnqr57jz6fbx3z1";
-      name = "plasma-pa-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-pa-5.24.4.tar.xz";
+      sha256 = "09fkaq2zzicgr214zi2wf7cirffm7mwh55bivvafblp1wlavkrgz";
+      name = "plasma-pa-5.24.4.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-sdk-5.24.3.tar.xz";
-      sha256 = "0g6nypqsbmsp9msixd7p25lk58zismdamkp41f5lx3cbb49x1fpr";
-      name = "plasma-sdk-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-sdk-5.24.4.tar.xz";
+      sha256 = "1zkggp9a1yz5mwwvndizwlan6wlb2fy8n940ljnhldccl91mgwzc";
+      name = "plasma-sdk-5.24.4.tar.xz";
     };
   };
   plasma-systemmonitor = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-systemmonitor-5.24.3.tar.xz";
-      sha256 = "17a3q1az4d3xpk2ifqsj6sz7r4apxy58kk2r2l14p6s6aszhqk4h";
-      name = "plasma-systemmonitor-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-systemmonitor-5.24.4.tar.xz";
+      sha256 = "0jcsmmg0asf2npl3f1nbzazz3i8m9b34q55088k8jjakwwxqbwhz";
+      name = "plasma-systemmonitor-5.24.4.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-tests-5.24.3.tar.xz";
-      sha256 = "1x5hr465kj3dg6c335lji2lxvp7cbn86181l78qk4l75sj1ss721";
-      name = "plasma-tests-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-tests-5.24.4.tar.xz";
+      sha256 = "1ms298h9wghj9gpi7laf1dsd7s3yiycy44k4s5v4id8vfarnbs27";
+      name = "plasma-tests-5.24.4.tar.xz";
     };
   };
   plasma-thunderbolt = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-thunderbolt-5.24.3.tar.xz";
-      sha256 = "1px5vfk37ak6hj6q3ipljj2dpazdbgdsga6nbkwcfn31708c7gjj";
-      name = "plasma-thunderbolt-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-thunderbolt-5.24.4.tar.xz";
+      sha256 = "1cqabdsg8v8b00ppbabrg2gih16lf79lr5i8mqvjnc73npacvzhy";
+      name = "plasma-thunderbolt-5.24.4.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-vault-5.24.3.tar.xz";
-      sha256 = "0f5yhz7qz4bqj7mc7hv7mvh2ji82pp02c901ws5cwwsh23yrhjcd";
-      name = "plasma-vault-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-vault-5.24.4.tar.xz";
+      sha256 = "0rj9z2c52mya2fjm4bimqz5z3lj2qg764zri6bqwrgwgsjwc4s81";
+      name = "plasma-vault-5.24.4.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-workspace-5.24.3.tar.xz";
-      sha256 = "1d1a8k75q0rdbbwkx8p1i38hc6xv9kggvfm6973lh3q0pc75qk0h";
-      name = "plasma-workspace-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-workspace-5.24.4.tar.xz";
+      sha256 = "0w7cnawnpcg5zk9bycjcnc8yfz21whrhd9h2z7hizgfnj2q403jv";
+      name = "plasma-workspace-5.24.4.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-workspace-wallpapers-5.24.3.tar.xz";
-      sha256 = "0j1qqjc27grh3k02dgfb657ps11gym28lc9hzcw3qdxkf3djw9fs";
-      name = "plasma-workspace-wallpapers-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-workspace-wallpapers-5.24.4.tar.xz";
+      sha256 = "0hpg7nn5wsn56my48jk225x1qb70sgf3hf8q5swwqc1xc6xzcg14";
+      name = "plasma-workspace-wallpapers-5.24.4.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plymouth-kcm-5.24.3.tar.xz";
-      sha256 = "196nx8h54bnnrly12zvnwl22ksr9nk2mi6g39k4xmp28agw94jv5";
-      name = "plymouth-kcm-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plymouth-kcm-5.24.4.tar.xz";
+      sha256 = "0s5h25vyk5yzipwj91rb62xzgi6aafpwikh7ibpmmh2wn71x3amr";
+      name = "plymouth-kcm-5.24.4.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.24.3";
+    version = "1-5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/polkit-kde-agent-1-5.24.3.tar.xz";
-      sha256 = "1mbr8xpjvd8w9b5nd6k8fxcnjykzzygwqk19il4wirqyh4n3k3bq";
-      name = "polkit-kde-agent-1-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/polkit-kde-agent-1-5.24.4.tar.xz";
+      sha256 = "1bc5ss6v4d7kwk1chhvpis5srs8lfypims46wgxjncyhjg2lcllm";
+      name = "polkit-kde-agent-1-5.24.4.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/powerdevil-5.24.3.tar.xz";
-      sha256 = "047h4lz8d1kdyakh5x7fr3kpk35r38z39vm7wb974rd9hjz7alj9";
-      name = "powerdevil-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/powerdevil-5.24.4.tar.xz";
+      sha256 = "0sjlx5fhfdld1i352adi2bhyd29ja9lbmzhfxgnvmpfl6q7c0w7g";
+      name = "powerdevil-5.24.4.tar.xz";
     };
   };
   qqc2-breeze-style = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/qqc2-breeze-style-5.24.3.tar.xz";
-      sha256 = "1y21ldxwlb12kfqzxpyhdw9lkcaf5sfamwhg68r512hy785sg490";
-      name = "qqc2-breeze-style-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/qqc2-breeze-style-5.24.4.tar.xz";
+      sha256 = "1d0cgsxvnm0zza7n5hz47n28yrr35hp0vniggifncm0ag8sn0kmd";
+      name = "qqc2-breeze-style-5.24.4.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/sddm-kcm-5.24.3.tar.xz";
-      sha256 = "15n6drklwk3lmiaklw1af98qcixml4w83hngy23lwwv2lbnirl6h";
-      name = "sddm-kcm-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/sddm-kcm-5.24.4.tar.xz";
+      sha256 = "0pfqp5das7pxpmh111i2dlfqm6xzzd99bcb32bbmd9v6w2wlgwxy";
+      name = "sddm-kcm-5.24.4.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/systemsettings-5.24.3.tar.xz";
-      sha256 = "11fmjdh6v0a4gacqshhrk374i07px989p3x70w8438gr6y0n2032";
-      name = "systemsettings-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/systemsettings-5.24.4.tar.xz";
+      sha256 = "0cqm7s89jvzqz1fw32284ppnm3dc69yvc8bqqgw5jdbbjnc1z4k9";
+      name = "systemsettings-5.24.4.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/xdg-desktop-portal-kde-5.24.3.tar.xz";
-      sha256 = "06qdr7j2m9s9l60mk8vspb2173va10zdv6sinhmkhxxp78h857z6";
-      name = "xdg-desktop-portal-kde-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/xdg-desktop-portal-kde-5.24.4.tar.xz";
+      sha256 = "07nwb6ff8rnlk2play9gar52d8d44b8y412hnx9a9d4b50b4js0i";
+      name = "xdg-desktop-portal-kde-5.24.4.tar.xz";
     };
   };
 }
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index b181cc29c966a..acdddd7d1e69d 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -158,7 +158,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
 
-} // lib.optionalAttrs (config.allowAliases or true) {
+} // lib.optionalAttrs config.allowAliases {
   #### ALIASES - added 2018-01
 
   terminal = xfce4-terminal;
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
index ef3e4b7219e44..68d33b657c687 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
@@ -10,9 +10,10 @@ assert (stdenv.isDarwin && stdenv.isx86_64);
 
 let cpuName = stdenv.hostPlatform.parsed.cpu.name;
     result = stdenv.mkDerivation {
-  name = if sourcePerArch.packageType == "jdk"
-    then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"
-    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}";
+  pname = if sourcePerArch.packageType == "jdk"
+    then "adoptopenjdk-${sourcePerArch.vmType}-bin"
+    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin";
+  version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}");
 
   src = fetchurl {
     inherit (sourcePerArch.${cpuName}) url sha256;
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index 39685131edd37..6fc96b4d1825e 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -33,9 +33,9 @@ let
 in
 
 let result = stdenv.mkDerivation rec {
-  name = if sourcePerArch.packageType == "jdk"
-    then "adoptopenjdk-${sourcePerArch.vmType}-bin-${version}"
-    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${version}";
+  pname = if sourcePerArch.packageType == "jdk"
+    then "adoptopenjdk-${sourcePerArch.vmType}-bin"
+    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin";
 
   version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}");
 
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix
index a26aaf771af38..d00d428a69507 100644
--- a/pkgs/development/compilers/gcc/10/default.nix
+++ b/pkgs/development/compilers/gcc/10/default.nix
@@ -8,12 +8,7 @@
 , profiledCompiler ? false
 , langJit ? false
 , staticCompiler ? false
-, # N.B. the defult is intentionally not from an `isStatic`. See
-  # https://gcc.gnu.org/install/configure.html - this is about target
-  # platform libraries not host platform ones unlike normal. But since
-  # we can't rebuild those without also rebuilding the compiler itself,
-  # we opt to always build everything unlike our usual policy.
-  enableShared ? true
+, enableShared ? !stdenv.targetPlatform.isStatic
 , enableLTO ? !stdenv.hostPlatform.isStatic
 , texinfo ? null
 , perl ? null # optional, for texi2pod (then pod2man)
@@ -61,8 +56,8 @@ let majorVersion = "10";
 
     inherit (stdenv) buildPlatform hostPlatform targetPlatform;
 
-    patches =
-         optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
+    patches = [ ./gcc10-asan-glibc-2.34.patch ]
+      ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch
       /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
@@ -266,7 +261,7 @@ stdenv.mkDerivation ({
   };
 
   enableParallelBuilding = true;
-  inherit enableMultilib;
+  inherit enableMultilib enableShared;
 
   inherit (stdenv) is64bit;
 
diff --git a/pkgs/development/compilers/gcc/10/gcc10-asan-glibc-2.34.patch b/pkgs/development/compilers/gcc/10/gcc10-asan-glibc-2.34.patch
new file mode 100644
index 0000000000000..d6d4f41ffdf87
--- /dev/null
+++ b/pkgs/development/compilers/gcc/10/gcc10-asan-glibc-2.34.patch
@@ -0,0 +1,70 @@
+From 950bac27d63c1c2ac3a6ed867692d6a13f21feb3 Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <jakub@redhat.com>
+Date: Sat, 17 Apr 2021 11:27:14 +0200
+Subject: [PATCH] sanitizer: Fix asan against glibc 2.34 [PR100114]
+
+As mentioned in the PR, SIGSTKSZ is no longer a compile time constant in
+glibc 2.34 and later, so
+static const uptr kAltStackSize = SIGSTKSZ * 4;
+needs dynamic initialization, but is used by a function called indirectly
+from .preinit_array and therefore before the variable is constructed.
+This results in using 0 size instead and all asan instrumented programs
+die with:
+==91==ERROR: AddressSanitizer failed to allocate 0x0 (0) bytes of SetAlternateSignalStack (error code: 22)
+
+Here is a cherry-pick from upstream to fix this.
+
+2021-04-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/100114
+	* sanitizer_common/sanitizer_posix_libcdep.cpp: Cherry-pick
+	llvm-project revisions 82150606fb11d28813ae6da1101f5bda638165fe
+	and b93629dd335ffee2fc4b9b619bf86c3f9e6b0023.
+
+(cherry picked from commit d9f462fb372fb02da032cefd6b091d7582c425ae)
+---
+ .../sanitizer_common/sanitizer_posix_libcdep.cpp    | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp
+index 304b3a01a08..ac88fbe074e 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp
++++ b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp
+@@ -169,7 +169,11 @@ bool SupportsColoredOutput(fd_t fd) {
+ 
+ #if !SANITIZER_GO
+ // TODO(glider): different tools may require different altstack size.
+-static const uptr kAltStackSize = SIGSTKSZ * 4;  // SIGSTKSZ is not enough.
++static uptr GetAltStackSize() {
++  // SIGSTKSZ is not enough.
++  static const uptr kAltStackSize = SIGSTKSZ * 4;
++  return kAltStackSize;
++}
+ 
+ void SetAlternateSignalStack() {
+   stack_t altstack, oldstack;
+@@ -180,10 +184,9 @@ void SetAlternateSignalStack() {
+   // TODO(glider): the mapped stack should have the MAP_STACK flag in the
+   // future. It is not required by man 2 sigaltstack now (they're using
+   // malloc()).
+-  void* base = MmapOrDie(kAltStackSize, __func__);
+-  altstack.ss_sp = (char*) base;
++  altstack.ss_size = GetAltStackSize();
++  altstack.ss_sp = (char *)MmapOrDie(altstack.ss_size, __func__);
+   altstack.ss_flags = 0;
+-  altstack.ss_size = kAltStackSize;
+   CHECK_EQ(0, sigaltstack(&altstack, nullptr));
+ }
+ 
+@@ -191,7 +194,7 @@ void UnsetAlternateSignalStack() {
+   stack_t altstack, oldstack;
+   altstack.ss_sp = nullptr;
+   altstack.ss_flags = SS_DISABLE;
+-  altstack.ss_size = kAltStackSize;  // Some sane value required on Darwin.
++  altstack.ss_size = GetAltStackSize();  // Some sane value required on Darwin.
+   CHECK_EQ(0, sigaltstack(&altstack, &oldstack));
+   UnmapOrDie(oldstack.ss_sp, oldstack.ss_size);
+ }
+-- 
+2.27.0
+
diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix
index b78ca339fb853..79e682e88c4eb 100644
--- a/pkgs/development/compilers/gcc/11/default.nix
+++ b/pkgs/development/compilers/gcc/11/default.nix
@@ -8,12 +8,7 @@
 , profiledCompiler ? false
 , langJit ? false
 , staticCompiler ? false
-, # N.B. the defult is intentionally not from an `isStatic`. See
-  # https://gcc.gnu.org/install/configure.html - this is about target
-  # platform libraries not host platform ones unlike normal. But since
-  # we can't rebuild those without also rebuilding the compiler itself,
-  # we opt to always build everything unlike our usual policy.
-  enableShared ? true
+, enableShared ? !stdenv.targetPlatform.isStatic
 , enableLTO ? !stdenv.hostPlatform.isStatic
 , texinfo ? null
 , perl ? null # optional, for texi2pod (then pod2man)
@@ -269,7 +264,7 @@ stdenv.mkDerivation ({
   };
 
   enableParallelBuilding = true;
-  inherit enableMultilib;
+  inherit enableShared enableMultilib;
 
   inherit (stdenv) is64bit;
 
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index bc7868cc46060..ef1a04635f9ac 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -8,12 +8,7 @@
 , profiledCompiler ? false
 , langJit ? false
 , staticCompiler ? false
-, # N.B. the defult is intentionally not from an `isStatic`. See
-  # https://gcc.gnu.org/install/configure.html - this is about target
-  # platform libraries not host platform ones unlike normal. But since
-  # we can't rebuild those without also rebuilding the compiler itself,
-  # we opt to always build everything unlike our usual policy.
-  enableShared ? true
+, enableShared ? !stdenv.targetPlatform.isStatic
 , enableLTO ? !stdenv.hostPlatform.isStatic
 , texinfo ? null
 , perl ? null # optional, for texi2pod (then pod2man); required for Java
@@ -295,7 +290,7 @@ stdenv.mkDerivation ({
   };
 
   enableParallelBuilding = true;
-  inherit enableMultilib;
+  inherit enableShared enableMultilib;
 
   inherit (stdenv) is64bit;
 
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index bb1a3dd7d6364..289df07d0312f 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -8,12 +8,7 @@
 , profiledCompiler ? false
 , langJit ? false
 , staticCompiler ? false
-, # N.B. the defult is intentionally not from an `isStatic`. See
-  # https://gcc.gnu.org/install/configure.html - this is about target
-  # platform libraries not host platform ones unlike normal. But since
-  # we can't rebuild those without also rebuilding the compiler itself,
-  # we opt to always build everything unlike our usual policy.
-  enableShared ? true
+, enableShared ? !stdenv.targetPlatform.isStatic
 , enableLTO ? !stdenv.hostPlatform.isStatic
 , texinfo ? null
 , perl ? null # optional, for texi2pod (then pod2man); required for Java
@@ -311,7 +306,7 @@ stdenv.mkDerivation ({
   };
 
   enableParallelBuilding = true;
-  inherit enableMultilib;
+  inherit enableShared enableMultilib;
 
   inherit (stdenv) is64bit;
 
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 7548ec56c7599..a577c61bdf581 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -9,12 +9,7 @@
 , profiledCompiler ? false
 , langJit ? false
 , staticCompiler ? false
-, # N.B. the defult is intentionally not from an `isStatic`. See
-  # https://gcc.gnu.org/install/configure.html - this is about target
-  # platform libraries not host platform ones unlike normal. But since
-  # we can't rebuild those without also rebuilding the compiler itself,
-  # we opt to always build everything unlike our usual policy.
-  enableShared ? true
+, enableShared ? !stdenv.targetPlatform.isStatic
 , enableLTO ? !stdenv.hostPlatform.isStatic
 , texinfo ? null
 , flex
@@ -79,6 +74,7 @@ let majorVersion = "6";
     ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       ++ optional langAda ../gnat-cflags.patch
+      ++ optional langAda ./gnat-glibc234.patch
       ++ optional langFortran ../gfortran-driving.patch
       ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
 
@@ -325,7 +321,7 @@ stdenv.mkDerivation ({
   };
 
   enableParallelBuilding = true;
-  inherit enableMultilib;
+  inherit enableShared enableMultilib;
 
   inherit (stdenv) is64bit;
 
diff --git a/pkgs/development/compilers/gcc/6/gnat-glibc234.patch b/pkgs/development/compilers/gcc/6/gnat-glibc234.patch
new file mode 100644
index 0000000000000..2d29cd7fa77f5
--- /dev/null
+++ b/pkgs/development/compilers/gcc/6/gnat-glibc234.patch
@@ -0,0 +1,30 @@
+Fix build with glibc 2.34.  Adapted from:
+https://github.com/gcc-mirror/gcc/commit/331763de7d4850702a0f67298f36017c73cdb103
+--- a/gcc/ada/init.c
++++ b/gcc/ada/init.c
+@@ -579,12 +579,8 @@
+ 
+ #ifndef __ia64__
+ #define HAVE_GNAT_ALTERNATE_STACK 1
+-/* This must be in keeping with System.OS_Interface.Alternate_Stack_Size.
+-   It must be larger than MINSIGSTKSZ and hopefully near 2 * SIGSTKSZ.  */
+-# if 16 * 1024 < MINSIGSTKSZ
+-#  error "__gnat_alternate_stack too small"
+-# endif
+-char __gnat_alternate_stack[16 * 1024];
++/* This must be in keeping with System.OS_Interface.Alternate_Stack_Size.  */
++char __gnat_alternate_stack[32 * 1024];
+ #endif
+ 
+ #ifdef __XENO__
+--- a/gcc/ada/s-osinte-linux.ads
++++ b/gcc/ada/s-osinte-linux.ads
+@@ -328,7 +328,7 @@
+       oss : access stack_t) return int;
+    pragma Import (C, sigaltstack, "sigaltstack");
+ 
+-   Alternate_Stack_Size : constant := 16 * 1024;
++   Alternate_Stack_Size : constant := 32 * 1024;
+    --  This must be in keeping with init.c:__gnat_alternate_stack
+ 
+    Alternate_Stack : aliased char_array (1 .. Alternate_Stack_Size);
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index dfac97104eb6a..937ccbb351036 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -7,12 +7,7 @@
 , profiledCompiler ? false
 , langJit ? false
 , staticCompiler ? false
-, # N.B. the defult is intentionally not from an `isStatic`. See
-  # https://gcc.gnu.org/install/configure.html - this is about target
-  # platform libraries not host platform ones unlike normal. But since
-  # we can't rebuild those without also rebuilding the compiler itself,
-  # we opt to always build everything unlike our usual policy.
-  enableShared ? true
+, enableShared ? !stdenv.targetPlatform.isStatic
 , enableLTO ? !stdenv.hostPlatform.isStatic
 , texinfo ? null
 , perl ? null # optional, for texi2pod (then pod2man)
@@ -63,6 +58,9 @@ let majorVersion = "7";
         ./riscv-pthread-reentrant.patch
         # https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00297.html
         ./riscv-no-relax.patch
+        # Fix for asan w/glibc-2.34. Although there's no upstream backport to v7,
+        # the patch from gcc 8 seems to work perfectly fine.
+        ./gcc8-asan-glibc-2.34.patch
 
         ./0001-Fix-build-for-glibc-2.31.patch
       ]
@@ -277,7 +275,7 @@ stdenv.mkDerivation ({
   };
 
   enableParallelBuilding = true;
-  inherit enableMultilib;
+  inherit enableShared enableMultilib;
 
   inherit (stdenv) is64bit;
 
diff --git a/pkgs/development/compilers/gcc/7/gcc8-asan-glibc-2.34.patch b/pkgs/development/compilers/gcc/7/gcc8-asan-glibc-2.34.patch
new file mode 100644
index 0000000000000..5645b97c1d898
--- /dev/null
+++ b/pkgs/development/compilers/gcc/7/gcc8-asan-glibc-2.34.patch
@@ -0,0 +1,70 @@
+From ef195a39d0d3b929cc676302d074b42c25460601 Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <jakub@redhat.com>
+Date: Sat, 17 Apr 2021 11:27:14 +0200
+Subject: [PATCH] sanitizer: Fix asan against glibc 2.34 [PR100114]
+
+As mentioned in the PR, SIGSTKSZ is no longer a compile time constant in
+glibc 2.34 and later, so
+static const uptr kAltStackSize = SIGSTKSZ * 4;
+needs dynamic initialization, but is used by a function called indirectly
+from .preinit_array and therefore before the variable is constructed.
+This results in using 0 size instead and all asan instrumented programs
+die with:
+==91==ERROR: AddressSanitizer failed to allocate 0x0 (0) bytes of SetAlternateSignalStack (error code: 22)
+
+Here is a cherry-pick from upstream to fix this.
+
+2021-04-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/100114
+	* sanitizer_common/sanitizer_posix_libcdep.cc: Cherry-pick
+	llvm-project revisions 82150606fb11d28813ae6da1101f5bda638165fe
+	and b93629dd335ffee2fc4b9b619bf86c3f9e6b0023.
+
+(cherry picked from commit 950bac27d63c1c2ac3a6ed867692d6a13f21feb3)
+---
+ .../sanitizer_common/sanitizer_posix_libcdep.cc     | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc
+index 1a37118c299..066079b3954 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc
+@@ -159,7 +159,11 @@ bool SupportsColoredOutput(fd_t fd) {
+ 
+ #if !SANITIZER_GO
+ // TODO(glider): different tools may require different altstack size.
+-static const uptr kAltStackSize = SIGSTKSZ * 4;  // SIGSTKSZ is not enough.
++static uptr GetAltStackSize() {
++  // SIGSTKSZ is not enough.
++  static const uptr kAltStackSize = SIGSTKSZ * 4;
++  return kAltStackSize;
++}
+ 
+ void SetAlternateSignalStack() {
+   stack_t altstack, oldstack;
+@@ -170,10 +174,9 @@ void SetAlternateSignalStack() {
+   // TODO(glider): the mapped stack should have the MAP_STACK flag in the
+   // future. It is not required by man 2 sigaltstack now (they're using
+   // malloc()).
+-  void* base = MmapOrDie(kAltStackSize, __func__);
+-  altstack.ss_sp = (char*) base;
++  altstack.ss_size = GetAltStackSize();
++  altstack.ss_sp = (char *)MmapOrDie(altstack.ss_size, __func__);
+   altstack.ss_flags = 0;
+-  altstack.ss_size = kAltStackSize;
+   CHECK_EQ(0, sigaltstack(&altstack, nullptr));
+ }
+ 
+@@ -181,7 +184,7 @@ void UnsetAlternateSignalStack() {
+   stack_t altstack, oldstack;
+   altstack.ss_sp = nullptr;
+   altstack.ss_flags = SS_DISABLE;
+-  altstack.ss_size = kAltStackSize;  // Some sane value required on Darwin.
++  altstack.ss_size = GetAltStackSize();  // Some sane value required on Darwin.
+   CHECK_EQ(0, sigaltstack(&altstack, &oldstack));
+   UnmapOrDie(oldstack.ss_sp, oldstack.ss_size);
+ }
+-- 
+2.27.0
+
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 609dfa722a65d..e981978369557 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -7,12 +7,7 @@
 , profiledCompiler ? false
 , langJit ? false
 , staticCompiler ? false
-, # N.B. the defult is intentionally not from an `isStatic`. See
-  # https://gcc.gnu.org/install/configure.html - this is about target
-  # platform libraries not host platform ones unlike normal. But since
-  # we can't rebuild those without also rebuilding the compiler itself,
-  # we opt to always build everything unlike our usual policy.
-  enableShared ? true
+, enableShared ? !stdenv.targetPlatform.isStatic
 , enableLTO ? !stdenv.hostPlatform.isStatic
 , texinfo ? null
 , perl ? null # optional, for texi2pod (then pod2man)
@@ -259,7 +254,7 @@ stdenv.mkDerivation ({
   };
 
   enableParallelBuilding = true;
-  inherit enableMultilib;
+  inherit enableShared enableMultilib;
 
   inherit (stdenv) is64bit;
 
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix
index ea4296826661b..dd1a53e172a4f 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/pkgs/development/compilers/gcc/9/default.nix
@@ -9,12 +9,7 @@
 , profiledCompiler ? false
 , langJit ? false
 , staticCompiler ? false
-, # N.B. the defult is intentionally not from an `isStatic`. See
-  # https://gcc.gnu.org/install/configure.html - this is about target
-  # platform libraries not host platform ones unlike normal. But since
-  # we can't rebuild those without also rebuilding the compiler itself,
-  # we opt to always build everything unlike our usual policy.
-  enableShared ? true
+, enableShared ? !stdenv.targetPlatform.isStatic
 , enableLTO ? !stdenv.hostPlatform.isStatic
 , texinfo ? null
 , perl ? null # optional, for texi2pod (then pod2man)
@@ -78,7 +73,7 @@ let majorVersion = "9";
       # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96796
       #
       # This patch can most likely be removed by a post 9.3.0-release.
-      [ ./avoid-cycling-subreg-reloads.patch ]
+      [ ./avoid-cycling-subreg-reloads.patch ./gcc9-asan-glibc-2.34.patch ]
       ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
@@ -88,6 +83,11 @@ let majorVersion = "9";
         sha256 = ""; # TODO: uncomment and check hash when available.
       }) */
       ++ optional langAda ../gnat-cflags.patch
+      ++ optional langAda (fetchpatch {
+        name = "gnat-glibc-234.diff";
+        url = "https://github.com/gcc-mirror/gcc/commit/331763de7d4850702a0f67298f36017c73cdb103.diff";
+        sha256 = "eS4B7vJasnv2N+5v5yB8/iDpKPX8CJDAy2xabWWj+aU=";
+      })
       ++ optional langD ../libphobos.patch
       ++ optional langFortran ../gfortran-driving.patch
       ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
@@ -285,7 +285,7 @@ stdenv.mkDerivation ({
   };
 
   enableParallelBuilding = true;
-  inherit enableMultilib;
+  inherit enableShared enableMultilib;
 
   inherit (stdenv) is64bit;
 
diff --git a/pkgs/development/compilers/gcc/9/gcc9-asan-glibc-2.34.patch b/pkgs/development/compilers/gcc/9/gcc9-asan-glibc-2.34.patch
new file mode 100644
index 0000000000000..1aea1f9b18a14
--- /dev/null
+++ b/pkgs/development/compilers/gcc/9/gcc9-asan-glibc-2.34.patch
@@ -0,0 +1,70 @@
+From 3d0135bf3be416bbe2531dc763d19b749eb2b856 Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <jakub@redhat.com>
+Date: Sat, 17 Apr 2021 11:27:14 +0200
+Subject: [PATCH] sanitizer: Fix asan against glibc 2.34 [PR100114]
+
+As mentioned in the PR, SIGSTKSZ is no longer a compile time constant in
+glibc 2.34 and later, so
+static const uptr kAltStackSize = SIGSTKSZ * 4;
+needs dynamic initialization, but is used by a function called indirectly
+from .preinit_array and therefore before the variable is constructed.
+This results in using 0 size instead and all asan instrumented programs
+die with:
+==91==ERROR: AddressSanitizer failed to allocate 0x0 (0) bytes of SetAlternateSignalStack (error code: 22)
+
+Here is a cherry-pick from upstream to fix this.
+
+2021-04-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/100114
+	* sanitizer_common/sanitizer_posix_libcdep.cc: Cherry-pick
+	llvm-project revisions 82150606fb11d28813ae6da1101f5bda638165fe
+	and b93629dd335ffee2fc4b9b619bf86c3f9e6b0023.
+
+(cherry picked from commit 950bac27d63c1c2ac3a6ed867692d6a13f21feb3)
+---
+ .../sanitizer_common/sanitizer_posix_libcdep.cc     | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc
+index d2fd76a6d36..1917e29ced2 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc
+@@ -169,7 +169,11 @@ bool SupportsColoredOutput(fd_t fd) {
+ 
+ #if !SANITIZER_GO
+ // TODO(glider): different tools may require different altstack size.
+-static const uptr kAltStackSize = SIGSTKSZ * 4;  // SIGSTKSZ is not enough.
++static uptr GetAltStackSize() {
++  // SIGSTKSZ is not enough.
++  static const uptr kAltStackSize = SIGSTKSZ * 4;
++  return kAltStackSize;
++}
+ 
+ void SetAlternateSignalStack() {
+   stack_t altstack, oldstack;
+@@ -180,10 +184,9 @@ void SetAlternateSignalStack() {
+   // TODO(glider): the mapped stack should have the MAP_STACK flag in the
+   // future. It is not required by man 2 sigaltstack now (they're using
+   // malloc()).
+-  void* base = MmapOrDie(kAltStackSize, __func__);
+-  altstack.ss_sp = (char*) base;
++  altstack.ss_size = GetAltStackSize();
++  altstack.ss_sp = (char *)MmapOrDie(altstack.ss_size, __func__);
+   altstack.ss_flags = 0;
+-  altstack.ss_size = kAltStackSize;
+   CHECK_EQ(0, sigaltstack(&altstack, nullptr));
+ }
+ 
+@@ -191,7 +194,7 @@ void UnsetAlternateSignalStack() {
+   stack_t altstack, oldstack;
+   altstack.ss_sp = nullptr;
+   altstack.ss_flags = SS_DISABLE;
+-  altstack.ss_size = kAltStackSize;  // Some sane value required on Darwin.
++  altstack.ss_size = GetAltStackSize();  // Some sane value required on Darwin.
+   CHECK_EQ(0, sigaltstack(&altstack, &oldstack));
+   UnmapOrDie(oldstack.ss_sp, oldstack.ss_size);
+ }
+-- 
+2.27.0
+
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index e6d41d7b29ab7..9d0514f175901 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -222,6 +222,10 @@ postInstall() {
     moveToOutput "${targetConfig+$targetConfig/}lib/lib*.dll.a" "${!outputLib}"
     moveToOutput "share/gcc-*/python" "${!outputLib}"
 
+    if [ -z "$enableShared" ]; then
+        moveToOutput "${targetConfig+$targetConfig/}lib/lib*.a" "${!outputLib}"
+    fi
+
     for i in "${!outputLib}/${targetConfig}"/lib/*.{la,py}; do
         substituteInPlace "$i" --replace "$out" "${!outputLib}"
     done
diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix
index 69537dc899e82..28d5ffdc6dff4 100644
--- a/pkgs/development/compilers/go/1.17.nix
+++ b/pkgs/development/compilers/go/1.17.nix
@@ -55,11 +55,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.17.7";
+  version = "1.17.8";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "sha256-wQjNM7c7GRGgK2l3Qd896kPgGlxOCOQJ6LOg43RdK00=";
+    sha256 = "sha256-Lv/NiYFA2nmgYfN4TKT42LE9gR+yq+na0kBEQtq733o=";
   };
 
   # perl is used for testing go vet
diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix
index ece5a2a247164..acdd8a034e7bc 100644
--- a/pkgs/development/compilers/julia/1.6-bin.nix
+++ b/pkgs/development/compilers/julia/1.6-bin.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "julia-bin";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = {
     x86_64-linux = fetchurl {
       url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
-      sha256 = "0b4fmcfd5q5wzvasmsfqq838rivpxn274n5y2kza4m3jakp27zmq";
+      sha256 = "0ia9a4h7w0n5rg57fkl1kzcyj500ymfwq3qsd2r7l82288dgfpy2";
     };
   }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
diff --git a/pkgs/development/compilers/llvm/multi.nix b/pkgs/development/compilers/llvm/multi.nix
index 60db622a73ab5..ecea5d440378e 100644
--- a/pkgs/development/compilers/llvm/multi.nix
+++ b/pkgs/development/compilers/llvm/multi.nix
@@ -19,9 +19,9 @@ let
       lib = gcc_multi_sysroot;
     };
   } ''
-    mkdir -p $out/lib/gcc
+    mkdir -p $out/lib{,64}/gcc
 
-    ln -s ${combine gcc64}/lib/gcc/* $out/lib/gcc/
+    ln -s ${combine gcc64}/lib/gcc/* $out/lib64/gcc/
     ln -s ${combine gcc32}/lib/gcc/* $out/lib/gcc/
     # XXX: This shouldn't be needed, clang just doesn't look for "i686-unknown"
     ln -s $out/lib/gcc/i686-unknown-linux-gnu $out/lib/gcc/i686-pc-linux-gnu
diff --git a/pkgs/development/compilers/ocaml/4.10.nix b/pkgs/development/compilers/ocaml/4.10.nix
index 78051040b5718..48d01a5a8c8d2 100644
--- a/pkgs/development/compilers/ocaml/4.10.nix
+++ b/pkgs/development/compilers/ocaml/4.10.nix
@@ -3,4 +3,7 @@ import ./generic.nix {
   minor_version = "10";
   patch_version = "2";
   sha256 = "sha256-locUYQeCgtXbAiB32JveJchfteN2YStE+MN9ToTwAOM=";
+  patches = [
+    ./glibc-2.34-for-ocaml-4.10-and-11.patch
+  ];
 }
diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix
index 3e5aefc11f1ce..6a2e4f61f80e2 100644
--- a/pkgs/development/compilers/ocaml/4.11.nix
+++ b/pkgs/development/compilers/ocaml/4.11.nix
@@ -3,4 +3,7 @@ import ./generic.nix {
   minor_version = "11";
   patch_version = "2";
   sha256 = "1m3wrgkkv3f77wvcymjm0i2srxzmx62y6jln3i0a2px07ng08l9z";
+  patches = [
+    ./glibc-2.34-for-ocaml-4.10-and-11.patch
+  ];
 }
diff --git a/pkgs/development/compilers/ocaml/4.12.nix b/pkgs/development/compilers/ocaml/4.12.nix
index 4be2bcf5f9d03..2066d0d5ad314 100644
--- a/pkgs/development/compilers/ocaml/4.12.nix
+++ b/pkgs/development/compilers/ocaml/4.12.nix
@@ -3,4 +3,9 @@ import ./generic.nix {
   minor_version = "12";
   patch_version = "1";
   sha256 = "1jbjjnmqq6ymsy81x188i256bz4z5jrz1pws8g1qf59c32ganjkf";
+  patches = [
+    { url = "https://src.fedoraproject.org/rpms/ocaml/raw/129153b85109944bf0b2922949f77ef8f32b39a1/f/0004-Dynamically-allocate-the-alternate-signal-stack-1026.patch";
+      sha256 = "sha256-FdQ1HkMKHU9QvgLPUBvMdPiEa7w7IL3+1F3SLv63Gog=";
+    }
+  ];
 }
diff --git a/pkgs/development/compilers/ocaml/Makefile.nixpkgs b/pkgs/development/compilers/ocaml/Makefile.nixpkgs
new file mode 100644
index 0000000000000..2d6457852fc9a
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/Makefile.nixpkgs
@@ -0,0 +1,16 @@
+# ocaml build system does not allow for parallel building of some
+# top-level targets like 'world', 'bootstrap', 'world.opt' as
+# then spawn '$(MAKE) all' subprocesses that conflict among each
+# other. But we would still like to run each target in parallel
+# individually. This file defines such entry points.
+
+# Re-export all existing phases to make 'make install' work as is.
+include Makefile
+
+nixpkgs_world:
+	$(MAKE) world
+
+nixpkgs_world_bootstrap_world_opt:
+	$(MAKE) world
+	$(MAKE) bootstrap
+	$(MAKE) world.opt
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index ec52e56c1faa2..0573b43f5e231 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -1,4 +1,4 @@
-{ minor_version, major_version, patch_version
+{ minor_version, major_version, patch_version, patches ? []
 , ...}@args:
 let
   versionNoPatch = "${toString major_version}.${toString minor_version}";
@@ -6,7 +6,7 @@ let
   safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips || stdenv.hostPlatform.isStatic);
 in
 
-{ lib, stdenv, fetchurl, ncurses, buildEnv, libunwind
+{ lib, stdenv, fetchurl, ncurses, buildEnv, libunwind, fetchpatch
 , libX11, xorgproto, useX11 ? safeX11 stdenv && !lib.versionAtLeast version "4.09"
 , aflSupport ? false
 , flambdaSupport ? false
@@ -28,21 +28,22 @@ in
 let
    useNativeCompilers = !stdenv.isMips;
    inherit (lib) optional optionals optionalString;
-   name = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}-${version}";
+   pname = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}";
 in
 
 let
   x11env = buildEnv { name = "x11env"; paths = [libX11 xorgproto]; };
   x11lib = x11env + "/lib";
   x11inc = x11env + "/include";
+
+  fetchpatch' = x: if builtins.isAttrs x then fetchpatch x else x;
 in
 
 stdenv.mkDerivation (args // {
 
-  inherit name;
-  inherit version;
+  inherit pname version src;
 
-  inherit src;
+  patches = map fetchpatch' patches;
 
   strictDeps = true;
 
@@ -74,7 +75,18 @@ stdenv.mkDerivation (args // {
   hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"
     ++ lib.optionals (args ? hardeningDisable) args.hardeningDisable;
 
-  buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
+  # Older versions have some race:
+  #  cp: cannot stat 'boot/ocamlrun': No such file or directory
+  #  make[2]: *** [Makefile:199: backup] Error 1
+  enableParallelBuilding = lib.versionAtLeast version "4.08";
+
+  # Workaround lack of parallelism support among top-level targets:
+  # we place nixpkgs-specific targets to a separate file and set
+  # sequential order among them as a single rule.
+  makefile = ./Makefile.nixpkgs;
+  buildFlags = if useNativeCompilers
+    then ["nixpkgs_world_bootstrap_world_opt"]
+    else ["nixpkgs_world"];
   buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses
     ++ optionals useX11 [ libX11 xorgproto ];
   propagatedBuildInputs = optional spaceTimeSupport libunwind;
diff --git a/pkgs/development/compilers/ocaml/glibc-2.34-for-ocaml-4.10-and-11.patch b/pkgs/development/compilers/ocaml/glibc-2.34-for-ocaml-4.10-and-11.patch
new file mode 100644
index 0000000000000..4ff9e6fddba57
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/glibc-2.34-for-ocaml-4.10-and-11.patch
@@ -0,0 +1,37 @@
+From dfb5e954a04f59b0456cc4c0ddf3acaf22e0ff07 Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones@redhat.com>
+Date: Feb 28 2021 20:45:47 +0000
+Subject: Workaround for glibc non-constant SIGSTKSZ
+
+
+https://github.com/ocaml/ocaml/issues/10250
+
+Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
+
+---
+
+diff --git a/runtime/signals_nat.c b/runtime/signals_nat.c
+index 8b64ab4..7f0a975 100644
+--- a/runtime/signals_nat.c
++++ b/runtime/signals_nat.c
+@@ -181,7 +181,19 @@ DECLARE_SIGNAL_HANDLER(trap_handler)
+ #error "CONTEXT_SP is required if HAS_STACK_OVERFLOW_DETECTION is defined"
+ #endif
+ 
++#ifndef __GLIBC__
+ static char sig_alt_stack[SIGSTKSZ];
++#else
++/* glibc 2.34 has non-constant SIGSTKSZ */
++static char *sig_alt_stack;
++
++static void allocate_sig_alt_stack(void) __attribute__((constructor));
++static void
++allocate_sig_alt_stack(void)
++{
++  sig_alt_stack = malloc(SIGSTKSZ);
++}
++#endif
+ 
+ /* Code compiled with ocamlopt never accesses more than
+    EXTRA_STACK bytes below the stack pointer. */
+
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 6f4b78286d63a..8c45bece9adc1 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -40,6 +40,7 @@ let
       ./currency-date-range-jdk10.patch
       ./increase-javadoc-heap.patch
       ./fix-library-path-jdk11.patch
+      ./fix-glibc-2.34.patch
     ] ++ lib.optionals (!headless && enableGnome2) [
       ./swing-use-gtk-jdk10.patch
     ];
diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix
index e6fd12a632b38..0a4a8e1de4131 100644
--- a/pkgs/development/compilers/openjdk/16.nix
+++ b/pkgs/development/compilers/openjdk/16.nix
@@ -48,6 +48,7 @@ let
         url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
         sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
       })
+      ./fix-glibc-2.34.patch
     ] ++ lib.optionals (!headless && enableGnome2) [
       ./swing-use-gtk-jdk13.patch
     ];
diff --git a/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch b/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch
new file mode 100644
index 0000000000000..7bf8b2b167447
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch
@@ -0,0 +1,24 @@
+Taken from https://build.opensuse.org/package/view_file/Java:Factory/java-15-openjdk/openjdk-glibc234.patch
+
+--- openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c	2021-04-09 11:36:58.000000000 +0200
++++ openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c	2021-08-26 15:42:52.326232581 +0200
+@@ -67,8 +67,17 @@
+   longjmp(context, 1);
+ }
+ 
++static char* altstack = NULL;
++
+ void set_signal_handler() {
+-  static char altstack[SIGSTKSZ];
++  if (altstack == NULL) {
++    // Dynamically allocated in case SIGSTKSZ is not constant
++    altstack = malloc(SIGSTKSZ);
++    if (altstack == NULL) {
++      fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n");
++      exit(7);
++    }
++  }
+ 
+   stack_t ss = {
+     .ss_size = SIGSTKSZ,
+
diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix
index 7858e3f6dc119..4354ce7e2d671 100644
--- a/pkgs/development/compilers/polyml/5.6.nix
+++ b/pkgs/development/compilers/polyml/5.6.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, autoreconfHook}:
+{lib, stdenv, fetchurl, autoreconfHook, fetchpatch }:
 
 let
   version = "5.6";
@@ -12,6 +12,14 @@ stdenv.mkDerivation {
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
+  patches = [
+    # glibc 2.34 compat
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/polyml/raw/4d8868ca5a1ce3268f212599a321f8011c950496/f/polyml-pthread-stack-min.patch";
+      sha256 = "1h5ihg2sxld9ymrl3f2mpnbn2242ka1fsa0h4gl9h90kndvg6kby";
+    })
+  ];
+
   buildInputs = lib.optional stdenv.isDarwin autoreconfHook;
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index 5ac6990383cce..efd3d1bfd40aa 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "polyml";
@@ -8,7 +8,15 @@ stdenv.mkDerivation rec {
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
-  patches = [ ./5.7-new-libffi-FFI_SYSV.patch ];
+  patches = [
+    ./5.7-new-libffi-FFI_SYSV.patch
+
+    # glibc 2.34 compat
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/polyml/raw/4d8868ca5a1ce3268f212599a321f8011c950496/f/polyml-pthread-stack-min.patch";
+      sha256 = "1h5ihg2sxld9ymrl3f2mpnbn2242ka1fsa0h4gl9h90kndvg6kby";
+    })
+  ];
 
   buildInputs = [ libffi gmp ];
 
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 8a283bb6cf998..2f22f8cd616b3 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,4 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gmp, libffi }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, gmp
+, libffi
+}:
 
 stdenv.mkDerivation rec {
   pname = "polyml";
diff --git a/pkgs/development/compilers/rust/1_58.nix b/pkgs/development/compilers/rust/1_59.nix
index c854bfdd37a4d..9812585165546 100644
--- a/pkgs/development/compilers/rust/1_58.nix
+++ b/pkgs/development/compilers/rust/1_59.nix
@@ -20,8 +20,8 @@
 } @ args:
 
 import ./default.nix {
-  rustcVersion = "1.58.1";
-  rustcSha256 = "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8";
+  rustcVersion = "1.59.0";
+  rustcSha256 = "sha256-p8juruhb/O+EyWsCsxcdHmVA0VF5/4Pd3Z6vuhhfhfk=";
 
   llvmSharedForBuild = pkgsBuildBuild.llvmPackages_13.libllvm.override { enableSharedLibraries = true; };
   llvmSharedForHost = pkgsBuildHost.llvmPackages_13.libllvm.override { enableSharedLibraries = true; };
@@ -37,24 +37,25 @@ import ./default.nix {
 
   # Note: the version MUST be one version prior to the version we're
   # building
-  bootstrapVersion = "1.57.0";
+  bootstrapVersion = "1.58.1";
 
   # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
   bootstrapHashes = {
-    i686-unknown-linux-gnu = "7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa";
-    x86_64-unknown-linux-gnu = "ea0253784b2e5c22659ff148d492a68d2e11da734491714ebc61cc93896efcda";
-    x86_64-unknown-linux-musl = "56876ebca0e46236208c8bd3c3425dba553abe49639e1040ee8b95bc66a45d33";
-    arm-unknown-linux-gnueabihf = "b4448f7a96da4feee99a2c4b16b5738b99ab7e86e22d284ea6f7dca5921bca9b";
-    armv7-unknown-linux-gnueabihf = "577682b1405e8901f971839407daaad06d8ae68ad370305b75d569ba293c4fb4";
-    aarch64-unknown-linux-gnu = "d66847f7cf7b548ecb328c400ac4f691ee2aea6ff5cd9286ad8733239569556c";
-    aarch64-unknown-linux-musl = "91c8e5171e5715261f7f635142a10a9415a4e5ba55374daf76f0b713c8b08132";
-    x86_64-apple-darwin = "15ceffc4743434c19d08f73fb4edd6642b7fd8162ed7101d3e6ca2c691fcb699";
-    aarch64-apple-darwin = "7511075e28b715e2d9c7ee74221779f8444681a4bb60ac3a0270a5fdf08bdd5a";
-    powerpc64le-unknown-linux-gnu = "3ddc1abed6b7535c4150bf54291901fa856806c948bc21b711e24a3c8d810be7";
-    riscv64gc-unknown-linux-gnu = "f809df1c6ac0adc9bd37eb871dfb0d9809f3ed7f61ba611f9305e9eb8f8c9226";
+    i686-unknown-linux-gnu = "c3d282cd96cc9e5292e62db1ebb9fa6d5b738f4684d5ece9883f7472e2f76ad4";
+    x86_64-unknown-linux-gnu = "4fac6df9ea49447682c333e57945bebf4f9f45ec7b08849e507a64b2ccd5f8fb";
+    x86_64-unknown-linux-musl = "7036e34eadc8ce22d16b0625919d9f2244ca49a5441d6599f4822116c181d272";
+    arm-unknown-linux-gnueabihf = "739389d46c5862b0e67d01dece99aa3db2229e055a3d7f7624679c55b6c33e06";
+    armv7-unknown-linux-gnueabihf = "6cede2c7795e8126b0f17b1032d52500e594bac64c7d190bdc0ac1c832ef30bd";
+    aarch64-unknown-linux-gnu = "ce557516593e4526709b0f33c2e1d7c932b3ddf76af94c2417d8d667921ce90c";
+    aarch64-unknown-linux-musl = "b1533fdeeda483a3633617fd18a79d8fad7821331614b8dc13efd8b22acc30f5";
+    x86_64-apple-darwin = "d0044680fc132a721481b130a0a4282a444867f423efdb890fe13e447966412f";
+    aarch64-apple-darwin = "00b44985bc87e53c53d92622fb10226f09e9f25c79db48a77c0a769a36f83b1e";
+    powerpc64le-unknown-linux-gnu = "b15baef702cbd6f0ea2bef7bf98ca7ce5644f2beb219028e8a12e7053da4c849";
+    riscv64gc-unknown-linux-gnu = "d8ea2b11a4b24d1169fa3190127488b951b8bdef28293a4129ddd46c0ba9469b";
+    mips64el-unknown-linux-gnuabi64 = "4f03bc972ae784d4f66cfa77215b369723531e67f647de9f49ce9fc21e5691af";
   };
 
-  selectRustPackage = pkgs: pkgs.rust_1_58;
+  selectRustPackage = pkgs: pkgs.rust_1_59;
 
   rustcPatches = [
   ];
diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix
index ce4250f675e9a..1145f4da8f663 100644
--- a/pkgs/development/compilers/rust/binary.nix
+++ b/pkgs/development/compilers/rust/binary.nix
@@ -19,7 +19,7 @@ in
 
 rec {
   rustc = stdenv.mkDerivation {
-    name = "rustc-${versionType}-${version}";
+    pname = "rustc-${versionType}";
 
     inherit version;
     inherit src;
@@ -71,7 +71,7 @@ rec {
   };
 
   cargo = stdenv.mkDerivation {
-    name = "cargo-${versionType}-${version}";
+    pname = "cargo-${versionType}";
 
     inherit version;
     inherit src;
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index ee909e973a353..b50f36f0d9b64 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -5,7 +5,7 @@
 }:
 
 rustPlatform.buildRustPackage {
-  name = "cargo-${rustc.version}";
+  pname = "cargo";
   inherit (rustc) version src;
 
   # the rust source tarball already has all the dependencies vendored, no need to fetch them again
diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix
index b3191c242feab..f8ac8bf39df38 100644
--- a/pkgs/development/compilers/rust/rustfmt.nix
+++ b/pkgs/development/compilers/rust/rustfmt.nix
@@ -18,8 +18,8 @@ rustPlatform.buildRustPackage rec {
 
   # As of rustc 1.45.0, these env vars are required to build rustfmt (due to
   # https://github.com/rust-lang/rust/pull/72001)
-  CFG_RELEASE = "${rustPlatform.rust.rustc.version}-nightly";
-  CFG_RELEASE_CHANNEL = "nightly";
+  CFG_RELEASE = rustPlatform.rust.rustc.version;
+  CFG_RELEASE_CHANNEL = "stable";
 
   meta = with lib; {
     description = "A tool for formatting Rust code according to style guidelines";
diff --git a/pkgs/development/coq-modules/aac-tactics/default.nix b/pkgs/development/coq-modules/aac-tactics/default.nix
index c67b47f18776e..15b2e493b68e1 100644
--- a/pkgs/development/coq-modules/aac-tactics/default.nix
+++ b/pkgs/development/coq-modules/aac-tactics/default.nix
@@ -6,7 +6,10 @@ mkCoqDerivation {
 
   releaseRev = v: "v${v}";
 
+  release."8.15.1".sha256 = "sha256:0k2sl3ns897a5ll11bazgpv4ppgi1vmx4n89v2dnxabm5dglyglp";
+  release."8.14.1".sha256 = "sha256:1w99jgm7mxwdxnalxhralmhmpwwbd52pbbifq0mx13ixkv6iqm1a";
   release."8.14.0".sha256 = "04x47ngb95m1h4jw2gl0v79s5im7qimcw7pafc34gkkf51pyhakp";
+  release."8.13.2".sha256 = "sha256-MAnMc4KzC551JInrRcfKED4nz04FO0GyyyuDVRmnYTa=";
   release."8.13.0".sha256 = "sha256-MAnMc4KzC551JInrRcfKED4nz04FO0GyyyuDVRmnYTY=";
   release."8.12.0".sha256 = "sha256-dPNA19kZo/2t3rbyX/R5yfGcaEfMhbm9bo71Uo4ZwoM=";
   release."8.11.0".sha256 = "sha256-CKKMiJLltIb38u+ZKwfQh/NlxYawkafp+okY34cGCYU=";
@@ -18,8 +21,9 @@ mkCoqDerivation {
 
   inherit version;
   defaultVersion = with versions; switch coq.coq-version [
-    { case = "8.14"; out = "8.14.0"; }
-    { case = "8.13"; out = "8.13.0"; }
+    { case = "8.15"; out = "8.15.1"; }
+    { case = "8.14"; out = "8.14.1"; }
+    { case = "8.13"; out = "8.13.2"; }
     { case = "8.12"; out = "8.12.0"; }
     { case = "8.11"; out = "8.11.0"; }
     { case = "8.10"; out = "8.10.0"; }
diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix
index 127d630752fe2..46ede02a57e69 100644
--- a/pkgs/development/coq-modules/coqprime/default.nix
+++ b/pkgs/development/coq-modules/coqprime/default.nix
@@ -6,12 +6,13 @@ with lib; mkCoqDerivation {
   owner = "thery";
   inherit version;
   defaultVersion = with versions; switch coq.coq-version [
-    { case = range "8.12" "8.14"; out = "8.14.1"; }
+    { case = range "8.12" "8.15"; out = "8.15"; }
     { case = range "8.10" "8.11"; out = "8.10"; }
     { case = range "8.8"  "8.9";  out = "8.8"; }
     { case = "8.7";               out = "8.7.2"; }
   ] null;
 
+  release."8.15".sha256  = "sha256:1zr2q52r08na8265019pj9spcz982ivixk6cnzk6l1srn2g328gv";
   release."8.14.1".sha256= "sha256:0dqf87xkzcpg7gglbxjyx68ad84w1w73icxgy3s7d3w563glc2p7";
   release."8.12".sha256  = "1slka4w0pya15js4drx9frj7lxyp3k2lzib8v23givzpnxs8ijdj";
   release."8.10".sha256  = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz";
diff --git a/pkgs/development/coq-modules/relation-algebra/default.nix b/pkgs/development/coq-modules/relation-algebra/default.nix
index 01cb7f63b71a3..204be2931a50f 100644
--- a/pkgs/development/coq-modules/relation-algebra/default.nix
+++ b/pkgs/development/coq-modules/relation-algebra/default.nix
@@ -5,8 +5,13 @@ mkCoqDerivation {
   pname = "relation-algebra";
   owner = "damien-pous";
 
-  releaseRev = v: "v${v}";
+  releaseRev = v:
+    if versions.isGe "1.7.6" v
+    then "v.${v}"
+    else "v${v}";
 
+  release."1.7.7".sha256 = "sha256:1dff3id6nypl2alhk9rcifj3dab0j78dym05blc525lawsmc26l2";
+  release."1.7.6".sha256 = "sha256:02gsj06zcy9zgd0h1ibqspwfiwm36pkkgg9cz37k4bxzcapxcr6w";
   release."1.7.5".sha256 = "sha256-XdO8agoJmNXPv8Ho+KTlLCB4oRlQsb0w06aM9M16ZBU=";
   release."1.7.4".sha256 = "sha256-o+v2CIAa2+9tJ/V8DneDTf4k31KMHycgMBLaQ+A4ufM=";
   release."1.7.3".sha256 = "sha256-4feSNfi7h4Yhwn5L+9KP9K1S7HCPvsvaVWwoQSTFvos=";
@@ -15,6 +20,8 @@ mkCoqDerivation {
 
   inherit version;
   defaultVersion = with versions; switch coq.coq-version [
+    { case = isEq "8.15"; out = "1.7.7"; }
+    { case = isEq "8.14"; out = "1.7.6"; }
     { case = isEq "8.13"; out = "1.7.5"; }
     { case = isEq "8.12"; out = "1.7.4"; }
     { case = isEq "8.11"; out = "1.7.3"; }
diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix
index f19458fa84fbc..c40f2f45f3128 100644
--- a/pkgs/development/embedded/platformio/core.nix
+++ b/pkgs/development/embedded/platformio/core.nix
@@ -153,7 +153,8 @@ with python.pkgs; buildPythonApplication rec {
       --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}'
 
     substituteInPlace setup.py \
-      --replace "zeroconf==0.37.*" "zeroconf"
+      --replace "wsproto==1.0.*" "wsproto" \
+      --replace "zeroconf==0.38.*" "zeroconf"
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 76d0dc961c5a4..e2428edbb268f 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -153,13 +153,13 @@ let
 
       export GOCACHE=$TMPDIR/go-cache
       export GOPATH="$TMPDIR/go"
+      export GOPROXY=off
       export GOSUMDB=off
       cd "$modRoot"
-    '' + lib.optionalString (go-modules != "") ''
+    '' + lib.optionalString (vendorSha256 != null) ''
       ${if proxyVendor then ''
         export GOPROXY=file://${go-modules}
       '' else ''
-        export GOPROXY=off
         rm -rf vendor
         cp -r --reflink=auto ${go-modules} vendor
       ''}
@@ -171,13 +171,20 @@ let
     buildPhase = args.buildPhase or ''
       runHook preBuild
 
+      exclude='\(/_\|examples\|Godeps\|testdata'
+      if [[ -n "$excludedPackages" ]]; then
+        IFS=' ' read -r -a excludedArr <<<$excludedPackages
+        printf -v excludedAlternates '%s\\|' "''${excludedArr[@]}"
+        excludedAlternates=''${excludedAlternates%\\|} # drop final \| added by printf
+        exclude+='\|'"$excludedAlternates"
+      fi
+      exclude+='\)'
+
       buildGoDir() {
         local d; local cmd;
         cmd="$1"
         d="$2"
         . $TMPDIR/buildFlagsArray
-        echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0
-        [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
         local OUT
         if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then
           if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
@@ -214,6 +221,7 @@ let
           export NIX_BUILD_CORES=1
       fi
       for pkg in $(getGoDirs ""); do
+        grep -q "$exclude" <<<$pkg && continue
         echo "Building subPackage $pkg"
         buildGoDir install "$pkg"
       done
diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index 7c4d173b937b3..3d633324eefed 100644
--- a/pkgs/development/go-packages/generic/default.nix
+++ b/pkgs/development/go-packages/generic/default.nix
@@ -150,13 +150,20 @@ let
 
       runHook renameImports
 
+      exclude='\(/_\|examples\|Godeps\|testdata'
+      if [[ -n "$excludedPackages" ]]; then
+        IFS=' ' read -r -a excludedArr <<<$excludedPackages
+        printf -v excludedAlternates '%s\\|' "''${excludedArr[@]}"
+        excludedAlternates=''${excludedAlternates%\\|} # drop final \| added by printf
+        exclude+='\|'"$excludedAlternates"
+      fi
+      exclude+='\)'
+
       buildGoDir() {
         local d; local cmd;
         cmd="$1"
         d="$2"
         . $TMPDIR/buildFlagsArray
-        echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0
-        [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
         local OUT
         if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then
           if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
@@ -195,6 +202,8 @@ let
           export NIX_BUILD_CORES=1
       fi
       for pkg in $(getGoDirs ""); do
+        grep -q "$exclude" <<<$pkg && continue
+        echo "Building subPackage $pkg"
         buildGoDir install "$pkg"
       done
     '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index ea8697482dabb..59069d878996e 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -205,7 +205,7 @@
 
     yampa = callPackage ./yampa.nix {};
 
-  } // builtins_ // pkgs.lib.optionalAttrs (config.allowAliases or true) {
+  } // builtins_ // pkgs.lib.optionalAttrs config.allowAliases {
     # removed packages
     protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # Added 2022-02-06
   };
diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index c3dcd0a0f71ff..de46d33bdf600 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.7.8";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
-    sha256 = "sha256-VbDivl92YYWzIbkbOgDijzf9bZ5ZyodcapPPG4EiGXc=";
+    sha256 = "sha256-xe+WL2V56ETnWv6ey+3xrvC21MfhT5AMtmOkVPbX5N0=";
   };
 
   executable = "bb";
diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix
index 4601faafb06d3..098a7fe7d3a10 100644
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "janet";
-  version = "1.21.1";
+  version = "1.21.2";
 
   src = fetchFromGitHub {
     owner = "janet-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-wJwlGliXoj0XmC9qb6SCo8mUy4aqHvJtFiigUB7PFLE=";
+    sha256 = "sha256-6E726+DLs1hCUbr2/rqIdSn8u94LLFdKBBHkbB4rgm0=";
   };
 
   # This release fails the test suite on darwin, remove when debugged.
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index 860f9ac3a5eb1..30055dc7a3dd6 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -30,6 +30,10 @@ stdenv.mkDerivation {
   hardeningDisable = [ "stackprotector" ] ++
     lib.optionals stdenv.isi686 [ "pic" "fortify" ];
 
+  # Fix for glibc-2.34, see
+  # https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-lang/maude/maude-3.1-r1.ebuild?id=f021cc6cfa1e35eb9c59955830f1fd89bfcb26b4
+  configureFlags = [ "--without-libsigsegv" ];
+
   preConfigure = ''
     configureFlagsArray=(
       --datadir="$out/share/maude"
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 54769a03b7b6f..f29e61d1105ba 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -19,11 +19,10 @@ let
 
   common = { perl, buildPerl, version, sha256 }: stdenv.mkDerivation (rec {
     inherit version;
-
-    name = "perl-${version}";
+    pname = "perl";
 
     src = fetchurl {
-      url = "mirror://cpan/src/5.0/${name}.tar.gz";
+      url = "mirror://cpan/src/5.0/perl-${version}.tar.gz";
       inherit sha256;
     };
 
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 579e3a05c58a6..6c566544f3295 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -75,7 +75,7 @@ with pkgs;
           optionalExtensions = cond: as: if cond then as else [];
           python2Extension = import ../../../top-level/python2-packages.nix;
           extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]);
-          aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ../../../top-level/python-aliases.nix lib self super);
+          aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super);
         in lib.makeScopeWithSplicing
           pkgs.splicePackages
           pkgs.newScope
@@ -124,19 +124,19 @@ with pkgs;
       sourceVersion = {
         major = "3";
         minor = "9";
-        patch = "10";
+        patch = "11";
         suffix = "";
       };
-      sha256 = "sha256-Co+/tSh+vDoT6brz1U4I+gZ3j/7M9jEa74Ibs6ZYbMg=";
+      sha256 = "sha256-ZnZ6NTCdck83DfnlA8FytO5ET0nWK5i8TspyUSPibEk=";
     };
     python310 = {
       sourceVersion = {
         major = "3";
         minor = "10";
-        patch = "2";
+        patch = "3";
         suffix = "";
       };
-      sha256 = "sha256-F946x9qfJRmqnWQ3jGA6c6DprVjf+ogS5FFgwIbeZMc=";
+      sha256 = "sha256-WWxy3pmNw5IFvE9w7w2/ft7HQKMG0JtJqb0Kd4BnMNw=";
     };
   };
 
diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
index 5f55ed5ecaf1a..3843497d94e53 100755
--- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
+++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
@@ -356,17 +356,19 @@ def _update_package(path, target):
         text = _replace_value('hash', sri_hash, text)
 
     if fetcher == 'fetchFromGitHub':
-        # in the case of fetchFromGitHub, it's common to see `rev = version;`
-        # in which no string value is meant to be substituted.
-        # Verify that the attribute is set to a variable
-        regex = '(rev\s+=\s+([_a-zA-Z][_a-zA-Z0-9\.]*);)'
+        # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";`
+        # in which no string value is meant to be substituted. However, we can just overwrite the previous value.
+        regex = '(rev\s+=\s+[^;]*;)'
         regex = re.compile(regex)
-        value = regex.findall(text)
-        n = len(value)
+        matches = regex.findall(text)
+        n = len(matches)
 
         if n == 0:
-            # value is set to a string, e.g. `rev = "v${version}";`
-            text = _replace_value('rev', f"{prefix}${{version}}", text)
+            raise ValueError("Unable to find rev value for {}.".format(pname))
+        else:
+            # forcefully rewrite rev, incase tagging conventions changed for a release
+            match = matches[0]
+            text = text.replace(match, f'rev = "refs/tags/{prefix}${{version}}";')
             # incase there's no prefix, just rewrite without interpolation
             text = text.replace('"${version}";', 'version;')
 
diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
index 4150f7683d5dd..6a8e171ee6e16 100644
--- a/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "rubygems";
+  pname = "rubygems";
   version = "3.2.26";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix
index b57cc64fb8d7e..45b59124b7821 100644
--- a/pkgs/development/interpreters/scsh/default.nix
+++ b/pkgs/development/interpreters/scsh/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "scheme";
     repo = "scsh";
-    rev = "f99b8c5293628cfeaeb792019072e3a96841104f";
-    sha256 = "sha256-vcVtqoUhozdJq1beUN8/rcI2qOJYUN+0CPSiDWGCIjI=";
+    rev = "4acf6e4ed7b65b46186ef0c9c2a1e10bef8dc052";
+    sha256 = "sha256-92NtMK5nVd6+WtHj/Rk6iQEkGsNEZySTVZkkbqKrLYY=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index d1086de3718de..d8d81492f9147 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -65,6 +65,14 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
   outputBin = "dev"; # sdl-config
 
+  patches = [
+    # `sdl2-config --cflags` from Nixpkgs returns include path to just SDL2.
+    # On a normal distro this is enough for includes from all SDL2* packages to work,
+    # but on NixOS they're spread across different paths.
+    # This patch + the setup-hook will ensure that `sdl2-config --cflags` works correctly.
+    ./find-headers.patch
+  ];
+
   depsBuildBuild = [ pkg-config ];
 
   nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ];
diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch
new file mode 100644
index 0000000000000..4792679deb117
--- /dev/null
+++ b/pkgs/development/libraries/SDL2/find-headers.patch
@@ -0,0 +1,34 @@
+diff --git a/sdl2-config.cmake.in b/sdl2-config.cmake.in
+index c570511fa..ca694f595 100644
+--- a/sdl2-config.cmake.in
++++ b/sdl2-config.cmake.in
+@@ -7,7 +7,8 @@ set(includedir "@includedir@")
+ set(SDL2_PREFIX "${prefix}")
+ set(SDL2_EXEC_PREFIX "${exec_prefix}")
+ set(SDL2_LIBDIR "${libdir}")
+-set(SDL2_INCLUDE_DIRS "${includedir}/SDL2")
++set(SDL2_INCLUDE_DIRS "${includedir}/SDL2" $ENV{SDL2_PATH})
++separate_arguments(SDL2_INCLUDE_DIRS)
+ set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@")
+ string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
+ 
+diff --git a/sdl2-config.in b/sdl2-config.in
+index 5a2aed292..7c55f0a28 100644
+--- a/sdl2-config.in
++++ b/sdl2-config.in
+@@ -42,7 +42,11 @@ while test $# -gt 0; do
+       echo @SDL_VERSION@
+       ;;
+     --cflags)
+-      echo -I@includedir@/SDL2 @SDL_CFLAGS@
++      SDL_CFLAGS=""
++      for i in @includedir@/SDL2 $SDL2_PATH; do
++        SDL_CFLAGS="$SDL_CFLAGS -I$i"
++      done
++      echo $SDL_CFLAGS @SDL_CFLAGS@
+       ;;
+ @ENABLE_SHARED_TRUE@    --libs)
+ @ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+-- 
+2.33.1
+
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index 777bad1e5a53d..b839092228b30 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -1,4 +1,8 @@
-{ lib, stdenv, fetchurl, fetchpatch, fetchzip, perl
+{ lib, stdenv, fetchurl, fetchpatch, fetchzip, perl, ncurses
+
+  # for tests
+, aspell, glibc, runCommand
+
 , searchNixProfiles ? true
 }:
 
@@ -37,7 +41,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ perl ];
-  buildInputs = [ perl ];
+  buildInputs = [ ncurses perl ];
 
   doCheck = true;
 
@@ -55,6 +59,19 @@ stdenv.mkDerivation rec {
     cp ${devaMapsSource}/u-deva.{cmap,cset} $out/lib/aspell/
   '';
 
+  passthru.tests = {
+    uses-curses = runCommand "${pname}-curses" {
+      buildInputs = [ glibc ];
+    } ''
+      if ! ldd ${aspell}/bin/aspell | grep -q ${ncurses}
+      then
+        echo "Test failure: It does not look like aspell picked up the curses dependency."
+        exit 1
+      fi
+      touch $out
+    '';
+  };
+
   meta = {
     description = "Spell checker for many languages";
     homepage = "http://aspell.net/";
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index a52d1be566e68..1732b5df04e2a 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -18,7 +18,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "avahi${lib.optionalString withLibdnssdCompat "-compat"}-${version}";
+  pname = "avahi${lib.optionalString withLibdnssdCompat "-compat"}";
   version = "0.8";
 
   src = fetchurl {
@@ -33,6 +33,10 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./no-mkdir-localstatedir.patch
+    (fetchpatch {
+      url = "https://github.com/lathiat/avahi/commit/9d31939e55280a733d930b15ac9e4dda4497680c.patch";
+      sha256 = "sha256-BXWmrLWUvDxKPoIPRFBpMS3T4gijRw0J+rndp6iDybU=";
+    })
   ];
 
   buildInputs = [ libdaemon dbus glib expat libiconv libevent ]
diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix
index 76d5839402cf1..e38a748317fb1 100644
--- a/pkgs/development/libraries/avro-c/default.nix
+++ b/pkgs/development/libraries/avro-c/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }:
+{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, lzma, snappy, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "avro-c";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config cmake ];
 
-  buildInputs = [ jansson zlib ];
+  buildInputs = [ jansson lzma snappy zlib ];
 
   meta = with lib; {
     description = "A C library which implements parts of the Avro Specification";
diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix
index d934e3267fcb2..c8846daa64f33 100644
--- a/pkgs/development/libraries/boost/1.69.nix
+++ b/pkgs/development/libraries/boost/1.69.nix
@@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec {
     # SHA256 from http://www.boost.org/users/history/version_1_69_0.html
     sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406";
   };
+
+  patches = [ ./pthread-stack-min-fix.patch ];
 })
diff --git a/pkgs/development/libraries/boost/1.70.nix b/pkgs/development/libraries/boost/1.70.nix
index bc70797acda8d..4d50f41e49ce5 100644
--- a/pkgs/development/libraries/boost/1.70.nix
+++ b/pkgs/development/libraries/boost/1.70.nix
@@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec {
     # SHA256 from http://www.boost.org/users/history/version_1_70_0.html
     sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778";
   };
+
+  patches = [ ./pthread-stack-min-fix.patch ];
 })
diff --git a/pkgs/development/libraries/boost/1.72.nix b/pkgs/development/libraries/boost/1.72.nix
index bb2fccdfaf786..666a3cacb656a 100644
--- a/pkgs/development/libraries/boost/1.72.nix
+++ b/pkgs/development/libraries/boost/1.72.nix
@@ -11,5 +11,7 @@ callPackage ./generic.nix (args // rec {
     # SHA256 from http://www.boost.org/users/history/version_1_72_0.html
     sha256 = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722";
   };
+
+  patches = [ ./pthread-stack-min-fix.patch ];
 })
 
diff --git a/pkgs/development/libraries/boost/pthread-stack-min-fix.patch b/pkgs/development/libraries/boost/pthread-stack-min-fix.patch
new file mode 100644
index 0000000000000..b6c85f8405298
--- /dev/null
+++ b/pkgs/development/libraries/boost/pthread-stack-min-fix.patch
@@ -0,0 +1,15 @@
+Taken from https://github.com/conan-io/conan-center-index/pull/361/files
+
+diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
+index aefbeb4..bc9b136 100644
+--- a/boost/thread/pthread/thread_data.hpp
++++ b/boost/thread/pthread/thread_data.hpp
+@@ -57,7 +57,7 @@ namespace boost
+ #else
+           std::size_t page_size = ::sysconf( _SC_PAGESIZE);
+ #endif
+-#if PTHREAD_STACK_MIN > 0
++#ifdef PTHREAD_STACK_MIN
+           if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
+ #endif
+           size = ((size+page_size-1)/page_size)*page_size;
diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
deleted file mode 100644
index d6ee9ff152f43..0000000000000
--- a/pkgs/development/libraries/botan/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  baseVersion = "1.10";
-  revision = "17";
-  sha256 = "04rnha712dd3sdb2q7k2yw45sf405jyigk7yrjfr6bwd9fvgyiv8";
-  sourceExtension = "tgz";
-  extraConfigureFlags = "--with-gnump";
-  postPatch = ''
-    sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
-  '';
-  knownVulnerabilities = [
-    "CVE-2021-40529"
-    # https://botan.randombit.net/security.html#id1
-    "2020-03-24: Side channel during CBC padding"
-  ];
-})
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index c89fbd477c960..c4d64a0f47878 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
       url = "https://github.com/catchorg/Catch2/commit/bb6d08323f23a39eb65dd86671e68f4f5d3f2d6c.patch";
       sha256 = "1vhbzx84nrhhf9zlbl6h5zmg3r5w5v833ihlswsysb9wp2i4isc5";
     })
+
+    # Fix glibc-2.34 build
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/catch1/raw/23276476148a657e7a45ade547f858cbf965a33a/f/catch1-sigstksz.patch";
+      sha256 = "sha256-XSsI3iDEZCUSbozlYWC0y/LZ7qr/5zwACpn1jHKD0yU=";
+    })
   ];
 
   doCheck = true;
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix
index dfe7f77767038..bba2e03f8d59b 100644
--- a/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/pkgs/development/libraries/cpp-hocon/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
     owner = "puppetlabs";
   };
 
+  postPatch = ''
+    sed -i -e '/add_subdirectory(tests)/d' lib/CMakeLists.txt
+  '';
+
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix
index 31a5420e375c8..e640b6cbbbabf 100644
--- a/pkgs/development/libraries/cwiid/default.nix
+++ b/pkgs/development/libraries/cwiid/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "cwiid-${version}-git";
-  version = "2010-02-21";
+  pname = "cwiid";
+  version = "unstable-2010-02-21";
 
   src = fetchFromGitHub {
     owner  = "abstrakraft";
diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/development/libraries/cxxopts/default.nix
index 9d3ea6f32de3d..5d12b3c19ee3c 100644
--- a/pkgs/development/libraries/cxxopts/default.nix
+++ b/pkgs/development/libraries/cxxopts/default.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cxxopts";
+  pname = "cxxopts";
   version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "jarro2783";
-    repo = name;
+    repo = "cxxopts";
     rev = "v${version}";
     sha256 = "08x7j168l1xwj0r3rv89cgghmfhsx98lpq35r3vkh504m1pd55a6";
   };
diff --git a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch
index 8662e812e9956..f0376792e0028 100644
--- a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch
+++ b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch
@@ -1,12 +1,13 @@
---- a/m4/sasl2.m4	2018-11-18 22:33:29.902625600 +0300
-+++ b/m4/sasl2.m4	2018-11-18 22:33:59.828746176 +0300
-@@ -339,7 +339,8 @@
- ],	
- 	[ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
- 	AC_MSG_RESULT(yes) ],
--	AC_MSG_RESULT(no))
-+	AC_MSG_RESULT(no),
-+    AC_MSG_RESULT(no))
-   LIBS="$cmu_save_LIBS"
+diff --git a/m4/sasl2.m4 b/m4/sasl2.m4
+index 098c853a..91d98def 100644
+--- a/m4/sasl2.m4
++++ b/m4/sasl2.m4
+@@ -350,7 +350,7 @@ int main(void)
  
- else
+     return (!have_spnego);  // 0 = success, 1 = failure
+ }
+-],[ac_cv_gssapi_supports_spnego=yes],[ac_cv_gssapi_supports_spnego=no])
++],[ac_cv_gssapi_supports_spnego=yes],[ac_cv_gssapi_supports_spnego=no],[ac_cv_gssapi_supports_spnego=no])
+     LIBS="$cmu_save_LIBS"
+   ])
+   AS_IF([test "$ac_cv_gssapi_supports_spnego" = yes],[
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 6e97c61a6a5e9..be20a9b1678df 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, openssl, openldap, libkrb5, db, gettext
 , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false
-, buildPackages, pruneLibtoolFiles, fetchpatch }:
+, buildPackages, pruneLibtoolFiles, nixosTests }:
 
 with lib;
 stdenv.mkDerivation rec {
   pname = "cyrus-sasl";
-  version = "2.1.27";
+  version = "2.1.28";
 
   src = fetchurl {
     urls =
@@ -13,9 +13,14 @@ stdenv.mkDerivation rec {
         "http://www.cyrusimap.org/releases/${pname}-${version}.tar.gz"
         "http://www.cyrusimap.org/releases/old/${pname}-${version}.tar.gz"
       ];
-    sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6";
+    sha256 = "sha256-fM/Gq9Ae1nwaCSSzU+Um8bdmsh9C1FYu5jWo6/xbs4w=";
   };
 
+  patches = [
+    # Fix cross-compilation
+    ./cyrus-sasl-ac-try-run-fix.patch
+  ];
+
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -26,16 +31,6 @@ stdenv.mkDerivation rec {
     ++ lib.optional enableLdap openldap
     ++ lib.optional stdenv.isLinux pam;
 
-  patches = [
-    ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
-    ./cyrus-sasl-ac-try-run-fix.patch
-    (fetchpatch {
-      name = "CVE-2019-19906.patch";
-      url = "https://sources.debian.org/data/main/c/cyrus-sasl2/2.1.27+dfsg-1+deb10u1/debian/patches/0021-CVE-2019-19906.patch";
-      sha256 = "1n4c5wg7l9j8rlbvx8i605j5d39xmj5wm618k8acxl4fmglcmfls";
-    })
-  ];
-
   configureFlags = [
     "--with-openssl=${openssl.dev}"
     "--with-plugindir=${placeholder "out"}/lib/sasl2"
@@ -46,6 +41,10 @@ stdenv.mkDerivation rec {
 
   installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ];
 
+  passthru.tests = {
+    inherit (nixosTests) parsedmarc postfix;
+  };
+
   meta = {
     homepage = "https://www.cyrusimap.org/sasl";
     description = "Library for adding authentication support to connection-based protocols";
diff --git a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch b/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch
deleted file mode 100644
index da96818ca267f..0000000000000
--- a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Gentoo bug #458790
---- a/include/sasl.h	2012-10-12 17:05:48.000000000 +0300
-+++ b/include/sasl.h	2013-02-23 16:56:44.648786268 +0200
-@@ -121,6 +121,9 @@
- #ifndef SASL_H
- #define SASL_H 1
- 
-+/* stddef.h to get size_t defined */
-+#include <stddef.h>
-+
- /* Keep in sync with win32/common.mak */
- #define SASL_VERSION_MAJOR 2
- #define SASL_VERSION_MINOR 1
diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix
index b39e092360960..180480985ac78 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/pkgs/development/libraries/dav1d/default.nix
@@ -10,14 +10,14 @@ assert useVulkan -> withExamples;
 
 stdenv.mkDerivation rec {
   pname = "dav1d";
-  version = "0.9.2";
+  version = "1.0.0";
 
   src = fetchFromGitLab {
     domain = "code.videolan.org";
     owner = "videolan";
     repo = pname;
     rev = version;
-    sha256 = "0bkps488h9s15ylvkm4fmfywgrpbw570glawpnv6khpq9n223dzl";
+    sha256 = "sha256-RVr7NFVxY+6MBD8NV7eMW8TEWuCgcfqpula1o1VZe0o=";
   };
 
   nativeBuildInputs = [ meson ninja nasm pkg-config ];
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
     "-Denable_examples=${lib.boolToString withExamples}"
   ];
 
+  doCheck = true;
+
   meta = with lib; {
     description = "A cross-platform AV1 decoder focused on speed and correctness";
     longDescription = ''
diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix
index 39d71eee432b6..fed050f64b6ef 100644
--- a/pkgs/development/libraries/dotconf/default.nix
+++ b/pkgs/development/libraries/dotconf/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, lib, stdenv, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "dotconf-" + version;
+  pname = "dotconf";
   version = "1.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index ac54ced75b1b9..a05f3b71fb46e 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "expat";
-  version = "2.4.6";
+  version = "2.4.7";
 
   src = fetchurl {
     url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-3lV5S3qbwhSFL9wHW+quzYVO/hNhWX5iaO6HlGlRKJs=";
+    sha256 = "0zbss0dssn17mjmvk17qfi5cmvm0lcyzs62cwvqr219hhl864xcq";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
 
   passthru.tests = {
     inherit python3;
+    inherit (python3.pkgs) xmltodict;
     inherit (haskellPackages) hexpat;
     inherit (perlPackages) XMLSAXExpat XMLParser;
     inherit (luaPackages) luaexpat;
diff --git a/pkgs/development/libraries/fltk/common.nix b/pkgs/development/libraries/fltk/common.nix
index 06e1c05c7d072..54c8b4094f162 100644
--- a/pkgs/development/libraries/fltk/common.nix
+++ b/pkgs/development/libraries/fltk/common.nix
@@ -36,7 +36,6 @@
 , withDocs ? true
 , doxygen
 , graphviz
-, texlive
 
 , withExamples ? true
 , withShared ? true
@@ -44,11 +43,6 @@
 
 let
   onOff = value: if value then "ON" else "OFF";
-  tex = texlive.combine {
-    inherit (texlive)
-      scheme-medium varwidth multirow hanging adjustbox collectbox stackengine
-      sectsty tocloft newunicodechar etoc;
-  };
 in
 stdenv.mkDerivation rec {
   pname = "fltk";
@@ -81,7 +75,6 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals withDocs [
     doxygen
     graphviz
-    tex
   ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -149,9 +142,9 @@ stdenv.mkDerivation rec {
 
     # Docs
     "-DOPTION_BUILD_HTML_DOCUMENTATION=${onOff withDocs}"
-    "-DOPTION_BUILD_PDF_DOCUMENTATION=${onOff withDocs}"
+    "-DOPTION_BUILD_PDF_DOCUMENTATION=OFF"
     "-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}"
-    "-DOPTION_INSTALL_PDF_DOCUMENTATION=${onOff withDocs}"
+    "-DOPTION_INSTALL_PDF_DOCUMENTATION=OFF"
     "-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}"
   ];
 
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix
index b9b7db729ebaa..094bb7e7a1d3d 100644
--- a/pkgs/development/libraries/gcc/libgcc/default.nix
+++ b/pkgs/development/libraries/gcc/libgcc/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenvNoLibs.mkDerivation rec {
-  name = "libgcc-${version}";
+  pname = "libgcc";
   inherit (gcc.cc) src version;
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index de7bf815b044a..cfc4fc6d1b5fa 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gdcm";
-  version = "3.0.11";
+  version = "3.0.12";
 
   src = fetchFromGitHub {
     owner = "malaterre";
     repo = "GDCM";
     rev = "v${version}";
-    sha256 = "sha256-rGR0yQImLG3kBp6/QoEMLFrFtgAIN6y9lZ3OmtAUVcY=";
+    sha256 = "sha256-ChHsbnX+128ZOugL6Nc8EqfaDMaNMNDmKTN55pyyem8=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/pkgs/development/libraries/ggz_base_libs/default.nix
index cafb869354906..687b74fdb3ad9 100644
--- a/pkgs/development/libraries/ggz_base_libs/default.nix
+++ b/pkgs/development/libraries/ggz_base_libs/default.nix
@@ -1,12 +1,11 @@
 { lib, stdenv, fetchurl, intltool, openssl, expat, libgcrypt }:
 
 stdenv.mkDerivation rec {
+  pname = "ggz-base-libs";
   version = "0.99.5";
-  baseName = "ggz-base-libs";
-  name = "${baseName}-snapshot-${version}";
 
   src = fetchurl {
-    url = "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/${name}.tar.gz";
+    url = "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/ggz-base-libs-snapshot-${version}.tar.gz";
     sha256 = "1cw1vg0fbj36zyggnzidx9cbjwfc1yr4zqmsipxnvns7xa2awbdk";
   };
 
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index a7b8f0d44bf6d..386130cc62245 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -54,6 +54,14 @@ stdenv.mkDerivation rec {
 
   patches = optionals stdenv.isDarwin [
     ./darwin-compilation.patch
+
+    # Fix Inkscape compilation with clang++
+    # https://gitlab.gnome.org/GNOME/glib/-/issues/2625
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/glib/-/commit/97d39b745ff1f621424f68a41ce0a7c5bb554c87.patch";
+      sha256 = "wftuyf3ExFfrISngCQpEUpIGfHCCLXeYv/PEb/TE6a8=";
+      revert = true;
+    })
   ] ++ optionals stdenv.hostPlatform.isMusl [
     ./quark_init_on_demand.patch
     ./gobject_init_on_demand.patch
diff --git a/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch b/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch
new file mode 100644
index 0000000000000..45bad2867e906
--- /dev/null
+++ b/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch
@@ -0,0 +1,131 @@
+From f81744bae4442345ff6f40d80fdb8adaba8b330f Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Fri, 27 Aug 2021 17:19:27 +0200
+Subject: [PATCH] Revert "Remove all usage of @BASH@ or ${BASH} in installed
+ files, and hardcode /bin/bash instead"
+
+We need the ability to override to use `/bin/sh` here to avoid having
+some bootstrap tools in a final build product.
+
+This reverts commit 5188a9d0265cc6f7235a8af1d31ab02e4a24853d.
+---
+ debug/Makefile     | 5 +++--
+ debug/xtrace.sh    | 2 +-
+ elf/Makefile       | 4 +++-
+ elf/ldd.bash.in    | 2 +-
+ elf/sotruss.sh     | 2 +-
+ malloc/Makefile    | 5 +++--
+ malloc/memusage.sh | 2 +-
+ timezone/Makefile  | 3 ++-
+ 8 files changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/debug/Makefile b/debug/Makefile
+index 6893111cbf..3f66666c6c 100644
+--- a/debug/Makefile
++++ b/debug/Makefile
+@@ -216,7 +216,8 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o
+ 
+ $(objpfx)xtrace: xtrace.sh
+ 	rm -f $@.new
+-	sed -e 's|@VERSION@|$(version)|' -e 's|@SLIBDIR@|$(sLIBdir)|' \
+-	    -e 's|@BINDIR@|$(bindir)|' -e 's|@PKGVERSION@|$(PKGVERSION)|' \
++	sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \
++	    -e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' \
++	    -e 's|@PKGVERSION@|$(PKGVERSION)|' \
+ 	    -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \
+ 	&& rm -f $@ && mv $@.new $@ && chmod +x $@
+diff --git a/debug/xtrace.sh b/debug/xtrace.sh
+index 9697fbe0b4..279fe59ac6 100755
+--- a/debug/xtrace.sh
++++ b/debug/xtrace.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#! @BASH@
+ # Copyright (C) 1999-2021 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ # Contributed by Ulrich Drepper <drepper@gnu.org>, 1999.
+diff --git a/elf/Makefile b/elf/Makefile
+index d05f410592..9264409fdd 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -144,7 +144,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \
+ 	$(common-objpfx)libc_nonshared.a
+ 
+ $(objpfx)sotruss: sotruss.sh $(common-objpfx)config.make
+-	sed -e 's%@VERSION@%$(version)%g' \
++	sed -e 's%@BASH@%$(BASH)%g' \
++	    -e 's%@VERSION@%$(version)%g' \
+ 	    -e 's%@TEXTDOMAINDIR@%$(localedir)%g' \
+ 	    -e 's%@PREFIX@%$(prefix)%g' \
+ 	    -e 's|@PKGVERSION@|$(PKGVERSION)|g' \
+@@ -659,6 +660,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
+ 	      -e 's%@VERSION@%$(version)%g' \
+ 	      -e 's|@PKGVERSION@|$(PKGVERSION)|g' \
+ 	      -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \
++	      -e 's%@BASH@%$(BASH)%g' \
+ 	      -e 's%@TEXTDOMAINDIR@%$(localedir)%g'
+ 
+ ifeq ($(ldd-rewrite-script),no)
+diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
+index ba736464ac..57442bc3f2 100644
+--- a/elf/ldd.bash.in
++++ b/elf/ldd.bash.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#! @BASH@
+ # Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ 
+diff --git a/elf/sotruss.sh b/elf/sotruss.sh
+index 003cf4d825..fd4da80244 100755
+--- a/elf/sotruss.sh
++++ b/elf/sotruss.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#! @BASH@
+ # Copyright (C) 2011-2021 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ 
+diff --git a/malloc/Makefile b/malloc/Makefile
+index 9b70831d38..90ecadff6c 100644
+--- a/malloc/Makefile
++++ b/malloc/Makefile
+@@ -271,8 +271,9 @@ $(objpfx)mtrace: mtrace.pl
+ 
+ $(objpfx)memusage: memusage.sh
+ 	rm -f $@.new
+-	sed -e 's|@VERSION@|$(version)|' -e 's|@SLIBDIR@|$(sLIBdir)|' \
+-	    -e 's|@BINDIR@|$(bindir)|' -e 's|@PKGVERSION@|$(PKGVERSION)|' \
++	sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \
++	    -e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' \
++	    -e 's|@PKGVERSION@|$(PKGVERSION)|' \
+ 	    -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \
+ 	&& rm -f $@ && mv $@.new $@ && chmod +x $@
+ 
+diff --git a/malloc/memusage.sh b/malloc/memusage.sh
+index 0645f09911..c1cd4e23b7 100755
+--- a/malloc/memusage.sh
++++ b/malloc/memusage.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#! @BASH@
+ # Copyright (C) 1999-2021 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ # Contributed by Ulrich Drepper <drepper@gnu.org>, 1999.
+diff --git a/timezone/Makefile b/timezone/Makefile
+index c624a189b3..395abfeebd 100644
+--- a/timezone/Makefile
++++ b/timezone/Makefile
+@@ -123,7 +123,8 @@ $(testdata)/XT%: testdata/XT%
+ 	cp $< $@
+ 
+ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
+-	sed -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \
++	sed -e 's|/bin/bash|$(BASH)|' \
++	    -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \
+ 	    -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
+ 	    -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
+ 	    -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \
+-- 
+2.31.1
+
diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz
deleted file mode 100644
index 777e94e2b2ea5..0000000000000
--- a/pkgs/development/libraries/glibc/2.33-master.patch.gz
+++ /dev/null
Binary files differdiff --git a/pkgs/development/libraries/glibc/2.34-master.patch.gz b/pkgs/development/libraries/glibc/2.34-master.patch.gz
new file mode 100644
index 0000000000000..8fb02ca6d7217
--- /dev/null
+++ b/pkgs/development/libraries/glibc/2.34-master.patch.gz
Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index ffec9972d2875..47aa304e7d398 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -43,9 +43,9 @@
 } @ args:
 
 let
-  version = "2.33";
-  patchSuffix = "-117";
-  sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8=";
+  version = "2.34";
+  patchSuffix = "-115";
+  sha256 = "sha256-RNJqH+ILiFOkj0cOrQHkJ56GmsFJsZXdpORKGV2YGrI=";
 in
 
 assert withLinuxHeaders -> linuxHeaders != null;
@@ -62,14 +62,14 @@ stdenv.mkDerivation ({
   patches =
     [
       /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
-          $ git fetch --all -p && git checkout origin/release/2.33/master && git describe
-          glibc-2.33-117-g55446dd8a2
-          $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz
+          $ git fetch --all -p && git checkout origin/release/2.34/master && git describe
+          glibc-2.34-115-gd5d1c95aaf
+          $ git show --minimal --reverse glibc-2.34.. | gzip -9n --rsyncable - > 2.34-master.patch.gz
 
          To compare the archive contents zdiff can be used.
-          $ zdiff -u 2.33-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz
+          $ zdiff -u 2.34-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.34-master.patch.gz
        */
-      ./2.33-master.patch.gz
+      ./2.34-master.patch.gz
 
       /* Allow NixOS and Nix to handle the locale-archive. */
       ./nix-locale-archive.patch
@@ -125,6 +125,8 @@ stdenv.mkDerivation ({
 
       /* https://github.com/NixOS/nixpkgs/pull/137601 */
       ./nix-nss-open-files.patch
+
+      ./0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch
     ]
     ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch
     ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch;
@@ -138,6 +140,10 @@ stdenv.mkDerivation ({
       # nscd needs libgcc, and we don't want it dynamically linked
       # because we don't want it to depend on bootstrap-tools libs.
       echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile
+
+      # Ensure that `__nss_files_fopen` can still be wrapped by `libredirect`.
+      sed -i -e '/libc_hidden_def (__nss_files_fopen)/d' nss/nss_files_fopen.c
+      sed -i -e '/libc_hidden_proto (__nss_files_fopen)/d' include/nss_files.h
     ''
     # FIXME: find a solution for infinite recursion in cross builds.
     # For now it's hopefully acceptable that IDN from libc doesn't reliably work.
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index caaacfe4f4368..65a622f046736 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -119,6 +119,17 @@ callPackage ./common.nix { inherit stdenv; } {
 
       # Get rid of more unnecessary stuff.
       rm -rf $out/var $bin/bin/sln
+
+      # Backwards-compatibility to fix e.g.
+      # "configure: error: Pthreads are required to build libgomp" during `gcc`-build
+      # because it's not actually needed anymore to link against `pthreads` since
+      # it's now part of `libc.so.6` itself, but the gcc build breaks if
+      # this doesn't work.
+      ln -sf $out/lib/libpthread.so.0 $out/lib/libpthread.so
+      ln -sf $out/lib/librt.so.1 $out/lib/librt.so
+      ln -sf $out/lib/libdl.so.2 $out/lib/libdl.so
+      ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so
+      touch $out/lib/libpthread.a
     ''
       # For some reason these aren't stripped otherwise and retain reference
       # to bootstrap-tools; on cross-arm this stripping would break objects.
diff --git a/pkgs/development/libraries/glibc/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch
index 39312951fcf91..2fedf2a7a7dbd 100644
--- a/pkgs/development/libraries/glibc/nix-locale-archive.patch
+++ b/pkgs/development/libraries/glibc/nix-locale-archive.patch
@@ -1,7 +1,8 @@
-diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c
---- glibc-2.27-orig/locale/loadarchive.c	2018-02-01 11:17:18.000000000 -0500
-+++ glibc-2.27/locale/loadarchive.c	2018-02-17 22:32:25.680169462 -0500
-@@ -123,6 +123,23 @@
+diff --git a/locale/loadarchive.c b/locale/loadarchive.c
+index 512769eaec..171dbb4ad9 100644
+--- a/locale/loadarchive.c
++++ b/locale/loadarchive.c
+@@ -123,6 +123,23 @@ calculate_head_size (const struct locarhead *h)
    return MAX (namehash_end, MAX (string_end, locrectab_end));
  }
  
@@ -25,7 +26,7 @@ diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c
  
  /* Find the locale *NAMEP in the locale archive, and return the
     internalized data structure for its CATEGORY data.  If this locale has
-@@ -202,7 +219,7 @@
+@@ -202,7 +219,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
        archmapped = &headmap;
  
        /* The archive has never been opened.  */
@@ -34,23 +35,25 @@ diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c
        if (fd < 0)
  	/* Cannot open the archive, for whatever reason.  */
  	return NULL;
-@@ -397,8 +414,7 @@
+@@ -397,8 +414,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
  	  if (fd == -1)
  	    {
- 	      struct stat64 st;
+ 	      struct __stat64_t64 st;
 -	      fd = __open_nocancel (archfname,
 -				    O_RDONLY|O_LARGEFILE|O_CLOEXEC);
-+	      fd = open_locale_archive ();
++	      fd = open_locale_archive();
  	      if (fd == -1)
  		/* Cannot open the archive, for whatever reason.  */
  		return NULL;
-diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/locale.c
---- glibc-2.27-orig/locale/programs/locale.c	2018-02-01 11:17:18.000000000 -0500
-+++ glibc-2.27/locale/programs/locale.c	2018-02-17 22:36:39.726293213 -0500
-@@ -633,6 +633,24 @@
+diff --git a/locale/programs/locale.c b/locale/programs/locale.c
+index ca0a95be99..e484783402 100644
+--- a/locale/programs/locale.c
++++ b/locale/programs/locale.c
+@@ -633,6 +633,24 @@ nameentcmp (const void *a, const void *b)
+ }
  
  
- static int
++static int
 +open_locale_archive (void)
 +{
 +  int fd = -1;
@@ -68,11 +71,10 @@ diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/l
 +}
 +
 +
-+static int
+ static int
  write_archive_locales (void **all_datap, char *linebuf)
  {
-   struct stat64 st;
-@@ -644,7 +662,7 @@
+@@ -645,7 +663,7 @@ write_archive_locales (void **all_datap, char *linebuf)
    int fd, ret = 0;
    uint32_t cnt;
  
@@ -81,10 +83,11 @@ diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/l
    if (fd < 0)
      return 0;
  
-diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/programs/locarchive.c
---- glibc-2.27-orig/locale/programs/locarchive.c	2018-02-01 11:17:18.000000000 -0500
-+++ glibc-2.27/locale/programs/locarchive.c	2018-02-17 22:40:51.245293975 -0500
-@@ -117,6 +117,22 @@
+diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
+index f38e835c52..779a3199fc 100644
+--- a/locale/programs/locarchive.c
++++ b/locale/programs/locarchive.c
+@@ -117,6 +117,22 @@ prepare_address_space (int fd, size_t total, size_t *reserved, int *xflags,
  }
  
  
@@ -107,7 +110,7 @@ diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/progra
  static void
  create_archive (const char *archivefname, struct locarhandle *ah)
  {
-@@ -578,7 +594,7 @@
+@@ -578,7 +594,7 @@ open_archive (struct locarhandle *ah, bool readonly)
    while (1)
      {
        /* Open the archive.  We must have exclusive write access.  */
diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix
deleted file mode 100644
index a8dfa430f5992..0000000000000
--- a/pkgs/development/libraries/globalplatform/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, zlib, openssl_1_0_2, pcsclite }:
-
-stdenv.mkDerivation rec {
-  pname = "globalplatform";
-  version  = "6.0.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz";
-    sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ zlib openssl_1_0_2 pcsclite ];
-
-  meta = with lib; {
-    homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
-    description = "Library for interacting with smart card devices";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
deleted file mode 100644
index a3ea4305bea71..0000000000000
--- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, globalplatform, openssl_1_0_2, pcsclite }:
-
-stdenv.mkDerivation rec {
-  pname = "gppcscconnectionplugin";
-  version  = "1.1.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz";
-    sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ globalplatform openssl_1_0_2 pcsclite ];
-
-  meta = with lib; {
-    homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
-    description = "GlobalPlatform pcsc connection plugin";
-    license = [ licenses.lgpl3 licenses.gpl3 ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 9093073cecff4..af4f15a151f0f 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -12,7 +12,7 @@
 let inherit (lib) optional; in
 
 let self = stdenv.mkDerivation rec {
-  pname = "gmp";
+  pname = "gmp${lib.optionalString cxx "-with-cxx"}";
   version = "6.2.1";
 
   src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 28c47640ca6a9..37c2a1a44133c 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation rec {
   pname = "grpc";
-  version = "1.43.0"; # N.B: if you change this, please update:
+  version = "1.44.0"; # N.B: if you change this, please update:
     # pythonPackages.grpcio-tools
     # pythonPackages.grpcio-status
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
-    sha256 = "sha256-NPyCQsrmD/gBs4UHPGbBACmGRTNQDj6WfnfLNdWulK4=";
+    sha256 = "sha256-pG8RtAJJCLnxm+3hW1YsikyeNr9pjIRANeYhDJfTPbo=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
index cf26e22da5bc3..284ee83c2d4f4 100644
--- a/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.x.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, gtk2, glibmm, cairomm, pangomm, atkmm }:
 
 stdenv.mkDerivation rec {
-  name = "gtkmm-${minVer}.5";
-  minVer = "2.24";
+  pname = "gtkmm";
+  version = "2.24.5";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtkmm/${minVer}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor version}/gtkmm-${version}.tar.xz";
     sha256 = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72";
   };
 
diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix
index 204af0a92b577..85fa8fc4c6eb0 100644
--- a/pkgs/development/libraries/hivex/default.nix
+++ b/pkgs/development/libraries/hivex/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./hivex-syms.patch ];
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];
   buildInputs = [
-    autoreconfHook makeWrapper libxml2
+    libxml2
   ]
   ++ (with perlPackages; [ perl IOStringy ])
   ++ lib.optionals stdenv.isDarwin [ libiconv ];
diff --git a/pkgs/development/libraries/hspell/dicts.nix b/pkgs/development/libraries/hspell/dicts.nix
index 83942c2c1dde2..06f80bf5cf223 100644
--- a/pkgs/development/libraries/hspell/dicts.nix
+++ b/pkgs/development/libraries/hspell/dicts.nix
@@ -2,7 +2,7 @@
 
 let
   dict = variant: a: stdenv.mkDerivation ({
-    inherit (hspell) src patchPhase nativeBuildInputs;
+    inherit (hspell) version src patchPhase nativeBuildInputs;
     buildFlags = [ variant ];
 
     meta = hspell.meta // {
@@ -15,7 +15,7 @@ in
   recurseForDerivations = true;
 
   aspell = dict "aspell" {
-    name = "aspell-dict-he-${hspell.version}";
+    pname = "aspell-dict-he";
 
     installPhase = ''
       mkdir -p $out/lib/aspell
@@ -23,7 +23,7 @@ in
   };
 
   myspell = dict "myspell" {
-    name = "myspell-dict-he-${hspell.version}";
+    pname = "myspell-dict-he";
 
     installPhase = ''
       mkdir -p $out/lib/myspell
@@ -31,7 +31,7 @@ in
   };
 
   hunspell = dict "hunspell" {
-    name = "hunspell-dict-he-${hspell.version}";
+    pname = "hunspell-dict-he";
 
     installPhase = ''
       mkdir -p $out/lib
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index 36ca0b0ca0b76..aff5b1ea3c183 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "http-parser";
@@ -12,7 +12,14 @@ stdenv.mkDerivation rec {
   };
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
-  patches = [ ./build-shared.patch ];
+  patches = [
+    ./build-shared.patch
+    # https://github.com/nodejs/http-parser/pull/510
+    (fetchpatch {
+      url = "https://github.com/nodejs/http-parser/commit/4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878.patch";
+      sha256 = "sha256-rZZMJeow3V1fTnjadRaRa+xTq3pdhZn/eJ4xjxEDoU4=";
+    })
+  ];
   makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ];
   buildFlags = [ "library" ];
   doCheck = true;
diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix
index 441646c439558..8402aae98198a 100644
--- a/pkgs/development/libraries/igraph/default.nix
+++ b/pkgs/development/libraries/igraph/default.nix
@@ -12,7 +12,9 @@
 , lapack
 , libxml2
 , libxslt
+, llvmPackages
 , pkg-config
+, plfit
 , python3
 , sourceHighlight
 , suitesparse
@@ -30,10 +32,6 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-SL9PcT18vFvykCv4VRXxXtlcDAcybmwEImnnKXMciFQ=";
   };
 
-  # Normally, igraph wants us to call bootstrap.sh, which will call
-  # tools/getversion.sh. Instead, we're going to put the version directly
-  # where igraph wants, and then let autoreconfHook do the rest of the
-  # bootstrap. ~ C.
   postPatch = ''
     echo "${version}" > IGRAPH_VERSION
   '' + lib.optionalString stdenv.isAarch64 ''
@@ -65,7 +63,10 @@ stdenv.mkDerivation rec {
     gmp
     lapack
     libxml2
+    plfit
     suitesparse
+  ] ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
   ];
 
   cmakeFlags = [
@@ -75,8 +76,10 @@ stdenv.mkDerivation rec {
     "-DIGRAPH_USE_INTERNAL_GLPK=OFF"
     "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF"
     "-DIGRAPH_USE_INTERNAL_GMP=OFF"
+    "-DIGRAPH_USE_INTERNAL_PLFIT=OFF"
     "-DIGRAPH_GLPK_SUPPORT=ON"
     "-DIGRAPH_GRAPHML_SUPPORT=ON"
+    "-DIGRAPH_OPENMP_SUPPORT=ON"
     "-DIGRAPH_ENABLE_LTO=AUTO"
     "-DIGRAPH_ENABLE_TLS=ON"
     "-DBUILD_SHARED_LIBS=ON"
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index b300731ce440b..ad13daef788d1 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -1,9 +1,8 @@
 { lib, stdenv, autoreconfHook, ghostscript }:
 
 stdenv.mkDerivation {
-  name = "ijs-${ghostscript.version}";
-
-  inherit (ghostscript) src;
+  pname = "ijs";
+  inherit (ghostscript) version src;
 
   postPatch = "cd ijs";
 
diff --git a/pkgs/development/libraries/isl/generic.nix b/pkgs/development/libraries/isl/generic.nix
index eb6fe5f9cd69a..0a8c89d88ad30 100644
--- a/pkgs/development/libraries/isl/generic.nix
+++ b/pkgs/development/libraries/isl/generic.nix
@@ -9,7 +9,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "isl-${version}";
+  pname = "isl";
+  inherit version;
 
   src = fetchurl {
     inherit urls sha256;
diff --git a/pkgs/development/libraries/jcal/default.nix b/pkgs/development/libraries/jcal/default.nix
index 4ce62ec67bc4a..354a5518c43dc 100644
--- a/pkgs/development/libraries/jcal/default.nix
+++ b/pkgs/development/libraries/jcal/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "jcal";
+  pname = "jcal";
   version = "0.4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix
index 8c71afd5dcf79..dbe4dd14b8f5b 100644
--- a/pkgs/development/libraries/kde-frameworks/attica.nix
+++ b/pkgs/development/libraries/kde-frameworks/attica.nix
@@ -1,7 +1,7 @@
 { mkDerivation, extra-cmake-modules, qtbase }:
 
 mkDerivation {
-  name = "attica";
+  pname = "attica";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix
index 0c8f181a188a3..d608785027e84 100644
--- a/pkgs/development/libraries/kde-frameworks/baloo.nix
+++ b/pkgs/development/libraries/kde-frameworks/baloo.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "baloo";
+  pname = "baloo";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative
diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
index c5764b4915edf..c07553f8493f7 100644
--- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
@@ -4,7 +4,7 @@
 }:
 
 mkDerivation {
-  name = "bluez-qt";
+  pname = "bluez-qt";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtdeclarative ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
index 6e79a45ea921a..7fd482ea0da0a 100644
--- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
+++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
@@ -1,7 +1,7 @@
 { mkDerivation, extra-cmake-modules, gtk3, qtsvg, hicolor-icon-theme }:
 
 mkDerivation {
-  name = "breeze-icons";
+  pname = "breeze-icons";
   nativeBuildInputs = [ extra-cmake-modules gtk3 ];
   buildInputs = [ qtsvg ];
   propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index a5b0bfdae8def..2f7d0943dd484 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -70,8 +70,8 @@ let
         mkDerivation = args:
           let
 
-            inherit (args) name;
-            inherit (srcs.${name}) src version;
+            inherit (args) pname;
+            inherit (srcs.${pname}) src version;
 
             outputs = args.outputs or [ "bin" "dev" "out" ];
             hasSeparateDev = lib.elem "dev" outputs;
@@ -90,8 +90,7 @@ let
               };
 
           in mkDerivation (args // {
-            name = "${name}-${version}";
-            inherit meta outputs setupHook src version;
+            inherit pname meta outputs setupHook src version;
           });
 
       };
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
index b74fb29e5f2a3..b274999010a26 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, cmake, pkg-config }:
 
 mkDerivation {
-  name = "extra-cmake-modules";
+  pname = "extra-cmake-modules";
 
   patches = [
     ./nix-lib-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index cb4e4cc262981..1e2e36d6784c3 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.91/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.92/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
index c49eab2763c5e..6cb700c77744c 100644
--- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "frameworkintegration";
+  pname = "frameworkintegration";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kbookmarks kcompletion kconfig ki18n kio knewstuff knotifications kpackage
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
index 88fde8c5fd6d3..63a5b03572417 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kactivities-stats";
+  pname = "kactivities-stats";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ boost kactivities kconfig ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix
index b53de41455adb..f2f5d09cc8e67 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kactivities";
+  pname = "kactivities";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     boost kconfig kcoreaddons kio kwindowsystem qtdeclarative
diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix
index 381dacaf49614..8d3e89935f8b7 100644
--- a/pkgs/development/libraries/kde-frameworks/kapidox.nix
+++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, extra-cmake-modules, python3 }:
 
 mkDerivation {
-  name = "kapidox";
+  pname = "kapidox";
   nativeBuildInputs = [ extra-cmake-modules python3 python3.pkgs.setuptools ];
   postFixup = ''
     moveToOutput bin $bin
diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix
index bd010f3f11cf2..822b28f3deea1 100644
--- a/pkgs/development/libraries/kde-frameworks/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks/karchive.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "karchive";
+  pname = "karchive";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ bzip2 xz zlib zstd ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
index 93c81525a1483..f5ab518ce6213 100644
--- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kauth";
+  pname = "kauth";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = lib.optional enablePolkit polkit-qt ++ [ qttools ];
   propagatedBuildInputs = [ kcoreaddons ];
diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
index 4d68c3694bd37..1c45a4acb097f 100644
--- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
+++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "kbookmarks";
+  pname = "kbookmarks";
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [
     kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui
diff --git a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix
index f4f2b05ad7367..3f02765af8ea0 100644
--- a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "kcalendarcore";
+  pname = "kcalendarcore";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ libical ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
index 22e2929ae0cb3..f965256ce3d4b 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "kcmutils";
+  pname = "kcmutils";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kcoreaddons kdeclarative ki18n kiconthemes kitemviews kpackage kxmlgui
diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
index a62135150a0fe..69a9e812494e6 100644
--- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
@@ -1,7 +1,7 @@
 { mkDerivation, extra-cmake-modules, qtbase, qttools, gperf }:
 
 mkDerivation {
-  name = "kcodecs";
+  pname = "kcodecs";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools gperf ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
index ffa612ffaa190..28b4715f98f94 100644
--- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kcompletion";
+  pname = "kcompletion";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kconfig kwidgetsaddons qttools ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix
index ba16e97ef3a6e..76d9a85e649cb 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix
@@ -1,7 +1,7 @@
 { mkDerivation, extra-cmake-modules, qtbase, qttools }:
 
 mkDerivation {
-  name = "kconfig";
+  pname = "kconfig";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
index fc10f3070b641..e9b283ebc318c 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
@@ -4,7 +4,7 @@
 }:
 
 mkDerivation {
-  name = "kconfigwidgets";
+  pname = "kconfigwidgets";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ kguiaddons ki18n qtbase qttools ];
   propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcontacts.nix b/pkgs/development/libraries/kde-frameworks/kcontacts.nix
index 56887b775f4ac..0d26d064dd2b7 100644
--- a/pkgs/development/libraries/kde-frameworks/kcontacts.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcontacts.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kcontacts";
+  pname = "kcontacts";
   meta = {
     license = [ lib.licenses.lgpl21 ];
   };
diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index a2102c7d73231..f790d802c0ca4 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kcoreaddons";
+  pname = "kcoreaddons";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools shared-mime-info ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix
index 27dc6d65edff5..4658ab5c6daee 100644
--- a/pkgs/development/libraries/kde-frameworks/kcrash.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kcrash";
+  pname = "kcrash";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdav.nix b/pkgs/development/libraries/kde-frameworks/kdav.nix
index a03cca3fdf265..92d57158e3209 100644
--- a/pkgs/development/libraries/kde-frameworks/kdav.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdav.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kdav";
+  pname = "kdav";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
   };
diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
index 5c435b4454145..b123129cf8d17 100644
--- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kdbusaddons";
+  pname = "kdbusaddons";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools qtx11extras ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
index 1389df5eb1528..08f7cb5d3785b 100644
--- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kdeclarative";
+  pname = "kdeclarative";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     libepoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons
diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix
index 250a999f4d6cf..180d508acc58c 100644
--- a/pkgs/development/libraries/kde-frameworks/kded.nix
+++ b/pkgs/development/libraries/kde-frameworks/kded.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "kded";
+  pname = "kded";
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   buildInputs = [
     gsettings-desktop-schemas kconfig kcoreaddons kcrash kdbusaddons
diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
index 392aa9ea90257..1e7b30738752e 100644
--- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
@@ -9,7 +9,7 @@
 }:
 
 mkDerivation {
-  name = "kdelibs4support";
+  pname = "kdelibs4support";
   patches = [
     ./nix-kde-include-dir.patch
   ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
index f1305274070f0..6244b82397a25 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "kdesignerplugin";
+  pname = "kdesignerplugin";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews
diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/default.nix b/pkgs/development/libraries/kde-frameworks/kdesu/default.nix
index 9a5f5a6942a84..fe506401da4e6 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesu/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesu/default.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kdesu";
+  pname = "kdesu";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ];
   propagatedBuildInputs = [ kpty ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
index 9f682b4497529..b6d548cabfcd1 100644
--- a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
@@ -3,7 +3,7 @@
 }:
 
 mkDerivation {
-  name = "kdewebkit";
+  pname = "kdewebkit";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kconfig kcoreaddons kio kparts ];
   propagatedBuildInputs = [ qtwebkit ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
index 8bb59bb36dba6..545057e7ef1f6 100644
--- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kdnssd";
+  pname = "kdnssd";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ avahi qttools ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
index a87bef40b1e23..83f3a04ee36ad 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "kdoctools";
+  pname = "kdoctools";
   nativeBuildInputs = [
     extra-cmake-modules
     # The build system insists on having native Perl.
diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
index 66a0889b13d27..67613d274a75c 100644
--- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kemoticons";
+  pname = "kemoticons";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ karchive kcoreaddons ];
   propagatedBuildInputs = [ kservice qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
index 7c16dcf465073..782b033221430 100644
--- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
@@ -15,7 +15,7 @@
 }:
 
 mkDerivation {
-  name = "kfilemetadata";
+  pname = "kfilemetadata";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     attr
diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index 7001c98ee00f0..ab181b8d902d6 100644
--- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "kglobalaccel";
+  pname = "kglobalaccel";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools
diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
index bcd18ab614b66..d3575717592d7 100644
--- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
@@ -4,7 +4,7 @@
 }:
 
 mkDerivation {
-  name = "kguiaddons";
+  pname = "kguiaddons";
 
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtx11extras wayland ];
diff --git a/pkgs/development/libraries/kde-frameworks/kholidays.nix b/pkgs/development/libraries/kde-frameworks/kholidays.nix
index 2ede69e74953d..9484dece57ed9 100644
--- a/pkgs/development/libraries/kde-frameworks/kholidays.nix
+++ b/pkgs/development/libraries/kde-frameworks/kholidays.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kholidays";
+  pname = "kholidays";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = with lib.maintainers; [ bkchr ];
diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix
index 3ef3a043c4e12..9677ffb78a5ef 100644
--- a/pkgs/development/libraries/kde-frameworks/khtml.nix
+++ b/pkgs/development/libraries/kde-frameworks/khtml.nix
@@ -7,7 +7,7 @@
 }:
 
 mkDerivation {
-  name = "khtml";
+  pname = "khtml";
   nativeBuildInputs = [ extra-cmake-modules perl ];
   buildInputs = [
     giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio knotifications
diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix
index 46f502d06bb4d..be8016155b87b 100644
--- a/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "ki18n";
+  pname = "ki18n";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedNativeBuildInputs = [ gettext python3 ];
   buildInputs = [ qtdeclarative qtscript ];
diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
index 122f3108da446..f807193718d5a 100644
--- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "kiconthemes";
+  pname = "kiconthemes";
   patches = [
     ./default-theme-breeze.patch
   ];
diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix
index 2678cf0804eb6..6379a5e2e31b8 100644
--- a/pkgs/development/libraries/kde-frameworks/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kidletime";
+  pname = "kidletime";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtx11extras ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
index 97b413e805c6e..86026bf50f457 100644
--- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
@@ -7,7 +7,7 @@
 let inherit (lib) getDev; in
 
 mkDerivation {
-  name = "kimageformats";
+  pname = "kimageformats";
 
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ karchive openexr libavif qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
index dcd84f1f35a1d..9acd56f324cbc 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
@@ -7,7 +7,7 @@
 let inherit (lib) getLib; in
 
 mkDerivation {
-  name = "kinit";
+  pname = "kinit";
   outputs = [ "out" "dev" ];
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index 5c05e0159b5be..7b2815945c8c3 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -9,7 +9,7 @@
 }:
 
 mkDerivation {
-  name = "kio";
+  pname = "kio";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications
diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/pkgs/development/libraries/kde-frameworks/kirigami2.nix
index bb5a5a3fc80f3..281a490bf90aa 100644
--- a/pkgs/development/libraries/kde-frameworks/kirigami2.nix
+++ b/pkgs/development/libraries/kde-frameworks/kirigami2.nix
@@ -1,7 +1,7 @@
 { mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations, qtgraphicaleffects }:
 
 mkDerivation {
-  name = "kirigami2";
+  pname = "kirigami2";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
index 0f398b0f57d19..8abed8aaa0903 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kitemmodels";
+  pname = "kitemmodels";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtbase ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
index 0e772978e1919..ef350835f05df 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kitemviews";
+  pname = "kitemviews";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
index 2e116b7bb7935..a4a6d5bb10258 100644
--- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kjobwidgets";
+  pname = "kjobwidgets";
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix
index 33aeb284e167b..a0f9853237470 100644
--- a/pkgs/development/libraries/kde-frameworks/kjs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjs.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kjs";
+  pname = "kjs";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ pcre qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
index f552f963513d9..576727e81d2f8 100644
--- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kjsembed";
+  pname = "kjsembed";
   nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
   buildInputs = [ ki18n qtsvg ];
   propagatedBuildInputs = [ kjs ];
diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
index 5de26e0c8dcb2..f92c22956511c 100644
--- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
+++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kmediaplayer";
+  pname = "kmediaplayer";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kparts kxmlgui ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix
index 6d170c0bb129f..6e554b5faaadf 100644
--- a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix
@@ -7,7 +7,7 @@
 }:
 
 mkDerivation {
-  name = "knewstuff";
+  pname = "knewstuff";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews
diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix
index d1a809d9f5169..363ca46d10aeb 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifications.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix
@@ -7,7 +7,7 @@
 }:
 
 mkDerivation {
-  name = "knotifications";
+  pname = "knotifications";
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [
     kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras
diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
index 1971e3e8039b3..b2415d731ff04 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "knotifyconfig";
+  pname = "knotifyconfig";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kcompletion kconfig ki18n kio phonon ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
index d4edc09b2f00f..c1d9bf387fc5f 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kpackage";
+  pname = "kpackage";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ];
   patches = [
diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix
index e1d2a156160df..682c2da63132b 100644
--- a/pkgs/development/libraries/kde-frameworks/kparts.nix
+++ b/pkgs/development/libraries/kde-frameworks/kparts.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "kparts";
+  pname = "kparts";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications kservice
diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix
index 52c16ea2b9c27..433cc6b6e1138 100644
--- a/pkgs/development/libraries/kde-frameworks/kpeople.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "kpeople";
+  pname = "kpeople";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative
diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix
index 68df24d0087b6..eb26b252566b6 100644
--- a/pkgs/development/libraries/kde-frameworks/kplotting.nix
+++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix
@@ -3,7 +3,7 @@
 }:
 
 mkDerivation {
-  name = "kplotting";
+  pname = "kplotting";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtbase qttools ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix
index 2456f4e22fab3..239407d6abdfe 100644
--- a/pkgs/development/libraries/kde-frameworks/kpty.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpty.nix
@@ -1,7 +1,7 @@
 { mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, qtbase, }:
 
 mkDerivation {
-  name = "kpty";
+  pname = "kpty";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kcoreaddons ki18n qtbase ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix
index 0ae30be653d49..20c1b2368a7b5 100644
--- a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix
+++ b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kquickcharts";
+  pname = "kquickcharts";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtquickcontrols2 ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix
index 189e100aa70c1..7cc083e5a261d 100644
--- a/pkgs/development/libraries/kde-frameworks/kross.nix
+++ b/pkgs/development/libraries/kde-frameworks/kross.nix
@@ -4,7 +4,7 @@
 }:
 
 mkDerivation {
-  name = "kross";
+  pname = "kross";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ kcompletion kcoreaddons kxmlgui ];
   propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix
index 7db7c61db466f..a56e56a2fe092 100644
--- a/pkgs/development/libraries/kde-frameworks/krunner.nix
+++ b/pkgs/development/libraries/kde-frameworks/krunner.nix
@@ -7,7 +7,7 @@
 
 let
   self = mkDerivation {
-    name = "krunner";
+    pname = "krunner";
     nativeBuildInputs = [ extra-cmake-modules ];
     buildInputs = [
       kconfig kcoreaddons ki18n kio kservice qtdeclarative solid
diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
index c1488f728dd66..008c52cf07850 100644
--- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "kservice";
+  pname = "kservice";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedNativeBuildInputs = [ bison flex ];
   buildInputs = [
diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
index 6a74dca7b4bd0..5788c07cb05ce 100644
--- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
@@ -7,7 +7,7 @@
 }:
 
 mkDerivation {
-  name = "ktexteditor";
+  pname = "ktexteditor";
   nativeBuildInputs = [ extra-cmake-modules perl ];
   buildInputs = [
     karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript
diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
index 653d0ac8899bd..6ce7aa88c3a6e 100644
--- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "ktextwidgets";
+  pname = "ktextwidgets";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem
diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
index de0d9aab922ee..aa4c87a1e5f92 100644
--- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
@@ -1,7 +1,7 @@
 { mkDerivation, extra-cmake-modules, ki18n, qtbase, }:
 
 mkDerivation {
-  name = "kunitconversion";
+  pname = "kunitconversion";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ ki18n qtbase ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix
index f93f0437dbd1d..e2a54a03f6e6b 100644
--- a/pkgs/development/libraries/kde-frameworks/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix
@@ -7,7 +7,7 @@
 }:
 
 mkDerivation {
-  name = "kwallet";
+  pname = "kwallet";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes
diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index 749735c4ad581..6a070d227808d 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kwayland";
+  pname = "kwayland";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
index ee347df18ab86..0fead3bfd6ba3 100644
--- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "kwidgetsaddons";
+  pname = "kwidgetsaddons";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index 7643572a7ec02..ec102dbb342a5 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "kwindowsystem";
+  pname = "kwindowsystem";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
index 0b29158e4b06a..c666edbc196d8 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
@@ -6,7 +6,7 @@
 }:
 
 mkDerivation {
-  name = "kxmlgui";
+  pname = "kxmlgui";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     attica kglobalaccel ki18n kiconthemes kitemviews ktextwidgets kwindowsystem
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
index aa334d69ef1d3..3b2d869d17772 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
@@ -1,7 +1,7 @@
 { mkDerivation, extra-cmake-modules, ki18n, kio }:
 
 mkDerivation {
-  name = "kxmlrpcclient";
+  pname = "kxmlrpcclient";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ ki18n ];
   propagatedBuildInputs = [ kio ];
diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
index 5ecb5317cfcc4..507e24e8f61e5 100644
--- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "modemmanager-qt";
+  pname = "modemmanager-qt";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ modemmanager qtbase ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
index 2ff4b2c2b4081..b79c79b084daf 100644
--- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "networkmanager-qt";
+  pname = "networkmanager-qt";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ networkmanager qtbase ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
index 32b219ab7e1cb..7121944d5d39f 100644
--- a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
+++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "oxygen-icons5";
+  pname = "oxygen-icons5";
   meta.license = lib.licenses.lgpl3Plus;
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index 12540b07007c1..cf118beaabce7 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
@@ -8,7 +8,7 @@
 }:
 
 mkDerivation {
-  name = "plasma-framework";
+  pname = "plasma-framework";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix
index 670fd02d6161b..c2063e22bba76 100644
--- a/pkgs/development/libraries/kde-frameworks/prison.nix
+++ b/pkgs/development/libraries/kde-frameworks/prison.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "prison";
+  pname = "prison";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ libdmtx qrencode ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix
index 0f376ce9ec3af..ee4e9584641c1 100644
--- a/pkgs/development/libraries/kde-frameworks/purpose.nix
+++ b/pkgs/development/libraries/kde-frameworks/purpose.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "purpose";
+  pname = "purpose";
   nativeBuildInputs = [ extra-cmake-modules intltool ];
   buildInputs = [
     qtbase accounts-qt qtdeclarative kaccounts-integration kconfig kcoreaddons
diff --git a/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix
index e400967407c69..6d8635c4f2837 100644
--- a/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix
+++ b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix
@@ -8,7 +8,7 @@
 }:
 
 mkDerivation {
-  name = "qqc2-desktop-style";
+  pname = "qqc2-desktop-style";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtx11extras qtquickcontrols2 kconfig kiconthemes kirigami2 ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix
index aa1b1ebe34581..69ef8c8adca3f 100644
--- a/pkgs/development/libraries/kde-frameworks/solid.nix
+++ b/pkgs/development/libraries/kde-frameworks/solid.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "solid";
+  pname = "solid";
   nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ];
   buildInputs = [ qtdeclarative qttools ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix
index 2eff7bad24029..78aa189559fc4 100644
--- a/pkgs/development/libraries/kde-frameworks/sonnet.nix
+++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix
@@ -4,7 +4,7 @@
 }:
 
 mkDerivation {
-  name = "sonnet";
+  pname = "sonnet";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ aspell qttools ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 2b3983a892c8a..1cddd857dda88 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -4,667 +4,667 @@
 
 {
   attica = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/attica-5.91.0.tar.xz";
-      sha256 = "0svvy7qflidwxns12y2lra54gg6lhglcddzmrw7ccvbdyqcy2pn0";
-      name = "attica-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/attica-5.92.0.tar.xz";
+      sha256 = "0cy9dd8kazfkhas87bxjj5smmzay3gvkjwsmy6gvkfxc6rvpqr5z";
+      name = "attica-5.92.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/baloo-5.91.0.tar.xz";
-      sha256 = "1cqjbaiwqba707xaz9zsrdz9cms2mdrhv6jpwsq8q7f4g4rxcx3m";
-      name = "baloo-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/baloo-5.92.0.tar.xz";
+      sha256 = "0xd4a0p22gjm523ymlyd5nfgp8z3ayb0nq6a04h5py507mc70d98";
+      name = "baloo-5.92.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/bluez-qt-5.91.0.tar.xz";
-      sha256 = "0p37jrmppwahh4vaq3wkw6xn0ms8dxcxpfd4glzjlnw426zrwnjr";
-      name = "bluez-qt-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/bluez-qt-5.92.0.tar.xz";
+      sha256 = "1dlasb39kqrcql6hq0sl74ax3n5bdcy3pkhvc9vwpf9dxn1j93gm";
+      name = "bluez-qt-5.92.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/breeze-icons-5.91.0.tar.xz";
-      sha256 = "0aj24gn48c17n9jzrj0az04ph4hpx7zf2rj4vgwl19iip69vfzf1";
-      name = "breeze-icons-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/breeze-icons-5.92.0.tar.xz";
+      sha256 = "0rj30r52ca6njx00gmmni4k70yn8873ihxfbc66lklwzk1irdq29";
+      name = "breeze-icons-5.92.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/extra-cmake-modules-5.91.0.tar.xz";
-      sha256 = "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp";
-      name = "extra-cmake-modules-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/extra-cmake-modules-5.92.0.tar.xz";
+      sha256 = "1vq3sd4qfr4hjcgqyfpykcz5wyagbfvrd4p24pdki1zjqn5j76pq";
+      name = "extra-cmake-modules-5.92.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/frameworkintegration-5.91.0.tar.xz";
-      sha256 = "1176ql8f96ap4gzjaj8vm4cr6f2rsx9z93gpc4hx4jcqjhxqrg3z";
-      name = "frameworkintegration-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/frameworkintegration-5.92.0.tar.xz";
+      sha256 = "0pgcwfxxzvfvqyjfgqzsllzfy9il4y8xr8dzdyjmd5vccpvgd3mx";
+      name = "frameworkintegration-5.92.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kactivities-5.91.0.tar.xz";
-      sha256 = "03y4hx7jgrhac12ys8pm22h0f49kms8b71gck4xv577p3ywi3j60";
-      name = "kactivities-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kactivities-5.92.0.tar.xz";
+      sha256 = "1kfvg23gdl4k6azs6700j8i8ncl8c7rrc70w1i2xhphz27ybc1pw";
+      name = "kactivities-5.92.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kactivities-stats-5.91.0.tar.xz";
-      sha256 = "0864qfljh20723djfzdv8h6nipw01825lhiknyqz17aj2x2ymzcq";
-      name = "kactivities-stats-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kactivities-stats-5.92.0.tar.xz";
+      sha256 = "0lgp7zxgjmjm02x4mydlv6ivmlxqjkklav5vfwgjgf6v1qp161i2";
+      name = "kactivities-stats-5.92.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kapidox-5.91.0.tar.xz";
-      sha256 = "1xxpl8rn49d2cr7ld94j3wsg21019l2kq14p5bvilisnj3salka3";
-      name = "kapidox-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kapidox-5.92.0.tar.xz";
+      sha256 = "0vd5k4wmmawbhyy3cxj0gjidf4haghwbsbly9yr3zg3qb3g02ljg";
+      name = "kapidox-5.92.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/karchive-5.91.0.tar.xz";
-      sha256 = "1kjc47zzdd9jhcmynq6zw6y6zaj2c1i8pxvszx3d9x5asaz2qq53";
-      name = "karchive-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/karchive-5.92.0.tar.xz";
+      sha256 = "1blzm6vf8kpflam4671r1y4svrsb79bglln7aia7baqh7a6a4xjh";
+      name = "karchive-5.92.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kauth-5.91.0.tar.xz";
-      sha256 = "001svdyvs8qc6h8zkb9x072npkz6xabz6j0djjb380gl9h9wnrgq";
-      name = "kauth-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kauth-5.92.0.tar.xz";
+      sha256 = "0a27z9xr5ccxfcxmx93vs4hgxc388nsd9ac906mdh475ivv4p0j4";
+      name = "kauth-5.92.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kbookmarks-5.91.0.tar.xz";
-      sha256 = "0iqfngsvpbgxk6h8l68idcp97df28sa2zwj707zs0mf2bl9k68m4";
-      name = "kbookmarks-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kbookmarks-5.92.0.tar.xz";
+      sha256 = "0hym3558xnp3h7q8kf1ljcy65r3g37mcmqb1ll3nxd912rv4wl4r";
+      name = "kbookmarks-5.92.0.tar.xz";
     };
   };
   kcalendarcore = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kcalendarcore-5.91.0.tar.xz";
-      sha256 = "0gkn0mzk3za86pjrpi8gd9d71bfv0ihzkgn8yy1ik3dw1rf9gxip";
-      name = "kcalendarcore-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kcalendarcore-5.92.0.tar.xz";
+      sha256 = "0fhbas8i7i08z4x32yq49admiz8vk4h9vwgkh7qy14lbzf6ydwkg";
+      name = "kcalendarcore-5.92.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kcmutils-5.91.0.tar.xz";
-      sha256 = "009r9r7fz1588g2cnqw585d2fz170x8j8bip1zqr7i4jl21ms68s";
-      name = "kcmutils-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kcmutils-5.92.0.tar.xz";
+      sha256 = "0fldpkhq4ysma4m6qylr7kqvxw0rb11x5abz5921bhl5zicfcjfx";
+      name = "kcmutils-5.92.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kcodecs-5.91.0.tar.xz";
-      sha256 = "0qkwvbp4vp3w57f3fyjknxd66qac77hl77mf042c7jxjl5vq7h1y";
-      name = "kcodecs-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kcodecs-5.92.0.tar.xz";
+      sha256 = "0xfjc0diljx081as3b500awybay9l3sfl59792h5z3clafjbgrfn";
+      name = "kcodecs-5.92.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kcompletion-5.91.0.tar.xz";
-      sha256 = "1l6z85a4rh3vrf4x5g3pqvp0q36gwmw0fbp9ny1iaqyy21dlh8i4";
-      name = "kcompletion-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kcompletion-5.92.0.tar.xz";
+      sha256 = "1svwvj9jxkgcddfdila10ggdmsabs22vnhf9k7isp2zfdif55w88";
+      name = "kcompletion-5.92.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kconfig-5.91.0.tar.xz";
-      sha256 = "0axdnqipa8xgx864zylxllnzchlp50q59bbfw3c98svvvkm3yg56";
-      name = "kconfig-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kconfig-5.92.0.tar.xz";
+      sha256 = "08q57f3wxj22d485s0ph53p44yrkjb376817470a0s43p10vc0bq";
+      name = "kconfig-5.92.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kconfigwidgets-5.91.0.tar.xz";
-      sha256 = "01mvv01hv64wadjh8xk3hhp1vbs04cvbrjpfl1g9cv2sa6hr7102";
-      name = "kconfigwidgets-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kconfigwidgets-5.92.0.tar.xz";
+      sha256 = "0ji799xd45lpnd70a9bizicfz2bsmlxq6r0fqgn0ghwsbp9ywna2";
+      name = "kconfigwidgets-5.92.0.tar.xz";
     };
   };
   kcontacts = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kcontacts-5.91.0.tar.xz";
-      sha256 = "1c839c9rvys3jwmi3fzw06r1nhgvrb4z8sdh8gda0w03vqh7h1hv";
-      name = "kcontacts-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kcontacts-5.92.0.tar.xz";
+      sha256 = "1kik4pvy8snvj6rsc9pfbcpc8rrcn0k4pjj1h9m221zma1p00xhj";
+      name = "kcontacts-5.92.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kcoreaddons-5.91.0.tar.xz";
-      sha256 = "16vimllvcs6rnb1ccbv9zg8hxbzacisgrlffyvwm608f4q1xmqyz";
-      name = "kcoreaddons-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kcoreaddons-5.92.0.tar.xz";
+      sha256 = "0rv63byrxwf9zdpx347rxybpk2j9yyjqm323j60vb8ja6a7p2pyz";
+      name = "kcoreaddons-5.92.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kcrash-5.91.0.tar.xz";
-      sha256 = "0gdknmp5a36ipvzms4jhxywyxpjh0vy26861c54jfsk13yircjal";
-      name = "kcrash-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kcrash-5.92.0.tar.xz";
+      sha256 = "1ir64mlv49vh3vz81r22q3sx0fichiwjr8qw5jf5vx96a1dn1icv";
+      name = "kcrash-5.92.0.tar.xz";
     };
   };
   kdav = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kdav-5.91.0.tar.xz";
-      sha256 = "026w3bk2lmc7lqzra8w9jq8i2l1hvqsxz36r1jzj9p01skhdm32v";
-      name = "kdav-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kdav-5.92.0.tar.xz";
+      sha256 = "1i5i6bkjairz1slk3fhrxd3s8wkcdaqg55jg2bv86kqh7d3nrcgk";
+      name = "kdav-5.92.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kdbusaddons-5.91.0.tar.xz";
-      sha256 = "18qhpj0s4abypkb8ix2d84wv1kqv6qxyblninn2f9hjkl2dnlwis";
-      name = "kdbusaddons-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kdbusaddons-5.92.0.tar.xz";
+      sha256 = "0m5fd396xi3dhc45zwxjrrxr2bhlrc8g8m7n17jq1ylzqhyg60vw";
+      name = "kdbusaddons-5.92.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kdeclarative-5.91.0.tar.xz";
-      sha256 = "183df5c0xyjqsip0izqvvk4wy2bjb973900s1wqsldhhvc7gpf7z";
-      name = "kdeclarative-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kdeclarative-5.92.0.tar.xz";
+      sha256 = "1cymh8clcajk9cl6r443cpqk6vmp4x12ngc6wgp08z53zrvlv5py";
+      name = "kdeclarative-5.92.0.tar.xz";
     };
   };
   kded = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kded-5.91.0.tar.xz";
-      sha256 = "1zi0sixlzaxvw4lfil2r36i3xrav3vfwxp2r1lp4n65dpl7nv7p5";
-      name = "kded-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kded-5.92.0.tar.xz";
+      sha256 = "0v0fak84nw4lb4qc1irb9sn5nh5k7qrhnfav5smn3cvchldm6dc3";
+      name = "kded-5.92.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/portingAids/kdelibs4support-5.91.0.tar.xz";
-      sha256 = "1373fi9vi7ki8frr0lsw6yp335i95v8yq2j41s7ip003dpy4hr2g";
-      name = "kdelibs4support-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/portingAids/kdelibs4support-5.92.0.tar.xz";
+      sha256 = "1q7d0i09klkhsiwq7i91ypxakdr5b841zdb60q7yjzcdmn25wbi9";
+      name = "kdelibs4support-5.92.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/portingAids/kdesignerplugin-5.91.0.tar.xz";
-      sha256 = "07lvvryc3k418hd0j7ddlqhid26c51isa8mvk7g6gd0v2x3gp76q";
-      name = "kdesignerplugin-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/portingAids/kdesignerplugin-5.92.0.tar.xz";
+      sha256 = "0kial8k6qr39871v103952d0qcs0hm25y6k0vdg4y8ns8nrmjs06";
+      name = "kdesignerplugin-5.92.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kdesu-5.91.0.tar.xz";
-      sha256 = "1wj099w810dabqn43pqis4sism3zwq3d1qa9mvcdyjafqbl7xnjm";
-      name = "kdesu-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kdesu-5.92.0.tar.xz";
+      sha256 = "1yjyz4v0gn7ys7zy4ymn47zggxxmgd37big005c6g85dm63xr1s6";
+      name = "kdesu-5.92.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/portingAids/kdewebkit-5.91.0.tar.xz";
-      sha256 = "1mln0w1dzrbpm373vfpcyss4xxnrfgwh9nhzr8wmzs8965bn3wqq";
-      name = "kdewebkit-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/portingAids/kdewebkit-5.92.0.tar.xz";
+      sha256 = "1dni134qbs5yff7zgk4n3sfjwblzarblg16rj35l59l6mly7f2jd";
+      name = "kdewebkit-5.92.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kdnssd-5.91.0.tar.xz";
-      sha256 = "1smzwh7lvz8g7vydxnd2kkh0ymg7yp6akc7k2vg8q65pa6pxqn3g";
-      name = "kdnssd-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kdnssd-5.92.0.tar.xz";
+      sha256 = "1m24v36pphy591z1xp90i0yxv70c62iinvy4gspdi15bz94sydjz";
+      name = "kdnssd-5.92.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kdoctools-5.91.0.tar.xz";
-      sha256 = "02lr4l4n5gnv7ffzml8lbrdwgfpq6m7ayhz3bdqqijdfvw6h283n";
-      name = "kdoctools-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kdoctools-5.92.0.tar.xz";
+      sha256 = "0w08fa8rl0dhp59lv6xcvypahl6pxda6cr0vv0f0xv0xp6wax8w6";
+      name = "kdoctools-5.92.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kemoticons-5.91.0.tar.xz";
-      sha256 = "1jznkiq87rkndv10xs6974b5k0v82ly32agy5acxc2xy9wq7la0h";
-      name = "kemoticons-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kemoticons-5.92.0.tar.xz";
+      sha256 = "01wzy3mwfz4sqpq8i1hfbbymajp55axryiaqkfr9r2n1844y7kzx";
+      name = "kemoticons-5.92.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kfilemetadata-5.91.0.tar.xz";
-      sha256 = "1z030irzcvmjq329nwfk3h8cd51dwy9mppnwbgcd0lw6y3bka0rq";
-      name = "kfilemetadata-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kfilemetadata-5.92.0.tar.xz";
+      sha256 = "1khmx9kd1jhd6j7rmfww3vmyjz2pg36mpsdn0bc77kwl21ax696n";
+      name = "kfilemetadata-5.92.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kglobalaccel-5.91.0.tar.xz";
-      sha256 = "09wscg6f19sh314ywpxp47pdr1xf1wzpjchg9rcjg207zrfhqqf0";
-      name = "kglobalaccel-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kglobalaccel-5.92.0.tar.xz";
+      sha256 = "0lhlb274pvv7rpkcsccqbv81bh8iklanp29g0k28wrv3kckiwyxy";
+      name = "kglobalaccel-5.92.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kguiaddons-5.91.0.tar.xz";
-      sha256 = "0gn8lvpm4i11s5vavlpm162bizjkmh5cb4dhj3p34dlp4vcc4mky";
-      name = "kguiaddons-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kguiaddons-5.92.0.tar.xz";
+      sha256 = "0pyzgyrglvz2m11b82rycs9fbmzpfgzabnjkvsq00agjcnjparqg";
+      name = "kguiaddons-5.92.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kholidays-5.91.0.tar.xz";
-      sha256 = "165vfmi5y8l00ng494469w5s1gjnf9zkggqrzmq65dfkdis3amdm";
-      name = "kholidays-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kholidays-5.92.0.tar.xz";
+      sha256 = "042bdg46hkpg66vdp9gk13wck5yhks8s6i9qz9xzh2mikz285lqf";
+      name = "kholidays-5.92.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/portingAids/khtml-5.91.0.tar.xz";
-      sha256 = "1ldkk1f954mmgz30vqa895z1nw2jaknnb53lsd5vqxzxi3cmc054";
-      name = "khtml-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/portingAids/khtml-5.92.0.tar.xz";
+      sha256 = "06hpjcm5yrfj1056vvv9dklccd0a1y09zm8ch4a5d8l2lfgdg8ci";
+      name = "khtml-5.92.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/ki18n-5.91.0.tar.xz";
-      sha256 = "11gdd2gvzsz3r8zvqbxxwbpwjvjwnzzhzyrd4spbpdy0w7j8n6ly";
-      name = "ki18n-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/ki18n-5.92.0.tar.xz";
+      sha256 = "0xsp77iaxf72i0ri3pb6x5rrdz3cv8rxcaqcrynisvsmx7l35005";
+      name = "ki18n-5.92.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kiconthemes-5.91.0.tar.xz";
-      sha256 = "1khh4ngivwdj9rxxcpx08ka8anskc9i1z9n2zijp4m5ix8mmj3c2";
-      name = "kiconthemes-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kiconthemes-5.92.0.tar.xz";
+      sha256 = "08yb6f980p620dfklfiyp83lcsqw4dds9qwzd6xpn2mzz07p2a11";
+      name = "kiconthemes-5.92.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kidletime-5.91.0.tar.xz";
-      sha256 = "12qmiwc8p3izj1y5h0rndj2s496ckm1p85dv4g51zbpg7m8a48qv";
-      name = "kidletime-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kidletime-5.92.0.tar.xz";
+      sha256 = "1mw0jarqv2ypxwgf4qaxqlw0sijw0is36sasrfz8grbykwi18bz1";
+      name = "kidletime-5.92.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kimageformats-5.91.0.tar.xz";
-      sha256 = "0df8in33xwajqay487w0hjfsplz8y51w9sjb75na7yqsn75p38xb";
-      name = "kimageformats-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kimageformats-5.92.0.tar.xz";
+      sha256 = "0sd3xhqh3zgy4jq8fc1llqjrxizylbsz58njz2dxqjas2a4rj16f";
+      name = "kimageformats-5.92.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kinit-5.91.0.tar.xz";
-      sha256 = "1y62k24mwzbg4gchvjb8wn6ygq57wc72clb3jgyipw034czdihvi";
-      name = "kinit-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kinit-5.92.0.tar.xz";
+      sha256 = "1kpkqnq9krxlzhripwjhw3n55p5sxqsvj6nb2pqb9m0ppw97jlfb";
+      name = "kinit-5.92.0.tar.xz";
     };
   };
   kio = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kio-5.91.0.tar.xz";
-      sha256 = "14v28qilb5ayv9shw86hb88k60nr4bbd2pa4vwsqij9xkwlympgj";
-      name = "kio-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kio-5.92.0.tar.xz";
+      sha256 = "1cscsjb2v0zygzazfhcflc3gb5ny1a79g3i6glyzw6ppj2c3yhyl";
+      name = "kio-5.92.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kirigami2-5.91.0.tar.xz";
-      sha256 = "0ifljwa6hli2rndfadpzs30dpwc99nnvcm3yi9j5dim2bdf6glwc";
-      name = "kirigami2-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kirigami2-5.92.0.tar.xz";
+      sha256 = "0p1x40p38pr9rvzwil57asgsaa95qpjqi9npwv4pgibhxacgznha";
+      name = "kirigami2-5.92.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kitemmodels-5.91.0.tar.xz";
-      sha256 = "189kgrw2vjr9067mqr4f2sv06xmnjaapry0bf8s41v6r9v7py708";
-      name = "kitemmodels-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kitemmodels-5.92.0.tar.xz";
+      sha256 = "16z8m11cyrapf6m56gmpjmvcgan7s50si8rl1cbbid02src7yp76";
+      name = "kitemmodels-5.92.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kitemviews-5.91.0.tar.xz";
-      sha256 = "16cm4zmv1ngrsmy6k0ybv5wxd0g8cc8zwq6ab7jvs7a04sykv238";
-      name = "kitemviews-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kitemviews-5.92.0.tar.xz";
+      sha256 = "1ml6i1km22xsprldkzmngfh9xs5vdhlfvc6f7aq5hx9q5114v2q5";
+      name = "kitemviews-5.92.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kjobwidgets-5.91.0.tar.xz";
-      sha256 = "14pkyd6j78kignr62xfkvpyi2fwvzcvcsdnn23h8jxkhwm2ri42v";
-      name = "kjobwidgets-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kjobwidgets-5.92.0.tar.xz";
+      sha256 = "09l5zgr5mn29v410ng5rccdg2bki9r6cb8y2lrijzgfxfxpvj96z";
+      name = "kjobwidgets-5.92.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/portingAids/kjs-5.91.0.tar.xz";
-      sha256 = "0jbwlnmf8whzgjkrbnsvdsnn3kv0h44ghf63m2qcgg2l9wb0j8rj";
-      name = "kjs-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/portingAids/kjs-5.92.0.tar.xz";
+      sha256 = "067ilsm78x03kf5fs2xmlasvy2712k0xrsa404g2zj81fm92s1q4";
+      name = "kjs-5.92.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/portingAids/kjsembed-5.91.0.tar.xz";
-      sha256 = "124y7518jhjg3y2x7bcyl6b3c0bfxfbgd2sz6dwk45y4byx7rl60";
-      name = "kjsembed-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/portingAids/kjsembed-5.92.0.tar.xz";
+      sha256 = "0db0r8v0bhp3razwyvmvk9r4psl14vgn23c4cm2q1b5pl0w6bhnp";
+      name = "kjsembed-5.92.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/portingAids/kmediaplayer-5.91.0.tar.xz";
-      sha256 = "0rn9azrj8k1m67y9ni0f3nwl9ldf1ksiqv6dgnzrx6xh0rxfm2h1";
-      name = "kmediaplayer-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/portingAids/kmediaplayer-5.92.0.tar.xz";
+      sha256 = "19lpib2wj91w8shsf9056nwi46qja8nh96hj164ydqlkslpfnf7y";
+      name = "kmediaplayer-5.92.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/knewstuff-5.91.0.tar.xz";
-      sha256 = "0akaxi9klmpwn4pyr6ys5sxcapdspldq1f64im7vd6byzqrgpnax";
-      name = "knewstuff-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/knewstuff-5.92.0.tar.xz";
+      sha256 = "0gvclv1a6xyrqa24svb56kp9zf2wi98as3q30lnwf0bpbpjsw52b";
+      name = "knewstuff-5.92.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/knotifications-5.91.0.tar.xz";
-      sha256 = "1207rimq8si1zxnn827631a1hskrd3m3ilgaj3wj859qrbkqmxzm";
-      name = "knotifications-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/knotifications-5.92.0.tar.xz";
+      sha256 = "1dwlx8w810l0cvy72mj52saf4x7i9p3xpqpjx4chy54n7mg0jklc";
+      name = "knotifications-5.92.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/knotifyconfig-5.91.0.tar.xz";
-      sha256 = "07m5mphd8mrak5sdqlldbcd51946v49xpcwi9fhn7w0kx29hknyf";
-      name = "knotifyconfig-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/knotifyconfig-5.92.0.tar.xz";
+      sha256 = "0fii74r0ap3n08lp9kj7pki0msqjsia2jnmavyps51kq37im5x7p";
+      name = "knotifyconfig-5.92.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kpackage-5.91.0.tar.xz";
-      sha256 = "12w8lfwifa107wlrld3zz774hczn9mkib6wqxw24yxxmzfw9lc2i";
-      name = "kpackage-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kpackage-5.92.0.tar.xz";
+      sha256 = "1av6v0629a8yi0wpl7xgyd0gsn5gi228abdlvbk4dzrx9vxpa7rn";
+      name = "kpackage-5.92.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kparts-5.91.0.tar.xz";
-      sha256 = "10ni6b114acjnmrahvvqw75iqkc10ii97y3z7lirj2727a3qmzzj";
-      name = "kparts-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kparts-5.92.0.tar.xz";
+      sha256 = "061kzss4b0bw67j3mc8h36mbaji077k3alk2ghcir7qix6r1hkh9";
+      name = "kparts-5.92.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kpeople-5.91.0.tar.xz";
-      sha256 = "09l2q8cg9p8g7zkd1mjx6x08bqkr4ykxjibskc184asff7v47gvp";
-      name = "kpeople-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kpeople-5.92.0.tar.xz";
+      sha256 = "0wf555pqiannxb115mlbl43ds1365im95vadsbzv1gdz668p44xk";
+      name = "kpeople-5.92.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kplotting-5.91.0.tar.xz";
-      sha256 = "0rgmmliw9cfi0j2miszqz2kphqm04r5nfs8dqq6pnvclk1k9kss6";
-      name = "kplotting-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kplotting-5.92.0.tar.xz";
+      sha256 = "1l8y0xlwjyv1l4g0mag4bgf906jc654ygky1bribzay4wki66pf9";
+      name = "kplotting-5.92.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kpty-5.91.0.tar.xz";
-      sha256 = "1yy1k96kikvvnlyd00krc08ifiqbrz0x5vwv3pgdbpnwgl8p580d";
-      name = "kpty-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kpty-5.92.0.tar.xz";
+      sha256 = "0lp0bqlg1i0a5vl6gvvkngbsha8ab38z6b3sjvpmk83vixgsq7fb";
+      name = "kpty-5.92.0.tar.xz";
     };
   };
   kquickcharts = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kquickcharts-5.91.0.tar.xz";
-      sha256 = "1ghiymm257b8xgmkibb7s7bwb28x3zhnrgrrsya47q5njb87h0ck";
-      name = "kquickcharts-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kquickcharts-5.92.0.tar.xz";
+      sha256 = "0y467vqx2r6dcyqwn6p7hbg4q7n0xdh4lcqwyin4cdxi14lhwhqs";
+      name = "kquickcharts-5.92.0.tar.xz";
     };
   };
   kross = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/portingAids/kross-5.91.0.tar.xz";
-      sha256 = "06f8220jmvjsfbzjkr2ybwicwjffbi3yw9sr3bcyrilchrrpgqal";
-      name = "kross-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/portingAids/kross-5.92.0.tar.xz";
+      sha256 = "1gqy1h5mqsfgbpqkdrhs7xf77kw4yy19mryda1fwjcqzxd02i7hj";
+      name = "kross-5.92.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/krunner-5.91.0.tar.xz";
-      sha256 = "17iaw55rkzyfpgkbw2an6pa4wid79b0dnb3310vfaq0xkm0gjxq6";
-      name = "krunner-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/krunner-5.92.0.tar.xz";
+      sha256 = "1vcgqjyx9i8k9q4j6q9p4f7sp76aap8gqn2v269lb7imcrfhrj1z";
+      name = "krunner-5.92.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kservice-5.91.0.tar.xz";
-      sha256 = "0m4j7djiyapi1hm23lz9nd238rrlldxlggzkqq056z486v2137bp";
-      name = "kservice-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kservice-5.92.0.tar.xz";
+      sha256 = "1y1fr1galhhi6yf9w9qcvkp1zb63ifvr4wb43jwpvpms9djxkqjj";
+      name = "kservice-5.92.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/ktexteditor-5.91.0.tar.xz";
-      sha256 = "1bkz6v1y5vyxav398a6224ldqa9pqhbad3vmhxrjb2hxcbha2cpm";
-      name = "ktexteditor-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/ktexteditor-5.92.0.tar.xz";
+      sha256 = "137v8g7j8kkv9yh30ysmm5n6imyyd3jmd0f6w5ni00kxl0y1rl5w";
+      name = "ktexteditor-5.92.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/ktextwidgets-5.91.0.tar.xz";
-      sha256 = "0xmzrak5mwg1l4v38g14i7j1yr3j6sj13q2iqa433hs5agl6l6n4";
-      name = "ktextwidgets-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/ktextwidgets-5.92.0.tar.xz";
+      sha256 = "030bz67n6m3fkbldnr48mzicm9cgnr9gdpwipaghl5x5k3s7p1py";
+      name = "ktextwidgets-5.92.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kunitconversion-5.91.0.tar.xz";
-      sha256 = "0n2v0f08s71z2imhn41jkm2knjvk7bkwmcz70gs8h97ykrj6niap";
-      name = "kunitconversion-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kunitconversion-5.92.0.tar.xz";
+      sha256 = "17ph75rg3y652ii0yxm9s8xrbpjs9pdfsrsajm220mi9ng2b9qj7";
+      name = "kunitconversion-5.92.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kwallet-5.91.0.tar.xz";
-      sha256 = "1z1qb6a2b5rqj7js88ms8n67fbs885pw6djbf1l86na2zhf0adip";
-      name = "kwallet-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kwallet-5.92.0.tar.xz";
+      sha256 = "1ra0cxw70vb6pks8sqw5k895rnrfzwxhg6vh4yc5dgzdn1nagb3i";
+      name = "kwallet-5.92.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kwayland-5.91.0.tar.xz";
-      sha256 = "1a03ckacp39lpsqyykkm6lxajxm71s6ifpzgj8q0a37v75jzmz9y";
-      name = "kwayland-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kwayland-5.92.0.tar.xz";
+      sha256 = "15fizsbdl6psmi24fvpfk9dvh61q07irzavpkl961qp4zg79gq4m";
+      name = "kwayland-5.92.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kwidgetsaddons-5.91.0.tar.xz";
-      sha256 = "03pj98sgybkcz487vr774x05w46imnipq2794nkv426nnhyxrd73";
-      name = "kwidgetsaddons-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kwidgetsaddons-5.92.0.tar.xz";
+      sha256 = "0b0z24j162j39zfycl5al69xcqgdsr96p7ii3prm1mbyda6mbqyh";
+      name = "kwidgetsaddons-5.92.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kwindowsystem-5.91.0.tar.xz";
-      sha256 = "1yy02fvfabrsvdpmrkdnjdsdd3d2crxavsl47si6ry8fdxb90y95";
-      name = "kwindowsystem-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kwindowsystem-5.92.0.tar.xz";
+      sha256 = "103xvhzlggi05k16s9kssy7g5a74k9yildj1a4igqwi39wmvvnyw";
+      name = "kwindowsystem-5.92.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/kxmlgui-5.91.0.tar.xz";
-      sha256 = "1qww2isx99lx0mn1dv0vzrvmr2xdp8zgikyvgw1wf8hfay3v2s1g";
-      name = "kxmlgui-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/kxmlgui-5.92.0.tar.xz";
+      sha256 = "0hxpjyjr77q2gyi3hg13119aza3634rvmllbj66pi7y37h6lr2z0";
+      name = "kxmlgui-5.92.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/portingAids/kxmlrpcclient-5.91.0.tar.xz";
-      sha256 = "1bnymf5wq4apjsgshvbhcggdw7jc0yxv4jag3k19ff9820lskhph";
-      name = "kxmlrpcclient-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/portingAids/kxmlrpcclient-5.92.0.tar.xz";
+      sha256 = "1axy34g5ahd1c3qg7ab7h786jibpaj4dvj45x50x5czq06idqchf";
+      name = "kxmlrpcclient-5.92.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/modemmanager-qt-5.91.0.tar.xz";
-      sha256 = "15l46lkh8nkal1nai494dabaysy581jzi8nwrv4kjvc6qwc3yrx2";
-      name = "modemmanager-qt-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/modemmanager-qt-5.92.0.tar.xz";
+      sha256 = "162qzq1aqv2l3bi0r01xrfan20r1zhaaqih4dqbaj7vqibsb9l3y";
+      name = "modemmanager-qt-5.92.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/networkmanager-qt-5.91.0.tar.xz";
-      sha256 = "0f27qin2ks3q7rin53sk9vjjnadjnax99d9k245sjr6fjpczy81f";
-      name = "networkmanager-qt-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/networkmanager-qt-5.92.0.tar.xz";
+      sha256 = "0r7s3fw9fk3pkrzrl1bxsmkf1qbgv3p0jrsskp28f3561vncipai";
+      name = "networkmanager-qt-5.92.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/oxygen-icons5-5.91.0.tar.xz";
-      sha256 = "0j3j2lyxr2iz68vasvpjqkix4bnnj6wc4sr97i6x6z06zq0kawai";
-      name = "oxygen-icons5-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/oxygen-icons5-5.92.0.tar.xz";
+      sha256 = "1wcy8bv4d6jns7vaisbvjc8nxriw9vkiz7j4za5ry7wnvlzv126a";
+      name = "oxygen-icons5-5.92.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/plasma-framework-5.91.0.tar.xz";
-      sha256 = "0ydhhpnwf7lfl3kdjsw92mgsza5gy292f7v6kyby4ygjnir1hizl";
-      name = "plasma-framework-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/plasma-framework-5.92.0.tar.xz";
+      sha256 = "1xq66lyagjsgfashhqgqgqhda0rqfqf0l5yf1gc4ziv48mibrhn6";
+      name = "plasma-framework-5.92.0.tar.xz";
     };
   };
   prison = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/prison-5.91.0.tar.xz";
-      sha256 = "0k1zp3jzh8gjsji6wh5g8k41zdl8s1vd58ipm0lxy670a71wcqcg";
-      name = "prison-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/prison-5.92.0.tar.xz";
+      sha256 = "07p47q8sva82hglfzp145a1sajlal8b3qshhkicc9rkbsngywvvy";
+      name = "prison-5.92.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/purpose-5.91.0.tar.xz";
-      sha256 = "1z6wpz7d9byx4n5zx6chmyy9k1jkmghdgahsvkqsc33z6hnh2b4m";
-      name = "purpose-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/purpose-5.92.0.tar.xz";
+      sha256 = "02j09zf18dwjk17mn841m7cm0qsn7gcz5lff8dad3yah0lc3wqcl";
+      name = "purpose-5.92.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/qqc2-desktop-style-5.91.0.tar.xz";
-      sha256 = "0rd9rvffhif8yckwr7axjcv5iqn5b0jdviij7f9y8vjpkzyjvm8i";
-      name = "qqc2-desktop-style-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/qqc2-desktop-style-5.92.0.tar.xz";
+      sha256 = "1b5xr71lan7ixvd1nfxy9wj21h4wwidsaxa192sha1d8p49hhlwp";
+      name = "qqc2-desktop-style-5.92.0.tar.xz";
     };
   };
   solid = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/solid-5.91.0.tar.xz";
-      sha256 = "1a4k0amyg8mvfr2ld7v8zyphhxv33yybh55vqcshwv4a0jm1wmjg";
-      name = "solid-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/solid-5.92.0.tar.xz";
+      sha256 = "172sid8l1znzxxz0hi5m19yy4vg7l1nbghvzjvh18ssbmxcwh9l9";
+      name = "solid-5.92.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/sonnet-5.91.0.tar.xz";
-      sha256 = "067xj5mllpzl0gnxxljhfi9y4xdgrpqbckm7pykczzqrklrrx8dx";
-      name = "sonnet-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/sonnet-5.92.0.tar.xz";
+      sha256 = "08jps1hy0qvk62wnzn50qi8iaay7xav3hbcj55sk70mm7pd1vz1i";
+      name = "sonnet-5.92.0.tar.xz";
     };
   };
   syndication = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/syndication-5.91.0.tar.xz";
-      sha256 = "1f2kb6mh1xc1k1bn536lq9gq0j2lb65qw4vpp4ixynlfij4zq1gy";
-      name = "syndication-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/syndication-5.92.0.tar.xz";
+      sha256 = "0ijxpnsygwzzybic5lp8gfq57y84vrp3bq7vdbjh3h0345vvk6hw";
+      name = "syndication-5.92.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/syntax-highlighting-5.91.0.tar.xz";
-      sha256 = "0fprqi2z8issh3jkql6labszkwd3cpvd6qadsg9fi46vfjr4a2ip";
-      name = "syntax-highlighting-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/syntax-highlighting-5.92.0.tar.xz";
+      sha256 = "03p5qzf13nbf54gzad3q1q6i33iggz3ik0ydr9szhj92kfppwd4r";
+      name = "syntax-highlighting-5.92.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.91.0";
+    version = "5.92.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.91/threadweaver-5.91.0.tar.xz";
-      sha256 = "1900kqglkwzkjc24mvl0j7jf7xcx6cr6b1g78s5b5m18rw050j12";
-      name = "threadweaver-5.91.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.92/threadweaver-5.92.0.tar.xz";
+      sha256 = "008in2wbl6zr404m9hbqdvy3d4r06mmb3jrr13myldwljqywzc28";
+      name = "threadweaver-5.92.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/kde-frameworks/syndication.nix b/pkgs/development/libraries/kde-frameworks/syndication.nix
index fd5a9b9db8464..1d32f9b702197 100644
--- a/pkgs/development/libraries/kde-frameworks/syndication.nix
+++ b/pkgs/development/libraries/kde-frameworks/syndication.nix
@@ -4,7 +4,7 @@
 }:
 
 mkDerivation {
-  name = "syndication";
+  pname = "syndication";
   meta.maintainers = [ lib.maintainers.bkchr ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kcodecs ];
diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
index a295b23f32101..fee392140f7e3 100644
--- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
+++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
@@ -3,7 +3,7 @@
 }:
 
 mkDerivation {
-  name = "syntax-highlighting";
+  pname = "syntax-highlighting";
   nativeBuildInputs = [ extra-cmake-modules perl ];
   buildInputs = [ qttools ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
index bfa529c9267ae..fb43b9f28b061 100644
--- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix
+++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation {
-  name = "threadweaver";
+  pname = "threadweaver";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtbase ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index c632c2fdac9e2..e1251b0e942c8 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -18,7 +18,7 @@ let
 in
 with lib;
 stdenv.mkDerivation rec {
-  name = "${type}krb5-${version}";
+  pname = "${type}krb5";
   version = "1.19.2";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
index 732efda1df466..8ff7b9332476b 100644
--- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
+++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }:
 
 stdenv.mkDerivation rec {
-  name = "khronos-ocl-icd-loader-${version}";
+  pname = "khronos-ocl-icd-loader";
   version = "2022.01.04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix
index b21d0f1159e08..50167f28a9db2 100644
--- a/pkgs/development/libraries/languagemachines/frog.nix
+++ b/pkgs/development/libraries/languagemachines/frog.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "frog-${release.version}";
+  pname = "frog";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "frog-v${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix
index f037e7fc17a09..5b1b07e792772 100644
--- a/pkgs/development/libraries/languagemachines/frogdata.nix
+++ b/pkgs/development/libraries/languagemachines/frogdata.nix
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "frogdata-${release.version}";
+  pname = "frogdata";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "frogdata-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix
index c2b4f6662bb50..6cc5bcade2050 100644
--- a/pkgs/development/libraries/languagemachines/libfolia.nix
+++ b/pkgs/development/libraries/languagemachines/libfolia.nix
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "libfolia-${release.version}";
+  pname = "libfolia";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "libfolia-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix
index af0f872494231..9556c1d567011 100644
--- a/pkgs/development/libraries/languagemachines/mbt.nix
+++ b/pkgs/development/libraries/languagemachines/mbt.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "mbt-${release.version}";
+  pname = "mbt";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "mbt-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix
index a5b262106c055..0b5fef292fcff 100644
--- a/pkgs/development/libraries/languagemachines/ticcutils.nix
+++ b/pkgs/development/libraries/languagemachines/ticcutils.nix
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ticcutils-${release.version}";
+  pname = "ticcutils";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "ticcutils-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix
index 8b9e6c62aee2d..1585798170b33 100644
--- a/pkgs/development/libraries/languagemachines/timbl.nix
+++ b/pkgs/development/libraries/languagemachines/timbl.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "timbl-${release.version}";
+  pname = "timbl";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "timbl-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix
index 55e914bd5b445..ea40d017d4711 100644
--- a/pkgs/development/libraries/languagemachines/timblserver.nix
+++ b/pkgs/development/libraries/languagemachines/timblserver.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "timblserver-${release.version}";
+  pname = "timblserver";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "timblserver-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix
index 4d85bbfc212bf..f707d9fb8b6eb 100644
--- a/pkgs/development/libraries/languagemachines/ucto.nix
+++ b/pkgs/development/libraries/languagemachines/ucto.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ucto-${release.version}";
+  pname = "ucto";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "ucto-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix
index dbc15a17a14b6..a274b6193eddc 100644
--- a/pkgs/development/libraries/languagemachines/uctodata.nix
+++ b/pkgs/development/libraries/languagemachines/uctodata.nix
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "uctodata-${release.version}";
+  pname = "uctodata";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "uctodata-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index 874c567ed42e8..05cf84144feb7 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     owner = "puppetlabs";
   };
 
+  cmakeFlags = [ "-DLEATHERMAN_ENABLE_TESTING=OFF" ];
+
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix
index 469235e2e6af5..8ca2acc11c715 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/pkgs/development/libraries/libappindicator/default.nix
@@ -13,8 +13,8 @@ with lib;
 
 
 stdenv.mkDerivation rec {
-  name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}";
-          in "libappindicator-${postfix}-${version}";
+  pname = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}";
+          in "libappindicator-${postfix}";
   version = "12.10.1+20.10.20200706.1";
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix
index 349b715d8520c..9473c4823fc4d 100644
--- a/pkgs/development/libraries/libcbor/default.nix
+++ b/pkgs/development/libraries/libcbor/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libcbor";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "PJK";
     repo = pname;
     rev = "v${version}";
-    sha256 = "01dv4vxcmbvpphqy16vqiwh25wx11x630js5wfnx7cryarsh9ld7";
+    sha256 = "sha256-Wp/48yQA17mf/dTgeMcMDvPpKOPkfLhQkCnzgGLpLtk=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix
index 0bf654ee963cb..919ddcd3f0668 100644
--- a/pkgs/development/libraries/libcollectdclient/default.nix
+++ b/pkgs/development/libraries/libcollectdclient/default.nix
@@ -2,7 +2,8 @@
 with lib;
 
 collectd.overrideAttrs (oldAttrs: {
-  name = "libcollectdclient-${collectd.version}";
+  pname = "libcollectdclient";
+  inherit (collectd) version;
   buildInputs = [ ];
 
   configureFlags = (oldAttrs.configureFlags or []) ++ [
diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index 13bbd246c64ad..e5d6d1c7c679b 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -12,12 +12,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libfido2";
-  version = "1.9.0";
+  version = "1.10.0";
 
   # releases on https://developers.yubico.com/libfido2/Releases/ are signed
   src = fetchurl {
     url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
-    sha256 = "sha256-ujnjrzc20t/IrT0ctuO+fszAlYhhCjsHyGXQ7T5YwtI=";
+    sha256 = "sha256-Um79PVavcGwF0J89IfGO47CxWsDB9cXaGsvCfCcwuZs=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix
index 8634f05ebbc7c..00031e66bf506 100644
--- a/pkgs/development/libraries/libfive/default.nix
+++ b/pkgs/development/libraries/libfive/default.nix
@@ -47,5 +47,6 @@ mkDerivation {
     maintainers = with maintainers; [ hodapp kovirobi ];
     license = with licenses; [ mpl20 gpl2Plus ];
     platforms = with platforms; linux ++ darwin;
+    broken = true;
   };
 }
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 89bdc15ff62c1..5c06cd282da55 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
-, fetchurl
+, fetchFromGitLab
+, gitUpdater
 , pkg-config
 , meson
 , ninja
@@ -44,13 +45,16 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libinput";
-  version = "1.19.3";
+  version = "1.20.0";
 
   outputs = [ "bin" "out" "dev" ];
 
-  src = fetchurl {
-    url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz";
-    sha256 = "sha256-PK54zN4Z19Dzh+WLxzTU0Xq19kJvVKnotyjJCxe6oGg=";
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "libinput";
+    repo = "libinput";
+    rev = version;
+    sha256 = "Ey6ItBIrf1POACp2+6R0B4KxJq5V1HoO+y4j6hZSGAE=";
   };
 
   patches = [
@@ -113,8 +117,14 @@ stdenv.mkDerivation rec {
     sed -i "/install_subdir('libinput', install_dir : dir_etc)/d" meson.build
   '';
 
-  passthru.tests = {
-    libinput-module = nixosTests.libinput;
+  passthru = {
+    tests = {
+      libinput-module = nixosTests.libinput;
+    };
+    updateScript = gitUpdater {
+      inherit pname version;
+      patchlevel-unstable = true;
+    };
   };
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index 92aaf6201b936..75ec20545cae3 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -16,13 +16,13 @@ assert !(enableJpeg7 && enableJpeg8);  # pick only one or none, not both
 stdenv.mkDerivation rec {
 
   pname = "libjpeg-turbo";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = "libjpeg-turbo";
     repo = "libjpeg-turbo";
     rev = version;
-    sha256 = "sha256-mlHueKAU/uNUdV9s4jWKAE+XVJdpEFhw2hxGvqRwAGc=";
+    sha256 = "sha256-GbOYoCNAsOESXrEsBb6OHVB4TKhPUEU04PBp8qXVMug=";
   };
 
   # This is needed by freeimage
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index a2097bb17e25b..e960c8d1bf481 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -1,14 +1,22 @@
-{ lib, stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }:
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libnfnetlink, libmnl }:
 
 stdenv.mkDerivation rec {
   pname = "libnetfilter_conntrack";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.bz2";
-    sha256 = "1ky1mqgnplw2h9jf0kn0a69d94jkydhbiipng9l2hdcj13h3pl8c";
+    sha256 = "sha256-Z72d9J/jTouCFE9t+5OzIPOEqOpZcn6S/40YtfS1eag=";
   };
 
+  patches = [
+    # Fix Musl build.
+    (fetchpatch {
+      url = "https://git.netfilter.org/libnetfilter_conntrack/patch/?id=21ee35dde73aec5eba35290587d479218c6dd824";
+      sha256 = "00rp82jrx5ygcw8la3c7bv7sigw9qzbn956dk71qjx981a2g2kqk";
+    })
+  ];
+
   buildInputs = [ libmnl ];
   propagatedBuildInputs = [ libnfnetlink ];
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/development/libraries/libosmscout/default.nix
index 2f83963d205f1..b11ec3eb94c1d 100644
--- a/pkgs/development/libraries/libosmscout/default.nix
+++ b/pkgs/development/libraries/libosmscout/default.nix
@@ -11,6 +11,8 @@ mkDerivation rec {
     sha256 = "1pa459h52kw88mvsdvkz83f4p35vvgsfy2qfjwcj61gj4y9d2rq4";
   };
 
+  cmakeFlags = [ "-DOSMSCOUT_BUILD_TESTS=OFF" ];
+
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ marisa qtlocation ];
 
diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix
index 9db1354677d65..665121b58b5ce 100644
--- a/pkgs/development/libraries/libowfat/default.nix
+++ b/pkgs/development/libraries/libowfat/default.nix
@@ -17,5 +17,8 @@ stdenv.mkDerivation rec {
     homepage = "https://www.fefe.de/libowfat/";
     license = licenses.gpl2;
     platforms = platforms.linux;
+    # Doesn't build with glibc 2.34: https://hydra.nixos.org/build/156248131
+    # Should be fixed with the next release: https://bugs.gentoo.org/806505
+    broken = true;
   };
 }
diff --git a/pkgs/development/libraries/libressl/fix-build-with-glibc.patch b/pkgs/development/libraries/libressl/fix-build-with-glibc.patch
new file mode 100644
index 0000000000000..db482bcb35da3
--- /dev/null
+++ b/pkgs/development/libraries/libressl/fix-build-with-glibc.patch
@@ -0,0 +1,92 @@
+diff --git a/tests/explicit_bzero.c b/tests/explicit_bzero.c
+index 34c60baa8a..9c0e917829 100644
+--- a/tests/explicit_bzero.c
++++ b/tests/explicit_bzero.c
+@@ -1,4 +1,4 @@
+-/*	$OpenBSD: explicit_bzero.c,v 1.6 2014/07/11 01:10:35 matthew Exp $	*/
++/*	$OpenBSD: explicit_bzero.c,v 1.7 2021/03/27 11:17:58 bcook Exp $	*/
+ /*
+  * Copyright (c) 2014 Google Inc.
+  *
+@@ -18,6 +18,7 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <signal.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ 
+@@ -36,19 +37,33 @@ enum {
+ 	SECRETBYTES = SECRETCOUNT * sizeof(secret)
+ };
+ 
+-static char altstack[SIGSTKSZ + SECRETBYTES];
++/*
++ * As of glibc 2.34, when _GNU_SOURCE is defined, SIGSTKSZ is no longer
++ * constant on Linux. SIGSTKSZ is redefined to sysconf (_SC_SIGSTKSZ).
++ */
++static char *altstack;
++#define ALTSTACK_SIZE (SIGSTKSZ + SECRETBYTES)
+ 
+ static void
+ setup_stack(void)
+ {
++	altstack = calloc(1, ALTSTACK_SIZE);
++	ASSERT_NE(NULL, altstack);
++
+ 	const stack_t sigstk = {
+ 		.ss_sp = altstack,
+-		.ss_size = sizeof(altstack),
++		.ss_size = ALTSTACK_SIZE
+ 	};
+ 
+ 	ASSERT_EQ(0, sigaltstack(&sigstk, NULL));
+ }
+ 
++static void
++cleanup_stack(void)
++{
++	free(altstack);
++}
++
+ static void
+ assert_on_stack(void)
+ {
+@@ -129,7 +144,7 @@ test_without_bzero()
+ 	char buf[SECRETBYTES];
+ 	assert_on_stack();
+ 	populate_secret(buf, sizeof(buf));
+-	char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf));
++	char *res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf));
+ 	ASSERT_NE(NULL, res);
+ 	return (res);
+ }
+@@ -140,7 +155,7 @@ test_with_bzero()
+ 	char buf[SECRETBYTES];
+ 	assert_on_stack();
+ 	populate_secret(buf, sizeof(buf));
+-	char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf));
++	char *res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf));
+ 	ASSERT_NE(NULL, res);
+ 	explicit_bzero(buf, sizeof(buf));
+ 	return (res);
+@@ -183,15 +198,17 @@ main()
+ 	 * on the stack.  This sanity checks that call_on_stack() and
+ 	 * populate_secret() work as intended.
+ 	 */
+-	memset(altstack, 0, sizeof(altstack));
++	memset(altstack, 0, ALTSTACK_SIZE);
+ 	call_on_stack(do_test_without_bzero);
+ 
+ 	/*
+ 	 * Now test with a call to explicit_bzero() and check that we
+ 	 * *don't* find any instances of the secret data.
+ 	 */
+-	memset(altstack, 0, sizeof(altstack));
++	memset(altstack, 0, ALTSTACK_SIZE);
+ 	call_on_stack(do_test_with_bzero);
+ 
++	cleanup_stack();
++
+ 	return (0);
+ }
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index 9e8be02aa63a3..95e2c69e4c7ba 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -18,7 +18,6 @@
 , gjs
 , libintl
 , dbus
-, xvfb-run
 }:
 
 stdenv.mkDerivation rec {
@@ -55,27 +54,43 @@ stdenv.mkDerivation rec {
     glib
   ];
 
-  installCheckInputs = [
+  checkInputs = [
     python3
     python3.pkgs.dbus-python
     python3.pkgs.pygobject3
-    xvfb-run
     dbus
     gjs
   ];
 
-  # needs to run after install because typelibs point to absolute paths
-  doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib
+  doCheck = stdenv.isLinux;
 
   postPatch = ''
-    patchShebangs .
+    patchShebangs ./tool/test-*.sh
   '';
 
-  installCheckPhase = ''
-    export NO_AT_BRIDGE=1
-    xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+  preCheck = ''
+    # Our gobject-introspection patches make the shared library paths absolute
+    # in the GIR files. When running tests, the library is not yet installed,
+    # though, so we need to replace the absolute path with a local one during build.
+    # We are using a symlink that will be overwitten during installation.
+    mkdir -p $out/lib $out/lib
+    ln -s "$PWD/libsecret/libmock-service.so" "$out/lib/libmock-service.so"
+    ln -s "$PWD/libsecret/libsecret-1.so.0" "$out/lib/libsecret-1.so.0"
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+
+    dbus-run-session \
       --config-file=${dbus.daemon}/share/dbus-1/session.conf \
-      make check
+      meson test --print-errorlogs
+
+    runHook postCheck
+  '';
+
+  postCheck = ''
+    # This is test-only so it won’t be overwritten during installation.
+    rm "$out/lib/libmock-service.so"
   '';
 
   postFixup = ''
diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix
index c48c71e144852..203f2768e37b1 100644
--- a/pkgs/development/libraries/libspf2/default.nix
+++ b/pkgs/development/libraries/libspf2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }:
 
 with lib;
 
@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
     sha256 = "03iiaafdcwh220pqignk407h6klrakwz0zkb8iwk6nkwipkwvhsx";
   };
 
+  patches = [
+    # glibc-2.34 compat
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/gentoo/dbb8a5c9f749cc11e61cfe558f164b165cbc30cb/mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch";
+      sha256 = "sha256-6JVVkVGCcFJsNeBdVTPcLhW4KoHLY4ai/KXDMliXgPA=";
+    })
+  ];
+
   postPatch = ''
     # disable static bins compilation
     sed -i \
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 1514d2702103b..24b147d142d74 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -7,33 +7,27 @@
 , udev
 , libobjc
 , IOKit
+, Security
 , withStatic ? false
 }:
 
 stdenv.mkDerivation rec {
   pname = "libusb";
-  version = "1.0.24";
+  version = "1.0.25";
 
   src = fetchFromGitHub {
     owner = "libusb";
     repo = "libusb";
     rev = "v${version}";
-    sha256 = "18ri8ky422hw64zry7bpbarb1m0hiljyf64a0a9y093y7aad38i7";
+    sha256 = "141wygijjcgka0h31504cdlvih4l2j02j67pcbb2l527p7dbc5pn";
   };
 
   outputs = [ "out" "dev" ];
 
-  patches = [ (fetchpatch {
-    # https://bugs.archlinux.org/task/69121
-    url = "https://github.com/libusb/libusb/commit/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch";
-    sha256 = "1dbahikcbwkjhyvks7wbp7fy2bf7nca48vg5z0zqvqzjb9y595cq";
-    excludes = [ "libusb/version_nano.h" ];
-  }) ];
-
   nativeBuildInputs = [ pkg-config autoreconfHook ];
   propagatedBuildInputs =
     lib.optional enableUdev udev ++
-    lib.optionals stdenv.isDarwin [ libobjc IOKit ];
+    lib.optionals stdenv.isDarwin [ libobjc IOKit Security ];
 
   dontDisableStatic = withStatic;
 
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 1d9354d48e1a7..12f7f982c1df0 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.43.0";
+  version = "1.44.1";
   pname = "libuv";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-AsXJb2AGNx+SARPmY8uRFRLfX5vqTPNjwL8njSw/e7o=";
+    sha256 = "sha256-12uveSEavRxQW4xVrB4Rkkj+eHZ71Qy8dRG+95ldz50=";
   };
 
   postPatch = let
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
       "threadpool_multiple_event_loops" # times out on slow machines
       "get_passwd" # passed on NixOS but failed on other Linuxes
       "tcp_writealot" "udp_multicast_join" "udp_multicast_join6" # times out sometimes
+      "fs_fstat" # https://github.com/libuv/libuv/issues/2235#issuecomment-1012086927
     ] ++ lib.optionals stdenv.isDarwin [
         # Sometimes: timeout (no output), failed uv_listen. Someone
         # should report these failures to libuv team. There tests should
diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix
deleted file mode 100644
index ade56ac16ee9e..0000000000000
--- a/pkgs/development/libraries/libva/1.0.0.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, lib, fetchurl, libX11, pkg-config, libXext, libdrm, libXfixes, wayland, libffi
-, libGL, mesa
-, minimal ? false, libva1-minimal
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libva";
-  version = "1.7.3";
-
-  src = fetchurl {
-    url = "https://www.freedesktop.org/software/vaapi/releases/libva/${pname}-${version}.tar.bz2";
-    sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12";
-  };
-
-  outputs = [ "bin" "dev" "out" ];
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [ libdrm ]
-    ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ];
-  # TODO: share libs between minimal and !minimal - perhaps just symlink them
-
-  configureFlags =
-    # Add FHS paths for non-NixOS applications.
-    [ "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++
-    lib.optionals (!minimal) [ "--enable-glx" ];
-
-  installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];
-
-  meta = with lib; {
-    homepage = "http://www.freedesktop.org/wiki/Software/vaapi";
-    license = licenses.mit;
-    description = "VAAPI library: Video Acceleration API";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
-  };
-}
diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix
new file mode 100644
index 0000000000000..5197420783a12
--- /dev/null
+++ b/pkgs/development/libraries/libva/1.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, autoreconfHook
+, libX11
+, pkg-config
+, libXext
+, libdrm
+, libXfixes
+, wayland
+, libffi
+, libGL
+, mesa
+, minimal ? false
+, libva1-minimal
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libva" + lib.optionalString minimal "-minimal";
+  version = "1.8.3";
+
+  src = fetchFromGitHub {
+    owner = "intel";
+    repo = "libva";
+    rev = version;
+    sha256 = "sha256-ur59cqdZqXIY2dDUSie9XsxyRomVBxIW2IVKAgWYC38=";
+  };
+
+  outputs = [ "dev" "out" ];
+
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
+
+  buildInputs = [ libdrm ]
+    ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ];
+  # TODO: share libs between minimal and !minimal - perhaps just symlink them
+
+  # Add FHS paths for non-NixOS applications.
+  configureFlags = [ "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ]
+    ++ lib.optionals (!minimal) [ "--enable-glx" ];
+
+  installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];
+
+  meta = with lib; {
+    homepage = "https://www.freedesktop.org/wiki/Software/vaapi/";
+    license = licenses.mit;
+    description = "VAAPI library: Video Acceleration API";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 10f90a16c927a..037318353ce06 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -6,14 +6,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "libva" + lib.optionalString minimal "minimal";
-  version = "2.13.0";
+  pname = "libva" + lib.optionalString minimal "-minimal";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "libva";
     rev    = version;
-    sha256 = "0vsvli3xc0gqqp06p7wkm973lhr7c5qgnyz5jfjmf8kv75rajazp";
+    sha256 = "0q395lg6gp05mwf04zbrwgj6q9073lahh3wrcfa2i8ll60cfq9fg";
   };
 
   outputs = [ "dev" "out" ];
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     homepage = "https://01.org/linuxmedia/vaapi";
     changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS";
     license = licenses.mit;
-    maintainers = with maintainers; [ primeos ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix
index 05ba3519ff4c2..357d20527957e 100644
--- a/pkgs/development/libraries/libva/utils.nix
+++ b/pkgs/development/libraries/libva/utils.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libva-utils";
-  version = "2.13.0";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "libva-utils";
     rev    = version;
-    sha256 = "0ahbwikdb0chf76whm62zz0a7zqil3gzsxmq38ccbqlmnnyjkbbb";
+    sha256 = "sha256-WuNJCFBbXbLSftL+L15ruq9PxM1XhIfYpP/IccB+aBs=";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/intel/libva-utils";
     changelog = "https://raw.githubusercontent.com/intel/libva-utils/${version}/NEWS";
     license = licenses.mit;
-    maintainers = with maintainers; [ primeos ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index 1517cf9707829..7ccc0d2a19993 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libwacom";
-  version = "2.0.0";
+  version = "2.1.0";
 
   outputs = [ "out" "dev" ];
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     owner = "linuxwacom";
     repo = "libwacom";
     rev = "libwacom-${version}";
-    sha256 = "sha256-k8pEgEu+oWNa0rI47osVPKaZGxgwX/ENaz9jPrQXy0E=";
+    sha256 = "sha256-yqOhlbOgDIAsxgQWoLKj7WpwJXvxeuW8yCvuKTtE7h0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 23163763ed9b7..a48f4b42e453b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -15,6 +15,7 @@
 , enableOSMesa ? stdenv.isLinux
 , enableOpenCL ? stdenv.isLinux && stdenv.isx86_64
 , libclc
+, jdupes
 }:
 
 /** Packaging design:
@@ -33,7 +34,7 @@ with lib;
 let
   # Release calendar: https://www.mesa3d.org/release-calendar.html
   # Release frequency: https://www.mesa3d.org/releasing.html#schedule
-  version = "21.3.7";
+  version = "21.3.8";
   branch  = versions.major version;
 
 self = stdenv.mkDerivation {
@@ -47,7 +48,7 @@ self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "0ggw3s514z6szasbiy4dv5mdi689121yy2xly2g21gv1mavrvyml";
+    sha256 = "19wx5plk6z0hhi0zdzxjx8ynl3lhlc5mbd8vhwqyk92kvhxjf3g7";
   };
 
   # TODO:
@@ -228,6 +229,9 @@ self = stdenv.mkDerivation {
       fi
     done
 
+    # NAR doesn't support hard links, so convert them to symlinks to save space.
+    ${jdupes}/bin/jdupes --hard-links --link-soft --recurse "$drivers"
+
     # add RPATH so the drivers can find the moved libgallium and libdricore9
     # moved here to avoid problems with stripping patchelfed files
     for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do
diff --git a/pkgs/development/libraries/mustache-hpp/default.nix b/pkgs/development/libraries/mustache-hpp/default.nix
index 373f232a9866d..ce6dd1d21a9b3 100644
--- a/pkgs/development/libraries/mustache-hpp/default.nix
+++ b/pkgs/development/libraries/mustache-hpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "mustache";
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb";
   };
 
-  nativeBuildInputs = [ cmake ];
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p $out/include
-    cp ../mustache.hpp $out/include
+    cp mustache.hpp $out/include
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index bd639ec3041a2..01df15c0a831e 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -1,90 +1,110 @@
-{ lib, stdenv, fetchurl, pkg-config
+{ lib
+, stdenv
+, fetchurl
+, installShellFiles
+, pkg-config
 
-# Optional Dependencies
-, openssl ? null, zlib ? null
-, enableLibEv ? !stdenv.hostPlatform.isWindows, libev ? null
-, enableCAres ? !stdenv.hostPlatform.isWindows, c-ares ? null
-, enableHpack ? false, jansson ? null
+# Optional dependencies
+, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic
+, c-ares ? null, libev ? null, openssl ? null, zlib ? null
 , enableAsioLib ? false, boost ? null
 , enableGetAssets ? false, libxml2 ? null
+, enableHpack ? false, jansson ? null
 , enableJemalloc ? false, jemalloc ? null
-, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic
 , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null
 
+# Unit tests ; we have to set TZDIR, which is a GNUism.
+, enableTests ? stdenv.hostPlatform.isGnu, cunit ? null, tzdata ? null
+
 # downstream dependencies, for testing
 , curl
 , libsoup
 }:
 
-# Note: this package is used for bootstrapping fetchurl, and thus
-# cannot use fetchpatch! All mutable patches (generated by GitHub or
-# cgit) that are needed here should be included directly in Nixpkgs as
-# files.
+# Note: this package is used for bootstrapping fetchurl, and thus cannot use fetchpatch!
+# All mutable patches (generated by GitHub or cgit) that are needed here
+# should be included directly in Nixpkgs as files.
 
-assert enableHpack -> jansson != null;
+assert enableApp -> c-ares != null && libev != null && openssl != null && zlib != null;
 assert enableAsioLib -> boost != null;
-assert enableGetAssets -> libxml2 != null;
-assert enableJemalloc -> jemalloc != null;
+assert enableGetAssets -> enableApp == true && libxml2 != null;
+assert enableHpack -> enableApp == true && jansson != null;
+assert enableJemalloc -> enableApp == true && jemalloc != null;
 assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null;
-
-let inherit (lib) optional optionals optionalString; in
+assert enableTests -> cunit != null && tzdata != null;
 
 stdenv.mkDerivation rec {
   pname = "nghttp2";
-  version = "1.43.0";
+  version = "1.47.0";
 
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "0qhgyphzdv72dgdfxin2xbk9623za3jwbcvhhaxixiwp6djj8vsm";
+    sha256 = "11d6w8iqrhnxmjd9ss9fzf66f7a32d48h2ihyk1580lg8d3rkj07";
   };
 
   outputs = [ "bin" "out" "dev" "lib" ]
-    ++ optional enablePython "python";
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl ]
-    ++ optional enableLibEv libev
-    ++ [ zlib ]
-    ++ optional enableCAres c-ares
-    ++ optional enableHpack jansson
-    ++ optional enableAsioLib boost
-    ++ optional enableGetAssets libxml2
-    ++ optional enableJemalloc jemalloc
-    ++ optionals enablePython [ python ncurses setuptools ];
+    ++ lib.optionals (enablePython) [ "python" ];
+
+  nativeBuildInputs = [ pkg-config ]
+    ++ lib.optionals (enableApp) [ installShellFiles ]
+    ++ lib.optionals (enablePython) [ cython ];
+
+  buildInputs = lib.optionals enableApp [ c-ares libev openssl zlib ]
+    ++ lib.optionals (enableAsioLib) [ boost ]
+    ++ lib.optionals (enableGetAssets) [ libxml2 ]
+    ++ lib.optionals (enableHpack) [ jansson ]
+    ++ lib.optionals (enableJemalloc) [ jemalloc ]
+    ++ lib.optionals (enablePython) [ python ncurses setuptools ];
 
   enableParallelBuilding = true;
 
   configureFlags = [
-    "--with-spdylay=no"
     "--disable-examples"
     (lib.enableFeature enableApp "app")
-  ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"
-    ++ (if enablePython then [
-    "--with-cython=${cython}/bin/cython"
-  ] else [
-    "--disable-python-bindings"
-  ]);
-
-  preInstall = optionalString enablePython ''
+  ] ++ lib.optionals (enableAsioLib) [ "--enable-asio-lib" "--with-boost-libdir=${boost}/lib" ]
+    ++ lib.optionals (enablePython) [ "--with-cython=${cython}/bin/cython" ];
+
+  # Unit tests require CUnit and setting TZDIR environment variable
+  doCheck = enableTests;
+  checkInputs = lib.optionals (enableTests) [ cunit tzdata ];
+  preCheck = lib.optionalString (enableTests) ''
+    export TZDIR=${tzdata}/share/zoneinfo
+  '';
+
+  preInstall = lib.optionalString (enablePython) ''
     mkdir -p $out/${python.sitePackages}
     # convince installer it's ok to install here
     export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}"
   '';
-  postInstall = optionalString enablePython ''
+  postInstall = lib.optionalString (enablePython) ''
     mkdir -p $python/${python.sitePackages}
     mv $out/${python.sitePackages}/* $python/${python.sitePackages}
+    rm -r $out/lib
+  '' + lib.optionalString (enableApp) ''
+    installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx}
   '';
 
-  #doCheck = true;  # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc
-
   passthru.tests = {
     inherit curl libsoup;
   };
 
   meta = with lib; {
+    description = "HTTP/2 C library and tools";
+    longDescription = ''
+      nghttp2 is an implementation of the HyperText Transfer Protocol version 2 in C.
+      The framing layer of HTTP/2 is implemented as a reusable C library. On top of that,
+      we have implemented an HTTP/2 client, server and proxy. We have also developed
+      load test and benchmarking tools for HTTP/2.
+      An HPACK encoder and decoder are available as a public API.
+      We have Python bindings of this library, but we do not have full code coverage yet.
+      An experimental high level C++ library is also available.
+    '';
+
     homepage = "https://nghttp2.org/";
-    description = "A C implementation of HTTP/2";
+    changelog = "https://github.com/nghttp2/nghttp2/releases/tag/v${version}";
+    # News articles with changes summary can be found here: https://nghttp2.org/blog/archives/
     license = licenses.mit;
+    maintainers = with maintainers; [ c0bw3b ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 279c8a0fd0543..2fae17a232364 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, octave ? null }:
+{ lib, stdenv, fetchFromGitHub, cmake, octave ? null, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "nlopt";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-TgieCX7yUdTAEblzXY/gCN0r6F9TVDh4RdNDjQdXZ1o=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
   buildInputs = [ octave ];
 
   configureFlags = [
diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix
index d23401c0fb49a..ad10cfadf6eb6 100644
--- a/pkgs/development/libraries/notcurses/default.nix
+++ b/pkgs/development/libraries/notcurses/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
       replacement for NCURSES on existing systems.
     '';
     license = licenses.asl20;
-    maintainers = with maintainers; [ jb55 AndersonTorres ];
+    maintainers = with maintainers; [ AndersonTorres ];
     inherit (ncurses.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index d17f4c4a78356..454c09e1b02ed 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -27,7 +27,8 @@ let
   #       It will rebuild itself using the version of this package (NSS) and if
   #       an update is required do the required changes to the expression.
   #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
-  version = "3.75";
+  version = "3.76";
+  underscoreVersion = lib.replaceStrings [ "." ] [ "_" ] version;
 
 in
 stdenv.mkDerivation rec {
@@ -35,8 +36,8 @@ stdenv.mkDerivation rec {
   inherit version;
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz";
-    sha256 = "10l5qn68gly2l4ifv0v6by1qc8nsmhra08nm9m7n913jh83iamzx";
+    url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
+    sha256 = "0c0nmajcvnm8gqz2v6wrlq04yzy3y7hcs806wjnx4r6kml8073hv";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -190,6 +191,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS";
     description = "A set of libraries for development of security-enabled client and server applications";
+    changelog = "https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_${underscoreVersion}.rst";
     maintainers = with maintainers; [ ];
     license = licenses.mpl20;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index aac11dc83bda1..7baf992669721 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -27,11 +27,11 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "openmpi";
-  version = "4.1.2";
+  version = "4.1.3";
 
   src = with lib.versions; fetchurl {
     url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
-    sha256 = "09xmlr4mfs02kwcf5cmdgkcdjj81fjwjmpa3rz2k28f3gz7wfy4v";
+    sha256 = "sha256-PYHQTFTvtV04caRl/7CY2NcsH0j/HLryWA6wWFZ8Cjs=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch b/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch
deleted file mode 100644
index 5ecfb41755697..0000000000000
--- a/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Configure b/Configure
-index 494e0b3..0b448aa 100755
---- a/Configure
-+++ b/Configure
-@@ -652,6 +652,8 @@ my %table=(
- "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-+"darwin64-arm64-cc","cc:-arch arm64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-+"debug-darwin64-arm64-cc","cc:-arch arm64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- # iPhoneOS/iOS
- "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
diff --git a/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch
deleted file mode 100644
index 5765409fdd579..0000000000000
--- a/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
-index e6d0e6e1a6..b89456fd87 100644
---- a/crypto/x509/by_file.c
-+++ b/crypto/x509/by_file.c
-@@ -97,7 +97,10 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp,
-     switch (cmd) {
-     case X509_L_FILE_LOAD:
-         if (argl == X509_FILETYPE_DEFAULT) {
--            file = ossl_safe_getenv(X509_get_default_cert_file_env());
-+            file = ossl_safe_getenv("NIX_SSL_CERT_FILE");
-+
-+            if (!file)
-+                file = ossl_safe_getenv(X509_get_default_cert_file_env());
- 
-             if (file)
-                 ok = (X509_load_cert_crl_file(ctx, file,
diff --git a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch
deleted file mode 100644
index 3d9ee7e6a822f..0000000000000
--- a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h
---- openssl-1.0.1r-orig/crypto/cryptlib.h	2016-01-28 14:38:30.000000000 +0100
-+++ openssl-1.0.1r/crypto/cryptlib.h	2016-02-03 12:54:29.193165176 +0100
-@@ -81,8 +81,8 @@
- 
- # ifndef OPENSSL_SYS_VMS
- #  define X509_CERT_AREA          OPENSSLDIR
- #  define X509_CERT_DIR           OPENSSLDIR "/certs"
--#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
-+#  define X509_CERT_FILE          "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
- #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
- # else
- #  define X509_CERT_AREA          "SSLROOT:[000000]"
diff --git a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch
deleted file mode 100644
index 813c6bdf44ab8..0000000000000
--- a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h
---- openssl-1.0.1r-orig/crypto/cryptlib.h	2016-01-28 14:38:30.000000000 +0100
-+++ openssl-1.0.1r/crypto/cryptlib.h	2016-02-03 12:54:29.193165176 +0100
-@@ -81,8 +81,8 @@
- 
- # ifndef OPENSSL_SYS_VMS
- #  define X509_CERT_AREA          OPENSSLDIR
- #  define X509_CERT_DIR           OPENSSLDIR "/certs"
--#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
-+#  define X509_CERT_FILE          "/etc/ssl/certs/ca-certificates.crt"
- #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
- # else
- #  define X509_CERT_AREA          "SSLROOT:[000000]"
diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
deleted file mode 100644
index bae3e53f441f3..0000000000000
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, perl, zlib
-, withCryptodev ? false, cryptodev
-}:
-
-with lib;
-stdenv.mkDerivation {
-  pname = "openssl-chacha";
-  version = "2016-08-22";
-
-  src = fetchFromGitHub {
-    owner = "PeterMosmans";
-    repo = "openssl";
-    rev = "293717318e903b95f4d7e83a98a087282f37efc3";
-    sha256 = "134j3anjnj2q99xsd8d47bwvjp73qkdsimdd9riyjxa3hd8ysr00";
-  };
-
-  outputs = [ "bin" "dev" "out" "man" ];
-  setOutputFlags = false;
-
-  nativeBuildInputs = [ perl zlib ];
-  buildInputs = lib.optional withCryptodev cryptodev;
-
-  configureScript = "./config";
-
-  configureFlags = [
-    "zlib"
-    "shared"
-    "experimental-jpake"
-    "enable-md2"
-    "enable-rc5"
-    "enable-rfc3779"
-    "enable-gost"
-    "--libdir=lib"
-    "--openssldir=etc/ssl"
-  ] ++ lib.optionals withCryptodev [
-    "-DHAVE_CRYPTODEV"
-    "-DUSE_CRYPTODEV_DIGESTS"
-  ];
-
-  makeFlags = [
-    "MANDIR=$(man)/share/man"
-  ];
-
-  # Parallel building is broken in OpenSSL.
-  enableParallelBuilding = false;
-
-  postInstall = ''
-    # If we're building dynamic libraries, then don't install static
-    # libraries.
-    if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
-        rm "$out/lib/"*.a
-    fi
-
-    mkdir -p $bin
-    mv $out/bin $bin/
-
-    mkdir $dev
-    mv $out/include $dev/
-
-    # remove dependency on Perl at runtime
-    rm -r $out/etc/ssl/misc
-
-    rmdir $out/etc/ssl/{certs,private}
-  '';
-
-  postFixup = ''
-    # Check to make sure we don't depend on perl
-    if grep -r '${perl}' $out; then
-      echo "Found an erroneous dependency on perl ^^^" >&2
-      exit 1
-    fi
-  '';
-
-  meta = {
-    homepage = "https://www.openssl.org/";
-    description = "A cryptographic library that implements the SSL and TLS protocols";
-    platforms = [ "x86_64-linux" ];
-    maintainers = [ lib.maintainers.cstrahan ];
-    license = licenses.openssl;
-    priority = 10; # resolves collision with ‘man-pages’
-  };
-}
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 33ddbf7018c50..648357b00cfba 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -170,20 +170,6 @@ let
 
 in {
 
-  openssl_1_0_2 = common {
-    version = "1.0.2u";
-    sha256 = "ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16";
-    patches = [
-      ./1.0.2/nix-ssl-cert-file.patch
-
-      (if stdenv.hostPlatform.isDarwin
-       then ./1.0.2/use-etc-ssl-certs-darwin.patch
-       else ./1.0.2/use-etc-ssl-certs.patch)
-    ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [
-      ./1.0.2/darwin64-arm64.patch
-    ];
-    extraMeta.knownVulnerabilities = [ "Support for OpenSSL 1.0.2 ended with 2019." ];
-  };
 
   openssl_1_1 = common rec {
     version = "1.1.1n";
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 72907f7aedc89..9c49f89c2ca99 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -71,6 +71,12 @@ stdenv.mkDerivation rec {
       url = "https://src.fedoraproject.org/rpms/polkit/raw/0a203bd46a1e2ec8cc4b3626840e2ea9d0d13a9a/f/CVE-2021-4115.patch";
       sha256 = "sha256-BivHVVpYB4Ies1YbBDyKwUmNlqq2D1MpMipH9/dZM54=";
     })
+    # Fix build with meson 0.61
+    # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/99
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/a96c5119f726225f8d79b222c85d71a9f0e32419.patch";
+      sha256 = "sha256-/hm/m22dKA50sDmw4L1VAlgvCm8CuIyNjHxF/2YgMKo=";
+    })
   ] ++ lib.optionals stdenv.hostPlatform.isMusl [
     # Make netgroup support optional (musl does not have it)
     # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index d89547261880d..a3664ae9e0555 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -84,7 +84,21 @@ let
     qtlocation = [ ./qtlocation-gcc-9.patch ];
     qtscript = [ ./qtscript.patch ];
     qtserialport = [ ./qtserialport.patch ];
+    qtwayland = [
+      # NixOS-specific, ensure that app_id is correctly determined for
+      # wrapped executables from `wrapQtAppsHook` (see comment in patch for further
+      # context).  Beware: shared among different Qt5 versions.
+      ../modules/qtwayland-app_id.patch
+    ];
     qtwebengine = [
+      # glibc 2.34 compat
+      (fetchpatch {
+        url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch";
+        sha256 = "sha256-CJxN6sTvWdPVEwSkr0zpPrjyhUIi6tYSWb8ZyO0sY2o=";
+        excludes = [
+          "src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc"
+        ];
+      })
       ./qtwebengine-no-build-skip.patch
       # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707
       # https://bugreports.qt.io/browse/QTBUG-77037
diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix
index 65ce74dac021d..15c85961adcfd 100644
--- a/pkgs/development/libraries/qt-5/5.14/default.nix
+++ b/pkgs/development/libraries/qt-5/5.14/default.nix
@@ -96,6 +96,12 @@ let
         stripLen = 1;
         extraPrefix = "src/3rdparty/";
       })
+
+      # glibc 2.34 compat
+      (fetchpatch {
+        url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/4cef673b2dd01ce85ce7a841cf352104bbe79668/f/qtwebengine-everywhere-5.15.2-SIGSTKSZ.patch";
+        sha256 = "sha256-2D0/FL4PBL4p6ccd6JoDAGqNtLs2aeE1OdM+PJItock=";
+      })
     ] ++ lib.optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
     qtwebkit = [
       (fetchpatch {
@@ -120,7 +126,13 @@ let
       ./qtwebkit-darwin-no-qos-classes.patch
     ];
     qttools = [ ./qttools.patch ];
-    qtwayland = [ ./qtwayland-libdrm-build.patch ];
+    qtwayland = [
+      ./qtwayland-libdrm-build.patch
+      # NixOS-specific, ensure that app_id is correctly determined for
+      # wrapped executables from `wrapQtAppsHook` (see comment in patch for further
+      # context).  Beware: shared among different Qt5 versions.
+      ../modules/qtwayland-app_id.patch
+    ];
   };
 
   addPackages = self: with self;
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 5943a80a701e7..946c196f4a2d6 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -60,6 +60,12 @@ let
       ./qtwebengine-darwin-no-platform-check.patch
       ./qtwebengine-mac-dont-set-dsymutil-path.patch
     ];
+    qtwayland = [
+      # NixOS-specific, ensure that app_id is correctly determined for
+      # wrapped executables from `wrapQtAppsHook` (see comment in patch for further
+      # context).  Beware: shared among different Qt5 versions.
+      ../modules/qtwayland-app_id.patch
+    ];
     qtwebkit = [
       (fetchpatch {
         name = "qtwebkit-bison-3.7-build.patch";
diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland-app_id.patch b/pkgs/development/libraries/qt-5/modules/qtwayland-app_id.patch
new file mode 100644
index 0000000000000..24d081aa602be
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/modules/qtwayland-app_id.patch
@@ -0,0 +1,36 @@
+Ensure that the correct `app_id` for Wayland is set. The upstream implementation
+uses `QFileInfo::baseName()`[1] which strips everything away after the first dot.
+This means that `.foo-wrapped` has an empty `app_id` because `baseName` returns
+an empty string in this case.
+
+The patch basically checks whether the program has the form `.foo-wrapped` (i.e. got
+wrapped by `makeWrapper`) and if that's the case, `foo` will be the correct `app_id`.
+
+[1] https://doc.qt.io/qt-5/qfileinfo.html#baseName
+
+diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
+index ba881cb..b3fd031 100644
+--- a/src/client/qwaylandwindow.cpp
++++ b/src/client/qwaylandwindow.cpp
+@@ -167,7 +167,20 @@ void QWaylandWindow::initWindow()
+                                                                                  Qt::SkipEmptyParts);
+ 
+                 if (domainName.isEmpty()) {
+-                    mShellSurface->setAppId(fi.baseName());
++                    auto baseName = fi.baseName();
++                    if (baseName.isEmpty()) {
++                        auto fileName = fi.fileName();
++                        if (fileName.endsWith("-wrapped") && fileName.startsWith(".")) {
++                            do {
++                                auto len = fileName.length();
++                                fileName = fileName.right(len - 1);
++                                fileName = fileName.left(len - 9);
++                            } while (fileName.endsWith("-wrapped") && fileName.startsWith("."));
++                            mShellSurface->setAppId(fileName);
++                        }
++                    } else {
++                        mShellSurface->setAppId(baseName);
++                    }
+                 } else {
+                     QString appId;
+                     for (int i = 0; i < domainName.count(); ++i)
diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix
index 4df98c3026e59..a8a87dfd11720 100644
--- a/pkgs/development/libraries/rapidcheck/default.nix
+++ b/pkgs/development/libraries/rapidcheck/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A C++ framework for property based testing inspired by QuickCheck";
     inherit (src.meta) homepage;
-    maintainers = with maintainers; [ jb55 ];
+    maintainers = with maintainers; [ ];
     license = licenses.bsd2;
     platforms = platforms.all;
   };
diff --git a/pkgs/development/libraries/recastnavigation/default.nix b/pkgs/development/libraries/recastnavigation/default.nix
index d39d1a7132191..6fd2056d2ea2b 100644
--- a/pkgs/development/libraries/recastnavigation/default.nix
+++ b/pkgs/development/libraries/recastnavigation/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, libGL, SDL2, libGLU }:
+{ stdenv, lib, fetchFromGitHub, cmake, libGL, SDL2, libGLU, catch }:
 
 stdenv.mkDerivation rec {
   pname = "recastai";
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-QP3lMMFR6fiKQTksAkRL6X9yaoVz2xt4QSIP9g6piww=";
   };
 
+  postPatch = ''
+    cp ${catch}/include/catch/catch.hpp Tests/catch.hpp
+  '';
+
+  doCheck = true;
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ libGL SDL2 libGLU ];
diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix
index fd53db0dcf919..044948a012e34 100644
--- a/pkgs/development/libraries/seasocks/default.nix
+++ b/pkgs/development/libraries/seasocks/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python3, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, python3, zlib, catch2 }:
 
 stdenv.mkDerivation rec {
   pname = "seasocks";
@@ -11,9 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "1f9a3mx3yjmr5qry4rc1c7mrx3348iifxm7d8sj8yd41kqnzmfv4";
   };
 
+  postPatch = ''
+    cp ${catch2}/include/catch2/catch.hpp src/test/c/catch/catch2/catch.hpp
+  '';
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ zlib python3 ];
 
+  doCheck = true;
+
   meta = with lib; {
     homepage = "https://github.com/mattgodbolt/seasocks";
     description = "Tiny embeddable C++ HTTP and WebSocket server";
diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix
index b17fbe16655be..142081da0153a 100644
--- a/pkgs/development/libraries/soci/default.nix
+++ b/pkgs/development/libraries/soci/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
 
   # Do not build static libraries
-  cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ];
+  cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" "-DSOCI_TESTS=off" ];
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
index d4e0888ffd2ff..6ef4f4af43aee 100644
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/pkgs/development/libraries/spdlog/default.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 }:
+{ lib, stdenv, fetchFromGitHub, cmake, fmt_8, fetchpatch }:
 
 let
-  generic = { version, sha256 }:
+  generic = { version, sha256, patches ? [] }:
     stdenv.mkDerivation {
       pname = "spdlog";
       inherit version;
@@ -13,6 +13,8 @@ let
         inherit sha256;
       };
 
+      inherit patches;
+
       nativeBuildInputs = [ cmake ];
       # spdlog <1.3 uses a bundled version of fmt
       propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8;
@@ -51,6 +53,13 @@ in
   spdlog_1 = generic {
     version = "1.9.2";
     sha256 = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y=";
+    patches = [
+      # glibc 2.34 compat
+      (fetchpatch {
+        url = "https://github.com/gabime/spdlog/commit/d54b8e89c058f3cab2b32b3e9a2b49fd171d5895.patch";
+        sha256 = "sha256-pb7cREF90GXb5Mbs8xFLQ+eLo6Xum13/xYa8JUgJlbI=";
+      })
+    ];
   };
 
   spdlog_0 = generic {
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 5fdf6c11d77bf..6cb2eb4b2d104 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl, zlib, interactive ? false, readline, ncurses
 , python3Packages
 , enableDeserialize ? false
+, sqldiff, sqlite-analyzer
 }:
 
 with lib;
@@ -11,13 +12,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sqlite${optionalString interactive "-interactive"}";
-  version = "3.37.2";
+  version = "3.38.1";
 
   # nixpkgs-update: no auto update
   # NB! Make sure to update ./tools.nix src (in the same directory).
   src = fetchurl {
     url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    sha256 = "sha256-QImo2bRnU3s/JG8he4TNduALHRqXH+WsoeMOIw5Gstg=";
+    sha256 = "sha256-jjqM65eU2Wg5lZDS3fnVwESpfdg9OLlhM2SiReyKL8Q=";
   };
 
   outputs = [ "bin" "dev" "out" ];
@@ -85,6 +86,7 @@ stdenv.mkDerivation rec {
 
   passthru.tests = {
     inherit (python3Packages) sqlalchemy;
+    inherit sqldiff sqlite-analyzer;
   };
 
   meta = {
diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix
index d8d3735fe3d85..6b07c762881ee 100644
--- a/pkgs/development/libraries/sqlite/tools.nix
+++ b/pkgs/development/libraries/sqlite/tools.nix
@@ -4,12 +4,12 @@ let
   archiveVersion = import ./archive-version.nix lib;
   mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec {
     inherit pname;
-    version = "3.37.2";
+    version = "3.38.1";
 
     # nixpkgs-update: no auto update
     src = assert version == sqlite.version; fetchurl {
       url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip";
-      sha256 = "sha256-SGdwtNX4i1uw26VA3W7hdjBn11Od/uGKfGb+m7A9Ftk=";
+      sha256 = "sha256-F3rv2oF/qfUoJeF0hYf3wnqbXmtTpIHNQ0YfJ0bZMdg=";
     };
 
     nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix
index cbe5e13a7007e..5cb2e21178630 100644
--- a/pkgs/development/libraries/symengine/default.nix
+++ b/pkgs/development/libraries/symengine/default.nix
@@ -5,6 +5,7 @@
 , flint
 , mpfr
 , libmpc
+, catch
 }:
 
 stdenv.mkDerivation rec {
@@ -18,6 +19,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-5KpxBusJCuwrfFWHbrRKlH6Ic7YivYqz2m+BCbNfZp0=";
   };
 
+  postPatch = ''
+    cp ${catch}/include/catch/catch.hpp symengine/utilities/catch/catch.hpp
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ gmp flint mpfr libmpc ];
diff --git a/pkgs/development/libraries/wxwidgets/wxGTK28.nix b/pkgs/development/libraries/wxwidgets/wxGTK28.nix
index 19a57d68e15bb..b577e52482038 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK28.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK28.nix
@@ -17,8 +17,6 @@
 , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 }:
 
-assert withMesa -> libGLU != null && libGL != null;
-
 stdenv.mkDerivation rec {
   pname = "wxGTK";
   version = "2.8.12.1";
diff --git a/pkgs/development/libraries/wxwidgets/wxGTK29.nix b/pkgs/development/libraries/wxwidgets/wxGTK29.nix
index d5bef77202f15..097cce6109cb5 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK29.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK29.nix
@@ -22,7 +22,6 @@
 , setfile
 }:
 
-assert withMesa -> libGLU != null && libGL != null;
 stdenv.mkDerivation rec {
   pname = "wxGTK";
   version = "2.9.5";
diff --git a/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix
index 115453303870f..6157786a5d041 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK30.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix
@@ -28,7 +28,6 @@
 assert withGtk2 -> (!withWebKit);
 
 let
-  inherit (gst_all_1) gstreamer gst-plugins-base;
   gtk = if withGtk2 then gtk2 else gtk3;
 in
 stdenv.mkDerivation rec {
@@ -47,8 +46,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gstreamer
-    gst-plugins-base
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
     gtk
     libSM
     libXinerama
diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
index 31d59e24fd840..5bce6250c74fa 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
@@ -35,8 +35,6 @@
 assert withGtk2 -> (!withWebKit);
 
 let
-  inherit (gnome2) GConf;
-  inherit (gst_all_1) gst-plugins-base gstreamer;
   gtk = if withGtk2 then gtk2 else gtk3;
 in
 stdenv.mkDerivation rec {
@@ -59,8 +57,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    gst-plugins-base
-    gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
   ]
   ++ lib.optionals (!stdenv.isDarwin) [
     gtk
@@ -71,7 +69,7 @@ stdenv.mkDerivation rec {
     xorgproto
   ]
   ++ lib.optionals withGtk2 [
-    GConf
+    gnome2.GConf
   ]
   ++ lib.optional withMesa libGLU
   ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk
diff --git a/pkgs/development/libraries/wxwidgets/wxmac30.nix b/pkgs/development/libraries/wxwidgets/wxmac30.nix
index e1f732929cecb..73bf013452a51 100644
--- a/pkgs/development/libraries/wxwidgets/wxmac30.nix
+++ b/pkgs/development/libraries/wxwidgets/wxmac30.nix
@@ -7,13 +7,15 @@
 , libpng
 , libtiff
 , zlib
-, darwin
+, AGL
+, Cocoa
+, Kernel
+, WebKit
+, derez
+, rez
+, setfile
 }:
 
-let
-  inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit;
-  inherit (darwin.stubs) derez rez setfile;
-in
 stdenv.mkDerivation rec {
   pname = "wxmac";
   version = "3.0.5.1";
diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix
deleted file mode 100644
index e8082e50447ae..0000000000000
--- a/pkgs/development/libraries/zeroc-ice/3.6.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv, lib, fetchFromGitHub
-, mcpp, bzip2, expat, openssl, db5
-, darwin, libiconv, Security
-, zeroc-ice # to share meta
-, cpp11 ? false
-}:
-
-stdenv.mkDerivation rec {
-  pname = "zeroc-ice";
-  version = "3.6.5";
-
-  src = fetchFromGitHub {
-    owner = "zeroc-ice";
-    repo = "ice";
-    rev = "v${version}";
-    sha256 = "073h7v1f2sw77cr1a6xxa5l9j547pz24sxa9qdjc4zki0ivcnq15";
-  };
-
-  buildInputs = [ mcpp bzip2 expat openssl db5 ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
-
-  postUnpack = ''
-    sourceRoot=$sourceRoot/cpp
-  '';
-
-  prePatch = lib.optionalString stdenv.isDarwin ''
-    substituteInPlace config/Make.rules.Darwin \
-        --replace xcrun ""
-  '';
-
-  patches = [
-    # Fixes compilation warning about uninitialied variables (in test code)
-    ./uninitialized-variable-warning.patch
-  ];
-
-  preBuild = ''
-    makeFlagsArray+=(
-      "prefix=$out"
-      "OPTIMIZE=yes"
-      "USR_DIR_INSTALL=yes"
-      "CONFIGS=${if cpp11 then "cpp11-shared" else "shared"}"
-      "SKIP=slice2py" # provided by a separate package
-    )
-  '';
-
-  # cannot find -lIceXML (linking bin/transformdb)
-  enableParallelBuilding = false;
-
-  outputs = [ "out" "bin" "dev" ];
-
-  postInstall = ''
-    mkdir -p $bin $dev/share
-    mv $out/bin $bin
-    mv $out/share/Ice-* $dev/share/ice
-    rm -rf $out/share/slice
-  '';
-
-  inherit (zeroc-ice) meta;
-}
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix
index fcd836348556f..9a1861f60440a 100644
--- a/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/pkgs/development/libraries/zeroc-ice/default.nix
@@ -3,6 +3,7 @@
 , darwin, libiconv, Security
 , python3 # for tests only
 , cpp11 ? false
+, fetchpatch
 }:
 
 let
@@ -32,6 +33,18 @@ in stdenv.mkDerivation rec {
     sha256 = "0zc8gmlzl2f38m1fj6pv2vm8ka7fkszd6hx2lb8gfv65vn3m4sk4";
   };
 
+  patches = [
+    # Fixes for openssl 3.0 / glibc-2.34.
+    (fetchpatch {
+      url = "https://github.com/zeroc-ice/ice/commit/7204b31a082a10cd481c1f31dbb6184ec699160d.patch";
+      sha256 = "sha256-RN8kQrvWRu1oXB7UV7DkYbZ8A0VyJYGArx6ikovwefo=";
+    })
+    (fetchpatch {
+      url = "https://github.com/zeroc-ice/ice/commit/358e7fea00383d55d1c19d38a3bbb64aca803aeb.patch";
+      sha256 = "sha256-ntrTO6qHB7dw398BRdAyJQUfVYW3iEfzUaBYoWWOEDs=";
+    })
+  ];
+
   buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl ]
     ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
 
diff --git a/pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch b/pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch
deleted file mode 100644
index 878dee26bb83b..0000000000000
--- a/pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/test/Glacier2/dynamicFiltering/TestControllerI.h b/test/Glacier2/dynamicFiltering/TestControllerI.h
-index 7e21639..1279200 100644
---- a/test/Glacier2/dynamicFiltering/TestControllerI.h
-+++ b/test/Glacier2/dynamicFiltering/TestControllerI.h
-@@ -21,13 +21,12 @@ struct SessionTuple
- {
-     Glacier2::SessionPrx session;
-     Glacier2::SessionControlPrx sessionControl;
--    bool configured;
-+    bool configured = false;
-
-     SessionTuple() {}
-     SessionTuple(Glacier2::SessionPrx s, Glacier2::SessionControlPrx control):
-         session(s),
--        sessionControl(control),
--        configured(false)
-+        sessionControl(control)
-     {}
-
-     SessionTuple&
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 48603000c9034..91cd037e0e33d 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -23,18 +23,16 @@ assert splitStaticOutput -> static;
 
 stdenv.mkDerivation (rec {
   pname = "zlib";
-  version = "1.2.11";
+  version = "1.2.12";
 
   src = fetchurl {
     urls =
       [ "https://www.zlib.net/fossils/zlib-${version}.tar.gz"  # stable archive path
         "mirror://sourceforge/libpng/zlib/${version}/zlib-${version}.tar.gz"
       ];
-    sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1";
+    sha256 = "91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9";
   };
 
-  patches = lib.optional stdenv.hostPlatform.isCygwin ./disable-cygwin-widechar.patch;
-
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace configure \
       --replace '/usr/bin/libtool' '${stdenv.cc.targetPrefix}ar' \
diff --git a/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch b/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch
deleted file mode 100644
index 3de4978c30661..0000000000000
--- a/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gzguts.h b/gzguts.h
-index 990a4d2..6378d46 100644
---- a/gzguts.h
-+++ b/gzguts.h
-@@ -39,7 +39,7 @@
- #  include <io.h>
- #endif
- 
--#if defined(_WIN32) || defined(__CYGWIN__)
-+#if defined(_WIN32)
- #  define WIDECHAR
- #endif
- 
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 7f85ddb783a5f..656695d691094 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -296,9 +296,6 @@ with prev;
       buildInputs = [ pkgs.libuv ];
 
       nativeBuildInputs = [ pkgs.pkg-config pkgs.fixDarwinDylibNames pkgs.cmake ];
-      # Fixup linking libluv.dylib, for some reason it's not linked against lua correctly.
-      NIX_LDFLAGS = pkgs.lib.optionalString pkgs.stdenv.isDarwin
-        (if isLuaJIT then "-lluajit-${lua.luaversion}" else "-llua");
   };
 
   luv = prev.lib.overrideLuarocks prev.luv (drv: {
diff --git a/pkgs/development/misc/breakpad/default.nix b/pkgs/development/misc/breakpad/default.nix
index 7fb2b329667d4..045e2e8f9a6e4 100644
--- a/pkgs/development/misc/breakpad/default.nix
+++ b/pkgs/development/misc/breakpad/default.nix
@@ -20,6 +20,11 @@ in stdenv.mkDerivation {
     ln -s ${lss} $sourceRoot/src/third_party/lss
   '';
 
+  postPatch = ''
+    substituteInPlace src/client/linux/handler/exception_handler.cc \
+      --replace "max(16384" "max(static_cast<long>(16384)"
+  '';
+
   meta = with lib; {
     description = "An open-source multi-platform crash reporting system";
     homepage = "https://chromium.googlesource.com/breakpad";
diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix
index 07ed3d19e4ebb..9ecb7c5f3ef45 100644
--- a/pkgs/development/node-packages/default.nix
+++ b/pkgs/development/node-packages/default.nix
@@ -352,6 +352,9 @@ let
       meta.mainProgram = "postcss";
     };
 
+    # To update prisma, please first update prisma-engines to the latest
+    # version. Then change the correct hash to this package. The PR should hold
+    # two commits: one for the engines and the other one for the node package.
     prisma = super.prisma.override rec {
       nativeBuildInputs = [ pkgs.makeWrapper ];
 
@@ -359,7 +362,7 @@ let
 
       src = fetchurl {
         url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
-        sha512 = "sha512-8SdsLPhKR3mOfoo2o73h9mNn3v5kA/RqGA26Sv6qDS78Eh2uepPqt5e8/nwj5EOblYm5HEGuitaXQrOCLb6uTw==";
+        sha512 = "sha512-ltCMZAx1i0i9xuPM692Srj8McC665h6E5RqJom999sjtVSccHSD8Z+HSdBN2183h9PJKvC5dapkn78dd0NWMBg==";
       };
       postInstall = with pkgs; ''
         wrapProgram "$out/bin/prisma" \
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 0ab3eda77407d..64400c47fc20f 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -103,22 +103,13 @@ let
         sha512 = "hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==";
       };
     };
-    "@angular-devkit/architect-0.1303.0" = {
+    "@angular-devkit/architect-0.1303.1" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.1303.0";
+      version = "0.1303.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1303.0.tgz";
-        sha512 = "kTcKB917ICA8j53SGo4gn+qAlzx8si+iHnOTbp5QlMr7qt/Iz07SVVI8mRlMD6c6lr7eE/fVlCLzEZ1+WCQpTA==";
-      };
-    };
-    "@angular-devkit/core-13.2.5" = {
-      name = "_at_angular-devkit_slash_core";
-      packageName = "@angular-devkit/core";
-      version = "13.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.5.tgz";
-        sha512 = "WuWp/1R0FtCHPBcJLF13lTLHETtDGFUX0ULfGPRaYB5OVCSQcovVp5UbZTTy/Ss3ub3EOEmJlU8kMJfBrWuq+A==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1303.1.tgz";
+        sha512 = "ppaLzNZPrqrI96ddgm1RuEALVpWZsmHbIPLDd0GBwhF6aOkwF0LpZHd5XyS4ktGFZPReiFIjWSVtqV5vaBdRsw==";
       };
     };
     "@angular-devkit/core-13.3.0" = {
@@ -130,13 +121,13 @@ let
         sha512 = "8YrreVbWlJVZnk5zs4vfkRItrPEtWhUcxWOBfYT/Kwu4FwJVAnNuhJAxxXOAQ2Ckd7cv30Idh/RFVLbTZ5Gs9w==";
       };
     };
-    "@angular-devkit/schematics-13.2.5" = {
-      name = "_at_angular-devkit_slash_schematics";
-      packageName = "@angular-devkit/schematics";
-      version = "13.2.5";
+    "@angular-devkit/core-13.3.1" = {
+      name = "_at_angular-devkit_slash_core";
+      packageName = "@angular-devkit/core";
+      version = "13.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.5.tgz";
-        sha512 = "kAye6VYiF9JQAoeO+BYhy8eT2QOmhB+WLziRjXoFCBxh5+yXTygTVfs9fD5jmIpHmeu4hd2ErSh69yT5xWcD9g==";
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.3.1.tgz";
+        sha512 = "eXAcQaP1mn6rnQb+5bv5NsamY6b34UYM7G+S154Hnma6CTTSGBtcmoNAJs8cekuFqWlw7YgpB/e15jR5OLPkDA==";
       };
     };
     "@angular-devkit/schematics-13.3.0" = {
@@ -148,6 +139,15 @@ let
         sha512 = "hq7tqnB3uVT/iDgqWWZ4kvnijeAcgd4cfLzZiCPaYn1nuhZf0tWsho6exhJ/odMZHvVp7w8OibqWiUKxNY9zHA==";
       };
     };
+    "@angular-devkit/schematics-13.3.1" = {
+      name = "_at_angular-devkit_slash_schematics";
+      packageName = "@angular-devkit/schematics";
+      version = "13.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.3.1.tgz";
+        sha512 = "DxXMjlq/sALcHuONZRMTBX5k30XPfN4b6Ue4k7Xl8JKZqyHhEzfXaZzgD9u2cwb7wybKEeF/BZ5eJd8JG525og==";
+      };
+    };
     "@angular-devkit/schematics-cli-13.3.0" = {
       name = "_at_angular-devkit_slash_schematics-cli";
       packageName = "@angular-devkit/schematics-cli";
@@ -319,13 +319,13 @@ let
         sha512 = "vF+zxhPiLtkwxONs6YanSt1EpwpGilThpneExUN5K3tCymuxNnVq2yojTvnpRjv2QfsEIt/n7ozPIIzBLwGIDQ==";
       };
     };
-    "@apollographql/apollo-tools-0.5.2" = {
+    "@apollographql/apollo-tools-0.5.3" = {
       name = "_at_apollographql_slash_apollo-tools";
       packageName = "@apollographql/apollo-tools";
-      version = "0.5.2";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.5.2.tgz";
-        sha512 = "KxZiw0Us3k1d0YkJDhOpVH5rJ+mBfjXcgoRoCcslbgirjgLotKMzOcx4PZ7YTEvvEROmvG7X3Aon41GvMmyGsw==";
+        url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.5.3.tgz";
+        sha512 = "VcsXHfTFoCodDAgJZxN04GdFK1kqOhZQnQY/9Fa147P+I8xfvOSz5d+lKAPB+hwSgBNyd7ncAKGIs4+utbL+yA==";
       };
     };
     "@apollographql/graphql-playground-html-1.6.27" = {
@@ -463,49 +463,49 @@ let
         sha512 = "o/xjMCq81opAjSBjt7YdHJwIJcGVG5XIV9+C2KXcY5QwVimkOKPybWTv0mXPvSwSilSx+EhpLNhkcJuXdzhw4w==";
       };
     };
-    "@aws-sdk/chunked-blob-reader-native-3.55.0" = {
+    "@aws-sdk/chunked-blob-reader-native-3.58.0" = {
       name = "_at_aws-sdk_slash_chunked-blob-reader-native";
       packageName = "@aws-sdk/chunked-blob-reader-native";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.55.0.tgz";
-        sha512 = "juorCwSR9O1XhpSIBSAiIH7cP1c67J4wnoiXmmbun/qzmBPipGYm0PHX5H+J89s8gD2F3e49/TWFXbZmxRw57w==";
+        url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.58.0.tgz";
+        sha512 = "+D3xnPD5985iphgAqgUerBDs371a2WzzoEVi7eHJUMMsP/gEnSTdSH0HNxsqhYv6CW4EdKtvDAQdAwA1VtCf2A==";
       };
     };
-    "@aws-sdk/client-s3-3.56.0" = {
+    "@aws-sdk/client-s3-3.58.0" = {
       name = "_at_aws-sdk_slash_client-s3";
       packageName = "@aws-sdk/client-s3";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.56.0.tgz";
-        sha512 = "g/OiJtD8d0roi3XK5ThIwEvkAkSDoKzxkE0gqKKJNABBnyozNnDNAVt4XnMxuXX1PPjg1KVKH2iJWFGj5I0jPQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.58.0.tgz";
+        sha512 = "7TAqYFpFeaahLCdIxsdWLz3uRrzITFFFitbfVxQ+eaR6EMuH3VEhbGEZ66+zieWns9a1UXc11918vpwgu0zTtw==";
       };
     };
-    "@aws-sdk/client-sso-3.56.0" = {
+    "@aws-sdk/client-sso-3.58.0" = {
       name = "_at_aws-sdk_slash_client-sso";
       packageName = "@aws-sdk/client-sso";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.56.0.tgz";
-        sha512 = "5gkbkNK1iaQ7C053HG5yvWNE/AB8w39kxk/VGxACrX6bVZR1tnN36vhInjom83mWlDIu0Tl5WqD8tmkjqCYMFQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.58.0.tgz";
+        sha512 = "nS5G/OX8Bg4ajBa6+jLcbbr4PpEO+l5eJfGUzoJQwS4Zqa0lF/wC0kyjKm61gLp4JuvhrQskxIC/3IXUqB1XVQ==";
       };
     };
-    "@aws-sdk/client-sts-3.56.0" = {
+    "@aws-sdk/client-sts-3.58.0" = {
       name = "_at_aws-sdk_slash_client-sts";
       packageName = "@aws-sdk/client-sts";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.56.0.tgz";
-        sha512 = "6LFwAU/K02Q8eNk8O/ZnaPCsnDibKYReiRV222hD64vy8rMvtGO1l+RTf5cFVa1XxHNy9ZERIJBn60EO2Zw7FA==";
+        url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.58.0.tgz";
+        sha512 = "2cHZsG2eXv/Zl0hvsG9+rdHEuAclMFfkma/3LC3RRwSuZXo1rXoIhFkzHfGfIbivdk738YAo7FT3ZYGlrsK4ow==";
       };
     };
-    "@aws-sdk/config-resolver-3.56.0" = {
+    "@aws-sdk/config-resolver-3.58.0" = {
       name = "_at_aws-sdk_slash_config-resolver";
       packageName = "@aws-sdk/config-resolver";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.56.0.tgz";
-        sha512 = "Gzx/fkUqixQkNpqoVTyR0+BUpJTfv+9qBNbhBw79V+HnPeY+tyqkVB4vZNJYbYSR6A/rMwYThxPOfvsNDFPk6A==";
+        url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.58.0.tgz";
+        sha512 = "NXEwYw0JrXcvenu42QpNMQXK+6pgZ+6bDGfCgOfCC0FmyI+w/CuF36lApwm7InHvHazOaDlwArXm2pfntErKoA==";
       };
     };
     "@aws-sdk/credential-provider-env-3.55.0" = {
@@ -517,49 +517,49 @@ let
         sha512 = "4AIIXEdvinLlWNFtrUbUgoB7dkuV04RTcTruVWI4Ub4WSsuSCa72ZU1vqyvcEAOgGGLBmcSaGTWByjiD2sGcGA==";
       };
     };
-    "@aws-sdk/credential-provider-imds-3.56.0" = {
+    "@aws-sdk/credential-provider-imds-3.58.0" = {
       name = "_at_aws-sdk_slash_credential-provider-imds";
       packageName = "@aws-sdk/credential-provider-imds";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.56.0.tgz";
-        sha512 = "EibXjFcGtDEm8g9DhGtJpcVLxRhnN1tnrTxwlwTdc510k7F4Aly7PNLT/72tr4IQ8hl9eCCYgsNBpPDlY4pMmQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.58.0.tgz";
+        sha512 = "CdtnTQ9zqLx1FbXdbgjijLbMcIWOyQM03TFaLSCjI3FNbUwyt3T7StBU9tj/LtbypHhSdXyQBpzUtXTOMWCEhg==";
       };
     };
-    "@aws-sdk/credential-provider-ini-3.56.0" = {
+    "@aws-sdk/credential-provider-ini-3.58.0" = {
       name = "_at_aws-sdk_slash_credential-provider-ini";
       packageName = "@aws-sdk/credential-provider-ini";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.56.0.tgz";
-        sha512 = "XpZf8LPIIbBI0zvsRPW9ZNyom5ymctr+lMIv62w9bUglojdVtBVC2ErGBmQXSWWITk/hzFZ122txU5fyRjyAFg==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.58.0.tgz";
+        sha512 = "uM62hcHUVaHP1YFnbrjf2RlrRj1m/BvMPE+T5jdNRWdE3lvnunhEMawB26HZs9nQqCV6d25I8G9/fGWVL7g3Og==";
       };
     };
-    "@aws-sdk/credential-provider-node-3.56.0" = {
+    "@aws-sdk/credential-provider-node-3.58.0" = {
       name = "_at_aws-sdk_slash_credential-provider-node";
       packageName = "@aws-sdk/credential-provider-node";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.56.0.tgz";
-        sha512 = "TSnjA1grdyTP8xNNgNxLmOvZMUT3zT9JLydBOqpQptLjLBbP90F32CCxKZWFOA/DXtZA0QK9Fjo+8t0Q3xZtiw==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.58.0.tgz";
+        sha512 = "f0wzcgMYCQUrii6TLP2ggCxkQP4HH8PW8tbbWEgt4cdIXcjE9KEuxN5yOV6sFHzL3eJh0QM9Yaz8WzhWn6fT2A==";
       };
     };
-    "@aws-sdk/credential-provider-process-3.56.0" = {
+    "@aws-sdk/credential-provider-process-3.58.0" = {
       name = "_at_aws-sdk_slash_credential-provider-process";
       packageName = "@aws-sdk/credential-provider-process";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.56.0.tgz";
-        sha512 = "B+Y35sefW1iTKqAPdlgzRy4lYx7nhXQNn+gyyt1ohfJLEvP3twv/n2xdNrF9xewCyF9glBm3YkxSleFZsGoBCw==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.58.0.tgz";
+        sha512 = "npgFqPUjMhUamf1FvJjBYUdpbWx8XWkKCwJsX73I7IYQAvAi2atCOkdtKq+4rds0VWAYu6vzlaI1tXgFxjOPNQ==";
       };
     };
-    "@aws-sdk/credential-provider-sso-3.56.0" = {
+    "@aws-sdk/credential-provider-sso-3.58.0" = {
       name = "_at_aws-sdk_slash_credential-provider-sso";
       packageName = "@aws-sdk/credential-provider-sso";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.56.0.tgz";
-        sha512 = "oCUWNl742VgrlES5LVgmtyl6ruin8xXCG8Igv6SO0gxYswkv/ed/3yhQfOOaUmO4hY7p+q0ClwXZ3EQ3UH66wg==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.58.0.tgz";
+        sha512 = "2qO34s9lJqvCC6zOF4UpopW6xURZpYfVC8xTUDpAUnvTOt4nS5hkx4vNyqPAXILoRHuFJsnlWsBH1UP5ZnBiZg==";
       };
     };
     "@aws-sdk/credential-provider-web-identity-3.55.0" = {
@@ -571,22 +571,22 @@ let
         sha512 = "aKnXfZNGohTuF9rCGYLg4JEIOvWIZ/sb66XMq7bOUrx13KRPDwL/eUQL8quS5jGRLpjXVNvrS17AFf65GbdUBg==";
       };
     };
-    "@aws-sdk/eventstream-marshaller-3.55.0" = {
+    "@aws-sdk/eventstream-marshaller-3.58.0" = {
       name = "_at_aws-sdk_slash_eventstream-marshaller";
       packageName = "@aws-sdk/eventstream-marshaller";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.55.0.tgz";
-        sha512 = "ubPmAce0pxVsxrKsQQ/1q0xTY9S14m2/7REnkE0pzAGrl8xjH5OUpGml4yWqyboZPk1chnTaw+hoC5fj8Avexw==";
+        url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.58.0.tgz";
+        sha512 = "vTdVFLIHGZTx/Anp9GpkTXVuvwSCNOecTutU5Py4i6fATgefWiSutc5Xc/FLujBSc0EhAXDGZIcTMpZC7jUpeg==";
       };
     };
-    "@aws-sdk/eventstream-serde-browser-3.55.0" = {
+    "@aws-sdk/eventstream-serde-browser-3.58.0" = {
       name = "_at_aws-sdk_slash_eventstream-serde-browser";
       packageName = "@aws-sdk/eventstream-serde-browser";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.55.0.tgz";
-        sha512 = "V0/54j6sTBIRjhJJWjG1j44PsmZHfYzD0n2vxfhwmEvrK3BSXYU3Z3D9kYcajSvcvO8KRFU9/ZqRFJEN60Cl1g==";
+        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.58.0.tgz";
+        sha512 = "oR5yoOoJrTSUKwbxZSt37bZgMXUUSsOub96E6SOb8wh8TMq2f0wvqeO8A+aaxY487gKpzuVUClp7jSQ9LgiVcw==";
       };
     };
     "@aws-sdk/eventstream-serde-config-resolver-3.55.0" = {
@@ -598,40 +598,40 @@ let
         sha512 = "NTJHLq1sbXyXAaJucKvcdN3Svr/fM2TjHEC3l8P/torFjIsX1+Ykpi8tZt8KsX8RjoUTTfKylh41AjJq0K9X4Q==";
       };
     };
-    "@aws-sdk/eventstream-serde-node-3.55.0" = {
+    "@aws-sdk/eventstream-serde-node-3.58.0" = {
       name = "_at_aws-sdk_slash_eventstream-serde-node";
       packageName = "@aws-sdk/eventstream-serde-node";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.55.0.tgz";
-        sha512 = "0/kzJfupYrNLbJqn+MsTGGV0/dhPbqTN6g/4GqnoVDOiZPQeJjWEzmrWcXUDDbXq79+Zw0fIlniVkAMxhK2hvw==";
+        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.58.0.tgz";
+        sha512 = "U1DnRVfvKOXty+Bei6oqhRWFzGWzxl0OFHtev9GzC7BE/E6s4Gn695o+NO+9IwQgjOlc/JsGyAcWevq3MDxymg==";
       };
     };
-    "@aws-sdk/eventstream-serde-universal-3.55.0" = {
+    "@aws-sdk/eventstream-serde-universal-3.58.0" = {
       name = "_at_aws-sdk_slash_eventstream-serde-universal";
       packageName = "@aws-sdk/eventstream-serde-universal";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.55.0.tgz";
-        sha512 = "fUqmpCO1jtdg5t1KQbKfs17KGsMUj9+d2hiIx7XxnL5SroXpBU6LIuiFgrjPluGWi0SsdOrL6SAkrDyR6aa/Xw==";
+        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.58.0.tgz";
+        sha512 = "w7czmMNvCCspJi8Ij0lTByCiuYBhyNzYTM1wv33vtF7dL+FJgi4W4c5WFAOtvpsPulobY013TWCjPJG+V0IPGQ==";
       };
     };
-    "@aws-sdk/fetch-http-handler-3.55.0" = {
+    "@aws-sdk/fetch-http-handler-3.58.0" = {
       name = "_at_aws-sdk_slash_fetch-http-handler";
       packageName = "@aws-sdk/fetch-http-handler";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.55.0.tgz";
-        sha512 = "/Sta3MLlszpRZ1pg+ClxfNqGvraX93F587eHrfQMaGXgQ2BqJLiAVRorBRGcmmmrHxfLOqspNqufF7ibrqziRQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.58.0.tgz";
+        sha512 = "timF3FjPV5Bd+Kgph83LIKVlPCFObVYzious1a6doeLAT6YFwZpRrWbfP/HzS+DCoYiwUsH69oVJ91BoV66oyA==";
       };
     };
-    "@aws-sdk/hash-blob-browser-3.55.0" = {
+    "@aws-sdk/hash-blob-browser-3.58.0" = {
       name = "_at_aws-sdk_slash_hash-blob-browser";
       packageName = "@aws-sdk/hash-blob-browser";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.55.0.tgz";
-        sha512 = "/tVsZDPXgxIovFRrKclcq304KEHcHUbBcpqar2QRYZAvaK+vxZM9h7ZmAKemmlkzV7mdh0KZqzPnfr6+KN4IGg==";
+        url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.58.0.tgz";
+        sha512 = "fdp12BqypRxwvevbJSl/sUhXJRi4Ghv6JKEXAHI1klkR6xY1GRORO5SHWltVY/xl373ERMol5o/n+ra/7jcx/g==";
       };
     };
     "@aws-sdk/hash-node-3.55.0" = {
@@ -643,13 +643,13 @@ let
         sha512 = "2UdYwY/++AlzWEAFaK9wOed2QSxbzV527vmqKjReLHpPKPrSIlooUxlTH3LU6Y6WVDAzDRtLK43KUVXTLgGK1A==";
       };
     };
-    "@aws-sdk/hash-stream-node-3.55.0" = {
+    "@aws-sdk/hash-stream-node-3.58.0" = {
       name = "_at_aws-sdk_slash_hash-stream-node";
       packageName = "@aws-sdk/hash-stream-node";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.55.0.tgz";
-        sha512 = "0FuQmHZK3XAd+dL+UC36PiPhZ80lOvkbFusFpZLwXTelXB3AUsiVl2IebA4EpE352XU+1ACEAAWwQpj8zsdcOw==";
+        url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.58.0.tgz";
+        sha512 = "y7HEeC3OiuXCRqsHnKDn5yef8UAbnegD9r+OM9bdD+3e6FLAL8Rq7hQTOpwIAiPXuD7HKx8h98s9JLvkwTOBkg==";
       };
     };
     "@aws-sdk/invalid-dependency-3.55.0" = {
@@ -670,67 +670,67 @@ let
         sha512 = "NbiPHVYuPxdqdFd6FxzzN3H1BQn/iWA3ri3Ry7AyLeP/tGs1yzEWMwf8BN8TSMALI0GXT6Sh0GDWy3Ok5xB6DA==";
       };
     };
-    "@aws-sdk/md5-js-3.55.0" = {
+    "@aws-sdk/md5-js-3.58.0" = {
       name = "_at_aws-sdk_slash_md5-js";
       packageName = "@aws-sdk/md5-js";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.55.0.tgz";
-        sha512 = "+jh2p2B0KsyODQR01bAh7Ywladi9oVL4MSfskwl6AQApKaj8/2xLqW9I89zbRSMfPEgi2eIksQgCWET7tUc29Q==";
+        url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.58.0.tgz";
+        sha512 = "V5f4Re+CLn3aDF1nrmDqdUtcqBHCyxxD2s2Ot+hZ2JFit+OtJggo1cI03ldTrQpG79rwHG+bHqL2VvNQP7Aj9A==";
       };
     };
-    "@aws-sdk/middleware-bucket-endpoint-3.56.0" = {
+    "@aws-sdk/middleware-bucket-endpoint-3.58.0" = {
       name = "_at_aws-sdk_slash_middleware-bucket-endpoint";
       packageName = "@aws-sdk/middleware-bucket-endpoint";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.56.0.tgz";
-        sha512 = "czf0u1+QeYg43hXYpR/udf3YwIq1CX5kd4bL5U6DryH9E39sHeIoEGt5NC+82OTnbezqrHBalzZX7h7Y2pI8Sg==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.58.0.tgz";
+        sha512 = "zocLfFzj+NQjXLGZKPJBAYWWldAKBJkGzGVpTfrYx9bxxHTA70Gu+3sx+Xe+iOu8dtQT0OAnIX0wGudOPnTGNg==";
       };
     };
-    "@aws-sdk/middleware-content-length-3.55.0" = {
+    "@aws-sdk/middleware-content-length-3.58.0" = {
       name = "_at_aws-sdk_slash_middleware-content-length";
       packageName = "@aws-sdk/middleware-content-length";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.55.0.tgz";
-        sha512 = "IkFBwa1G5ERfKFh4Kdtcn/aNAGi3Hcp9IO1PVt69LZWaevxjXAi5NS2k65E9mZPEumzuLtcEeC+3qhPs4FUkqQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.58.0.tgz";
+        sha512 = "h/BypPkhjv2CpCUbXA8Fa2s7V2GPiz9l11XhYK+sKSuQvQ7Lbq6VhaKaLqfeD3gLVZHgJZSLGl2btdHV1qHNNA==";
       };
     };
-    "@aws-sdk/middleware-expect-continue-3.55.0" = {
+    "@aws-sdk/middleware-expect-continue-3.58.0" = {
       name = "_at_aws-sdk_slash_middleware-expect-continue";
       packageName = "@aws-sdk/middleware-expect-continue";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.55.0.tgz";
-        sha512 = "RT6w9AJvZyMn8Cdw6RHaLK8c/Lkqdi4v19XAJCPaAaD2rQ6GhZ+AawgfkF5zawzN1TgzLmzWB4e1ts4+chr74Q==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.58.0.tgz";
+        sha512 = "nx6X6qLPwvbJrGoPxXSu4tsOek2eRnnjk78hhRUDfxFewpHJQLSPlyNKkXAo+C3syVALe6RJRmUYu5bShY6FfA==";
       };
     };
-    "@aws-sdk/middleware-flexible-checksums-3.55.0" = {
+    "@aws-sdk/middleware-flexible-checksums-3.58.0" = {
       name = "_at_aws-sdk_slash_middleware-flexible-checksums";
       packageName = "@aws-sdk/middleware-flexible-checksums";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.55.0.tgz";
-        sha512 = "Uhx0HAUkpRfRny5bGNPYNlaznMKSa5d88RWhrAEiYMgrhUsOcAahyj74lHrphGQ0nUwJr67uq55GPRRWn9Q4Ig==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.58.0.tgz";
+        sha512 = "R8S3U1boaIb7+kYhLJBks7rv/eaGj7I5T/2CgmcGY1BJBUU0h0arjPC7eeA/5wV29EHapoxVYQvJda//706rCw==";
       };
     };
-    "@aws-sdk/middleware-header-default-3.55.0" = {
+    "@aws-sdk/middleware-header-default-3.58.0" = {
       name = "_at_aws-sdk_slash_middleware-header-default";
       packageName = "@aws-sdk/middleware-header-default";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.55.0.tgz";
-        sha512 = "IrIsVoiol36Ap3VLtrofx95PkiBd4aNw6k4FRi9TsRxmOhfcAe3MvG521wyVEg+n3DqkYPb1N4SVTUENewo8bQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.58.0.tgz";
+        sha512 = "7F+CdLLauMmNbwFGYrE2pKsgTKY8G2PgazHmaE9s3FySEFcGPWmiEAG8sVImfZooj8gxGFQMLr97nanWjhSq2Q==";
       };
     };
-    "@aws-sdk/middleware-host-header-3.55.0" = {
+    "@aws-sdk/middleware-host-header-3.58.0" = {
       name = "_at_aws-sdk_slash_middleware-host-header";
       packageName = "@aws-sdk/middleware-host-header";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.55.0.tgz";
-        sha512 = "69mTWJfuPP4aC+h2/cb9B2CUNA9tiRPUBp67dmMrA2dHyy53kNYo8TGgfLKProoBidBz/AVXIfnh+izJj0F20w==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.58.0.tgz";
+        sha512 = "q/UKGcanm9e6DBRNN6UKhVqLvpRRdZWbmmPCeDNr4HqhCmgT6i1OvWdhAMOnT++hvCX8DpTsIXzNSlY6zWAxBg==";
       };
     };
     "@aws-sdk/middleware-location-constraint-3.55.0" = {
@@ -751,31 +751,31 @@ let
         sha512 = "PtRbVrxEzDmeV9prBIP4/9or7R5Dj66mjbFSvNRGZ0n+UBfBFfVRfNrhQPNzQpfV9A3KVl9YyWCVXDSW+/rk9Q==";
       };
     };
-    "@aws-sdk/middleware-retry-3.56.0" = {
+    "@aws-sdk/middleware-retry-3.58.0" = {
       name = "_at_aws-sdk_slash_middleware-retry";
       packageName = "@aws-sdk/middleware-retry";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.56.0.tgz";
-        sha512 = "AkunQvVex5JimQ+xLDcPcdsseVdvxE5rUSPh/NKLGO0bOyMxPnJSRlOxrOoibK0i1BPHkTpwdx+BDFrWiRLqug==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.58.0.tgz";
+        sha512 = "sfSq+t0Yy47DQwrWGpA8iOx9sd26l4l1JDVTwHNi7+OKD4ClRPVCEdw3bTbbyYz/PV4f9AEfAZ6jwtSff4wkGw==";
       };
     };
-    "@aws-sdk/middleware-sdk-s3-3.56.0" = {
+    "@aws-sdk/middleware-sdk-s3-3.58.0" = {
       name = "_at_aws-sdk_slash_middleware-sdk-s3";
       packageName = "@aws-sdk/middleware-sdk-s3";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.56.0.tgz";
-        sha512 = "ERHjQsA4ZTMDiKlSWF6dGt/UT15OQCCR8qRR+d/n3hVs6Nzyrt/ajEIBuea7E5lDuGwgyua5wkj1UjiHFQ4YeA==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.58.0.tgz";
+        sha512 = "vOTPOdhZpNJo4v54evg6JnFz14hK8IW2u8B+12iV5ZQ4zJom6VowzFmIOUn+KIsw/6SrwEX9tFb0aXLlVRw27Q==";
       };
     };
-    "@aws-sdk/middleware-sdk-sts-3.56.0" = {
+    "@aws-sdk/middleware-sdk-sts-3.58.0" = {
       name = "_at_aws-sdk_slash_middleware-sdk-sts";
       packageName = "@aws-sdk/middleware-sdk-sts";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.56.0.tgz";
-        sha512 = "LutcntT3DvS0nnHdGPHES+J+NUtKJFAVgz1gSqPq4MLIAB5oUm9QAWhmki5s2dfBbeRR7Kh1tWpzE00XowyBog==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.58.0.tgz";
+        sha512 = "HUz7MhcsSDDTGygOwL61l4voc0pZco06J3z06JjTX19D5XxcQ7hSCtkHHHz0oMb9M1himVSiEon2tjhjsnB99g==";
       };
     };
     "@aws-sdk/middleware-serde-3.55.0" = {
@@ -787,13 +787,13 @@ let
         sha512 = "NkEbTDrSZcC2NhuvfjXHKJEl0xgI2B5tMAwi/rMOq/TEnARwVUL9qAy+5lgeiPCqebiNllWatARrFgAaYf0VeA==";
       };
     };
-    "@aws-sdk/middleware-signing-3.56.0" = {
+    "@aws-sdk/middleware-signing-3.58.0" = {
       name = "_at_aws-sdk_slash_middleware-signing";
       packageName = "@aws-sdk/middleware-signing";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.56.0.tgz";
-        sha512 = "m0Rmlb3eojvZs0DQdfTZ+xJwJ0SuTXdeXn75jnpDAlnzRNKy7aRGYSsHChK8nkXgYKkpO2JmYywiTUriwwVULA==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.58.0.tgz";
+        sha512 = "4FXubHB66GbhyZUlo6YPQoWpYfED15GNbEmHbJLSONzrVzZR3IkViSPLasDngVm1a050JqKuqNkFYGJBP4No/Q==";
       };
     };
     "@aws-sdk/middleware-ssec-3.55.0" = {
@@ -814,31 +814,31 @@ let
         sha512 = "ouD+wFz8W2R0ZQ8HrbhgN8tg1jyINEg9lPEEXY79w1Q5sf94LJ90XKAMVk02rw3dJalUWjLHf0OQe1/qxZfHyA==";
       };
     };
-    "@aws-sdk/middleware-user-agent-3.55.0" = {
+    "@aws-sdk/middleware-user-agent-3.58.0" = {
       name = "_at_aws-sdk_slash_middleware-user-agent";
       packageName = "@aws-sdk/middleware-user-agent";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.55.0.tgz";
-        sha512 = "UOBimkQrj6onXb3Fyuao85IjipnDSowNHfOOl3ADVX9boA/A4db5QAXBSxThV0WHLArC0iiUsnwu95ElSSMVIg==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.58.0.tgz";
+        sha512 = "1c69bIWM63JwXijXvb9IWwcwQ/gViKMZ1lhxv52NvdG5VSxWXXsFJ2jETEXZoAypwT97Hmf3xo9SYuaHcKoq+g==";
       };
     };
-    "@aws-sdk/node-config-provider-3.56.0" = {
+    "@aws-sdk/node-config-provider-3.58.0" = {
       name = "_at_aws-sdk_slash_node-config-provider";
       packageName = "@aws-sdk/node-config-provider";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.56.0.tgz";
-        sha512 = "2uCisndaymG/tXsfVj+ZqybmNTRJwhTm3sPBB8+utSDcUe7PWR0viNEqR2lPO5Uds1zOQm4MPv1v+j4jZufFyw==";
+        url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.58.0.tgz";
+        sha512 = "AMcPqPhKxo/3/yOMS9PsKlI0GWp2/8eD6gSlhzdBpznPCKplyqXOSnSX7wS814Cyh373hFSjCaOrCOA9/EYtDg==";
       };
     };
-    "@aws-sdk/node-http-handler-3.55.0" = {
+    "@aws-sdk/node-http-handler-3.58.0" = {
       name = "_at_aws-sdk_slash_node-http-handler";
       packageName = "@aws-sdk/node-http-handler";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.55.0.tgz";
-        sha512 = "yF4YQr72YgVgWO9IDOhDcncqlKUJmMCtserAYhKNvmkVuaMGHE11p+IByWgcIsMJTvtFaFBhTA3W7zhJB1C1xA==";
+        url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.58.0.tgz";
+        sha512 = "D9xVZG2nfo4GbPsby3JuBiAhpqXTFk1+CfuQU0AZv0gQvE3fFTCnB3za83jo7JV/pyRPU+s+/LHIpxCWUHzStg==";
       };
     };
     "@aws-sdk/property-provider-3.55.0" = {
@@ -850,13 +850,13 @@ let
         sha512 = "o7cKFJSHq5WOhwPsspYrzNto35oKKZvESZuWDtLxaZKSI6l7zpA366BI4kDG6Tc9i2+teV553MbxyZ9eya5A8g==";
       };
     };
-    "@aws-sdk/protocol-http-3.55.0" = {
+    "@aws-sdk/protocol-http-3.58.0" = {
       name = "_at_aws-sdk_slash_protocol-http";
       packageName = "@aws-sdk/protocol-http";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.55.0.tgz";
-        sha512 = "vNjjsP5bFuKQMhmuBQZDddH441xanPbm8n42qgfigv0RzgWQhvUFrnmZWLBdyY8geY0RwsQ6x9yfQ0gvs48tpw==";
+        url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.58.0.tgz";
+        sha512 = "0yFFRPbR+CCa9eOQBBQ2qtrIDLYqSMN0y7G4iqVM8wQdIw7n3QK1PsTI3RNPGJ3Oi2krFTw5uUKqQQZPZEBuVQ==";
       };
     };
     "@aws-sdk/querystring-builder-3.55.0" = {
@@ -877,13 +877,13 @@ let
         sha512 = "e+2FLgo+eDx7oh7ap5HngN9XSVMxredAVztLHxCcSN0lFHHHzMa8b2SpXbaowUxQHh7ziymSqvOrPYFQ71Filg==";
       };
     };
-    "@aws-sdk/s3-request-presigner-3.56.0" = {
+    "@aws-sdk/s3-request-presigner-3.58.0" = {
       name = "_at_aws-sdk_slash_s3-request-presigner";
       packageName = "@aws-sdk/s3-request-presigner";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.56.0.tgz";
-        sha512 = "Ct/eGVojY1Mtmd4oC3n+OXnL7QmEDCQ8pXIGvhZIFwd/ZyiZsMdEz9ZO2+b8izdMGu9V9gg8EftV+hDfbMxMOQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.58.0.tgz";
+        sha512 = "rkwRSLSuTJaW3+rJgfjtJ8VCbuUh3iXKeeml3QP7ldsHg/4knUxEMr/Ja0PIkVrbPts2g4KGr4ZlppvxC9b4lA==";
       };
     };
     "@aws-sdk/service-error-classification-3.55.0" = {
@@ -895,22 +895,22 @@ let
         sha512 = "HdjnDyarsa1Avq1MJurkLyEe9c3eRa76dPmK4TmRGgwJ+tInEzGHL0rBW7V8xBK+PDF+fJQ71hvm8jPYmzvBwQ==";
       };
     };
-    "@aws-sdk/shared-ini-file-loader-3.56.0" = {
+    "@aws-sdk/shared-ini-file-loader-3.58.0" = {
       name = "_at_aws-sdk_slash_shared-ini-file-loader";
       packageName = "@aws-sdk/shared-ini-file-loader";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.56.0.tgz";
-        sha512 = "dCy3mXqYKK76iep9rn2inFrPOlGURvoO+B0Ygem0jgkDuxIF8t5wa10WHWB2ee8qZRlfwPYtcVdpEm2398St3g==";
+        url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.58.0.tgz";
+        sha512 = "ARDKQerIzgNs/MFNdCEuK2lgRJ1lneAaJw0p9O1LkJUvcSibvkSATwny7vwJMueOf+ae1Pf+8+54OMNIt0nTkQ==";
       };
     };
-    "@aws-sdk/signature-v4-3.56.0" = {
+    "@aws-sdk/signature-v4-3.58.0" = {
       name = "_at_aws-sdk_slash_signature-v4";
       packageName = "@aws-sdk/signature-v4";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.56.0.tgz";
-        sha512 = "aCvYQDMSAPe2K1lk0A+B+4xPBF50zf5ufO2k6FmBba020kqe8ODZjLq6vJJJfwrywc1B+2xWKvdpvCB7qbAOUw==";
+        url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.58.0.tgz";
+        sha512 = "flEo8p3XkzWoBDqnIUQre4jLuT5aLnmfQNI8c2uSjyJ3OBxpJ0iS1cDu3E++d1/pN6Q8o0KOmr2ypHeiyBOujw==";
       };
     };
     "@aws-sdk/smithy-client-3.55.0" = {
@@ -949,13 +949,13 @@ let
         sha512 = "76KJxp4MRWufHYWys7DFl64znr5yeJ3AIQNAPCKKw1sP0hzO7p6Kx0PaJnw9x+CPSzOrT4NbuApL6/srYhKDGg==";
       };
     };
-    "@aws-sdk/util-base64-browser-3.55.0" = {
+    "@aws-sdk/util-base64-browser-3.58.0" = {
       name = "_at_aws-sdk_slash_util-base64-browser";
       packageName = "@aws-sdk/util-base64-browser";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-base64-browser/-/util-base64-browser-3.55.0.tgz";
-        sha512 = "3hrZ2R/ZyD3IM25KhETOGLC5tB/ft8zoyVmNg1l4+takoUm46ompnglFXCVkWBu9Hpxc+M4XtiY7MHE6es4Wtg==";
+        url = "https://registry.npmjs.org/@aws-sdk/util-base64-browser/-/util-base64-browser-3.58.0.tgz";
+        sha512 = "0ebsXIZNpu/fup9OgsFPnRKfCFbuuI9PPRzvP6twzLxUB0c/aix6Co7LGHFKcRKHZdaykoJMXArf8eHj2Nzv1Q==";
       };
     };
     "@aws-sdk/util-base64-node-3.55.0" = {
@@ -1003,13 +1003,13 @@ let
         sha512 = "30dzofQQfx6tp1jVZkZ0DGRsT0wwC15nEysKRiAcjncM64A0Cm6sra77d0os3vbKiKoPCI/lMsFr4o3533+qvQ==";
       };
     };
-    "@aws-sdk/util-create-request-3.55.0" = {
+    "@aws-sdk/util-create-request-3.58.0" = {
       name = "_at_aws-sdk_slash_util-create-request";
       packageName = "@aws-sdk/util-create-request";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.55.0.tgz";
-        sha512 = "ihCVXBWQopYk9R1H/+IsBKuRx1OqBx4OmTMzL7dRC+wnOV1h0nOUhps19QidppT/uIZUnuV8EZs3KnOWdZzH3w==";
+        url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.58.0.tgz";
+        sha512 = "EP6HLQHc8RxjSJ95Ca9Ppp5F0aS6QNSQg03hbjcpmKK42h8dtuXFp5qGAu35VxUg6IRztN2x7lpa+b3d/SdDoQ==";
       };
     };
     "@aws-sdk/util-defaults-mode-browser-3.55.0" = {
@@ -1021,31 +1021,31 @@ let
         sha512 = "OS3gAwR84bHz7ObhjsSJM+grfeaBq3leGrj7xiX4BH3C8J+c10GMo3fqx1pV8Fq5F+9lMmhHpfOocD63SN5Q8A==";
       };
     };
-    "@aws-sdk/util-defaults-mode-node-3.56.0" = {
+    "@aws-sdk/util-defaults-mode-node-3.58.0" = {
       name = "_at_aws-sdk_slash_util-defaults-mode-node";
       packageName = "@aws-sdk/util-defaults-mode-node";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.56.0.tgz";
-        sha512 = "NKHW5kxH5EIcAa4b0Vua6t75z5D3lanwbAeiHzYrA1MeDIFlfXHs/kiHT2KTpr6stZZEEVPOEwb628AnkHAZTg==";
+        url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.58.0.tgz";
+        sha512 = "KNUCp0MXI+z3Z3pQCKDkx3Stdy1TXDjcUB+ZJFxRTJGIuBYwX4fV6G8s/zeFJi5Qv1ztR3CJ9fWJGsrx9mQ5EA==";
       };
     };
-    "@aws-sdk/util-format-url-3.55.0" = {
+    "@aws-sdk/util-format-url-3.58.0" = {
       name = "_at_aws-sdk_slash_util-format-url";
       packageName = "@aws-sdk/util-format-url";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.55.0.tgz";
-        sha512 = "xSVunSEiTPzemeEtyR8lIc027LsMKtwmC3j9QDV6oGMEZjarfrVB7SsxgVklTQvm4lPICEpmajMxR9Z0vSxYQg==";
+        url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.58.0.tgz";
+        sha512 = "nhxomsG+OIBqpIyc2AU88J3+dTap0H5R1D2lNAsSZk07kuu2B1H4qAXIlWPkXyxTi9uL9aykBMuCosECD062NA==";
       };
     };
-    "@aws-sdk/util-hex-encoding-3.55.0" = {
+    "@aws-sdk/util-hex-encoding-3.58.0" = {
       name = "_at_aws-sdk_slash_util-hex-encoding";
       packageName = "@aws-sdk/util-hex-encoding";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.55.0.tgz";
-        sha512 = "zbDWNzIyqN2Po7SIo1ZDL4rQMP3R0TzGcCrm01bpQAb+2fWqUPigolvNZXXtMO6eS7EW3ZJJzkfoWHdH8zDz1A==";
+        url = "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.58.0.tgz";
+        sha512 = "Rl+jXUzk/FJkOLYfUVYPhKa2aUmTpeobRP31l8IatQltSzDgLyRHO35f6UEs7Ztn5s1jbu/POatLAZ2WjbgVyg==";
       };
     };
     "@aws-sdk/util-locate-window-3.55.0" = {
@@ -1093,22 +1093,22 @@ let
         sha512 = "mmdDLUpFCN2nkfwlLdOM54lTD528GiGSPN1qb8XtGLgZsJUmg3uJSFIN2lPeSbEwJB3NFjVas/rnQC48i7mV8w==";
       };
     };
-    "@aws-sdk/util-user-agent-browser-3.55.0" = {
+    "@aws-sdk/util-user-agent-browser-3.58.0" = {
       name = "_at_aws-sdk_slash_util-user-agent-browser";
       packageName = "@aws-sdk/util-user-agent-browser";
-      version = "3.55.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.55.0.tgz";
-        sha512 = "E+8PluqbdOKfdJc9E4k0vy4PPb9wvAMa2Zdm5ycoaY0IXRI9RjQJnRw5JKAAJWLuOy7Lb83LgoowGW3o+4AuKw==";
+        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.58.0.tgz";
+        sha512 = "aJpqCvT09giJRg5xFTBDBRAVF0k0yq3OEf6UTuiOVf5azlL2MGp6PJ/xkJp9Z06PuQQkwBJ/2nIQZemo02a5Sw==";
       };
     };
-    "@aws-sdk/util-user-agent-node-3.56.0" = {
+    "@aws-sdk/util-user-agent-node-3.58.0" = {
       name = "_at_aws-sdk_slash_util-user-agent-node";
       packageName = "@aws-sdk/util-user-agent-node";
-      version = "3.56.0";
+      version = "3.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.56.0.tgz";
-        sha512 = "jpWDpEG2M06jqGtk/Jz9Iu94lBI8tdP7r2ctq2ptki9wYNmmWKdIXlS/W0g2UFx3qa9G9W67QI1efSTh2B0nfA==";
+        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.58.0.tgz";
+        sha512 = "VlbY/nzWdN2pfLUHqKvnlGBQ6tEeV4jyK9ggAD2Szjj0bkYvaaKwpBKswQmuJpi5/J2v7Bo4ayBLnqDL7PgzLA==";
       };
     };
     "@aws-sdk/util-utf8-browser-3.55.0" = {
@@ -2344,13 +2344,13 @@ let
         sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==";
       };
     };
-    "@blueprintjs/colors-4.0.1" = {
+    "@blueprintjs/colors-4.0.2" = {
       name = "_at_blueprintjs_slash_colors";
       packageName = "@blueprintjs/colors";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.1.tgz";
-        sha512 = "w2kMtUzQjHdrmjXpUnCfTq7/pc41S4UnXzOp6+AZtzCR4cVG1r2yBWR4XxaAAecDb94/yIBXooqtMD0B8T1Y2w==";
+        url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.2.tgz";
+        sha512 = "+luoTHBcdUD5y5SGCxk9CAHPfa9WeGdHuTRGABFanoyXZwrtzh5a8hlN/g3B5xeseGdoz50uMtmeanF8Atx0fg==";
       };
     };
     "@blueprintjs/core-3.54.0" = {
@@ -2425,40 +2425,40 @@ let
         sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg==";
       };
     };
-    "@cdktf/hcl2cdk-0.9.4" = {
+    "@cdktf/hcl2cdk-0.10.1" = {
       name = "_at_cdktf_slash_hcl2cdk";
       packageName = "@cdktf/hcl2cdk";
-      version = "0.9.4";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.9.4.tgz";
-        sha512 = "sUg9GsmaFpqqfoGcqibMEDHozMQhaDOxBT3Dz3ioNc0SSWhBpDRwrlctK3rNNKvWUetEeUr28L7SJR/I0TSd+Q==";
+        url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.10.1.tgz";
+        sha512 = "TzMrX+stsho41G/Vkbvk/b3PQcs4ug8KilU+Nffqz6fqPBbkBc9ZMSLQZw4I6gso02R/CQ7Zh32K/c9zNIx8zQ==";
       };
     };
-    "@cdktf/hcl2json-0.9.4" = {
+    "@cdktf/hcl2json-0.10.1" = {
       name = "_at_cdktf_slash_hcl2json";
       packageName = "@cdktf/hcl2json";
-      version = "0.9.4";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.9.4.tgz";
-        sha512 = "dZZUi94C7TFs0E8IubNYu38mBncVlQVUeGp6nA3tYxs/ue1igKqx7+mWfZP7NYVOSlggMGRNaTts6ZA0UAtOYQ==";
+        url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.10.1.tgz";
+        sha512 = "JTOSg7Q3CKELPIL9m2qP9uYxSpwhrHEcKaxZUdfXakx6YhKieBUK6P3SrEHhCaJ+/9ZJwuxo7ZmYkn5pwyXsUA==";
       };
     };
-    "@cdktf/provider-generator-0.9.4" = {
+    "@cdktf/provider-generator-0.10.1" = {
       name = "_at_cdktf_slash_provider-generator";
       packageName = "@cdktf/provider-generator";
-      version = "0.9.4";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.9.4.tgz";
-        sha512 = "06sfpBTn3+PqiU/XP3RQ6FO6M+GxzmHo6yIJk9r5x1QmIlitDE9tdogXqmAVVHB4nGRL/v7SXefcrOHrOkl1YQ==";
+        url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.10.1.tgz";
+        sha512 = "dta913ZHPpsylXlwAl4++JV64Fy0u0ahp6KoKVzj6Ee9u2CY3P6CDi8NLBAE4orluhHz8aZlkYcL//I5kjBHuA==";
       };
     };
-    "@chemzqm/neovim-5.7.7" = {
+    "@chemzqm/neovim-5.7.8" = {
       name = "_at_chemzqm_slash_neovim";
       packageName = "@chemzqm/neovim";
-      version = "5.7.7";
+      version = "5.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.7.7.tgz";
-        sha512 = "d9Bu5WA3fTEZw40EfEAkpevoE0HiPEwUAIYw4hfsGwwmcagMJzpx47h3EkH/r0I3qfXeDWEZ353fx9bc1qvYcA==";
+        url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.7.8.tgz";
+        sha512 = "QjCwx/71/FoQcrBSPiFTXYbizols+1OR3i6RXAnaOAQeKjc2u8zDYQPv6EYIO/cacFxzwNravXRMzIeD27gF/Q==";
       };
     };
     "@chinachu/aribts-1.3.5-mirakurun.17" = {
@@ -2650,31 +2650,31 @@ let
         sha512 = "do5jDoX9oCR/dGHE4POVQ3PYDCmQ2Fow4CA72UL4WoE8zUImA/0lChczjfl+ucNjE4sXFWUnzoO6j4WzrUvLnw==";
       };
     };
-    "@cspell/cspell-bundled-dicts-5.19.3" = {
+    "@cspell/cspell-bundled-dicts-5.19.5" = {
       name = "_at_cspell_slash_cspell-bundled-dicts";
       packageName = "@cspell/cspell-bundled-dicts";
-      version = "5.19.3";
+      version = "5.19.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.19.3.tgz";
-        sha512 = "YAz68AgXTFFtrBUhNJlOQ7KOjUE6ncYt578/esa2GStMJHgJoUtPnOZsE41hh+cVWXqO5yRRI+Qkwub99zLMgQ==";
+        url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.19.5.tgz";
+        sha512 = "qXW99H+S/529cTOtRBTPiTV1Ay+I2+kcF5lfVblSRsij7fBM6d99dB3Fg6oL0i6okRwOUNFAV4qbxgg7zxA3wA==";
       };
     };
-    "@cspell/cspell-pipe-5.19.3" = {
+    "@cspell/cspell-pipe-5.19.5" = {
       name = "_at_cspell_slash_cspell-pipe";
       packageName = "@cspell/cspell-pipe";
-      version = "5.19.3";
+      version = "5.19.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-5.19.3.tgz";
-        sha512 = "3RKntgGRxYYzoxoH3VBPvnNMYkHKPq0U+U7qogcWxDkgAUgKXlBP0oc2mw96grJQ4HIzOL1vBnaVAWAqteY9Kw==";
+        url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-5.19.5.tgz";
+        sha512 = "dNCMYDgjeWKw7KIptjxHu17UfeT3oiqQk6LkSyi3BewUxpnlLLO7EsxR6GRW+RVU/MrPXe7BF9WgF0gO8m+8cQ==";
       };
     };
-    "@cspell/cspell-types-5.19.3" = {
+    "@cspell/cspell-types-5.19.5" = {
       name = "_at_cspell_slash_cspell-types";
       packageName = "@cspell/cspell-types";
-      version = "5.19.3";
+      version = "5.19.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-5.19.3.tgz";
-        sha512 = "tub7PW/I6qB6o+ZtlahAZjm5O5cnzj88HRiC8nAbJFpa7q0mrdpFMYhd7ksWtyFLlNbuDkCsfzXGamAhIQnnIw==";
+        url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-5.19.5.tgz";
+        sha512 = "tOzCzuQQ4DdgfnI6+FGBPOVL/1JbH0pWtoOinPoU93/pH29XOKGW2I24HLeESzgskfoZGK274wMFQfGp6oJw9g==";
       };
     };
     "@cspell/dict-ada-2.0.0" = {
@@ -3694,13 +3694,13 @@ let
         sha512 = "+WoaAaoYx/wfkrz1Ag40JqHvDUFfQcg+dQ3jaEOoau16y7EZGIe7oN8WYIXNMgWuMxH7r1QlanFbQZ+ziKjHmw==";
       };
     };
-    "@fluentui/react-8.62.3" = {
+    "@fluentui/react-8.64.0" = {
       name = "_at_fluentui_slash_react";
       packageName = "@fluentui/react";
-      version = "8.62.3";
+      version = "8.64.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react/-/react-8.62.3.tgz";
-        sha512 = "ENfTetlsI74k4vgJ3574mWSoRv7kcwUMow+7GBFBw3EZcwnkUXPG6FubzuLBbn36X8MjeRSi8pnaR6T73GaBOw==";
+        url = "https://registry.npmjs.org/@fluentui/react/-/react-8.64.0.tgz";
+        sha512 = "ykO3VHQVQL6IUAXnp5No38fMqG5XOqjP0bNOv5klCYelfF0bnDdbzmT+nHMorq+SKqaHnbnryO+OQuXDmyujCQ==";
       };
     };
     "@fluentui/react-focus-8.5.6" = {
@@ -3901,13 +3901,13 @@ let
         sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g==";
       };
     };
-    "@graphql-tools/delegate-8.7.0" = {
+    "@graphql-tools/delegate-8.7.1" = {
       name = "_at_graphql-tools_slash_delegate";
       packageName = "@graphql-tools/delegate";
-      version = "8.7.0";
+      version = "8.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.0.tgz";
-        sha512 = "tsmNFV8nVvPY2nApCj69ck32/Jdj44rYbUZx+cpyUWOzfbUT1iu0d1mUwn5UeHuGnB+Bzgn3fuTypg97mDEyEw==";
+        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.1.tgz";
+        sha512 = "e98/NRaOH5wQy624bRd5i5qUKz5tCs8u4xBmxW89d7t6V6CveXj7pvAgmnR9DbwOkO6IA3P799p/aa/YG/pWTA==";
       };
     };
     "@graphql-tools/graphql-file-loader-6.2.7" = {
@@ -3964,13 +3964,13 @@ let
         sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg==";
       };
     };
-    "@graphql-tools/load-7.5.5" = {
+    "@graphql-tools/load-7.5.6" = {
       name = "_at_graphql-tools_slash_load";
       packageName = "@graphql-tools/load";
-      version = "7.5.5";
+      version = "7.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.5.tgz";
-        sha512 = "qPasit140nwTbMQbFCfZcgaS7q/0+xMQGdkMGU11rtHt6/jMgJIKDUU8/fJGKltNY3EeHlEdVtZmggZD7Rr6bA==";
+        url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.6.tgz";
+        sha512 = "IocEP4METGdbDzV44VaeiXO387NOYSW4cTuBP8qybHZX0XlIp8bEv7c8GKS3m8DeRop/9SnOL7HyiAfNMA4Chg==";
       };
     };
     "@graphql-tools/merge-6.2.17" = {
@@ -4000,13 +4000,13 @@ let
         sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA==";
       };
     };
-    "@graphql-tools/schema-8.3.5" = {
+    "@graphql-tools/schema-8.3.6" = {
       name = "_at_graphql-tools_slash_schema";
       packageName = "@graphql-tools/schema";
-      version = "8.3.5";
+      version = "8.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.5.tgz";
-        sha512 = "3mJ/K7TdL+fnEUtCUqF4qkh1fcNMzaxgwKgO9fSYSTS7zyT16hbi5XSulSTshygHgaD2u+MO588iR4ZJcbZcIg==";
+        url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.6.tgz";
+        sha512 = "7tWYRQ8hB/rv2zAtv2LtnQl4UybyJPtRz/VLKRmgi7+F5t8iYBahmmsxMDAYMWMmWMqEDiKk54TvAes+J069rQ==";
       };
     };
     "@graphql-tools/url-loader-6.10.1" = {
@@ -4018,13 +4018,13 @@ let
         sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw==";
       };
     };
-    "@graphql-tools/url-loader-7.9.7" = {
+    "@graphql-tools/url-loader-7.9.8" = {
       name = "_at_graphql-tools_slash_url-loader";
       packageName = "@graphql-tools/url-loader";
-      version = "7.9.7";
+      version = "7.9.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.7.tgz";
-        sha512 = "cJoZcv6oJrhArRPmSnw8wcqnz7F8p+HzwvjoJyHbs0ne2jTXazD+LOHaXMAa1L7lKK2YmH2Txy8pOI76JnvUiQ==";
+        url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.8.tgz";
+        sha512 = "nRMXwwoIDLt7ohBWvKKjEEH61YS1nnWs6BVgGStePfmRGrhxECpLWmfAmKLNXPqDJN7Nu6ykFJYjt65j5l6qsw==";
       };
     };
     "@graphql-tools/utils-6.2.4" = {
@@ -4072,13 +4072,13 @@ let
         sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg==";
       };
     };
-    "@graphql-tools/wrap-8.4.9" = {
+    "@graphql-tools/wrap-8.4.10" = {
       name = "_at_graphql-tools_slash_wrap";
       packageName = "@graphql-tools/wrap";
-      version = "8.4.9";
+      version = "8.4.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.9.tgz";
-        sha512 = "YFb34itVWyE3sMifvPRqvYjXYpjJle2hkq9nIELQOumc1yqxT7jf/+YnNZalS1DoOdWn4GbDmqO/uljf6AuuDA==";
+        url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.10.tgz";
+        sha512 = "1/pcKRDTGIUspUl6uhlfQ0u1l4j15TVGkOkijI+gX25Q9sfAJclT0bovKBksP39G6v4hZnolpOU2txJ47MxxEg==";
       };
     };
     "@grpc/grpc-js-1.4.4" = {
@@ -4117,6 +4117,15 @@ let
         sha512 = "RAlSbZ9LXo0wNoHKeUlwP9dtGgVBDUbnBKFpfAv5iSqMG4qWz9um2yLH215+Wow1I48etIa1QMS+WAGmsE/7HQ==";
       };
     };
+    "@grpc/grpc-js-1.6.1" = {
+      name = "_at_grpc_slash_grpc-js";
+      packageName = "@grpc/grpc-js";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.6.1.tgz";
+        sha512 = "ix3rQS64rKL1s6CfIaRgnts+RNYZZ2NaYyTK7iimai6an/0GGDbukzy990hJ5vtKHjhaqJxJMB6Qq7BMZ0zZSQ==";
+      };
+    };
     "@grpc/proto-loader-0.6.6" = {
       name = "_at_grpc_slash_proto-loader";
       packageName = "@grpc/proto-loader";
@@ -5494,13 +5503,13 @@ let
         sha512 = "/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg==";
       };
     };
-    "@mapbox/node-pre-gyp-1.0.8" = {
+    "@mapbox/node-pre-gyp-1.0.9" = {
       name = "_at_mapbox_slash_node-pre-gyp";
       packageName = "@mapbox/node-pre-gyp";
-      version = "1.0.8";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.8.tgz";
-        sha512 = "CMGKi28CF+qlbXh26hDe6NxCd7amqeAzEqnS6IHeO6LoaKyM/n+Xw3HT1COdq8cuioOdlKdqn/hCmqPUOMOywg==";
+        url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz";
+        sha512 = "aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==";
       };
     };
     "@mapbox/point-geometry-0.1.0" = {
@@ -5584,31 +5593,49 @@ let
         sha512 = "y3Ntio6hb5+m6asxcA3nnIN6URjAFMji2EZZVYGd2Ag5On4mmvPhMnXdiIScCMXgHjFX+5qXuKaojLLhJHZPAg==";
       };
     };
-    "@medable/mdctl-api-1.0.63" = {
+    "@medable/mdctl-api-1.0.64" = {
       name = "_at_medable_slash_mdctl-api";
       packageName = "@medable/mdctl-api";
-      version = "1.0.63";
+      version = "1.0.64";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@medable/mdctl-api/-/mdctl-api-1.0.64.tgz";
+        sha512 = "EPYWmkTMazBrilFm1YgSsQ8e62poVJbXdWHiCgUaVfqgE5htuogUSx1qMQbkGPYA1eWeZQLEpmTaKZXfI/1Vtw==";
+      };
+    };
+    "@medable/mdctl-api-driver-1.0.64" = {
+      name = "_at_medable_slash_mdctl-api-driver";
+      packageName = "@medable/mdctl-api-driver";
+      version = "1.0.64";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@medable/mdctl-api/-/mdctl-api-1.0.63.tgz";
-        sha512 = "B4AgY+HGy7nJpGCY1+88F74NeXEJbmKGud5sgWaBOXHnOweNHvqWb0c2Fkn5A2LxiYPXpDvmGmiypCHubqJlQg==";
+        url = "https://registry.npmjs.org/@medable/mdctl-api-driver/-/mdctl-api-driver-1.0.64.tgz";
+        sha512 = "w4OzAcQJvAlOBelophFpIM4TZdxFRyFTn71J88TME8h/swxC/YbfUmN3HVRQMxMimhnX0kGC44pm1YiHcqOg/g==";
       };
     };
-    "@medable/mdctl-core-1.0.63" = {
+    "@medable/mdctl-axon-tools-1.0.64" = {
+      name = "_at_medable_slash_mdctl-axon-tools";
+      packageName = "@medable/mdctl-axon-tools";
+      version = "1.0.64";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@medable/mdctl-axon-tools/-/mdctl-axon-tools-1.0.64.tgz";
+        sha512 = "Weew9WUga+AmZUbB4NZDR17qvv8rQ05F2gzlRxDdNwjbuwRmglwtBf2nbZu4SkAYhIFSSf3yPerhHpQsPpaf+w==";
+      };
+    };
+    "@medable/mdctl-core-1.0.64" = {
       name = "_at_medable_slash_mdctl-core";
       packageName = "@medable/mdctl-core";
-      version = "1.0.63";
+      version = "1.0.64";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@medable/mdctl-core/-/mdctl-core-1.0.63.tgz";
-        sha512 = "XDZS5TN6d7BuHmIFi83P8MPg1zioiOzPFkq/S27DZ0Oa7Z9tW+w29IG0ltYZ6/uFuo8Z0VPiu9MdwM2vmzIPKQ==";
+        url = "https://registry.npmjs.org/@medable/mdctl-core/-/mdctl-core-1.0.64.tgz";
+        sha512 = "iu/iZwtueHD0uzuO/3kNECdZRKndF37VS+kRSS0diMkjgcgAqTo5telnnkEreJ6F/rULTlag6D5IkZNI9b/3LQ==";
       };
     };
-    "@medable/mdctl-core-schemas-1.0.63" = {
+    "@medable/mdctl-core-schemas-1.0.64" = {
       name = "_at_medable_slash_mdctl-core-schemas";
       packageName = "@medable/mdctl-core-schemas";
-      version = "1.0.63";
+      version = "1.0.64";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@medable/mdctl-core-schemas/-/mdctl-core-schemas-1.0.63.tgz";
-        sha512 = "eoYyS0m4ZFE+q3QpkoHbl+HDxhDxx/xN0i6VeWhQsSMCeTeLffrXBWYIdZvi39QKLCL171m9uWr83yNKkvEp1w==";
+        url = "https://registry.npmjs.org/@medable/mdctl-core-schemas/-/mdctl-core-schemas-1.0.64.tgz";
+        sha512 = "qgSx/Br+B6eFtPWEPLMT6G2kZf6gCLyayN3O7MpwaF1RA8dH7kAqm+EWsiLvIrhYMfQ+3reTvHvP7K3431piRA==";
       };
     };
     "@medable/mdctl-core-utils-1.0.63" = {
@@ -5620,31 +5647,31 @@ let
         sha512 = "9Xx4Fku47H00F9K5cCbHE3ugz3PWyUxXBRp86ee1n3QVTvhoE2PdCHYH2RES24385uH+/BrYfclMtZ4pCfXVwg==";
       };
     };
-    "@medable/mdctl-credentials-provider-keychain-1.0.63" = {
+    "@medable/mdctl-credentials-provider-keychain-1.0.64" = {
       name = "_at_medable_slash_mdctl-credentials-provider-keychain";
       packageName = "@medable/mdctl-credentials-provider-keychain";
-      version = "1.0.63";
+      version = "1.0.64";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-keychain/-/mdctl-credentials-provider-keychain-1.0.63.tgz";
-        sha512 = "Vr+VpZ9XrPdsg5+qW6YNikED+RUn/v8/RMvbZ78hsEFEjEHRYT0He7f/nbJVkrS7+zYX7cdmzlZnKPV5z5HiQQ==";
+        url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-keychain/-/mdctl-credentials-provider-keychain-1.0.64.tgz";
+        sha512 = "PXCw9HfDbEu9w7c6MPSFG2rrqDDcEr8oDvr6m7FpmU/VjujsE055JkmmJ5nQTpBRex1pHuGkPWUgtSEMvzhITg==";
       };
     };
-    "@medable/mdctl-credentials-provider-pouchdb-1.0.63" = {
+    "@medable/mdctl-credentials-provider-pouchdb-1.0.64" = {
       name = "_at_medable_slash_mdctl-credentials-provider-pouchdb";
       packageName = "@medable/mdctl-credentials-provider-pouchdb";
-      version = "1.0.63";
+      version = "1.0.64";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-pouchdb/-/mdctl-credentials-provider-pouchdb-1.0.63.tgz";
-        sha512 = "FNIq2RxBd9NJPz4oBCs17sd3Zg2g0Y7zjAqu3G3I9LyEjbeJZLGwr7lu6NqmtG/F3e/TH2d6ecMK0zKPlpAJQg==";
+        url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-pouchdb/-/mdctl-credentials-provider-pouchdb-1.0.64.tgz";
+        sha512 = "qCcxaVrUUxsgtEPA693VanapacR0/l51o029YmYCDtIzTnndK7rjpxQ7XDNGLd8o3suzKEq8MrQDF0USkE/18g==";
       };
     };
-    "@medable/mdctl-docs-1.0.63" = {
+    "@medable/mdctl-docs-1.0.64" = {
       name = "_at_medable_slash_mdctl-docs";
       packageName = "@medable/mdctl-docs";
-      version = "1.0.63";
+      version = "1.0.64";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@medable/mdctl-docs/-/mdctl-docs-1.0.63.tgz";
-        sha512 = "1DUsJFnpJNkwTZ65vx5rd+hzkuM3sfSJ3nxYfwcyOWw1bErloObXSEMw2iPIyt3ryYg3i9Jtt+d3AUuDpcT4PQ==";
+        url = "https://registry.npmjs.org/@medable/mdctl-docs/-/mdctl-docs-1.0.64.tgz";
+        sha512 = "33HEgkgL1Hu4yHYU0uH+zQukLiMv+e/NtfbCFBCGNuelvvSQHI4m/ZzAdriF9h7Ovyv1IFAKylEGKrw4A7xyZQ==";
       };
     };
     "@medable/mdctl-export-adapter-console-1.0.63" = {
@@ -5656,49 +5683,49 @@ let
         sha512 = "hPGbVYsWH/BVA9Q8cWuTMAeWtGvBg5TDE3pYWdVzaRMUqNt1af7weaieYX56h7jlOhkl4AtkKcW6S5AK0Q8w+w==";
       };
     };
-    "@medable/mdctl-export-adapter-tree-1.0.63" = {
+    "@medable/mdctl-export-adapter-tree-1.0.64" = {
       name = "_at_medable_slash_mdctl-export-adapter-tree";
       packageName = "@medable/mdctl-export-adapter-tree";
-      version = "1.0.63";
+      version = "1.0.64";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-tree/-/mdctl-export-adapter-tree-1.0.63.tgz";
-        sha512 = "RfmHQUosT3qXnL0jFM2KPkc+JeHv7Ur9Qf16ffOAJCqopbJ+4ZAfUn/3IOUnlYZbeifWy3xU6gptSCqHITJokQ==";
+        url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-tree/-/mdctl-export-adapter-tree-1.0.64.tgz";
+        sha512 = "O3zQpVACsFfeat3hmBiQXLoHpU4tnjQ0ggDr5pOpQUuWnV3H8lxzDNw1UTmcZuN9e+WA2HoX2C5I3yWZ/2uCvg==";
       };
     };
-    "@medable/mdctl-import-adapter-1.0.63" = {
+    "@medable/mdctl-import-adapter-1.0.64" = {
       name = "_at_medable_slash_mdctl-import-adapter";
       packageName = "@medable/mdctl-import-adapter";
-      version = "1.0.63";
+      version = "1.0.64";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@medable/mdctl-import-adapter/-/mdctl-import-adapter-1.0.63.tgz";
-        sha512 = "l3xxVPyMvruvbi5JL75TqcFnh1wa+enFnJT9lk6tESy858w57PQes3cqhWdMZHJlDDBvpKhus/UiIERSEfwRDA==";
+        url = "https://registry.npmjs.org/@medable/mdctl-import-adapter/-/mdctl-import-adapter-1.0.64.tgz";
+        sha512 = "0HWnOFQVKomxKwu1nt3o1fK4+ObT10r545viQg8Ad2zEYzcb/jE3k7FlSQOkvLqTk/JCcNjp0AIWV6R3PFHJ0w==";
       };
     };
-    "@medable/mdctl-manifest-1.0.63" = {
+    "@medable/mdctl-manifest-1.0.64" = {
       name = "_at_medable_slash_mdctl-manifest";
       packageName = "@medable/mdctl-manifest";
-      version = "1.0.63";
+      version = "1.0.64";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@medable/mdctl-manifest/-/mdctl-manifest-1.0.63.tgz";
-        sha512 = "lNepdPyMUTMNL87QrVoHklUOK8d0Nrv72y19gdO52yAM7IZPXG/UORlfip0JYFkFu/KSedrIVodjp6prm7+sgA==";
+        url = "https://registry.npmjs.org/@medable/mdctl-manifest/-/mdctl-manifest-1.0.64.tgz";
+        sha512 = "9lT6lAw9Y0m5Pv3sHXjOJIalUgcazrmCc0GGRmIoxDvWn9AUyaJ0p2dilyh9wR9IX1HAexEAuQR5IviGCLq/Hg==";
       };
     };
-    "@medable/mdctl-node-utils-1.0.63" = {
+    "@medable/mdctl-node-utils-1.0.64" = {
       name = "_at_medable_slash_mdctl-node-utils";
       packageName = "@medable/mdctl-node-utils";
-      version = "1.0.63";
+      version = "1.0.64";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@medable/mdctl-node-utils/-/mdctl-node-utils-1.0.63.tgz";
-        sha512 = "wbC+fKBmdf0Zk1pB3x0T+4Z1fk3anSE3kcp8VznOZfpGD5UgYUzbhZzH8oPhT/3X1jx17XUS7XTURjqj6vTQew==";
+        url = "https://registry.npmjs.org/@medable/mdctl-node-utils/-/mdctl-node-utils-1.0.64.tgz";
+        sha512 = "ITZP4EHYqJbF0sxfHddrPvTRvEfuBiyZuI8gOBjTOHUUMj9PE8vG3D9okWIoCtvkaNAgr2Jjd/SHkEYDRZHnpA==";
       };
     };
-    "@medable/mdctl-sandbox-1.0.63" = {
+    "@medable/mdctl-sandbox-1.0.64" = {
       name = "_at_medable_slash_mdctl-sandbox";
       packageName = "@medable/mdctl-sandbox";
-      version = "1.0.63";
+      version = "1.0.64";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@medable/mdctl-sandbox/-/mdctl-sandbox-1.0.63.tgz";
-        sha512 = "GENimL772K2Udv4id+QqL6E66Oko4e2UOeN93tYiUrU92w3S3wvEu/UyXXKjS/rzgs2naBmo6T3K7gdu8HqF4Q==";
+        url = "https://registry.npmjs.org/@medable/mdctl-sandbox/-/mdctl-sandbox-1.0.64.tgz";
+        sha512 = "dhoWUIfRgPJeymAxwW6D4T4k3QNrwvfeANRrIuNj7CT0hcn7CsusQhoCyYkhrymAvN5/X0KoTvYCGRj6sSLeMg==";
       };
     };
     "@medable/mdctl-secrets-1.0.63" = {
@@ -5728,13 +5755,13 @@ let
         sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA==";
       };
     };
-    "@microsoft/load-themed-styles-1.10.249" = {
+    "@microsoft/load-themed-styles-1.10.250" = {
       name = "_at_microsoft_slash_load-themed-styles";
       packageName = "@microsoft/load-themed-styles";
-      version = "1.10.249";
+      version = "1.10.250";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.249.tgz";
-        sha512 = "qrLdjIZ9znm2CUILAXuwyAcUvyBzSNaf8wIzaZf/ul2UKhww5xSI7pT7bIqWbuwn5SB+xOmIZrlRr3DyzuVBYQ==";
+        url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.250.tgz";
+        sha512 = "uxn8ho0Wlc+JL8epCErwKIBK5ulva33VrabPbqPM1A770RGdxfW0J9PhnaIDOlz9p2w4DeyNhcLXIZry2eOaBg==";
       };
     };
     "@mitmaro/errors-1.0.0" = {
@@ -5791,13 +5818,13 @@ let
         sha512 = "BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg==";
       };
     };
-    "@nestjs/schematics-8.0.8" = {
+    "@nestjs/schematics-8.0.9" = {
       name = "_at_nestjs_slash_schematics";
       packageName = "@nestjs/schematics";
-      version = "8.0.8";
+      version = "8.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.8.tgz";
-        sha512 = "xIIb5YnMQN/OJQ68+MCapy2bXvTxSWgINoqQbyZWkLL/yTIuROvZCdtV850NPGyr7f7l93VBP0ZPitbFIexy3Q==";
+        url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.9.tgz";
+        sha512 = "2YNRFWyQCxKaK7XTKBRKecERKQj2cg9FLxsHwAf9beryXxVmciTmHV0gHCW7Pfatj38R50QFGPN71wuyyZIC5g==";
       };
     };
     "@netflix/nerror-1.1.3" = {
@@ -6520,481 +6547,481 @@ let
         sha512 = "GdTwDHSaZ6iP5LUdvS/SLUjn3067xn1HcBsLZCh8YOsf22d/YWTBcnFl3buieBP4KiajwHLho4I8HSMDKACBSg==";
       };
     };
-    "@ot-builder/bin-composite-types-1.5.0" = {
+    "@ot-builder/bin-composite-types-1.5.1" = {
       name = "_at_ot-builder_slash_bin-composite-types";
       packageName = "@ot-builder/bin-composite-types";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.5.0.tgz";
-        sha512 = "0X12BGmy7l91ONXGLfmG3BQerqjdipYgrGhREXL80qcKQfcZL4o+7NHjq/FDlFYpMGLxDq9CkprGEDmgSIL9CA==";
+        url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.5.1.tgz";
+        sha512 = "ocwr19PbiqbZ6X64IhTzZzXvYxrGBUQHSN3Ii1RAPbZ8McHlNX4LtUbxAE1P3MnXOWtlZO4YUr4hHOZY2c6/7A==";
       };
     };
-    "@ot-builder/bin-util-1.5.0" = {
+    "@ot-builder/bin-util-1.5.1" = {
       name = "_at_ot-builder_slash_bin-util";
       packageName = "@ot-builder/bin-util";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.5.0.tgz";
-        sha512 = "zLBqM5SjP/EmVaZtwqOjK832yzYQTlWqtldOmgAizckiNpayC6P5c49KJpVTLhVh54euhsk9oJUjsi0L9i8A0g==";
+        url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.5.1.tgz";
+        sha512 = "uYz/dEE723loQiNIoRifnY8TWOdheuorCojIoTtZa3CIiAzfjpkVpHXpoSrDpO0Syep0tfq8pgDf/vm0fv0Mnw==";
       };
     };
-    "@ot-builder/cli-help-shower-1.5.0" = {
+    "@ot-builder/cli-help-shower-1.5.1" = {
       name = "_at_ot-builder_slash_cli-help-shower";
       packageName = "@ot-builder/cli-help-shower";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.5.0.tgz";
-        sha512 = "2jMS5aTr+92mt0HsUoLLV+1GBMsk2GC1tx5YFcdDBH7rfExvYR5NKgpO1d7muVdUi8WBh4fn611rb5sjhBtF5Q==";
+        url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.5.1.tgz";
+        sha512 = "xSeyQV/muAqr0ZMZprdAAz+4fq3C8j1AOPqjv0jWeyUcDTGHR1Itvf1iigL7+LB9nIn3bZXKFLBiUUQx2Lmhig==";
       };
     };
-    "@ot-builder/cli-proc-1.5.0" = {
+    "@ot-builder/cli-proc-1.5.1" = {
       name = "_at_ot-builder_slash_cli-proc";
       packageName = "@ot-builder/cli-proc";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.5.0.tgz";
-        sha512 = "zU0afR6WqkUcogoX1pLJBsYSlViPJCkQ1zrHjnOLcHRJ5zIPwNXbFUTAhWePMvNF8EAjtILGeX8ZxoE3PtXMTQ==";
+        url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.5.1.tgz";
+        sha512 = "/uUtJIOHiUzfFeWMQFF9CNg93+cZc9DIbPb7fIS3yucWSpaKP2cXjwZ9LeHDxkbtIMLwfr9W/ktRk/DlKERPJw==";
       };
     };
-    "@ot-builder/cli-shared-1.5.0" = {
+    "@ot-builder/cli-shared-1.5.1" = {
       name = "_at_ot-builder_slash_cli-shared";
       packageName = "@ot-builder/cli-shared";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.5.0.tgz";
-        sha512 = "hOYs07mNlg9Z+Rl2wKsDRzb0gYVsnAv6K8O52Q141QBvu5Uyjb6p19zM8pYvOF7VXZTGEhki9WNoM3qVgp5pSA==";
+        url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.5.1.tgz";
+        sha512 = "FbFIQ5lWNobNR7Sg4TDevNpEGn03Com+5+OfLLUToHhXoTuGmJDfrHeQ7KG7bFs4pnCNDDavM1Dn34v/U5zmbA==";
       };
     };
-    "@ot-builder/common-impl-1.5.0" = {
+    "@ot-builder/common-impl-1.5.1" = {
       name = "_at_ot-builder_slash_common-impl";
       packageName = "@ot-builder/common-impl";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.5.0.tgz";
-        sha512 = "6linn1dhjDVIiu2cvY0UACSAJClKvLmwrLigg3dzlEjJRvr6jnE/zZ8D401CuL7EMLJPNjciSlf1lQCj5/MU8Q==";
+        url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.5.1.tgz";
+        sha512 = "5cBzUheN3hOn0Di47FXW83PN6/ggcIBo3g5jIEP0UiYFXnUkO9YLzdQWEz5dLa0cUVkaotfwS7XYbaiBOmW57g==";
       };
     };
-    "@ot-builder/errors-1.5.0" = {
+    "@ot-builder/errors-1.5.1" = {
       name = "_at_ot-builder_slash_errors";
       packageName = "@ot-builder/errors";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.5.0.tgz";
-        sha512 = "vARlbSzv3euBX0/Y4orHhbYZOsj7hYjsPU+VXt2LD+do6On1EJ8z6vvXXZxB4B52Rr2jnxzycqk0fNh95IKTeg==";
+        url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.5.1.tgz";
+        sha512 = "++wdnFpE9Z/YR/sosddrtdIO4rIglp8V/igHCvZtsyIPR88q+q0/NTmQBMOLsZn6MeHRJgYIt0/Q4yZEhezUiA==";
       };
     };
-    "@ot-builder/io-bin-cff-1.5.0" = {
+    "@ot-builder/io-bin-cff-1.5.1" = {
       name = "_at_ot-builder_slash_io-bin-cff";
       packageName = "@ot-builder/io-bin-cff";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.5.0.tgz";
-        sha512 = "3KWiwRB/8JUkfxE3WqR/xOWQdBDbIS6evdQPBQ/CAJV1qyTtL3Q9KfCHaMPHJcDLbKPP/4lnhKEyi6QsnJU/Tw==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.5.1.tgz";
+        sha512 = "7RcEM5hTDWM9vds2EXyS9sW2KRFUlnQuys9eMQ0OvgU9cO3hrN7UDhNtMTcjDFTtD668DX82jkP1CtnwORUczA==";
       };
     };
-    "@ot-builder/io-bin-encoding-1.5.0" = {
+    "@ot-builder/io-bin-encoding-1.5.1" = {
       name = "_at_ot-builder_slash_io-bin-encoding";
       packageName = "@ot-builder/io-bin-encoding";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.5.0.tgz";
-        sha512 = "h55cS6agqz++YRMPAi6Zvgd6oWllF9+SjF72whPGekOjRZLNemuTpmWBbXbD3gc1pU8SqSUUSeIcUdny3sqtdg==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.5.1.tgz";
+        sha512 = "0nDTXPdTfHDvThAGuS/Td8HDp7FV7mQBcC1YVblA7L1RXf0EU2dxbLKgjqt9s4diQRsMRAvIs+REc0oa+/FFzQ==";
       };
     };
-    "@ot-builder/io-bin-ext-private-1.5.0" = {
+    "@ot-builder/io-bin-ext-private-1.5.1" = {
       name = "_at_ot-builder_slash_io-bin-ext-private";
       packageName = "@ot-builder/io-bin-ext-private";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.5.0.tgz";
-        sha512 = "11K88CL96HiSP0DZYvNd/oULlDbKfD+RYChnl8OJlYDKqxQcFfecIcgKAJmEpmkr11MurRB0AdP2Hg6HBCUFuA==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.5.1.tgz";
+        sha512 = "wB8F3cpeSYbUQl9yQPdc/vtq//KKI9g9INc2vh/OaQVBeGtfEEHmyVtTsVg3qaBNH5UVcJLO1n8WPMaUejPQ4w==";
       };
     };
-    "@ot-builder/io-bin-font-1.5.0" = {
+    "@ot-builder/io-bin-font-1.5.1" = {
       name = "_at_ot-builder_slash_io-bin-font";
       packageName = "@ot-builder/io-bin-font";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.5.0.tgz";
-        sha512 = "UuepwTTj9lbFh92vvyyK346OBVKlG7mXUcafrRijGGCyc1Toe+HONaCU1dcNy9IvwlNjEa6svrQfMFx8fwxMKA==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.5.1.tgz";
+        sha512 = "gyjIucWeUUe5Qa5kgyoKQ5ZgmcEqmjXhyOrMAftflo13JUe48azoqFgmcR2F7mLHEEp0o6zPxIFhuq4Osjoi/g==";
       };
     };
-    "@ot-builder/io-bin-glyph-store-1.5.0" = {
+    "@ot-builder/io-bin-glyph-store-1.5.1" = {
       name = "_at_ot-builder_slash_io-bin-glyph-store";
       packageName = "@ot-builder/io-bin-glyph-store";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.5.0.tgz";
-        sha512 = "Xtg0k34yj4nfFlyh/lpBM6O66QYiAW9+/qmn5Rtp9N8hDCGD+2HZ7fTZZdcqgXYZblZvlknzBFKSOLoupcvZNg==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.5.1.tgz";
+        sha512 = "UmVjJ5SZxwEgaJFbO/l5gN4VD5GQwP0mkFhrTa0iubHMcKsAYAPiXJfs/YCaGj/cWaVtyucilk7+dbHsRglGnw==";
       };
     };
-    "@ot-builder/io-bin-layout-1.5.0" = {
+    "@ot-builder/io-bin-layout-1.5.1" = {
       name = "_at_ot-builder_slash_io-bin-layout";
       packageName = "@ot-builder/io-bin-layout";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.5.0.tgz";
-        sha512 = "bS+e8VkFUX6LyWqD7zGa5FvJbCtIw6Crs2g4DVivn6slhru9JIc5DcNOHp86zwNkwlzg+v+5/3KUoNZoWgxWpw==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.5.1.tgz";
+        sha512 = "SoarXj9DVSuGSMxGetF9jIBeO0BV1KGMuHs23+CTD6xKSBn0YrPa3S/kim8crCbhdJl5az0pIa2X3EvJ+sGziw==";
       };
     };
-    "@ot-builder/io-bin-metadata-1.5.0" = {
+    "@ot-builder/io-bin-metadata-1.5.1" = {
       name = "_at_ot-builder_slash_io-bin-metadata";
       packageName = "@ot-builder/io-bin-metadata";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.5.0.tgz";
-        sha512 = "0Q0K1UkSqO0wW03UbUuOw79abzNeK6cHjzCE0UX2hZPtH26gEG32xCPYUNCaSxOFPWXSRXPg/kmYIT6/ZmkWLA==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.5.1.tgz";
+        sha512 = "XC+0/BBXFUQxP+jeRq7H9QQZLBlsXGvwiSc0Fll8zQjVgFJB8HS/sOpCvr1kP3AiuFpUtnXsFSCp4SUM+phZEQ==";
       };
     };
-    "@ot-builder/io-bin-metric-1.5.0" = {
+    "@ot-builder/io-bin-metric-1.5.1" = {
       name = "_at_ot-builder_slash_io-bin-metric";
       packageName = "@ot-builder/io-bin-metric";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.5.0.tgz";
-        sha512 = "Ezw3MBw4rO6fMrikm1Mc0nOnf3E4FPkHMhUAXN62AFcz6VOKMY34OL+NSoLkJL+HfGTju4KcF3guiNytXrtLeA==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.5.1.tgz";
+        sha512 = "WfQtSPgsOaydreLa2j9wjBg1UfBPmi2vYHG5M8LrD0iygOG+OoFcAvuX58gvOxz0n6OS3bHIeI2KAXd/9XLLew==";
       };
     };
-    "@ot-builder/io-bin-name-1.5.0" = {
+    "@ot-builder/io-bin-name-1.5.1" = {
       name = "_at_ot-builder_slash_io-bin-name";
       packageName = "@ot-builder/io-bin-name";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.5.0.tgz";
-        sha512 = "zPhTA5HEwQ0jAovA+ZwPjt3ZNnOaLSQagoLHo6zuETOb+uJSksTExg+G4h6PFHC9U9q55OZ0HidlWOmnmi1xbA==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.5.1.tgz";
+        sha512 = "R7UT653Y/OYcSRT+cjXpsbPRRU4mAz5RfYxKTW8yKFJ2SN++17LqlkHAUhhWMiU6mJwNjIkpx6/g97ewRgY0oA==";
       };
     };
-    "@ot-builder/io-bin-sfnt-1.5.0" = {
+    "@ot-builder/io-bin-sfnt-1.5.1" = {
       name = "_at_ot-builder_slash_io-bin-sfnt";
       packageName = "@ot-builder/io-bin-sfnt";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.5.0.tgz";
-        sha512 = "/8sANRI3aBKKdOcbnULiS5w5c34d6lb8IufJtYpCuowUuvkDUXF3vlGw7t7CL7mudzdcELpW4ROa1/vNRR+c6Q==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.5.1.tgz";
+        sha512 = "/PedJquNAlN+brP11hxKtDsNwVqklZVO8kYBOfh/8M/W5DDiz0Vrp36hSj8/qI0waYQWQegoN8l31y81YQRYxw==";
       };
     };
-    "@ot-builder/io-bin-ttf-1.5.0" = {
+    "@ot-builder/io-bin-ttf-1.5.1" = {
       name = "_at_ot-builder_slash_io-bin-ttf";
       packageName = "@ot-builder/io-bin-ttf";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.5.0.tgz";
-        sha512 = "tiyuas19970WkKNFRC4ja9rMD0mgt9arbYbNeQvDjFB9MPsV0+BNgk6fpGr2o8tmYpw73/TZcJfEgIiEICJKtg==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.5.1.tgz";
+        sha512 = "xeV56Bd72YGm0n4Pt5SOcA+nocNEP/D2P1oieGu0Karb7yMqwd+fkoxPBo6+UMxWkWh0x7iztY4uMGI87HEpqQ==";
       };
     };
-    "@ot-builder/io-bin-vtt-private-1.5.0" = {
+    "@ot-builder/io-bin-vtt-private-1.5.1" = {
       name = "_at_ot-builder_slash_io-bin-vtt-private";
       packageName = "@ot-builder/io-bin-vtt-private";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.5.0.tgz";
-        sha512 = "yz7WLqLI8XZ0KgYowu5ct9rbOS97TQRwudndDDXJZynSFZyUK5wYV9hfqXwKPDQI2QViAWhYBUJDR94zeSe7MA==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.5.1.tgz";
+        sha512 = "QL6HLeE7fs5gYiazG+2DVRg6zbL2O/srkkVGU4L1++1Z87BFp4xvID9LvePwLEpWUJFl9+4bRB6j5ozoYU3vYA==";
       };
     };
-    "@ot-builder/ot-1.5.0" = {
+    "@ot-builder/ot-1.5.1" = {
       name = "_at_ot-builder_slash_ot";
       packageName = "@ot-builder/ot";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.5.0.tgz";
-        sha512 = "8nmX1B5D7974LaqH2ieIcZ4TDaAILGvANipOL5e75MMt6jF1O72UUHzO4vJ/llIsZYasqm9+rlv6dkp9CkveZA==";
+        url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.5.1.tgz";
+        sha512 = "XIIYr9jv1TSYmcOkZDPRJASvgeKUQ+WnfaScu0fDiFI5GcLCLZOQnYjju8P1Q7/YOHT6HLZlD8T1MgXR8auo+w==";
       };
     };
-    "@ot-builder/ot-encoding-1.5.0" = {
+    "@ot-builder/ot-encoding-1.5.1" = {
       name = "_at_ot-builder_slash_ot-encoding";
       packageName = "@ot-builder/ot-encoding";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.5.0.tgz";
-        sha512 = "cWVGpb/A3jKPqobIdMUdScq1tUd+ew282P/yLFejIeJvaE4U3zZas6wS9pg4se6uiRsdf8bY5xSjAvnfbJAM1w==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.5.1.tgz";
+        sha512 = "jgAxj59W5P3bC33FGYGINjFvgc6JVX6ppPN4LVeXnl0ExtqVqiBDf83DA33u+tDrZlqkAtYSed42V3TNA90wXg==";
       };
     };
-    "@ot-builder/ot-ext-private-1.5.0" = {
+    "@ot-builder/ot-ext-private-1.5.1" = {
       name = "_at_ot-builder_slash_ot-ext-private";
       packageName = "@ot-builder/ot-ext-private";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.5.0.tgz";
-        sha512 = "gxbsodaN07XLNtTNLIWhhgHCsXjOs9D7M7c4i40UTv4S80FGzpyJpz2VOW1BJ8SUQjGFP/eeDdSyHWtmrBH21g==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.5.1.tgz";
+        sha512 = "fcnGZ6MgMdQIGipVzBuiH1lIOFWovi7Lfwt0ddYMzWjUqlnZgzpl6JwROQkmcfweAguEN3gFB/2Nkd+B5IHNgw==";
       };
     };
-    "@ot-builder/ot-glyphs-1.5.0" = {
+    "@ot-builder/ot-glyphs-1.5.1" = {
       name = "_at_ot-builder_slash_ot-glyphs";
       packageName = "@ot-builder/ot-glyphs";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.5.0.tgz";
-        sha512 = "SxqNTishqTKf36tt6XRQkXXLD3fw+7azbf/kSu4A0Pq6MdmRMy5CGs6HDA9KhqaPpmq1UpMk876QPA9vCXoLPw==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.5.1.tgz";
+        sha512 = "hHKK6TWINdwy/pYQgPNfSlTWaIesHrizk6Uu2uT66ISRd3FAUcr3L+kjf8nLimkFDqPBvvQGMW8c3pEVlOt3Cw==";
       };
     };
-    "@ot-builder/ot-layout-1.5.0" = {
+    "@ot-builder/ot-layout-1.5.1" = {
       name = "_at_ot-builder_slash_ot-layout";
       packageName = "@ot-builder/ot-layout";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.5.0.tgz";
-        sha512 = "fdmOl/HZi2Jdl0Fh8bx7CCG9s+jXimH+UCez3LPhTXgNNvOaFVqhABPtP+tAepqWi9J0MjBCeWMnFUmGiSa5gw==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.5.1.tgz";
+        sha512 = "ORIVOQFccaCkA/CpmKEUAGBU3jE3LtyQGl/g+sQPHNGR4H0Amrm9X4FlDuQAgzqMEDC3jUPmcyB3yBxJ71CLzQ==";
       };
     };
-    "@ot-builder/ot-metadata-1.5.0" = {
+    "@ot-builder/ot-metadata-1.5.1" = {
       name = "_at_ot-builder_slash_ot-metadata";
       packageName = "@ot-builder/ot-metadata";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.5.0.tgz";
-        sha512 = "OARTkm/LDERbwo6I0BMdAmA0D6vMP2A0IaQlOWn1PxjNoHOZQY6U+1er1H//xJQZ4aA5BZtRgOoQebjQpYELbg==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.5.1.tgz";
+        sha512 = "t8u2Uf418PQBXA+Ex5vhAkqg1z7U3ULr4P3gdzwlvs82HpeTVrsJvYbpWj4RymSGUTDB56GT6dpvL9n9MZfg7w==";
       };
     };
-    "@ot-builder/ot-name-1.5.0" = {
+    "@ot-builder/ot-name-1.5.1" = {
       name = "_at_ot-builder_slash_ot-name";
       packageName = "@ot-builder/ot-name";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.5.0.tgz";
-        sha512 = "b/NSfonC0QqMVNBloOPHeeQIqVAaHaID0oVD/C9jEGKPtp3zpSgS2oycmtZ8JmSqwS2qfJTU9lfzusT6E/LWsw==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.5.1.tgz";
+        sha512 = "SYwiXsP0edNS7kQcRpqmUOJX5koqnA888/kyalzzmStGm95JGoT6bX8dWp6MY/KOyzSHq4srJcM23GBxGs4epA==";
       };
     };
-    "@ot-builder/ot-sfnt-1.5.0" = {
+    "@ot-builder/ot-sfnt-1.5.1" = {
       name = "_at_ot-builder_slash_ot-sfnt";
       packageName = "@ot-builder/ot-sfnt";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.5.0.tgz";
-        sha512 = "imCGAlN78Yc2HQDVUzNPixj0ERT+PEodi9bp+wINLVYF9G6CgRMTIuSgG0KBK9H8T20sBrorOFfcZFQJuucy4A==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.5.1.tgz";
+        sha512 = "BPfGhc6xpZWKrOcLoH0+ceVxu7EWqaByzkz56d58bh/EGdLRqbQegjRyNsHQz3U237I9YulbsAOBi4LMh9EbCg==";
       };
     };
-    "@ot-builder/ot-standard-glyph-namer-1.5.0" = {
+    "@ot-builder/ot-standard-glyph-namer-1.5.1" = {
       name = "_at_ot-builder_slash_ot-standard-glyph-namer";
       packageName = "@ot-builder/ot-standard-glyph-namer";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.5.0.tgz";
-        sha512 = "aZkJBn2kog2eyAcXygzvYte5uH7GCVgO2jM9QeB4bpWoxXYjIF3dy58hsbZ6zKMXMncphOFcnTgxgvct45bglA==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.5.1.tgz";
+        sha512 = "6zJken8UG3En8/Z0sN1gDvFoXfgxN4hgLD6ElKLzu9gBw3zXdgdigLnIgTecOGzoYUfnO17pA0/tY4AH6Z70OQ==";
       };
     };
-    "@ot-builder/ot-vtt-private-1.5.0" = {
+    "@ot-builder/ot-vtt-private-1.5.1" = {
       name = "_at_ot-builder_slash_ot-vtt-private";
       packageName = "@ot-builder/ot-vtt-private";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.5.0.tgz";
-        sha512 = "iMQP2zI56mZJqG98VVAswCe2f2NgApW0BtAKfC/e3VKDJPWbsJHcIHnkcRReaC4FzAmzxqarY1IyeNC94xSNVg==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.5.1.tgz";
+        sha512 = "757L0L3kNZxx3fG5FUeGFGtZIPerv2gAycat91Wtbw6XjiMtqcJITwO7/rkUWD+6u3vMYTWpFO1Ye4XgClYuWQ==";
       };
     };
-    "@ot-builder/prelude-1.5.0" = {
+    "@ot-builder/prelude-1.5.1" = {
       name = "_at_ot-builder_slash_prelude";
       packageName = "@ot-builder/prelude";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.5.0.tgz";
-        sha512 = "b3tJ4GTZvK+sFNHlihFaOTxeMOWmSqIDKGOJuV9l6Svn/1moTcO3VWjRuriHmsrA0ZuaSQxTKMf3Na5BYiTnXw==";
+        url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.5.1.tgz";
+        sha512 = "0ovDORVvH3SWHoG+nNL0RAAk6wsHrfxp6cW8Fk+7vum06JWWGTiv9VEDyYNWWfCRD958T/xUguk/q/0slr38Ow==";
       };
     };
-    "@ot-builder/primitive-1.5.0" = {
+    "@ot-builder/primitive-1.5.1" = {
       name = "_at_ot-builder_slash_primitive";
       packageName = "@ot-builder/primitive";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.5.0.tgz";
-        sha512 = "jJN98wURFXGa8KTfjrIlB54AF2QJw+w9eQuJ812mt8Nmw2Mle+IaYCRAiD8IKWjRWMZcd6bztkOoDbCavqcrUQ==";
+        url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.5.1.tgz";
+        sha512 = "xRIHI7+EKqq+3XAJMRne4lX41Y85QLtyf+mAN6CpFfrtTRd9U47BpbLHV8fktW/tzR+iuOtWL5C0g4iNVqrTTA==";
       };
     };
-    "@ot-builder/rectify-1.5.0" = {
+    "@ot-builder/rectify-1.5.1" = {
       name = "_at_ot-builder_slash_rectify";
       packageName = "@ot-builder/rectify";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.5.0.tgz";
-        sha512 = "Ivx2VxlMB/Btq4+YLaH4KhPb+eoU4Nsg4UMd5u0BXQ+JjC3HvUbyXDWRMJn3ACDLvvkXSqjEprf7G3BFp58p7g==";
+        url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.5.1.tgz";
+        sha512 = "AXM+fy1h/JAvf0y79a31w92NwicQb9y+hotRthd88EXTxOZLlyyuwzUdfBW5MaMfXq7/SfeCxlz6xcSaMMjfrg==";
       };
     };
-    "@ot-builder/stat-glyphs-1.5.0" = {
+    "@ot-builder/stat-glyphs-1.5.1" = {
       name = "_at_ot-builder_slash_stat-glyphs";
       packageName = "@ot-builder/stat-glyphs";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.5.0.tgz";
-        sha512 = "OMCvsvxsX0dkjWcde3J3sxF1xRbzVm4uyz+G9sgjRXznBLVKtvstTpspFqpTfhUFEcjRU+7AJhWNn4nvXQR/jw==";
+        url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.5.1.tgz";
+        sha512 = "trH59RavFr0++8WnodHF/A3YpKXXcW68fbugm19dW5Pen5sUSfEh0OpLKwI4YjW98/kKiLYqu8MwJCIugEaKqQ==";
       };
     };
-    "@ot-builder/trace-1.5.0" = {
+    "@ot-builder/trace-1.5.1" = {
       name = "_at_ot-builder_slash_trace";
       packageName = "@ot-builder/trace";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.5.0.tgz";
-        sha512 = "qegG5Oc9gYHWMSnV9qLqYQnQAq79SRHo/apQtnnpD4o7d1SsxDPqR+xspzl3dprPRYSqq8zUKVZ5mxnLNcLPWQ==";
+        url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.5.1.tgz";
+        sha512 = "M+8o1JvM4T99ciRdipJDWIshBN1878EB5B2m7VvB9SwcfIRy2bBEW2pNIf+nWBgttbkXqeMNi9JMGgBlcCbK/w==";
       };
     };
-    "@ot-builder/var-store-1.5.0" = {
+    "@ot-builder/var-store-1.5.1" = {
       name = "_at_ot-builder_slash_var-store";
       packageName = "@ot-builder/var-store";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.5.0.tgz";
-        sha512 = "NufILxFqLWcXjhJqG0IgVCDr0ey/e4Q+mX8k0o+SV1/yHdVxug5CrBQnmF7/yIB1Au9FgdZp2eal2Un1gjxQ4A==";
+        url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.5.1.tgz";
+        sha512 = "GJWlE7hDwajX1cvGjChR9rt8kqiC3O5cr9ikFpPyz150zkkqWaLi38sISA1h7Vk/dU5TQ6nVka53/I2Q4tWptA==";
       };
     };
-    "@ot-builder/variance-1.5.0" = {
+    "@ot-builder/variance-1.5.1" = {
       name = "_at_ot-builder_slash_variance";
       packageName = "@ot-builder/variance";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.5.0.tgz";
-        sha512 = "iA8tovocbymAAhA1zRO29vltUlZGfLjYaukyLu3mH8XBgNuxTwb0aUbQ9muDKyWS+E5Q23+KN/PaA8ZwUtlHlA==";
+        url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.5.1.tgz";
+        sha512 = "v4HMolIM+Jigr9N8TTAYnPcGhsUr54WDpJbVVW6fueH54ePD3Z9MYE0X22TAjpFwZbBHUUAjtoHeUP32pMMpqg==";
       };
     };
-    "@parcel/bundler-default-2.4.0" = {
+    "@parcel/bundler-default-2.4.1" = {
       name = "_at_parcel_slash_bundler-default";
       packageName = "@parcel/bundler-default";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.4.0.tgz";
-        sha512 = "RaXlxo0M51739Ko3bsOJpDBZlJ+cqkDoBTozNeSc65jS2TMBIBWLMapm8095qmty39OrgYNhzjgPiIlKDS/LWA==";
+        url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.4.1.tgz";
+        sha512 = "PTfBOuoiiYdfwyoPFeBTOinyl1RL4qaoyAQ0PCe01C1i4NcRWCY1w7zRvwJW/OhU3Ka+LtioGmfxu5/drdXzLg==";
       };
     };
-    "@parcel/cache-2.4.0" = {
+    "@parcel/cache-2.4.1" = {
       name = "_at_parcel_slash_cache";
       packageName = "@parcel/cache";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.4.0.tgz";
-        sha512 = "oOudoAafrCAHQY0zkU7gVHG1pAGBUz9rht7Tx4WupTmAH0O0F5UnZs6XbjoBJaPHg+CYUXK7v9wQcrNA72E3GA==";
+        url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.4.1.tgz";
+        sha512 = "2N5ly++p/yefmPdK39X1QIoA2e6NtS1aYSsxrIC9EX92Kjd7SfSceqUJhlJWB49omJSheEJLd1qM3EJG9EvICQ==";
       };
     };
-    "@parcel/codeframe-2.4.0" = {
+    "@parcel/codeframe-2.4.1" = {
       name = "_at_parcel_slash_codeframe";
       packageName = "@parcel/codeframe";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.4.0.tgz";
-        sha512 = "PJ3W9Z0sjoS2CANyo50c+LEr9IRZrtu0WsVPSYZ5ZYRuSXrSa/6PcAlnkyDk2+hi7Od8ncT2bmDexl0Oar3Jyg==";
+        url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.4.1.tgz";
+        sha512 = "m3WDeEpWvgqekCqsHfPMJrSQquahdIgSR1x1RDCqQ1YelvW0fQiGgu42MXI5tjoBrHC1l1mF01UDb+xMSxz1DA==";
       };
     };
-    "@parcel/compressor-raw-2.4.0" = {
+    "@parcel/compressor-raw-2.4.1" = {
       name = "_at_parcel_slash_compressor-raw";
       packageName = "@parcel/compressor-raw";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.4.0.tgz";
-        sha512 = "ZErX14fTc0gKIgtnuqW7Clfln4dpXWfUaJQQIf5C3x/LkpUeEhdXeKntkvSxOddDk2JpIKDwqzAxEMZUnDo4Nw==";
+        url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.4.1.tgz";
+        sha512 = "cEOOOzIK7glxCqJX0OfBFBZE/iT7tmjEOXswRY3CnqY9FGoY3NYDAsOLm7A73RuIdNaZfYVxVUy3g7OLpbKL+g==";
       };
     };
-    "@parcel/config-default-2.4.0" = {
+    "@parcel/config-default-2.4.1" = {
       name = "_at_parcel_slash_config-default";
       packageName = "@parcel/config-default";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.4.0.tgz";
-        sha512 = "pFOPBXPO6HGqNWTLkcK5i8haMOrRgUouUhcWPGWDpN9IPUYFK2E/O1E/uyMjIA1mSL3FnazI+jJwZ45NhKPpIA==";
+        url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.4.1.tgz";
+        sha512 = "yGA4Mx/KDzVOPm8IYb4Id+zlz1TaIM7s472pxA4tUV1qcEtBInY0aeO9R/GsLKC2+3QPHURZld9WI9EMXRUBBA==";
       };
     };
-    "@parcel/core-2.4.0" = {
+    "@parcel/core-2.4.1" = {
       name = "_at_parcel_slash_core";
       packageName = "@parcel/core";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/core/-/core-2.4.0.tgz";
-        sha512 = "EWZ2UWtIuwDc3fgsKyyTLpNNPoG8Yk2L117ICWF/+cqY8z/wJHm2KwLbeplDeq524shav0GJ9O4CemP3JPx0Nw==";
+        url = "https://registry.npmjs.org/@parcel/core/-/core-2.4.1.tgz";
+        sha512 = "h2FvqLA75ZQdIXX1y+ylGjIIi7YtbAUJyIapxaO081h3EsYG2jr9sRL4sym5ECgmvbyua/DEgtMLX3eGYn09FA==";
       };
     };
-    "@parcel/css-1.7.3" = {
+    "@parcel/css-1.7.4" = {
       name = "_at_parcel_slash_css";
       packageName = "@parcel/css";
-      version = "1.7.3";
+      version = "1.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css/-/css-1.7.3.tgz";
-        sha512 = "rgdRX4Uk31EvzH/mUScL0wdXtkci3U5N1W2pgam+9S10vQy4uONhWBepZ1tUCjONHLacGXr1jp3LbG/HI7LiTw==";
+        url = "https://registry.npmjs.org/@parcel/css/-/css-1.7.4.tgz";
+        sha512 = "K1N9mxEkWQQmSINMNuGvlyPq7yCY+AtHskGxWav97lhu2i8GMMXRV9kc8/x/jkZh5KDBWO5vHhdQiujRBrgR8g==";
       };
     };
-    "@parcel/css-darwin-arm64-1.7.3" = {
+    "@parcel/css-darwin-arm64-1.7.4" = {
       name = "_at_parcel_slash_css-darwin-arm64";
       packageName = "@parcel/css-darwin-arm64";
-      version = "1.7.3";
+      version = "1.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.7.3.tgz";
-        sha512 = "m3HDY+Rh8HJxmLELKAvCpF59vLS7FWtgBODHxl8G9Jl2CnGtXpXvdpyeMxNsTE+2QuPC+a5QT7IeZAKb2Gjmxg==";
+        url = "https://registry.npmjs.org/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.7.4.tgz";
+        sha512 = "fA+aBZAAgXSV7jUQFRYuKpJr5EEqNq++mFu4o/pU/lBFMJhL6Z11aqzrBecC1JziWT3t/BgryWdznf1QkNtM4w==";
       };
     };
-    "@parcel/css-darwin-x64-1.7.3" = {
+    "@parcel/css-darwin-x64-1.7.4" = {
       name = "_at_parcel_slash_css-darwin-x64";
       packageName = "@parcel/css-darwin-x64";
-      version = "1.7.3";
+      version = "1.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-darwin-x64/-/css-darwin-x64-1.7.3.tgz";
-        sha512 = "LuhweXKxVwrz/hjAOm9XNRMSL+p23px20nhSCASkyUP7Higaxza948W3TSQdoL3YyR+wQxQH8Yj+R/T8Tz3E3g==";
+        url = "https://registry.npmjs.org/@parcel/css-darwin-x64/-/css-darwin-x64-1.7.4.tgz";
+        sha512 = "qx/+vEXSmed7eeBgVvV/1lrEjk8KnKUiAN+CCes8d6ddJJzK5evTKQsWkywe1jNdHC33d2mlLlhLFmC2+2IPOw==";
       };
     };
-    "@parcel/css-linux-arm-gnueabihf-1.7.3" = {
+    "@parcel/css-linux-arm-gnueabihf-1.7.4" = {
       name = "_at_parcel_slash_css-linux-arm-gnueabihf";
       packageName = "@parcel/css-linux-arm-gnueabihf";
-      version = "1.7.3";
+      version = "1.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.7.3.tgz";
-        sha512 = "/pd9Em18zMvt7eDZAMpNBEwF7c4VPVhAtBOZ59ClFrsXCTDNYP7mSy0cwNgtLelCRZCGAQmZNBDNQPH7vO3rew==";
+        url = "https://registry.npmjs.org/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.7.4.tgz";
+        sha512 = "+Qf+j8dqJ+t7V/w9LnyWBzNcMG/GnlzjlWNQhiUkt1aYFYPr5i/eRWuWLYxVlz8EGQOUbYlinDGLXTUJDt31gA==";
       };
     };
-    "@parcel/css-linux-arm64-gnu-1.7.3" = {
+    "@parcel/css-linux-arm64-gnu-1.7.4" = {
       name = "_at_parcel_slash_css-linux-arm64-gnu";
       packageName = "@parcel/css-linux-arm64-gnu";
-      version = "1.7.3";
+      version = "1.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.7.3.tgz";
-        sha512 = "5aKiEhQK40riO4iVKzRqISzgYK+7Z7i3e6JTSz+/BHuQyHEUaBe/RuJ8Z0BDQtFz0HmWQlrQCd+7hd0Xgd8vYQ==";
+        url = "https://registry.npmjs.org/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.7.4.tgz";
+        sha512 = "ITP0HZT/Ay6JCgH3W7JpoRUYfciW+jBVBTjglZjYgyYPLLWk2J1kXB+qC3jHp5XCeH4feh7eFB1pyQcE7kqCjA==";
       };
     };
-    "@parcel/css-linux-arm64-musl-1.7.3" = {
+    "@parcel/css-linux-arm64-musl-1.7.4" = {
       name = "_at_parcel_slash_css-linux-arm64-musl";
       packageName = "@parcel/css-linux-arm64-musl";
-      version = "1.7.3";
+      version = "1.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.7.3.tgz";
-        sha512 = "Wf7/aIueDED2JqBMfZvzbBAFSaPmd3TR28bD2pmP7CI/jZnm9vHVKMdOLgt9NKSSSjdGrp+VM410CsrUM7xcOw==";
+        url = "https://registry.npmjs.org/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.7.4.tgz";
+        sha512 = "or61QRhhpsDlHfrc73KP4bPwnnVZWni1jkuRv1mCi+0SzYzoaO190JEaj7VWh/boUvjGiIl//FsLoZleQIWKNA==";
       };
     };
-    "@parcel/css-linux-x64-gnu-1.7.3" = {
+    "@parcel/css-linux-x64-gnu-1.7.4" = {
       name = "_at_parcel_slash_css-linux-x64-gnu";
       packageName = "@parcel/css-linux-x64-gnu";
-      version = "1.7.3";
+      version = "1.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.7.3.tgz";
-        sha512 = "0ZADbuFklUrHC1p2uPY4BPcN07jUTMqJzr/SSdnGN2XiXgiVZGcDCMHUj0DvC9Vwy11DDM6Rnw4QBbKHG+QGjQ==";
+        url = "https://registry.npmjs.org/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.7.4.tgz";
+        sha512 = "GHGsM06F26FAkvPcnsGw7NHxPVD7TQvg7OC7cVAYmETccO8mqs9DyRzBTevk+1kl7EQXNnHDojn7VpVN6q+phg==";
       };
     };
-    "@parcel/css-linux-x64-musl-1.7.3" = {
+    "@parcel/css-linux-x64-musl-1.7.4" = {
       name = "_at_parcel_slash_css-linux-x64-musl";
       packageName = "@parcel/css-linux-x64-musl";
-      version = "1.7.3";
+      version = "1.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.7.3.tgz";
-        sha512 = "mFWWM8lX2OIID81YQuDDt9zTqof0B7UcEcs0huE7Zbs60uLEEQupdf8iH0yh5EOhxPt3sRcQnGXf2QTrXdjIMA==";
+        url = "https://registry.npmjs.org/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.7.4.tgz";
+        sha512 = "H/9wvQ7LNqng9yIwulpfUUhs6zm9+vLCzri2qnC4vm8geyTjA0W0H5fphV8IlzNJ/DfHmoesJ+TXw5NG+QC9hg==";
       };
     };
-    "@parcel/css-win32-x64-msvc-1.7.3" = {
+    "@parcel/css-win32-x64-msvc-1.7.4" = {
       name = "_at_parcel_slash_css-win32-x64-msvc";
       packageName = "@parcel/css-win32-x64-msvc";
-      version = "1.7.3";
+      version = "1.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.7.3.tgz";
-        sha512 = "KUFEMQcoP7DG3QbsN21OxhjHkfQ1BARn7D9puX75bV5N1F1kv557aaLkQZiMsgiYOL4tmJvsdQXutG7x++3j4Q==";
+        url = "https://registry.npmjs.org/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.7.4.tgz";
+        sha512 = "xmg18iISCn1f9IyYUif6yR8FuEmi93qzH55oUiri5vZWuCY8xfraHsRA6i8yLWnxgDmVeHyiN0IICl7rgZo10A==";
       };
     };
-    "@parcel/diagnostic-2.4.0" = {
+    "@parcel/diagnostic-2.4.1" = {
       name = "_at_parcel_slash_diagnostic";
       packageName = "@parcel/diagnostic";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.4.0.tgz";
-        sha512 = "TjWO/b2zMFhub5ouwGjazMm7iAUvdmXBfWmjrg4TBhUbhoQwBnyWfvMDtAYo7PcvXfxVPgPZv86Nv6Ym5H6cHQ==";
+        url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.4.1.tgz";
+        sha512 = "wmJIfn0PG2ABuraS+kMjl6UKaLjTDTtG+XkjJLWHzU/dd5RozqAZDKp65GWjvHzHLx7KICTAdUJsXh2s3TnTOQ==";
       };
     };
-    "@parcel/events-2.4.0" = {
+    "@parcel/events-2.4.1" = {
       name = "_at_parcel_slash_events";
       packageName = "@parcel/events";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/events/-/events-2.4.0.tgz";
-        sha512 = "DEaEtFbhOhNAEmiXJ3MyF8Scq+sNDKiTyLax4lAC5/dpE5GvwfNnoD17C2+0gDuuDpdQkdHfXfvr50aYFt7jcw==";
+        url = "https://registry.npmjs.org/@parcel/events/-/events-2.4.1.tgz";
+        sha512 = "er2jwyzYt3Zimkrp7TR865GIeIMYNd7YSSxW39y/egm4LIPBsruUpHSnKRD5b65Jd+gckkxDsnrpADG6MH1zNw==";
       };
     };
     "@parcel/fs-1.11.0" = {
@@ -7006,40 +7033,40 @@ let
         sha512 = "86RyEqULbbVoeo8OLcv+LQ1Vq2PKBAvWTU9fCgALxuCTbbs5Ppcvll4Vr+Ko1AnmMzja/k++SzNAwJfeQXVlpA==";
       };
     };
-    "@parcel/fs-2.4.0" = {
+    "@parcel/fs-2.4.1" = {
       name = "_at_parcel_slash_fs";
       packageName = "@parcel/fs";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.4.0.tgz";
-        sha512 = "CnUlWGUJ52SJVQi8QnaAPPQZOADmHMV9D9aX9GLcDm5XLT3Em7vmesG4bNLdMLwzYuzAtenhcWmuRCACuYztHw==";
+        url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.4.1.tgz";
+        sha512 = "kE9HzW6XjO/ZA5bQnAzp1YVmGlXeDqUaius2cH2K0wU7KQX/GBjyfEWJm/UsKPB6QIrGXgkPH6ashNzOgwDqpw==";
       };
     };
-    "@parcel/fs-search-2.4.0" = {
+    "@parcel/fs-search-2.4.1" = {
       name = "_at_parcel_slash_fs-search";
       packageName = "@parcel/fs-search";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.4.0.tgz";
-        sha512 = "W/Vu6wbZk4wuB6AVdMkyymwh/S8Peed/PgJgSsApYD6lSTD315I6OuEdxZh3lWY+dqQdog/NJ7dvi/hdpH/Iqw==";
+        url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.4.1.tgz";
+        sha512 = "xfoLvHjHkZm4VZf3UWU5v6gzz+x7IBVY7siHGn0YyGwvlv73FmiR4mCSizqerXOyXknF2fpg6tNHNQyyNLS32Q==";
       };
     };
-    "@parcel/graph-2.4.0" = {
+    "@parcel/graph-2.4.1" = {
       name = "_at_parcel_slash_graph";
       packageName = "@parcel/graph";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.4.0.tgz";
-        sha512 = "5TZIAfDITkJCzgH4j4OQhnIvjV9IFwWqNBJanRl5QQTmKvdcODS3WbnK1SOJ+ZltcLVXMB+HNXmL0bX0tVolcw==";
+        url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.4.1.tgz";
+        sha512 = "3JCnPI9BJdKpGIk6NtVN7ML3C/J9Ey+WfUfk8WisDxFP7vjYkXwZbNSR/HnxH+Y03wmB6cv4HI8A4kndF0H0pw==";
       };
     };
-    "@parcel/hash-2.4.0" = {
+    "@parcel/hash-2.4.1" = {
       name = "_at_parcel_slash_hash";
       packageName = "@parcel/hash";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.4.0.tgz";
-        sha512 = "nB+wYNUhe6+G8M7vQhdeFXtpYJYwJgBHOPZ7Hd9O2jdlamWjDbw0t/u1dJbYvGJ8ZDtLDwiItawQVpuVdskQ9g==";
+        url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.4.1.tgz";
+        sha512 = "Ch1kkFPedef3geapU+XYmAdZY29u3eQXn/twMjowAKkWCmj6wZ+muUgBmOO2uCfK3xys7GycI8jYZcAbF5DVLg==";
       };
     };
     "@parcel/logger-1.11.1" = {
@@ -7051,211 +7078,211 @@ let
         sha512 = "9NF3M6UVeP2udOBDILuoEHd8VrF4vQqoWHEafymO1pfSoOMfxrSJZw1MfyAAIUN/IFp9qjcpDCUbDZB+ioVevA==";
       };
     };
-    "@parcel/logger-2.4.0" = {
+    "@parcel/logger-2.4.1" = {
       name = "_at_parcel_slash_logger";
       packageName = "@parcel/logger";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.4.0.tgz";
-        sha512 = "DqfU0Zcs/0a7VBk+MsjJ80C66w4kM9EbkO3G12NIyEjNeG50ayW2CE9rUuJ91JaM9j0NFM1P82eyLpQPFFaVPw==";
+        url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.4.1.tgz";
+        sha512 = "wm7FoKY+1dyo+Dd7Z4b0d6hmpgRBWfZwCoZSSyhgbG96Ty68/oo3m7oEMXPfry8IVGIhShmWKDp4py44PH3l7w==";
       };
     };
-    "@parcel/markdown-ansi-2.4.0" = {
+    "@parcel/markdown-ansi-2.4.1" = {
       name = "_at_parcel_slash_markdown-ansi";
       packageName = "@parcel/markdown-ansi";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.4.0.tgz";
-        sha512 = "gPUP1xikxHiu2kFyPy35pfuVkFgAmcywO8YDQj7iYcB+k7l4QPpIYFYGXn2QADV4faf66ncMeTD4uYV8c0GqjQ==";
+        url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.4.1.tgz";
+        sha512 = "BkWhzbKQhTQ9lS96ZMMG0KyXSJBFdNeBVobWrdrrwcFlNER0nt2m6fdF7Hfpf1TqFhM4tT+GNFtON7ybL53RiQ==";
       };
     };
-    "@parcel/namer-default-2.4.0" = {
+    "@parcel/namer-default-2.4.1" = {
       name = "_at_parcel_slash_namer-default";
       packageName = "@parcel/namer-default";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.4.0.tgz";
-        sha512 = "DfL+Gx0Tyoa0vsgRpNybXjuKbWNw8MTVpy7Dk7r0btfVsn1jy3SSwlxH4USf76gb00/pK6XBsMp9zn7Z8ePREQ==";
+        url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.4.1.tgz";
+        sha512 = "a/Xulfia7JJP6Cw/D6Wq5xX6IAKVKMRPEYtU2wB8vKuwC/et6kXi+0bFVeCLnTjDzVtsjDdyOEwfRC4yiEy3BA==";
       };
     };
-    "@parcel/node-resolver-core-2.4.0" = {
+    "@parcel/node-resolver-core-2.4.1" = {
       name = "_at_parcel_slash_node-resolver-core";
       packageName = "@parcel/node-resolver-core";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.4.0.tgz";
-        sha512 = "qiN97XcfW2fYNoYuVEhNKuVPEJKj5ONQl0fqr/NEMmYvWz3bVKjgiXNJwW558elZvCI08gEbdxgyThpuFFQeKQ==";
+        url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.4.1.tgz";
+        sha512 = "CvCADj3l4o5USqz/ZCaqbK8gdAQK63q94oSa0KnP6hrcDI/gDyf5Bk4+3cD4kSI+ByuN6aFLAYBS2nHBh5O/MQ==";
       };
     };
-    "@parcel/optimizer-css-2.4.0" = {
+    "@parcel/optimizer-css-2.4.1" = {
       name = "_at_parcel_slash_optimizer-css";
       packageName = "@parcel/optimizer-css";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.4.0.tgz";
-        sha512 = "LQmjjOGsHEHKTJqfHR2eJyhWhLXvHP0uOAU+qopBttYYlB2J/vMK9RYAye5cyAb8bQmV8wAdi2mq9rnt7FMSPw==";
+        url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.4.1.tgz";
+        sha512 = "+1CxZ43aoAUF8Hj2wLPK4d+TzdJlgYidXJ19Qwlh6XdQs8OeFGBAzIsUBFSr8+XCugXmnTkjYK94nX04Z2FhtQ==";
       };
     };
-    "@parcel/optimizer-htmlnano-2.4.0" = {
+    "@parcel/optimizer-htmlnano-2.4.1" = {
       name = "_at_parcel_slash_optimizer-htmlnano";
       packageName = "@parcel/optimizer-htmlnano";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.4.0.tgz";
-        sha512 = "02EbeElLgNOAYhGU7fFBahpoKrX5G/yzahpaoKB/ypScM4roSsAMBkGcluboR5L10YRsvfvJEpxvfGyDA3tPmw==";
+        url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.4.1.tgz";
+        sha512 = "JkykHZcBS92iggT7GHuJJd+MDIc7BMAG0xxTJIY9KzzcxGNYsY8P3LedGVTL0/X8tkdlYQSGNLkTCntP0/62cw==";
       };
     };
-    "@parcel/optimizer-image-2.4.0" = {
+    "@parcel/optimizer-image-2.4.1" = {
       name = "_at_parcel_slash_optimizer-image";
       packageName = "@parcel/optimizer-image";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.4.0.tgz";
-        sha512 = "Q4onaBMPkDyYxPzrb8ytBUftaQZFepj9dSUgq+ETuHDzkgia0tomDPfCqrw6ld0qvYyANzXTP5+LC4g0i5yh+A==";
+        url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.4.1.tgz";
+        sha512 = "cv03Ta1FWuF75o9DJLuk1eYk1ULSdSbSkriQUAzc4InKW1bJH6gJasMZSTBsAg2Oz1TWqiDyiy5D/6i/UPoBJg==";
       };
     };
-    "@parcel/optimizer-svgo-2.4.0" = {
+    "@parcel/optimizer-svgo-2.4.1" = {
       name = "_at_parcel_slash_optimizer-svgo";
       packageName = "@parcel/optimizer-svgo";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.4.0.tgz";
-        sha512 = "mwvGuCqVuNCAuMlp2maFE/Uz9ud1T1AuX0f6cCRczjFYiwZuIr/0iDdfFzSziOkVo1MRAGAZNa0dRR/UzCZtVg==";
+        url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.4.1.tgz";
+        sha512 = "sOiofvHXjwJDu0NnTO8gGKDv0BztykVczfJdcedYmj207uU71JG1uODZvhyY4uiw1eRqmZnIXELZIftvYnZnDA==";
       };
     };
-    "@parcel/optimizer-terser-2.4.0" = {
+    "@parcel/optimizer-terser-2.4.1" = {
       name = "_at_parcel_slash_optimizer-terser";
       packageName = "@parcel/optimizer-terser";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.4.0.tgz";
-        sha512 = "PdCgRgXNSY6R1HTV9VG2MHp1CgUbP5pslCyxvlbUmQAS6bvEpMOpn3qSd+U28o7mGE/qXIhvpDyi808sb+MEcg==";
+        url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.4.1.tgz";
+        sha512 = "naRdp6gApWHUI1FCBZEJs9NzNngjZx8hRhIHeQtTxWpc2Mu8cVzxbVHNAwUj10nW3iOYmxyj4wleOArl8xpVCQ==";
       };
     };
-    "@parcel/package-manager-2.4.0" = {
+    "@parcel/package-manager-2.4.1" = {
       name = "_at_parcel_slash_package-manager";
       packageName = "@parcel/package-manager";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.4.0.tgz";
-        sha512 = "21AEfAQnZbHRVViTn7QsPGe/CiGaFaDUH5f0m8qVC7fDjjhC8LM8blkqU72goaO9FbaLMadtEf2txhzly7h/bg==";
+        url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.4.1.tgz";
+        sha512 = "JUUinm4U3hy4epHl9A389xb+BGiFR8n9+qw3Z4UDfS1te43sh8+0virBGcnai/G7mlr5/vHW+l9xulc7WQaY6w==";
       };
     };
-    "@parcel/packager-css-2.4.0" = {
+    "@parcel/packager-css-2.4.1" = {
       name = "_at_parcel_slash_packager-css";
       packageName = "@parcel/packager-css";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.4.0.tgz";
-        sha512 = "LmPDWzkXi60Oy3WrPF0jPKQxeTwW5hmNBgrcXJMHSu+VcXdaQZNzNxVzhnZkJUbDd2z9vAUrUGzdLh8TquC8iQ==";
+        url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.4.1.tgz";
+        sha512 = "COx6RvHbpZ3DzuAgB/XvLLR/luxn9kYhqdFrnmIlYBh4B9atfXyr4rKDlWj1W/r2R72R6LHM35KhkwUATmrC/w==";
       };
     };
-    "@parcel/packager-html-2.4.0" = {
+    "@parcel/packager-html-2.4.1" = {
       name = "_at_parcel_slash_packager-html";
       packageName = "@parcel/packager-html";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.4.0.tgz";
-        sha512 = "OPMIQ1uHYQFpRPrsmm5BqONbAyzjlhVsPRAzHlcBrglG4BTUeOR2ow4MUKblHmVVqc3QHnfZG4nHHtFkeuNQ3A==";
+        url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.4.1.tgz";
+        sha512 = "F5/PmWKoz8JhToufnp3u+NQ4LUoVkabzIJYHyQrM858XVmNbMInRfiTYxtgCBa2ARm2BTPhToh7N01OEyFCOhA==";
       };
     };
-    "@parcel/packager-js-2.4.0" = {
+    "@parcel/packager-js-2.4.1" = {
       name = "_at_parcel_slash_packager-js";
       packageName = "@parcel/packager-js";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.4.0.tgz";
-        sha512 = "cfslIH43CJFgBS9PmdFaSnbInMCoejsFCnxtJa2GeUpjCXSfelPRp0OPx7m8n+fap4czftPhoxBALeDUElOZGQ==";
+        url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.4.1.tgz";
+        sha512 = "broWBUQisJLF5ThFtnl/asypuLMlMBwFPBTr8Ho9FYlL6W4wUzIymu7eOcuDljstmbD6luNVGMdCBYqt3IhHmw==";
       };
     };
-    "@parcel/packager-raw-2.4.0" = {
+    "@parcel/packager-raw-2.4.1" = {
       name = "_at_parcel_slash_packager-raw";
       packageName = "@parcel/packager-raw";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.4.0.tgz";
-        sha512 = "SFfw7chMFITj3J26ZVDJxbO6xwtPFcFBm1js8cwWMgzwuwS6CEc43k5+Abj+2/EqHU9kNJU9eWV5vT6lQwf3HA==";
+        url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.4.1.tgz";
+        sha512 = "4lCY3TjiYaZyRIqshNF21i6XkQ5PJyr+ahhK4O2IymuYuD8/wGH2amTZqKPpGLuiF3j1HskRRUNv1ekpvExJ8w==";
       };
     };
-    "@parcel/packager-svg-2.4.0" = {
+    "@parcel/packager-svg-2.4.1" = {
       name = "_at_parcel_slash_packager-svg";
       packageName = "@parcel/packager-svg";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.4.0.tgz";
-        sha512 = "DwkgrdLEQop+tu9Ocr1ZaadmpsbSgVruJPr80xq1LaB0Jiwrl9HjHStMNH1laNFueK1yydxhnj9C2JQfW28qag==";
+        url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.4.1.tgz";
+        sha512 = "V7GW/dgJPqXHReTzwpLcNEdyT5WWveYOW1MfxvKgOOK1ENk6oPgXL0FUdm5IHzqlK1bbwF5hzSQs2vaJMv7rPg==";
       };
     };
-    "@parcel/plugin-2.4.0" = {
+    "@parcel/plugin-2.4.1" = {
       name = "_at_parcel_slash_plugin";
       packageName = "@parcel/plugin";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.4.0.tgz";
-        sha512 = "ehFUAL2+h27Lv+cYbbXA74UGy8C+eglUjcpvASOOjVRFuD6poMAMliKkKAXBhQaFx/Rvhz27A2PIPv9lL2i4UQ==";
+        url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.4.1.tgz";
+        sha512 = "EJzNhwNWYuSpIPRlG1U2hKcovq/RsVie4Os1z51/e2dcCto/uAoJOMoWYYsCxtjkJ7BjFYyQ7fcZRKM9DEr6gQ==";
       };
     };
-    "@parcel/reporter-cli-2.4.0" = {
+    "@parcel/reporter-cli-2.4.1" = {
       name = "_at_parcel_slash_reporter-cli";
       packageName = "@parcel/reporter-cli";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.4.0.tgz";
-        sha512 = "Q9bIFMaGvQgypCDxdMEKOwrJzIHAXScKkuFsqTHnUL6mmH3Mo2CoEGAq/wpMXuPhXRn1dPJcHgTNDwZ2fSzz0A==";
+        url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.4.1.tgz";
+        sha512 = "99v/dSQ6wYmfpjmBxbsuBoxPWu9bm7PRxDDJxiVapbbym50bWYwVmMEHj6mYnK151YbMssV0garrSs1yYQEvqw==";
       };
     };
-    "@parcel/reporter-dev-server-2.4.0" = {
+    "@parcel/reporter-dev-server-2.4.1" = {
       name = "_at_parcel_slash_reporter-dev-server";
       packageName = "@parcel/reporter-dev-server";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.4.0.tgz";
-        sha512 = "24h++wevs7XYuX4dKa4PUfLSstvn3g7udajFv6CeQoME+dR25RL/wH/2LUbhV5ilgXXab76rWIndSqp78xHxPA==";
+        url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.4.1.tgz";
+        sha512 = "tRz1LHiudDhujBC3kJ3Qm0Wnbo3p3SpE6fjyCFRhdv2PJnEufNTTwzEUoa7lYZACwFVQUtrh6F7nMXFw6ynrsQ==";
       };
     };
-    "@parcel/resolver-default-2.4.0" = {
+    "@parcel/resolver-default-2.4.1" = {
       name = "_at_parcel_slash_resolver-default";
       packageName = "@parcel/resolver-default";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.4.0.tgz";
-        sha512 = "K7pIIFmGm1hjg/7Mzkg99i8tfCClKfBUTuc2R5j8cdr2n0mCAi4/f2mFf5svLrb5XZrnDgoQ05tHKklLEfUDUw==";
+        url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.4.1.tgz";
+        sha512 = "iJRt1+7lk0n7+wb+S/tVyiObbaiYP1YQGKRsTE8y4Kgp4/OPukdUHGFJwzbojWa0HnyoXm3zEgelVz7cHl47fQ==";
       };
     };
-    "@parcel/runtime-browser-hmr-2.4.0" = {
+    "@parcel/runtime-browser-hmr-2.4.1" = {
       name = "_at_parcel_slash_runtime-browser-hmr";
       packageName = "@parcel/runtime-browser-hmr";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.4.0.tgz";
-        sha512 = "swPFtvxGoCA9LEjU/pHPNjxG1l0fte8447zXwRN/AaYrtjNu9Ww117OSKCyvCnE143E79jZOFStodTQGFuH+9A==";
+        url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.4.1.tgz";
+        sha512 = "INsr78Kn0OuwMdXHCzw7v6l3Gf/UBTYtX7N7JNDOIBEFFkuZQiFWyAOI2P/DvMm8qeqcsrKliBO5Xty/a2Ivaw==";
       };
     };
-    "@parcel/runtime-js-2.4.0" = {
+    "@parcel/runtime-js-2.4.1" = {
       name = "_at_parcel_slash_runtime-js";
       packageName = "@parcel/runtime-js";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.4.0.tgz";
-        sha512 = "67OOvmkDdtmgzZVP/EyAzoXhJ/Ug3LUVUt7idg9arun5rdJptqEb3Um3wmH0zjcNa9jMbJt7Kl5x1wA8dJgPYg==";
+        url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.4.1.tgz";
+        sha512 = "/EXwRpo+GPvWgN5yD0hjjt84Gm6QWp757dqOOzTG5R2rm1WU+g1a+zJJB1zXkxhu9lleQs44D1jEffzhh2Voyw==";
       };
     };
-    "@parcel/runtime-react-refresh-2.4.0" = {
+    "@parcel/runtime-react-refresh-2.4.1" = {
       name = "_at_parcel_slash_runtime-react-refresh";
       packageName = "@parcel/runtime-react-refresh";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.4.0.tgz";
-        sha512 = "flnr+bf06lMZPbXZZLLaFNrPHvYpfuXTVovEghyUW46qLVpaHj33dpsU/LqZplIuHgBp2ibgrKhr/hY9ell68w==";
+        url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.4.1.tgz";
+        sha512 = "a4GBQ/fO7Mklh1M1G2JVpJBPbZD7YXUPAzh9Y4vpCf0ouTHBRMc8ew4CyKPJIrrTly5P42tFWnD3P4FVNKwHOQ==";
       };
     };
-    "@parcel/runtime-service-worker-2.4.0" = {
+    "@parcel/runtime-service-worker-2.4.1" = {
       name = "_at_parcel_slash_runtime-service-worker";
       packageName = "@parcel/runtime-service-worker";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.4.0.tgz";
-        sha512 = "RgM5QUqW22WzstW03CtV+Oih8VGVuwsf94Cc4hLouU2EAD0NUJgATWbFocZVTZIBTKELAWh2gjpSQDdnL4Ur+A==";
+        url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.4.1.tgz";
+        sha512 = "WtMKSiyQ0kF78rBw0XIx7n65mMb+6GBx+5m49r1aVZzeZEOSynpjJzJvqo7rxVmA7qTDkD2bko7BH41iScsEaw==";
       };
     };
     "@parcel/source-map-2.0.2" = {
@@ -7267,112 +7294,112 @@ let
         sha512 = "NnUrPYLpYB6qyx2v6bcRPn/gVigmGG6M6xL8wIg/i0dP1GLkuY1nf+Hqdf63FzPTqqT7K3k6eE5yHPQVMO5jcA==";
       };
     };
-    "@parcel/transformer-babel-2.4.0" = {
+    "@parcel/transformer-babel-2.4.1" = {
       name = "_at_parcel_slash_transformer-babel";
       packageName = "@parcel/transformer-babel";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.4.0.tgz";
-        sha512 = "iWDa7KzJTMP3HNmrYxiYq/S6redk2qminx/9MwmKIN9jzm8mgts2Lj9lOg/t66YaDGky6JAvw4DhB2qW4ni6yQ==";
+        url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.4.1.tgz";
+        sha512 = "S+L14Fdr+S/+hqOi2nqnhuJvBbEJW24KyQeLmdaoMkt7DQLy5zENjGb9U2WYgB0Q96au0vX8NgB6jOnONecnpg==";
       };
     };
-    "@parcel/transformer-css-2.4.0" = {
+    "@parcel/transformer-css-2.4.1" = {
       name = "_at_parcel_slash_transformer-css";
       packageName = "@parcel/transformer-css";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.4.0.tgz";
-        sha512 = "D2u48LuiQsQvbknABE0wVKFp9r6yCgWrHKEP1J6EJ31c49nXGXDHrpHJJwqq9BvAs/124eBI5mSsehTJyFEMwg==";
+        url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.4.1.tgz";
+        sha512 = "+6wCc0eEg4ez96Mucp/RjYKyRVN+7HPWPH7axalsQdp88t7wawWoqI2nd2mEw2PxpyuejIsk0ixLzYZ5opZivw==";
       };
     };
-    "@parcel/transformer-html-2.4.0" = {
+    "@parcel/transformer-html-2.4.1" = {
       name = "_at_parcel_slash_transformer-html";
       packageName = "@parcel/transformer-html";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.4.0.tgz";
-        sha512 = "2/8X/o5QaCNVPr4wkxLCUub7v/YVvVN2L5yCEcTatNeFhNg/2iz7P2ekfqOaoDCHWZEOBT1VTwPbdBt+TMM71Q==";
+        url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.4.1.tgz";
+        sha512 = "jyteTWuBA+f5wXn1RmAq3gOnB3yy41c748vARU9uNEXkLB4a7R106w4e5dlTG1DJfk+Tw1okSe1p2BeHoZntAw==";
       };
     };
-    "@parcel/transformer-image-2.4.0" = {
+    "@parcel/transformer-image-2.4.1" = {
       name = "_at_parcel_slash_transformer-image";
       packageName = "@parcel/transformer-image";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.4.0.tgz";
-        sha512 = "JZkQvGGoGiD0AVKLIbAYYUWxepMmUaWZ4XXx71MmS/kA7cUDwTZ0CXq63YnSY1m+DX+ClTuTN8mBlwe2dkcGbA==";
+        url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.4.1.tgz";
+        sha512 = "pOfgPVe13lMTKdzydjXXNl4bojVMmuQmwm44OZ9cmpwOD3phkZzCtrxgySoV1eRBCOipdQg1O6GGI3za1KNdvw==";
       };
     };
-    "@parcel/transformer-js-2.4.0" = {
+    "@parcel/transformer-js-2.4.1" = {
       name = "_at_parcel_slash_transformer-js";
       packageName = "@parcel/transformer-js";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.4.0.tgz";
-        sha512 = "eeLHFwv3jT3GmIxpLC7B8EXExGK0MFaK91HXljOMh6l8a+GlQYw27MSFQVtoXr0Olx9Uq2uvjXP1+zSsq3LQUQ==";
+        url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.4.1.tgz";
+        sha512 = "39Y9RUuDk5dc09Z3Pgj8snQd5E8926IqOowdTLKNJr7EcmkwHdinbpI4EqgKnisOwX4NSzxUti1I2DHsP1QZHw==";
       };
     };
-    "@parcel/transformer-json-2.4.0" = {
+    "@parcel/transformer-json-2.4.1" = {
       name = "_at_parcel_slash_transformer-json";
       packageName = "@parcel/transformer-json";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.4.0.tgz";
-        sha512 = "3nR+d39mbURoXIypDfVCaxpwL65qMV+h8SLD78up2uhaRGklHQfN7GuemR7L+mcVAgNrmwVvZHhyNjdgYwWqqg==";
+        url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.4.1.tgz";
+        sha512 = "bAwKyWb2/Wm6GS7OpQg1lWgcq+VDBXTKy5oFGX3edbpZFsrb59Ln1v+1jI888zRq4ehDBybhx8WTxPKTJnU+jA==";
       };
     };
-    "@parcel/transformer-postcss-2.4.0" = {
+    "@parcel/transformer-postcss-2.4.1" = {
       name = "_at_parcel_slash_transformer-postcss";
       packageName = "@parcel/transformer-postcss";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.4.0.tgz";
-        sha512 = "ijIa2x+dbKnJhr7zO5WlXkvuj832fDoGksMBk2DX3u2WMrbh2rqVWPpGFsDhESx7EAy38nUoV/5KUdrNqUmCEA==";
+        url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.4.1.tgz";
+        sha512 = "I+jauarY5RlDUcd0zb9CC4GlpA7/+FqNSqCaGrM73aoszh6FNs4GiwD5tgy0pKOEASBZ0fBPmHEG1OBiVBXRGg==";
       };
     };
-    "@parcel/transformer-posthtml-2.4.0" = {
+    "@parcel/transformer-posthtml-2.4.1" = {
       name = "_at_parcel_slash_transformer-posthtml";
       packageName = "@parcel/transformer-posthtml";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.4.0.tgz";
-        sha512 = "xoL3AzgtVeRRAo6bh0AHAYm9bt1jZ+HiH86/7oARj/uJs6Wd8kXK/DZf6fH+F87hj4e7bnjmDDc0GPVK0lPz1w==";
+        url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.4.1.tgz";
+        sha512 = "DNtS41Sew940vnnqlFS0QK3ZbjQqCGT8JXkvwFojIrdH+3BW/n/9Hrtxj+X/bxrlwZlsRiqiRJ7crXp7TVhx2g==";
       };
     };
-    "@parcel/transformer-raw-2.4.0" = {
+    "@parcel/transformer-raw-2.4.1" = {
       name = "_at_parcel_slash_transformer-raw";
       packageName = "@parcel/transformer-raw";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.4.0.tgz";
-        sha512 = "fciFbNrzj0kLlDgr6OsI0PUv414rVygDWAsgbCCq4BexDkuemMs9f9FjMctx9B2VZlctE8dTT4RGkuQumTIpUg==";
+        url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.4.1.tgz";
+        sha512 = "0PzdWJSGSTQ522aohymHEnq4GABy0mHSs+LkPZyMfNmX9ZAIyy6XuFJ9dz8nUmP4Nhn8qDvbRjoAYXR3XsGDGQ==";
       };
     };
-    "@parcel/transformer-react-refresh-wrap-2.4.0" = {
+    "@parcel/transformer-react-refresh-wrap-2.4.1" = {
       name = "_at_parcel_slash_transformer-react-refresh-wrap";
       packageName = "@parcel/transformer-react-refresh-wrap";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.4.0.tgz";
-        sha512 = "9+f6sGOWkf0jyUQ1CuFWk+04Mq3KTOCU9kRiwCHX1YdUCv5uki6r9XUSpqiYodrV+L6w9CCwLvGMLCDHxtCxMg==";
+        url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.4.1.tgz";
+        sha512 = "zF6pzj/BwSiD1jA/BHDCEJnKSIDekjblU+OWp1WpSjA1uYkJORuZ5knLcq6mXOQ8M2NCbOXosc1ru8071i8sYA==";
       };
     };
-    "@parcel/transformer-svg-2.4.0" = {
+    "@parcel/transformer-svg-2.4.1" = {
       name = "_at_parcel_slash_transformer-svg";
       packageName = "@parcel/transformer-svg";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.4.0.tgz";
-        sha512 = "D+yzVtSxtQML3d26fd/g4E/xYW68+OMbMUVLXORtoYMU42fnXQkJP6jGOdqy8Td+WORNY7EwVtQnESLwhBmolw==";
+        url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.4.1.tgz";
+        sha512 = "E0XdXsZOnP7g9zvJskfvXeIHx9pKjPHtLKo/txmpjW1eXOmsFcRMVy6l4pFh+kBciAgiZOI6o1pVHt+Uf7ia/g==";
       };
     };
-    "@parcel/types-2.4.0" = {
+    "@parcel/types-2.4.1" = {
       name = "_at_parcel_slash_types";
       packageName = "@parcel/types";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/types/-/types-2.4.0.tgz";
-        sha512 = "nysGIbBEnp+7R+tKTysdcTFOZDTCodsiXFeAhYQa5bhiOnG1l9gzhxQnE2OsdsgvMm40IOsgKprqvM/DbdLfnQ==";
+        url = "https://registry.npmjs.org/@parcel/types/-/types-2.4.1.tgz";
+        sha512 = "YqkiyGS8oiD89Z2lJP7sbjn0F0wlSJMAuqgqf7obeKj0zmZJS7n2xK0uUEuIlUO+Cbqgl0kCGsUSjuT8xcEqjg==";
       };
     };
     "@parcel/utils-1.11.0" = {
@@ -7384,13 +7411,13 @@ let
         sha512 = "cA3p4jTlaMeOtAKR/6AadanOPvKeg8VwgnHhOyfi0yClD0TZS/hi9xu12w4EzA/8NtHu0g6o4RDfcNjqN8l1AQ==";
       };
     };
-    "@parcel/utils-2.4.0" = {
+    "@parcel/utils-2.4.1" = {
       name = "_at_parcel_slash_utils";
       packageName = "@parcel/utils";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.4.0.tgz";
-        sha512 = "sdNo+mZqDZT8LJYB6WWRKa4wFVZcK6Zb5Jh6Du76QvXXwHbPIQNZgJBb6gd/Rbk4GLOp2tW7MnBfq6zP9E9E2g==";
+        url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.4.1.tgz";
+        sha512 = "hmbrnPtFAfMT6s9FMMIVlIzCwEFX/+byB67GoJmSCAMRmj6RMu4a6xKlv2FdzkTKJV2ucg8vxAcua0MQ/q8rkQ==";
       };
     };
     "@parcel/watcher-1.12.1" = {
@@ -7420,13 +7447,13 @@ let
         sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ==";
       };
     };
-    "@parcel/workers-2.4.0" = {
+    "@parcel/workers-2.4.1" = {
       name = "_at_parcel_slash_workers";
       packageName = "@parcel/workers";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.4.0.tgz";
-        sha512 = "eSFyvEoXXPgFzQfKIlpkUjpHfIbezUCRFTPKyJAKCxvU5DSXOpb1kz5vDESWQ4qTZXKnrKvxS1PPWN6bam9z0g==";
+        url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.4.1.tgz";
+        sha512 = "EYujbJOblFqIt2NGQ+baIYTuavJqbhy84IfZ3j0jmACeKO5Ew1EHXZyl9LJgWHKaIPZsnvnbxw2mDOF05K65xQ==";
       };
     };
     "@peculiar/asn1-schema-2.1.0" = {
@@ -7501,22 +7528,22 @@ let
         sha512 = "DiIjtous4XPuR2deTctD3/RVZy/vRzVYBgYYvHV313MmTfkbVP60qLH5txrT3/bYNvnb0poNDelLS6U0kqlvHA==";
       };
     };
-    "@prisma/engines-3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9" = {
+    "@prisma/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" = {
       name = "_at_prisma_slash_engines";
       packageName = "@prisma/engines";
-      version = "3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9";
+      version = "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9.tgz";
-        sha512 = "MILbsGnvmnhCbFGa2/iSnsyGyazU3afzD7ldjCIeLIGKkNBMSZgA2IvpYsAXl+6qFHKGrS3B2otKfV31dwMSQw==";
+        url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980.tgz";
+        sha512 = "zULjkN8yhzS7B3yeEz4aIym4E2w1ChrV12i14pht3ePFufvsAvBSoZ+tuXMvfSoNTgBS5E4bolRzLbMmbwkkMQ==";
       };
     };
-    "@prisma/prisma-fmt-wasm-3.11.0-48.b371888aaf8f51357c7457d836b86d12da91658b" = {
+    "@prisma/prisma-fmt-wasm-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" = {
       name = "_at_prisma_slash_prisma-fmt-wasm";
       packageName = "@prisma/prisma-fmt-wasm";
-      version = "3.11.0-48.b371888aaf8f51357c7457d836b86d12da91658b";
+      version = "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.11.0-48.b371888aaf8f51357c7457d836b86d12da91658b.tgz";
-        sha512 = "bp8ksqxPmTIuAF13ujxtyUnbbeQl5H3EVLUDjswSARK/8dwQ6ORQC/Ho1wv63joyiuZstwl7K3FgqIY1OB1lcA==";
+        url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980.tgz";
+        sha512 = "9L+jHXt1zFcnhhcxa+oUBI9r0qh+fNFtDKxndj0C4pnAnGGNevvAo4GZNqWICa8BJbNgiV/XacTMea+98e1Rhw==";
       };
     };
     "@protobufjs/aspromise-1.1.2" = {
@@ -7690,13 +7717,13 @@ let
         sha512 = "y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw==";
       };
     };
-    "@redocly/openapi-core-1.0.0-beta.90" = {
+    "@redocly/openapi-core-1.0.0-beta.93" = {
       name = "_at_redocly_slash_openapi-core";
       packageName = "@redocly/openapi-core";
-      version = "1.0.0-beta.90";
+      version = "1.0.0-beta.93";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.90.tgz";
-        sha512 = "MvkME+AWCBexyJyNp/sVFRUBjxCSk5CQ+CAozkwm0t/HusXp9G+kH26+e9giD6Fms129smr1qp3pCAUbwJZzZA==";
+        url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.93.tgz";
+        sha512 = "xQj7UnjPj3mKtkyRrm+bjzEoyo0CVNjGP4pV6BzQ0vgKf0Jqq7apFC703psyBH+JscYr7NKK1hPQU76ylhFDdg==";
       };
     };
     "@redocly/react-dropdown-aria-2.0.12" = {
@@ -7753,13 +7780,13 @@ let
         sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==";
       };
     };
-    "@schematics/angular-13.3.0" = {
+    "@schematics/angular-13.3.1" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "13.3.0";
+      version = "13.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.3.0.tgz";
-        sha512 = "WND6DXWf0ZFefqlC2hUm1FzHDonRfGpDEPWVhVulhYkB7IUUaXuCz8K41HAScyJ3bxUngs2Lx9+4omikc05fxA==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.3.1.tgz";
+        sha512 = "+lrK/d1eJsAK6d6E9TDeg3Vc71bDy1KsE8M+lEINdX9Wax22mAz4pw20X9RSCw5RHgn+XcNUuMsgRJAwVhDNpg==";
       };
     };
     "@segment/loosely-validate-event-2.0.0" = {
@@ -7780,13 +7807,13 @@ let
         sha512 = "J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA==";
       };
     };
-    "@serverless/dashboard-plugin-6.2.0" = {
+    "@serverless/dashboard-plugin-6.2.1" = {
       name = "_at_serverless_slash_dashboard-plugin";
       packageName = "@serverless/dashboard-plugin";
-      version = "6.2.0";
+      version = "6.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.2.0.tgz";
-        sha512 = "3vapxoW1hI8OBxLRJq+J9vt3tdckZObhYWfwRPDlqPs6FOEoHuJieAzz07e7YdWt7fO/LkQx6rlgCXlGamLnjw==";
+        url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.2.1.tgz";
+        sha512 = "ZvkDZsakoVluEbaQsskY1fW8puVjKjfjkMFAuXJnAPflGy0LCgT1ETGFEqCrAJwUJhgenPVxpZalO8J/22nzKw==";
       };
     };
     "@serverless/event-mocks-1.1.1" = {
@@ -8599,13 +8626,13 @@ let
         sha512 = "SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==";
       };
     };
-    "@types/concat-stream-1.6.1" = {
+    "@types/concat-stream-2.0.0" = {
       name = "_at_types_slash_concat-stream";
       packageName = "@types/concat-stream";
-      version = "1.6.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.1.tgz";
-        sha512 = "eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA==";
+        url = "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-2.0.0.tgz";
+        sha512 = "t3YCerNM7NTVjLuICZo5gYAXYoDvpuuTceCcFQWcDQz26kxUR5uIWolxbIR5jRNIXpMqhOpW/b8imCR1LEmuJw==";
       };
     };
     "@types/connect-3.4.35" = {
@@ -8959,13 +8986,13 @@ let
         sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw==";
       };
     };
-    "@types/inquirer-8.2.0" = {
+    "@types/inquirer-8.2.1" = {
       name = "_at_types_slash_inquirer";
       packageName = "@types/inquirer";
-      version = "8.2.0";
+      version = "8.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.0.tgz";
-        sha512 = "BNoMetRf3gmkpAlV5we+kxyZTle7YibdOntIZbU5pyIfMdcwy784KfeZDAcuyMznkh5OLa17RVXZOGA5LTlkgQ==";
+        url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.1.tgz";
+        sha512 = "wKW3SKIUMmltbykg4I5JzCVzUhkuD9trD6efAmYgN2MrSntY0SMRQzEnD3mkyJ/rv9NLbTC7g3hKKE86YwEDLw==";
       };
     };
     "@types/is-empty-1.2.1" = {
@@ -9067,6 +9094,15 @@ let
         sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw==";
       };
     };
+    "@types/json-buffer-3.0.0" = {
+      name = "_at_types_slash_json-buffer";
+      packageName = "@types/json-buffer";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/json-buffer/-/json-buffer-3.0.0.tgz";
+        sha512 = "3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==";
+      };
+    };
     "@types/json-schema-7.0.11" = {
       name = "_at_types_slash_json-schema";
       packageName = "@types/json-schema";
@@ -9166,13 +9202,13 @@ let
         sha512 = "0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==";
       };
     };
-    "@types/lodash-4.14.180" = {
+    "@types/lodash-4.14.181" = {
       name = "_at_types_slash_lodash";
       packageName = "@types/lodash";
-      version = "4.14.180";
+      version = "4.14.181";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.180.tgz";
-        sha512 = "XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g==";
+        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.181.tgz";
+        sha512 = "n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag==";
       };
     };
     "@types/long-4.0.1" = {
@@ -9931,13 +9967,13 @@ let
         sha512 = "awvdx4vX7SkMKyvWIlRjycjb4blYRSQI3Bav0YMn+lJLGN6gJgb20urN/dQCv/2ejDu5S6ADEBt6O15DOpIAkg==";
       };
     };
-    "@types/vscode-1.65.0" = {
+    "@types/vscode-1.66.0" = {
       name = "_at_types_slash_vscode";
       packageName = "@types/vscode";
-      version = "1.65.0";
+      version = "1.66.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.65.0.tgz";
-        sha512 = "wQhExnh2nEzpjDMSKhUvnNmz3ucpd3E+R7wJkOhBNK3No6fG3VUdmVmMOKD0A8NDZDDDiQcLNxe3oGmX5SjJ5w==";
+        url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.66.0.tgz";
+        sha512 = "ZfJck4M7nrGasfs4A4YbUoxis3Vu24cETw3DERsNYtDZmYSYtk6ljKexKFKhImO/ZmY6ZMsmegu2FPkXoUFImA==";
       };
     };
     "@types/webidl-conversions-6.1.1" = {
@@ -10129,13 +10165,13 @@ let
         sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==";
       };
     };
-    "@typescript-eslint/eslint-plugin-5.16.0" = {
+    "@typescript-eslint/eslint-plugin-5.18.0" = {
       name = "_at_typescript-eslint_slash_eslint-plugin";
       packageName = "@typescript-eslint/eslint-plugin";
-      version = "5.16.0";
+      version = "5.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.16.0.tgz";
-        sha512 = "SJoba1edXvQRMmNI505Uo4XmGbxCK9ARQpkvOd00anxzri9RNQk0DDCxD+LIl+jYhkzOJiOMMKYEHnHEODjdCw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz";
+        sha512 = "tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A==";
       };
     };
     "@typescript-eslint/experimental-utils-4.33.0" = {
@@ -10156,13 +10192,13 @@ let
         sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==";
       };
     };
-    "@typescript-eslint/parser-5.16.0" = {
+    "@typescript-eslint/parser-5.18.0" = {
       name = "_at_typescript-eslint_slash_parser";
       packageName = "@typescript-eslint/parser";
-      version = "5.16.0";
+      version = "5.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.16.0.tgz";
-        sha512 = "fkDq86F0zl8FicnJtdXakFs4lnuebH6ZADDw6CYQv0UZeIjHvmEw87m9/29nk2Dv5Lmdp0zQ3zDQhiMWQf/GbA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.18.0.tgz";
+        sha512 = "+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ==";
       };
     };
     "@typescript-eslint/scope-manager-4.33.0" = {
@@ -10174,22 +10210,22 @@ let
         sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==";
       };
     };
-    "@typescript-eslint/scope-manager-5.16.0" = {
+    "@typescript-eslint/scope-manager-5.18.0" = {
       name = "_at_typescript-eslint_slash_scope-manager";
       packageName = "@typescript-eslint/scope-manager";
-      version = "5.16.0";
+      version = "5.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.16.0.tgz";
-        sha512 = "P+Yab2Hovg8NekLIR/mOElCDPyGgFZKhGoZA901Yax6WR6HVeGLbsqJkZ+Cvk5nts/dAlFKm8PfL43UZnWdpIQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz";
+        sha512 = "C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ==";
       };
     };
-    "@typescript-eslint/type-utils-5.16.0" = {
+    "@typescript-eslint/type-utils-5.18.0" = {
       name = "_at_typescript-eslint_slash_type-utils";
       packageName = "@typescript-eslint/type-utils";
-      version = "5.16.0";
+      version = "5.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.16.0.tgz";
-        sha512 = "SKygICv54CCRl1Vq5ewwQUJV/8padIWvPgCxlWPGO/OgQLCijY9G7lDu6H+mqfQtbzDNlVjzVWQmeqbLMBLEwQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz";
+        sha512 = "vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA==";
       };
     };
     "@typescript-eslint/types-4.33.0" = {
@@ -10201,13 +10237,13 @@ let
         sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==";
       };
     };
-    "@typescript-eslint/types-5.16.0" = {
+    "@typescript-eslint/types-5.18.0" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
-      version = "5.16.0";
+      version = "5.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.16.0.tgz";
-        sha512 = "oUorOwLj/3/3p/HFwrp6m/J2VfbLC8gjW5X3awpQJ/bSG+YRGFS4dpsvtQ8T2VNveV+LflQHjlLvB6v0R87z4g==";
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.18.0.tgz";
+        sha512 = "bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw==";
       };
     };
     "@typescript-eslint/typescript-estree-4.33.0" = {
@@ -10219,22 +10255,22 @@ let
         sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==";
       };
     };
-    "@typescript-eslint/typescript-estree-5.16.0" = {
+    "@typescript-eslint/typescript-estree-5.18.0" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "5.16.0";
+      version = "5.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.16.0.tgz";
-        sha512 = "SE4VfbLWUZl9MR+ngLSARptUv2E8brY0luCdgmUevU6arZRY/KxYoLI/3V/yxaURR8tLRN7bmZtJdgmzLHI6pQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz";
+        sha512 = "wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ==";
       };
     };
-    "@typescript-eslint/utils-5.16.0" = {
+    "@typescript-eslint/utils-5.18.0" = {
       name = "_at_typescript-eslint_slash_utils";
       packageName = "@typescript-eslint/utils";
-      version = "5.16.0";
+      version = "5.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.16.0.tgz";
-        sha512 = "iYej2ER6AwmejLWMWzJIHy3nPJeGDuCqf8Jnb+jAQVoPpmWzwQOfa9hWVB8GIQE5gsCv/rfN4T+AYb/V06WseQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.18.0.tgz";
+        sha512 = "+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA==";
       };
     };
     "@typescript-eslint/visitor-keys-4.33.0" = {
@@ -10246,13 +10282,13 @@ let
         sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==";
       };
     };
-    "@typescript-eslint/visitor-keys-5.16.0" = {
+    "@typescript-eslint/visitor-keys-5.18.0" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
-      version = "5.16.0";
+      version = "5.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.16.0.tgz";
-        sha512 = "jqxO8msp5vZDhikTwq9ubyMHqZ67UIvawohr4qF3KhlpL7gzSjOd+8471H3nh5LyABkaI85laEKKU8SnGUK5/g==";
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz";
+        sha512 = "Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg==";
       };
     };
     "@ungap/promise-all-settled-1.1.2" = {
@@ -11083,6 +11119,15 @@ let
         sha512 = "4wOae+5N2RZ+CZXd9ZKwkaDi55IxrSTOjHpxTvQQ4fomtOJmqVxbmICA9jE1jvnqNhpfgz8cnfFagG86wV/xLQ==";
       };
     };
+    "@xmldom/xmldom-0.8.2" = {
+      name = "_at_xmldom_slash_xmldom";
+      packageName = "@xmldom/xmldom";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.2.tgz";
+        sha512 = "+R0juSseERyoPvnBQ/cZih6bpF7IpCXlWbHRoCRzYzqpz6gWHOgf8o4MOEf6KBVuOyqU+gCNLkCWVIJAro8XyQ==";
+      };
+    };
     "@xmpp/base64-0.13.1" = {
       name = "_at_xmpp_slash_base64";
       packageName = "@xmpp/base64";
@@ -12622,13 +12667,13 @@ let
         sha512 = "y8H99NExU1Sk4TvcaUxTdzfq2SZo6uSj5dyh75XSQvbpH6gdAXIW9MaBcvlNC7n0cVPsidHmOcHOWxJ/pTXGjA==";
       };
     };
-    "apollo-graphql-0.9.5" = {
+    "apollo-graphql-0.9.6" = {
       name = "apollo-graphql";
       packageName = "apollo-graphql";
-      version = "0.9.5";
+      version = "0.9.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.9.5.tgz";
-        sha512 = "RGt5k2JeBqrmnwRM0VOgWFiGKlGJMfmiif/4JvdaEqhMJ+xqe/9cfDYzXfn33ke2eWixsAbjEbRfy8XbaN9nTw==";
+        url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.9.6.tgz";
+        sha512 = "CrqJxZwfu/U5x0bYYPPluwu1G+oC3jjKFK/EVn9CDcpi4+yD9rAYko/h1iUB5A6VRQhA4Boluc7QexMYQ2tCng==";
       };
     };
     "apollo-link-1.2.1" = {
@@ -13135,6 +13180,15 @@ let
         sha1 = "3a77345ffc1cf35e2a91825601f9e58f2e24cac4";
       };
     };
+    "arr-rotate-1.0.0" = {
+      name = "arr-rotate";
+      packageName = "arr-rotate";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arr-rotate/-/arr-rotate-1.0.0.tgz";
+        sha512 = "yOzOZcR9Tn7enTF66bqKorGGH0F36vcPaSWg8fO0c0UYb3LX3VMXj5ZxEqQLNOecAhlRJ7wYZja5i4jTlnbIfQ==";
+      };
+    };
     "arr-union-2.1.0" = {
       name = "arr-union";
       packageName = "arr-union";
@@ -13954,6 +14008,15 @@ let
         sha512 = "gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==";
       };
     };
+    "async-iter-stream-1.2.0" = {
+      name = "async-iter-stream";
+      packageName = "async-iter-stream";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async-iter-stream/-/async-iter-stream-1.2.0.tgz";
+        sha1 = "91afbe5e9a7714fd1dd63d4a8dcb1284a3f72826";
+      };
+    };
     "async-limiter-1.0.1" = {
       name = "async-limiter";
       packageName = "async-limiter";
@@ -14242,13 +14305,22 @@ let
         sha512 = "fChMDiSfWcW0EUWmiqlyc+VAIXKH0w7BBruL3cVWSwO+5oA5A9juGF4NCBV2/KAHzaKaG0hXKPE49Wh6Lq74ag==";
       };
     };
-    "aws-sdk-2.1101.0" = {
+    "aws-sdk-2.1107.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.1101.0";
+      version = "2.1107.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1101.0.tgz";
-        sha512 = "7lyVb7GXGl8yyu954Qxf6vU6MrcgFlmKyTLBVXJyo3Phn1OB+qOExA55WtSC6gQiQ7e5TeWOn1RUHLg30ywTBA==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1107.0.tgz";
+        sha512 = "gZaCm+zSSwjUYSa/cVg63uXhq5w9coT9yA8aTDOYzFkyl19b9H2CCixPeyf7KHtZdGwe3QAG2Oe6Rw0xtoCs+Q==";
+      };
+    };
+    "aws-sdk-2.1108.0" = {
+      name = "aws-sdk";
+      packageName = "aws-sdk";
+      version = "2.1108.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1108.0.tgz";
+        sha512 = "BpoHW6vk8cXQDf0M+j7LSti7db4vIWocfUDTFbmkOT0hH9pR3f4IDzbnGzGmlka6IOFWkb9sVHl+P5S2meswOg==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -15493,13 +15565,13 @@ let
         sha1 = "dd3a862b2fedf66fee8471320069428d0d84427a";
       };
     };
-    "bin-links-3.0.0" = {
+    "bin-links-3.0.1" = {
       name = "bin-links";
       packageName = "bin-links";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bin-links/-/bin-links-3.0.0.tgz";
-        sha512 = "fC7kPWcEkAWBgCKxmAMqZldlIeHsXwQy9JXzrppAVQiukGiDKxmYesJcBKWu6UMwx/5GOfo10wtK/4zy+Xt/mg==";
+        url = "https://registry.npmjs.org/bin-links/-/bin-links-3.0.1.tgz";
+        sha512 = "9vx+ypzVhASvHTS6K+YSGf7nwQdANoz7v6MTC0aCtYnOEZ87YvMf81aY737EZnGZdpbRM3sfWjO9oWkKmuIvyQ==";
       };
     };
     "bin-version-3.1.0" = {
@@ -15682,13 +15754,13 @@ let
         sha512 = "O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ==";
       };
     };
-    "bipf-1.5.5" = {
+    "bipf-1.6.1" = {
       name = "bipf";
       packageName = "bipf";
-      version = "1.5.5";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bipf/-/bipf-1.5.5.tgz";
-        sha512 = "sGJPBMy5GUBXhmc50TX+LdBXpU6oTR/lkxwbU98GzA2XdmcDK2rmPxcH6NWMtbRO5sv9LhBDrmCxR89HPZsRuQ==";
+        url = "https://registry.npmjs.org/bipf/-/bipf-1.6.1.tgz";
+        sha512 = "wsn3ickoiYgUn9Bd0JUTPnpJemEcjWtXkMLLQyNVhrnKhRxKhma8Gq/DoB1Di8GUcHhgeEVH+PQT2C/JRFpOgw==";
       };
     };
     "bit-field-1.5.3" = {
@@ -16195,6 +16267,15 @@ let
         sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==";
       };
     };
+    "body-parser-1.20.0" = {
+      name = "body-parser";
+      packageName = "body-parser";
+      version = "1.20.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz";
+        sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==";
+      };
+    };
     "bolt01-1.2.3" = {
       name = "bolt01";
       packageName = "bolt01";
@@ -16267,6 +16348,15 @@ let
         sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5";
       };
     };
+    "bonjour-service-1.0.11" = {
+      name = "bonjour-service";
+      packageName = "bonjour-service";
+      version = "1.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.11.tgz";
+        sha512 = "drMprzr2rDTCtgEE3VgdA9uUFaUHF+jXduwYSThHJnKMYM+FhI9Z3ph+TX3xy0LtgYHae6CHYPJ/2UnK8nQHcA==";
+      };
+    };
     "boolbase-1.0.0" = {
       name = "boolbase";
       packageName = "boolbase";
@@ -16474,15 +16564,6 @@ let
         sha512 = "z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==";
       };
     };
-    "bplist-parser-0.3.0" = {
-      name = "bplist-parser";
-      packageName = "bplist-parser";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.0.tgz";
-        sha512 = "zgmaRvT6AN1JpPPV+S0a1/FAtoxSreYDccZGIqEMSvZl9DMe70mJ7MFzpxa1X+gHVdkToE2haRUHHMiW1OdejA==";
-      };
-    };
     "bplist-parser-0.3.1" = {
       name = "bplist-parser";
       packageName = "bplist-parser";
@@ -17285,6 +17366,15 @@ let
         sha512 = "1bPRZQtmKaO6h7qV1YHXNtr6nCK28k0Zo95KM4dXfILcZZwoHJBN1m3lfLv9LPkcOZlrSr+J1bzMaZFO98Yq0w==";
       };
     };
+    "builtins-5.0.0" = {
+      name = "builtins";
+      packageName = "builtins";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/builtins/-/builtins-5.0.0.tgz";
+        sha512 = "aizhtbxgT1Udg0Fj6GssXshAVK+nxbtCV+1OtTrMNy67jffDFBY6CUBAkhO4owbleAx6fdbnWdpsmmcXydbzNw==";
+      };
+    };
     "bulk-write-stream-1.1.4" = {
       name = "bulk-write-stream";
       packageName = "bulk-write-stream";
@@ -17915,13 +18005,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001320" = {
+    "caniuse-lite-1.0.30001325" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001320";
+      version = "1.0.30001325";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001320.tgz";
-        sha512 = "MWPzG54AGdo3nWx7zHZTefseM5Y1ccM7hlQKHRqJkPozUaw3hNbBTMmLn16GG2FUzjR13Cr3NPfhIieX5PzXDA==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz";
+        sha512 = "sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ==";
       };
     };
     "canvas-2.9.1" = {
@@ -18077,31 +18167,31 @@ let
         sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==";
       };
     };
-    "cdk8s-1.5.52" = {
+    "cdk8s-1.5.62" = {
       name = "cdk8s";
       packageName = "cdk8s";
-      version = "1.5.52";
+      version = "1.5.62";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.52.tgz";
-        sha512 = "xqVD2lUGC3JJC1Zl2YWDop5xcJRl0OT91PAkT7qrWO5Xho4cz3B3NA3Cua4Q7bcLQViL7CeRdH4d9zL9mJmuMw==";
+        url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.62.tgz";
+        sha512 = "zspC9PLbuRVlDp+D9mhnqiBD3d4TAcgiIU0E12B6paJUM9gZaJEOi5q/DQcoGXa0AbnnGbSjmd+b0BgHFQJTGg==";
       };
     };
-    "cdk8s-plus-22-1.0.0-beta.158" = {
+    "cdk8s-plus-22-1.0.0-beta.180" = {
       name = "cdk8s-plus-22";
       packageName = "cdk8s-plus-22";
-      version = "1.0.0-beta.158";
+      version = "1.0.0-beta.180";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.158.tgz";
-        sha512 = "//RAiob+IkkJxMtt2GhLUIchljTjdwkfPSqC+R3scZLtDM1yPlyN1u5qKp/3C6anm2nKtw96zAENpqzfXdZasw==";
+        url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.180.tgz";
+        sha512 = "7jZonUlzpGSyY7v9TWk42lznAh5GSNKRE/Xq0S4kRsZYMePCDNMgxyodlNp0Yd5mhPZYHAy/D7Rm7V3miuEvLg==";
       };
     };
-    "cdktf-0.9.4" = {
+    "cdktf-0.10.1" = {
       name = "cdktf";
       packageName = "cdktf";
-      version = "0.9.4";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cdktf/-/cdktf-0.9.4.tgz";
-        sha512 = "CuTCNVV3Goptnq3daPVfs9boODEoIrjy09XAj9nkApcozgidPkNIkDcaJCo/7q3rxnoblsK9u2nj6CDUB8cTIg==";
+        url = "https://registry.npmjs.org/cdktf/-/cdktf-0.10.1.tgz";
+        sha512 = "c+Hj3cBppRNcT1qD2FL1R4IDQXaQWwq4ZCyQeWktT5IB3tE2ncRCoZ8me8aaZ4vfT5CpAIkPf5heNmhy+U5P0Q==";
       };
     };
     "center-align-0.1.3" = {
@@ -18491,13 +18581,13 @@ let
         sha512 = "0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==";
       };
     };
-    "cheerio-select-1.5.0" = {
+    "cheerio-select-1.6.0" = {
       name = "cheerio-select";
       packageName = "cheerio-select";
-      version = "1.5.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz";
-        sha512 = "qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==";
+        url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.6.0.tgz";
+        sha512 = "eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==";
       };
     };
     "chevrotain-4.1.1" = {
@@ -18878,13 +18968,13 @@ let
         sha512 = "EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==";
       };
     };
-    "clean-css-5.2.4" = {
+    "clean-css-5.3.0" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "5.2.4";
+      version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-5.2.4.tgz";
-        sha512 = "nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg==";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz";
+        sha512 = "YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==";
       };
     };
     "clean-git-ref-2.0.1" = {
@@ -18977,13 +19067,13 @@ let
         sha512 = "xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w==";
       };
     };
-    "cli-color-2.0.1" = {
+    "cli-color-2.0.2" = {
       name = "cli-color";
       packageName = "cli-color";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-color/-/cli-color-2.0.1.tgz";
-        sha512 = "eBbxZF6fqPUNnf7CLAFOersUnyYzv83tHFLSlts+OAHsNendaqv2tHCq+/MO+b3Y+9JeoUlIvobyxG/Z8GNeOg==";
+        url = "https://registry.npmjs.org/cli-color/-/cli-color-2.0.2.tgz";
+        sha512 = "g4JYjrTW9MGtCziFNjkqp3IMpGhnJyeB0lOtRPjQkYhXzKYr6tYnXKyEVnMzITxhpbahsEW9KsxOYIDKwcsIBw==";
       };
     };
     "cli-cursor-1.0.2" = {
@@ -19049,13 +19139,13 @@ let
         sha512 = "kLORQrhYCAtUPLZxqsAt2YJGOvRdt34+O6jl5cQGb7iF3dM55FQZlTR+rQyIK9JUcO9bBMwZsTlND+3dmFU2Cw==";
       };
     };
-    "cli-progress-footer-2.3.0" = {
+    "cli-progress-footer-2.3.1" = {
       name = "cli-progress-footer";
       packageName = "cli-progress-footer";
-      version = "2.3.0";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-2.3.0.tgz";
-        sha512 = "xJl+jqvdsE0Gjh5tKoLzZrQS4nPHC+yzeitgq2faAZiHl+/Peuwzoy5Sed6EBkm8JNrPk7W4U3YNVO/uxoqOFg==";
+        url = "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-2.3.1.tgz";
+        sha512 = "urD1hiEIQeZadVABtW5ExM8wse1phnmz15oJ4QEe46GQN87v1VBa0lZQ7gXkPELMzP6At4VY6v07baAiyztulw==";
       };
     };
     "cli-spinner-0.2.10" = {
@@ -19517,6 +19607,15 @@ let
         sha512 = "lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==";
       };
     };
+    "cmd-shim-5.0.0" = {
+      name = "cmd-shim";
+      packageName = "cmd-shim";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-5.0.0.tgz";
+        sha512 = "qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw==";
+      };
+    };
     "cmdln-3.2.1" = {
       name = "cmdln";
       packageName = "cmdln";
@@ -20390,6 +20489,15 @@ let
         sha1 = "8a47901700238e4fc32269771230226f24b415a9";
       };
     };
+    "compress-brotli-1.3.6" = {
+      name = "compress-brotli";
+      packageName = "compress-brotli";
+      version = "1.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/compress-brotli/-/compress-brotli-1.3.6.tgz";
+        sha512 = "au99/GqZtUtiCBliqLFbWlhnCxn+XSYjwZ77q6mKN4La4qOXDoLVPZ50iXr0WmAyMxl8yqoq3Yq4OeQNPPkyeQ==";
+      };
+    };
     "compress-commons-2.1.1" = {
       name = "compress-commons";
       packageName = "compress-commons";
@@ -20471,13 +20579,13 @@ let
         sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==";
       };
     };
-    "conf-10.1.1" = {
+    "conf-10.1.2" = {
       name = "conf";
       packageName = "conf";
-      version = "10.1.1";
+      version = "10.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conf/-/conf-10.1.1.tgz";
-        sha512 = "z2civwq/k8TMYtcn3SVP0Peso4otIWnHtcTuHhQ0zDZDdP4NTxqEc8owfkz4zBsdMYdn/LFcE+ZhbCeqkhtq3Q==";
+        url = "https://registry.npmjs.org/conf/-/conf-10.1.2.tgz";
+        sha512 = "o9Fv1Mv+6A0JpoayQ8JleNp3hhkbOJP/Re/Q+QqxMPHPkABVsRjQGWZn9A5GcqLiTNC6d89p2PB5ZhHVDSMwyg==";
       };
     };
     "conf-6.2.4" = {
@@ -20723,22 +20831,22 @@ let
         sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
       };
     };
-    "constructs-10.0.97" = {
+    "constructs-10.0.106" = {
       name = "constructs";
       packageName = "constructs";
-      version = "10.0.97";
+      version = "10.0.106";
       src = fetchurl {
-        url = "https://registry.npmjs.org/constructs/-/constructs-10.0.97.tgz";
-        sha512 = "2193Y3iDLY9sYCd89eb4TfjeDN+oD5ocl5d1LRnbGwlmvMe2fWqd9i84ET6K8K/PXBPSTyRQghnpw+Smn8b9vA==";
+        url = "https://registry.npmjs.org/constructs/-/constructs-10.0.106.tgz";
+        sha512 = "6k8z7O3q6UigE62QW/z34YcSqa1elCDEGz1rTwaMkiVjdL93mB6YLNCpC21FYVUbx+rauTdsQCD3ejVxdAmazg==";
       };
     };
-    "constructs-3.3.250" = {
+    "constructs-3.3.259" = {
       name = "constructs";
       packageName = "constructs";
-      version = "3.3.250";
+      version = "3.3.259";
       src = fetchurl {
-        url = "https://registry.npmjs.org/constructs/-/constructs-3.3.250.tgz";
-        sha512 = "D1817bciQBs1xFEx1+Yh0ynd4GmrrjNPo93Z3Q8H+bxHBfRN00xSCfgDHttv+dk+6UEA43eYaI4SNYbmfSj2gQ==";
+        url = "https://registry.npmjs.org/constructs/-/constructs-3.3.259.tgz";
+        sha512 = "hI++shPkBPk8yPD/Af48B6nPmnZIXsKx2dnqDiqadoU0i7Z75/G/TqtLVF96h8XC4A6JkzQ89+CxJLpRTqwy8w==";
       };
     };
     "consume-http-header-1.0.0" = {
@@ -21471,13 +21579,13 @@ let
         sha512 = "H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA==";
       };
     };
-    "cosmiconfig-typescript-loader-1.0.6" = {
+    "cosmiconfig-typescript-loader-1.0.9" = {
       name = "cosmiconfig-typescript-loader";
       packageName = "cosmiconfig-typescript-loader";
-      version = "1.0.6";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.6.tgz";
-        sha512 = "2nEotziYJWtNtoTjKbchj9QrdTT6DBxCvqjNKoDKARw+e2yZmTQCa07uRrykLIZuvSgp69YXLH89UHc0WhdMfQ==";
+        url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.9.tgz";
+        sha512 = "tRuMRhxN4m1Y8hP9SNYfz7jRwt8lZdWxdjg/ohg5esKmsndJIn4yT96oJVcf5x0eA11taXl+sIp+ielu529k6g==";
       };
     };
     "couch-login-0.1.20" = {
@@ -21561,13 +21669,13 @@ let
         sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==";
       };
     };
-    "crc-32-1.2.1" = {
+    "crc-32-1.2.2" = {
       name = "crc-32";
       packageName = "crc-32";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz";
-        sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==";
+        url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz";
+        sha512 = "ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==";
       };
     };
     "crc32-stream-3.0.1" = {
@@ -21606,13 +21714,13 @@ let
         sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
       };
     };
-    "create-gatsby-2.10.2" = {
+    "create-gatsby-2.11.2" = {
       name = "create-gatsby";
       packageName = "create-gatsby";
-      version = "2.10.2";
+      version = "2.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.10.2.tgz";
-        sha512 = "OmuFey3Eoaek20m8Br/iIqEr76AUrl/ThCn7TBYJ6RvWVKezKV5UksQlFpdQgPK8kO9LogjkmiyA0k94VC3nXg==";
+        url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.11.2.tgz";
+        sha512 = "EHlULRVoiXoLM400sLYNtFRy5pemp2WoNKR6vjUlFnLBqn+BGe+TJAmKfwqHYFheXMozKqY2bW0ekuDj2x8zAg==";
       };
     };
     "create-graphback-1.0.1" = {
@@ -21795,13 +21903,13 @@ let
         sha512 = "mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw==";
       };
     };
-    "cross-undici-fetch-0.1.27" = {
+    "cross-undici-fetch-0.1.28" = {
       name = "cross-undici-fetch";
       packageName = "cross-undici-fetch";
-      version = "0.1.27";
+      version = "0.1.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.1.27.tgz";
-        sha512 = "Oz/zXdh2HCq55xARCwFAYtKlyGp3VFAIfOEexN6nVm06rD6O5g47fKp7fggf/kBtc7iG09asNoGW+CUwIi4Efg==";
+        url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.1.28.tgz";
+        sha512 = "/nLMyVE5IC9PQdBtmgjpGZfK0wo8UupomAPx+7HlbEgVDkZOa9xCiZP9goo5aLYofP0gHXgovjXdXrE2obANag==";
       };
     };
     "crossroads-0.12.2" = {
@@ -21876,49 +21984,49 @@ let
         sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==";
       };
     };
-    "cspell-gitignore-5.19.3" = {
+    "cspell-gitignore-5.19.5" = {
       name = "cspell-gitignore";
       packageName = "cspell-gitignore";
-      version = "5.19.3";
+      version = "5.19.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-5.19.3.tgz";
-        sha512 = "Q67uHcf0qNgOoanRLhatapjWpLiftT+MuLIyAaSLe5eNVzQurQIc+UnXhtaslkVyOTqQt4NJFqLgtf5ZSGz1bg==";
+        url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-5.19.5.tgz";
+        sha512 = "Wj16pnPmx7PGd2PcVAEsxWnTtfY4qNzUBtfTqo5VEd23WME6SgEtffxm4eSRpHYZmmDclir+Tbb9yQAsZajDeQ==";
       };
     };
-    "cspell-glob-5.19.3" = {
+    "cspell-glob-5.19.5" = {
       name = "cspell-glob";
       packageName = "cspell-glob";
-      version = "5.19.3";
+      version = "5.19.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-5.19.3.tgz";
-        sha512 = "qp2Oe/euzTu3e0zZrQxHuTrqRo418tYfh4CnCa+DKU6lWKKcF4zCEhOGJHPsYak8SFIXZ4ZE360wHFxB/JDutQ==";
+        url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-5.19.5.tgz";
+        sha512 = "fnrUNLNY9CMsr5J1wRPoGpx7aastD05wEZ/NL+Xd7uEmuU+R7gViOjyOPlUMFH+YARwY0youHRiobkl7pJNngw==";
       };
     };
-    "cspell-io-5.19.3" = {
+    "cspell-io-5.19.5" = {
       name = "cspell-io";
       packageName = "cspell-io";
-      version = "5.19.3";
+      version = "5.19.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cspell-io/-/cspell-io-5.19.3.tgz";
-        sha512 = "dE9eBvHgIJ11DelWtyehMU3W3bCpcB+0nS6uOZJ2d8fDu13m5BebpLrXZ2dKfY4cjksJUhRPatt14uwQSeUp2A==";
+        url = "https://registry.npmjs.org/cspell-io/-/cspell-io-5.19.5.tgz";
+        sha512 = "R6q1Dor6mfs1VBpuXVlcm/Vvr96GclO/BtNDK/8ppcm22Ct1VF24MG2itoYO7296dOgR1H4HkndvvEgx3p8fzw==";
       };
     };
-    "cspell-lib-5.19.3" = {
+    "cspell-lib-5.19.5" = {
       name = "cspell-lib";
       packageName = "cspell-lib";
-      version = "5.19.3";
+      version = "5.19.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-5.19.3.tgz";
-        sha512 = "peMJggwJpxCXKZZ0DuHyDtZmf66POKaHf5Im8LGEyMKFARUIq6O2WvaUGggYjyRe3Ng/f5G+EYTcIHbF9pZYcg==";
+        url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-5.19.5.tgz";
+        sha512 = "6HOJ7O+vDYzJs49fHZI5xzsL5TxeR7WsfjWvx1BwgRs1rHdA9/8KFZFX2DJazKRGm+kL1kBO0VJlaF0tvVsjzw==";
       };
     };
-    "cspell-trie-lib-5.19.3" = {
+    "cspell-trie-lib-5.19.5" = {
       name = "cspell-trie-lib";
       packageName = "cspell-trie-lib";
-      version = "5.19.3";
+      version = "5.19.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-5.19.3.tgz";
-        sha512 = "Io8EB7E1pmttHzZvgvPEF0b87qlq8G5uA4B+sbqCxrUf5l4JDcK/UYLih0+rekLTbv4Q68zqgCTASvqxgqnoAg==";
+        url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-5.19.5.tgz";
+        sha512 = "yNOmd7uzLiu5UDpbIfJlORx8rJZltLz/ebostAV7UC3wzrOIQgS8xKoFfqiE0iWxIMwmV9eyydVcyzh5grx0gg==";
       };
     };
     "csrf-3.1.0" = {
@@ -22056,13 +22164,13 @@ let
         sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==";
       };
     };
-    "css-select-4.2.1" = {
+    "css-select-4.3.0" = {
       name = "css-select";
       packageName = "css-select";
-      version = "4.2.1";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz";
-        sha512 = "/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==";
+        url = "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz";
+        sha512 = "wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==";
       };
     };
     "css-select-base-adapter-0.1.1" = {
@@ -22137,13 +22245,13 @@ let
         sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==";
       };
     };
-    "css-what-5.1.0" = {
+    "css-what-6.1.0" = {
       name = "css-what";
       packageName = "css-what";
-      version = "5.1.0";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz";
-        sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==";
+        url = "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz";
+        sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==";
       };
     };
     "cssauron-1.4.0" = {
@@ -22515,13 +22623,13 @@ let
         sha512 = "4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==";
       };
     };
-    "d3-7.3.0" = {
+    "d3-7.4.2" = {
       name = "d3";
       packageName = "d3";
-      version = "7.3.0";
+      version = "7.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/d3/-/d3-7.3.0.tgz";
-        sha512 = "MDRLJCMK232OJQRqGljQ/gCxtB8k3/sLKFjftMjzPB3nKVUODpdW9Rb3vcq7U8Ka5YKoZkAmp++Ur6I+6iNWIw==";
+        url = "https://registry.npmjs.org/d3/-/d3-7.4.2.tgz";
+        sha512 = "7VK+QBAWtNDbP2EU/ThkXgjd0u1MsXYYgCK2ElQ4BBWh0usE75tHVVeYx47m2pqQEy4isYKAA0tAFSln0l+9EQ==";
       };
     };
     "d3-array-1.2.4" = {
@@ -22542,6 +22650,15 @@ let
         sha512 = "33qQ+ZoZlli19IFiQx4QEpf2CBEayMRzhlisJHSCsSUbDXv6ZishqS1x7uFVClKG4Wr7rZVHvaAttoLow6GqdQ==";
       };
     };
+    "d3-array-3.1.4" = {
+      name = "d3-array";
+      packageName = "d3-array";
+      version = "3.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3-array/-/d3-array-3.1.4.tgz";
+        sha512 = "H8lM97Gr9+LAR4WVHETCMt6LlWtLJVMCKsz1ojors+/PvAs2QqdLa20BuYvU11/DU+nLF0GVWL5Rv3jSgo2KmA==";
+      };
+    };
     "d3-axis-1.0.12" = {
       name = "d3-axis";
       packageName = "d3-axis";
@@ -22623,13 +22740,13 @@ let
         sha512 = "SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==";
       };
     };
-    "d3-color-3.0.1" = {
+    "d3-color-3.1.0" = {
       name = "d3-color";
       packageName = "d3-color";
-      version = "3.0.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/d3-color/-/d3-color-3.0.1.tgz";
-        sha512 = "6/SlHkDOBLyQSJ1j1Ghs82OIUXpKWlR0hCsw0XrLSQhuUPuCSmLQ1QPH98vpnQxMUQM2/gfAkUEWsupVpd9JGw==";
+        url = "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz";
+        sha512 = "zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==";
       };
     };
     "d3-contour-1.3.2" = {
@@ -22866,13 +22983,13 @@ let
         sha512 = "j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==";
       };
     };
-    "d3-hierarchy-3.1.1" = {
+    "d3-hierarchy-3.1.2" = {
       name = "d3-hierarchy";
       packageName = "d3-hierarchy";
-      version = "3.1.1";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.1.tgz";
-        sha512 = "LtAIu54UctRmhGKllleflmHalttH3zkfSi4NlKrTAoFKjC+AFBJohsCAdgCBYQwH0F8hIOGY89X1pPqAchlMkA==";
+        url = "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz";
+        sha512 = "FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==";
       };
     };
     "d3-interpolate-1.4.0" = {
@@ -23541,13 +23658,13 @@ let
         sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ==";
       };
     };
-    "deasync-0.1.24" = {
+    "deasync-0.1.26" = {
       name = "deasync";
       packageName = "deasync";
-      version = "0.1.24";
+      version = "0.1.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.24.tgz";
-        sha512 = "i98vg42xNfRZCymummMAN0rIcQ1gZFinSe3btvPIvy6JFTaeHcumeKybRo2HTv86nasfmT0nEgAn2ggLZhOCVA==";
+        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.26.tgz";
+        sha512 = "YKw0BmJSWxkjtQsbgn6Q9CHSWB7DKMen8vKrgyC006zy0UZ6nWyGidB0IzZgqkVRkOglAeUaFtiRTeLyel72bg==";
       };
     };
     "death-1.1.0" = {
@@ -25107,13 +25224,13 @@ let
         sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9";
       };
     };
-    "doipjs-0.15.5" = {
+    "doipjs-0.15.6" = {
       name = "doipjs";
       packageName = "doipjs";
-      version = "0.15.5";
+      version = "0.15.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/doipjs/-/doipjs-0.15.5.tgz";
-        sha512 = "PIZIx+2+LqDtJWUXOMAd0PabT6uojkk5x4k1crUX68nMqDuNKne8v4K2Viytu8F9eBgN1cIUL9gLV8p4oqXI4A==";
+        url = "https://registry.npmjs.org/doipjs/-/doipjs-0.15.6.tgz";
+        sha512 = "oC9uXxkUye8XTin/U+veA2Qmt++4I+WRBxtIoeufGmWqaD5iLM5REMSVbrOX4FbuLtimYEnajlgFXhh1fdF72A==";
       };
     };
     "dom-converter-0.2.0" = {
@@ -25872,13 +25989,13 @@ let
         sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==";
       };
     };
-    "electron-14.2.8" = {
+    "electron-14.2.9" = {
       name = "electron";
       packageName = "electron";
-      version = "14.2.8";
+      version = "14.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron/-/electron-14.2.8.tgz";
-        sha512 = "K22hI0NVkC7sU5sMDXwW1lxAjhNsFXL2wuJF7Ij9CyWqW/j6AtIMfDkUoM5mXaTg0FGUlmlNr9Rh7cp8bBn6Sg==";
+        url = "https://registry.npmjs.org/electron/-/electron-14.2.9.tgz";
+        sha512 = "7LdJFmqVzO9NLKO0hwOwPA6Kv4GSybGMcej8f2q7fVT4O8mIfL9oo/v4axVjVWm0+58ROQtHv8hYnnAs3ygG0Q==";
       };
     };
     "electron-notarize-1.2.1" = {
@@ -25917,13 +26034,13 @@ let
         sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw==";
       };
     };
-    "electron-to-chromium-1.4.96" = {
+    "electron-to-chromium-1.4.103" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.4.96";
+      version = "1.4.103";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.96.tgz";
-        sha512 = "DPNjvNGPabv6FcyjzLAN4C0psN/GgD9rSGvMTuv81SeXG/EX3mCz0wiw9N1tUEnfQXYCJi3H8M0oFPRziZh7rw==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.103.tgz";
+        sha512 = "c/uKWR1Z/W30Wy/sx3dkZoj4BijbXX85QKWu9jJfjho3LBAXNEGAEW3oWiGb+dotA6C6BzCTxL2/aLes7jlUeg==";
       };
     };
     "electrum-client-git://github.com/janoside/electrum-client" = {
@@ -26630,13 +26747,13 @@ let
         sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==";
       };
     };
-    "es-abstract-1.19.1" = {
+    "es-abstract-1.19.2" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.19.1";
+      version = "1.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz";
-        sha512 = "2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz";
+        sha512 = "gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==";
       };
     };
     "es-get-iterator-1.1.2" = {
@@ -28025,6 +28142,15 @@ let
         sha512 = "vJCpKROPULPrTnLTCytZuxBkm23yS9CBXBald2BDeizgKsJV19vOc2+lmTk4fL5hh+TgHQybwtt6UwEy3ORjgg==";
       };
     };
+    "exponential-backoff-3.1.0" = {
+      name = "exponential-backoff";
+      packageName = "exponential-backoff";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.0.tgz";
+        sha512 = "oBuz5SYz5zzyuHINoe9ooePwSu0xApKWgeNzok4hZ5YKXFh9zrQBEM15CXqoZkJJPuI2ArvqjPQd8UKJA753XA==";
+      };
+    };
     "express-2.5.11" = {
       name = "express";
       packageName = "express";
@@ -28808,13 +28934,13 @@ let
         sha512 = "WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ==";
       };
     };
-    "faunadb-4.5.2" = {
+    "faunadb-4.5.4" = {
       name = "faunadb";
       packageName = "faunadb";
-      version = "4.5.2";
+      version = "4.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/faunadb/-/faunadb-4.5.2.tgz";
-        sha512 = "XQ2yDoPZc5/IqC4eS4tP5tjewFbAK8UdQYLDGlUiJy5E9F3rpvYCMdjlkRWcaxOMD2yPYr8NSoql10zy1CNoCA==";
+        url = "https://registry.npmjs.org/faunadb/-/faunadb-4.5.4.tgz";
+        sha512 = "v0e1aXPhitIGMtuC7NFtp//hyr0d2NtHFcGqsEJgWx49rRJoonZQl6hLQ3lBjhA/LPg26U4R/BAlmDFE2pzsUA==";
       };
     };
     "faye-websocket-0.10.0" = {
@@ -29735,13 +29861,13 @@ let
         sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
       };
     };
-    "flow-parser-0.174.1" = {
+    "flow-parser-0.175.0" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.174.1";
+      version = "0.175.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.174.1.tgz";
-        sha512 = "nDMOvlFR+4doLpB3OJpseHZ7uEr3ENptlF6qMas/kzQmNcLzMwfQeFX0gGJ/+em7UdldB/nGsk55tDTOvjbCuw==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.175.0.tgz";
+        sha512 = "9XG5JGOjhODF+OQF5ufCw8XiGi+8B46scjr3Q49JxN7IDRdT2W+1AOuvKKd6j766/5E7qSuCn/dsq1y3hihntg==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -30311,13 +30437,13 @@ let
         sha512 = "KhjJmZAs2eqfhCb6PdPx4RcZtheGTz86tpTC5JTvqBn/xda+Nb+0C7dCyjOSN7T76H6a56LvH0SVXQMchLXDRw==";
       };
     };
-    "fs-chunk-store-2.0.4" = {
+    "fs-chunk-store-2.0.5" = {
       name = "fs-chunk-store";
       packageName = "fs-chunk-store";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-2.0.4.tgz";
-        sha512 = "JfeKRPPWkLaUoNKZdi+eLPKzZkZK1pdj2Y5lidEw9fUCkglvK/muLe6ONjdvn8yAGrDsk4tkjNp52GS658yy0g==";
+        url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-2.0.5.tgz";
+        sha512 = "z3c2BmyaHdQTtIVXJDQOvwZVWN2gNU//0IYKK2LuPr+cZyGoIrgDwI4iDASaTUyQbOBtyg/k6GuDZepB6jQIPw==";
       };
     };
     "fs-constants-1.0.0" = {
@@ -30725,22 +30851,22 @@ let
         sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9";
       };
     };
-    "gatsby-core-utils-3.10.1" = {
+    "gatsby-core-utils-3.11.1" = {
       name = "gatsby-core-utils";
       packageName = "gatsby-core-utils";
-      version = "3.10.1";
+      version = "3.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.10.1.tgz";
-        sha512 = "WqNMm0u1CAZm6Q+UQ4dDHwIAt3l32NeIaPuSXmDX7QcMGR3FUUk8cl2Ym6gx1hfILm1aCexqfaSCLUXtaWKkbQ==";
+        url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.11.1.tgz";
+        sha512 = "Op9/uihtcsDLlZDfRsGJ1ya2mFx2YH9Zmx93bawElZ0YpIzKjCkNTp+I5i5UANxvs5I+Fljl0WHQRudMWg+fWA==";
       };
     };
-    "gatsby-telemetry-3.10.1" = {
+    "gatsby-telemetry-3.11.1" = {
       name = "gatsby-telemetry";
       packageName = "gatsby-telemetry";
-      version = "3.10.1";
+      version = "3.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.10.1.tgz";
-        sha512 = "935quI1YsQfzYREuvPLNKBb7IUE2vX9p7WoS7Dc9TbV2xDZPTAzeOfX+HE56ZltkxMi8Zivp7mqe5+n//WL7EQ==";
+        url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.11.1.tgz";
+        sha512 = "TPNKTpuYFyULOuRvhpXUtj8h2E7bvrTYsRC/aKeHoWqEchwwbzPwBSJd+3ZFjsxLHIXAa5sTAlR2wd9SYBgOlA==";
       };
     };
     "gauge-1.2.7" = {
@@ -30770,13 +30896,13 @@ let
         sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==";
       };
     };
-    "gauge-4.0.3" = {
+    "gauge-4.0.4" = {
       name = "gauge";
       packageName = "gauge";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-4.0.3.tgz";
-        sha512 = "ICw1DhAwMtb22rYFwEHgJcx1JCwJGv3x6G0OQUq56Nge+H4Q8JEwr8iveS0XFlsUNSI67F5ffMGK25bK4Pmskw==";
+        url = "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz";
+        sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==";
       };
     };
     "gaxios-2.3.4" = {
@@ -32139,13 +32265,13 @@ let
         sha512 = "J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==";
       };
     };
-    "graceful-fs-4.2.9" = {
+    "graceful-fs-4.2.10" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.9";
+      version = "4.2.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz";
-        sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz";
+        sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==";
       };
     };
     "graceful-readlink-1.0.1" = {
@@ -32157,13 +32283,13 @@ let
         sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
       };
     };
-    "grammy-1.7.0" = {
+    "grammy-1.7.1" = {
       name = "grammy";
       packageName = "grammy";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/grammy/-/grammy-1.7.0.tgz";
-        sha512 = "Xs4vRzCkSO+8CrFP8BXXOo4BGfBGWTPoDcbj8V3kz/c01XLNXI738HWv6/qjQ+IuPLnd/Qegjy7MBogbymogUg==";
+        url = "https://registry.npmjs.org/grammy/-/grammy-1.7.1.tgz";
+        sha512 = "7a4mFIGpFZgjk1G+CbFudOX8y8J5HzHkP19eYuEcv1Dif5IITYVDoQxa5GTORL6dsmmQ/sdZQ3QXuT1DMq6gbg==";
       };
     };
     "grant-4.7.0" = {
@@ -32283,13 +32409,13 @@ let
         sha512 = "MBY0wEjvcgJtZUyoqpPvOE1e5qPI0hJaa1gKTqjonSFiCsNHX2lykNjpOPcodmAgH1V06ELxhGnm9kcVzqvi/g==";
       };
     };
-    "graphql-config-4.1.0" = {
+    "graphql-config-4.3.0" = {
       name = "graphql-config";
       packageName = "graphql-config";
-      version = "4.1.0";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-config/-/graphql-config-4.1.0.tgz";
-        sha512 = "Myqay6pmdcmX3KqoH+bMbeKZ1cTODpHS2CxF1ZzNnfTE+YUpGTcp01bOw6LpzamRb0T/WTYtGFbZeXGo9Hab2Q==";
+        url = "https://registry.npmjs.org/graphql-config/-/graphql-config-4.3.0.tgz";
+        sha512 = "Uiu3X7+s5c056WyrvdZVz2vG1fhAipMlYmtiCU/4Z2mX79OXDr1SqIon2MprC/pExIWJfAQZCcjYDY76fPBUQg==";
       };
     };
     "graphql-executor-0.0.22" = {
@@ -33813,13 +33939,13 @@ let
         sha512 = "jWTtP3dCd7R8x/tt9DK3pvpcQd7HDMcRPUqPxr/i9989q2k5RHIhmlRDFeyQ/LSd8IKrteG8Ce5g0Ig4eGIipg==";
       };
     };
-    "htmlnano-2.0.0" = {
+    "htmlnano-2.0.1" = {
       name = "htmlnano";
       packageName = "htmlnano";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.0.0.tgz";
-        sha512 = "thKQfhcp2xgtsWNE27A2bliEeqVL5xjAgGn0wajyttvFFsvFWWah1ntV9aEX61gz0T6MBQ5xK/1lXuEumhJTcg==";
+        url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.0.1.tgz";
+        sha512 = "SIe/X2W5/9hmB4sFSw4HxQEMR1ERq+GXvasJQiatjKWEv6QCuvNHfPqeW8DRNtuGHOPlsfuFz0SbAStv63ZMvw==";
       };
     };
     "htmlparser2-3.10.1" = {
@@ -35154,6 +35280,15 @@ let
         sha512 = "firNp1q3xxTzoItj/eOOSZQnYSlyrWks5llCTVX37nJ59K3eXbQ8PtzCguqo8YI19EELo5QxaKnJd4VxzhU8tg==";
       };
     };
+    "ink-select-input-4.2.1" = {
+      name = "ink-select-input";
+      packageName = "ink-select-input";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ink-select-input/-/ink-select-input-4.2.1.tgz";
+        sha512 = "WvlrYdwmdnD6/nE/9mNhaaanTQOKmwy/hT/vuAqbDec3PUQBQ8Pkwszii/8eGvDTx5bGiUHu18P9D5IoB/ERaw==";
+      };
+    };
     "ink-spinner-4.0.3" = {
       name = "ink-spinner";
       packageName = "ink-spinner";
@@ -35289,15 +35424,6 @@ let
         sha512 = "0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ==";
       };
     };
-    "inquirer-8.2.1" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "8.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.1.tgz";
-        sha512 = "pxhBaw9cyTFMjwKtkjePWDhvwzvrNGAw7En4hottzlPvz80GZaMZthdDU35aA6/f5FRZf3uhE057q8w1DE3V2g==";
-      };
-    };
     "inquirer-8.2.2" = {
       name = "inquirer";
       packageName = "inquirer";
@@ -36729,13 +36855,13 @@ let
         sha512 = "6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==";
       };
     };
-    "is-number-object-1.0.6" = {
+    "is-number-object-1.0.7" = {
       name = "is-number-object";
       packageName = "is-number-object";
-      version = "1.0.6";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz";
-        sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==";
+        url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz";
+        sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==";
       };
     };
     "is-obj-1.0.1" = {
@@ -37125,13 +37251,13 @@ let
         sha512 = "+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==";
       };
     };
-    "is-shared-array-buffer-1.0.1" = {
+    "is-shared-array-buffer-1.0.2" = {
       name = "is-shared-array-buffer";
       packageName = "is-shared-array-buffer";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz";
-        sha512 = "IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==";
+        url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz";
+        sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==";
       };
     };
     "is-ssh-1.3.3" = {
@@ -38044,13 +38170,13 @@ let
         sha512 = "NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==";
       };
     };
-    "js-beautify-1.14.0" = {
+    "js-beautify-1.14.2" = {
       name = "js-beautify";
       packageName = "js-beautify";
-      version = "1.14.0";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.0.tgz";
-        sha512 = "yuck9KirNSCAwyNJbqW+BxJqJ0NLJ4PwBUzQQACl5O3qHMBXVkXb/rD0ilh/Lat/tn88zSZ+CAHOlk0DsY7GuQ==";
+        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.2.tgz";
+        sha512 = "H85kX95a53os+q1OCqtYe8AXAmgy3BvtysA/V83S3fdhznm6WlUpGi14DqSPbKFsL3dXZFXYl7YQwW9U1+76ng==";
       };
     };
     "js-git-0.7.8" = {
@@ -38368,13 +38494,13 @@ let
         sha512 = "ZUzuO2JgnxE01tgIdZorsUZj5jiHP8uxeLDU/vsnmnAU2ZbMHFDT1cWacoAKESDnCyFF8VRCuPXHx8e5/SOXig==";
       };
     };
-    "jsii-srcmak-0.1.512" = {
+    "jsii-srcmak-0.1.521" = {
       name = "jsii-srcmak";
       packageName = "jsii-srcmak";
-      version = "0.1.512";
+      version = "0.1.521";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.512.tgz";
-        sha512 = "AA/WSd6ysD6xPrwLvsXOnbgwgN+TlX9ApXBNTsZohQxlKEnyyQAPt945rW9cu/cdNbpc/U/Dnig3CLqDn+PogQ==";
+        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.521.tgz";
+        sha512 = "cZv5C7kMUz+UZqZsZpmz+xDWZCC8VNJNRo/nO+1uuzKuBk1XRAvKOEiMI5E//tZqRuv2BXuyGIhyJOMrOpP4dg==";
       };
     };
     "json-bigint-1.0.0" = {
@@ -38674,13 +38800,13 @@ let
         sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A==";
       };
     };
-    "json2jsii-0.2.172" = {
+    "json2jsii-0.2.181" = {
       name = "json2jsii";
       packageName = "json2jsii";
-      version = "0.2.172";
+      version = "0.2.181";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.172.tgz";
-        sha512 = "SXqltdQ3byo8XEsClMR5xnV6US5MWu0rBJdAC3NcvFCb0jgzu0V8ljfNJWEJJUKInuQWAsJ788ep5oKbLf3W7g==";
+        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.181.tgz";
+        sha512 = "pFUtkCYepbjES8GBuxzkHXEuQyx7CE2VZp6OouvjbrFYJTx3SbbDXmyPuk/ytiD2pPBblwlpb+9VOohxBxXZsQ==";
       };
     };
     "json3-3.2.6" = {
@@ -39034,13 +39160,13 @@ let
         sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0";
       };
     };
-    "jszip-3.7.1" = {
+    "jszip-3.9.0" = {
       name = "jszip";
       packageName = "jszip";
-      version = "3.7.1";
+      version = "3.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz";
-        sha512 = "ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==";
+        url = "https://registry.npmjs.org/jszip/-/jszip-3.9.0.tgz";
+        sha512 = "Vb3SMfASUN1EKrFzv5A5+lTaZnzLzT5E6A9zyT7WFqMSfhT2Z7iS5FgSOjx2Olm3MDj8OqKj6GHyP2kMt1Ir6w==";
       };
     };
     "junk-3.1.0" = {
@@ -39088,13 +39214,13 @@ let
         sha512 = "X00TokkRIDotUIf3EV4xUm6ELc/IkqhS/vPSHdWnsM5y0HoNMfEqrazizI7g78lpHvnRSRt/PFfKtRqJCOGIuQ==";
       };
     };
-    "just-diff-apply-4.0.1" = {
+    "just-diff-apply-5.2.0" = {
       name = "just-diff-apply";
       packageName = "just-diff-apply";
-      version = "4.0.1";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-4.0.1.tgz";
-        sha512 = "AKOkzB5P6FkfP21UlZVX/OPXx/sC2GagpLX9cBxqHqDuRjwmZ/AJRKSNrB9jHPpRW1W1ONs6gly1gW46t055nQ==";
+        url = "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.2.0.tgz";
+        sha512 = "unjtin7rnng0KUpE4RPWwTl8iwWiZuyZqOQ+vm8orV6aIXX8mHN8zlKCPPbOycfDNuLh2PBazbFhNoDJv4S/FA==";
       };
     };
     "jwa-1.4.1" = {
@@ -39349,13 +39475,13 @@ let
         sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==";
       };
     };
-    "keyv-4.1.1" = {
+    "keyv-4.2.1" = {
       name = "keyv";
       packageName = "keyv";
-      version = "4.1.1";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz";
-        sha512 = "tGv1yP6snQVDSM4X6yxrv2zzq/EvpW+oYiUz6aueW1u9CtS8RzUQYxxmFwgZlO2jSgCxQbchhxaqXXp2hnKGpQ==";
+        url = "https://registry.npmjs.org/keyv/-/keyv-4.2.1.tgz";
+        sha512 = "cAJq5cTfxQdq1DHZEVNpnk4mEvhP+8UP8UQftLtTtJ98beKkRHf+62M0mIDM2u/IWXyP8bmGB375/6uGdSX2MA==";
       };
     };
     "khroma-1.4.1" = {
@@ -40240,6 +40366,15 @@ let
         sha512 = "ryJlD9qhbUSq4ZS6Q0WXnTgmj3IMqN1iBfUJoGAMzSbSGZAS8E8eejci88naBbbDA0N34hALpSsa5Ok7JayAdQ==";
       };
     };
+    "lightning-5.8.6" = {
+      name = "lightning";
+      packageName = "lightning";
+      version = "5.8.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lightning/-/lightning-5.8.6.tgz";
+        sha512 = "qiKxXH81vfxJdR1TbY095IKjD7kwbiWbdGcGHs1GMaAxxcGo/iqf5F+VDWHwGjSlPMohMI827vN0JHqZQKcojA==";
+      };
+    };
     "lilconfig-2.0.5" = {
       name = "lilconfig";
       packageName = "lilconfig";
@@ -40474,6 +40609,15 @@ let
         sha512 = "vB7pnTJveZSMHbyO6qyGbxNqo+rNTYexb3PONon2+Ow4fBUQW5eeBTj+LguuQdN7AgpXX/PHZUQM0TPFeHlVWw==";
       };
     };
+    "ln-service-53.9.4" = {
+      name = "ln-service";
+      packageName = "ln-service";
+      version = "53.9.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ln-service/-/ln-service-53.9.4.tgz";
+        sha512 = "JHPpLaJJ3LSyytDdor9V5GQViEI06kZlxtE6SJeyL+/KAL+feC6Iz/6AlE39pmb1ymm1/CihtSeYcQmgreXlgA==";
+      };
+    };
     "ln-sync-3.11.0" = {
       name = "ln-sync";
       packageName = "ln-sync";
@@ -40483,13 +40627,13 @@ let
         sha512 = "YqtS0v6zsDvv7rA51bSbXnB7Il4HQida+FpPD9KTAXdEiJW1L/NiyV4B+oosaygdUbT2oYgM3xw++L7XVBkPvA==";
       };
     };
-    "ln-telegram-3.20.0" = {
+    "ln-telegram-3.21.0" = {
       name = "ln-telegram";
       packageName = "ln-telegram";
-      version = "3.20.0";
+      version = "3.21.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.20.0.tgz";
-        sha512 = "gPh5EG0sNQUoqnn0Y1SeXXV0rNZN05LC8uKnvCbjPeHrFdx+3TdRLlMrsSITJL1xwATVtxN4+YWMuCSMEU7S+g==";
+        url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.21.0.tgz";
+        sha512 = "a1MvI5yMUStDZ7tOnPeh3nz6yftIESRw/R79oeh2eSvYbS6AGel35pKJ5E+aXVWuQR+0jeA3uGKKBBI1LGc9mw==";
       };
     };
     "load-bmfont-1.4.1" = {
@@ -42409,13 +42553,13 @@ let
         sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
       };
     };
-    "lru-cache-7.7.1" = {
+    "lru-cache-7.7.3" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "7.7.1";
+      version = "7.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.1.tgz";
-        sha512 = "cRffBiTW8s73eH4aTXqBcTLU0xQnwGV3/imttRHGWCrbergmnK4D6JXQd8qin5z43HnDwRI+o7mVW0LEB+tpAw==";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz";
+        sha512 = "WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==";
       };
     };
     "lru-queue-0.1.0" = {
@@ -42680,13 +42824,22 @@ let
         sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
       };
     };
-    "make-fetch-happen-10.1.0" = {
+    "make-fetch-happen-10.1.1" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
-      version = "10.1.0";
+      version = "10.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.1.tgz";
+        sha512 = "3/mCljDQNjmrP7kl0vhS5WVlV+TvSKoZaFhdiYV7MOijEnrhrjaVnqbp/EY/7S+fhUB2KpH7j8c1iRsIOs+kjw==";
+      };
+    };
+    "make-fetch-happen-10.1.2" = {
+      name = "make-fetch-happen";
+      packageName = "make-fetch-happen";
+      version = "10.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.0.tgz";
-        sha512 = "HeP4QlkadP/Op+hE+Une1070kcyN85FshQObku3/rmzRh4zDcKXA19d2L3AQR6UoaX3uZmhSOpTLH15b1vOFvQ==";
+        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.2.tgz";
+        sha512 = "GWMGiZsKVeJACQGJ1P3Z+iNec7pLsU6YW1q11eaPn3RR8nRXHppFWfP7Eu0//55JK3hSjrAQRl8sDa5uXpq1Ew==";
       };
     };
     "make-fetch-happen-8.0.14" = {
@@ -42905,13 +43058,13 @@ let
         sha512 = "/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA==";
       };
     };
-    "markdown-it-anchor-8.4.1" = {
+    "markdown-it-anchor-8.5.0" = {
       name = "markdown-it-anchor";
       packageName = "markdown-it-anchor";
-      version = "8.4.1";
+      version = "8.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.4.1.tgz";
-        sha512 = "sLODeRetZ/61KkKLJElaU3NuU2z7MhXf12Ml1WJMSdwpngeofneCRF+JBbat8HiSqhniOMuTemXMrsI7hA6XyA==";
+        url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.5.0.tgz";
+        sha512 = "ii8jRFS4Sxny0nevOOQZqZKswcZyXnD00AlPKctM0PkNRVsT1/2fQMQPXAdWmRz9kYrMupElsEwCikR7Fd2JFQ==";
       };
     };
     "markdown-it-deflist-2.1.0" = {
@@ -45398,6 +45551,15 @@ let
         sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==";
       };
     };
+    "moment-2.29.2" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.29.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.29.2.tgz";
+        sha512 = "UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==";
+      };
+    };
     "moment-2.7.0" = {
       name = "moment";
       packageName = "moment";
@@ -45434,13 +45596,13 @@ let
         sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==";
       };
     };
-    "mongodb-4.4.1" = {
+    "mongodb-4.5.0" = {
       name = "mongodb";
       packageName = "mongodb";
-      version = "4.4.1";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mongodb/-/mongodb-4.4.1.tgz";
-        sha512 = "IAD3nFtCR4s22vi5qjqkCBnuyDDrOW8WVSSmgHquOvGaP1iTD+XpC5tr8wAUbZ2EeZkaswwBKQFHDvl4qYcKqQ==";
+        url = "https://registry.npmjs.org/mongodb/-/mongodb-4.5.0.tgz";
+        sha512 = "A2l8MjEpKojnhbCM0MK3+UOGUSGvTNNSv7AkP1fsT7tkambrkkqN/5F2y+PhzsV0Nbv58u04TETpkaSEdI2zKA==";
       };
     };
     "mongodb-connection-string-url-2.5.2" = {
@@ -45704,13 +45866,67 @@ let
         sha512 = "JG0V47xRIQ9pyUnx6Hb4+3TrQoia2nA3UIdmyTldhxaxtKFkekkKpUW/N6fwHwod9o4BGuJGtouxOk+yCP5PEA==";
       };
     };
-    "msgpackr-extract-1.0.16" = {
+    "msgpackr-extract-1.1.0" = {
       name = "msgpackr-extract";
       packageName = "msgpackr-extract";
-      version = "1.0.16";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.1.0.tgz";
+        sha512 = "9QxKc4KYr7bNV0/2JPDbRIxCgMEYhDiZtOszvA+eH8Rx8IOOSv3bzP95RoxREwgekdXej+/GhA2Y6paSNBYsgA==";
+      };
+    };
+    "msgpackr-extract-darwin-arm64-1.1.0" = {
+      name = "msgpackr-extract-darwin-arm64";
+      packageName = "msgpackr-extract-darwin-arm64";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-1.1.0.tgz";
+        sha512 = "s1kHoT12tS2cCQOv+Wl3I+/cYNJXBPtwQqGA+dPYoXmchhXiE0Nso+BIfvQ5PxbmAyjj54Q5o7PnLTqVquNfZA==";
+      };
+    };
+    "msgpackr-extract-darwin-x64-1.1.0" = {
+      name = "msgpackr-extract-darwin-x64";
+      packageName = "msgpackr-extract-darwin-x64";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-1.1.0.tgz";
+        sha512 = "yx/H/i12IKg4eWGu/eKdKzJD4jaYvvujQSaVmeOMCesbSQnWo5X6YR9TFjoiNoU9Aexk1KufzL9gW+1DozG1yw==";
+      };
+    };
+    "msgpackr-extract-linux-arm-1.1.0" = {
+      name = "msgpackr-extract-linux-arm";
+      packageName = "msgpackr-extract-linux-arm";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.0.16.tgz";
-        sha512 = "fxdRfQUxPrL/TizyfYfMn09dK58e+d65bRD/fcaVH4052vj30QOzzqxcQIS7B0NsqlypEQ/6Du3QmP2DhWFfCA==";
+        url = "https://registry.npmjs.org/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-1.1.0.tgz";
+        sha512 = "0VvSCqi12xpavxl14gMrauwIzHqHbmSChUijy/uo3mpjB1Pk4vlisKpZsaOZvNJyNKj0ACi5jYtbWnnOd7hYGw==";
+      };
+    };
+    "msgpackr-extract-linux-arm64-1.1.0" = {
+      name = "msgpackr-extract-linux-arm64";
+      packageName = "msgpackr-extract-linux-arm64";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-1.1.0.tgz";
+        sha512 = "AxFle3fHNwz2V4CYDIGFxI6o/ZuI0lBKg0uHI8EcCMUmDE5mVAUWYge5WXmORVvb8sVWyVgFlmi3MTu4Ve6tNQ==";
+      };
+    };
+    "msgpackr-extract-linux-x64-1.1.0" = {
+      name = "msgpackr-extract-linux-x64";
+      packageName = "msgpackr-extract-linux-x64";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-1.1.0.tgz";
+        sha512 = "O+XoyNFWpdB8oQL6O/YyzffPpmG5rTNrr1nKLW70HD2ENJUhcITzbV7eZimHPzkn8LAGls1tBaMTHQezTBpFOw==";
+      };
+    };
+    "msgpackr-extract-win32-x64-1.1.0" = {
+      name = "msgpackr-extract-win32-x64";
+      packageName = "msgpackr-extract-win32-x64";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-1.1.0.tgz";
+        sha512 = "6AJdM5rNsL4yrskRfhujVSPEd6IBpgvsnIT/TPowKNLQ62iIdryizPY2PJNFiW3AJcY249AHEiDBXS1cTDPxzA==";
       };
     };
     "multer-1.4.3" = {
@@ -46208,6 +46424,15 @@ let
         sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==";
       };
     };
+    "nanoid-3.3.2" = {
+      name = "nanoid";
+      packageName = "nanoid";
+      version = "3.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz";
+        sha512 = "CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==";
+      };
+    };
     "nanoiterator-1.2.1" = {
       name = "nanoiterator";
       packageName = "nanoiterator";
@@ -46623,13 +46848,13 @@ let
         sha512 = "SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A==";
       };
     };
-    "nested-error-stacks-2.1.0" = {
+    "nested-error-stacks-2.1.1" = {
       name = "nested-error-stacks";
       packageName = "nested-error-stacks";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz";
-        sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==";
+        url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz";
+        sha512 = "9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==";
       };
     };
     "netmask-1.0.6" = {
@@ -47136,13 +47361,13 @@ let
         sha512 = "G6RlQt5Sb4GMBzXvhfkeFmbqR6MzhtnT7VTHuLadjkii3rdYHNdw0m8zA4BTxVIh68FicCQ2NSUANpsqkr9jvQ==";
       };
     };
-    "node-forge-1.3.0" = {
+    "node-forge-1.3.1" = {
       name = "node-forge";
       packageName = "node-forge";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz";
-        sha512 = "08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==";
+        url = "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz";
+        sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==";
       };
     };
     "node-gyp-3.8.0" = {
@@ -47199,13 +47424,23 @@ let
         sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==";
       };
     };
-    "node-gyp-build-4.3.0" = {
+    "node-gyp-build-4.4.0" = {
       name = "node-gyp-build";
       packageName = "node-gyp-build";
-      version = "4.3.0";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz";
-        sha512 = "iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==";
+        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz";
+        sha512 = "amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==";
+      };
+    };
+    "node-gyp-build-git://github.com/kriszyp/node-gyp-build#optional-packages" = {
+      name = "node-gyp-build";
+      packageName = "node-gyp-build";
+      version = "4.3.0";
+      src = fetchgit {
+        url = "git://github.com/kriszyp/node-gyp-build";
+        rev = "c9952cb77e89d2cd8b6c2d4d056a06d41834b305";
+        sha256 = "c94d85ea73a0770f4e6c6af7967d19ddf09dd721fb0d6d097a0124e976df6487";
       };
     };
     "node-hid-2.1.1" = {
@@ -47847,6 +48082,15 @@ let
         sha512 = "09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==";
       };
     };
+    "npm-install-checks-5.0.0" = {
+      name = "npm-install-checks";
+      packageName = "npm-install-checks";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-5.0.0.tgz";
+        sha512 = "65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==";
+      };
+    };
     "npm-keyword-5.0.0" = {
       name = "npm-keyword";
       packageName = "npm-keyword";
@@ -47919,13 +48163,13 @@ let
         sha512 = "LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==";
       };
     };
-    "npm-package-arg-9.0.1" = {
+    "npm-package-arg-9.0.2" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "9.0.1";
+      version = "9.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.0.1.tgz";
-        sha512 = "Xs9wznfEAmZAR61qsYH3iN24V/qMYYkvAR5CRQNMvC6PjN2fHtO8y9XP/xdp5K+Icx+u1wMBMgWRPCmAEChSog==";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.0.2.tgz";
+        sha512 = "v/miORuX8cndiOheW8p2moNuPJ7QhcFh9WGlTorruG8hXSA23vMTEp5hTCmDxic0nD8KHhj/NQgFuySD3GYY3g==";
       };
     };
     "npm-packlist-1.4.8" = {
@@ -47973,13 +48217,13 @@ let
         sha512 = "dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==";
       };
     };
-    "npm-pick-manifest-7.0.0" = {
+    "npm-pick-manifest-7.0.1" = {
       name = "npm-pick-manifest";
       packageName = "npm-pick-manifest";
-      version = "7.0.0";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-7.0.0.tgz";
-        sha512 = "njM1AcdioFaKd0JSGtLO09YA1WRwctjGQJbnHGmKS+u+uwP8oFvtZtOQWPYdxrnY5eJud3wn8OpH4sEIx6+GEQ==";
+        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz";
+        sha512 = "IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg==";
       };
     };
     "npm-prefix-1.2.0" = {
@@ -49576,22 +49820,22 @@ let
         sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
-    "ot-builder-1.5.0" = {
+    "ot-builder-1.5.1" = {
       name = "ot-builder";
       packageName = "ot-builder";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.5.0.tgz";
-        sha512 = "taCpdbAu+OFogPf5AMdGMt2PnAGER7p4B4EWmIoMh00ZyDcyOVwgbV5V7z64wxo24tAaWXGwLqWOcI2K0SdWhQ==";
+        url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.5.1.tgz";
+        sha512 = "i5kUXVflf7Ek10jTng/E4pVt9F/8PpIQ5p3estArHrzi6OL2EfsqeQskz3IKoAhNjjfsq1h/+MpL3yNu6ZYoVg==";
       };
     };
-    "otb-ttc-bundle-1.5.0" = {
+    "otb-ttc-bundle-1.5.1" = {
       name = "otb-ttc-bundle";
       packageName = "otb-ttc-bundle";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.5.0.tgz";
-        sha512 = "wiavReuHttWgXplMV/T86jiT+dYPOZCq1UtsJR11m8ddI2BnDxhNZcg65OlkGU0Iq4tQmyjVG2PdX2sGH319XQ==";
+        url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.5.1.tgz";
+        sha512 = "i6c3SBvEHyxnptFm0uoRNbfGt6UuXnQOIChG65IFlj9OizEZhqkdwPs+AQ3CZcHcsj6/lXCs20lFOtMOYeScEg==";
       };
     };
     "ow-0.21.0" = {
@@ -50251,22 +50495,22 @@ let
         sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac";
       };
     };
-    "paid-services-3.14.2" = {
+    "paid-services-3.14.4" = {
       name = "paid-services";
       packageName = "paid-services";
-      version = "3.14.2";
+      version = "3.14.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/paid-services/-/paid-services-3.14.2.tgz";
-        sha512 = "Juz+H52DcDe8m0DlYm3oPN1Lf3VKLG5p7/CiiNBoLbZ7vkgO1BU6v71nv1klrvYIJBL9+uwuzgDxWaqYqw4Yxw==";
+        url = "https://registry.npmjs.org/paid-services/-/paid-services-3.14.4.tgz";
+        sha512 = "DLmutrDtOoxgcaiyZcdzD6nIVFwMwnkcriJhZEvVNeyzXlB+aNySn5MpB4YPlDtxKuSd6use+JZxQ5RzifcJ4g==";
       };
     };
-    "paid-services-3.14.4" = {
+    "paid-services-3.14.5" = {
       name = "paid-services";
       packageName = "paid-services";
-      version = "3.14.4";
+      version = "3.14.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/paid-services/-/paid-services-3.14.4.tgz";
-        sha512 = "DLmutrDtOoxgcaiyZcdzD6nIVFwMwnkcriJhZEvVNeyzXlB+aNySn5MpB4YPlDtxKuSd6use+JZxQ5RzifcJ4g==";
+        url = "https://registry.npmjs.org/paid-services/-/paid-services-3.14.5.tgz";
+        sha512 = "oFfpfIeXLJfulqQNupGyWukEgt5yFVm+hNulRm9PCfS9Tr+9akZvW1ZvmakNxuwZugaJqkAgZaDi0xIe9v9Fdw==";
       };
     };
     "pako-0.2.9" = {
@@ -50413,13 +50657,13 @@ let
         sha512 = "bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ==";
       };
     };
-    "parse-conflict-json-2.0.1" = {
+    "parse-conflict-json-2.0.2" = {
       name = "parse-conflict-json";
       packageName = "parse-conflict-json";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-2.0.1.tgz";
-        sha512 = "Y7nYw+QaSGBto1LB9lgwOR05Rtz5SbuTf+Oe7HJ6SYQ/DHsvRjQ8O03oWdJbvkt6GzDWospgyZbGmjDYL0sDgA==";
+        url = "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz";
+        sha512 = "jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA==";
       };
     };
     "parse-english-4.2.0" = {
@@ -51655,13 +51899,13 @@ let
         sha512 = "IWo0HwnxUEH9OtQ3qEZsKUbpdStRSomS18Gx4UV5JT1fj/E/opYGZMgpcdzC1+3ouBJECV1evzt0778S2RJ+/Q==";
       };
     };
-    "pkg-5.5.2" = {
+    "pkg-5.6.0" = {
       name = "pkg";
       packageName = "pkg";
-      version = "5.5.2";
+      version = "5.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pkg/-/pkg-5.5.2.tgz";
-        sha512 = "pD0UB2ud01C6pVv2wpGsTYJrXI/bnvGRYvMLd44wFzA1p+A2jrlTGFPAYa7YEYzmitXhx23PqalaG1eUEnSwcA==";
+        url = "https://registry.npmjs.org/pkg/-/pkg-5.6.0.tgz";
+        sha512 = "mHrAVSQWmHA41RnUmRpC7pK9lNnMfdA16CF3cqOI22a8LZxOQzF7M8YWtA2nfs+d7I0MTDXOtkDsAsFXeCpYjg==";
       };
     };
     "pkg-conf-1.1.3" = {
@@ -51709,13 +51953,13 @@ let
         sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==";
       };
     };
-    "pkg-fetch-3.2.6" = {
+    "pkg-fetch-3.3.0" = {
       name = "pkg-fetch";
       packageName = "pkg-fetch";
-      version = "3.2.6";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.2.6.tgz";
-        sha512 = "Q8fx6SIT022g0cdSE4Axv/xpfHeltspo2gg1KsWRinLQZOTRRAtOOaEFghA1F3jJ8FVsh8hGrL/Pb6Ea5XHIFw==";
+        url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.3.0.tgz";
+        sha512 = "xJnIZ1KP+8rNN+VLafwu4tEeV4m8IkFBDdCFqmAJz9K1aiXEtbARmdbEe6HlXWGSVuShSHjFXpfkKRkDBQ5kiA==";
       };
     };
     "pkg-up-2.0.0" = {
@@ -52006,13 +52250,13 @@ let
         sha512 = "2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==";
       };
     };
-    "polished-4.1.4" = {
+    "polished-4.2.1" = {
       name = "polished";
       packageName = "polished";
-      version = "4.1.4";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/polished/-/polished-4.1.4.tgz";
-        sha512 = "Nq5Mbza+Auo7N3sQb1QMFaQiDO+4UexWuSGR7Cjb4Sw11SZIJcrrFtiZ+L0jT9MBsUsxDboHVASbCLbE1rnECg==";
+        url = "https://registry.npmjs.org/polished/-/polished-4.2.1.tgz";
+        sha512 = "vRkUnHBwVX7kIeCzCghcLCWoDenV+sV7lkItnmTc7bb6Uzbe8ogU1FxqEW8+dXCxUX8YW8vusQ0HTk2yES7bfQ==";
       };
     };
     "polyraf-1.1.0" = {
@@ -52232,13 +52476,13 @@ let
         sha512 = "/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==";
       };
     };
-    "postcss-load-config-3.1.3" = {
+    "postcss-load-config-3.1.4" = {
       name = "postcss-load-config";
       packageName = "postcss-load-config";
-      version = "3.1.3";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.3.tgz";
-        sha512 = "5EYgaM9auHGtO//ljHH+v/aC/TQ5LHXtL7bQajNAUBKUVKiYE8rYpFms7+V26D9FncaGe2zwCoPQsFKb5zF/Hw==";
+        url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz";
+        sha512 = "6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==";
       };
     };
     "postcss-loader-3.0.0" = {
@@ -52583,22 +52827,22 @@ let
         sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==";
       };
     };
-    "postcss-selector-parser-6.0.2" = {
+    "postcss-selector-parser-6.0.10" = {
       name = "postcss-selector-parser";
       packageName = "postcss-selector-parser";
-      version = "6.0.2";
+      version = "6.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz";
-        sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==";
+        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz";
+        sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==";
       };
     };
-    "postcss-selector-parser-6.0.9" = {
+    "postcss-selector-parser-6.0.2" = {
       name = "postcss-selector-parser";
       packageName = "postcss-selector-parser";
-      version = "6.0.9";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz";
-        sha512 = "UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==";
+        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz";
+        sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==";
       };
     };
     "postcss-svgo-4.0.3" = {
@@ -53132,13 +53376,13 @@ let
         sha512 = "vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==";
       };
     };
-    "prettier-2.6.1" = {
+    "prettier-2.6.2" = {
       name = "prettier";
       packageName = "prettier";
-      version = "2.6.1";
+      version = "2.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettier/-/prettier-2.6.1.tgz";
-        sha512 = "8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A==";
+        url = "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz";
+        sha512 = "PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==";
       };
     };
     "prettier-bytes-1.0.4" = {
@@ -53294,15 +53538,6 @@ let
         sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f";
       };
     };
-    "printj-1.3.1" = {
-      name = "printj";
-      packageName = "printj";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz";
-        sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==";
-      };
-    };
     "prism-media-0.0.4" = {
       name = "prism-media";
       packageName = "prism-media";
@@ -53366,13 +53601,13 @@ let
         sha512 = "aCk8AO51s+4JyuYGg3Q/a6gnrlDO09NpVWePtjp7xwphcoQ04x5WAfCyugcsbLooWcMJ87CLkD4+604IckEdhg==";
       };
     };
-    "proc-log-2.0.0" = {
+    "proc-log-2.0.1" = {
       name = "proc-log";
       packageName = "proc-log";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proc-log/-/proc-log-2.0.0.tgz";
-        sha512 = "I/35MfCX2H8jBUhKN8JB8nmqvQo/nKdrBodBY7L3RhDSPPyvOHwLYNmPuhwuJq7a7C3vgFKWGQM+ecPStcvOHA==";
+        url = "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz";
+        sha512 = "Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==";
       };
     };
     "process-0.10.1" = {
@@ -54887,13 +55122,13 @@ let
         sha512 = "2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w==";
       };
     };
-    "puppeteer-13.5.1" = {
+    "puppeteer-13.5.2" = {
       name = "puppeteer";
       packageName = "puppeteer";
-      version = "13.5.1";
+      version = "13.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.5.1.tgz";
-        sha512 = "wWxO//vMiqxlvuzHMAJ0pRJeDHvDtM7DQpW1GKdStz2nZo2G42kOXBDgkmQ+zqjwMCFofKGesBeeKxIkX9BO+w==";
+        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.5.2.tgz";
+        sha512 = "DJAyXODBikZ3xPs8C35CtExEw78LZR9RyelGDAs0tX1dERv3OfW7qpQ9VPBgsfz+hG2HiMTO/Tyf7BuMVWsrxg==";
       };
     };
     "purest-3.1.0" = {
@@ -54968,13 +55203,13 @@ let
         sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==";
       };
     };
-    "pyright-1.1.233" = {
+    "pyright-1.1.235" = {
       name = "pyright";
       packageName = "pyright";
-      version = "1.1.233";
+      version = "1.1.235";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pyright/-/pyright-1.1.233.tgz";
-        sha512 = "qjyKJd6mfXLwaBls4Ww0CmML+K2gA4NnTelxGktLC3JQv7ioWU7lmiQ1KSr1BnmwuuTfsaJSDN3f+hUf9YPfWg==";
+        url = "https://registry.npmjs.org/pyright/-/pyright-1.1.235.tgz";
+        sha512 = "eW40mxHo8WE7WHoBzFfyrH0lQ9nP5rTM5XKvkBgaYjhVafh4MmQeaEm8LmYGN2vUq2//YFLVprvA+U6u+v9i3g==";
       };
     };
     "q-0.9.7" = {
@@ -55634,6 +55869,15 @@ let
         sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q==";
       };
     };
+    "rate-limiter-flexible-2.3.6" = {
+      name = "rate-limiter-flexible";
+      packageName = "rate-limiter-flexible";
+      version = "2.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.3.6.tgz";
+        sha512 = "8DVFOe89rreyut/vzwBI7vgXJynyYoYnH5XogtAKs0F/neAbCTTglXxSJ7fZeZamcFXZDvMidCBvps4KM+1srw==";
+      };
+    };
     "raven-js-3.27.2" = {
       name = "raven-js";
       packageName = "raven-js";
@@ -55751,13 +55995,13 @@ let
         sha512 = "bwfUSB37TWkHfP+PPjb/x8BUjChFmmBK44JMfVnU7paisWqZl/o5k7ttCH+EQLnrbn2Aq8Fo1LAsyUiz+WF4CQ==";
       };
     };
-    "rc-config-loader-4.0.0" = {
+    "rc-config-loader-4.1.0" = {
       name = "rc-config-loader";
       packageName = "rc-config-loader";
-      version = "4.0.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.0.0.tgz";
-        sha512 = "//LRTblJEcqbmmro1GCmZ39qZXD+JqzuD8Y5/IZU3Dhp3A1Yr0Xn68ks8MQ6qKfKvYCWDveUmRDKDA40c+sCXw==";
+        url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.0.tgz";
+        sha512 = "aW+kX4qy0CiM9L4fG4Us3oEOpIrOrXzWykAn+xldD07Y9PXWjTH744oHbv0Kc9ZwWaylw3jMjxaf14RgStrNrA==";
       };
     };
     "rc4-0.1.5" = {
@@ -55841,13 +56085,13 @@ let
         sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A==";
       };
     };
-    "react-devtools-core-4.24.2" = {
+    "react-devtools-core-4.24.3" = {
       name = "react-devtools-core";
       packageName = "react-devtools-core";
-      version = "4.24.2";
+      version = "4.24.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.24.2.tgz";
-        sha512 = "UC3rvQCG/dnC95NPNWBFrUEtdAEiFZ9xZe1tTHFOELVR5qfNLroZ3w9tC51NQvvK5E10G2ko3lQ5Vrh3p0bHrA==";
+        url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.24.3.tgz";
+        sha512 = "+htKZxLxDN14jhRG3+IXRiJqNSGHUiPYrMtv9e7qlZxcbKeJjVs+C/hd8kZF5rydp3faBwFN6ZpTaZnLA3/ZGA==";
       };
     };
     "react-dom-17.0.2" = {
@@ -56111,6 +56355,15 @@ let
         sha512 = "HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==";
       };
     };
+    "read-cmd-shim-3.0.0" = {
+      name = "read-cmd-shim";
+      packageName = "read-cmd-shim";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-3.0.0.tgz";
+        sha512 = "KQDVjGqhZk92PPNRj9ZEXEuqg8bUobSKRw+q0YQ3TKI5xkce7bUJobL4Z/OtiEbAAv70yEpYIXp4iQ9L8oPVog==";
+      };
+    };
     "read-last-lines-1.6.0" = {
       name = "read-last-lines";
       packageName = "read-last-lines";
@@ -56669,13 +56922,13 @@ let
         sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4";
       };
     };
-    "redoc-2.0.0-rc.65" = {
+    "redoc-2.0.0-rc.66" = {
       name = "redoc";
       packageName = "redoc";
-      version = "2.0.0-rc.65";
+      version = "2.0.0-rc.66";
       src = fetchurl {
-        url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.65.tgz";
-        sha512 = "VqJbhb3krYXFP8De7ygyaWsA4jr9K5avsMo3GJUDv2xPiHTOzcprkIfOaL4ZdINn03x6JT1GOa47cWhrmb5KVA==";
+        url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.66.tgz";
+        sha512 = "ZjmZhYkg46QAkza4SYCouY3TEuqnkjf50uyJBiz6Dyaz55RLClofAKokPoy5uEBo0RkPjxebKf9HTGyrxNqJ8A==";
       };
     };
     "reduce-component-1.0.1" = {
@@ -59288,13 +59541,13 @@ let
         sha512 = "zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA==";
       };
     };
-    "sass-1.49.9" = {
+    "sass-1.49.11" = {
       name = "sass";
       packageName = "sass";
-      version = "1.49.9";
+      version = "1.49.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz";
-        sha512 = "YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==";
+        url = "https://registry.npmjs.org/sass/-/sass-1.49.11.tgz";
+        sha512 = "wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ==";
       };
     };
     "sass-loader-10.2.0" = {
@@ -59936,13 +60189,13 @@ let
         sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==";
       };
     };
-    "serialize-to-js-3.1.1" = {
+    "serialize-to-js-3.1.2" = {
       name = "serialize-to-js";
       packageName = "serialize-to-js";
-      version = "3.1.1";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-to-js/-/serialize-to-js-3.1.1.tgz";
-        sha512 = "F+NGU0UHMBO4Q965tjw7rvieNVjlH6Lqi2emq/Lc9LUURYJbiCzmpi4Cy1OOjjVPtxu0c+NE85LU6968Wko5ZA==";
+        url = "https://registry.npmjs.org/serialize-to-js/-/serialize-to-js-3.1.2.tgz";
+        sha512 = "owllqNuDDEimQat7EPG0tH7JjO090xKNzUtYz6X+Sk2BXDnOCilDdNLwjWeFywG9xkJul1ULvtUQa9O4pUaY0w==";
       };
     };
     "serve-11.3.2" = {
@@ -60575,13 +60828,13 @@ let
         sha512 = "z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A==";
       };
     };
-    "simple-git-3.4.0" = {
+    "simple-git-3.5.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "3.4.0";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-3.4.0.tgz";
-        sha512 = "sBRdudUc1yvi0xQQPuHXc1L9gTWkRn4hP2bbc7q4BTxR502d3JJAGsDOhrmsBY+wAZAw5JLl82tx55fSWYE65w==";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-3.5.0.tgz";
+        sha512 = "fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA==";
       };
     };
     "simple-handshake-3.0.0" = {
@@ -60638,13 +60891,13 @@ let
         sha512 = "D1SaWpOW8afq1CZGWB8xTfrT3FekjQmPValrqncJMX7QFl8YwhrPTZvMCANLtgBwwdS+7zURyqxDDEmY558tTw==";
       };
     };
-    "simple-plist-1.3.0" = {
+    "simple-plist-1.3.1" = {
       name = "simple-plist";
       packageName = "simple-plist";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-plist/-/simple-plist-1.3.0.tgz";
-        sha512 = "uYWpeGFtZtVt2NhG4AHgpwx323zxD85x42heMJBan1qAiqqozIlaGrwrEt6kRjXWRWIXsuV1VLCvVmZan2B5dg==";
+        url = "https://registry.npmjs.org/simple-plist/-/simple-plist-1.3.1.tgz";
+        sha512 = "iMSw5i0XseMnrhtIzRb7XpQEXepa9xhWxGUojHBL43SIpQuDQkh3Wpy67ZbDzZVr6EKxvwVChnVpdl8hEVLDiw==";
       };
     };
     "simple-sha1-2.1.2" = {
@@ -61862,13 +62115,13 @@ let
         sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==";
       };
     };
-    "spdx-license-list-6.4.0" = {
+    "spdx-license-list-6.5.0" = {
       name = "spdx-license-list";
       packageName = "spdx-license-list";
-      version = "6.4.0";
+      version = "6.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-6.4.0.tgz";
-        sha512 = "4BxgJ1IZxTJuX1YxMGu2cRYK46Bk9zJNTK2/R0wNZR0cm+6SVl26/uG7FQmQtxoJQX1uZ0EpTi2L7zvMLboaBA==";
+        url = "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-6.5.0.tgz";
+        sha512 = "28O9GgFrMg2Wp8tVML0Zk+fnXaECy7UbB6pxo+93whHay/nqPyEdM07Cx6B4+j2pniUZTYr57OaIOyNTxsTwtw==";
       };
     };
     "spdy-1.32.5" = {
@@ -62591,13 +62844,13 @@ let
         sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA==";
       };
     };
-    "sscaff-1.2.239" = {
+    "sscaff-1.2.248" = {
       name = "sscaff";
       packageName = "sscaff";
-      version = "1.2.239";
+      version = "1.2.248";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.239.tgz";
-        sha512 = "labp/0JhozHLJWGAdobeGgabqIosT6oTjRYPVSGQUy+P1L4qTBWLAOBCRURm+4JHLh7fOHXt7gnFLrEg42SDrA==";
+        url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.248.tgz";
+        sha512 = "rHpwuR6VXLYvHowk/AZTNbTbhnxQ20+G6izyrdCXH7qxIcU05sbo328b8WdglFi3ncm6FF9Rn2PmGEc2HGaY/Q==";
       };
     };
     "ssh-config-1.1.6" = {
@@ -62699,6 +62952,15 @@ let
         sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==";
       };
     };
+    "ssri-9.0.0" = {
+      name = "ssri";
+      packageName = "ssri";
+      version = "9.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssri/-/ssri-9.0.0.tgz";
+        sha512 = "Y1Z6J8UYnexKFN1R/hxUaYoY2LVdKEzziPmVAFKiKX8fiwvCJTVzn/xYE9TEWod5OVyNfIHHuVfIEuBClL/uJQ==";
+      };
+    };
     "stable-0.1.8" = {
       name = "stable";
       packageName = "stable";
@@ -63185,6 +63447,15 @@ let
         sha512 = "PS6wT2ZyyR38Cy+lE6PBEI1ZmO2HdzZoLeDGG0zZbYikCZd0dh8FUoSeFzgWLItpBYw1WJmPVRLpykRV+lAWLQ==";
       };
     };
+    "stream-to-iterator-3.0.3" = {
+      name = "stream-to-iterator";
+      packageName = "stream-to-iterator";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-to-iterator/-/stream-to-iterator-3.0.3.tgz";
+        sha512 = "KT1EWa9Wug83efjIRA8fGaCEFblgU9yNSwoE/uXfuEb0g2LL0vbayn8p6gQ2iuxVUnrIepH0soWBjN8oUShvfg==";
+      };
+    };
     "stream-to-promise-3.0.0" = {
       name = "stream-to-promise";
       packageName = "stream-to-promise";
@@ -64040,13 +64311,13 @@ let
         sha512 = "luHn2OAMGJouOnadm6Fim6WXodQ2AWDkWjYq0rMdyEwzO5PdE4LzoXAEn9LL2snmBAlwUp1URVOTF7lZR3KU+Q==";
       };
     };
-    "stylis-4.0.13" = {
+    "stylis-4.1.0" = {
       name = "stylis";
       packageName = "stylis";
-      version = "4.0.13";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz";
-        sha512 = "xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==";
+        url = "https://registry.npmjs.org/stylis/-/stylis-4.1.0.tgz";
+        sha512 = "SrSDzNasOCBTo7C2N9geFwydg/2bmdkWXd4gJirtq82m5JBYtR2+Ialck8czmfBLIdPxCOotlgJESPa8C1RqvA==";
       };
     };
     "stylus-0.54.8" = {
@@ -64328,13 +64599,13 @@ let
         sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==";
       };
     };
-    "supports-color-9.2.1" = {
+    "supports-color-9.2.2" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "9.2.1";
+      version = "9.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-9.2.1.tgz";
-        sha512 = "Obv7ycoCTG51N7y175StI9BlAXrmgZrFhZOb0/PyjHBher/NmsdBgbbQ1Inhq+gIhz6+7Gb+jWF2Vqi7Mf1xnQ==";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-9.2.2.tgz";
+        sha512 = "XC6g/Kgux+rJXmwokjm9ECpD6k/smUoS5LKlUCcsYr4IY3rW0XyAympon2RmxGrlnZURMpg5T18gWDP9CsHXFA==";
       };
     };
     "supports-hyperlinks-1.0.1" = {
@@ -64382,22 +64653,22 @@ let
         sha1 = "5a7f8a20a71188cf9e75a2cfe8eb182de90daf3b";
       };
     };
-    "svelte-3.46.4" = {
+    "svelte-3.46.6" = {
       name = "svelte";
       packageName = "svelte";
-      version = "3.46.4";
+      version = "3.46.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/svelte/-/svelte-3.46.4.tgz";
-        sha512 = "qKJzw6DpA33CIa+C/rGp4AUdSfii0DOTCzj/2YpSKKayw5WGSS624Et9L1nU1k2OVRS9vaENQXp2CVZNU+xvIg==";
+        url = "https://registry.npmjs.org/svelte/-/svelte-3.46.6.tgz";
+        sha512 = "o9nNft/OzCz/9kJpmWa1S52GAM+huCjPIsNWydYmgei74ZWlOA9/hN9+Z12INdklghu31seEXZMRHhS1+8DETw==";
       };
     };
-    "svelte-preprocess-4.10.4" = {
+    "svelte-preprocess-4.10.5" = {
       name = "svelte-preprocess";
       packageName = "svelte-preprocess";
-      version = "4.10.4";
+      version = "4.10.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.4.tgz";
-        sha512 = "fuwol0N4UoHsNQolLFbMqWivqcJ9N0vfWO9IuPAiX/5okfoGXURyJ6nECbuEIv0nU3M8Xe2I1ONNje2buk7l6A==";
+        url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.5.tgz";
+        sha512 = "VKXPRScCzAZqeBZOGq4LLwtNrAu++mVn7XvQox3eFDV7Ciq0Lg70Q8QWjH9iXF7J+pMlXhPsSFwpCb2E+hoeyA==";
       };
     };
     "svelte2tsx-0.5.6" = {
@@ -64562,13 +64833,13 @@ let
         sha512 = "8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw==";
       };
     };
-    "swagger-ui-dist-4.9.1" = {
+    "swagger-ui-dist-4.10.3" = {
       name = "swagger-ui-dist";
       packageName = "swagger-ui-dist";
-      version = "4.9.1";
+      version = "4.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.9.1.tgz";
-        sha512 = "hYo/kt/wXYd/4WOUm2NLyDa3tR3lCfHbjVa1wSvvSL8AKbYoJsBkc4Va7VJ1uv/JO89xM1736pp1tzJkrVsBxA==";
+        url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.10.3.tgz";
+        sha512 = "eR4vsd7sYo0Sx7ZKRP5Z04yij7JkNmIlUQfrDQgC+xO5ABYx+waabzN+nDsQTLAJ4Z04bjkRd8xqkJtbxr3G7w==";
       };
     };
     "swagger2openapi-7.0.8" = {
@@ -65328,13 +65599,13 @@ let
         sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
       };
     };
-    "textextensions-5.14.0" = {
+    "textextensions-5.15.0" = {
       name = "textextensions";
       packageName = "textextensions";
-      version = "5.14.0";
+      version = "5.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/textextensions/-/textextensions-5.14.0.tgz";
-        sha512 = "4cAYwNFNYlIAHBUo7p6zw8POUvWbZor+/R0Tanv+rIhsauEyV9QSrEXL40pI+GfTQxKX8k6Tyw6CmdSDSmASrg==";
+        url = "https://registry.npmjs.org/textextensions/-/textextensions-5.15.0.tgz";
+        sha512 = "MeqZRHLuaGamUXGuVn2ivtU3LA3mLCCIO5kUGoohTCoGmCBg/+8yPhWVX9WSl9telvVd8erftjFk9Fwb2dD6rw==";
       };
     };
     "textlint-rule-helper-1.2.0" = {
@@ -67272,13 +67543,13 @@ let
         sha512 = "Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA==";
       };
     };
-    "type-fest-2.12.1" = {
+    "type-fest-2.12.2" = {
       name = "type-fest";
       packageName = "type-fest";
-      version = "2.12.1";
+      version = "2.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type-fest/-/type-fest-2.12.1.tgz";
-        sha512 = "AiknQSEqKVGDDjtZqeKrUoTlcj7FKhupmnVUgz6KoOKtvMwRGE6hUNJ/nVear+h7fnUPO1q/htSkYKb1pyntkQ==";
+        url = "https://registry.npmjs.org/type-fest/-/type-fest-2.12.2.tgz";
+        sha512 = "qt6ylCGpLjZ7AaODxbpyBZSs9fCI9SkL3Z9q2oxMBQhs/uyY+VD8jHA8ULCGmWQJlBgqvO3EJeAngOHD8zQCrQ==";
       };
     };
     "type-is-1.6.18" = {
@@ -67947,13 +68218,13 @@ let
         sha1 = "5e4bda308e4a8a2ae584f9b9a4359a499825cc50";
       };
     };
-    "undici-4.16.0" = {
+    "undici-5.0.0" = {
       name = "undici";
       packageName = "undici";
-      version = "4.16.0";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/undici/-/undici-4.16.0.tgz";
-        sha512 = "tkZSECUYi+/T1i4u+4+lwZmQgLXd4BLGlrc7KZPcLIW7Jpq99+Xpc30ONv7nS6F5UNOxp/HBZSSL9MafUrvJbw==";
+        url = "https://registry.npmjs.org/undici/-/undici-5.0.0.tgz";
+        sha512 = "VhUpiZ3No1DOPPQVQnsDZyfcbTTcHdcgWej1PdFnSvOeJmOVDgiOHkunJmBLfmjt4CqgPQddPVjSWW0dsTs5Yg==";
       };
     };
     "unherit-1.1.3" = {
@@ -68136,13 +68407,13 @@ let
         sha512 = "ZlMm62ejrf+tJHdyOjQfljszngQjRor95q2XZMGk6rpJUYi7ZIHY/EXEhOcj9PZkMKKdLIM+dqL4s0ceyk9wbA==";
       };
     };
-    "unified-engine-9.0.5" = {
+    "unified-engine-9.1.0" = {
       name = "unified-engine";
       packageName = "unified-engine";
-      version = "9.0.5";
+      version = "9.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unified-engine/-/unified-engine-9.0.5.tgz";
-        sha512 = "frQ6lUNlkTwVC0JELJqSSITpE7MLrLJqAWmDrUFj5Do6A4/3n6eX5Jyg8fhe4Dbwwh38spqUJd39FtRFG34QWg==";
+        url = "https://registry.npmjs.org/unified-engine/-/unified-engine-9.1.0.tgz";
+        sha512 = "V3UAUsVSAPSNsAdGeYHjtM6FWKIXUt6fPZovbBI5L6WsQIRkRkuFfllquTGCvtu0RckrzdOC7jGaV/tKkokwDw==";
       };
     };
     "unified-lint-rule-1.0.6" = {
@@ -68415,13 +68686,13 @@ let
         sha512 = "w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==";
       };
     };
-    "unist-util-position-4.0.2" = {
+    "unist-util-position-4.0.3" = {
       name = "unist-util-position";
       packageName = "unist-util-position";
-      version = "4.0.2";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.2.tgz";
-        sha512 = "Y6+plxR41dOLbyyqVDLuGWgXDmxdXslCSRYQkSDagBnOT9oFsQH0J8FzhirSklUEe0xZTT0WDnAE1gXPaDFljA==";
+        url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.3.tgz";
+        sha512 = "p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ==";
       };
     };
     "unist-util-position-from-estree-1.1.1" = {
@@ -68955,13 +69226,13 @@ let
         sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
       };
     };
-    "urijs-1.19.10" = {
+    "urijs-1.19.11" = {
       name = "urijs";
       packageName = "urijs";
-      version = "1.19.10";
+      version = "1.19.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/urijs/-/urijs-1.19.10.tgz";
-        sha512 = "EzauQlgKuJgsXOqoMrCiePBf4At5jVqRhXykF3Wfb8ZsOBMxPcfiVBcsHXug4Aepb/ICm2PIgqAUGMelgdrWEg==";
+        url = "https://registry.npmjs.org/urijs/-/urijs-1.19.11.tgz";
+        sha512 = "HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==";
       };
     };
     "urix-0.1.0" = {
@@ -69631,6 +69902,15 @@ let
         sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
       };
     };
+    "validate-npm-package-name-4.0.0" = {
+      name = "validate-npm-package-name";
+      packageName = "validate-npm-package-name";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz";
+        sha512 = "mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==";
+      };
+    };
     "validator-10.11.0" = {
       name = "validator";
       packageName = "validator";
@@ -70558,13 +70838,13 @@ let
         sha512 = "FA0foqMzMmEoO0WJP+MjoD4dRERhKS+Ag+yBrtmWQDmw2OuZ1R/5FkvI/XdTkCpHmTD9VMczugpHRejQyTXCNQ==";
       };
     };
-    "vscode-css-languageservice-5.3.0" = {
+    "vscode-css-languageservice-5.4.1" = {
       name = "vscode-css-languageservice";
       packageName = "vscode-css-languageservice";
-      version = "5.3.0";
+      version = "5.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.3.0.tgz";
-        sha512 = "ujWW855AoJlE4ETU17Gff7unlZZTHDA0w26itk9EQFMfJqi9lE6S67zOsMvcPmJf55MrnGQbojDYZRiDVaFjdA==";
+        url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.4.1.tgz";
+        sha512 = "W7D3GKFXf97ReAaU4EZ2nxVO1kQhztbycJgc1b/Ipr0h8zYWr88BADmrXu02z+lsCS84D7Sr4hoUzDKeaFn2Kg==";
       };
     };
     "vscode-debugadapter-testsupport-1.51.0" = {
@@ -71611,13 +71891,13 @@ let
         sha512 = "WkwV9qJLZZm1ygrryt4+6hAKbk4jLSVCpE92RYk/MOtLSpxq/2S1U0JFyKgsASXhYU5hqHQRiXvFBoNQhfCHyg==";
       };
     };
-    "webcrypto-core-1.7.2" = {
+    "webcrypto-core-1.7.3" = {
       name = "webcrypto-core";
       packageName = "webcrypto-core";
-      version = "1.7.2";
+      version = "1.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.7.2.tgz";
-        sha512 = "GUblRwka3JiP/dduk9/Hdkbm7/+ZqVPISJj9Fq1rZ/JBSInmaeVbeH0KuIy4/gtoC7aWpu6DEnYk0VhkZXmFSA==";
+        url = "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.7.3.tgz";
+        sha512 = "8TnMtwwC/hQOyvElAOJ26lJKGgcErUG02KnKS1+QhjV4mDvQetVWU1EUEeLF8ICOrdc42+GypocyBJKRqo2kQg==";
       };
     };
     "webidl-conversions-2.0.1" = {
@@ -71710,6 +71990,15 @@ let
         sha512 = "ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==";
       };
     };
+    "webpack-5.71.0" = {
+      name = "webpack";
+      packageName = "webpack";
+      version = "5.71.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webpack/-/webpack-5.71.0.tgz";
+        sha512 = "g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A==";
+      };
+    };
     "webpack-bundle-analyzer-3.9.0" = {
       name = "webpack-bundle-analyzer";
       packageName = "webpack-bundle-analyzer";
@@ -71917,13 +72206,13 @@ let
         sha512 = "7iZ+u28Ljw5hCnMiq0BCOeSYf0vCFQe/ORY0HgscTiKjQed8WqugpBUggJ2NTnB9fahn1kEnPRX2jf8Px5PhJw==";
       };
     };
-    "webtorrent-1.8.10" = {
+    "webtorrent-1.8.13" = {
       name = "webtorrent";
       packageName = "webtorrent";
-      version = "1.8.10";
+      version = "1.8.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.10.tgz";
-        sha512 = "0ywp9VXPMpqemsamWWUjU74vdNpOKUILK+lAfZnOgolybAcYZRJ5gCz0u01BI2NFKHZFWoyDacl3fkbxVb57pw==";
+        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.13.tgz";
+        sha512 = "CrNeCA2ZRSvG7YRVpmjyT8sr7QOa7E70k0nAAqIEIvXsYgDexwrwMe4TxH9sXbwaJCA9URSX9UBEGNZ/bjhwMg==";
       };
     };
     "webworkify-webpack-2.1.5" = {
@@ -72421,6 +72710,15 @@ let
         sha512 = "9j8T75p+bcN6D00sF/zjFVmPp+t8KMPB1MzbbzYjeN9VWxdsYnTB40TkbNUEXAmILEfChMvAMgidlX64OG3p6w==";
       };
     };
+    "winston-3.7.2" = {
+      name = "winston";
+      packageName = "winston";
+      version = "3.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winston/-/winston-3.7.2.tgz";
+        sha512 = "QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng==";
+      };
+    };
     "winston-transport-4.5.0" = {
       name = "winston-transport";
       packageName = "winston-transport";
@@ -74147,15 +74445,15 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "13.3.0";
+    version = "13.3.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-13.3.0.tgz";
-      sha512 = "2qCKP/QsyxrJnpd3g4P/iTQ4TjI04N8r+bG5YLLfudoMDsQ/Ti4ogdI7PBeG2IMbRylZW9XLjHraWG42+Y9tWw==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-13.3.1.tgz";
+      sha512 = "0uwU8v3V/2s95X4cZT582J6upReT/ZNw/VAf4p4q51JN+BBvdCEb251xTF+TcOojyToFyJYvg8T28XSrsNsmTQ==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.1303.0"
-      sources."@angular-devkit/core-13.3.0"
-      sources."@angular-devkit/schematics-13.3.0"
+      sources."@angular-devkit/architect-0.1303.1"
+      sources."@angular-devkit/core-13.3.1"
+      sources."@angular-devkit/schematics-13.3.1"
       sources."@gar/promisify-1.1.3"
       sources."@npmcli/fs-1.1.1"
       sources."@npmcli/git-2.1.0"
@@ -74164,7 +74462,7 @@ in
       sources."@npmcli/node-gyp-1.0.3"
       sources."@npmcli/promise-spawn-1.3.2"
       sources."@npmcli/run-script-2.0.0"
-      sources."@schematics/angular-13.3.0"
+      sources."@schematics/angular-13.3.1"
       sources."@tootallnate/once-1.1.2"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."abbrev-1.1.1"
@@ -74220,9 +74518,9 @@ in
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
-      sources."gauge-4.0.3"
+      sources."gauge-4.0.4"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-unicode-2.0.1"
@@ -74292,8 +74590,8 @@ in
           sources."@tootallnate/once-2.0.0"
           sources."cacache-16.0.3"
           sources."http-proxy-agent-5.0.0"
-          sources."lru-cache-7.7.1"
-          (sources."make-fetch-happen-10.1.0" // {
+          sources."lru-cache-7.7.3"
+          (sources."make-fetch-happen-10.1.1" // {
             dependencies = [
               sources."minipass-fetch-2.1.0"
             ];
@@ -74531,7 +74829,7 @@ in
       sources."convert-source-map-1.8.0"
       sources."convict-6.2.2"
       sources."core-util-is-1.0.3"
-      sources."crc-32-1.2.1"
+      sources."crc-32-1.2.2"
       sources."dateformat-4.6.3"
       sources."decompress-response-4.2.1"
       sources."define-properties-1.1.3"
@@ -74539,7 +74837,6 @@ in
       sources."duplexify-4.1.2"
       sources."end-of-stream-1.4.4"
       sources."escape-string-regexp-1.0.5"
-      sources."exit-on-epipe-1.0.1"
       sources."extend-3.0.2"
       sources."fast-redact-3.1.1"
       sources."fast-safe-stringify-2.1.1"
@@ -74561,7 +74858,7 @@ in
           sources."glob-7.2.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."gulp-vinyl-zip-2.5.0"
       sources."handlebars-4.7.7"
       sources."has-1.0.3"
@@ -74631,7 +74928,6 @@ in
       sources."pino-abstract-transport-0.5.0"
       sources."pino-pretty-7.3.0"
       sources."pino-std-serializers-4.0.0"
-      sources."printj-1.3.1"
       sources."process-nextick-args-2.0.1"
       sources."process-warning-1.0.0"
       sources."progress-2.0.3"
@@ -74720,10 +75016,10 @@ in
   "@astrojs/language-server" = nodeEnv.buildNodePackage {
     name = "_at_astrojs_slash_language-server";
     packageName = "@astrojs/language-server";
-    version = "0.13.2";
+    version = "0.13.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.13.2.tgz";
-      sha512 = "4YM4hM02ILvvsSQljAlwLY7OWymlhbikY7O/gsZqELVGMXixemA6dI3GTr2K6duU4ktPBJ3JexuU/OFyb5jvtQ==";
+      url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.13.4.tgz";
+      sha512 = "xWtzZMEVsEZkRLlHMKiOoQIXyQwdMkBPHsRcO1IbzpCmaMQGfKKYNANJ1FKZSHsybbXG/BBaB+LqgVPFNFufew==";
     };
     dependencies = [
       sources."@astrojs/svelte-language-integration-0.1.2"
@@ -74743,11 +75039,11 @@ in
       sources."no-case-3.0.4"
       sources."pascal-case-3.1.2"
       sources."source-map-0.7.3"
-      sources."svelte-3.46.4"
+      sources."svelte-3.46.6"
       sources."svelte2tsx-0.5.6"
       sources."tslib-2.3.1"
       sources."typescript-4.6.3"
-      sources."vscode-css-languageservice-5.3.0"
+      sources."vscode-css-languageservice-5.4.1"
       sources."vscode-html-languageservice-4.2.4"
       sources."vscode-jsonrpc-6.0.0"
       sources."vscode-languageserver-7.0.0"
@@ -74875,7 +75171,7 @@ in
       sources."fresh-0.5.2"
       sources."function-bind-1.1.1"
       sources."get-intrinsic-1.1.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-symbols-1.0.3"
@@ -74903,7 +75199,7 @@ in
         ];
       })
       sources."json-stringify-safe-5.0.1"
-      sources."jszip-3.7.1"
+      sources."jszip-3.9.0"
       sources."keygrip-1.1.0"
       (sources."koa-2.13.4" // {
         dependencies = [
@@ -75106,7 +75402,7 @@ in
       sources."conventional-changelog-angular-5.0.13"
       sources."conventional-commits-parser-3.2.4"
       sources."cosmiconfig-7.0.1"
-      sources."cosmiconfig-typescript-loader-1.0.6"
+      sources."cosmiconfig-typescript-loader-1.0.9"
       sources."create-require-1.1.1"
       sources."cross-spawn-7.0.3"
       sources."dargs-7.0.0"
@@ -75132,7 +75428,7 @@ in
       sources."get-stream-6.0.1"
       sources."git-raw-commits-2.0.11"
       sources."global-dirs-0.1.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
@@ -75310,6 +75606,7 @@ in
       sources."@szmarczak/http-timer-4.0.6"
       sources."@types/cacheable-request-6.0.2"
       sources."@types/http-cache-semantics-4.0.1"
+      sources."@types/json-buffer-3.0.0"
       sources."@types/keyv-3.1.4"
       sources."@types/minimatch-3.0.5"
       sources."@types/node-17.0.23"
@@ -75352,6 +75649,7 @@ in
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."commander-7.2.0"
+      sources."compress-brotli-1.3.6"
       sources."concat-map-0.0.1"
       sources."currently-unhandled-0.4.1"
       sources."debounce-1.2.1"
@@ -75391,7 +75689,7 @@ in
       sources."googleapis-76.0.0"
       sources."googleapis-common-5.1.0"
       sources."got-11.8.3"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."gtoken-5.3.2"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
@@ -75438,7 +75736,7 @@ in
       sources."jsonfile-6.1.0"
       sources."jwa-2.0.0"
       sources."jws-4.0.0"
-      sources."keyv-4.1.1"
+      sources."keyv-4.2.1"
       sources."lines-and-columns-1.2.4"
       sources."locate-path-6.0.0"
       sources."lodash-4.17.21"
@@ -75458,7 +75756,7 @@ in
       sources."multimatch-5.0.0"
       sources."mute-stream-0.0.8"
       sources."node-fetch-2.6.7"
-      sources."node-forge-1.3.0"
+      sources."node-forge-1.3.1"
       sources."normalize-newline-4.1.0"
       (sources."normalize-package-data-3.0.3" // {
         dependencies = [
@@ -75549,7 +75847,7 @@ in
       sources."tr46-0.0.3"
       (sources."ts2gas-4.2.0" // {
         dependencies = [
-          sources."type-fest-2.12.1"
+          sources."type-fest-2.12.2"
         ];
       })
       sources."tslib-2.3.1"
@@ -75790,7 +76088,7 @@ in
       sources."minimist-1.2.6"
       sources."mkdirp-1.0.4"
       sources."mkdirp-classic-0.5.3"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."mountable-hypertrie-2.8.0"
       sources."ms-2.0.0"
       sources."multicast-dns-7.2.4"
@@ -75801,7 +76099,7 @@ in
       sources."nanoresource-1.3.0"
       sources."nanoresource-promise-1.2.2"
       sources."napi-macros-2.0.0"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       (sources."noise-peer-2.1.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -75893,7 +76191,7 @@ in
       sources."supports-preserve-symlinks-flag-1.0.0"
       sources."temp-dir-1.0.0"
       sources."tempy-0.1.0"
-      sources."textextensions-5.14.0"
+      sources."textextensions-5.15.0"
       (sources."through2-4.0.2" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -75952,35 +76250,37 @@ in
   "@medable/mdctl-cli" = nodeEnv.buildNodePackage {
     name = "_at_medable_slash_mdctl-cli";
     packageName = "@medable/mdctl-cli";
-    version = "1.0.62";
+    version = "1.0.64";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@medable/mdctl-cli/-/mdctl-cli-1.0.62.tgz";
-      sha512 = "7EpRhhrJqICbMGjLkdthQYLLGMXNCsrsq8/xxYX1cdRiNwoGb84yjL1WFBrnQtaM8rXShOvhf4lrM2W0K9m4lQ==";
+      url = "https://registry.npmjs.org/@medable/mdctl-cli/-/mdctl-cli-1.0.64.tgz";
+      sha512 = "hV1PG20mLFmYbSJvV+JIGVLUT3zzDt2snR9T7tKMBAVvGQBAfzodylbTZe+b20hNz3Max2Z4zsKVksRu71x1+A==";
     };
     dependencies = [
       sources."@babel/parser-7.17.8"
-      sources."@medable/mdctl-api-1.0.63"
-      sources."@medable/mdctl-core-1.0.63"
-      sources."@medable/mdctl-core-schemas-1.0.63"
+      sources."@medable/mdctl-api-1.0.64"
+      sources."@medable/mdctl-api-driver-1.0.64"
+      sources."@medable/mdctl-axon-tools-1.0.64"
+      sources."@medable/mdctl-core-1.0.64"
+      sources."@medable/mdctl-core-schemas-1.0.64"
       sources."@medable/mdctl-core-utils-1.0.63"
-      sources."@medable/mdctl-credentials-provider-keychain-1.0.63"
-      sources."@medable/mdctl-credentials-provider-pouchdb-1.0.63"
-      sources."@medable/mdctl-docs-1.0.63"
+      sources."@medable/mdctl-credentials-provider-keychain-1.0.64"
+      sources."@medable/mdctl-credentials-provider-pouchdb-1.0.64"
+      sources."@medable/mdctl-docs-1.0.64"
       sources."@medable/mdctl-export-adapter-console-1.0.63"
-      (sources."@medable/mdctl-export-adapter-tree-1.0.63" // {
+      (sources."@medable/mdctl-export-adapter-tree-1.0.64" // {
         dependencies = [
           sources."glob-7.2.0"
           sources."globby-10.0.2"
         ];
       })
-      sources."@medable/mdctl-import-adapter-1.0.63"
-      (sources."@medable/mdctl-manifest-1.0.63" // {
+      sources."@medable/mdctl-import-adapter-1.0.64"
+      (sources."@medable/mdctl-manifest-1.0.64" // {
         dependencies = [
           sources."pluralize-8.0.0"
         ];
       })
-      sources."@medable/mdctl-node-utils-1.0.63"
-      sources."@medable/mdctl-sandbox-1.0.63"
+      sources."@medable/mdctl-node-utils-1.0.64"
+      sources."@medable/mdctl-sandbox-1.0.64"
       sources."@medable/mdctl-secrets-1.0.63"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.scandir-2.1.5"
@@ -76023,6 +76323,7 @@ in
       sources."assign-symbols-1.0.0"
       sources."ast-types-0.9.6"
       sources."async-2.6.3"
+      sources."async-iter-stream-1.2.0"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
@@ -76267,7 +76568,7 @@ in
           sources."to-regex-range-2.1.1"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       (sources."handlebars-4.7.7" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -76389,11 +76690,15 @@ in
       sources."lodash.isstring-4.0.1"
       sources."lodash.once-4.1.1"
       sources."lodash.sortby-4.7.0"
-      sources."map-age-cleaner-0.1.3"
+      (sources."map-age-cleaner-0.1.3" // {
+        dependencies = [
+          sources."p-defer-1.0.0"
+        ];
+      })
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."markdown-it-12.3.2"
-      sources."markdown-it-anchor-8.4.1"
+      sources."markdown-it-anchor-8.5.0"
       sources."marked-4.0.12"
       sources."md5.js-1.3.5"
       sources."mdurl-1.0.1"
@@ -76419,6 +76724,7 @@ in
         ];
       })
       sources."mkdirp-0.5.6"
+      sources."moment-2.29.2"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.7"
       sources."nan-2.14.0"
@@ -76476,7 +76782,7 @@ in
       sources."os-locale-3.1.0"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
-      sources."p-defer-1.0.0"
+      sources."p-defer-3.0.0"
       sources."p-finally-1.0.0"
       sources."p-is-promise-2.1.0"
       sources."p-limit-2.3.0"
@@ -76740,6 +77046,7 @@ in
           sources."kind-of-5.1.0"
         ];
       })
+      sources."stream-to-iterator-3.0.3"
       sources."string-natural-compare-2.0.3"
       sources."string-width-1.0.2"
       sources."string_decoder-1.3.0"
@@ -76920,7 +77227,7 @@ in
       sources."deprecation-2.3.1"
       sources."esprima-4.0.1"
       sources."fs-extra-9.1.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-flag-4.0.0"
       sources."ieee754-1.2.1"
       sources."inherits-2.0.4"
@@ -77007,10 +77314,10 @@ in
           sources."supports-color-5.5.0"
         ];
       })
-      (sources."@nestjs/schematics-8.0.8" // {
+      (sources."@nestjs/schematics-8.0.9" // {
         dependencies = [
-          sources."@angular-devkit/core-13.2.5"
-          sources."@angular-devkit/schematics-13.2.5"
+          sources."@angular-devkit/core-13.3.1"
+          sources."@angular-devkit/schematics-13.3.1"
         ];
       })
       sources."@types/eslint-8.4.1"
@@ -77057,7 +77364,7 @@ in
       sources."buffer-5.7.1"
       sources."buffer-from-1.1.2"
       sources."callsites-3.1.0"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       sources."chalk-3.0.0"
       sources."chardet-0.7.0"
       sources."chokidar-3.5.3"
@@ -77076,7 +77383,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-to-chromium-1.4.103"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."enhanced-resolve-5.9.2"
@@ -77112,7 +77419,7 @@ in
       sources."glob-7.2.0"
       sources."glob-parent-5.1.2"
       sources."glob-to-regexp-0.4.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."human-signals-1.1.1"
@@ -77467,7 +77774,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.1101.0" // {
+      (sources."aws-sdk-2.1107.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -77557,7 +77864,7 @@ in
       sources."function-bind-1.1.1"
       sources."get-intrinsic-1.1.1"
       sources."getpass-0.1.7"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       (sources."grant-4.7.0" // {
         dependencies = [
           sources."qs-6.10.3"
@@ -77621,7 +77928,7 @@ in
           sources."mime-db-1.42.0"
         ];
       })
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."moment-timezone-0.5.34"
       (sources."morgan-1.10.0" // {
         dependencies = [
@@ -77752,7 +78059,7 @@ in
           sources."@types/node-10.17.60"
         ];
       })
-      sources."@apollographql/apollo-tools-0.5.2"
+      sources."@apollographql/apollo-tools-0.5.3"
       sources."@apollographql/graphql-playground-html-1.6.27"
       sources."@apollographql/graphql-upload-8-fork-8.1.3"
       sources."@babel/code-frame-7.16.7"
@@ -77933,7 +78240,7 @@ in
       sources."@types/fs-capacitor-2.0.0"
       sources."@types/http-assert-1.5.3"
       sources."@types/http-errors-1.8.2"
-      sources."@types/inquirer-8.2.0"
+      sources."@types/inquirer-8.2.1"
       (sources."@types/jscodeshift-0.7.2" // {
         dependencies = [
           sources."ast-types-0.12.1"
@@ -77980,7 +78287,7 @@ in
       sources."ansi-styles-4.3.0"
       sources."apollo-cache-control-0.14.0"
       sources."apollo-datasource-0.9.0"
-      sources."apollo-graphql-0.9.5"
+      sources."apollo-graphql-0.9.6"
       (sources."apollo-link-1.2.14" // {
         dependencies = [
           sources."tslib-1.14.1"
@@ -78037,9 +78344,12 @@ in
       })
       sources."base64-js-1.5.1"
       sources."bl-4.1.0"
-      (sources."body-parser-1.19.2" // {
+      (sources."body-parser-1.20.0" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."depd-2.0.0"
+          sources."http-errors-2.0.0"
+          sources."statuses-2.0.1"
         ];
       })
       (sources."boxen-5.1.2" // {
@@ -78068,7 +78378,7 @@ in
       })
       sources."call-bind-1.0.2"
       sources."camelcase-6.3.0"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       sources."caw-2.0.1"
       sources."chalk-4.1.2"
       sources."chardet-0.7.0"
@@ -78176,7 +78486,7 @@ in
       sources."define-property-2.0.2"
       sources."depd-1.1.2"
       sources."deprecated-decorator-0.1.6"
-      sources."destroy-1.0.4"
+      sources."destroy-1.2.0"
       sources."dicer-0.3.0"
       sources."dir-glob-3.0.1"
       (sources."download-7.1.0" // {
@@ -78189,14 +78499,14 @@ in
       sources."easy-stack-1.0.1"
       sources."ee-first-1.1.1"
       sources."ejs-3.1.6"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-to-chromium-1.4.103"
       sources."emoji-regex-8.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."entities-2.2.0"
       sources."envinfo-7.8.1"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
       sources."escape-html-1.0.3"
@@ -78229,7 +78539,11 @@ in
       })
       (sources."express-4.17.3" // {
         dependencies = [
+          sources."body-parser-1.19.2"
           sources."debug-2.6.9"
+          sources."on-finished-2.3.0"
+          sources."qs-6.9.7"
+          sources."raw-body-2.4.3"
         ];
       })
       sources."express-history-api-fallback-2.2.1"
@@ -78260,6 +78574,7 @@ in
       (sources."finalhandler-1.1.2" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."on-finished-2.3.0"
         ];
       })
       (sources."find-cache-dir-2.1.0" // {
@@ -78289,7 +78604,7 @@ in
           sources."which-2.0.2"
         ];
       })
-      sources."flow-parser-0.174.1"
+      sources."flow-parser-0.175.0"
       sources."for-each-0.3.3"
       sources."for-in-1.0.2"
       sources."forwarded-0.2.0"
@@ -78331,7 +78646,7 @@ in
           sources."get-stream-3.0.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."graphql-15.8.0"
       sources."graphql-extensions-0.15.0"
       sources."graphql-subscriptions-1.2.1"
@@ -78397,14 +78712,14 @@ in
       sources."is-natural-number-4.0.1"
       sources."is-negative-zero-2.0.2"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-object-1.0.2"
       sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
       sources."is-promise-2.2.2"
       sources."is-regex-1.1.4"
       sources."is-retry-allowed-1.2.0"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-stream-1.1.0"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
@@ -78538,7 +78853,7 @@ in
       sources."object.assign-4.1.2"
       sources."object.getownpropertydescriptors-2.1.3"
       sources."object.pick-1.3.0"
-      sources."on-finished-2.3.0"
+      sources."on-finished-2.4.1"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
       sources."open-8.4.0"
@@ -78607,11 +78922,17 @@ in
       sources."proxy-addr-2.0.7"
       sources."ps-list-7.2.0"
       sources."pump-3.0.0"
-      sources."qs-6.9.7"
+      sources."qs-6.10.3"
       sources."query-string-5.1.1"
       sources."queue-microtask-1.2.3"
       sources."range-parser-1.2.1"
-      sources."raw-body-2.4.3"
+      (sources."raw-body-2.5.1" // {
+        dependencies = [
+          sources."depd-2.0.0"
+          sources."http-errors-2.0.0"
+          sources."statuses-2.0.1"
+        ];
+      })
       sources."read-pkg-5.2.0"
       sources."readable-stream-3.6.0"
       sources."recast-0.20.5"
@@ -78659,7 +78980,9 @@ in
               sources."ms-2.0.0"
             ];
           })
+          sources."destroy-1.0.4"
           sources."ms-2.1.3"
+          sources."on-finished-2.3.0"
         ];
       })
       sources."serve-static-1.14.2"
@@ -79104,7 +79427,7 @@ in
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/acorn-4.0.6"
-      sources."@types/concat-stream-1.6.1"
+      sources."@types/concat-stream-2.0.0"
       sources."@types/debug-4.1.7"
       sources."@types/estree-0.0.51"
       sources."@types/estree-jsx-0.0.1"
@@ -79225,7 +79548,7 @@ in
         ];
       })
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -79493,7 +79816,7 @@ in
         ];
       })
       sources."unified-diff-4.0.1"
-      (sources."unified-engine-9.0.5" // {
+      (sources."unified-engine-9.1.0" // {
         dependencies = [
           sources."is-plain-obj-4.0.0"
           sources."lines-and-columns-2.0.3"
@@ -79509,7 +79832,7 @@ in
       sources."unist-util-inspect-7.0.0"
       sources."unist-util-is-5.1.1"
       sources."unist-util-modify-children-2.0.0"
-      sources."unist-util-position-4.0.2"
+      sources."unist-util-position-4.0.3"
       sources."unist-util-position-from-estree-1.1.1"
       sources."unist-util-remove-position-4.0.1"
       sources."unist-util-stringify-position-3.0.2"
@@ -79544,7 +79867,7 @@ in
           sources."emoji-regex-9.2.2"
           sources."string-width-5.1.2"
           sources."strip-ansi-7.0.1"
-          sources."supports-color-9.2.1"
+          sources."supports-color-9.2.2"
         ];
       })
       sources."vfile-sort-3.0.0"
@@ -79623,7 +79946,7 @@ in
       sources."balanced-match-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."browserslist-4.20.2"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       sources."chalk-2.4.2"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -79633,7 +79956,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.96"
+      sources."electron-to-chromium-1.4.103"
       sources."ensure-posix-path-1.1.1"
       sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
@@ -79653,7 +79976,7 @@ in
         ];
       })
       sources."globals-11.12.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-color-0.1.7"
       sources."has-flag-3.0.0"
@@ -79887,7 +80210,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
       sources."uri-js-4.4.1"
-      sources."urijs-1.19.10"
+      sources."urijs-1.19.11"
       sources."uuid-3.4.0"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
@@ -80009,8 +80332,8 @@ in
     };
     dependencies = [
       sources."browserslist-4.20.2"
-      sources."caniuse-lite-1.0.30001320"
-      sources."electron-to-chromium-1.4.96"
+      sources."caniuse-lite-1.0.30001325"
+      sources."electron-to-chromium-1.4.103"
       sources."escalade-3.1.1"
       sources."fraction.js-4.2.0"
       sources."node-releases-2.0.2"
@@ -80045,7 +80368,7 @@ in
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-4.3.0"
       sources."ast-types-0.13.4"
-      (sources."aws-sdk-2.1101.0" // {
+      (sources."aws-sdk-2.1107.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -80066,7 +80389,7 @@ in
       sources."chalk-4.1.2"
       sources."chardet-0.7.0"
       sources."cheerio-1.0.0-rc.10"
-      sources."cheerio-select-1.5.0"
+      sources."cheerio-select-1.6.0"
       sources."chownr-1.1.4"
       sources."cli-cursor-3.1.0"
       sources."cli-spinners-2.6.1"
@@ -80077,8 +80400,8 @@ in
       sources."commander-8.3.0"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.3"
-      sources."css-select-4.2.1"
-      sources."css-what-5.1.0"
+      sources."css-select-4.3.0"
+      sources."css-what-6.1.0"
       sources."data-uri-to-buffer-3.0.1"
       sources."debug-4.3.4"
       sources."deep-is-0.1.4"
@@ -80119,7 +80442,7 @@ in
       sources."get-stream-5.2.0"
       sources."get-uri-3.0.2"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-flag-4.0.0"
       sources."htmlparser2-6.1.0"
       sources."http-errors-2.0.0"
@@ -80360,7 +80683,7 @@ in
       sources."glob-parent-5.1.2"
       sources."globby-11.1.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
@@ -80663,10 +80986,10 @@ in
   balanceofsatoshis = nodeEnv.buildNodePackage {
     name = "balanceofsatoshis";
     packageName = "balanceofsatoshis";
-    version = "11.61.3";
+    version = "11.64.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.61.3.tgz";
-      sha512 = "+ORg7HujAcHBRnOycZsbkVaNESplxHqYUxbtfZ1jSqNRoIf/mjQhpzTa4L5huBk7C+nFnx/rbfJn+xFIeL7ebA==";
+      url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.64.1.tgz";
+      sha512 = "k8ft+Al3mYVW9hfQ2JjkKIrbUmIyhZzjUqHz16ieo/4ggWMPr8WxKiiz7ZuPgG/kog8XY0RlkFT2F0/9Ej9gdg==";
     };
     dependencies = [
       (sources."@alexbosworth/caporal-1.4.1" // {
@@ -80718,10 +81041,10 @@ in
       sources."@types/node-17.0.23"
       sources."@types/qs-6.9.7"
       sources."@types/range-parser-1.2.4"
-      sources."@types/request-2.48.7"
+      sources."@types/request-2.48.8"
       sources."@types/serve-static-1.13.10"
       sources."@types/tough-cookie-4.0.1"
-      sources."@types/ws-8.2.0"
+      sources."@types/ws-8.5.2"
       sources."abort-controller-3.0.0"
       sources."accepts-1.3.8"
       (sources."agent-base-6.0.2" // {
@@ -80773,7 +81096,7 @@ in
       sources."bolt01-1.2.3"
       sources."bolt03-1.2.13"
       sources."bolt07-1.8.0"
-      sources."bolt09-0.2.1"
+      sources."bolt09-0.2.2"
       (sources."boxen-5.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -80822,9 +81145,13 @@ in
       sources."commander-6.2.1"
       sources."concat-stream-1.6.2"
       sources."configstore-5.0.1"
-      sources."content-disposition-0.5.3"
+      (sources."content-disposition-0.5.4" // {
+        dependencies = [
+          sources."safe-buffer-5.2.1"
+        ];
+      })
       sources."content-type-1.0.4"
-      sources."cookie-0.4.0"
+      sources."cookie-0.4.2"
       sources."cookie-signature-1.0.6"
       sources."core-util-is-1.0.3"
       sources."cors-2.8.5"
@@ -80863,16 +81190,9 @@ in
       sources."etag-1.8.1"
       sources."event-target-shim-5.0.1"
       sources."exit-hook-1.1.1"
-      (sources."express-4.17.1" // {
+      (sources."express-4.17.3" // {
         dependencies = [
-          sources."body-parser-1.19.0"
-          sources."bytes-3.1.0"
-          sources."http-errors-1.7.2"
-          sources."inherits-2.0.3"
-          sources."qs-6.7.0"
-          sources."raw-body-2.4.0"
-          sources."setprototypeof-1.1.1"
-          sources."toidentifier-1.0.0"
+          sources."safe-buffer-5.2.1"
         ];
       })
       sources."extend-3.0.2"
@@ -80890,10 +81210,14 @@ in
       sources."get-caller-file-2.0.5"
       sources."get-stream-4.1.0"
       sources."global-dirs-3.0.0"
-      sources."goldengate-11.1.0"
+      (sources."goldengate-11.1.0" // {
+        dependencies = [
+          sources."ln-service-53.9.3"
+        ];
+      })
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
-      (sources."grammy-1.7.0" // {
+      sources."graceful-fs-4.2.10"
+      (sources."grammy-1.7.1" // {
         dependencies = [
           sources."debug-4.3.4"
           sources."ms-2.1.2"
@@ -80938,10 +81262,12 @@ in
           sources."restore-cursor-3.1.0"
           sources."supports-color-7.2.0"
           sources."tmp-0.0.33"
+          sources."type-fest-0.21.3"
         ];
       })
       (sources."invoices-2.0.4" // {
         dependencies = [
+          sources."bolt09-0.2.1"
           sources."tiny-secp256k1-2.2.0"
           sources."uint8array-tools-0.0.6"
         ];
@@ -80977,50 +81303,18 @@ in
       sources."keyv-3.1.0"
       sources."kind-of-6.0.3"
       sources."latest-version-5.1.0"
-      (sources."lightning-4.14.3" // {
+      (sources."lightning-5.8.2" // {
         dependencies = [
-          sources."@grpc/grpc-js-1.4.4"
-          sources."@grpc/proto-loader-0.6.6"
-          sources."@types/node-16.11.7"
-          sources."async-3.2.2"
-          sources."asyncjs-util-1.2.7"
-          sources."bech32-1.1.4"
-          sources."bitcoinjs-lib-6.0.0"
-          sources."body-parser-1.19.0"
-          sources."bolt07-1.7.4"
-          sources."bolt09-0.2.0"
-          sources."bytes-3.1.0"
-          sources."http-errors-1.7.2"
-          sources."inherits-2.0.3"
-          (sources."invoices-2.0.1" // {
-            dependencies = [
-              (sources."bitcoinjs-lib-5.2.0" // {
-                dependencies = [
-                  sources."bech32-1.1.4"
-                ];
-              })
-            ];
-          })
-          (sources."psbt-1.1.10" // {
-            dependencies = [
-              sources."bitcoinjs-lib-5.2.0"
-            ];
-          })
-          sources."qs-6.7.0"
-          sources."raw-body-2.4.0"
-          sources."setprototypeof-1.1.1"
-          (sources."tiny-secp256k1-1.1.6" // {
-            dependencies = [
-              sources."bn.js-4.12.0"
-            ];
-          })
-          sources."toidentifier-1.0.0"
+          sources."@types/node-17.0.21"
         ];
       })
       (sources."ln-accounting-5.0.5" // {
         dependencies = [
           sources."@grpc/grpc-js-1.4.4"
           sources."@grpc/proto-loader-0.6.6"
+          sources."@types/node-16.11.7"
+          sources."@types/request-2.48.7"
+          sources."@types/ws-8.2.0"
           sources."async-3.2.2"
           sources."asyncjs-util-1.2.7"
           sources."bech32-1.1.4"
@@ -81034,7 +81328,10 @@ in
           })
           sources."bolt09-0.2.0"
           sources."bytes-3.1.0"
+          sources."content-disposition-0.5.3"
+          sources."cookie-0.4.0"
           sources."ecpair-1.0.1"
+          sources."express-4.17.1"
           sources."goldengate-10.4.2"
           sources."http-errors-1.7.2"
           sources."inherits-2.0.3"
@@ -81044,7 +81341,23 @@ in
               sources."bn.js-5.2.0"
             ];
           })
+          (sources."lightning-4.14.3" // {
+            dependencies = [
+              sources."bech32-2.0.0"
+              sources."bn.js-5.2.0"
+              (sources."invoices-2.0.1" // {
+                dependencies = [
+                  (sources."bitcoinjs-lib-5.2.0" // {
+                    dependencies = [
+                      sources."bech32-1.1.4"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
           sources."ln-service-52.16.0"
+          sources."ms-2.1.1"
           (sources."psbt-1.1.10" // {
             dependencies = [
               sources."bitcoinjs-lib-5.2.0"
@@ -81053,33 +81366,31 @@ in
           })
           sources."qs-6.7.0"
           sources."raw-body-2.4.0"
+          sources."send-0.17.1"
+          sources."serve-static-1.14.1"
           sources."setprototypeof-1.1.1"
           sources."tiny-secp256k1-1.1.6"
           sources."toidentifier-1.0.0"
+          sources."ws-8.2.3"
         ];
       })
-      (sources."ln-service-53.9.3" // {
+      (sources."ln-service-53.9.4" // {
         dependencies = [
-          sources."@types/node-17.0.21"
-          sources."@types/request-2.48.8"
-          sources."@types/ws-8.5.2"
-          sources."bolt09-0.2.2"
-          sources."content-disposition-0.5.4"
-          sources."cookie-0.4.2"
-          sources."express-4.17.3"
-          sources."lightning-5.8.2"
-          sources."ms-2.1.3"
-          sources."safe-buffer-5.2.1"
-          sources."send-0.17.2"
-          sources."serve-static-1.14.2"
-          sources."type-fest-2.12.0"
-          sources."ws-8.5.0"
+          sources."@grpc/grpc-js-1.6.1"
+          sources."@types/ws-8.5.3"
+          sources."lightning-5.8.6"
+          sources."type-fest-2.12.2"
+        ];
+      })
+      (sources."ln-sync-3.11.0" // {
+        dependencies = [
+          sources."ln-service-53.9.3"
         ];
       })
-      sources."ln-sync-3.11.0"
-      (sources."ln-telegram-3.20.0" // {
+      (sources."ln-telegram-3.21.0" // {
         dependencies = [
-          sources."paid-services-3.14.2"
+          sources."ln-service-53.9.3"
+          sources."paid-services-3.14.4"
         ];
       })
       sources."lodash-4.17.21"
@@ -81135,7 +81446,7 @@ in
       sources."negotiator-0.6.3"
       sources."node-addon-api-2.0.2"
       sources."node-fetch-2.6.7"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       sources."nofilter-3.1.0"
       sources."normalize-url-4.5.1"
       sources."npmlog-2.0.4"
@@ -81164,7 +81475,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      sources."paid-services-3.14.4"
+      sources."paid-services-3.14.5"
       sources."parseurl-1.3.3"
       sources."path-to-regexp-0.1.7"
       sources."pinkie-2.0.4"
@@ -81174,23 +81485,19 @@ in
         dependencies = [
           sources."@grpc/grpc-js-1.5.4"
           sources."@types/node-17.0.15"
-          sources."@types/request-2.48.8"
           sources."@types/ws-8.2.2"
           sources."body-parser-1.19.1"
+          sources."bolt09-0.2.1"
           sources."bytes-3.1.1"
-          sources."content-disposition-0.5.4"
           sources."cookie-0.4.1"
           sources."express-4.17.2"
           sources."invoices-2.0.3"
           sources."lightning-5.6.2"
           sources."ln-service-53.7.3"
-          sources."ms-2.1.3"
           sources."qs-6.9.6"
           sources."raw-body-2.4.2"
           sources."safe-buffer-5.2.1"
           sources."secp256k1-4.0.3"
-          sources."send-0.17.2"
-          sources."serve-static-1.14.2"
           sources."tiny-secp256k1-2.2.0"
           sources."type-fest-2.11.1"
           sources."uint8array-tools-0.0.6"
@@ -81236,15 +81543,12 @@ in
           sources."semver-6.3.0"
         ];
       })
-      (sources."send-0.17.1" // {
+      (sources."send-0.17.2" // {
         dependencies = [
-          sources."http-errors-1.7.3"
-          sources."ms-2.1.1"
-          sources."setprototypeof-1.1.1"
-          sources."toidentifier-1.0.0"
+          sources."ms-2.1.3"
         ];
       })
-      sources."serve-static-1.14.1"
+      sources."serve-static-1.14.2"
       sources."setprototypeof-1.2.0"
       sources."sha.js-2.4.11"
       sources."signal-exit-3.0.7"
@@ -81291,7 +81595,7 @@ in
       sources."tslib-2.3.1"
       sources."tweetnacl-1.0.3"
       sources."tweetnacl-util-0.15.1"
-      sources."type-fest-0.21.3"
+      sources."type-fest-2.12.0"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."typedarray-to-buffer-3.1.5"
@@ -81333,7 +81637,7 @@ in
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-3.0.3"
-      sources."ws-8.2.3"
+      sources."ws-8.5.0"
       sources."xdg-basedir-4.0.0"
       sources."y18n-5.0.8"
       sources."yallist-4.0.0"
@@ -81461,7 +81765,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."uri-js-4.4.1"
-      sources."urijs-1.19.10"
+      sources."urijs-1.19.11"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
       sources."vscode-jsonrpc-6.0.0"
@@ -81702,7 +82006,7 @@ in
       sources."find-up-1.1.2"
       (sources."fs-extra-0.26.7" // {
         dependencies = [
-          sources."graceful-fs-4.2.9"
+          sources."graceful-fs-4.2.10"
         ];
       })
       sources."fs.realpath-1.0.0"
@@ -81723,17 +82027,17 @@ in
       sources."is-utf8-0.2.1"
       (sources."jsonfile-2.4.0" // {
         dependencies = [
-          sources."graceful-fs-4.2.9"
+          sources."graceful-fs-4.2.10"
         ];
       })
       (sources."klaw-1.3.1" // {
         dependencies = [
-          sources."graceful-fs-4.2.9"
+          sources."graceful-fs-4.2.10"
         ];
       })
       (sources."load-json-file-1.1.0" // {
         dependencies = [
-          sources."graceful-fs-4.2.9"
+          sources."graceful-fs-4.2.10"
         ];
       })
       sources."lodash-4.2.1"
@@ -81756,7 +82060,7 @@ in
       sources."path-parse-1.0.7"
       (sources."path-type-1.1.0" // {
         dependencies = [
-          sources."graceful-fs-4.2.9"
+          sources."graceful-fs-4.2.10"
         ];
       })
       sources."pify-2.3.0"
@@ -81887,7 +82191,7 @@ in
           sources."bn.js-4.12.0"
         ];
       })
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-to-primitive-1.2.1"
       sources."events-3.3.0"
       sources."evp_bytestokey-1.0.3"
@@ -81927,9 +82231,9 @@ in
       sources."is-date-object-1.0.5"
       sources."is-generator-function-1.0.10"
       sources."is-negative-zero-2.0.2"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-regex-1.1.4"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-typed-array-1.1.8"
@@ -82129,7 +82433,7 @@ in
       sources."fsevents-2.3.2"
       sources."get-caller-file-2.0.5"
       sources."glob-parent-5.1.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-ansi-2.0.0"
       sources."has-cors-1.1.0"
       (sources."http-errors-2.0.0" // {
@@ -82327,7 +82631,7 @@ in
       })
       sources."bluebird-3.7.2"
       sources."bn.js-4.12.0"
-      (sources."body-parser-1.19.2" // {
+      (sources."body-parser-1.20.0" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
@@ -82380,8 +82684,10 @@ in
       (sources."csurf-1.11.0" // {
         dependencies = [
           sources."cookie-0.4.0"
+          sources."depd-1.1.2"
           sources."http-errors-1.7.3"
           sources."setprototypeof-1.1.1"
+          sources."statuses-1.5.0"
           sources."toidentifier-1.0.0"
         ];
       })
@@ -82405,8 +82711,8 @@ in
       sources."decimal.js-10.3.1"
       sources."delayed-stream-1.0.0"
       sources."denque-1.5.1"
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
+      sources."depd-2.0.0"
+      sources."destroy-1.2.0"
       sources."dijkstrajs-1.0.2"
       sources."doctypes-1.1.0"
       sources."dotenv-10.0.0"
@@ -82426,16 +82732,22 @@ in
       sources."event-loop-stats-1.4.1"
       (sources."express-4.17.3" // {
         dependencies = [
+          sources."body-parser-1.19.2"
           sources."cookie-0.4.2"
           sources."debug-2.6.9"
+          sources."depd-1.1.2"
+          sources."http-errors-1.8.1"
+          sources."on-finished-2.3.0"
+          sources."qs-6.9.7"
+          sources."raw-body-2.4.3"
           sources."safe-buffer-5.2.1"
+          sources."statuses-1.5.0"
         ];
       })
       sources."express-async-handler-1.2.0"
       (sources."express-session-1.17.2" // {
         dependencies = [
           sources."debug-2.6.9"
-          sources."depd-2.0.0"
           sources."safe-buffer-5.2.1"
         ];
       })
@@ -82447,6 +82759,8 @@ in
       (sources."finalhandler-1.1.2" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
         ];
       })
       sources."find-up-4.1.0"
@@ -82475,7 +82789,7 @@ in
       sources."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."hosted-git-info-4.1.0"
-      sources."http-errors-1.8.1"
+      sources."http-errors-2.0.0"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
       sources."indent-string-4.0.0"
@@ -82539,12 +82853,12 @@ in
       sources."minimist-1.2.6"
       sources."minimist-options-4.1.0"
       sources."mkdirp-0.5.6"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."moment-duration-format-2.3.2"
       (sources."morgan-1.10.0" // {
         dependencies = [
           sources."debug-2.6.9"
-          sources."depd-2.0.0"
+          sources."on-finished-2.3.0"
         ];
       })
       sources."ms-2.0.0"
@@ -82555,7 +82869,8 @@ in
       sources."normalize-package-data-3.0.3"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
-      sources."on-finished-2.3.0"
+      sources."object-inspect-1.12.0"
+      sources."on-finished-2.4.1"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."p-limit-2.3.0"
@@ -82592,12 +82907,12 @@ in
       sources."punycode-2.1.1"
       sources."pushdata-bitcoin-1.0.1"
       sources."qrcode-1.5.0"
-      sources."qs-6.9.7"
+      sources."qs-6.10.3"
       sources."quick-lru-4.0.1"
       sources."random-bytes-1.0.0"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
-      sources."raw-body-2.4.3"
+      sources."raw-body-2.5.1"
       (sources."read-pkg-5.2.0" // {
         dependencies = [
           sources."hosted-git-info-2.8.9"
@@ -82639,7 +82954,12 @@ in
               sources."ms-2.0.0"
             ];
           })
+          sources."depd-1.1.2"
+          sources."destroy-1.0.4"
+          sources."http-errors-1.8.1"
           sources."ms-2.1.3"
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
         ];
       })
       (sources."serve-favicon-2.5.0" // {
@@ -82652,6 +82972,7 @@ in
       sources."set-blocking-2.0.0"
       sources."setprototypeof-1.2.0"
       sources."sha.js-2.4.11"
+      sources."side-channel-1.0.4"
       sources."simple-git-2.48.0"
       sources."spdx-correct-3.1.1"
       sources."spdx-exceptions-2.3.0"
@@ -82660,7 +82981,7 @@ in
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.17.0"
       sources."standard-error-1.1.0"
-      sources."statuses-1.5.0"
+      sources."statuses-2.0.1"
       sources."string-width-4.2.3"
       (sources."string_decoder-1.3.0" // {
         dependencies = [
@@ -82869,7 +83190,7 @@ in
       sources."getpass-0.1.7"
       sources."glob-7.2.0"
       sources."got-1.2.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
@@ -83360,7 +83681,7 @@ in
       sources."global-dirs-0.1.1"
       sources."globby-8.0.2"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       (sources."has-ansi-2.0.0" // {
         dependencies = [
@@ -83752,10 +84073,10 @@ in
   cdk8s-cli = nodeEnv.buildNodePackage {
     name = "cdk8s-cli";
     packageName = "cdk8s-cli";
-    version = "1.0.134";
+    version = "1.0.143";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.134.tgz";
-      sha512 = "piVuRH84D5xsGeC7uOOGQNBR7JrhrDT+6g5GEM4EOZf1XjxeuH15YfRsI6+ukexwq85kseEoCWltcOvGZefYQQ==";
+      url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.143.tgz";
+      sha512 = "H2aROcLGTNDjTdpFf1C3wniW8HtsoKkoL9JX/0Yddu+yBx7Kens2B9Hlh83qgb2PWIqWfiXtYpy4ug/jTLAtqA==";
     };
     dependencies = [
       sources."@jsii/check-node-1.55.1"
@@ -83774,8 +84095,8 @@ in
       sources."call-bind-1.0.2"
       sources."camelcase-6.3.0"
       sources."case-1.6.3"
-      sources."cdk8s-1.5.52"
-      sources."cdk8s-plus-22-1.0.0-beta.158"
+      sources."cdk8s-1.5.62"
+      sources."cdk8s-plus-22-1.0.0-beta.180"
       sources."chalk-4.1.2"
       sources."cliui-7.0.4"
       sources."clone-2.1.2"
@@ -83788,7 +84109,7 @@ in
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."commonmark-0.30.0"
-      sources."constructs-3.3.250"
+      sources."constructs-3.3.259"
       sources."date-format-4.0.6"
       sources."debug-4.3.4"
       sources."decamelize-5.0.1"
@@ -83799,7 +84120,7 @@ in
       sources."dot-case-3.0.4"
       sources."emoji-regex-8.0.0"
       sources."entities-2.0.3"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-get-iterator-1.1.2"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
@@ -83822,7 +84143,7 @@ in
       sources."get-intrinsic-1.1.1"
       sources."get-symbol-description-1.0.0"
       sources."glob-parent-5.1.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-bigints-1.0.1"
       sources."has-flag-4.0.0"
@@ -83840,10 +84161,10 @@ in
       sources."is-map-2.0.2"
       sources."is-negative-zero-2.0.2"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-regex-1.1.4"
       sources."is-set-2.0.2"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-typed-array-1.1.8"
@@ -83875,14 +84196,14 @@ in
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.512" // {
+      (sources."jsii-srcmak-0.1.521" // {
         dependencies = [
           sources."fs-extra-9.1.0"
         ];
       })
       sources."json-schema-0.4.0"
       sources."json-schema-traverse-1.0.0"
-      sources."json2jsii-0.2.172"
+      sources."json2jsii-0.2.181"
       sources."jsonfile-6.1.0"
       sources."jsonschema-1.4.0"
       sources."locate-path-5.0.0"
@@ -83925,8 +84246,8 @@ in
       sources."side-channel-1.0.4"
       sources."snake-case-3.0.4"
       sources."sort-json-2.0.1"
-      sources."spdx-license-list-6.4.0"
-      sources."sscaff-1.2.239"
+      sources."spdx-license-list-6.5.0"
+      sources."sscaff-1.2.248"
       (sources."streamroller-3.0.6" // {
         dependencies = [
           sources."fs-extra-10.0.1"
@@ -83978,10 +84299,10 @@ in
   cdktf-cli = nodeEnv.buildNodePackage {
     name = "cdktf-cli";
     packageName = "cdktf-cli";
-    version = "0.9.4";
+    version = "0.10.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.9.4.tgz";
-      sha512 = "C7nL+AVA2ltmRhFdAb6yinXzjumRIAyaNi1p5QyZpythrg6+GThxZS/We+s8GIA000uIrPMvesuHCE+dGxkssw==";
+      url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.10.1.tgz";
+      sha512 = "zmmalXgXObKkh8IY5cFJkpbN0iWzJDUMaQlJHmivmTFAxgNTn31/zJjjg6zqngIFpkpDOHbf5nyinJVKXKxI5Q==";
     };
     dependencies = [
       sources."@babel/code-frame-7.16.7"
@@ -83991,9 +84312,9 @@ in
       sources."@babel/parser-7.17.8"
       sources."@babel/template-7.16.7"
       sources."@babel/types-7.17.0"
-      sources."@cdktf/hcl2cdk-0.9.4"
-      sources."@cdktf/hcl2json-0.9.4"
-      sources."@cdktf/provider-generator-0.9.4"
+      sources."@cdktf/hcl2cdk-0.10.1"
+      sources."@cdktf/hcl2json-0.10.1"
+      sources."@cdktf/provider-generator-0.10.1"
       (sources."@jsii/check-node-1.55.1" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -84013,6 +84334,7 @@ in
       sources."@xmldom/xmldom-0.8.1"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-3.2.1"
+      sources."arr-rotate-1.0.0"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
       sources."available-typed-arrays-1.0.5"
@@ -84022,7 +84344,7 @@ in
       sources."call-bind-1.0.2"
       sources."camelcase-6.3.0"
       sources."case-1.6.3"
-      sources."cdktf-0.9.4"
+      sources."cdktf-0.10.1"
       sources."chalk-2.4.2"
       sources."cliui-6.0.0"
       sources."clone-2.1.2"
@@ -84036,7 +84358,7 @@ in
       sources."combined-stream-1.0.8"
       sources."commonmark-0.30.0"
       sources."concat-map-0.0.1"
-      sources."constructs-10.0.97"
+      sources."constructs-10.0.106"
       sources."date-format-4.0.6"
       sources."debug-4.3.4"
       sources."decamelize-1.2.0"
@@ -84047,7 +84369,7 @@ in
       sources."detect-newline-2.1.0"
       sources."emoji-regex-8.0.0"
       sources."entities-2.0.3"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-get-iterator-1.1.2"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
@@ -84055,6 +84377,7 @@ in
       sources."events-3.3.0"
       sources."fast-glob-3.2.11"
       sources."fastq-1.13.0"
+      sources."figures-3.2.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
       sources."flatted-3.2.5"
@@ -84066,9 +84389,13 @@ in
       sources."get-caller-file-2.0.5"
       sources."get-intrinsic-1.1.1"
       sources."get-symbol-description-1.0.0"
-      sources."glob-7.2.0"
+      (sources."glob-7.2.0" // {
+        dependencies = [
+          sources."minimatch-3.1.2"
+        ];
+      })
       sources."glob-parent-5.1.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."graphology-0.24.1"
       sources."graphology-types-0.21.2"
       sources."has-1.0.3"
@@ -84078,6 +84405,7 @@ in
       sources."has-tostringtag-1.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
+      sources."ink-select-input-4.2.1"
       sources."internal-slot-1.0.3"
       sources."is-arguments-1.1.1"
       sources."is-bigint-1.0.4"
@@ -84090,10 +84418,10 @@ in
       sources."is-map-2.0.2"
       sources."is-negative-zero-2.0.2"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-regex-1.1.4"
       sources."is-set-2.0.2"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-typed-array-1.1.8"
@@ -84173,7 +84501,7 @@ in
           sources."yargs-parser-20.2.9"
         ];
       })
-      (sources."jsii-srcmak-0.1.512" // {
+      (sources."jsii-srcmak-0.1.521" // {
         dependencies = [
           sources."fs-extra-9.1.0"
           sources."jsonfile-6.1.0"
@@ -84184,6 +84512,7 @@ in
       sources."jsonfile-4.0.0"
       sources."jsonschema-1.4.0"
       sources."locate-path-5.0.0"
+      sources."lodash.isequal-4.5.0"
       sources."log4js-6.4.4"
       sources."lru-cache-6.0.0"
       sources."mdurl-1.0.1"
@@ -84191,10 +84520,15 @@ in
       sources."micromatch-4.0.5"
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
-      sources."minimatch-3.1.2"
+      (sources."minimatch-5.0.1" // {
+        dependencies = [
+          sources."brace-expansion-2.0.1"
+        ];
+      })
       sources."minimist-1.2.6"
       sources."ms-2.1.2"
       sources."ncp-2.0.0"
+      sources."node-abort-controller-3.0.1"
       sources."node-fetch-2.6.7"
       sources."object-inspect-1.12.0"
       sources."object-is-1.1.5"
@@ -84209,7 +84543,7 @@ in
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."picomatch-2.3.1"
-      sources."prettier-2.6.1"
+      sources."prettier-2.6.2"
       sources."punycode-2.1.1"
       sources."queue-microtask-1.2.3"
       sources."regexp.prototype.flags-1.4.1"
@@ -84219,6 +84553,7 @@ in
       sources."reusify-1.0.4"
       sources."rfdc-1.3.0"
       sources."run-parallel-1.2.0"
+      sources."safe-buffer-5.2.1"
       sources."semver-7.3.5"
       (sources."semver-intersect-1.4.0" // {
         dependencies = [
@@ -84229,7 +84564,7 @@ in
       sources."side-channel-1.0.4"
       sources."sort-json-2.0.1"
       sources."source-map-0.5.7"
-      sources."spdx-license-list-6.4.0"
+      sources."spdx-license-list-6.5.0"
       (sources."streamroller-3.0.6" // {
         dependencies = [
           sources."fs-extra-10.0.1"
@@ -84246,6 +84581,7 @@ in
       sources."to-fast-properties-2.0.0"
       sources."to-regex-range-5.0.1"
       sources."tr46-0.0.3"
+      sources."tunnel-agent-0.6.0"
       sources."typescript-3.9.10"
       sources."unbox-primitive-1.0.1"
       sources."universalify-0.1.2"
@@ -84298,10 +84634,10 @@ in
   clean-css-cli = nodeEnv.buildNodePackage {
     name = "clean-css-cli";
     packageName = "clean-css-cli";
-    version = "5.5.2";
+    version = "5.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.5.2.tgz";
-      sha512 = "4y5FD+ayRz7IWqZRCCMvFxNUhluc1Yv8mNPmrHbrm2NjKsv9uaQZedZKN4L+QMkTqANL1RfOwhpe22neDEgEMA==";
+      url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.6.0.tgz";
+      sha512 = "68vorNEG808D1QzeerO9AlwQVTuaR8YSK4aqwIsjJq0wDSyPH11ApHY0O+EQrdEGUZcN+d72v+Nn/gpxjAFewQ==";
     };
     dependencies = [
       sources."anymatch-3.1.2"
@@ -84310,7 +84646,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."chokidar-3.5.3"
-      sources."clean-css-5.2.4"
+      sources."clean-css-5.3.0"
       sources."commander-7.2.0"
       sources."concat-map-0.0.1"
       sources."fill-range-7.0.1"
@@ -84518,10 +84854,10 @@ in
   coc-clangd = nodeEnv.buildNodePackage {
     name = "coc-clangd";
     packageName = "coc-clangd";
-    version = "0.21.1";
+    version = "0.21.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.21.1.tgz";
-      sha512 = "222VMJBKE4ReyznvWjgJv4lZFtCrkEnKfJk4cL20SH+74x95JP2N0ujNtUiggBhaWcxvOiQxRt467NuVI48Fxg==";
+      url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.21.3.tgz";
+      sha512 = "fo38suoOGygQ68d6WAcQyTT0uVyEq+plVgr0viWb/DVe4vy51S5RLDboGFuCfkk8GIy6snWCv0am0w83WXBuig==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -84730,10 +85066,10 @@ in
   coc-go = nodeEnv.buildNodePackage {
     name = "coc-go";
     packageName = "coc-go";
-    version = "1.2.1";
+    version = "1.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-go/-/coc-go-1.2.1.tgz";
-      sha512 = "wC3hU4P7w9QtGUNng4lb3PFjfZvOwaSCz9V/M7xcnscuyyoA1j0nNB1/GsBNmW7xnhRS4kEfRPeeHwvj/3YYmA==";
+      url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.0.tgz";
+      sha512 = "Oh3ea/gb0lU5qZN1qaQMAQhxscrgcYfB3ZuRWxi+tMLCjoi8gJg/g05C5zD6hfbgmhC1PsL7jPeWSe5F4MifLg==";
     };
     dependencies = [
       sources."isexe-2.0.0"
@@ -84904,7 +85240,7 @@ in
       sha512 = "zFExh1wGAZl4LXSp76NAjWORO9Tyhfw8WtALnhDv741p4tjWjVSEl6GmXTQN0U0tXz8UZ8ln2rL2OaxOdgMCTA==";
     };
     dependencies = [
-      sources."@chemzqm/neovim-5.7.7"
+      sources."@chemzqm/neovim-5.7.8"
       sources."@tootallnate/once-1.1.2"
       sources."agent-base-6.0.2"
       sources."arch-2.2.0"
@@ -84940,7 +85276,7 @@ in
       sources."define-properties-1.1.3"
       sources."duplexer2-0.1.4"
       sources."end-of-stream-1.4.4"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-to-primitive-1.2.1"
       sources."event-lite-0.1.2"
       sources."execa-1.0.0"
@@ -84963,7 +85299,7 @@ in
       sources."get-stream-4.1.0"
       sources."get-symbol-description-1.0.0"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-bigints-1.0.1"
       sources."has-symbols-1.0.3"
@@ -84982,9 +85318,9 @@ in
       sources."is-date-object-1.0.5"
       sources."is-docker-2.2.1"
       sources."is-negative-zero-2.0.2"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-regex-1.1.4"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-stream-1.1.0"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
@@ -85123,7 +85459,7 @@ in
       sha512 = "LkwQTBlD/chH0BTl7zFMw+M1CKbVIy8W49nVLuB+wmgS3dqnKZo58PRTYkcX2X25/FIWOh/oMSjWoZ8cTck8zQ==";
     };
     dependencies = [
-      sources."prettier-2.6.1"
+      sources."prettier-2.6.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -85144,7 +85480,7 @@ in
       sha512 = "1ytGBG4gmz/M/6guRKUvTSltXDpoWlcbqq7RsMi3fFEBhYvSQVpy3MkKgxjkJNVbp+YKuJpcuNAhCIjq0+BHAg==";
     };
     dependencies = [
-      sources."pyright-1.1.233"
+      sources."pyright-1.1.235"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -85218,10 +85554,10 @@ in
   coc-rust-analyzer = nodeEnv.buildNodePackage {
     name = "coc-rust-analyzer";
     packageName = "coc-rust-analyzer";
-    version = "0.61.1";
+    version = "0.61.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.61.1.tgz";
-      sha512 = "xQtIB93k8SIlK6tOS1XEpdFAypU8mLVWhqsPkfV8Hf7AP3m4prErooMS8Du/9AMRqwL2nQxsBjAwpWYI/gJCgA==";
+      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.61.2.tgz";
+      sha512 = "qFVrmFNls2WsLtfgGlChm+mKpQc5lypxhjHgELslQbKBKSEZHpV4OfpknTpCjocSHpP0HFgIKiDVVwC2wsW0PA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -85254,10 +85590,10 @@ in
   coc-snippets = nodeEnv.buildNodePackage {
     name = "coc-snippets";
     packageName = "coc-snippets";
-    version = "3.0.5";
+    version = "3.0.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.0.5.tgz";
-      sha512 = "fyJwbwX6FJVNb8NMmkyN2JDj5pr/imvfOCePPvkHiQCybnU82YM05+CKpBIAUBfxzwkBLQq64V4D7LD+lrUVLQ==";
+      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.0.8.tgz";
+      sha512 = "+9CpyQNMNQQCn3gGbH84/nuihfWzt0I/TXGVAj11AQL4ns4iAlQaaqqle7FmG1VTlvHYwZy5luN8YYWqKBx6uQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -85356,7 +85692,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       (sources."chalk-4.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -85393,7 +85729,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-to-chromium-1.4.103"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -85525,7 +85861,7 @@ in
       sources."postcss-safe-parser-4.0.2"
       sources."postcss-sass-0.4.4"
       sources."postcss-scss-2.1.1"
-      sources."postcss-selector-parser-6.0.9"
+      sources."postcss-selector-parser-6.0.10"
       sources."postcss-syntax-0.36.2"
       sources."postcss-value-parser-4.2.0"
       sources."punycode-2.1.1"
@@ -85937,7 +86273,7 @@ in
       sources."path-key-3.1.1"
       sources."path-parse-1.0.7"
       sources."prelude-ls-1.2.1"
-      sources."prettier-2.6.1"
+      sources."prettier-2.6.2"
       sources."progress-2.0.3"
       sources."pug-error-2.0.0"
       sources."pug-lexer-5.0.1"
@@ -86165,7 +86501,7 @@ in
       sources."git-clone-0.1.0"
       sources."glob-7.2.0"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-flag-3.0.0"
       sources."has-symbol-support-x-1.4.2"
       sources."has-to-string-tag-x-1.4.1"
@@ -86336,10 +86672,10 @@ in
   concurrently = nodeEnv.buildNodePackage {
     name = "concurrently";
     packageName = "concurrently";
-    version = "7.0.0";
+    version = "7.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/concurrently/-/concurrently-7.0.0.tgz";
-      sha512 = "WKM7PUsI8wyXpF80H+zjHP32fsgsHNQfPLw/e70Z5dYkV7hF+rf8q3D+ScWJIEr57CpkO3OWBko6hwhQLPR8Pw==";
+      url = "https://registry.npmjs.org/concurrently/-/concurrently-7.1.0.tgz";
+      sha512 = "Bz0tMlYKZRUDqJlNiF/OImojMB9ruKUz6GCfmhFnSapXgPe+3xzY4byqoKG9tUZ7L2PGEUjfLPOLfIX3labnmw==";
     };
     dependencies = [
       sources."ansi-regex-5.0.1"
@@ -86518,7 +86854,7 @@ in
       sources."git-remote-origin-url-2.0.0"
       sources."git-semver-tags-4.1.1"
       sources."gitconfiglocal-1.0.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."handlebars-4.7.7"
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
@@ -86776,7 +87112,7 @@ in
         ];
       })
       sources."concat-map-0.0.1"
-      (sources."conf-10.1.1" // {
+      (sources."conf-10.1.2" // {
         dependencies = [
           sources."ajv-8.11.0"
           sources."dot-prop-6.0.1"
@@ -86907,7 +87243,7 @@ in
           sources."get-stream-4.1.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
@@ -87316,7 +87652,7 @@ in
       sources."function-bind-1.1.1"
       sources."glob-parent-5.1.2"
       sources."globby-13.1.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -87347,7 +87683,7 @@ in
           sources."arrify-1.0.1"
         ];
       })
-      sources."nested-error-stacks-2.1.0"
+      sources."nested-error-stacks-2.1.1"
       (sources."normalize-package-data-3.0.3" // {
         dependencies = [
           sources."semver-7.3.5"
@@ -87594,7 +87930,7 @@ in
       sources."fstream-1.0.12"
       sources."fstream-ignore-1.0.5"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-flag-4.0.0"
       sources."hyperquest-2.1.3"
       sources."inflight-1.0.6"
@@ -87680,10 +88016,10 @@ in
   cspell = nodeEnv.buildNodePackage {
     name = "cspell";
     packageName = "cspell";
-    version = "5.19.3";
+    version = "5.19.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cspell/-/cspell-5.19.3.tgz";
-      sha512 = "JJBH8iqtHYmxqLQZ+7GAMTVvc6SAoHVgn1tdYknOI2/uxAbZVH29eaxINY7JfjwPuxPPVAvttRetBAIRiu6ZYw==";
+      url = "https://registry.npmjs.org/cspell/-/cspell-5.19.5.tgz";
+      sha512 = "LFKWBBOY6s1SYJcMlWmFP2ml3kxgzUcUCOY4JYDCAzA088gbBEiSN8sM0X6MhobsMJx4MchxjwveXFRP+1umyA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.16.7"
@@ -87698,9 +88034,9 @@ in
           sources."supports-color-5.5.0"
         ];
       })
-      sources."@cspell/cspell-bundled-dicts-5.19.3"
-      sources."@cspell/cspell-pipe-5.19.3"
-      sources."@cspell/cspell-types-5.19.3"
+      sources."@cspell/cspell-bundled-dicts-5.19.5"
+      sources."@cspell/cspell-pipe-5.19.5"
+      sources."@cspell/cspell-types-5.19.5"
       sources."@cspell/dict-ada-2.0.0"
       sources."@cspell/dict-aws-2.0.0"
       sources."@cspell/dict-bash-2.0.1"
@@ -87759,11 +88095,11 @@ in
       sources."core-util-is-1.0.3"
       sources."cosmiconfig-7.0.1"
       sources."crypto-random-string-2.0.0"
-      sources."cspell-gitignore-5.19.3"
-      sources."cspell-glob-5.19.3"
-      sources."cspell-io-5.19.3"
-      sources."cspell-lib-5.19.3"
-      sources."cspell-trie-lib-5.19.3"
+      sources."cspell-gitignore-5.19.5"
+      sources."cspell-glob-5.19.5"
+      sources."cspell-io-5.19.5"
+      sources."cspell-lib-5.19.5"
+      sources."cspell-trie-lib-5.19.5"
       sources."dot-prop-5.3.0"
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
@@ -87781,7 +88117,7 @@ in
       sources."get-stdin-8.0.0"
       sources."glob-7.2.0"
       sources."global-dirs-0.1.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-flag-4.0.0"
       sources."has-own-prop-2.0.0"
       (sources."import-fresh-3.3.0" // {
@@ -88112,7 +88448,7 @@ in
       sources."global-4.4.0"
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."guard-timeout-2.0.0"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -88231,7 +88567,7 @@ in
       sources."neat-input-1.11.1"
       sources."neat-log-3.1.0"
       sources."nets-3.2.0"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       sources."normalize-path-2.1.1"
       sources."npm-run-path-2.0.2"
       sources."oauth-sign-0.9.0"
@@ -88519,7 +88855,7 @@ in
   "deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop" = nodeEnv.buildNodePackage {
     name = "deltachat-desktop";
     packageName = "deltachat-desktop";
-    version = "1.28.0";
+    version = "1.28.1";
     src = ../../applications/networking/instant-messengers/deltachat-desktop;
     dependencies = [
       sources."@ampproject/remapping-2.1.2"
@@ -88633,7 +88969,7 @@ in
       sources."@babel/template-7.16.7"
       sources."@babel/traverse-7.17.3"
       sources."@babel/types-7.17.0"
-      sources."@blueprintjs/colors-4.0.1"
+      sources."@blueprintjs/colors-4.0.2"
       sources."@blueprintjs/core-3.54.0"
       sources."@blueprintjs/icons-3.33.0"
       sources."@deltachat/message_parser_wasm-0.3.0"
@@ -88722,7 +89058,7 @@ in
         ];
       })
       sources."call-bind-1.0.2"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
       (sources."class-utils-0.3.6" // {
@@ -88788,8 +89124,8 @@ in
       sources."dom4-2.1.6"
       sources."duplexer3-0.1.4"
       sources."earcut-2.2.3"
-      sources."electron-14.2.8"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-14.2.9"
+      sources."electron-to-chromium-1.4.103"
       sources."emoji-js-clean-4.0.0"
       sources."emoji-mart-3.0.1"
       sources."emoji-regex-9.2.2"
@@ -88881,7 +89217,7 @@ in
           sources."get-stream-4.1.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."grid-index-1.1.0"
       sources."gud-1.0.0"
       sources."has-1.0.3"
@@ -88961,14 +89297,14 @@ in
         ];
       })
       sources."mkdirp-0.5.6"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."ms-2.1.2"
       sources."murmurhash-js-1.0.0"
       sources."nan-2.15.0"
       sources."nanomatch-1.2.13"
       sources."napi-macros-2.0.0"
       sources."node-fetch-2.6.7"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       sources."node-releases-2.0.2"
       sources."normalize-path-3.0.0"
       sources."normalize-url-4.5.1"
@@ -89068,7 +89404,7 @@ in
       sources."rw-0.1.4"
       sources."safe-buffer-5.2.1"
       sources."safe-regex-1.1.0"
-      (sources."sass-1.49.9" // {
+      (sources."sass-1.49.11" // {
         dependencies = [
           sources."anymatch-3.1.2"
           sources."binary-extensions-2.2.0"
@@ -89275,7 +89611,7 @@ in
       sources."glob-7.2.0"
       sources."glob-parent-5.1.2"
       sources."globby-11.1.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."ignore-5.2.0"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
@@ -89365,10 +89701,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.82.1";
+    version = "6.82.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.82.1.tgz";
-      sha512 = "21LnOw92tD3UXOP0/yaWYBig5p28N5q8TTgL64mkIkNWUIKA2gOa+UO+Enejs1Mubo36jNX830w2ea1uJfHcLg==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.82.3.tgz";
+      sha512 = "Q7JNsKRQbPkwCQIj9YNHbgYZ2TcHAMdKlga++mBkKwpuIiwYYtqvb40TtjQBWpAD+k9MI7Lrp2/Vqrt9vmy0ow==";
     };
     dependencies = [
       sources."@fast-csv/format-4.3.5"
@@ -89573,6 +89909,7 @@ in
       sources."@types/cacheable-request-6.0.2"
       sources."@types/glob-7.2.0"
       sources."@types/http-cache-semantics-4.0.1"
+      sources."@types/json-buffer-3.0.0"
       sources."@types/keyv-3.1.4"
       sources."@types/minimatch-3.0.5"
       sources."@types/node-17.0.23"
@@ -89640,6 +89977,7 @@ in
       sources."combined-stream-1.0.8"
       sources."commander-4.1.1"
       sources."compare-version-0.1.2"
+      sources."compress-brotli-1.3.6"
       sources."concat-map-0.0.1"
       sources."config-chain-1.1.13"
       sources."console-control-strings-1.1.0"
@@ -89761,7 +90099,7 @@ in
           sources."universalify-0.1.2"
         ];
       })
-      sources."gauge-4.0.3"
+      sources."gauge-4.0.4"
       sources."get-caller-file-2.0.5"
       sources."get-installed-path-2.1.1"
       (sources."get-package-info-1.0.0" // {
@@ -89783,7 +90121,7 @@ in
       sources."global-tunnel-ng-2.7.1"
       sources."globalthis-1.0.2"
       sources."got-11.8.3"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
@@ -89833,7 +90171,7 @@ in
       sources."jsonfile-6.1.0"
       sources."jsprim-1.4.2"
       sources."junk-3.1.0"
-      sources."keyv-4.1.1"
+      sources."keyv-4.2.1"
       sources."load-json-file-2.0.0"
       sources."locate-path-2.0.0"
       sources."lodash-4.17.21"
@@ -89875,7 +90213,7 @@ in
       sources."node-api-version-0.1.4"
       sources."node-fetch-2.6.7"
       sources."node-gyp-8.4.1"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       sources."nopt-5.0.0"
       (sources."normalize-package-data-2.5.0" // {
         dependencies = [
@@ -90182,7 +90520,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       sources."chalk-2.4.2"
       sources."ci-info-2.0.0"
       sources."cli-boxes-2.2.1"
@@ -90211,7 +90549,7 @@ in
         ];
       })
       sources."dot-prop-5.3.0"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-to-chromium-1.4.103"
       sources."emoji-regex-8.0.0"
       sources."emojilib-2.4.0"
       sources."end-of-stream-1.4.4"
@@ -90336,7 +90674,7 @@ in
       sources."punycode-2.1.1"
       sources."quick-lru-4.0.1"
       sources."react-16.14.0"
-      sources."react-devtools-core-4.24.2"
+      sources."react-devtools-core-4.24.3"
       sources."react-is-16.13.1"
       sources."react-reconciler-0.26.2"
       (sources."read-pkg-5.2.0" // {
@@ -90479,7 +90817,7 @@ in
       sources."@fluentui/foundation-legacy-8.2.5"
       sources."@fluentui/keyboard-key-0.4.0"
       sources."@fluentui/merge-styles-8.5.0"
-      sources."@fluentui/react-8.62.3"
+      sources."@fluentui/react-8.64.0"
       sources."@fluentui/react-focus-8.5.6"
       sources."@fluentui/react-hooks-8.5.3"
       sources."@fluentui/react-window-provider-2.2.0"
@@ -90506,7 +90844,7 @@ in
         ];
       })
       sources."@humanwhocodes/object-schema-1.2.1"
-      sources."@microsoft/load-themed-styles-1.10.249"
+      sources."@microsoft/load-themed-styles-1.10.250"
       sources."@node-rs/crc32-1.5.0"
       sources."@node-rs/crc32-android-arm-eabi-1.5.0"
       sources."@node-rs/crc32-android-arm64-1.5.0"
@@ -91090,7 +91428,7 @@ in
       sources."globby-11.1.0"
       sources."glogg-1.0.2"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."gulp-4.0.2"
       (sources."gulp-cli-2.3.0" // {
         dependencies = [
@@ -91402,7 +91740,7 @@ in
             ];
           })
           sources."openapi-types-7.2.3"
-          sources."swagger-ui-dist-4.9.1"
+          sources."swagger-ui-dist-4.10.3"
         ];
       })
       (sources."mixin-deep-1.3.2" // {
@@ -91411,7 +91749,7 @@ in
         ];
       })
       sources."mkdirp-1.0.4"
-      sources."mongodb-4.4.1"
+      sources."mongodb-4.5.0"
       sources."mongodb-connection-string-url-2.5.2"
       (sources."morgan-1.10.0" // {
         dependencies = [
@@ -91457,7 +91795,7 @@ in
           sources."tar-2.2.2"
         ];
       })
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       (sources."node-pre-gyp-0.11.0" // {
         dependencies = [
           sources."minimist-1.2.6"
@@ -92387,7 +92725,7 @@ in
       sources."camel-case-3.0.0"
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       sources."case-sensitive-paths-webpack-plugin-2.4.0"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
@@ -92628,7 +92966,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.96"
+      sources."electron-to-chromium-1.4.103"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -92654,7 +92992,7 @@ in
       sources."errno-0.1.8"
       sources."error-ex-1.3.2"
       sources."error-stack-parser-2.0.7"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-to-primitive-1.2.1"
       sources."es6-promise-4.2.8"
       sources."escalade-3.1.1"
@@ -92857,7 +93195,7 @@ in
         ];
       })
       sources."globby-11.1.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."gzip-size-5.1.1"
       sources."handle-thing-2.0.1"
       sources."har-schema-2.0.0"
@@ -93002,7 +93340,7 @@ in
       sources."is-glob-4.0.3"
       sources."is-negative-zero-2.0.2"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-obj-2.0.0"
       sources."is-path-cwd-2.2.0"
       sources."is-path-in-cwd-2.1.0"
@@ -93011,7 +93349,7 @@ in
       sources."is-plain-object-2.0.4"
       sources."is-regex-1.1.4"
       sources."is-resolvable-1.1.0"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-stream-1.1.0"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
@@ -93358,7 +93696,7 @@ in
           sources."postcss-value-parser-3.3.1"
         ];
       })
-      sources."postcss-selector-parser-6.0.9"
+      sources."postcss-selector-parser-6.0.10"
       (sources."postcss-svgo-4.0.3" // {
         dependencies = [
           sources."postcss-value-parser-3.3.1"
@@ -93419,8 +93757,8 @@ in
       (sources."renderkid-2.0.7" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
-          sources."css-select-4.2.1"
-          sources."css-what-5.1.0"
+          sources."css-select-4.3.0"
+          sources."css-what-6.1.0"
           sources."dom-serializer-1.3.2"
           sources."domelementtype-2.2.0"
           sources."domutils-2.8.0"
@@ -94418,6 +94756,7 @@ in
       sources."@types/istanbul-lib-coverage-2.0.4"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-3.0.1"
+      sources."@types/json-buffer-3.0.0"
       sources."@types/json-schema-7.0.11"
       sources."@types/keyv-3.1.4"
       sources."@types/minimatch-3.0.5"
@@ -94626,7 +94965,7 @@ in
       })
       sources."camelcase-6.3.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       (sources."chalk-4.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -94708,6 +95047,7 @@ in
       sources."commondir-1.0.1"
       sources."component-emitter-1.3.0"
       sources."component-type-1.2.1"
+      sources."compress-brotli-1.3.6"
       sources."compressible-2.0.18"
       (sources."compression-1.7.4" // {
         dependencies = [
@@ -94786,7 +95126,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      (sources."css-select-4.2.1" // {
+      (sources."css-select-4.3.0" // {
         dependencies = [
           sources."domhandler-4.3.1"
         ];
@@ -94797,7 +95137,7 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      sources."css-what-5.1.0"
+      sources."css-what-6.1.0"
       sources."cssesc-3.0.0"
       sources."cssnano-4.1.11"
       sources."cssnano-preset-default-4.0.8"
@@ -94884,7 +95224,7 @@ in
       sources."duplexer3-0.1.4"
       sources."duplexify-3.7.1"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-to-chromium-1.4.103"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -94905,7 +95245,7 @@ in
       sources."errno-0.1.8"
       sources."error-ex-1.3.2"
       sources."errorhandler-1.5.1"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
       sources."escape-html-1.0.3"
@@ -95083,7 +95423,7 @@ in
       sources."globals-11.12.0"
       sources."globby-11.1.0"
       sources."got-11.8.3"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."graphql-0.13.2"
       (sources."graphql-tools-3.0.0" // {
         dependencies = [
@@ -95218,7 +95558,7 @@ in
       })
       sources."is-negative-zero-2.0.2"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-obj-2.0.0"
       sources."is-path-cwd-2.2.0"
       (sources."is-path-in-cwd-2.1.0" // {
@@ -95255,7 +95595,7 @@ in
       sources."is-regex-1.1.4"
       sources."is-resolvable-1.1.0"
       sources."is-root-2.1.0"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-stream-2.0.1"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
@@ -95297,7 +95637,7 @@ in
       sources."jsonfile-6.1.0"
       sources."jsonify-0.0.0"
       sources."keychain-1.3.0"
-      sources."keyv-4.1.1"
+      sources."keyv-4.2.1"
       sources."killable-1.0.1"
       sources."kind-of-6.0.3"
       sources."kleur-3.0.3"
@@ -95716,7 +96056,7 @@ in
         ];
       })
       sources."postcss-safe-parser-4.0.2"
-      sources."postcss-selector-parser-6.0.9"
+      sources."postcss-selector-parser-6.0.10"
       (sources."postcss-svgo-4.0.3" // {
         dependencies = [
           sources."postcss-value-parser-3.3.1"
@@ -95924,9 +96264,9 @@ in
       sources."shell-quote-1.6.1"
       sources."side-channel-1.0.4"
       sources."signal-exit-3.0.7"
-      (sources."simple-plist-1.3.0" // {
+      (sources."simple-plist-1.3.1" // {
         dependencies = [
-          sources."bplist-parser-0.3.0"
+          sources."bplist-parser-0.3.1"
         ];
       })
       (sources."simple-swizzle-0.2.2" // {
@@ -96500,7 +96840,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       sources."chalk-2.4.2"
       sources."chownr-1.1.4"
       sources."ci-info-2.0.0"
@@ -96525,7 +96865,7 @@ in
       })
       sources."delay-5.0.0"
       sources."devtools-protocol-0.0.969999"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-to-chromium-1.4.103"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
@@ -96615,15 +96955,14 @@ in
       sources."progress-2.0.3"
       sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
-      (sources."puppeteer-13.5.1" // {
+      (sources."puppeteer-13.5.2" // {
         dependencies = [
-          sources."debug-4.3.3"
           sources."ws-8.5.0"
         ];
       })
       sources."quick-lru-4.0.1"
       sources."react-17.0.2"
-      sources."react-devtools-core-4.24.2"
+      sources."react-devtools-core-4.24.3"
       sources."react-reconciler-0.26.2"
       (sources."read-pkg-5.2.0" // {
         dependencies = [
@@ -96717,10 +97056,10 @@ in
   fauna-shell = nodeEnv.buildNodePackage {
     name = "fauna-shell";
     packageName = "fauna-shell";
-    version = "0.14.0";
+    version = "0.15.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.14.0.tgz";
-      sha512 = "BkerCVGNYE81YUaXK1N4Zv9Sppa1KqfdaqDF03o+B1fnDrQLeCftN+8j8P/z9iFH8ZDrDR9E1qgWNA5NvjHbAw==";
+      url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.15.0.tgz";
+      sha512 = "/1EUu9Z5ICqSOwegsl0aWI1e3yvfr0/HEw8ns9RLYmROKqihO0IaeWkcf0vqayjp7vp6gl9SoJF8yiX1soYpvA==";
     };
     dependencies = [
       (sources."@heroku-cli/color-1.1.14" // {
@@ -96854,6 +97193,7 @@ in
           sources."semver-5.7.1"
         ];
       })
+      sources."csv-parse-5.0.4"
       sources."csv-stream-0.2.0"
       sources."dashdash-1.14.1"
       sources."debug-4.3.4"
@@ -96873,6 +97213,7 @@ in
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."execa-0.10.0"
+      sources."exponential-backoff-3.1.0"
       sources."extend-3.0.2"
       sources."external-editor-3.1.0"
       sources."extract-stack-1.0.0"
@@ -96882,7 +97223,7 @@ in
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
       sources."fastq-1.13.0"
-      sources."faunadb-4.5.2"
+      sources."faunadb-4.5.4"
       (sources."figures-3.2.0" // {
         dependencies = [
           sources."escape-string-regexp-1.0.5"
@@ -96899,7 +97240,7 @@ in
       sources."glob-parent-5.1.2"
       sources."globby-11.1.0"
       sources."got-8.3.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-flag-3.0.0"
@@ -96973,7 +97314,7 @@ in
       sources."mime-types-2.1.35"
       sources."mimic-fn-2.1.0"
       sources."mimic-response-1.0.1"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
       (sources."netrc-parser-3.1.6" // {
@@ -97006,13 +97347,14 @@ in
       sources."pify-3.0.0"
       sources."prelude-ls-1.1.2"
       sources."prepend-http-2.0.0"
-      sources."prettier-2.6.1"
+      sources."prettier-2.6.2"
       sources."process-nextick-args-2.0.1"
       sources."psl-1.8.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.3"
       sources."query-string-5.1.1"
       sources."queue-microtask-1.2.3"
+      sources."rate-limiter-flexible-2.3.6"
       (sources."readable-stream-2.3.7" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -97101,10 +97443,10 @@ in
   firebase-tools = nodeEnv.buildNodePackage {
     name = "firebase-tools";
     packageName = "firebase-tools";
-    version = "10.5.0";
+    version = "10.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-10.5.0.tgz";
-      sha512 = "sl4ycYfKsliII500HuqgEOWeB3OXi0twDDC/xPv1Eiw8FFYoTJwHm2w4YWUhTtDq4tSrHNCmdBza9LP+wvelnA==";
+      url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-10.6.0.tgz";
+      sha512 = "bJvamfCfvgoPixnJQwKdju88u+fWC0fvbQHRD11IPKFH6G9zd41nlAzqP/b9Sh9YjA/MSDpVA7nUnlnipxB01g==";
     };
     dependencies = [
       (sources."@apidevtools/json-schema-ref-parser-9.0.9" // {
@@ -97158,7 +97500,11 @@ in
       sources."acorn-8.7.0"
       sources."acorn-walk-8.2.0"
       sources."agent-base-6.0.2"
-      sources."agentkeepalive-4.2.1"
+      (sources."agentkeepalive-4.2.1" // {
+        dependencies = [
+          sources."depd-1.1.2"
+        ];
+      })
       sources."aggregate-error-3.1.0"
       sources."ajv-6.12.6"
       (sources."ajv-formats-2.1.1" // {
@@ -97210,7 +97556,7 @@ in
       sources."bl-4.1.0"
       sources."blakejs-1.2.1"
       sources."bluebird-3.4.7"
-      (sources."body-parser-1.19.2" // {
+      (sources."body-parser-1.20.0" // {
         dependencies = [
           sources."debug-2.6.9"
           sources."ms-2.0.0"
@@ -97241,6 +97587,7 @@ in
           sources."lowercase-keys-2.0.0"
         ];
       })
+      sources."call-bind-1.0.2"
       sources."call-me-maybe-1.0.1"
       sources."camelcase-5.3.1"
       sources."cardinal-2.1.1"
@@ -97306,7 +97653,7 @@ in
       sources."cookie-signature-1.0.6"
       sources."core-util-is-1.0.3"
       sources."cors-2.8.5"
-      sources."crc-32-1.2.1"
+      sources."crc-32-1.2.2"
       sources."crc32-stream-4.0.2"
       (sources."cross-env-5.2.1" // {
         dependencies = [
@@ -97336,8 +97683,8 @@ in
       sources."degenerator-3.0.2"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
+      sources."depd-2.0.0"
+      sources."destroy-1.2.0"
       sources."dot-prop-5.3.0"
       sources."dotenv-6.2.0"
       (sources."duplexer2-0.1.4" // {
@@ -97388,11 +97735,17 @@ in
       })
       sources."exegesis-express-4.0.0"
       sources."exit-code-1.0.2"
-      sources."exit-on-epipe-1.0.1"
       (sources."express-4.17.3" // {
         dependencies = [
+          sources."body-parser-1.19.2"
           sources."debug-2.6.9"
+          sources."depd-1.1.2"
+          sources."http-errors-1.8.1"
           sources."ms-2.0.0"
+          sources."on-finished-2.3.0"
+          sources."qs-6.9.7"
+          sources."raw-body-2.4.3"
+          sources."statuses-1.5.0"
         ];
       })
       (sources."ext-1.6.0" // {
@@ -97421,6 +97774,8 @@ in
         dependencies = [
           sources."debug-2.6.9"
           sources."ms-2.0.0"
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
         ];
       })
       (sources."flat-arguments-1.0.2" // {
@@ -97456,10 +97811,12 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      sources."gauge-4.0.3"
+      sources."function-bind-1.1.1"
+      sources."gauge-4.0.4"
       sources."gaxios-4.3.2"
       sources."gcp-metadata-4.3.1"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.1.1"
       sources."get-stream-4.1.0"
       (sources."get-uri-3.0.2" // {
         dependencies = [
@@ -97476,21 +97833,23 @@ in
       sources."google-gax-2.29.6"
       sources."google-p12-pem-3.1.3"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."gtoken-5.3.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
+      sources."has-1.0.3"
       (sources."has-ansi-2.0.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
         ];
       })
       sources."has-flag-4.0.0"
+      sources."has-symbols-1.0.3"
       sources."has-unicode-2.0.1"
       sources."has-yarn-2.1.0"
       sources."home-dir-1.0.0"
       sources."http-cache-semantics-4.1.0"
-      sources."http-errors-1.8.1"
+      sources."http-errors-2.0.0"
       sources."http-proxy-agent-4.0.1"
       sources."http-signature-1.2.0"
       sources."https-proxy-agent-5.0.0"
@@ -97643,8 +98002,8 @@ in
       (sources."morgan-1.10.0" // {
         dependencies = [
           sources."debug-2.6.9"
-          sources."depd-2.0.0"
           sources."ms-2.0.0"
+          sources."on-finished-2.3.0"
         ];
       })
       sources."ms-2.1.2"
@@ -97661,7 +98020,7 @@ in
       sources."nice-try-1.0.5"
       sources."node-emoji-1.11.0"
       sources."node-fetch-2.6.7"
-      sources."node-forge-1.3.0"
+      sources."node-forge-1.3.1"
       (sources."node-gyp-8.4.1" // {
         dependencies = [
           sources."semver-7.3.5"
@@ -97675,7 +98034,8 @@ in
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       sources."object-hash-2.2.0"
-      sources."on-finished-2.3.0"
+      sources."object-inspect-1.12.0"
+      sources."on-finished-2.4.1"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."one-time-1.0.0"
@@ -97709,7 +98069,6 @@ in
       })
       sources."prelude-ls-1.1.2"
       sources."prepend-http-2.0.0"
-      sources."printj-1.3.1"
       sources."process-nextick-args-2.0.1"
       sources."progress-2.0.3"
       sources."promise-breaker-5.0.0"
@@ -97733,9 +98092,9 @@ in
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."pupa-2.1.1"
-      sources."qs-6.9.7"
+      sources."qs-6.10.3"
       sources."range-parser-1.2.1"
-      sources."raw-body-2.4.3"
+      sources."raw-body-2.5.1"
       sources."rc-1.2.8"
       sources."re2-1.17.4"
       sources."readable-stream-3.6.0"
@@ -97783,8 +98142,13 @@ in
               sources."ms-2.0.0"
             ];
           })
+          sources."depd-1.1.2"
+          sources."destroy-1.0.4"
+          sources."http-errors-1.8.1"
           sources."mime-1.6.0"
           sources."ms-2.1.3"
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
         ];
       })
       sources."serve-static-1.14.2"
@@ -97793,6 +98157,7 @@ in
       sources."setprototypeof-1.2.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
+      sources."side-channel-1.0.4"
       sources."signal-exit-3.0.7"
       sources."simple-swizzle-0.2.2"
       sources."smart-buffer-4.2.0"
@@ -97803,7 +98168,7 @@ in
       sources."sshpk-1.17.0"
       sources."ssri-8.0.1"
       sources."stack-trace-0.0.10"
-      sources."statuses-1.5.0"
+      sources."statuses-2.0.1"
       sources."stream-chain-2.2.5"
       sources."stream-json-1.7.4"
       sources."stream-shift-1.0.1"
@@ -97929,7 +98294,7 @@ in
       sources."which-1.3.1"
       sources."wide-align-1.1.5"
       sources."widest-line-3.1.0"
-      sources."winston-3.6.0"
+      sources."winston-3.7.2"
       sources."winston-transport-4.5.0"
       sources."word-wrap-1.2.3"
       sources."wrap-ansi-7.0.0"
@@ -98307,7 +98672,7 @@ in
       sources."fs-extra-9.1.0"
       sources."get-caller-file-2.0.5"
       sources."getpass-0.1.7"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-flag-4.0.0"
@@ -98352,7 +98717,7 @@ in
       sources."nedb-1.8.0"
       sources."node-addon-api-2.0.2"
       sources."node-fetch-2.6.7"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       (sources."number-to-bn-1.7.0" // {
         dependencies = [
           sources."bn.js-4.11.6"
@@ -98562,7 +98927,7 @@ in
       sources."dot-prop-4.2.1"
       sources."duplexer-0.1.2"
       sources."enabled-2.0.0"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-get-iterator-1.1.2"
       sources."es-to-primitive-1.2.1"
       sources."event-stream-3.3.4"
@@ -98622,7 +98987,7 @@ in
           sources."is-glob-3.1.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-bigints-1.0.1"
       sources."has-symbols-1.0.3"
@@ -98660,12 +99025,12 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-obj-1.0.1"
       sources."is-plain-object-2.0.4"
       sources."is-regex-1.1.4"
       sources."is-set-2.0.2"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-stream-2.0.1"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
@@ -98884,7 +99249,7 @@ in
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.1"
       sources."which-typed-array-1.1.7"
-      (sources."winston-3.6.0" // {
+      (sources."winston-3.7.2" // {
         dependencies = [
           sources."async-3.2.3"
           sources."readable-stream-3.6.0"
@@ -98965,10 +99330,10 @@ in
   gatsby-cli = nodeEnv.buildNodePackage {
     name = "gatsby-cli";
     packageName = "gatsby-cli";
-    version = "4.10.2";
+    version = "4.11.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.10.2.tgz";
-      sha512 = "lA1zFuWZwE+VtKYgntls0EC5PG4QoqqeJFWP+83Lmh+9hoLLkmL1plALBQeI3JY/9KXgRiC4OoR94CQkI329TA==";
+      url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.11.2.tgz";
+      sha512 = "MypoVvMwWcDEtf5JTm1UTdGeOavRjnNRKfuUqvbhvb+q1vQ2xIFhu/pK9sdOlQfL6v6Fl8xwO2FuOfz+i53z3w==";
     };
     dependencies = [
       sources."@ampproject/remapping-2.1.2"
@@ -99035,6 +99400,7 @@ in
       sources."@types/cacheable-request-6.0.2"
       sources."@types/common-tags-1.8.1"
       sources."@types/http-cache-semantics-4.0.1"
+      sources."@types/json-buffer-3.0.0"
       sources."@types/keyv-3.1.4"
       sources."@types/node-17.0.23"
       sources."@types/node-fetch-2.6.1"
@@ -99065,7 +99431,7 @@ in
       })
       sources."call-bind-1.0.2"
       sources."camelcase-6.3.0"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       (sources."chalk-4.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -99098,19 +99464,20 @@ in
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.8"
       sources."common-tags-1.8.2"
+      sources."compress-brotli-1.3.6"
       sources."concat-map-0.0.1"
       sources."configstore-5.0.1"
       sources."convert-hrtime-3.0.0"
       sources."convert-source-map-1.8.0"
-      sources."create-gatsby-2.10.2"
+      sources."create-gatsby-2.11.2"
       (sources."cross-spawn-6.0.5" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
       })
       sources."crypto-random-string-2.0.0"
-      sources."css-select-4.2.1"
-      sources."css-what-5.1.0"
+      sources."css-select-4.3.0"
+      sources."css-what-6.1.0"
       sources."debug-4.3.4"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
@@ -99129,7 +99496,7 @@ in
       sources."domutils-2.8.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-to-chromium-1.4.103"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."entities-2.2.0"
@@ -99164,8 +99531,8 @@ in
       sources."fs-extra-10.0.1"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
-      sources."gatsby-core-utils-3.10.1"
-      (sources."gatsby-telemetry-3.10.1" // {
+      sources."gatsby-core-utils-3.11.1"
+      (sources."gatsby-telemetry-3.11.1" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."boxen-4.2.0"
@@ -99187,7 +99554,7 @@ in
       sources."global-dirs-3.0.0"
       sources."globals-11.12.0"
       sources."got-11.8.3"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.3"
@@ -99229,7 +99596,7 @@ in
       sources."json-buffer-3.0.1"
       sources."json5-2.2.1"
       sources."jsonfile-6.1.0"
-      sources."keyv-4.1.1"
+      sources."keyv-4.2.1"
       sources."kleur-3.0.3"
       sources."latest-version-5.1.0"
       sources."lmdb-2.2.6"
@@ -99253,12 +99620,22 @@ in
       sources."minimist-1.2.6"
       sources."ms-2.1.2"
       sources."msgpackr-1.5.5"
-      sources."msgpackr-extract-1.0.16"
+      (sources."msgpackr-extract-1.1.0" // {
+        dependencies = [
+          sources."node-gyp-build-git://github.com/kriszyp/node-gyp-build#optional-packages"
+        ];
+      })
+      sources."msgpackr-extract-darwin-arm64-1.1.0"
+      sources."msgpackr-extract-darwin-x64-1.1.0"
+      sources."msgpackr-extract-linux-arm-1.1.0"
+      sources."msgpackr-extract-linux-arm64-1.1.0"
+      sources."msgpackr-extract-linux-x64-1.1.0"
+      sources."msgpackr-extract-win32-x64-1.1.0"
       sources."mute-stream-0.0.8"
       sources."nan-2.15.0"
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.7"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       sources."node-object-hash-2.3.10"
       sources."node-releases-2.0.2"
       sources."normalize-url-6.1.0"
@@ -99734,7 +100111,7 @@ in
       sources."mime-types-2.1.35"
       sources."minimist-1.2.6"
       sources."mkdirp-0.5.6"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."moo-0.5.1"
       sources."ms-2.1.2"
       sources."multicb-1.2.2"
@@ -99743,7 +100120,7 @@ in
       sources."multiserver-scopes-2.0.0"
       sources."muxrpc-6.7.2"
       sources."nearley-2.20.1"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       sources."node-polyglot-1.0.0"
       sources."non-private-ip-2.2.0"
       sources."os-homedir-1.0.2"
@@ -99907,6 +100284,7 @@ in
       sources."@szmarczak/http-timer-4.0.6"
       sources."@types/cacheable-request-6.0.2"
       sources."@types/http-cache-semantics-4.0.1"
+      sources."@types/json-buffer-3.0.0"
       sources."@types/keyv-3.1.4"
       sources."@types/node-17.0.23"
       sources."@types/responselike-1.0.0"
@@ -99927,6 +100305,7 @@ in
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."combined-stream-1.0.8"
+      sources."compress-brotli-1.3.6"
       sources."decode-uri-component-0.2.0"
       (sources."decompress-response-6.0.0" // {
         dependencies = [
@@ -99954,7 +100333,7 @@ in
       sources."is-interactive-2.0.0"
       sources."is-unicode-supported-1.2.0"
       sources."json-buffer-3.0.1"
-      sources."keyv-4.1.1"
+      sources."keyv-4.2.1"
       sources."li-1.3.0"
       (sources."log-symbols-5.1.0" // {
         dependencies = [
@@ -100012,10 +100391,10 @@ in
   gitmoji-cli = nodeEnv.buildNodePackage {
     name = "gitmoji-cli";
     packageName = "gitmoji-cli";
-    version = "4.11.0";
+    version = "4.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.11.0.tgz";
-      sha512 = "tRX7PJ+qYGsfQcfaXT5rGgXE0KOXz7sR6rS8oScFPguXTSUtBl3cW74jNh92nGVHhbCCVBFq9vqVBgt5aRo9RQ==";
+      url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.12.0.tgz";
+      sha512 = "selN2/DBH5qN27r0PH6FuEO6B5X1qFd3x8M9YP3+23NjgPM6sUOSw2V0phP9Ofir/uubKl7jEao+rVH/NONJdg==";
     };
     dependencies = [
       sources."@babel/code-frame-7.16.7"
@@ -100076,7 +100455,7 @@ in
       sources."clone-response-1.0.2"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
-      sources."conf-10.1.1"
+      sources."conf-10.1.2"
       (sources."configstore-5.0.1" // {
         dependencies = [
           sources."dot-prop-5.3.0"
@@ -100137,7 +100516,7 @@ in
           sources."get-stream-4.1.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
@@ -100155,7 +100534,7 @@ in
       sources."indent-string-4.0.0"
       sources."inherits-2.0.4"
       sources."ini-2.0.0"
-      (sources."inquirer-8.2.1" // {
+      (sources."inquirer-8.2.2" // {
         dependencies = [
           sources."chalk-4.1.2"
         ];
@@ -100218,7 +100597,7 @@ in
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
       sources."netmask-2.0.2"
-      sources."node-fetch-2.6.0"
+      sources."node-fetch-2.6.7"
       sources."normalize-package-data-3.0.3"
       sources."normalize-url-4.5.1"
       sources."npm-run-path-4.0.1"
@@ -100326,6 +100705,7 @@ in
       sources."tmp-0.0.33"
       sources."to-readable-stream-1.0.0"
       sources."toidentifier-1.0.1"
+      sources."tr46-0.0.3"
       sources."trim-newlines-3.0.1"
       sources."tslib-2.3.1"
       sources."type-check-0.3.2"
@@ -100341,6 +100721,8 @@ in
       sources."validate-npm-package-license-3.0.4"
       sources."vm2-3.9.9"
       sources."wcwidth-1.0.1"
+      sources."webidl-conversions-3.0.1"
+      sources."whatwg-url-5.0.0"
       sources."which-2.0.2"
       sources."widest-line-3.1.0"
       sources."word-wrap-1.2.3"
@@ -100448,7 +100830,7 @@ in
       sources."get-caller-file-2.0.5"
       sources."get-stream-2.3.1"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -100631,7 +101013,7 @@ in
           sources."tslib-2.3.1"
         ];
       })
-      (sources."@graphql-tools/schema-8.3.5" // {
+      (sources."@graphql-tools/schema-8.3.6" // {
         dependencies = [
           sources."@graphql-tools/merge-8.2.6"
           sources."@graphql-tools/utils-8.6.5"
@@ -100759,7 +101141,7 @@ in
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-get-iterator-1.1.2"
       sources."es-to-primitive-1.2.1"
       sources."es6-promise-3.3.1"
@@ -100808,7 +101190,7 @@ in
           sources."p-cancelable-1.1.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."graphql-15.3.0"
       (sources."graphql-config-3.0.3" // {
         dependencies = [
@@ -100867,11 +101249,11 @@ in
       sources."is-map-2.0.2"
       sources."is-negative-zero-2.0.2"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-promise-4.0.0"
       sources."is-regex-1.1.4"
       sources."is-set-2.0.2"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-stream-1.1.0"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
@@ -101156,14 +101538,14 @@ in
       sources."@cronvel/get-pixels-3.4.0"
       sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2"
       sources."@graphql-tools/batch-execute-8.4.1"
-      sources."@graphql-tools/delegate-8.7.0"
+      sources."@graphql-tools/delegate-8.7.1"
       sources."@graphql-tools/graphql-file-loader-7.3.7"
       sources."@graphql-tools/import-6.6.9"
       sources."@graphql-tools/json-file-loader-7.3.7"
-      sources."@graphql-tools/load-7.5.5"
+      sources."@graphql-tools/load-7.5.6"
       sources."@graphql-tools/merge-8.2.6"
-      sources."@graphql-tools/schema-8.3.5"
-      (sources."@graphql-tools/url-loader-7.9.7" // {
+      sources."@graphql-tools/schema-8.3.6"
+      (sources."@graphql-tools/url-loader-7.9.8" // {
         dependencies = [
           (sources."subscriptions-transport-ws-0.11.0" // {
             dependencies = [
@@ -101174,7 +101556,7 @@ in
         ];
       })
       sources."@graphql-tools/utils-8.6.5"
-      sources."@graphql-tools/wrap-8.4.9"
+      sources."@graphql-tools/wrap-8.4.10"
       sources."@iarna/toml-2.2.5"
       sources."@n1ru4l/graphql-live-query-0.9.0"
       sources."@nodelib/fs.scandir-2.1.5"
@@ -101277,7 +101659,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."cross-undici-fetch-0.1.27"
+      sources."cross-undici-fetch-0.1.28"
       sources."cwise-compiler-1.1.3"
       sources."dataloader-2.0.0"
       sources."debug-4.3.4"
@@ -101324,9 +101706,9 @@ in
       sources."fs-extra-8.1.0"
       sources."glob-parent-5.1.2"
       sources."globby-11.1.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."graphql-15.4.0"
-      sources."graphql-config-4.1.0"
+      sources."graphql-config-4.3.0"
       sources."graphql-executor-0.0.22"
       (sources."graphql-language-service-interface-2.10.2" // {
         dependencies = [
@@ -101387,7 +101769,7 @@ in
       sources."mime-1.4.1"
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
-      sources."minimatch-3.0.4"
+      sources."minimatch-4.2.1"
       sources."ms-2.1.2"
       sources."ndarray-1.0.19"
       sources."ndarray-pack-1.2.1"
@@ -101476,7 +101858,7 @@ in
       sources."ts-node-9.1.1"
       sources."tslib-2.3.1"
       sources."type-is-1.6.18"
-      sources."undici-4.16.0"
+      sources."undici-5.0.0"
       sources."uniq-1.0.1"
       sources."universalify-0.1.2"
       sources."unixify-1.0.0"
@@ -102016,7 +102398,7 @@ in
       sources."global-modules-1.0.0"
       sources."global-prefix-1.0.2"
       sources."glogg-1.0.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."gulp-cli-2.3.0"
       sources."gulplog-1.0.0"
       sources."has-1.0.3"
@@ -102418,7 +102800,7 @@ in
       sources."global-modules-1.0.0"
       sources."global-prefix-1.0.2"
       sources."glogg-1.0.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."gulplog-1.0.0"
       sources."has-1.0.3"
       sources."has-symbols-1.0.3"
@@ -102715,10 +103097,10 @@ in
   htmlhint = nodeEnv.buildNodePackage {
     name = "htmlhint";
     packageName = "htmlhint";
-    version = "1.1.2";
+    version = "1.1.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.2.tgz";
-      sha512 = "3rUS4ROXjyRidMiThTXhwtAotmGvOOof3uUk1X0YWjJF63qOP0sorogfgvo+XFcp5Q6IWhiFcZqd3giCrKHg+g==";
+      url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.3.tgz";
+      sha512 = "Z2GtamhFnhCAXKP5lsfqShIDlk6eHEI5U6B9A/JXstdgakoOC2y9nF1b38DcVNBJ8eHn/wfSdh4GVrW4NmmFEQ==";
     };
     dependencies = [
       sources."ansi-styles-4.3.0"
@@ -102728,22 +103110,18 @@ in
       sources."chalk-4.1.2"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
-      sources."commander-8.3.0"
+      sources."commander-9.1.0"
       sources."concat-map-0.0.1"
       sources."fs.realpath-1.0.0"
       sources."glob-7.2.0"
-      sources."glob-base-0.3.0"
-      sources."glob-parent-2.0.0"
       sources."has-flag-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."is-dotfile-1.0.3"
-      sources."is-extglob-1.0.0"
-      sources."is-glob-2.0.1"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-4.0.3"
       sources."minimatch-3.1.2"
       sources."node-fetch-2.6.7"
       sources."once-1.4.0"
-      sources."parse-glob-3.0.4"
       sources."path-is-absolute-1.0.1"
       sources."strip-json-comments-3.1.0"
       sources."supports-color-7.2.0"
@@ -103004,7 +103382,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.1101.0"
+      sources."aws-sdk-2.1107.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.11.0"
       sources."base64-js-1.5.1"
@@ -103111,7 +103489,7 @@ in
       sources."mime-types-2.1.35"
       sources."minimist-1.2.6"
       sources."mkdirp-0.5.6"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."moment-timezone-0.5.34"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
@@ -103209,7 +103587,7 @@ in
       sources."jp-kernel-2.0.0"
       sources."nan-2.14.2"
       sources."nel-1.3.0"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       sources."uuid-3.4.0"
       sources."zeromq-5.2.8"
     ];
@@ -103301,7 +103679,7 @@ in
           sources."object-assign-3.0.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-ansi-2.0.0"
@@ -103475,7 +103853,7 @@ in
           sources."minimist-1.2.6"
         ];
       })
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."mv-2.1.1"
       sources."nan-2.15.0"
       sources."ncp-2.0.0"
@@ -103565,7 +103943,7 @@ in
       sources."fsevents-2.3.2"
       sources."get-stream-4.1.0"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."historic-readline-1.0.8"
       sources."iconv-lite-0.6.3"
       sources."inflight-1.0.6"
@@ -103714,7 +104092,7 @@ in
       sources."getpass-0.1.7"
       sources."glob-7.2.0"
       sources."glob-parent-5.1.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."he-1.2.0"
@@ -103788,7 +104166,7 @@ in
       sources."uri-js-4.4.1"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
-      (sources."vscode-css-languageservice-5.3.0" // {
+      (sources."vscode-css-languageservice-5.4.1" // {
         dependencies = [
           sources."vscode-languageserver-types-3.16.0"
         ];
@@ -103935,7 +104313,7 @@ in
       sources."get-stream-4.1.0"
       sources."get-uri-3.0.2"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-symbols-1.0.3"
@@ -104148,42 +104526,42 @@ in
     dependencies = [
       sources."@iarna/toml-2.2.5"
       sources."@msgpack/msgpack-2.7.2"
-      sources."@ot-builder/bin-composite-types-1.5.0"
-      sources."@ot-builder/bin-util-1.5.0"
-      sources."@ot-builder/cli-help-shower-1.5.0"
-      sources."@ot-builder/cli-proc-1.5.0"
-      sources."@ot-builder/cli-shared-1.5.0"
-      sources."@ot-builder/common-impl-1.5.0"
-      sources."@ot-builder/errors-1.5.0"
-      sources."@ot-builder/io-bin-cff-1.5.0"
-      sources."@ot-builder/io-bin-encoding-1.5.0"
-      sources."@ot-builder/io-bin-ext-private-1.5.0"
-      sources."@ot-builder/io-bin-font-1.5.0"
-      sources."@ot-builder/io-bin-glyph-store-1.5.0"
-      sources."@ot-builder/io-bin-layout-1.5.0"
-      sources."@ot-builder/io-bin-metadata-1.5.0"
-      sources."@ot-builder/io-bin-metric-1.5.0"
-      sources."@ot-builder/io-bin-name-1.5.0"
-      sources."@ot-builder/io-bin-sfnt-1.5.0"
-      sources."@ot-builder/io-bin-ttf-1.5.0"
-      sources."@ot-builder/io-bin-vtt-private-1.5.0"
-      sources."@ot-builder/ot-1.5.0"
-      sources."@ot-builder/ot-encoding-1.5.0"
-      sources."@ot-builder/ot-ext-private-1.5.0"
-      sources."@ot-builder/ot-glyphs-1.5.0"
-      sources."@ot-builder/ot-layout-1.5.0"
-      sources."@ot-builder/ot-metadata-1.5.0"
-      sources."@ot-builder/ot-name-1.5.0"
-      sources."@ot-builder/ot-sfnt-1.5.0"
-      sources."@ot-builder/ot-standard-glyph-namer-1.5.0"
-      sources."@ot-builder/ot-vtt-private-1.5.0"
-      sources."@ot-builder/prelude-1.5.0"
-      sources."@ot-builder/primitive-1.5.0"
-      sources."@ot-builder/rectify-1.5.0"
-      sources."@ot-builder/stat-glyphs-1.5.0"
-      sources."@ot-builder/trace-1.5.0"
-      sources."@ot-builder/var-store-1.5.0"
-      sources."@ot-builder/variance-1.5.0"
+      sources."@ot-builder/bin-composite-types-1.5.1"
+      sources."@ot-builder/bin-util-1.5.1"
+      sources."@ot-builder/cli-help-shower-1.5.1"
+      sources."@ot-builder/cli-proc-1.5.1"
+      sources."@ot-builder/cli-shared-1.5.1"
+      sources."@ot-builder/common-impl-1.5.1"
+      sources."@ot-builder/errors-1.5.1"
+      sources."@ot-builder/io-bin-cff-1.5.1"
+      sources."@ot-builder/io-bin-encoding-1.5.1"
+      sources."@ot-builder/io-bin-ext-private-1.5.1"
+      sources."@ot-builder/io-bin-font-1.5.1"
+      sources."@ot-builder/io-bin-glyph-store-1.5.1"
+      sources."@ot-builder/io-bin-layout-1.5.1"
+      sources."@ot-builder/io-bin-metadata-1.5.1"
+      sources."@ot-builder/io-bin-metric-1.5.1"
+      sources."@ot-builder/io-bin-name-1.5.1"
+      sources."@ot-builder/io-bin-sfnt-1.5.1"
+      sources."@ot-builder/io-bin-ttf-1.5.1"
+      sources."@ot-builder/io-bin-vtt-private-1.5.1"
+      sources."@ot-builder/ot-1.5.1"
+      sources."@ot-builder/ot-encoding-1.5.1"
+      sources."@ot-builder/ot-ext-private-1.5.1"
+      sources."@ot-builder/ot-glyphs-1.5.1"
+      sources."@ot-builder/ot-layout-1.5.1"
+      sources."@ot-builder/ot-metadata-1.5.1"
+      sources."@ot-builder/ot-name-1.5.1"
+      sources."@ot-builder/ot-sfnt-1.5.1"
+      sources."@ot-builder/ot-standard-glyph-namer-1.5.1"
+      sources."@ot-builder/ot-vtt-private-1.5.1"
+      sources."@ot-builder/prelude-1.5.1"
+      sources."@ot-builder/primitive-1.5.1"
+      sources."@ot-builder/rectify-1.5.1"
+      sources."@ot-builder/stat-glyphs-1.5.1"
+      sources."@ot-builder/trace-1.5.1"
+      sources."@ot-builder/var-store-1.5.1"
+      sources."@ot-builder/variance-1.5.1"
       sources."@unicode/unicode-14.0.0-1.2.1"
       sources."@xmldom/xmldom-0.7.5"
       sources."aglfn-1.0.2"
@@ -104232,7 +104610,7 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."fs-extra-10.0.1"
       sources."get-caller-file-2.0.5"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-flag-4.0.0"
       sources."hashish-0.0.4"
       sources."iconv-lite-0.6.3"
@@ -104245,8 +104623,8 @@ in
       sources."mimic-fn-2.1.0"
       sources."onetime-5.1.2"
       sources."optionator-0.8.3"
-      sources."ot-builder-1.5.0"
-      sources."otb-ttc-bundle-1.5.0"
+      sources."ot-builder-1.5.1"
+      sources."otb-ttc-bundle-1.5.1"
       sources."passerror-1.1.1"
       sources."patel-0.37.1"
       sources."patrisika-0.24.0"
@@ -104472,82 +104850,82 @@ in
       })
       sources."@aws-sdk/abort-controller-3.55.0"
       sources."@aws-sdk/chunked-blob-reader-3.55.0"
-      sources."@aws-sdk/chunked-blob-reader-native-3.55.0"
-      sources."@aws-sdk/client-s3-3.56.0"
-      sources."@aws-sdk/client-sso-3.56.0"
-      sources."@aws-sdk/client-sts-3.56.0"
-      sources."@aws-sdk/config-resolver-3.56.0"
+      sources."@aws-sdk/chunked-blob-reader-native-3.58.0"
+      sources."@aws-sdk/client-s3-3.58.0"
+      sources."@aws-sdk/client-sso-3.58.0"
+      sources."@aws-sdk/client-sts-3.58.0"
+      sources."@aws-sdk/config-resolver-3.58.0"
       sources."@aws-sdk/credential-provider-env-3.55.0"
-      sources."@aws-sdk/credential-provider-imds-3.56.0"
-      sources."@aws-sdk/credential-provider-ini-3.56.0"
-      sources."@aws-sdk/credential-provider-node-3.56.0"
-      sources."@aws-sdk/credential-provider-process-3.56.0"
-      sources."@aws-sdk/credential-provider-sso-3.56.0"
+      sources."@aws-sdk/credential-provider-imds-3.58.0"
+      sources."@aws-sdk/credential-provider-ini-3.58.0"
+      sources."@aws-sdk/credential-provider-node-3.58.0"
+      sources."@aws-sdk/credential-provider-process-3.58.0"
+      sources."@aws-sdk/credential-provider-sso-3.58.0"
       sources."@aws-sdk/credential-provider-web-identity-3.55.0"
-      sources."@aws-sdk/eventstream-marshaller-3.55.0"
-      sources."@aws-sdk/eventstream-serde-browser-3.55.0"
+      sources."@aws-sdk/eventstream-marshaller-3.58.0"
+      sources."@aws-sdk/eventstream-serde-browser-3.58.0"
       sources."@aws-sdk/eventstream-serde-config-resolver-3.55.0"
-      sources."@aws-sdk/eventstream-serde-node-3.55.0"
-      sources."@aws-sdk/eventstream-serde-universal-3.55.0"
-      sources."@aws-sdk/fetch-http-handler-3.55.0"
-      sources."@aws-sdk/hash-blob-browser-3.55.0"
+      sources."@aws-sdk/eventstream-serde-node-3.58.0"
+      sources."@aws-sdk/eventstream-serde-universal-3.58.0"
+      sources."@aws-sdk/fetch-http-handler-3.58.0"
+      sources."@aws-sdk/hash-blob-browser-3.58.0"
       sources."@aws-sdk/hash-node-3.55.0"
-      sources."@aws-sdk/hash-stream-node-3.55.0"
+      sources."@aws-sdk/hash-stream-node-3.58.0"
       sources."@aws-sdk/invalid-dependency-3.55.0"
       sources."@aws-sdk/is-array-buffer-3.55.0"
-      sources."@aws-sdk/md5-js-3.55.0"
-      sources."@aws-sdk/middleware-bucket-endpoint-3.56.0"
-      sources."@aws-sdk/middleware-content-length-3.55.0"
-      sources."@aws-sdk/middleware-expect-continue-3.55.0"
-      sources."@aws-sdk/middleware-flexible-checksums-3.55.0"
-      sources."@aws-sdk/middleware-header-default-3.55.0"
-      sources."@aws-sdk/middleware-host-header-3.55.0"
+      sources."@aws-sdk/md5-js-3.58.0"
+      sources."@aws-sdk/middleware-bucket-endpoint-3.58.0"
+      sources."@aws-sdk/middleware-content-length-3.58.0"
+      sources."@aws-sdk/middleware-expect-continue-3.58.0"
+      sources."@aws-sdk/middleware-flexible-checksums-3.58.0"
+      sources."@aws-sdk/middleware-header-default-3.58.0"
+      sources."@aws-sdk/middleware-host-header-3.58.0"
       sources."@aws-sdk/middleware-location-constraint-3.55.0"
       sources."@aws-sdk/middleware-logger-3.55.0"
-      (sources."@aws-sdk/middleware-retry-3.56.0" // {
+      (sources."@aws-sdk/middleware-retry-3.58.0" // {
         dependencies = [
           sources."uuid-8.3.2"
         ];
       })
-      sources."@aws-sdk/middleware-sdk-s3-3.56.0"
-      sources."@aws-sdk/middleware-sdk-sts-3.56.0"
+      sources."@aws-sdk/middleware-sdk-s3-3.58.0"
+      sources."@aws-sdk/middleware-sdk-sts-3.58.0"
       sources."@aws-sdk/middleware-serde-3.55.0"
-      sources."@aws-sdk/middleware-signing-3.56.0"
+      sources."@aws-sdk/middleware-signing-3.58.0"
       sources."@aws-sdk/middleware-ssec-3.55.0"
       sources."@aws-sdk/middleware-stack-3.55.0"
-      sources."@aws-sdk/middleware-user-agent-3.55.0"
-      sources."@aws-sdk/node-config-provider-3.56.0"
-      sources."@aws-sdk/node-http-handler-3.55.0"
+      sources."@aws-sdk/middleware-user-agent-3.58.0"
+      sources."@aws-sdk/node-config-provider-3.58.0"
+      sources."@aws-sdk/node-http-handler-3.58.0"
       sources."@aws-sdk/property-provider-3.55.0"
-      sources."@aws-sdk/protocol-http-3.55.0"
+      sources."@aws-sdk/protocol-http-3.58.0"
       sources."@aws-sdk/querystring-builder-3.55.0"
       sources."@aws-sdk/querystring-parser-3.55.0"
-      sources."@aws-sdk/s3-request-presigner-3.56.0"
+      sources."@aws-sdk/s3-request-presigner-3.58.0"
       sources."@aws-sdk/service-error-classification-3.55.0"
-      sources."@aws-sdk/shared-ini-file-loader-3.56.0"
-      sources."@aws-sdk/signature-v4-3.56.0"
+      sources."@aws-sdk/shared-ini-file-loader-3.58.0"
+      sources."@aws-sdk/signature-v4-3.58.0"
       sources."@aws-sdk/smithy-client-3.55.0"
       sources."@aws-sdk/types-3.55.0"
       sources."@aws-sdk/url-parser-3.55.0"
       sources."@aws-sdk/util-arn-parser-3.55.0"
-      sources."@aws-sdk/util-base64-browser-3.55.0"
+      sources."@aws-sdk/util-base64-browser-3.58.0"
       sources."@aws-sdk/util-base64-node-3.55.0"
       sources."@aws-sdk/util-body-length-browser-3.55.0"
       sources."@aws-sdk/util-body-length-node-3.55.0"
       sources."@aws-sdk/util-buffer-from-3.55.0"
       sources."@aws-sdk/util-config-provider-3.55.0"
-      sources."@aws-sdk/util-create-request-3.55.0"
+      sources."@aws-sdk/util-create-request-3.58.0"
       sources."@aws-sdk/util-defaults-mode-browser-3.55.0"
-      sources."@aws-sdk/util-defaults-mode-node-3.56.0"
-      sources."@aws-sdk/util-format-url-3.55.0"
-      sources."@aws-sdk/util-hex-encoding-3.55.0"
+      sources."@aws-sdk/util-defaults-mode-node-3.58.0"
+      sources."@aws-sdk/util-format-url-3.58.0"
+      sources."@aws-sdk/util-hex-encoding-3.58.0"
       sources."@aws-sdk/util-locate-window-3.55.0"
       sources."@aws-sdk/util-middleware-3.55.0"
       sources."@aws-sdk/util-stream-browser-3.55.0"
       sources."@aws-sdk/util-stream-node-3.55.0"
       sources."@aws-sdk/util-uri-escape-3.55.0"
-      sources."@aws-sdk/util-user-agent-browser-3.55.0"
-      sources."@aws-sdk/util-user-agent-node-3.56.0"
+      sources."@aws-sdk/util-user-agent-browser-3.58.0"
+      sources."@aws-sdk/util-user-agent-node-3.58.0"
       sources."@aws-sdk/util-utf8-browser-3.55.0"
       sources."@aws-sdk/util-utf8-node-3.55.0"
       sources."@aws-sdk/util-waiter-3.55.0"
@@ -104611,7 +104989,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.1101.0" // {
+      (sources."aws-sdk-2.1108.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
@@ -104676,13 +105054,13 @@ in
         ];
       })
       sources."cwise-compiler-1.1.3"
-      sources."d3-7.3.0"
-      sources."d3-array-3.1.1"
+      sources."d3-7.4.2"
+      sources."d3-array-3.1.4"
       sources."d3-axis-3.0.0"
       sources."d3-brush-3.0.0"
       sources."d3-chord-3.0.1"
       sources."d3-collection-1.0.7"
-      sources."d3-color-3.0.1"
+      sources."d3-color-3.1.0"
       sources."d3-contour-3.0.1"
       sources."d3-delaunay-6.0.2"
       sources."d3-dispatch-3.0.1"
@@ -104698,7 +105076,7 @@ in
       sources."d3-force-3.0.0"
       sources."d3-format-3.1.0"
       sources."d3-geo-3.0.1"
-      sources."d3-hierarchy-3.1.1"
+      sources."d3-hierarchy-3.1.2"
       sources."d3-interpolate-3.0.1"
       sources."d3-path-3.0.1"
       sources."d3-polygon-3.0.1"
@@ -104842,7 +105220,7 @@ in
       sources."github-from-package-0.0.0"
       sources."glob-7.2.0"
       sources."glob-parent-5.1.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."graphlib-2.1.8"
       sources."growly-1.3.0"
       sources."har-schema-2.0.0"
@@ -105000,12 +105378,12 @@ in
       sources."minizlib-1.3.3"
       sources."mkdirp-0.5.6"
       sources."mkdirp-classic-0.5.3"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."moment-mini-2.24.0"
       sources."ms-2.1.3"
       sources."multiparty-4.2.3"
       sources."mustache-4.2.0"
-      sources."nanoid-3.3.1"
+      sources."nanoid-3.3.2"
       sources."napi-build-utils-1.0.2"
       sources."ndarray-1.0.19"
       sources."ndarray-pack-1.2.1"
@@ -105202,7 +105580,7 @@ in
         ];
       })
       sources."strip-json-comments-2.0.1"
-      sources."stylis-4.0.13"
+      sources."stylis-4.1.0"
       sources."supports-color-7.2.0"
       sources."symbol-observable-1.2.0"
       sources."symbol-tree-3.2.4"
@@ -105309,10 +105687,10 @@ in
   js-beautify = nodeEnv.buildNodePackage {
     name = "js-beautify";
     packageName = "js-beautify";
-    version = "1.14.0";
+    version = "1.14.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.0.tgz";
-      sha512 = "yuck9KirNSCAwyNJbqW+BxJqJ0NLJ4PwBUzQQACl5O3qHMBXVkXb/rD0ilh/Lat/tn88zSZ+CAHOlk0DsY7GuQ==";
+      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.2.tgz";
+      sha512 = "H85kX95a53os+q1OCqtYe8AXAmgy3BvtysA/V83S3fdhznm6WlUpGi14DqSPbKFsL3dXZFXYl7YQwW9U1+76ng==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -105393,7 +105771,7 @@ in
       sources."linkify-it-3.0.3"
       sources."lodash-4.17.21"
       sources."markdown-it-12.3.2"
-      sources."markdown-it-anchor-8.4.1"
+      sources."markdown-it-anchor-8.5.0"
       sources."marked-4.0.12"
       sources."mdurl-1.0.1"
       sources."mkdirp-1.0.4"
@@ -105492,7 +105870,7 @@ in
       sha512 = "VBvNBt3cIrCBHa3gYbVsCFUEReqWZPf+Biq1ZtFdIiQ6rytRLDp3qvtrGv7z/iZDd1D4vXWpW7Nx1nP8muLzkg==";
     };
     dependencies = [
-      sources."cli-color-2.0.1"
+      sources."cli-color-2.0.2"
       sources."d-1.0.1"
       sources."difflib-0.2.4"
       sources."dreamopt-0.8.0"
@@ -105605,7 +105983,7 @@ in
       sources."ansi-styles-4.3.0"
       sources."array-flatten-1.1.1"
       sources."basic-auth-2.0.1"
-      sources."body-parser-1.19.2"
+      sources."body-parser-1.20.0"
       sources."boxen-5.1.2"
       sources."bytes-3.1.2"
       (sources."cacheable-request-6.1.0" // {
@@ -105614,6 +105992,7 @@ in
           sources."lowercase-keys-2.0.0"
         ];
       })
+      sources."call-bind-1.0.2"
       sources."camelcase-6.3.0"
       sources."chalk-4.1.2"
       sources."ci-info-2.0.0"
@@ -105644,8 +106023,8 @@ in
       sources."decompress-response-3.3.0"
       sources."deep-extend-0.6.0"
       sources."defer-to-connect-1.1.3"
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
+      sources."depd-2.0.0"
+      sources."destroy-1.2.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
@@ -105659,7 +106038,14 @@ in
       sources."etag-1.8.1"
       (sources."express-4.17.3" // {
         dependencies = [
+          sources."body-parser-1.19.2"
+          sources."depd-1.1.2"
+          sources."http-errors-1.8.1"
+          sources."on-finished-2.3.0"
+          sources."qs-6.9.7"
+          sources."raw-body-2.4.3"
           sources."safe-buffer-5.2.1"
+          sources."statuses-1.5.0"
         ];
       })
       (sources."express-urlrewrite-1.4.0" // {
@@ -105667,18 +106053,27 @@ in
           sources."path-to-regexp-1.8.0"
         ];
       })
-      sources."finalhandler-1.1.2"
+      (sources."finalhandler-1.1.2" // {
+        dependencies = [
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
+        ];
+      })
       sources."forwarded-0.2.0"
       sources."fresh-0.5.2"
+      sources."function-bind-1.1.1"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.1.1"
       sources."get-stream-4.1.0"
       sources."global-dirs-3.0.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
+      sources."has-1.0.3"
       sources."has-flag-4.0.0"
+      sources."has-symbols-1.0.3"
       sources."has-yarn-2.1.0"
       sources."http-cache-semantics-4.1.0"
-      sources."http-errors-1.8.1"
+      sources."http-errors-2.0.0"
       sources."iconv-lite-0.4.24"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -105725,15 +106120,16 @@ in
       sources."minimist-1.2.6"
       (sources."morgan-1.10.0" // {
         dependencies = [
-          sources."depd-2.0.0"
+          sources."on-finished-2.3.0"
         ];
       })
       sources."ms-2.0.0"
-      sources."nanoid-3.3.1"
+      sources."nanoid-3.3.2"
       sources."negotiator-0.6.3"
       sources."normalize-url-4.5.1"
       sources."object-assign-4.1.1"
-      sources."on-finished-2.3.0"
+      sources."object-inspect-1.12.0"
+      sources."on-finished-2.4.1"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."p-cancelable-1.1.0"
@@ -105751,9 +106147,9 @@ in
       sources."proxy-addr-2.0.7"
       sources."pump-3.0.0"
       sources."pupa-2.1.1"
-      sources."qs-6.9.7"
+      sources."qs-6.10.3"
       sources."range-parser-1.2.1"
-      sources."raw-body-2.4.3"
+      sources."raw-body-2.5.1"
       (sources."rc-1.2.8" // {
         dependencies = [
           sources."ini-1.3.8"
@@ -105774,14 +106170,20 @@ in
       })
       (sources."send-0.17.2" // {
         dependencies = [
+          sources."depd-1.1.2"
+          sources."destroy-1.0.4"
+          sources."http-errors-1.8.1"
           sources."ms-2.1.3"
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
         ];
       })
       sources."serve-static-1.14.2"
       sources."server-destroy-1.0.1"
       sources."setprototypeof-1.2.0"
+      sources."side-channel-1.0.4"
       sources."signal-exit-3.0.7"
-      sources."statuses-1.5.0"
+      sources."statuses-2.0.1"
       sources."steno-0.4.4"
       sources."string-width-4.2.3"
       sources."strip-ansi-6.0.1"
@@ -105882,7 +106284,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-extensions-1.13.1"
       sources."bindings-1.5.0"
-      sources."body-parser-1.19.2"
+      sources."body-parser-1.20.0"
       sources."boxen-0.6.0"
       sources."braces-1.8.5"
       sources."bytes-3.1.2"
@@ -105891,6 +106293,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
+      sources."call-bind-1.0.2"
       sources."camelcase-2.1.1"
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
@@ -105956,8 +106359,8 @@ in
         ];
       })
       sources."delayed-stream-1.0.0"
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
+      sources."depd-2.0.0"
+      sources."destroy-1.2.0"
       sources."dot-prop-3.0.0"
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
@@ -105972,7 +106375,14 @@ in
       sources."expand-range-1.8.2"
       (sources."express-4.17.3" // {
         dependencies = [
+          sources."body-parser-1.19.2"
+          sources."depd-1.1.2"
+          sources."http-errors-1.8.1"
+          sources."on-finished-2.3.0"
+          sources."qs-6.9.7"
+          sources."raw-body-2.4.3"
           sources."safe-buffer-5.2.1"
+          sources."statuses-1.5.0"
         ];
       })
       sources."extend-3.0.2"
@@ -105989,7 +106399,12 @@ in
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.4"
       sources."filled-array-1.1.0"
-      sources."finalhandler-1.1.2"
+      (sources."finalhandler-1.1.2" // {
+        dependencies = [
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
+        ];
+      })
       sources."find-up-1.1.2"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
@@ -106001,16 +106416,18 @@ in
       sources."fsevents-1.2.13"
       sources."function-bind-1.1.1"
       sources."get-caller-file-1.0.3"
+      sources."get-intrinsic-1.1.1"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
       sources."got-5.7.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
+      sources."has-symbols-1.0.3"
       (sources."has-value-1.0.0" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -106027,7 +106444,7 @@ in
         ];
       })
       sources."hosted-git-info-2.8.9"
-      sources."http-errors-1.8.1"
+      sources."http-errors-2.0.0"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
       sources."imurmurhash-0.1.4"
@@ -106118,7 +106535,7 @@ in
       sources."mkdirp-0.5.6"
       (sources."morgan-1.10.0" // {
         dependencies = [
-          sources."depd-2.0.0"
+          sources."on-finished-2.3.0"
         ];
       })
       sources."ms-2.0.0"
@@ -106150,6 +106567,7 @@ in
           })
         ];
       })
+      sources."object-inspect-1.12.0"
       (sources."object-visit-1.0.1" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -106161,7 +106579,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."on-finished-2.3.0"
+      sources."on-finished-2.4.1"
       sources."on-headers-1.0.2"
       sources."os-homedir-1.0.2"
       sources."os-locale-1.4.0"
@@ -106189,7 +106607,7 @@ in
       sources."proxy-addr-2.0.7"
       sources."psl-1.8.0"
       sources."punycode-2.1.1"
-      sources."qs-6.9.7"
+      sources."qs-6.10.3"
       (sources."randomatic-3.1.1" // {
         dependencies = [
           sources."is-number-4.0.0"
@@ -106197,7 +106615,7 @@ in
         ];
       })
       sources."range-parser-1.2.1"
-      sources."raw-body-2.4.3"
+      sources."raw-body-2.5.1"
       sources."rc-1.2.8"
       sources."read-all-stream-3.1.0"
       sources."read-pkg-1.1.0"
@@ -106279,7 +106697,12 @@ in
       sources."semver-diff-2.1.0"
       (sources."send-0.17.2" // {
         dependencies = [
+          sources."depd-1.1.2"
+          sources."destroy-1.0.4"
+          sources."http-errors-1.8.1"
           sources."ms-2.1.3"
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
         ];
       })
       sources."serve-static-1.14.2"
@@ -106291,6 +106714,7 @@ in
         ];
       })
       sources."setprototypeof-1.2.0"
+      sources."side-channel-1.0.4"
       sources."slide-1.1.6"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
@@ -106343,7 +106767,7 @@ in
           sources."kind-of-5.1.0"
         ];
       })
-      sources."statuses-1.5.0"
+      sources."statuses-2.0.1"
       sources."steno-0.4.4"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
@@ -106536,7 +106960,7 @@ in
       sources."get-intrinsic-1.1.1"
       sources."glob-parent-5.1.2"
       sources."globby-11.1.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-symbols-1.0.3"
@@ -106573,7 +106997,7 @@ in
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
       sources."mimic-fn-2.1.0"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
       sources."natural-orderby-2.0.3"
@@ -106631,7 +107055,7 @@ in
       sources."typedarray-to-buffer-3.1.5"
       sources."universalify-0.1.2"
       sources."uri-js-4.4.1"
-      sources."urijs-1.19.10"
+      sources."urijs-1.19.11"
       sources."uuid-8.3.2"
       sources."which-1.3.1"
       sources."widest-line-3.1.0"
@@ -106692,10 +107116,11 @@ in
       sources."balanced-match-1.0.2"
       sources."base64id-2.0.0"
       sources."binary-extensions-2.2.0"
-      sources."body-parser-1.19.2"
+      sources."body-parser-1.20.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."bytes-3.1.2"
+      sources."call-bind-1.0.2"
       sources."chokidar-3.5.3"
       sources."cliui-7.0.4"
       sources."color-convert-2.0.1"
@@ -106709,7 +107134,8 @@ in
       sources."custom-event-1.0.1"
       sources."date-format-4.0.6"
       sources."debug-2.6.9"
-      sources."depd-1.1.2"
+      sources."depd-2.0.0"
+      sources."destroy-1.2.0"
       sources."di-0.0.1"
       sources."dom-serialize-2.2.1"
       sources."ee-first-1.1.1"
@@ -106728,17 +107154,26 @@ in
       sources."eventemitter3-4.0.7"
       sources."extend-3.0.2"
       sources."fill-range-7.0.1"
-      sources."finalhandler-1.1.2"
+      (sources."finalhandler-1.1.2" // {
+        dependencies = [
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
+        ];
+      })
       sources."flatted-3.2.5"
       sources."follow-redirects-1.14.9"
       sources."fs-extra-10.0.1"
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.3.2"
+      sources."function-bind-1.1.1"
       sources."get-caller-file-2.0.5"
+      sources."get-intrinsic-1.1.1"
       sources."glob-7.2.0"
       sources."glob-parent-5.1.2"
-      sources."graceful-fs-4.2.9"
-      sources."http-errors-1.8.1"
+      sources."graceful-fs-4.2.10"
+      sources."has-1.0.3"
+      sources."has-symbols-1.0.3"
+      sources."http-errors-2.0.0"
       sources."http-proxy-1.18.1"
       sources."iconv-lite-0.4.24"
       sources."inflight-1.0.6"
@@ -106768,15 +107203,16 @@ in
       sources."negotiator-0.6.3"
       sources."normalize-path-3.0.0"
       sources."object-assign-4.1.1"
-      sources."on-finished-2.3.0"
+      sources."object-inspect-1.12.0"
+      sources."on-finished-2.4.1"
       sources."once-1.4.0"
       sources."parseurl-1.3.3"
       sources."path-is-absolute-1.0.1"
       sources."picomatch-2.3.1"
       sources."qjobs-1.2.0"
-      sources."qs-6.9.7"
+      sources."qs-6.10.3"
       sources."range-parser-1.2.1"
-      sources."raw-body-2.4.3"
+      sources."raw-body-2.5.1"
       sources."readdirp-3.6.0"
       sources."require-directory-2.1.1"
       sources."requires-port-1.0.0"
@@ -106784,6 +107220,7 @@ in
       sources."rimraf-3.0.2"
       sources."safer-buffer-2.1.2"
       sources."setprototypeof-1.2.0"
+      sources."side-channel-1.0.4"
       (sources."socket.io-4.4.1" // {
         dependencies = [
           sources."debug-4.3.4"
@@ -106798,7 +107235,7 @@ in
         ];
       })
       sources."source-map-0.6.1"
-      sources."statuses-1.5.0"
+      sources."statuses-2.0.1"
       (sources."streamroller-3.0.6" // {
         dependencies = [
           sources."debug-4.3.4"
@@ -106970,7 +107407,7 @@ in
       sources."buffer-from-1.1.2"
       sources."bytes-3.1.2"
       sources."call-bind-1.0.2"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       sources."chalk-2.4.2"
       sources."chardet-1.4.0"
       sources."chownr-1.1.4"
@@ -107030,7 +107467,7 @@ in
       sources."destroy-1.0.4"
       sources."detect-libc-1.0.3"
       sources."dir-glob-3.0.1"
-      sources."doipjs-0.15.5"
+      sources."doipjs-0.15.6"
       (sources."domexception-2.0.1" // {
         dependencies = [
           sources."webidl-conversions-5.0.0"
@@ -107038,12 +107475,12 @@ in
       })
       sources."dotenv-8.6.0"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-to-chromium-1.4.103"
       sources."emoji-regex-8.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."enquirer-2.3.6"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
       sources."escape-html-1.0.3"
@@ -107117,7 +107554,7 @@ in
           sources."slash-3.0.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-bigints-1.0.1"
       sources."has-flag-3.0.0"
@@ -107159,12 +107596,12 @@ in
       sources."is-glob-4.0.3"
       sources."is-negative-zero-2.0.2"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-plain-obj-2.1.0"
       sources."is-plain-object-2.0.4"
       sources."is-potential-custom-element-name-1.0.1"
       sources."is-regex-1.1.4"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-weakref-1.0.2"
@@ -107245,7 +107682,7 @@ in
       sources."picomatch-2.3.1"
       sources."pify-4.0.1"
       sources."pirates-4.0.5"
-      (sources."pkg-5.5.2" // {
+      (sources."pkg-5.6.0" // {
         dependencies = [
           sources."@babel/parser-7.16.2"
           sources."@babel/types-7.16.0"
@@ -107258,7 +107695,7 @@ in
         ];
       })
       sources."pkg-dir-3.0.0"
-      (sources."pkg-fetch-3.2.6" // {
+      (sources."pkg-fetch-3.3.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.2"
@@ -107379,7 +107816,7 @@ in
       sources."vary-1.1.2"
       sources."w3c-hr-time-1.0.2"
       sources."w3c-xmlserializer-2.0.0"
-      sources."webcrypto-core-1.7.2"
+      sources."webcrypto-core-1.7.3"
       sources."webidl-conversions-3.0.1"
       sources."whatwg-encoding-1.0.5"
       sources."whatwg-mimetype-2.3.0"
@@ -107453,7 +107890,7 @@ in
       sources."glob-7.2.0"
       sources."glob-parent-3.1.0"
       sources."glob-stream-6.1.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-symbols-1.0.3"
       sources."inflight-1.0.6"
@@ -107640,7 +108077,7 @@ in
       sources."minimatch-3.1.2"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."mute-stream-0.0.8"
       (sources."nconf-0.10.0" // {
         dependencies = [
@@ -107890,7 +108327,7 @@ in
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
       sources."mkdirp-1.0.4"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."mute-stream-0.0.8"
       (sources."nconf-0.10.0" // {
         dependencies = [
@@ -108295,7 +108732,7 @@ in
       sources."envinfo-7.8.1"
       sources."err-code-2.0.3"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
@@ -108362,7 +108799,7 @@ in
       sources."glob-7.2.0"
       sources."glob-parent-5.1.2"
       sources."globby-11.1.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."handlebars-4.7.7"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -108417,12 +108854,12 @@ in
       sources."is-lambda-1.0.1"
       sources."is-negative-zero-2.0.2"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-obj-2.0.0"
       sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
       sources."is-regex-1.1.4"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-ssh-1.3.3"
       sources."is-stream-2.0.1"
       sources."is-string-1.0.7"
@@ -108784,7 +109221,7 @@ in
       sources."copy-anything-2.0.6"
       sources."debug-3.2.7"
       sources."errno-0.1.8"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."iconv-lite-0.4.24"
       sources."image-size-0.5.5"
       sources."is-what-3.14.1"
@@ -108959,7 +109396,7 @@ in
           sources."is-glob-3.1.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -109208,7 +109645,7 @@ in
       sources."binary-extensions-1.13.1"
       sources."bindings-1.5.0"
       sources."blob-0.0.5"
-      sources."body-parser-1.19.2"
+      sources."body-parser-1.20.0"
       sources."braces-1.8.5"
       sources."bytes-3.1.2"
       (sources."cache-base-1.0.1" // {
@@ -109216,6 +109653,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
+      sources."call-bind-1.0.2"
       sources."caseless-0.12.0"
       sources."chokidar-1.7.0"
       (sources."class-utils-0.3.6" // {
@@ -109260,8 +109698,8 @@ in
         ];
       })
       sources."delayed-stream-1.0.0"
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
+      sources."depd-2.0.0"
+      sources."destroy-1.2.0"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
@@ -109284,7 +109722,14 @@ in
       sources."expand-range-1.8.2"
       (sources."express-4.17.3" // {
         dependencies = [
+          sources."body-parser-1.19.2"
+          sources."depd-1.1.2"
+          sources."http-errors-1.8.1"
+          sources."on-finished-2.3.0"
+          sources."qs-6.9.7"
+          sources."raw-body-2.4.3"
           sources."safe-buffer-5.2.1"
+          sources."statuses-1.5.0"
         ];
       })
       sources."extend-3.0.2"
@@ -109300,7 +109745,12 @@ in
       sources."file-uri-to-path-1.0.0"
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.4"
-      sources."finalhandler-1.1.2"
+      (sources."finalhandler-1.1.2" // {
+        dependencies = [
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
+        ];
+      })
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."forever-agent-0.6.1"
@@ -109309,20 +109759,24 @@ in
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
       sources."fsevents-1.2.13"
+      sources."function-bind-1.1.1"
+      sources."get-intrinsic-1.1.1"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."github-slugger-1.4.0"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
+      sources."has-1.0.3"
       (sources."has-binary2-1.0.3" // {
         dependencies = [
           sources."isarray-2.0.1"
         ];
       })
       sources."has-cors-1.1.0"
+      sources."has-symbols-1.0.3"
       (sources."has-value-1.0.0" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -109339,7 +109793,7 @@ in
         ];
       })
       sources."html-entities-1.4.0"
-      sources."http-errors-1.8.1"
+      sources."http-errors-2.0.0"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
       sources."indexof-0.0.1"
@@ -109434,6 +109888,7 @@ in
           })
         ];
       })
+      sources."object-inspect-1.12.0"
       (sources."object-visit-1.0.1" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -109445,7 +109900,7 @@ in
           sources."isobject-3.0.1"
         ];
       })
-      sources."on-finished-2.3.0"
+      sources."on-finished-2.4.1"
       sources."opn-5.5.0"
       sources."parse-glob-3.0.4"
       sources."parseqs-0.0.6"
@@ -109461,7 +109916,7 @@ in
       sources."proxy-addr-2.0.7"
       sources."psl-1.8.0"
       sources."punycode-2.1.1"
-      sources."qs-6.9.7"
+      sources."qs-6.10.3"
       (sources."randomatic-3.1.1" // {
         dependencies = [
           sources."is-number-4.0.0"
@@ -109469,7 +109924,7 @@ in
         ];
       })
       sources."range-parser-1.2.1"
-      sources."raw-body-2.4.3"
+      sources."raw-body-2.5.1"
       sources."readable-stream-2.3.7"
       (sources."readdirp-2.2.1" // {
         dependencies = [
@@ -109539,7 +109994,12 @@ in
       sources."safer-buffer-2.1.2"
       (sources."send-0.17.2" // {
         dependencies = [
+          sources."depd-1.1.2"
+          sources."destroy-1.0.4"
+          sources."http-errors-1.8.1"
           sources."ms-2.1.3"
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
         ];
       })
       sources."serve-static-1.14.2"
@@ -109549,6 +110009,7 @@ in
         ];
       })
       sources."setprototypeof-1.2.0"
+      sources."side-channel-1.0.4"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -109619,7 +110080,7 @@ in
           sources."kind-of-5.1.0"
         ];
       })
-      sources."statuses-1.5.0"
+      sources."statuses-2.0.1"
       sources."string_decoder-1.1.1"
       sources."to-array-0.1.4"
       sources."to-object-path-0.3.0"
@@ -110004,7 +110465,7 @@ in
       sources."cached-path-relative-1.1.0"
       sources."call-bind-1.0.2"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       (sources."chalk-3.0.0" // {
@@ -110127,7 +110588,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-to-chromium-1.4.103"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -110247,7 +110708,7 @@ in
       })
       sources."globals-11.12.0"
       sources."google-closure-compiler-js-20170910.0.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       (sources."gunzip-maybe-1.4.2" // {
         dependencies = [
           sources."browserify-zlib-0.1.4"
@@ -110950,7 +111411,7 @@ in
       sources."fuzzyset.js-0.0.1"
       sources."getpass-0.1.7"
       sources."glob-6.0.4"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."hogan.js-2.0.0"
       (sources."http-signature-1.3.6" // {
         dependencies = [
@@ -110987,7 +111448,7 @@ in
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
       sources."mkdirp-0.5.6"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       (sources."mooremachine-2.3.0" // {
         dependencies = [
           sources."assert-plus-0.2.0"
@@ -111492,7 +111953,7 @@ in
       sources."glob-7.2.0"
       sources."globals-9.18.0"
       sources."glogg-1.0.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."gulp-eslint-3.0.1"
       (sources."gulp-util-3.0.8" // {
         dependencies = [
@@ -111749,13 +112210,13 @@ in
       sources."commander-9.1.0"
       sources."concat-map-0.0.1"
       sources."cross-fetch-3.1.5"
-      sources."d3-7.3.0"
-      sources."d3-array-3.1.1"
+      sources."d3-7.4.2"
+      sources."d3-array-3.1.4"
       sources."d3-axis-3.0.0"
       sources."d3-brush-3.0.0"
       sources."d3-chord-3.0.1"
       sources."d3-collection-1.0.7"
-      sources."d3-color-3.0.1"
+      sources."d3-color-3.1.0"
       sources."d3-contour-3.0.1"
       sources."d3-delaunay-6.0.2"
       sources."d3-dispatch-3.0.1"
@@ -111770,7 +112231,7 @@ in
       sources."d3-force-3.0.0"
       sources."d3-format-3.1.0"
       sources."d3-geo-3.0.1"
-      sources."d3-hierarchy-3.1.1"
+      sources."d3-hierarchy-3.1.2"
       sources."d3-interpolate-3.0.1"
       sources."d3-path-3.0.1"
       sources."d3-polygon-3.0.1"
@@ -111823,7 +112284,7 @@ in
           sources."iconv-lite-0.4.24"
         ];
       })
-      sources."debug-4.3.3"
+      sources."debug-4.3.4"
       sources."delaunator-5.0.0"
       sources."devtools-protocol-0.0.969999"
       sources."dompurify-2.3.5"
@@ -111863,7 +112324,7 @@ in
       sources."progress-2.0.3"
       sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
-      sources."puppeteer-13.5.1"
+      sources."puppeteer-13.5.2"
       sources."readable-stream-3.6.0"
       sources."rimraf-3.0.2"
       sources."robust-predicates-3.0.1"
@@ -111871,7 +112332,7 @@ in
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."string_decoder-1.3.0"
-      sources."stylis-4.0.13"
+      sources."stylis-4.1.0"
       sources."supports-color-7.2.0"
       sources."tar-fs-2.1.1"
       sources."tar-stream-2.2.0"
@@ -112309,7 +112770,7 @@ in
       sources."glob-7.2.0"
       sources."global-dirs-3.0.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-flag-4.0.0"
       sources."has-unicode-2.0.1"
       sources."has-yarn-2.1.0"
@@ -112386,7 +112847,7 @@ in
       })
       sources."node-addon-api-3.2.1"
       sources."node-fetch-2.6.7"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       sources."node-hid-2.1.1"
       sources."normalize-url-4.5.1"
       sources."npmlog-4.1.2"
@@ -112613,7 +113074,11 @@ in
       sources."are-we-there-yet-3.0.0"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-1.1.11"
-      sources."cacache-16.0.3"
+      (sources."cacache-16.0.3" // {
+        dependencies = [
+          sources."ssri-8.0.1"
+        ];
+      })
       sources."chownr-2.0.0"
       sources."clean-stack-2.2.0"
       sources."color-support-1.1.3"
@@ -112628,9 +113093,9 @@ in
       sources."err-code-2.0.3"
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
-      sources."gauge-4.0.3"
+      sources."gauge-4.0.4"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-unicode-2.0.1"
       sources."http-cache-semantics-4.1.0"
       sources."http-proxy-agent-5.0.0"
@@ -112646,8 +113111,8 @@ in
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-lambda-1.0.1"
       sources."isexe-2.0.0"
-      sources."lru-cache-7.7.1"
-      sources."make-fetch-happen-10.1.0"
+      sources."lru-cache-7.7.3"
+      sources."make-fetch-happen-10.1.2"
       sources."minimatch-3.1.2"
       sources."minipass-3.1.6"
       sources."minipass-collect-1.0.2"
@@ -112681,7 +113146,7 @@ in
       sources."smart-buffer-4.2.0"
       sources."socks-2.6.2"
       sources."socks-proxy-agent-6.1.1"
-      sources."ssri-8.0.1"
+      sources."ssri-9.0.0"
       sources."string-width-4.2.3"
       sources."string_decoder-1.3.0"
       sources."strip-ansi-6.0.1"
@@ -112707,10 +113172,10 @@ in
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "4.3.0";
+    version = "4.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz";
-      sha512 = "iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz";
+      sha512 = "amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -112815,7 +113280,7 @@ in
         ];
       })
       sources."glob-5.0.15"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-1.0.5"
       sources."har-validator-4.2.1"
       sources."has-1.0.3"
@@ -113129,7 +113594,7 @@ in
     };
     dependencies = [
       sources."@babel/runtime-7.17.8"
-      sources."@mapbox/node-pre-gyp-1.0.8"
+      sources."@mapbox/node-pre-gyp-1.0.9"
       sources."@node-red/editor-api-2.2.2"
       sources."@node-red/editor-client-2.2.2"
       (sources."@node-red/nodes-2.2.2" // {
@@ -113152,6 +113617,7 @@ in
       sources."@szmarczak/http-timer-4.0.6"
       sources."@types/cacheable-request-6.0.2"
       sources."@types/http-cache-semantics-4.0.1"
+      sources."@types/json-buffer-3.0.0"
       sources."@types/keyv-3.1.4"
       sources."@types/node-17.0.23"
       sources."@types/responselike-1.0.0"
@@ -113207,7 +113673,7 @@ in
       sources."cacheable-lookup-5.0.4"
       sources."cacheable-request-7.0.2"
       sources."cheerio-1.0.0-rc.10"
-      sources."cheerio-select-1.5.0"
+      sources."cheerio-select-1.6.0"
       sources."chownr-2.0.0"
       sources."cli-table-0.3.11"
       sources."clone-2.1.2"
@@ -113216,6 +113682,7 @@ in
       sources."colors-1.0.3"
       sources."combined-stream-1.0.8"
       sources."commist-1.1.0"
+      sources."compress-brotli-1.3.6"
       sources."concat-map-0.0.1"
       (sources."concat-stream-1.6.2" // {
         dependencies = [
@@ -113234,8 +113701,8 @@ in
       sources."core-util-is-1.0.3"
       sources."cors-2.8.5"
       sources."cronosjs-1.7.1"
-      sources."css-select-4.2.1"
-      sources."css-what-5.1.0"
+      sources."css-select-4.3.0"
+      sources."css-what-6.1.0"
       sources."debug-2.6.9"
       (sources."decompress-response-6.0.0" // {
         dependencies = [
@@ -113248,7 +113715,7 @@ in
       sources."denque-2.0.1"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
-      sources."detect-libc-1.0.3"
+      sources."detect-libc-2.0.1"
       sources."dicer-0.2.5"
       sources."dom-serializer-1.3.2"
       sources."domelementtype-2.2.0"
@@ -113293,7 +113760,7 @@ in
       sources."get-stream-5.2.0"
       sources."glob-7.2.0"
       sources."got-11.8.3"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-unicode-2.0.1"
       sources."hash-sum-2.0.0"
       (sources."help-me-3.0.0" // {
@@ -113333,7 +113800,7 @@ in
           sources."universalify-2.0.0"
         ];
       })
-      sources."keyv-4.1.1"
+      sources."keyv-4.2.1"
       sources."leven-2.1.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lowercase-keys-2.0.0"
@@ -113369,7 +113836,7 @@ in
         ];
       })
       sources."mkdirp-0.5.6"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."moment-timezone-0.5.34"
       (sources."mqtt-4.3.5" // {
         dependencies = [
@@ -113571,7 +114038,7 @@ in
       sources."gauge-2.7.4"
       sources."getpass-0.1.7"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-1.0.3"
@@ -113771,7 +114238,7 @@ in
       sources."glob-parent-5.1.2"
       sources."global-dirs-3.0.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-flag-3.0.0"
       sources."has-yarn-2.1.0"
       sources."http-cache-semantics-4.1.0"
@@ -113904,6 +114371,7 @@ in
       sources."@szmarczak/http-timer-4.0.6"
       sources."@types/cacheable-request-6.0.2"
       sources."@types/http-cache-semantics-4.0.1"
+      sources."@types/json-buffer-3.0.0"
       sources."@types/keyv-3.1.4"
       sources."@types/minimist-1.2.2"
       sources."@types/node-17.0.23"
@@ -113962,6 +114430,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
+      sources."compress-brotli-1.3.6"
       sources."concat-map-0.0.1"
       (sources."configstore-5.0.1" // {
         dependencies = [
@@ -114016,7 +114485,7 @@ in
           sources."type-fest-0.10.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
       (sources."has-ansi-2.0.0" // {
@@ -114109,7 +114578,7 @@ in
       sources."js-tokens-4.0.0"
       sources."json-buffer-3.0.1"
       sources."json-parse-even-better-errors-2.3.1"
-      sources."keyv-4.1.1"
+      sources."keyv-4.2.1"
       sources."kind-of-6.0.3"
       sources."latest-version-5.1.0"
       sources."lines-and-columns-1.2.4"
@@ -114400,10 +114869,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "8.5.5";
+    version = "8.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-8.5.5.tgz";
-      sha512 = "a1vl26nokCNlD+my/iNYmOUPx/hpYR4ZyZk8gb7/A2XXtrPZf2gTSJOnVjS77jQS+BSfIVQpipZwXWCL0+5wzg==";
+      url = "https://registry.npmjs.org/npm/-/npm-8.6.0.tgz";
+      sha512 = "icekvN8FJFESIFkLaFEVl05Nocl5Id5HnoVhJzhCUvtNY8tj9kfUlH/J527fZq/8ltsAUqpettfutwRjQYS2fA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -114418,10 +114887,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "12.5.4";
+    version = "12.5.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.4.tgz";
-      sha512 = "4+27zaTdieWgvPLaCZ/A6Q2WC1cYVcrc2SqVmLFYgkWBrKw1QkwpeV16FSvkFGZr3OdFyr7Dpjw8JRn4H2QxFw==";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.7.tgz";
+      sha512 = "WDkqPBevmgphV1UH3FImsDEpTAq2UFvnMZC3GdXPknE2VL701kfKylnae8IA9ZeYfm/uU0249N9gjMXqA/9y3w==";
     };
     dependencies = [
       sources."@gar/promisify-1.1.3"
@@ -114429,11 +114898,7 @@ in
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
       sources."@npmcli/fs-2.1.0"
-      (sources."@npmcli/git-3.0.0" // {
-        dependencies = [
-          sources."lru-cache-7.7.1"
-        ];
-      })
+      sources."@npmcli/git-3.0.0"
       sources."@npmcli/installed-package-contents-1.0.7"
       sources."@npmcli/move-file-1.1.2"
       sources."@npmcli/node-gyp-1.0.3"
@@ -114458,12 +114923,8 @@ in
       sources."brace-expansion-2.0.1"
       sources."braces-3.0.2"
       sources."buffer-from-1.1.2"
-      sources."builtins-1.0.3"
-      (sources."cacache-16.0.3" // {
-        dependencies = [
-          sources."lru-cache-7.7.1"
-        ];
-      })
+      sources."builtins-5.0.0"
+      sources."cacache-16.0.3"
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
           sources."get-stream-5.2.0"
@@ -114513,7 +114974,7 @@ in
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
-      sources."gauge-4.0.3"
+      sources."gauge-4.0.4"
       sources."get-stdin-8.0.0"
       sources."get-stream-4.1.0"
       (sources."glob-7.2.0" // {
@@ -114530,12 +114991,12 @@ in
       })
       sources."globby-11.1.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-unicode-2.0.1"
       sources."has-yarn-2.1.0"
-      sources."hosted-git-info-4.1.0"
+      sources."hosted-git-info-5.0.0"
       sources."http-cache-semantics-4.1.0"
       sources."http-proxy-agent-5.0.0"
       sources."https-proxy-agent-5.0.0"
@@ -114593,15 +115054,15 @@ in
       sources."locate-path-6.0.0"
       sources."lodash-4.17.21"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-7.7.3"
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
-      (sources."make-fetch-happen-10.1.0" // {
+      (sources."make-fetch-happen-10.1.2" // {
         dependencies = [
-          sources."lru-cache-7.7.1"
+          sources."ssri-9.0.0"
         ];
       })
       sources."merge2-1.4.1"
@@ -114622,24 +115083,14 @@ in
       sources."negotiator-0.6.3"
       sources."node-gyp-9.0.0"
       sources."nopt-5.0.0"
-      (sources."normalize-package-data-4.0.0" // {
-        dependencies = [
-          sources."hosted-git-info-5.0.0"
-          sources."lru-cache-7.7.1"
-        ];
-      })
+      sources."normalize-package-data-4.0.0"
       sources."normalize-url-4.5.1"
       sources."npm-bundled-1.1.2"
-      sources."npm-install-checks-4.0.0"
+      sources."npm-install-checks-5.0.0"
       sources."npm-normalize-package-bin-1.0.1"
-      (sources."npm-package-arg-9.0.1" // {
-        dependencies = [
-          sources."hosted-git-info-5.0.0"
-          sources."lru-cache-7.7.1"
-        ];
-      })
+      sources."npm-package-arg-9.0.2"
       sources."npm-packlist-4.0.0"
-      sources."npm-pick-manifest-7.0.0"
+      sources."npm-pick-manifest-7.0.1"
       sources."npm-registry-fetch-13.1.0"
       sources."npmlog-6.0.1"
       sources."once-1.4.0"
@@ -114660,7 +115111,7 @@ in
       sources."path-type-4.0.0"
       sources."picomatch-2.3.1"
       sources."prepend-http-2.0.0"
-      sources."proc-log-2.0.0"
+      sources."proc-log-2.0.1"
       sources."progress-2.0.3"
       sources."promise-inflight-1.0.1"
       sources."promise-retry-2.0.1"
@@ -114669,7 +115120,7 @@ in
       sources."pupa-2.1.1"
       sources."queue-microtask-1.2.3"
       sources."rc-1.2.8"
-      sources."rc-config-loader-4.0.0"
+      sources."rc-config-loader-4.1.0"
       sources."read-package-json-5.0.0"
       sources."read-package-json-fast-2.0.3"
       sources."readable-stream-3.6.0"
@@ -114684,7 +115135,11 @@ in
       sources."run-parallel-1.2.0"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.3.5"
+      (sources."semver-7.3.5" // {
+        dependencies = [
+          sources."lru-cache-6.0.0"
+        ];
+      })
       (sources."semver-diff-3.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -114723,7 +115178,7 @@ in
       sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
       sources."validate-npm-package-license-3.0.4"
-      sources."validate-npm-package-name-3.0.0"
+      sources."validate-npm-package-name-4.0.0"
       sources."which-2.0.2"
       sources."wide-align-1.1.5"
       sources."widest-line-3.1.0"
@@ -114828,7 +115283,7 @@ in
           sources."mkdirp-0.5.6"
         ];
       })
-      sources."gauge-4.0.3"
+      sources."gauge-4.0.4"
       sources."getpass-0.1.7"
       sources."glob-7.2.0"
       sources."graceful-fs-2.0.3"
@@ -115303,7 +115758,7 @@ in
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -115385,7 +115840,7 @@ in
       sources."cssstyle-1.4.0"
       sources."dashdash-1.14.1"
       sources."data-urls-1.1.0"
-      sources."deasync-0.1.24"
+      sources."deasync-0.1.26"
       sources."debug-4.3.4"
       sources."decode-uri-component-0.2.0"
       sources."deep-is-0.1.4"
@@ -115440,7 +115895,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.96"
+      sources."electron-to-chromium-1.4.103"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -115450,7 +115905,7 @@ in
       sources."entities-2.2.0"
       sources."envinfo-7.8.1"
       sources."error-ex-1.3.2"
-      (sources."es-abstract-1.19.1" // {
+      (sources."es-abstract-1.19.2" // {
         dependencies = [
           sources."object-inspect-1.12.0"
         ];
@@ -115512,7 +115967,7 @@ in
       })
       sources."glob-to-regexp-0.3.0"
       sources."globals-11.12.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."grapheme-breaker-0.3.2"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -115604,12 +116059,12 @@ in
       sources."is-html-1.1.0"
       sources."is-negative-zero-2.0.2"
       sources."is-number-3.0.0"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-obj-2.0.0"
       sources."is-plain-object-2.0.4"
       sources."is-regex-1.1.4"
       sources."is-resolvable-1.1.0"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-typedarray-1.0.0"
@@ -115809,7 +116264,7 @@ in
       sources."postcss-ordered-values-4.1.2"
       sources."postcss-reduce-initial-4.0.3"
       sources."postcss-reduce-transforms-4.0.2"
-      sources."postcss-selector-parser-6.0.9"
+      sources."postcss-selector-parser-6.0.10"
       sources."postcss-svgo-4.0.3"
       sources."postcss-unique-selectors-4.0.1"
       sources."postcss-value-parser-3.3.1"
@@ -115903,7 +116358,7 @@ in
           sources."ms-2.1.3"
         ];
       })
-      sources."serialize-to-js-3.1.1"
+      sources."serialize-to-js-3.1.2"
       sources."serve-static-1.15.0"
       sources."set-value-2.0.1"
       sources."setimmediate-1.0.5"
@@ -116081,10 +116536,10 @@ in
   parcel = nodeEnv.buildNodePackage {
     name = "parcel";
     packageName = "parcel";
-    version = "2.4.0";
+    version = "2.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/parcel/-/parcel-2.4.0.tgz";
-      sha512 = "dPWpu4RnxG9HqiLvaF8COEWEnT/KrigrC6PyPaQ0zEgpBfp7/jzXZFBVaZk2N+lpvrbNEYMjN9bv5UQGJJszIw==";
+      url = "https://registry.npmjs.org/parcel/-/parcel-2.4.1.tgz";
+      sha512 = "H8n7cJ0rOt0AZZLuPuG6hvujUWiWz8kxx4pkqEDm31dijrbKb0pNgccXOllQ34em6r7elv6yH7lxox8jDCp0hw==";
     };
     dependencies = [
       sources."@babel/code-frame-7.16.7"
@@ -116094,78 +116549,78 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@parcel/bundler-default-2.4.0"
-      sources."@parcel/cache-2.4.0"
-      sources."@parcel/codeframe-2.4.0"
-      sources."@parcel/compressor-raw-2.4.0"
-      sources."@parcel/config-default-2.4.0"
-      sources."@parcel/core-2.4.0"
-      sources."@parcel/css-1.7.3"
-      sources."@parcel/css-darwin-arm64-1.7.3"
-      sources."@parcel/css-darwin-x64-1.7.3"
-      sources."@parcel/css-linux-arm-gnueabihf-1.7.3"
-      sources."@parcel/css-linux-arm64-gnu-1.7.3"
-      sources."@parcel/css-linux-arm64-musl-1.7.3"
-      sources."@parcel/css-linux-x64-gnu-1.7.3"
-      sources."@parcel/css-linux-x64-musl-1.7.3"
-      sources."@parcel/css-win32-x64-msvc-1.7.3"
-      sources."@parcel/diagnostic-2.4.0"
-      sources."@parcel/events-2.4.0"
-      sources."@parcel/fs-2.4.0"
-      sources."@parcel/fs-search-2.4.0"
-      sources."@parcel/graph-2.4.0"
-      sources."@parcel/hash-2.4.0"
-      sources."@parcel/logger-2.4.0"
-      sources."@parcel/markdown-ansi-2.4.0"
-      sources."@parcel/namer-default-2.4.0"
-      sources."@parcel/node-resolver-core-2.4.0"
-      sources."@parcel/optimizer-css-2.4.0"
-      sources."@parcel/optimizer-htmlnano-2.4.0"
-      sources."@parcel/optimizer-image-2.4.0"
-      sources."@parcel/optimizer-svgo-2.4.0"
-      sources."@parcel/optimizer-terser-2.4.0"
-      sources."@parcel/package-manager-2.4.0"
-      sources."@parcel/packager-css-2.4.0"
-      sources."@parcel/packager-html-2.4.0"
-      sources."@parcel/packager-js-2.4.0"
-      sources."@parcel/packager-raw-2.4.0"
-      sources."@parcel/packager-svg-2.4.0"
-      sources."@parcel/plugin-2.4.0"
-      sources."@parcel/reporter-cli-2.4.0"
-      sources."@parcel/reporter-dev-server-2.4.0"
-      sources."@parcel/resolver-default-2.4.0"
-      sources."@parcel/runtime-browser-hmr-2.4.0"
-      sources."@parcel/runtime-js-2.4.0"
-      sources."@parcel/runtime-react-refresh-2.4.0"
-      sources."@parcel/runtime-service-worker-2.4.0"
+      sources."@parcel/bundler-default-2.4.1"
+      sources."@parcel/cache-2.4.1"
+      sources."@parcel/codeframe-2.4.1"
+      sources."@parcel/compressor-raw-2.4.1"
+      sources."@parcel/config-default-2.4.1"
+      sources."@parcel/core-2.4.1"
+      sources."@parcel/css-1.7.4"
+      sources."@parcel/css-darwin-arm64-1.7.4"
+      sources."@parcel/css-darwin-x64-1.7.4"
+      sources."@parcel/css-linux-arm-gnueabihf-1.7.4"
+      sources."@parcel/css-linux-arm64-gnu-1.7.4"
+      sources."@parcel/css-linux-arm64-musl-1.7.4"
+      sources."@parcel/css-linux-x64-gnu-1.7.4"
+      sources."@parcel/css-linux-x64-musl-1.7.4"
+      sources."@parcel/css-win32-x64-msvc-1.7.4"
+      sources."@parcel/diagnostic-2.4.1"
+      sources."@parcel/events-2.4.1"
+      sources."@parcel/fs-2.4.1"
+      sources."@parcel/fs-search-2.4.1"
+      sources."@parcel/graph-2.4.1"
+      sources."@parcel/hash-2.4.1"
+      sources."@parcel/logger-2.4.1"
+      sources."@parcel/markdown-ansi-2.4.1"
+      sources."@parcel/namer-default-2.4.1"
+      sources."@parcel/node-resolver-core-2.4.1"
+      sources."@parcel/optimizer-css-2.4.1"
+      sources."@parcel/optimizer-htmlnano-2.4.1"
+      sources."@parcel/optimizer-image-2.4.1"
+      sources."@parcel/optimizer-svgo-2.4.1"
+      sources."@parcel/optimizer-terser-2.4.1"
+      sources."@parcel/package-manager-2.4.1"
+      sources."@parcel/packager-css-2.4.1"
+      sources."@parcel/packager-html-2.4.1"
+      sources."@parcel/packager-js-2.4.1"
+      sources."@parcel/packager-raw-2.4.1"
+      sources."@parcel/packager-svg-2.4.1"
+      sources."@parcel/plugin-2.4.1"
+      sources."@parcel/reporter-cli-2.4.1"
+      sources."@parcel/reporter-dev-server-2.4.1"
+      sources."@parcel/resolver-default-2.4.1"
+      sources."@parcel/runtime-browser-hmr-2.4.1"
+      sources."@parcel/runtime-js-2.4.1"
+      sources."@parcel/runtime-react-refresh-2.4.1"
+      sources."@parcel/runtime-service-worker-2.4.1"
       sources."@parcel/source-map-2.0.2"
-      sources."@parcel/transformer-babel-2.4.0"
-      sources."@parcel/transformer-css-2.4.0"
-      (sources."@parcel/transformer-html-2.4.0" // {
+      sources."@parcel/transformer-babel-2.4.1"
+      sources."@parcel/transformer-css-2.4.1"
+      (sources."@parcel/transformer-html-2.4.1" // {
         dependencies = [
           sources."posthtml-parser-0.10.2"
         ];
       })
-      sources."@parcel/transformer-image-2.4.0"
-      sources."@parcel/transformer-js-2.4.0"
-      sources."@parcel/transformer-json-2.4.0"
-      sources."@parcel/transformer-postcss-2.4.0"
-      (sources."@parcel/transformer-posthtml-2.4.0" // {
+      sources."@parcel/transformer-image-2.4.1"
+      sources."@parcel/transformer-js-2.4.1"
+      sources."@parcel/transformer-json-2.4.1"
+      sources."@parcel/transformer-postcss-2.4.1"
+      (sources."@parcel/transformer-posthtml-2.4.1" // {
         dependencies = [
           sources."posthtml-parser-0.10.2"
         ];
       })
-      sources."@parcel/transformer-raw-2.4.0"
-      sources."@parcel/transformer-react-refresh-wrap-2.4.0"
-      (sources."@parcel/transformer-svg-2.4.0" // {
+      sources."@parcel/transformer-raw-2.4.1"
+      sources."@parcel/transformer-react-refresh-wrap-2.4.1"
+      (sources."@parcel/transformer-svg-2.4.1" // {
         dependencies = [
           sources."posthtml-parser-0.10.2"
         ];
       })
-      sources."@parcel/types-2.4.0"
-      sources."@parcel/utils-2.4.0"
+      sources."@parcel/types-2.4.1"
+      sources."@parcel/utils-2.4.1"
       sources."@parcel/watcher-2.0.5"
-      sources."@parcel/workers-2.4.0"
+      sources."@parcel/workers-2.4.1"
       sources."@swc/helpers-0.3.8"
       sources."@trysound/sax-0.2.0"
       sources."@types/parse-json-4.0.0"
@@ -116177,7 +116632,7 @@ in
       sources."browserslist-4.20.2"
       sources."buffer-from-1.1.2"
       sources."callsites-3.1.0"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       (sources."chalk-4.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -116193,9 +116648,9 @@ in
       sources."color-name-1.1.3"
       sources."commander-7.2.0"
       sources."cosmiconfig-7.0.1"
-      sources."css-select-4.2.1"
+      sources."css-select-4.3.0"
       sources."css-tree-1.1.3"
-      sources."css-what-5.1.0"
+      sources."css-what-6.1.0"
       sources."csso-4.2.0"
       sources."detect-libc-1.0.3"
       (sources."dom-serializer-1.3.2" // {
@@ -116208,7 +116663,7 @@ in
       sources."domutils-2.8.0"
       sources."dotenv-7.0.0"
       sources."dotenv-expand-5.1.0"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-to-chromium-1.4.103"
       sources."entities-3.0.1"
       sources."error-ex-1.3.2"
       sources."escalade-3.1.1"
@@ -116216,7 +116671,7 @@ in
       sources."get-port-4.2.0"
       sources."globals-13.13.0"
       sources."has-flag-3.0.0"
-      sources."htmlnano-2.0.0"
+      sources."htmlnano-2.0.1"
       sources."htmlparser2-7.2.0"
       sources."import-fresh-3.3.0"
       sources."is-arrayish-0.2.1"
@@ -116229,10 +116684,20 @@ in
       sources."lmdb-2.2.4"
       sources."mdn-data-2.0.14"
       sources."msgpackr-1.5.5"
-      sources."msgpackr-extract-1.0.16"
+      (sources."msgpackr-extract-1.1.0" // {
+        dependencies = [
+          sources."node-gyp-build-git://github.com/kriszyp/node-gyp-build#optional-packages"
+        ];
+      })
+      sources."msgpackr-extract-darwin-arm64-1.1.0"
+      sources."msgpackr-extract-darwin-x64-1.1.0"
+      sources."msgpackr-extract-linux-arm-1.1.0"
+      sources."msgpackr-extract-linux-arm64-1.1.0"
+      sources."msgpackr-extract-linux-x64-1.1.0"
+      sources."msgpackr-extract-win32-x64-1.1.0"
       sources."nan-2.15.0"
       sources."node-addon-api-3.2.1"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       sources."node-releases-2.0.2"
       sources."nth-check-2.0.1"
       sources."nullthrows-1.1.1"
@@ -116400,7 +116865,7 @@ in
       sources."get-intrinsic-1.1.1"
       sources."getpass-0.1.7"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."handlebars-4.7.7"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -116446,7 +116911,7 @@ in
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
       sources."mkdirp-0.5.6"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."ms-2.0.0"
       sources."msgpack5-3.6.1"
       sources."mv-2.1.1"
@@ -116602,7 +117067,7 @@ in
       sources."fs-extra-7.0.1"
       sources."fs.realpath-1.0.0"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-flag-3.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -116747,7 +117212,7 @@ in
       sources."get-intrinsic-1.1.1"
       sources."get-stdin-4.0.1"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
@@ -117009,7 +117474,7 @@ in
       sources."blob-0.0.5"
       sources."bn.js-4.12.0"
       sources."bncode-0.5.3"
-      sources."body-parser-1.19.2"
+      sources."body-parser-1.20.0"
       sources."brace-expansion-1.1.11"
       sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
@@ -117020,6 +117485,7 @@ in
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.2"
       sources."bytes-3.1.2"
+      sources."call-bind-1.0.2"
       sources."caseless-0.12.0"
       sources."chrome-dgram-3.0.6"
       sources."chrome-dns-1.0.1"
@@ -117037,9 +117503,12 @@ in
       sources."concat-map-0.0.1"
       (sources."connect-multiparty-2.2.0" // {
         dependencies = [
+          sources."depd-1.1.2"
           sources."http-errors-1.7.3"
+          sources."on-finished-2.3.0"
           sources."qs-6.5.3"
           sources."setprototypeof-1.1.1"
+          sources."statuses-1.5.0"
           sources."toidentifier-1.0.0"
         ];
       })
@@ -117059,8 +117528,8 @@ in
       sources."debug-2.6.9"
       sources."decompress-response-3.3.0"
       sources."delayed-stream-1.0.0"
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
+      sources."depd-2.0.0"
+      sources."destroy-1.2.0"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
@@ -117082,8 +117551,15 @@ in
       sources."events-3.3.0"
       (sources."express-4.17.3" // {
         dependencies = [
+          sources."body-parser-1.19.2"
+          sources."depd-1.1.2"
+          sources."http-errors-1.8.1"
+          sources."on-finished-2.3.0"
+          sources."qs-6.9.7"
+          sources."raw-body-2.4.3"
           sources."safe-buffer-5.2.1"
           sources."serve-static-1.14.2"
+          sources."statuses-1.5.0"
         ];
       })
       sources."extend-3.0.2"
@@ -117091,7 +117567,12 @@ in
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fifo-0.1.4"
-      sources."finalhandler-1.1.2"
+      (sources."finalhandler-1.1.2" // {
+        dependencies = [
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
+        ];
+      })
       sources."flatten-0.0.1"
       sources."fluent-ffmpeg-2.1.2"
       sources."forever-agent-0.6.1"
@@ -117101,20 +117582,24 @@ in
       sources."fs-chunk-store-1.7.0"
       sources."fs-constants-1.0.0"
       sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
       sources."get-browser-rtc-1.1.0"
+      sources."get-intrinsic-1.1.1"
       sources."getpass-0.1.7"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
+      sources."has-1.0.3"
       (sources."has-binary2-1.0.3" // {
         dependencies = [
           sources."isarray-2.0.1"
         ];
       })
       sources."has-cors-1.1.0"
+      sources."has-symbols-1.0.3"
       sources."hat-0.0.3"
-      sources."http-errors-1.8.1"
+      sources."http-errors-2.0.0"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
@@ -117171,19 +117656,23 @@ in
       sources."mkdirp-classic-0.5.3"
       (sources."morgan-1.10.0" // {
         dependencies = [
-          sources."depd-2.0.0"
+          sources."on-finished-2.3.0"
         ];
       })
       sources."ms-2.0.0"
       (sources."multiparty-4.2.3" // {
         dependencies = [
+          sources."depd-1.1.2"
+          sources."http-errors-1.8.1"
           sources."safe-buffer-5.2.1"
+          sources."statuses-1.5.0"
         ];
       })
       sources."negotiator-0.6.3"
       sources."normalize-path-3.0.0"
       sources."oauth-sign-0.9.0"
-      sources."on-finished-2.3.0"
+      sources."object-inspect-1.12.0"
+      sources."on-finished-2.4.1"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."options-0.0.6"
@@ -117213,7 +117702,7 @@ in
       sources."psl-1.8.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
-      sources."qs-6.9.7"
+      sources."qs-6.10.3"
       sources."queue-microtask-1.2.3"
       sources."queue-tick-1.0.0"
       sources."random-access-file-2.2.1"
@@ -117222,7 +117711,7 @@ in
       sources."random-iterate-1.0.1"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
-      sources."raw-body-2.4.3"
+      sources."raw-body-2.5.1"
       sources."re-emitter-1.1.4"
       sources."read-torrent-1.3.1"
       sources."readable-stream-3.6.0"
@@ -117239,21 +117728,22 @@ in
       sources."safer-buffer-2.1.2"
       (sources."send-0.17.2" // {
         dependencies = [
+          sources."depd-1.1.2"
+          sources."destroy-1.0.4"
+          sources."http-errors-1.8.1"
           sources."ms-2.1.3"
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
         ];
       })
       (sources."serve-static-1.15.0" // {
         dependencies = [
-          sources."depd-2.0.0"
-          sources."destroy-1.2.0"
-          sources."http-errors-2.0.0"
           sources."ms-2.1.3"
-          sources."on-finished-2.4.1"
           sources."send-0.18.0"
-          sources."statuses-2.0.1"
         ];
       })
       sources."setprototypeof-1.2.0"
+      sources."side-channel-1.0.4"
       sources."simple-concat-1.0.1"
       sources."simple-get-2.8.2"
       (sources."simple-peer-6.4.4" // {
@@ -117293,7 +117783,7 @@ in
       })
       sources."speedometer-0.1.4"
       sources."sshpk-1.17.0"
-      sources."statuses-1.5.0"
+      sources."statuses-2.0.1"
       (sources."string2compact-1.3.2" // {
         dependencies = [
           sources."ipaddr.js-2.0.1"
@@ -117354,10 +117844,10 @@ in
   pkg = nodeEnv.buildNodePackage {
     name = "pkg";
     packageName = "pkg";
-    version = "5.5.2";
+    version = "5.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pkg/-/pkg-5.5.2.tgz";
-      sha512 = "pD0UB2ud01C6pVv2wpGsTYJrXI/bnvGRYvMLd44wFzA1p+A2jrlTGFPAYa7YEYzmitXhx23PqalaG1eUEnSwcA==";
+      url = "https://registry.npmjs.org/pkg/-/pkg-5.6.0.tgz";
+      sha512 = "mHrAVSQWmHA41RnUmRpC7pK9lNnMfdA16CF3cqOI22a8LZxOQzF7M8YWtA2nfs+d7I0MTDXOtkDsAsFXeCpYjg==";
     };
     dependencies = [
       sources."@babel/helper-validator-identifier-7.16.7"
@@ -117424,7 +117914,7 @@ in
       sources."github-from-package-0.0.0"
       sources."glob-parent-5.1.2"
       sources."globby-11.1.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-unicode-2.0.1"
@@ -117470,7 +117960,7 @@ in
       sources."path-parse-1.0.7"
       sources."path-type-4.0.0"
       sources."picomatch-2.3.1"
-      sources."pkg-fetch-3.2.6"
+      sources."pkg-fetch-3.3.0"
       sources."prebuild-install-6.1.4"
       sources."prelude-ls-1.1.2"
       sources."process-nextick-args-2.0.1"
@@ -117645,7 +118135,7 @@ in
       sources."git-sha1-0.1.2"
       sources."glob-7.2.0"
       sources."glob-parent-5.1.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."http-errors-2.0.0"
@@ -117774,10 +118264,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "6.32.3";
+    version = "6.32.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-6.32.3.tgz";
-      sha512 = "lMQgROSwiUA+kt+suAPinjNwqevS1Iz0rppWNZ3jHhzeP07RFRQ+Ksai2OlAnM+YjlbHT9niQ4ICBVSqcdQ04w==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-6.32.4.tgz";
+      sha512 = "rOG+VpOzs6g/MR5HWc8KTlLAx3ljdRJCMQwSg1DE/hzAaqF/Y2zIHH0u6dZw/XnRb9w1U8rOs9MJT9jMt7e+Qw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -117801,7 +118291,7 @@ in
       sources."commander-2.11.0"
       sources."file-or-stdin-1.0.2"
       sources."get-stdin-5.0.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."inspect-with-kind-1.0.5"
       sources."kind-of-6.0.3"
       sources."poor-mans-t-sql-formatter-1.6.10"
@@ -117826,7 +118316,7 @@ in
       sha512 = "lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==";
     };
     dependencies = [
-      sources."nanoid-3.3.1"
+      sources."nanoid-3.3.2"
       sources."picocolors-1.0.0"
       sources."source-map-js-1.0.2"
     ];
@@ -117875,7 +118365,7 @@ in
       sources."get-stdin-9.0.0"
       sources."glob-parent-5.1.2"
       sources."globby-12.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."ignore-5.2.0"
       sources."is-binary-path-2.1.0"
       sources."is-extglob-2.1.1"
@@ -117891,7 +118381,7 @@ in
       sources."picocolors-1.0.0"
       sources."picomatch-2.3.1"
       sources."pify-2.3.0"
-      sources."postcss-load-config-3.1.3"
+      sources."postcss-load-config-3.1.4"
       sources."postcss-reporter-7.0.5"
       sources."pretty-hrtime-1.0.3"
       sources."queue-microtask-1.2.3"
@@ -118009,10 +118499,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "2.6.1";
+    version = "2.6.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-2.6.1.tgz";
-      sha512 = "8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A==";
+      url = "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz";
+      sha512 = "PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -118042,7 +118532,7 @@ in
       sources."minimist-1.2.6"
       sources."nanolru-1.0.0"
       sources."path-parse-1.0.7"
-      sources."prettier-2.6.1"
+      sources."prettier-2.6.2"
       sources."resolve-1.22.0"
       sources."supports-color-8.1.1"
       sources."supports-preserve-symlinks-flag-1.0.0"
@@ -118084,13 +118574,13 @@ in
   prisma = nodeEnv.buildNodePackage {
     name = "prisma";
     packageName = "prisma";
-    version = "3.11.1";
+    version = "3.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prisma/-/prisma-3.11.1.tgz";
-      sha512 = "aYn8bQwt1xwR2oSsVNHT4PXU7EhsThIwmpNB/MNUaaMx5OPLTro6VdNJe/sJssXFLxhamfWeMjwmpXjljo6xkg==";
+      url = "https://registry.npmjs.org/prisma/-/prisma-3.12.0.tgz";
+      sha512 = "ltCMZAx1i0i9xuPM692Srj8McC665h6E5RqJom999sjtVSccHSD8Z+HSdBN2183h9PJKvC5dapkn78dd0NWMBg==";
     };
     dependencies = [
-      sources."@prisma/engines-3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9"
+      sources."@prisma/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -118105,31 +118595,16 @@ in
   "@prisma/language-server" = nodeEnv.buildNodePackage {
     name = "_at_prisma_slash_language-server";
     packageName = "@prisma/language-server";
-    version = "3.11.0";
+    version = "3.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.11.0.tgz";
-      sha512 = "gH48Ytf2EOtKAM2uDGbGwh/Y3gHIsHigV4nBbnsodbCZpirbbWXxO/L5+sY1nSeU49wnd6GUcQ7dqZCMW+bcaQ==";
+      url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.12.0.tgz";
+      sha512 = "YP22QXvdwCHKmYObWJzmHgFJKJ/g4NDhgJ22vfcOYVRIqu4PanK8XyBtjiKqj4SJMkg1QjhxWkdH+KSA6wQszA==";
     };
     dependencies = [
-      sources."@prisma/prisma-fmt-wasm-3.11.0-48.b371888aaf8f51357c7457d836b86d12da91658b"
+      sources."@prisma/prisma-fmt-wasm-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980"
       sources."@types/js-levenshtein-1.1.1"
-      sources."anymatch-3.1.2"
-      sources."binary-extensions-2.2.0"
-      sources."braces-3.0.2"
-      sources."chokidar-3.5.3"
-      sources."fill-range-7.0.1"
-      sources."fsevents-2.3.2"
-      sources."glob-parent-5.1.2"
-      sources."is-binary-path-2.1.0"
-      sources."is-extglob-2.1.1"
-      sources."is-glob-4.0.3"
-      sources."is-number-7.0.0"
       sources."js-levenshtein-1.1.6"
       sources."klona-2.0.5"
-      sources."normalize-path-3.0.0"
-      sources."picomatch-2.3.1"
-      sources."readdirp-3.6.0"
-      sources."to-regex-range-5.0.1"
       sources."vscode-jsonrpc-6.0.0"
       sources."vscode-languageserver-7.0.0"
       sources."vscode-languageserver-protocol-3.16.0"
@@ -118138,7 +118613,7 @@ in
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Implementation of a language server in Node.";
+      description = "Prisma Language Server";
       homepage = "https://github.com/prisma/language-tools#readme";
       license = "Apache-2.0";
     };
@@ -118299,7 +118774,7 @@ in
           sources."glob-7.1.7"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       (sources."hash-base-3.1.0" // {
         dependencies = [
@@ -118562,7 +119037,7 @@ in
       sources."get-intrinsic-1.1.1"
       sources."get-stream-4.1.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-symbols-1.0.3"
       sources."http-cache-semantics-4.1.0"
@@ -118581,7 +119056,7 @@ in
       sources."lowercase-keys-1.0.1"
       sources."mimic-response-1.0.1"
       sources."minimist-1.2.6"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."ms-2.1.2"
       sources."node-abort-controller-3.0.1"
       sources."normalize-url-4.5.1"
@@ -118631,10 +119106,10 @@ in
   pyright = nodeEnv.buildNodePackage {
     name = "pyright";
     packageName = "pyright";
-    version = "1.1.233";
+    version = "1.1.235";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.233.tgz";
-      sha512 = "qjyKJd6mfXLwaBls4Ww0CmML+K2gA4NnTelxGktLC3JQv7ioWU7lmiQ1KSr1BnmwuuTfsaJSDN3f+hUf9YPfWg==";
+      url = "https://registry.npmjs.org/pyright/-/pyright-1.1.235.tgz";
+      sha512 = "eW40mxHo8WE7WHoBzFfyrH0lQ9nP5rTM5XKvkBgaYjhVafh4MmQeaEm8LmYGN2vUq2//YFLVprvA+U6u+v9i3g==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -118649,10 +119124,10 @@ in
   quicktype = nodeEnv.buildNodePackage {
     name = "quicktype";
     packageName = "quicktype";
-    version = "15.0.260";
+    version = "15.0.261";
     src = fetchurl {
-      url = "https://registry.npmjs.org/quicktype/-/quicktype-15.0.260.tgz";
-      sha512 = "OYP77enVz2UkcdDqVFc2AcFGYjk5/ENGYZHmSEY5Oy6Y2xVatlHUnrScddEkI+xJxSfYS6UXSH8oOTW7mEOiEw==";
+      url = "https://registry.npmjs.org/quicktype/-/quicktype-15.0.261.tgz";
+      sha512 = "y2Se/GFGSeFNfON7X0MEJO8K+Lm23hWEZs5UMP9dVy3ShSYng6HTVw1YmqreUwGCLRGn4jD9TjNB1oqyaT3NBw==";
     };
     dependencies = [
       sources."@mark.probst/typescript-json-schema-0.32.0"
@@ -118745,7 +119220,7 @@ in
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.7"
       sources."npm-run-path-2.0.2"
@@ -118839,7 +119314,7 @@ in
           sources."pako-0.2.9"
         ];
       })
-      sources."urijs-1.19.10"
+      sources."urijs-1.19.11"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."vlq-0.2.3"
@@ -118897,7 +119372,7 @@ in
       sources."cycle-1.0.3"
       sources."deep-equal-2.0.5"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-get-iterator-1.1.2"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -118924,10 +119399,10 @@ in
       sources."is-date-object-1.0.5"
       sources."is-map-2.0.2"
       sources."is-negative-zero-2.0.2"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-regex-1.1.4"
       sources."is-set-2.0.2"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-typed-array-1.1.8"
@@ -119324,7 +119799,7 @@ in
       sources."camel-case-3.0.0"
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       sources."case-sensitive-paths-webpack-plugin-2.4.0"
       sources."caw-2.0.1"
       sources."chalk-2.4.2"
@@ -119554,7 +120029,7 @@ in
       sources."duplexify-3.7.1"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-to-chromium-1.4.103"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -119585,7 +120060,7 @@ in
       sources."entities-2.2.0"
       sources."errno-0.1.8"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-to-primitive-1.2.1"
       sources."escalade-3.1.1"
       sources."escape-html-1.0.3"
@@ -119724,7 +120199,7 @@ in
           sources."pify-3.0.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."gud-1.0.0"
       sources."gunzip-maybe-1.4.2"
       sources."gzip-size-5.1.1"
@@ -119865,7 +120340,7 @@ in
       sources."is-natural-number-4.0.1"
       sources."is-negative-zero-2.0.2"
       sources."is-number-7.0.0"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-obj-2.0.0"
       sources."is-object-1.0.2"
       sources."is-path-cwd-2.2.0"
@@ -119876,7 +120351,7 @@ in
       sources."is-regex-1.1.4"
       sources."is-resolvable-1.1.0"
       sources."is-retry-allowed-1.2.0"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-stream-1.1.0"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
@@ -120213,7 +120688,7 @@ in
           sources."postcss-value-parser-3.3.1"
         ];
       })
-      sources."postcss-selector-parser-6.0.9"
+      sources."postcss-selector-parser-6.0.10"
       (sources."postcss-svgo-4.0.3" // {
         dependencies = [
           sources."postcss-value-parser-3.3.1"
@@ -120290,8 +120765,8 @@ in
       (sources."renderkid-2.0.7" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
-          sources."css-select-4.2.1"
-          sources."css-what-5.1.0"
+          sources."css-select-4.3.0"
+          sources."css-what-6.1.0"
           sources."dom-serializer-1.3.2"
           sources."domelementtype-2.2.0"
           sources."domutils-2.8.0"
@@ -120789,7 +121264,7 @@ in
       sources."esprima-3.1.3"
       sources."esprima-fb-13001.1001.0-dev-harmony-fb"
       sources."glob-5.0.15"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."iconv-lite-0.4.24"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -120926,10 +121401,10 @@ in
   redoc-cli = nodeEnv.buildNodePackage {
     name = "redoc-cli";
     packageName = "redoc-cli";
-    version = "0.13.9";
+    version = "0.13.10";
     src = fetchurl {
-      url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.9.tgz";
-      sha512 = "RoUonPhAQeEpg6lCJyi7Oha5iYPNFhAN2lFWzc3biLigJCTh6JDwPHlomfLMrwkri6bz8W3vVEtEqQ1RLaxMJQ==";
+      url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.10.tgz";
+      sha512 = "txYchKO6rpXJapD6Kg/Vd6mEg3ZJDz+TLCev8dvj8cGQxiSZDJ/V/x3uRfg03EH5FrC71kHC4ETI97MUlye9NQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.16.7"
@@ -120958,7 +121433,7 @@ in
       sources."@emotion/unitless-0.7.5"
       sources."@exodus/schemasafe-1.0.0-rc.6"
       sources."@redocly/ajv-8.6.4"
-      sources."@redocly/openapi-core-1.0.0-beta.90"
+      sources."@redocly/openapi-core-1.0.0-beta.93"
       sources."@redocly/react-dropdown-aria-2.0.12"
       sources."@types/json-schema-7.0.11"
       sources."@types/node-14.18.12"
@@ -121132,7 +121607,7 @@ in
       sources."perfect-scrollbar-1.5.5"
       sources."picomatch-2.3.1"
       sources."pluralize-8.0.0"
-      sources."polished-4.1.4"
+      sources."polished-4.2.1"
       sources."postcss-value-parser-4.2.0"
       sources."prismjs-1.27.0"
       sources."process-0.11.10"
@@ -121161,7 +121636,7 @@ in
         ];
       })
       sources."readdirp-3.6.0"
-      (sources."redoc-2.0.0-rc.65" // {
+      (sources."redoc-2.0.0-rc.66" // {
         dependencies = [
           sources."path-browserify-1.0.1"
         ];
@@ -121285,7 +121760,7 @@ in
       sources."figures-3.2.0"
       sources."find-up-2.1.0"
       sources."function-bind-1.1.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."hosted-git-info-2.8.9"
@@ -121513,7 +121988,7 @@ in
       sources."glob-parent-5.1.2"
       sources."global-dirs-3.0.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
       sources."highlight.js-10.7.2"
@@ -121767,14 +122242,14 @@ in
       sources."@types/json-schema-7.0.11"
       sources."@types/node-14.17.34"
       sources."@types/vscode-1.63.2"
-      sources."@typescript-eslint/eslint-plugin-5.16.0"
-      sources."@typescript-eslint/parser-5.16.0"
-      sources."@typescript-eslint/scope-manager-5.16.0"
-      sources."@typescript-eslint/type-utils-5.16.0"
-      sources."@typescript-eslint/types-5.16.0"
-      sources."@typescript-eslint/typescript-estree-5.16.0"
-      sources."@typescript-eslint/utils-5.16.0"
-      sources."@typescript-eslint/visitor-keys-5.16.0"
+      sources."@typescript-eslint/eslint-plugin-5.18.0"
+      sources."@typescript-eslint/parser-5.18.0"
+      sources."@typescript-eslint/scope-manager-5.18.0"
+      sources."@typescript-eslint/type-utils-5.18.0"
+      sources."@typescript-eslint/types-5.18.0"
+      sources."@typescript-eslint/typescript-estree-5.18.0"
+      sources."@typescript-eslint/utils-5.18.0"
+      sources."@typescript-eslint/visitor-keys-5.18.0"
       sources."@vscode/test-electron-2.1.3"
       sources."acorn-8.7.0"
       sources."acorn-jsx-5.3.2"
@@ -121809,7 +122284,7 @@ in
       sources."chainsaw-0.1.0"
       sources."chalk-4.1.2"
       sources."cheerio-1.0.0-rc.10"
-      sources."cheerio-select-1.5.0"
+      sources."cheerio-select-1.6.0"
       sources."chownr-1.1.4"
       sources."cliui-7.0.4"
       sources."code-point-at-1.1.0"
@@ -121821,14 +122296,14 @@ in
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.3"
       sources."cross-spawn-7.0.3"
-      sources."css-select-4.2.1"
-      sources."css-what-5.1.0"
-      sources."d3-7.3.0"
-      sources."d3-array-3.1.1"
+      sources."css-select-4.3.0"
+      sources."css-what-6.1.0"
+      sources."d3-7.4.2"
+      sources."d3-array-3.1.4"
       sources."d3-axis-3.0.0"
       sources."d3-brush-3.0.0"
       sources."d3-chord-3.0.1"
-      sources."d3-color-3.0.1"
+      sources."d3-color-3.1.0"
       sources."d3-contour-3.0.1"
       sources."d3-delaunay-6.0.2"
       sources."d3-dispatch-3.0.1"
@@ -121854,7 +122329,7 @@ in
           sources."d3-zoom-2.0.0"
         ];
       })
-      sources."d3-hierarchy-3.1.1"
+      sources."d3-hierarchy-3.1.2"
       sources."d3-interpolate-3.0.1"
       sources."d3-path-3.0.1"
       sources."d3-polygon-3.0.1"
@@ -121958,7 +122433,7 @@ in
       sources."glob-parent-5.1.2"
       sources."globals-13.13.0"
       sources."globby-11.1.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-symbols-1.0.3"
@@ -122153,7 +122628,7 @@ in
     dependencies = [
       sources."find-up-5.0.0"
       sources."locate-path-6.0.0"
-      sources."nanoid-3.3.1"
+      sources."nanoid-3.3.2"
       sources."p-limit-3.1.0"
       sources."p-locate-5.0.0"
       sources."path-exists-4.0.0"
@@ -122272,10 +122747,10 @@ in
   sass = nodeEnv.buildNodePackage {
     name = "sass";
     packageName = "sass";
-    version = "1.49.9";
+    version = "1.49.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz";
-      sha512 = "YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==";
+      url = "https://registry.npmjs.org/sass/-/sass-1.49.11.tgz";
+      sha512 = "wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ==";
     };
     dependencies = [
       sources."anymatch-3.1.2"
@@ -122452,10 +122927,10 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "3.10.0";
+    version = "3.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-3.10.0.tgz";
-      sha512 = "2bRpqJFrejlN0hIrTnFQKV/MejUF8lZSRfULBqdUG4emwrUiTzZSerYdUVifHvhvIEcno6GeTbMs1xwQrCb2fw==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-3.11.0.tgz";
+      sha512 = "v4yfKOK46ri12TkiuNfUrLo+PrfR4BI9WkrUxPF66Cst7Kdu1RH0qiCA6Gxpibauox++gnbxCdgoJ+XKw9nv1g==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
@@ -122464,7 +122939,7 @@ in
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
-      sources."@serverless/dashboard-plugin-6.2.0"
+      sources."@serverless/dashboard-plugin-6.2.1"
       sources."@serverless/event-mocks-1.1.1"
       (sources."@serverless/platform-client-4.3.2" // {
         dependencies = [
@@ -122481,8 +122956,9 @@ in
       sources."@tokenizer/token-0.3.0"
       sources."@types/cacheable-request-6.0.2"
       sources."@types/http-cache-semantics-4.0.1"
+      sources."@types/json-buffer-3.0.0"
       sources."@types/keyv-3.1.4"
-      sources."@types/lodash-4.14.180"
+      sources."@types/lodash-4.14.181"
       sources."@types/node-17.0.23"
       sources."@types/responselike-1.0.0"
       sources."adm-zip-0.5.9"
@@ -122509,7 +122985,7 @@ in
       sources."async-3.2.3"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.1101.0" // {
+      (sources."aws-sdk-2.1108.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -122555,9 +123031,9 @@ in
       sources."chokidar-3.5.3"
       sources."chownr-2.0.0"
       sources."ci-info-3.3.0"
-      sources."cli-color-2.0.1"
+      sources."cli-color-2.0.2"
       sources."cli-cursor-3.1.0"
-      sources."cli-progress-footer-2.3.0"
+      sources."cli-progress-footer-2.3.1"
       sources."cli-spinners-2.6.1"
       (sources."cli-sprintf-format-1.1.1" // {
         dependencies = [
@@ -122572,6 +123048,7 @@ in
       sources."combined-stream-1.0.8"
       sources."commander-2.20.3"
       sources."component-emitter-1.3.0"
+      sources."compress-brotli-1.3.6"
       (sources."compress-commons-4.1.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -122585,7 +123062,7 @@ in
       })
       sources."cookiejar-2.1.3"
       sources."core-util-is-1.0.3"
-      sources."crc-32-1.2.1"
+      sources."crc-32-1.2.2"
       (sources."crc32-stream-4.0.2" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -122665,7 +123142,6 @@ in
       sources."essentials-1.2.0"
       sources."event-emitter-0.3.5"
       sources."events-1.1.1"
-      sources."exit-on-epipe-1.0.1"
       sources."ext-1.6.0"
       sources."ext-list-2.2.2"
       sources."ext-name-5.0.0"
@@ -122701,7 +123177,7 @@ in
       sources."glob-parent-5.1.2"
       sources."globby-11.1.0"
       sources."got-11.8.3"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."graphlib-2.1.8"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -122749,9 +123225,9 @@ in
       })
       sources."json-schema-traverse-1.0.0"
       sources."jsonfile-6.1.0"
-      sources."jszip-3.7.1"
+      sources."jszip-3.9.0"
       sources."jwt-decode-2.2.0"
-      sources."keyv-4.1.1"
+      sources."keyv-4.2.1"
       sources."lazystream-1.0.1"
       sources."lie-3.3.0"
       sources."lodash-4.17.21"
@@ -122819,7 +123295,6 @@ in
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
-      sources."printj-1.3.1"
       sources."process-nextick-args-2.0.1"
       sources."process-utils-4.0.0"
       sources."promise-queue-2.2.5"
@@ -122856,7 +123331,7 @@ in
       sources."shebang-regex-1.0.0"
       sources."side-channel-1.0.4"
       sources."signal-exit-3.0.7"
-      sources."simple-git-3.4.0"
+      sources."simple-git-3.5.0"
       sources."slash-3.0.0"
       sources."sort-keys-1.1.2"
       sources."sort-keys-length-1.0.1"
@@ -123270,7 +123745,7 @@ in
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."get-value-2.0.6"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."graceful-readlink-1.0.1"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
@@ -123575,10 +124050,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.884.0";
+    version = "1.895.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.884.0.tgz";
-      sha512 = "lQtXRoi0mgTsrjzTcKNbpec+q4ai8rhls1FOcr2ZBTe7V7mKTGXZ9yk6DY2VXRKyboL8zvV3rIrzm+l85n5yIg==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.895.0.tgz";
+      sha512 = "8/1P6Hx5aiDzTYKCC+yPg5ZhKf4gflodohaQc8/852ftUkCZ58UJopaYkiBTXbN51OTLRIK/TLGfPY0DpVUe+w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -123874,7 +124349,7 @@ in
       sources."binary-search-1.3.6"
       sources."binary-search-bounds-2.0.5"
       sources."bindings-1.5.0"
-      sources."bipf-1.5.5"
+      sources."bipf-1.6.1"
       sources."blake2s-1.1.0"
       sources."brace-expansion-1.1.11"
       sources."braces-1.8.5"
@@ -123980,7 +124455,7 @@ in
       })
       sources."epidemic-broadcast-trees-7.0.0"
       sources."errno-0.1.8"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       (sources."es-get-iterator-1.1.2" // {
         dependencies = [
           sources."isarray-2.0.5"
@@ -124058,7 +124533,7 @@ in
       sources."glob-parent-2.0.0"
       sources."globby-4.1.0"
       sources."gossip-query-2.0.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-bigints-1.0.1"
@@ -124132,7 +124607,7 @@ in
       sources."is-map-2.0.2"
       sources."is-negative-zero-2.0.2"
       sources."is-number-2.1.0"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-options-1.0.2"
       (sources."is-plain-object-2.0.4" // {
         dependencies = [
@@ -124143,7 +124618,7 @@ in
       sources."is-primitive-2.0.0"
       sources."is-regex-1.1.4"
       sources."is-set-2.0.2"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-typed-array-1.1.8"
@@ -124257,7 +124732,7 @@ in
       sources."next-tick-1.1.0"
       sources."nice-try-1.0.5"
       sources."node-bindgen-loader-1.0.1"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       sources."non-private-ip-2.2.0"
       sources."normalize-path-2.1.1"
       sources."normalize-uri-1.1.3"
@@ -124838,7 +125313,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.1101.0" // {
+      (sources."aws-sdk-2.1108.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -124866,9 +125341,9 @@ in
       sources."bindings-1.2.1"
       sources."blob-0.0.5"
       sources."bluebird-2.11.0"
-      (sources."body-parser-1.19.2" // {
+      (sources."body-parser-1.20.0" // {
         dependencies = [
-          sources."qs-6.9.7"
+          sources."qs-6.10.3"
         ];
       })
       sources."boom-2.10.1"
@@ -124931,11 +125406,7 @@ in
       })
       sources."cookie-signature-1.0.6"
       sources."cookiejar-2.1.3"
-      (sources."cookies-0.8.0" // {
-        dependencies = [
-          sources."depd-2.0.0"
-        ];
-      })
+      sources."cookies-0.8.0"
       sources."core-js-2.6.12"
       sources."core-util-is-1.0.2"
       sources."cors-2.8.5"
@@ -124944,8 +125415,10 @@ in
       sources."csrf-3.1.0"
       (sources."csurf-1.11.0" // {
         dependencies = [
+          sources."depd-1.1.2"
           sources."http-errors-1.7.3"
           sources."setprototypeof-1.1.1"
+          sources."statuses-1.5.0"
           sources."toidentifier-1.0.0"
         ];
       })
@@ -124963,9 +125436,9 @@ in
       sources."decamelize-1.2.0"
       sources."deep-extend-0.4.2"
       sources."delayed-stream-1.0.0"
-      sources."depd-1.1.2"
+      sources."depd-2.0.0"
       sources."deref-0.6.4"
-      sources."destroy-1.0.4"
+      sources."destroy-1.2.0"
       sources."dicer-0.2.5"
       sources."doctypes-1.1.0"
       sources."drange-1.1.1"
@@ -125010,11 +125483,17 @@ in
       })
       (sources."express-4.17.3" // {
         dependencies = [
+          sources."body-parser-1.19.2"
           sources."cookie-0.4.2"
+          sources."depd-1.1.2"
+          sources."http-errors-1.8.1"
+          sources."on-finished-2.3.0"
           sources."proxy-addr-2.0.7"
           sources."qs-6.9.7"
+          sources."raw-body-2.4.3"
           sources."safe-buffer-5.2.1"
           sources."serve-static-1.14.2"
+          sources."statuses-1.5.0"
         ];
       })
       (sources."express-validator-2.21.0" // {
@@ -125030,7 +125509,12 @@ in
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fd-slicer-1.1.0"
-      sources."finalhandler-1.1.2"
+      (sources."finalhandler-1.1.2" // {
+        dependencies = [
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
+        ];
+      })
       sources."find-up-3.0.0"
       sources."follow-redirects-1.14.9"
       sources."forever-agent-0.6.1"
@@ -125056,7 +125540,7 @@ in
           sources."debug-3.2.7"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."graphlib-2.1.8"
       sources."har-schema-2.0.0"
       sources."har-validator-2.0.6"
@@ -125079,7 +125563,7 @@ in
       })
       sources."hoek-2.16.3"
       sources."hosted-git-info-2.8.9"
-      sources."http-errors-1.8.1"
+      sources."http-errors-2.0.0"
       (sources."http-proxy-1.18.1" // {
         dependencies = [
           sources."eventemitter3-4.0.7"
@@ -125209,7 +125693,7 @@ in
       sources."minimist-1.2.6"
       sources."minitouch-prebuilt-1.2.0"
       sources."mkdirp-0.5.6"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."ms-2.1.3"
       sources."multer-1.4.4"
       sources."mustache-2.3.2"
@@ -125231,7 +125715,7 @@ in
       sources."object-assign-4.1.1"
       sources."object-hash-0.3.0"
       sources."object-inspect-1.12.0"
-      sources."on-finished-2.3.0"
+      sources."on-finished-2.4.1"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       (sources."openid-2.0.10" // {
@@ -125309,7 +125793,7 @@ in
       sources."randexp-0.4.9"
       sources."random-bytes-1.0.0"
       sources."range-parser-1.2.1"
-      sources."raw-body-2.4.3"
+      sources."raw-body-2.5.1"
       sources."read-pkg-1.1.0"
       (sources."read-pkg-up-1.0.1" // {
         dependencies = [
@@ -125360,7 +125844,15 @@ in
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.1"
       sources."semver-5.7.1"
-      sources."send-0.17.2"
+      (sources."send-0.17.2" // {
+        dependencies = [
+          sources."depd-1.1.2"
+          sources."destroy-1.0.4"
+          sources."http-errors-1.8.1"
+          sources."on-finished-2.3.0"
+          sources."statuses-1.5.0"
+        ];
+      })
       (sources."serve-favicon-2.5.0" // {
         dependencies = [
           sources."ms-2.1.1"
@@ -125369,12 +125861,7 @@ in
       })
       (sources."serve-static-1.15.0" // {
         dependencies = [
-          sources."depd-2.0.0"
-          sources."destroy-1.2.0"
-          sources."http-errors-2.0.0"
-          sources."on-finished-2.4.1"
           sources."send-0.18.0"
-          sources."statuses-2.0.1"
         ];
       })
       sources."set-blocking-2.0.0"
@@ -125419,7 +125906,7 @@ in
         ];
       })
       sources."stack-trace-0.0.10"
-      sources."statuses-1.5.0"
+      sources."statuses-2.0.1"
       sources."stf-appstore-db-1.0.0"
       sources."stf-browser-db-1.0.2"
       sources."stf-device-db-1.2.0"
@@ -125741,7 +126228,7 @@ in
       sources."minimatch-3.1.2"
       sources."minimist-options-4.1.0"
       sources."ms-2.1.2"
-      sources."nanoid-3.3.1"
+      sources."nanoid-3.3.2"
       sources."normalize-package-data-3.0.3"
       sources."normalize-path-3.0.0"
       sources."normalize-selector-0.2.0"
@@ -125761,7 +126248,7 @@ in
       sources."postcss-media-query-parser-0.2.3"
       sources."postcss-resolve-nested-selector-0.1.1"
       sources."postcss-safe-parser-6.0.0"
-      sources."postcss-selector-parser-6.0.9"
+      sources."postcss-selector-parser-6.0.10"
       sources."postcss-value-parser-4.2.0"
       sources."punycode-2.1.1"
       sources."queue-microtask-1.2.3"
@@ -125890,7 +126377,7 @@ in
       sources."fstream-1.0.12"
       sources."getpass-0.1.7"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."has-flag-3.0.0"
@@ -126010,7 +126497,7 @@ in
       sources."fsevents-2.3.2"
       sources."glob-7.2.0"
       sources."glob-parent-5.1.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."import-fresh-3.3.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -126044,7 +126531,7 @@ in
       sources."source-map-0.7.3"
       sources."sourcemap-codec-1.4.8"
       sources."strip-indent-3.0.0"
-      sources."svelte-preprocess-4.10.4"
+      sources."svelte-preprocess-4.10.5"
       sources."to-regex-range-5.0.1"
       sources."typescript-4.6.3"
       sources."wrappy-1.0.2"
@@ -126097,7 +126584,7 @@ in
       sources."fsevents-2.3.2"
       sources."glob-7.2.0"
       sources."glob-parent-5.1.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-binary-path-2.1.0"
@@ -126132,8 +126619,8 @@ in
       sources."source-map-0.7.3"
       sources."sourcemap-codec-1.4.8"
       sources."strip-indent-3.0.0"
-      sources."svelte-3.46.4"
-      sources."svelte-preprocess-4.10.4"
+      sources."svelte-3.46.6"
+      sources."svelte-preprocess-4.10.5"
       sources."svelte2tsx-0.5.6"
       sources."to-regex-range-5.0.1"
       sources."tslib-2.3.1"
@@ -126185,9 +126672,9 @@ in
       sources."@trysound/sax-0.2.0"
       sources."boolbase-1.0.0"
       sources."commander-7.2.0"
-      sources."css-select-4.2.1"
+      sources."css-select-4.3.0"
       sources."css-tree-1.1.3"
-      sources."css-what-5.1.0"
+      sources."css-what-6.1.0"
       sources."csso-4.2.0"
       sources."dom-serializer-1.3.2"
       sources."domelementtype-2.2.0"
@@ -126418,7 +126905,7 @@ in
       })
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       (sources."graphlib-2.1.8" // {
         dependencies = [
           sources."lodash-4.17.21"
@@ -126934,7 +127421,7 @@ in
       sources."merge2-1.4.1"
       sources."micromatch-4.0.5"
       sources."minimist-1.2.6"
-      sources."nanoid-3.3.1"
+      sources."nanoid-3.3.2"
       sources."normalize-path-3.0.0"
       sources."object-hash-2.2.0"
       sources."parent-module-1.0.1"
@@ -126945,9 +127432,9 @@ in
       sources."picomatch-2.3.1"
       sources."postcss-8.4.12"
       sources."postcss-js-4.0.0"
-      sources."postcss-load-config-3.1.3"
+      sources."postcss-load-config-3.1.4"
       sources."postcss-nested-5.0.6"
-      sources."postcss-selector-parser-6.0.9"
+      sources."postcss-selector-parser-6.0.10"
       sources."postcss-value-parser-4.2.0"
       sources."queue-microtask-1.2.3"
       sources."quick-lru-5.1.1"
@@ -127042,7 +127529,7 @@ in
       sources."mime-types-2.1.35"
       sources."minimist-1.2.6"
       sources."module-alias-2.2.2"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."ms-2.1.2"
       sources."node-fetch-2.6.7"
       sources."oauth-sign-0.9.0"
@@ -127110,7 +127597,7 @@ in
     };
     dependencies = [
       sources."node-addon-api-4.3.0"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       sources."q-1.5.1"
       sources."usb-1.9.2"
     ];
@@ -127144,7 +127631,7 @@ in
       sources."errno-0.1.8"
       sources."fs.realpath-1.0.0"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."isarray-1.0.0"
@@ -127273,7 +127760,7 @@ in
       sources."get-intrinsic-1.1.1"
       sources."get-stdin-5.0.1"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
       sources."has-symbols-1.0.3"
@@ -127590,7 +128077,7 @@ in
         ];
       })
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -128064,7 +128551,7 @@ in
       sources."define-properties-1.1.3"
       sources."emoji-regex-6.5.1"
       sources."end-with-1.0.2"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."get-intrinsic-1.1.1"
@@ -128079,9 +128566,9 @@ in
       sources."is-callable-1.2.4"
       sources."is-date-object-1.0.5"
       sources."is-negative-zero-2.0.2"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-regex-1.1.4"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-weakref-1.0.2"
@@ -128174,7 +128661,7 @@ in
       sources."array-includes-3.1.4"
       sources."call-bind-1.0.2"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."get-intrinsic-1.1.1"
@@ -128190,9 +128677,9 @@ in
       sources."is-capitalized-1.0.0"
       sources."is-date-object-1.0.5"
       sources."is-negative-zero-2.0.2"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-regex-1.1.4"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-weakref-1.0.2"
@@ -128267,6 +128754,7 @@ in
       sources."@types/cookie-0.4.1"
       sources."@types/cors-2.8.12"
       sources."@types/http-cache-semantics-4.0.1"
+      sources."@types/json-buffer-3.0.0"
       sources."@types/keyv-3.1.4"
       sources."@types/node-17.0.23"
       sources."@types/responselike-1.0.0"
@@ -128323,7 +128811,7 @@ in
       sources."caseless-0.12.0"
       sources."chalk-4.1.2"
       sources."cheerio-1.0.0-rc.10"
-      sources."cheerio-select-1.5.0"
+      sources."cheerio-select-1.6.0"
       sources."chownr-1.1.4"
       sources."clone-response-1.0.2"
       sources."code-point-at-1.1.0"
@@ -128332,6 +128820,7 @@ in
       sources."combined-stream-1.0.8"
       sources."commander-7.2.0"
       sources."component-emitter-1.3.0"
+      sources."compress-brotli-1.3.6"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."content-disposition-0.5.3"
@@ -128341,8 +128830,8 @@ in
       sources."core-js-3.21.1"
       sources."core-util-is-1.0.2"
       sources."cors-2.8.5"
-      sources."css-select-4.2.1"
-      sources."css-what-5.1.0"
+      sources."css-select-4.3.0"
+      sources."css-what-6.1.0"
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       (sources."decompress-response-6.0.0" // {
@@ -128378,7 +128867,7 @@ in
       })
       sources."engine.io-parser-4.0.3"
       sources."entities-2.2.0"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-to-primitive-1.2.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
@@ -128410,7 +128899,7 @@ in
       sources."getpass-0.1.7"
       sources."glob-7.2.0"
       sources."got-11.8.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."grapheme-splitter-1.0.4"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -128454,9 +128943,9 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-generator-function-1.0.10"
       sources."is-negative-zero-2.0.2"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-regex-1.1.4"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-typed-array-1.1.8"
@@ -128480,7 +128969,7 @@ in
       })
       sources."jwa-2.0.0"
       sources."jws-4.0.0"
-      sources."keyv-4.1.1"
+      sources."keyv-4.2.1"
       sources."ldap-filter-0.3.3"
       sources."ldapjs-2.3.1"
       sources."linkify-it-3.0.3"
@@ -128740,6 +129229,7 @@ in
       sources."@types/cookie-0.4.1"
       sources."@types/cors-2.8.12"
       sources."@types/http-cache-semantics-4.0.1"
+      sources."@types/json-buffer-3.0.0"
       sources."@types/keyv-3.1.4"
       sources."@types/node-17.0.23"
       sources."@types/responselike-1.0.0"
@@ -128796,7 +129286,7 @@ in
       sources."caseless-0.12.0"
       sources."chalk-4.1.2"
       sources."cheerio-1.0.0-rc.10"
-      sources."cheerio-select-1.5.0"
+      sources."cheerio-select-1.6.0"
       sources."chownr-1.1.4"
       sources."clone-response-1.0.2"
       sources."code-point-at-1.1.0"
@@ -128805,6 +129295,7 @@ in
       sources."combined-stream-1.0.8"
       sources."commander-7.2.0"
       sources."component-emitter-1.3.0"
+      sources."compress-brotli-1.3.6"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."content-disposition-0.5.3"
@@ -128814,8 +129305,8 @@ in
       sources."core-js-3.21.1"
       sources."core-util-is-1.0.2"
       sources."cors-2.8.5"
-      sources."css-select-4.2.1"
-      sources."css-what-5.1.0"
+      sources."css-select-4.3.0"
+      sources."css-what-6.1.0"
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       (sources."decompress-response-6.0.0" // {
@@ -128851,7 +129342,7 @@ in
       })
       sources."engine.io-parser-4.0.3"
       sources."entities-2.2.0"
-      sources."es-abstract-1.19.1"
+      sources."es-abstract-1.19.2"
       sources."es-to-primitive-1.2.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
@@ -128883,7 +129374,7 @@ in
       sources."getpass-0.1.7"
       sources."glob-7.2.0"
       sources."got-11.8.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."grapheme-splitter-1.0.4"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -128927,9 +129418,9 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-generator-function-1.0.10"
       sources."is-negative-zero-2.0.2"
-      sources."is-number-object-1.0.6"
+      sources."is-number-object-1.0.7"
       sources."is-regex-1.1.4"
-      sources."is-shared-array-buffer-1.0.1"
+      sources."is-shared-array-buffer-1.0.2"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-typed-array-1.1.8"
@@ -128953,7 +129444,7 @@ in
       })
       sources."jwa-2.0.0"
       sources."jws-4.0.0"
-      sources."keyv-4.1.1"
+      sources."keyv-4.2.1"
       sources."ldap-filter-0.3.3"
       sources."ldapjs-2.3.1"
       sources."linkify-it-3.0.3"
@@ -129374,7 +129865,7 @@ in
       sources."getpass-0.1.7"
       sources."glob-7.2.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."grapheme-splitter-1.0.4"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -129655,15 +130146,15 @@ in
   thelounge-theme-abyss = nodeEnv.buildNodePackage {
     name = "thelounge-theme-abyss";
     packageName = "thelounge-theme-abyss";
-    version = "2.0.2";
+    version = "2.0.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/thelounge-theme-abyss/-/thelounge-theme-abyss-2.0.2.tgz";
-      sha512 = "1TrJGKqrk+zltLhythNDfEScgt1FL8b1j+3+tPno1yN06vm3yn8dRQlNesMP52op5jX+xJqA5jBFQGMQYSS19g==";
+      url = "https://registry.npmjs.org/thelounge-theme-abyss/-/thelounge-theme-abyss-2.0.3.tgz";
+      sha512 = "Kx0eqblXlz3aRN/XNxcwQXN5L2K2QIgmXdn6OJKBcwXCIBqcAf+2Njey6iNtEbB+lIBYm+yXBQJOuGnLuECIsA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
       description = "A theme for The Lounge";
-      homepage = "https://github.com/rj45man/thelounge-theme-abyss";
+      homepage = "https://github.com/Flisk/thelounge-theme-abyss";
       license = "GPL-3";
     };
     production = true;
@@ -129882,6 +130373,7 @@ in
       sources."@tokenizer/token-0.3.0"
       sources."@types/cacheable-request-6.0.2"
       sources."@types/http-cache-semantics-4.0.1"
+      sources."@types/json-buffer-3.0.0"
       sources."@types/keyv-3.1.4"
       sources."@types/node-17.0.23"
       sources."@types/responselike-1.0.0"
@@ -129953,6 +130445,7 @@ in
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
+      sources."compress-brotli-1.3.6"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       (sources."content-disposition-0.5.3" // {
@@ -130040,7 +130533,7 @@ in
       sources."getpass-0.1.7"
       sources."glob-7.2.0"
       sources."got-11.5.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."grapheme-splitter-1.0.4"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -130097,7 +130590,7 @@ in
       })
       sources."jwa-2.0.0"
       sources."jws-4.0.0"
-      sources."keyv-4.1.1"
+      sources."keyv-4.2.1"
       sources."ldap-filter-0.3.3"
       sources."ldapjs-2.1.1"
       sources."linkify-it-3.0.2"
@@ -130347,6 +130840,7 @@ in
       sources."@tokenizer/token-0.3.0"
       sources."@types/cacheable-request-6.0.2"
       sources."@types/http-cache-semantics-4.0.1"
+      sources."@types/json-buffer-3.0.0"
       sources."@types/keyv-3.1.4"
       sources."@types/node-17.0.23"
       sources."@types/responselike-1.0.0"
@@ -130418,6 +130912,7 @@ in
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
+      sources."compress-brotli-1.3.6"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       (sources."content-disposition-0.5.3" // {
@@ -130505,7 +131000,7 @@ in
       sources."getpass-0.1.7"
       sources."glob-7.2.0"
       sources."got-11.5.2"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."grapheme-splitter-1.0.4"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -130562,7 +131057,7 @@ in
       })
       sources."jwa-2.0.0"
       sources."jws-4.0.0"
-      sources."keyv-4.1.1"
+      sources."keyv-4.2.1"
       sources."ldap-filter-0.3.3"
       sources."ldapjs-2.1.1"
       sources."linkify-it-3.0.2"
@@ -131197,10 +131692,10 @@ in
   three = nodeEnv.buildNodePackage {
     name = "three";
     packageName = "three";
-    version = "0.139.0";
+    version = "0.139.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/three/-/three-0.139.0.tgz";
-      sha512 = "hZ4LkCjgoEM82WLaOVptDKGpB3SkEyuJP2OHe36AFO8hS2I6CrEiNanXj7wwR3wIPT7V5wi5Y5pFnncS5SVHgQ==";
+      url = "https://registry.npmjs.org/three/-/three-0.139.2.tgz";
+      sha512 = "gV7q7QY8rogu7HLFZR9cWnOQAUedUhu2WXAnpr2kdXZP9YDKsG/0ychwQvWkZN5PlNw9mv5MoCTin6zNTXoONg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -131251,7 +131746,7 @@ in
       sources."@octokit/request-error-2.1.0"
       sources."@octokit/rest-18.12.0"
       sources."@octokit/types-6.34.0"
-      sources."@xmldom/xmldom-0.8.1"
+      sources."@xmldom/xmldom-0.8.2"
       sources."ajv-6.12.6"
       sources."asn1-0.2.6"
       sources."assert-plus-1.0.0"
@@ -131292,7 +131787,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."getpass-0.1.7"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
       sources."http-signature-1.2.0"
@@ -131447,7 +131942,7 @@ in
       sources."minimatch-3.1.2"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."mooremachine-2.3.0"
       sources."mute-stream-0.0.8"
       sources."mv-2.1.1"
@@ -131691,7 +132186,7 @@ in
       sources."glob-7.2.0"
       sources."glob-parent-5.1.2"
       sources."globby-11.1.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."ignore-5.2.0"
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
@@ -131807,6 +132302,7 @@ in
       sources."@types/cookie-0.4.1"
       sources."@types/cors-2.8.12"
       sources."@types/http-cache-semantics-4.0.1"
+      sources."@types/json-buffer-3.0.0"
       sources."@types/keyv-3.1.4"
       sources."@types/node-16.11.26"
       sources."@types/responselike-1.0.0"
@@ -131840,6 +132336,7 @@ in
       sources."color-string-1.9.0"
       sources."colorspace-1.1.4"
       sources."component-emitter-1.3.0"
+      sources."compress-brotli-1.3.6"
       sources."concat-map-0.0.1"
       sources."content-disposition-0.5.4"
       sources."content-type-1.0.4"
@@ -131932,7 +132429,7 @@ in
       sources."jquery-ui-1.13.1"
       sources."json-buffer-3.0.1"
       sources."just-detect-adblock-1.1.0"
-      sources."keyv-4.1.1"
+      sources."keyv-4.2.1"
       sources."knockout-3.5.1"
       sources."kuler-2.0.0"
       sources."latest-version-6.0.0"
@@ -131960,7 +132457,7 @@ in
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
       sources."mkdirp-1.0.4"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."ms-2.0.0"
       sources."negotiator-0.6.3"
       sources."node-cache-5.1.2"
@@ -132119,7 +132616,7 @@ in
       sources."@babel/code-frame-7.16.7"
       sources."@babel/helper-validator-identifier-7.16.7"
       sources."@babel/highlight-7.16.10"
-      sources."@types/concat-stream-1.6.1"
+      sources."@types/concat-stream-2.0.0"
       sources."@types/debug-4.1.7"
       sources."@types/is-empty-1.2.1"
       sources."@types/js-yaml-4.0.5"
@@ -132187,7 +132684,7 @@ in
       sources."to-vfile-7.2.3"
       sources."trough-2.1.0"
       sources."typedarray-0.0.6"
-      sources."unified-engine-9.0.5"
+      sources."unified-engine-9.1.0"
       sources."unist-util-inspect-7.0.0"
       sources."unist-util-stringify-position-3.0.2"
       sources."util-deprecate-1.0.2"
@@ -132195,7 +132692,7 @@ in
       sources."vfile-message-3.1.2"
       (sources."vfile-reporter-7.0.4" // {
         dependencies = [
-          sources."supports-color-9.2.1"
+          sources."supports-color-9.2.2"
         ];
       })
       sources."vfile-sort-3.0.0"
@@ -132227,7 +132724,7 @@ in
       sha512 = "gX4TrHLo1nsBiLC/bZkWnZANp1ib4b4+3drekhCkJv0ne+Ti9Xuf5b2G8yqYv4pmT/sB5/ClvxFKmm1Ol0tFIQ==";
     };
     dependencies = [
-      sources."@mapbox/node-pre-gyp-1.0.8"
+      sources."@mapbox/node-pre-gyp-1.0.9"
       sources."@types/estree-0.0.50"
       sources."abbrev-1.1.1"
       sources."agent-base-6.0.2"
@@ -132246,8 +132743,8 @@ in
       sources."commander-7.2.0"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
-      sources."d3-array-3.1.1"
-      sources."d3-color-3.0.1"
+      sources."d3-array-3.1.4"
+      sources."d3-color-3.1.0"
       sources."d3-delaunay-6.0.2"
       sources."d3-dispatch-3.0.1"
       sources."d3-dsv-3.0.1"
@@ -132255,7 +132752,7 @@ in
       sources."d3-format-3.1.0"
       sources."d3-geo-3.0.1"
       sources."d3-geo-projection-4.0.0"
-      sources."d3-hierarchy-3.1.1"
+      sources."d3-hierarchy-3.1.2"
       sources."d3-interpolate-3.0.1"
       sources."d3-path-3.0.1"
       sources."d3-quadtree-3.0.1"
@@ -132268,7 +132765,7 @@ in
       sources."decompress-response-4.2.1"
       sources."delaunator-5.0.0"
       sources."delegates-1.0.0"
-      sources."detect-libc-1.0.3"
+      sources."detect-libc-2.0.1"
       sources."emoji-regex-8.0.0"
       sources."escalade-3.1.1"
       sources."fs-minipass-2.1.0"
@@ -132345,7 +132842,11 @@ in
       sources."vega-runtime-6.1.3"
       sources."vega-scale-7.2.0"
       sources."vega-scenegraph-4.10.1"
-      sources."vega-selections-5.4.0"
+      (sources."vega-selections-5.4.0" // {
+        dependencies = [
+          sources."d3-array-3.1.1"
+        ];
+      })
       sources."vega-statistics-1.8.0"
       sources."vega-time-2.1.0"
       sources."vega-transforms-4.10.0"
@@ -132473,7 +132974,7 @@ in
       sources."get-stream-4.1.0"
       sources."global-dirs-2.1.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
       sources."http-cache-semantics-4.1.0"
@@ -132696,7 +133197,7 @@ in
       sources."path-key-3.1.1"
       sources."path-parse-1.0.7"
       sources."prelude-ls-1.2.1"
-      sources."prettier-2.6.1"
+      sources."prettier-2.6.2"
       sources."progress-2.0.3"
       sources."pug-error-2.0.0"
       sources."pug-lexer-5.0.1"
@@ -132936,7 +133437,7 @@ in
       sources."regenerator-runtime-0.13.9"
       sources."request-light-0.5.7"
       sources."typescript-4.6.3"
-      sources."vscode-css-languageservice-5.3.0"
+      sources."vscode-css-languageservice-5.4.1"
       sources."vscode-html-languageservice-4.2.4"
       sources."vscode-json-languageservice-4.2.1"
       sources."vscode-jsonrpc-8.0.0-next.7"
@@ -132975,7 +133476,7 @@ in
       sources."@types/json-schema-7.0.11"
       sources."@types/mocha-7.0.2"
       sources."@types/node-8.10.66"
-      sources."@types/vscode-1.65.0"
+      sources."@types/vscode-1.66.0"
       sources."@types/yauzl-2.9.2"
       sources."@ungap/promise-all-settled-1.1.2"
       sources."@webassemblyjs/ast-1.11.1"
@@ -133020,14 +133521,14 @@ in
       sources."buffer-from-1.1.2"
       sources."call-bind-1.0.2"
       sources."camelcase-6.3.0"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       (sources."chalk-4.1.2" // {
         dependencies = [
           sources."supports-color-7.2.0"
         ];
       })
       sources."cheerio-1.0.0-rc.10"
-      sources."cheerio-select-1.5.0"
+      sources."cheerio-select-1.6.0"
       sources."chokidar-3.5.1"
       sources."chrome-trace-event-1.0.3"
       (sources."cliui-7.0.4" // {
@@ -133046,8 +133547,8 @@ in
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.3"
       sources."cross-spawn-7.0.3"
-      sources."css-select-4.2.1"
-      sources."css-what-5.1.0"
+      sources."css-select-4.3.0"
+      sources."css-what-6.1.0"
       (sources."debug-4.3.1" // {
         dependencies = [
           sources."ms-2.1.2"
@@ -133060,7 +133561,7 @@ in
       sources."domelementtype-2.2.0"
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-to-chromium-1.4.103"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
       sources."enhanced-resolve-5.9.2"
@@ -133095,7 +133596,7 @@ in
       sources."glob-7.1.6"
       sources."glob-parent-5.1.2"
       sources."glob-to-regexp-0.4.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."growl-1.10.5"
       sources."has-1.0.3"
       sources."has-flag-4.0.0"
@@ -133269,7 +133770,7 @@ in
       sources."vscode-debugadapter-testsupport-1.51.0"
       sources."vscode-debugprotocol-1.51.0"
       sources."watchpack-2.3.1"
-      sources."webpack-5.70.0"
+      sources."webpack-5.71.0"
       (sources."webpack-cli-4.9.2" // {
         dependencies = [
           sources."commander-7.2.0"
@@ -133422,7 +133923,7 @@ in
       sources."git-clone-0.1.0"
       sources."glob-7.2.0"
       sources."got-6.7.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."gray-matter-4.0.3"
       sources."handlebars-4.7.7"
       sources."har-schema-2.0.0"
@@ -133937,7 +134438,7 @@ in
           sources."get-stream-4.1.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."gridsome-helper-json-1.0.3"
       sources."has-1.0.3"
       (sources."has-ansi-2.0.0" // {
@@ -134024,7 +134525,7 @@ in
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
-      sources."js-beautify-1.14.0"
+      sources."js-beautify-1.14.2"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.1"
       sources."json-buffer-3.0.0"
@@ -134562,7 +135063,7 @@ in
     };
     dependencies = [
       sources."@babel/runtime-corejs3-7.17.8"
-      sources."@mapbox/node-pre-gyp-1.0.8"
+      sources."@mapbox/node-pre-gyp-1.0.9"
       sources."@tootallnate/once-1.1.2"
       sources."@types/raf-3.4.0"
       sources."abab-2.0.5"
@@ -134616,7 +135117,7 @@ in
       sources."deep-is-0.1.4"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
-      sources."detect-libc-1.0.3"
+      sources."detect-libc-2.0.1"
       (sources."domexception-2.0.1" // {
         dependencies = [
           sources."webidl-conversions-5.0.0"
@@ -134636,7 +135137,7 @@ in
       sources."gauge-3.0.2"
       sources."get-caller-file-2.0.5"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-unicode-2.0.1"
       sources."html-encoding-sniffer-2.0.1"
       sources."http-proxy-agent-4.0.1"
@@ -134845,7 +135346,7 @@ in
       sources."caseless-0.12.0"
       sources."chalk-4.1.2"
       sources."cheerio-1.0.0-rc.10"
-      sources."cheerio-select-1.5.0"
+      sources."cheerio-select-1.6.0"
       sources."chrome-launcher-0.15.0"
       sources."ci-info-2.0.0"
       sources."cli-boxes-2.2.1"
@@ -134871,8 +135372,8 @@ in
       sources."core-util-is-1.0.3"
       sources."cross-spawn-7.0.3"
       sources."crypto-random-string-2.0.0"
-      sources."css-select-4.2.1"
-      sources."css-what-5.1.0"
+      sources."css-select-4.3.0"
+      sources."css-what-6.1.0"
       sources."dashdash-1.14.1"
       sources."debounce-1.2.0"
       sources."debug-2.6.9"
@@ -134981,7 +135482,7 @@ in
           sources."get-stream-4.1.0"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."graceful-readlink-1.0.1"
       sources."growly-1.3.0"
       sources."har-schema-2.0.0"
@@ -135052,7 +135553,7 @@ in
         ];
       })
       sources."jsprim-1.4.2"
-      (sources."jszip-3.7.1" // {
+      (sources."jszip-3.9.0" // {
         dependencies = [
           sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
@@ -135095,7 +135596,7 @@ in
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
       sources."mkdirp-1.0.4"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."ms-2.0.0"
       sources."multimatch-5.0.0"
       (sources."mv-2.1.1" // {
@@ -135107,7 +135608,7 @@ in
       })
       sources."mz-2.7.0"
       sources."nan-2.15.0"
-      sources."nanoid-3.3.1"
+      sources."nanoid-3.3.2"
       sources."natural-compare-1.4.0"
       sources."ncp-2.0.0"
       sources."node-forge-0.10.0"
@@ -135309,10 +135810,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "5.70.0";
+    version = "5.71.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz";
-      sha512 = "ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-5.71.0.tgz";
+      sha512 = "g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A==";
     };
     dependencies = [
       sources."@types/eslint-8.4.1"
@@ -135343,10 +135844,10 @@ in
       sources."ajv-keywords-3.5.2"
       sources."browserslist-4.20.2"
       sources."buffer-from-1.1.2"
-      sources."caniuse-lite-1.0.30001320"
+      sources."caniuse-lite-1.0.30001325"
       sources."chrome-trace-event-1.0.3"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.4.96"
+      sources."electron-to-chromium-1.4.103"
       sources."enhanced-resolve-5.9.2"
       sources."es-module-lexer-0.9.3"
       sources."escalade-3.1.1"
@@ -135361,7 +135862,7 @@ in
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."glob-to-regexp-0.4.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-flag-4.0.0"
       sources."jest-worker-27.5.1"
       sources."json-parse-better-errors-1.0.2"
@@ -135474,15 +135975,13 @@ in
   webpack-dev-server = nodeEnv.buildNodePackage {
     name = "webpack-dev-server";
     packageName = "webpack-dev-server";
-    version = "4.7.4";
+    version = "4.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz";
-      sha512 = "nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A==";
+      url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.8.0.tgz";
+      sha512 = "yZ7OWVP1nOtv8s10R/ZCsH6zf6QKkNusMRBE9DsQbOknRzKaFYYrbwVPCXp8ynUOTt3RlD9szM8H0pUlrJ6wcw==";
     };
     dependencies = [
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
+      sources."@leichtgewicht/ip-codec-2.0.3"
       sources."@types/body-parser-1.19.2"
       sources."@types/bonjour-3.5.10"
       sources."@types/connect-3.4.35"
@@ -135501,15 +136000,12 @@ in
       sources."@types/sockjs-0.3.33"
       sources."@types/ws-8.5.3"
       sources."accepts-1.3.8"
-      sources."aggregate-error-3.1.0"
       sources."ajv-8.11.0"
       sources."ajv-formats-2.1.1"
       sources."ajv-keywords-5.1.0"
       sources."ansi-html-community-0.0.8"
-      sources."ansi-regex-6.0.1"
       sources."anymatch-3.1.2"
       sources."array-flatten-2.1.2"
-      sources."array-union-2.1.0"
       sources."async-2.6.3"
       sources."balanced-match-1.0.2"
       sources."batch-0.6.1"
@@ -135519,42 +136015,34 @@ in
           sources."bytes-3.1.2"
         ];
       })
-      sources."bonjour-3.5.0"
+      sources."bonjour-service-1.0.11"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."buffer-indexof-1.1.1"
       sources."bytes-3.0.0"
-      sources."call-bind-1.0.2"
       sources."chokidar-3.5.3"
-      sources."clean-stack-2.2.0"
       sources."colorette-2.0.16"
       sources."compressible-2.0.18"
-      (sources."compression-1.7.4" // {
+      sources."compression-1.7.4"
+      sources."concat-map-0.0.1"
+      sources."connect-history-api-fallback-1.6.0"
+      (sources."content-disposition-0.5.4" // {
         dependencies = [
-          sources."safe-buffer-5.1.2"
+          sources."safe-buffer-5.2.1"
         ];
       })
-      sources."concat-map-0.0.1"
-      sources."connect-history-api-fallback-1.6.0"
-      sources."content-disposition-0.5.4"
       sources."content-type-1.0.4"
       sources."cookie-0.4.2"
       sources."cookie-signature-1.0.6"
       sources."core-util-is-1.0.3"
       sources."cross-spawn-7.0.3"
       sources."debug-2.6.9"
-      sources."deep-equal-1.1.1"
       sources."default-gateway-6.0.3"
       sources."define-lazy-prop-2.0.0"
-      sources."define-properties-1.1.3"
-      sources."del-6.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."detect-node-2.1.0"
-      sources."dir-glob-3.0.1"
       sources."dns-equal-1.0.0"
-      sources."dns-packet-1.3.4"
-      sources."dns-txt-2.0.2"
+      sources."dns-packet-5.3.1"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
       sources."escape-html-1.0.3"
@@ -135564,11 +136052,10 @@ in
       (sources."express-4.17.3" // {
         dependencies = [
           sources."array-flatten-1.1.1"
+          sources."safe-buffer-5.2.1"
         ];
       })
       sources."fast-deep-equal-3.1.3"
-      sources."fast-glob-3.2.11"
-      sources."fastq-1.13.0"
       sources."faye-websocket-0.11.4"
       sources."fill-range-7.0.1"
       sources."finalhandler-1.1.2"
@@ -135578,21 +136065,14 @@ in
       sources."fs-monkey-1.0.3"
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.3.2"
-      sources."function-bind-1.1.1"
-      sources."get-intrinsic-1.1.1"
       sources."get-stream-6.0.1"
       sources."glob-7.2.0"
       sources."glob-parent-5.1.2"
-      sources."globby-11.1.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."handle-thing-2.0.1"
-      sources."has-1.0.3"
-      sources."has-symbols-1.0.3"
-      sources."has-tostringtag-1.0.0"
       (sources."hpack.js-2.1.6" // {
         dependencies = [
           sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
         ];
       })
       sources."html-entities-2.3.3"
@@ -135603,23 +136083,15 @@ in
       sources."http-proxy-middleware-2.0.4"
       sources."human-signals-2.1.0"
       sources."iconv-lite-0.4.24"
-      sources."ignore-5.2.0"
-      sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ip-1.1.5"
       sources."ipaddr.js-2.0.1"
-      sources."is-arguments-1.1.1"
       sources."is-binary-path-2.1.0"
-      sources."is-date-object-1.0.5"
       sources."is-docker-2.2.1"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.3"
       sources."is-number-7.0.0"
-      sources."is-path-cwd-2.2.0"
-      sources."is-path-inside-3.0.3"
       sources."is-plain-obj-3.0.0"
-      sources."is-regex-1.1.4"
       sources."is-stream-2.0.1"
       sources."is-wsl-2.2.0"
       sources."isarray-1.0.0"
@@ -135630,7 +136102,6 @@ in
       sources."memfs-3.4.1"
       sources."merge-descriptors-1.0.1"
       sources."merge-stream-2.0.0"
-      sources."merge2-1.4.1"
       sources."methods-1.1.2"
       sources."micromatch-4.0.5"
       sources."mime-1.6.0"
@@ -135642,27 +136113,22 @@ in
       sources."minimist-1.2.6"
       sources."mkdirp-0.5.6"
       sources."ms-2.0.0"
-      sources."multicast-dns-6.2.3"
-      sources."multicast-dns-service-types-1.1.0"
+      sources."multicast-dns-7.2.4"
       sources."negotiator-0.6.3"
-      sources."node-forge-1.3.0"
+      sources."node-forge-1.3.1"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-4.0.1"
-      sources."object-is-1.1.5"
-      sources."object-keys-1.1.1"
       sources."obuf-1.1.2"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
       sources."open-8.4.0"
-      sources."p-map-4.0.0"
       sources."p-retry-4.6.1"
       sources."parseurl-1.3.3"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
       sources."path-to-regexp-0.1.7"
-      sources."path-type-4.0.0"
       sources."picomatch-2.3.1"
       (sources."portfinder-1.0.28" // {
         dependencies = [
@@ -135678,7 +136144,6 @@ in
       })
       sources."punycode-2.1.1"
       sources."qs-6.9.7"
-      sources."queue-microtask-1.2.3"
       sources."range-parser-1.2.1"
       (sources."raw-body-2.4.3" // {
         dependencies = [
@@ -135687,14 +136152,11 @@ in
       })
       sources."readable-stream-3.6.0"
       sources."readdirp-3.6.0"
-      sources."regexp.prototype.flags-1.4.1"
       sources."require-from-string-2.0.2"
       sources."requires-port-1.0.0"
       sources."retry-0.13.1"
-      sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
-      sources."run-parallel-1.2.0"
-      sources."safe-buffer-5.2.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."schema-utils-4.0.0"
       sources."select-hose-2.0.0"
@@ -135716,7 +136178,6 @@ in
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.7"
-      sources."slash-3.0.0"
       sources."sockjs-0.3.24"
       (sources."spdy-4.0.2" // {
         dependencies = [
@@ -135731,12 +136192,7 @@ in
         ];
       })
       sources."statuses-1.5.0"
-      (sources."string_decoder-1.1.1" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
-      sources."strip-ansi-7.0.1"
+      sources."string_decoder-1.1.1"
       sources."strip-final-newline-2.0.0"
       sources."thunky-1.1.0"
       sources."to-regex-range-5.0.1"
@@ -135964,7 +136420,7 @@ in
       sources."fast-fifo-1.1.0"
       sources."filestream-5.0.0"
       sources."freelist-1.0.3"
-      (sources."fs-chunk-store-2.0.4" // {
+      (sources."fs-chunk-store-2.0.5" // {
         dependencies = [
           sources."thunky-1.1.0"
         ];
@@ -136022,7 +136478,7 @@ in
       sources."minimatch-3.1.2"
       sources."minimist-1.2.6"
       sources."mkdirp-classic-0.5.3"
-      sources."moment-2.29.1"
+      sources."moment-2.29.2"
       sources."mp4-box-encoding-1.4.1"
       sources."mp4-stream-3.1.3"
       sources."ms-2.0.0"
@@ -136036,7 +136492,7 @@ in
       sources."netmask-2.0.2"
       sources."network-address-1.1.2"
       sources."next-event-1.0.0"
-      sources."node-gyp-build-4.3.0"
+      sources."node-gyp-build-4.4.0"
       sources."node-ssdp-2.9.1"
       sources."nodebmc-0.0.7"
       sources."on-finished-2.4.1"
@@ -136149,7 +136605,7 @@ in
       sources."utp-native-2.5.3"
       sources."videostream-3.2.2"
       sources."vlc-command-1.2.0"
-      (sources."webtorrent-1.8.10" // {
+      (sources."webtorrent-1.8.13" // {
         dependencies = [
           sources."debug-4.3.4"
           sources."decompress-response-6.0.0"
@@ -136279,7 +136735,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."get-caller-file-2.0.5"
       sources."glob-7.2.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."has-flag-4.0.0"
       sources."ignore-5.2.0"
       sources."ignore-walk-3.0.4"
@@ -136436,7 +136892,7 @@ in
       sources."balanced-match-1.0.2"
       sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
-      (sources."bin-links-3.0.0" // {
+      (sources."bin-links-3.0.1" // {
         dependencies = [
           sources."write-file-atomic-4.0.1"
         ];
@@ -136492,7 +136948,7 @@ in
       sources."clone-response-1.0.2"
       sources."clone-stats-1.0.0"
       sources."cloneable-readable-1.1.3"
-      sources."cmd-shim-4.1.0"
+      sources."cmd-shim-5.0.0"
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -136600,7 +137056,7 @@ in
           sources."p-cancelable-0.4.1"
         ];
       })
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."grouped-queue-2.0.0"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -136708,7 +137164,7 @@ in
       sources."jsonparse-1.3.1"
       sources."jsprim-1.4.2"
       sources."just-diff-5.0.1"
-      sources."just-diff-apply-4.0.1"
+      sources."just-diff-apply-5.2.0"
       sources."keyv-3.0.0"
       (sources."latest-version-3.1.0" // {
         dependencies = [
@@ -136798,7 +137254,7 @@ in
           sources."ansi-regex-5.0.1"
           sources."are-we-there-yet-3.0.0"
           sources."env-paths-2.2.1"
-          sources."gauge-4.0.3"
+          sources."gauge-4.0.4"
           sources."is-fullwidth-code-point-3.0.0"
           sources."npmlog-6.0.1"
           sources."readable-stream-3.6.0"
@@ -136846,12 +137302,16 @@ in
         dependencies = [
           sources."@npmcli/fs-2.1.0"
           sources."@tootallnate/once-2.0.0"
-          sources."cacache-16.0.3"
+          (sources."cacache-16.0.3" // {
+            dependencies = [
+              sources."ssri-8.0.1"
+            ];
+          })
           sources."debug-4.3.4"
           sources."http-cache-semantics-4.1.0"
           sources."http-proxy-agent-5.0.0"
-          sources."lru-cache-7.7.1"
-          (sources."make-fetch-happen-10.1.0" // {
+          sources."lru-cache-7.7.3"
+          (sources."make-fetch-happen-10.1.2" // {
             dependencies = [
               sources."minipass-fetch-2.1.0"
             ];
@@ -136863,6 +137323,7 @@ in
               sources."lru-cache-6.0.0"
             ];
           })
+          sources."ssri-9.0.0"
         ];
       })
       sources."npm-run-path-2.0.2"
@@ -136927,7 +137388,7 @@ in
         ];
       })
       sources."pad-component-0.0.1"
-      sources."parse-conflict-json-2.0.1"
+      sources."parse-conflict-json-2.0.2"
       sources."parse-help-1.0.0"
       sources."parse-json-2.2.0"
       sources."passwd-user-3.0.0"
@@ -136979,7 +137440,7 @@ in
       sources."query-string-5.1.1"
       sources."queue-microtask-1.2.3"
       sources."rc-1.2.8"
-      sources."read-cmd-shim-2.0.0"
+      sources."read-cmd-shim-3.0.0"
       sources."read-package-json-fast-2.0.3"
       (sources."read-pkg-1.1.0" // {
         dependencies = [
@@ -137150,7 +137611,7 @@ in
         ];
       })
       sources."text-table-0.2.0"
-      sources."textextensions-5.14.0"
+      sources."textextensions-5.15.0"
       sources."through-2.3.8"
       sources."timed-out-4.0.1"
       sources."titleize-1.0.1"
@@ -137337,7 +137798,7 @@ in
       sources."fs-extra-10.0.1"
       sources."glob-parent-5.1.2"
       sources."globby-13.1.1"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
       sources."ignore-5.2.0"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.3"
diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index 3c8be666b66a1..8447c25cd7075 100644
--- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix
+++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
@@ -3,13 +3,11 @@
 }:
 
 buildDunePackage rec {
-  minimumOCamlVersion = "4.05";
+  minimalOCamlVersion = "4.08";
 
   pname = "asn1-combinators";
   version = "0.2.6";
 
-  useDune2 = true;
-
   src = fetchurl {
     url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz";
     sha256 = "sha256-ASreDYhp72IQY3UsHPjqAm9rxwL+0Q35r1ZojikbGpE=";
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index e3af173edc916..f3c587428a409 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -16,17 +16,18 @@
 , js_of_ocaml-tyxml
 , lwt_ppx
 , ocamlnet
+, ocsipersist
 }:
 
 stdenv.mkDerivation rec {
   pname = "eliom";
-  version = "8.9.0";
+  version = "9.4.0";
 
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "eliom";
     rev = version;
-    sha256 = "sha256-VNxzpVpXEGlixyjadbW0GjL83jcKV5TWd46UReNYO6w=";
+    sha256 = "sha256:1yn8mqxv9yz51x81j8wv1jn7l7crm8azp1m2g4zn5nz2s4nmfv6q";
   };
 
   nativeBuildInputs = [
@@ -49,12 +50,17 @@ stdenv.mkDerivation rec {
     lwt_ppx
     lwt_react
     ocsigen_server
+    ocsipersist
     ppx_deriving
   ];
 
   strictDeps = true;
 
-  installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
+  installPhase = ''
+    runHook preInstall
+    opaline -prefix $out -libdir $OCAMLFIND_DESTDIR
+    runHook postInstall
+  '';
 
   setupHook = [ ./setup-hook.sh ];
 
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 67ec458a122d5..daa64b7e30193 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -2,7 +2,7 @@
 , bigstringaf, lwt, cstruct, mirage-crypto, zarith, mirage-crypto-ec, ptime, mirage-crypto-rng, mtime, ca-certs
 , cohttp, cohttp-lwt-unix, hmap
 , lwt_log, ocaml_pcre, cryptokit, xml-light, ipaddr
-, pgocaml, camlzip, ocaml_sqlite3
+, camlzip
 , makeWrapper
 }:
 
@@ -17,7 +17,7 @@ let caml_ld_library_path =
 ; in
 
 buildDunePackage rec {
-  version = "4.0.1";
+  version = "5.0.1";
   pname = "ocsigenserver";
 
   useDune2 = true;
@@ -27,11 +27,11 @@ buildDunePackage rec {
     owner = "ocsigen";
     repo = "ocsigenserver";
     rev = version;
-    sha256 = "0pid4irkmdmx1d6n2rvcvx5mnljl3hazzdqc3bql72by35izfac6";
+    sha256 = "sha256:1vzza33hd41740dqrx4854rqpyd8wv7kwpsvvmlpck841i9lh8h5";
   };
 
   nativeBuildInputs = [ makeWrapper which ];
-  buildInputs = [ lwt_react pgocaml camlzip ocaml_sqlite3 ];
+  buildInputs = [ lwt_react camlzip ];
 
   propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit hmap ipaddr lwt_log lwt_ssl
     ocaml_pcre xml-light
diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
index 118138dc8fd00..4f439733740e2 100644
--- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-ocsigen-start";
-  version = "4.3.0";
+  version = "4.5.0";
 
   nativeBuildInputs = [ ocaml findlib eliom ];
   propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ocamlnet ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "ocsigen";
     repo = "ocsigen-start";
     rev = version;
-    sha256 = "0lkl59dwzyqq2lyr46fyjr27ms0fp9h59xfsn37faaavdd7v0h98";
+    sha256 = "sha256:1n94r8rbkzxbgcz5w135n6f2cwpc91bdvf7yslcdq4cn713rncmq";
   };
 
   preInstall = ''
diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
index 1b2dd72a2ec38..12a92c5be399c 100644
--- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation rec {
  pname = "ocsigen-toolkit";
  name = "ocaml${ocaml.version}-${pname}-${version}";
- version = "3.0.1";
+ version = "3.1.1";
 
  propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ];
  nativeBuildInputs = [ ocaml findlib opaline eliom ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     owner = "ocsigen";
     repo = pname;
     rev = version;
-    sha256 = "1yx50ja2wcs5vfy4rk9szgwccpnihkjn14i4ywchx4yr4ppr00fm";
+    sha256 = "sha256:1fm0vvccmjib9yj5m2760vhzb4z3392swlprp51az53g3vk4q218";
   };
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/ocsipersist/default.nix b/pkgs/development/ocaml-modules/ocsipersist/default.nix
new file mode 100644
index 0000000000000..8006477dad96e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsipersist/default.nix
@@ -0,0 +1,20 @@
+{ buildDunePackage, ocsipersist-lib
+, ocsipersist-pgsql
+, ocsipersist-sqlite
+}:
+
+buildDunePackage {
+  pname = "ocsipersist";
+  inherit (ocsipersist-lib) src version useDune2;
+
+  buildInputs = [
+    ocsipersist-pgsql
+    ocsipersist-sqlite
+  ];
+
+  propagatedBuildInputs = [ ocsipersist-lib ];
+
+  meta = ocsipersist-lib.meta // {
+    description = "Persistent key/value storage (for Ocsigen) using multiple backends";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocsipersist/lib.nix b/pkgs/development/ocaml-modules/ocsipersist/lib.nix
new file mode 100644
index 0000000000000..a2abc5d9b399e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsipersist/lib.nix
@@ -0,0 +1,27 @@
+{ lib, buildDunePackage, fetchFromGitHub
+, lwt_ppx, lwt
+}:
+
+buildDunePackage rec {
+  pname = "ocsipersist-lib";
+  version = "1.1.0";
+
+  useDune2 = true;
+
+  src = fetchFromGitHub {
+    owner = "ocsigen";
+    repo = "ocsipersist";
+    rev = version;
+    sha256 = "sha256:1d6kdcfjvrz0dl764mnyxc477aa57rvmzkg154qc915w2y1nbz9a";
+  };
+
+  buildInputs = [ lwt_ppx ];
+  propagatedBuildInputs = [ lwt ];
+
+  meta = {
+    description = "Persistent key/value storage (for Ocsigen) - support library";
+    license = lib.licenses.lgpl21Only;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix b/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix
new file mode 100644
index 0000000000000..e93c8b4790359
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix
@@ -0,0 +1,24 @@
+{ buildDunePackage, ocsipersist-lib
+, lwt_log
+, ocsigen_server
+, pgocaml
+, xml-light
+}:
+
+buildDunePackage {
+  pname = "ocsipersist-pgsql";
+  inherit (ocsipersist-lib) version src useDune2;
+
+  propagatedBuildInputs = [
+    lwt_log
+    ocsigen_server
+    ocsipersist-lib
+    pgocaml
+    xml-light
+  ];
+
+  meta = ocsipersist-lib.meta // {
+    description = "Persistent key/value storage (for Ocsigen) using PostgreSQL";
+  };
+}
+
diff --git a/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix b/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix
new file mode 100644
index 0000000000000..2cfa30bc908e6
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix
@@ -0,0 +1,23 @@
+{ buildDunePackage, ocsipersist-lib
+, lwt_log
+, ocaml_sqlite3
+, ocsigen_server
+, xml-light
+}:
+
+buildDunePackage {
+  pname = "ocsipersist-sqlite";
+  inherit (ocsipersist-lib) version src useDune2;
+
+  propagatedBuildInputs = [
+    lwt_log
+    ocaml_sqlite3
+    ocsigen_server
+    ocsipersist-lib
+    xml-light
+  ];
+
+  meta = ocsipersist-lib.meta // {
+    description = "Persistent key/value storage (for Ocsigen) using SQLite";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
deleted file mode 100644
index 6009eaecce1d3..0000000000000
--- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, twt, ocaml_sqlite3 }:
-
-assert lib.versionAtLeast (lib.getVersion ocaml) "3.12";
-
-if lib.versionAtLeast ocaml.version "4.06"
-then throw "sqlite3EZ is not available for OCaml ${ocaml.version}"
-else
-
-stdenv.mkDerivation rec {
-  pname = "ocaml-sqlite3EZ";
-  version = "0.1.0";
-
-  src = fetchFromGitHub {
-    owner = "mlin";
-    repo = "ocaml-sqlite3EZ";
-    rev = "v${version}";
-    sha256 = "sha256-pKysvth0efxJeyJQY2Dnqarg7OtsKyyLnFV/1ZhsfDY=";
-  };
-
-  nativeBuildInputs = [ ocaml findlib ocamlbuild ];
-  buildInputs = [ twt ];
-
-  propagatedBuildInputs = [ ocaml_sqlite3 ];
-
-  strictDeps = true;
-
-  createFindlibDestdir = true;
-
-  meta = with lib; {
-    homepage = "https://github.com/mlin/ocaml-sqlite3EZ";
-    description = "A thin wrapper for sqlite3-ocaml with a simplified interface";
-    license = licenses.mit;
-    maintainers = [ maintainers.vbgl ];
-    platforms = ocaml.meta.platforms or [ ];
-  };
-}
diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix
index 7a0c6bdadeff8..c4c80dacc9f2f 100644
--- a/pkgs/development/ocaml-modules/torch/default.nix
+++ b/pkgs/development/ocaml-modules/torch/default.nix
@@ -56,5 +56,6 @@ buildDunePackage rec {
     description = "Ocaml bindings to Pytorch";
     maintainers = [ maintainers.bcdarwin ];
     license = licenses.asl20;
+    broken = lib.versionAtLeast pytorch.version "1.11";
   };
 }
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index e22037cbbb9f2..5ceabe766b867 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -25,11 +25,11 @@ let
 
 in buildPythonPackage rec {
   pname = "Cython";
-  version = "0.29.24";
+  version = "0.29.28";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-zfBNB8NgCGDowuuq1Oj1KsP+shJFPBdkpJrAjIJ+hEM=";
+    sha256 = "sha256-1vrCNCgCww5RQmgo/ghP9N6xszhzZ8+Yl2uy5ktvjkU=";
   };
 
   nativeBuildInputs = [
@@ -44,13 +44,6 @@ in buildPythonPackage rec {
   LC_ALL = "en_US.UTF-8";
 
   patches = [
-    # https://github.com/cython/cython/issues/2752, needed by sage (https://trac.sagemath.org/ticket/26855) and up to be included in 0.30
-    (fetchpatch {
-      name = "non-int-conversion-to-pyhash.patch";
-      url = "https://github.com/cython/cython/commit/28251032f86c266065e4976080230481b1a1bb29.patch";
-      sha256 = "19rg7xs8gr90k3ya5c634bs8gww1sxyhdavv07cyd2k71afr83gy";
-    })
-
     # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series.
     # it does not affect Python code unless the code explicitly uses the feature.
     # trashcan support is needed to avoid stack overflows during object deallocation in sage (https://trac.sagemath.org/ticket/27267)
diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix
index 15bd1ee35fec2..5096f37e3025d 100644
--- a/pkgs/development/python-modules/XlsxWriter/default.nix
+++ b/pkgs/development/python-modules/XlsxWriter/default.nix
@@ -1,24 +1,36 @@
-{lib, buildPythonPackage, fetchFromGitHub}:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
 
 buildPythonPackage rec {
+  pname = "xlsxwriter";
+  version = "3.0.2";
+  format = "setuptools";
 
-  pname = "XlsxWriter";
-  version = "1.2.9";
+  disabled = pythonOlder "3.7";
 
-  # PyPI release tarball doesn't contain tests so let's use GitHub. See:
-  # https://github.com/jmcnamara/XlsxWriter/issues/327
-  src = fetchFromGitHub{
+  src = fetchFromGitHub {
     owner = "jmcnamara";
-    repo = pname;
+    repo = "XlsxWriter";
     rev = "RELEASE_${version}";
-    sha256 = "08pdca5ssi50bx2xz52gkmjix2ybv5i4bjw7yd6yfiph0y0qsbsb";
+    hash = "sha256-I87/8OhMoI9/BRXdmTZ1Ul+d+/x+Kg/9CuqMgTsP8Eo=";
   };
 
-  meta = {
-    description = "A Python module for creating Excel XLSX files";
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "xlsxwriter"
+  ];
+
+  meta = with lib; {
+    description = "Module for creating Excel XLSX files";
     homepage = "https://xlsxwriter.readthedocs.io/";
-    maintainers = with lib.maintainers; [ jluttine ];
-    license = lib.licenses.bsd2;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ jluttine ];
   };
-
 }
diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 2671c25e59f7d..921c844e27d8d 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "adafruit-platformdetect";
-  version = "3.22.0";
+  version = "3.22.1";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "Adafruit-PlatformDetect";
     inherit version;
-    sha256 = "sha256-XnB6aSTKRV72WjcXx9jPZ+FGmCNh6dvwiau7WDlyE5M=";
+    sha256 = "sha256-fOBs0aPekIvpwbrYxzh1wz7EKGko0Je1f/N5H0DIguw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix
index 941beb5447313..3655c7456e586 100644
--- a/pkgs/development/python-modules/adblock/default.nix
+++ b/pkgs/development/python-modules/adblock/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "adblock";
-  version = "0.5.1";
+  version = "0.5.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -25,14 +25,14 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ArniDagur";
     repo = "python-adblock";
-    rev = version;
-    sha256 = "sha256-f6PmEHVahQv8t+WOkE8DO2emivHG2t14hUSIf/l8omY=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-6FH+AVK7+Yg1a6oKbFV80TuGGE4Y7I3mMVzwVHdHYO4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-x0mcykHWhheD2ycELcfR1ZQ/6WfFQzY+L/LmMipP4Rc=";
+    hash = "sha256-JI/C+Woi/dJWUGUum8daecjFWiQgxY6BFYZ5MpTcRvU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix
index 4bc3532f5b572..864d0caba3959 100644
--- a/pkgs/development/python-modules/afsapi/default.nix
+++ b/pkgs/development/python-modules/afsapi/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "afsapi";
-  version = "0.2.2";
+  version = "0.2.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "wlcrs";
     repo = "python-afsapi";
     rev = version;
-    hash = "sha256-C4rxlkylWGsDsnMPuecrC2ELj1PvP6EelZ/kzTn4Brk=";
+    hash = "sha256-6nmj15jCGBRkT7Ip/VGHX5IrAbhu1LUlvXuvFhvXknY=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix
index fab3a32a6a0ec..83c5e986f099e 100644
--- a/pkgs/development/python-modules/aioftp/default.nix
+++ b/pkgs/development/python-modules/aioftp/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "aioftp";
-  version = "0.20.0";
+  version = "0.20.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-N8qiKsWPaFT/t5p1eSHS0BydoXv4AL6y8gP4z4P9fsE=";
+    sha256 = "sha256-6p3n5tNNQrbwHqGRXYNL4+cf31Blx2e9elxX6/wxj/4=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix
index baf84ad89f42b..ed902288d0f24 100644
--- a/pkgs/development/python-modules/aioguardian/default.nix
+++ b/pkgs/development/python-modules/aioguardian/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "aioguardian";
-  version = "2022.03.1";
+  version = "2022.03.2";
 
   src = fetchFromGitHub {
     owner = "bachya";
     repo = pname;
     rev = version;
-    sha256 = "sha256-UiRTyUAoTcohRkTBF5Jvd/uY2zAbHV5z4HC8Oc0QNTs=";
+    sha256 = "sha256-eEvvcj8tHNErU6RrWar5mxG3xbQ5wCEEYJ95hXkdY54=";
   };
 
   format = "pyproject";
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index f6d9b5d97ec72..660e205fb482b 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -75,6 +75,10 @@ buildPythonPackage rec {
     "test_client_session_timeout_zero"
     "test_mark_formdata_as_processed"
     "test_requote_redirect_url_default"
+    # Disable tests that trigger deprecation warnings in pytest
+    "test_async_with_session"
+    "test_session_close_awaitable"
+    "test_close_run_until_complete_not_deprecated"
   ] ++ lib.optionals stdenv.is32bit [
     "test_cookiejar"
   ] ++ lib.optionals stdenv.isDarwin [
diff --git a/pkgs/development/python-modules/aionotify/default.nix b/pkgs/development/python-modules/aionotify/default.nix
index e653f4cca74eb..13ae51d25227f 100644
--- a/pkgs/development/python-modules/aionotify/default.nix
+++ b/pkgs/development/python-modules/aionotify/default.nix
@@ -18,6 +18,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.5";
 
+  preCheck = ''
+    substituteInPlace tests/test_usage.py \
+      --replace "asyncio.wait_for(task, timeout, loop=self.loop)" "asyncio.wait_for(task, timeout)"
+  '';
+
   checkInputs = [
     asynctest
   ];
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 18698a0d68f26..a82cd5e258ae4 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "alembic";
-  version = "1.7.5";
+  version = "1.7.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-fDKGlKLmjwPulx5jw72IWEZHA3OltTLPLJ8WAcQTsVM=";
+    sha256 = "sha256-bAwF6XaKiW2AQ4fiCymYgP4BvFZIQkaw3/6AddbT2Ec=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix
index 016fa989a8ab3..eb83fcce471b5 100644
--- a/pkgs/development/python-modules/amazon-ion/default.nix
+++ b/pkgs/development/python-modules/amazon-ion/default.nix
@@ -1,29 +1,47 @@
-{ lib, buildPythonPackage, fetchPypi, jsonconversion, six, pytestCheckHook }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, jsonconversion
+, six
+, pytestCheckHook
+, pythonOlder
+}:
 
 buildPythonPackage rec {
   pname = "amazon-ion";
-  version = "0.8.0";
+  version = "0.9.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "amazon.ion";
     inherit version;
-    sha256 = "sha256-vtztUHSnGoPYozhwvigxEdieVtbKNfV4B5yZ4MHaWGw=";
+    hash = "sha256-Moq1e7LmI0L7DHg6UNYvseEDbqdL23aCwL38wDm3yCA=";
   };
 
   postPatch = ''
-    substituteInPlace setup.py --replace "'pytest-runner'," ""
+    substituteInPlace setup.py \
+      --replace "'pytest-runner'," ""
   '';
 
-  propagatedBuildInputs = [ jsonconversion six ];
+  propagatedBuildInputs = [
+    jsonconversion
+    six
+  ];
 
-  checkInputs = [ pytestCheckHook ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  pythonImportsCheck = [ "amazon.ion" ];
+  pythonImportsCheck = [
+    "amazon.ion"
+  ];
 
   meta = with lib; {
-    description = "A Python implementation of Amazon Ion";
+    description = "Python implementation of Amazon Ion";
     homepage = "https://github.com/amzn/ion-python";
     license = licenses.asl20;
-    maintainers = [ maintainers.terlar ];
+    maintainers = with maintainers; [ terlar ];
   };
 }
diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix
index d198fde80bb82..5847e3ad0f9e8 100644
--- a/pkgs/development/python-modules/ansi/default.nix
+++ b/pkgs/development/python-modules/ansi/default.nix
@@ -1,17 +1,29 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "ansi";
-  version = "0.2.0";
+  version = "0.3.6";
+  format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "98e9b27c4bb187867a69480cbc63b843331622fec7e7d090873d806e1b5d8a80";
+  src = fetchFromGitHub {
+    owner = "tehmaze";
+    repo = pname;
+    rev = "${pname}-${version}";
+    hash = "sha256-2gu2Dba3LOjMhbCCZrBqzlOor5KqDYThhe8OP8J3O2M=";
   };
 
-  checkPhase = ''
-    python -c "import ansi.color"
-  '';
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "ansi.colour"
+    "ansi.color"
+  ];
 
   meta = with lib; {
     description = "ANSI cursor movement and graphics";
diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix
index 50188fe0e4a3a..1f45968974cb7 100644
--- a/pkgs/development/python-modules/ansi2html/default.nix
+++ b/pkgs/development/python-modules/ansi2html/default.nix
@@ -2,13 +2,14 @@
 
 buildPythonPackage rec {
   pname = "ansi2html";
-  version = "1.6.0";
+  version = "1.7.0";
+  format = "pyproject";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596";
+    sha256 = "sha256-aTFr6MaKyRxVgtOXwokOacmTzHzaUgYqx+Rfy2YNjtw=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix
index bc776e42f07b4..49be7afaac7a2 100644
--- a/pkgs/development/python-modules/anybadge/default.nix
+++ b/pkgs/development/python-modules/anybadge/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "anybadge";
-  version = "1.8.0";
+  version = "1.9.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "jongracecox";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-xKHIoV/8qsNMcU5fd92Jjh7d7jTeYN5xakMEjR6qPX8=";
+    sha256 = "sha256-9C1oPZcXjrGwvkx20E+xPGje+ATD9HwOCWWn/pg+98Q=";
   };
 
   # setup.py reads its version from the TRAVIS_TAG environment variable
diff --git a/pkgs/development/python-modules/anyconfig/default.nix b/pkgs/development/python-modules/anyconfig/default.nix
index 3e0e347bbfa3d..17794d5c8c46c 100644
--- a/pkgs/development/python-modules/anyconfig/default.nix
+++ b/pkgs/development/python-modules/anyconfig/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "anyconfig";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-MJHXZ1dAaG+t6FdVU38qfGzO+oZZxbtWF04C3tdLltU=";
+    sha256 = "sha256-A/8uF2KvOI+7vtHBq3+fHsAGqR2n2zpouWPabneV0qw=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 382e64ea0f4fb..a9ae447d45ff5 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -2,6 +2,7 @@
 , lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , pythonOlder
 , setuptools-scm
 , idna
@@ -19,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "anyio";
-  version = "3.3.4";
+  version = "3.5.0";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
@@ -27,9 +28,17 @@ buildPythonPackage rec {
     owner = "agronholm";
     repo = pname;
     rev = version;
-    sha256 = "sha256-aMnXZ+4dlybId2QhjE/3STY+Sj/vzI6K7wmqqx+P8yE=";
+    sha256 = "sha256-AZ9M/NBCBlMIUpRJgKbJRL/oReZDUh2Jhwtoxoo0tMs=";
   };
 
+  patches = [
+    (fetchpatch {
+      # Pytest 7.0 compatibility
+      url = "https://github.com/agronholm/anyio/commit/fed7cc4f95e196f68251bcb9253da3b143ea8e7e.patch";
+      sha256 = "sha256-VmZmiQEmWJ4aPz0Wx+GTMZo7jXRDScnRYf2Hu2hiRVw=";
+    })
+  ];
+
   preBuild = ''
     export SETUPTOOLS_SCM_PRETEND_VERSION=${version}
   '';
diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix
index 4ac03a8820fb8..948fae7893b85 100644
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/pkgs/development/python-modules/apache-airflow/default.nix
@@ -65,13 +65,13 @@
 , mkYarnPackage
 }:
 let
-  version = "2.2.3";
+  version = "2.2.4";
 
   airflow-src = fetchFromGitHub rec {
     owner = "apache";
     repo = "airflow";
     rev = version;
-    sha256 = "02y3az7yj4g4qaamq5s1bcvy3knd6xmvnhbfqs3kbm51irkba1zq";
+    sha256 = "sha256-JCcEgCq1sB8lBaeJy7QQbWU00sGAh5vUmJAptF8M9qo=";
   };
 
   # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.
diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix
index 2eeebaaea7f8c..b8d1a94eeff0c 100644
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@@ -43,14 +43,14 @@
 
 buildPythonPackage rec {
   pname = "apache-beam";
-  version = "2.35.0";
+  version = "2.36.0";
   disabled = pythonAtLeast "3.10";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "beam";
     rev = "v${version}";
-    sha256 = "0qxkas33d8i6yj133plnadbfm74ak7arn7ldpziyiwdav3hj68sy";
+    sha256 = "sha256-f+ICbKSwNjkhrTCCZwxbmqZlQ1+dQSTRag1IflWsqYg=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix
index b74533e0d44b9..ece87d1894e09 100644
--- a/pkgs/development/python-modules/approvaltests/default.nix
+++ b/pkgs/development/python-modules/approvaltests/default.nix
@@ -7,7 +7,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.6.0";
+  version = "4.0.0";
   pname = "approvaltests";
 
   # no tests included in PyPI tarball
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     owner = "approvals";
     repo = "ApprovalTests.Python";
     rev = "v${version}";
-    sha256 = "sha256-pgGuIoYV6JRM9h7hR8IeNduqsGm+UrKq+P/T1LM30NE=";
+    sha256 = "sha256-4dg5xTswqLFRBaZagKrkilCvsAnky9donb03MT/PiWM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
index 46ae3fc34e565..5adee7244dd39 100644
--- a/pkgs/development/python-modules/apsw/default.nix
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -29,6 +29,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  # Works around the following error by dropping the call to that function
+  #     def print_version_info(write=write):
+  # >       write("                Python " + sys.executable + " " + str(sys.version_info) + "\n")
+  # E       TypeError: 'module' object is not callable
+  preCheck = ''
+    sed -i '/print_version_info(write)/d' tests.py
+  '';
+
   pytestFlagsArray = [
     "tests.py"
   ];
diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix
index fc66509a194a1..c09610c3be1f7 100644
--- a/pkgs/development/python-modules/arrow/default.nix
+++ b/pkgs/development/python-modules/arrow/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "arrow";
-  version = "1.2.1";
+  version = "1.2.2";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c2dde3c382d9f7e6922ce636bf0b318a7a853df40ecb383b29192e6c5cc82840";
+    sha256 = "sha256-Bcrx/T2aEaETWytvCYh0IRU7lFWOXvTQkLVntHFzrCs=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix
index 1a9ba2dd0963c..122020c271f9f 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/pkgs/development/python-modules/asdf/default.nix
@@ -17,13 +17,13 @@
 
 buildPythonPackage rec {
   pname = "asdf";
-  version = "2.8.3";
+  version = "2.10.1";
   disabled = pythonOlder "3.6";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "de0f70ffb2e0d539461940d6f7529c3548541fa098d8edc37af256af61c09b44";
+    sha256 = "sha256-9+Vp8ps3I5Oe/sgWTrLtcnS91ICwsoPXWDPw9Z0QhAk=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 78f02e2870ce8..6a61dd1009c69 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -19,7 +19,7 @@
 
 let
   pname = "astropy";
-  version = "5.0";
+  version = "5.0.1";
 in
 buildPythonPackage {
   inherit pname version;
@@ -29,7 +29,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "70203e151e13292586a817b4069ce1aad4643567aff38b1d191c173bc54f3927";
+    sha256 = "sha256-Y4LN5qIFqgsWoNXmHAwBMevU8BdNbHPilk9L7hMqkCc=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix
index 9dc412ccde86d..69e6519b32c3d 100644
--- a/pkgs/development/python-modules/async-lru/default.nix
+++ b/pkgs/development/python-modules/async-lru/default.nix
@@ -28,6 +28,10 @@ buildPythonPackage rec {
     pytest-asyncio
   ];
 
+  pytestFlagsArray = [
+    "--asyncio-mode=strict"
+  ];
+
   disabledTests = [
     # https://github.com/aio-libs/async-lru/issues/341
     "test_alru_cache_deco"
diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix
index 73422a0624c8c..11e1f444cb0bb 100644
--- a/pkgs/development/python-modules/authcaptureproxy/default.nix
+++ b/pkgs/development/python-modules/authcaptureproxy/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "authcaptureproxy";
-  version = "1.1.1";
+  version = "1.1.3";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "alandtse";
     repo = "auth_capture_proxy";
     rev = "v${version}";
-    sha256 = "08zpaclg5f9g1pix0jaq42i2ph12xc8djjrmhxz0yygw5rsilgl4";
+    sha256 = "sha256-RD/8v3IQb50iGkU6zj5QfHXakjHdcCBWWAkXhCIF6qo=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index a088a0120103a..285630db32e9a 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "autobahn";
-  version = "21.11.1";
+  version = "22.2.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-vW9GMVQZygpb5BCfc3QQIIrV8ZcY9nympKZ0zGbKmxg=";
+    sha256 = "sha256-YOH0xgKqzQUv/j1GrkC2t1+ChrPEaSLCE7UjFi5YwX4=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix
index 461ce9d90d9d6..673b6631cf2ad 100644
--- a/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/pkgs/development/python-modules/aws-adfs/default.nix
@@ -17,12 +17,12 @@
 
 buildPythonPackage rec {
   pname = "aws-adfs";
-  version = "1.24.5";
+  version = "2.0.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6a78bd31477ea9988166215ae86abcbfe1413bee20373ecdf0dd170b7290db55";
+    sha256 = "sha256-+WMv52JIbh51pqLhDnUCzrcbPD5eutzwFcPOhO+nR7s=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix
index 6197914f435be..ab689bda51ef1 100644
--- a/pkgs/development/python-modules/awscrt/default.nix
+++ b/pkgs/development/python-modules/awscrt/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "awscrt";
-  version = "0.13.7";
+  version = "0.13.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FCmdYuXh8+nWfeGbJ9IhfwASFsZoxOp7jL+5/TrtG5Q=";
+    hash = "sha256-n1ckAHU31Lo/CdhKxa4sOWuNLg565BB0XKcmpZovCMs=";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin [
diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix
index 2312df1cafaf0..a540ebf0beadd 100644
--- a/pkgs/development/python-modules/azure-common/default.nix
+++ b/pkgs/development/python-modules/azure-common/default.nix
@@ -9,14 +9,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.1.27";
+  version = "1.1.28";
   pname = "azure-common";
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "9f3f5d991023acbd93050cf53c4e863c6973ded7e236c69e99c8ff5c7bad41ef";
+    sha256 = "sha256-SsDNMhTja2obakQmhnIqXYzESWA6qDPz8PQL2oNnBKM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix
index b7d330e6eff90..fbff37fad374f 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/pkgs/development/python-modules/azure-core/default.nix
@@ -15,14 +15,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.21.1";
+  version = "1.22.1";
   pname = "azure-core";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "88d2db5cf9a135a7287dc45fdde6b96f9ca62c9567512a3bb3e20e322ce7deb2";
+    sha256 = "sha256-S25AUmijO4cxB3lklc7D8vGx/+k1Ykzg+93/NtONOk0=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix
index ea0696e294a07..44660e56f4268 100644
--- a/pkgs/development/python-modules/azure-identity/default.nix
+++ b/pkgs/development/python-modules/azure-identity/default.nix
@@ -24,6 +24,11 @@ buildPythonPackage rec {
     sha256 = "sha256-Ag/w5HFXhS5KrIo62waEGCcUfyepTL50qQRCXY5i2Tw=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "msal-extensions~=0.3.0" "msal-extensions"
+  '';
+
   propagatedBuildInputs = [
     azure-common
     azure-core
diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix
index 4c7233203bb92..4c61b55b666c9 100644
--- a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.1.0";
+  version = "3.0.0";
   pname = "azure-mgmt-apimanagement";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94";
+    sha256 = "sha256-kmL1TtOH6wg9ja5m0yqN81ZHMZuQK9SYzcN29QoS0VQ=";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
index 947bb4a28ba97..9629c6e7bba06 100644
--- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
@@ -4,7 +4,6 @@
 , msrest
 , msrestazure
 , azure-common
-, azure-mgmt-nspkg
 , azure-mgmt-core
 }:
 
@@ -22,7 +21,6 @@ buildPythonPackage rec {
     msrest
     msrestazure
     azure-common
-    azure-mgmt-nspkg
     azure-mgmt-core
   ];
 
diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
index dd7ed3b19b213..68d14c49ef6a8 100644
--- a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
@@ -4,24 +4,26 @@
 , msrest
 , msrestazure
 , azure-common
+, azure-mgmt-core
 , azure-mgmt-nspkg
 , isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-trafficmanager";
-  version = "0.51.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "fc8ae77022cfe52fda4379a2f31e0b857574d536e41291a7b569b5c0f4104186";
+    sha256 = "sha256-R0F2HoA0bE7dTLPycTaOqYBj+ATQFeJFwv4EjtK1lqg=";
   };
 
   propagatedBuildInputs = [
     msrest
     msrestazure
     azure-common
+    azure-mgmt-core
   ] ++ lib.optionals (!isPy3k) [
     azure-mgmt-nspkg
   ];
diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix
index b4e37c33fef9f..a0864529177fc 100644
--- a/pkgs/development/python-modules/azure-servicebus/default.nix
+++ b/pkgs/development/python-modules/azure-servicebus/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "azure-servicebus";
-  version = "7.5.0";
+  version = "7.6.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "e97a069c6a73fce3042a5ef0d438cc564152cfbcc2e7db6f7a19fbd51bb3555b";
+    sha256 = "sha256-uZGxQ1Vl6wpBCMW1+80/CBuqelLV02yXf1sNlNtCpHU=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix
index 0b4703e265161..d2b6d06c4cdbb 100644
--- a/pkgs/development/python-modules/backports-zoneinfo/default.nix
+++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix
@@ -1,4 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub
+, pythonAtLeast
 , pythonOlder
 , python
 , substituteAll
@@ -12,6 +13,8 @@ buildPythonPackage rec {
   pname = "backports-zoneinfo";
   version = "0.2.1";
 
+  disabled = pythonAtLeast "3.9";
+
   src = fetchFromGitHub {
     owner = "pganssle";
     repo = "zoneinfo";
diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix
index 30ca58fed319e..6d8dd8a3943b0 100644
--- a/pkgs/development/python-modules/basemap/default.nix
+++ b/pkgs/development/python-modules/basemap/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "basemap";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "matplotlib";
     repo = "basemap";
     rev = "v${version}";
-    sha256 = "0nwpd6zx2q2fc556ppz71ra6ad9z0d5bz8hcld64i91dcy0f0zs3";
+    sha256 = "sha256-onNdOQL4i6GTcuCRel5yanJ2EQ5iYClp+imuBObXF2I=";
   };
 
   propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ];
diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix
index 78529e288ca26..7b34a3d382a8a 100644
--- a/pkgs/development/python-modules/bc-python-hcl2/default.nix
+++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "bc-python-hcl2";
-  version = "0.3.33";
+  version = "0.3.37";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tdsw9gf64VGH9tRWgYZZq3FNa5B5JNhN3k6wUHrU5zY=";
+    hash = "sha256-+Wr/JF9es2LQhQ5rc0iyGZa0Di5CsFo9k36WI7jrOqs=";
   };
 
   # Nose is required during build process, so can not use `checkInputs`.
diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
index 1198f034d00ab..2384a51e50233 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonApplication rec {
   pname = "behave";
-  version = "1.2.7.dev1";
+  version = "1.2.7.dev2";
 
   src = fetchFromGitHub {
     owner = "behave";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ssgixmqlg8sxsyalr83a1970njc2wg3zl8idsmxnsljwacv7qwv";
+    hash = "sha256-B8PUN1Q4UAsDWrHjPZDlpaPjCKjI/pAogCSI+BQnaWs=";
   };
 
   checkInputs = [ pytestCheckHook mock pathpy pyhamcrest pytest-html ];
diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix
index a4430b655ce17..932d887754ec4 100644
--- a/pkgs/development/python-modules/bip_utils/default.nix
+++ b/pkgs/development/python-modules/bip_utils/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "bip_utils";
-  version = "2.1.0";
+  version = "2.2.1";
 
   disabled = pythonOlder "3.6";
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "ebellocchia";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1n677z6rvcny1vyfzwnvcmzbqp9m4kfpdjfvkf1q6310zr2ybp7m";
+    sha256 = "sha256-p2JOZAJxQ/nPZ7vjnB24hA3kz3Io4D3HTP/8mqS/XCc=";
   };
 
   propagatedBuildInputs = [ ecdsa pysha3 ];
diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix
index d57d4a6585bd4..358a4d163f3e2 100644
--- a/pkgs/development/python-modules/bitbox02/default.nix
+++ b/pkgs/development/python-modules/bitbox02/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "bitbox02";
-  version = "5.3.0";
+  version = "6.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fe0e8aeb9b32fd7d76bb3e9838895973a74dfd532a8fb8ac174a1a60214aee26";
+    sha256 = "sha256-wTateh3dJycFNozLaQbAzXF0avr2ofBdjlqqcOBLr/0=";
   };
 
   propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ];
diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix
deleted file mode 100644
index c9d317a81c3c3..0000000000000
--- a/pkgs/development/python-modules/bitcoin-price-api/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, python-dateutil, requests }:
-
-buildPythonPackage rec {
-  pname = "bitcoin-price-api";
-  version = "0.0.4";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "bc68076f9632aaa9a8009d916d67a709c1e045dd904cfc7a3e8be33960d32029";
-  };
-
-  propagatedBuildInputs = [ python-dateutil requests ];
-
-  # No tests in archive
-  doCheck = false;
-
-  meta = {
-    homepage = "https://github.com/dursk/bitcoin-price-api";
-    description = "Price APIs for bitcoin exchanges";
-    license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ bhipple ];
-  };
-}
diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix
index ef599d89be2bc..e8b11a6311a4e 100644
--- a/pkgs/development/python-modules/bjoern/default.nix
+++ b/pkgs/development/python-modules/bjoern/default.nix
@@ -1,12 +1,17 @@
-{ lib, buildPythonPackage, fetchPypi, libev, python }:
+{ lib, buildPythonPackage, fetchFromGitHub, libev, python }:
 
 buildPythonPackage rec {
   pname = "bjoern";
-  version = "3.1.0";
+  version = "3.2.1";
+  format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "01f3b601cf0ab0a9c7cb9c8f944ab7c738baaa6043ca82db20e9bd7a9be5767b";
+  # tests are not published to pypi anymore
+  src = fetchFromGitHub {
+    owner = "jonashaag";
+    repo = pname;
+    rev = version;
+    hash = "sha256-d7u/lEh2Zr5NYWYu4Zr7kgyeOIQuHQLYrZeiZMHbpio=";
+    fetchSubmodules = true; # fetch http-parser and statsd-c-client submodules
   };
 
   buildInputs = [ libev ];
diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix
index c2b03d35a21c3..592c36692d0fd 100644
--- a/pkgs/development/python-modules/blessed/default.nix
+++ b/pkgs/development/python-modules/blessed/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "blessed";
-  version = "1.19.0";
+  version = "1.19.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4db0f94e5761aea330b528e84a250027ffe996b5a94bf03e502600c9a5ad7a61";
+    sha256 = "sha256-mg0JlpW/Yh1GgN1sc/atVH9qNEL72+gMSx2qHtvEkvw=";
   };
 
   checkInputs = [ pytest mock glibcLocales ];
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index c6fdc8c9981c5..d1a104f6ae9b2 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "boto3";
-  version = "1.20.35"; # N.B: if you change this, change botocore and awscli to a matching version
+  version = "1.21.12"; # N.B: if you change this, change botocore and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "42dd9fcb9e033ab19c9dfaeaba745ef9d2db6efe4e9f1e1f547b3e3e0b1f4a82";
+    sha256 = "sha256-yS7CCmcHIbWhvAE7MFqE2yt/nHFmU7MFbOfi+9KhgO8=";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 6d5c11665c2cb..0c69de1c0e084 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.23.35"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.24.12"; # N.B: if you change this, change boto3 and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5be6ba6c5ea71c256da8a5023bf9c278847c4b90fdb40f2c4c3bdb21ca11ff28";
+    sha256 = "sha256-AXSZmgSwouQkVxBgk6zps2+pR3KkQtm89gdQJj0dBz4=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix
index f7e7dc7c390c1..7b8334ee36c1a 100644
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "Bottleneck";
-  version = "1.3.2";
+  version = "1.3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "20179f0b66359792ea283b69aa16366419132f3b6cf3adadc0c48e2e8118e573";
+    sha256 = "sha256-F2Sn9K1YxVhyPFQoR+s2erC7ttiApOXV7vMKDs5c7Oo=";
   };
 
   propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix
index a3f0db80fafe8..dd521523179f7 100644
--- a/pkgs/development/python-modules/boxx/default.nix
+++ b/pkgs/development/python-modules/boxx/default.nix
@@ -18,11 +18,11 @@
 
 buildPythonPackage rec {
   pname = "boxx";
-  version = "0.9.9";
+  version = "0.9.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Mc6R6ruUVhFs2D0CTJsAiM9aGOusS973hRS5r2kQsy4=";
+    sha256 = "sha256-Iw6jRhKAroqfWmbXhD7YTn4s8FrE/Iyd31EOP0tMdkQ=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix
index 6db9523477522..ed13a3a3a7ba7 100644
--- a/pkgs/development/python-modules/bsblan/default.nix
+++ b/pkgs/development/python-modules/bsblan/default.nix
@@ -5,6 +5,8 @@
 , aresponses
 , coverage
 , mypy
+, poetry-core
+, pydantic
 , pytest-asyncio
 , pytest-cov
 , pytest-mock
@@ -17,22 +19,27 @@
 
 buildPythonPackage rec {
   pname = "bsblan";
-  version = "0.5.0";
-  format = "setuptools";
+  version = "0.5.5";
+  format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "liudger";
     repo = "python-bsblan";
-    rev = "v.${version}";
-    sha256 = "1j41y2njnalcsp1vjqwl508yp3ki82lv8108ijz52hprhrq4fffb";
+    rev = "v${version}";
+    sha256 = "sha256-kq4cML7D9XC/QRPjGfaWcs0H78OOc2IXGua7qJpWYOQ=";
   };
 
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
   propagatedBuildInputs = [
     aiohttp
     attrs
     cattrs
+    pydantic
     yarl
   ];
 
diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index 2836ee24c34a4..5190c1fa74f42 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -92,6 +92,9 @@ let
     preCheck = ''
       export LC_ALL="en_US.UTF-8"
       export PATH="$out/bin:$PATH"
+
+      # remove testfile which is missing configuration file from sdist
+      rm buildbot/test/integration/test_graphql.py
     '';
 
     disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index a68d73e1242c5..18077ce78cc8e 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "python-can";
-  version = "unstable-2022-01-11";
+  version = "4.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -23,8 +23,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hardbyte";
     repo = pname;
-    rev = "2e24af08326ecd69fba9f02fed7b9c26f233c92b";
-    hash = "sha256-ZP5qtbjDtBZ2uT9DOSvSnfHyTlirr0oCEXhiLO1ydz0=";
+    rev = version;
+    hash = "sha256-/z7zBfVbO7x4UtzWOXolH2YrtYWgsvRLObWwz8sqOEc=";
   };
 
   propagatedBuildInputs = [
@@ -56,6 +56,9 @@ buildPythonPackage rec {
     # Tests require access socket
     "BasicTestUdpMulticastBusIPv4"
     "BasicTestUdpMulticastBusIPv6"
+    # pytest.approx is not supported in a boolean context (since pytest7)
+    "test_pack_unpack"
+    "test_receive"
   ];
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix
index e3d694d28e3b3..94a357df98bee 100644
--- a/pkgs/development/python-modules/cattrs/default.nix
+++ b/pkgs/development/python-modules/cattrs/default.nix
@@ -7,6 +7,7 @@
 , motor
 , msgpack
 , poetry-core
+, pytest-xdist
 , pytestCheckHook
 , pythonOlder
 , pyyaml
@@ -44,12 +45,17 @@ buildPythonPackage rec {
     immutables
     motor
     msgpack
+    pytest-xdist
     pytestCheckHook
     pyyaml
     tomlkit
     ujson
   ];
 
+  pytestFlagsArray = [
+    "--numprocesses $NIX_BUILD_CORES"
+  ];
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5  --benchmark-group-by=fullname" "" \
@@ -75,6 +81,8 @@ buildPythonPackage rec {
   disabledTests = [
     # orjson is not available as it requires Rust nightly features to compile its requirements
     "test_orjson"
+    # tomlkit is pinned to an older version and newer versions raise InvalidControlChar exception
+    "test_tomlkit"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix
index cf4813a9d9085..5039872b336f2 100644
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/pkgs/development/python-modules/cbor2/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "cbor2";
-  version = "5.4.2";
+  version = "5.4.2.post1";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-4oPnC1WgSf82TMXmSP3lh+TZsOh+SyZkxp5jkTXms7g=";
+    sha256 = "sha256-nPIdWWBLlSnXh3yOA0Ki66rhoH/o/1aD3HX+wVhHx5c=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index e65e6f0d808ed..72a5d8db39d75 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "certbot";
-  version = "1.22.0";
+  version = "1.24.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1wrk5rhds6a69vbs1bda0zhwpvjhd8i20did6j3kydbas3zbr516";
+    sha256 = "sha256-XIKFEPQKIV5s6sZ7LRnlTvsb3cF4KIaiVZ36cAN1AwA=";
   };
 
   sourceRoot = "source/${pname}";
diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index 762846ab34c2d..93499d0f56384 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -24,13 +24,13 @@
 
 buildPythonPackage rec {
   pname = "chalice";
-  version = "1.26.4";
+  version = "1.26.6";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Xn8OqeEihLxZS9QZtrhzau2zLg9SzQrrigK70PoImhU=";
+    sha256 = "sha256-6Y5pJg6N/F97zvkyo4r6MoThi79kI53AvlHNOmOCpFA=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix
index 1525c5ac90587..a4bd20f9cd6a8 100644
--- a/pkgs/development/python-modules/chiavdf/default.nix
+++ b/pkgs/development/python-modules/chiavdf/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "chiavdf";
-  version = "1.0.5";
+  version = "1.0.6";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2pC6sFRwgAwIEanZXe99848XMxK/lyLGxiA+UA+q3H0=";
+    hash = "sha256-Ri7j/T0nnZFml4kC0qIQkyYRJBPZMhTYxolW/A25030=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix
index e6db689a45c5f..49b36a5c6582c 100644
--- a/pkgs/development/python-modules/ciscoconfparse/default.nix
+++ b/pkgs/development/python-modules/ciscoconfparse/default.nix
@@ -33,6 +33,7 @@ buildPythonPackage rec {
     passlib
     dnspython
     loguru
+    toml
   ];
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index 6d865307f9be4..5156ad1048fb3 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -17,11 +17,11 @@
 
 buildPythonPackage rec {
   pname = "click";
-  version = "8.0.3";
+  version = "8.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-QQ6TKwUPXu13PEzalN51lxyJzbMVWnKggxE5p55ey1s=";
+    sha256 = "sha256-hFjXsSh8X7EoyQ4jOBz5nc3nS+r2x/9jhM6E1v4JCts=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix
index 563ad08381c4e..697296d9a200b 100644
--- a/pkgs/development/python-modules/clldutils/default.nix
+++ b/pkgs/development/python-modules/clldutils/default.nix
@@ -44,9 +44,15 @@ buildPythonPackage rec {
     pytest-mock
   ];
 
+  disabledTests = [
+    # uses pytest.approx which is not supported in a boolean context in pytest7
+    "test_to_dec"
+    "test_roundtrip"
+  ];
+
   meta = with lib; {
-    description = "CSV on the Web";
-    homepage = "https://github.com/cldf/csvw";
+    description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al";
+    homepage = "https://github.com/clld/clldutils";
     license = licenses.asl20;
     maintainers = with maintainers; [ ];
   };
diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix
index 473f060769833..c0480f2fa714c 100644
--- a/pkgs/development/python-modules/cma/default.nix
+++ b/pkgs/development/python-modules/cma/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "cma";
-  version = "3.1.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "CMA-ES";
     repo = "pycma";
     rev = "r${version}";
-    sha256 = "1bal4kljxrdm6x5ppyi6i109714h0czdxfsna906dlfplrmq52bf";
+    sha256 = "sha256-wLUD8HMJusUeCwwp37D/W7yJuJQcDfRwVGVKwBS6sR8=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index 5f262438fe954..8a7f9a5e1c8ac 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "cmd2";
-  version = "2.3.3";
+  version = "2.4.0";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "750d7eb04d55c3bc2a413e191bc177856f388102de47d11f2210a35266543640";
+    sha256 = "sha256-CQkJq2yOzuQIE87HWeYd1ucMgiehqOlggvXysNOUvHc=";
   };
 
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/collections-extended/default.nix b/pkgs/development/python-modules/collections-extended/default.nix
index 52f73a5554a59..b51a458109c9b 100644
--- a/pkgs/development/python-modules/collections-extended/default.nix
+++ b/pkgs/development/python-modules/collections-extended/default.nix
@@ -7,7 +7,7 @@
 }:
 buildPythonPackage rec {
   pname = "collections-extended";
-  version = "2.0.0";
+  version = "2.0.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "mlenzen";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256:1qcr1q49a134b122rpldjiim1fsl32gxs5fpj3232nyb05r68haz";
+    sha256 = "sha256-cK13+CQUELKSiLpG747+C+RB5b6luu0mWLLXTT+uGH4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix
index 7a2416728c8e1..ff642c8930e5b 100644
--- a/pkgs/development/python-modules/commoncode/default.nix
+++ b/pkgs/development/python-modules/commoncode/default.nix
@@ -20,7 +20,7 @@
 buildPythonPackage rec {
   pname = "commoncode";
   version = "30.0.0";
-  format = "setuptools";
+  format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
@@ -29,6 +29,11 @@ buildPythonPackage rec {
     sha256 = "sha256-6SeU4u6pfDuGCgCYAO5fdbWBxW9XN3WvM8j6DwUlFwM=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "intbitset >= 2.3.0, < 3.0" "intbitset >= 2.3.0"
+  '';
+
   dontConfigure = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix
index 8ae44476eff40..ce6e0a65b3429 100644
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -5,7 +5,7 @@
 
 buildPythonPackage rec {
   pname   = "construct";
-  version = "2.10.67";
+  version = "2.10.68";
 
   disabled = pythonOlder "3.6";
 
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     owner  = pname;
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1nciwim745qk41l1ck4chx3vxpfr6cq4k3a4i7vfnnrd3s6szzsw";
+    sha256 = "sha256-bp/YyRFP0rrBHPyhiqnn6o1iC5l61oedShZ2phGeqaw=";
   };
 
   # not an explicit dependency, but it's imported by an entrypoint
diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix
index cc26142d362b1..b20066c51d8b1 100644
--- a/pkgs/development/python-modules/convertdate/default.nix
+++ b/pkgs/development/python-modules/convertdate/default.nix
@@ -1,23 +1,24 @@
 { lib
 , buildPythonPackage
-, isPy27
 , fetchFromGitHub
 , pymeeus
 , pytz
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "convertdate";
-  version = "2.3.2";
-  disabled = isPy27;
+  version = "2.4.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
-  # Tests are not available in the PyPI tarball so use GitHub instead.
   src = fetchFromGitHub {
     owner = "fitnr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0k7j59sbqwyi72vcjx5vsh3qb6hxfnkfjkd2i6f6lckdr1bkh7fz";
+    hash = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE=";
   };
 
   propagatedBuildInputs = [
@@ -29,11 +30,13 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "convertdate" ];
+  pythonImportsCheck = [
+    "convertdate"
+  ];
 
   meta = with lib; {
-    homepage = "https://github.com/fitnr/convertdate";
     description = "Utils for converting between date formats and calculating holidays";
+    homepage = "https://github.com/fitnr/convertdate";
     license = licenses.mit;
     maintainers = with maintainers; [ jluttine ];
   };
diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index f1930b88fb8c4..8019fc9496655 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "coverage";
-  version = "6.2";
+  version = "6.3.2";
   # uses f strings
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8";
+    sha256 = "sha256-A+KngmCGuR7zRf8YdC7p/Eemg5zNUXBh74+hl25lLOk=";
   };
 
   # No tests in archive
diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix
index 52c1bc4067fbc..987e84ffcee2f 100644
--- a/pkgs/development/python-modules/cssselect2/default.nix
+++ b/pkgs/development/python-modules/cssselect2/default.nix
@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, flit-core
 , pythonOlder
 , fetchPypi
 , tinycss2
@@ -8,18 +9,23 @@
 
 buildPythonPackage rec {
   pname = "cssselect2";
-  version = "0.4.1";
+  version = "0.5.0";
+  format = "pyproject";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8";
+    sha256 = "sha256-2Yp7vdjrxGCTJ5GV1mmjNZvVoj+QwZ6CwZ2e7vMz5hc=";
   };
 
   postPatch = ''
     sed -i '/^addopts/d' pyproject.toml
   '';
 
+  nativeBuildInputs = [
+    flit-core
+  ];
+
   propagatedBuildInputs = [ tinycss2 ];
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix
index 90e2608069c40..fb02b0d1ef144 100644
--- a/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/pkgs/development/python-modules/cx_freeze/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "cx_Freeze";
-  version = "6.9";
+  version = "6.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "673aa3199af2ef87fc03a43a30e5d78b27ced2cedde925da89c55b5657da267b";
+    sha256 = "sha256-5bcb9XuYgawUL76+riyLDTKUtW9uSKtkAyMh47Giuic=";
   };
 
   disabled = pythonOlder "3.5";
diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index 26546c3f7cb01..af638894831d9 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "cyclonedx-python-lib";
-  version = "1.3.0";
+  version = "2.0.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "CycloneDX";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-/1kWvhTUS0JT0RwodiivJSUiWIDwQyXxdjF/KUlCNds=";
+    hash = "sha256-S1bcUCHe4UYJuSHI8LMQZ/reS6YAE0hxrpw+QweFm/8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 7af0eca747e81..ffdca65a606a0 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "2022.02.0";
+  version = "2022.02.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "dask";
     repo = pname;
     rev = version;
-    hash = "sha256-tDqpIS8j6a16YbJak+P1GkCEZvJyheWV5vkUrkhScRY=";
+    hash = "sha256-A8ktvfpow/QKAEEt9SUnkTqYFJCrV1mgnuDIP3gdyrE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index c15e673fa3ed7..7d32650302f4d 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
+, hatchling
 , decorator
 , requests
 , typing ? null
@@ -17,17 +18,22 @@
 
 buildPythonPackage rec {
   pname = "datadog";
-  version = "0.43.0";
+  version = "0.44.0";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f2123083d9e1add6f238c62714b76ac2fc134d7d1c435cd82b976487b191b96";
+    sha256 = "sha256-BxFw8MfvIlEdv3+b12xL5QDuLT1SBykApch7VJXSxzM=";
   };
 
   postPatch = ''
     find . -name '*.pyc' -exec rm {} \;
   '';
 
+  nativeBuildInputs = [
+    hatchling
+  ];
+
   propagatedBuildInputs = [ decorator requests ]
     ++ lib.optional (pythonOlder "3.5") typing
     ++ lib.optional (pythonOlder "3.0") configparser;
diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix
index ab5e929818c6e..baf27639fd4a7 100644
--- a/pkgs/development/python-modules/datasets/default.nix
+++ b/pkgs/development/python-modules/datasets/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "datasets";
-  version = "1.17.0";
+  version = "1.18.3";
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = pname;
     rev = version;
-    sha256 = "0bsk3jldvcxak64dhlxkqax7mf83z6qpwfgfk32rni1gpnz5pqbd";
+    sha256 = "sha256-2x6DpsDcVF2O5iJKeMEGw/aJwZPc7gSGaK2947c3B6s=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix
index 9008270fc79e3..004e47a60b5cc 100644
--- a/pkgs/development/python-modules/datatable/default.nix
+++ b/pkgs/development/python-modules/datatable/default.nix
@@ -44,15 +44,9 @@ buildPythonPackage rec {
   LLVM = llvm;
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1";
 
-  pytestFlagsArray = let
-    # ini file (not included in tarball) required to change python_files setting,
-    pytestIni = writeText "pytest.ini" ''
-      [pytest]
-      python_files = test_*.py test-*.py
-    '';
-  in [
-    "-c ${pytestIni}"
-  ];
+  # test suite is very cpu intensive, only run small subset to ensure package is working as expected
+  pytestFlagsArray = [ "tests/test-sets.py" ];
+
   disabledTests = [
     # skip tests which are irrelevant to our installation or use way too much memory
     "test_xfunction_paths"
diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix
index 67f5347e1e7e2..2601eedc2fa27 100644
--- a/pkgs/development/python-modules/deepdiff/default.nix
+++ b/pkgs/development/python-modules/deepdiff/default.nix
@@ -12,18 +12,21 @@
 
 buildPythonPackage rec {
   pname = "deepdiff";
-  version = "5.6.0";
+  version = "5.7.0";
   format = "setuptools";
 
   # pypi source does not contain all fixtures required for tests
   src = fetchFromGitHub {
     owner = "seperman";
     repo = "deepdiff";
-    rev = version;
-    sha256 = "sha256-ysaIeVefsTX7ZubOXaEzeS1kMyBp4/w3SHNFxsGVhzY=";
+    # 5.7.0 release not tagged https://github.com/seperman/deepdiff/issues/300
+    rev = "f2ffdb83b2993f4f0bb7e854620f0acd0bf6339e";
+    hash = "sha256-0UBx7sH2iMrLVl5FtHNTwoecLHi8GbInn75G3FSg4gk=";
   };
 
   postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace "ordered-set==4.0.2" "ordered-set"
     substituteInPlace tests/test_command.py \
       --replace '/tmp/' "$TMPDIR/"
   '';
diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix
index ef19b9a913b01..e9227891e0457 100644
--- a/pkgs/development/python-modules/detect-secrets/default.nix
+++ b/pkgs/development/python-modules/detect-secrets/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "detect-secrets";
-  version = "1.1.0";
+  version = "1.2.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-dG2YaWXAMINxBGKNMlVfGTR9QHdnepiZmN+G88X4Wak=";
+    hash = "sha256-4VcV06iaL3NAj7qF8RyfWV1zgrt928AQfjGeuO2Pbjk=";
     leaveDotGit = true;
   };
 
diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix
index 5d4f0871bf78f..34004769b1fdf 100644
--- a/pkgs/development/python-modules/devtools/default.nix
+++ b/pkgs/development/python-modules/devtools/default.nix
@@ -34,11 +34,18 @@ buildPythonPackage rec {
     pytest-mock
   ];
 
+  pytestFlagsArray = [
+    # pytest.PytestRemovedIn8Warning: Passing None has been deprecated.
+    "-W ignore::pytest.PytestRemovedIn8Warning"
+  ];
+
   disabledTests = [
     # Test for Windows32
     "test_print_subprocess"
     # sensitive to timing
     "test_multiple_not_verbose"
+    # sensitive to interpreter output
+    "test_simple_vars"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix
index cbb44fb7ca4fe..22435ae71ba56 100644
--- a/pkgs/development/python-modules/diff-cover/default.nix
+++ b/pkgs/development/python-modules/diff-cover/default.nix
@@ -52,6 +52,8 @@ buildPythonPackage rec {
     "file_does_not_exist"
     # AssertionError: assert '.c { color:...
     "test_style_defs"
+    # uses pytest.approx in a boolean context, which is unsupported since pytest7
+    "test_percent_covered"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index ee86418a66514..2055c9de13e39 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "2022.2.0";
+  version = "2022.2.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   # get full repository need conftest.py to run tests
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Gi9u7JczpnAEg53E7N5tXBfAeWZaLBVzRU3SpbU3bZU=";
+    hash = "sha256-+2KnWvjvM7vhqoCmjAGjOpPBzVozLdAXq0SVW/fs9ls=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
index bf8675af941d3..deee452ae1b4a 100644
--- a/pkgs/development/python-modules/distro/default.nix
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "distro";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424";
+    sha256 = "sha256-FRrsz2DCFkApMrUuQO5HepOfjViJiSc3igKrvoUsHDk=";
   };
 
   # tests are very targeted at individual linux distributions
diff --git a/pkgs/development/python-modules/django-appconf/default.nix b/pkgs/development/python-modules/django-appconf/default.nix
new file mode 100644
index 0000000000000..66eef9d472886
--- /dev/null
+++ b/pkgs/development/python-modules/django-appconf/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, django
+, six
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "django-appconf";
+  version = "1.0.5";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "django-compressor";
+    repo = "django-appconf";
+    rev = "v${version}";
+    hash = "sha256-nS4Hwp/NYg1XGvZO1tiE9mzJA7WFifyvgAjyp3YpqS4=";
+  };
+
+  propagatedBuildInputs = [
+    django
+  ];
+
+  preCheck = ''
+    # prove we're running tests against installed package, not build dir
+    rm -r appconf
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m django test --settings=tests.test_settings
+    runHook postCheck
+  '';
+
+  meta = with lib; {
+    description = "A helper class for handling configuration defaults of packaged apps gracefully";
+    homepage = "https://django-appconf.readthedocs.org/";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ desiderius ];
+  };
+}
diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
index 713e7214cfbc6..f590aca527f4f 100644
--- a/pkgs/development/python-modules/django-raster/default.nix
+++ b/pkgs/development/python-modules/django-raster/default.nix
@@ -2,9 +2,7 @@
   numpy, django_colorful, pillow, psycopg2,
   pyparsing, django, celery, boto3, importlib-metadata
 }:
-if lib.versionOlder django.version "2.0"
-then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2."
-else
+
 buildPythonPackage rec {
   version = "0.8.1";
   pname = "django-raster";
diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix
index 78c807903c4ef..db7d36c899339 100644
--- a/pkgs/development/python-modules/django-statici18n/default.nix
+++ b/pkgs/development/python-modules/django-statici18n/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, django, django_appconf }:
+{ lib, buildPythonPackage, fetchPypi, django, django-appconf }:
 
 buildPythonPackage rec {
   pname = "django-statici18n";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "dbcdac190d93e0b4eabcab8875c8eb68795eceb442f926843ec5cbe1432fe628";
   };
 
-  propagatedBuildInputs = [ django django_appconf ];
+  propagatedBuildInputs = [ django django-appconf ];
 
   # pypi package does not contains test harness
   # source tarball requires setting up a config
diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix
index 63e575b634549..5fd29de16107d 100644
--- a/pkgs/development/python-modules/django-widget-tweaks/default.nix
+++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix
@@ -1,4 +1,16 @@
-{ buildPythonPackage, fetchFromGitHub, python, lib, django }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# native
+, setuptools-scm
+
+# propagated
+, django
+
+# tests
+, python
+}:
 
 buildPythonPackage rec {
   pname = "django-widget-tweaks";
@@ -11,15 +23,26 @@ buildPythonPackage rec {
     sha256 = "1rhn2skx287k6nnkxlwvl9snbia6w6z4c2rqg22hwzbz5w05b24h";
   };
 
-  checkPhase = "${python.interpreter} runtests.py";
-  propagatedBuildInputs = [ django ];
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    django
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} -m django test --settings=tests.settings
+  '';
 
   meta = with lib; {
-      description = "Tweak the form field rendering in templates, not in python-level form definitions.";
-      homepage = "https://github.com/jazzband/django-widget-tweaks";
-      license = licenses.mit;
-      maintainers = with maintainers; [
-          maxxk
-      ];
+    description = "Tweak the form field rendering in templates, not in python-level form definitions.";
+    homepage = "https://github.com/jazzband/django-widget-tweaks";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      maxxk
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch
deleted file mode 100644
index da154554d1b37..0000000000000
--- a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
---- a/django/contrib/gis/gdal/libgdal.py
-+++ b/django/contrib/gis/gdal/libgdal.py
-@@ -17,7 +17,7 @@ try:
-     lib_path = settings.GDAL_LIBRARY_PATH
- except (AttributeError, EnvironmentError,
-         ImportError, ImproperlyConfigured):
--    lib_path = None
-+    lib_path = "@gdal@/lib/libgdal@extension@"
- 
- if lib_path:
-     lib_names = None
-diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
---- a/django/contrib/gis/geos/libgeos.py
-+++ b/django/contrib/gis/geos/libgeos.py
-@@ -26,7 +26,7 @@ try:
-         lib_path = settings.GEOS_LIBRARY_PATH
-     except (AttributeError, EnvironmentError,
-             ImportError, ImproperlyConfigured):
--        lib_path = None
-+        lib_path = "@geos@/lib/libgeos_c@extension@"
- 
-     # Setting the appropriate names for the GEOS-C library.
-     if lib_path:
diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix
deleted file mode 100644
index 727bf304fdb2b..0000000000000
--- a/pkgs/development/python-modules/django/2.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, substituteAll,
-  isPy3k,
-  geos, gdal, pytz, sqlparse,
-  withGdal ? false
-}:
-
-buildPythonPackage rec {
-  pname = "django";
-  version = "2.2.27";
-
-  disabled = !isPy3k;
-
-  src = fetchPypi {
-    pname = "Django";
-    inherit version;
-    sha256 = "sha256-HuNwRrC/K2HoOzoB0GcyNRbsO28rF81JsTJt1LqdyRM=";
-  };
-
-  patches = lib.optional withGdal
-    (substituteAll {
-      src = ./1.10-gis-libs.template.patch;
-      geos = geos;
-      gdal = gdal;
-      extension = stdenv.hostPlatform.extensions.sharedLibrary;
-    })
-  ;
-
-  propagatedBuildInputs = [ pytz sqlparse ];
-
-  # too complicated to setup
-  doCheck = false;
-
-  meta = with lib; {
-    description = "A high-level Python Web framework";
-    homepage = "https://www.djangoproject.com/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ georgewhewell ];
-  };
-}
diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix
deleted file mode 100644
index 5da9ed0ca26da..0000000000000
--- a/pkgs/development/python-modules/django_appconf/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }:
-buildPythonPackage rec {
-  pname = "django-appconf";
-  version = "1.0.3";
-
-  src = fetchFromGitHub {
-    owner = "django-compressor";
-    repo = "django-appconf";
-    rev = version;
-    sha256 = "06hwbz7362y0la9np3df25mms235fcqgpd2vn0mnf8dri9spzy1h";
-  };
-
-  propagatedBuildInputs = [ six django ];
-
-  patches = [
-    (fetchpatch {
-      name = "backport_django_2_2.patch";
-      url = "https://github.com/django-compressor/django-appconf/commit/1526a842ee084b791aa66c931b3822091a442853.patch";
-      sha256 = "1vl2s6vlf15089s8p4c3g4d5iqm8jva66bdw683r8440f80ixgmw";
-    })
-  ];
-
-  checkPhase = ''
-    # prove we're running tests against installed package, not build dir
-    rm -r appconf
-    python -m django test --settings="tests.test_settings"
-  '';
-
-  meta = with lib; {
-    description = "A helper class for handling configuration defaults of packaged apps gracefully";
-    homepage = "https://django-appconf.readthedocs.org/";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ desiderius ];
-  };
-}
diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix
index a8204eab5fad2..82684b52374ac 100644
--- a/pkgs/development/python-modules/django_compressor/default.nix
+++ b/pkgs/development/python-modules/django_compressor/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi,
-  rcssmin, rjsmin, django_appconf }:
+  rcssmin, rjsmin, django-appconf }:
 
 buildPythonPackage rec {
     pname = "django_compressor";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     # requires django-sekizai, which we don't have packaged yet
     doCheck = false;
 
-    propagatedBuildInputs = [ rcssmin rjsmin django_appconf ];
+    propagatedBuildInputs = [ rcssmin rjsmin django-appconf ];
 
     meta = with lib; {
       description = "Compresses linked and inline JavaScript or CSS into single cached files";
diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix
index 3f717b0fb5ce1..88bbdfdeddb99 100644
--- a/pkgs/development/python-modules/django_contrib_comments/default.nix
+++ b/pkgs/development/python-modules/django_contrib_comments/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "django-contrib-comments";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d82f1d04690550df026553053903deec0c52dc54212e1b79241b08f0355cff2c";
+    sha256 = "sha256-SN4A8VZ34BaiFq7/IF1uAOQ5HJpXAhNsZBGcRytzVto=";
   };
 
   propagatedBuildInputs = [ django ];
diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix
index 1bf4d6b4dab55..f6bc72dc226a5 100644
--- a/pkgs/development/python-modules/django_reversion/default.nix
+++ b/pkgs/development/python-modules/django_reversion/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "django-reversion";
-  version = "4.0.2";
+  version = "5.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-XTO6lE2/GccDDJ5w43MSSK40Nozyr+3hDg0I+/ieb4w=";
+    sha256 = "sha256-C63jw5k4dFEIfwxng14NPRhtdn3mpcW6U6iOr8Pyccg=";
   };
 
   # tests assume the availability of a mysql/postgresql database
diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix
index 55a91006b06a8..03677faa689fa 100644
--- a/pkgs/development/python-modules/dm-haiku/default.nix
+++ b/pkgs/development/python-modules/dm-haiku/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "dm-haiku";
-  version = "0.0.5";
+  version = "0.0.6";
 
   src = fetchFromGitHub {
     owner = "deepmind";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1mdqjcka0m1div63ngba8w8z94id4c1h8xqmnq1xpmgkc79224wa";
+    sha256 = "sha256-qvKMeGPiWXvvyV+GZdTWdsC6Wp08AmP8nDtWk7sZtqM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix
index 59730bff71ecf..5676d270935f7 100644
--- a/pkgs/development/python-modules/dnspython/default.nix
+++ b/pkgs/development/python-modules/dnspython/default.nix
@@ -5,6 +5,7 @@
 , pythonOlder
 , setuptools-scm
 , pytestCheckHook
+, cacert
 }:
 
 buildPythonPackage rec {
@@ -20,16 +21,23 @@ buildPythonPackage rec {
 
   checkInputs = [
     pytestCheckHook
+  ] ++ lib.optional stdenv.isDarwin [
+    cacert
   ];
 
   disabledTests = [
     # dns.exception.SyntaxError: protocol not found
     "test_misc_good_WKS_text"
-  ] ++ lib.optionals stdenv.isDarwin [
-    # unable to get local issuer certificate
-    "test_async"
-    "test_query"
+    # fails if IPv6 isn't available
     "test_resolver_override"
+
+  # Tests that run inconsistently on darwin systems
+  ] ++ lib.optionals stdenv.isDarwin [
+    # 9 tests fail with: BlockingIOError: [Errno 35] Resource temporarily unavailable
+    "testQueryUDP"
+    # 6 tests fail with: dns.resolver.LifetimeTimeout: The resolution lifetime expired after ...
+    "testResolveCacheHit"
+    "testResolveTCP"
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix
index c7c66fceaa7cd..95b7adc474af0 100644
--- a/pkgs/development/python-modules/doit/default.nix
+++ b/pkgs/development/python-modules/doit/default.nix
@@ -8,6 +8,7 @@
 , cloudpickle
 , pyinotify
 , macfsevents
+, toml
 }:
 
 buildPythonPackage rec {
@@ -21,8 +22,10 @@ buildPythonPackage rec {
     sha256 = "sha256-OIER+Kals7RGIM7rKH0FhZJ8hdDW0/h5DTT7tFwM9sM=";
   };
 
-  propagatedBuildInputs = [ cloudpickle ]
-    ++ lib.optional stdenv.isLinux pyinotify
+  propagatedBuildInputs = [
+    cloudpickle
+    toml
+  ] ++ lib.optional stdenv.isLinux pyinotify
     ++ lib.optional stdenv.isDarwin macfsevents;
 
   # hangs on darwin
diff --git a/pkgs/development/python-modules/dotmap/default.nix b/pkgs/development/python-modules/dotmap/default.nix
index 16ea974f5a0f4..b0627160e3ee7 100644
--- a/pkgs/development/python-modules/dotmap/default.nix
+++ b/pkgs/development/python-modules/dotmap/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "dotmap";
-  version = "1.3.27";
+  version = "1.3.29";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-gHCQIN8CIeF8TgHWeQu8GCRxK1aQFJJ/d7jZurxxMik=";
+    hash = "sha256-5mhR+Ey8RrruucUIt5LxBNM6OBUWbLy5jNOWg6tzxRE=";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix
index f4a24a7a7f8a7..8b51d829c8df1 100644
--- a/pkgs/development/python-modules/dunamai/default.nix
+++ b/pkgs/development/python-modules/dunamai/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "dunamai";
-  version = "1.10.0";
+  version = "1.11.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "mtkennerly";
     repo = "dunamai";
     rev = "v${version}";
-    sha256 = "sha256-Sp0yfNkFwNc2qR9aSPteBqZcqRokM9whOVmduXVK3CI=";
+    sha256 = "sha256-nkE9QBziCQA/aN+Z0OuqJlf5FJ4fidE7u5Gt25zjX0c=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix
index dafbcfc2f5cd0..3ee79ae448049 100644
--- a/pkgs/development/python-modules/dynalite-devices/default.nix
+++ b/pkgs/development/python-modules/dynalite-devices/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "dynalite-devices";
-  version = "0.1.46";
+  version = "0.46";
 
   src = fetchFromGitHub {
     owner = "ziv1234";
     repo = "python-dynalite-devices";
-    rev = "v0.46"; # https://github.com/ziv1234/python-dynalite-devices/issues/2
+    rev = "v${version}"; # https://github.com/ziv1234/python-dynalite-devices/issues/2
     hash = "sha256-Fju2JpFkQBCbOln7r3L+crv82TI2SkdPJ1oaK7PEifo=";
   };
 
diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix
index c98a8b572d454..97707e0e9fd43 100644
--- a/pkgs/development/python-modules/easyprocess/default.nix
+++ b/pkgs/development/python-modules/easyprocess/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "EasyProcess";
-  version = "0.3";
+  version = "1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "115rzzr0hx4af4m6krf7dxn8851n4l8jfxahjzjc2r0zq2m8v57v";
+    sha256 = "sha256-iFiYMCpXqrlIlz6LXTKkIpOSufstmGqx1P/VkOW6kOw=";
   };
 
   # No tests
diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix
index a26d6ede8904f..1223f3f911dec 100644
--- a/pkgs/development/python-modules/entrypoints/default.nix
+++ b/pkgs/development/python-modules/entrypoints/default.nix
@@ -1,31 +1,36 @@
 { lib
 , buildPythonPackage
+, pythonOlder
 , fetchPypi
+, flit-core
 , configparser
-, pytest
-, isPy3k
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "entrypoints";
-  version = "0.3";
+  version = "0.4";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451";
+    sha256 = "sha256-twbt2qkhihnrzWe1aBjwW7J1ibHKno15e3Sv+tTMrNQ=";
   };
 
-  checkInputs = [ pytest ];
-
-  propagatedBuildInputs = lib.optional (!isPy3k) configparser;
+  nativeBuildInputs = [
+    flit-core
+  ];
 
-  checkPhase = ''
-    py.test tests
-  '';
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  meta = {
+  meta = with lib; {
     description = "Discover and load entry points from installed packages";
     homepage = "https://github.com/takluyver/entrypoints";
-    license = lib.licenses.mit;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index 048edf64d38f8..728339621f897 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "faker";
-  version = "11.3.0";
+  version = "13.3.0";
 
   src = fetchPypi {
     pname = "Faker";
     inherit version;
-    hash = "sha256-rb5WfmTaahCX/qyraZAA4a0W4Xplkqjwrh7gt/vxmIc=";
+    hash = "sha256-YYsUDHdHV4bb46VAmtU1Ict2dGq3pcd7mcZj8+8bG8I=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix
index 42f8a4860509a..e1c6fee726eb5 100644
--- a/pkgs/development/python-modules/faraday-plugins/default.nix
+++ b/pkgs/development/python-modules/faraday-plugins/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "faraday-plugins";
-  version = "1.6.1";
+  version = "1.6.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "infobyte";
     repo = "faraday_plugins";
     rev = "v${version}";
-    sha256 = "sha256-NpPVA+fruI/xX0KMjRuRuMK8HYc/0ErbDhJOCNXKhyY=";
+    sha256 = "sha256-1YROdQvwfV5Wp7vsNYCy2X6yR6mplunchD0U4xGUNBc=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix
index 0364022fa2864..b1281c686d87d 100644
--- a/pkgs/development/python-modules/fasteners/default.nix
+++ b/pkgs/development/python-modules/fasteners/default.nix
@@ -1,47 +1,32 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, six
-, monotonic
+, fetchFromGitHub
 , diskcache
-, more-itertools
-, testtools
-, isPy3k
-, nose
-, futures ? null
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "fasteners";
-  version = "0.16.3";
+  version = "0.17.3";
+  format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b1ab4e5adfbc28681ce44b3024421c4f567e705cc3963c732bf1cba3348307de";
+  src = fetchFromGitHub {
+    owner = "harlowja";
+    repo = pname;
+    rev = version;
+    hash = "sha256-FVhHp8BZ/wQQyr5AcuDo94LlflixhjZ0SnheSdHuDVQ=";
   };
 
-  propagatedBuildInputs = [
-    six
-    monotonic
-  ];
-
   checkInputs = [
     diskcache
-    more-itertools
-    testtools
-    nose
-  ] ++ lib.optionals (!isPy3k) [
-    futures
+    pytestCheckHook
   ];
 
-  checkPhase = ''
-    nosetests
-  '';
-
   meta = with lib; {
     description = "A python package that provides useful locks";
     homepage = "https://github.com/harlowja/fasteners";
     license = licenses.asl20;
+    maintainers = with maintainers; [ ];
   };
 
 }
diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix
index 8eaed65ca73c2..16379ef85e1ef 100644
--- a/pkgs/development/python-modules/filelock/default.nix
+++ b/pkgs/development/python-modules/filelock/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "filelock";
-  version = "3.4.2";
+  version = "3.6.0";
   format = "pyproject";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80";
+    sha256 = "sha256-nNVAqTUuQyxyRqSP5OhxKxCssd8q0fMOjAcLgq4f7YU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix
new file mode 100644
index 0000000000000..ad35f379b906b
--- /dev/null
+++ b/pkgs/development/python-modules/findpython/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+
+# build time
+, pdm-pep517
+
+# runtime
+, packaging
+
+# tests
+, pytestCheckHook
+}:
+
+let
+  pname = "findpython";
+  version = "0.1.3";
+in
+buildPythonPackage {
+  inherit pname version;
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-tVpBa5/PLShyG/vqHOsqbLZ6APmexLlKdtoix6IAKHA=";
+  };
+
+  nativeBuildInputs = [
+    pdm-pep517
+  ];
+
+  propagatedBuildInputs = [
+    packaging
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "findpython"
+  ];
+
+  meta = with lib; {
+    description = "A utility to find python versions on your system";
+    homepage = "https://github.com/frostming/findpython";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix
index fff330946d168..26e5feca03e39 100644
--- a/pkgs/development/python-modules/flask-compress/default.nix
+++ b/pkgs/development/python-modules/flask-compress/default.nix
@@ -1,25 +1,43 @@
-{ lib, fetchPypi, buildPythonPackage, flask
+{ lib
+, fetchPypi
+, buildPythonPackage
+, setuptools-scm
+, flask
 , brotli
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
-  version = "1.10.1";
+  version = "1.11";
   pname = "Flask-Compress";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "28352387efbbe772cfb307570019f81957a13ff718d994a9125fa705efb73680";
+    sha256 = "sha256-9WnzLERtayXKjjR9UAOgUxgR73MmeABbADb8HJ6xwhw=";
   };
 
-  postPatch = ''
-    sed -i -e 's/use_scm_version=.*/version="${version}",/' setup.py
-  '';
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
 
-  propagatedBuildInputs = [ flask brotli ];
+  propagatedBuildInputs = [
+    flask
+    brotli
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "flask_compress"
+  ];
 
   meta = with lib; {
     description = "Compress responses in your Flask app with gzip";
-    homepage = "https://libwilliam.github.io/flask-compress/";
+    homepage = "https://github.com/colour-science/flask-compress";
+    changelog = "https://github.com/colour-science/flask-compress/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix
index ddf5aa05c493b..e88556c07d020 100644
--- a/pkgs/development/python-modules/flask-security-too/default.nix
+++ b/pkgs/development/python-modules/flask-security-too/default.nix
@@ -28,12 +28,12 @@
 
 buildPythonPackage rec {
   pname = "flask-security-too";
-  version = "4.1.2";
+  version = "4.1.3";
 
   src = fetchPypi {
     pname = "Flask-Security-Too";
     inherit version;
-    sha256 = "16ws5n08vm7wsa2f7lrkxvc7jl3ah1xfylhhyzb4vvqmlk7x9hw8";
+    sha256 = "sha256-mW2NKGeJpyR4Ri7m+KE3ElSg3E+P7qbzNTTCo3cskc8=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index 6c05367b3d477..6b49d2d2a6ee1 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -12,12 +12,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.0.2";
+  version = "2.0.3";
   pname = "Flask";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7b2fb8e934ddd50731893bdcdb00fc8c0315916f9fcd50d22c7cc1a95ab634e2";
+    sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 50f5e87a29f49..84f2edb721020 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "4.29.0";
+  version = "4.29.1";
 
   # Bump to 3.7 when https://github.com/fonttools/fonttools/pull/2417 is merged
   disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner  = pname;
     repo   = pname;
     rev    = version;
-    sha256 = "LnkpTEpZbbRAyqGPJXdfpHjh4t7n6LkjZGLhirVNl7E=";
+    sha256 = "sha256-xviNGFcb1wj5WuA6UxHpw3BkpdjSJL3fbsBytJacp8w=";
   };
 
   # all dependencies are optional, but
diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index 0ab3778f55cf4..6915ba8d050c9 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -20,11 +20,11 @@
 
 buildPythonPackage rec {
   pname = "fs";
-  version = "2.4.14";
+  version = "2.4.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9555dc2bc58c58cac03478ac7e9f622d29fe2d20a4384c24c90ab50de2c7b36c";
+    sha256 = "sha256-sJ0CwxH0rdHm4rdXJMRQ6vz+7MkXV5IkyorSHazQoYI=";
   };
 
   buildInputs = [ glibcLocales ];
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index 5ea93ec179ecb..d214cb4f0a437 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "ftfy";
-  version = "6.0.3";
+  version = "6.1.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ba71121a9c8d7790d3e833c6c1021143f3e5c4118293ec3afb5d43ed9ca8e72b";
+    sha256 = "sha256-v8IBn4T82FFBkVIyCmN1YEoPFFnCgbWxmbLNDS5yf48=";
   };
 
   propagatedBuildInputs = [
@@ -29,6 +29,12 @@ buildPythonPackage rec {
     export PATH=$out/bin:$PATH
   '';
 
+  disabledTestPaths = [
+    # Calls poetry and fails to match output exactly
+    "tests/test_cli.py"
+  ];
+
+
   meta = with lib; {
     description = "Given Unicode text, make its representation consistent and possibly less broken";
     homepage = "https://github.com/LuminosoInsight/python-ftfy";
diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix
index c476960bbf836..be6abbd836443 100644
--- a/pkgs/development/python-modules/genshi/default.nix
+++ b/pkgs/development/python-modules/genshi/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "Genshi";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c12d6c2abf7df0ec661d9ff2e197522eae846e43dc58abd5a36443d05bc41135";
+    sha256 = "sha256-NKLOi4DoQ/Ygxbe35ZqqNip2zpdkpvEQMig+2UWMOlk=";
   };
 
   # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase)
diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix
index 691af2eda8497..9d1fdc07d9017 100644
--- a/pkgs/development/python-modules/gidgethub/default.nix
+++ b/pkgs/development/python-modules/gidgethub/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "gidgethub";
-  version = "5.0.1";
+  version = "5.1.0";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3efbd6998600254ec7a2869318bd3ffde38edc3a0d37be0c14bc46b45947b682";
+    sha256 = "sha256-kNGTb6mA2XBaljYvpOWaKFEks3NigsiPgmdIgSMKTiU=";
   };
 
   nativeBuildInputs = [ setuptools pytest-runner ];
diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix
index 1f5c983e14f38..67e1868fb8b1a 100644
--- a/pkgs/development/python-modules/github3_py/default.nix
+++ b/pkgs/development/python-modules/github3_py/default.nix
@@ -18,11 +18,11 @@
 
 buildPythonPackage rec {
   pname = "github3.py";
-  version = "3.0.0";
+  version = "3.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a9134cb9efd334b1644ad7c5ee3ff3ff488317c4549ffc0e8d82e4d63383a1a4";
+    sha256 = "sha256-Cbcr4Ul9NGsJaM3oNgoNavedwgbQFJpjzT7IbGXDd8w=";
   };
 
   checkInputs = [ betamax pytest betamax-matchers ]
diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix
index 27c70c78a66ed..b750164ccf7a8 100644
--- a/pkgs/development/python-modules/goodwe/default.nix
+++ b/pkgs/development/python-modules/goodwe/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "goodwe";
-  version = "0.2.16";
+  version = "0.2.17";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "marcelblijleven";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-qW1wD6QVLqGhEnpGqNjZ50jb/3HHooohfHz+p4/ZH74=";
+    sha256 = "sha256-Lx7jvL7Fyq8fqJQq8ZgEG/V20+tHxw3yl3s7scAwwjA=";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index 772f45411d397..493bda2f9d5c6 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "2.35.0";
+  version = "2.39.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "038b12979ea86ef0e33962bd33f955c337bc28f0471522bd27a801d52bfb4ae2";
+    sha256 = "sha256-QBFpIV7K+1r7aD0/4OQ8BZ62Jccf6hkp8WQD3acqLcE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
index 9763cd4e0ba32..d6cc1f35e61c2 100644
--- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigtable";
-  version = "2.7.1";
+  version = "2.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TUMgrv1JNt8h6DzCNtk0Fm4LQFC73/FNfpgTs9jhkYs=";
+    hash = "sha256-FLnEEsbTie1Z/9Y8nLzvLFbxiexUL4GFa8jCcEAYK1s=";
   };
 
   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 f7c79521b6323..76c686c951ad0 100644
--- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -8,15 +8,19 @@
 , proto-plus
 , pytestCheckHook
 , pytest-asyncio
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-secret-manager";
-  version = "2.9.2";
+  version = "2.10.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-W93SDJR8bUPQX9KzoZ6YvV9kU+Twd9huH09Smap481g=";
+    hash = "sha256-nQfdej2SveO0Qxam57ZRAyTQ0NnGoyb4nx2YFnqtAhI=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix
index 08e27c1948734..d546046192523 100644
--- a/pkgs/development/python-modules/graphql-relay/default.nix
+++ b/pkgs/development/python-modules/graphql-relay/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "graphql-relay";
-  version = "3.1.0";
+  version = "3.1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-cNWn7lmV6nwqmjflEidmOxpGTx9A6Y/d6VC+VBXf4LQ=";
+    sha256 = "sha256-En9AkT8Ry4R0Uu95STEmGq47Ii6q+Xb3yEMCmFNOVNM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/pkgs/development/python-modules/graphql-subscription-manager/default.nix
index 2ca6a134ee271..ab12d3500886f 100644
--- a/pkgs/development/python-modules/graphql-subscription-manager/default.nix
+++ b/pkgs/development/python-modules/graphql-subscription-manager/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "graphql-subscription-manager";
-  version = "0.5.5";
+  version = "0.5.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "PyGraphqlWebsocketManager";
     rev = version;
-    hash = "sha256-7MqFsttMNnWmmWKj1zaOORBTDGt6Wm8GU7w56DfPl2c=";
+    hash = "sha256-nieKl25yDc3FHnMqwn6FNzWKd8sas3rTlBonYbJc1tg=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix
index 881dec6b932f9..46a541fe50409 100644
--- a/pkgs/development/python-modules/graphviz/default.nix
+++ b/pkgs/development/python-modules/graphviz/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
@@ -58,6 +59,9 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
+  # Too many failures due to attempting to connect to com.apple.fonts daemon
+  doCheck = !stdenv.isDarwin;
+
   meta = with lib; {
     description = "Simple Python interface for Graphviz";
     homepage = "https://github.com/xflr6/graphviz";
diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix
index 10e7190d1fde7..1a246461e5f7d 100644
--- a/pkgs/development/python-modules/graspologic/default.nix
+++ b/pkgs/development/python-modules/graspologic/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "graspologic";
-  version = "0.3.1";
+  version = "1.0.0";
 
   disabled = isPy27;
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "graspologic";
     rev = "v${version}";
-    sha256 = "07dmfb1aplha01d22b41js7634dac4v28pv1l3bzssqhi4yyds7h";
+    sha256 = "sha256-mzJ3eFo77gnOh/Vs9u68yFDZW3ilXtcCCwKahKyRRmc=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix
index b20426c0288fa..fc069dccbaf7e 100644
--- a/pkgs/development/python-modules/grpcio-status/default.nix
+++ b/pkgs/development/python-modules/grpcio-status/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "grpcio-status";
-  version = "1.43.0";
+  version = "1.44.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-IXWQBvNqf/v/GH1BkfQRjActiqn6aCOhGq14QqPGzNA=";
+    sha256 = "sha256-rGE6t6RTgMv6PlKQItCzcxfYWPFyum5lwYiqc1VTk5g=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index 78d952f4cb973..c428be6430757 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "grpcio-tools";
-  version = "1.43.0";
+  version = "1.44.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f42f1d713096808b1b0472dd2a3749b712d13f0092dab9442d9c096446e860b2";
+    sha256 = "sha256-vjf0WOpRDJqPHKq7wrJY0S5V0YmlZ/Xtys6Q8n3A778=";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index d500c64532133..f703820a4f5c5 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "gssapi";
-  version = "1.7.2";
+  version = "1.7.3";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "pythongssapi";
     repo = "python-${pname}";
     rev = "v${version}";
-    sha256 = "1xdcnm66b07m7chf04pp58p3khvy547hns1fw1xffd4n51kl42pp";
+    sha256 = "sha256-/1YOnG6sCP8G8J3K2/RycTC95rXW9M+U3Mjz4GCt13s=";
   };
 
   # It's used to locate headers
diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index 1616343f8b436..aff7d1a297816 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "gym";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "12b545xz0r2g4z5r7f8amxl7nm0lqymkzwcwhg1bni9h0sxwpv6c";
+    rev = version;
+    sha256 = "sha256-JbPWLuQGo+fErUlCKKpMwWdu0KvXBDuH2MeAHdJCTgM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix
index f3d37dacfa3c7..be4802566f75d 100644
--- a/pkgs/development/python-modules/h11/default.nix
+++ b/pkgs/development/python-modules/h11/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "h11";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0hk0nll6qazsambp3kl8cxxsbl4gv5y9252qadyk0jky0sv2q8j7";
+    sha256 = "sha256-cIE8ETUIeiSKTTjMDhoBgf+rIYgUGpPq9WeUDDlX/wY=";
   };
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/hachoir/default.nix b/pkgs/development/python-modules/hachoir/default.nix
index 2c46b14a27445..c7d4178e3bf9a 100644
--- a/pkgs/development/python-modules/hachoir/default.nix
+++ b/pkgs/development/python-modules/hachoir/default.nix
@@ -3,17 +3,21 @@
 , fetchFromGitHub
 , pytestCheckHook
 , urwid
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "hachoir";
-  version = "3.1.2";
+  version = "3.1.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "vstinner";
     repo = pname;
     rev = version;
-    sha256 = "06544qmmimvaznwcjs8wwfih1frdd7anwcw5z07cf69l8p146p0y";
+    hash = "sha256-HlxDwkU0GccO+IUzbtVpLbsAo+Mcacm4/WrXWCsmpBg=";
   };
 
   propagatedBuildInputs = [
@@ -24,7 +28,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "hachoir" ];
+  pythonImportsCheck = [
+    "hachoir"
+  ];
 
   meta = with lib; {
     description = "Python library to view and edit a binary stream";
diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index b70c808197544..512f92deb1b61 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "1.0.4";
+  version = "1.0.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "danielperna84";
     repo = pname;
     rev = version;
-    sha256 = "sha256-YpsZKhuK3IzUZFNmBToBOuUacaDgbMC/N7pZDjuSzbE=";
+    sha256 = "sha256-8iLQpNax0xgjf+vUo6OcXMF1aZuaRFZBos8EC1gJEPA=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index e7732e1f6a426..edf19d0e190ff 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -28,7 +28,8 @@ buildPythonPackage rec {
     sed -i 's/"acme.*"/"acme"/' setup.py
     substituteInPlace setup.py \
       --replace "cryptography>=2.8,<4.0" "cryptography" \
-      --replace "snitun==" "snitun>="
+      --replace "snitun==" "snitun>=" \
+      --replace "pycognito==2022.01.0" "pycognito"
   '';
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix
index 6a0a3793d87b2..b710e5fb2e263 100644
--- a/pkgs/development/python-modules/hatasmota/default.nix
+++ b/pkgs/development/python-modules/hatasmota/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "hatasmota";
-  version = "0.3.1";
+  version = "0.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "emontnemery";
     repo = pname;
     rev = version;
-    sha256 = "sha256-/am6cRhAdiqMq0u7Ed4qhIA+Em2O0gIt7HfP19+2XHw=";
+    sha256 = "sha256-r9EBuaKxc7Vcdfk8zoDpIi2i6yIGc7soSWx+RjG+SZo=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix
new file mode 100644
index 0000000000000..09cbdead671a3
--- /dev/null
+++ b/pkgs/development/python-modules/hatchling/default.nix
@@ -0,0 +1,79 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+
+# runtime
+, editables
+, importlib-metadata # < 3.8
+, packaging
+, pathspec
+, pluggy
+, tomli
+
+# tests
+, build
+, python
+, requests
+, toml
+, virtualenv
+}:
+
+let
+  pname = "hatchling";
+  version = "0.20.1";
+in
+buildPythonPackage {
+  inherit pname version;
+  format = "pyproject";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-l1VRce5H3CSAwZBeuxRyy7bNpOM6zX5s2L1/DXPo/Bg=";
+  };
+
+  # listed in backend/src/hatchling/ouroboros.py
+  propagatedBuildInputs = [
+    editables
+    packaging
+    pathspec
+    pluggy
+    tomli
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
+  ];
+
+  pythonImportsCheck = [
+    "hatchling"
+    "hatchling.build"
+  ];
+
+  # tries to fetch packages from the internet
+  doCheck = false;
+
+  # listed in /backend/tests/downstream/requirements.txt
+  checkInputs = [
+    build
+    packaging
+    requests
+    toml
+    virtualenv
+  ];
+
+  preCheck = ''
+    export HOME=$TMPDIR
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} tests/downstream/integrate.py
+    runHook postCheck
+  '';
+
+  meta = with lib; {
+    description = "Modern, extensible Python build backend";
+    homepage = "https://ofek.dev/hatch/latest/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ofek ];
+  };
+}
diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix
index eccdcdaed422a..6ccde29313b73 100644
--- a/pkgs/development/python-modules/hg-git/default.nix
+++ b/pkgs/development/python-modules/hg-git/default.nix
@@ -3,24 +3,34 @@
 , fetchPypi
 , dulwich
 , mercurial
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "hg-git";
-  version = "0.10.3";
+  version = "1.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "27e6d7686a1548d4632dcc977f2ff3ce2e42d80735339b1f3b389b7481260cc4";
+    hash = "sha256-ORGDOWLrnImca+qPtJZmyC8hGxJNCEC+tq2V4jpGIbY=";
   };
 
-  propagatedBuildInputs = [ dulwich mercurial ];
+  propagatedBuildInputs = [
+    dulwich
+    mercurial
+  ];
+
+  pythonImportsCheck = [
+    "hggit"
+  ];
 
   meta = with lib; {
     description = "Push and pull from a Git server using Mercurial";
     homepage = "https://hg-git.github.io/";
-    maintainers = with maintainers; [ koral ];
     license = licenses.gpl2Only;
+    maintainers = with maintainers; [ koral ];
   };
-
 }
diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix
index 17f5126367bf4..bdeff30b76129 100644
--- a/pkgs/development/python-modules/hmmlearn/default.nix
+++ b/pkgs/development/python-modules/hmmlearn/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "hmmlearn";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchurl {
     url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz";
-    sha256 = "2a289cf28b31be59fa8ba5d3253d4a2a992401d45a8cdc221ae484fbf390c0d7";
+    sha256 = "sha256-a0snIPJ6912pNnq02Q3LAPONozFo322Rf57F3mZw9uE=";
   };
 
   buildInputs = [ setuptools-scm cython ];
diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix
index 79d979b10a97c..7f028c478fc5c 100644
--- a/pkgs/development/python-modules/httpcore/default.nix
+++ b/pkgs/development/python-modules/httpcore/default.nix
@@ -12,6 +12,7 @@
 , pytest-cov
 , pytest-httpbin
 , sniffio
+, socksio
 , trio
 , trustme
 , uvicorn
@@ -19,22 +20,28 @@
 
 buildPythonPackage rec {
   pname = "httpcore";
-  version = "0.14.4";
+  version = "0.14.7";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
     rev = version;
-    sha256 = "19zsg8ijw0s1722ka67mjxx5z07lx9jq36z97l1fa6z1129wq240";
+    sha256 = "sha256-h+3MfP1p/ifN0mF/xxrOKPTjD4Q7WzRh94YO4DYSuXE=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "h11>=0.11,<0.13" "h11>=0.11,<0.14"
+  '';
+
   propagatedBuildInputs = [
     anyio
     certifi
     h11
     h2
     sniffio
+    socksio
   ];
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index cd2134418a753..9fc6b4ff14400 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -52,7 +52,13 @@ buildPythonPackage rec {
     # ValueError: Unable to load PEM file.
     # https://github.com/httplib2/httplib2/issues/192#issuecomment-993165140
     "test_client_cert_password_verified"
-  ] ++ lib.optionals (stdenv.isDarwin) [
+
+    # improper pytest marking
+    "test_head_301"
+    "test_303"
+  ] ++ lib.optionals stdenv.isDarwin [
+    # fails with "ConnectionResetError: [Errno 54] Connection reset by peer"
+    "test_connection_close"
     # fails with HTTP 408 Request Timeout, instead of expected 200 OK
     "test_timeout_subsequent"
     "test_connection_close"
diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix
index 0a5b510b0ad9c..963a9ff5ebfe2 100644
--- a/pkgs/development/python-modules/httptools/default.nix
+++ b/pkgs/development/python-modules/httptools/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "httptools";
-  version = "0.3.0";
+  version = "0.4.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3f9b4856d46ba1f0c850f4e84b264a9a8b4460acb20e865ec00978ad9fbaa4cf";
+    sha256 = "sha256-LJqTDDeLPRXWtpX7levP+BpzlbT5d1xPEKB2vrCywf8=";
   };
 
   # tests are not included in pypi tarball
diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
index d479cc1f13ced..dbf8d1745c0e5 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/pkgs/development/python-modules/httpx/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "httpx";
-  version = "0.21.3";
+  version = "0.22.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "encode";
     repo = pname;
     rev = version;
-    sha256 = "01069b0kj6vnb26xazlz06rj4yncy5nkq76pajvzx0pmpjkniiz9";
+    sha256 = "sha256-hQmQodGpVG23IZSsWV7rB1iB6QAudDao/8YshIgpmas=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
index cf0b27c6c5b3a..3bbc8ad2669e9 100644
--- a/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "huggingface-hub";
-  version = "0.1.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "huggingface_hub";
     rev = "v${version}";
-    sha256 = "1pmi76vinwwn0bcxy5hj8pxhzqxdbzp0y3hsd631yyys01s0n6xd";
+    sha256 = "sha256-rrkubNy60e/1VcGacYQang4yWxUzIBGySxZyq6G1arw=";
   };
 
   nativeBuildInputs = [ packaging ];
diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix
index d0b2464608b94..fa13cdab0c23a 100644
--- a/pkgs/development/python-modules/humanize/default.nix
+++ b/pkgs/development/python-modules/humanize/default.nix
@@ -9,7 +9,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.13.1";
+  version = "4.0.0";
   pname = "humanize";
   format = "pyproject";
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "jmoiron";
     repo = pname;
     rev = version;
-    sha256 = "sha256-lgGBvYb3ciqETBOR31gxQVD7YyopTtmr++nCwvm63Zs=";
+    sha256 = "sha256-v4OdZmUI2LCick4qCSGOHJ7jtWybwKTeTeIcly+QQQQ=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index 89aac153172d7..c928a13950cac 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # If you need these, you can just add them to your environment.
 
   pname = "hypothesis";
-  version = "6.35.0";
+  version = "6.38.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "HypothesisWorks";
     repo = "hypothesis-python";
     rev = "hypothesis-python-${version}";
-    sha256 = "08wph7q3c08480ma2p7m7mamy0g7g7r5jqpwdyhdga4cfg734527";
+    sha256 = "sha256-JLAM9gBf/Lh+UO7audy6V2jEPg5Cn4DR7moQV7VBwGc=";
   };
 
   postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";
diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix
index ee8b897154bdb..33174deb65730 100644
--- a/pkgs/development/python-modules/hypothesmith/default.nix
+++ b/pkgs/development/python-modules/hypothesmith/default.nix
@@ -17,7 +17,11 @@ buildPythonPackage rec {
 
   checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ];
 
-  pytestFlagsArray = [ "-v" ];  # tests are fairly slow, prevents timeout due to no stdout printing
+  pytestFlagsArray = [
+    "-v"
+    "--numprocesses $NIX_BUILD_CORES"
+  ];
+
   pythonImportsCheck = [ "hypothesmith" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix
index 61966bc7de76b..b09d5bd565ff1 100644
--- a/pkgs/development/python-modules/hyppo/default.nix
+++ b/pkgs/development/python-modules/hyppo/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "hyppo";
-  version = "0.2.2";
+  version = "0.3.2";
 
   disabled = pythonOlder "3.6";
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "neurodata";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1wrzrppyjq0pc03bn6qcslxzcnwn7fr2z5lm71gfpli5k05i26nr";
+    sha256 = "sha256-DQ5DrQrFBJ3dnGAjD1c/7GCJeR3g+aL2poR4hwOvmPA=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index 98495932fdaf1..9c449c69b7700 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -1,26 +1,36 @@
 { lib
+, stdenv
 , buildPythonPackage
 , isPy27
 , fetchPypi
-, fetchpatch
+, substituteAll
 , imageio-ffmpeg
 , numpy
 , pillow
 , psutil
 , pytestCheckHook
 , tifffile
+, fsspec
+, libGL
 }:
 
 buildPythonPackage rec {
   pname = "imageio";
-  version = "2.14.1";
+  version = "2.16.1";
   disabled = isPy27;
 
   src = fetchPypi {
-    sha256 = "sha256-cJwY+ACYHkKGq+S9hrbJtbtuKFtrkztboJYu+OeZQFg=";
+    sha256 = "sha256-fxI8sjp3rFq+jtTnrWpggxqC3ixdEjRj3PHUJ4xHedI=";
     inherit pname version;
   };
 
+  patches = [
+    (substituteAll {
+      src = ./libgl-path.patch;
+      libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}";
+    })
+  ];
+
   propagatedBuildInputs = [
     imageio-ffmpeg
     numpy
@@ -28,34 +38,33 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    fsspec
     psutil
     pytestCheckHook
     tifffile
   ];
 
+  pytestFlagsArray = [
+    "-m 'not needs_internet'"
+  ];
+
   preCheck = ''
     export IMAGEIO_USERDIR="$TMP"
-    export IMAGEIO_NO_INTERNET="true"
-    export HOME="$(mktemp -d)"
+    export HOME=$TMPDIR
   '';
 
-  disabledTests = [
-    # tries to pull remote resources, even with IMAGEIO_NO_INTERNET
-    "test_png_remote"
-    # needs git history
-    "test_mvolread_out_of_bytes"
-    "test_imiter"
-    "test_memory_size"
-    "test_legacy_write_empty"
-  ];
-
   disabledTestPaths = [
+    # tries to fetch fixtures over the network
+    "tests/test_freeimage.py"
     "tests/test_pillow.py"
+    "tests/test_spe.py"
+    "tests/test_swf.py"
   ];
 
   meta = with lib; {
     description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats";
     homepage = "http://imageio.github.io/";
     license = licenses.bsd2;
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/imageio/libgl-path.patch b/pkgs/development/python-modules/imageio/libgl-path.patch
new file mode 100644
index 0000000000000..f2a2bbfa093d2
--- /dev/null
+++ b/pkgs/development/python-modules/imageio/libgl-path.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_core.py b/tests/test_core.py
+index 2cdbb3a..032974c 100644
+--- a/tests/test_core.py
++++ b/tests/test_core.py
+@@ -129,7 +129,7 @@ def test_findlib2():
+     open(os.path.join(fi_dir, "notalib.test.so"), "wb")
+ 
+     # Loading libs
+-    gllib = ctypes.util.find_library("GL")
++    gllib = "@libgl@"
+     core.load_lib([gllib], [])
+     # Fail
+     raises(ValueError, core.load_lib, [], [])  # Nothing given
diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix
index 3917742a55a90..31181d9b1afe0 100644
--- a/pkgs/development/python-modules/importlib-metadata/default.nix
+++ b/pkgs/development/python-modules/importlib-metadata/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
+, setuptools
 , setuptools-scm
 , typing-extensions
 , toml
@@ -10,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "importlib-metadata";
-  version = "4.11.0";
+  version = "4.11.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,10 +19,11 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "importlib_metadata";
     inherit version;
-    hash = "sha256-nl5VO7uhhDy0oAgjAUuQdha+Ru5QPSuboAHSFKjaIY8=";
+    hash = "sha256-s2/6kl/jE5svb/EdaSX/1Pp7xHhwFl46wmCse0+R5qw=";
   };
 
   nativeBuildInputs = [
+    setuptools # otherwise cross build fails
     setuptools-scm
   ];
 
diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix
index db98be8276c59..798bdbbd25195 100644
--- a/pkgs/development/python-modules/intbitset/default.nix
+++ b/pkgs/development/python-modules/intbitset/default.nix
@@ -1,36 +1,23 @@
 { lib
 , fetchPypi
 , buildPythonPackage
-, six
-, nose
+, pytestCheckHook
 }:
+
 buildPythonPackage rec {
   pname = "intbitset";
-  version = "2.4.1";
+  version = "3.0.0";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "44bca80b8cc702d5a56f0686f2bb5e028ab4d0c2c1761941589d46b7fa2c701c";
+    sha256 = "sha256-tDG3CAlTZvz9Pi2pLq0TEPhl3DyYuWQS1N6VNNNokEE=";
   };
 
-  patches = [
-    # fixes compilation on aarch64 and determinism (uses -march=core2 and
-    # -mtune=native)
-    ./remove-impure-tuning.patch
-  ];
-
-  propagatedBuildInputs = [
-    six
-  ];
-
   checkInputs = [
-    nose
+    pytestCheckHook
   ];
 
-  checkPhase = ''
-    nosetests
-  '';
-
   pythonImportsCheck = [
     "intbitset"
   ];
diff --git a/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch b/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch
deleted file mode 100644
index 4747b87b806c9..0000000000000
--- a/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2ea60bdf4d7b0344fc6ff5c97c675842fedccfa8 Mon Sep 17 00:00:00 2001
-From: Cole Helbling <cole.e.helbling@outlook.com>
-Date: Fri, 23 Apr 2021 09:02:22 -0700
-Subject: [PATCH] setup.py: remove impure tuning
-
----
- setup.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 7840022..3922aa5 100644
---- a/setup.py
-+++ b/setup.py
-@@ -48,7 +48,6 @@ setup(
-     ext_modules=[
-         Extension("intbitset",
-                   ["intbitset/intbitset.c", "intbitset/intbitset_impl.c"],
--                  extra_compile_args=['-O3', '-march=core2', '-mtune=native']
-                   # For debug -> '-ftree-vectorizer-verbose=2'
-                   )
-     ],
--- 
-2.30.1
-
diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix
index 48260398f4907..5e658953fc80e 100644
--- a/pkgs/development/python-modules/intensity-normalization/default.nix
+++ b/pkgs/development/python-modules/intensity-normalization/default.nix
@@ -15,14 +15,15 @@
 
 buildPythonPackage rec {
   pname = "intensity-normalization";
-  version = "2.1.4";
+  version = "2.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "e7b46039311bcbba40224d85eb07eefe1488bd8a6faa893a180e15e65c48b7f5";
+    pname = "intensity_normalization";
+    inherit version;
+    sha256 = "sha256-0tc21NBj3Cajklk9mWbKfBzbSwjUrBWs/SlakjEHC1U=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index e888fdcd32093..fe67c73cbaddf 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "ipykernel";
-  version = "6.7.0";
+  version = "6.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d82b904fdc2fd8c7b1fbe0fa481c68a11b4cd4c8ef07e6517da1f10cc3114d24";
+    sha256 = "sha256-+VBwot/TFH+KsZ8Y7kZzMxCBN1hZN0XgfsGPsItAnx0=";
   };
 
   # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767
diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix
index 3644442f7adaa..08b41e629787d 100644
--- a/pkgs/development/python-modules/ipympl/default.nix
+++ b/pkgs/development/python-modules/ipympl/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "ipympl";
-  version = "0.8.7";
+  version = "0.8.8";
   format = "wheel";
 
   src = fetchPypi {
     inherit pname version format;
-    sha256 = "11c3d01f0555f855c51a960964e3ab4dff38e6ccd1a4695205fe250341a9eb99";
+    sha256 = "sha256-hkaK6q6MCigAfQx/bbuF8rbLmAUWfojU2qdSlWIAkVk=";
   };
 
 
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index c1c0b049dc8c8..24fd28a16f7ca 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -28,13 +28,13 @@
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "8.0.1";
+  version = "8.1.0";
   format = "pyproject";
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0x19sj4dlq7r4p1mqnpx9245r8dwvpjwd8n34snfm37a452lsmmb";
+    sha256 = "sha256-QsI+kLLequYxJmiF3hZWpRehZz1+HbV+jrOku2zVzhs=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix
index 35cdf8836a89e..c2050c6f79c07 100644
--- a/pkgs/development/python-modules/itsdangerous/default.nix
+++ b/pkgs/development/python-modules/itsdangerous/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "itsdangerous";
-  version = "2.0.1";
+  version = "2.1.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1w6gfb2zhbcmrfj6digwzw1z68w6zg1q87rm6la2m412zil4swly";
+    sha256 = "sha256-2Ej8uLx9UHxFRrRIV06KRPxOorqE6/jXgykNU+gZkvU=";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix
index 80b0349ed58d3..95d20fd7e6be7 100644
--- a/pkgs/development/python-modules/jaraco_itertools/default.nix
+++ b/pkgs/development/python-modules/jaraco_itertools/default.nix
@@ -4,11 +4,12 @@
 
 buildPythonPackage rec {
   pname = "jaraco.itertools";
-  version = "6.0.3";
+  version = "6.2.1";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1775bfcad5de275a540a36720c5ab34594ea1dbe7ffefa32099b0129c5604608";
+    sha256 = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw=";
   };
 
   pythonNamespaces = [ "jaraco" ];
diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix
index 054f68ba2f244..e1e82df89ea32 100644
--- a/pkgs/development/python-modules/jaraco_text/default.nix
+++ b/pkgs/development/python-modules/jaraco_text/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "jaraco.text";
-  version = "3.6.0";
+  version = "3.7.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "901d3468eaaa04f1d8a8f141f54b8887bfd943ccba311fc1c1de62c66604dfe0";
+    sha256 = "sha256-p/nMG0Sl8wlqIWy9EwtlDHprLJ+ABbAArpfzKSOafAA=";
   };
 
   pythonNamespaces = [
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 2b011f56c1e8f..ad7db290d67e6 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -1,4 +1,5 @@
 { lib
+, pythonAtLeast
 , pythonOlder
 , buildPythonPackage
 , fetchPypi
@@ -28,6 +29,7 @@ buildPythonPackage rec {
   disabledTests = [
     "test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57
     "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests
+    "test_nested_parallel_warnings" # tests is flaky under load
   ] ++ lib.optionals stdenv.isDarwin [
     "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin.
   ];
diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix
index 0b6f012098189..fe41d0dd85401 100644
--- a/pkgs/development/python-modules/jsondiff/default.nix
+++ b/pkgs/development/python-modules/jsondiff/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "jsondiff";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5122bf4708a031b02db029366184a87c5d0ddd5a327a5884ee6cf0193e599d71";
+    sha256 = "sha256-BM+uvUpeVziUirYVcQ3D7pjvvfhRJV/Tl3xMLuWecxI=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix
index a91e6b3accd29..1ffbbdd5e8954 100644
--- a/pkgs/development/python-modules/jsonpickle/default.nix
+++ b/pkgs/development/python-modules/jsonpickle/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "jsonpickle";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a";
+    sha256 = "sha256-hGhM/FM4pTQXPI3WmAnkDyhl0L4fiit6+EZeW5aNz6k=";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix
index 9cb465947551a..23580f42bf577 100644
--- a/pkgs/development/python-modules/jupyter-client/default.nix
+++ b/pkgs/development/python-modules/jupyter-client/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "jupyter_client";
-  version = "7.1.0";
+  version = "7.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a5f995a73cffb314ed262713ae6dfce53c6b8216cea9f332071b8ff44a6e1654";
+    sha256 = "sha256-TqYQM3Jsjlee21VibY7i5r8KgxWN3zdRuN1GssXNHpY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix
index a7dd89a1f89a0..b7838ff5915f6 100644
--- a/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/pkgs/development/python-modules/jupyter_core/default.nix
@@ -2,33 +2,54 @@
 , buildPythonPackage
 , fetchPypi
 , isPy3k
+, fetchpatch
+, python
 , ipython
 , traitlets
 , glibcLocales
 , mock
-, pytest
+, pytestCheckHook
 , nose
 }:
 
 buildPythonPackage rec {
   pname = "jupyter_core";
-  version = "4.9.1";
+  version = "4.9.2";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dce8a7499da5a53ae3afd5a9f4b02e5df1d57250cf48f3ad79da23b4778cd6fa";
+    sha256 = "sha256-1puuuf+xKLjNJlf88nA/icdp0Wc8hRgSEZ46Kg6TrZo=";
   };
 
-  checkInputs = [ pytest mock glibcLocales nose ];
+  checkInputs = [ pytestCheckHook mock glibcLocales nose ];
   propagatedBuildInputs = [ ipython traitlets ];
 
-  patches = [ ./tests_respect_pythonpath.patch ];
+  patches = [
+    # install jupyter_core/*.py files
+    (fetchpatch {
+      url = "https://github.com/jupyter/jupyter_core/pull/253/commits/3bbeaebec0a53520523162d5e8d5c6ca02b1b782.patch";
+      sha256 = "sha256-QeAfj7wLz4egVUPMAgrZ9Wn/Tv60LrIXLgHGVoH41wQ=";
+    })
+    ./tests_respect_pythonpath.patch
+  ];
 
-  checkPhase = ''
-    HOME=$TMPDIR LC_ALL=en_US.utf8 py.test
+  preCheck = ''
+    export HOME=$TMPDIR
+    export LC_ALL=en_US.utf8
   '';
 
+  disabledTests = [
+    # creates a temporary script, which isn't aware of PYTHONPATH
+    "test_argv0"
+  ];
+
+  postCheck = ''
+    $out/bin/jupyter --help > /dev/null
+  '';
+
+  pythonImportsCheck = [ "jupyter_core" ];
+
   meta = with lib; {
     description = "Jupyter core package. A base package on which Jupyter projects rely";
     homepage = "https://jupyter.org/";
diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index 9d2907072e62a..dc909f798dafa 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab-git";
-  version = "0.34.1";
+  version = "0.34.2";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     pname = "jupyterlab_git";
     inherit version;
-    sha256 = "c7a03f526eb19175df73fedd5dee3cdae2d39e0474eef8f55c1c55b219ab26d9";
+    sha256 = "sha256-WNBhuHF3rhAWZED4di9B9Loq+shRzpJuaAOOcND1YEE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index 6e0668de1470d..a7a7d48c9d1dc 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "jupytext";
-  version = "1.13.7";
+  version = "1.13.8";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -26,8 +26,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mwouts";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-DWK5ZoPL6Ek3dXHOlZfecQKLNwBqDjMZ77XZ7YLCXKI=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-ebe5sQJxA8QE6eJp6vPUyMaEvZUPqzCmQ6damzo1BVo=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix
index 07f317a8aba5a..562d8880692fc 100644
--- a/pkgs/development/python-modules/karton-core/default.nix
+++ b/pkgs/development/python-modules/karton-core/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "karton-core";
-  version = "4.3.0";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner = "CERT-Polska";
     repo = "karton";
-    rev = "v${version}";
-    sha256 = "sha256-pIYDY+pie4xqH11UHBal7/+MVmJDgNCFVpSD9we9ZPA=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-TwTq44l/Nx+FQ6tFZHat4SPGOmHSwYfg7ShbGnxpkVw=";
   };
 
   propagatedBuildInputs = [ minio redis ];
diff --git a/pkgs/development/python-modules/keepalive/default.nix b/pkgs/development/python-modules/keepalive/default.nix
index b6daec6ca2006..6a4fcdb265f47 100644
--- a/pkgs/development/python-modules/keepalive/default.nix
+++ b/pkgs/development/python-modules/keepalive/default.nix
@@ -19,6 +19,7 @@ buildPythonPackage rec {
     description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive";
     homepage = "https://github.com/wikier/keepalive";
     license = licenses.asl20;
+    broken = true; # uses use_2to3, which is no longer supported for setuptools>=58
   };
 
 }
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index 2b9a269e280fc..dbdebefdb5a08 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "keras";
-  version = "2.7.0";
+  version = "2.8.0";
   format = "wheel";
 
   src = fetchPypi {
     inherit format pname version;
-    sha256 = "0c33ae1f728064ca0d35dfba999e9c316f03623bf5688c82fb83cc74a80ea248";
+    sha256 = "sha256-dE053GV33NgP9KTUFUnpK3fWoX4O3VikMdMGVuKbyU4=";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index c89782d4027e5..27f05d83aa058 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "labelbox";
-  version = "3.11.1";
+  version = "3.15.0";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "Labelbox";
     repo = "labelbox-python";
-    rev = "v${version}";
-    sha256 = "114h9phvbdknyvqdnjba3pd7i4iznffhgx9d569lq0hfla3hl61a";
+    rev = "v.${version}";
+    sha256 = "sha256-pJkDC/2EDPWbIw9WqV9kdYmr4X6apXtholzd0IYjgDg=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix
index f88e14d0a3e7c..020506d519100 100644
--- a/pkgs/development/python-modules/lektor/default.nix
+++ b/pkgs/development/python-modules/lektor/default.nix
@@ -1,55 +1,84 @@
 { lib
+, Babel
 , buildPythonPackage
-, fetchFromGitHub
 , click
-, watchdog
 , exifread
-, requests
-, mistune
+, fetchFromGitHub
+, filetype
+, flask
 , inifile
-, Babel
 , jinja2
-, flask
+, marshmallow
+, marshmallow-dataclass
+, mistune
+, pip
 , pyopenssl
-, ndg-httpsclient
-, pytestCheckHook
-, pytest-cov
+, pytest-click
 , pytest-mock
 , pytest-pylint
-, pytest-click
-, isPy27
-, functools32
+, pytestCheckHook
+, pythonOlder
+, python-slugify
+, requests
 , setuptools
+, watchdog
+, werkzeug
 }:
 
 buildPythonPackage rec {
   pname = "lektor";
-  version = "3.3.1";
+  version = "3.3.3";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "lektor";
-    repo = "lektor";
-    rev = version;
-    sha256 = "04gn3jybqf9wc6l9mi0djpki60adnk7gppmv987ik676k5x8f1kk";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-3jPN4VQdIUVjSSGJxPek2RrnXzCwkDxoEBqk4vuL+nc=";
   };
 
   propagatedBuildInputs = [
-    click watchdog exifread requests mistune inifile Babel jinja2
-    flask pyopenssl ndg-httpsclient setuptools
-  ] ++ lib.optionals isPy27 [ functools32 ];
+    Babel
+    click
+    exifread
+    filetype
+    flask
+    inifile
+    jinja2
+    marshmallow
+    marshmallow-dataclass
+    mistune
+    pip
+    pyopenssl
+    python-slugify
+    requests
+    setuptools
+    watchdog
+    werkzeug
+  ];
 
   checkInputs = [
-    pytestCheckHook pytest-cov pytest-mock pytest-pylint pytest-click
+    pytest-click
+    pytest-mock
+    pytest-pylint
+    pytestCheckHook
   ];
 
-  # many errors -- tests assume inside of git repo, linting errors 13/317 fail
-  doCheck = false;
+  pythonImportsCheck = [
+    "lektor"
+  ];
+
+  disabledTests = [
+    # Test requires network access
+    "test_path_installed_plugin_is_none"
+  ];
 
   meta = with lib; {
     description = "A static content management system";
-    homepage    = "https://www.getlektor.com/";
-    license     = licenses.bsd0;
+    homepage = "https://www.getlektor.com/";
+    license = licenses.bsd0;
     maintainers = with maintainers; [ costrouc ];
   };
-
 }
diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix
index 64a9a3b5e996b..e5f743e0fe11e 100644
--- a/pkgs/development/python-modules/levenshtein/default.nix
+++ b/pkgs/development/python-modules/levenshtein/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "levenshtein";
-  version = "0.17.0";
+  version = "0.18.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "maxbachmann";
     repo = "Levenshtein";
     rev = "v${version}";
-    sha256 = "1a14cw2314jb5lrm979zipzk3av4630lxdr4jzj2wl5qh3yw4w52";
+    sha256 = "sha256-3p9LM4tv45bqeTsuyngivqfd5uml7uqGB2ICKqPa0qY=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix
index 0c4a8985e4015..86b546289bbef 100644
--- a/pkgs/development/python-modules/libcst/default.nix
+++ b/pkgs/development/python-modules/libcst/default.nix
@@ -7,6 +7,8 @@
 , python
 , pythonOlder
 , pyyaml
+, rustPlatform
+, setuptools-rust
 , setuptools-scm
 , typing-extensions
 , typing-inspect
@@ -14,8 +16,8 @@
 
 buildPythonPackage rec {
   pname = "libcst";
-  version = "0.3.23";
-  format = "setuptools";
+  version = "0.4.1";
+  format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
@@ -23,9 +25,18 @@ buildPythonPackage rec {
     owner = "instagram";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1r4aiqpndqa75119faknsghi7zxyjrx5r6i7cb3d0liwiqrkzrvx";
+    sha256 = "sha256-soAlt1KBpCn5JxM1b2LZ3vOpBn9HPGdbm+BBYbyEkfE=";
   };
 
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    sourceRoot = "source/${cargoRoot}";
+    name = "${pname}-${version}";
+    hash = "sha256:1rz1c0dv3f1h2m5hwdisl3rbqnmifbva4f0c4vygk7rh1q27l515";
+  };
+
+  cargoRoot = "native";
+
   postPatch = ''
     # test try to format files, which isn't necessary when consuming releases
     sed -i libcst/codegen/generate.py \
@@ -35,8 +46,10 @@ buildPythonPackage rec {
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeBuildInputs = [
+    setuptools-rust
     setuptools-scm
-  ];
+    rustPlatform.cargoSetupHook
+  ] ++ (with rustPlatform; [ rust.cargo rust.rustc ]);
 
   propagatedBuildInputs = [
     hypothesis
diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix
index 4a4ba489e0a62..494e887c79bca 100644
--- a/pkgs/development/python-modules/libevdev/default.nix
+++ b/pkgs/development/python-modules/libevdev/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "libevdev";
-  version = "0.9";
+  version = "0.10";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17agnigmzscmdjqmrylg1lza03hwjhgxbpf4l705s6i7p7ndaqrs";
+    sha256 = "sha256-9LM2Ftr6qmQYysCxso+XJSthwJdOU01J+yL8ZWbtwRM=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix
index 9a19dda15789a..47738b23dc415 100644
--- a/pkgs/development/python-modules/limits/default.nix
+++ b/pkgs/development/python-modules/limits/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "limits";
-  version = "2.2.0";
+  version = "2.3.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "da6346f0dcf85f17f0f1cc709c3408a3058cf6fee68313c288127c287237b411";
+    sha256 = "sha256-1CcNKVkcxezqsZvgU0VaTmGbo5UGJQK94rVoGvfcG+g=";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index 2c549b6830a16..3ef230eb8e8d1 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "lxml";
-  version = "4.7.1";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "lxml-${version}";
-    sha256 = "0xji4kcw1fl3nqg04q6zlympkx2kv2s1r1p18763dshgpisqgiq4";
+    sha256 = "sha256-ppyLn8B0YFQivRCOE8TjKGdDDQHbb7UdTUkevznoVC8=";
   };
 
   # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs
diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix
index 9e2cc9b31e155..c6966e632f05e 100644
--- a/pkgs/development/python-modules/lz4/default.nix
+++ b/pkgs/development/python-modules/lz4/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , pythonOlder
+, python
 
 # native inputs
 , pkgconfig
@@ -14,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "python-lz4";
-  version = "3.1.12";
+  version = "4.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.5";
@@ -24,7 +25,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-fqt9aJGqZpfbiYtU8cmm7UQaixZwbTKFBwRfR1B/qic=";
+    sha256 = "sha256-9gp67i2fotvFOpkaQZ82/YKnDEs3DnzXfuNCVRJg88I=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -50,13 +51,13 @@ buildPythonPackage rec {
     psutil
   ];
 
-  # leave build directory, so the installed library gets imported
-  preCheck = ''
-    pushd tests
-  '';
+  # for lz4.steam
+  PYLZ4_EXPERIMENTAL = true;
 
-  postCheck = ''
-    popd
+  # prevent local lz4 directory from getting imported as it lacks native extensions
+  preCheck = ''
+    rm -r lz4
+    export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix
index 03ca9d7915971..28fa4c9c4e2aa 100644
--- a/pkgs/development/python-modules/magicgui/default.nix
+++ b/pkgs/development/python-modules/magicgui/default.nix
@@ -11,12 +11,12 @@
 , docstring-parser
 }: buildPythonPackage rec {
   pname = "magicgui";
-  version = "0.3.0";
+  version = "0.3.7";
   src = fetchFromGitHub {
     owner = "napari";
     repo = "magicgui";
     rev = "v${version}";
-    sha256 = "sha256-DvL1szk2RoCrpisjp0BVNL6qFZtYc2oYDenX59Cxbug=";
+    sha256 = "sha256-LYXNNr5lS3ibQk2NIopZkB8kzC7j3yY8moGMk0Gr+hU=";
   };
   nativeBuildInputs = [ setuptools-scm ];
   propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ];
diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix
index 0c36f2cc6cc6e..2e1bff7e21ef0 100644
--- a/pkgs/development/python-modules/manticore/default.nix
+++ b/pkgs/development/python-modules/manticore/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "manticore";
-  version = "0.3.6";
+  version = "0.3.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "trailofbits";
     repo = "manticore";
     rev = version;
-    sha256 = "sha256-L112YwrBcdcLBeBsPLWt3C57u2WDvGLq50EzW9ojdyg=";
+    sha256 = "sha256-+17VBfAtkZZIi3SF5Num1Uqg3WjIpgbz3Jx65rD5zkM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix
index 12845da7e37a8..b0f876ef3e8dc 100644
--- a/pkgs/development/python-modules/markupsafe/default.nix
+++ b/pkgs/development/python-modules/markupsafe/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "markupsafe";
-  version = "2.0.1";
+  version = "2.1.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     pname = "MarkupSafe";
     inherit version;
-    sha256 = "02k2ynmqvvd0z0gakkf8s4idyb606r7zgga41jrkhqmigy06fk2r";
+    sha256 = "sha256-gL6vY937xkoEUrhB2ANsoGEeBJZQ4gr8uIL108Jm1l8=";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix
index 665167e290ea9..724a1459b7794 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/pkgs/development/python-modules/matrix-nio/default.nix
@@ -41,6 +41,7 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' \
+      --replace 'h11 = "^0.12.0"' 'h11 = "*"' \
       --replace 'jsonschema = "^3.2.0"' 'jsonschema = "*"' \
       --replace 'cachetools = { version = "^4.2.1", optional = true }' 'cachetools = { version = "*", optional = true }'
   '';
diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix
index a37e82a62d34e..5f0f9a434b49c 100644
--- a/pkgs/development/python-modules/md-toc/default.nix
+++ b/pkgs/development/python-modules/md-toc/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "md-toc";
-  version = "8.1.1";
+  version = "8.1.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.5";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "frnmst";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Dlqia+B7WJZlFGlIhgUWdND1qhSS/FOPoFH+uim6i8I=";
+    sha256 = "sha256-EmhCZhxUCzBMqScPeawvcWmP9rrthow1vhTZachjCDI=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix
index 54f8431ba2792..1471ea5b1e5dd 100644
--- a/pkgs/development/python-modules/meshio/default.nix
+++ b/pkgs/development/python-modules/meshio/default.nix
@@ -6,22 +6,24 @@
 , h5py
 , exdown
 , pytestCheckHook
+, rich
 }:
 
 buildPythonPackage rec {
   pname = "meshio";
-  version = "5.2.2";
+  version = "5.3.2";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "209885ac31b00155e43c27859d1aff0ba7f97f319ee7bed453a8b9e1677a4e52";
+    sha256 = "sha256-L1YNRAgoHBvf8SsM++J+k1UNciIw91W1s6IA26I/bYw=";
   };
 
   propagatedBuildInputs = [
     numpy
     netcdf4
     h5py
+    rich
   ];
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix
index 2c78575d3704a..83085d76a367d 100644
--- a/pkgs/development/python-modules/mezzanine/default.nix
+++ b/pkgs/development/python-modules/mezzanine/default.nix
@@ -20,12 +20,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "5.1.0";
+  version = "5.1.3";
   pname = "Mezzanine";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ce1117c81416d2e0a77981419312e200aec1cf3cb3ea9630083bd29e74bbb265";
+    sha256 = "sha256-G/Oj5g70tFUhnbSVElVk0s9Ka+MEuPsEgj6blcFBOoY=";
   };
 
   disabled = isPyPy || lib.versionOlder django.version "1.11"
diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix
index 477ed47e9dd14..5b142406fab09 100644
--- a/pkgs/development/python-modules/minio/default.nix
+++ b/pkgs/development/python-modules/minio/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "minio";
-  version = "7.1.2";
+  version = "7.1.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "minio";
     repo = "minio-py";
     rev = version;
-    sha256 = "sha256-KluSdmhpSSqUTLVdFpIGwre7LOu3A16rt73FvaTmuz8=";
+    sha256 = "sha256-IzITqo23pRf83SFpnBZdryGHIsxh+7HrLVLM9CT5nQQ=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix
index d609f465e2771..269ebf2ef3cfd 100644
--- a/pkgs/development/python-modules/mongoengine/default.nix
+++ b/pkgs/development/python-modules/mongoengine/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "mongoengine";
-  version = "0.23.1";
+  version = "0.24.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "MongoEngine";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1lj33pgdrp4rvjzcg2glvz1f87np1pfnqhlwbdcijav9rxqc0w70";
+    sha256 = "sha256-BQSB4SGlejARFreeTfqFMzCWvBc6Vvq9EOMLjhAihdI=";
   };
 
   propagatedBuildInputs = [
@@ -36,12 +36,15 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "coverage==4.2" "coverage"
+      --replace "coverage==4.2" "coverage" \
+      --replace "pymongo>=3.4,<=4.0" "pymongo"
   '';
 
   # tests require mongodb running in background
   doCheck = false;
 
+  pythonImportsCheck = [ "mongoengine" ];
+
   meta = with lib; {
     description = "MongoEngine is a Python Object-Document Mapper for working with MongoDB";
     homepage = "http://mongoengine.org/";
diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix
index 9f6ca7e91a785..50ba81d6d5260 100644
--- a/pkgs/development/python-modules/moonraker-api/default.nix
+++ b/pkgs/development/python-modules/moonraker-api/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "moonraker-api";
-  version = "2.0.4";
+  version = "2.0.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "cmroche";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1hhm3jnl9qm44y4k927fzw1n32c3551kgsk7i57qw25nca9x3k61";
+    sha256 = "sha256-PgFsXmdAmHXK0wZ6xLTu94RdME1L2H1Mb6V+qFlGXSk=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index 1d9d077437982..f920a06488a3f 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -1,269 +1,115 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+
+# runtime
 , aws-xray-sdk
-, backports_tempfile
 , boto3
 , botocore
 , cfn-lint
+, cryptography
 , docker
 , flask
 , flask-cors
-, freezegun
+, graphql-core
+, idna
 , jinja2
 , jsondiff
-, mock
-, pyaml
+, python-dateutil
 , python-jose
 , pytz
+, pyyaml
 , requests
 , responses
-, six
 , sshpubkeys
-, sure
 , werkzeug
 , xmltodict
-, parameterized
-, idna
-, nose
+
+# tests
+, freezegun
 , pytestCheckHook
 , pytest-xdist
+, sure
 }:
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "3.0.2";
+  version = "3.0.5";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-vZ1oofOYUkFETDFKwSmifvvn+bCi/6NQAxu950NYk5k=";
+    sha256 = "sha256-hfLs4K0DBaoTo5E5zmSKs6/hwEyzKsHbjV5ekRfU0Q4=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "ecdsa<0.15" "ecdsa" \
-      --replace "idna<3,>=2.5" "idna" \
-      --replace "MarkupSafe<2.0" "MarkupSafe" \
-  '';
-
   propagatedBuildInputs = [
     aws-xray-sdk
     boto3
     botocore
     cfn-lint
+    cryptography
     docker
-    flask # required for server
+    flask
+    flask-cors
+    graphql-core
+    idna
     jinja2
     jsondiff
-    mock
-    pyaml
+    python-dateutil
     python-jose
     pytz
-    six
+    pyyaml
     requests
     responses
     sshpubkeys
     werkzeug
     xmltodict
-    idna
-  ] ++ lib.optionals isPy27 [ backports_tempfile ];
+  ];
 
   checkInputs = [
-    boto3
-    flask-cors
     freezegun
-    parameterized
-    pytestCheckHook
     pytest-xdist
+    pytestCheckHook
     sure
   ];
 
-  # Multiple test files still import boto, rather than boto3 like
-  # boto is long-deprecated and broken on python3.9
-  # https://github.com/spulec/moto/blob/63ce647123755e4c4693a89f52c254596004c098/tests/test_autoscaling/test_autoscaling.py#L2
-  # NOTE: This should change to use disabledTestFiles / disabledTestPaths once that
-  # feature stabalizes: see #113153 (mostly the discussion therein), #113167, #110700
   pytestFlagsArray = [
-    "-n $NIX_BUILD_CORES"
-    "--ignore=tests/test_awslambda/test_policy.py"
-    "--ignore=tests/test_autoscaling/test_autoscaling.py"
-    "--ignore=tests/test_autoscaling/test_cloudformation.py"
-    "--ignore=tests/test_autoscaling/test_elbv2.py"
-    "--ignore=tests/test_autoscaling/test_launch_configurations.py"
-    "--ignore=tests/test_autoscaling/test_policies.py"
-    "--ignore=tests/test_autoscaling/test_server.py"
-    "--ignore=tests/test_awslambda/test_lambda.py"
-    "--ignore=tests/test_awslambda/test_lambda_cloudformation.py"
-    "--ignore=tests/test_batch/test_cloudformation.py"
-    "--ignore=tests/test_batch/test_server.py"
-    "--ignore=tests/test_cloudformation/test_cloudformation_depends_on.py"
-    "--ignore=tests/test_cloudformation/test_cloudformation_stack_crud.py"
-    "--ignore=tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py"
-    "--ignore=tests/test_cloudformation/test_cloudformation_stack_integration.py"
-    "--ignore=tests/test_cloudformation/test_stack_parsing.py"
-    "--ignore=tests/test_cloudformation/test_validate.py"
-    "--ignore=tests/test_cloudwatch/test_cloudwatch.py"
-    "--ignore=tests/test_cognitoidentity/test_server.py"
-    "--ignore=tests/test_config/test_config.py"
-    "--ignore=tests/test_core/test_auth.py"
-    "--ignore=tests/test_core/test_decorator_calls.py"
-    "--ignore=tests/test_core/test_nested.py"
-    "--ignore=tests/test_core/test_server.py"
-    "--ignore=tests/test_datapipeline/test_datapipeline.py"
-    "--ignore=tests/test_datapipeline/test_server.py"
-    "--ignore=tests/test_datasync/test_datasync.py"
-    "--ignore=tests/test_dynamodb/test_dynamodb.py"
-    "--ignore=tests/test_dynamodb/test_dynamodb_table_with_range_key.py"
-    "--ignore=tests/test_dynamodb/test_dynamodb_table_without_range_key.py"
-    "--ignore=tests/test_dynamodb/test_server.py"
-    "--ignore=tests/test_dynamodb2/test_dynamodb.py"
-    "--ignore=tests/test_dynamodb2/test_dynamodb_table_with_range_key.py"
-    "--ignore=tests/test_dynamodb2/test_dynamodb_table_without_range_key.py"
-    "--ignore=tests/test_dynamodb2/test_server.py"
-    "--ignore=tests/test_ec2/test_amazon_dev_pay.py"
-    "--ignore=tests/test_ec2/test_amis.py"
-    "--ignore=tests/test_ec2/test_availability_zones_and_regions.py"
-    "--ignore=tests/test_ec2/test_customer_gateways.py"
-    "--ignore=tests/test_ec2/test_dhcp_options.py"
-    "--ignore=tests/test_ec2/test_elastic_block_store.py"
-    "--ignore=tests/test_ec2/test_elastic_ip_addresses.py"
-    "--ignore=tests/test_ec2/test_elastic_network_interfaces.py"
-    "--ignore=tests/test_ec2/test_general.py"
-    "--ignore=tests/test_ec2/test_instances.py"
-    "--ignore=tests/test_ec2/test_internet_gateways.py"
-    "--ignore=tests/test_ec2/test_ip_addresses.py"
-    "--ignore=tests/test_ec2/test_key_pairs.py"
-    "--ignore=tests/test_ec2/test_monitoring.py"
-    "--ignore=tests/test_ec2/test_network_acls.py"
-    "--ignore=tests/test_ec2/test_placement_groups.py"
-    "--ignore=tests/test_ec2/test_regions.py"
-    "--ignore=tests/test_ec2/test_reserved_instances.py"
-    "--ignore=tests/test_ec2/test_route_tables.py"
-    "--ignore=tests/test_ec2/test_security_groups.py"
-    "--ignore=tests/test_ec2/test_spot_instances.py"
-    "--ignore=tests/test_ec2/test_subnets.py"
-    "--ignore=tests/test_ec2/test_tags.py"
-    "--ignore=tests/test_ec2/test_virtual_private_gateways.py"
-    "--ignore=tests/test_ec2/test_vm_export.py"
-    "--ignore=tests/test_ec2/test_vm_import.py"
-    "--ignore=tests/test_ec2/test_vpc_peering.py"
-    "--ignore=tests/test_ec2/test_vpcs.py"
-    "--ignore=tests/test_ec2/test_vpn_connections.py"
-    "--ignore=tests/test_ec2/test_vpn_connections.py"
-    "--ignore=tests/test_ec2/test_windows.py"
-    "--ignore=tests/test_ecs/test_ecs_boto3.py"
-    "--ignore=tests/test_elb/test_elb.py"
-    "--ignore=tests/test_elb/test_server.py"
-    "--ignore=tests/test_elbv2/test_elbv2.py"
-    "--ignore=tests/test_elbv2/test_server.py"
-    "--ignore=tests/test_emr/test_emr.py"
-    "--ignore=tests/test_emr/test_server.py"
-    "--ignore=tests/test_glacier/test_glacier_archives.py"
-    "--ignore=tests/test_glacier/test_glacier_jobs.py"
-    "--ignore=tests/test_glacier/test_glacier_vaults.py"
-    "--ignore=tests/test_iam/test_iam.py"
-    "--ignore=tests/test_iam/test_iam_cloudformation.py"
-    "--ignore=tests/test_iam/test_iam_groups.py"
-    "--ignore=tests/test_iam/test_server.py"
-    "--ignore=tests/test_iot/test_server.py"
-    "--ignore=tests/test_iotdata/test_server.py"
-    "--ignore=tests/test_kinesis/test_kinesis.py"
-    "--ignore=tests/test_kinesis/test_kinesis_cloudformation.py"
-    "--ignore=tests/test_kinesis/test_server.py"
-    "--ignore=tests/test_kinesisvideo/test_server.py"
-    "--ignore=tests/test_kinesisvideoarchivedmedia/test_server.py"
-    "--ignore=tests/test_kms/test_kms.py"
-    "--ignore=tests/test_kms/test_server.py"
-    "--ignore=tests/test_kms/test_utils.py"
-    "--ignore=tests/test_logs/test_logs.py"
-    "--ignore=tests/test_polly/test_server.py"
-    "--ignore=tests/test_rds/test_rds.py"
-    "--ignore=tests/test_rds/test_server.py"
-    "--ignore=tests/test_rds2/test_server.py"
-    "--ignore=tests/test_redshift/test_redshift.py"
-    "--ignore=tests/test_redshift/test_server.py"
-    "--ignore=tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py"
-    "--ignore=tests/test_route53/test_route53.py"
-    "--ignore=tests/test_s3/test_s3.py"
-    "--ignore=tests/test_s3/test_s3_cloudformation.py"
-    "--ignore=tests/test_s3/test_s3_lifecycle.py"
-    "--ignore=tests/test_s3/test_s3_storageclass.py"
-    "--ignore=tests/test_s3/test_s3_utils.py"
-    "--ignore=tests/test_s3bucket_path/test_s3bucket_path.py"
-    "--ignore=tests/test_s3bucket_path/test_s3bucket_path_combo.py"
-    "--ignore=tests/test_secretsmanager/test_server.py"
-    "--ignore=tests/test_ses/test_server.py"
-    "--ignore=tests/test_ses/test_ses.py"
-    "--ignore=tests/test_ses/test_ses_boto3.py"
-    "--ignore=tests/test_ses/test_ses_sns_boto3.py"
-    "--ignore=tests/test_sns/test_application.py"
-    "--ignore=tests/test_sns/test_application_boto3.py"
-    "--ignore=tests/test_sns/test_publishing.py"
-    "--ignore=tests/test_sns/test_publishing_boto3.py"
-    "--ignore=tests/test_sns/test_server.py"
-    "--ignore=tests/test_sns/test_subscriptions.py"
-    "--ignore=tests/test_sns/test_subscriptions_boto3.py"
-    "--ignore=tests/test_sns/test_topics.py"
-    "--ignore=tests/test_sns/test_topics_boto3.py"
-    "--ignore=tests/test_sqs/test_server.py"
-    "--ignore=tests/test_sqs/test_sqs.py"
-    "--ignore=tests/test_ssm/test_ssm_boto3.py"
-    "--ignore=tests/test_ssm/test_ssm_docs.py"
-    "--ignore=tests/test_sts/test_server.py"
-    "--ignore=tests/test_sts/test_sts.py"
-    "--ignore=tests/test_swf/models/test_activity_task.py"
-    "--ignore=tests/test_swf/models/test_decision_task.py"
-    "--ignore=tests/test_swf/models/test_timeout.py"
-    "--ignore=tests/test_swf/models/test_workflow_execution.py"
-    "--ignore=tests/test_swf/responses/test_activity_tasks.py"
-    "--ignore=tests/test_swf/responses/test_activity_types.py"
-    "--ignore=tests/test_swf/responses/test_decision_tasks.py"
-    "--ignore=tests/test_swf/responses/test_domains.py"
-    "--ignore=tests/test_swf/responses/test_timeouts.py"
-    "--ignore=tests/test_swf/responses/test_workflow_executions.py"
-    "--ignore=tests/test_swf/responses/test_workflow_types.py"
-    # attempts web connections
-    "--ignore=tests/test_appsync/test_appsync_schema.py"
-    "--ignore=tests/test_awslambda/test_lambda_eventsourcemapping.py"
-    "--ignore=tests/test_awslambda/test_lambda_invoke.py"
-    "--ignore=tests/test_batch/test_batch_jobs.py"
-    "--ignore=tests/**/*_integration.py"
+    "--numprocesses $NIX_BUILD_CORES"
+
+    # Disable tests that try to access the network
+    "--deselect=tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed"
+    "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get"
+    "--deselect=tests/test_core/test_decorator_calls.py::test_context_manager"
+    "--deselect=tests/test_core/test_decorator_calls.py::test_decorator_start_and_stop"
+    "--deselect=tests/test_core/test_request_mocking.py::test_passthrough_requests"
+    "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination"
+    "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination"
+    "--deselect=tests/test_logs/test_integration.py::test_put_subscription_filter_with_lambda"
+    "--deselect=tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception"
+    "--deselect=tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception"
+    "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_creation_fails_with_invalid_names"
+    "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_list_executions_with_pagination"
+
+    # json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0)
+    "--deselect=tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function"
+  ];
+
+  disabledTestPaths = [
+    # xml.parsers.expat.ExpatError: out of memory: line 1, column 0
+    "tests/test_sts/test_sts.py"
+    # botocore.exceptions.NoCredentialsError: Unable to locate credentials
+    "tests/test_redshiftdata/test_redshiftdata.py"
+    # Tries to access the network
+    "tests/test_appsync/test_appsync_schema.py"
+    "tests/test_awslambda/test_lambda_eventsourcemapping.py"
+    "tests/test_awslambda/test_lambda_invoke.py"
+    "tests/test_batch/test_batch_jobs.py"
   ];
 
   disabledTests = [
-    # these tests rely on the network
-    "test_server"
-    "test_managedblockchain_nodes"
-    "test_swf"
-    "test_simple_instance"
-    "test_passthrough_requests"
-    "test_s3_server_get"
-    "test_s3_server_bucket_create"
-    "test_s3_server_post_to_bucket"
-    "test_s3_server_put_ipv6"
-    "test_s3_server_put_ipv4"
-    "test_http_proxying_integration"
-    "test_submit_job_by_name"
-    "test_submit_job"
-    "test_list_jobs"
-    "test_terminate_job"
-    "test_idtoken_contains_kid_header"
-    "test_latest_meta_data"
-    "test_meta_data_iam"
-    "test_meta_data_security_credentials"
-    "test_meta_data_default_role"
-    "test_reset_api"
-    "test_data_api"
-    "test_requests_to_amazon_subdomains_dont_work"
-    "test_get_records_seq"
-    "test_stream_with_range_key"
-    "test_create_notebook_instance_bad_volume_size"
-    "http_destination"
-    "test_invoke_function_from_sqs_exception"
-    "test_state_machine_list_executions_with_pagination"
-    "test_put_subscription_filter_with_lambda"
-    "test_create_custom_lambda_resource__verify_cfnresponse_failed"
-    "test_state_machine_creation_fails_with_invalid_names"
-    # needs graphql
-    "test_get_schema_creation_status"
     # only appears in aarch64 currently, but best to be safe
     "test_state_machine_list_executions_with_filter"
   ];
diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix
index f81395f0245b7..a811018da214b 100644
--- a/pkgs/development/python-modules/msal-extensions/default.nix
+++ b/pkgs/development/python-modules/msal-extensions/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "msal-extensions";
-  version = "0.3.1";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d9029af70f2cbdc5ad7ecfed61cb432ebe900484843ccf72825445dbfe62d311";
+    sha256 = "sha256-xnarpWsMzjeD3htcXs/oKNuZgWeHUSbKS0fcZDZFE1Q=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 0ea21ecbe405a..6ee071732691b 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "multidict";
-  version = "5.2.0";
+  version = "6.0.2";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce";
+    sha256 = "sha256-X/O9dfOOTEPx9HDy33pNQwuCHEziK+OE4UWctX1rsBM=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix
index 33fc3c02daeba..6308b6fceb6f6 100644
--- a/pkgs/development/python-modules/mutagen/default.nix
+++ b/pkgs/development/python-modules/mutagen/default.nix
@@ -1,37 +1,74 @@
 { lib
 , buildPythonPackage
+, pythonOlder
 , fetchPypi
-, isPy27
-, flake8
+
+# docs
+, python
+, sphinx
+, sphinx_rtd_theme
+
+# tests
 , hypothesis
-, pycodestyle
-, pyflakes
-, pytest
-, setuptools
-, pkgs
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "mutagen";
   version = "1.45.1";
-  disabled = isPy27; # abandoned
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1";
   };
 
-  propagatedBuildInputs = [ setuptools ];
+  outputs = [
+    "doc"
+    "out"
+  ];
+
+  nativeBuildInputs = [
+    sphinx
+    sphinx_rtd_theme
+  ];
+
+  postInstall = ''
+    ${python.interpreter} setup.py build_sphinx --build-dir=$doc
+  '';
+
   checkInputs = [
-    pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz
-    pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis flake8
+    hypothesis
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # Hypothesis produces unreliable results: Falsified on the first call but did not on a subsequent one
+    "test_test_fileobj_save"
+  ];
+
+  disabledTestPaths = [
+    # we are not interested in code quality measurements
+    "tests/quality/test_flake8.py"
   ];
-  LC_ALL = "en_US.UTF-8";
 
   meta = with lib; {
-    description = "Python multimedia tagging library";
+    description = "Python module for handling audio metadata";
+    longDescription = ''
+      Mutagen is a Python module to handle audio metadata. It supports
+      ASF, FLAC, MP4, Monkey's Audio, MP3, Musepack, Ogg Opus, Ogg FLAC,
+      Ogg Speex, Ogg Theora, Ogg Vorbis, True Audio, WavPack, OptimFROG,
+      and AIFF audio files. All versions of ID3v2 are supported, and all
+      standard ID3v2.4 frames are parsed. It can read Xing headers to
+      accurately calculate the bitrate and length of MP3s. ID3 and APEv2
+      tags can be edited regardless of audio format. It can also
+      manipulate Ogg streams on an individual packet/page level.
+    '';
     homepage = "https://mutagen.readthedocs.io";
-    license = licenses.lgpl2Plus;
+    changelog = "https://mutagen.readthedocs.io/en/latest/changelog.html#release-${lib.replaceStrings [ "." ] [ "-" ] version}";
+    license = licenses.gpl2Plus;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 5c5e985641ff7..937c958717242 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -14,22 +14,22 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.931";
+  version = "0.941";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "python";
     repo = "mypy";
     rev = "v${version}";
-    sha256 = "1v83flrdxh8grcp40qw04q4hzjflih9xwib64078vsxv2w36f817";
+    hash = "sha256-H2SWJA0WWyKV7/5miFawv4JRXu/J7H6Wer1eBL+Tru0=";
   };
 
   patches = [
     # FIXME: Remove patch after upstream has decided the proper solution.
     #        https://github.com/python/mypy/pull/11143
     (fetchpatch {
-      url = "https://github.com/python/mypy/commit/f1755259d54330cd087cae763cd5bbbff26e3e8a.patch";
-      sha256 = "sha256-5gPahX2X6+/qUaqDQIGJGvh9lQ2EDtks2cpQutgbOHk=";
+      url = "https://github.com/python/mypy/commit/e7869f05751561958b946b562093397027f6d5fa.patch";
+      hash = "sha256-waIZ+m3tfvYE4HJ8kL6rN/C4fMjvLEe9UoPbt9mHWIM=";
     })
   ];
 
diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix
index 74936da4f7254..babdbc4506dc4 100644
--- a/pkgs/development/python-modules/napari/default.nix
+++ b/pkgs/development/python-modules/napari/default.nix
@@ -28,12 +28,12 @@
 , wrapQtAppsHook
 }: mkDerivationWith buildPythonPackage rec {
   pname = "napari";
-  version = "0.4.12";
+  version = "0.4.14";
   src = fetchFromGitHub {
     owner = "napari";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-0QSI0mgDjF70/X58fE7uWwlBUCGY5gsvbCm4oJkp2Yk=";
+    sha256 = "sha256-uDDj5dzsT4tRVV0Y+CYegiCpLM77XFaXEXEZXTnX808=";
   };
   nativeBuildInputs = [ setuptools-scm wrapQtAppsHook ];
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix
deleted file mode 100644
index 3e159dfe7cee4..0000000000000
--- a/pkgs/development/python-modules/nassl/default.nix
+++ /dev/null
@@ -1,170 +0,0 @@
-{ lib
-, fetchFromGitHub
-, fetchurl
-, buildPythonPackage
-, pkgsStatic
-, openssl_1_1
-, openssl_1_0_2
-, invoke
-, tls-parser
-, cacert
-, pytestCheckHook
-, pythonAtLeast
-, pythonOlder
-}:
-
-let
-  zlibStatic = (pkgsStatic.zlib.override {
-    splitStaticOutput = false;
-  }).overrideAttrs (oldAttrs: {
-    NIX_CFLAGS_COMPILE = "${oldAttrs.NIX_CFLAGS_COMPILE} -fPIC";
-  });
-  nasslOpensslArgs = {
-    static = true;
-    enableSSL2 = true;
-  };
-  nasslOpensslFlagsCommon = [
-    "zlib"
-    "no-zlib-dynamic"
-    "no-shared"
-    "--with-zlib-lib=${zlibStatic.out}/lib"
-    "--with-zlib-include=${zlibStatic.out.dev}/include"
-    "enable-rc5"
-    "enable-md2"
-    "enable-gost"
-    "enable-cast"
-    "enable-idea"
-    "enable-ripemd"
-    "enable-mdc2"
-    "-fPIC"
-  ];
-  opensslStatic = (openssl_1_1.override nasslOpensslArgs).overrideAttrs (
-    oldAttrs: rec {
-      name = "openssl-${version}";
-      version = "1.1.1h";
-      src = fetchurl {
-        url = "https://www.openssl.org/source/${name}.tar.gz";
-        sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w";
-      };
-      configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon ++ [
-        "enable-weak-ssl-ciphers"
-        "enable-tls1_3"
-        "no-async"
-      ];
-      patches = builtins.filter
-        (
-          p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch"
-        )
-        oldAttrs.patches;
-      buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ];
-      meta = oldAttrs.meta // {
-        knownVulnerabilities = [
-          "CVE-2020-1971"
-          "CVE-2021-23840"
-          "CVE-2021-23841"
-          "CVE-2021-3449"
-          "CVE-2021-3450"
-          "CVE-2021-3711"
-          "CVE-2021-3712"
-        ];
-      };
-    }
-  );
-  opensslLegacyStatic = (openssl_1_0_2.override nasslOpensslArgs).overrideAttrs (
-    oldAttrs: rec {
-      name = "openssl-${version}";
-      version = "1.0.2e";
-      src = fetchurl {
-        url = "https://www.openssl.org/source/${name}.tar.gz";
-        sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72";
-      };
-      configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon;
-      patches = builtins.filter
-        (
-          p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch"
-        )
-        oldAttrs.patches;
-      buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ];
-      # openssl_1_0_2 needs `withDocs = false`
-      outputs = lib.remove "doc" oldAttrs.outputs;
-    }
-  );
-in
-buildPythonPackage rec {
-  pname = "nassl";
-  version = "4.0.2";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "nabla-c0d3";
-    repo = pname;
-    rev = version;
-    hash = "sha256-lLyHXLmBVvT+LgsKBU8DcUXd0qaLSrwvXxFnIB9CHcU=";
-  };
-
-  postPatch =
-    let
-      legacyOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslLegacyStatic.version;
-      modernOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslStatic.version;
-      zlibVersion = zlibStatic.version;
-    in
-    ''
-      mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
-      cp ${opensslLegacyStatic.out}/lib/libssl.a \
-        ${opensslLegacyStatic.out}/lib/libcrypto.a \
-        deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
-      ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include
-      ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps
-
-      mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/
-      cp ${opensslStatic.out}/lib/libssl.a \
-        ${opensslStatic.out}/lib/libcrypto.a \
-        deps/openssl-OpenSSL_${modernOpenSSLVersion}/
-      ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include
-      ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps
-
-      mkdir -p deps/zlib-${zlibVersion}/
-      cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/
-    '';
-
-  nativeBuildInputs = [
-    invoke
-  ];
-
-  propagatedBuildInputs = [
-    tls-parser
-  ];
-
-  checkInputs = [
-    pytestCheckHook
-  ];
-
-  buildPhase = ''
-    invoke build.nassl
-    invoke package.wheel
-  '';
-
-  doCheck = true;
-
-  pythonImportsCheck = [
-    "nassl"
-  ];
-
-  disabledTests = [
-    "Online"
-  ] ++ lib.optionals (pythonAtLeast "3.10") [
-    "test_write_bad"
-    "test_client_authentication_no_certificate_supplied"
-    "test_client_authentication_succeeds"
-  ];
-
-  meta = with lib; {
-    description = "Low-level OpenSSL wrapper for Python";
-    homepage = "https://github.com/nabla-c0d3/nassl";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ veehaitch ];
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix
index f87eb269da7a3..3cc92514bd6ea 100644
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "nats-py";
-  version = "2.0.0";
+  version = "2.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "nats.py";
-    rev = "v${version}";
-    hash = "sha256-BraT30J7OIcW2NXAwjcg9PYu+kgf8f1iDjKiN9J6l7Y=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-OwxTcjHB1YLijEtTA+QFjEmihqXsiitIcCtdl/3uipI=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix
index c5e3facc06224..52478ad4fd628 100644
--- a/pkgs/development/python-modules/nbclient/default.nix
+++ b/pkgs/development/python-modules/nbclient/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "nbclient";
-  version = "0.5.10";
+  version = "0.5.11";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b5fdea88d6fa52ca38de6c2361401cfe7aaa7cd24c74effc5e489cec04d79088";
+    sha256 = "sha256-dRUWmS80tYFyutVO7x5L9+T0Rg1Y4lXKGk5clklHYAc=";
   };
 
   inherit doCheck;
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index ab91f22acc442..8604698cc2a27 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -23,11 +23,11 @@
 
 buildPythonPackage rec {
   pname = "nbconvert";
-  version = "6.4.0";
+  version = "6.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5412ec774c6db4fccecb8c4ba07ec5d37d6dcf5762593cb3d6ecbbeb562ebbe5";
+    sha256 = "sha256-6ygD2xj2+szmvzsBtoT+R5B5lL0VbRXqzN8BHj1/gWQ=";
   };
 
   # Add $out/share/jupyter to the list of paths that are used to search for
diff --git a/pkgs/development/python-modules/net2grid/default.nix b/pkgs/development/python-modules/net2grid/default.nix
index 05b5321a69cfa..ef03d45ab6b86 100644
--- a/pkgs/development/python-modules/net2grid/default.nix
+++ b/pkgs/development/python-modules/net2grid/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "net2grid";
-  version = "3.0.0";
+  version = "4.0.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "klaasnicolaas";
     repo = "python-net2grid";
     rev = "v${version}";
-    hash = "sha256-nT9qMv4Zr7SjNwHRN3HRR11yl+Oue8VVCfJr2n1D02Q=";
+    hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix
index e8769f9efc7dd..c876c0d549dd3 100644
--- a/pkgs/development/python-modules/networkx/default.nix
+++ b/pkgs/development/python-modules/networkx/default.nix
@@ -10,11 +10,11 @@
 buildPythonPackage rec {
   pname = "networkx";
   # upgrade may break sage, please test the sage build or ping @timokau on upgrade
-  version = "2.6.3";
+  version = "2.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51";
+    sha256 = "sha256-7/t9nNXDbh4NM/QqOu9brd5QMFNYJqNn1c9gihcK9RU=";
   };
 
   propagatedBuildInputs = [ decorator setuptools ];
diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix
index 60f5fcde63fe9..dc0a6d12f0c1b 100644
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , isPy27
 , packaging
-, pytest
+, pytestCheckHook
 , nose
 , numpy
 , h5py
@@ -23,11 +23,14 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ];
 
-  checkInputs = [ nose pytest ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  checkPhase = ''
-    pytest
-  '';
+  disabledTests = [
+    # https://github.com/nipy/nibabel/issues/951
+    "test_filenames"
+  ];
 
   meta = with lib; {
     homepage = "https://nipy.org/nibabel";
diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index 60e11ef1d12da..2494a446a8113 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "nilearn";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a0489940855130f35bbc4cac0750479a6f82025215ea7b1d778faca064219298";
+    sha256 = "sha256-+cjjCt71FImRCux3JLVpneF4Qn065jhz2tmyPdMh/nY=";
   };
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix
index d88661ae757cb..1ff2d47b32d63 100644
--- a/pkgs/development/python-modules/nodeenv/default.nix
+++ b/pkgs/development/python-modules/nodeenv/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, setuptools }:
+{ lib, buildPythonPackage, fetchPypi, setuptools, python, which }:
 
 buildPythonPackage rec {
   pname = "nodeenv";
@@ -16,6 +16,13 @@ buildPythonPackage rec {
   # Tests not included in PyPI tarball
   doCheck = false;
 
+  preFixup = ''
+    substituteInPlace $out/${python.sitePackages}/nodeenv.py \
+      --replace '["which", candidate]' '["${lib.getBin which}/bin/which", candidate]'
+  '';
+
+  pythonImportsCheck = [ "nodeenv" ];
+
   meta = with lib; {
     description = "Node.js virtual environment builder";
     homepage = "https://github.com/ekalinin/nodeenv";
diff --git a/pkgs/development/python-modules/nose-cover3/default.nix b/pkgs/development/python-modules/nose-cover3/default.nix
deleted file mode 100644
index b75dcc526c5fd..0000000000000
--- a/pkgs/development/python-modules/nose-cover3/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, nose
-}:
-
-buildPythonPackage rec {
-  pname = "nose-cover3";
-  version = "0.1.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1la4hhc1yszjpcchvkqk5xmzlb2g1b3fgxj9wwc58qc549whlcc1";
-  };
-
-  propagatedBuildInputs = [ nose ];
-
-  # No tests included
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Coverage 3.x support for Nose";
-    homepage = "https://github.com/ask/nosecover3";
-    license = licenses.lgpl21;
-  };
-
-}
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 7a1902cb21144..586257a4f8db8 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -27,12 +27,12 @@
 
 buildPythonPackage rec {
   pname = "notebook";
-  version = "6.4.7";
+  version = "6.4.8";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b01da66f11a203b3839d6afa4013674bcfff41c36552f9ad0fbcb2d93c92764a";
+    sha256 = "sha256-Hphcncb2eL3/+53GVzBrVGm/pi1z4D906N77920oQxI=";
   };
 
   LC_ALL = "en_US.utf8";
diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix
index d9a340d824918..898d209d91381 100644
--- a/pkgs/development/python-modules/nplusone/default.nix
+++ b/pkgs/development/python-modules/nplusone/default.nix
@@ -8,7 +8,6 @@
 , mock
 , peewee
 , pytest-django
-, pytest-pythonpath
 , pytestCheckHook
 , six
 , sqlalchemy
@@ -38,7 +37,6 @@ buildPythonPackage rec {
     mock
     peewee
     pytest-django
-    pytest-pythonpath
     pytestCheckHook
     sqlalchemy
     webtest
@@ -54,6 +52,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pytest.ini \
+      --replace "python_paths" "pythonpath" \
       --replace "--cov nplusone --cov-report term-missing" ""
   '';
 
diff --git a/pkgs/development/python-modules/numba/cuda_path.patch b/pkgs/development/python-modules/numba/cuda_path.patch
new file mode 100644
index 0000000000000..275eeb1ccab60
--- /dev/null
+++ b/pkgs/development/python-modules/numba/cuda_path.patch
@@ -0,0 +1,79 @@
+diff --git a/numba/cuda/cuda_paths.py b/numba/cuda/cuda_paths.py
+index b9988bc..a642680 100644
+--- a/numba/cuda/cuda_paths.py
++++ b/numba/cuda/cuda_paths.py
+@@ -24,10 +24,7 @@ def _find_valid_path(options):
+ 
+ def _get_libdevice_path_decision():
+     options = [
+-        ('Conda environment', get_conda_ctk()),
+-        ('CUDA_HOME', get_cuda_home('nvvm', 'libdevice')),
+-        ('System', get_system_ctk('nvvm', 'libdevice')),
+-        ('Debian package', get_debian_pkg_libdevice()),
++        ('Nix store', get_nix_ctk('nvvm', 'libdevice')),
+     ]
+     by, libdir = _find_valid_path(options)
+     return by, libdir
+@@ -35,18 +32,16 @@ def _get_libdevice_path_decision():
+ 
+ def _nvvm_lib_dir():
+     if IS_WIN32:
+-        return 'nvvm', 'bin'
++        return 'bin',
+     elif IS_OSX:
+-        return 'nvvm', 'lib'
++        return 'lib',
+     else:
+-        return 'nvvm', 'lib64'
++        return 'lib64',
+ 
+ 
+ def _get_nvvm_path_decision():
+     options = [
+-        ('Conda environment', get_conda_ctk()),
+-        ('CUDA_HOME', get_cuda_home(*_nvvm_lib_dir())),
+-        ('System', get_system_ctk(*_nvvm_lib_dir())),
++        ('Nix store', get_nix_ctk(*_nvvm_lib_dir())),        
+     ]
+     by, path = _find_valid_path(options)
+     return by, path
+@@ -74,14 +69,12 @@ def _cudalib_path():
+     elif IS_OSX:
+         return 'lib'
+     else:
+-        return 'lib64'
++        return 'lib'
+ 
+ 
+ def _get_cudalib_dir_path_decision():
+     options = [
+-        ('Conda environment', get_conda_ctk()),
+-        ('CUDA_HOME', get_cuda_home(_cudalib_path())),
+-        ('System', get_system_ctk(_cudalib_path())),
++        ('Nix store', get_nix_lib_ctk(_cudalib_path())),
+     ]
+     by, libdir = _find_valid_path(options)
+     return by, libdir
+@@ -92,6 +85,22 @@ def _get_cudalib_dir():
+     return _env_path_tuple(by, libdir)
+ 
+ 
++def get_nix_ctk(*subdirs):
++    """Return path to nix store cudatoolkit; or, None if it doesn't exist.
++    """
++    base = '@cuda_toolkit_path@'
++    if os.path.exists(base):
++        return os.path.join(base, *subdirs)
++
++
++def get_nix_lib_ctk(*subdirs):
++    """Return path to nix store cudatoolkit-lib; or, None if it doesn't exist.
++    """
++    base = '@cuda_toolkit_lib_path@'
++    if os.path.exists(base):
++        return os.path.join(base, *subdirs)
++
++
+ def get_system_ctk(*subdirs):
+     """Return path to system-wide cudatoolkit; or, None if it doesn't exist.
+     """
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 8bead014e34a7..0219300f1fdf1 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -9,29 +9,54 @@
 , llvmlite
 , setuptools
 , libcxx
-}:
+, substituteAll
+
+# CUDA-only dependencies:
+, addOpenGLRunpath ? null
+, cudatoolkit ? null
 
+# CUDA flags:
+, cudaSupport ? false
+}:
 buildPythonPackage rec {
-  version = "0.55.0";
+  version = "0.55.1";
   pname = "numba";
   disabled = pythonOlder "3.6" || pythonAtLeast "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-siHr2ZdmKh3Ld+TwkUDgIvv+dXetB4H8LgIUE126bL0=";
+    sha256 = "sha256-A+kGmiZm0chPk7ANvXFvuP7d6Lssbvr6LwSEKkZELqM=";
   };
 
   postPatch = ''
+    # numpy
     substituteInPlace setup.py \
-      --replace "1.21" "1.22"
+      --replace "1.22" "2"
 
     substituteInPlace numba/__init__.py \
-      --replace "(1, 20)" "(1, 21)"
+      --replace "(1, 21)" "(2, 0)"
   '';
 
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
 
-  propagatedBuildInputs = [ numpy llvmlite setuptools ];
+  propagatedBuildInputs = [ numpy llvmlite setuptools ] ++ lib.optionals cudaSupport [ cudatoolkit cudatoolkit.lib ];
+
+  nativeBuildInputs = lib.optional cudaSupport [ addOpenGLRunpath ];
+
+  patches = lib.optionals cudaSupport [
+    (substituteAll {
+      src = ./cuda_path.patch;
+      cuda_toolkit_path = cudatoolkit;
+      cuda_toolkit_lib_path = cudatoolkit.lib;
+    })
+  ];
+
+  postFixup = lib.optionalString cudaSupport ''
+    find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+      addOpenGLRunpath "$lib"
+      patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:$(patchelf --print-rpath "$lib")" "$lib"
+    done
+  '';
 
   # Copy test script into $out and run the test suite.
   checkPhase = ''
diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix
index 0f57847b3a624..ea092d01dd426 100644
--- a/pkgs/development/python-modules/numpydoc/default.nix
+++ b/pkgs/development/python-modules/numpydoc/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "numpydoc";
-  version = "1.1.0";
+  version = "1.2";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname;
     inherit version;
-    sha256 = "c36fd6cb7ffdc9b4e165a43f67bf6271a7b024d0bb6b00ac468c9e2bfc76448e";
+    sha256 = "sha256-DOwjN0DGsSWRMAXRboqZluBgUor8uLfK0/JwZinf1vc=";
   };
 
   checkInputs = [ nose pytest ];
diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix
index f4cc9d3140e46..5b974c9b6af29 100644
--- a/pkgs/development/python-modules/nunavut/default.nix
+++ b/pkgs/development/python-modules/nunavut/default.nix
@@ -8,13 +8,13 @@
 
  buildPythonPackage rec {
   pname = "nunavut";
-  version = "1.6.2";
+  version = "1.7.3";
 
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c6f99eaa65935b2c8a3f004025fb3c0309e11655c391d0fcd318d2a8665ca5c4";
+    sha256 = "sha256-Tj3zCKDM4IBH9BKonhW9gPFD+lE3Q570Lxfm6b/d5JU=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix
index 01e6ca29b5d9b..3a2f5cb1bddc5 100644
--- a/pkgs/development/python-modules/oauthlib/default.nix
+++ b/pkgs/development/python-modules/oauthlib/default.nix
@@ -1,28 +1,26 @@
 { lib
-, buildPythonPackage
-, fetchFromGitHub
-
-# propagates
 , blinker
+, buildPythonPackage
 , cryptography
-, pyjwt
-
-# test
+, fetchFromGitHub
 , mock
+, pyjwt
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "oauthlib";
-  version = "3.1.1";
+  version = "3.2.0";
   format = "setuptools";
 
-  # master supports pyjwt==1.7.1
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256:1bgxpzh11i0x7h9py3a29cz5z714b3p498b62znnn5ciy0cr80sv";
+    hash = "sha256-41JFURG8G8BjlAlNu2+lbj84XR/trAk1U5OPYxPq+5M=";
   };
 
   propagatedBuildInputs = [
@@ -36,10 +34,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  pythonImportsCheck = [
+    "oauthlib"
+  ];
+
   meta = with lib; {
+    description = "Generic, spec-compliant, thorough implementation of the OAuth request-signing logic";
     homepage = "https://github.com/idan/oauthlib";
-    description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic";
-    maintainers = with maintainers; [ prikhi ];
     license = licenses.bsd3;
+    maintainers = with maintainers; [ prikhi ];
   };
 }
diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix
index da0a70aafb4c7..84d56962cc4d9 100644
--- a/pkgs/development/python-modules/objax/default.nix
+++ b/pkgs/development/python-modules/objax/default.nix
@@ -7,7 +7,7 @@
 , parameterized
 , pillow
 , scipy
-, tensorflow-tensorboard
+, tensorboard
 }:
 
 buildPythonPackage rec {
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     parameterized
     pillow
     scipy
-    tensorflow-tensorboard
+    tensorboard
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix
index d32b82365dc71..e873f3256084d 100644
--- a/pkgs/development/python-modules/onnx/default.nix
+++ b/pkgs/development/python-modules/onnx/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "onnx";
-  version = "1.10.2";
+  version = "1.11.0";
   format = "setuptools";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-JNc8p9/X5sczmUT4lVS0AQcZiZM3kk/KFEfY8bXbUNY=";
+    sha256 = "sha256-7KIkx8LI7kByoHQ+SJioSpvfgpe15ZEKJjLkxBgv+yo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index 4fb744826b794..a8b65ea58944d 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -9,6 +9,7 @@
 , pandas-stubs
 , requests
 , tqdm
+, wandb
 
 # Check dependencies
 , pytest-mock
@@ -35,6 +36,7 @@ buildPythonPackage rec {
     pandas-stubs
     requests
     tqdm
+    wandb
   ];
 
   pythonImportsCheck = [ "openai" ];
diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix
index 199ea38ae4ab8..32989e7f9ce5a 100644
--- a/pkgs/development/python-modules/openapi-core/default.nix
+++ b/pkgs/development/python-modules/openapi-core/default.nix
@@ -68,6 +68,8 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # AttributeError: 'str' object has no attribute '__name__'
     "tests/integration/validation"
+    # requires secrets and additional configuration
+    "tests/integration/contrib/test_django.py"
     # Unable to detect SECRET_KEY and ROOT_URLCONF
     "tests/integration/contrib/test_django.py"
   ];
diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix
index 8251c2cd01751..ced5f8ed68b8a 100644
--- a/pkgs/development/python-modules/openapi-schema-validator/default.nix
+++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "openapi-schema-validator";
-  version = "0.2.0";
+  version = "0.2.3";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = pname;
     rev = version;
-    sha256 = "sha256-HoXtDlXOoYqzsM4FxVfLQdIlpJXaNUcQo8//B4JqJoA=";
+    sha256 = "sha256-rgl2B55dnbpZszr+gWM0FgeXMKfrkDG7HeZBSw5Eles=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix
index 4e61a86a5013e..7ef70ab3d3ff8 100644
--- a/pkgs/development/python-modules/openapi-spec-validator/default.nix
+++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix
@@ -1,17 +1,23 @@
 { lib, buildPythonPackage, isPy27, fetchPypi
 , jsonschema, openapi-schema-validator, pyyaml, six, pathlib
-, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools }:
+, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools
+, poetry-core
+, requests
+}:
 
 buildPythonPackage rec {
   pname = "openapi-spec-validator";
-  version = "0.3.1";
+  version = "0.4.0";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3d70e6592754799f7e77a45b98c6a91706bdd309a425169d17d8e92173e198a2";
+    sha256 = "sha256-l/JYhQr8l7BI98JlOFXg+I+masEDwr5Qd8eWCsoq1Jo=";
   };
 
-  propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools ]
+  nativeBuildInputs = [ poetry-core ];
+
+  propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools requests ]
     ++ (lib.optionals (isPy27) [ pathlib ]);
 
   checkInputs = [ mock pytest pytest-cov pytest-flake8 tox ];
diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix
index 78e0c53c9112f..c233f88c73f9c 100644
--- a/pkgs/development/python-modules/openshift/default.nix
+++ b/pkgs/development/python-modules/openshift/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "openshift";
-  version = "0.12.1";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "openshift";
     repo = "openshift-restclient-python";
     rev = "v${version}";
-    sha256 = "1di55xg3nl4dwrrfw314p4mfm6593kdi7ia517v1sm6x5p4hjl78";
+    sha256 = "sha256-9mMHih2xuQve8hEnc5x4f9Pd4wX7IMy3vrxxGFCG+8o=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix
index 7546566cb3aac..8ea71fd2d901f 100644
--- a/pkgs/development/python-modules/ordered-set/default.nix
+++ b/pkgs/development/python-modules/ordered-set/default.nix
@@ -1,24 +1,39 @@
-{ buildPythonPackage, fetchPypi, lib, isPy27, pytest }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, flit-core
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "ordered-set";
-  version = "4.0.2";
-  disabled = isPy27;
+  version = "4.1.0";
+  format = "pyproject";
 
-  checkInputs = [ pytest ];
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "159syfbqnwqnivzjfn3x7ak3xwrxmnzbji7c2qhj1jjv0pgv54xs";
+    sha256 = "sha256-aUqORMh2V8WSku3nKJHrkdNBMfZTFGOqswCRkcdzZKg=";
   };
 
-  checkPhase = ''
-    py.test test.py
-  '';
+  nativeBuildInputs = [
+    flit-core
+  ];
 
-  meta = {
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "ordered_set"
+  ];
+
+  meta = with lib; {
     description = "A MutableSet that remembers its order, so that every entry has an index.";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.MostAwesomeDude ];
+    homepage = "https://github.com/rspeer/ordered-set";
+    license = licenses.mit;
+    maintainers = with maintainers; [ MostAwesomeDude ];
   };
 }
diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix
index e9a662412b771..2777fc5be7546 100644
--- a/pkgs/development/python-modules/osc-lib/default.nix
+++ b/pkgs/development/python-modules/osc-lib/default.nix
@@ -43,7 +43,13 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
-    stestr run
+    # tests parse cli output which slightly changed
+    stestr run -e <(echo "
+      osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_filtering_option_to_parser
+      osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_create
+      osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_set
+      osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_unset
+    ")
   '';
 
   pythonImportsCheck = [ "osc_lib" ];
diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix
index f38b9bb09b39d..7f5fa9b98ca0e 100644
--- a/pkgs/development/python-modules/oslo-context/default.nix
+++ b/pkgs/development/python-modules/oslo-context/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "oslo.context";
-  version = "3.4.0";
+  version = "4.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "970f96361c5de9a5dc86d48a648289d77118180ca13ba5eeb307137736ffa953";
+    sha256 = "sha256-damnIqVS+6ionooBAo+oKmGQqzF6lZG7gzA6IhCnkUQ=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix
index a2e6eac8e3894..c2b11dd3167bb 100644
--- a/pkgs/development/python-modules/oslo-log/default.nix
+++ b/pkgs/development/python-modules/oslo-log/default.nix
@@ -11,16 +11,20 @@
 , pyinotify
 , python-dateutil
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "oslo-log";
-  version = "4.6.1";
+  version = "4.7.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     pname = "oslo.log";
     inherit version;
-    sha256 = "0dlnxjci9mpwhgfv19fy1z7xrdp8m95skrj5dr60all3pr7n22f6";
+    hash = "sha256-ycLEyW098LLuuTG0djvbCpBbqvKbiVgW2Vd41p+hJwc=";
   };
 
   propagatedBuildInputs = [
@@ -44,7 +48,9 @@ buildPythonPackage rec {
     "test_logging_handle_error"
   ];
 
-  pythonImportsCheck = [ "oslo_log" ];
+  pythonImportsCheck = [
+    "oslo_log"
+  ];
 
   meta = with lib; {
     description = "oslo.log library";
diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix
index 5236cc7bbf8e5..c2d74d0d3c16c 100644
--- a/pkgs/development/python-modules/packageurl-python/default.nix
+++ b/pkgs/development/python-modules/packageurl-python/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "packageurl-python";
-  version = "0.9.8.1";
+  version = "0.9.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Z14OyAWPoIN6BAUEcXi96mp9C0aWaYP6eeHAoa+rHJ4=";
+    sha256 = "sha256-hyoENLmkSLP6l1cXEfad0qP7cjRa1myQsX2Cev6oLwk=";
   };
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 536f883f29a2d..90309ef0b4026 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -27,12 +27,12 @@
 
 buildPythonPackage rec {
   pname = "pandas";
-  version = "1.3.5";
+  version = "1.4.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e4285f5de1012de20ca46b188ccf33521bff61ba5c5ebd78b4fb28e5416a9f1";
+    sha256 = "sha256-jbk+yYrHy1+KwUIMEPXjxDUzFT8lP+f7bYkc9aorgNI=";
   };
 
   nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/parameterizedtestcase/default.nix b/pkgs/development/python-modules/parameterizedtestcase/default.nix
index 20e662cd66d61..9d277af8d1a9c 100644
--- a/pkgs/development/python-modules/parameterizedtestcase/default.nix
+++ b/pkgs/development/python-modules/parameterizedtestcase/default.nix
@@ -27,5 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/msabramo/python_unittest_parameterized_test_case";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
+    broken = python.isPy3k; # uses use_2to3
   };
 }
diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix
index 5cfb4b610ce7a..3356853e8ac4a 100644
--- a/pkgs/development/python-modules/parse-type/default.nix
+++ b/pkgs/development/python-modules/parse-type/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "parse-type";
-  version = "0.5.6";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "jenisys";
     repo = "parse_type";
     rev = "v${version}";
-    sha256 = "sha256-CJroqJIi5DpmR8i1lr8OJ+234615PhpVUsqK91XOT3E=";
+    sha256 = "sha256-v79zzAAwXYoK2N8ZPl1L90qOwMRexAV2wCTMvo4vrSc=";
   };
 
   propagatedBuildInputs = [
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace pytest.ini \
       --replace "--metadata PACKAGE_UNDER_TEST parse_type" "" \
-      --replace "--metadata PACKAGE_VERSION 0.5.6" "" \
+      --replace "--metadata PACKAGE_VERSION ${version}" "" \
       --replace "--html=build/testing/report.html --self-contained-html" "" \
       --replace "--junit-xml=build/testing/report.xml" ""
   '';
diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix
index 757ddc7d97463..f0f0163652ca0 100644
--- a/pkgs/development/python-modules/pathlib2/default.nix
+++ b/pkgs/development/python-modules/pathlib2/default.nix
@@ -5,28 +5,32 @@
 , pythonOlder
 , scandir ? null
 , glibcLocales
-, mock ? null
+, mock
+, typing
 }:
 
 buildPythonPackage rec {
   pname = "pathlib2";
-  version = "2.3.6";
+  version = "2.3.7.post1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f";
+    sha256 = "sha256-n+DtrYmLg8DD4ZnIQrJ+0hZkXS4Xd1ey3Wc4TUETxkE=";
   };
 
-  propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir;
-  checkInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock;
+  propagatedBuildInputs = [ six ]
+    ++ lib.optionals (pythonOlder "3.5") [ scandir typing ];
+  checkInputs = [ glibcLocales ]
+    ++ lib.optional (pythonOlder "3.3") mock;
 
   preCheck = ''
     export LC_ALL="en_US.UTF-8"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems.";
-    homepage = "https://pypi.python.org/pypi/pathlib2/";
-    license = with lib.licenses; [ mit ];
+    homepage = "https://pypi.org/project/pathlib2/";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix
index aa99d5f23f7b7..5649e092634c5 100644
--- a/pkgs/development/python-modules/pdm-pep517/default.nix
+++ b/pkgs/development/python-modules/pdm-pep517/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "pdm-pep517";
-  version = "0.10.2";
+  version = "0.11.2";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "83bb71a7588df69ea0d77dc6524741c3a1af54ad5f421341428de648bfc03a29";
+    sha256 = "sha256-4AC6tDUCwZHXGAiiYw3UTs4wGjGdJuACocrqOnMHzSA=";
   };
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index 852ba5ffbcb7c..85a58271b6d38 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "peewee";
-  version = "3.14.8";
+  version = "3.14.9";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "coleifer";
     repo = pname;
     rev = version;
-    sha256 = "sha256-BJSM+7+VdW6SxN4/AXsX8NhQPdIFoYrVRVwR9OsJ3QE=";
+    sha256 = "sha256-8rwWKsOOYUrk2k1piCurb1LkB9zzmSITq52qWdyx4yk=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index 436192e18b8d5..723b3888edb8c 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "pelican";
-  version = "4.7.1";
+  version = "4.7.2";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "getpelican";
     repo = pname;
     rev = version;
-    sha256 = "0w3r4ifbrl6mhfphabqs048qys7x6k164ds63jr10l3namljm8ad";
+    hash = "sha256-ZBGzsyCtFt5uj9mpOpGdTzGJET0iwOAgDTy80P6anRU=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     extraPostFetch = ''
diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix
index ca8f867e6e30c..a2bb6baec9694 100644
--- a/pkgs/development/python-modules/perfplot/default.nix
+++ b/pkgs/development/python-modules/perfplot/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "perfplot";
-  version = "0.9.13";
+  version = "0.10.1";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "nschloe";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0ry5x38sv8gh505z6ip90jymm7kfgyf80y3vjb2i6z567bnblam6";
+    sha256 = "sha256-5qZolEJWjhqk1JakcGBWZ1hxeP1cLqcB7IZ3ufjOC/o=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index 0c22823d565ec..305f47a17f058 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pex";
-  version = "2.1.75";
+  version = "2.1.77";
   format = "flit";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-G5JE4/ZWZYo8Fpy3ZhIaWNzGfEkWb9qA9vL3UVTqf0Q=";
+    hash = "sha256-lvzRb+m3a3DmimzVIroobJaNe2PuMoadb48YwhxCVvA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
index 308e8c9c8b640..e7b4e62ab575d 100644
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "pgspecial";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3847e205b19469f16ded05bda24b4758056d67ade4075a5ded4ce6628a9bad01";
+    sha256 = "sha256-1dq5ZpCQgnWRbcLGIu+uIX8ULggWX6NmlJ1By8VlhwE=";
   };
 
   propagatedBuildInputs = [
@@ -28,6 +28,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # requires a postgresql server
+    "test_slash_dp_pattern_schema"
+  ];
+
   meta = with lib; {
     description = "Meta-commands handler for Postgres Database";
     homepage = "https://pypi.python.org/pypi/pgspecial";
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 9faad1e96de20..92b621e49c640 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.12.43";
+  version = "8.12.44";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-HIJwouJX1sZUWKQig/gtPsp/e52SVFSmlm4vBN914c8=";
+    sha256 = "sha256-Js/QJX0XBP4viMr/LKq7cNFqh3seZbaq5R+fu+EKqM4=";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 2ddba8f363e34..a4370fbaae576 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pip";
-  version = "21.3.1";
+  version = "22.0.3";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = pname;
     rev = version;
-    sha256 = "sha256-A8oePI5VOKGJTY6ZuUhcOhRkz2I2FSdfsS2xIgktCVQ=";
+    sha256 = "sha256-Wu2QQfb0pehPLLa+za32C4jH1arkBKKc3jlAMRkDV5Q=";
     name = "${pname}-${version}-source";
   };
 
diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix
index 2be8928f630f4..584d9361fb767 100644
--- a/pkgs/development/python-modules/platformdirs/default.nix
+++ b/pkgs/development/python-modules/platformdirs/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "platformdirs";
-  version = "2.5.0";
+  version = "2.5.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-fppwtY8VX8IQ96H930xItO7mS8LlxxHgBcKlwIL5P2E=";
+    sha256 = "sha256-z6WIwTWLlc/chNRxt3dqqa/IxYj1BBTcQ6OcfliHrvA=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index fbe869b07032f..fc24a4c2e6f7f 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "5.5.0";
+  version = "5.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "20b8a1a0f0434f9b8d10eb7caa66e947a9a1d698e5a53d40d447bbc0d2ae41f0";
+    sha256 = "sha256-2G5E69449HU9/5gqubXgPPhyqrj99TpAPpme03gVQzE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix
index ae3c4941f6848..70b4421778f3e 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@@ -50,6 +50,14 @@ buildPythonPackage rec {
     "test_change_env"
     "test_dictlike"
     "test_local"
+    # incompatible with pytest 7
+    "test_incorrect_login"
+  ];
+
+  disabledTestPaths = [
+    # incompatible with pytest7
+    # https://github.com/tomerfiliba/plumbum/issues/594
+    "tests/test_remote.py"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index e8632d0ed0782..5922d67fc8b76 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "poetry-core";
-  version = "1.0.7";
+  version = "1.0.8";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = pname;
     rev = version;
-    sha256 = "0v86x8f8pcbviv2cdn7jjbgj3c994qasx0bqk1kr0mj8m6pjwy9z";
+    sha256 = "sha256-cs9SMGD9RdW8Wx/IAMq6gkOUBsney5r19hyGva98grk=";
   };
 
   postPatch = lib.optionalString (pythonOlder "3.8") ''
diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix
index 3b7ddaf280197..238e6ad62230b 100644
--- a/pkgs/development/python-modules/pooch/default.nix
+++ b/pkgs/development/python-modules/pooch/default.nix
@@ -11,12 +11,13 @@
 
 buildPythonPackage rec {
   pname = "pooch";
-  version = "1.5.2";
+  version = "1.6.0";
+  format = "pyproject";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5969b2f1defbdc405df932767e05e0b536e2771c27f1f95d7f260bc99bf13581";
+    sha256 = "sha256-V9IOxLEN1pTSsFu2S8axCcboWmwUBXlM6H7Ys0GrP0Q=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix
index 357ca815407fa..cd7d6d03bbd4c 100644
--- a/pkgs/development/python-modules/portalocker/default.nix
+++ b/pkgs/development/python-modules/portalocker/default.nix
@@ -22,6 +22,10 @@ buildPythonPackage rec {
     pytest-mypy
   ];
 
+  disabledTests = [
+    "test_combined" # no longer compatible with setuptools>=58
+  ];
+
   meta = with lib; {
     description = "A library to provide an easy API to file locking";
     homepage = "https://github.com/WoLpH/portalocker";
diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix
index f914a0f3df449..25d22c2c5a2fd 100644
--- a/pkgs/development/python-modules/prettytable/default.nix
+++ b/pkgs/development/python-modules/prettytable/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "prettytable";
-  version = "3.0.0";
+  version = "3.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "69fe75d78ac8651e16dd61265b9e19626df5d630ae294fc31687aa6037b97a58";
+    sha256 = "sha256-Q8niMnLKJT0Diudv463eiXlOkuf8qy3fW5SzhkLvTyE=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix
index 7af4e2b02faae..9ba5068359bbc 100644
--- a/pkgs/development/python-modules/prometheus-client/default.nix
+++ b/pkgs/development/python-modules/prometheus-client/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "prometheus-client";
-  version = "0.12.0";
+  version = "0.13.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "prometheus";
     repo = "client_python";
     rev = "v${version}";
-    sha256 = "1a0kllal5vkkdv325k0mx1mha2l9808mcz4dqx6qrgfskz8c2xjl";
+    sha256 = "sha256-1sMnlUOvvdlUuh288UalAdlf0a1mpnM+Y/upwlnL1H8=";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix
index 403f0c0979163..8833689cec122 100644
--- a/pkgs/development/python-modules/promise/default.nix
+++ b/pkgs/development/python-modules/promise/default.nix
@@ -18,6 +18,11 @@ buildPythonPackage rec {
     sha256 = "17mq1bm78xfl0x1g50ng502m5ldq6421rzz35hlqafsj0cq8dkp6";
   };
 
+  postPatch = ''
+    substituteInPlace tests/test_extra.py \
+      --replace "assert_exc.traceback[-1].path.strpath" "str(assert_exc.traceback[-1].path)"
+  '';
+
   propagatedBuildInputs = [
     six
   ];
diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix
index e38560be2eb68..4ec9e381dafbf 100644
--- a/pkgs/development/python-modules/prompt-toolkit/default.nix
+++ b/pkgs/development/python-modules/prompt-toolkit/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "prompt-toolkit";
-  version = "3.0.24";
+  version = "3.0.28";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "prompt_toolkit";
     inherit version;
-    sha256 = "1bb05628c7d87b645974a1bad3f17612be0c29fa39af9f7688030163f680bad6";
+    sha256 = "sha256-nxzRax6GwpaPJRnX+zHdnWaZFvUVYSwmnRTp7VK1FlA=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix
index dd2494729efd7..defc28d9429a3 100644
--- a/pkgs/development/python-modules/proto-plus/default.nix
+++ b/pkgs/development/python-modules/proto-plus/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "proto-plus";
-  version = "1.19.8";
+  version = "1.20.3";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bdf45f0e0be71510eb2ec9db4da78afde7b5fb8b0a507a36340a9b6ce8e48e58";
+    sha256 = "sha256-8osiW8nmwU4gb7f46Zakb7LM2QJkjlEtSWq7anFqSuU=";
   };
 
   propagatedBuildInputs = [ protobuf ];
diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix
index 4bf07b1375eb4..6527f88e4891a 100644
--- a/pkgs/development/python-modules/proxy-py/default.nix
+++ b/pkgs/development/python-modules/proxy-py/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "proxy-py";
-  version = "2.3.1";
+  version = "2.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "abhinavsingh";
     repo = "proxy.py";
     rev = "v${version}";
-    sha256 = "sha256-qqwb3t8/xicDGfO6l843qRwh0yUfthnOIhgNeKIbEO4=";
+    sha256 = "sha256-VagX7ATVu6AT4POWoG9btizxFeBh9MLXiLpavtfXnyM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
index 46c1307826ef2..8627ca53d54b2 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/pkgs/development/python-modules/pybind11/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   postBuild = ''
     # build tests
-    make
+    make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES
   '';
 
   postInstall = ''
@@ -60,6 +60,8 @@ buildPythonPackage rec {
     "tests/test_numpy_dtypes.py"
     # no need to test internal packaging
     "tests/extra_python_package/test_files.py"
+    # tests that try to parse setuptools stdout
+    "tests/extra_setuptools/test_setuphelper.py"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix
index 1cd7d91ef2593..ae90c21bea9f9 100644
--- a/pkgs/development/python-modules/pybluez/default.nix
+++ b/pkgs/development/python-modules/pybluez/default.nix
@@ -2,11 +2,14 @@
 , buildPythonPackage
 , fetchFromGitHub
 , pkgs
+, isPy3k
 }:
 
 buildPythonPackage rec {
   version = "unstable-20160819";
   pname = "pybluez";
+  # requires use2to3, which is no longer supported in setuptools>58
+  disabled = isPy3k;
 
   propagatedBuildInputs = [ pkgs.bluez ];
 
diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix
index 375453231b9bc..ff050c15bfe08 100644
--- a/pkgs/development/python-modules/pycognito/default.nix
+++ b/pkgs/development/python-modules/pycognito/default.nix
@@ -4,22 +4,25 @@
 , envs
 , fetchFromGitHub
 , isPy27
+, freezegun
 , mock
+, moto
 , pytestCheckHook
 , python-jose
 , requests
+, requests-mock
 }:
 
 buildPythonPackage rec {
   pname = "pycognito";
-  version = "2022.01.0";
+  version = "2022.02.1";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "pvizeli";
     repo = pname;
     rev = version;
-    sha256 = "sha256-mmlw3irMC0SFjfEinXHyoPNfTvCcO02zGyqQLj9STSY=";
+    sha256 = "sha256-0PqeZ8yy2MzvIi1xQNosR7V2Ma3tMT0Q/v4OIv7f1Kg=";
   };
 
   propagatedBuildInputs = [
@@ -30,8 +33,11 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    freezegun
     mock
+    moto
     pytestCheckHook
+    requests-mock
   ];
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix
index f80f900347848..68a19afddba71 100644
--- a/pkgs/development/python-modules/pydmd/default.nix
+++ b/pkgs/development/python-modules/pydmd/default.nix
@@ -35,9 +35,10 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTestPaths = [
-    # Those tests take over 1.5 h on hydra. Also, an error and two failures
-    "tests/test_spdmd.py"
+  pytestFlagsArray = [
+    # test suite takes over 100 vCPU hours, just run small subset of it.
+    # TODO: Add a passthru.tests with all tests
+    "tests/test_dmdbase.py"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix
index a252cd4505ac2..e47e0366c8631 100644
--- a/pkgs/development/python-modules/pyee/default.nix
+++ b/pkgs/development/python-modules/pyee/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "pyee";
-  version = "8.2.2";
+  version = "9.0.4";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-XH5g+N+VcQ2+F1UOFs4BU/g5kMAO90SEG0Pzce1T6+o=";
+    sha256 = "sha256-J3DEkoq8ch9GtwXmpysMWUgMSmnJqDygsAu5lPHqSzI=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix
index a2815c3e1e2d2..e356ca563b545 100644
--- a/pkgs/development/python-modules/pyfaidx/default.nix
+++ b/pkgs/development/python-modules/pyfaidx/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "pyfaidx";
-  version = "0.6.3.1";
+  version = "0.6.4";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "93adf036a75e08dc9b1dcd59de6a4db2f65a48c603edabe2e499764b6535ed50";
+    sha256 = "sha256-e6O9yx30unSfdmWzTmoFKqToQkBqDflebfRxfMEj85I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix
index 29803793fd6f8..63bf4483911a2 100644
--- a/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/pkgs/development/python-modules/pyfakefs/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.5.4";
+  version = "4.5.5";
   pname = "pyfakefs";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5b5951e873f73bf12e3a19d8e4470c4b7962c51df753cf8c4caaf64e24a0a323";
+    sha256 = "sha256-iIIe2MJjJxu2alRBmoJZGqEH+yz9pC3I8hWOC+CIWQc=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index b8b405a8ecf03..47654ff34c6a8 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pygit2";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-bixc/1qh5D9DEDSAdhFS9cXWvvQPXB9QyHWKbonmbLY=";
+    sha256 = "sha256-xehYisrV4y+gWVWCVxBZ5rkOx8SHxYtOU8KADcveRMg=";
   };
 
   preConfigure = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix
index 4c557b2676cdf..22cea8c0709db 100644
--- a/pkgs/development/python-modules/pygls/default.nix
+++ b/pkgs/development/python-modules/pygls/default.nix
@@ -4,6 +4,7 @@
 , fetchFromGitHub
 , setuptools-scm
 , pydantic
+, toml
 , typeguard
 , mock
 , pytest-asyncio
@@ -13,6 +14,7 @@
 buildPythonPackage rec {
   pname = "pygls";
   version = "0.11.3";
+  format = "setuptools";
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
@@ -27,6 +29,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     pydantic
+    toml
     typeguard
   ];
   # We don't know why an early version of pydantic is required, see:
diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix
index 6028f19bdab22..ff59ccd9c9cc3 100644
--- a/pkgs/development/python-modules/pyhaversion/default.nix
+++ b/pkgs/development/python-modules/pyhaversion/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyhaversion";
-  version = "22.02.0";
+  version = "22.04.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-7cBUsTEZ9yVlWsUdKs4YWm647baN09AQJI+7CTORhLc=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-ItemkSm85Sq3utEG28mvfS7gq95veeYwhHG6BpOUJJY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix
index 3281a7ceb8735..02226feff2ced 100644
--- a/pkgs/development/python-modules/pyicu/default.nix
+++ b/pkgs/development/python-modules/pyicu/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "PyICU";
-  version = "2.8";
+  version = "2.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3d80de47045a8163db5aebc947c42b4d429eeea4f0c32af4f40b33981fa872b9";
+    sha256 = "sha256-8LlUmof4e6fEE/E2edE3Jx4LN/HzmwEJrOOCV9TRSNY=";
   };
 
   nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config
diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix
index 5daadce41f444..4037146710085 100644
--- a/pkgs/development/python-modules/pyisy/default.nix
+++ b/pkgs/development/python-modules/pyisy/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "pyisy";
-  version = "3.0.5";
+  version = "3.0.6";
 
   src = fetchFromGitHub {
     owner = "automicus";
     repo = "PyISY";
-    rev = "v${version}";
-    hash = "sha256-lVutG/xJvVP0qS0UnEyS/9KwwqdRX6ownTKek8/VXbU=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-4thCP9Xc3dtL6IaP863sW/L4aj4+QIPFv6p0kFLGh7E=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix
index 3f93aef0a3f7b..5d8674aac023e 100644
--- a/pkgs/development/python-modules/pylama/default.nix
+++ b/pkgs/development/python-modules/pylama/default.nix
@@ -10,12 +10,14 @@
 , pydocstyle
 , pyflakes
 , vulture
+, isort
+, pylint
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "pylama";
-  version = "8.3.6";
+  version = "8.3.7";
 
   format = "setuptools";
 
@@ -24,7 +26,7 @@ buildPythonPackage rec {
     owner = "klen";
     repo = "pylama";
     rev = version;
-    hash = "sha256-KU/G+2Fm4G/dUuNhhk8xM0Y8+7YOUUgREONM8CQGugw=";
+    hash = "sha256-//mrvZb4bT4aATURqa4g1DUagYe9SoP3o3OrwmiEJnI=";
   };
 
   patches = [
@@ -45,14 +47,22 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    # avoid infinite recursion pylint -> isort -> pylama
+    (pylint.override {
+      isort = isort.overridePythonAttrs (old: {
+        doCheck = false;
+      });
+    })
     pytestCheckHook
   ];
 
+  preCheck = ''
+    export HOME=$TEMP
+  '';
+
   disabledTests = [
-    "test_pylint" # infinite recursion
     "test_quotes" # FIXME package pylama-quotes
     "test_radon" # FIXME package radon
-    "test_sort"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix
index 291ef8fba62ef..61d49bd3ba0db 100644
--- a/pkgs/development/python-modules/pylint-django/default.nix
+++ b/pkgs/development/python-modules/pylint-django/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pylint-django";
-  version = "2.5.0";
+  version = "2.5.2";
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1r48dss9qnzlifwy5ylkffdw35aaajmil0486mav056jm1vmi2pr";
+    sha256 = "sha256-VgGdV1T154LauclGo6jpLPUrYn5vTOWwvO4IXQ9se7c=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix
index f30b6ea06b4c0..f2055ca9a791f 100644
--- a/pkgs/development/python-modules/pymemcache/default.nix
+++ b/pkgs/development/python-modules/pymemcache/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "pymemcache";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "pinterest";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-O2qmcLWCUSc1f32irelIZOOuOziOUQXFGcuQJBXPvvM=";
+    sha256 = "sha256-DKqfv5gf9gzbnEPQSzy2mAaVYJZL9jmTKyGWVzj40T4=";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix
index bae4f7c25fb82..ba184f68b4b5a 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/pkgs/development/python-modules/pymongo/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "pymongo";
-  version = "3.12.2";
+  version = "3.12.3";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "64ea5e97fca1a37f83df9f3460bf63640bc0d725e12f3471e6acbf3a6040dd37";
+    sha256 = "sha256-ConK3ABipeU2ZN3gQ/bAlxcrjBxfAJRJAJUoL/mZWl8=";
   };
 
   # Tests call a running mongodb instance
diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix
index 2030507e07f3a..1eabc9daaee79 100644
--- a/pkgs/development/python-modules/pynetgear/default.nix
+++ b/pkgs/development/python-modules/pynetgear/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pynetgear";
-  version = "0.9.2";
+  version = "0.9.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,8 +15,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MatMaul";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-/aPyx+jNOCW6bzeYAEBP1yfIJfQwJjo1i6WaRvAz0oU=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-/oxwUukYq/a0WeO/XhkMW3Jj7I1icZZUDwh1mdbGi08=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix
index f15cfef63c6e0..79b914f6122cc 100644
--- a/pkgs/development/python-modules/pynndescent/default.nix
+++ b/pkgs/development/python-modules/pynndescent/default.nix
@@ -34,6 +34,16 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # numpy.core._exceptions._UFuncNoLoopError
+    "test_sparse_nn_descent_query_accuracy_angular"
+    "test_nn_descent_query_accuracy_angular"
+    "test_alternative_distances"
+    # scipy: ValueError: Unknown Distance Metric: wminkowski
+    # https://github.com/scikit-learn/scikit-learn/pull/21741
+    "test_weighted_minkowski"
+  ];
+
   pythonImportsCheck = [
     "pynndescent"
   ];
diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix
index e8d89e9ef2d25..20450cd9effc6 100644
--- a/pkgs/development/python-modules/pyomo/default.nix
+++ b/pkgs/development/python-modules/pyomo/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyomo";
-  version = "5.7.3";
+  version = "6.3.0";
   disabled = isPy27; # unable to import pyutilib.th
 
   src = fetchFromGitHub {
     repo = "pyomo";
     owner = "pyomo";
     rev = version;
-    sha256 = "sha256-p0/DdCwyXdzXElzjWewKs0Oi7BMXC+BxgYikdZL0t68=";
+    sha256 = "sha256-xyjiB5fDRf5y9Av5Cr+8wtU4pHzMHsM45mcmJEOaTWs=";
   };
 
   checkInputs = [ nose glpk ];
diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix
index c6839bba98962..195ec563d50f6 100644
--- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix
+++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix
@@ -1,11 +1,13 @@
 { lib
 , buildPythonPackage
+, pythonAtLeast
 , fetchPypi
 }:
 
 buildPythonPackage rec {
   pname = "pyopengl-accelerate";
   version = "3.1.5";
+  disabled = pythonAtLeast "3.10"; # fails to compile
 
   src = fetchPypi {
     pname = "PyOpenGL-accelerate";
diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix
index 72d6ae3325837..7370057ad720d 100644
--- a/pkgs/development/python-modules/pyopengl/default.nix
+++ b/pkgs/development/python-modules/pyopengl/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "pyopengl";
-  version = "3.1.5";
+  version = "3.1.6";
 
   src = fetchPypi {
     pname = "PyOpenGL";
     inherit version;
-    sha256 = "4107ba0d0390da5766a08c242cf0cf3404c377ed293c5f6d701e457c57ba3424";
+    sha256 = "sha256-jqbIdzkn7adAW//G9buTvoFWmnsFyMrFDNlOlp3OXic=";
   };
 
   propagatedBuildInputs = [ pillow ];
diff --git a/pkgs/development/python-modules/pyownet/default.nix b/pkgs/development/python-modules/pyownet/default.nix
index 2bdc18e1e2440..9a368c26087eb 100644
--- a/pkgs/development/python-modules/pyownet/default.nix
+++ b/pkgs/development/python-modules/pyownet/default.nix
@@ -14,6 +14,10 @@ buildPythonPackage rec {
     sha256 = "4f2fa4471c2f806b35090bdc6c092305c6eded3ff3736f8b586d35bdb157de62";
   };
 
+  postPatch = ''
+    sed -i '/use_2to3/d' setup.py
+  '';
+
   # tests access network
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix
index 32bada43c1545..8e46be2697ce8 100644
--- a/pkgs/development/python-modules/pypandoc/default.nix
+++ b/pkgs/development/python-modules/pypandoc/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "pypandoc";
-  version = "1.7.4";
+  version = "1.7.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-KN4j9kbZ6ARAPGth180yptdso1arx563IXvb/2dI+G4=";
+    sha256 = "sha256-gCwmquF7ZBNsbQBpSdjOGDp9TZ+9Ty0FHmb0+59FylA=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix
index 27047cf6eabc4..449c5334e6640 100644
--- a/pkgs/development/python-modules/pyparsing/default.nix
+++ b/pkgs/development/python-modules/pyparsing/default.nix
@@ -11,13 +11,13 @@
 let
   pyparsing = buildPythonPackage rec {
     pname = "pyparsing";
-    version = "3.0.6";
+    version = "3.0.7";
 
     src = fetchFromGitHub {
       owner = "pyparsing";
       repo = pname;
       rev = "pyparsing_${version}";
-      sha256 = "0n89ky7rx5yg09ssji8liahnyxip08hz7syc2k4pmlgs4978181a";
+      sha256 = "sha256-RyvTTbFshAZgyZPgzqcq31E504RlnMZuf16jJYGqDDI=";
     };
 
     # circular dependencies if enabled by default
diff --git a/pkgs/development/python-modules/pypdf3/default.nix b/pkgs/development/python-modules/pypdf3/default.nix
index 4970c0d527bb5..a4273497e3bc4 100644
--- a/pkgs/development/python-modules/pypdf3/default.nix
+++ b/pkgs/development/python-modules/pypdf3/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "pypdf3";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchPypi {
     pname = "PyPDF3";
     inherit version;
-    sha256 = "sha256-DGKpR4p3z8tw4gKi5Hmj09svysD3Hkn4NklhgROmEAU=";
+    sha256 = "sha256-yUbzJzQZ43JY415yJz9JkEqxVyPYenYcERXvmXmfjF8=";
   };
 
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix
index 40a77fc0c7bd1..25cf9906cb44b 100644
--- a/pkgs/development/python-modules/pyperf/default.nix
+++ b/pkgs/development/python-modules/pyperf/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "pyperf";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8a85dd42e067131d5b26b71472336da7f7f4b87ff9c97350d89f5ff0de9adedc";
+    sha256 = "sha256-SsLiz3JKubUlInw7SmnxarXHFOpbrWHJdODF1XhyOKE=";
   };
 
   checkInputs = [ nose psutil ] ++
diff --git a/pkgs/development/python-modules/pyplaato/default.nix b/pkgs/development/python-modules/pyplaato/default.nix
index d4e91a985ef34..46168b87116de 100644
--- a/pkgs/development/python-modules/pyplaato/default.nix
+++ b/pkgs/development/python-modules/pyplaato/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "pyplaato";
-  version = "0.0.15";
+  version = "0.0.16";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nykbkv2fg1x5min07cbi44x6am48f5gw3mnyj7x2kpmj6sqfpqp";
+    sha256 = "sha256-0hbdwgkQhcjD9YbpG+bczAAi9u1QfrJdMn1g14EBPac=";
   };
 
   propagatedBuildInputs = [ aiohttp python-dateutil ];
diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix
index bb15a4d927ab2..a5b618d56902b 100644
--- a/pkgs/development/python-modules/pyres/default.nix
+++ b/pkgs/development/python-modules/pyres/default.nix
@@ -1,26 +1,10 @@
 { lib, stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
 
-let
-
-  # the requirements of `pyres` support Redis 3.x (due to a missing upper-bound),
-  # but it doesn't support Redis 3.x.
-  redis' = redis.overridePythonAttrs (old: rec {
-    pname = "redis";
-    version = "2.10.6";
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "03vcgklykny0g0wpvqmy8p6azi2s078317wgb2xjv5m2rs9sjb52";
-    };
-  });
-
-in
-
 buildPythonPackage rec {
   pname = "pyres";
   version = "1.5";
 
-  # ps is used in Worker.worker_pids method
-  propagatedBuildInputs = [ simplejson setproctitle redis' pkgs.ps ];
+  propagatedBuildInputs = [ simplejson setproctitle redis pkgs.ps ];
   checkInputs = [ nose pkgs.redis ];
 
   # PyPI tarball doesn't contain tests so let's use GitHub
@@ -44,5 +28,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/binarydud/pyres";
     license = licenses.mit;
     maintainers = with maintainers; [ jluttine ];
+    broken = true; # not compatible with latest redis
   };
 }
diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index 75cecc7d70916..5a1b66bfa26c5 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "pyrsistent";
-  version = "0.18.0";
+  version = "0.18.1";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b";
+    sha256 = "sha256-1NYfi5k6clW6cU3zrKUnAPgSUon4T3BM+AkWUXxG65Y=";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix
index bbf4ee712c6a1..3b91236a6ccfe 100644
--- a/pkgs/development/python-modules/pyscss/default.nix
+++ b/pkgs/development/python-modules/pyscss/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "pyScss";
-  version = "1.3.7";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     repo = "pyScss";
     owner = "Kronuz";
-    rev = version;
-    sha256 = "0701hziiiw67blafgpmjhzspmrss8mfvif7fw0rs8fikddwwc9g6";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-z0y4z+/JE6rZWHAvps/taDZvutyVhxxs2gMujV5rNu4=";
   };
 
   checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix
index 3ad501324260f..1c7cd8ee299db 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.4.4";
+  version = "0.4.5";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "SigmaHQ";
     repo = "pySigma";
     rev = "v${version}";
-    hash = "sha256-eZDPi87wwsM0EriJ/Y1yTSJ9R4BqvJg3YJyJUa2vLqo=";
+    hash = "sha256-jZPimSkJ6qTs0kEMVhP9Gnxu0jxA0cmgdn5++CevgIM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix
index d645a068d291c..31e40fcb12da3 100644
--- a/pkgs/development/python-modules/pysimplegui/default.nix
+++ b/pkgs/development/python-modules/pysimplegui/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pysimplegui";
-  version = "4.57.0";
+  version = "4.59.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PySimpleGUI";
     inherit version;
-    sha256 = "sha256-+Dcrv+esnthI74AFLK47sS2qI4sPvihuQlL54Zo32RM=";
+    sha256 = "sha256-GW6BwKQ36sSJNZXy7mlRW5hB5gjTUb08V33XqRNFT1E=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix
index 2e6f41aa23327..c424e3195e7d9 100644
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pyspark";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bfea06179edbfb4bc76a0f470bd3c38e12f00e1023e3ad0373558d07cff102ab";
+    sha256 = "sha256-C4E1kmLsbprHjDUzROfeAmAn0UDG3vlJ/w2Aq3D4mlQ=";
   };
 
   # pypandoc is broken with pandoc2, so we just lose docs.
diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix
index 561ec037c0a2a..563042091bf74 100644
--- a/pkgs/development/python-modules/pyspnego/default.nix
+++ b/pkgs/development/python-modules/pyspnego/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pyspnego";
-  version = "0.3.1";
+  version = "0.5.0";
 
   disabled = pythonOlder "3.7";
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "jborean93";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-f7CR7wMxHNNpxizV7MFCtWci3SSNvdx+W5i/rgOUSxY=";
+    sha256 = "sha256-CvPvyP7Vi2Ib+ikgUQt8JkVt5fxzapG590TgAehXqHE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix
index 4aac6902ce3bb..13cfdaea214e1 100644
--- a/pkgs/development/python-modules/pytesseract/default.nix
+++ b/pkgs/development/python-modules/pytesseract/default.nix
@@ -1,8 +1,9 @@
-{ buildPythonPackage, fetchPypi, lib, pillow, tesseract, substituteAll, packaging }:
+{ buildPythonPackage, fetchPypi, lib, packaging, pillow, tesseract, substituteAll }:
 
 buildPythonPackage rec {
   pname = "pytesseract";
   version = "0.3.9";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
@@ -16,8 +17,14 @@ buildPythonPackage rec {
     })
   ];
 
-  buildInputs = [ tesseract ];
-  propagatedBuildInputs = [ pillow packaging ];
+  buildInputs = [
+    tesseract
+  ];
+
+  propagatedBuildInputs = [
+    packaging
+    pillow
+  ];
 
   # the package doesn't have any tests.
   doCheck = false;
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index b8d3dffa3b0b9..da60feb724f8f 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-asyncio";
-  version = "0.18.0";
+  version = "0.18.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "pytest-dev";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-PE66ogjfzj6cW3+UD5nZHSt6zg7b+j6Q4ACznE4j0j8=";
+    hash = "sha256-9KN45+Pdz40rJv1NUxuoy8xWtLGt7kz7YcqfjfZ9x4A=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix
index c1c918c4d60c2..767d300f7dd94 100644
--- a/pkgs/development/python-modules/pytest-cid/default.nix
+++ b/pkgs/development/python-modules/pytest-cid/default.nix
@@ -20,6 +20,11 @@ buildPythonPackage rec {
     sha256 = "sha256-H2RtMGYWukowTTfqZSx+hikxzkqw1v5bA4AfZfiVl8U=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "pytest >= 5.0, < 7.0" "pytest >= 5.0"
+  '';
+
   propagatedBuildInputs = [
     py-cid
   ];
diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix
index 9536325ade513..569ac8606f6a1 100644
--- a/pkgs/development/python-modules/pytest-httpx/default.nix
+++ b/pkgs/development/python-modules/pytest-httpx/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-httpx";
-  version = "0.17.3";
+  version = "0.20.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "Colin-b";
     repo = "pytest_httpx";
     rev = "v${version}";
-    sha256 = "sha256-cJRzjNIN9Fc8vcjmndW+akjxDSp+wFahY2MEslgXIwM=";
+    sha256 = "sha256-9LDbVZgTmfyYAWylUy6Q4KH2gKpAa/o4IhqQV31BVgY=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix
index e628e6a158c51..c06959b96c419 100644
--- a/pkgs/development/python-modules/pytest-isort/default.nix
+++ b/pkgs/development/python-modules/pytest-isort/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-isort";
-  version = "2.0.0";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "821a8c5c9c4f3a3c52cfa9c541fbe89ac9e28728125125af53724c4c3f129117";
+    sha256 = "sha256-T+Sybq0q93ZzDsI/WHDXQh81qs4ipBxOk4WG702Hh8s=";
   };
 
   propagatedBuildInputs = [ isort ];
diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix
index 747411ad74558..b5a5775f56edd 100644
--- a/pkgs/development/python-modules/pytest-mpl/default.nix
+++ b/pkgs/development/python-modules/pytest-mpl/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-mpl";
-  version = "0.13";
+  version = "0.14.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "582db6e14315f9b08cbd2df39b136dc344bfe8a27c2f05b995460fb0969ec19e";
+    sha256 = "sha256-iE4HjS1TgK9WQzhOIzw1jpZZgl+y2X/9r48YXENMjYk=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix
index 8c52fa2e69889..bec0ee59d0c5b 100644
--- a/pkgs/development/python-modules/pytest-mypy/default.nix
+++ b/pkgs/development/python-modules/pytest-mypy/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-mypy";
-  version = "0.8.1";
+  version = "0.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fa55723a4bf1d054fcba1c3bd694215a2a65cc95ab10164f5808afd893f3b11";
+    sha256 = "sha256-n/o79AXBLFxr6ekuIr67arLJG5wy9FsPDJOvRzJpq1w=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/pytest-pythonpath/default.nix b/pkgs/development/python-modules/pytest-pythonpath/default.nix
deleted file mode 100644
index 8c3fb48b430e6..0000000000000
--- a/pkgs/development/python-modules/pytest-pythonpath/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ buildPythonPackage, fetchPypi, lib, pytest }:
-
-buildPythonPackage rec {
-  pname = "pytest-pythonpath";
-  version = "0.7.4";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-ZOGVsjqPjAxjH7Fogtmtb6QTftHylh3dFdUgZc1DXbY=";
-  };
-
-  buildInputs = [ pytest ];
-  checkInputs = [ pytest ];
-
-  checkPhase = ''
-    pytest
-  '';
-
-  meta = with lib; {
-    description =
-      "Pytest plugin for adding to the PYTHONPATH from command line or configs";
-    homepage = "https://github.com/bigsassy/pytest-pythonpath";
-    maintainers = with maintainers; [ cript0nauta ];
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix
index 6866df7b71258..99099d3ac9247 100644
--- a/pkgs/development/python-modules/pytest-regressions/default.nix
+++ b/pkgs/development/python-modules/pytest-regressions/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-regressions";
-  version = "2.3.0";
+  version = "2.3.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-STWtZzbvhQ0NsSvl7jh0CjmYjmtRA/LTUQAAaze5Tg4=";
+    sha256 = "sha256-s+xM2zTo9idgYnXYuDTGXmDhowc+MmuzcnpCcnPQIh0=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/pytest-runner/default.nix b/pkgs/development/python-modules/pytest-runner/default.nix
index d99f72299dd7d..baca23d774913 100644
--- a/pkgs/development/python-modules/pytest-runner/default.nix
+++ b/pkgs/development/python-modules/pytest-runner/default.nix
@@ -1,20 +1,29 @@
-{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools-scm
+, pytest
+}:
 
 buildPythonPackage rec {
   pname = "pytest-runner";
-  version = "5.3.1";
+  version = "6.0.0";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fce5b8dc68760f353979d99fdd6b3ad46330b6b1837e2077a89ebcf204aac91";
+    sha256 = "sha256-tNhTYu0ptMNIZ43nl99Djw8FCUl924xkcJbAKm2HtoU=";
   };
 
-  nativeBuildInputs = [ setuptools-scm pytest ];
-
   postPatch = ''
     rm pytest.ini
   '';
 
+  nativeBuildInputs = [
+    setuptools-scm
+    pytest
+  ];
+
   checkPhase = ''
     py.test tests
   '';
diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix
index 1376d3e8412f8..bcd4abb4d4100 100644
--- a/pkgs/development/python-modules/pytest-socket/default.nix
+++ b/pkgs/development/python-modules/pytest-socket/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-socket";
-  version = "0.5.0";
+  version = "0.5.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "miketheman";
     repo = pname;
     rev = version;
-    hash = "sha256-HdGkpIHFsoAG2+8UyL9jSb3Dm8bWkYzREdY3i15ls/Q=";
+    hash = "sha256-QKHnuq2pqWMVUhF9nnhJggEK6SSyp6zBEfQX9tGND2E=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix
index d5e379b524d5f..b1df1ceaad678 100644
--- a/pkgs/development/python-modules/pytest-subtests/default.nix
+++ b/pkgs/development/python-modules/pytest-subtests/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-subtests";
-  version = "0.6.0";
+  version = "0.7.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Pr0wao3PdRM/F0LyiMgvNkJuvPihMtTuiXgtIOhPwTo=";
+    sha256 = "sha256-lcRMd+P77emEi7iMqQs4SBX8uoCQ75qfVWWasWOxaBw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix
index 1b291778b2ad6..3a39700186525 100644
--- a/pkgs/development/python-modules/pytest-testmon/default.nix
+++ b/pkgs/development/python-modules/pytest-testmon/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "pytest-testmon";
-  version = "1.2.2";
+  version = "1.3.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e69d5aeac4e371986f94e8ad06e56d70633870d026f2306fca44051f02fcb688";
+    sha256 = "sha256-1Qyroq6Dv11EaCGRAj19bKQBfRz26XSh5TJY7xA/vBE=";
   };
 
   propagatedBuildInputs = [ coverage ];
diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix
index f99340e48b3b2..e380068c59d35 100644
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "pytest-timeout";
-  version = "2.0.2";
+  version = "2.1.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e6f98b54dafde8d70e4088467ff621260b641eb64895c4195b6e5c8f45638112";
+    sha256 = "sha256-wHygdATGEvirviIpSyPDaOLlEEtSHBeQGVVh834aw9k=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 0b1bb2b02030b..109e918285881 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,5 +1,4 @@
 { lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
-, pythonAtLeast, fetchpatch
 , atomicwrites
 , attrs
 , hypothesis
@@ -13,29 +12,21 @@
 , setuptools
 , setuptools-scm
 , six
-, toml
+, tomli
 , wcwidth
 , writeText
 }:
 
 buildPythonPackage rec {
   pname = "pytest";
-  version = "6.2.5";
+  version = "7.0.1";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89";
+    sha256 = "sha256-4wkFoMEx09lLiWJKHMWv7D4LovvbFRhn2ODr1JhQ8XE=";
   };
 
-  patches = lib.optionals (pythonAtLeast "3.10") [
-    (fetchpatch {
-      # Fix test_errors_in_xfail_skip_expressions for Python 3.10.1, remove after 6.2.5
-      url = "https://github.com/pytest-dev/pytest/commit/913439f5e5691f391e2969b3c8f0a49e50dce43a.patch";
-      sha256 = "0hsl3lww6bx5k99cp8gj0fy9rg02kcfbwiiwjx2y8vbhwd5ns41p";
-    })
-  ];
-
   nativeBuildInputs = [ setuptools-scm ];
 
   propagatedBuildInputs = [
@@ -48,7 +39,7 @@ buildPythonPackage rec {
     py
     setuptools
     six
-    toml
+    tomli
     wcwidth
   ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
 
@@ -95,7 +86,7 @@ buildPythonPackage rec {
     # - files are not needed after tests are finished
     pytestRemoveBytecodePhase () {
         # suffix is defined at:
-        #    https://github.com/pytest-dev/pytest/blob/6.2.5/src/_pytest/assertion/rewrite.py#L51-L53
+        #    https://github.com/pytest-dev/pytest/blob/7.0.1/src/_pytest/assertion/rewrite.py#L51-L53
         find $out -name "*-pytest-*.py[co]" -delete
     }
     preDistPhases+=" pytestRemoveBytecodePhase"
diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix
index 074e5699e3d5a..cc12b14aa153e 100644
--- a/pkgs/development/python-modules/python-daemon/default.nix
+++ b/pkgs/development/python-modules/python-daemon/default.nix
@@ -51,6 +51,11 @@ buildPythonPackage rec {
     })
   ];
 
+  disabledTestPaths = [
+    # requires removed distutils.command
+    "test_version.py"
+  ];
+
   disabledTests = [
     "begin_with_TestCase"
     "changelog_TestCase"
diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix
index 60e6f2e745526..378c58f02364f 100644
--- a/pkgs/development/python-modules/python-dbusmock/default.nix
+++ b/pkgs/development/python-modules/python-dbusmock/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "python-dbusmock";
-  version = "0.25.0";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "martinpitt";
     repo = pname;
     rev = version;
-    sha256 = "0zg2aib0k6hc1vvlbdcmp003m85dvkv7pndzgkc4vv2y9qpi0jp9";
+    sha256 = "sha256-kavbWMTgKU/rBIo7RMs9NkwReYQyEdeFwMBSzEM9wa0=";
   };
 
   prePatch = ''
diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix
index 754bac51ea682..3d290ae5eda5e 100644
--- a/pkgs/development/python-modules/python-glanceclient/default.nix
+++ b/pkgs/development/python-modules/python-glanceclient/default.nix
@@ -19,11 +19,11 @@
 
 buildPythonApplication rec {
   pname = "python-glanceclient";
-  version = "3.5.0";
+  version = "3.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "417b9d814b43e62df4351f26a0d5569b801e9f99f7758bd8c82ef994c3629356";
+    sha256 = "sha256-gi1IYtWJL2pltoKTRy5gsHTRwHlp0GHoBMbh1UP5g9o=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix
index 8ba5c7dd21fc8..d78682a8c66cf 100644
--- a/pkgs/development/python-modules/python-heatclient/default.nix
+++ b/pkgs/development/python-modules/python-heatclient/default.nix
@@ -22,11 +22,11 @@
 
 buildPythonApplication rec {
   pname = "python-heatclient";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b610748eb3f18f6bd762e0808accdf872308289a77c3b19ed2d8b9f306393a42";
+    sha256 = "sha256-3l7XyxKm18BAM1DhNsCmRwcZR224+8m/jQ1YHrwLHCs=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix
index c193cf7cd1ad9..83449a9285d3a 100644
--- a/pkgs/development/python-modules/python-ironicclient/default.nix
+++ b/pkgs/development/python-modules/python-ironicclient/default.nix
@@ -20,11 +20,11 @@
 
 buildPythonApplication rec {
   pname = "python-ironicclient";
-  version = "4.10.0";
+  version = "4.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8f3ad8ae1fc4df524ea05a458ad2567b58144e881807dbbb985e282902d732fd";
+    sha256 = "sha256-zGG/3Cq7mARyuGGvqa4KGWFmx/UN+W2KMuy+RNenzXM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix
index 6adfbf5745d27..46ee0ad00fb2e 100644
--- a/pkgs/development/python-modules/python-kasa/default.nix
+++ b/pkgs/development/python-modules/python-kasa/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "python-kasa";
-  version = "0.4.2";
+  version = "0.4.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
-    sha256 = "sha256-5Ohks3yfqAAe+CiLEucibezmibl6TtktDXMHAhecXzA=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-r1PoOxFPA4zYFEpw+BakzDAJ13IMfcZpTJWkRt/q4go=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix
index a2da2e4f4a761..09dc46ba9552c 100644
--- a/pkgs/development/python-modules/python-manilaclient/default.nix
+++ b/pkgs/development/python-modules/python-manilaclient/default.nix
@@ -22,11 +22,11 @@
 
 buildPythonApplication rec {
   pname = "python-manilaclient";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-6iAed0mtEYHguYq4Rlh4YWT8E5hNqBYPcnG9/8RMspo=";
+    sha256 = "sha256-JFfkbJHmDQFbiWXw0Wp+0xSLyXowIHnsw7+5irZwhXo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix
index 16c4dc0f23085..2f22a20afb357 100644
--- a/pkgs/development/python-modules/python-slugify/default.nix
+++ b/pkgs/development/python-modules/python-slugify/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "python-slugify";
-  version = "6.1.0";
+  version = "6.1.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7/GQ5N+sl9L4wYkO5oJwns0jZQdCNhaH24LZXh5eJfU=";
+    hash = "sha256-AAAzl/TjFBTpIs5WezpNoozxQ2pT0zLJrutRx9jEaf0=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix
index fe4d6ea7bda7d..397fcaa3dd0d1 100644
--- a/pkgs/development/python-modules/python-snappy/default.nix
+++ b/pkgs/development/python-modules/python-snappy/default.nix
@@ -4,35 +4,33 @@
 , isPyPy
 , snappy
 , cffi
-, nose
+, python
 }:
 
 buildPythonPackage rec {
   pname = "python-snappy";
-  version = "0.6.0";
+  version = "0.6.1";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06l9my361ig4x5ycyrmq33q83zcdib3y2zxfxv7k7dlpyp9ri2hn";
+    sha256 = "sha256-tqEHqwYgasxTWdTFYyvZsi1EhwKnmzFpsMYuD7gIuyo=";
   };
 
   buildInputs = [ snappy ];
 
   propagatedBuildInputs = lib.optional isPyPy cffi;
 
-  checkInputs = [ nose ];
-
   checkPhase = ''
-    rm -r snappy # prevent local snappy from being picked up
-    nosetests test_snappy.py
-  '' + lib.optionalString isPyPy ''
-    nosetests test_snappy_cffi.py
+    runHook preCheck
+    ${python.interpreter} -m unittest discover
+    runHook postCheck
   '';
 
   meta = with lib; {
     description = "Python library for the snappy compression library from Google";
     homepage = "https://github.com/andrix/python-snappy";
     license = licenses.bsd3;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }
diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix
index cb3b5b850e36b..8c1e38ed45e07 100644
--- a/pkgs/development/python-modules/python-swiftclient/default.nix
+++ b/pkgs/development/python-modules/python-swiftclient/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonApplication rec {
   pname = "python-swiftclient";
-  version = "3.13.0";
+  version = "3.13.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b200dcfbc6842bd4cac29efd0ea9ef34d3b8625957472ba7aa3ae0242437e2cc";
+    sha256 = "sha256-LSbJC2OS9r76f7sW/Np75Eqibiropb7icF0dHIE4M/A=";
   };
 
   propagatedBuildInputs = [ pbr python-keystoneclient ];
diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix
index a21ee97eca5db..8bc9cf3090f04 100644
--- a/pkgs/development/python-modules/python3-saml/default.nix
+++ b/pkgs/development/python-modules/python3-saml/default.nix
@@ -3,14 +3,14 @@ isodate, lxml, xmlsec, freezegun }:
 
 buildPythonPackage rec {
   pname = "python3-saml";
-  version = "1.12.0";
+  version = "1.14.0";
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "onelogin";
     repo = "python3-saml";
     rev = "v${version}";
-    sha256 = "sha256-VPUsjuo4FIes8ti0tkR0kT3J3RdUt1wtl4QEahVsc2c=";
+    sha256 = "sha256-TAfVXh1fSKhNn/lsi7elq4wFyKCxCtCYUTrnH3ytBTw=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix
index 271d193ce019f..73c1987fb3c92 100644
--- a/pkgs/development/python-modules/pytomlpp/default.nix
+++ b/pkgs/development/python-modules/pytomlpp/default.nix
@@ -38,6 +38,14 @@ buildPythonPackage rec {
   # pelican requires > 2.7
   doCheck = !pythonOlder "3.6";
 
+  disabledTests = [
+    # incompatible with pytest7
+    # https://github.com/bobfang1992/pytomlpp/issues/66
+    "test_loads_valid_toml_files"
+    "test_round_trip_for_valid_toml_files"
+    "test_decode_encode_binary"
+  ];
+
   preCheck = ''
     cd tests
   '';
diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix
index 7dcd86705a35d..f4710872cbe86 100644
--- a/pkgs/development/python-modules/pytools/default.nix
+++ b/pkgs/development/python-modules/pytools/default.nix
@@ -3,34 +3,36 @@
 , fetchPypi
 , pythonOlder
 , decorator
-, appdirs
-, six
 , numpy
-, pytest
+, platformdirs
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "pytools";
-  version = "2021.2.9";
+  version = "2022.1";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "db6cf83c9ba0a165d545029e2301621486d1e9ef295684072e5cd75316a13755";
+    sha256 = "sha256-GXqs9uH11gxxW5JDh5Kst3Aq7Vnrv7FH+oTtp4DlT+4=";
   };
 
-  checkInputs = [ pytest ];
-
   propagatedBuildInputs = [
     decorator
-    appdirs
-    six
     numpy
+    platformdirs
+  ];
+
+  checkInputs = [
+    pytestCheckHook
   ];
 
-  checkPhase = ''
-    py.test -k 'not test_persistent_dict'
-  '';
+  pythonImportsCheck = [
+    "pytools"
+    "pytools.batchjob"
+    "pytools.lex"
+  ];
 
   meta = {
     homepage = "https://github.com/inducer/pytools/";
diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix
index de75aa0ae8fbd..d3c9a96551591 100644
--- a/pkgs/development/python-modules/pytorch-lightning/default.nix
+++ b/pkgs/development/python-modules/pytorch-lightning/default.nix
@@ -6,12 +6,12 @@
 , pytestCheckHook
 , pytorch
 , pyyaml
-, tensorflow-tensorboard
+, tensorboard
 , tqdm }:
 
 buildPythonPackage rec {
   pname = "pytorch-lightning";
-  version = "1.5.8";
+  version = "1.5.10";
 
   disabled = isPy27;
 
@@ -19,14 +19,14 @@ buildPythonPackage rec {
     owner = "PyTorchLightning";
     repo = pname;
     rev = version;
-    sha256 = "161mz66l11z4350q93fmmq3x0jzbp5761lf4fx3yvz17qzp7ygkn";
+    sha256 = "sha256-GP6/VZuRv8dS5wKQW7RbtOSa2vV9Af2Jp+ioEW3bIgc=";
   };
 
   propagatedBuildInputs = [
     future
     pytorch
     pyyaml
-    tensorflow-tensorboard
+    tensorboard
     tqdm
   ];
 
diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
index e9728b3d676c5..64dfca2e94b03 100644
--- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix
+++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname   = "pytorch-metric-learning";
-  version = "1.1.0";
+  version = "1.2.0";
 
   disabled = isPy27;
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "KevinMusgrave";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0qvlxgdml22fzrs47yzqpfzak8lfdrzayvapawfz93cq8903h7qp";
+    sha256 = "sha256-M/iH+pIuamOmvxLtKMzWXiuMCnMXzpVFRb/HfYfCKdc=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
index 46bd35b9cfb85..3c239d970402c 100644
--- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
+++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "pytorch-pfn-extras";
-  version = "0.5.6";
+  version = "0.5.7";
 
   src = fetchFromGitHub {
     owner = "pfnet";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ch4vhz3zjanj5advqsj51yy7idrp8yvydvcg4ymwa3wsfjrx58g";
+    sha256 = "sha256-gB575ZKXZRAy5K5CkBtfG6KG1yQ9WDREIobsy43CEOc=";
   };
 
   propagatedBuildInputs = [ numpy pytorch typing-extensions ];
diff --git a/pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch b/pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch
new file mode 100644
index 0000000000000..33a2304cb9b1a
--- /dev/null
+++ b/pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch
@@ -0,0 +1,13 @@
+diff --git a/third_party/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/src/client/linux/handler/exception_handler.cc
+index ca353c4099..499be0a986 100644
+--- a/third_party/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/third_party/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
+   // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
+   // the alternative stack. Ensure that the size of the alternative stack is
+   // large enough.
+-  static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
++  const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ);
+ 
+   // Only set an alternative stack if there isn't already one, or if the current
+   // one is too small.
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index c370eaf6a9426..24ba74a1013b2 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildPythonPackage, python,
+{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python,
   cudaSupport ? false, cudatoolkit, cudnn, nccl, magma,
   mklDnnSupport ? true, useSystemNccl ? true,
   MPISupport ? false, mpi,
@@ -12,7 +12,7 @@
   numactl,
 
   # Propagated build inputs
-  dataclasses, numpy, pyyaml, cffi, click, typing-extensions,
+  numpy, pyyaml, cffi, click, typing-extensions,
 
   # Unit tests
   hypothesis, psutil,
@@ -25,7 +25,7 @@
   ninja,
 
   # dependencies for torch.utils.tensorboard
-  pillow, six, future, tensorflow-tensorboard, protobuf,
+  pillow, six, future, tensorboard, protobuf,
 
   isPy3k, pythonOlder }:
 
@@ -117,9 +117,10 @@ let
 in buildPythonPackage rec {
   pname = "pytorch";
   # Don't forget to update pytorch-bin to the same version.
-  version = "1.10.2";
+  version = "1.11.0";
+  format = "setuptools";
 
-  disabled = !isPy3k;
+  disabled = pythonOlder "3.7.0";
 
   outputs = [
     "out"   # output standard python package
@@ -132,10 +133,15 @@ in buildPythonPackage rec {
     repo   = "pytorch";
     rev    = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-QcvoJqpZJXPSc9HLCJHetrp/hMESuC5kYl90d7Id0ZU=";
+    sha256 = "sha256-CEu63tdRBAF8CTchO3Qu8gUNObQylX6U08yDTI4/c/0=";
   };
 
-  patches = lib.optionals stdenv.isDarwin [
+  patches = [
+    # Fix for a breakpad incompatibility with glibc>2.33
+    # https://github.com/pytorch/pytorch/issues/70297
+    # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e
+    ./breakpad-sigstksz.patch
+  ] ++ lib.optionals stdenv.isDarwin [
     # pthreadpool added support for Grand Central Dispatch in April
     # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO)
     # that is available starting with macOS 10.13. However, our current
@@ -144,13 +150,6 @@ in buildPythonPackage rec {
     ./pthreadpool-disable-gcd.diff
   ];
 
-  # The dataclasses module is included with Python >= 3.7. This should
-  # be fixed with the next PyTorch release.
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "'dataclasses'" "'dataclasses; python_version < \"3.7\"'"
-  '';
-
   preConfigure = lib.optionalString cudaSupport ''
     export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}"
     export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
@@ -208,7 +207,7 @@ in buildPythonPackage rec {
   # https://github.com/pytorch/pytorch/issues/22346
   #
   # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++:
-  # https://github.com/pytorch/pytorch/blob/v1.2.0/setup.py#L17
+  # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17
   NIX_CFLAGS_COMPILE = lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ];
 
   nativeBuildInputs = [
@@ -230,9 +229,8 @@ in buildPythonPackage rec {
     pyyaml
     typing-extensions
     # the following are required for tensorboard support
-    pillow six future tensorflow-tensorboard protobuf
-  ] ++ lib.optionals MPISupport [ mpi ]
-    ++ lib.optionals (pythonOlder "3.7") [ dataclasses ];
+    pillow six future tensorboard protobuf
+  ] ++ lib.optionals MPISupport [ mpi ];
 
   checkInputs = [ hypothesis ninja psutil ];
 
diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix
index 89cd50f085f67..24784afc842dc 100644
--- a/pkgs/development/python-modules/pyudev/default.nix
+++ b/pkgs/development/python-modules/pyudev/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "pyudev";
-  version = "0.22.0";
+  version = "0.23.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xmj6l08iih2js9skjqpv4w7y0dhxyg91zmrs6v5aa65gbmipfv9";
+    sha256 = "sha256-Mq41hbMgpRvCg+CgQAD9iiVZnttEVB4vUDT2r+5dFcw=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix
index 2d276c6dccab9..2f1870dd1c852 100644
--- a/pkgs/development/python-modules/pyuv/default.nix
+++ b/pkgs/development/python-modules/pyuv/default.nix
@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, pythonAtLeast
 , fetchFromGitHub
 , libuv
 }:
@@ -7,6 +8,7 @@
 buildPythonPackage rec {
   pname = "pyuv";
   version = "1.4.0";
+  disabled = pythonAtLeast "3.10"; # https://github.com/saghul/pyuv/issues/273
 
   src = fetchFromGitHub {
     owner = "saghul";
diff --git a/pkgs/development/python-modules/pyvcf/default.nix b/pkgs/development/python-modules/pyvcf/default.nix
index 7c513617754fb..919477298b152 100644
--- a/pkgs/development/python-modules/pyvcf/default.nix
+++ b/pkgs/development/python-modules/pyvcf/default.nix
@@ -28,5 +28,6 @@ buildPythonPackage rec {
       vcf will attempt to parse the content of each record based on the data
       types specified in the meta-information lines
     '';
+    broken = true; # uses the 2to3 feature, that got removed in setuptools 0.58
   };
 }
diff --git a/pkgs/development/python-modules/pyverilog/default.nix b/pkgs/development/python-modules/pyverilog/default.nix
index 8e41d26921fa9..115014a25bbb7 100644
--- a/pkgs/development/python-modules/pyverilog/default.nix
+++ b/pkgs/development/python-modules/pyverilog/default.nix
@@ -5,7 +5,6 @@
 , jinja2
 , ply
 , verilog
-, pytest-pythonpath
 , pytestCheckHook
 }:
 
@@ -32,8 +31,12 @@ buildPythonPackage rec {
     verilog
   ];
 
+  preCheck = ''
+    substituteInPlace pytest.ini \
+      --replace "python_paths" "pythonpath"
+  '';
+
   checkInputs = [
-    pytest-pythonpath
     pytestCheckHook
   ];
 
diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix
index 96669c52634bd..c0800c3a8cc49 100644
--- a/pkgs/development/python-modules/pyvesync/default.nix
+++ b/pkgs/development/python-modules/pyvesync/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pyvesync";
-  version = "2.0.0";
+  version = "2.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-+054tFirjMF3sGLRpTVCZ3V2KN627b57+fFl6GBMMcU=";
+    sha256 = "sha256-7eGsRy8S6IZQ+UVNN8SoS7tBIYLlujSFr2qFldaxtJE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix
index db7bd82b652b6..0547f3edd9386 100644
--- a/pkgs/development/python-modules/pywbem/default.nix
+++ b/pkgs/development/python-modules/pywbem/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pywbem";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "52f668f7ee1f03bdd80485692b648588b3e1909e2dc0754dceca497f5e9cf059";
+    sha256 = "sha256-rYu75Kt+eVciwPJ/JlbJL8Zzp+BqFM0VGlDwMGRU0X4=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix
index 67f11ed291f5b..2a369ca5704fa 100644
--- a/pkgs/development/python-modules/pywebview/default.nix
+++ b/pkgs/development/python-modules/pywebview/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pywebview";
-  version = "3.5";
+  version = "3.6.1";
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "r0x0r";
     repo = "pywebview";
     rev = version;
-    sha256 = "sha256-+At/ToEylSPcLh/u2NHVTXQpMnw+2/afsevg5YAX/4c=";
+    sha256 = "sha256-9o9ghqvU9Hnmf2aj/BqX7WBgS9ilRSnicR+qd25OfjI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix
index 511bc0b2a0bed..ad00a16a880ea 100644
--- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix
+++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "qiskit-machine-learning";
-  version = "0.3.0";
+  version = "0.3.1";
 
   disabled = pythonOlder "3.6";
 
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "qiskit";
     repo = pname;
     rev = version;
-    sha256 = "0jycs18apnwrksarpwpmp7scndyx91vnv6fchil4jyx4kym8mnf9";
+    sha256 = "sha256-8tnd6+tqofKuK/sBdqmClBtywHbu3VvwLjO9k4YoChA=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix
index 8d19e360ca4d5..c1f078ecc1381 100644
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/pkgs/development/python-modules/qutip/default.nix
@@ -1,57 +1,69 @@
 { lib, stdenv, fetchFromGitHub, buildPythonPackage, python, packaging, numpy
-, cython, scipy, matplotlib, pytestCheckHook, pytest-rerunfailures }:
+, cython, scipy, matplotlib, pytestCheckHook, pytest-rerunfailures
+, doCheck ? false
+}:
 
-buildPythonPackage rec {
-  pname = "qutip";
-  version = "4.6.3";
+let
+  self = buildPythonPackage rec {
+    pname = "qutip";
+    version = "4.6.3";
 
-  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-11K7Tl7PE98nM2vGsa+OKIJYu0Wmv8dT700PDt9RRVk=";
-  };
+    src = fetchFromGitHub {
+      owner = pname;
+      repo = pname;
+      rev = "v${version}";
+      sha256 = "sha256-11K7Tl7PE98nM2vGsa+OKIJYu0Wmv8dT700PDt9RRVk=";
+    };
+
+    # QuTiP says it needs specific (old) Numpy versions. We overwrite them here
+    # as the tests work perfectly fine with up-to-date packages.
+    postPatch = ''
+      substituteInPlace setup.cfg --replace "numpy>=1.16.6,<1.20" "numpy>=1.16.6"
+    '';
+
+    # Disabling OpenMP support on Darwin.
+    setupPyGlobalFlags = lib.optional (!stdenv.isDarwin) "--with-openmp";
+
+    propagatedBuildInputs = [
+      packaging
+      numpy
+      cython
+      scipy
+      matplotlib
+    ];
+
+    checkInputs = [
+      pytestCheckHook
+      pytest-rerunfailures
+    ];
+
+    # test suite is very cpu intensive
+    inherit doCheck;
+    # - QuTiP tries to access the home directory to create an rc file for us.
+    # This of course fails and therefore, we provide a writable temp dir as HOME.
+    # - We need to go to another directory to run the tests from there.
+    # This is due to the Cython-compiled modules not being in the correct location
+    # of the source tree.
+    # - For running tests, see:
+    # https://qutip.org/docs/latest/installation.html#verifying-the-installation
+    checkPhase = ''
+      export OMP_NUM_THREADS=$NIX_BUILD_CORES
+      export HOME=$(mktemp -d)
+      mkdir -p test && cd test
+      ${python.interpreter} -c "import qutip.testing; qutip.testing.run()"
+    '';
+
+    pythonImportsCheck = [ "qutip" ];
+
+    passthru.tests = {
+      all-tests = self.override { doCheck = true; };
+    };
 
-  # QuTiP says it needs specific (old) Numpy versions. We overwrite them here
-  # as the tests work perfectly fine with up-to-date packages.
-  postPatch = ''
-    substituteInPlace setup.cfg --replace "numpy>=1.16.6,<1.20" "numpy>=1.16.6"
-  '';
-
-  # Disabling OpenMP support on Darwin.
-  setupPyGlobalFlags = lib.optional (!stdenv.isDarwin) "--with-openmp";
-
-  propagatedBuildInputs = [
-    packaging
-    numpy
-    cython
-    scipy
-    matplotlib
-  ];
-
-  checkInputs = [
-    pytestCheckHook
-    pytest-rerunfailures
-  ];
-
-  # - QuTiP tries to access the home directory to create an rc file for us.
-  # This of course fails and therefore, we provide a writable temp dir as HOME.
-  # - We need to go to another directory to run the tests from there.
-  # This is due to the Cython-compiled modules not being in the correct location
-  # of the source tree.
-  # - For running tests, see:
-  # https://qutip.org/docs/latest/installation.html#verifying-the-installation
-  checkPhase = ''
-    export OMP_NUM_THREADS=$NIX_BUILD_CORES
-    export HOME=$(mktemp -d)
-    mkdir -p test && cd test
-    ${python.interpreter} -c "import qutip.testing; qutip.testing.run()"
-  '';
-
-  meta = with lib; {
-    description = "Open-source software for simulating the dynamics of closed and open quantum systems";
-    homepage = "https://qutip.org/";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.fabiangd ];
+    meta = with lib; {
+      description = "Open-source software for simulating the dynamics of closed and open quantum systems";
+      homepage = "https://qutip.org/";
+      license = licenses.bsd3;
+      maintainers = [ maintainers.fabiangd ];
+    };
   };
-}
+in self
diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 27d6d498c3470..8c73268e6b8de 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -1,31 +1,86 @@
-{ buildPythonPackage, lib, fetchFromGitHub, isPy3k
-, cython, setuptools
-, numpy, affine, attrs, cligj, click-plugins, snuggs, gdal
-, pytest, pythonOlder, packaging, hypothesis, boto3
-, certifi, shapely
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+
+# build time
+, cython
+, gdal
+
+# runtime
+, affine
+, attrs
+, boto3
+, click
+, click-plugins
+, cligj
+, matplotlib
+, numpy
+, snuggs
+
+# tests
+, hypothesis
+, packaging
+, pytest-randomly
+, pytestCheckHook
+, shapely
 }:
 
 buildPythonPackage rec {
   pname = "rasterio";
-  version = "1.2.10";
+  version = "1.2.10"; # not x.y[ab]z, those are alpha/beta versions
+  format = "pyproject";
   disabled = pythonOlder "3.6";
 
   # Pypi doesn't ship the tests, so we fetch directly from GitHub
   src = fetchFromGitHub {
-    owner = "mapbox";
+    owner = "rasterio";
     repo = "rasterio";
     rev = version;
-    sha256 = "sha256-xVGwQfQvxsqYihUYXENJAz9Qp9xBkhsGc/RheRTJxgo=";
+    hash = "sha256-xVGwQfQvxsqYihUYXENJAz9Qp9xBkhsGc/RheRTJxgo=";
   };
 
-  checkInputs = [ boto3 pytest packaging hypothesis shapely ];
-  nativeBuildInputs = [ cython gdal ];
-  propagatedBuildInputs = [ certifi gdal numpy attrs affine cligj click-plugins snuggs setuptools ];
+  nativeBuildInputs = [
+    cython
+    gdal
+  ];
+
+  propagatedBuildInputs = [
+    affine
+    attrs
+    boto3
+    click
+    click-plugins
+    cligj
+    matplotlib
+    numpy
+    snuggs
+  ];
+
+  preCheck = ''
+    rm -rf rasterio
+  '';
+
+  checkInputs = [
+    pytest-randomly
+    pytestCheckHook
+    packaging
+    hypothesis
+    shapely
+  ];
+
+  pytestFlagsArray = [
+    "-m 'not network'"
+  ];
+
+  pythonImportsCheck = [
+    "rasterio"
+  ];
 
   meta = with lib; {
     description = "Python package to read and write geospatial raster data";
-    license = licenses.bsd3;
     homepage = "https://rasterio.readthedocs.io/en/latest/";
+    license = licenses.bsd3;
     maintainers = with maintainers; [ mredaelli ];
   };
 }
diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index 73f170b90b1b6..1a587d8d61acd 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -2,16 +2,23 @@
 , stdenv
 , buildPythonPackage
 , fetchFromGitHub
-, html5lib
+, pythonOlder
+
+# propagates
 , isodate
-, networkx
-, nose
 , pyparsing
-, tabulate
-, pandas
+
+# propagates <3.8
+, importlib-metadata
+
+# extras: networkx
+, networkx
+
+# extras: html
+, html5lib
+
+# tests
 , pytestCheckHook
-, pythonOlder
-, SPARQLWrapper
 }:
 
 buildPythonPackage rec {
@@ -32,34 +39,37 @@ buildPythonPackage rec {
     isodate
     html5lib
     pyparsing
-    SPARQLWrapper
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
   ];
 
+  passthru.extra-requires = {
+    html = [
+      html5lib
+    ];
+    networkx = [
+      networkx
+    ];
+  };
+
   checkInputs = [
-    networkx
-    pandas
-    nose
-    tabulate
     pytestCheckHook
-  ];
+  ]
+  ++ passthru.extra-requires.networkx
+  ++ passthru.extra-requires.html;
 
   pytestFlagsArray = [
     # requires network access
-    "--deselect rdflib/__init__.py::rdflib"
-    "--deselect test/jsonld/test_onedotone.py::test_suite"
+    "--deselect=rdflib/__init__.py::rdflib"
+    "--deselect=test/jsonld/test_onedotone.py::test_suite"
   ];
 
   disabledTests = [
     # Requires network access
-    "api_key"
-    "BerkeleyDBTestCase"
-    "test_bad_password"
     "test_service"
     "testGuessFormatForParse"
   ] ++ lib.optional stdenv.isDarwin [
     # Require loopback network access
-    "test_sparqlstore"
-    "test_sparqlupdatestore_mock"
     "TestGraphHTTP"
   ];
 
diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix
index 122c4fdf6653d..ab062615cc499 100644
--- a/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/pkgs/development/python-modules/readme_renderer/default.nix
@@ -43,6 +43,12 @@ buildPythonPackage rec {
   disabledTests = [
     # https://github.com/pypa/readme_renderer/issues/221
     "test_GFM_"
+    # Relies on old distutils behaviour removed by setuptools (TypeError: dist must be a Distribution instance)
+    "test_valid_rst"
+    "test_invalid_rst"
+    "test_malicious_rst"
+    "test_invalid_missing"
+    "test_invalid_empty"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index 0731487575b1a..7cd59a5528a7f 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "redis";
-  version = "4.1.0";
+  version = "4.1.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-IfCiO85weQkHbmuizgdsulm/9g0qsily4GR/32IP/kc=";
+    sha256 = "sha256-HZoM34n92T+EJhcz4k9Vp7vUE6myGf2vVuPnKMqaIwY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index 86e591eaf14f1..512a7162f0e3c 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "regex";
-  version = "2022.1.18";
+  version = "2022.3.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-l/MtwDqAVKTEpatddh7Uhh6CiywgD+vU5GhXBppIORY=";
+    hash = "sha256-eeWvH/JYvA/gvdb2m8SuM5NaiY48vvu8zyLoiif6BTs=";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 82d84dc26a974..629f8d0ec750e 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -11,11 +11,11 @@ let
   ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
 in buildPythonPackage rec {
   pname = "reportlab";
-  version = "3.6.5";
+  version = "3.6.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d8fe27ad312671c9347cf5997f7c1017833fac17233f33296281ba9fa0de189a";
+    sha256 = "sha256-3HZX/LC8PkhcPIaaRN3bUtcRNWoBpFZmS3vvgnIiyYI=";
   };
 
   checkInputs = [ glibcLocales ];
diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix
index aed6576c90dfc..d42de957791e4 100644
--- a/pkgs/development/python-modules/requests-oauthlib/default.nix
+++ b/pkgs/development/python-modules/requests-oauthlib/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "requests-oauthlib";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0smaxs5ixng4z0k6dsgmm6s972ka3p6a2ykdpnl23mqzlw0ic9ml";
+    sha256 = "sha256-db6sSkeIHuuU1epdatMe+IhWr/4jMrmq+1LGRSzPDXo=";
   };
 
   propagatedBuildInputs = [ oauthlib requests ];
diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index f5b021801f413..86b2c2ffc3902 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -13,7 +13,6 @@
 , pytest-mock
 , pytest-xdist
 , pytestCheckHook
-, trustme
 , urllib3
 }:
 
@@ -54,7 +53,6 @@ buildPythonPackage rec {
     pytest-mock
     pytest-xdist
     pytestCheckHook
-    trustme
   ];
 
   # AttributeError: 'KeywordMapping' object has no attribute 'get'
diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix
index 51d88446c0b5d..241f0f9e9da44 100644
--- a/pkgs/development/python-modules/respx/default.nix
+++ b/pkgs/development/python-modules/respx/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "respx";
-  version = "0.19.1";
+  version = "0.19.2";
 
   src = fetchFromGitHub {
     owner = "lundberg";
     repo = pname;
     rev = version;
-    sha256 = "134h9526md242p7ql0cpknqvkpd3fhxk2vridkvswg91f532w180";
+    sha256 = "sha256-uNmSBJOQF4baq8AWzfwj0kinO19jr6Mp9Yblys/WmZs=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix
index 01c7a5e78c62e..0033794ef4371 100644
--- a/pkgs/development/python-modules/restructuredtext_lint/default.nix
+++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "restructuredtext_lint";
-  version = "1.3.2";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d3b10a1fe2ecac537e51ae6d151b223b78de9fafdd50e5eb6b08c243df173c80";
+    sha256 = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU=";
   };
 
   checkInputs = [ nose testtools ];
diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index f6194970adbd0..3e7055d274efa 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -13,15 +13,15 @@
 
 buildPythonPackage rec {
   pname = "rich";
-  version = "11.0.0";
+  version = "11.2.0";
   format = "pyproject";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
-    owner = "willmcgugan";
+    owner = "Textualize";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0vkwar22rv1j6a3kqj3c016j0vnnha0kwi79fkd90ib1n501m7rn";
+    sha256 = "19k8c8jnqj1v0ji8kkx3r2ny6wlpwy58ir7lyrh2qyjvzkw08i58";
   };
 
   nativeBuildInputs = [ poetry-core ];
@@ -43,7 +43,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal";
-    homepage = "https://github.com/willmcgugan/rich";
+    homepage = "https://github.com/Textualize/rich";
     license = licenses.mit;
     maintainers = with maintainers; [ ris ];
   };
diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix
index 63e87609ac25b..74810c7761f53 100644
--- a/pkgs/development/python-modules/robotstatuschecker/default.nix
+++ b/pkgs/development/python-modules/robotstatuschecker/default.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robotframework";
     repo = "statuschecker";
-    rev = version;
+    rev = "refs/tags/v${version}";
     sha256 = "0hy1390j3l4kkfna9x9xax4y5mqaa3hdndv3fiyg9wr5f7sx3wnz";
   };
 
diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index d90d1052282dc..8582c0ac72923 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "s3fs";
-  version = "2022.1.0";
+  version = "2022.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6bafc1f6b4e935ea59512c0f38d5cb9c299dbbfe738e40c3d1de8f67b4ee1fd4";
+    sha256 = "sha256-RhHQ9+QeW8nawwCQcOCtN9qHpC9t73W0gTwG9+QEpzg=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 80c4bd92a385a..d18d939be606b 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.75.1";
+  version = "2.77.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-MN/F7TWaKsQpKMR7Pxx0Vam1+O+PFEJ/H5jLJh3zpe4=";
+    sha256 = "sha256-RX3QcjGDWYaPC9lKz/nJSMTO3jeXxY7MW98fHYfcLq0=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix
index 4bc446c2e1425..3fb60ebaa9e5c 100644
--- a/pkgs/development/python-modules/sanic-testing/default.nix
+++ b/pkgs/development/python-modules/sanic-testing/default.nix
@@ -1,11 +1,10 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, pytestCheckHook
 , httpx
-, pytest-asyncio
 , sanic
 , websockets
+, callPackage
 }:
 
 buildPythonPackage rec {
@@ -19,11 +18,14 @@ buildPythonPackage rec {
     sha256 = "17fbb78gvic5s9nlcgwj817fq1f9j9d1d7z6n2ahhinmvyzl9gc8";
   };
 
+  outputs = [
+    "out"
+    "testsout"
+  ];
+
   postPatch = ''
-    # https://github.com/sanic-org/sanic-testing/issues/19
     substituteInPlace setup.py \
-      --replace '"websockets==8.1",' '"websockets>=9.1",' \
-      --replace "httpx==0.18.*" "httpx"
+      --replace "httpx>=0.18,<0.22" "httpx"
   '';
 
   propagatedBuildInputs = [
@@ -32,18 +34,18 @@ buildPythonPackage rec {
     websockets
   ];
 
-  checkInputs = [
-    pytest-asyncio
-    pytestCheckHook
-  ];
+  postInstall = ''
+    mkdir $testsout
+    cp -R tests $testsout/tests
+  '';
 
-  # `sanic` is explicitly set to null when building `sanic` itself
-  # to prevent infinite recursion.  In that case we skip running
-  # the package at all.
-  doCheck = sanic != null;
-  dontUsePythonImportsCheck = sanic == null;
+  # check in passthru.tests.pytest to escape infinite recursion with sanic
+  doCheck = false;
+  doInstallCheck = false;
 
-  pythonImportsCheck = [ "sanic_testing" ];
+  passthru.tests = {
+    pytest = callPackage ./tests.nix { };
+  };
 
   meta = with lib; {
     description = "Core testing clients for the Sanic web framework";
diff --git a/pkgs/development/python-modules/sanic-testing/tests.nix b/pkgs/development/python-modules/sanic-testing/tests.nix
new file mode 100644
index 0000000000000..6a228a9823102
--- /dev/null
+++ b/pkgs/development/python-modules/sanic-testing/tests.nix
@@ -0,0 +1,26 @@
+{ buildPythonPackage
+, sanic
+, sanic-testing
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage {
+  pname = "sanic-testing-tests";
+  inherit (sanic-testing) version;
+
+  src = sanic-testing.testsout;
+
+  dontBuild = true;
+  dontInstall = true;
+
+  checkInputs = [
+    pytest-asyncio
+    pytestCheckHook
+    sanic
+  ];
+
+  pythonImportsCheck = [
+    "sanic_testing"
+  ];
+}
diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index 63c24e9936fcb..460927719ad53 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -40,9 +40,12 @@ buildPythonPackage rec {
   postPatch = ''
     # Loosen dependency requirements.
     substituteInPlace setup.py \
-      --replace '"pytest==6.2.5"' '"pytest"' \
-      --replace '"gunicorn==20.0.4"' '"gunicorn"' \
-      --replace '"pytest-sanic",' "" \
+      --replace "pytest==6.2.5" "pytest" \
+      --replace "gunicorn==20.0.4" "gunicorn" \
+      --replace "multidict>=5.0,<6.0" "multidict"
+
+    sed '/pytest-sanic/d' setup.py
+
     # Patch a request headers test to allow brotli encoding
     # (we build httpx with brotli support, upstream doesn't).
     substituteInPlace tests/test_headers.py \
@@ -118,6 +121,8 @@ buildPythonPackage rec {
     "test_num_workers"
     "test_server_run"
     "test_version"
+    # Sensitive comparison of raw HTTP header fails
+    "test_raw_headers"
   ];
 
   disabledTestPaths = [
diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index bea5b766b5c91..f7be7f0107c01 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "schema-salad";
-  version = "8.2.20220103095339";
+  version = "8.2.20220204150214";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "051690a2f89b98e35100cd2cb489406a5169a60c2f27a716f3f287a42d45be2d";
+    sha256 = "sha256-PlPb/nE3eWueUTWSDpa7JxPe2ee+KFna5VTR3IsClwQ=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix
index bc72f76bf2237..3fefba47cbda6 100644
--- a/pkgs/development/python-modules/scikit-build/default.nix
+++ b/pkgs/development/python-modules/scikit-build/default.nix
@@ -25,11 +25,11 @@
 
 buildPythonPackage rec {
   pname = "scikit-build";
-  version = "0.12.0";
+  version = "0.13.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f851382c469bcd9a8c98b1878bcfdd13b68556279d2fd9a329be41956ae5a7fe";
+    sha256 = "sha256-XRd0ousVmI4IHFgsJUq0qXUgluajTyNUEct5vWFmDDc=";
   };
 
   propagatedBuildInputs = [
@@ -66,6 +66,8 @@ buildPythonPackage rec {
     "test_install_command" # tries to alter out path
     "test_test_command" # tries to alter out path
     "test_setup" # tries to install using distutils
+    "test_pep518" # pip exits with code 1
+    "test_dual_pep518" # pip exits with code 1
   ]);
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index b06c1cb5db48b..45239f64fbef9 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -16,89 +16,98 @@
 , imageio
 , tifffile
 , pytestCheckHook
+, doCheck ? false
 }:
 
 let
   installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}";
-in buildPythonPackage rec {
-  pname = "scikit-image";
-  version = "0.18.3";
+  self = buildPythonPackage rec {
+    pname = "scikit-image";
+    version = "0.18.3";
 
-  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh";
-  };
+    src = fetchFromGitHub {
+      owner = pname;
+      repo = pname;
+      rev = "v${version}";
+      sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh";
+    };
+
+    patches = [ ./add-testing-data.patch ];
 
-  patches = [ ./add-testing-data.patch ];
+    nativeBuildInputs = [ cython ];
 
-  nativeBuildInputs = [ cython ];
+    propagatedBuildInputs = [
+      cloudpickle
+      dask
+      imageio
+      matplotlib
+      networkx
+      numpy
+      pillow
+      pywavelets
+      scipy
+      six
+      tifffile
+    ];
 
-  propagatedBuildInputs = [
-    cloudpickle
-    dask
-    imageio
-    matplotlib
-    networkx
-    numpy
-    pillow
-    pywavelets
-    scipy
-    six
-    tifffile
-  ];
+    # test suite is very cpu intensive, move to passthru.tests
+    inherit doCheck;
+    checkInputs = [ pytestCheckHook ];
 
-  checkInputs = [ pytestCheckHook ];
+    # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store;
+    # (2) To stop Python from importing the wrong directory, i.e. the one in the build dir, not the one in nix store, `skimage` dir should be removed or renamed;
+    # (3) Therefore, tests should be run on the installed package in nix store.
 
-  # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store;
-  # (2) To stop Python from importing the wrong directory, i.e. the one in the build dir, not the one in nix store, `skimage` dir should be removed or renamed;
-  # (3) Therefore, tests should be run on the installed package in nix store.
+    # See e.g. https://discourse.nixos.org/t/cant-import-cythonized-modules-at-checkphase/14207 on why the following is needed.
+    preCheck = ''
+      rm -r skimage
+    '';
 
-  # See e.g. https://discourse.nixos.org/t/cant-import-cythonized-modules-at-checkphase/14207 on why the following is needed.
-  preCheck = ''
-    rm -r skimage
-  '';
+    disabledTestPaths = [
+      # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error).
+      "${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py"
+    ];
+    pytestFlagsArray = [ "${installedPackageRoot}" "--pyargs" "skimage" ] ++ builtins.map (testid: "--deselect=" + testid) ([
+      # These tests require network access
+      "skimage/data/test_data.py::test_skin"
+      "skimage/data/tests/test_data.py::test_skin"
+      "skimage/io/tests/test_io.py::test_imread_http_url"
+      "skimage/restoration/tests/test_rolling_ball.py::test_ndim"
+    ] ++ lib.optionals stdenv.isDarwin [
+      # Matplotlib tests are broken inside darwin sandbox
+      "skimage/feature/tests/test_util.py::test_plot_matches"
+      "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold"
+      "skimage/io/tests/test_mpl_imshow.py::"
+    ]);
 
-  disabledTestPaths = [
-    # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error).
-    "${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py"
-  ];
-  pytestFlagsArray = [ "${installedPackageRoot}" "--pyargs" "skimage" ] ++ builtins.map (testid: "--deselect=" + testid) ([
-    # These tests require network access
-    "skimage/data/test_data.py::test_skin"
-    "skimage/data/tests/test_data.py::test_skin"
-    "skimage/io/tests/test_io.py::test_imread_http_url"
-    "skimage/restoration/tests/test_rolling_ball.py::test_ndim"
-  ] ++ lib.optionals stdenv.isDarwin [
-    # Matplotlib tests are broken inside darwin sandbox
-    "skimage/feature/tests/test_util.py::test_plot_matches"
-    "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold"
-    "skimage/io/tests/test_mpl_imshow.py::"
-  ]);
+    # Check cythonized modules
+    pythonImportsCheck = [
+      "skimage"
+      "skimage._shared"
+      "skimage.draw"
+      "skimage.feature"
+      "skimage.restoration"
+      "skimage.filters"
+      "skimage.future.graph"
+      "skimage.graph"
+      "skimage.io"
+      "skimage.measure"
+      "skimage.morphology"
+      "skimage.transform"
+      "skimage.util"
+      "skimage.segmentation"
+    ];
 
-  # Check cythonized modules
-  pythonImportsCheck = [
-    "skimage"
-    "skimage._shared"
-    "skimage.draw"
-    "skimage.feature"
-    "skimage.restoration"
-    "skimage.filters"
-    "skimage.future.graph"
-    "skimage.graph"
-    "skimage.io"
-    "skimage.measure"
-    "skimage.morphology"
-    "skimage.transform"
-    "skimage.util"
-    "skimage.segmentation"
-  ];
+    passthru.tests = {
+      all-tests = self.override { doCheck = true; };
+    };
 
-  meta = {
-    description = "Image processing routines for SciPy";
-    homepage = "https://scikit-image.org";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ yl3dy ];
+    meta = {
+      description = "Image processing routines for SciPy";
+      homepage = "https://scikit-image.org";
+      license = lib.licenses.bsd3;
+      maintainers = with lib.maintainers; [ yl3dy ];
+    };
   };
-}
+in
+  self
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 9c3b28e0a9aca..85708822cc2bb 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "scipy";
-  version = "1.7.3";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ab5875facfdef77e0a47d5fd39ea178b58e60e454a4c85aa1e52fcb80db7babf";
+    sha256 = "sha256-MdTy1rckvJqY5Se1hJuKflib8epjDDOqVj7akSyf8L0=";
   };
 
   nativeBuildInputs = [ cython gfortran pythran ];
diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix
index b68d15f3cac1e..1d07c371ca2a2 100644
--- a/pkgs/development/python-modules/scmrepo/default.nix
+++ b/pkgs/development/python-modules/scmrepo/default.nix
@@ -37,6 +37,11 @@ buildPythonPackage rec {
     pygtrie
   ];
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "asyncssh>=2.7.1,<2.9" "asyncssh>=2.7.1"
+  '';
+
   # Requires a running Docker instance
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 51e6c76de5db2..3272c4b612f63 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -126,6 +126,8 @@ buildPythonPackage rec {
     "tests/integrations/chalice/"
     # broken since rq-1.10.1: https://github.com/getsentry/sentry-python/issues/1274
     "tests/integrations/rq/"
+    # broken since pytest 7.0.1; AssertionError: previous item was not torn down properly
+    "tests/utils/test_contextvars.py"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index e748334b5ad16..6b18422cc18a6 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "setuptools";
-  version = "57.2.0";
+  version = "60.8.2";
 
   # Create an sdist of setuptools
   sdist = stdenv.mkDerivation rec {
@@ -20,12 +20,13 @@ let
       owner = "pypa";
       repo = pname;
       rev = "v${version}";
-      sha256 = "sha256-zFmndVoATNxfvDsacY+gj5bzIbbd/8ldbsJj4qOawTA=";
+      sha256 = "1mqpmbn58rx3g24dm6wnllx0xs97ampn2yga3qypqgwnh1nk477i";
       name = "${pname}-${version}-source";
     };
 
     patches = [
       ./tag-date.patch
+      ./setuptools-distutils-C++.patch
     ];
 
     buildPhase = ''
diff --git a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch
new file mode 100644
index 0000000000000..a14e514fda7ed
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch
@@ -0,0 +1,216 @@
+Based on pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch,
+adapted to apply to setuptools 60.x's bundled distutils.
+
+diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py
+index c5c86d8f..b879e447 100644
+--- a/setuptools/_distutils/cygwinccompiler.py
++++ b/setuptools/_distutils/cygwinccompiler.py
+@@ -124,14 +124,19 @@ class CygwinCCompiler(UnixCCompiler):
+         self.cxx = os.environ.get('CXX', 'g++')
+ 
+         self.linker_dll = self.cc
++        self.linker_dll_cxx = self.cxx
+         shared_option = "-shared"
+ 
+         self.set_executables(compiler='%s -mcygwin -O -Wall' % self.cc,
+                              compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc,
+                              compiler_cxx='%s -mcygwin -O -Wall' % self.cxx,
++                             compiler_so_cxx='%s -mcygwin -mdll -O -Wall' % self.cxx,
+                              linker_exe='%s -mcygwin' % self.cc,
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='%s -mcygwin' % self.cxx,
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # Include the appropriate MSVC runtime library if Python was built
+         # with MSVC 7.0 or later.
+@@ -162,8 +167,12 @@ class CygwinCCompiler(UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -279,9 +288,13 @@ class Mingw32CCompiler(CygwinCCompiler):
+         self.set_executables(compiler='%s -O -Wall' % self.cc,
+                              compiler_so='%s -mdll -O -Wall' % self.cc,
+                              compiler_cxx='%s -O -Wall' % self.cxx,
++                             compiler_so_cxx='%s -mdll -O -Wall' % self.cxx,
+                              linker_exe='%s' % self.cc,
+                              linker_so='%s %s'
+-                                        % (self.linker_dll, shared_option))
++                                        % (self.linker_dll, shared_option),
++                             linker_exe_cxx='%s' % self.cxx,
++                             linker_so_cxx='%s %s'
++                                        % (self.linker_dll_cxx, shared_option))
+ 
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
+index 4a77a431..1ad85181 100644
+--- a/setuptools/_distutils/sysconfig.py
++++ b/setuptools/_distutils/sysconfig.py
+@@ -216,9 +216,11 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cxxflags = cflags
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -232,19 +234,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = cflags + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -253,13 +263,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         if 'RANLIB' in os.environ and compiler.executables.get('ranlib', None):
+diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py
+index a07e5988..576ef490 100644
+--- a/setuptools/_distutils/unixccompiler.py
++++ b/setuptools/_distutils/unixccompiler.py
+@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["cc"],
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -110,12 +113,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -173,30 +183,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-
+-                    if os.path.basename(linker[i]) == 'ld_so_aix':
+-                        # AIX platforms prefix the compiler with the ld_so_aix
+-                        # script, so we need to adjust our linker index
+-                        offset = 1
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
+                     else:
+-                        offset = 0
+-
+-                    linker[i+offset] = self.compiler_cxx[i]
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix
index d2b36af12a3ba..a9319779060ea 100644
--- a/pkgs/development/python-modules/simple-salesforce/default.nix
+++ b/pkgs/development/python-modules/simple-salesforce/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "simple-salesforce";
-  version = "1.11.4";
+  version = "1.11.6";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "17d6g7zfhlgd2n4mimjarl2x4hl7ww2lb4izidlns1hzqm8igg4y";
+    sha256 = "sha256-/uaFEQnilcelHKjbmrnyLm5Mzj2V8P4oEH+cgJn+KvI=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 6904714a60c78..d6ee1e76f5480 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "sip";
-  version = "6.5.0";
+  version = "6.5.1";
 
   src = fetchPypi {
     pname = "sip";
     inherit version;
-    sha256 = "a1cf8431a8eb9392b3ff6dc61d832d0447bfdcae5b3e4256a5fa74dbc25b0734";
+    sha256 = "sha256-IE8CQNuJmadJ1jiph7NRhhhD5pI5uBHsPRiBQSw3BqY=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix
index b5d826c8f8efb..562346b1a476f 100644
--- a/pkgs/development/python-modules/smbprotocol/default.nix
+++ b/pkgs/development/python-modules/smbprotocol/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "smbprotocol";
-  version = "1.8.3";
+  version = "1.9.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "jborean93";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-m9C+uzwrEOcbkvBQ3Z+to2BsX2i7cLnUiV/+L7hMUdE=";
+    sha256 = "sha256-u3brP3WsnoqRy3R0OQQkIbq+avS7nemx9GKpvTq+vxg=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/socksio/default.nix b/pkgs/development/python-modules/socksio/default.nix
new file mode 100644
index 0000000000000..5d42ed6e8ecc5
--- /dev/null
+++ b/pkgs/development/python-modules/socksio/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonAtLeast
+, flit-core
+, pytestCheckHook
+}:
+
+let
+  pname = "socksio";
+  version = "1.0.0";
+in
+buildPythonPackage {
+  inherit pname version;
+  format = "pyproject";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-+IvrPaW1w4uYkEad5n0MsPnUlLeLEGyhhF+WwQuRxKw=";
+  };
+
+  nativeBuildInputs = [
+    flit-core
+  ];
+
+  # remove coverage configuration
+  preCheck = ''
+    rm pytest.ini
+  '';
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    description = "Sans-I/O implementation of SOCKS4, SOCKS4A, and SOCKS5";
+    homepage = "https://github.com/sethmlarson/socksio";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix
index 2f70732caa316..d203f8709c375 100644
--- a/pkgs/development/python-modules/spacy-transformers/default.nix
+++ b/pkgs/development/python-modules/spacy-transformers/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "spacy-transformers";
-  version = "1.1.3";
+  version = "1.1.4";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f4f553d3d2a065147a8c1292b5d9adf050c0f78dd15bb05c9614341cf88c5574";
+    sha256 = "sha256-G09bZiXTdEuukvKjPOYYTW/B19d406QSRDOU5ZflDDU=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 19961cc2ec182..7d79aaa457a3b 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -92,9 +92,11 @@ buildPythonPackage rec {
     # Due to lack of network sandboxing can't guarantee port 7777 isn't bound
     "test_inspect_main_url"
     "test_auth_header_uses_first_match"
+    "test_linkcheck_allowed_redirects"
     "test_linkcheck_request_headers"
     "test_linkcheck_request_headers_no_slash"
     "test_follows_redirects_on_HEAD"
+    "test_get_after_head_raises_connection_error"
     "test_invalid_ssl"
     "test_connect_to_selfsigned_with_tls_verify_false"
     "test_connect_to_selfsigned_with_tls_cacerts"
diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index cfeaf08fb33f4..40e393b57d6cf 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "spyder";
-  version = "5.2.1";
+  version = "5.2.2";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b318a70a75acd200018a547d2ff2d2f55e7507054469d0c77ec6f967ac3c2d28";
+    sha256 = "sha256-3DIikQlsc7Ptagi8ddR5ia+u24dXeBdppRkIn/xp3bg=";
   };
 
   nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 1d6406c5db13c..d379fc9294288 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "SQLAlchemy";
-  version = "1.4.31";
+  version = "1.4.32";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-WCtZ0eV4CkR6raIrRh5QtASp3AV2jaHYc2itgZBGhBg=";
+    sha256 = "sha256-b90txZMdqrd4wrZbA99q5oN24CijCY62JNCQnZmYhbw=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index a435b363a0f7b..6313f413c6ab7 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.6.3";
+  version = "1.6.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-W/UdJPLcFOEHHz7VYeQ3CcXysNju5DuxqvYA+xMkb20=";
+    sha256 = "sha256-6RKJ5a8Yl+SnWgdfrTIwY0m1JyY6W9fhZk6pTZiBVx8=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix
deleted file mode 100644
index bc3e2c238c9f0..0000000000000
--- a/pkgs/development/python-modules/sslyze/default.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{ lib
-, fetchFromGitHub
-, buildPythonPackage
-, pytestCheckHook
-, pythonOlder
-  # deps
-, cryptography
-, nassl
-, pydantic
-, tls-parser
-  # check deps
-, faker
-, openssl_1_0_2
-, openssl_1_1
-}:
-
-buildPythonPackage rec {
-  pname = "sslyze";
-  version = "5.0.3";
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "nabla-c0d3";
-    repo = pname;
-    rev = version;
-    hash = "sha256-d465WJIDsgNAPe8KW5v2KDSgzMH7OPLSiFfFH9n+jiA=";
-  };
-
-  patchPhase = ''
-    substituteInPlace setup.py \
-      --replace "cryptography>=2.6,<36.0.0" "cryptography>=2.6"
-  '';
-
-  checkInputs = [
-    pytestCheckHook
-    faker
-  ];
-
-  # Most of the tests are online; hence, applicable tests are listed
-  # explicitly here
-  pytestFlagsArray = [
-    "tests/cli_tests/test_console_output.py"
-    "tests/cli_tests/test_server_string_parser.py"
-    "tests/json_tests/test_json_output.py"
-    "tests/plugins_tests/certificate_info/test_certificate_algorithms.py"
-    "tests/plugins_tests/certificate_info/test_certificate_utils.py"
-    "tests/plugins_tests/certificate_info/test_symantec.py"
-    "tests/plugins_tests/certificate_info/test_trust_store_repository.py"
-    "tests/plugins_tests/openssl_cipher_suites/test_cipher_suites.py"
-    "tests/plugins_tests/test_early_data_plugin.py"
-    "tests/plugins_tests/test_http_headers_plugin.py"
-    "tests/plugins_tests/test_robot_plugin.py"
-    "tests/plugins_tests/test_scan_commands.py"
-    "tests/plugins_tests/test_session_renegotiation_plugin.py"
-    "tests/scanner_tests/test_jobs_worker_thread.py"
-    "tests/scanner_tests/test_mass_scanner.py"
-    "tests/scanner_tests/test_models.py"
-    "tests/scanner_tests/test_scanner.py"
-    "tests/server_connectivity_tests/test_client_authentication.py"
-  ];
-
-  disabledTests = [
-    # TestEllipticCurvesPluginWithOnlineServer
-    "test_supported_curves"
-    # TestRobotPluginPlugin
-    "test_robot_attack_good"
-    # TestHttpHeadersPlugin
-    "test_all_headers_disabled"
-    "test_expect_ct_enabled"
-    "test_hsts_enabled"
-    # TestSessionRenegotiationPlugin
-    "test_renegotiation_good"
-    # TestCertificateAlgorithms
-    "test_ecdsa_certificate"
-    "test_invalid_certificate_bad_name"
-    # TestEarlyDataPlugin
-    "test_early_data_enabled"
-    # TestTrustStoresRepository
-    "test_update_default"
-    # TestClientAuthentication
-    "test_optional_client_authentication"
-  ];
-
-  # Some tests require OpenSSL
-  preCheck = ''
-    pushd $TMPDIR/$sourceRoot/tests/openssl_server/
-
-    rm openssl-1-1-1-linux64
-    ln -s ${openssl_1_1.bin}/bin/openssl openssl-1-1-1-linux64
-
-    rm openssl-1-0-0e-linux64
-    ln -s ${openssl_1_0_2.bin}/bin/openssl openssl-1-0-0e-linux64
-
-    popd
-  '';
-
-  pythonImportsCheck = [ "sslyze" ];
-
-  propagatedBuildInputs = [
-    cryptography
-    nassl
-    pydantic
-    tls-parser
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/nabla-c0d3/sslyze";
-    description = "Fast and powerful SSL/TLS scanning library";
-    platforms = platforms.linux ++ platforms.darwin;
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ veehaitch ];
-  };
-}
diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index 1084a50be7707..00283cd9ec9ce 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "starlette";
-  version = "0.17.1";
+  version = "0.18.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "encode";
     repo = pname;
     rev = version;
-    sha256 = "sha256-qT/w7r8PsrauLoBolwCGpxiwhDZo3z6hIqKVXeY5yqA=";
+    sha256 = "sha256-N2X9pjCiQ6TKRcm6VlyybLLyCdjQuIZHu1vK99gY8rY=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix
index 8ea42d1f27953..55f74b58fb520 100644
--- a/pkgs/development/python-modules/stone/default.nix
+++ b/pkgs/development/python-modules/stone/default.nix
@@ -1,34 +1,31 @@
-{ lib, buildPythonPackage, fetchPypi
-, coverage
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
 , mock
 , ply
-, pytest-runner
 , pytestCheckHook
 , six
 }:
 
 buildPythonPackage rec {
   pname = "stone";
-  version = "3.2.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0xby5mpsms7b2rv8j6mvxzmzz5i9ii01brb9ylxz6kiv2i08piwv";
+  version = "3.3.1";
+
+  # pypi sdist misses requirements.txt
+  src = fetchFromGitHub {
+    owner = "dropbox";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-0FWdYbv+paVU3Wj6g9OrSNUB0pH8fLwTkhVIBPeFB/U=";
   };
 
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace "pytest-runner == 5.2.0" "pytest-runner" \
-      --replace "pytest < 5" "pytest"
-    substituteInPlace test/requirements.txt \
-      --replace "coverage==5.3" "coverage"
+    sed -i '/pytest-runner/d' setup.py
   '';
 
-  nativeBuildInputs = [ pytest-runner ];
-
   propagatedBuildInputs = [ ply six ];
 
-  checkInputs = [ pytestCheckHook coverage mock ];
+  checkInputs = [ pytestCheckHook mock ];
 
   # try to import from `test` directory, which is exported by the python interpreter
   # and cannot be overriden without removing some py3 to py2 support
diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix
index 68e35a1d0eca7..66a9b7e0d82ce 100644
--- a/pkgs/development/python-modules/stumpy/default.nix
+++ b/pkgs/development/python-modules/stumpy/default.nix
@@ -34,6 +34,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  pytestFlagsArray = [
+    # whole testsuite is very CPU intensive, only run core tests
+    # TODO: move entire test suite to passthru.tests
+    "tests/test_core.py"
+  ];
+
   meta = with lib; {
     description = "A powerful and scalable library that can be used for a variety of time series data mining tasks";
     homepage = "https://github.com/TDAmeritrade/stumpy";
diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix
index af307919387f6..f2776265b067f 100644
--- a/pkgs/development/python-modules/suds-jurko/default.nix
+++ b/pkgs/development/python-modules/suds-jurko/default.nix
@@ -27,6 +27,7 @@ buildPythonPackage rec {
     description = "Lightweight SOAP client (Jurko's fork)";
     homepage = "https://bitbucket.org/jurko/suds";
     license = licenses.lgpl3;
+    broken = true; # Uses use2to3, which has been removed in setuptools>=58
   };
 
 }
diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix
index 4e61f8665ba6a..9c88dc3462aca 100644
--- a/pkgs/development/python-modules/sunpy/default.nix
+++ b/pkgs/development/python-modules/sunpy/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "sunpy";
-  version = "3.1.3";
+  version = "3.1.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4acb05a05c7e6a2090cd0bb426b34c7e1620be0de2bf90a95a3f48ba15a5fce2";
+    sha256 = "sha256-TDslY1KUohR9zyyJ6+B95MMMsUL1TBl49L+nSCvZ9nI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix
index 9890a7000a9af..af600f623423c 100644
--- a/pkgs/development/python-modules/superqt/default.nix
+++ b/pkgs/development/python-modules/superqt/default.nix
@@ -3,21 +3,25 @@
 , fetchFromGitHub
 , setuptools-scm
 , pyqt5
+, qtpy
 , typing-extensions
 , pytest
 , pytestCheckHook
-}: buildPythonPackage rec {
+}:
+
+buildPythonPackage rec {
   pname = "superqt";
-  version = "0.2.5-1";
+  version = "0.3.1";
+
   src = fetchFromGitHub {
     owner = "napari";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-rkTiCJ8mIogS9SDmLPiaAyhhuBx3kk6rXjCc19zbwiM=";
+    sha256 = "sha256-DPjJxOgybNvZ3YvYHr48fmx59Puck61Dzm2G4M9qKo4=";
   };
   format = "pyproject";
   nativeBuildInputs = [ setuptools-scm ];
-  propagatedBuildInputs = [ pyqt5 typing-extensions ];
+  propagatedBuildInputs = [ pyqt5 qtpy typing-extensions ];
   checkInputs = [ pytestCheckHook pytest ];
   doCheck = false; # Segfaults...
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/teletype/default.nix b/pkgs/development/python-modules/teletype/default.nix
index c3878bf3c8779..999454edf83ff 100644
--- a/pkgs/development/python-modules/teletype/default.nix
+++ b/pkgs/development/python-modules/teletype/default.nix
@@ -1,17 +1,27 @@
-{ buildPythonPackage, fetchPypi, lib }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
 
 buildPythonPackage rec {
   pname = "teletype";
-  version = "1.1.0";
+  version = "1.3.4";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02mg0qmdf7hljq6jw1hwaid3hvkf70dfxgrxmpqybaxrph5pfg1y";
+    hash = "sha256-uBppM4w9GlMgYqKFGw1Rcjvq+mnU04K3E74jCgK9YYo=";
   };
 
   # no tests
   doCheck = false;
-  pythonImportsCheck = [ "teletype" ];
+
+  pythonImportsCheck = [
+    "teletype"
+  ];
 
   meta = with lib; {
     description = "A high-level cross platform tty library";
diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index 79b04b7ebbb2b..ff837158fc268 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -1,30 +1,59 @@
-{ lib, buildPythonPackage, fetchPypi
-, setuptools-scm, pytestCheckHook, pytest-freezegun, freezegun, backports_unittest-mock
-, six, pytz, jaraco_functools, pythonOlder
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+
+# build time
+, setuptools-scm
+
+# runtime
+, pytz
+, jaraco_functools
+
+# tests
+, freezegun
+, pytest-freezegun
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "tempora";
-  version = "5.0.0";
+  version = "5.0.1";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "aa21dd1956e29559ecb2f2f2e14fcdb950085222fbbf86e6c946b5e1a8c36b26";
+    sha256 = "sha256-y6Dxl6ZIg78+c2V++8AyTVvxcXnndpsThbTXXSbNkSc=";
   };
 
-  disabled = pythonOlder "3.2";
-
-  nativeBuildInputs = [ setuptools-scm ];
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
 
-  propagatedBuildInputs = [ six pytz jaraco_functools ];
+  propagatedBuildInputs = [
+    jaraco_functools
+    pytz
+  ];
 
   checkInputs = [
-    pytest-freezegun pytestCheckHook freezegun backports_unittest-mock
+    freezegun
+    pytest-freezegun
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "tempora"
+    "tempora.schedule"
+    "tempora.timing"
+    "tempora.utc"
   ];
 
   meta = with lib; {
     description = "Objects and routines pertaining to date and time";
     homepage = "https://github.com/jaraco/tempora";
     license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix
index a4a04d898566a..47025bf4a28af 100644
--- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
+++ b/pkgs/development/python-modules/tensorboard/default.nix
@@ -22,17 +22,16 @@
 # buildBazelPackage.
 
 buildPythonPackage rec {
-  pname = "tensorflow-tensorboard";
-  version = "2.6.0";
+  pname = "tensorboard";
+  version = "2.8.0";
   format = "wheel";
-  disabled = pythonOlder "3.6" || pythonAtLeast "3.10";
+  disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
 
   src = fetchPypi {
-    pname = "tensorboard";
-    inherit version format;
+    inherit pname version format;
     dist = "py3";
     python = "py3";
-    sha256 = "sha256-99rEzftS0UyeP3RYXOKq+OYgNiCoZOUfr4SYiwn3u9s=";
+    hash = "sha256-ZaM45EJOkHnyYEkjvb4wF5KtzirOG+aNprPd8AUXDe8=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix
index eacb5b4cdc804..7aa29f34baa55 100644
--- a/pkgs/development/python-modules/tensorboardx/default.nix
+++ b/pkgs/development/python-modules/tensorboardx/default.nix
@@ -13,7 +13,7 @@
 , pytorch
 , six
 , soundfile
-, tensorflow-tensorboard
+, tensorboard
 , torchvision
 }:
 
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     pillow
     pytestCheckHook
     pytorch
-    tensorflow-tensorboard
+    tensorboard
     torchvision
   ];
 
@@ -70,6 +70,8 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # we are not interested in linting errors
     "tests/test_lint.py"
+    # missing caffe2 dependency
+    "tests/test_caffe2.py"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix
index b97461394d13a..1fc9f5ae25dcc 100644
--- a/pkgs/development/python-modules/tensorflow-datasets/default.nix
+++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix
@@ -39,13 +39,13 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-datasets";
-  version = "4.4.0";
+  version = "4.5.2";
 
   src = fetchFromGitHub {
     owner = "tensorflow";
     repo = "datasets";
     rev = "v${version}";
-    sha256 = "11kbpv54nwr0xf7z5mkj2lmrfqfmcdq8qcpapnqck1kiawr3yad6";
+    sha256 = "sha256-OZpaY/6BMISq5IeDXyuyu5L/yG+DwlFliw4BsipPOLg=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix
index 5ad6d0ab6e555..7c7f155adb09b 100644
--- a/pkgs/development/python-modules/tensorflow-estimator/default.nix
+++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-estimator";
-  version = "2.7.0";
+  version = "2.8.0";
   format = "wheel";
 
   src = fetchPypi {
     pname = "tensorflow_estimator";
     inherit version format;
-    hash = "sha256-MltaIkhkN5JCt7dsaYfKVEI5voJXnTPmjsfCvaV6vJ0=";
+    hash = "sha256-vujgUgxgrn6vbKjLRsWp9LRXJVMTgNuPvjj8tIR4trs=";
   };
 
   propagatedBuildInputs = [ mock numpy absl-py ];
diff --git a/pkgs/development/python-modules/tensorflow-metadata/build.patch b/pkgs/development/python-modules/tensorflow-metadata/build.patch
index ff81c5d1e86cf..5b570bf72062d 100644
--- a/pkgs/development/python-modules/tensorflow-metadata/build.patch
+++ b/pkgs/development/python-modules/tensorflow-metadata/build.patch
@@ -2,15 +2,6 @@ diff --git a/setup.py b/setup.py
 index 7a09b2f..94c5aa6 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -125,7 +125,7 @@ setup(
-     ],
-     namespace_packages=[],
-     install_requires=[
--        'absl-py>=0.9,<0.13',
-+        'absl-py>=0.9',
-         'googleapis-common-protos>=1.52.0,<2',
-         'protobuf>=3.13,<4',
-     ],
 @@ -137,8 +137,5 @@ setup(
      long_description_content_type='text/markdown',
      keywords='tensorflow metadata tfx',
diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix
index 2a80155c4cd9e..b39f1211d0cac 100644
--- a/pkgs/development/python-modules/tensorflow-metadata/default.nix
+++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix
@@ -2,18 +2,19 @@
 , buildPythonPackage
 , fetchFromGitHub
 , googleapis-common-protos
+, protobuf
 , lib
 }:
 
 buildPythonPackage rec {
   pname = "tensorflow-metadata";
-  version = "1.5.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "tensorflow";
     repo = "metadata";
     rev = "v${version}";
-    sha256 = "17p74k6rwswpmj7m16cw9hdam6b4m7v5bahirmc2l1kwfvrn4w33";
+    sha256 = "sha256-CQlLEVNcD9u2pojz8r1eLzYzc9i2hjdZfzfYSQ/8Q4k=";
   };
 
   patches = [
@@ -31,8 +32,12 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     absl-py
     googleapis-common-protos
+    protobuf
   ];
 
+  # has no tests
+  doCheck = false;
+
   pythonImportsCheck = [
     "tensorflow_metadata"
   ];
diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix
deleted file mode 100644
index f58b1a207719a..0000000000000
--- a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k
-, numpy
-, wheel
-, werkzeug
-, protobuf
-, grpcio
-, markdown
-, futures
-, absl-py
-}:
-
-# tensorflow/tensorboard is built from a downloaded wheel, because
-# https://github.com/tensorflow/tensorboard/issues/719 blocks
-# buildBazelPackage.
-
-buildPythonPackage rec {
-  pname = "tensorflow-tensorboard";
-  version = "1.15.0";
-  format = "wheel";
-
-  src = fetchPypi ({
-    pname = "tensorboard";
-    inherit version format;
-  } // (if isPy3k then {
-    python = "py3";
-    sha256 = "1g62i3nrgp8q9wfsyqqjkkfnsz7x2k018c26kdh527h1yrjjrbac";
-  } else {
-    python = "py2";
-    sha256 = "0l3zc8j2sh7h1z4qpy8kfvclv3kzndri55p10i42q6xahs9phav1";
-  }));
-
-  propagatedBuildInputs = [
-    numpy
-    werkzeug
-    protobuf
-    markdown
-    grpcio
-    absl-py
-    # not declared in install_requires, but used at runtime
-    # https://github.com/NixOS/nixpkgs/issues/73840
-    wheel
-  ] ++ lib.optional (!isPy3k) futures;
-
-  # in the absence of a real test suite, run cli and imports
-  checkPhase = ''
-    $out/bin/tensorboard --help > /dev/null
-  '';
-
-  pythonImportsCheck = [
-    "tensorboard"
-    "tensorboard.backend"
-    "tensorboard.compat"
-    "tensorboard.data"
-    "tensorboard.plugins"
-    "tensorboard.summary"
-    "tensorboard.util"
-  ];
-
-  meta = with lib; {
-    description = "TensorFlow's Visualization Toolkit";
-    homepage = "http://tensorflow.org";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ abbradar ];
-  };
-}
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 2556a8039c1b7..2c47f8674e0e9 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -18,7 +18,7 @@
 , opt-einsum
 , backports_weakref
 , tensorflow-estimator
-, tensorflow-tensorboard
+, tensorboard
 , cudaSupport ? false
 , cudatoolkit
 , cudnn
@@ -74,7 +74,7 @@ in buildPythonPackage {
     google-pasta
     wrapt
     tensorflow-estimator
-    tensorflow-tensorboard
+    tensorboard
     keras-applications
     keras-preprocessing
     h5py
@@ -168,7 +168,7 @@ in buildPythonPackage {
     '';
 
   # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
-  # and the propagated input tensorflow-tensorboard, which causes environment collisions.
+  # and the propagated input tensorboard, which causes environment collisions.
   # Another possibility would be to have tensorboard only in the buildInputs
   # See https://github.com/NixOS/nixpkgs/pull/44381 for more information.
   postInstall = ''
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 517faef3f8fc7..2d5a302521b48 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin
+{ stdenv, bazel_4, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin
 , addOpenGLRunpath, fetchpatch, patchelfUnstable
 # Python deps
 , buildPythonPackage, pythonOlder, python
 # Python libraries
-, numpy, tensorflow-tensorboard, absl-py
+, numpy, tensorboard, absl-py
 , setuptools, wheel, keras, keras-preprocessing, google-pasta
 , opt-einsum, astunparse, h5py
 , termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator
-, dill, flatbuffers-python, tblib, typing-extensions
+, dill, flatbuffers-python, portpicker, tblib, typing-extensions
 # Common deps
 , git, pybind11, which, binutils, glibcLocales, cython, perl
 # Common libraries
-, jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp
+, jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp, nsync
 , curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core
-# Upsteam by default includes cuda support since tensorflow 1.15. We could do
+# Upstream by default includes cuda support since tensorflow 1.15. We could do
 # that in nix as well. It would make some things easier and less confusing, but
 # it would also make the default tensorflow package unfree. See
 # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0
@@ -72,7 +72,7 @@ let
 
   tfFeature = x: if x then "1" else "0";
 
-  version = "2.7.1";
+  version = "2.8.0";
   variant = if cudaSupport then "-gpu" else "";
   pname = "tensorflow${variant}";
 
@@ -94,8 +94,8 @@ let
       setuptools
       six
       tblib
+      tensorboard
       tensorflow-estimator
-      tensorflow-tensorboard
       termcolor
       typing-extensions
       wheel
@@ -179,20 +179,15 @@ let
     stdenv = llvmPackages_11.stdenv;
   })) {
     name = "${pname}-${version}";
-    bazel = bazel_3;
+    bazel = bazel_4;
 
     src = fetchFromGitHub {
       owner = "tensorflow";
       repo = "tensorflow";
       rev = "v${version}";
-      sha256 = "1qwzbqq899swrwrwmm6z7mq9sc55gyh0r4ca0mcnchbvn7w0qbkh";
+      hash = "sha256-w78ehpsnXElIyYftgZEq3b/+TSrRN1gyWVUVlSZpGFM=";
     };
 
-    patches = [
-      # Patch the sources to compile with protobuf >= 3.16.
-      ./system-protobuf.patch
-    ];
-
     # On update, it can be useful to steal the changes from gentoo
     # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow
 
@@ -207,20 +202,20 @@ let
       git
 
       # libs taken from system through the TF_SYS_LIBS mechanism
-      grpc
-      sqlite
       boringssl
-      jsoncpp
       curl
-      pybind11
-      snappy
+      double-conversion
       flatbuffers-core
+      giflib
+      grpc
       icu
-      double-conversion
-      libpng
+      jsoncpp
       libjpeg_turbo
-      giflib
+      libpng
       lmdb-core
+      pybind11
+      snappy
+      sqlite
     ] ++ lib.optionals cudaSupport [
       cudatoolkit
       cudnn
@@ -229,6 +224,8 @@ let
     ] ++ lib.optionals stdenv.isDarwin [
       Foundation
       Security
+    ] ++ lib.optionals (!stdenv.isDarwin) [
+      nsync
     ];
 
     # arbitrarily set to the current latest bazel version, overly careful
@@ -237,7 +234,7 @@ let
     # Take as many libraries from the system as possible. Keep in sync with
     # list of valid syslibs in
     # https://github.com/tensorflow/tensorflow/blob/master/third_party/systemlibs/syslibs_configure.bzl
-    TF_SYSTEM_LIBS = lib.concatStringsSep "," [
+    TF_SYSTEM_LIBS = lib.concatStringsSep "," ([
       "absl_py"
       "astor_archive"
       "astunparse_archive"
@@ -253,7 +250,6 @@ let
       "cython"
       "dill_archive"
       "double_conversion"
-      "enum34_archive"
       "flatbuffers"
       "functools32_archive"
       "gast_archive"
@@ -264,7 +260,6 @@ let
       "libjpeg_turbo"
       "lmdb"
       "nasm"
-      # "nsync" # not packaged in nixpkgs
       "opt_einsum_archive"
       "org_sqlite"
       "pasta"
@@ -277,7 +272,9 @@ let
       "typing_extensions_archive"
       "wrapt"
       "zlib"
-    ];
+    ] ++ lib.optionals (!stdenv.isDarwin) [
+      "nsync" # fails to build on darwin
+    ]);
 
     INCLUDEDIR = "${includes_joined}/include";
 
@@ -361,12 +358,12 @@ let
     fetchAttrs = {
       # cudaSupport causes fetch of ncclArchive, resulting in different hashes
       sha256 = if cudaSupport then
-        "sha256-+szc2mRoImwijzbj3nw6HmZp3DeRjjPRU5yC+5AEbkg="
+        "sha256-dQEyfueuQPcGvbhuh8Al45np3nRLDw2PCfC2lEqAH50="
       else
         if stdenv.isDarwin then
-          "sha256-+bwIzp6t7gRJPcI8B5oyuf9z0AjCAyggUR7x+vv5kFs="
+          "sha256-yfnZVtKWqNQGvlfq2owXhem0LmzDYriVfYgf1ZRlaDo="
         else
-          "sha256-5yOYmeGpJq4Chi55H7iblxyRXVktgnePtpYTPvBs538=";
+          "sha256:12i1ix2xwq77f3h8qr4h57g0aazrdsjjqa536cpwx3n1mvl5p6qi";
     };
 
     buildAttrs = {
@@ -428,18 +425,20 @@ in buildPythonPackage {
 
   # Adjust dependency requirements:
   # - Relax gast version requirement that doesn't match what we have packaged
+  # - Relax tf-estimator, that would require a nightly version
   # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet
   # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now.
   postPatch = ''
     sed -i setup.py \
       -e "s/'gast[^']*',/'gast',/" \
+      -e "s/'tf-estimator-nightly[^']*',/'tensorflow-estimator',/" \
       -e "/'libclang[^']*',/d" \
       -e "/'keras[^']*',/d" \
       -e "/'tensorflow-io-gcs-filesystem[^']*',/d"
   '';
 
   # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
-  # and the propagated input tensorflow-tensorboard, which causes environment collisions.
+  # and the propagated input tensorboard, which causes environment collisions.
   # Another possibility would be to have tensorboard only in the buildInputs
   # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79
   postInstall = ''
@@ -452,7 +451,6 @@ in buildPythonPackage {
   propagatedBuildInputs = [
     absl-py
     astunparse
-    dill
     flatbuffers-python
     gast
     google-pasta
@@ -463,13 +461,12 @@ in buildPythonPackage {
     opt-einsum
     protobuf-python
     six
-    tblib
     tensorflow-estimator
     termcolor
     typing-extensions
     wrapt
   ] ++ lib.optionals withTensorboard [
-    tensorflow-tensorboard
+    tensorboard
   ];
 
   # remove patchelfUnstable once patchelf 0.14 with https://github.com/NixOS/patchelf/pull/256 becomes the default
@@ -486,7 +483,13 @@ in buildPythonPackage {
   # Actual tests are slow and impure.
   # TODO try to run them anyway
   # TODO better test (files in tensorflow/tools/ci_build/builds/*test)
-  checkInputs = [ keras ];
+  # TEST_PACKAGES in tensorflow/tools/pip_package/setup.py
+  checkInputs = [
+    dill
+    keras
+    portpicker
+    tblib
+  ];
   checkPhase = ''
     ${python.interpreter} <<EOF
     # A simple "Hello world"
diff --git a/pkgs/development/python-modules/tensorflow/system-protobuf.patch b/pkgs/development/python-modules/tensorflow/system-protobuf.patch
deleted file mode 100644
index dce6df810464f..0000000000000
--- a/pkgs/development/python-modules/tensorflow/system-protobuf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tensorflow/core/kernels/example_parsing_ops.cc b/tensorflow/core/kernels/example_parsing_ops.cc
-index a1265cfb5c6..ada919bbd7b 100644
---- a/tensorflow/core/kernels/example_parsing_ops.cc
-+++ b/tensorflow/core/kernels/example_parsing_ops.cc
-@@ -1218,7 +1218,7 @@ class DecodeJSONExampleOp : public OpKernel {
-           resolver_.get(), "type.googleapis.com/tensorflow.Example", &in, &out);
-       OP_REQUIRES(ctx, status.ok(),
-                   errors::InvalidArgument("Error while parsing JSON: ",
--                                          string(status.error_message())));
-+                                          string(status.message())));
-     }
-   }
- 
diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix
index 28b0eb09dbed5..6a63fe5371688 100644
--- a/pkgs/development/python-modules/terminado/default.nix
+++ b/pkgs/development/python-modules/terminado/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "terminado";
-  version = "0.12.1";
+  version = "0.13.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b20fd93cc57c1678c799799d117874367cc07a3d2d55be95205b1a88fa08393f";
+    sha256 = "sha256-W4K1xumR8HBadvlh9DJip/seVbCTwW3Kg/FjhKfzm3s=";
   };
 
   propagatedBuildInputs = [ ptyprocess tornado ];
diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix
index 5cdc1dafc0345..83d1e1780b0b7 100644
--- a/pkgs/development/python-modules/teslajsonpy/default.nix
+++ b/pkgs/development/python-modules/teslajsonpy/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "teslajsonpy";
-  version = "1.9.0";
+  version = "2.0.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -23,8 +23,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zabuldon";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-Q/ltNdr2Huvfj1RmKFopJbaR4FSM7ziWadmDKPS26vc=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-cplx6Zhqc/ft7l9dy1ian3zzgDqEfpO/0AF7ErX4wqk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix
index 1cc20cc2cca7f..5eac0d60b6cff 100644
--- a/pkgs/development/python-modules/test-tube/default.nix
+++ b/pkgs/development/python-modules/test-tube/default.nix
@@ -8,7 +8,7 @@
 , numpy
 , pandas
 , pytorch
-, tensorflow-tensorboard
+, tensorboard
 }:
 
 buildPythonPackage rec {
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     numpy
     pandas
     pytorch
-    tensorflow-tensorboard
+    tensorboard
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix
index e11ddeed50a6f..4db5aa362f4a0 100644
--- a/pkgs/development/python-modules/testpath/default.nix
+++ b/pkgs/development/python-modules/testpath/default.nix
@@ -2,18 +2,24 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
+, flit-core
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "testpath";
-  version = "0.5.0";
+  version = "0.6.0";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05z4s4d5i1ja16hiv4jhqv63fvg1a4vw77s0ay1sw11hrl5pmkqs";
+    sha256 = "sha256-LxuX5kQsAmgevgG9hPUxAop8rqGvOCUAD1I0XDAoXg8=";
   };
 
+  nativeBuildInputs = [
+    flit-core
+  ];
+
   checkInputs = [
     pytestCheckHook
   ];
diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix
index b310defa45d19..eabb2aff006ae 100644
--- a/pkgs/development/python-modules/tiledb/default.nix
+++ b/pkgs/development/python-modules/tiledb/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "tiledb";
-  version = "0.12.0";
+  version = "0.13.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "TileDB-Inc";
     repo = "TileDB-Py";
     rev = version;
-    sha256 = "0iz16sgr5dpwc1jvb6brcmgvvg0npjdd98q4wgkqmvg7qif92zls";
+    sha256 = "sha256-ku+9kMXXrlPy4teV5KpTXAwExhIoPpAsGAHIBvsl9KI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix
index 30c3f08f52e7c..b1c0346b96489 100644
--- a/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/pkgs/development/python-modules/toggl-cli/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "toggl-cli";
-  version = "2.4.3";
+  version = "3";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "togglCli";
     inherit version;
-    sha256 = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo=";
+    sha256 = "sha256-SkA/u1q//AyYn0v6uAXXsjANhFppxxjKhlhWhsK649w=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix
index 551655eebf0d0..c9c9cb46b2c75 100644
--- a/pkgs/development/python-modules/tomli/default.nix
+++ b/pkgs/development/python-modules/tomli/default.nix
@@ -3,6 +3,7 @@
 , callPackage
 , fetchFromGitHub
 , flit-core
+, python
 
 # important downstream dependencies
 , flit
@@ -13,40 +14,28 @@
 
 buildPythonPackage rec {
   pname = "tomli";
-  version = "1.2.2";
+  version = "2.0.1";
   format = "pyproject";
 
-  outputs = [
-    "out"
-    "testsout"
-  ];
-
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-oDjpNzWxTaCC1+WyBKrkR6kp90ZomcZQfyW+xKddDoM=";
+    sha256 = "sha256-v0ZMrHIIaGeORwD4JiBeLthmnKZODK5odZVL0SY4etA=";
   };
 
-  patches = [
-    # required for mypy
-    ./fix-backwards-compatibility-load.patch
-  ];
-
   nativeBuildInputs = [ flit-core ];
 
-  postInstall = ''
-    mkdir $testsout
-    cp -R benchmark/ pyproject.toml tests/ $testsout/
-  '';
-
   pythonImportsCheck = [ "tomli" ];
 
-  # check in passthru.tests.pytest to escape infinite recursion with setuptools-scm
-  doCheck = false;
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m unittest discover
+    runHook postCheck
+  '';
 
   passthru.tests = {
-    pytest = callPackage ./tests.nix { };
+    # test downstream dependencies
     inherit flit black mypy setuptools-scm;
   };
 
diff --git a/pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch b/pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch
deleted file mode 100644
index edfc2f3834956..0000000000000
--- a/pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tomli/_parser.py b/tomli/_parser.py
-index 89e81c3..6fb1bfd 100644
---- a/tomli/_parser.py
-+++ b/tomli/_parser.py
-@@ -1,6 +1,6 @@
- import string
- from types import MappingProxyType
--from typing import Any, BinaryIO, Dict, FrozenSet, Iterable, NamedTuple, Optional, Tuple
-+from typing import IO, Union, Any, BinaryIO, Dict, FrozenSet, Iterable, NamedTuple, Optional, Tuple
- import warnings
- 
- from tomli._re import (
-@@ -48,7 +48,7 @@ class TOMLDecodeError(ValueError):
-     """An error raised if a document is not valid TOML."""
- 
- 
--def load(fp: BinaryIO, *, parse_float: ParseFloat = float) -> Dict[str, Any]:
-+def load(fp: Union[IO, BinaryIO], *, parse_float: ParseFloat = float) -> Dict[str, Any]:
-     """Parse TOML from a binary file object."""
-     s_bytes = fp.read()
-     try:
diff --git a/pkgs/development/python-modules/tomli/tests.nix b/pkgs/development/python-modules/tomli/tests.nix
deleted file mode 100644
index 5d3d67dbd128c..0000000000000
--- a/pkgs/development/python-modules/tomli/tests.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ buildPythonPackage
-, tomli
-, pytestCheckHook
-, python-dateutil
-}:
-
-buildPythonPackage rec {
-  pname = "tomli-tests";
-  inherit (tomli) version;
-
-  src = tomli.testsout;
-
-  dontBuild = true;
-  dontInstall = true;
-
-  checkInputs = [
-    pytestCheckHook
-    python-dateutil
-    tomli
-  ];
-}
diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix
index 6c8455f060ec0..22f3ffab29955 100644
--- a/pkgs/development/python-modules/tomlkit/default.nix
+++ b/pkgs/development/python-modules/tomlkit/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "tomlkit";
-  version = "0.8.0";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "29e84a855712dfe0e88a48f6d05c21118dbafb283bb2eed614d46f80deb8e9a1";
+    sha256 = "sha256-2ZlGxq7TOHyYuJ2R+57f+PkBv5JVkBCBJmqE+1YErc0=";
   };
 
   propagatedBuildInputs =
diff --git a/pkgs/development/python-modules/torch-tb-profiler/default.nix b/pkgs/development/python-modules/torch-tb-profiler/default.nix
index fc53c5ba8232c..2843910613672 100644
--- a/pkgs/development/python-modules/torch-tb-profiler/default.nix
+++ b/pkgs/development/python-modules/torch-tb-profiler/default.nix
@@ -4,7 +4,7 @@
 , pandas
 , pytestCheckHook
 , pytorch
-, tensorflow-tensorboard
+, tensorboard
 , torchvision
 }:
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # See https://discourse.nixos.org/t/extracting-sub-directory-from-fetchgit-or-fetchurl-or-any-derivation/8830.
   src = "${repo}/tb_plugin";
 
-  propagatedBuildInputs = [ pandas tensorflow-tensorboard ];
+  propagatedBuildInputs = [ pandas tensorboard ];
 
   checkInputs = [ pytestCheckHook pytorch torchvision ];
 
diff --git a/pkgs/development/python-modules/tornado/5.nix b/pkgs/development/python-modules/tornado/5.nix
index 2f3ba5c1c2aae..f0dc14b5fa2ab 100644
--- a/pkgs/development/python-modules/tornado/5.nix
+++ b/pkgs/development/python-modules/tornado/5.nix
@@ -3,12 +3,13 @@
 , buildPythonPackage
 , fetchPypi
 , isPy27
+, pythonAtLeast
 }:
 
 buildPythonPackage rec {
   pname = "tornado";
   version = "5.1.1";
-  disabled = isPy27;
+  disabled = isPy27 || pythonAtLeast "3.10";
 
   # We specify the name of the test files to prevent
   # https://github.com/NixOS/nixpkgs/issues/14634
diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix
index b039277f20199..9953e2c17be57 100644
--- a/pkgs/development/python-modules/towncrier/default.nix
+++ b/pkgs/development/python-modules/towncrier/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "towncrier";
-  version = "21.3.0";
+  version = "21.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6eed0bc924d72c98c000cb8a64de3bd566e5cb0d11032b73fcccf8a8f956ddfe";
+    sha256 = "sha256-nLb0XBbhoe7J0OdlEWXnvmDNCrgdE6XJbKl6SYrof0g=";
   };
 
   propagatedBuildInputs = [
@@ -31,12 +31,18 @@ buildPythonPackage rec {
 
   # zope.interface collision
   doCheck = !isPy27;
+
+  preCheck = ''
+    export PATH=$out/bin:$PATH
+  '';
+
   checkInputs = [
     git
     mock
     twisted
     pytestCheckHook
   ];
+
   pythonImportsCheck = [ "towncrier" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix
index 544c1a3084a6e..5cd14c7704d80 100644
--- a/pkgs/development/python-modules/tpm2-pytss/default.nix
+++ b/pkgs/development/python-modules/tpm2-pytss/default.nix
@@ -9,12 +9,12 @@ buildPythonPackage rec {
 
   # Last version on github is 0.2.4, but it looks
   # like a mistake (it's missing commits from 0.1.9)
-  version = "0.1.9";
+  version = "1.0.0";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-v5Xth0A3tFnLFg54nvWYL2TD201e/GWv+2y5Qc60CmU=";
+    sha256 = "sha256-Gx1nIXYuhTmQva9LmtTYvd1nyRH/pBQZ5bJ8OLcc1lo=";
   };
   postPatch = ''
     substituteInPlace tpm2_pytss/config.py --replace \
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 3973d68b6c381..2613a2b587d76 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "tqdm";
-  version = "4.62.3";
+  version = "4.63.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d";
+    sha256 = "sha256-HZg17ejjlLuMncv/vKAtcXIXETrcZ5I2hz7qrFvAs80=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index e667f146afc04..f9b325ecc2956 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -13,19 +13,45 @@
 , jedi
 , astor
 , yapf
+, coreutils
 }:
 
 buildPythonPackage rec {
   pname = "trio";
-  version = "0.19.0";
+  version = "0.20.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "895e318e5ec5e8cea9f60b473b6edb95b215e82d99556a03eb2d20c5e027efe1";
+    sha256 = "sha256-ZwpS0xFdDoeeGsg4pOuZmvMvhYFj46cE/kg53ipnYHA=";
   };
 
-  checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi yapf ];
+  propagatedBuildInputs = [
+    attrs
+    sortedcontainers
+    async_generator
+    idna
+    outcome
+    sniffio
+  ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ];
+
+  # tests are failing on Darwin
+  doCheck = !stdenv.isDarwin;
+
+  checkInputs = [
+    astor
+    jedi
+    pyopenssl
+    pytestCheckHook
+    trustme
+    yapf
+  ];
+
+  preCheck = ''
+    substituteInPlace trio/tests/test_subprocess.py \
+      --replace "/bin/sleep" "${coreutils}/bin/sleep"
+  '';
+
   # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it.
   disabledTests = [
     "getnameinfo"
@@ -41,18 +67,6 @@ buildPythonPackage rec {
     "-W" "ignore::DeprecationWarning"
   ];
 
-  propagatedBuildInputs = [
-    attrs
-    sortedcontainers
-    async_generator
-    idna
-    outcome
-    sniffio
-  ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ];
-
-  # tests are failing on Darwin
-  doCheck = !stdenv.isDarwin;
-
   meta = {
     description = "An async/await-native I/O library for humans and snake people";
     homepage = "https://github.com/python-trio/trio";
diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix
index c332a067a76be..6a52dd869e053 100644
--- a/pkgs/development/python-modules/trytond/default.nix
+++ b/pkgs/development/python-modules/trytond/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonApplication rec {
   pname = "trytond";
-  version = "6.2.3";
+  version = "6.2.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9be5d27aff9ae9b0ab73a8805145b2cc89900b9b513e6d5bfce89e9b7167f8f4";
+    sha256 = "sha256-Sof6A9lxU70YnCbboJr56CAdTL0cRbaRNxdvG5Tnqnw=";
   };
 
   # Tells the tests which database to use
diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix
index a3526eb707be9..c97fd85a8be48 100644
--- a/pkgs/development/python-modules/tweepy/default.nix
+++ b/pkgs/development/python-modules/tweepy/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "tweepy";
-  version = "4.5.0";
+  version = "4.6.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-mRpYPuj2B/kEaaeZlNYYnViGxWiK1xtWfDObHNduIK8=";
+    sha256 = "sha256-7ogsocRTMTO5yegyY7BADu9NrHK7zMMbihBu8oF4UlQ=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index ddc94541422c3..13bbff916cff9 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -1,17 +1,19 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, mock
-, nose
-, pyjwt
 , pythonOlder
+
+, pyjwt
 , pytz
 , requests
+
+, mock
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "7.5.0";
+  version = "7.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -19,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "twilio";
     repo = "twilio-python";
-    rev = version;
-    sha256 = "0h6r9nz7dcvagrjhzvnirpnjazcy9r64cwlr2bnmlrbjhwdni9rq";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-r28iKUv+i8D6JLvsJA7x8T2KFzK26limIwqsXC5jjSE=";
   };
 
   propagatedBuildInputs = [
@@ -31,7 +33,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     mock
-    nose
+    pytestCheckHook
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index 82c157722d285..d6fea5942117a 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "twine";
-  version = "3.7.1";
+  version = "3.8.0";
   format = "pyproject";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "28460a3db6b4532bde6a5db6755cf2dce6c5020bada8a641bb2c5c7a9b1f35b8";
+    sha256 = "sha256-jvpSZY4K53BoahO2dVaTKPH7qYN+XeGGe/5fRqmu/hk=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 074e7b8d50915..23c24f3e514a7 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "txaio";
-  version = "21.2.1";
+  version = "22.2.1";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-fW+JdFaAIz8cTbndt0jfXojSp6N5Yr4XTA/QTI26Hcg=";
+    sha256 = "sha256-LkWCtw8EsjRZCCVGhKmEIGwNm1DjB0okpMVauiHSTQE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix
index 6e903b6840772..d9696122f151a 100644
--- a/pkgs/development/python-modules/typed-settings/default.nix
+++ b/pkgs/development/python-modules/typed-settings/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "typed-settings";
-  version = "1.0.0";
+  version = "1.0.1";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-c+iOb1F8+9IoRbwpMTdyDfOPW2ZEo4xDAlbzLAxgSfk=";
+    sha256 = "sha256-xrIJgQiAaSXcANMnyXMnqEkLNUP+VyxjRoi9DkX+SLA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index 8b2ff2de5129d..dd3f62527aa23 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -3,7 +3,7 @@
 , pythonOlder
 , lib
 , setuptools-scm
-, pytest
+, pytestCheckHook
 , typing-extensions
 , glibcLocales
 }:
@@ -26,12 +26,17 @@ buildPythonPackage rec {
     substituteInPlace setup.cfg --replace " --cov" ""
   '';
 
-  checkInputs = [ pytest typing-extensions ];
+  checkInputs = [ pytestCheckHook typing-extensions ];
 
-  # mypy tests aren't passing with latest mypy
-  checkPhase = ''
-    py.test . --ignore=tests/mypy
-  '';
+  disabledTestPaths = [
+    # mypy tests aren't passing with latest mypy
+    "tests/mypy"
+  ];
+
+  disabledTests = [
+    # not compatible with python3.10
+    "test_typed_dict"
+  ];
 
   disabled = pythonOlder "3.3";
 
diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix
index 1e29bc9a6160c..97f0d48cecc2a 100644
--- a/pkgs/development/python-modules/typing-extensions/default.nix
+++ b/pkgs/development/python-modules/typing-extensions/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "typing-extensions";
-  version = "4.0.1";
+  version = "4.1.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "typing_extensions";
     inherit version;
-    hash = "sha256-TKCR3qFJ+UXsVq+0ja5xTyHoaS7yKjlSI7zTKJYbag4=";
+    hash = "sha256-GpRi3MM0enmx8cAnH7556ERYC7WYuvoe0gi5TaPNzUI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix
index 1e5303b7b09e5..d540160493643 100644
--- a/pkgs/development/python-modules/typing-inspect/default.nix
+++ b/pkgs/development/python-modules/typing-inspect/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , typing-extensions
 , mypy-extensions
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -20,6 +21,19 @@ buildPythonPackage rec {
     mypy-extensions
   ];
 
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # https://github.com/ilevkivskyi/typing_inspect/issues/84
+    "test_typed_dict_typing_extension"
+  ];
+
+  pythonImportsCheck = [
+    "typing_inspect"
+  ];
+
   meta = with lib; {
     description = "Runtime inspection utilities for Python typing module";
     homepage = "https://github.com/ilevkivskyi/typing_inspect";
diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix
index a3458b2f332fe..03ebd566b709e 100644
--- a/pkgs/development/python-modules/ufo2ft/default.nix
+++ b/pkgs/development/python-modules/ufo2ft/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "ufo2ft";
-  version = "2.25.2";
+  version = "2.25.3";
 
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ooWIHvyMtrht4WcGPiacY8dfjPSb5uitHnTRTKvf2AA=";
+    sha256 = "sha256-4OuEol+YorvOeK5bj33Po8V9KD0trcgTMXCTQ+J7q94=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix
index c8d1edc421094..c4ee1f955e440 100644
--- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix
+++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix
@@ -1,18 +1,21 @@
-{lib, fetchPypi, buildPythonPackage, isPy27, six}:
+{lib, fetchPypi, buildPythonPackage, isPy27, six, lxml }:
 
 buildPythonPackage rec {
   pname = "unittest-xml-reporting";
-  version = "3.0.4";
+  version = "3.2.0";
   disabled = isPy27;
 
-  propagatedBuildInputs = [six];
+  propagatedBuildInputs = [
+    lxml
+    six
+  ];
 
   # The tarball from Pypi doesn't actually contain the unit tests
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "984cebba69e889401bfe3adb9088ca376b3a1f923f0590d005126c1bffd1a695";
+    sha256 = "sha256-7djTFwtAw6gbjPkQ9GxqMErihH7AEDbQLpwPm4V2LSg=";
   };
   meta = with lib; {
     homepage = "https://github.com/xmlrunner/unittest-xml-reporting/tree/master/";
diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index bf523046c6166..8bf8e67b8e465 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "uproot";
-  version = "4.1.9";
+  version = "4.2.0";
 
   # fetch from github for tests
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "uproot4";
     rev = version;
-    sha256 = "035gljxm18hvpfvc7nsd7lhawwq3np5sg1y86pzcxc680c6rj6lx";
+    sha256 = "sha256-ft2VXYGb+iPqRUrtOBvl7SgTPfPR4+IOdYFVTNbQAEw=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index 4ce9228efee88..a3238d4c5484e 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "uvicorn";
-  version = "0.16.0";
+  version = "0.17.5";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
     rev = version;
-    sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s";
+    sha256 = "sha256-66wPVnBLy2HK4p0m/b/DRxy12sk8AsVFZoFVcWRkL4s=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 72ede5dc1716f..b4b75dbb19411 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -62,8 +62,12 @@ buildPythonPackage rec {
     "tests/test_sourcecode.py"
   ];
 
-  # force using installed/compiled uvloop vs source by moving tests to temp dir
-  preCheck = ''
+  preCheck = lib.optionalString stdenv.isDarwin ''
+    # Work around "OSError: AF_UNIX path too long"
+    # https://github.com/MagicStack/uvloop/issues/463
+    export TMPDIR="/tmp"
+   '' + ''
+    # force using installed/compiled uvloop vs source by moving tests to temp dir
     export TEST_DIR=$(mktemp -d)
     cp -r tests $TEST_DIR
     pushd $TEST_DIR
diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index c463c37747eaa..126bf4e6c6c07 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -23,11 +23,11 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "20.13.0";
+  version = "20.13.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d8458cf8d59d0ea495ad9b34c2599487f8a7772d796f9910858376d1600dd2dd";
+    sha256 = "sha256-AfX4B0TSSjdDzmGFgSNIjpHLLdHTvfkq2vG7o5/97fA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index ef8e6cfd247ec..7f21877f1fb58 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -114,6 +114,10 @@ buildPythonPackage rec {
     "tests/test_tables.py"
   ];
 
+  # Disable test that fails on darwin due to issue with python3Packages.psutil:
+  # https://github.com/giampaolo/psutil/issues/1219
+  disabledTests = lib.optional stdenv.isDarwin "test_tpu_system_stats";
+
   checkInputs = [
     azure-core
     bokeh
diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index 9fba5785c4478..1bc471c7287f1 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -39,6 +39,11 @@ buildPythonPackage rec {
       --replace "--cov-report=term-missing" ""
   '';
 
+  disabledTests = [
+    # probably failing because of an encoding related issue
+    "test_create_wrong_encoding"
+  ];
+
   disabledTestPaths = [
     # Tests are flaky
     "tests/test_inotify_buffer.py"
diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index 3d752596dec3b..a1a7470b8b5d6 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "weasyprint";
-  version = "54.2";
+  version = "54.3";
   disabled = !isPy3k;
 
   format = "pyproject";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "weasyprint";
-    sha256 = "sha256-1eiqguPiokd6RUPwZG2fsUCAybo0oIWXUesjdXzABGY=";
+    sha256 = "sha256-4E2gQGMFZsRMqiAgM/B/hYdl9TZwkEWoCXOfPQSOidY=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix
index 116f45f16dd34..37d926e505558 100644
--- a/pkgs/development/python-modules/websocket-client/default.nix
+++ b/pkgs/development/python-modules/websocket-client/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "websocket-client";
-  version = "1.2.3";
+  version = "1.3.1";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1315816c0acc508997eb3ae03b9d3ff619c9d12d544c9a9b553704b1cc4f6af5";
+    sha256 = "sha256-YninUGU5VBgoP4h958O+r7OqaNraXKy+SyFOjSbaSZs=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix
index 42a3877cffc15..0bb0a8f7999d1 100644
--- a/pkgs/development/python-modules/weconnect-mqtt/default.nix
+++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "weconnect-mqtt";
-  version = "0.30.0";
+  version = "0.30.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "tillsteinbach";
     repo = "WeConnect-mqtt";
     rev = "v${version}";
-    sha256 = "sha256-/mlN9gEEy8DJSFef0Pp2PLjHhwStKwANKSzw4nT19eM=";
+    sha256 = "sha256-e8dDdtabEHQKNx3c63Ou3T3ygsj4763C9Pd8usFrSCE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix
index f5af3e5aa5048..096f1b0e99b07 100644
--- a/pkgs/development/python-modules/weconnect/default.nix
+++ b/pkgs/development/python-modules/weconnect/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "weconnect";
-  version = "0.37.0";
+  version = "0.37.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "tillsteinbach";
     repo = "WeConnect-python";
     rev = "v${version}";
-    sha256 = "sha256-h6jKtQt9vCh5bnhIqWLniUIJ41GxCs0uSi4vBVNs8tE=";
+    sha256 = "sha256-54T4L1MzF2rkKM0AXz+bPBdVL7Izdho6c3AVSXBho2E=";
   };
 
   propagatedBuildInputs = [
@@ -42,8 +42,8 @@ buildPythonPackage rec {
     substituteInPlace setup.py \
       --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \
       --replace "tests_require=TEST_REQUIRED," "tests_require=[],"
-    substituteInPlace requirements.txt \
-      --replace "pillow~=9.0.0" "pillow"
+    substituteInPlace image_extra_requirements.txt \
+      --replace "pillow~=9.0.1" "pillow"
     substituteInPlace pytest.ini \
       --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \
       --replace "pytest-cov" ""
diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix
index c75c59ac1c9c5..63c3ad1b420bc 100644
--- a/pkgs/development/python-modules/werkzeug/default.nix
+++ b/pkgs/development/python-modules/werkzeug/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "werkzeug";
-  version = "2.0.2";
+  version = "2.0.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Werkzeug";
     inherit version;
-    sha256 = "sha256-qiu2/I3ujWxQTArB5/X33FgQqZA+eTtvcVqfAVva25o=";
+    sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";
   };
 
   propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [
diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix
index d4dd7d0899976..803ddd51d9fa8 100644
--- a/pkgs/development/python-modules/wsproto/default.nix
+++ b/pkgs/development/python-modules/wsproto/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "wsproto";
-  version = "1.0.0";
+  version = "1.1.0";
   disabled = pythonOlder "3.6"; # python versions <3.6
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38";
+    sha256 = "sha256-ouVr/Vx82DwTadg7X+zNbTd5i3SHKGbmJhbg7PERvag=";
   };
 
   propagatedBuildInputs = [ h11 ] ++ lib.optional isPy36 dataclasses;
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 5f780a61ffc56..85b8ac799c739 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "xarray";
-  version = "0.20.2";
+  version = "2022.3.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-wuvoDKgbEKAkH2h23MNKyWluXFzc30dY2nz0vXMsQfc=";
+    sha256 = "sha256-OYNEv30XBHeqzv9wIQ4R69aa9rFW/hOXgFTSXEhylEA=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION="${version}";
diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix
index 3717ca2473c39..f6c63db450517 100644
--- a/pkgs/development/python-modules/xgboost/default.nix
+++ b/pkgs/development/python-modules/xgboost/default.nix
@@ -48,7 +48,8 @@ buildPythonPackage {
     ln -s ${xgboost}/bin/xgboost ../xgboost
   '';
 
-  pytestFlagsArray = ["../tests/python"];
+  # tests are extremely cpu intensive, only run basic tests to ensure package is working
+  pytestFlagsArray = ["../tests/python/test_basic.py"];
   disabledTestPaths = [
     # Requires internet access: https://github.com/dmlc/xgboost/blob/03cd087da180b7dff21bd8ef34997bf747016025/tests/python/test_ranking.py#L81
     "../tests/python/test_ranking.py"
diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix
index 0a9a0af0e543f..76ce32e5e8f38 100644
--- a/pkgs/development/python-modules/xmlsec/default.nix
+++ b/pkgs/development/python-modules/xmlsec/default.nix
@@ -16,6 +16,7 @@
 buildPythonPackage rec {
   pname = "xmlsec";
   version = "1.3.12";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
@@ -35,7 +36,14 @@ buildPythonPackage rec {
 
   # Full git clone required for test_doc_examples
   checkInputs = [ pytestCheckHook hypothesis ];
-  disabledTestPaths = [ "tests/test_doc_examples.py" ];
+
+  disabledTestPaths = [
+    "tests/test_doc_examples.py"
+    # test_reinitialize_module segfaults python
+    # https://github.com/mehcode/python-xmlsec/issues/203
+    "tests/test_xmlsec.py"
+  ];
+
 
   pythonImportsCheck = [ "xmlsec" ];
 
diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix
index 13cc5b89c2a21..5e0733b6256e7 100644
--- a/pkgs/development/python-modules/xmltodict/default.nix
+++ b/pkgs/development/python-modules/xmltodict/default.nix
@@ -1,30 +1,27 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, coverage
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "xmltodict";
   version = "0.12.0";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21";
   };
 
-  checkInputs = [ coverage pytestCheckHook ];
-
-  disabledTests = [
-    # incompatibilities with security fixes: https://github.com/martinblech/xmltodict/issues/289
-    "test_namespace_collapse"
-    "test_namespace_support"
+  checkInputs = [
+    pytestCheckHook
   ];
 
-  meta = {
+  meta = with lib; {
     description = "Makes working with XML feel like you are working with JSON";
     homepage = "https://github.com/martinblech/xmltodict";
-    license = lib.licenses.mit;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix
index df3c0c852696d..f70526da6a106 100644
--- a/pkgs/development/python-modules/xxhash/default.nix
+++ b/pkgs/development/python-modules/xxhash/default.nix
@@ -4,12 +4,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.0.2";
+  version = "3.0.0";
   pname = "xxhash";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b7bead8cf6210eadf9cecf356e17af794f57c0939a3d420a00d87ea652f87b49";
+    sha256 = "sha256-MLLZeq8R+xIgI/a0TruXxpVengDXRhqWQVygMLXOucc=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix
index b87982b20b65c..5bcbf24dc302e 100644
--- a/pkgs/development/python-modules/yq/default.nix
+++ b/pkgs/development/python-modules/yq/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "yq";
-  version = "2.13.0";
+  version = "2.14.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-/RMf2x9WcWrY1EzZ6q99OyLTm6iGHqZKQJzD9K4mPbg=";
+    sha256 = "sha256-9L8rKZ0eXH69dM+yXR9dm2QBBjusB6LQmhVhRMHWROE=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix
index 11c6f84850bd5..c943f34c52ef3 100644
--- a/pkgs/development/python-modules/zarr/default.nix
+++ b/pkgs/development/python-modules/zarr/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "zarr";
-  version = "2.10.3";
+  version = "2.11.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "76932665c2146ebdf15f6dba254f9e0030552fbfcf9322dea822bff96fbce693";
+    sha256 = "sha256-sIc74nr1aQc4+hWOp6gC6uRUkEwzmVBWGFrMWnQltFE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index 1b3e0c5fcdf0c..83ee3f37f7e4e 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -6,6 +6,7 @@
 , cached-property
 , defusedxml
 , fetchFromGitHub
+, fetchpatch
 , freezegun
 , httpx
 , isodate
@@ -38,6 +39,14 @@ buildPythonPackage rec {
     sha256 = "sha256-fJLr2LJpbNQTl183R56G7sJILfm04R39qpJxLogQLoo=";
   };
 
+  patches = [
+    (fetchpatch {
+      # fixes pytest_httpx test case; https://github.com/mvantellingen/python-zeep/pull/1293
+      url = "https://github.com/mvantellingen/python-zeep/commit/2907848185adcb4e6d8c093db6c617c64cb8c8bf.patch";
+      hash = "sha256-hpksgMfrBLvYtI1QIs1aHBtFq7C1PWpnAj8BW5ak1/4=";
+    })
+  ];
+
   propagatedBuildInputs = [
     attrs
     cached-property
diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix
index d350e2040891b..d4c6c6b7e4742 100644
--- a/pkgs/development/python-modules/zimports/default.nix
+++ b/pkgs/development/python-modules/zimports/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "zimports";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "sqlalchemyorg";
     repo = "zimports";
     rev = "v${version}";
-    sha256 = "11mg7j7xiypv9hki4qbnp9jsgwgfdrgdzfqyrzk5x0s4hycgi4q0";
+    sha256 = "sha256-O8MHUt9yswL9fK9pEddkvnNS2E4vWA/S1BTs1OD1VbU=";
   };
 
   disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix
index 0586227c61c54..fb1eb07154a08 100644
--- a/pkgs/development/python-modules/zope_exceptions/default.nix
+++ b/pkgs/development/python-modules/zope_exceptions/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "zope.exceptions";
-  version = "4.4";
+  version = "4.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0d72886b1bb8af4c346a117a540f28ab122577f5e3a105a261be72cd15776fda";
+    sha256 = "sha256-TjW7oEiJxdEU3KpVKXQl1fM/YYqF7323Ehs7dxEAeE4=";
   };
 
   propagatedBuildInputs = [ zope_interface ];
diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix
index d7e9cf507f031..1bc880456b6e1 100644
--- a/pkgs/development/python-modules/zopfli/default.nix
+++ b/pkgs/development/python-modules/zopfli/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "zopfli";
-  version = "0.1.9";
+  version = "0.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "78de3cc08a8efaa8013d61528907d91ac4d6cc014ffd8a41cc10ee75e9e60d7b";
+    sha256 = "sha256-x9PzVcSR84TkNNsuYmheq269pmuWTonhdUuxFLLTjOo=";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python2-modules/pycairo/default.nix b/pkgs/development/python2-modules/pycairo/default.nix
index 9da4da1479c0e..eefc69a3323f6 100644
--- a/pkgs/development/python2-modules/pycairo/default.nix
+++ b/pkgs/development/python2-modules/pycairo/default.nix
@@ -3,7 +3,7 @@
 , meson
 , ninja
 , buildPythonPackage
-, pytestCheckHook
+, pytest
 , pkg-config
 , cairo
 , python
@@ -32,9 +32,11 @@ buildPythonPackage rec {
     cairo
   ];
 
-  checkInputs = [
-    pytestCheckHook
-  ];
+  # HACK: Don't use the pytestCheckHook because PYTHONPATH
+  # will be added by the Python setuptook breaking meson.
+  checkPhase = ''
+    ${pytest}/bin/pytest
+  '';
 
   mesonFlags = [
     # This is only used for figuring out what version of Python is in
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index fce57c0893e8e..c8f8934e866a1 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -362,7 +362,7 @@ let
     mwaved = [ pkgs.fftw.dev ];
     mzR = with pkgs; [ zlib boost159.dev netcdf ];
     ncdf4 = [ pkgs.netcdf ];
-    nloptr = with pkgs; [ nlopt pkg-config ];
+    nloptr = with pkgs; [ nlopt pkg-config libiconv ];
     n1qn1 = [ pkgs.gfortran ];
     odbc = [ pkgs.unixODBC ];
     pander = with pkgs; [ pandoc which ];
diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix
index 880fff44ed644..beb669d9893f4 100644
--- a/pkgs/development/r-modules/generic-builder.nix
+++ b/pkgs/development/r-modules/generic-builder.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation ({
   NIX_CFLAGS_COMPILE =
     lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
 
+  hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
+
   configurePhase = ''
     runHook preConfigure
     export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library"
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 8cda4a0b21280..77bf4c5dfb104 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -32,13 +32,13 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "checkov";
-  version = "2.0.988";
+  version = "2.0.1034";
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = pname;
     rev = version;
-    hash = "sha256-0/SL20N5d/oqWdyvVMZ+pzpPbehrYepaPi8P8SS8DSA=";
+    hash = "sha256-amSgg/6yYaLKzwkO7dq06zvh4744RyTVhd/tdurHKa4=";
   };
 
   nativeBuildInputs = with py.pkgs; [
@@ -94,7 +94,8 @@ buildPythonApplication rec {
   postPatch = ''
     substituteInPlace setup.py \
       --replace "cyclonedx-python-lib>=0.11.0,<1.0.0" "cyclonedx-python-lib>=0.11.0" \
-      --replace "prettytable>=3.0.0" "prettytable"
+      --replace "prettytable>=3.0.0" "prettytable" \
+      --replace "pycep-parser==0.3.3" "pycep-parser"
   '';
 
   preCheck = ''
@@ -114,6 +115,8 @@ buildPythonApplication rec {
     "test_skipped_check_exists"
     # AssertionError: 0 not greater than 0
     "test_skip_mapping_default"
+    # Test is failing
+    "test_SQLServerAuditingEnabled"
   ];
 
   disabledTestPaths = [
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 47abc7ec767b6..cf2fe926ddb08 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
     + lib.optionalString isBootstrap "-boot"
     + lib.optionalString useNcurses "-cursesUI"
     + lib.optionalString withQt5 "-qt5UI";
-  version = "3.22.2";
+  version = "3.22.3";
 
   src = fetchurl {
     url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
-    sha256 = "sha256-PBxHi5ZQsQfUUsW9VFxy4vrU43wJuJoZhLmi9G32rO0=";
+    sha256 = "sha256-n4RpFm+UVTtpeKFu4pIn7Emi61zrYIJ13sQNiuDRtaA=";
   };
 
   patches = [
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 8744407fb96d8..d8c92bc82d6ef 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -10,11 +10,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "0.60.3";
+  version = "0.61.2";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    hash = "sha256-h8pfqTWKAYZFKTkr1k4CcVjrlK/KfHdmsYZu8n7MuY4=";
+    hash = "sha256-AjOn+NlZB5MY9gUrCTnCf2il3oa6YB8lye5oaftfWIk=";
   };
 
   patches = [
@@ -58,10 +58,6 @@ python3.pkgs.buildPythonApplication rec {
     # unsandboxed non-NixOS builds, see:
     # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
     ./boost-Do-not-add-system-paths-on-nix.patch
-
-    # Meson tries to update ld.so.cache which breaks when the target architecture
-    # differs from the build host's.
-    ./do-not-update-ldconfig-cache.patch
   ] ++ lib.optionals withDarwinFrameworksGtkDocPatch [
     # Fix building gtkdoc for GLib
     # https://github.com/mesonbuild/meson/pull/10186
diff --git a/pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch b/pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch
deleted file mode 100644
index 884023aaa7eb4..0000000000000
--- a/pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
-index cb87faf5c..878ec4cd6 100644
---- a/mesonbuild/minstall.py
-+++ b/mesonbuild/minstall.py
-@@ -551,7 +551,6 @@ class Installer:
-                 self.install_emptydir(d, dm, destdir, fullprefix)
-                 self.install_data(d, dm, destdir, fullprefix)
-                 self.restore_selinux_contexts(destdir)
--                self.apply_ldconfig(dm, destdir)
-                 self.run_install_script(d, destdir, fullprefix)
-                 if not self.did_install_something:
-                     self.log('Nothing to install.')
diff --git a/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch b/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch
index eb6d9718bcb21..6c237e92dd11c 100644
--- a/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch
+++ b/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch
@@ -1,4 +1,4 @@
-From 0a008a6c7ecee19f35c8b7ab17b1470d0d1a8a15 Mon Sep 17 00:00:00 2001
+From b8ba462ae72e0818898357464263ec84722f6d4c Mon Sep 17 00:00:00 2001
 From: Jan Tojnar <jtojnar@gmail.com>
 Date: Sat, 26 Mar 2022 02:26:27 +0100
 Subject: [PATCH] gnome: Fix gtkdoc when using multiple Apple frameworks
@@ -11,13 +11,16 @@ Picked from https://github.com/mesonbuild/meson/pull/10186
 Also pick https://github.com/mesonbuild/meson/commit/68e684d51f1e469e0d9f4b499ffda15146cad98a when resolving conflict.
 
 diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index 7113f28d2..d3269b53f 100644
+index 214f97ac3..0521b2605 100644
 --- a/mesonbuild/modules/gnome.py
 +++ b/mesonbuild/modules/gnome.py
-@@ -384,13 +384,14 @@ class GnomeModule(ExtensionModule):
-     def _get_link_args(self, state, lib, depends, include_rpath=False,
-                        use_gir_args=False):
-         link_command = []
+@@ -593,15 +593,16 @@ class GnomeModule(ExtensionModule):
+                        lib: T.Union[build.SharedLibrary, build.StaticLibrary],
+                        depends: T.List[build.BuildTarget],
+                        include_rpath: bool = False,
+-                       use_gir_args: bool = False) -> T.List[str]:
++                       use_gir_args: bool = False) -> T.Tuple[T.List[str], T.List[T.Union[build.BuildTarget, 'build.GeneratedTypes', 'FileOrString']]]:
+         link_command: T.List[str] = []
 +        new_depends = list(depends)
          # Construct link args
          if isinstance(lib, build.SharedLibrary):
@@ -30,42 +33,36 @@ index 7113f28d2..d3269b53f 100644
              # Needed for the following binutils bug:
              # https://github.com/mesonbuild/meson/issues/1911
              # However, g-ir-scanner does not understand -Wl,-rpath
-@@ -404,18 +405,24 @@ class GnomeModule(ExtensionModule):
+@@ -615,19 +616,19 @@ class GnomeModule(ExtensionModule):
              link_command.append('--extra-library=' + lib.name)
          else:
              link_command.append('-l' + lib.name)
 -        return link_command
--
--    def _get_dependencies_flags(self, deps, state, depends, include_rpath=False,
--                                use_gir_args=False, separate_nodedup=False):
--        cflags = OrderedSet()
--        internal_ldflags = OrderedSet()
--        external_ldflags = OrderedSet()
 +        return link_command, new_depends
-+
+ 
+-    def _get_dependencies_flags(
 +    def _get_dependencies_flags_raw(
-+            self, deps,
-+            state,
-+            depends,
-+            include_rpath: bool = False,
-+            use_gir_args: bool = False,
-+            ) -> T.Tuple[OrderedSet[str], OrderedSet[T.Union[str, T.Tuple[str, str]]], OrderedSet[T.Union[str, T.Tuple[str, str]]], OrderedSet[str],
-+                         T.List]:
-+        cflags: OrderedSet[str] = OrderedSet()
+             self, deps: T.Sequence[T.Union['Dependency', build.SharedLibrary, build.StaticLibrary]],
+-            state: 'ModuleState', depends: T.List[build.BuildTarget], include_rpath: bool = False,
+-            use_gir_args: bool = False, separate_nodedup: bool = False
+-            ) -> T.Tuple[OrderedSet[str], OrderedSet[str], OrderedSet[str], T.Optional[T.List[str]], OrderedSet[str]]:
++            state: 'ModuleState', depends: T.List[build.BuildTarget], include_rpath: bool,
++            use_gir_args: bool
++            ) -> T.Tuple[OrderedSet[str], OrderedSet[T.Union[str, T.Tuple[str, str]]], OrderedSet[T.Union[str, T.Tuple[str, str]]], T.Optional[T.List[str]], OrderedSet[str],
++                         T.List[T.Union[build.BuildTarget, 'build.GeneratedTypes', 'FileOrString']]]:
+         cflags: OrderedSet[str] = OrderedSet()
+-        internal_ldflags: OrderedSet[str] = OrderedSet()
+-        external_ldflags: OrderedSet[str] = OrderedSet()
          # External linker flags that can't be de-duped reliably because they
 -        # require two args in order, such as -framework AVFoundation
--        external_ldflags_nodedup = []
--        gi_includes = OrderedSet()
+-        external_ldflags_nodedup: T.List[str] = []
 +        # require two args in order, such as -framework AVFoundation will be stored as a tuple.
 +        internal_ldflags: OrderedSet[T.Union[str, T.Tuple[str, str]]] = OrderedSet()
 +        external_ldflags: OrderedSet[T.Union[str, T.Tuple[str, str]]] = OrderedSet()
-+        gi_includes: OrderedSet[str] = OrderedSet()
+         gi_includes: OrderedSet[str] = OrderedSet()
          deps = mesonlib.listify(deps)
-+        depends = list(depends)
  
-         for dep in deps:
-             if isinstance(dep, Dependency):
-@@ -427,21 +434,20 @@ class GnomeModule(ExtensionModule):
+@@ -642,21 +643,20 @@ class GnomeModule(ExtensionModule):
                  cflags.update(state.get_include_args(dep.include_directories))
                  for lib in dep.libraries:
                      if isinstance(lib, build.SharedLibrary):
@@ -95,21 +92,21 @@ index 7113f28d2..d3269b53f 100644
                  for source in dep.sources:
                      if isinstance(source, GirTarget):
                          gi_includes.update([os.path.join(state.environment.get_build_dir(),
-@@ -469,7 +475,7 @@ class GnomeModule(ExtensionModule):
+@@ -684,7 +684,7 @@ class GnomeModule(ExtensionModule):
                      # If it's a framework arg, slurp the framework name too
                      # to preserve the order of arguments
-                     if lib == '-framework':
--                        external_ldflags_nodedup += [lib, next(ldflags)]
-+                        external_ldflags.update([(lib, next(ldflags))])
+                     if flag == '-framework':
+-                        external_ldflags_nodedup += [flag, next(ldflags)]
++                        external_ldflags.update([(flag, next(ldflags))])
                      else:
-                         external_ldflags.update([lib])
+                         external_ldflags.update([flag])
              elif isinstance(dep, (build.StaticLibrary, build.SharedLibrary)):
-@@ -480,21 +486,43 @@ class GnomeModule(ExtensionModule):
+@@ -695,21 +695,41 @@ class GnomeModule(ExtensionModule):
                  continue
  
          if use_gir_args and self._gir_has_option('--extra-library'):
--            def fix_ldflags(ldflags):
--                fixed_ldflags = OrderedSet()
+-            def fix_ldflags(ldflags: T.Iterable[str]) -> OrderedSet[str]:
+-                fixed_ldflags: OrderedSet[str] = OrderedSet()
 +            def fix_ldflags(ldflags: T.Iterable[T.Union[str, T.Tuple[str, str]]]) -> OrderedSet[T.Union[str, T.Tuple[str, str]]]:
 +                fixed_ldflags: OrderedSet[T.Union[str, T.Tuple[str, str]]] = OrderedSet()
                  for ldflag in ldflags:
@@ -122,19 +119,17 @@ index 7113f28d2..d3269b53f 100644
              external_ldflags = fix_ldflags(external_ldflags)
 -        if not separate_nodedup:
 -            external_ldflags.update(external_ldflags_nodedup)
--            return cflags, internal_ldflags, external_ldflags, gi_includes
+-            return cflags, internal_ldflags, external_ldflags, None, gi_includes
 -        else:
 -            return cflags, internal_ldflags, external_ldflags, external_ldflags_nodedup, gi_includes
 +        return cflags, internal_ldflags, external_ldflags, gi_includes, depends
 +
 +    def _get_dependencies_flags(
-+            self, deps,
-+            state,
-+            depends,
-+            include_rpath: bool = False,
-+            use_gir_args: bool = False,
++            self, deps: T.Sequence[T.Union['Dependency', build.SharedLibrary, build.StaticLibrary]],
++            state: 'ModuleState', depends: T.List[build.BuildTarget], include_rpath: bool = False,
++            use_gir_args: bool = False
 +            ) -> T.Tuple[OrderedSet[str], T.List[str], T.List[str], OrderedSet[str],
-+                         T.List]:
++                         T.List[T.Union[build.BuildTarget, 'build.GeneratedTypes', 'FileOrString']]]:
 +
 +        cflags, internal_ldflags_raw, external_ldflags_raw, gi_includes, depends = self._get_dependencies_flags_raw(deps, state, depends, include_rpath, use_gir_args)
 +        internal_ldflags: T.List[str] = []
@@ -153,24 +148,15 @@ index 7113f28d2..d3269b53f 100644
 +                external_ldflags.extend(ldflag)
  
 +        return cflags, internal_ldflags, external_ldflags, gi_includes, depends
-     def _unwrap_gir_target(self, girtarget, state):
+     def _unwrap_gir_target(self, girtarget: T.Union[build.Executable, build.StaticLibrary, build.SharedLibrary], state: 'ModuleState'
+                            ) -> T.Union[build.Executable, build.StaticLibrary, build.SharedLibrary]:
          if not isinstance(girtarget, (build.Executable, build.SharedLibrary,
-                                       build.StaticLibrary)):
-@@ -875,7 +903,7 @@ class GnomeModule(ExtensionModule):
+@@ -1056,7 +1076,7 @@ class GnomeModule(ExtensionModule):
          # ldflags will be misinterpreted by gir scanner (showing
          # spurious dependencies) but building GStreamer fails if they
          # are not used here.
--        dep_cflags, dep_internal_ldflags, dep_external_ldflags, gi_includes = \
+-        dep_cflags, dep_internal_ldflags, dep_external_ldflags, _, gi_includes = \
 +        dep_cflags, dep_internal_ldflags, dep_external_ldflags, gi_includes, depends = \
              self._get_dependencies_flags(deps, state, depends, use_gir_args=True)
          scan_cflags = []
          scan_cflags += list(self._get_scanner_cflags(cflags))
-@@ -1170,7 +1198,7 @@ class GnomeModule(ExtensionModule):
-         deps = extract_as_list(kwargs, 'dependencies')
-         cflags = []
-         cflags.extend(mesonlib.stringlistify(kwargs.pop('c_args', [])))
--        deps_cflags, internal_ldflags, external_ldflags, gi_includes = \
-+        deps_cflags, internal_ldflags, external_ldflags, gi_includes, depends = \
-             self._get_dependencies_flags(deps, state, depends, include_rpath=True)
-         inc_dirs = mesonlib.extract_as_list(kwargs, 'include_directories')
-         for incd in inc_dirs:
diff --git a/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/pkgs/development/tools/build-managers/meson/fix-rpath.patch
index d34b6c4c43457..29bec7903ca98 100644
--- a/pkgs/development/tools/build-managers/meson/fix-rpath.patch
+++ b/pkgs/development/tools/build-managers/meson/fix-rpath.patch
@@ -1,9 +1,9 @@
 --- a/mesonbuild/backend/backends.py
 +++ b/mesonbuild/backend/backends.py
-@@ -456,6 +456,21 @@ class Backend:
-                 args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang))
-             except Exception:
-                 pass
+@@ -723,6 +723,21 @@
+     @staticmethod
+     def get_rpath_dirs_from_link_args(args: T.List[str]) -> T.Set[str]:
+         dirs: T.Set[str] = set()
 +
 +        nix_ldflags = os.environ.get('NIX_LDFLAGS', '').split()
 +        next_is_path = False
diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
index e09aeea75a321..14d9f146651a1 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   pname = "qbs";
 
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "qbs";
     repo = "qbs";
     rev = "v${version}";
-    sha256 = "sha256-jlJ7bk+lKBUs+jB6MTMe2Qxhf7BA7s5M9Xa2Dnx2UJs=";
+    sha256 = "sha256-gFPcT/TNsKEUNzkJVaXHCGNmhQ0dV1/NYgQQInYrcNI=";
   };
 
   nativeBuildInputs = [ qmake ];
diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix
index d607f7af00c35..2fc1a18c1ff87 100644
--- a/pkgs/development/tools/buildpack/default.nix
+++ b/pkgs/development/tools/buildpack/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pack";
-  version = "0.24.0";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-nlSJwo2YjbOOKofZwXdWB3fxRUNTeSUcT6jN987SB3o=";
+    sha256 = "sha256-zwvZ99SLeYQDSzrEy2eYPMyFh9B6LWZT3tY92EOrXnU=";
   };
 
   vendorSha256 = "sha256-4uMd0KaV5xrxuJ9yqpxbD3YTNaBHsH2d/IRtYRyN5+0=";
diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix
deleted file mode 100644
index 5b2a7fddeb459..0000000000000
--- a/pkgs/development/tools/container-linux-config-transpiler/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, fetchFromGitHub, buildGoPackage }:
-
-with lib;
-
-buildGoPackage rec {
-  pname = "ct";
-  version = "0.9.0";
-
-  goPackagePath = "github.com/coreos/container-linux-config-transpiler";
-
-  src = fetchFromGitHub {
-    owner = "coreos";
-    repo = "container-linux-config-transpiler";
-    rev = "v${version}";
-    sha256="1w6nvgrl5qp3ci9igflk9dlk3020psv5m4f3p57f3qcx9vrcl4lw";
-  };
-
-  ldflags = [
-    "-X ${goPackagePath}/internal/version.Raw=v${version}"
-  ];
-
-  postInstall = ''
-    mv $out/bin/{internal,ct}
-    rm $out/bin/tools
-  '';
-
-  meta = {
-    description = "Convert a Container Linux Config into Ignition";
-    license = licenses.asl20;
-    homepage = "https://github.com/coreos/container-linux-config-transpiler";
-    maintainers = with maintainers; [elijahcaine];
-    platforms = with platforms; unix;
-  };
-}
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index 32be3e432389f..70e60d8418ffe 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -3,16 +3,16 @@
   nixosTests }:
 buildGoModule rec {
   pname = "buildkite-agent";
-  version = "3.34.1";
+  version = "3.35.1";
 
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "agent";
     rev = "v${version}";
-    sha256 = "sha256-OxZcMPJx83hBQOe4Pc8ERhO9QOc4euVVs+OMbPjA4U0=";
+    sha256 = "sha256-fa32tKOlRuKTONiMboX7CUxeknePsNRC7jlBvAtXmus=";
   };
 
-  vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI=";
+  vendorSha256 = "sha256-YnOOJDzdirikFbS9451A/TWOSWv04QsqO68/cSXK82k=";
 
   postPatch = ''
     substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
@@ -46,7 +46,7 @@ buildGoModule rec {
     '';
     homepage = "https://buildkite.com/docs/agent";
     license = licenses.mit;
-    maintainers = with maintainers; [ pawelpacana zimbatm rvl ];
+    maintainers = with maintainers; [ pawelpacana zimbatm rvl techknowlogick ];
     platforms = with platforms; unix ++ darwin;
   };
 }
diff --git a/pkgs/development/tools/database/indradb/default.nix b/pkgs/development/tools/database/indradb/default.nix
index f577963e8f4b8..eefb0a32525ff 100644
--- a/pkgs/development/tools/database/indradb/default.nix
+++ b/pkgs/development/tools/database/indradb/default.nix
@@ -3,6 +3,7 @@
 , lib
 , rustPlatform
 , rustfmt
+, protobuf
 }:
 let
   src = fetchFromGitHub {
@@ -30,7 +31,9 @@ in
 
     buildAndTestSubdir = "server";
 
-    nativeBuildInputs = [ rustfmt ];
+    PROTOC = "${protobuf}/bin/protoc";
+
+    nativeBuildInputs = [ rustfmt rustPlatform.bindgenHook ];
 
     # test rely on libindradb and it can't be found
     # failure at https://github.com/indradb/indradb/blob/master/server/tests/plugins.rs#L63
@@ -44,7 +47,9 @@ in
 
     cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM=";
 
-    nativeBuildInputs = [ rustfmt ];
+    PROTOC = "${protobuf}/bin/protoc";
+
+    nativeBuildInputs = [ rustfmt rustPlatform.bindgenHook ];
 
     buildAndTestSubdir = "client";
   };
diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix
index 015b60d9ccf0b..73af1bde5ea2c 100644
--- a/pkgs/development/tools/database/prisma-engines/default.nix
+++ b/pkgs/development/tools/database/prisma-engines/default.nix
@@ -8,21 +8,24 @@
 , stdenv
 }:
 
+# Updating this package will force an update for nodePackages.prisma. The
+# version of prisma-engines and nodePackages.prisma must be the same for them to
+# function correctly.
 rustPlatform.buildRustPackage rec {
   pname = "prisma-engines";
-  version = "3.11.0";
+  version = "3.12.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma-engines";
     rev = version;
-    sha256 = "sha256-z7ebwidY+p350XaGeyohoSHWc2DhfzpRxsRDLON1BuA=";
+    sha256 = "sha256-lIHE63XIPutvTS2cid0+tuo+JMSKMGuSUcnFv1mCRrM=";
   };
 
   # Use system openssl.
   OPENSSL_NO_VENDOR = 1;
 
-  cargoSha256 = "sha256-PQdLoNJL9szPzPtFRznWS0lngTvtWK+Ko2rp4JWH9dQ=";
+  cargoSha256 = "sha256-SkI+GLHknC+CGhGo7KiZahBxMp/JCIukTe2C0mMTdjY=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix
index fdec9ad19ed0a..601f4f17ae65f 100644
--- a/pkgs/development/tools/ddosify/default.nix
+++ b/pkgs/development/tools/ddosify/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "ddosify";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-n9xKg8RN2o20dTsV8a0tAJjmvAlwZ7TF2cTrXx+f49k=";
+    sha256 = "sha256-nwTVSx6+ELTZnM2tOuyzr7Koq6SE5L52S4revRjGABs=";
   };
 
   vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU=";
diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix
index 014acc89e1f7d..c5074cd037768 100644
--- a/pkgs/development/tools/deadcode/default.nix
+++ b/pkgs/development/tools/deadcode/default.nix
@@ -11,7 +11,7 @@ buildGoPackage rec {
   rev = "210d2dc333e90c7e3eedf4f2242507a8e83ed4ab";
 
   goPackagePath = "github.com/tsenart/deadcode";
-  excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)";
+  excludedPackages = "cmd/fillswitch/test-fixtures";
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index 478ef3b6fc685..f42046c284ec9 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -5,7 +5,7 @@ buildGoPackage rec {
   version = "1.8.2";
 
   goPackagePath = "github.com/go-delve/delve";
-  excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
+  excludedPackages = [ "_fixtures" "scripts" "service/test" ];
 
   src = fetchFromGitHub {
     owner = "go-delve";
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index a4a70dabd69dc..5a0807974edec 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "doxygen";
-  version = "1.8.20";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "doxygen";
     repo = "doxygen";
     rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "17chvi3i80rj4750smpizf562xjzd2xcv5rfyh997pyvc1zbq5rh";
+    sha256 = "1xfsv31ffrv03qhxlscav0r5mdi3qz4654ib9cq35rvmxfj999bw";
   };
 
   nativeBuildInputs = [
@@ -30,19 +30,20 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE =
     lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
 
-  enableParallelBuilding = false;
-
   meta = {
     license = lib.licenses.gpl2Plus;
-    homepage = "http://doxygen.nl/";
+    homepage = "https://www.doxygen.nl/";
+    changelog = "https://www.doxygen.nl/manual/changelog.html";
     description = "Source code documentation generator tool";
 
     longDescription = ''
-      Doxygen is a documentation system for C++, C, Java, Objective-C,
-      Python, IDL (CORBA and Microsoft flavors), Fortran, VHDL, PHP,
-      C\#, and to some extent D.  It can generate an on-line
-      documentation browser (in HTML) and/or an off-line reference
-      manual (in LaTeX) from a set of documented source files.
+      Doxygen is the de facto standard tool for generating documentation from
+      annotated C++ sources, but it also supports other popular programming
+      languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba,
+      Microsoft, and UNO/OpenOffice flavors), Fortran, VHDL and to some extent
+      D. It can generate an on-line documentation browser (in HTML) and/or an
+      off-line reference manual (in LaTeX) from a set of documented source
+      files.
     '';
 
     platforms = if qt5 != null then lib.platforms.linux else lib.platforms.unix;
diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index 1048ca1944117..4a300df0577cc 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -4,7 +4,7 @@ buildGoModule rec {
   pname = "gauge";
   version = "1.4.3";
 
-  excludedPackages = ''\(build\|man\)'';
+  excludedPackages = [ "build" "man" ];
 
   src = fetchFromGitHub {
     owner = "getgauge";
diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix
index 6719d71039211..9985d43da2f7c 100644
--- a/pkgs/development/tools/ginkgo/default.nix
+++ b/pkgs/development/tools/ginkgo/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
 
   # integration tests expect more file changes
   # types tests are missing CodeLocation
-  excludedPackages = "\\(integration\\|types\\)";
+  excludedPackages = [ "integration" "types" ];
 
   meta = with lib; {
     homepage = "https://onsi.github.io/ginkgo/";
diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix
index 9ece650f0cb29..5004afc28e359 100644
--- a/pkgs/development/tools/go-motion/default.nix
+++ b/pkgs/development/tools/go-motion/default.nix
@@ -9,7 +9,6 @@ buildGoPackage rec {
   rev = "218875ebe23806e7af82f3b5b14bb3355534f679";
 
   goPackagePath = "github.com/fatih/motion";
-  excludedPackages = "testdata";
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix
index fca346b78c429..c07d38b607335 100644
--- a/pkgs/development/tools/gocode-gomod/default.nix
+++ b/pkgs/development/tools/gocode-gomod/default.nix
@@ -9,8 +9,6 @@ buildGoModule rec {
   # standard packages.
   allowGoReference = true;
 
-  excludedPackages = "internal/suggest/testdata";
-
   src = fetchFromGitHub {
     owner = "stamblerre";
     repo = "gocode";
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index be9f70da9341f..687b69cf20278 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -6,7 +6,6 @@ buildGoPackage rec {
   rev = "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c";
 
   goPackagePath = "github.com/mdempsky/gocode";
-  excludedPackages = "internal/suggest/testdata";
 
   # we must allow references to the original `go` package,
   # because `gocode` needs to dig into $GOROOT to provide completions for the
diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix
index 2a111a8d1ab34..6f7c189ea9d2e 100644
--- a/pkgs/development/tools/gogetdoc/default.nix
+++ b/pkgs/development/tools/gogetdoc/default.nix
@@ -12,8 +12,6 @@ buildGoModule rec {
 
   doCheck = false;
 
-  excludedPackages = "\\(testdata\\)";
-
   src = fetchFromGitHub {
     inherit rev;
 
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
index 3187f793127ee..aa6ce6c7cda59 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -5,8 +5,6 @@ buildGoModule rec {
   version = "20201208-${lib.strings.substring 0 7 rev}";
   rev = "83fdc39ff7b56453e3793356bcff3070b9b96445";
 
-  excludedPackages = "testdata";
-
   # we must allow references to the original `go` package, as golint uses
   # compiler go/build package to load the packages it's linting.
   allowGoReference = true;
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index ea79baa96a703..9ea238233c361 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -38,9 +38,7 @@ buildGoModule rec {
     export GOTOOLDIR=$out/bin
   '';
 
-  excludedPackages = "\\("
-    + lib.concatStringsSep "\\|" ([ "testdata" "vet" "cover" ])
-    + "\\)";
+  excludedPackages = [ "vet" "cover" ];
 
   # Set GOTOOLDIR for derivations adding this to buildInputs
   postInstall = ''
diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
index 5e2d89cfd5df7..eb234c82fc088 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -1,16 +1,16 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "govers";
-  version = "20160623-${lib.strings.substring 0 7 rev}";
-  rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43";
+  version = "unstable-2016-06-23";
 
   goPackagePath = "github.com/rogpeppe/govers";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/rogpeppe/govers";
-    sha256 = "12w83vyi8mgn48fwdm2js693qcydimxapg8rk0yf01w0ab03r5wn";
+  src = fetchFromGitHub {
+    owner = "rogpeppe";
+    repo = "govers";
+    rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43";
+    sha256 = "sha256-lpc8wFKAB+A8mBm9q3qNzTM8ktFS1MYdIvZVFP0eiIs=";
   };
 
   dontRenameImports = true;
diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix
index 2158095775239..111048b562f39 100644
--- a/pkgs/development/tools/ineffassign/default.nix
+++ b/pkgs/development/tools/ineffassign/default.nix
@@ -9,7 +9,6 @@ buildGoPackage rec {
   rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514";
 
   goPackagePath = "github.com/gordonklaus/ineffassign";
-  excludedPackages = "testdata";
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix
deleted file mode 100644
index 4358ee244896f..0000000000000
--- a/pkgs/development/tools/interfacer/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ buildGoPackage
-, lib
-, fetchFromGitHub
-}:
-
-buildGoPackage rec {
-  pname = "interfacer-unstable";
-  version = "2018-08-31";
-  rev = "c20040233aedb03da82d460eca6130fcd91c629a";
-
-  goPackagePath = "mvdan.cc/interfacer";
-  excludedPackages = "check/testdata";
-
-  src = fetchFromGitHub {
-    inherit rev;
-
-    owner = "mvdan";
-    repo = "interfacer";
-    sha256 = "0cx4m74mvn200360pmsqxx4z0apk9fcknwwqh8r94zd3jfv4akq2";
-  };
-
-  goDeps = ./deps.nix;
-
-  meta = with lib; {
-    description = "A linter that suggests interface types";
-    homepage = "https://github.com/mvdan/interfacer";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ kalbasit ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
diff --git a/pkgs/development/tools/interfacer/deps.nix b/pkgs/development/tools/interfacer/deps.nix
deleted file mode 100644
index 6810950878be5..0000000000000
--- a/pkgs/development/tools/interfacer/deps.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/kisielk/gotool";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kisielk/gotool";
-      rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
-      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/tools";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/tools";
-      rev = "96e9e165b75e735822645eff82850b08c377be36";
-      sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg";
-    };
-  }
-  {
-    goPackagePath = "mvdan.cc/lint";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mvdan/lint";
-      rev = "adc824a0674b99099789b6188a058d485eaf61c0";
-      sha256 = "17mi2rvkg9kzv1shxcyawzcj4jj3v738d1j82fp4yygx859yvr8r";
-    };
-  }
-]
diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix
deleted file mode 100644
index e095755df1103..0000000000000
--- a/pkgs/development/tools/kube-aws/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, fetchFromGitHub, buildGoPackage }:
-
-with lib;
-
-buildGoPackage rec {
-  pname = "kube-aws";
-  version = "0.9.4";
-
-  goPackagePath = "github.com/coreos/kube-aws";
-
-  src = fetchFromGitHub {
-    owner = "coreos";
-    repo = "kube-aws";
-    rev = "v${version}";
-    sha256 = "11h14fsnflbx76rmpp0fxahbxi2qgcamgyxy9s4rmw83j2m8csxp";
-  };
-
-  preBuild = ''(
-    cd go/src/${goPackagePath}
-    go generate ./core/controlplane/config
-    go generate ./core/nodepool/config
-    go generate ./core/root/config
-  )'';
-
-  ldflags = [
-    "-X github.com/coreos/kube-aws/core/controlplane/cluster.VERSION=v${version}"
-  ];
-
-  meta = {
-    description = "Tool for deploying kubernetes on aws using coreos";
-    license = licenses.asl20;
-    homepage = "https://github.com/coreos/coreos-kubernetes";
-    maintainers = with maintainers; [offline];
-    platforms = with platforms; unix;
-  };
-}
diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index dcaafe676e9a3..92cab080aa803 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -2,9 +2,9 @@
 
 buildGoModule rec {
   pname = "kustomize";
-  version = "4.5.3";
+  version = "4.5.4";
   # rev is the commit of the tag, mainly for kustomize version command output
-  rev = "b2d65ddc98e09187a8e38adc27c30bab078c1dbf";
+  rev = "cf3a452ddd6f83945d39d582243b8592ec627ae3";
 
   ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in
     [
@@ -17,7 +17,7 @@ buildGoModule rec {
     owner = "kubernetes-sigs";
     repo = pname;
     rev = "kustomize/v${version}";
-    sha256 = "sha256-sy429uTTYvjnweZlsuolBamcggRXmaR8uxD043GUIQE=";
+    sha256 = "sha256-7Ode+ONgWJRNSbIpvIjhuT+oVvZgJfByFqS/iSUhcXw=";
   };
 
   doCheck = true;
@@ -25,7 +25,7 @@ buildGoModule rec {
   # avoid finding test and development commands
   sourceRoot = "source/kustomize";
 
-  vendorSha256 = "sha256-5kMMSr+YyuoASgW+qzkyO4CcDHFFANcsAZTUqHX5nGk=";
+  vendorSha256 = "sha256-beIbeY/+k2NgotGw5zQFkYuqMKlwctoxuToZfiFlCm4=";
 
   meta = with lib; {
     description = "Customization of kubernetes YAML configurations";
diff --git a/pkgs/development/tools/misc/gef/default.nix b/pkgs/development/tools/misc/gef/default.nix
index 0352ebc7cf327..b09cc795d8c08 100644
--- a/pkgs/development/tools/misc/gef/default.nix
+++ b/pkgs/development/tools/misc/gef/default.nix
@@ -4,6 +4,7 @@
 , makeWrapper
 , gdb
 , python3
+, bintools-unwrapped
 , file
 , ps
 , git
@@ -39,7 +40,12 @@ in stdenv.mkDerivation rec {
     makeWrapper ${gdb}/bin/gdb $out/bin/gef \
       --add-flags "-q -x $out/share/gef/gef.py" \
       --set NIX_PYTHONPATH ${pythonPath} \
-      --prefix PATH : ${lib.makeBinPath [ python3 file ps ]}
+      --prefix PATH : ${lib.makeBinPath [
+        python3
+        bintools-unwrapped # for readelf
+        file
+        ps
+      ]}
   '';
 
   checkInputs = [
diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix
deleted file mode 100644
index f5298d685eba7..0000000000000
--- a/pkgs/development/tools/misc/gpshell/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin
-, makeWrapper
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gpshell";
-  version = "1.4.4";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/globalplatform/gpshell-${version}.tar.gz";
-    sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";
-  };
-
-  nativeBuildInputs = [ pkg-config makeWrapper ];
-  buildInputs = [ globalplatform pcsclite ];
-
-  postFixup = ''
-    wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib"
-  '';
-
-  meta = with lib; {
-    homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
-    description = "Smartcard management application";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/tools/misc/grcov/default.nix b/pkgs/development/tools/misc/grcov/default.nix
index 04ed4a1046b77..2ca092fa659d8 100644
--- a/pkgs/development/tools/misc/grcov/default.nix
+++ b/pkgs/development/tools/misc/grcov/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "grcov";
-  version = "0.8.8";
+  version = "0.8.9";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-OITtZdI9d5zQVI02s5gJF9lWCjZZgE7YZRfFROU040o=";
+    sha256 = "sha256-VSjKZoK/o05kYX5mRCnaS6r/+4dZep9Bp9Im1Zw7piM=";
   };
 
-  cargoSha256 = "sha256-AZVkS/huEsA1wdVB/xUGCCjY5AWJxaU1DD/OlEURw/c=";
+  cargoSha256 = "sha256-7I0BizeDbikpog0YG/X8vwoO4PGE1qYzRTWTr0RUQws=";
 
   # tests do not find grcov path correctly
   checkFlags = let
diff --git a/pkgs/development/tools/misc/nix-bisect/default.nix b/pkgs/development/tools/misc/nix-bisect/default.nix
new file mode 100644
index 0000000000000..23efce44cff80
--- /dev/null
+++ b/pkgs/development/tools/misc/nix-bisect/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, fetchpatch
+, fetchFromGitHub
+, python3
+}:
+
+let
+  pname = "nix-bisect";
+  version = "0.4.1";
+in
+python3.pkgs.buildPythonApplication {
+  inherit pname version;
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "timokau";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-01vj35mMakqKi5zbMIPQ+R8xdkOWbzpnigd3/SU+svw=";
+  };
+
+  patches = [
+    (fetchpatch {
+      # Fixes compatibility with recent nix versions
+      url = "https://github.com/timokau/nix-bisect/commit/01eefe174b740cb90e48b06d67d5582d51786b96.patch";
+      hash = "sha256-Gls/NtHH7LujdEgLbcIRZ12KsJDrasXIMcHeeBVns4A=";
+    })
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    appdirs
+    numpy
+    pexpect
+  ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Bisect nix builds";
+    homepage = "https://github.com/timokau/nix-bisect";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index dcb4d2362c8e0..6919cd0f23fbe 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "patchelf";
-  version = "0.14.3";
+  version = "0.14.5";
 
   src = fetchurl {
     url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-oBfsPSFSoZ/ZacDYez+LQ+MqZuT/q9yHZ6VgYrmuwnA=";
+    sha256 = "sha256-uaRvKYkyLrifpPYjfiCDbFe0VapDoyVF6gk7Qx2YL1w=";
   };
 
   setupHook = [ ./setup-hook.sh ];
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index e62805867504e..350424747e883 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub }:
+{ lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub, unstableGitUpdater }:
 
 stdenv.mkDerivation rec {
   pname = "patchelf";
-  version = "2021-11-16";
+  version = "unstable-2022-02-21";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "patchelf";
-    rev = "a174cf3006baf31e0e9eaa62bc9adead93af63f7";
-    sha256 = "sha256-cKZ4DE70R5XiIqfnIVAl2s7a1bJxaaPpuCmxs3pxFRU=";
+    rev = "a35054504293f9ff64539850d1ed0bfd2f5399f2";
+    sha256 = "sha256-/hD/abmzWSkDhAWPLHiLQQ9cwJF8oFDuovNzRqs3Bho=";
   };
 
   # Drop test that fails on musl (?)
@@ -24,6 +24,12 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
+  passthru = {
+    updateScript = unstableGitUpdater {
+      url = "https://github.com/NixOS/patchelf.git";
+    };
+  };
+
   meta = with lib; {
     homepage = "https://github.com/NixOS/patchelf";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/misc/texinfo/6.8.nix b/pkgs/development/tools/misc/texinfo/6.8.nix
index 11435bf329f66..992f695bc92ca 100644
--- a/pkgs/development/tools/misc/texinfo/6.8.nix
+++ b/pkgs/development/tools/misc/texinfo/6.8.nix
@@ -1,4 +1,8 @@
 import ./common.nix {
   version = "6.8";
   sha256 = "1i7yb7mrp3inz25zbzv2pllr4y7d58v818f1as7iz8mw53nm7dwf";
+  patches = [
+    # glibc 2.34 compat
+    ./fix-glibc-2.34.patch
+  ];
 }
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index b379df09a4b06..26732657eb9f5 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -1,4 +1,4 @@
-{ version, sha256 }:
+{ version, sha256, patches ? [] }:
 
 { lib, stdenv, buildPackages, fetchurl, perl, xz, gettext
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     inherit sha256;
   };
 
-  patches = optional crossBuildTools ./cross-tools-flags.patch;
+  patches = patches ++ optional crossBuildTools ./cross-tools-flags.patch;
 
   # ncurses is required to build `makedoc'
   # this feature is introduced by the ./cross-tools-flags.patch
diff --git a/pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch b/pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch
new file mode 100644
index 0000000000000..60f2e63b7ce03
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch
@@ -0,0 +1,186 @@
+
+Patch by Vitezslav Crhonek <vcrhonek@redhat.com>
+Source: https://src.fedoraproject.org/rpms/texinfo/c/9b2cca4817fa4bd8d520fed05e9560fc7183dcdf?branch=rawhide
+
+diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h
+--- texinfo-6.8/gnulib/lib/cdefs.h.orig	2021-03-11 19:57:53.000000000 +0100
++++ texinfo-6.8/gnulib/lib/cdefs.h	2021-07-19 12:26:46.985176475 +0200
+@@ -321,15 +321,15 @@
+ 
+ /* The nonnull function attribute marks pointer parameters that
+    must not be NULL.  */
+-#ifndef __attribute_nonnull__
++#ifndef __nonnull
+ # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__)
+-#  define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params))
++#  define __nonnull(params) __attribute__ ((__nonnull__ params))
+ # else
+-#  define __attribute_nonnull__(params)
++#  define __nonnull(params)
+ # endif
+-#endif
+-#ifndef __nonnull
+-# define __nonnull(params) __attribute_nonnull__ (params)
++#elif !defined __GLIBC__
++# undef __nonnull
++# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params)
+ #endif
+ 
+ /* If fortification mode, we warn about unused results of certain
+diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h
+--- texinfo-6.8/gnulib/lib/libc-config.h.orig	2021-03-11 19:57:54.000000000 +0100
++++ texinfo-6.8/gnulib/lib/libc-config.h	2021-07-19 12:27:58.810590975 +0200
+@@ -33,9 +33,9 @@
+ #include <config.h>
+ 
+ /* On glibc this includes <features.h> and <sys/cdefs.h> and #defines
+-   _FEATURES_H, __WORDSIZE, and __set_errno.  On FreeBSD 11 and
+-   DragonFlyBSD 5.9 it includes <sys/cdefs.h> which defines __nonnull.
+-   Elsewhere it is harmless.  */
++   _FEATURES_H, __WORDSIZE, and __set_errno.  On FreeBSD 11 it
++   includes <sys/cdefs.h> which defines __nonnull.  Elsewhere it
++   is harmless.  */
+ #include <errno.h>
+ 
+ /* From glibc <errno.h>.  */
+diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c
+--- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig	2021-03-11 19:57:54.000000000 +0100
++++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c	2021-07-19 12:24:46.878419397 +0200
+@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY
+ 
+ /* Initialize a dynamic array object.  This must be called before any
+    use of the object.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static void
+ DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST
+ }
+ 
+ /* Deallocate the dynamic array and its elements.  */
+-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __nonnull ((1))
+ static void
+ DYNARRAY_FREE (struct DYNARRAY_STRUCT *list)
+ {
+@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l
+ }
+ 
+ /* Return true if the dynamic array is in an error state.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline bool
+ DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list)
+ {
+@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct
+ 
+ /* Mark the dynamic array as failed.  All elements are deallocated as
+    a side effect.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static void
+ DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA
+ 
+ /* Return the number of elements which have been added to the dynamic
+    array.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline size_t
+ DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list)
+ {
+@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR
+ 
+ /* Return a pointer to the array element at INDEX.  Terminate the
+    process if INDEX is out of bounds.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline DYNARRAY_ELEMENT *
+ DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index)
+ {
+@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU
+ /* Return a pointer to the first array element, if any.  For a
+    zero-length array, the pointer can be NULL even though the dynamic
+    array has not entered the failure state.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline DYNARRAY_ELEMENT *
+ DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S
+ /* Return a pointer one element past the last array element.  For a
+    zero-length array, the pointer can be NULL even though the dynamic
+    array has not entered the failure state.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline DYNARRAY_ELEMENT *
+ DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S
+ /* Add ITEM at the end of the array, enlarging it by one element.
+    Mark *LIST as failed if the dynamic array allocation size cannot be
+    increased.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline void
+ DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item)
+ {
+@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR
+ /* Allocate a place for a new element in *LIST and return a pointer to
+    it.  The pointer can be NULL if the dynamic array cannot be
+    enlarged due to a memory allocation failure.  */
+-__attribute_maybe_unused__ __attribute_warn_unused_result__
+-__attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
+ static
+ /* Avoid inlining with the larger initialization code.  */
+ #if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE))
+@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY
+    existing size, new elements are added (which can be initialized).
+    Otherwise, the list is truncated, and elements are freed.  Return
+    false on memory allocation failure (and mark *LIST as failed).  */
+-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __nonnull ((1))
+ static bool
+ DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size)
+ {
+@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_
+ }
+ 
+ /* Remove the last element of LIST if it is present.  */
+-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __nonnull ((1))
+ static void
+ DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA
+ 
+ /* Remove all elements from the list.  The elements are freed, but the
+    list itself is not.  */
+-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __nonnull ((1))
+ static void
+ DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S
+    stored in *RESULT if LIST refers to an empty list.  On success, the
+    pointer in *RESULT is heap-allocated and must be deallocated using
+    free.  */
+-__attribute_maybe_unused__ __attribute_warn_unused_result__
+-__attribute_nonnull__ ((1, 2))
++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2))
+ static bool
+ DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list,
+                           DYNARRAY_FINAL_TYPE *result)
+@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA
+    have a sentinel at the end).  If LENGTHP is not NULL, the array
+    length is written to *LENGTHP.  *LIST is re-initialized and can be
+    reused.  */
+-__attribute_maybe_unused__ __attribute_warn_unused_result__
+-__attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
+ static DYNARRAY_ELEMENT *
+ DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp)
+ {
diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix
index 643ca8773cb72..c0d1ec44f9e69 100644
--- a/pkgs/development/tools/neil/default.nix
+++ b/pkgs/development/tools/neil/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "neil";
-  version = "0.0.13";
+  version = "0.0.23";
 
   src = fetchFromGitHub {
     owner = "babashka";
     repo = "neil";
     rev = "v${version}";
-    sha256 = "0jiyl0d39d8kk5bpangwxiy90vqipj4lgp8x84rh4z5m53knjpkd";
+    sha256 = "0fx34gkhkklzq3hzk1cj2l4rgqrq9vif5y8b0nx9gg4136yj85cg";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 3e5471db5ae00..08abbc1c9f216 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -4,7 +4,7 @@
 
 buildDunePackage rec {
   pname = "utop";
-  version = "2.9.0";
+  version = "2.9.1";
 
   useDune2 = true;
 
@@ -12,7 +12,7 @@ buildDunePackage rec {
 
   src = fetchurl {
     url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz";
-    sha256 = "sha256:17jd61bc6pva5wqmnc9xq70ysyjplrzf1p25sq1s7wgrfq2vlyyd";
+    sha256 = "sha256-6TQxLYN/qjTABZuK6rp+daCSNWyJIXzB8q2QpZeBwaY=";
   };
 
   nativeBuildInputs = [ makeWrapper cppo ];
diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index d9e4ec1fb199e..5093553824d82 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -25,11 +25,10 @@ in stdenv.mkDerivation rec {
     sha256 = "1zsbpk1sgh9a16f1a5nx3qvk77ibjn812wqkxqck8n6fia85m5iq";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [ qmake makeWrapper ];
   buildInputs = [
     bison flex fontconfig freetype gperf icu openssl
     libjpeg libpng perl python2 ruby sqlite qtwebkit qtbase
-    makeWrapper
   ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     AGL ApplicationServices AppKit Cocoa OpenGL
     darwin.libobjc fakeClang cups
diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix
index a31108f338120..0e8371e4a0155 100644
--- a/pkgs/development/tools/reftools/default.nix
+++ b/pkgs/development/tools/reftools/default.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)";
+  excludedPackages = "cmd/fillswitch/test-fixtures";
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix
index 0f90f48004395..49e9bbaceb5bb 100644
--- a/pkgs/development/tools/rust/cargo-flash/default.nix
+++ b/pkgs/development/tools/rust/cargo-flash/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-flash";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "probe-rs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0s49q8x0iscy9rgn9zgymyg39cqm251a99m341znjn55lap3pdl8";
+    sha256 = "sha256-bd0TY8bdpLHLCdDQgJeJvqjAcSF67+LGSNx8yafYbys=";
   };
 
-  cargoSha256 = "0rb4s5bwjs7hri636r2viva96a6z9qjv9if6i220j9yglrvi7c8i";
+  cargoSha256 = "sha256-bx2N8zP7BmqU6oM/7Nf2i9S1uNWItReQMD59vtG1RKE=";
 
   nativeBuildInputs = [ pkg-config rustfmt ];
   buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
diff --git a/pkgs/development/tools/rust/ograc/default.nix b/pkgs/development/tools/rust/ograc/default.nix
new file mode 100644
index 0000000000000..4361a225498dd
--- /dev/null
+++ b/pkgs/development/tools/rust/ograc/default.nix
@@ -0,0 +1,21 @@
+{ fetchFromGitLab, lib, rustPlatform, }:
+
+rustPlatform.buildRustPackage {
+  pname = "ograc";
+  version = "0.1.6";
+  src = fetchFromGitLab {
+    owner = "lirnril";
+    repo = "ograc";
+    rev = "d09b3102ff7a364bf2593589327a16a473bd4f25";
+    sha256 = "sha256-vdHPFY6zZ/OBNlJO3N/6YXcvlddw2wYHgFWI0yfSgVo=";
+  };
+  cargoSha256 = "sha256-HAeEd7HY+hbTUOkIt6aTfvPYLRPtdAcUGvkuBUMjohA=";
+
+  meta = with lib; {
+    description = "like cargo, but backwards";
+    homepage = "https://crates.io/crates/ograc";
+    license = licenses.agpl3Plus;
+    maintainers = with maintainers; [ sciencentistguy ];
+  };
+}
+
diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix
index 2fb0f1ebbebac..0ba8e3b3d31a6 100644
--- a/pkgs/development/tools/sentry-cli/default.nix
+++ b/pkgs/development/tools/sentry-cli/default.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sentry-cli";
-  version = "1.74.2";
+  version = "1.74.3";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-cli";
     rev = version;
-    sha256 = "sha256-1A/c5HiXtT6xUTxVInv9DbbCsqpu8iCJ7I0A9wFeaQ0=";
+    sha256 = "sha256-savbS/1j6PJqmkk6c+XMOUEkrLZNU2p0YbN8rHfz2po=";
   };
   doCheck = false;
 
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
   nativeBuildInputs = [ pkg-config ];
 
-  cargoSha256 = "sha256-z++t+Zt40az11z/xhobvvbbSNUBpnMzqlRzoOuYgY2U=";
+  cargoSha256 = "sha256-7B8cmrDYufhlIMv2r6TSD+C8NLE2Juewgy4XYYr+QKs=";
 
   meta = with lib; {
     homepage = "https://docs.sentry.io/cli/";
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index 4f286cb22d779..0a7a1823baafb 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "skaffold";
-  version = "1.37.0";
+  version = "1.37.1";
 
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${version}";
-    sha256 = "sha256-mS+q+WOdEMMHjoqoIlDOqkoaRRLlou7FbMjC436k96A=";
+    sha256 = "sha256-hcP0BGzPQoYGvK+5Ro9Ts5882JhQYRT63mdTJbXhnzg=";
   };
 
   vendorSha256 = "sha256-LiNnTAI7iJkWL657eBw5OsCdvgWE2ZFZ3e+8vJtMhoE=";
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index 6618c0248514e..c25a27e6d957b 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -10,6 +10,7 @@
 , installShellFiles
 , makeWrapper
 , fuse-overlayfs
+, dockerTools
 }:
 
 buildGoModule rec {
@@ -53,6 +54,10 @@ buildGoModule rec {
     runHook postInstall
   '';
 
+  passthru.tests = {
+    inherit (dockerTools.examples) testNixFromDockerHub;
+  };
+
   meta = with lib; {
     description = "A command line utility for various operations on container images and image repositories";
     homepage = "https://github.com/containers/skopeo";
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
index 3b30e2a8af033..67c9b91594b97 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
+++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> {}
 , nodejs ? pkgs.nodejs
 , yarn ? pkgs.yarn
-, allowAliases ? pkgs.config.allowAliases or true
+, allowAliases ? pkgs.config.allowAliases
 }:
 
 let
diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix
index 9f31ce6f94349..59244b053eff8 100644
--- a/pkgs/development/tools/yq-go/default.nix
+++ b/pkgs/development/tools/yq-go/default.nix
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   vendorSha256 = "sha256-R40zU0jOc/eIFVDsWG3+4o51iro7Sd7jwtyH/fpWVZs=";
 
-  doCheck = false;
-
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix
index e2db169bad376..ea7c211163e2b 100644
--- a/pkgs/development/web/nodejs/v12.nix
+++ b/pkgs/development/web/nodejs/v12.nix
@@ -8,7 +8,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "12.22.11";
-    sha256 = "sha256-XoHaJv1bH4lxRIOrqmjj2jBFI+QzTHjEm/p6A+541vE=";
+    version = "12.22.12";
+    sha256 = "1whl0zi6fs9ay33bhcn2kh9xynran05iipahg1zzr6sv97wbfhmw";
     patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
   }
diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix
new file mode 100644
index 0000000000000..c5170c9845cca
--- /dev/null
+++ b/pkgs/games/bugdom/default.nix
@@ -0,0 +1,66 @@
+{ lib, stdenv, fetchFromGitHub, SDL2, IOKit, Foundation, cmake, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "bugdom";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "jorio";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256:1371inw11rzfrxmc3v4gv5axp56bxjbcr0mhqm4x839401bfq5mf";
+    fetchSubmodules = true;
+  };
+
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Expects SDL2.framework in specific location, which we don't have
+    # Passing this in cmakeFlags doesn't work because the path is hard-coded for Darwin
+    substituteInPlace cmake/FindSDL2.cmake \
+      --replace 'set(SDL2_LIBRARIES' 'set(SDL2_LIBRARIES "${SDL2}/lib/libSDL2.dylib") #'
+  '';
+
+  buildInputs = [
+    SDL2
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    IOKit
+    Foundation
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+  ];
+
+  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+    "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
+    # Expects SDL2.framework in specific location, which we don't have
+    "-DSDL2_INCLUDE_DIRS=${SDL2.dev}/include/SDL2"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+  '' + (if stdenv.hostPlatform.isDarwin then ''
+    mkdir -p $out/{bin,Applications}
+    mv {,$out/Applications/}Bugdom.app
+    ln -s $out/{Applications/Bugdom.app/Contents/MacOS,bin}/Bugdom
+  '' else ''
+    mkdir -p $out/share/bugdom
+    mv Data $out/share/bugdom
+    install -Dm755 {.,$out/bin}/Bugdom
+    wrapProgram $out/bin/Bugdom --run "cd $out/share/bugdom"
+  '') + ''
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A port of Bugdom, a 1999 Macintosh game by Pangea Software, for modern operating systems";
+    homepage = "https://github.com/jorio/Bugdom";
+    license = with licenses; [
+      cc-by-sa-40
+    ];
+    maintainers = with maintainers; [ lux ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix
index 1701d84e8df7a..af20169a6e088 100644
--- a/pkgs/games/cataclysm-dda/common.nix
+++ b/pkgs/games/cataclysm-dda/common.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
   '';
 
   makeFlags = [
-    "PREFIX=$(out)" "LANGUAGES=all"
+    "PREFIX=$(out)" "LANGUAGES=all" "RUNTESTS=0"
     (if useXdgDir then "USE_XDG_DIR=1" else "USE_HOME_DIR=1")
   ] ++ optionals (!debug) [
     "RELEASE=1"
diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index 2b29bddad93ca..f6de3d57c1304 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison
+{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison, fetchpatch
 , less
 , buildPackages
 , x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkg-config, qt5
@@ -24,6 +24,15 @@ in stdenv.mkDerivation rec {
          else if qtMode then "nethack-qt"
          else "nethack";
 
+  patches = [
+    # Don't unset `__warn_unused_result__`, breaks on glibc-2.34
+    (fetchpatch {
+      url = "https://github.com/NetHack/NetHack/commit/81d73ce417dda6a98e2e918e06922e68b67c53f7.patch";
+      sha256 = "sha256-PX9XtJTEE3K1yg/IwIzEIT+EZWi02gU+9msrsG9ZWQY=";
+      revert = true;
+    })
+  ];
+
   src = fetchurl {
     url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz";
     sha256 = "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng";
diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index edc8147a2b77b..8746d3172ac83 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -83,5 +83,10 @@ mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ abbradar marius851000 ];
     platforms = platforms.linux;
+
+    # 2021-10-13, doesn't compile with glibc-2.34, maintainers prefer a fix on glibc's end.
+    # Can be marked as un-broken as soon as https://gitlab.com/OpenMW/openmw/-/merge_requests/1239
+    # is resolved and a patch is appliable here.
+    broken = true;
   };
 }
diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index c5fba68b22a10..d18accd0d546a 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -206,12 +206,6 @@ in buildFHSUserEnv rec {
   ++ steamPackages.steam-runtime-wrapped.overridePkgs
   ++ extraLibraries pkgs;
 
-  extraBuildCommands = ''
-    ln -s /usr/lib/libbz2.so usr/lib/libbz2.so.1.0
-  '' + lib.optionalString (steam-runtime-wrapped-i686 != null) ''
-    ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0
-  '';
-
   extraInstallCommands = ''
     mkdir -p $out/share/applications
     ln -s ${steam}/share/icons $out/share
@@ -269,7 +263,7 @@ in buildFHSUserEnv rec {
     name = "steam-run";
 
     targetPkgs = commonTargetPkgs;
-    inherit multiPkgs extraBuildCommands profile extraInstallCommands;
+    inherit multiPkgs profile extraInstallCommands;
 
     inherit unshareIpc unsharePid;
 
diff --git a/pkgs/misc/drivers/argononed/default.nix b/pkgs/misc/drivers/argononed/default.nix
new file mode 100644
index 0000000000000..5fa28c17c529a
--- /dev/null
+++ b/pkgs/misc/drivers/argononed/default.nix
@@ -0,0 +1,48 @@
+{ lib, stdenv, fetchFromGitLab, dtc, installShellFiles }:
+
+stdenv.mkDerivation rec {
+  pname = "argononed";
+  version = "unstable-2022-03-26";
+
+  src = fetchFromGitLab {
+    owner = "DarkElvenAngel";
+    repo = pname;
+    rev = "97c4fa07fc2c09ffc3bd86e0f6319d50fa639578";
+    sha256 = "sha256-5/xUYbprRiwD+FN8V2cUpHxnTbBkEsFG2wfsEXrCrgQ=";
+  };
+
+  patches = [ ./fix-hardcoded-reboot-poweroff-paths.patch ];
+
+  postPatch = ''
+    patchShebangs configure
+  '';
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  buildInputs = [ dtc ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 build/argononed $out/bin/argononed
+    install -Dm755 build/argonone-cli $out/bin/argonone-cli
+    install -Dm755 build/argonone-shutdown $out/lib/systemd/system-shutdown/argonone-shutdown
+    install -Dm644 build/argonone.dtbo $out/boot/overlays/argonone.dtbo
+
+    install -Dm644 OS/_common/argononed.service $out/lib/systemd/system/argononed.service
+    install -Dm644 OS/_common/argononed.logrotate $out/etc/logrotate.d/argononed
+    install -Dm644 LICENSE $out/share/argononed/LICENSE
+
+    installShellCompletion --bash --name argonone-cli OS/_common/argonone-cli-complete.bash
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://gitlab.com/DarkElvenAngel/argononed";
+    description = "A replacement daemon for the Argon One Raspberry Pi case";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.misterio77 ];
+  };
+}
diff --git a/pkgs/misc/drivers/argononed/fix-hardcoded-reboot-poweroff-paths.patch b/pkgs/misc/drivers/argononed/fix-hardcoded-reboot-poweroff-paths.patch
new file mode 100644
index 0000000000000..88bcb6ddd25e4
--- /dev/null
+++ b/pkgs/misc/drivers/argononed/fix-hardcoded-reboot-poweroff-paths.patch
@@ -0,0 +1,18 @@
+--- a/src/argononed.c
++++ b/src/argononed.c
+@@ -783,13 +783,13 @@
+     {
+         log_message(LOG_DEBUG, "EXEC REBOOT");
+         sync();
+-        system("/sbin/reboot");
++        system("/run/current-system/sw/bin/reboot");
+     }
+     if (count >= 39 && count <= 41)
+     {
+         log_message(LOG_DEBUG, "EXEC SHUTDOWN");
+         sync();
+-        system("/sbin/poweroff");
++        system("/run/current-system/sw/bin/poweroff");
+     }
+ #else
+     log_message(LOG_INFO,"Daemon Ready");
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index e80ad8a839fb4..327cf2862346c 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -29,11 +29,11 @@ let
 
 in
 stdenv.mkDerivation rec {
-  pname = "ghostscript";
+  pname = "ghostscript${lib.optionalString (x11Support) "-with-X"}";
   version = "9.55.0";
 
   src = fetchurl {
-    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/${pname}-${version}.tar.xz";
+    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/ghostscript-${version}.tar.xz";
     sha512 = "27g72152mlwlalg232jxdhaf3ykgmqwi2pccbkwfygql1h9iz40plfbwbs1n0fkvm4zwzg5r9cr8g7w2dxih4jldiidv7rflxdy1is2";
   };
 
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix
index 96c0475c087ec..e9121b0211641 100644
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix
@@ -89,6 +89,8 @@
   IOBluetooth                      = { inherit CoreBluetooth IOKit; };
   IOBluetoothUI                    = { inherit IOBluetooth; };
   IOKit                            = {};
+  # `IOSurface` should depend on `Libsystem` (in place of `xpc`) but this currently causes build
+  # issues due to incompatibility issues between `Libsystem` and `libcxx`.
   IOSurface                        = { inherit IOKit xpc; };
   IOUSBHost                        = {};
   IdentityLookup                   = {};
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index dd3cf03095266..2772ca0460d60 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -1,9 +1,9 @@
 { lib, appleDerivation, xcbuildHook
-, openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }:
+, openssl, Librpcsvc, xnu, libpcap, developer_cmds }:
 
 appleDerivation {
   nativeBuildInputs = [ xcbuildHook ];
-  buildInputs = [ openssl_1_0_2 xnu Librpcsvc libpcap developer_cmds ];
+  buildInputs = [ openssl xnu Librpcsvc libpcap developer_cmds ];
 
   NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/";
 
diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix
index 98fd83ed5d518..eedaa9ef96872 100644
--- a/pkgs/os-specific/linux/apfs/default.nix
+++ b/pkgs/os-specific/linux/apfs/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation {
   pname = "apfs";
-  version = "unstable-2021-09-21-${kernel.version}";
+  version = "unstable-2022-02-03-${kernel.version}";
 
   src = fetchFromGitHub {
     owner = "linux-apfs";
     repo = "linux-apfs-rw";
-    rev = "362c4e32ab585b9234a26aa3e49f29b605612a31";
-    sha256 = "sha256-Y8/PGPLirNrICF+Bum60v/DBPa1xpox5VBvt64myZzs=";
+    rev = "a0d6a4dca69b6eab3cabaaee4d4284807828a266";
+    sha256 = "sha256-3T1BNc6g3SDTxb0VrronLUIp/CWbwnzXTsc8Qk5c4jY=";
   };
 
   hardeningDisable = [ "pic" ];
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index 5c1cf272e0e79..a7afd83862457 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, makeWrapper, autoreconfHook
+{ stdenv, lib, fetchFromGitLab, fetchpatch, makeWrapper, autoreconfHook
 , pkg-config, which
 , flex, bison
 , linuxHeaders ? stdenv.cc.libc.linuxHeaders
@@ -21,7 +21,7 @@
 }:
 
 let
-  apparmor-version = "3.0.3";
+  apparmor-version = "3.0.4";
 
   apparmor-meta = component: with lib; {
     homepage = "https://apparmor.net/";
@@ -31,9 +31,11 @@ let
     platforms = platforms.linux;
   };
 
-  apparmor-sources = fetchurl {
-    url = "https://launchpad.net/apparmor/${lib.versions.majorMinor apparmor-version}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";
-    sha256 = "0nasq8pdmzkrf856yg1v8z5hcs0nn6gw2qr60ab0a7j9ixfv0g8m";
+  apparmor-sources = fetchFromGitLab {
+    owner = "apparmor";
+    repo = "apparmor";
+    rev = "v${apparmor-version}";
+    sha256 = "1a217j28rgfq4lsmpn0wv1xgmdr9ba8iysv9i6q477kj6z77zrb9";
   };
 
   aa-teardown = writeShellScript "aa-teardown" ''
@@ -48,8 +50,9 @@ let
     substituteInPlace ./common/Make.rules \
       --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man" \
       --replace "/usr/bin/pod2html" "${buildPackages.perl}/bin/pod2html" \
-      --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" \
       --replace "/usr/share/man" "share/man"
+    substituteInPlace ./utils/Makefile \
+      --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"
   '';
 
   patches = lib.optionals stdenv.hostPlatform.isMusl [
@@ -60,6 +63,8 @@ let
     })
   ];
 
+  python = python3.withPackages (ps: with ps; [ setuptools ]);
+
   # Set to `true` after the next FIXME gets fixed or this gets some
   # common derivation infra. Too much copy-paste to fix one by one.
   doCheck = false;
@@ -86,19 +91,16 @@ let
       ncurses
       which
       perl
-    ] ++ lib.optional withPython python3;
+    ] ++ lib.optional withPython python;
 
     buildInputs = lib.optional withPerl perl
-      ++ lib.optional withPython python3;
+      ++ lib.optional withPython python;
 
     # required to build apparmor-parser
     dontDisableStatic = true;
 
     prePatch = prePatchCommon + ''
       substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.am --replace install_vendor install_site
-      substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.in --replace install_vendor install_site
-      substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h"
-      substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h"
     '';
     inherit patches;
 
@@ -132,12 +134,12 @@ let
 
     strictDeps = true;
 
-    nativeBuildInputs = [ makeWrapper which python3 ];
+    nativeBuildInputs = [ makeWrapper which python ];
 
     buildInputs = [
       bash
       perl
-      python3
+      python
       libapparmor
       libapparmor.python
     ];
@@ -159,7 +161,7 @@ let
     postInstall = ''
       sed -i $out/bin/aa-unconfined -e "/my_env\['PATH'\]/d"
       for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-unconfined ; do
-        wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python3.libPrefix}/site-packages:$PYTHONPATH"
+        wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.sitePackages}:$PYTHONPATH"
       done
 
       substituteInPlace $out/bin/aa-notify \
diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index 7b29f5a0e5cfe..5e552301fe48e 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -1,5 +1,7 @@
 { lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
-, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }:
+, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto
+, fetchpatch
+}:
 
 stdenv.mkDerivation rec {
   version = "5.1.6";
@@ -10,6 +12,15 @@ stdenv.mkDerivation rec {
     sha256 = "1vya21mb4izj3khcr3flibv7xc15vvx2v0rjfk5yd31qnzcy7pnx";
   };
 
+  patches = [
+    # glibc 2.34 compat
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/autofs/raw/cc745af5e42396d540d5b3b92fae486e232bf6bd/f/autofs-5.1.7-use-default-stack-size-for-threads.patch";
+      sha256 = "sha256-6ETDFbW7EhHR03xFWF+6OJBgn9NX3WW3bGhTNGodaOc=";
+      excludes = [ "CHANGELOG" ];
+    })
+  ];
+
   preConfigure = ''
     configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH"
     export sssldir="${sssd}/lib/sssd/modules"
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 7aaedb5b1acdc..970129f97390f 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -65,6 +65,16 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./busybox-in-store.patch
+    (fetchurl {
+      name = "CVE-2022-28391.patch";
+      url = "https://git.alpinelinux.org/aports/plain/main/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch?id=ed92963eb55bbc8d938097b9ccb3e221a94653f4";
+      sha256 = "sha256-yviw1GV+t9tbHbY7YNxEqPi7xEreiXVqbeRyf8c6Awo=";
+    })
+    (fetchurl {
+      name = "CVE-2022-28391.patch";
+      url = "https://git.alpinelinux.org/aports/plain/main/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch?id=ed92963eb55bbc8d938097b9ccb3e221a94653f4";
+      sha256 = "sha256-vl1wPbsHtXY9naajjnTicQ7Uj3N+EQ8pRNnrdsiow+w=";
+    })
   ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
 
   separateDebugInfo = true;
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 9bd8890e71348..87f5bb052f488 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -1,7 +1,7 @@
 { config, lib, stdenv, fetchFromGitHub, pkg-config, cmake
 
 # dependencies
-, glib, libXinerama
+, glib, libXinerama, catch2
 
 # optional features without extra dependencies
 , mpdSupport          ? true
@@ -85,6 +85,8 @@ stdenv.mkDerivation rec {
     sed -i 's/ Example: .*$//' doc/config_settings.xml
 
     substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)"
+
+    cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp
   '';
 
   NIX_LDFLAGS = "-lgcc_s";
@@ -133,6 +135,8 @@ stdenv.mkDerivation rec {
   # src/conky.cc:137:23: fatal error: defconfig.h: No such file or directory
   enableParallelBuilding = false;
 
+  doCheck = true;
+
   meta = with lib; {
     homepage = "http://conky.sourceforge.net/";
     description = "Advanced, highly configurable system monitor based on torsmo";
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index a9bd508d16ecd..be819802394e5 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   pname = "cryptsetup";
   version = "2.4.3";
 
-  outputs = [ "out" "dev" "man" ];
+  outputs = [ "bin" "out" "dev" "man" ];
   separateDebugInfo = true;
 
   src = fetchurl {
@@ -31,6 +31,12 @@ stdenv.mkDerivation rec {
     "--enable-cryptsetup-reencrypt"
     "--with-crypto_backend=openssl"
     "--disable-ssh-token"
+  ] ++ lib.optionals stdenv.hostPlatform.isStatic [
+    "--disable-external-tokens"
+    # We have to override this even though we're removing token
+    # support, because the path still gets included in the binary even
+    # though it isn't used.
+    "--with-luks2-external-tokens-path=/"
   ];
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index aa8e3f15aab27..d79201cc4cd18 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.46";
+  version = "0.49";
 
   outputs = [ "out" "dev" ];
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
     rev = version;
-    sha256 = "sha256-Am1PNFFfSzII4Iaeq0wgfuVHSeMDjiDzYkNQWlnEHJY=";
+    sha256 = "sha256-/5ivelqRDvJuPVJqMs27VJUIq7/Dw6ROt/cmjSo309s=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
index 389078db0af52..fe7a3e9ae406f 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
 
   patches = [ ./no-root-install.patch ];
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [
+    "PREFIX=$(out)"
+    "CC=${stdenv.cc.targetPrefix}cc"
+  ];
 
   meta = {
     description = "Firmware extractor for cards supported by the b43 kernel module";
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
index 3f810fd93a1c3..98d793c5d9983 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "0vz4ka8gycf72gmnaq61k8rh8y17j1wm2k3fidxvcqjvmix0drzi";
   };
 
-  buildInputs = [ b43FirmwareCutter ];
+  nativeBuildInputs = [ b43FirmwareCutter ];
 
   installPhase = ''
     mkdir -p $out/lib/firmware
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
index 1116d96a637f3..622b89b1baea5 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0baw6gcnrhxbb447msv34xg6rmlcj0gm3ahxwvdwfcvq4xmknz50";
   };
 
-  buildInputs = [ b43FirmwareCutter ];
+  nativeBuildInputs = [ b43FirmwareCutter ];
 
   sourceRoot = ".";
 
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index 7b9b35614a459..ac4deb19f51ce 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -31,7 +31,13 @@ in stdenv.mkDerivation rec {
       })
     ++ (if isFuse3
       then [ ./fuse3-install.patch ./fuse3-Do-not-set-FUSERMOUNT_DIR.patch ]
-      else [ ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch ]);
+      else [
+        ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch
+        (fetchpatch {
+          url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch?id=8a970396fca7aca2d5a761b8e7a8242f1eef14c9";
+          sha256 = "sha256-ELYBW/wxRcSMssv7ejCObrpsJHtOPJcGq33B9yHQII4=";
+        })
+      ]);
 
   nativeBuildInputs = if isFuse3
     then [ meson ninja pkg-config ]
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 72ecaffe5f50f..19f4301ff537b 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -12,12 +12,12 @@
 
 stdenv.mkDerivation rec {
   pname = "iwd";
-  version = "1.20";
+  version = "1.25";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
     rev = version;
-    sha256 = "sha256-GcqmMqrZSgvSrsY8FJbPynNWTzSi5A6kmyq+xJ+2i3Y=";
+    sha256 = "sha256-3IiRuILU2FKzXAQ0Q79DX2+nlNMcHNanS8m9GqjBBnU=";
   };
 
   outputs = [ "out" "man" "doc" ]
@@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
   postUnpack = ''
     mkdir -p iwd/ell
     ln -s ${ell.src}/ell/useful.h iwd/ell/useful.h
+    ln -s ${ell.src}/ell/asn1-private.h iwd/ell/asn1-private.h
     patchShebangs .
   '';
 
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 153b41194b859..fdf54d302bf20 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -448,6 +448,9 @@ let
       NLS_CODEPAGE_437 = module; # VFAT default for the codepage= mount option
       NLS_ISO8859_1    = module; # VFAT default for the iocharset= mount option
 
+      # Needed to use the installation iso image. Not included in all defconfigs (e.g. arm64)
+      ISO9660_FS = module;
+
       DEVTMPFS = yes;
 
       UNICODE = whenAtLeast "5.2" yes; # Casefolding support for filesystems
@@ -906,6 +909,11 @@ let
       ANDROID_BINDER_IPC =     { optional = true; tristate = whenAtLeast "5.0" "y";};
       ANDROID_BINDERFS =       { optional = true; tristate = whenAtLeast "5.0" "y";};
       ANDROID_BINDER_DEVICES = { optional = true; freeform = whenAtLeast "5.0" "binder,hwbinder,vndbinder";};
+
+      TASKSTATS = yes;
+      TASK_DELAY_ACCT = yes;
+      TASK_XACCT = yes;
+      TASK_IO_ACCOUNTING = yes;
     } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
       # Enable CPU/memory hotplug support
       # Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot
diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl
index df807188f14f9..7e12ca5d96a95 100644
--- a/pkgs/os-specific/linux/kernel/generate-config.pl
+++ b/pkgs/os-specific/linux/kernel/generate-config.pl
@@ -81,7 +81,7 @@ sub runConfig {
                 my $question = $1; my $name = $2; my $alts = $3;
                 my $answer = "";
                 # Build everything as a module if possible.
-                $answer = "m" if $autoModules && $alts =~ /\/m/ && !($preferBuiltin && $alts =~ /Y/);
+                $answer = "m" if $autoModules && $alts =~ qr{\A(\w/)+m/(\w/)*\?\z} && !($preferBuiltin && $alts =~ /Y/);
                 $answer = $answers{$name} if defined $answers{$name};
                 print STDERR "QUESTION: $question, NAME: $name, ALTS: $alts, ANSWER: $answer\n" if $debug;
                 print OUT "$answer\n";
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index a1a1906ba9cea..0411bae2060c7 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -16,6 +16,8 @@ in stdenv.mkDerivation rec {
     sha256 = "0am54mi5rk72g5q7k6l6f36gw3r9vwgjmyna43ywcjhqmakyx00b";
   };
 
+  outputs = [ "out" "dev" "lib" ];
+
   nativeBuildInputs = [ autoreconfHook pkg-config libxslt ];
   buildInputs = [ xz zstd ] ++ lib.optional stdenv.isDarwin elf-header;
 
diff --git a/pkgs/os-specific/linux/kvdo/default.nix b/pkgs/os-specific/linux/kvdo/default.nix
new file mode 100644
index 0000000000000..74895e11bd5aa
--- /dev/null
+++ b/pkgs/os-specific/linux/kvdo/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, vdo, kernel }:
+
+stdenv.mkDerivation rec {
+  inherit (vdo) version;
+  pname = "kvdo";
+
+  src = fetchFromGitHub {
+    owner = "dm-vdo";
+    repo = "kvdo";
+    rev = version;
+    sha256 = "1xl7dwcqx00w1gbpb6vlkn8nchyfj1fsc8c06vgda0sgxp7qs5gn";
+  };
+
+  dontConfigure = true;
+  enableParallelBuilding = true;
+
+  KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+  INSTALL_MOD_PATH = placeholder "out";
+
+  preBuild = ''
+    makeFlags="$makeFlags -C ${KSRC} M=$(pwd)"
+'';
+  installTargets = [ "modules_install" ];
+
+  meta = with lib; {
+    inherit (vdo.meta) license maintainers;
+    homepage = "https://github.com/dm-vdo/kvdo";
+    description = "A pair of kernel modules which provide pools of deduplicated and/or compressed block storage";
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 2f12d2fea38c8..750e26313cfe9 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPackages, fetchurl, attr, perl, runtimeShell
+{ stdenv, lib, buildPackages, fetchurl, attr, runtimeShell
 , usePam ? !isStatic, pam ? null
 , isStatic ? stdenv.hostPlatform.isStatic
 }:
@@ -7,18 +7,17 @@ assert usePam -> pam != null;
 
 stdenv.mkDerivation rec {
   pname = "libcap";
-  version = "2.49";
+  version = "2.63";
 
   src = fetchurl {
     url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz";
-    sha256 = "sha256-6YvE2TZFCC7Hh3MLD9GnErOIgkZcUFd33hfDOIMe4YE=";
+    sha256 = "sha256-DGN7j0T8fYYneH6c9X8VrAbB3cy1PkH+7FSWvjRm938=";
   };
 
   outputs = [ "out" "dev" "lib" "man" "doc" ]
     ++ lib.optional usePam "pam";
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ perl ];
 
   buildInputs = lib.optional usePam pam;
 
@@ -31,7 +30,9 @@ stdenv.mkDerivation rec {
     "CC:=$(CC)"
   ] ++ lib.optional isStatic "SHARED=no";
 
-  prePatch = ''
+  postPatch = ''
+    patchShebangs ./progs/mkcapshdoc.sh
+
     # use full path to bash
     substituteInPlace progs/capsh.c --replace "/bin/bash" "${runtimeShell}"
 
diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index 07e8c9cb02da2..7ba08e7d90342 100644
--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -11,6 +11,7 @@
 , enableDmeventd ? false
 , udevSupport ? !stdenv.hostPlatform.isStatic, udev ? null
 , onlyLib ? stdenv.hostPlatform.isStatic
+, enableVDO ? false, vdo ? null
 , nixosTests
 }:
 
@@ -18,7 +19,7 @@
 assert enableDmeventd -> enableCmdlib;
 
 stdenv.mkDerivation rec {
-  pname = "lvm2" + lib.optionalString enableDmeventd "-with-dmeventd";
+  pname = "lvm2" + lib.optionalString enableDmeventd "-with-dmeventd" + lib.optionalString enableVDO "-with-vdo";
   inherit version;
 
   src = fetchurl {
@@ -33,6 +34,8 @@ stdenv.mkDerivation rec {
     udev
   ] ++ lib.optionals (!onlyLib) [
     libuuid
+  ] ++ lib.optionals enableVDO [
+    vdo
   ];
 
   configureFlags = [
@@ -58,6 +61,8 @@ stdenv.mkDerivation rec {
     "--enable-udev_sync"
   ] ++ lib.optionals stdenv.hostPlatform.isStatic [
     "--enable-static_link"
+  ] ++  lib.optionals enableVDO [
+    "--enable-vdo"
   ];
 
   preConfigure = ''
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 0b6291226bc84..8485a868d8a59 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl, pkg-config, bison, file, flex
 , asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl
 , libmnl, libnftnl, libpcap
-, gmp, jansson, readline
+, gmp, jansson, libedit
+, autoreconfHook, fetchpatch
 , withDebugSymbols ? false
 , withPython ? false , python3
 , withXtables ? true , iptables
@@ -10,22 +11,23 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "1.0.1";
+  version = "1.0.2";
   pname = "nftables";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2";
-    sha256 = "08x4xw0s5sap3q7jfr91v7mrkxrydi4dvsckw85ims0qb1ibmviw";
+    sha256 = "00jcjn1pl7qyqpg8pd4yhlkys7wbj4vkzgg73n27nmplzips6a0b";
   };
 
   nativeBuildInputs = [
+    autoreconfHook
     pkg-config bison file flex
     asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt
   ];
 
   buildInputs = [
     libmnl libnftnl libpcap
-    gmp jansson readline
+    gmp jansson libedit
   ] ++ optional withXtables iptables
     ++ optional withPython python3;
 
@@ -33,9 +35,17 @@ stdenv.mkDerivation rec {
     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=readline"  # TODO: maybe switch to editline
+    "--with-cli=editline"
   ] ++ optional (!withDebugSymbols) "--disable-debug"
     ++ optional (!withPython) "--disable-python"
     ++ optional withPython "--enable-python"
diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix
index 0091accd57a7a..ebd45246ae8d1 100644
--- a/pkgs/os-specific/linux/pam_usb/default.nix
+++ b/pkgs/os-specific/linux/pam_usb/default.nix
@@ -41,8 +41,12 @@ stdenv.mkDerivation rec {
     sha256 = "1g1w0s9d8mfld8abrn405ll5grv3xgs0b0hsganrz6qafdq9j7q1";
   };
 
-  buildInputs = [
+  nativeBuildInputs = [
     makeWrapper
+    pkg-config
+  ];
+
+  buildInputs = [
     # pam_usb dependencies
     dbus libxml2 pam pmount pkg-config
     # pam_usb's tools dependencies
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 2e4ae1649ea86..5537f9f6aacb0 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -19,13 +19,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "shadow";
-  version = "4.8.1";
+  version = "4.11.1";
 
   src = fetchFromGitHub {
     owner = "shadow-maint";
     repo = "shadow";
-    rev = version;
-    sha256 = "13407r6qwss00504qy740jghb2dzd561la7dhp47rg8w3g8jarpn";
+    rev = "v${version}";
+    sha256 = "sha256-PxLX5V0t18JftT5wT41krNv18Ew7Kz3MfZkOi/80ODA=";
   };
 
   buildInputs = lib.optional (pam != null && stdenv.isLinux) pam;
diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
index a87c59558e01c..404b0d2ee6f30 100644
--- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
+++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -1,4 +1,4 @@
-From 93b2d29de784c68d1b4d70d7f214b19432aec6a8 Mon Sep 17 00:00:00 2001
+From 8622539fe2ce67934ed2e60626a2303ef8191e40 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:46:30 +0100
 Subject: [PATCH 01/19] Start device units for uninitialised encrypted devices
@@ -28,5 +28,5 @@ index 25b8a590a6..d18999ea87 100644
  SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root"
  SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks"
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
index e9fedd239f473..d37ace3250c23 100644
--- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
+++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
@@ -1,4 +1,4 @@
-From 41edb381df0326e216b3c569d2cd5764591267d9 Mon Sep 17 00:00:00 2001
+From a845786195182c376b72a85433e278c35243676d Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Fri, 12 Apr 2013 13:16:57 +0200
 Subject: [PATCH 02/19] Don't try to unmount /nix or /nix/store
@@ -25,10 +25,10 @@ index f683f05981..5a04c2c2a6 100644
                          "/etc"))
                  return true;
 diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
-index 1f945b7875..6df9d383ba 100644
+index f5a2cb20c1..51608d24c0 100644
 --- a/src/shutdown/umount.c
 +++ b/src/shutdown/umount.c
-@@ -508,6 +508,8 @@ static int delete_md(MountPoint *m) {
+@@ -502,6 +502,8 @@ static int delete_md(MountPoint *m) {
  
  static bool nonunmountable_path(const char *path) {
          return path_equal(path, "/")
@@ -38,5 +38,5 @@ index 1f945b7875..6df9d383ba 100644
                  || path_equal(path, "/usr")
  #endif
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
index 217629f7d6ac7..56c6238b81f26 100644
--- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
+++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
@@ -1,4 +1,4 @@
-From 43620479f6bfbbc4c3eed28947e0676c817acb7c Mon Sep 17 00:00:00 2001
+From d33f3461fa2202ef9b0d6cdf2137c510c59fb052 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Wed, 16 Apr 2014 10:59:28 +0200
 Subject: [PATCH 03/19] Fix NixOS containers
@@ -10,10 +10,10 @@ container, so checking early whether it exists will fail.
  1 file changed, 2 insertions(+)
 
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 575b9da447..438ca294db 100644
+index 8f17ab8810..197e5aa252 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
-@@ -5590,6 +5590,7 @@ static int run(int argc, char *argv[]) {
+@@ -5625,6 +5625,7 @@ static int run(int argc, char *argv[]) {
                                  goto finish;
                          }
                  } else {
@@ -21,7 +21,7 @@ index 575b9da447..438ca294db 100644
                          const char *p, *q;
  
                          if (arg_pivot_root_new)
-@@ -5604,6 +5605,7 @@ static int run(int argc, char *argv[]) {
+@@ -5639,6 +5640,7 @@ static int run(int argc, char *argv[]) {
                                  r = -EINVAL;
                                  goto finish;
                          }
@@ -30,5 +30,5 @@ index 575b9da447..438ca294db 100644
  
          } else {
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
index f7b768af515f2..36d0ee0cde24f 100644
--- a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
+++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
@@ -1,4 +1,4 @@
-From a08ed6697974d7f7dabe60d42bbc9e31a10f7e23 Mon Sep 17 00:00:00 2001
+From 8fd5968163f3a1cb5f196d934756ba08ccaa5b1e Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Thu, 1 May 2014 14:10:10 +0200
 Subject: [PATCH 04/19] Look for fsck in the right place
@@ -8,7 +8,7 @@ Subject: [PATCH 04/19] Look for fsck in the right place
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
-index cd7adfaeb9..68cebdd158 100644
+index 745d01ff50..dd4eef45c3 100644
 --- a/src/fsck/fsck.c
 +++ b/src/fsck/fsck.c
 @@ -368,7 +368,7 @@ static int run(int argc, char *argv[]) {
@@ -21,5 +21,5 @@ index cd7adfaeb9..68cebdd158 100644
                  cmdline[i++] = "-T";
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
index 7ebf07d0a82b7..6acac84a9d28b 100644
--- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
+++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
@@ -1,4 +1,4 @@
-From ddcfae6de8c460903c5db8c536ffeb5771e976f8 Mon Sep 17 00:00:00 2001
+From 90d1a90d3147e9c8db5caec8befabda270e755d4 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Fri, 19 Dec 2014 14:46:17 +0100
 Subject: [PATCH 05/19] Add some NixOS-specific unit directories
@@ -14,10 +14,10 @@ Also, remove /usr and /lib as these don't exist on NixOS.
  2 files changed, 6 insertions(+), 19 deletions(-)
 
 diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
-index 05eb17d66c..1cd141d012 100644
+index 6fb8c40e7a..142ecdecec 100644
 --- a/src/basic/path-lookup.c
 +++ b/src/basic/path-lookup.c
-@@ -91,11 +91,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
+@@ -92,11 +92,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
  }
  
  static const char* const user_data_unit_paths[] = {
@@ -29,7 +29,7 @@ index 05eb17d66c..1cd141d012 100644
          NULL
  };
  
-@@ -613,15 +609,13 @@ int lookup_paths_init(
+@@ -614,15 +610,13 @@ int lookup_paths_init(
                                          persistent_config,
                                          SYSTEM_CONFIG_UNIT_DIR,
                                          "/etc/systemd/system",
@@ -46,7 +46,7 @@ index 05eb17d66c..1cd141d012 100644
                                          STRV_IFNOTNULL(generator_late));
                          break;
  
-@@ -637,14 +631,11 @@ int lookup_paths_init(
+@@ -638,14 +632,11 @@ int lookup_paths_init(
                                          persistent_config,
                                          USER_CONFIG_UNIT_DIR,
                                          "/etc/systemd/user",
@@ -62,7 +62,7 @@ index 05eb17d66c..1cd141d012 100644
                                          STRV_IFNOTNULL(generator_late));
                          break;
  
-@@ -794,7 +785,6 @@ char **generator_binary_paths(UnitFileScope scope) {
+@@ -795,7 +786,6 @@ char **generator_binary_paths(UnitFileScope scope) {
                  case UNIT_FILE_SYSTEM:
                          add = strv_new("/run/systemd/system-generators",
                                         "/etc/systemd/system-generators",
@@ -70,7 +70,7 @@ index 05eb17d66c..1cd141d012 100644
                                         SYSTEM_GENERATOR_DIR);
                          break;
  
-@@ -802,7 +792,6 @@ char **generator_binary_paths(UnitFileScope scope) {
+@@ -803,7 +793,6 @@ char **generator_binary_paths(UnitFileScope scope) {
                  case UNIT_FILE_USER:
                          add = strv_new("/run/systemd/user-generators",
                                         "/etc/systemd/user-generators",
@@ -78,7 +78,7 @@ index 05eb17d66c..1cd141d012 100644
                                         USER_GENERATOR_DIR);
                          break;
  
-@@ -841,12 +830,10 @@ char **env_generator_binary_paths(bool is_system) {
+@@ -842,12 +831,10 @@ char **env_generator_binary_paths(bool is_system) {
                  if (is_system)
                          add = strv_new("/run/systemd/system-environment-generators",
                                          "/etc/systemd/system-environment-generators",
@@ -122,5 +122,5 @@ index fc0f8c34fa..162432e77f 100644
  
  systemd_sleep_dir=${root_prefix}/lib/systemd/system-sleep
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
index 0c09107c5ef22..438d841bb1c7a 100644
--- a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
+++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
@@ -1,4 +1,4 @@
-From b39b8871bcaa07280d6b0cf2226b1a3be31232b8 Mon Sep 17 00:00:00 2001
+From 213279752124dc4a57a4189df9b5b2e96feaa0b3 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Mon, 11 May 2015 15:39:38 +0200
 Subject: [PATCH 06/19] Get rid of a useless message in user sessions
@@ -13,10 +13,10 @@ in containers.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index 34891a8754..b9b4789720 100644
+index 9368a1dfa1..5b0bdb1bc7 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
-@@ -1375,7 +1375,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
+@@ -1408,7 +1408,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
                  if (!unit_is_bound_by_inactive(u, &culprit))
                          continue;
  
@@ -27,5 +27,5 @@ index 34891a8754..b9b4789720 100644
                  /* If stopping a unit fails continuously we might enter a stop loop here, hence stop acting on the
                   * service being unnecessary after a while. */
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
index d7649b5e44a76..a93488afbf92a 100644
--- a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
+++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
@@ -1,4 +1,4 @@
-From 566208aea81057789218b959f4d0e898eec54fc9 Mon Sep 17 00:00:00 2001
+From 14474d5e116609ce4fac60d779b08fa3eab840c3 Mon Sep 17 00:00:00 2001
 From: Gabriel Ebner <gebner@gebner.org>
 Date: Sun, 6 Dec 2015 14:26:36 +0100
 Subject: [PATCH 07/19] hostnamed, localed, timedated: disable methods that
@@ -11,10 +11,10 @@ Subject: [PATCH 07/19] hostnamed, localed, timedated: disable methods that
  3 files changed, 25 insertions(+)
 
 diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index 36702f2fb0..669257ea2f 100644
+index b20a93ad81..6292fca4fc 100644
 --- a/src/hostname/hostnamed.c
 +++ b/src/hostname/hostnamed.c
-@@ -797,6 +797,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
+@@ -813,6 +813,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
          if (r < 0)
                  return r;
  
@@ -24,7 +24,7 @@ index 36702f2fb0..669257ea2f 100644
          name = empty_to_null(name);
  
          context_read_etc_hostname(c);
-@@ -860,6 +863,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
+@@ -876,6 +879,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
          if (r < 0)
                  return r;
  
@@ -104,5 +104,5 @@ index 66b454269d..0a8fe25d0f 100644
          if (r < 0)
                  return r;
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
index f938b553c9f52..e1bc44a148ea0 100644
--- a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
+++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
@@ -1,4 +1,4 @@
-From 3b9983969de2a86929768f6362ed41c20dd13bd3 Mon Sep 17 00:00:00 2001
+From d668df39728c992ec0c691ef6e76664e7121f5bd Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Thu, 7 Jul 2016 02:47:13 +0300
 Subject: [PATCH 08/19] Fix hwdb paths
@@ -24,5 +24,5 @@ index 5ddc2211e6..ee621eec46 100644
 +        "/etc/udev/hwdb.bin\0"
 +
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
index 87cf1afc7d22b..68d40980ab169 100644
--- a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
@@ -1,4 +1,4 @@
-From b5966b6abb9696798618367cab33d1fed317734f Mon Sep 17 00:00:00 2001
+From dd59ce5f1bbdafb0b92f8aeacc68b000ec347a61 Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Tue, 11 Oct 2016 13:12:08 +0300
 Subject: [PATCH 09/19] Change /usr/share/zoneinfo to /etc/zoneinfo
@@ -35,10 +35,10 @@ index e486474c44..5f373d0723 100644
      <literal>Etc/UTC</literal>. The resulting link should lead to the
      corresponding binary
 diff --git a/src/basic/time-util.c b/src/basic/time-util.c
-index 5d162e8ffe..1bec83e555 100644
+index b659d6905d..660b1c6fed 100644
 --- a/src/basic/time-util.c
 +++ b/src/basic/time-util.c
-@@ -1269,7 +1269,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
+@@ -1267,7 +1267,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
  
          assert(ret);
  
@@ -47,7 +47,7 @@ index 5d162e8ffe..1bec83e555 100644
          if (!f)
                  return -errno;
  
-@@ -1308,7 +1308,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
+@@ -1306,7 +1306,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
          _cleanup_strv_free_ char **zones = NULL;
          int r;
  
@@ -56,7 +56,7 @@ index 5d162e8ffe..1bec83e555 100644
          if (!f)
                  return -errno;
  
-@@ -1421,7 +1421,7 @@ int verify_timezone(const char *name, int log_level) {
+@@ -1419,7 +1419,7 @@ int verify_timezone(const char *name, int log_level) {
          if (p - name >= PATH_MAX)
                  return -ENAMETOOLONG;
  
@@ -65,7 +65,7 @@ index 5d162e8ffe..1bec83e555 100644
  
          fd = open(t, O_RDONLY|O_CLOEXEC);
          if (fd < 0)
-@@ -1512,7 +1512,7 @@ int get_timezone(char **ret) {
+@@ -1510,7 +1510,7 @@ int get_timezone(char **ret) {
          if (r < 0)
                  return r; /* returns EINVAL if not a symlink */
  
@@ -75,10 +75,10 @@ index 5d162e8ffe..1bec83e555 100644
                  return -EINVAL;
  
 diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index 2cb4f80d5d..ebeaeac52f 100644
+index d28a416e5d..c7c215731d 100644
 --- a/src/firstboot/firstboot.c
 +++ b/src/firstboot/firstboot.c
-@@ -491,7 +491,7 @@ static int process_timezone(void) {
+@@ -494,7 +494,7 @@ static int process_timezone(void) {
          if (isempty(arg_timezone))
                  return 0;
  
@@ -88,10 +88,10 @@ index 2cb4f80d5d..ebeaeac52f 100644
          (void) mkdir_parents(etc_localtime, 0755);
          if (symlink(e, etc_localtime) < 0)
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 438ca294db..98bd110d92 100644
+index 197e5aa252..c674fa61d5 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
-@@ -1887,8 +1887,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
+@@ -1899,8 +1899,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
  static const char *timezone_from_path(const char *path) {
          return PATH_STARTSWITH_SET(
                          path,
@@ -137,5 +137,5 @@ index 0a8fe25d0f..2f02b9a520 100644
                          return -ENOMEM;
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
index 6e36bbdc34065..f2514de6c6629 100644
--- a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
+++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
@@ -1,4 +1,4 @@
-From f4e9304560ad42eeb8d42be583cc55eb2e5b4bb1 Mon Sep 17 00:00:00 2001
+From a93da270bed88972f4d60a1fa08f24e00712d7fb Mon Sep 17 00:00:00 2001
 From: Imuli <i@imu.li>
 Date: Wed, 19 Oct 2016 08:46:47 -0400
 Subject: [PATCH 10/19] localectl: use /etc/X11/xkb for list-x11-*
@@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/locale/localectl.c b/src/locale/localectl.c
-index 548ac8eb2c..5e372f1566 100644
+index b5624209dc..4ab7adfdb6 100644
 --- a/src/locale/localectl.c
 +++ b/src/locale/localectl.c
-@@ -280,7 +280,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
+@@ -279,7 +279,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
          } state = NONE, look_for;
          int r;
  
@@ -23,5 +23,5 @@ index 548ac8eb2c..5e372f1566 100644
                  return log_error_errno(errno, "Failed to open keyboard mapping list. %m");
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
index 5aa22d988952d..c21a1bda41226 100644
--- a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
+++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
@@ -1,4 +1,4 @@
-From 43a363f30b6012d600cfb62a3851c4ac7af4d1d5 Mon Sep 17 00:00:00 2001
+From 3bc3462165cd72de93a1c71f03e6c4150726b159 Mon Sep 17 00:00:00 2001
 From: Franz Pletz <fpletz@fnordicwalking.de>
 Date: Sun, 11 Feb 2018 04:37:44 +0100
 Subject: [PATCH 11/19] build: don't create statedir and don't touch prefixdir
@@ -8,12 +8,12 @@ Subject: [PATCH 11/19] build: don't create statedir and don't touch prefixdir
  1 file changed, 3 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 5bdfd9753d..5bf6afc7b7 100644
+index c0cbadecb1..8266bf57de 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -3539,9 +3539,6 @@ install_data('LICENSE.GPL2',
-              'docs/GVARIANT-SERIALIZATION.md',
-              install_dir : docdir)
+@@ -3729,9 +3729,6 @@ install_data('LICENSE.GPL2',
+ install_subdir('LICENSES',
+                install_dir : docdir)
  
 -meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))
 -meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir))
@@ -22,5 +22,5 @@ index 5bdfd9753d..5bf6afc7b7 100644
  
  # Ensure that changes to the docs/ directory do not break the
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch
index a2bdfcf8ec3fd..5f27e41752328 100644
--- a/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch
+++ b/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch
@@ -1,4 +1,4 @@
-From 7ea935a5ac4f31106ce9347227d4eb59b77b02cd Mon Sep 17 00:00:00 2001
+From 85f0ad0cb7b4f0cfd482c9611f9cbc2dacbba33a Mon Sep 17 00:00:00 2001
 From: Andreas Rammhold <andreas@rammhold.de>
 Date: Fri, 2 Nov 2018 21:15:42 +0100
 Subject: [PATCH 12/19] inherit systemd environment when calling generators.
@@ -16,10 +16,10 @@ executables that are being called from managers.
  1 file changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index b9b4789720..79239afe4a 100644
+index 5b0bdb1bc7..1538a5200a 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
-@@ -4149,10 +4149,15 @@ static int manager_run_generators(Manager *m) {
+@@ -3653,10 +3653,15 @@ static int manager_run_generators(Manager *m) {
          argv[4] = NULL;
  
          RUN_WITH_UMASK(0022)
@@ -40,5 +40,5 @@ index b9b4789720..79239afe4a 100644
  
  finish:
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch
index 20372a5dbad58..d008cf2821c7a 100644
--- a/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch
+++ b/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch
@@ -1,4 +1,4 @@
-From eb93778af78a127e8e20d6ed7fd9f91fd22dc7c9 Mon Sep 17 00:00:00 2001
+From b30d2273d3ce1480b0c4c27c25211f84e04172e9 Mon Sep 17 00:00:00 2001
 From: Andreas Rammhold <andreas@rammhold.de>
 Date: Thu, 9 May 2019 11:15:22 +0200
 Subject: [PATCH 13/19] add rootprefix to lookup dir paths
@@ -12,7 +12,7 @@ files that I might have missed.
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/basic/def.h b/src/basic/def.h
-index 2e60abb4f1..732ec51d36 100644
+index eccee3d3fa..e94a2c8bd0 100644
 --- a/src/basic/def.h
 +++ b/src/basic/def.h
 @@ -39,13 +39,15 @@
@@ -34,5 +34,5 @@ index 2e60abb4f1..732ec51d36 100644
  #define CONF_PATHS(n)                           \
          CONF_PATHS_USR(n)                       \
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
index a22566eb4cc30..49c6651c0edff 100644
--- a/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
+++ b/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
@@ -1,4 +1,4 @@
-From 1d623def80a3532ac1445499c9d4673e21ae8195 Mon Sep 17 00:00:00 2001
+From 76da27ff77e5db07e502d4d8d26286d69c3f0319 Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Thu, 25 Jul 2019 20:45:55 +0300
 Subject: [PATCH 14/19] systemd-shutdown: execute scripts in
@@ -10,12 +10,12 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
-index a98cfc4d8a..b0b34edda7 100644
+index 7ad9930677..fdb03a2e1a 100644
 --- a/src/shutdown/shutdown.c
 +++ b/src/shutdown/shutdown.c
-@@ -312,7 +312,7 @@ int main(int argc, char *argv[]) {
+@@ -335,7 +335,7 @@ int main(int argc, char *argv[]) {
          _cleanup_free_ char *cgroup = NULL;
-         char *arguments[3], *watchdog_device;
+         char *arguments[3];
          int cmd, r, umount_log_level = LOG_INFO;
 -        static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, NULL};
 +        static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, "/etc/systemd/system-shutdown", NULL};
@@ -23,5 +23,5 @@ index a98cfc4d8a..b0b34edda7 100644
          /* The log target defaults to console, but the original systemd process will pass its log target in through a
           * command line argument, which will override this default. Also, ensure we'll never log to the journal or
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
index 1a21d1005ee04..78d77c0058229 100644
--- a/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
+++ b/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
@@ -1,4 +1,4 @@
-From 5a96c4a98be971d84a12ae04e42bc3cb889d5191 Mon Sep 17 00:00:00 2001
+From 47c651f97acae814d4ff679ae04d78d4532cbca6 Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Thu, 25 Jul 2019 20:46:58 +0300
 Subject: [PATCH 15/19] systemd-sleep: execute scripts in
@@ -10,7 +10,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
  1 file changed, 1 insertion(+)
 
 diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index a3aeb24633..0ed6a34d79 100644
+index 7064f3a905..b60ced9d9b 100644
 --- a/src/sleep/sleep.c
 +++ b/src/sleep/sleep.c
 @@ -182,6 +182,7 @@ static int execute(
@@ -22,5 +22,5 @@ index a3aeb24633..0ed6a34d79 100644
          };
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
index 12624cb5548fc..3c1643e0f1ab8 100644
--- a/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
+++ b/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
@@ -1,32 +1,27 @@
-From 775a2a8940c07f4af33a2a11bfa17e0257b427cb Mon Sep 17 00:00:00 2001
+From df0fec7ac2f33bcca60ba9a2396af33397ba42cc Mon Sep 17 00:00:00 2001
 From: Florian Klink <flokli@flokli.de>
 Date: Sat, 7 Mar 2020 22:40:27 +0100
 Subject: [PATCH 16/19] kmod-static-nodes.service: Update ConditionFileNotEmpty
 
-kmod loads modules from not only /lib/modules but also from
-/run/booted-system/kernel-modules/lib/modules and
-/run/current-system/kernel-modules/lib/module
-
-Co-authored-by: Arian van Putten <arian.vanputten@gmail.com>
+On NixOS, kernel modules of the currently booted systems are located at
+/run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/.
 ---
- units/kmod-static-nodes.service.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ units/kmod-static-nodes.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
-index 777e82d16b..9a5e05a1cc 100644
+index 777e82d16b..b6abc2bba0 100644
 --- a/units/kmod-static-nodes.service.in
 +++ b/units/kmod-static-nodes.service.in
-@@ -12,7 +12,9 @@ Description=Create List of Static Device Nodes
+@@ -12,7 +12,7 @@ Description=Create List of Static Device Nodes
  DefaultDependencies=no
  Before=sysinit.target systemd-tmpfiles-setup-dev.service
  ConditionCapability=CAP_SYS_MODULE
 -ConditionFileNotEmpty=/lib/modules/%v/modules.devname
-+ConditionFileNotEmpty=|/lib/modules/%v/modules.devname
-+ConditionFileNotEmpty=|/run/booted-system/kernel-modules/lib/modules/%v/modules.devname
-+ConditionFileNotEmpty=|/run/current-system/kernel-modules/lib/modules/%v/modules.devname
++ConditionFileNotEmpty=/run/booted-system/kernel-modules/lib/modules/%v/modules.devname
  
  [Service]
  Type=oneshot
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
index 52b74284fe26d..882690ad9140f 100644
--- a/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
+++ b/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
@@ -1,4 +1,4 @@
-From 6ddb2011b379f3232374327517af874b68c434b5 Mon Sep 17 00:00:00 2001
+From f21722ac0f51b0b59a5c030af3db5fe4e6397f7c Mon Sep 17 00:00:00 2001
 From: Florian Klink <flokli@flokli.de>
 Date: Sun, 8 Mar 2020 01:05:54 +0100
 Subject: [PATCH 17/19] path-util.h: add placeholder for DEFAULT_PATH_NORMAL
@@ -10,7 +10,7 @@ systemd itself uses extensively.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/basic/path-util.h b/src/basic/path-util.h
-index 26e7362d1f..a8f8a863ec 100644
+index 518f3340bf..18e826ea0b 100644
 --- a/src/basic/path-util.h
 +++ b/src/basic/path-util.h
 @@ -24,11 +24,11 @@
@@ -29,5 +29,5 @@ index 26e7362d1f..a8f8a863ec 100644
  #if HAVE_SPLIT_USR
  #  define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch b/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch
index 58eb7f96e642c..e602bef9c3d7f 100644
--- a/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch
+++ b/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch
@@ -1,4 +1,4 @@
-From 50f2ada6cbfafa75b628410e8834f29581854e6f Mon Sep 17 00:00:00 2001
+From 968bd0c7bc058a4b05b6457f9ff20d02b70c9852 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
 Date: Sun, 6 Dec 2020 08:34:19 +0100
 Subject: [PATCH 18/19] pkg-config: derive prefix from --prefix
@@ -29,5 +29,5 @@ index 162432e77f..2fc20daf03 100644
  rootprefix=${root_prefix}
  sysconf_dir={{SYSCONF_DIR}}
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch b/pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch
index 54e5c32aeb446..916f95e194ac6 100644
--- a/pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch
+++ b/pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch
@@ -1,4 +1,4 @@
-From 2ab388cf0be320879e668a6206cb15d002b55f98 Mon Sep 17 00:00:00 2001
+From 169fc6f270ff3e3903a7a31550c964152f9751ec Mon Sep 17 00:00:00 2001
 From: Andreas Rammhold <andreas@rammhold.de>
 Date: Wed, 18 Aug 2021 19:10:08 +0200
 Subject: [PATCH 19/19] core: handle lookup paths being symlinks
@@ -15,10 +15,10 @@ directory itself is already a symlink.
  1 file changed, 31 insertions(+), 2 deletions(-)
 
 diff --git a/src/basic/unit-file.c b/src/basic/unit-file.c
-index 0d58b1c4fe..7314f1245f 100644
+index 30c632dfce..6179100126 100644
 --- a/src/basic/unit-file.c
 +++ b/src/basic/unit-file.c
-@@ -254,6 +254,7 @@ int unit_file_build_name_map(
+@@ -255,6 +255,7 @@ int unit_file_build_name_map(
  
          _cleanup_hashmap_free_ Hashmap *ids = NULL, *names = NULL;
          _cleanup_set_free_free_ Set *paths = NULL;
@@ -26,7 +26,7 @@ index 0d58b1c4fe..7314f1245f 100644
          uint64_t timestamp_hash;
          char **dir;
          int r;
-@@ -273,6 +274,34 @@ int unit_file_build_name_map(
+@@ -274,6 +275,34 @@ int unit_file_build_name_map(
                          return log_oom();
          }
  
@@ -59,9 +59,9 @@ index 0d58b1c4fe..7314f1245f 100644
 +        }
 +
          STRV_FOREACH(dir, (char**) lp->search_path) {
-                 struct dirent *de;
                  _cleanup_closedir_ DIR *d = NULL;
-@@ -351,11 +380,11 @@ int unit_file_build_name_map(
+ 
+@@ -386,11 +415,11 @@ int unit_file_build_name_map(
                                          continue;
                                  }
  
@@ -76,5 +76,5 @@ index 0d58b1c4fe..7314f1245f 100644
                                          log_debug("%s: linked unit file: %s → %s",
                                                    __func__, filename, simplified);
 -- 
-2.33.1
+2.34.0
 
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 4cbed9b7cbf10..73c27b0b61f04 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -15,6 +15,8 @@
 , gperf
 , getent
 , glibcLocales
+
+  # glib is only used during tests (test-bus-gvariant, test-bus-marshal)
 , glib
 , substituteAll
 , gettext
@@ -29,7 +31,6 @@
   # Optional dependencies
 , pam
 , cryptsetup
-, lvm2
 , audit
 , acl
 , lz4
@@ -61,8 +62,10 @@
 , kexec-tools
 , bashInteractive
 , libmicrohttpd
+, libfido2
+, p11-kit
 
-  # the (optional) BPF feature requires bpftool, libbpf, clang and llmv-strip to be avilable during build time.
+  # the (optional) BPF feature requires bpftool, libbpf, clang and llvm-strip to be available during build time.
   # Only libbpf should be a runtime dependency.
 , bpftools
 , libbpf
@@ -97,8 +100,8 @@
 , withTimesyncd ? true
 , withTpm2Tss ? !stdenv.hostPlatform.isMusl
 , withUserDb ? !stdenv.hostPlatform.isMusl
-, libfido2
-, p11-kit
+  # tests assume too much system access for them to be feasible for us right now
+, withTests ? false
 
   # name argument
 , pname ? "systemd"
@@ -123,7 +126,14 @@ assert withHomed -> withCryptsetup;
 assert withCryptsetup -> (cryptsetup != null);
 let
   wantCurl = withRemote || withImportd;
-  version = "249.7";
+  wantGcrypt = withResolved || withImportd;
+  version = "250.4";
+
+  # Bump this variable on every (major) version change. See below (in the meson options list) for why.
+  # command:
+  #  $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \
+  #     jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime'
+  releaseTimestamp = "1640290180";
 in
 stdenv.mkDerivation {
   inherit pname version;
@@ -134,12 +144,12 @@ stdenv.mkDerivation {
     owner = "systemd";
     repo = "systemd-stable";
     rev = "v${version}";
-    sha256 = "sha256-y33/BvvI+JyhsvuT1Cbm6J2Z72j71oXgLw6X9NwCMPE=";
+    sha256 = "sha256-AdzPh7dGVrGbbjL9+PqytQOpRzNDUUEftmKZAbFH3L4=";
   };
 
-  # If these need to be regenerated, `git am path/to/00*.patch` them into a
-  # systemd worktree, rebase to the more recent systemd version, and export the
-  # patches again via `git -c format.signoff=false format-patch v${version}`.
+  # On major changes, or when otherwise required, you *must* reformat the patches,
+  # `git am path/to/00*.patch` them into a systemd worktree, rebase to the more recent
+  # systemd version, and export the patches again via `git -c format.signoff=false format-patch v${version}`.
   # Use `find . -name "*.patch" | sort` to get an up-to-date listing of all patches
   patches = [
     ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -166,42 +176,44 @@ stdenv.mkDerivation {
     # systemd. With the below patch we mitigate that effect by special casing
     # all our root unit dirs if they are symlinks. This does exactly what we
     # need (AFAICT).
-    # See https://github.com/systemd/systemd/pull/20479 for upsteam discussion.
+    # See https://github.com/systemd/systemd/pull/20479 for upstream discussion.
     ./0019-core-handle-lookup-paths-being-symlinks.patch
-  ] ++ lib.optional stdenv.hostPlatform.isMusl (let
-    oe-core = fetchzip {
-      url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-14c6e5a4b72d0e4665279158a0740dd1dc21f72f.tar.bz2";
-      sha256 = "1jixya4czkr5p5rdcw3d6ips8zzr82dvnanvzvgjh67730scflya";
-    };
-    musl-patches = oe-core + "/meta/recipes-core/systemd/systemd";
-  in [
-    (musl-patches + "/0002-don-t-use-glibc-specific-qsort_r.patch")
-    (musl-patches + "/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch")
-    (musl-patches + "/0004-add-fallback-parse_printf_format-implementation.patch")
-    (musl-patches + "/0005-src-basic-missing.h-check-for-missing-strndupa.patch")
-    (musl-patches + "/0006-Include-netinet-if_ether.h.patch")
-    (musl-patches + "/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch")
-    (musl-patches + "/0008-add-missing-FTW_-macros-for-musl.patch")
-    (musl-patches + "/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch")
-    (musl-patches + "/0010-Use-uintmax_t-for-handling-rlim_t.patch")
-    (musl-patches + "/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch")
-    (musl-patches + "/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch")
-    (musl-patches + "/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch")
-    (musl-patches + "/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch")
-    (musl-patches + "/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch")
-    (musl-patches + "/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch")
-    (musl-patches + "/0017-missing_type.h-add-__compar_d_fn_t-definition.patch")
-    (musl-patches + "/0018-avoid-redefinition-of-prctl_mm_map-structure.patch")
-    (musl-patches + "/0019-Handle-missing-LOCK_EX.patch")
-    (musl-patches + "/0021-test-json.c-define-M_PIl.patch")
-    (musl-patches + "/0022-do-not-disable-buffer-in-writing-files.patch")
-    (musl-patches + "/0025-Handle-__cpu_mask-usage.patch")
-    (musl-patches + "/0026-Handle-missing-gshadow.patch")
-    (musl-patches + "/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch")
-
-    # Being discussed upstream: https://lists.openembedded.org/g/openembedded-core/topic/86411771#157056
-    ./musl.diff
-  ]);
+  ] ++ lib.optional stdenv.hostPlatform.isMusl (
+    let
+      oe-core = fetchzip {
+        url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-7e35a575ef09a85e625a81e0b4d80b020e3e3a92.tar.bz2";
+        sha256 = "0dvz4685nk0y7nnq3sr2q8ab3wfx0bi8ilwcgn0h6kagwcnav2n8";
+      };
+      musl-patches = oe-core + "/meta/recipes-core/systemd/systemd";
+    in
+    [
+      (musl-patches + "/0002-don-t-use-glibc-specific-qsort_r.patch")
+      (musl-patches + "/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch")
+      (musl-patches + "/0004-add-fallback-parse_printf_format-implementation.patch")
+      (musl-patches + "/0005-src-basic-missing.h-check-for-missing-strndupa.patch")
+      (musl-patches + "/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch")
+      (musl-patches + "/0008-add-missing-FTW_-macros-for-musl.patch")
+      (musl-patches + "/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch")
+      (musl-patches + "/0010-Use-uintmax_t-for-handling-rlim_t.patch")
+      (musl-patches + "/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch")
+      (musl-patches + "/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch")
+      (musl-patches + "/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch")
+      (musl-patches + "/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch")
+      (musl-patches + "/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch")
+      (musl-patches + "/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch")
+      (musl-patches + "/0017-missing_type.h-add-__compar_d_fn_t-definition.patch")
+      (musl-patches + "/0018-avoid-redefinition-of-prctl_mm_map-structure.patch")
+      (musl-patches + "/0019-Handle-missing-LOCK_EX.patch")
+      (musl-patches + "/0021-test-json.c-define-M_PIl.patch")
+      (musl-patches + "/0022-do-not-disable-buffer-in-writing-files.patch")
+      (musl-patches + "/0025-Handle-__cpu_mask-usage.patch")
+      (musl-patches + "/0026-Handle-missing-gshadow.patch")
+      (musl-patches + "/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch")
+      (musl-patches + "/0001-pass-correct-parameters-to-getdents64.patch")
+      (musl-patches + "/0002-Add-sys-stat.h-for-S_IFDIR.patch")
+      (musl-patches + "/0001-Adjust-for-musl-headers.patch")
+    ]
+  );
 
   postPatch = ''
     substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/"
@@ -211,7 +223,7 @@ stdenv.mkDerivation {
       "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'"
   '' + (
     let
-      # The folllowing patches references to dynamic libraries to ensure that
+      # The following patches references to dynamic libraries to ensure that
       # all the features that are implemented via dlopen(3) are available (or
       # explicitly deactivated) by pointing dlopen to the absolute store path
       # instead of relying on the linkers runtime lookup code.
@@ -267,7 +279,7 @@ stdenv.mkDerivation {
           { name = "libidn.so.12"; pkg = null; }
           { name = "libidn.so.11"; pkg = null; }
 
-          # journalctl --grep requires libpcre so lets provide it
+          # journalctl --grep requires libpcre so let's provide it
           { name = "libpcre2-8.so.0"; pkg = pcre2; }
 
           # Support for TPM2 in systemd-cryptsetup, systemd-repart and systemd-cryptenroll
@@ -276,6 +288,10 @@ stdenv.mkDerivation {
           { name = "libtss2-mu.so.0"; pkg = opt withTpm2Tss tpm2-tss; }
           { name = "libtss2-tcti-"; pkg = opt withTpm2Tss tpm2-tss; }
           { name = "libfido2.so.1"; pkg = opt withFido2 libfido2; }
+
+          # inspect-elf support
+          { name = "libelf.so.1"; pkg = opt withCoredump elfutils; }
+          { name = "libdw.so.1"; pkg = opt withCoredump elfutils; }
         ];
 
       patchDlOpen = dl:
@@ -294,7 +310,7 @@ stdenv.mkDerivation {
             # exceptional case, details:
             # https://github.com/systemd/systemd-stable/blob/v249-stable/src/shared/tpm2-util.c#L157
             if ! [[ "${library}" =~ .*libtss2-tcti-$ ]]; then
-              echo 'The shared library `${library}` does not exist but was given as subtitute for `${dl.name}`'
+              echo 'The shared library `${library}` does not exist but was given as substitute for `${dl.name}`'
               exit 1
             fi
           fi
@@ -318,8 +334,8 @@ stdenv.mkDerivation {
     fi
   ''
   # Finally patch shebangs that might need patching.
-  # Should no longer be necessary with v250.
-  # https://github.com/systemd/systemd/pull/19638
+  # Should no longer be necessary with v251.
+  # https://github.com/systemd/systemd/pull/21749
   + ''
     patchShebangs .
   '';
@@ -356,16 +372,16 @@ stdenv.mkDerivation {
     [
       acl
       audit
-      glib
       kmod
       libcap
-      libgcrypt
       libidn2
       libuuid
       linuxHeaders
       pam
     ]
 
+    ++ lib.optional wantGcrypt libgcrypt
+    ++ lib.optional withTests glib
     ++ lib.optional withApparmor libapparmor
     ++ lib.optional wantCurl (lib.getDev curl)
     ++ lib.optionals withCompression [ bzip2 lz4 xz zstd ]
@@ -389,6 +405,14 @@ stdenv.mkDerivation {
 
   mesonFlags = [
     "-Dversion-tag=${version}"
+    # We bump this variable on every (major) version change to ensure
+    # that we have known-good value for a timestamp that is in the (not so distant) past.
+    # This serves as a lower bound for valid system timestamps during startup. Systemd will
+    # reset the system timestamp if this date is +- 15 years from the system time.
+    # See the systemd v250 release notes for further details:
+    # https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266
+    "-Dtime-epoch=${releaseTimestamp}"
+
     "-Ddbuspolicydir=${placeholder "out"}/share/dbus-1/system.d"
     "-Ddbussessionservicedir=${placeholder "out"}/share/dbus-1/services"
     "-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services"
@@ -400,11 +424,11 @@ stdenv.mkDerivation {
     "-Dsetfont-path=${kbd}/bin/setfont"
     "-Dtty-gid=3" # tty in NixOS has gid 3
     "-Ddebug-shell=${bashInteractive}/bin/bash"
-    "-Dglib=${lib.boolToString (glib != null)}"
+    "-Dglib=${lib.boolToString withTests}"
     # while we do not run tests we should also not build them. Removes about 600 targets
     "-Dtests=false"
     "-Danalyze=${lib.boolToString withAnalyze}"
-    "-Dgcrypt=${lib.boolToString (libgcrypt != null)}"
+    "-Dgcrypt=${lib.boolToString wantGcrypt}"
     "-Dimportd=${lib.boolToString withImportd}"
     "-Dlz4=${lib.boolToString withCompression}"
     "-Dhomed=${lib.boolToString withHomed}"
@@ -435,7 +459,11 @@ stdenv.mkDerivation {
     "-Dsmack=true"
     "-Db_pie=true"
     "-Dinstall-sysconfdir=false"
-    "-Defi-ld=${stdenv.cc.bintools.targetPrefix}ld"
+    "-Dsbat-distro=nixos"
+    "-Dsbat-distro-summary=NixOS"
+    "-Dsbat-distro-url=https://nixos.org/"
+    "-Dsbat-distro-pkgname=${pname}"
+    "-Dsbat-distro-version=${version}"
     /*
       As of now, systemd doesn't allow runtime configuration of these values. So
       the settings in /etc/login.defs have no effect on it. Many people think this
@@ -448,7 +476,6 @@ stdenv.mkDerivation {
     */
     "-Dsystem-uid-max=999"
     "-Dsystem-gid-max=999"
-    # "-Dtime-epoch=1"
 
     "-Dsysvinit-path="
     "-Dsysvrcnd-path="
@@ -487,57 +514,96 @@ stdenv.mkDerivation {
     "-Dutmp=false"
     "-Didn=false"
   ];
+  preConfigure =
+    let
+      # A list of all the runtime binaries that the systemd exectuables, tests and libraries are referencing in their source code, scripts and unit files.
+      # As soon as a dependency isn't required anymore we should remove it from the list. The `where` attribute for each of the replacement patterns must be exhaustive. If another (unhandled) case is found in the source code the build fails with an error message.
+      binaryReplacements = [
+        { search = "/usr/bin/getent"; replacement = "${getent}/bin/getent"; where = [ "src/nspawn/nspawn-setuid.c" ]; }
+
+        {
+          search = "/sbin/mkswap";
+          replacement = "${lib.getBin util-linux}/sbin/mkswap";
+          where = [
+            "man/systemd-makefs@.service.xml"
+          ];
+        }
+        { search = "/sbin/swapon"; replacement = "${lib.getBin util-linux}/sbin/swapon"; where = [ "src/core/swap.c" "src/basic/unit-def.h" ]; }
+        { search = "/sbin/swapoff"; replacement = "${lib.getBin util-linux}/sbin/swapoff"; where = [ "src/core/swap.c" ]; }
+        {
+          search = "/bin/echo";
+          replacement = "${coreutils}/bin/echo";
+          where = [
+            "man/systemd-analyze.xml"
+            "man/systemd.service.xml"
+            "src/analyze/test-verify.c"
+            "src/test/test-env-file.c"
+            "src/test/test-fileio.c"
+          ];
+        }
+        {
+          search = "/bin/cat";
+          replacement = "${coreutils}/bin/cat";
+          where = [ "test/create-busybox-container" "test/test-execute/exec-noexecpaths-simple.service" "src/journal/cat.c" ];
+        }
+        { search = "/sbin/modprobe"; replacement = "${lib.getBin kmod}/sbin/modprobe"; where = [ "units/modprobe@.service" ]; }
+        {
+          search = "/usr/lib/systemd/systemd-fsck";
+          replacement = "$out/lib/systemd/systemd-fsck";
+          where = [
+            "man/systemd-fsck@.service.xml"
+          ];
+        }
+      ] ++ lib.optionals withImportd [
+        {
+          search = "\"gpg\"";
+          replacement = "\\\"${gnupg}/bin/gpg\\\"";
+          where = [ "src/import/pull-common.c" ];
+        }
+        {
+          search = "\"tar\"";
+          replacement = "\\\"${gnutar}/bin/tar\\\"";
+          where = [
+            "src/import/export-tar.c"
+            "src/import/export.c"
+            "src/import/import-common.c"
+            "src/import/import-tar.c"
+            "src/import/import.c"
+            "src/import/importd.c"
+            "src/import/pull-tar.c"
+            "src/import/pull.c"
+          ];
+        }
+      ];
+
+      # { replacement, search, where } -> List[str]
+      mkSubstitute = { replacement, search, where }:
+        map (path: "substituteInPlace ${path} --replace '${search}' \"${replacement}\"") where;
+      mkEnsureSubstituted = { replacement, search, where }:
+        ''
+          if [[ $(grep -r '${search}' | grep -v "${replacement}" | grep -Ev 'NEWS|^test/' | wc -l) -gt 0 ]]; then
+            echo "Not all references to '${search}' have been replaced. Found the following matches:"
+            grep '${search}' -r | grep -v "${replacement}" | grep -Ev 'NEWS|^test/'
+            exit 1
+          fi
+        '';
 
-  preConfigure = ''
-    mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
-    export LC_ALL="en_US.UTF-8";
-    # FIXME: patch this in systemd properly (and send upstream).
-    # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount
-    for i in \
-      src/core/mount.c \
-      src/core/swap.c \
-      src/cryptsetup/cryptsetup-generator.c \
-      src/journal/cat.c \
-      src/nspawn/nspawn.c \
-      src/remount-fs/remount-fs.c \
-      src/shared/generator.c \
-      src/shutdown/shutdown.c \
-      units/emergency.service.in \
-      units/modprobe@.service \
-      units/rescue.service.in \
-      units/systemd-logind.service.in \
-      units/systemd-nspawn@.service.in; \
-    do
-      test -e $i
-      substituteInPlace $i \
-        --replace /usr/bin/getent ${getent}/bin/getent \
-        --replace /sbin/mkswap ${lib.getBin util-linux}/sbin/mkswap \
-        --replace /sbin/swapon ${lib.getBin util-linux}/sbin/swapon \
-        --replace /sbin/swapoff ${lib.getBin util-linux}/sbin/swapoff \
-        --replace /bin/echo ${coreutils}/bin/echo \
-        --replace /bin/cat ${coreutils}/bin/cat \
-        --replace /sbin/sulogin ${lib.getBin util-linux}/sbin/sulogin \
-        --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \
-        --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \
-        --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
-    done
+    in
+    ''
+      mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
+      export LC_ALL="en_US.UTF-8";
 
-    for dir in tools src/resolve test src/test src/shared; do
-      patchShebangs $dir
-    done
+      ${lib.concatStringsSep "\n" (lib.flatten (map mkSubstitute binaryReplacements))}
+      ${lib.concatMapStringsSep "\n" mkEnsureSubstituted binaryReplacements}
 
-    # absolute paths to gpg & tar
-    substituteInPlace src/import/pull-common.c \
-      --replace '"gpg"' '"${gnupg}/bin/gpg"'
-    for file in src/import/{{export,import,pull}-tar,import-common}.c; do
-      substituteInPlace $file \
-        --replace '"tar"' '"${gnutar}/bin/tar"'
-    done
 
+      for dir in tools src/resolve test src/test src/shared; do
+        patchShebangs $dir
+      done
 
-    substituteInPlace src/libsystemd/sd-journal/catalog.c \
-      --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
-  '';
+      substituteInPlace src/libsystemd/sd-journal/catalog.c \
+        --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
+    '';
 
   # These defines are overridden by CFLAGS and would trigger annoying
   # warning messages
@@ -545,7 +611,7 @@ stdenv.mkDerivation {
     substituteInPlace config.h \
       --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \
       --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \
-      --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
+      --replace "SYSTEMD_CGROUP_AGENTS_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
   '';
 
   NIX_CFLAGS_COMPILE = toString ([
@@ -557,8 +623,8 @@ stdenv.mkDerivation {
     # Set the release_agent on /sys/fs/cgroup/systemd to the
     # currently running systemd (/run/current-system/systemd) so
     # that we don't use an obsolete/garbage-collected release agent.
-    "-USYSTEMD_CGROUP_AGENT_PATH"
-    "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""
+    "-USYSTEMD_CGROUP_AGENTS_PATH"
+    "-DSYSTEMD_CGROUP_AGENTS_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""
 
     "-USYSTEMD_BINARY_PATH"
     "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
@@ -575,6 +641,12 @@ stdenv.mkDerivation {
   '';
 
   postInstall = ''
+    # sysinit.target: Don't depend on
+    # systemd-tmpfiles-setup.service. This interferes with NixOps's
+    # send-keys feature (since sshd.service depends indirectly on
+    # sysinit.target).
+    mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/
+
     mkdir -p $out/example/systemd
     mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
     mv $out/lib/systemd/{system,user} $out/example/systemd
diff --git a/pkgs/os-specific/linux/systemd/musl.diff b/pkgs/os-specific/linux/systemd/musl.diff
deleted file mode 100644
index cab135dd8fc53..0000000000000
--- a/pkgs/os-specific/linux/systemd/musl.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
-index ef3527e..cc1ba23 100644
---- a/src/shared/mount-setup.c
-+++ b/src/shared/mount-setup.c
-@@ -32,6 +32,7 @@
- #include "strv.h"
- #include "user-util.h"
- #include "virt.h"
-+#include "missing_type.h"
- 
- typedef enum MountMode {
-         MNT_NONE           = 0,
diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix
index 38bc7c3eaff31..1182aead36bed 100644
--- a/pkgs/os-specific/linux/tiscamera/default.nix
+++ b/pkgs/os-specific/linux/tiscamera/default.nix
@@ -17,6 +17,7 @@
 , python3Packages
 , libuuid
 , wrapGAppsHook
+, catch2
 }:
 
 stdenv.mkDerivation rec {
@@ -30,6 +31,10 @@ stdenv.mkDerivation rec {
     sha256 = "0hpy9yhc4mn6w8gvzwif703smmcys0j2jqbz2xfghqxcyb0ykplj";
   };
 
+  postPatch = ''
+    cp ${catch2}/include/catch2/catch.hpp external/catch/catch.hpp
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index bedd2417e7ead..d54f577def3e0 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "util-linux";
+  pname = "util-linux" + lib.optionalString ( !nlsSupport && ncurses == null && systemd == null ) "-minimal";
   version = "2.37.4";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz";
     sha256 = "sha256-Y05pFq2RM2bDU2tkaOeER2lUm5mnsr+AMU3nirVlW4M=";
   };
 
diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/os-specific/linux/vdo/default.nix
new file mode 100644
index 0000000000000..1904445d4c2c5
--- /dev/null
+++ b/pkgs/os-specific/linux/vdo/default.nix
@@ -0,0 +1,64 @@
+{ lib, stdenv
+, fetchFromGitHub
+, installShellFiles
+, libuuid
+, lvm2_dmeventd  # <libdevmapper-event.h>
+, zlib
+, python3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "vdo";
+  version = "8.1.1.360";  # kvdo uses this!
+
+  src = fetchFromGitHub {
+    owner = "dm-vdo";
+    repo = pname;
+    rev = version;
+    sha256 = "1zp8aaw0diramnlx5z96jcpbm6x0r204xf1vwq6k21rzcazczkwv";
+  };
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  buildInputs = [
+    libuuid
+    lvm2_dmeventd
+    zlib
+    python3.pkgs.wrapPython
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    pyyaml
+  ];
+
+  pythonPath = propagatedBuildInputs;
+
+  makeFlags = [
+    "DESTDIR=${placeholder "out"}"
+    "INSTALLOWNER="
+    # all of these paths are relative to DESTDIR and have defaults that don't work for us
+    "bindir=/bin"
+    "defaultdocdir=/share/doc"
+    "mandir=/share/man"
+    "python3_sitelib=${python3.sitePackages}"
+  ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    installShellCompletion --bash $out/bash_completion.d/*
+    rm -r $out/bash_completion.d
+
+    wrapPythonPrograms
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/dm-vdo/vdo";
+    description = "A set of userspace tools for managing pools of deduplicated and/or compressed block storage";
+    platforms = platforms.linux;
+    license = with licenses; [ gpl2Plus ];
+    maintainers = with maintainers; [ ajs124 ];
+  };
+}
diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix
index 745cf96df46ad..840d7a2d4e6af 100644
--- a/pkgs/servers/echoip/default.nix
+++ b/pkgs/servers/echoip/default.nix
@@ -13,8 +13,6 @@ buildGoModule {
 
   vendorSha256 = "0vvs717pl5gzggxpbn2vkyxmpiw5zjdfnpbh8i81xidbqvlnm22h";
 
-  doCheck = false;
-
   outputs = [ "out" "index" ];
 
   postInstall = ''
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index ce72bb0f8ed9d..32273d35e7a76 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -59,6 +59,18 @@ let
     })
 
     (self: super: {
+      hatasmota = super.hatasmota.overridePythonAttrs (oldAttrs: {
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "emontnemery";
+          repo = "hatasmota";
+          rev = "0.3.1";
+          sha256 = "sha256-/am6cRhAdiqMq0u7Ed4qhIA+Em2O0gIt7HfP19+2XHw=";
+        };
+      });
+    })
+
+    (self: super: {
       huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec {
         version = "1.4.18";
         src = fetchFromGitHub {
diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix
index 9058a4cbda75d..06d640a5bc00f 100644
--- a/pkgs/servers/http/trafficserver/default.nix
+++ b/pkgs/servers/http/trafficserver/default.nix
@@ -13,6 +13,7 @@
 , python3
 , xz
 , zlib
+, catch2
 # recommended dependencies
 , withHwloc ? true
 , hwloc
@@ -113,6 +114,8 @@ stdenv.mkDerivation rec {
       tools/check-unused-dependencies
 
     substituteInPlace configure --replace '/usr/bin/file' '${file}/bin/file'
+
+    cp ${catch2}/include/catch2/catch.hpp tests/include/catch.hpp
   '' + lib.optionalString stdenv.isLinux ''
     substituteInPlace configure \
       --replace '/usr/include/linux' '${linuxHeaders}/include/linux'
diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix
index d35c53de9afe2..a46efc07fa831 100644
--- a/pkgs/servers/imgproxy/default.nix
+++ b/pkgs/servers/imgproxy/default.nix
@@ -14,8 +14,6 @@ buildGoModule rec {
 
   vendorSha256 = "sha256-Rp0vTtpdKpYg/7UjX73Qwxu6dOqDr24nqp41fKN1IYw=";
 
-  doCheck = false;
-
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ gobject-introspection vips ]
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 08c55f771724d..942023b4eaf43 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl
 , coreutils, findutils, gnugrep, gawk, icu, pcre, m4
+, fetchpatch
 , buildPackages, nixosTests
 , withLDAP ? true, openldap
 , withPgSQL ? false, postgresql
@@ -46,6 +47,12 @@ in stdenv.mkDerivation rec {
     ./postfix-3.0-no-warnings.patch
     ./post-install-script.patch
     ./relative-symlinks.patch
+
+    # glibc 2.34 compat
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/postfix/raw/2f9d42453e67ebc43f786d98262a249037f80a77/f/postfix-3.6.2-glibc-234-build-fix.patch";
+      sha256 = "sha256-xRUL5gaoIt6HagGlhsGwvwrAfYvzMgydsltYMWvl9BI=";
+    })
   ];
 
   postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 77ae99a9297e6..99a949116ce05 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -10,7 +10,7 @@
 , storePathAsBuildHash ? false }:
 
 let
-  version = "6.3.3";
+  version = "6.3.6";
 
   goPackagePath = "github.com/mattermost/mattermost-server";
 
@@ -22,7 +22,7 @@ let
       owner = "mattermost";
       repo = "mattermost-server";
       rev = "v${version}";
-      sha256 = "OSN8Bscgv7rPfKIfZ3ZnegdgsygFpSM7/vGWojj0P3k=";
+      sha256 = "905zxMucDTxxrLoh5ZoAExW4eFmi+xa98aI3EpJZ2Og=";
     };
 
     ldflags = [
@@ -65,7 +65,7 @@ let
 
     src = fetchurl {
       url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-      sha256 = "Og9DUGyE4cWYF7EQP/8szIrWM1Ldqnpqc+HW+L7XApo=";
+      sha256 = "JDsCDZEtbeBTYuzOSwrxFNRKXy+9KXirjaCz6ODP5uw=";
     };
 
     installPhase = ''
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 4461930b13cc9..eedb420f2eb44 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,12 +1,12 @@
 {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.14";
+  version = "1.6.15";
   pname = "memcached";
 
   src = fetchurl {
     url = "https://memcached.org/files/${pname}-${version}.tar.gz";
-    sha256 = "sha256-VNY3QsaIbc3E4Mh/RDmikwqHbNnyv6AdaZsMa60XB7M=";
+    sha256 = "sha256-jXq+PWSTeO27oW9C7x1myj8qwHXy65cUXOFkOI5u1RU=";
   };
 
   configureFlags = [
diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix
index 7cd209f95e3f7..4760b2b7ccb59 100644
--- a/pkgs/servers/misc/oven-media-engine/default.nix
+++ b/pkgs/servers/misc/oven-media-engine/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Open-source streaming video service with sub-second latency";
     homepage    = "https://ovenmediaengine.com";
-    license     = licenses.gpl2Only;
+    license     = licenses.agpl3Only;
     maintainers = with maintainers; [ lukegb ];
     platforms   = [ "x86_64-linux" ];
   };
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index e3877265ca35f..c541c74d5be5f 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -4,7 +4,7 @@ buildGoModule rec {
   pname = "grafana";
   version = "8.4.5";
 
-  excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";
+  excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" ];
 
   src = fetchFromGitHub {
     rev = "v${version}";
diff --git a/pkgs/servers/monitoring/heapster/default.nix b/pkgs/servers/monitoring/heapster/default.nix
deleted file mode 100644
index d1205ae353b23..0000000000000
--- a/pkgs/servers/monitoring/heapster/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub, docker }:
-
-buildGoPackage rec {
-  rev = "3057a2c07061c8d9ffaf77e5442ffd7512ac0133";
-  pname = "heapster";
-  version = lib.strings.substring 0 7 rev;
-  goPackagePath = "k8s.io/heapster";
-  subPackages = [ "./" ];
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "kubernetes";
-    repo = "heapster";
-    sha256 = "1vg83207y7yigydnnhlvzs3s94vx02i56lqgs6a96c6i3mr3ydpb";
-  };
-
-  preBuild = ''
-    export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
-  '';
-
-  meta = with lib; {
-    description = "Compute Resource Usage Analysis and Monitoring of Container Clusters";
-    license = licenses.asl20;
-    homepage = "https://github.com/kubernetes/heapster";
-    maintainers = with maintainers; [ offline ];
-    platforms = docker.meta.platforms;
-  };
-}
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 258247c34f47e..e8fa4feb6af47 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -13,8 +13,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-p273O5JLFX1dA2caV3lVVL9YNTcGMSrC7DWieUfUmqI=";
   };
 
-  buildInputs = [
+  nativeBuildInputs = [
     makeWrapper
+  ];
+
+  buildInputs = [
     which
     coreutils
     rrdtool
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 2349bac177c9f..430da1ea4d08e 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -3,9 +3,10 @@
 buildGoModule rec {
   pname = "blackbox_exporter";
   version = "0.20.0";
+  rev = "v${version}";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    inherit rev;
     owner = "prometheus";
     repo = "blackbox_exporter";
     sha256 = "sha256-Y3HdFIChkQVooxy2I2Gbqw3WLHsI4Zm+osHTzFluRZA=";
@@ -18,11 +19,21 @@ buildGoModule rec {
 
   passthru.tests = { inherit (nixosTests.prometheus-exporters) blackbox; };
 
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/prometheus/common/version.Version=${version}"
+    "-X github.com/prometheus/common/version.Revision=${rev}"
+    "-X github.com/prometheus/common/version.Branch=unknown"
+    "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
+    "-X github.com/prometheus/common/version.BuildDate=unknown"
+  ];
+
   meta = with lib; {
     description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP";
     homepage = "https://github.com/prometheus/blackbox_exporter";
     license = licenses.asl20;
-    maintainers = with maintainers; [ globin fpletz willibutz Frostman ];
+    maintainers = with maintainers; [ globin fpletz willibutz Frostman ma27 ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
deleted file mode 100644
index 289b8f2403d8f..0000000000000
--- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "mesos_exporter";
-  version = "1.1.2";
-
-  goPackagePath = "github.com/prometheus/mesos_exporter";
-
-  src = fetchFromGitHub {
-    rev = "v${version}";
-    owner = "mesos";
-    repo = "mesos_exporter";
-    sha256 = "0nvjlpxdhh60wcdw2fdc8h0vn6fxkz0nh7zrx43hjxymvc15ixza";
-  };
-
-  meta = with lib; {
-    description = "Export Mesos metrics to Prometheus";
-    homepage = "https://github.com/prometheus/mesos_exporter";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index 932e03b99f837..8692b5b558ab9 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "thanos";
-  version = "0.24.0";
+  version = "0.25.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "thanos-io";
     repo = "thanos";
-    sha256 = "sha256-HdfOxi9l2xPs4JOY15Yt+KlCm7SQ0Ap1qa5F7abr2g8=";
+    sha256 = "sha256-yisJqr2JMpXSo9O3q7WpNe1r6w7E3XyeLpVlbdest3s=";
   };
 
-  vendorSha256 = "sha256-+0XW7xGocM00kxmOMj0xHYPIpxc0rTQnyr9JQ/cPl3I=";
+  vendorSha256 = "sha256-tHtfS4PnO9n3ckUdaG6dQAIE2D2PG6km4Tqofaab/eg=";
 
   doCheck = false;
 
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index bf7f7b4396096..d9f1892beca94 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which }:
+{ stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which, catch2, catch }:
 
 let
   common = { version, sha256 }: stdenv.mkDerivation {
@@ -26,6 +26,14 @@ let
       # with nixpkgs, it has no sense to check for a version update
       substituteInPlace js/client/client.js --replace "require('@arangodb').checkAvailableVersions();" ""
       substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" ""
+
+      ${if (lib.versionOlder version "3.4") then ''
+        cp ${catch}/include/catch/catch.hpp 3rdParty/catch/catch.hpp
+      '' else if (lib.versionOlder version "3.5") then ''
+        cp ${catch2}/include/catch2/catch.hpp 3rdParty/catch/catch.hpp
+      '' else ''
+        (cd 3rdParty/boost/1.69.0 && patch -p1 < ${../../../development/libraries/boost/pthread-stack-min-fix.patch})
+      ''}
     '';
 
     cmakeFlags = [
diff --git a/pkgs/servers/owncast/default.nix b/pkgs/servers/owncast/default.nix
index 774f51bc0f630..313d17e8e8d42 100644
--- a/pkgs/servers/owncast/default.nix
+++ b/pkgs/servers/owncast/default.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   propagatedBuildInputs = [ ffmpeg ];
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   preInstall = ''
     mkdir -p $out
diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix
index ff0bbd6b97dc0..2b5188f743ad5 100644
--- a/pkgs/servers/rt/default.nix
+++ b/pkgs/servers/rt/default.nix
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
+    makeWrapper
   ];
 
   buildInputs = [
-    makeWrapper
     perl
     (buildEnv {
       name = "rt-perl-deps";
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index 2dbed400650a1..622662645c7ef 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,18 +2,16 @@
 
 buildGoModule rec {
   pname = "traefik";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchzip {
     url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
-    sha256 = "sha256-DVmszzDre0pWXARUqXuqGfY3pX1Ijh33G0Gsdmp8f98=";
+    sha256 = "sha256-OaKgX3qwiJM/EPprV1r3CbUnxOaWl7BTMcS5v+tmHoo=";
     stripRoot = false;
   };
 
   vendorSha256 = "sha256-tqrfCpZ/fRYZBZ/SBAvvJebLBeD2M/AVJEPiseehJHY=";
 
-  doCheck = false;
-
   subPackages = [ "cmd/traefik" ];
 
   nativeBuildInputs = [ go-bindata ];
diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix
index 836a5934d96b6..c9b39eccd8a81 100644
--- a/pkgs/servers/ursadb/default.nix
+++ b/pkgs/servers/ursadb/default.nix
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-/EK1CKJ0IR7fkKSpQkONbWcz6uhUoAwK430ljNYsV5U=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace \
+        "add_executable(ursadb_test Tests.cpp)" "" \
+      --replace \
+        "target_link_libraries(ursadb_test ursa)" ""
+  '';
+
   installPhase = ''
     mkdir -p $out/bin
     cp ursadb $out/bin/
diff --git a/pkgs/servers/web-apps/ethercalc/generate.sh b/pkgs/servers/web-apps/ethercalc/generate.sh
index 814a83a033d0f..d87c9b93966b1 100755
--- a/pkgs/servers/web-apps/ethercalc/generate.sh
+++ b/pkgs/servers/web-apps/ethercalc/generate.sh
@@ -9,6 +9,7 @@ set -euo pipefail
 cd -- "$(dirname -- "$BASH_SOURCE[0]")"
 
 node2nix \
+     --nodejs-14 \
      --input node-packages.json \
      --output node-packages-generated.nix \
      --composition node-packages.nix \
diff --git a/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix b/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix
index 97435a5225f81..21cd090df86c7 100644
--- a/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix
@@ -31,13 +31,13 @@ let
         sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25";
       };
     };
-    "adler-32-1.3.0" = {
+    "adler-32-1.3.1" = {
       name = "adler-32";
       packageName = "adler-32";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.0.tgz";
-        sha512 = "f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g==";
+        url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz";
+        sha512 = "ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==";
       };
     };
     "after-0.8.1" = {
@@ -184,13 +184,13 @@ let
         sha1 = "82306becadf44543e826b3907eae93f0237c4e5c";
       };
     };
-    "brace-expansion-1.1.11" = {
+    "brace-expansion-2.0.1" = {
       name = "brace-expansion";
       packageName = "brace-expansion";
-      version = "1.1.11";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz";
+        sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==";
       };
     };
     "buffer-crc32-0.2.3" = {
@@ -391,15 +391,6 @@ let
         sha1 = "69700cf1ee8963454356ac192a6e5e91e232bffb";
       };
     };
-    "concat-map-0.0.1" = {
-      name = "concat-map";
-      packageName = "concat-map";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
-        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
-      };
-    };
     "concat-stream-2.0.0" = {
       name = "concat-stream";
       packageName = "concat-stream";
@@ -481,13 +472,13 @@ let
         sha1 = "09507984ee9bcce3bd1b8861f0de8ab10ae8187d";
       };
     };
-    "crc-32-1.2.0" = {
+    "crc-32-1.2.1" = {
       name = "crc-32";
       packageName = "crc-32";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz";
-        sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==";
+        url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz";
+        sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==";
       };
     };
     "csrf-2.0.7" = {
@@ -595,7 +586,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         name = "emitter-1.0.1.tar.gz";
-        url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1";
+        url = "https://codeload.github.com/component/emitter/tar.gz/refs/tags/1.0.1";
         sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d";
       };
     };
@@ -731,7 +722,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         name = "global-2.0.1.tar.gz";
-        url = "https://codeload.github.com/component/global/tar.gz/v2.0.1";
+        url = "https://codeload.github.com/component/global/tar.gz/refs/tags/v2.0.1";
         sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785";
       };
     };
@@ -924,13 +915,13 @@ let
         sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
       };
     };
-    "minimatch-3.0.4" = {
+    "minimatch-5.0.1" = {
       name = "minimatch";
       packageName = "minimatch";
-      version = "3.0.4";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz";
+        sha512 = "nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==";
       };
     };
     "minimist-0.0.10" = {
@@ -1185,22 +1176,13 @@ let
         sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==";
       };
     };
-    "printj-1.2.3" = {
+    "printj-1.3.1" = {
       name = "printj";
       packageName = "printj";
-      version = "1.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/printj/-/printj-1.2.3.tgz";
-        sha512 = "sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA==";
-      };
-    };
-    "printj-1.3.0" = {
-      name = "printj";
-      packageName = "printj";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/printj/-/printj-1.3.0.tgz";
-        sha512 = "017o8YIaz8gLhaNxRB9eBv2mWXI2CtzhPJALnQTP+OPpuUfP0RMWqr/mHCzqVeu1AQxfzSfAtAq66vKB8y7Lzg==";
+        url = "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz";
+        sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==";
       };
     };
     "proxy-addr-1.0.1" = {
@@ -1806,19 +1788,15 @@ in
           sources."iconv-lite-0.4.4"
         ];
       })
-      sources."brace-expansion-1.1.11"
+      sources."brace-expansion-2.0.1"
       sources."buffer-crc32-0.2.3"
       sources."buffer-from-1.1.2"
       sources."bytes-1.0.0"
       sources."callsite-1.0.0"
       (sources."cfb-1.2.1" // {
         dependencies = [
-          (sources."adler-32-1.3.0" // {
-            dependencies = [
-              sources."printj-1.2.3"
-            ];
-          })
-          sources."printj-1.3.0"
+          sources."adler-32-1.3.1"
+          sources."printj-1.3.1"
         ];
       })
       (sources."codepage-1.14.0" // {
@@ -1844,7 +1822,6 @@ in
           sources."vary-1.0.1"
         ];
       })
-      sources."concat-map-0.0.1"
       sources."concat-stream-2.0.0"
       sources."connect-2.25.9"
       sources."connect-timeout-1.2.2"
@@ -1853,7 +1830,11 @@ in
       sources."cookie-signature-1.0.4"
       sources."core-util-is-1.0.3"
       sources."cors-2.8.5"
-      sources."crc-32-1.2.0"
+      (sources."crc-32-1.2.1" // {
+        dependencies = [
+          sources."printj-1.3.1"
+        ];
+      })
       sources."csrf-2.0.7"
       sources."cssom-0.2.5"
       sources."csurf-1.4.1"
@@ -1937,7 +1918,7 @@ in
       sources."methods-1.1.0"
       sources."mime-1.2.11"
       sources."mime-types-1.0.2"
-      sources."minimatch-3.0.4"
+      sources."minimatch-5.0.1"
       sources."minimist-0.0.10"
       (sources."mkdirp-0.5.0" // {
         dependencies = [
diff --git a/pkgs/servers/web-apps/ethercalc/node-packages.nix b/pkgs/servers/web-apps/ethercalc/node-packages.nix
index 0961603968eac..862d223400999 100644
--- a/pkgs/servers/web-apps/ethercalc/node-packages.nix
+++ b/pkgs/servers/web-apps/ethercalc/node-packages.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/servers/web-apps/whitebophir/default.nix b/pkgs/servers/web-apps/whitebophir/default.nix
index 7373724a01801..630410de11335 100644
--- a/pkgs/servers/web-apps/whitebophir/default.nix
+++ b/pkgs/servers/web-apps/whitebophir/default.nix
@@ -1,11 +1,14 @@
 { stdenv
 , pkgs
 , lib
-, nodejs
+, nodejs-14_x
 , runtimeShell
 }:
 
 let
+  # nodejs-16_x fails with ENOTCACHED
+  nodejs = nodejs-14_x;
+
   nodePackages = import ./node-packages.nix {
     inherit pkgs nodejs;
     inherit (stdenv.hostPlatform) system;
diff --git a/pkgs/servers/web-apps/whitebophir/generate.sh b/pkgs/servers/web-apps/whitebophir/generate.sh
index 825def892fc54..814a83a033d0f 100755
--- a/pkgs/servers/web-apps/whitebophir/generate.sh
+++ b/pkgs/servers/web-apps/whitebophir/generate.sh
@@ -1,7 +1,13 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p nodePackages.node2nix
+
+# Run this script not via `./generate.sh`, but via `$PWD/generate.sh`.
+# Else `nix-shell` will not find this script.
+
 set -euo pipefail
 
+cd -- "$(dirname -- "$BASH_SOURCE[0]")"
+
 node2nix \
      --input node-packages.json \
      --output node-packages-generated.nix \
diff --git a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
index 5a511da72a480..a3feac5bffa7b 100644
--- a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
@@ -22,6 +22,15 @@ let
         sha512 = "v6Ucl//xSVhpyTtHMVCA9uv9W7CVwj8vBAQFKFDkfGC1DquBobOMhnzH9Odc+Tunf+i4WRnNgt90fQ7CSAbU3g==";
       };
     };
+    "@socket.io/base64-arraybuffer-1.0.2" = {
+      name = "_at_socket.io_slash_base64-arraybuffer";
+      packageName = "@socket.io/base64-arraybuffer";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz";
+        sha512 = "dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==";
+      };
+    };
     "@types/component-emitter-1.2.11" = {
       name = "_at_types_slash_component-emitter";
       packageName = "@types/component-emitter";
@@ -49,13 +58,13 @@ let
         sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==";
       };
     };
-    "@types/node-17.0.0" = {
+    "@types/node-17.0.14" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "17.0.0";
+      version = "17.0.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-17.0.0.tgz";
-        sha512 = "eMhwJXc931Ihh4tkU+Y7GiLzT/y/DBNpNtr4yU9O2w3SYBsr9NaOPhQlLKRmoWtI54uNwuo0IOUFQjVOTZYRvw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-17.0.14.tgz";
+        sha512 = "SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng==";
       };
     };
     "accept-language-parser-1.5.0" = {
@@ -67,13 +76,13 @@ let
         sha1 = "8877c54040a8dcb59e0a07d9c1fde42298334791";
       };
     };
-    "accepts-1.3.7" = {
+    "accepts-1.3.8" = {
       name = "accepts";
       packageName = "accepts";
-      version = "1.3.7";
+      version = "1.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz";
-        sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
+        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz";
+        sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==";
       };
     };
     "async-mutex-0.3.2" = {
@@ -85,15 +94,6 @@ let
         sha512 = "HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA==";
       };
     };
-    "base64-arraybuffer-1.0.1" = {
-      name = "base64-arraybuffer";
-      packageName = "base64-arraybuffer";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz";
-        sha512 = "vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA==";
-      };
-    };
     "base64id-2.0.0" = {
       name = "base64id";
       packageName = "base64id";
@@ -103,6 +103,15 @@ let
         sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==";
       };
     };
+    "buffer-equal-constant-time-1.0.1" = {
+      name = "buffer-equal-constant-time";
+      packageName = "buffer-equal-constant-time";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
+        sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
+      };
+    };
     "component-emitter-1.3.0" = {
       name = "component-emitter";
       packageName = "component-emitter";
@@ -112,13 +121,13 @@ let
         sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
       };
     };
-    "cookie-0.4.1" = {
+    "cookie-0.4.2" = {
       name = "cookie";
       packageName = "cookie";
-      version = "0.4.1";
+      version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz";
-        sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==";
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz";
+        sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==";
       };
     };
     "core-util-is-1.0.3" = {
@@ -175,6 +184,15 @@ let
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     };
+    "ecdsa-sig-formatter-1.0.11" = {
+      name = "ecdsa-sig-formatter";
+      packageName = "ecdsa-sig-formatter";
+      version = "1.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz";
+        sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==";
+      };
+    };
     "ee-first-1.1.1" = {
       name = "ee-first";
       packageName = "ee-first";
@@ -193,22 +211,22 @@ let
         sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
       };
     };
-    "engine.io-6.1.0" = {
+    "engine.io-6.1.2" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "6.1.0";
+      version = "6.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.0.tgz";
-        sha512 = "ErhZOVu2xweCjEfYcTdkCnEYUiZgkAcBBAhW4jbIvNG8SLU3orAqoJCiytZjYF7eTpVmmCrLDjLIEaPlUAs1uw==";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz";
+        sha512 = "v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==";
       };
     };
-    "engine.io-parser-5.0.2" = {
+    "engine.io-parser-5.0.3" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
-      version = "5.0.2";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.2.tgz";
-        sha512 = "wuiO7qO/OEkPJSFueuATIXtrxF7/6GTbAO9QLv7nnbjwZ5tYhLm9zxvLwxstRs0dcT0KUlWTjtIOs1T86jt12g==";
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz";
+        sha512 = "BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==";
       };
     };
     "escape-html-1.0.3" = {
@@ -256,13 +274,13 @@ let
         sha1 = "18282b27d08a267cb3030cd2b8b4b0f212af752a";
       };
     };
-    "graceful-fs-4.2.8" = {
+    "graceful-fs-4.2.9" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.8";
+      version = "4.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz";
-        sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz";
+        sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==";
       };
     };
     "handlebars-4.7.7" = {
@@ -301,6 +319,96 @@ let
         sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
       };
     };
+    "jsonwebtoken-8.5.1" = {
+      name = "jsonwebtoken";
+      packageName = "jsonwebtoken";
+      version = "8.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz";
+        sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==";
+      };
+    };
+    "jwa-1.4.1" = {
+      name = "jwa";
+      packageName = "jwa";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz";
+        sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==";
+      };
+    };
+    "jws-3.2.2" = {
+      name = "jws";
+      packageName = "jws";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz";
+        sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==";
+      };
+    };
+    "lodash.includes-4.3.0" = {
+      name = "lodash.includes";
+      packageName = "lodash.includes";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz";
+        sha1 = "60bb98a87cb923c68ca1e51325483314849f553f";
+      };
+    };
+    "lodash.isboolean-3.0.3" = {
+      name = "lodash.isboolean";
+      packageName = "lodash.isboolean";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz";
+        sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6";
+      };
+    };
+    "lodash.isinteger-4.0.4" = {
+      name = "lodash.isinteger";
+      packageName = "lodash.isinteger";
+      version = "4.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz";
+        sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343";
+      };
+    };
+    "lodash.isnumber-3.0.3" = {
+      name = "lodash.isnumber";
+      packageName = "lodash.isnumber";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz";
+        sha1 = "3ce76810c5928d03352301ac287317f11c0b1ffc";
+      };
+    };
+    "lodash.isplainobject-4.0.6" = {
+      name = "lodash.isplainobject";
+      packageName = "lodash.isplainobject";
+      version = "4.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz";
+        sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb";
+      };
+    };
+    "lodash.isstring-4.0.1" = {
+      name = "lodash.isstring";
+      packageName = "lodash.isstring";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz";
+        sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451";
+      };
+    };
+    "lodash.once-4.1.1" = {
+      name = "lodash.once";
+      packageName = "lodash.once";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz";
+        sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac";
+      };
+    };
     "lru-cache-6.0.0" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -391,13 +499,13 @@ let
         sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
       };
     };
-    "negotiator-0.6.2" = {
+    "negotiator-0.6.3" = {
       name = "negotiator";
       packageName = "negotiator";
-      version = "0.6.2";
+      version = "0.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz";
-        sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
+        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz";
+        sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==";
       };
     };
     "neo-async-2.6.2" = {
@@ -499,6 +607,24 @@ let
         sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     };
+    "safe-buffer-5.2.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
+        sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
+      };
+    };
+    "semver-5.7.1" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
+        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
+      };
+    };
     "semver-7.3.5" = {
       name = "semver";
       packageName = "semver";
@@ -535,13 +661,13 @@ let
         sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==";
       };
     };
-    "socket.io-4.4.0" = {
+    "socket.io-4.4.1" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "4.4.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-4.4.0.tgz";
-        sha512 = "bnpJxswR9ov0Bw6ilhCvO38/1WPtE3eA2dtxi2Iq4/sFebiDJQzgKNYA7AuVVdGW09nrESXd90NbZqtDd9dzRQ==";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz";
+        sha512 = "s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==";
       };
     };
     "socket.io-adapter-2.3.3" = {
@@ -643,13 +769,13 @@ let
         sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==";
       };
     };
-    "uglify-js-3.14.5" = {
+    "uglify-js-3.15.0" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.14.5";
+      version = "3.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz";
-        sha512 = "qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.0.tgz";
+        sha512 = "x+xdeDWq7FiORDvyIJ0q/waWd4PhjBNOm5dQUOq2AKC0IEjxOS66Ha9tctiVDGcRQuh69K7fgU5oRuTK4cysSg==";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -700,29 +826,34 @@ let
   };
 in
 {
-  "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.16.0" = nodeEnv.buildNodePackage {
+  "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.17.0" = nodeEnv.buildNodePackage {
     name = "whitebophir";
     packageName = "whitebophir";
-    version = "1.16.0";
+    version = "1.17.0";
     src = fetchgit {
       url = "https://github.com/lovasoa/whitebophir.git";
-      rev = "8a3997b26419b3d510ad92c18071c4ce007b0081";
-      sha256 = "8aab3d89c72589d60f956f83a8e33d9d52a5b4da3c13004f9ab75b6dcbdaadcc";
+      rev = "7fd1b7bbeaf9a178ba76ff60ebc4c9870bc599f3";
+      sha256 = "a343b29069e5da8ab129588a8d21ddefd03af5a69f04db6b35082ecfcef75d40";
     };
     dependencies = [
-      sources."@financial-times/polyfill-useragent-normaliser-1.10.1"
+      (sources."@financial-times/polyfill-useragent-normaliser-1.10.1" // {
+        dependencies = [
+          sources."semver-7.3.5"
+        ];
+      })
       sources."@financial-times/useragent_parser-1.6.0"
+      sources."@socket.io/base64-arraybuffer-1.0.2"
       sources."@types/component-emitter-1.2.11"
       sources."@types/cookie-0.4.1"
       sources."@types/cors-2.8.12"
-      sources."@types/node-17.0.0"
+      sources."@types/node-17.0.14"
       sources."accept-language-parser-1.5.0"
-      sources."accepts-1.3.7"
+      sources."accepts-1.3.8"
       sources."async-mutex-0.3.2"
-      sources."base64-arraybuffer-1.0.1"
       sources."base64id-2.0.0"
+      sources."buffer-equal-constant-time-1.0.1"
       sources."component-emitter-1.3.0"
-      sources."cookie-0.4.1"
+      sources."cookie-0.4.2"
       sources."core-util-is-1.0.3"
       sources."cors-2.8.5"
       (sources."debug-2.6.9" // {
@@ -732,25 +863,36 @@ in
       })
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
+      sources."ecdsa-sig-formatter-1.0.11"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-6.1.0" // {
+      (sources."engine.io-6.1.2" // {
         dependencies = [
           sources."debug-4.3.3"
           sources."ms-2.1.2"
         ];
       })
-      sources."engine.io-parser-5.0.2"
+      sources."engine.io-parser-5.0.3"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."fresh-0.5.2"
       sources."from2-2.3.0"
       sources."from2-string-1.1.0"
-      sources."graceful-fs-4.2.8"
+      sources."graceful-fs-4.2.9"
       sources."handlebars-4.7.7"
       sources."http-errors-1.8.1"
       sources."inherits-2.0.4"
       sources."isarray-1.0.0"
+      sources."jsonwebtoken-8.5.1"
+      sources."jwa-1.4.1"
+      sources."jws-3.2.2"
+      sources."lodash.includes-4.3.0"
+      sources."lodash.isboolean-3.0.3"
+      sources."lodash.isinteger-4.0.4"
+      sources."lodash.isnumber-3.0.3"
+      sources."lodash.isplainobject-4.0.6"
+      sources."lodash.isstring-4.0.1"
+      sources."lodash.once-4.1.1"
       sources."lru-cache-6.0.0"
       sources."merge2-1.4.1"
       sources."mime-1.6.0"
@@ -759,7 +901,7 @@ in
       sources."minimist-1.2.5"
       sources."mnemonist-0.38.5"
       sources."ms-2.1.3"
-      sources."negotiator-0.6.2"
+      sources."negotiator-0.6.3"
       sources."neo-async-2.6.2"
       sources."object-assign-4.1.1"
       sources."obliterator-2.0.1"
@@ -769,13 +911,17 @@ in
       sources."process-nextick-args-2.0.1"
       sources."promise-polyfill-1.1.6"
       sources."range-parser-1.2.1"
-      sources."readable-stream-2.3.7"
-      sources."safe-buffer-5.1.2"
-      sources."semver-7.3.5"
+      (sources."readable-stream-2.3.7" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."safe-buffer-5.2.1"
+      sources."semver-5.7.1"
       sources."send-0.17.2"
       sources."serve-static-1.14.2"
       sources."setprototypeof-1.2.0"
-      (sources."socket.io-4.4.0" // {
+      (sources."socket.io-4.4.1" // {
         dependencies = [
           sources."debug-4.3.3"
           sources."ms-2.1.2"
@@ -793,11 +939,15 @@ in
       sources."statuses-1.5.0"
       sources."stream-from-promise-1.0.0"
       sources."stream-to-string-1.2.0"
-      sources."string_decoder-1.1.1"
+      (sources."string_decoder-1.1.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."toidentifier-1.0.1"
       sources."toposort-2.0.2"
       sources."tslib-2.3.1"
-      sources."uglify-js-3.14.5"
+      sources."uglify-js-3.15.0"
       sources."util-deprecate-1.0.2"
       sources."vary-1.1.2"
       sources."wordwrap-1.0.0"
diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.json b/pkgs/servers/web-apps/whitebophir/node-packages.json
index 0d0615804f5a1..6b42db95e3e0e 100644
--- a/pkgs/servers/web-apps/whitebophir/node-packages.json
+++ b/pkgs/servers/web-apps/whitebophir/node-packages.json
@@ -1,3 +1,3 @@
 [
-  { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.16.0" }
+  { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.17.0" }
 ]
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 1556250447a9a..6b70c4cc9874f 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -72,17 +72,17 @@ stdenv.mkDerivation rec {
         cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
       '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))}
       wrapProgram $out/bin/prosody \
-        --set LUA_PATH "$luaEnvPath" \
-        --set LUA_CPATH "$luaEnvCPath"
+        --prefix LUA_PATH ';' "$luaEnvPath" \
+        --prefix LUA_CPATH ';' "$luaEnvCPath"
       wrapProgram $out/bin/prosodyctl \
         --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \
-        --set LUA_PATH "$luaEnvPath" \
-        --set LUA_CPATH "$luaEnvCPath"
+        --prefix LUA_PATH ';' "$luaEnvPath" \
+        --prefix LUA_CPATH ';' "$luaEnvCPath"
 
       make -C tools/migration install
       wrapProgram $out/bin/prosody-migrator \
-        --set LUA_PATH "$luaEnvPath" \
-        --set LUA_CPATH "$luaEnvCPath"
+        --prefix LUA_PATH ';' "$luaEnvPath" \
+        --prefix LUA_CPATH ';' "$luaEnvCPath"
     '';
 
   passthru = {
diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix
index 3467613085837..41ecc70340c84 100644
--- a/pkgs/shells/fish/plugins/fzf-fish.nix
+++ b/pkgs/shells/fish/plugins/fzf-fish.nix
@@ -2,13 +2,13 @@
 
 buildFishPlugin rec {
   pname = "fzf.fish";
-  version = "8.1";
+  version = "8.2";
 
   src = fetchFromGitHub {
     owner = "PatrickF1";
     repo = "fzf.fish";
     rev = "v${version}";
-    sha256 = "sha256-uqYVbRdrcO6StaIim9S8xmb9P67CmXnLEywSeILn4yQ=";
+    sha256 = "sha256-WRrPd/GuXHJ9uYvhwjwp9AEtvbfMlpV0xdgNyfx43ok=";
   };
 
   checkInputs = [ fzf fd util-linux ];
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 082472b9cd396..1b777d96696b2 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 }:
 
 stdenv.mkDerivation rec {
-  version = "2022-03-31";
+  version = "2022-04-04";
   pname = "oh-my-zsh";
-  rev = "53863e7b3ff0c2e2816e90dab3d870adebdf49c7";
+  rev = "4d9e5ce9a7d8db3c3aadcae81580a5c3ff5a0e8b";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "TQOGSAzcJfcUNTzUcCI5tTlAKD1JYtH9CiPnfHZaA9E=";
+    sha256 = "Plg7mr6ZOSzUpq5XMFkebVpCjdtwe237+4sVdtL+kLM=";
   };
 
   installPhase = ''
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 2465449867cb2..8749e8b755524 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -219,9 +219,11 @@ else let
           # it again.
           staticMarker = lib.optionalString stdenv.hostPlatform.isStatic "-static";
         in
+        lib.strings.sanitizeDerivationName (
           if attrs ? name
           then attrs.name + hostSuffix
-          else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}";
+          else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
+        );
     }) // {
       builder = attrs.realBuilder or stdenv.shell;
       args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
@@ -340,8 +342,9 @@ else let
   # passed to the builder and is not a dependency.  But since we
   # include it in the result, it *is* available to nix-env for queries.
   meta = {
-      # `name` above includes cross-compilation cruft (and is under assert),
-      # lets have a clean always accessible version here.
+      # `name` above includes cross-compilation cruft,
+      # is under assert, and is sanitized.
+      # Let's have a clean always accessible version here.
       name = attrs.name or "${attrs.pname}-${attrs.version}";
 
       # If the packager hasn't specified `outputsToInstall`, choose a default,
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 0777fa830c109..350fff482528f 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -143,14 +143,14 @@ exitHandler() {
             echo "build failed with exit code $exitCode (ignored)"
             mkdir -p "$out/nix-support"
             printf "%s" "$exitCode" > "$out/nix-support/failed"
-            exit 0
+            return 0
         fi
 
     else
         runHook exitHook
     fi
 
-    exit "$exitCode"
+    return "$exitCode"
 }
 
 trap "exitHandler" EXIT
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 84b63e7b8fd0e..1d6ebe6284f54 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -74,6 +74,9 @@ in with pkgs; rec {
         cp -d ${libc.out}/lib/libresolv*.so* $out/lib
         cp -d ${libc.out}/lib/crt?.o $out/lib
 
+        # Hacky compat with our current unpack-bootstrap-tools.sh
+        ln -s librt.so "$out"/lib/librt-dummy.so
+
         cp -rL ${libc.dev}/include $out
         chmod -R u+w "$out"
 
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 0e1b9c2ac7a0e..63aaf6bb72e71 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -59,6 +59,7 @@ with pkgs;
 
   trivial-builders = recurseIntoAttrs {
     writeStringReferencesToFile = callPackage ../build-support/trivial-builders/test/writeStringReferencesToFile.nix {};
+    writeTextFile = callPackage ../build-support/trivial-builders/test/write-text-file.nix {};
     references = callPackage ../build-support/trivial-builders/test/references.nix {};
     overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {};
     concat = callPackage ../build-support/trivial-builders/test/concat-test.nix {};
diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix
index 8074e52c7cf1a..5ffef951d51a7 100644
--- a/pkgs/tools/X11/obconf/default.nix
+++ b/pkgs/tools/X11/obconf/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
+    makeWrapper
     pkg-config
   ];
 
@@ -22,7 +23,6 @@ stdenv.mkDerivation rec {
     libSM
     libstartup_notification
     libxml2
-    makeWrapper
     openbox
   ];
 
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix
index c3355b8026338..00ebb1ecec23e 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
        do
          sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g'
        done
+
+       # Fix for glibc-2.34. For some reason, `LIBSEMA="CCC"` is added
+       # if `sem_init` is part of libc which causes errors like
+       # `gcc: error: CCC: No such file or directory` during the build.
+       substituteInPlace configure \
+        --replace 'LIBSEMA="CCC"' 'LIBSEMA=""'
     '';
 
   buildInputs =
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 11cf6c53076c4..1e82459f4c6a6 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -35,11 +35,11 @@ let
 in
 with py.pkgs; buildPythonApplication rec {
   pname = "awscli";
-  version = "1.22.35"; # N.B: if you change this, change botocore and boto3 to a matching version too
+  version = "1.22.67"; # N.B: if you change this, change botocore and boto3 to a matching version too
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-GsMclLh/VtPaNjD+XDKqTYeSX29R2aRS7If9G918OWY=";
+    hash = "sha256-ofgxL9V/jTn/itxSOLGYkAmgQXES7aVUM/vM6nWdbBc=";
   };
 
   # https://github.com/aws/aws-cli/issues/4837
diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix
index 08fb92e4ea63a..16c547dbeba62 100644
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@@ -33,13 +33,13 @@ let
 in
 with py.pkgs; buildPythonApplication rec {
   pname = "awscli2";
-  version = "2.4.19"; # N.B: if you change this, change botocore to a matching version too
+  version = "2.4.23"; # N.B: if you change this, change botocore to a matching version too
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-cli";
     rev = version;
-    sha256 = "sha256-ZOSZBZT4d5jv5lg8KkGoOJqAvStUsGZbiXp3dpsrOpo=";
+    sha256 = "sha256-zpkphlIfmexqZm0lZgDP3RoQJqTpFdT+5dGtaLiRr/U=";
   };
 
   propagatedBuildInputs = [
@@ -69,7 +69,6 @@ with py.pkgs; buildPythonApplication rec {
   postPatch = ''
     substituteInPlace setup.cfg \
       --replace "colorama>=0.2.5,<0.4.4" "colorama" \
-      --replace "cryptography>=3.3.2,<3.4.0" "cryptography" \
       --replace "docutils>=0.10,<0.16" "docutils" \
       --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \
       --replace "wcwidth<0.2.0" "wcwidth" \
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index efd1ecfee3c16..01cb5081cf4f2 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
 
 let
-  version = "2.32.0";
+  version = "2.34.1";
   srcName = "azure-cli-${version}-src";
 
   src = fetchFromGitHub {
@@ -9,7 +9,7 @@ let
     owner = "Azure";
     repo = "azure-cli";
     rev = "azure-cli-${version}";
-    sha256 = "sha256-PXY32bfuK0bQGI0N+XHs9lakF6K7+WjrHMvuNgDFSJM=";
+    sha256 = "sha256-BEEwxf3UTShKi3K/uBK1yMxyPCvybL/BbKsu8XAwu0M=";
   };
 
   # put packages that needs to be overriden in the py package scope
diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix
index d27805bb257e4..5b8732f537514 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -69,7 +69,8 @@ let
         postPatch = ''
           substituteInPlace setup.py \
             --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \
-            --replace "cryptography>=3.2,<3.4" "cryptography"
+            --replace "cryptography>=3.2,<3.4" "cryptography" \
+            --replace "msal-extensions>=0.3.1,<0.4" "msal-extensions"
         '';
 
         checkInputs = with self; [ pytest ];
@@ -117,11 +118,11 @@ let
         '';
       };
 
-      azure-batch = overrideAzureMgmtPackage super.azure-batch "11.0.0" "zip"
-        "sha256-zl/bDsli7d/oXNgiBekXfLC720RSZXRuOLO7vx8W3HM=";
+      azure-batch = overrideAzureMgmtPackage super.azure-batch "12.0.0" "zip"
+        "sha256-GpseF4mEp79JWvZ7zOUfDbHkqKlXr7KeM1VKFKlnTes=";
 
-      azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip"
-        "0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr";
+      azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "3.0.0" "zip"
+        "9262f54ed387eb083d8dae66d32a8df35647319b902bd498cdc376f50a12d154";
 
       azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "16.0.0" "zip"
         "1b3cecd6f16813879c6ac1a1bb01f9a6f2752cd1f9157eb04d5e41e4a89f3c34";
@@ -156,8 +157,8 @@ let
       azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.0.0" "zip"
         "dc6116e8394d45312c7ad5a9098ce0dd2370bd92d43afd33d8b3bfab724fa498";
 
-      azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "23.1.0" "zip"
-        "sha256-Sduw9RAG1VfL0LIpmcuezz6rwr5G2W78xtZRxrM3VLM=";
+      azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "25.0.0" "zip"
+        "sha256-Y0WNBtQ9v0yhTVFfTvfcudWHOjzGagGB+/b++3Ie5Kk=";
 
       azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
         "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
@@ -165,8 +166,8 @@ let
       azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "9.1.0" "zip"
         "sha256-N+zUTEnOyn18lDHlkUj+vRXX/sJhZR7XLd1YdV50ULA=";
 
-      azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "16.1.0" "zip"
-        "sha256-NlTIrOK4ho0OqcTHjHT1HobiMzDH2KY20TIlN0fm8/Q=";
+      azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "17.0.0" "zip"
+        "sha256-oUbWdZryabCCg/gTujchT7p1nS7IDoU5W9MQ4ekJYH8=";
 
       azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "7.0.0b2" "zip"
         "sha256-hVvYW9gkfTVMwis3IdD0JXYDxdKcyyzIFx3hNk7VMLI=";
@@ -183,11 +184,11 @@ let
       azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.0.0" "zip"
         "634e398de9a23e712aa27a4a59f9ea5d5091d1dfcfed5ac977230918872c4430";
 
-      azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.1.0" "zip"
-        "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f";
+      azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.2.0" "zip"
+        "sha256-nsAeVhs5N8bpwYenmRwJmqF/IAqz/ulSoYIeOU5l0eM=";
 
-      azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.0.0" "zip"
-        "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9";
+      azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.1.0" "zip"
+        "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4=";
 
       azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "9.0.0" "zip"
         "64df73df449a6f3717f3d0963e5869224ed3e6216c79de571493bea7c1b52cb6";
@@ -198,14 +199,14 @@ let
       azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
         "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
 
-      azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "5.1.0" "zip"
-        "sha256-MGCICI7hDobEzyTMgqnKYZ21zfwNo/ogfQDsf3fwbo4=";
+      azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "6.0.1" "zip"
+        "6ce683587be1638d8d77620b7af118060b8b7dfc4fd23d46a623a66edcb388e1";
 
       azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip"
         "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8";
 
-      azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "12.0.0" "zip"
-        "da128a7e0291be7fa2063848df92a9180cf5c16d42adc09d2bc2efd711536bfb";
+      azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "13.0.0b2" "zip"
+        "sha256-j8CyWZGF7Z/5szJ+CD96E0EbNsceJ1SScrlPqWVLjnk=";
 
       azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.3.0" "zip"
         "0b6a1ccdffd76e057ab16a6c319740a0ca68d59fedf7e9c02f2437396e72aa11";
@@ -216,8 +217,8 @@ let
       azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip"
         "sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk=";
 
-      azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "0.1.0" "zip"
-        "sha256-/2LZgu3aY0o2Fgyx0Vo2epVypay0GeXnrTcejIO9R8c=";
+      azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "1.0.0" "zip"
+        "bab9bd532a1c34557f5b0ab9950e431e3f00bb96e8a3ce66df0f6ce2ae19cd73";
 
       azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip"
         "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8";
@@ -231,8 +232,8 @@ let
       azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "1.0.0" "zip"
         "b60f16e43f7b291582c5f57bae1b083096d8303e9d9958e2c29227a55cc27c45";
 
-      azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "4.0.0" "zip"
-        "sha256-5XQ3qTPn3qmwYY/nkODa3GP5hXc1NhrItfXoBiucKg0=";
+      azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "6.1.0" "zip"
+        "c26635089276515b0488fcf014aab50a0446f54800c6e0e5583cc493ac8d738f";
 
       azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.0.0" "zip"
         "94cd41f1ebd82e40620fd3e6d88f666b5c19ac7cf8b4e8edadb9721bd7c80980";
@@ -291,11 +292,11 @@ let
       azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip"
         "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m";
 
-      azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "19.0.0" "zip"
-        "f05963e5a8696d0fd4dcadda4feecb9b382a380d2e461b3647704ac787d79876";
+      azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "19.1.0" "zip"
+        "sha256-Seoi8A4JZaNVCvNKQcGh06SBaQ9lAMeOhUCIAvVtdBY=";
 
-      azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "6.0.0" "zip"
-        "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e";
+      azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "7.1.0" "zip"
+        "d8ae7905fb7d3e24822daa20aa7bc5014f41aa18b48ea2d0161e997fc11a3d36";
 
       azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip"
         "de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913";
@@ -413,12 +414,12 @@ let
       });
 
       azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs(oldAttrs: rec {
-        version = "4.5.0b4";
+        version = "4.5.0b6";
         src = super.fetchPypi {
           inherit (oldAttrs) pname;
           inherit version;
           extension = "zip";
-          sha256 = "sha256-f43ZTMFc0IVIaa69gEZFOLALREcx3RRCFoYDY2FYLrY=";
+          sha256 = "sha256-WFSRJaia0+WnvGxoMYZIvf81ue51VPYXzTp8huUh1fc=";
         };
       });
 
@@ -481,18 +482,6 @@ let
         };
       });
 
-      PyGithub = super.PyGithub.overridePythonAttrs(oldAttrs: rec {
-        version = "1.38";
-
-        src = super.fetchPypi {
-          inherit (oldAttrs) pname;
-          inherit version;
-          sha256 = "sha256-HtCPd17FBnvIRStyveLbuVz05S/yvVDMMsackf+tknI=";
-        };
-
-        doCheck = false;
-      });
-
       knack = super.knack.overridePythonAttrs(oldAttrs: rec {
         version = "0.9.0";
 
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index eaf7ac1da6d49..3e0ab75681838 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.89.0";
+  version = "0.90.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    sha256 = "sha256-8Cdvt+WB/Tl5jFNRlE2t62Y7O0QIxtZWF8F/dLDSqkw=";
+    sha256 = "sha256-XQZ32Gg/LZCDuSmtGvDEYCuzvq39zzq3yGGTYSKZyXI=";
   };
 
-  vendorSha256 = "sha256-SJowSDvthxwfAyMSRtNkQbyOy8L5HjkVRkxG/L4/dLc=";
+  vendorSha256 = "sha256-IYqeuyNPRQBMwuZMW4InKfHpOLhleM5Mz5Oauw4nK6M=";
 
   doCheck = false;
 
diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix
deleted file mode 100644
index 33145e0e548f6..0000000000000
--- a/pkgs/tools/admin/intecture/agent.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, fetchFromGitHub, rustPlatform
-, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
-
-with rustPlatform;
-
-buildRustPackage rec {
-  pname = "intecture-agent";
-  version = "0.3.1";
-
-  src = fetchFromGitHub {
-    owner = "intecture";
-    repo = "agent";
-    rev = version;
-    sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj";
-  };
-
-  cargoSha256 = "0j7yv00ipaa60hpakfj60xrblcyzjwi0lp2hpzz41vq3p9bkigvm";
-
-  buildInputs = [ openssl zeromq czmq zlib ];
-
-  nativeBuildInputs = [ pkg-config cmake ];
-
-  meta = with lib; {
-    description = "Authentication client/server for Intecture components";
-    homepage = "https://intecture.io";
-    license = licenses.mpl20;
-    maintainers = [ maintainers.rushmorem ];
-  };
-}
diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix
deleted file mode 100644
index 5fe81b78c9a6f..0000000000000
--- a/pkgs/tools/admin/intecture/auth.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, fetchFromGitHub, rustPlatform
-, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
-
-with rustPlatform;
-
-buildRustPackage rec {
-  pname = "intecture-auth";
-  version = "0.1.2";
-
-  src = fetchFromGitHub {
-    owner = "intecture";
-    repo = "auth";
-    rev = version;
-    sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2";
-  };
-
-  cargoSha256 = "15f7lb0xxaxvhvj8g3kjmqy5jzy4pyzwk3zfdvykphpg18qgg6qj";
-
-  buildInputs = [ openssl zeromq czmq zlib ];
-
-  nativeBuildInputs = [ pkg-config cmake ];
-
-  meta = with lib; {
-    description = "Authentication client/server for Intecture components";
-    homepage = "https://intecture.io";
-    license = licenses.mpl20;
-    maintainers = [ maintainers.rushmorem ];
-  };
-}
diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix
deleted file mode 100644
index 9b543b40498e2..0000000000000
--- a/pkgs/tools/admin/intecture/cli.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, fetchFromGitHub, rustPlatform
-, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
-
-with rustPlatform;
-
-buildRustPackage rec {
-  pname = "intecture-cli";
-  version = "0.3.4";
-
-  src = fetchFromGitHub {
-    owner = "intecture";
-    repo = "cli";
-    rev = version;
-    sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq";
-  };
-
-  cargoSha256 = "09phc0gxz1amrk1bbl5ajg0jmgxcqm4xzbvq3nj58qps991kvgf1";
-
-  buildInputs = [ openssl zeromq czmq zlib ];
-
-  nativeBuildInputs = [ pkg-config cmake ];
-
-  # Needed for tests
-  USER = "$(whoami)";
-
-  meta = with lib; {
-    description = "A developer friendly, language agnostic configuration management tool for server systems";
-    homepage = "https://intecture.io";
-    license = licenses.mpl20;
-    maintainers = [ maintainers.rushmorem ];
-  };
-}
diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix
index c14cee2901444..1db58accc4b25 100644
--- a/pkgs/tools/admin/pulumi/data.nix
+++ b/pkgs/tools/admin/pulumi/data.nix
@@ -6,7 +6,7 @@
     x86_64-linux = [
       {
         url = "https://get.pulumi.com/releases/sdk/pulumi-v3.28.0-linux-x64.tar.gz";
-        sha256 = "1ngwbv5dhi7xw2dvwlxm8l62h44b5inn3ybhcndsqklwgylsgf88";
+        sha256 = "0983axi1hxika5a1jl84hfndx8qgfl9pchfakkqcb9w9hwzz5zdq";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-linux-amd64.tar.gz";
@@ -164,7 +164,7 @@
     x86_64-darwin = [
       {
         url = "https://get.pulumi.com/releases/sdk/pulumi-v3.28.0-darwin-x64.tar.gz";
-        sha256 = "0nwpar4vz7af3ylpyg8lf2mmp86qggxihg2nh2acwc0fhdad4jr5";
+        sha256 = "0nixfzgl94kqzzvwr572rzqcayldcyj03ilbqhns7x3wl31fn583";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-darwin-amd64.tar.gz";
@@ -322,7 +322,7 @@
     aarch64-linux = [
       {
         url = "https://get.pulumi.com/releases/sdk/pulumi-v3.28.0-linux-arm64.tar.gz";
-        sha256 = "0nbzl4mhms9v6dr0db5pgnv187a5mipwhnp86a21a5q964dz998v";
+        sha256 = "1zrz7vgl36wj4h3h298x4vh2dl0a909niw22dxfvzvsvxcd88y9v";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-linux-arm64.tar.gz";
diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix
index 0d88df6185a69..83bdea6d49eeb 100644
--- a/pkgs/tools/admin/trivy/default.nix
+++ b/pkgs/tools/admin/trivy/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "trivy";
-  version = "0.25.0";
+  version = "0.25.2";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-jlLE8io7/Yhu0rF7brV9YhDIsZBANZtatnWbgoHMReg=";
+    sha256 = "sha256-yDoHDOPtPX5u8K2/fnj6dgqlI+WUCsuxbdKtb/UtIRQ=";
   };
 
-  vendorSha256 = "sha256-hOurOL7xowgBs9gXa++X7+iOKJJ6WjekGGFiR9Q0OEU=";
+  vendorSha256 = "sha256-HZpGPCayrnayOg+3mB8Tw+5M2IfIpIvzP7qfY1OL7tk=";
 
   excludedPackages = "misc";
 
diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix
index c9270ce58357f..e407a5f990705 100644
--- a/pkgs/tools/audio/spotdl/default.nix
+++ b/pkgs/tools/audio/spotdl/default.nix
@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "spotdl";
-  version = "3.9.3";
+  version = "3.9.4";
 
   src = fetchFromGitHub {
     owner = "spotDL";
     repo = "spotify-downloader";
     rev = "v${version}";
-    sha256 = "sha256-sx6UtblpsetKPwhlXB3Kj3OMIOyW9QluzB+YbtQGdYQ=";
+    sha256 = "sha256-PJ9m+697bdrhHZ80wJvL6V366Vn3tmPfioK1sZAyB/Q=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index da37cf9fbd8cf..cd262875a76be 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -44,6 +44,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    ln -s $out/lib/libbz2.so.1.0.* $out/lib/libbz2.so.1.0
+  '';
+
   meta = with lib; {
     description = "High-quality data compression program";
     homepage = "https://www.sourceware.org/bzip2";
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index c51cc12da36bb..fad1944c4a0eb 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "btrfs-progs";
-  version = "5.16.1";
+  version = "5.16.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "sha256-PaTaU2HPhr3dqA7bTE8w6gdstOvsKZBPoIr8kw754ag=";
+    sha256 = "sha256-npswOh0P2c6q8gTudMHI+h/VV5TiI9n+K8Yodey9U9I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/filesystems/buttersink/default.nix b/pkgs/tools/filesystems/buttersink/default.nix
deleted file mode 100644
index aa0f317787f82..0000000000000
--- a/pkgs/tools/filesystems/buttersink/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, python2 }:
-
-python2.pkgs.buildPythonApplication rec {
-  pname = "buttersink";
-  version = "0.6.9";
-
-  src = python2.pkgs.fetchPypi {
-    inherit pname version;
-    sha256 = "a797b6e92ad2acdf41e033c1368ab365aa268f4d8458b396a5770fa6c2bc3f54";
-  };
-
-  propagatedBuildInputs = with python2.pkgs; [ boto crcmod psutil ];
-
-  # No tests implemented
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Synchronise btrfs snapshots";
-    longDescription = ''
-      ButterSink is like rsync, but for btrfs subvolumes instead of files,
-      which makes it much more efficient for things like archiving backup
-      snapshots. It is built on top of btrfs send and receive capabilities.
-      Sources and destinations can be local btrfs file systems, remote btrfs
-      file systems over SSH, or S3 buckets.
-    '';
-    homepage = "https://github.com/AmesCornish/buttersink/wiki";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix
index f5b0a0315dfcb..3111be5b4d12e 100644
--- a/pkgs/tools/filesystems/djmount/default.nix
+++ b/pkgs/tools/filesystems/djmount/default.nix
@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa";
   };
 
+  postPatch = ''
+    # Taken from https://github.com/pupnp/pupnp/pull/334/files
+    substituteInPlace libupnp/threadutil/inc/ithread.h \
+      --replace \
+        "#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np" \
+        '#define ithread_mutexattr_setkind_np pthread_mutexattr_settype'
+  '';
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse];
 
diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix
index 44e547b01c24d..4d56f08b44262 100644
--- a/pkgs/tools/filesystems/securefs/default.nix
+++ b/pkgs/tools/filesystems/securefs/default.nix
@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
     ./add-macfuse-support.patch
   ];
 
+  postPatch = ''
+    sed -i -e '/TEST_SOURCES/d' CMakeLists.txt
+  '';
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ fuse ];
 
diff --git a/pkgs/tools/filesystems/xfsdump/default.nix b/pkgs/tools/filesystems/xfsdump/default.nix
new file mode 100644
index 0000000000000..af9c2e92f05ab
--- /dev/null
+++ b/pkgs/tools/filesystems/xfsdump/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, stdenv
+, fetchurl
+, attr
+, gettext
+, autoconf
+, automake
+, ncurses
+, libtool
+, libuuid
+, libxfs
+}:
+
+stdenv.mkDerivation rec {
+  pname = "xfsdump";
+  version = "3.1.10";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/utils/fs/xfs/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "sha256-mqt6U6oFzUbtyXJp6/FFaqsrYKuMH/+q+KpJLwtfZRc=";
+  };
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    gettext
+    libtool
+  ];
+  buildInputs = [
+    attr
+    libuuid
+    libxfs
+    ncurses
+  ];
+
+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace "cp include/install-sh ." "cp -f include/install-sh ."
+  '';
+
+  # Conifigure scripts don't check PATH, see xfstests derviation
+  preConfigure = ''
+    export MAKE=$(type -P make)
+    export MSGFMT=$(type -P msgfmt)
+    export MSGMERGE=$(type -P msgmerge)
+    export XGETTEXT=$(type -P xgettext)
+
+    make configure
+    patchShebangs ./install-sh
+  '';
+
+  meta = with lib; {
+    description = "XFS filesystem incremental dump utility";
+    homepage = "https://git.kernel.org/pub/scm/fs/xfs/xfsdump-dev.git/tree/doc/CHANGES";
+    license = licenses.gpl2Only;
+    maintainers = [ maintainers.lunik1 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 0f4dde0a41694..4ca1e62bfb8af 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -21,7 +21,7 @@
 , gtk-doc
 , runCommand
 , isocodes
-, cldr-emoji-annotation
+, cldr-annotations
 , unicode-character-database
 , unicode-emoji
 , python3
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
     "--enable-gtk4"
     "--enable-install-tests"
     "--with-unicode-emoji-dir=${unicode-emoji}/share/unicode/emoji"
-    "--with-emoji-annotation-dir=${cldr-emoji-annotation}/share/unicode/cldr/common/annotations"
+    "--with-emoji-annotation-dir=${cldr-annotations}/share/unicode/cldr/common/annotations"
     "--with-ucd-dir=${unicode-character-database}/share/unicode"
   ];
 
diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix
index 6e87d82921a21..c7e629c280ee5 100644
--- a/pkgs/tools/misc/antimicrox/default.nix
+++ b/pkgs/tools/misc/antimicrox/default.nix
@@ -36,7 +36,7 @@ mkDerivation rec {
   meta = with lib; {
     description = "GUI for mapping keyboard and mouse controls to a gamepad";
     inherit (src.meta) homepage;
-    maintainers = with maintainers; [ jb55 sbruder ];
+    maintainers = with maintainers; [ sbruder ];
     license = licenses.gpl3Plus;
     platforms = with platforms; linux;
   };
diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix
index ef1b6a5a4ca5b..12cc6572abcb9 100644
--- a/pkgs/tools/misc/aspcud/default.nix
+++ b/pkgs/tools/misc/aspcud/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , boost
+, catch2
 , clasp
 , cmake
 , gringo
@@ -19,6 +20,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-d04GPMoz6PMGq6iiul0zT1C9Mljdl9uJJ2C8MIwcmaw=";
   };
 
+  postPatch = ''
+    cp ${catch2}/include/catch2/catch.hpp libcudf/tests/catch.hpp
+  '';
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost clasp gringo re2c ];
 
@@ -28,6 +33,8 @@ stdenv.mkDerivation rec {
     "-DASPCUD_CLASP_PATH=${clasp}/bin/clasp"
   ];
 
+  doCheck = true;
+
   meta = with lib; {
     description = "Solver for package problems in CUDF format using ASP";
     homepage = "https://potassco.org/aspcud/";
diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index 4ffffa6360953..35e3032f6131a 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "chezmoi";
-  version = "2.14.0";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     rev = "v${version}";
-    sha256 = "sha256-WxOpmowRP8KSxxjW4JNQlQL6jZ2EhvpNb87NgeSO890=";
+    sha256 = "sha256-P4ELrDcN6kIpIsKgZJppJv+y+ofnEz7McmGvCijnfQA=";
   };
 
-  vendorSha256 = "sha256-ord4jHjgiW+Z2OD/x2ZAFOJYLyoB7Tja6SOd+JqxWDM=";
+  vendorSha256 = "sha256-D27a107gjHK4NYkJhZDd0SvhUmmRSl3DX519nglAoPo=";
 
   doCheck = false;
 
diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix
index a1b2ad662bc6c..9f0cb31c1ff7a 100644
--- a/pkgs/tools/misc/docui/default.nix
+++ b/pkgs/tools/misc/docui/default.nix
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   vendorSha256 = "1ggdczvv03lj0g6cq26vrk1rba6pk0805n85w9hkbjx9c4r3j577";
 
-  doCheck = false;
-
   meta = with lib; {
     description = "TUI Client for Docker";
     homepage = "https://github.com/skanehira/docui";
diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix
index 32c5ec6566dae..72a38cf1eaf3f 100644
--- a/pkgs/tools/misc/dsq/default.nix
+++ b/pkgs/tools/misc/dsq/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "dsq";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "multiprocessio";
     repo = "dsq";
     rev = version;
-    hash = "sha256-4g9fu5taFtb7VzVa0X8s6SbEO9qTFD0ff+CVJpr376c=";
+    hash = "sha256-AxYqSCdCrhHrN21WGJtg0KIde8VAjj6bF7DzELZptj8=";
   };
 
-  vendorSha256 = "sha256-YPH/uPPNT1byXOtCrNyU68H4mHO8arl6l5hs9WMcxVk=";
+  vendorSha256 = "sha256-aER7j/DG1WB5DZhvgXYrl19UwQ/lZLPRAptINVJ3rdI=";
 
   nativeBuildInputs = [ diffutils ];
 
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 65797f65fe6d0..d46815e8bf2a3 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ethtool";
-  version = "5.15";
+  version = "5.16";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-aG/WEQOJ1JwqEg8Aw81d/kPeutqOAh5CcNdLvkUqEW0=";
+    sha256 = "sha256-qi/vGTbdShF1XfoL25Pw7FvqRSCNJ8l1S8Or4apCwcs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 3746c4b4657fc..56d710c854549 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var/cache"
   ];
 
-  CFLAGS = [
+  CFLAGS = lib.optionals stdenv.isDarwin [
     # TODO: Revisit upstream issue https://savannah.gnu.org/bugs/?59972
     # https://github.com/Homebrew/homebrew-core/pull/69761#issuecomment-770268478
     "-D__nonnull\\(params\\)="
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 6bb728af99cac..3de016bf6d688 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchpatch, fetchFromGitHub, lib
 , cmake, perl, uthash, pkg-config, gettext
 , python, freetype, zlib, glib, giflib, libpng, libjpeg, libtiff, libxml2, cairo, pango
-, readline, woff2, zeromq, libuninameslist
+, readline, woff2, zeromq
 , withSpiro ? false, libspiro
 , withGTK ? false, gtk3
 , withGUI ? withGTK
@@ -14,13 +14,13 @@ assert withGTK -> withGUI;
 
 stdenv.mkDerivation rec {
   pname = "fontforge";
-  version = "20201107";
+  version = "20220308";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc=";
+    sha256 = "sha256-q+71PDPODl5fEEy3d1icRl+rBGY7AhH+2dMUKeBWGgI=";
   };
 
   patches = [
@@ -28,13 +28,11 @@ stdenv.mkDerivation rec {
     # Taken from https://salsa.debian.org/fonts-team/fontforge/-/blob/master/debian/patches/0001-add-extra-cmake-install-rules.patch
     (fetchpatch {
       url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch";
-      sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg=";
-    })
-    # Fix segmentation fault with some fonts.
-    # This is merged and should be present in the next release.
-    (fetchpatch {
-      url = "https://github.com/fontforge/fontforge/commit/69e263b2aff29ad22f97f13935cfa97a1eabf207.patch";
-      sha256 = "06yyf90605aq6ppfiz83mqkdmnaq5418axp9jgsjyjq78b00xb29";
+      excludes = [
+        # Already handled upstream: https://github.com/fontforge/fontforge/commit/f97a2cd7b344ec8fcb9f8bfb908e1b6f36326d20
+        "contrib/cidmap/CMakeLists.txt"
+      ];
+      sha256 = "iQwaGeBHUais979hGVbU2NxKozQSQkpYXjApxPuLI/4=";
     })
   ];
 
@@ -52,7 +50,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [
-    readline uthash woff2 zeromq libuninameslist
+    readline uthash woff2 zeromq
     python freetype zlib glib giflib libpng libjpeg libtiff libxml2
   ]
     ++ lib.optionals withSpiro [ libspiro ]
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 92c5baa1096ea..5195af2774f1a 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "fzf";
-  version = "0.29.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = pname;
     rev = version;
-    sha256 = "sha256-m+mW9R50VXWUMaRmhMzpr7v8iQJxLYexYvcUMHPz3UM=";
+    sha256 = "sha256-7E6fj/Sjew+zz+iMFkiSJjVn2rymKRvZtEJZH65INxk=";
   };
 
   vendorSha256 = "sha256-omvCzM5kH3nAE57S33NV0OFRJmU+Ty7hhriaG/Dc0o0=";
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index a002d190984f8..8d6de0bbeb81d 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gparted";
-  version = "1.3.1";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/gparted/${pname}-${version}.tar.gz";
-    sha256 = "sha256-Xu4ubXSxXvlrE7OiMQyGjtIpjgM0ECHn0SpamKHR4Qk=";
+    sha256 = "sha256-5Sk6eS5T/b66KcSoNBE82WA9DWOTMNqTGkaL82h4h74=";
   };
 
   # Tries to run `pkexec --version` to get version.
diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix
index 31bc0b2b6a12d..f80e15b3b3c22 100644
--- a/pkgs/tools/misc/kisslicer/default.nix
+++ b/pkgs/tools/misc/kisslicer/default.nix
@@ -27,8 +27,11 @@ stdenv.mkDerivation rec {
     stripRoot = false;
   };
 
-  buildInputs = [
+  nativeBuildInputs = [
     makeWrapper
+  ];
+
+  buildInputs = [
     libGLU libGL
     libX11
   ];
diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix
index 0b3e17818dcd7..c1136ed887689 100644
--- a/pkgs/tools/misc/logstash/6.x.nix
+++ b/pkgs/tools/misc/logstash/6.x.nix
@@ -26,8 +26,12 @@ let this = stdenv.mkDerivation rec {
   dontStrip         = true;
   dontPatchShebangs = true;
 
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
   buildInputs = [
-    makeWrapper jre
+    jre
   ];
 
   installPhase = ''
diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix
index 636c380817ce3..6cf64691efb6d 100644
--- a/pkgs/tools/misc/logstash/7.x.nix
+++ b/pkgs/tools/misc/logstash/7.x.nix
@@ -41,8 +41,11 @@ let
     dontStrip = true;
     dontPatchShebangs = true;
 
-    buildInputs = [
+    nativeBuildInputs = [
       makeWrapper
+    ];
+
+    buildInputs = [
       jre
     ];
 
diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix
index 5528bb2f97c38..4560e14c697f1 100644
--- a/pkgs/tools/misc/mongodb-compass/default.nix
+++ b/pkgs/tools/misc/mongodb-compass/default.nix
@@ -33,7 +33,7 @@ xorg,
 }:
 
 let
-  version = "1.30.1";
+  version = "1.31.0";
 
   rpath = lib.makeLibraryPath [
     alsa-lib
@@ -82,7 +82,7 @@ let
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
-        sha256 = "sha256-MwkYgkDZmzZsthJxSK6c+0us0D4cPuDfuV1XBbeTNXE=";
+        sha256 = "sha256-kzGBb8h03jPCqpwKPXeqB3yPTGgvVsl1DjIyCbNgjqM=";
       }
     else
       throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 8c4fa097ea41d..3a60c3be36926 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "1.2022.2";
+  version = "1.2022.3";
   pname = "plantuml";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "sha256-4LPR8gdpfebq5U/umxcFfqe7i6qJHLqhOAu7DfYzTY8=";
+    sha256 = "sha256-u40P3YFiWd419Bz1NvhIsPa7nASl/I9z/L2Q5v9eOAo=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/plfit/default.nix b/pkgs/tools/misc/plfit/default.nix
new file mode 100644
index 0000000000000..d1613af76e909
--- /dev/null
+++ b/pkgs/tools/misc/plfit/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, python ? null
+, swig
+, llvmPackages
+}:
+
+stdenv.mkDerivation rec {
+  pname = "plfit";
+  version = "0.9.3";
+
+  src = fetchFromGitHub {
+    owner = "ntamas";
+    repo = "plfit";
+    rev = version;
+    hash = "sha256-y4n6AlGtuuUuA+33oF7lGOYuKSqea4GMSJlv9PaSpQ8=";
+  };
+
+  patches = [
+    # https://github.com/ntamas/plfit/pull/41
+    (fetchpatch {
+      name = "use-cmake-install-full-dir.patch";
+      url = "https://github.com/ntamas/plfit/commit/d0e77c80e6e899298240e6be465cf580603f6ee2.patch";
+      hash = "sha256-wi3qCp6ZQtrKuM7XDA6xCXunCiqsyhnkxmg2eSmxjYM=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    cmake
+  ] ++ lib.optionals (!isNull python) [
+    python
+    swig
+  ];
+
+  cmakeFlags = [
+    "-DPLFIT_USE_OPENMP=ON"
+  ] ++ lib.optionals (!isNull python) [
+    "-DPLFIT_COMPILE_PYTHON_MODULE=ON"
+  ];
+
+  buildInputs = lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ];
+
+  meta = with lib; {
+    description = "Fitting power-law distributions to empirical data";
+    homepage = "https://github.com/ntamas/plfit";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix
index 307e5e9c74611..72f7f66c9e43a 100644
--- a/pkgs/tools/misc/pre-commit/default.nix
+++ b/pkgs/tools/misc/pre-commit/default.nix
@@ -1,17 +1,27 @@
-{ lib, python3Packages }:
+{ lib
+, python3Packages
+, fetchFromGitHub
+  # tests
+, cargo
+, dotnet-sdk
+, git
+, go
+, nodejs
+}:
 
 with python3Packages;
 buildPythonPackage rec {
   pname = "pre-commit";
-  version = "2.17.0";
+  version = "2.18.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit version;
-    pname = "pre_commit";
-    sha256 = "c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a";
+  src = fetchFromGitHub {
+    owner = "pre-commit";
+    repo = "pre-commit";
+    rev = "v${version}";
+    sha256 = "sha256-d/ukUTjNgpqr6IeDJHDaOXQm0EdsX+vq0sVX7HG3gSE=";
   };
 
   patches = [
@@ -32,18 +42,103 @@ buildPythonPackage rec {
     importlib-resources
   ];
 
-  # slow and impure
-  doCheck = false;
+  checkInputs = [
+    cargo
+    dotnet-sdk
+    git
+    go
+    nodejs
+    pytest-env
+    pytest-xdist
+    pytestCheckHook
+    re-assert
+  ];
+
+  doCheck = true;
 
-  preFixup = ''
-    substituteInPlace $out/${python.sitePackages}/pre_commit/resources/hook-tmpl \
+  postPatch = ''
+    substituteInPlace pre_commit/resources/hook-tmpl \
       --subst-var-by pre-commit $out
-    substituteInPlace $out/${python.sitePackages}/pre_commit/languages/python.py \
+    substituteInPlace pre_commit/languages/python.py \
       --subst-var-by virtualenv ${virtualenv}
-    substituteInPlace $out/${python.sitePackages}/pre_commit/languages/node.py \
+    substituteInPlace pre_commit/languages/node.py \
       --subst-var-by nodeenv ${nodeenv}
+
+    patchShebangs pre_commit/resources/hook-tmpl
+  '';
+
+  pytestFlagsArray = [
+    "--numprocesses $NIX_BUILD_CORES"
+    "--forked"
+  ];
+
+  preCheck = ''
+    export GIT_AUTHOR_NAME=test GIT_COMMITTER_NAME=test \
+           GIT_AUTHOR_EMAIL=test@example.com GIT_COMMITTER_EMAIL=test@example.com \
+           VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 LANG=en_US.UTF-8
+
+    git init -b master
+
+    export HOME=$(mktemp -d)
+
+    python -m venv --system-site-packages venv
+    source "$PWD/venv/bin/activate"
+    #$out/bin/pre-commit install
+    python setup.py develop
   '';
 
+  postCheck = ''
+    deactivate
+  '';
+
+  disabledTests = [
+    # ERROR: The install method you used for conda--probably either `pip install conda`
+    # or `easy_install conda`--is not compatible with using conda as an application.
+    "test_conda_"
+    "test_local_conda_"
+
+    # /build/pytest-of-nixbld/pytest-0/test_install_ruby_with_version0/rbenv-2.7.2/libexec/rbenv-init:
+    # /usr/bin/env: bad interpreter: No such file or directory
+    "ruby"
+
+    # network
+    "test_additional_dependencies_roll_forward"
+    "test_additional_golang_dependencies_installed"
+    "test_additional_node_dependencies_installed"
+    "test_additional_rust_cli_dependencies_installed"
+    "test_additional_rust_lib_dependencies_installed"
+    "test_dart_hook"
+    "test_dotnet_hook"
+    "test_golang_hook"
+    "test_golang_hook_still_works_when_gobin_is_set"
+    "test_installs_without_links_outside_env"
+    "test_local_dart_additional_dependencies"
+    "test_local_golang_additional_dependencies"
+    "test_local_lua_additional_dependencies"
+    "test_local_perl_additional_dependencies"
+    "test_local_rust_additional_dependencies"
+    "test_lua_hook"
+    "test_perl_hook"
+    "test_r_hook"
+    "test_r_inline_hook"
+    "test_r_local_with_additional_dependencies_hook"
+    "test_r_with_additional_dependencies_hook"
+    "test_run_a_node_hook_default_version"
+    "test_run_versioned_node_hook"
+
+    # python2, no explanation needed
+    "python2"
+    "test_switch_language_versions_doesnt_clobber"
+
+    # docker
+    "test_run_a_docker_hook"
+
+    # i don't know why these fail
+    "test_install_existing_hooks_no_overwrite"
+    "test_installed_from_venv"
+    "test_uninstall_restores_legacy_hooks"
+  ];
+
   pythonImportsCheck = [
     "pre_commit"
   ];
diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix
deleted file mode 100644
index 1319a6bfabe91..0000000000000
--- a/pkgs/tools/misc/proxytunnel/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, stdenv, fetchurl, openssl }:
-
-stdenv.mkDerivation rec {
-  pname = "proxytunnel";
-  version = "1.9.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/proxytunnel/proxytunnel-${version}.tgz";
-    sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f";
-  };
-
-  buildInputs = [ openssl ];
-
-  installPhase = ''make DESTDIR="$out" PREFIX="" install'';
-
-  meta = {
-    description = "Program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy";
-    homepage = "http://proxytunnel.sourceforge.net/download.php";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index ad045aa1d9245..1ed9a9fd237c6 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -9,13 +9,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "svtplay-dl";
-  version = "4.10";
+  version = "4.11";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "sha256-JK/JtGDmmTJ+g0kmM7mSJi7+/N552GKtlMkh7quOBjo=";
+    sha256 = "1ybip45bfmvajw046v6mxjbf3vv0y7zgfb454rjy56zhx40l232v";
   };
 
   pythonPaths = [ cryptography pyyaml requests ];
diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix
deleted file mode 100644
index 3bf1f5cd34b61..0000000000000
--- a/pkgs/tools/misc/teleconsole/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "teleconsole";
-  version = "0.4.0";
-
-  goPackagePath = "github.com/gravitational/teleconsole";
-
-  src = fetchFromGitHub {
-    owner = "gravitational";
-    repo = "teleconsole";
-    rev = version;
-    sha256 = "01552422n0bj1iaaw6pvg9l1qr66r69sdsngxbcdjn1xh3mj74sm";
-  };
-
-  srcTeleport = fetchFromGitHub {
-    owner = "gravitational";
-    repo = "teleport";
-    rev = "2cb40abd8ea8fb2915304ea4888b5b9f3e5bc223";
-    sha256 = "1xw3bfnjbj88x465snwwzn4bmpmzmsrq9r0pkj388qwvfrclgnfk";
-  };
-
-  preBuild = ''
-    cp -r ${srcTeleport} ./go/src/github.com/gravitational/teleport
-  '';
-
-  CGO_ENABLED = 1;
-
-  meta = with lib; {
-    homepage = "https://www.teleconsole.com/";
-    description = "Share your terminal session with people you trust";
-    license = licenses.asl20;
-    # Builds for Aarch64 not possible in the current release due to
-    # incompatibilities further up the dependency chain.
-    # See:
-    #  - https://github.com/gravitational/teleport/issues/679
-    #  - https://github.com/kr/pty/issues/27
-    broken = stdenv.isAarch64;
-    maintainers = [ maintainers.kimburgess ];
-  };
-}
diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index 06e886e4d04fb..11875e73f9301 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -1,18 +1,39 @@
-{ lib, stdenv, fetchurl, makeWrapper, xorgserver, getopt
-, xauth, util-linux, which, fontsConf, gawk, coreutils }:
-let
-  xvfb-run = fetchurl {
-    name = "xvfb-run";
-    url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/9cb733cefa92af3fca608fb051d5251160c9bbff/trunk/xvfb-run";
-    sha256 = "1307mz4nr8ga3qz73i8hbcdphky75rq8lrvfk2zm4kmv6pkbk611";
-  };
-in
-stdenv.mkDerivation {
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+, makeWrapper
+, xorgserver
+, getopt
+, xauth
+, util-linux
+, which
+, fontsConf
+, gawk
+, coreutils
+, installShellFiles
+, xterm
+}:
+stdenvNoCC.mkDerivation rec {
   name = "xvfb-run";
-  nativeBuildInputs = [ makeWrapper ];
-  buildCommand = ''
+  version = "1+g87f6705";
+
+  src = fetchFromGitHub {
+    owner = "archlinux";
+    repo = "svntogit-packages";
+    rev = "87f67054c49b32511893acd22be94c47ecd44b4a";
+    sha256 = "sha256-KEg92RYgJd7naHFDKbdXEy075bt6NLcmX8VhQROHVPs=";
+  };
+
+  nativeBuildInputs = [ makeWrapper installShellFiles ];
+
+  dontUnpack = true;
+  dontBuild = true;
+  dontConfigure = true;
+
+  installPhase = ''
     mkdir -p $out/bin
-    cp ${xvfb-run} $out/bin/xvfb-run
+    cp $src/trunk/xvfb-run $out/bin/xvfb-run
+    installManPage $src/trunk/xvfb-run.1
 
     chmod a+x $out/bin/xvfb-run
     patchShebangs $out/bin/xvfb-run
@@ -21,8 +42,23 @@ stdenv.mkDerivation {
       --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]}
   '';
 
+  doInstallCheck = true;
+  installCheckPhase = ''
+    (
+      unset PATH
+      echo "running xterm with xvfb-run"
+      $out/bin/xvfb-run ${lib.getBin xterm}/bin/xterm -e true
+    )
+  '';
+
+  passthru = {
+    updateScript = ./update.sh;
+  };
+
   meta = with lib; {
+    description = "Convenience script to run a virtualized X-Server";
     platforms = platforms.linux;
     license = licenses.gpl2;
+    maintainers = [ maintainers.artturin ];
   };
 }
diff --git a/pkgs/tools/misc/xvfb-run/update.sh b/pkgs/tools/misc/xvfb-run/update.sh
new file mode 100755
index 0000000000000..e592323154e22
--- /dev/null
+++ b/pkgs/tools/misc/xvfb-run/update.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnused nix-prefetch jq common-updater-scripts
+# shellcheck shell=bash
+
+set -e
+
+info=$(nix-prefetch-git --quiet --url "https://github.com/archlinux/svntogit-packages" --rev "refs/heads/packages/xorg-server")
+
+rev=$(jq -r '.rev' <<< "$info")
+sha256=$(nix hash to-sri --type sha256 "$(jq -r '.sha256' <<< "$info")")
+dir=$(jq -r '.path' <<< "$info")
+
+newXvfbsha=$(sha256sum "$dir/trunk/xvfb-run")
+oldXvfbsha=$(sha256sum "$(nix build --quiet ".#xvfb-run.src" --json --no-link | jq -r '.[].outputs.out')/trunk/xvfb-run")
+
+if [[ "$newXvfbsha" != "$oldXvfbsha" ]]; then
+    (
+        cd "$(git rev-parse --show-toplevel)"
+        update-source-version xvfb-run "1+g${rev:0:7}" "$sha256" --rev="$rev"
+    )
+fi
diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index 47894c1a53290..cde173ba305a0 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "babeld";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchurl {
     url = "https://www.irif.fr/~jch/software/files/${pname}-${version}.tar.gz";
-    sha256 = "1sld5bbig2pkcr4zrdpvfzifc6a3lc8i8kdzk5ryjh166844mxd5";
+    sha256 = "sha256-mTFa6vLqIH8XfBaFX/o0/DVK8bWYjAcODy/KOg1ND6U=";
   };
 
   preBuild = ''
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index bfd48893165cd..c032ba61c123a 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -54,14 +54,14 @@ assert zstdSupport -> zstd != null;
 
 stdenv.mkDerivation rec {
   pname = "curl";
-  version = "7.81.0";
+  version = "7.82.0";
 
   src = fetchurl {
     urls = [
       "https://curl.haxx.se/download/${pname}-${version}.tar.bz2"
       "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2"
     ];
-    sha256 = "sha256-Hno41wGOwGDx8W34OYVPCInpThIsTPpdOjfC3Fbx4lg=";
+    sha256 = "sha256-RtmgQAozQI/ZkncLBKRKdDSzA28ugImsKLV1c9WdNx8=";
   };
 
   patches = [
diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 035a99103fc7d..0fb559afc990c 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -7,6 +7,7 @@
 , openssl
 , protobuf
 , zlib
+, catch2
 }:
 
 stdenv.mkDerivation rec {
@@ -20,6 +21,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-cCZbG0CD5V/FTj1BuVr083EJ+BCgIcKHomNtpJb3lOo=";
   };
 
+  preBuild = ''
+    cp ${catch2}/include/catch2/catch.hpp ../external_imported/Catch2/single_include/catch2/catch.hpp
+  '';
+
   nativeBuildInputs = [
     cmake
   ];
@@ -42,6 +47,8 @@ stdenv.mkDerivation rec {
     "-std=c++17"
   ];
 
+  doCheck = true;
+
   meta = with lib; {
     description = "Remote shell that automatically reconnects without interrupting the session";
     homepage = "https://eternalterminal.dev/";
diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix
index 426953cf29142..158129c2c1f4f 100644
--- a/pkgs/tools/networking/findomain/default.nix
+++ b/pkgs/tools/networking/findomain/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "findomain";
-  version = "7.0.1";
+  version = "7.2.0";
 
   src = fetchFromGitHub {
     owner = "Edu4rdSHL";
     repo = pname;
     rev = version;
-    sha256 = "sha256-OXyp2cQmt311CPAcJQeWKGRHFYNL6E+f2TmUuT80/z4=";
+    sha256 = "sha256-NhsEXYEYoRZ/HlMS+MP/N+ZxB13DDZr5B8MY5dbONP0=";
   };
 
-  cargoSha256 = "sha256-TwegOBf7dILL7DKohIVfa8IRTU4F9u24tDrrONIGF0U=";
+  cargoSha256 = "sha256-Y/DgAMWhTgHuhdbYxpsg7UxLF7hXNQEY1aoaUbKdDEM=";
 
   nativeBuildInputs = [ installShellFiles perl ];
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/tools/networking/gost/default.nix
index 13cac74446174..c8f42b3ad4a73 100644
--- a/pkgs/tools/networking/gost/default.nix
+++ b/pkgs/tools/networking/gost/default.nix
@@ -13,8 +13,33 @@ buildGoModule rec {
 
   vendorSha256 = "1cgb957ipkiix3x0x84c77a1i8l679q3kqykm1lhb4f19x61dqjh";
 
-  # Many tests fail.
-  doCheck = false;
+  postPatch = ''
+    substituteInPlace http2_test.go \
+      --replace "TestH2CForwardTunnel" "SkipH2CForwardTunnel" \
+      --replace "TestH2ForwardTunnel" "SkipH2ForwardTunnel"
+
+    substituteInPlace resolver_test.go \
+      --replace '{NameServer{Addr: "1.1.1.1"}, "github", true},' "" \
+      --replace '{NameServer{Addr: "1.1.1.1"}, "github.com", true},' "" \
+      --replace '{NameServer{Addr: "1.1.1.1:53"}, "github.com", true},' "" \
+      --replace '{NameServer{Addr: "1.1.1.1:53", Protocol: "tcp"}, "github.com", true},' "" \
+      --replace '{NameServer{Addr: "1.1.1.1:853", Protocol: "tls"}, "github.com", true},' "" \
+      --replace '{NameServer{Addr: "1.1.1.1:853", Protocol: "tls", Hostname: "cloudflare-dns.com"}, "github.com", true},' "" \
+      --replace '{NameServer{Addr: "https://cloudflare-dns.com/dns-query", Protocol: "https"}, "github.com", true},' "" \
+      --replace '{NameServer{Addr: "https://1.0.0.1/dns-query", Protocol: "https"}, "github.com", true},' ""
+
+    # Skip TestShadowTCP, TestShadowUDP: #70 #71 #72 #78 #83 #85 #86 #87 #93
+    substituteInPlace ss_test.go \
+      --replace '{url.User("xchacha20"), url.UserPassword("xchacha20", "123456"), false},' "" \
+      --replace '{url.UserPassword("xchacha20", "123456"), url.User("xchacha20"), false},' "" \
+      --replace '{url.UserPassword("xchacha20", "123456"), url.UserPassword("xchacha20", "abc"), false},' "" \
+      --replace '{url.UserPassword("CHACHA20-IETF-POLY1305", "123456"), url.UserPassword("CHACHA20-IETF-POLY1305", "123456"), true},' "" \
+      --replace '{url.UserPassword("AES-128-GCM", "123456"), url.UserPassword("AES-128-GCM", "123456"), true},' "" \
+      --replace '{url.User("AES-192-GCM"), url.UserPassword("AES-192-GCM", "123456"), false},' "" \
+      --replace '{url.UserPassword("AES-192-GCM", "123456"), url.User("AES-192-GCM"), false},' "" \
+      --replace '{url.UserPassword("AES-192-GCM", "123456"), url.UserPassword("AES-192-GCM", "abc"), false},' "" \
+      --replace '{url.UserPassword("AES-256-GCM", "123456"), url.UserPassword("AES-256-GCM", "123456"), true},' ""
+  '';
 
   meta = with lib; {
     description = "A simple tunnel written in golang";
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix
index 126b3b513a86e..c9d56044b0dc0 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modemmanager/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "modemmanager";
-  version = "1.18.4";
+  version = "1.18.6";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz";
-    sha256 = "sha256-EfuXD2Pi2ojfS22HWeTuZJlExRUkS5eb9Qp6bfHX8Zk=";
+    sha256 = "sha256-1PgEsxz1BCOcXx1Jc8YglcAMuh7pq7UDcY2sbRRqRwo=";
   };
 
   nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ];
diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix
index e87b550aa6fe9..8331e3686dc9f 100644
--- a/pkgs/tools/networking/mosh/default.nix
+++ b/pkgs/tools/networking/mosh/default.nix
@@ -11,11 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ];
+  nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf perlPackages.perl ];
   buildInputs = [ protobuf ncurses zlib openssl bash-completion ]
-    ++ (with perlPackages; [ perl IOTty ])
     ++ lib.optional withUtempter libutempter;
 
+  strictDeps = true;
+
   enableParallelBuilding = true;
 
   patches = [
diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix
index c26cb527f55e9..2c7347defdd3b 100644
--- a/pkgs/tools/networking/nethogs/default.nix
+++ b/pkgs/tools/networking/nethogs/default.nix
@@ -1,26 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }:
+{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }:
 
 stdenv.mkDerivation rec {
   pname = "nethogs";
-  version = "0.8.6";
+  version = "0.8.7";
 
   src = fetchFromGitHub {
     owner = "raboof";
     repo = "nethogs";
     rev = "v${version}";
-    sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9";
+    sha256 = "10shdwvfj90lp2fxz9260342a1c2n1jbw058qy5pyq5kh3xwr9b8";
   };
 
-  patches = [
-    # Pull upstream patch for ncurses-6.3 support:
-    #  https://github.com/raboof/nethogs/pull/210
-    (fetchpatch {
-      name = "ncurses-6.3.patch";
-      url = "https://github.com/raboof/nethogs/commit/455daf357da7f394763e5b93b11b3defe1f82ed1.patch";
-      sha256 = "0wkp0yr6qg1asgvmsn7blf7rq48sh5k4n3w0nxf5869hxvkhnnzs";
-    })
-  ];
-
   buildInputs = [ ncurses libpcap ];
 
   makeFlags = [ "VERSION=${version}" "nethogs" ];
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 91e1767b75c11..f272470a98f41 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n";
   };
 
+  patches = [
+    # From https://patchwork.openembedded.org/patch/180019/
+    ./glibc-2.34-fix.patch
+  ];
+
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
diff --git a/pkgs/tools/networking/ntp/glibc-2.34-fix.patch b/pkgs/tools/networking/ntp/glibc-2.34-fix.patch
new file mode 100644
index 0000000000000..256f125a77b26
--- /dev/null
+++ b/pkgs/tools/networking/ntp/glibc-2.34-fix.patch
@@ -0,0 +1,28 @@
+From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 31 Jul 2021 10:51:41 -0700
+Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc
+In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which
+could mean different stack sizes at runtime on different architectures
+and it also causes compile failure. Default glibc thread stack size
+or 64Kb set by ntp should be good in glibc these days.
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libntp/work_thread.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/libntp/work_thread.c b/libntp/work_thread.c
+index 03a5647..3ddd751 100644
+--- a/libntp/work_thread.c
++++ b/libntp/work_thread.c
+@@ -41,7 +41,7 @@
+ #ifndef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE	(64U * 1024)
+ #endif
+-#ifndef __sun
++#if !defined(__sun) && !defined(__GLIBC__)
+ #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
+ # undef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN
+-- 
+2.32.0
diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix
index 0e1da29320f06..5dea456d00bfc 100644
--- a/pkgs/tools/networking/openconnect/default.nix
+++ b/pkgs/tools/networking/openconnect/default.nix
@@ -4,6 +4,7 @@
 , pkg-config
 , openssl ? null
 , gnutls ? null
+, p11-kit
 , gmp
 , libxml2
 , stoken
@@ -42,7 +43,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ]
-    ++ lib.optional stdenv.isDarwin PCSC;
+    ++ lib.optional stdenv.isDarwin PCSC
+    ++ lib.optional stdenv.isLinux p11-kit;
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optional head autoreconfHook;
 
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 36125a5893be7..77277f20950bc 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -6,11 +6,11 @@ in
 
   openssh = common rec {
     pname = "openssh";
-    version = "8.8p1";
+    version = "8.9p1";
 
     src = fetchurl {
       url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
-      sha256 = "1s8z6f7mi1pwsl79cqai8cr350m5lf2ifcxff57wx6mvm478k425";
+      sha256 = "sha256:1ry5prcax0134v6srkgznpl9ch5snkgq7yvjqvd8c5mbnxa7cjgx";
     };
 
     extraPatches = [ ./ssh-keysign-8.5.patch ];
diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix
index 8ac1e137ca432..fd4cdbaf977d1 100644
--- a/pkgs/tools/networking/smartdns/default.nix
+++ b/pkgs/tools/networking/smartdns/default.nix
@@ -1,34 +1,32 @@
-{ lib, stdenv, fetchFromGitHub, openssl }:
+{ lib, stdenv, fetchFromGitHub, openssl, testVersion, smartdns }:
 
 stdenv.mkDerivation rec {
   pname = "smartdns";
-  version = "35";
+  version = "36";
 
   src = fetchFromGitHub {
     owner = "pymumu";
     repo = pname;
     rev = "Release${version}";
-    sha256 = "sha256-5822qe3mdn4wPO8fHW5AsgMA7xbJnMjZn9DbiMU3GX0=";
+    sha256 = "sha256-sjrRPmTJRCUnMrA08M/VdYhL7/OfQY30/t1loLPSrlQ=";
   };
 
   buildInputs = [ openssl ];
 
-  # Force the systemd service file to be regenerated from it's template.  This
-  # file is erroneously added in version 35 and it has already been deleted from
-  # upstream's git repository.  So this "postPatch" phase can be deleted in next
-  # release.
-  postPatch = ''
-    rm -f systemd/smartdns.service
-  '';
-
   makeFlags = [
     "PREFIX=${placeholder "out"}"
     "SYSTEMDSYSTEMUNITDIR=${placeholder "out"}/lib/systemd/system"
     "RUNSTATEDIR=/run"
+    # by default it is the build time... weird... https://github.com/pymumu/smartdns/search?q=ver
+    "VER=${version}"
   ];
 
   installFlags = [ "SYSCONFDIR=${placeholder "out"}/etc" ];
 
+  passthru.tests = {
+    version = testVersion { package = smartdns; };
+  };
+
   meta = with lib; {
     description =
       "A local DNS server to obtain the fastest website IP for the best Internet experience";
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index b2d577dab330e..b92fb23d64e58 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -8,6 +8,8 @@
 , libsodium
 , protobufc
 , hiredis
+, python ? null
+, swig
 , dns-root-data
 , pkg-config
 , makeWrapper
@@ -35,6 +37,7 @@
 # Avoid .lib depending on lib.getLib openssl
 # The build gets a little hacky, so in some cases we disable this approach.
 , withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP
+, withPythonModule ? false
 , libnghttp2
 }:
 
@@ -49,11 +52,13 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ]
+    ++ lib.optionals withPythonModule [ swig ];
 
   buildInputs = [ openssl nettle expat libevent ]
     ++ lib.optionals withSystemd [ pkg-config systemd ]
-    ++ lib.optionals withDoH [ libnghttp2 ];
+    ++ lib.optionals withDoH [ libnghttp2 ]
+    ++ lib.optionals withPythonModule [ python ];
 
   configureFlags = [
     "--with-ssl=${openssl.dev}"
@@ -69,6 +74,8 @@ stdenv.mkDerivation rec {
     "--disable-flto"
   ] ++ lib.optionals withSystemd [
     "--enable-systemd"
+  ] ++ lib.optionals withPythonModule [
+    "--with-pythonmodule"
   ] ++ lib.optionals withDoH [
     "--with-libnghttp2=${libnghttp2.dev}"
   ] ++ lib.optionals withECS [
@@ -100,12 +107,21 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  postPatch = lib.optionalString withPythonModule ''
+    substituteInPlace Makefile.in \
+      --replace "\$(DESTDIR)\$(PYTHON_SITE_PKG)" "$out/${python.sitePackages}"
+  '';
+
   installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
 
   postInstall = ''
     make unbound-event-install
     wrapProgram $out/bin/unbound-control-setup \
       --prefix PATH : ${lib.makeBinPath [ openssl ]}
+  '' + lib.optionalString withPythonModule ''
+    wrapProgram $out/bin/unbound \
+      --prefix PYTHONPATH : "$out/${python.sitePackages}" \
+      --argv0 $out/bin/unbound
   '';
 
   preFixup = lib.optionalString withSlimLib
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 4510948b436be..4ad17072dc85d 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -68,6 +68,17 @@ in lib.makeExtensible (self: {
   nix_2_7 = common {
     version = "2.7.0";
     sha256 = "sha256-m8tqCS6uHveDon5GSro5yZor9H+sHeh+v/veF1IGw24=";
+    patches = [
+      # remove when there's a 2.7.1 release
+      # https://github.com/NixOS/nix/pull/6297
+      # https://github.com/NixOS/nix/issues/6243
+      # https://github.com/NixOS/nixpkgs/issues/163374
+      (fetchpatch {
+        url = "https://github.com/NixOS/nix/commit/c9afca59e87afe7d716101e6a75565b4f4b631f7.patch";
+        sha256 = "sha256-xz7QnWVCI12lX1+K/Zr9UpB93b10t1HS9y/5n5FYf8Q=";
+      })
+    ];
+
   };
 
   stable = self.nix_2_7;
diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix
index 4e59333ed79bd..cae4431ea65b4 100644
--- a/pkgs/tools/package-management/pdm/default.nix
+++ b/pkgs/tools/package-management/pdm/default.nix
@@ -24,13 +24,13 @@ in
 with python.pkgs;
 buildPythonApplication rec {
   pname = "pdm";
-  version = "1.12.6";
+  version = "1.13.3";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-MXKER2ijU+2yPnsBFH0cu/hjHI4uNt++AqggH5rhnaU=";
+    sha256 = "sha256-5+bjjljmk3AHaDVjYzNuC7lkkvlpLa9/grKgdmERC7k=";
   };
 
   # this patch allows us to run additional tests that invoke pdm, which checks
@@ -41,19 +41,12 @@ buildPythonApplication rec {
   # doesn't appear to respect the settings in `$HOME`; possibly a bug upstream
   patches = [
     ./check-update.patch
-    (fetchurl {
-      # Mark test that require network access
-      url = "https://github.com/pdm-project/pdm/files/7911962/mark-network-tests.patch.txt";
-      hash = "sha256:1dizf9j3z7zk4lxvnszwx63xzd9r68f2iva5sszzf8s8na831dvd";
-    })
   ];
-  postPatch = ''
-    substituteInPlace pyproject.toml --replace "pdm-pep517>=0.9,<0.10" "pdm-pep517"
-  '';
 
   propagatedBuildInputs = [
     blinker
     click
+    findpython
     installer
     packaging
     pdm-pep517
@@ -82,22 +75,19 @@ buildPythonApplication rec {
     "-m 'not network'"
   ];
 
-  preCheck = "HOME=$TMPDIR";
+  preCheck = ''
+    export HOME=$TMPDIR
+  '';
 
   disabledTests = [
     # sys.executable and expected executable are different
     "test_set_non_exist_python_path"
     # pythonfinder isn't aware of nix's python infrastructure
     "test_auto_isolate_site_packages"
-    "test_use_invalid_wrapper_python"
     "test_use_wrapper_python"
-    # tries to read/write files without proper permissions
-    "test_completion_command"
-    "test_plugin_add"
-    "test_plugin_list"
-    "test_plugin_remove"
-    # tries to treat a gzip file as a zipfile and fails
-    "test_resolve_local_artifacts"
+    "test_find_python_in_path"
+    # calls pip install and exits != 0
+    "test_pre_and_post_hooks"
   ];
 
   meta = with lib; {
diff --git a/pkgs/tools/security/aeskeyfind/default.nix b/pkgs/tools/security/aeskeyfind/default.nix
new file mode 100644
index 0000000000000..08b2481ff00da
--- /dev/null
+++ b/pkgs/tools/security/aeskeyfind/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "aeskeyfind";
+  version = "1.0";
+
+  src = fetchurl {
+    url = "https://citpsite.s3.amazonaws.com/memory-content/src/aeskeyfind-${version}.tar.gz";
+    sha256 = "sha256-FBflwbYehruVJ9sfW+4ZlaDuqCR12zy8iA4Ev3Bgg+Q=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp aeskeyfind $out/bin
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Locates 128-bit and 256-bit AES keys in a captured memory image";
+    homepage = "https://citp.princeton.edu/our-work/memory/";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fedx-sudo ];
+  };
+
+}
+
diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix
deleted file mode 100644
index 88002fc1ce436..0000000000000
--- a/pkgs/tools/security/aws-okta/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ buildGoPackage, fetchFromGitHub, libusb1, pkg-config, lib, libiconv }:
-
-buildGoPackage rec {
-  pname = "aws-okta";
-  version = "1.0.11";
-
-  goPackagePath = "github.com/segmentio/aws-okta";
-
-  src = fetchFromGitHub {
-    owner = "segmentio";
-    repo = "aws-okta";
-    rev = "v${version}";
-    sha256 = "sha256-1cprKpIFgM3+lUEHNvda34nJTH4Ch3LtTRq/Dp6QBQ8=";
-  };
-
-  tags = [ "release" ];
-
-  ldflags = [ "-X main.Version=${version}" ];
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libusb1  libiconv ];
-
-  meta = with lib; {
-    description = "aws-vault like tool for Okta authentication";
-    license = licenses.mit;
-    maintainers = with maintainers; [imalsogreg Chili-Man];
-    homepage = "https://github.com/segmentio/aws-okta";
-    downloadPage = "https://github.com/segmentio/aws-okta";
-  };
-}
diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix
deleted file mode 100644
index 23022f92b6afd..0000000000000
--- a/pkgs/tools/security/cipherscan/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python3, coreutils }:
-
-stdenv.mkDerivation rec {
-  pname = "cipherscan";
-  version = "2016-08-16";
-
-  src = fetchFromGitHub {
-    owner = "mozilla";
-    repo = "cipherscan";
-    rev = "74dd82e8ad994a140daf79489d3bd1c5ad928d38";
-    sha256 = "16azhlmairnvdz7xmwgvfpn2pzw1p8z7c9b27m07fngqjkpx0mhh";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ python3 ];
-
-  strictDeps = true;
-
-  buildPhase = ''
-    substituteInPlace cipherscan --replace '$0' 'cipherscan'
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-
-    cp cipherscan $out/bin
-    cp openssl.cnf $out/bin
-    cp analyze.py $out/bin/cipherscan-analyze
-
-    wrapProgram $out/bin/cipherscan \
-      --set NOAUTODETECT 1 \
-      --set TIMEOUTBIN "${coreutils}/bin/timeout" \
-      --set OPENSSLBIN "${openssl}/bin/openssl"
-  '';
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "Very simple way to find out which SSL ciphersuites are supported by a target";
-    license = licenses.mpl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ cstrahan fpletz ];
-  };
-}
diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix
index 63d36e99032ec..d36a1fa8a4a68 100644
--- a/pkgs/tools/security/cosign/default.nix
+++ b/pkgs/tools/security/cosign/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cosign";
-  version = "1.6.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-jAkTIO+tmb1vjS2eRWU9Fau7qzPCBlXJCk00iwNpULE=";
+    sha256 = "sha256-TyU5aznt3xra23Q52LUmvWlHYkw0s7E3Wqw9ppmzScw=";
   };
 
   buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
@@ -16,7 +16,7 @@ buildGoModule rec {
 
   nativeBuildInputs = [ pkg-config installShellFiles ];
 
-  vendorSha256 = "sha256-E9zeRlPIIoXo/EfagHC3aDnW747SdsPiqIA384D7NQI=";
+  vendorSha256 = "sha256-WhixkCKW/vQ6J3vJp+KX0JmZxHN38nzzAi5TS2lF3CM=";
 
   subPackages = [
     "cmd/cosign"
diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/tools/security/ffuf/default.nix
index a24b4a8452a76..a3600b89694c7 100644
--- a/pkgs/tools/security/ffuf/default.nix
+++ b/pkgs/tools/security/ffuf/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "ffuf";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-M+wzS/u40zjUNc+63qzkoM9eJ4ruradeJKhhQTP2jxQ=";
+    sha256 = "sha256-m+L78fVsqntD7JfgWS9foUJUhIVr+CtJ6K8etsLuNzw=";
   };
 
   vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU=";
diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix
index b0339846a67db..d9c17f935eda6 100644
--- a/pkgs/tools/security/fprintd/default.nix
+++ b/pkgs/tools/security/fprintd/default.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation rec {
   pname = "fprintd";
-  version = "1.94.1";
+  version = "1.94.2";
   outputs = [ "out" "devdoc" ];
 
   src = fetchFromGitLab {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     owner = "libfprint";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-XHfHPffVp0jV3Md9Gui9v/nyOJ/bTWM3+hiR7WdEsgQ=";
+    sha256 = "sha256-ePhcIZyXoGr8XlBuzKjpibU9D/44iCXYBlpVR9gcswQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix
index cc436a16b5871..e11e76cc971b0 100644
--- a/pkgs/tools/security/gobuster/default.nix
+++ b/pkgs/tools/security/gobuster/default.nix
@@ -16,8 +16,6 @@ buildGoModule rec {
 
   vendorSha256 = "1isp2jd6k4ppns5zi9irj09090imnc0xp6vcps135ymgp8qg4163";
 
-  doCheck = false;
-
   meta = with lib; {
     description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers";
     homepage = "https://github.com/OJ/gobuster";
diff --git a/pkgs/tools/security/pbis/default.nix b/pkgs/tools/security/pbis/default.nix
deleted file mode 100644
index acd1fc5607bc4..0000000000000
--- a/pkgs/tools/security/pbis/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, perl, flex, bison, curl,
-  pam, popt, libiconv, libuuid, openssl_1_0_2, cyrus_sasl, sqlite, tdb, libxml2 }:
-
-stdenv.mkDerivation rec {
-  pname = "pbis-open";
-  version = "9.1.0";
-
-  src = fetchFromGitHub {
-    owner = "BeyondTrust";
-    repo = pname;
-    rev = version;
-    sha256 = "081jm34sf488nwz5wzs55d6rxx3sv566x6p4h1yqcjaw36174m8v";
-  };
-
-  nativeBuildInputs = [
-    autoconf automake libtool perl flex bison
-  ];
-
-  # curl must be placed after openssl_1_0_2, because it pulls openssl 1.1 dependency.
-  buildInputs = [
-    pam popt libiconv libuuid openssl_1_0_2 cyrus_sasl
-    curl sqlite popt tdb libxml2
-  ];
-
-  postPatch = ''
-    patchShebangs .
-    sed -i -e 's/legacy//g' lwupgrade/MakeKitBuild # disable /opt/ symlinks
-    sed -i -e 's/tdb.h//g' samba-interop/MakeKitBuild #include <tdb.h> fails but it won't affect the build
-  '';
-  preConfigure = ''
-    mkdir release
-    cd release
-    if [ $CC = gcc ]; then
-            NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow -Wno-error=address-of-packed-member"
-    fi
-    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable"
-  '';
-  configureScript = "../configure";
-  configureFlags = [
-    "CFLAGS=-O"
-    "--docdir=${placeholder "prefix"}/share/doc"
-    "--mandir=${placeholder "prefix"}/share/doc/man"
-    "--datadir=${placeholder "prefix"}/share"
-    "--lw-initdir=${placeholder "prefix"}/etc/init.d"
-    "--selinux=no" # NixOS does not support SELinux
-    "--build-isas=x86_64" # [lwbase] endianness (host/x86_32): [lwbase] ERROR: could not determine endianness
-    "--fail-on-warn=no"
-    # "--debug=yes"
-  ]; # ^ See https://github.com/BeyondTrust/pbis-open/issues/124
-  configureFlagsArray = [ "--lw-bundled-libs=linenoise-mob tomlc99 opensoap krb5 cyrus-sasl curl openldap ${ if libuuid == null then "libuuid" else "" }" ];
-  # ^ it depends on old krb5 version 1.9 (issue #228)
-  # linenoise-mod, tomlc99, opensoap is not in nixpkgs.
-  # krb5 must be old one, and cyrus-sasl and openldap have dependency to newer libkrb5 that cause runtime error
-  enableParallelBuilding = true;
-  makeFlags = "SHELL=";
-  hardeningDisable = [ "format" ]; # -Werror=format-security
-  installPhase = ''
-    mkdir $sys
-    mv stage/{lib,var} $sys
-    mv stage$out $out
-  '';
-  outputs = [ "out" "sys" ];
-
-  meta = with lib; {
-    description = "BeyondTrust AD Bridge Open simplifies the process of joining non-Microsoft hosts to Active Directory domains";
-    homepage = "https://github.com/BeyondTrust/pbis-open";
-    license = with licenses; [ gpl2 lgpl21 ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/tools/security/vaultwarden/vault.nix b/pkgs/tools/security/vaultwarden/vault.nix
index 5ec014de9593b..f37fbe12f1c62 100644
--- a/pkgs/tools/security/vaultwarden/vault.nix
+++ b/pkgs/tools/security/vaultwarden/vault.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "vaultwarden-vault";
-  version = "2.25.0";
+  version = "2.27.0";
 
   src = fetchurl {
     url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
-    sha256 = "sha256-0uxkHz/oHWl4MdzV7zRVKgkEqOkrl7Fd405TOf472gw=";
+    sha256 = "sha256-r4z45gjVB+RMZM0IE/ec0yf+rt4YDz5IpZEz5FlQSds=";
   };
 
   buildCommand = ''
diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix
index e27851f618d69..4fb28559483de 100644
--- a/pkgs/tools/security/wapiti/default.nix
+++ b/pkgs/tools/security/wapiti/default.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "wapiti";
-  version = "3.0.9";
+  version = "3.1.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "wapiti-scanner";
     repo = pname;
     rev = version;
-    sha256 = "sha256-olqPM8EQ8LxQQM7kqcjbT9RMdBeYdhfn6Qp6BUu8K5Q=";
+    sha256 = "1xyvyan5gz7fz8wa2fbgvma59pr79arqra2gvx861szn2njkf272";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec {
     browser-cookie3
     cryptography
     dnspython
+    httpcore
     httpx
     httpx-ntlm
     httpx-socks
@@ -36,7 +37,6 @@ python3.pkgs.buildPythonApplication rec {
     markupsafe
     pysocks
     six
-    sslyze
     sqlalchemy
     tld
     yaswfp
@@ -54,7 +54,7 @@ python3.pkgs.buildPythonApplication rec {
     # Ignore pinned versions
     substituteInPlace setup.py \
       --replace "httpx-socks[asyncio] == 0.6.0" "httpx-socks[asyncio]"
-    sed -i -e "s/==[0-9.]*//" setup.py
+    sed -i -e "s/==[0-9.]*//;s/>=[0-9.]*//" setup.py
     substituteInPlace setup.cfg \
       --replace " --cov --cov-report=xml" ""
   '';
@@ -107,6 +107,7 @@ python3.pkgs.buildPythonApplication rec {
     "test_true_positive_request_count"
     "test_unregistered_cname"
     "test_url_detection"
+    "test_verify_dns"
     "test_warning"
     "test_whole"
     "test_xss_inside_tag_input"
@@ -118,9 +119,14 @@ python3.pkgs.buildPythonApplication rec {
     # Requires a PHP installation
     "test_timesql"
     "test_cookies"
+    "test_redirect"
     # TypeError: Expected bytes or bytes-like object got: <class 'str'>
     "test_persister_upload"
   ];
+  disabledTestPaths = [
+    # requires sslyze
+    "tests/attack/test_mod_ssl.py"
+  ];
 
   pythonImportsCheck = [
     "wapitiCore"
diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix
index 3943a8f4eef86..1152e66bd8870 100644
--- a/pkgs/tools/system/s-tui/default.nix
+++ b/pkgs/tools/system/s-tui/default.nix
@@ -1,12 +1,18 @@
-{ lib, python3Packages }:
+{ lib
+, stdenv
+, python3Packages
+, nix-update-script
+, s-tui
+, testVersion
+}:
 
 python3Packages.buildPythonPackage rec {
   pname = "s-tui";
-  version = "1.0.1";
+  version = "1.1.3";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1gqrb2xxii43j7kszy7kvv4f6hr8ac4p0m9q8i1xs5fhsqcx186i";
+    sha256 = "sha256-t3h8d0yc7i3UvO8CVfBd3/3h3RfGN6yE6hutymOZUdA=";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -14,12 +20,16 @@ python3Packages.buildPythonPackage rec {
     psutil
   ];
 
-  LC_ALL = "en_US.UTF-8";
+  passthru = {
+    updateScript = nix-update-script { attrPath = pname; };
+    tests = testVersion { package = s-tui; };
+  };
 
   meta = with lib; {
     homepage = "https://amanusk.github.io/s-tui/";
     description = "Stress-Terminal UI monitoring tool";
     license = licenses.gpl2;
     maintainers = with maintainers; [ infinisil ];
+    broken = stdenv.isDarwin; # https://github.com/amanusk/s-tui/issues/49
   };
 }
diff --git a/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch b/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch
new file mode 100644
index 0000000000000..d41bada82def8
--- /dev/null
+++ b/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch
@@ -0,0 +1,177 @@
+From c52a5046e19718a43d48c9b3cfdc121d964e8c3b Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Fri, 28 Jan 2022 17:43:35 +0100
+Subject: [PATCH] Exclude all tests from the build
+
+For some reason it isn't sufficient to set `-DJPP_ENABLE_TESTS=OFF`.
+Doing that because the tests on 2.0.0-rc3 don't seem to be working and
+the vendored catch2 doesn't build with glibc 2.34.
+---
+ src/CMakeLists.txt               |  3 +--
+ src/core/CMakeLists.txt          | 11 +----------
+ src/core/analysis/CMakeLists.txt |  2 --
+ src/core/codegen/CMakeLists.txt  |  3 ---
+ src/core/spec/CMakeLists.txt     |  2 --
+ src/core/training/CMakeLists.txt |  2 --
+ src/jumandic/CMakeLists.txt      |  8 +-------
+ src/rnn/CMakeLists.txt           |  5 +----
+ src/util/CMakeLists.txt          |  2 --
+ 9 files changed, 4 insertions(+), 34 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 169dff5..64b6a07 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -67,7 +67,6 @@ function(jpp_feature_codegen)
+ endfunction(jpp_feature_codegen)
+ 
+ add_subdirectory(util)
+-add_subdirectory(testing)
+ add_subdirectory(core)
+ add_subdirectory(jumandic)
+-add_subdirectory(rnn)
+\ No newline at end of file
++add_subdirectory(rnn)
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index c63d134..01c825e 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -55,20 +55,11 @@ set(core_hdrs
+   ${core_hdrs}
+   )
+ 
+-set(core_test_srcs
+-  ${core_test_srcs}
+-  ${core_tsrcs}
+-  test/test_analyzer_env.h
+-  ../testing/test_analyzer.h
+-  )
+-
+ add_library(jpp_core ${core_srcs} ${core_hdrs} ${libs3p_pegtl_headers})
+-jpp_test_executable(jpp_core_tests ${core_test_srcs})
+ 
+ target_include_directories(jpp_core PUBLIC ${jpp_core_cfg_dir})
+ 
+ target_link_libraries(jpp_core PUBLIC jpp_util jpp_rnn PRIVATE pathie)
+-target_link_libraries(jpp_core_tests jpp_core jpp_core_train)
+ 
+ if (${JPP_USE_PROTOBUF})
+   target_include_directories(jpp_core PUBLIC ${Protobuf_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+@@ -78,4 +69,4 @@ endif()
+ add_subdirectory(benchmarks)
+ if (${JPP_ENABLE_DEV_TOOLS})
+   add_subdirectory(devtools)
+-endif ()
+\ No newline at end of file
++endif ()
+diff --git a/src/core/analysis/CMakeLists.txt b/src/core/analysis/CMakeLists.txt
+index 526263e..1b32f8d 100644
+--- a/src/core/analysis/CMakeLists.txt
++++ b/src/core/analysis/CMakeLists.txt
+@@ -79,5 +79,3 @@ jpp_core_files(core_hdrs
+   )
+ 
+ 
+-jpp_test_executable(jpp_core_analysis_tests ${core_analysis_tsrc})
+-target_link_libraries(jpp_core_analysis_tests jpp_core)
+diff --git a/src/core/codegen/CMakeLists.txt b/src/core/codegen/CMakeLists.txt
+index a905cee..fa759c7 100644
+--- a/src/core/codegen/CMakeLists.txt
++++ b/src/core/codegen/CMakeLists.txt
+@@ -30,7 +30,4 @@ set(jpp_codegen_tsrcs
+ 
+ add_library(jpp_core_codegen ${jpp_codegen_srcs} ${jpp_codegen_hdrs})
+ 
+-jpp_test_executable(jpp_codegen_tests ${jpp_codegen_tsrcs})
+-target_include_directories(jpp_codegen_tests PRIVATE ${cgtest02_INCLUDE})
+ target_link_libraries(jpp_core_codegen jpp_core)
+-target_link_libraries(jpp_codegen_tests jpp_core_codegen)
+\ No newline at end of file
+diff --git a/src/core/spec/CMakeLists.txt b/src/core/spec/CMakeLists.txt
+index f495d67..da827b9 100644
+--- a/src/core/spec/CMakeLists.txt
++++ b/src/core/spec/CMakeLists.txt
+@@ -33,5 +33,3 @@ jpp_core_files(core_hdrs
+ 
+   )
+ 
+-jpp_test_executable(jpp_core_spec_tests ${core_spec_tsrc} ${libs3p_pegtl_headers})
+-target_link_libraries(jpp_core_spec_tests jpp_core)
+\ No newline at end of file
+diff --git a/src/core/training/CMakeLists.txt b/src/core/training/CMakeLists.txt
+index 960437e..4ede9e1 100644
+--- a/src/core/training/CMakeLists.txt
++++ b/src/core/training/CMakeLists.txt
+@@ -39,7 +39,5 @@ set(core_train_hdrs
+ 
+ 
+ add_library(jpp_core_train ${core_train_src} ${core_train_hdrs})
+-jpp_test_executable(jpp_core_train_tests ${core_train_tsrc})
+ 
+ target_link_libraries(jpp_core_train jpp_core)
+-target_link_libraries(jpp_core_train_tests jpp_core_train)
+\ No newline at end of file
+diff --git a/src/jumandic/CMakeLists.txt b/src/jumandic/CMakeLists.txt
+index bef3149..85a8b5d 100644
+--- a/src/jumandic/CMakeLists.txt
++++ b/src/jumandic/CMakeLists.txt
+@@ -53,10 +53,6 @@ if (${JPP_USE_PROTOBUF})
+ endif ()
+ 
+ 
+-jpp_test_executable(jpp_jumandic_tests ${jumandic_tests})
+-jpp_test_executable(jpp_bug_tests ${bug_test_sources})
+-target_include_directories(jpp_jumandic_tests PRIVATE ${jpp_jumandic_cg_INCLUDE})
+-
+ add_executable(jpp_jumandic_bootstrap main/bootstrap.cc)
+ add_executable(jumanpp_v2 main/jumanpp.cc)
+ add_executable(jumanpp_v2_train main/jumanpp_train.cc main/jumanpp_train.h)
+@@ -64,11 +60,9 @@ add_executable(jpp_jumandic_pathdiff main/path_diff.cc)
+ target_include_directories(jpp_jumandic_pathdiff PRIVATE ${jpp_jumandic_cg_INCLUDE})
+ 
+ target_link_libraries(jpp_jumandic jpp_jumandic_spec)
+-target_link_libraries(jpp_jumandic_tests jpp_jumandic jpp_core_train)
+-target_link_libraries(jpp_bug_tests jpp_jumandic jpp_core_train)
+ target_link_libraries(jpp_jumandic_bootstrap jpp_jumandic)
+ target_link_libraries(jumanpp_v2 jpp_jumandic)
+ target_link_libraries(jumanpp_v2_train jpp_jumandic jpp_core_train)
+ target_link_libraries(jpp_jumandic_pathdiff jpp_jumandic)
+ 
+-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jumanpp_v2 RENAME jumanpp DESTINATION bin)
+\ No newline at end of file
++install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jumanpp_v2 RENAME jumanpp DESTINATION bin)
+diff --git a/src/rnn/CMakeLists.txt b/src/rnn/CMakeLists.txt
+index 448ba51..ca09a00 100644
+--- a/src/rnn/CMakeLists.txt
++++ b/src/rnn/CMakeLists.txt
+@@ -1,12 +1,9 @@
+ set(jpp_rnn_sources mikolov_rnn.cc)
+ set(jpp_rnn_includes mikolov_rnn.h simple_rnn_impl.h mikolov_rnn_impl.h rnn_arg_parse.h)
+-set(jpp_rnn_tests mikolov_rnn_test.cc)
+ 
+ add_library(jpp_rnn ${jpp_rnn_sources} ${jpp_rnn_includes} )
+ add_library(jumanpp_rnn_legacy legacy/rnnlmlib.h legacy/rnnlmlib_static.h legacy/rnnlmlib_static.cpp)
+ 
+-jpp_test_executable(jpp_rnn_tests ${jpp_rnn_tests})
+ target_link_libraries(jpp_rnn jpp_util)
+-target_link_libraries(jpp_rnn_tests jpp_rnn jumanpp_rnn_legacy)
+ 
+-target_link_libraries(jumanpp_rnn_legacy jpp_util)
+\ No newline at end of file
++target_link_libraries(jumanpp_rnn_legacy jpp_util)
+diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
+index 53b6c57..c4599d5 100644
+--- a/src/util/CMakeLists.txt
++++ b/src/util/CMakeLists.txt
+@@ -25,8 +25,6 @@ endif()
+ 
+ 
+ add_library(jpp_util ${jpp_util_sources} ${jpp_util_headers} ${BACKWARD_headers})
+-jpp_test_executable(jpp_util_test ${jpp_util_test_srcs} ${jpp_util_headers})
+-target_link_libraries(jpp_util_test jpp_util)
+ target_link_libraries(jpp_util ${CMAKE_THREAD_LIBS_INIT})
+ target_include_directories(jpp_util PUBLIC ${JPP_LIBS_DIR} ${JPP_SRC_DIR})
+ target_compile_features(jpp_util PUBLIC
+-- 
+2.33.1
+
diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix
index 5fb5ec88d6793..5bea259bccafc 100644
--- a/pkgs/tools/text/jumanpp/default.nix
+++ b/pkgs/tools/text/jumanpp/default.nix
@@ -9,6 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-ASdr6qbkSe71M7QmuuwidCa4xQhDVoXBJ2XqvSY53pQ=";
   };
 
+  patches = [ ./0001-Exclude-all-tests-from-the-build.patch ];
+  cmakeFlags = [ "-DJPP_ENABLE_TESTS=OFF" ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ protobuf ]
     ++ lib.optional stdenv.isDarwin libiconv;
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index c1530856096a4..0cdf0f3976774 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -7,7 +7,6 @@
 , makeWrapper, python3, ruby, perl
 , useFixedHashes ? true
 , recurseIntoAttrs
-, fetchpatch
 }:
 let
   # various binaries (compiled)
@@ -57,22 +56,15 @@ let
         deps = orig.collection-plaingeneric.deps // { inherit (tl) xdvi; };
       };
 
+      # override cyclic dependency until #167226 is fixed
+      xecjk = orig.xecjk // {
+        deps = removeAttrs orig.xecjk.deps [ "ctex" ];
+      };
+
       texdoc = orig.texdoc // {
         # build Data.tlpdb.lua (part of the 'tlType == "run"' package)
-        postUnpack = let
-          # commit that ensures reproducibility of Data.tlpdb.lua
-          # remove on the next texdoc update
-          reproPatch = fetchpatch {
-            name = "make-data-tlpdb-lua-reproducible.patch";
-            url = "https://github.com/TeX-Live/texdoc/commit/82aff83d5453a887c1117b9e771a98bddd8a605a.patch";
-            sha256 = "0y04y468i7db4p5bsyyhgzip8q4fi1756x9a15ndha9xfnasbf44";
-            stripLen = 2;
-            extraPrefix = "scripts/texdoc/";
-          };
-        in ''
+        postUnpack = ''
           if [[ -f "$out"/scripts/texdoc/texdoc.tlu ]]; then
-            patch -p1 -d "$out" < "${reproPatch}"
-
             unxz --stdout "${tlpdb}" > texlive.tlpdb
 
             # create dummy doc file to ensure that texdoc does not return an error
@@ -123,20 +115,21 @@ let
         ++ combinePkgs (attrs.deps or {});
     };
 
-  snapshot = {
-    year = "2021";
-    month = "12";
-    day = "27";
-  };
+  # for daily snapshots
+  # snapshot = {
+  #   year = "2022";
+  #   month = "03";
+  #   day = "22";
+  # };
 
   tlpdb = fetchurl {
     # use the same mirror(s) as urlPrefixes below
     urls = [
-      #"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2019/tlnet-final/tlpkg/texlive.tlpdb.xz"
-      #"ftp://tug.org/texlive/historic/2019/tlnet-final/tlpkg/texlive.tlpdb.xz"
-      "https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/tlpkg/texlive.tlpdb.xz"
+      "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/tlpkg/texlive.tlpdb.xz"
+      "ftp://tug.org/texlive/historic/${bin.texliveYear}/tlnet-final/tlpkg/texlive.tlpdb.xz"
+      #"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/tlpkg/texlive.tlpdb.xz"
     ];
-    hash = "sha512-PcXTctrO0aL5C7Ci1J2Z5fa5WqKONhOK2q0FnSbT5+iP9WWSCljyQiHE8C4LYMMHii48y6AJVRkjVIukI3+rUQ==";
+    hash = "sha256-qSV6OZmGHCom2w85WXm84ohMrGGJLZ2Vzj9talDNiOo=";
   };
 
   # create a derivation that contains an unpacked upstream TL package
@@ -157,11 +150,11 @@ let
       # (https://tug.org/historic/).
       urlPrefixes = args.urlPrefixes or [
         # tlnet-final snapshot
-        #"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2019/tlnet-final/archive"
-        #"ftp://tug.org/texlive/historic/2019/tlnet-final/archive"
+        "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive"
+        "ftp://tug.org/texlive/historic/${bin.texliveYear}/tlnet-final/archive"
 
         # Daily snapshots hosted by one of the texlive release managers
-        "https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/archive"
+        #"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/archive"
       ];
 
     in runCommand "texlive-${tlName}"
@@ -209,7 +202,8 @@ in
           (combine {
             ${pname} = attrs;
             extraName = "combined" + lib.removePrefix "scheme" pname;
-            extraVersion = ".${snapshot.year}${snapshot.month}${snapshot.day}";
+            extraVersion = "-final";
+            #extraVersion = ".${snapshot.year}${snapshot.month}${snapshot.day}";
           })
         )
         { inherit (tl)
diff --git a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
index 02a3c148a6a24..e57d15077d181 100644
--- a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
+++ b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
@@ -4,8 +4,8 @@
 "amsfonts.source-3.04"="064gndy9lnmsq2srw5hh97sbdk8gk0qv9zzki00ms3c6rzhd9sjl";
 "bibtex-0.99d"="1w7vpf0kw6vi3hgmlmk0dpzk82kns7a77appx8yg76xcip2xid51";
 "bibtex.doc-0.99d"="13xh14d3v8a9ik4z5kn0y3qff9j6zb83671411in78v46dh3d75y";
-"kpathsea-59203"="1g3nca35s9qnsg7jhj20j5ddrh47ks7qfwhidfbg133mc38ndbzq";
-"kpathsea.doc-59203"="121f7nv9zq4dsy0krd1wkq5yjpbynjav6asafpq5idp1l5haw67h";
+"kpathsea-61937"="1g3nca35s9qnsg7jhj20j5ddrh47ks7qfwhidfbg133mc38ndbzq";
+"kpathsea.doc-61937"="121f7nv9zq4dsy0krd1wkq5yjpbynjav6asafpq5idp1l5haw67h";
 "cm-57963"="1i70pxbx7bp7lzpd4skdymv1a7h8njsr42v8l8jvh4bs3gkmlbgi";
 "cm.doc-57963"="1s5jagrajx29zmpdbqc6qpbcpwgp7g4c3d59ilg4sgcqgd9n5v1j";
 "colorprofiles-20181105"="05nf7y425f8ric57c3afq7ymc7ndxcdahbx9n32jnaz9j3qq2ypl";
@@ -13,8 +13,8 @@
 "dvipdfmx-61101"="0i83g2476bp3zfgdvg11kmls969ip36z1d4w592946547ar2akmv";
 "dvipdfmx.doc-61101"="04zmlbpiclcd6bsxzq2xcssrbnla9wxvw4fx4p52lkija91qv848";
 "glyphlist-54074"="12nmmyh77vr2622lzi11nm1z1k2bxs7jz018yl4rwjlpg0sxg1ja";
-"dvips-57972"="0k89qqz9zx5zh13azpjndfzszgl85hq4513kaayf4k3spy9fn5yw";
-"dvips.doc-57972"="1j0k0sg0j5zhcw2k8aznp9kflmmvw06qhwwlmbhsj1ii3847vxsh";
+"dvips-61719"="0k89qqz9zx5zh13azpjndfzszgl85hq4513kaayf4k3spy9fn5yw";
+"dvips.doc-61719"="1j0k0sg0j5zhcw2k8aznp9kflmmvw06qhwwlmbhsj1ii3847vxsh";
 "ec-1.0"="0l9zf4zs8yw84x5rnyzaggz4idl4kmvj40c03jyxbsxsx6bi8jks";
 "ec.doc-1.0"="013w8hdsln91k13c3ilv36p4vp1263knkxf4m3hh6vaaqcr55aw9";
 "enctex-34957"="02a26lzlkkw3dabxci7w77117n2bagsdk5rlcn4cps45xdbjqikj";
@@ -23,26 +23,26 @@
 "etex.doc-56291"="1nsh69hzpk33ljng9g6drrrb5c59cm58a058damk3s3gzfy7a8a1";
 "etex-pkg-2.7"="01aa6bn8d46ql8aw8kg9k2c3x611jpd5hx3h6g2fqb2lvjqnr1zp";
 "etex-pkg.doc-2.7"="1hcir648vyypvqa8r710mj9qldir9yp2lq7biv3s9w1vl2ssw18d";
-"graphics-def-61111"="13jc8zsds8fah1sryh28kpm4n7wrrcyzn3kgcy1vmlzk17hq7slr";
-"graphics-def.doc-61111"="02klzm6xyr1nc37rqsvczpsi5smfxxnshcryfrsjqjl2v4j5d1m7";
-"hyph-utf8-58619"="14jj24fr6v74vj8wi2a9k9zk9vnrvmy1ni4zn24dl5fdfw75n5ik";
-"hyph-utf8.doc-58619"="11n1blnx9i7q2dlhyhf1dxs2vnldc9r8f3k6diix0i1np8hpz05q";
-"hyph-utf8.source-58619"="1cff5ijmpxc752n6cmpfzn1a10ihrkz7n9l55gz2k2q0a00m2ssh";
-"hyphen-base-61052"="0x41j4zi6gfw54g60mjn3lmzsr4sg2z95zlsz42b8kljvb89jqlk";
+"graphics-def-62085"="0mpkx9jwwabkz79r7agz0v5xd9v2l551hn7cwl7w6b48ywqscmxf";
+"graphics-def.doc-62085"="0345ybrfzjfxx0bgkbv6gv1y2gx4vw63zbvj2394d8lr2sij1snx";
+"hyph-utf8-61719"="14jj24fr6v74vj8wi2a9k9zk9vnrvmy1ni4zn24dl5fdfw75n5ik";
+"hyph-utf8.doc-61719"="11n1blnx9i7q2dlhyhf1dxs2vnldc9r8f3k6diix0i1np8hpz05q";
+"hyph-utf8.source-61719"="1cff5ijmpxc752n6cmpfzn1a10ihrkz7n9l55gz2k2q0a00m2ssh";
+"hyphen-base-62756"="1fridbp66rs1p570s7pi477j15bbdrqn693wb9ga888vrl1fvvm2";
 "hyphenex-57387"="08f915yqpx6qhc2dzbicbv9cijzpgcl4jpifydqcc0x68y51qrzi";
 "hyphenex.source-57387"="0lqn354bskaa6g0bn9g1r3lbb1hj9si5n1ki38awayzp1yj8a3q0";
 "ifplatform-0.4a"="0abhpfw3w1mvpg52xaw3cngl55sszk5ji9a38yab8vhknh3d3jby";
 "ifplatform.doc-0.4a"="1b41nzn666askfc1kkm1lwf05ggf2ml8gz3rrki4yw6ch52sl2sc";
 "ifplatform.source-0.4a"="0g0qvbvv4j87rxps9yypair00z6il5hfjczkrmf4fkycw714sdqa";
-"iftex-1.0d"="1jcwlnm5wzzwr3r67v6d873c0619bhll93qd7f342xw503vqwlsy";
-"iftex.doc-1.0d"="136jnij0z3xk2kp2ldglg6g1qyp66rzzibmm5rpdk24rkrrakg1f";
+"iftex-1.0f"="0dzpfyc2ld4kbdwj457fzmf733792gz1z7n7hpbn6z7npnkg6i8s";
+"iftex.doc-1.0f"="07wvwfxwv641lmk0p1gplv7rsvab87v9fgzamizqvihf2ys506q2";
 "knuth-lib-57963"="0dl8z340n6m6xn7wari4hir0syxqi0kl2fhnf0bvnmkqhqwyzpca";
 "knuth-local-57963"="02cf32f57fr6bngiv9xiw8bh4sq53p9br034ap74s80h3bgcmn1f";
 "lua-alt-getopt-0.7.0"="17czrz46xlbj3xkh4jwdq269mqaq7165kpkhhqa498hrkcgdgaak";
 "lua-alt-getopt.doc-0.7.0"="1zfwvs979c7s16vpv2k9l81mcmm9y4qdjk46l8ik3123dalchv6f";
 "luahbtex.doc-57972"="0w4hfjmjgiw42bpz1b59cla8v4s6kik54q6wdhmdjy6jp91rfl2i";
-"luatex-58822"="0yjx7nw9mgfgnq1givkzbxh7z7ncw1liaddjgm7n2nwn0aw6xfdg";
-"luatex.doc-58822"="0waifnd18hhv03x338mcivcwxlbazkaiasxwlw00s2ksfhq2k0fn";
+"luatex-62174"="0yjx7nw9mgfgnq1givkzbxh7z7ncw1liaddjgm7n2nwn0aw6xfdg";
+"luatex.doc-62174"="1hpjhng5664l4qkrb50d4qgvp9vshg2la4d1myrqc11s7vh72niz";
 "plain-3.141592653"="1mn5cfiaj7wrjij4y0g2mipc6v8dk7l7nc25s1gmgvvyfqwd3byv";
 "tex-ini-files-40533"="0q1g62jg0qiqslm93ycvm30bw8ydmssjdshzsnzl7n2vpd62qfi2";
 "tex-ini-files.doc-40533"="198f4y0bjw9azzck8rz6ml0rpq7g67r37rw8825y8crhpykchp6n";
@@ -53,18 +53,18 @@
 "mflogo-2.0"="0swy70pm0pyqzy1i5wf5hc6cbzn91ihw8hwh9kavdfawb4qzjxxw";
 "mflogo.doc-2.0"="1xqk3nwpi3drkzrnr172i660yx541lxxw3wps0jqbqficqn4fiw4";
 "mflogo.source-2.0"="145hmbxr5x5pj2whra9yify9lyx0ak1az31gvwr3gp5klcmna8p0";
-"mfware-57972"="0kcz1gy17819w77sf0l9m5f6rw8dcapkdbvwaknnrmy50v0jfs1n";
-"mfware.doc-57972"="08bx2bl2xm1bqkrs1b80inzdf4q5djwa8nn0fhbir80z1a3cbf0f";
+"mfware-61719"="0kcz1gy17819w77sf0l9m5f6rw8dcapkdbvwaknnrmy50v0jfs1n";
+"mfware.doc-61719"="08bx2bl2xm1bqkrs1b80inzdf4q5djwa8nn0fhbir80z1a3cbf0f";
 "modes-4.2"="0xg6jpyxni3r3fl6r7iq1vz97pp1w3gh8ccp7w5k51igs3dpvcvv";
 "modes.doc-4.2"="1lgmgg6hhq5h3zgpc9vrbb6j0pif03cjs6gwj20df8md69hzr184";
-"pdftex-57973"="079pv90lpakdn10p2vddzdvi9z5grx3c9yrjfg4k3iii7zdjagx4";
-"pdftex.doc-57973"="0v47bnyd6r2i4z3gy9as7nvl3gylsniikp55ywbr9p13q1s4pwkn";
+"pdftex-62145"="079pv90lpakdn10p2vddzdvi9z5grx3c9yrjfg4k3iii7zdjagx4";
+"pdftex.doc-62145"="0v47bnyd6r2i4z3gy9as7nvl3gylsniikp55ywbr9p13q1s4pwkn";
 "dehyph-48599"="0fkqlsknrlxk8zazcqy4q3nisxr3a4x21aiwqhz8s237rdf3w39g";
 "tex.doc-3.141592653"="0njmxc6l84j44k48qh7d79n3qznzriz2pf8lkj09i7mkkj9fw9lf";
-"texlive-common.doc-61281"="09w78q333h9vbh3k0gnmym2s6xrbbaqbkcz50im37322g8db8zg1";
-"texlive-en.doc-60536"="12krafng9nh1c5lspmw5m006sc4z2pv8q7079sq34880g92nqrav";
-"texlive-scripts-61410"="14grwzvq0csdg5kaqc5yjvgb6nk07w739mg8rpn0ibi4ln4bdwzv";
-"texlive-scripts.doc-61410"="0nlgnvrz6i4zifkarql68z51ahwab7plll50q25zbfdxh9jr5zmn";
+"texlive-common.doc-62149"="0jryb62sw6mgl4hk0b346rzd72a2ixrrp41ilwsbnycl1kbg6644";
+"texlive-en.doc-61754"="1pjzjpyc8lfbx1qdlhrgvla262wi4nniagxmlxs1942xv3x81rqq";
+"texlive-scripts-62847"="0ryhll848sc58hj9q8a26lb9q1lkisq15rrmd0nv14wflzh9d8j4";
+"texlive-scripts.doc-62847"="13di46v2i9ycji46r084wc4x0a6hzyr74mrng050gwis2a8ds01m";
 "tlshell-60747"="1wkqyr71inys08h4j2ssi9s5nl4jx3xkxk5fqv6agqxz62h8607z";
 "tlshell.doc-60747"="1h5mk09sakbmgsppl9fnry28xnzqya3bmp3r1nkzg44cv7kl98vz";
 "aaai-named-52470"="1xs2iki0v1mh0kbqjxnv9r24bcfmgj6myfw7h368h8g0s1n8d5v6";
@@ -85,7 +85,7 @@
 "archaeologie.source-2.4.5"="1gv9495g29hqc0g6in438g8sdkaxwwn2vvp8f41mz033dzfln5bs";
 "authordate-52564"="0caz9s2ra7qqlzdnahhv50z050iyp62ypyrfpbj1p9ih7zmcdg23";
 "authordate.doc-52564"="14wxjyrighkhg51m9jpdyjdwz2ipz4zr1rfgmdnxbpg31rbg2x7s";
-"beebe-61345"="0nnas9j7d6z95rd24bpbmq3wd33py301w7rmwxa5wm0nbb2sl4qp";
+"beebe-62425"="1ipw282kd57giy4d9kqv963jz0mgakhiy4macrbaf33lvj551l9b";
 "besjournals-45662"="1jpp3ayblhwwqzndss91rcns3axr60b8zzxdd6f4qqifhaqczk3l";
 "besjournals.doc-45662"="02s7qd7vvdr6wf00cm7026984s6vphp88iaqhnhk0iiafpr3lk3i";
 "bestpapers-1.0"="00ig29wqb4fn6qw7szmwmv92s19nc2wpapv4pgv8nwsby8nplyrm";
@@ -93,18 +93,18 @@
 "bib2gls-2.9"="1wfgpgda0kagc3jj4xfv0lazzydrlrikbs5bi3kvl3a0dg8wba6s";
 "bib2gls.doc-2.9"="1y4a0i1nv5nprq4z1ncxm5ri3xvkral5gm81dr1ivwip1hgv6zpd";
 "bib2gls.source-2.9"="0rwgk026cfzf48256cfmbm26wzdlkcljx3g18ahi7ka72lm9w1ax";
-"bibarts-2.3"="14lvmv03p5i3d128il90xjys1xkp2q3jr9k2cf8z70hdqdl6j3pn";
-"bibarts.doc-2.3"="0kdxf1cn3av2y8vp8ylks978zqa67g7j5nlbp453s4yz2xnlb1aw";
-"bibarts.source-2.3"="19nq1jydazjk4fpsqbxrwad8zpkgs4nvivf5bivy48lrjnhsmzgh";
-"biber.doc-2.16"="11507rlq3rcvag1xxf8cn55rnnxdaag03hfd6mq42mnki5w54zjh";
-"biber.source-2.16"="1lsvh76vskf50aij9i2vgysnnc75qdc9c0vyb7m4y46zhrx0lvrn";
+"bibarts-2.4"="057710y3yaqkz53y51pwibjjcc7f2llnanfi4yyyvdh4mkvsiqp8";
+"bibarts.doc-2.4"="1l7g0l7s38waz1w3ch17bawcvljk9h8i7vnv005jsj0ww655i4i9";
+"bibarts.source-2.4"="14gwx3hl07k5z02avxv3fd9gw3psyf90ja5xcxcahsmgk55wdbg7";
+"biber.doc-2.17"="0zhavk94smw0dsgypmddx0x08z4hl3ph4hhvzjg7h7g3f86xhvmb";
+"biber.source-2.17"="1pdkxikcacimb89a8m1rf88v0w0dqlvbsrkx1n46anrd6382swy9";
 "bibexport-3.03"="1zbsilzaz68zvmbf2xw7jqw4l66clcplz3l46ggxw95gns8mgqlg";
 "bibexport.doc-3.03"="17a5w095vkpp7j54h8m7f74l7vycsqbv6zzschdb3dd34scq1s5w";
 "bibexport.source-3.03"="1pqs7j4xdhx3pqsc8i0wqnz9jkyg891dzl7g3cv19a6wv82k0xjv";
 "bibhtml-2.0.2"="1sg9x0jrgh2jng9b1pd08i0f8kzhy94sq0mf33as91gr43dzws88";
 "bibhtml.doc-2.0.2"="0is3q2m1xg52h5s9n9403c85yfmpjaqqbh8lgyfqfwhl5qqmgrf9";
-"biblatex-3.16"="1yhh1h1ir9g1p2njcqqnkkzadpl8hphakv17n6igkwmjpdxwycy2";
-"biblatex.doc-3.16"="0h2i50a483ipbvc8wnhqp5sar1kwvhj0na7cgzf0yhxs8r7rfl76";
+"biblatex-3.17"="01wfy9x17435jkd96l5s0qqgyzh3whwhps8afs8vawk7b0zfmjb0";
+"biblatex.doc-3.17"="01k4jlldvrks2qlhnb1cabz9hf4jrb5chlhxjhjza1bpdky2vjs5";
 "etoolbox-2.5k"="1g944zizyl05qz6lq1k13hv9952r97gc1i7is9s5fckz664075jl";
 "etoolbox.doc-2.5k"="05c3kvfwvbg4bxf3wza5rdvh98mnxadf818rsklxa5g2lz44jm76";
 "kvoptions-3.14"="10rv33msjbxkxyvxckxbwzf7y011cgdqgpfqh724m9554s6rlqkl";
@@ -132,9 +132,9 @@
 "biblatex-archaeology.source-2.2"="0shn0bacflcaayajxpdiv9ik994aizpdmlc010shm3fzjdlay79c";
 "biblatex-arthistory-bonn-1.2"="1j0wy272dkzcb96i74qh54ap2hs5wdhmln8akh749fyydsazr43h";
 "biblatex-arthistory-bonn.doc-1.2"="094s5c55lfc7ssmz3mzj61zkxpnn1haj2vh582apzffppgd3fd0m";
-"biblatex-bath-4.0"="1vlkj2gvrki82mg77h1kyk4ngg2r9yfbrr887kvypn4wl32hm372";
-"biblatex-bath.doc-4.0"="0y0j1hdk7kj236civ1ngb03sf24hxd5dxgv4af6xdll6r2ljikpd";
-"biblatex-bath.source-4.0"="119vi9nxizn2l04ghiajp8kpzrvkgrn4yl4qn9brq99drn6hnlr9";
+"biblatex-bath-5.0"="0nznlcay4pv0i76xy7hd7chzajv2as21azpgknprm096sahqgck9";
+"biblatex-bath.doc-5.0"="09b5zczd4qi4vq9ifj4rfi22pb5iid8mkl6j8mmwxr9v6cfk03zy";
+"biblatex-bath.source-5.0"="0cjhk02a79klq62cmpyg1k6g4bz4fcbl50c78ilnqzbgfzfhk25q";
 "biblatex-bookinarticle-1.3.1a"="1gas58hi5ycchbpamm0z9mn5jc2hbry682i4wmba242wm55digyq";
 "biblatex-bookinarticle.doc-1.3.1a"="1s39gixpryiqf44riq5bk3hnp6nc8pdqbdylh594k9xk3770p77z";
 "biblatex-bookinother-2.3.3"="1vb9m88z3cck9gi8d41lsv4ckqli4wjdgwkklfds2z189vbncc4k";
@@ -155,12 +155,12 @@
 "biblatex-dw.doc-1.7"="1879390m7ivmb49fkvkhl7233a33q89hpb2pnyvsscz5km3vv4w0";
 "biblatex-enc-1.0"="0kvya1xzxpcmvwgacb726jqzmgr944y9ljai45f0gdkw855ylmb8";
 "biblatex-enc.doc-1.0"="0mmc5sd1jjnj42aa2q1g1zaps1hla6yayl769i4bya6i1w9r99yf";
-"biblatex-ext-0.14"="1kdfdpy6hsnqdc168s9bysgk7zxgc0a6ky0za67xs55l3wiskdd0";
-"biblatex-ext.doc-0.14"="1hvacmbdq5q9cwpqi9137i5m24bnidg8df5fbw4jdsrnim8pk8n5";
+"biblatex-ext-0.15"="0i229qzi0jax8vjrl2x1pi2v4k7jjs262dcm30w9c6i4z483q5ym";
+"biblatex-ext.doc-0.15"="14vq50axsl3jqbb82gbgvzqc2yaxqsjpr2q6fsmfcxvspsilcf1w";
 "biblatex-fiwi-1.7"="16grb6hqmrhvzryijg6p4q4vf47a0lxa8bw59avlib5j7mqpg0wc";
 "biblatex-fiwi.doc-1.7"="10skq20bmpqymbgxs47z8ac0q5nckyph7s4xwqmpfd7pi2sksb4a";
-"biblatex-gb7714-2015-1.1b"="0rz1gzqswa913mijbpwd7pavxr56nfw9b9c5hj1sgf0mlvd4a67f";
-"biblatex-gb7714-2015.doc-1.1b"="17hzyfg5h00dgznpv11yw05zvlds6nyx431vki73wy7gwp3glfna";
+"biblatex-gb7714-2015-1.1f"="0wmg2mhpqw8mnyy9y1nfkkqnak3cw3skcw01i4vmskbx8xlm39l1";
+"biblatex-gb7714-2015.doc-1.1f"="0ld73f0294g2byk23cn5wh27zgsg208b8qa4x1sjr6p408jffym6";
 "biblatex-german-legal-002"="1x7x5vpicvxdjbbx17s8va3j0m9mig9ilwim2sp674yxjhfdpw48";
 "biblatex-german-legal.doc-002"="0jgkxjcx6z9nc0c6ms1cn1j7h94d2frxmj9i5rd3h37cj5rax25y";
 "biblatex-gost-1.22"="0ar1d77qzhqb2wvxa2rqgfdk006ph5p2h3a4i0ibjbnm61wx2afp";
@@ -171,24 +171,24 @@
 "biblatex-ieee.doc-1.3f"="0mnpgdamgf0f3nr0lbzkhl0ncnf5qvd3g3q4qnw45h30y69cpmsq";
 "biblatex-ijsra-0.1"="0gnm3h0918lvbqwnzk9wkdcafpzz5q3cln2z1sjaylr3mgypykdw";
 "biblatex-ijsra.doc-0.1"="0jl8mr3ai1ybc3lmp7x477znv59az94hlbzaqmvix54rxf6k8f4k";
-"biblatex-iso690-0.4"="0ap3l1j8l45f0wlar9gp537v5dzlhc9b805bp3ijm700csclj0hv";
-"biblatex-iso690.doc-0.4"="1ng5dqk0ch57yrz8macbmm3djm55r4jkrq82bi065a5mxdll1cag";
+"biblatex-iso690-0.4.1"="1nkq6fa443dpxxm1w7fkj04169a50d61zwsvijg2z80ivlfqpn8m";
+"biblatex-iso690.doc-0.4.1"="0y139zpq2xzdwj7ak46wdii3jsnjdywdxvnw5qwh58vvwwliz2cc";
 "biblatex-jura2-0.4"="1wwhlys3s1zb1zp675ikgydpwzkzgpk51phwd67nx9zphdd9h55q";
 "biblatex-jura2.doc-0.4"="14rpa74dq13g4wjd5b28pwivf7frz5w4712p0mld15z9cvlsi5hn";
 "biblatex-juradiss-0.23"="0zi9b67y0p9zdz2n4j1lr5qgd54p3l13c132wjz749mlrv6njfx3";
 "biblatex-juradiss.doc-0.23"="0a6d7awx49cy86ndwfkfq280dwh846ssjkkkrgbq4vxlbmbh2zpx";
 "biblatex-license-0.1"="1fg16xc32kbg493y91sjxjnxpi6jb7kki7yvy3d796w7vy86ljfn";
 "biblatex-license.doc-0.1"="0iy8ad7k9j5x5wnnk196dwsyc5hhz8fl88wq56x80cgfdkg20jrh";
-"biblatex-lncs-0.3"="0iknz957rwpc4h7jkjcsrgznb85knj59zqkkbxrp5awxy8vdm5nd";
-"biblatex-lncs.doc-0.3"="0bqbxrai2kg7888hcja6aj7aflijkg2m4l2s9k3qz38xaw0qqkkx";
+"biblatex-lncs-0.4"="013a3kylcxgnm4fyqw2akjx0bsx2sir0agi8fg9fbw7zflw805v5";
+"biblatex-lncs.doc-0.4"="0bqbxrai2kg7888hcja6aj7aflijkg2m4l2s9k3qz38xaw0qqkkx";
 "biblatex-lni-0.5"="1dg4xa0xkblf3iy9hipjp4wwk46zwq5yhwfsmiwxa63bkjavpzg6";
 "biblatex-lni.doc-0.5"="0d0cx0jvgy2shly976ypmr0k1rrpmiiqc01m2sb9scj558vrf3fn";
 "biblatex-luh-ipw-0.3"="13hh4x8p8hxnyz6cr22lb3djl5advrl5c9dyx6f491d2mjz7vibs";
 "biblatex-luh-ipw.doc-0.3"="0xb2wmg5psd0wi21j1vmn1y8sy8gw78350fqbmpgd6l4xw7bb4gn";
 "biblatex-manuscripts-philology-2.1.2"="0wrhgwkbi468nzh41278mxh1ljsycz0vvch583jaksf26cxi6cpd";
 "biblatex-manuscripts-philology.doc-2.1.2"="1ybl7drbymw9sr019w8jyxir0827kbr8w9swvz64shjzhblkcdzg";
-"biblatex-mla-2.0"="0kvs84szqmkcby304q4vcz6ys030mwdlaybf58693sx40i8902wd";
-"biblatex-mla.doc-2.0"="0dz8rhvqj4s42wys5f9rrnb46hmf2f0f889l4rvdwjz9phaa344b";
+"biblatex-mla-2.1a"="1fdznq1hvym9wgrxd2gsxdi534n5pbx95i8hzkz95zbxfvjpf4rk";
+"biblatex-mla.doc-2.1a"="0i4716ascvd17l0nlf1wn4vddkjkzc85545wgb4cdzj847azm1yj";
 "biblatex-morenames-1.3.1"="1imryzaywyvdr67qcspys9r3mhl5k94vhqjsl16pmz86klq1bs1w";
 "biblatex-morenames.doc-1.3.1"="03p7154s44ga7rlf8ya69qvbwkb6gsiwz8j2wycgzljj0z3plnjh";
 "biblatex-multiple-dm-1.0.1"="11rl82yv0bfy69cmij15np3wc15jss82ghf965r0b1py37vsj0s4";
@@ -212,8 +212,10 @@
 "biblatex-philosophy.source-1.9.8f"="0shk41xppa3a5xzmmbnn3ffvj0908j2k00p9xpf0m5qmls10v639";
 "biblatex-phys-1.1b"="1vj1rrhzh7ncvi2dap2cjk88vdj0dmlpakjiz953rvb7szx0h40r";
 "biblatex-phys.doc-1.1b"="0z3y7gmcmp2p5g25jha6kwkd7ma4pzgqybxra4402p6aid823fws";
-"biblatex-publist-1.25"="077v60bzb6m87srw751bb3ngxlsb3cx0pc35lqq063hgz3yf8ywy";
-"biblatex-publist.doc-1.25"="1w3qgnprk0x4r1992pk378gzm9qpk44p1pmfgynwq0dnsnd008lm";
+"biblatex-publist-1.26"="0i50fmkzdi8yp4yrp4pin70iv6dk13a3rigc9ny89z7bgw8jnn7s";
+"biblatex-publist.doc-1.26"="124i6rx1r4xy0x9q04cqrkmv287vgbda43cc9nsx87gswiay7jzf";
+"biblatex-readbbl-0.01"="0byz95nahaassfx1gpl80p4vgc2bhs9wfw9w7xxwan6b1kkkz9p2";
+"biblatex-readbbl.doc-0.01"="1cp3r5j8b7zrl0k7zzhyjcrw9nypmr6gd7mn1q5whn7n1dn5js5c";
 "biblatex-realauthor-2.7.1a"="1xv65ic8ywf18fdb246sr8pvq60hv4wmg7ris1glr5104g5yhg7p";
 "biblatex-realauthor.doc-2.7.1a"="06nvybm142cd1shgpcabddbrfyvzcc3yxk9zyq9hr3rfhzcqf05q";
 "biblatex-sbl-0.13"="1qlqkzlr3zp2igrhbcxgd7xm6ypbl9v5zmclwzvfp9c2hlpb9ra3";
@@ -224,13 +226,13 @@
 "biblatex-shortfields.doc-1.0.1"="1fs56vf86wwpaz1ik846r83zd9bpidrzzwv4l6jhxss8hgww6y0w";
 "biblatex-socialscienceshuberlin-0.0.1"="0fj2l2wxawps79v81s74jr4d8wz4pf45mmpry1pflm2zcica3ajd";
 "biblatex-socialscienceshuberlin.doc-0.0.1"="09sf6k9qghwll84bj6m7v0xw6zm040y6n878x0ywiq64jc33h0np";
-"biblatex-software-1.2-3"="146mr457mnvjsycsy10842mvn0gd81ij2wglkyqf5rvbx4dwra3z";
-"biblatex-software.doc-1.2-3"="176vrl0vw1f9jgln390y2554kbpmdyw87zsv7i7mc99y311sz3j1";
-"biblatex-software.source-1.2-3"="0jig20hy40f90iq3ywp1cf7ms7xcm5ccw90f17iayz8g2hrn2nrf";
+"biblatex-software-1.2-4"="0818bq99vqz0pfn01g1j69sbnm5iqn7dgss385s585hsg3wjh9bw";
+"biblatex-software.doc-1.2-4"="1wm1v1kwar3gj296dpynjqk4q2vqhw9p2j49c0hf3b1rpkpiqhm1";
+"biblatex-software.source-1.2-4"="0jig20hy40f90iq3ywp1cf7ms7xcm5ccw90f17iayz8g2hrn2nrf";
 "biblatex-source-division-2.4.2"="09wsi1nj7hcf5nswkd6syn63xhk2ghaxikz5xb5sfyci0lmnqgxc";
 "biblatex-source-division.doc-2.4.2"="1mfz2bxfwx24a2652n4jrdw1mhrm1y7i5vq54rs7sp5a1xfg2d9q";
-"biblatex-spbasic-0.03"="1rday7vc0gm8x9zxgy0w1zypj30lhrzr2i3dard63ybcqa1d4d27";
-"biblatex-spbasic.doc-0.03"="10b4q35b1krradlq78i1ndwlb0yi6n618520rypy1v5av7ik9ghr";
+"biblatex-spbasic-0.04"="1pw2925wakr0wgcm33vbmqgfqnglzn8g04fapnzrd6s0h5155zc1";
+"biblatex-spbasic.doc-0.04"="1p0fbxqyxiw3ihiw69z6zbv2g8pbrpdiad98iwxx5j12sm6g5v1m";
 "biblatex-subseries-1.2.0"="1c92azsgrp1cmq82ga3cvnca5s4j902hcncp64g9psgl9fm74nwx";
 "biblatex-subseries.doc-1.2.0"="0ri6vvzcpcm2hz73dkam0fgbnfm7i650x983qcngkr0jqa43xr41";
 "biblatex-swiss-legal-1.1.2a"="1sqskc93a3vdxvycmdz494kddxvzpf6rgw6l184lizwnrz9mr8v0";
@@ -239,12 +241,12 @@
 "biblatex-trad.doc-0.5"="1m32xykdgms8i4aqny35w0happr6vbkkra9m4nasxp1vzykf0n63";
 "biblatex-true-citepages-omit-2.0.0"="1lqs1swmdmnhard0589k0r8gz3hp9bd88dz5z0kd0586vl7z2l82";
 "biblatex-true-citepages-omit.doc-2.0.0"="0madnjxwjlz9hs6jzgaady4sv0878v7fyjs3sn1bcnzyw4krfxgx";
-"biblatex-unified-1.00"="094ddmm1g0lq4dblgp8a87y8gyiab9flcca98fwnyh6jw2nmgk08";
-"biblatex-unified.doc-1.00"="1iip60hifs3xcrpv9zp9d7p3wn4iw8bfjiwqw3z7rhfk02fqn8yw";
+"biblatex-unified-1.10"="19d94nnrwd7wzav1b56hsvdzpcpyfpz7jqpfjizfs4mirm3gd0a4";
+"biblatex-unified.doc-1.10"="15h1nknr1jp7r92vm2cfgzcgpa5rxd8kl7d5kf5pdp825nlp5h0m";
 "biblatex-vancouver-0.1"="19ymkk94c4l5sav1lb66f2lxjyfzzi1s78qd2a8drjp9q1c6i0j8";
 "biblatex-vancouver.doc-0.1"="0wn26kl4nli220lfs663rdqmv49xgi76kjgnlwh99yljx7v47n09";
-"biblatex2bibitem-0.2.1"="0p58v87nyc9c1canp1b5y8wny1jibw9z5659fi96qbfqmkn0vw89";
-"biblatex2bibitem.doc-0.2.1"="0bpbsaasi6kq5ggs3cpkmwlakdlymd99rfr028q5xj42ir8cba3h";
+"biblatex2bibitem-0.2.2"="1l3j9v225f9g2zmishkfvimd08di89p39g0sqffdwx0psj99dw5k";
+"biblatex2bibitem.doc-0.2.2"="0bpbsaasi6kq5ggs3cpkmwlakdlymd99rfr028q5xj42ir8cba3h";
 "biblist-17116"="0z69a5x3czy0hb59c93jrkmmg6i66vc7rw6szvchsbsj1c6gwjfb";
 "biblist.doc-17116"="0wp7x8qj7bh1pgcy01jmq35r2i1f8yvrv6bcr8p68d70sr1jqspn";
 "bibtexperllibs-1.6"="0c083hg8hczwc28q0c9gw4z1bwj5w3krhrs5zg15h0s808ji32xq";
@@ -258,8 +260,8 @@
 "bibunits-2.2"="0znv09kqrwvmsjsw3lx9d3mp6fm8444zbn317q5yn5hzg2dyj61f";
 "bibunits.doc-2.2"="1zgj4jpl0fpmsrcp3h4qlkilflmy8zqhjamghidwzkkg1i9jsfz1";
 "bibunits.source-2.2"="04lswyalfivh01hp1wj3fq1q8960dmsvnbi8k856v3dhz0pv0whz";
-"biolett-bst-42217"="1ap5arz0s65bqqfllzwxisp3wa327kgivw1jh1gkc4wljq7v4jq1";
-"biolett-bst.doc-42217"="03hj647j6b7y43djqvb28rkjixpr0y7i02420piskp3cg90hn5dj";
+"biolett-bst-61719"="1ap5arz0s65bqqfllzwxisp3wa327kgivw1jh1gkc4wljq7v4jq1";
+"biolett-bst.doc-61719"="03hj647j6b7y43djqvb28rkjixpr0y7i02420piskp3cg90hn5dj";
 "bookdb-0.2"="1qky1ccqyni9x3dgjn6s36qyqdqzkj65m2glzzqdc4qs2h1hqr0q";
 "bookdb.doc-0.2"="00fr2fid8yg3ww2gmgadxx90y032vrgicjh23ia41r159clg7fqp";
 "breakcites-21014"="0f3zhwrk0wapckz83304anlp2ssii7nvzjdakbxfdj51cd6schpg";
@@ -278,6 +280,9 @@
 "chscite-2.9999"="0db7nrmm5r4b2cvcyjfra1fmskjaspbgymjsl4vvif9j3kwaa0ba";
 "chscite.doc-2.9999"="1q5s4qj508nqy74cdcg8380vjbhs4v70a4jkr9wdirqcxjxs6yfn";
 "chscite.source-2.9999"="009a8y3lxpxjhkd05fcf308k3fihl95pcn7r2bgy57jr4nalmixx";
+"citation-style-language-0.1.1"="1zlblvg8m8xz53zfh8izfnalklq2szp32mm8n8w3mpil7wsgvgk5";
+"citation-style-language.doc-0.1.1"="12g4y7m3c4sxzpd78jd13l1v4w4rlb9bgs1v3y0xw8qshqvhd9xq";
+"citation-style-language.source-0.1.1"="19ndqivipmsqfqj4fsnlk3vr0zip5zn81011vrqv4cbdryz494by";
 "citeall-1.4"="05nb6pywcrhqi1c9xfzkv46j2fq9y1lqmqawi75v3z56h2v6c136";
 "citeall.doc-1.4"="1p54cr0khq72z396r3vl0p9qqn2k82pmx4pjaszlzhni5v54hbdr";
 "citeref-1.1"="05bxlkylmilyzvbl99nsw16saqjsqb4bcaa68qkz8m59wz1ji4rj";
@@ -300,9 +305,9 @@
 "auxhook-1.6"="0c92za082vzi47m5dlwq8bss4jjgfzmbbaaz5j1yb4ngli9qj08y";
 "auxhook.doc-1.6"="0l6xga3hr1lvhgli259ma78rq394jplnkn5j8fgrfapvzrhsh2kp";
 "auxhook.source-1.6"="18q0lawz00fbv9mgcbp21zk6fm1hsprmrkvhnl34ac1qj1rx6x3p";
-"babel-3.67"="0m0z5448qir5yq2vfwrp8sxcj3lgjq0ffjxxgvzi6gy1bmgyvpzh";
-"babel.doc-3.67"="1j3wl5fsdbss0h0x7jlccn4c8sfy9jwybq3p7brr8kxri1m59gcq";
-"babel.source-3.67"="1wryf87hcvcj01m6r2rl4xmazbg8b31wpdzn4lg1dwlvvx3dbsd0";
+"babel-3.73"="0sgmkvrji515pqq92l4b2d97xqrrr6za3kdbmhp1lbbpdvcffijs";
+"babel.doc-3.73"="11czgqilds0h4nb9d6a5mypd9vgpgc7z0www75l34v55zq9nnfrd";
+"babel.source-3.73"="0df6sz4631kl543v7wx3mcawk42fkmlb0ry2sx84dfk64pvqhkk0";
 "babel-english-3.3r"="1nb3c0yikcfhlpfsqgx2c6549ra7wcbcjs614d7gvk5fyh0cds8y";
 "babel-english.doc-3.3r"="0jfjdsiqkg0sfy326nz6rncq9sk1ssjzb0w2frybkp348gif3rv4";
 "babel-english.source-3.3r"="1q9bgs6mdgjlg3pv2ddrwbnfb628dr6rhdsgkf7rnwm5m6ncxkxh";
@@ -358,9 +363,9 @@
 "hycolor-1.10"="1dfd149g2k8cq3lw95z6r4knyq1mgirdqnk9c4lmd7ip4rcs0vi5";
 "hycolor.doc-1.10"="1pc12vbn1yak6l6c1fgpnj0s88fg94nagj4b95mvclad6b546g71";
 "hycolor.source-1.10"="1f5jv91vsib5vk4byr0481a8j5pvbwmhfqz2qd14ck2vw8laz4ap";
-"hyperref-7.00m"="1gqgxg20ijmz4v60zh705vc3yxxif3jg1wm83hz0rn72c0k9zmlr";
-"hyperref.doc-7.00m"="0khhj1pmrnnqjwj56kxysm9xzxbiw914wpz11y7kagdvlwnh9vl0";
-"hyperref.source-7.00m"="1vb0gp8rvl9xisilz59zwxrl0wx5ihislm97ydl9ignh38lrmfdf";
+"hyperref-7.00n"="0syn1q6wcnqygh9lmaz6dxgx1153gg2s4an4ynskyrx0aa8rlyh9";
+"hyperref.doc-7.00n"="142xxbdyx11vzgaxmmflig97jypfbgyydz7w6n3r4rp7axzk5w6h";
+"hyperref.source-7.00n"="0fzp6hhhrvxvcd5r3fhk3girdydazkcw61cn2r49nwpnn1h3m9v4";
 "intcalc-1.3"="0llrnayqwdqxi91yh7panbbiljina3bynv2hxhi6sssaw3pyd92l";
 "intcalc.doc-1.3"="1vav25plm639410p59bi7bsihsyys9yaddz0bcawxn72zi9b96r4";
 "intcalc.source-1.3"="059pqs3f821javya7brxvl9v2mifdyw1vg18hr1zgzhj7bmlxh14";
@@ -391,31 +396,33 @@
 "stringenc-1.12"="01xnfg0mcp94dh33rfzphk50kjb68bw76kf7jnbsnjwlqf2cr5pq";
 "stringenc.doc-1.12"="00hbmjwhas4fpcx1yg016ggqv324hdc2aklr2nx5m5x0i68xq6qa";
 "stringenc.source-1.12"="1ir6041286fiz8c5zpsbl4cq62gzdrdpj50aqv5p6b1lqd8bsfp6";
-"zapfding-31835"="17mls8wilz9api9ivsbcczpiqp1f39qy8wa6ajssi8zhnc5lq7zn";
-"l3backend-61303"="0qm187pripx035zfjvhhhq9v1pjqncgrihbrb68403sc7p5n6j4j";
-"l3backend.doc-61303"="17wficlz8kzvppzfr8sk2v5zpsp63jc3r44na0g0617akh80p6ll";
-"l3backend.source-61303"="0yp5fv12279ryw138i4qr1gg741k6dxmiwgkra13ccxbbwq6ynp3";
-"l3kernel-61121"="1i9168cb9w9453j2lil05hsldp7dn31qvv5spmq3rnyrm3gywwg6";
-"l3kernel.doc-61121"="0k5a6pbw5dl04n4qscm7zwg3mwarlsqmv0ci7asgrx2g8r7w2c8k";
-"l3kernel.source-61121"="097s0pgm05h8djqdxdzbgcag8j89vzhppq7zwid3sbhgs0la3wgm";
-"l3packages-61040"="03fsn8icdwpx9qzkhm01ig42kibcvrlwdcpsk0skyq14k1fcziia";
-"l3packages.doc-61040"="0kbjvyfqys0qdfbikxzryndvnk5q4mnjbzad5vzi3pmfsv8fp5f6";
-"l3packages.source-61040"="1nd57kbcav7ca8cma94il4vljcs9fpq8xmms8x6jc9kbnv3w5rr4";
+"zapfding-61719"="17mls8wilz9api9ivsbcczpiqp1f39qy8wa6ajssi8zhnc5lq7zn";
+"l3backend-61931"="15jdr3b0760gd394x98cnxhvmxv6swgvr35m641s6b9w3bawgihc";
+"l3backend.doc-61931"="1dxldmc3173f2fax68znkppizcv0w67r1xfcr24lraczp2ql4b6i";
+"l3backend.source-61931"="02b21a39a8f632jj0mzjh49hbvrhvxlphn0drzjrq187lk5l2amv";
+"l3kernel-62165"="05r3ijf3jinjc9k5pc6bjnsnqv4y8i9qj3g26r8dllhj9zswdi9k";
+"l3kernel.doc-62165"="02p7ycn52xwq598qzvyxq9hr5ks1fjqgi38h00an69k482hnm8hd";
+"l3kernel.source-62165"="1h78rw4jsfmf7wq1xnnzm43k325m0xybwkqhn9h9x649gh7dv4jg";
+"l3packages-61588"="079h3iff65zk46yfwdn3jx5zmpz8g40dsirbs5dbbzzgkq6kg530";
+"l3packages.doc-61588"="1j7ia62s8gf8nbxif6jqxw6rnbrm5nvpkr9v8m6yi3mz1j9znwa4";
+"l3packages.source-61588"="137cmr5bjvn1496cfk7fxj56wqh9ixv7ci7q1lga8h3x3f0bny0d";
 "latex-2021-11-15_PL1"="1xdfikfw3g44yfyzghg93092ff98nbi5pfjjszjiq4raxci8m2p0";
 "latex.doc-2021-11-15_PL1"="16qy495sq5l011kczwnzdjinif234navxd0r6cj5csvdhqal0rmb";
 "latex.source-2021-11-15_PL1"="0rli1iji063xb5ak4k3vvycv7m24px6lb8kdgxyz83x8l9xq94di";
 "latex-fonts-28888"="0dh4kgy4mfarlsrgqw4dm5zgfhcfg9qzh8s2wjk6w2g0jfc8rf3v";
 "latex-fonts.doc-28888"="0243qbrs2w7qh17nh8m4ivj35gfgxsnqxza281cvhh7g2fv47f5l";
 "latexconfig-53525"="10ynmd8b9b9l1wl1mva23yz4zir53p6r5z31s39wmxz19pj12qvx";
-"latex-bin.doc-57972"="1mkiqwq28lbw9iaisfza1xg9wss4zazx9i2szprqgjfkw5c0yipi";
+"latex-bin.doc-62145"="1mkiqwq28lbw9iaisfza1xg9wss4zazx9i2szprqgjfkw5c0yipi";
 "everyshi-4.00"="0y738zcqy85ww3mhwgrj1qh0vgpwfh2ib676wlr514xglvmp9l3n";
 "everyshi.doc-4.00"="0ynjq4ibx6rr0qh5lajb5n9skqa3j4zyi533mxc10axp5zpxsjkx";
 "everyshi.source-4.00"="0iqxf73n3l1jf32x571rw5wqwvz7nj3bvyqzgizvfpbnavqhrxfb";
 "lm-2.005"="1b4lc6ipij5iws4rgpv3sjjwrdbaxnwiqdbyyj62jzc3yk999m4y";
 "lm.doc-2.005"="053xga559cmqggdifabingd1f7q1lfad1pkk9nmkximclq5igg2d";
-"luaotfload-3.18"="1c3n2py9qnzvs90nmgfy82q71djgxjncllwzrk45ybxhmbbkkxnl";
-"luaotfload.doc-3.18"="1ynb74dq6wqsvx0yszm1rblbmzwn2mdsqkddxk3vl4ns6wzsg1m5";
-"luaotfload.source-3.18"="1jmvglj1mv766cxzj6bnagrlby2z7w3gkpqls19ic2g9a154i62c";
+"luaotfload-3.21"="05jis09pcsbs3l7fn5grall4x0k71yy60pmaykjbw5ab4b3lbn6g";
+"luaotfload.doc-3.21"="12nhk0zba158687cjbkmcjvcnkddd7603xq6zf2qfwip3jsm0lhz";
+"luaotfload.source-3.21"="1jmvglj1mv766cxzj6bnagrlby2z7w3gkpqls19ic2g9a154i62c";
+"lua-uni-algos-0.4.1"="0msiywf33b5jpdzc66wyvnklvmvs4cpfq3f6bsplgi22x8nvdrvp";
+"lua-uni-algos.doc-0.4.1"="1sfswdkhbjrjd4cjj95lbc1sq30j9y5xi35lg3mjfpdinq43wfr9";
 "lualibs-2.74"="17v4m96nlmc4w4w4009wrg4l0racxmn4cnb5xj7s064z913wi51b";
 "lualibs.doc-2.74"="07nld6rv0vka8418zdpcvkpdja9iv69dijnncvjcglx79slhjgna";
 "lualibs.source-2.74"="14mjjrj90n6y4h2zw3layg4fg6zm5s07pf1iy1x6lzmqgad83z1b";
@@ -423,8 +430,8 @@
 "mfnfss-46036"="1m0yza8nw5r3ph8k5nihgf93vf54cb0cnw4c5gkqy0rsd23hk4dd";
 "mfnfss.doc-46036"="1ppjjma5dc5i9ly5y7h91647nw9c2y9w65k0dn1ks92xsvnzf1mv";
 "mfnfss.source-46036"="0qjz8dz76abwqspab89z3a50nndh6gflanr8hn31z5fra3kzfp90";
-"mptopdf-57347"="1r7m71i3cnyf3q5nlg6c3ialw6vmch48sgf0flmd63y6n21zjsi9";
-"mptopdf.doc-57347"="0hw66p8gbd91ddpiifgm4qbd4vv2dbc149k299nb6xxp93hh44yp";
+"mptopdf-61520"="1r7m71i3cnyf3q5nlg6c3ialw6vmch48sgf0flmd63y6n21zjsi9";
+"mptopdf.doc-61520"="0vslbvfk3az9sjhgy4zc10i4br7csgbfgwmgylzhz033rcc154r3";
 "natbib-8.31b"="1wxpcyr1b6k1rzizbz2g452klrmr6xh98csqr6pawlnx2zy3sx5x";
 "natbib.doc-8.31b"="1hai95c7ah61rqrsvzvn0ppvr7pn10830dp7wn7fc0j678z9r3js";
 "natbib.source-8.31b"="1qaxwivq95pf014w39igh070cnbs7n0k5am4waxvdwkzql1fafpy";
@@ -445,7 +452,7 @@
 "psnfss-9.3"="0ng5pkk6m2l8yqd58wggbakbs4hp4400r4ihyi9akf8j4kmq2s5y";
 "psnfss.doc-9.3"="0vfv9x1qsivwi6c6hi23vw0jcjz9dclx0vxnifslyzlrh7592dzc";
 "psnfss.source-9.3"="0cqpzra8jwdn9d6w4mhmfrfw2zia2nbpyxjfrcz8m1disd10lhsf";
-"symbol-31835"="1pdkpr86bhia5hcmf7q3nhvklnsga4mqqrrirgl8a7al7x6q3ivs";
+"symbol-61719"="1pdkpr86bhia5hcmf7q3nhvklnsga4mqqrrirgl8a7al7x6q3ivs";
 "pspicture-15878"="0i41lg0nw9xya0gfiwjd3xgbk0w723g90gnsvnfg764s2dl371b8";
 "pspicture.doc-15878"="1p27zx0svlcm4p12xjq35g2lgj1j485c3x363gciqb4aswmlsl65";
 "pspicture.source-15878"="1f8lhyhfcywn5y78354r37bgalyq57bm1fill5vzny3l7cyqxxn4";
@@ -471,8 +478,8 @@
 "doipubmed.source-1.01"="1hzv0iaj8rxblqxiak3n855yw8gqmxz7l8jwf98qnbpb9cm01f0i";
 "ecobiblatex-1.0"="0mrrb3bm54d6rpwg8i534wmwkh7v6qzysvd020pi5pph967lqp54";
 "ecobiblatex.doc-1.0"="0mhwspy6k7ixjjxk5frwklasm0xzwbwk2lx684ikv195nrpb6y8b";
-"econ-bst-3.1"="1bn3jldxrxv2715h4crz4sjwkiaan07gm8x65zhj4nf6l914412z";
-"econ-bst.doc-3.1"="1cq5sg6x9yxzrd8vjfb266gs5abiam5si9nx4i9b9cfxpvi3arps";
+"econ-bst-3.1.1"="0wdzjilmh9k73q25wdprppnjc0xkas62g50spkdrnvr4pagvnvch";
+"econ-bst.doc-3.1.1"="0y6qp5hn658gfwavkq4s6s8xfxy6lckpfsc1zvpy7jc5vkhhpwa0";
 "economic-32639"="0jyw807d23b22md2ib7xkgi2jh4mr50pczjbsylh2gdgsplxgaw9";
 "economic.doc-32639"="18jn833w1chbi0qamdxbrrp39945drslxd2jkzi2g8wcca7l5b71";
 "fbs-15878"="18h6n8azrnk2qabv30kpa8gmj2ljkvx0nqs8qb9r8dxxnhng78ch";
@@ -483,8 +490,8 @@
 "footbib.source-2.0.7"="0ps56l6ah0i398f38bxy4yg2i1p0ajcwczxq222hl5176g2z28jb";
 "francais-bst-1.1"="1jpqkxaplcjrvc8647rj4xh9kyaqrk3yj7r3nrkyf4r7b0vwq2sd";
 "francais-bst.doc-1.1"="0v2828gxvwhljsf578a06pbk1fr3dfl15s9xchy5gpb3cmv2xg1n";
-"gbt7714-2.1.3"="02jrp1as3cx3qxkh7vxg0fikcby32slflfysf7i0i7w611zfm21k";
-"gbt7714.doc-2.1.3"="1fm5lyrilq2mbpp406h1h15rhcc934hlnrpi9ygl0g8hpzn1s8jj";
+"gbt7714-2.1.4"="1iwac8hjr5fxngvxn68brivwn8y1rpkzllsgi07gy4ii6rxq0r48";
+"gbt7714.doc-2.1.4"="1qz7b4nv9nmwz4qsf6vyg91l2vz73nya29ps83faanrcjzh5k1ib";
 "geschichtsfrkl-1.4"="0vnxskd0vlslm3jhvpvb4ihzlssdrz5bywrxxysk6c391vyq3w0q";
 "geschichtsfrkl.doc-1.4"="182m0m7lfz5wz017kb6kk2jn5vkmsll3js0sd4pqmr6gb8av44m9";
 "geschichtsfrkl.source-1.4"="0hdq1lkgmcpjk7f8pl2q3c6rin97hdzwhfwacc43m1l3c8zbmqfr";
@@ -590,11 +597,11 @@
 "adhocfilelist-29349"="08fnrvnbrp7534b56hn8w0nm8pbgjli62v34mkalp4qkfb559kh7";
 "adhocfilelist.doc-29349"="1n7nah8vr691k56z0jkgyav4lc8w45rlg8k9shhqhnnpqi8zxv1m";
 "adhocfilelist.source-29349"="1xl0f33yhmbsrnmy9pby092js83vxcdaq2gfny08pjlq57arphr4";
-"arara-6.1.5"="0jsbmq479dczf1r4k8wj3ahw448fzfwiq7ks5i9wzrd4m6z322z9";
-"arara.doc-6.1.5"="1p3b5a2a2dsfmv0vjd46xd3sb50qiwbadyq3f8iwdljh1njfi919";
-"arara.source-6.1.5"="1qy0lq1x6dv62cwzg23s3n3vlcgqb11fg12kzjijxfjh67h14ipz";
-"asymptote-2.70"="1a9m3rkmsw5msfj289931x4f6j5lbz711avx956vi0kn01ppcrs2";
-"asymptote.doc-2.70"="0cbcr51gl3s2g2aqh60jsp6jicvvkdl0hya88wkkjanyw3dzbv3z";
+"arara-6.1.6"="16n6mgzidhviw06179iml34gr9sys4mkaqp3pq16y5lyagr9xrw9";
+"arara.doc-6.1.6"="09gq8zx61cpbllqlsr30m4gzfc61qxyvrjf5fdhqnrhngg33d7d8";
+"arara.source-6.1.6"="0nv976qhkcmfhf8wzdjbnb7r8yhhzid0mxxiqgr1w88pppn51vzj";
+"asymptote-2.78"="1a9m3rkmsw5msfj289931x4f6j5lbz711avx956vi0kn01ppcrs2";
+"asymptote.doc-2.78"="0cbcr51gl3s2g2aqh60jsp6jicvvkdl0hya88wkkjanyw3dzbv3z";
 "bibtex8-3.71"="1hi24b8mmpnz17cfj0p40ipyvzqhgkkhhgh7qkcgr1bz9k82q7sk";
 "bibtex8.doc-3.71"="1acay8y0l6gnczznxprl4h3bx7jaxdqrczyvdgin5z8yqhx0q13q";
 "bibtexu.doc-60002"="1h0kh81vf5z752v1s46zs0qvlqhqqzq8ip427317xhq186i71ymw";
@@ -622,10 +629,10 @@
 "ctanupload-1.2c"="1dvqr96ir3gakxrf4fk0dka80inl6aj3kydcf0128vlq168zgvsg";
 "ctanupload.doc-1.2c"="1gzfib72lfbgzcp5r8130k1n2d00v2kds0x8zdkqnikn22fq4jxm";
 "ctie.doc-1.1"="1xz0b4ja9vmx42d6391zdvrfvvnn82qb3xdjhpyly6b9j02bbq3c";
-"cweb-60085"="0ds2kanfw343zlyc28sfmshp4g1gvdvnhqlil45azjaqyz3603w1";
-"cweb.doc-60085"="1kicmrxxcnk928gl0nkk4d7mh3jnnylgz828s4myi64y2ms6a8ww";
-"de-macro-1.4"="1zlmrrb1x4sm0y6igxxcgh7drf7c6rqfgm8pk1a7bfv5fdmv4fln";
-"de-macro.doc-1.4"="02zxl4xpbyjs5vwg5cskgfh3w2ls2bxlyn50smh0kcqas46vn9a4";
+"cweb-62023"="1bgwc9ky1wm2dr5fglpxg2w0zhfwnpviim74jyj9sdfbfng3l08p";
+"cweb.doc-62023"="1kicmrxxcnk928gl0nkk4d7mh3jnnylgz828s4myi64y2ms6a8ww";
+"de-macro-1.4.1"="1zlmrrb1x4sm0y6igxxcgh7drf7c6rqfgm8pk1a7bfv5fdmv4fln";
+"de-macro.doc-1.4.1"="02zxl4xpbyjs5vwg5cskgfh3w2ls2bxlyn50smh0kcqas46vn9a4";
 "detex.doc-57972"="05hgi700kd7072h4x96bc7lx2p4cbwlfgfkmng0jdssiygkwrmyh";
 "dtl.doc-0.6.1"="1fjk69m1dyzhc8arygk26kwqv1p1yac2l9pca0x7xg3awc8nhgp9";
 "dtxgen-1.08"="19c9w97wjyrq6g1j8n8qgaclx141lv2j6z6l5h13gmkmyw08vwhh";
@@ -641,7 +648,7 @@
 "dviout-util.doc-52851"="0niv5zy6vksm2qqqz3bjd417ylq46bxz6sra3abp9k4c2bpr0pz9";
 "dvipng.doc-1.17"="0clgfwglxqs4xgzh2d9jjb91dfm0awigg0mv1r4sbyr4l21vciaj";
 "dvipos.doc-52851"="0izv95mvzky166xpalw897z3lgl3424ixbabz5pikrhn6i2q6zmf";
-"dvisvgm.doc-2.11"="1qc8sd9y1zj2wq5lxqr4z8ybr137vi8ihs6n3cyyhbll8zsfqh32";
+"dvisvgm.doc-2.13.3"="1qc8sd9y1zj2wq5lxqr4z8ybr137vi8ihs6n3cyyhbll8zsfqh32";
 "findhyph-3.4"="0b7qqz0p0l70r6dl4jhx086dxywb0vlln3r166pj0yl5jfjzhpna";
 "findhyph.doc-3.4"="0n7cpjxz3adj4bcmc1vd548lggcchhqfahdcvn4w9invw296hhlc";
 "fragmaster-1.6"="1d59sjzlvygwq9b02gbrfra4cnvmygza80b5rkghhhpa0n3xnx9p";
@@ -664,14 +671,14 @@
 "latex2man.doc-1.29"="11nl9ldkw3f90iz8r23jbgxaa6yq5p61f1db344nfhy0wimx15si";
 "latex2nemeth-1.0.3"="0rq642fznwpybyksjrxqknqvg7y3g9bi2ql5r211n6nljw06l5hz";
 "latex2nemeth.doc-1.0.3"="1fvgdi8va2w096q45d1ghhhckx730p5ksf7hbbag7cjhwsdjrs0r";
-"latexdiff-1.3.1.1"="1ipi5laj8r0k72l89dymyrpw8lv89c1lkcz73innqncqahfji3yd";
-"latexdiff.doc-1.3.1.1"="15724mm377xma69cvr18dkk9q0v2fis5bim6671pw098naniksds";
+"latexdiff-1.3.2"="1v64mikb2mwbrfja0m8z56yahfrv2yb3g7snln5k9p5wqbhzd34n";
+"latexdiff.doc-1.3.2"="0q2sp3b55b24pm4gwgy9yrzrjf9y9c0k57zw2xm10psfb5vmpv3c";
 "latexfileversion-0.3"="1yy159skv29hp0qxpghmq5zmay9yi0ndkgz7lbllj1ymkgxs5138";
 "latexfileversion.doc-0.3"="0k20c2kw0xarjlkdhjyx9h9kvjm2f3rd98lz097xj8xvk0fs0zp6";
-"latexindent-3.13.4"="1ywnk3n4kiskg84cz5v3790fk6v575mg18zw7hccia4znjrf1y9f";
-"latexindent.doc-3.13.4"="0zwyx1jj7v58wllv805ggqlljvfngrj82ic97qxz0698mrc8m400";
-"latexmk-4.76"="0h5kyad7ibw5grg8wzgg0wwbwjqzhzp0wsfw098q655ckdb5yiyz";
-"latexmk.doc-4.76"="05jskdzh2i4i99brs792rkq260iim6khmr29ybm8jmy8sm91m3k3";
+"latexindent-3.16"="1vl7ls4jw55xyks0y0g8m60ffaryj543nbg6ri6ndp4128mm25x6";
+"latexindent.doc-3.16"="1r8x8jrwrg90c137yv6yfh45655985syc30azw0h1gjyaixv7z5q";
+"latexmk-4.77"="1g5940qif0r1jz49z4x2232yv9dv1d2zjxd2bvgxr59w89pkrc94";
+"latexmk.doc-4.77"="1pd21yn9f6dqqb60g047wgqycqrbc3023lq1l1d781aw6mkw8h90";
 "latexpand-1.6"="0n8gjx86fxr03i4pg6dwxr48f12q2s2v32pszg8qc2rw8gkvniy2";
 "latexpand.doc-1.6"="1j7s8f3iw2y8g8inm2f7a5lm1bxfv10l4zmhnfay66xi01py2cbc";
 "light-latex-make-1.1.0"="0z2clckjb1ffzz7s8ffdw63qiln0wb171wc447k7smdqfdiawi0p";
@@ -684,8 +691,8 @@
 "ltximg-2.1"="0w53yx4bsj5c9djqp82fy3yvfaf7sl08d2698bq1bzl13rlnvlxc";
 "ltximg.doc-2.1"="1rni1hl6i91dw0fdynkajr27gir1a7qyagmpmypnpcdbqv0rq0hw";
 "luajittex.doc-57972"="1nqhgkh91g3sdsdysb768vw01ikbjviwlmhm4j2a2cdwxp81hffd";
-"make4ht-0.3j"="1acww1k0wclk8f8cwxb99778r0s31p0fwrpvv6dda0d239sm650q";
-"make4ht.doc-0.3j"="1w4md07gwagx62f3zpjwx66hjmsrbsjc0bywilyib5amyn7dxblp";
+"make4ht-0.3k"="19qnlivslx01zcq8jvxyns5pa9q56jq9yr2533zals9m8h13hm8r";
+"make4ht.doc-0.3k"="0zvsgsc0v1wcx1197lw65d051qz803p16dkslkfglsjm2f64wycc";
 "match_parens-1.43"="0b0vq9lgr9xxwvzvlhlky7fg66r2y1qhikiywddkd06rmw71yvi1";
 "match_parens.doc-1.43"="0i8dnjn5kfqhp51i255s3q2cd6jwzqy4rfdrhaxl15dhj4il9k7h";
 "mflua-54074"="0ngbhdh8hgpjfqnrjlnp27x3qziks3yf2zp1qq7r4bjfa5jx9gr6";
@@ -731,8 +738,8 @@
 "sty2dtx-2.3"="0l948m9xwn6pkxkwfcay98vapqa1p77rkjijyv6wqkbxr7zxh1i3";
 "sty2dtx.doc-2.3"="0ngfnvbznd1gyiljapflbgw9iq91jrcvjxxvaqcgfh6dilbpy2gk";
 "synctex.doc-54074"="13fc91avs09za1y5rrn50wfr2bf1csnf3p4dn0r3mkny46bdfw7c";
-"tex4ebook-0.3g"="0q5m0q0bnzfz9kmcawgyy2hqi81sf2d16i5jp6xdbrrkwk5jcck4";
-"tex4ebook.doc-0.3g"="1wxi9nvp458nn34jk3rmfq4v1m7fmyiqg6ylr8vn5i703rf0wrri";
+"tex4ebook-0.3h"="0n3ga0cdpy1ywrcmy7n1yy6j9d1s1n5ph05x9bgfy9azmzavfsvf";
+"tex4ebook.doc-0.3h"="091mmicgmq2m9b66h88p486rvhvxlvsahcid1i6dp4fb4pzashz0";
 "texcount-3.1.1"="1bi484kbrcfx3hyflr4f2w0plhz58p2206rz4r1wjllhhhwzc7pl";
 "texcount.doc-3.1.1"="12a3j0sk7nysd3bd7mwnbifyrcvjjkfjy3b8f1caf6k0pf1mz8b0";
 "texdef-1.9"="0wi60appvgs0h5690h8qqvcmsq2r6fcxais2jqps92ryy41s2v68";
@@ -742,27 +749,29 @@
 "texdiff.doc-0.4"="0f7q7cszy6ca6fmwzi7fn6p72szgzyj9fldvzz1rk3ywkhsnpakr";
 "texdirflatten-1.3"="0q2m138gpk9cvfp19jvsw746mkxa613c2204qfxw1bxw8b454d7m";
 "texdirflatten.doc-1.3"="19iiznql82a34d2yhzqcp339zszbhfz9fh0h4mb11696mj8rx3v7";
-"texdoc-3.3.1"="1vads5mb6agrd8vdbc10nxhvcz68ii29gdna4b3hkxlmf7z2vynp";
-"texdoc.doc-3.3.1"="05bq3lmyrnylz7zxmd45m06jyg8wsyavk5wmmx94rpd1hz7nyx00";
+"texdoc-3.4.1"="03ky8lczyi5i106bpgfvkick80xcagqr03wlv5pay3wm1cxw05mw";
+"texdoc.doc-3.4.1"="1ddaxpayfj8v5sfmw1z99jnfz0rhwgvdq96hywi12qf0nd8h0bvv";
 "texdoctk-0.6.0"="1k0gl06da0v60hsp2saphkmr2ma5yf1g6azwdl33ddbw4r8ssk10";
 "texdoctk.doc-0.6.0"="1k41z2lbfjsar5rl47xnk1adbcnnb4w97bzbgf2rnjhimd1gn9hq";
-"texfot-1.43"="0wd7n4hmzlmxbp4rhx14ghqcvsmml1bf0w8b7clxn77x009f05h2";
-"texfot.doc-1.43"="0rdzmcdjdkdvc4zdndzzn3qba8n08dh0b0vbf45k6fl6hnkq5dvn";
+"texfot-1.45"="0lf0748sl32brnvhdirjla69zm8gj7s462ds1h65f08pkarg4q91";
+"texfot.doc-1.45"="1i025vp5ag17k5vb2g6na9b0piaqkqfs0i51h14ddgr4kkdmh1ix";
 "texlive-scripts-extra-61101"="193v0r4i3p4psn5b4q0ggpgaazwn6jadjlzh5gjm3igg9k73i1wj";
 "texlive-scripts-extra.doc-61101"="1svrpyy75ksx0777k6mn6a3c54kcqlf92fnfn10x8wkvv7fkghd3";
 "texliveonfly-55777"="03i9pzqv2dz4z9nlq60kzwiyfvzhhaalhczqa9146jp4wvcib9l3";
 "texliveonfly.doc-55777"="1fsabzkbcrk42rsp8ssx0kvap31y1rqnkq582129946q3njvmylx";
 "texloganalyser-0.11"="0icav63nll0lj85cqlbg1lx1r6ysjf1lyv5bydxr3flr1c7yqx2r";
 "texloganalyser.doc-0.11"="1s7952n2brrz3s1qca9r5qk8fnjlmrmrn8b06dhjxdb7wdqis6g0";
-"texlogsieve-1.0.0-beta-1"="142583fb74dgimpaaidi3h80jb3bi164hvkn1sxpzqb8l59n5d2z";
-"texlogsieve.doc-1.0.0-beta-1"="02p128w771achibffxqcjm16qw6hc0zjzalhsymh9725kl4vaqfm";
+"texlogfilter-1.1"="19sxpfyfp2knv8q13sgka5kw74vplr0fnf5c9m599h5kb7v4pcys";
+"texlogfilter.doc-1.1"="0abckkbw2ka65bvmj7c2jipigph66l29kps62b9ivc7qmq4iv2d7";
+"texlogsieve-1.1.2"="1b0p1zas9djs3ni0ajpam7pnpjwh0lc3skqr0nr0n3w3y2870431";
+"texlogsieve.doc-1.1.2"="14sv932pmyg6wsfpcjs17y9ni2xbv2w14bnikfy6azj6kqlbqic3";
 "texosquery-1.7"="0jszy2f076hrc29kk8qcr9616hyk2cvys3kg2qfhvblxf07ziw62";
 "texosquery.doc-1.7"="11rz21m720pp97vb457pxaq5yxf3j4v8vfcd77w0bjpc632lh1xx";
 "texosquery.source-1.7"="1q7spgr1xk2lnx2xqksjh979n7r2v1n1441fkrc479zyi69ncn33";
-"texplate-1.0.3"="0bh1yhs28wzagh7i3sraki8ygd1kikcmalqvksilmb7j4s5c0hhl";
-"texplate.doc-1.0.3"="0zvrsllhb8fkk1wzg9mylnjyvb7pjl5wvd3m899j7w9cp5zl5yvp";
-"texplate.source-1.0.3"="02wc2aiqcrrgc514pn1m7yn1b5k6vg1p8d92kk99pkiz46vxnfj8";
-"texware.doc-57972"="1zv8m1y6gvnk7nbqmzkvg83iq1pgncg1qvxg572pxnqlm0lf779y";
+"texplate-1.0.4"="0bh1yhs28wzagh7i3sraki8ygd1kikcmalqvksilmb7j4s5c0hhl";
+"texplate.doc-1.0.4"="0zvrsllhb8fkk1wzg9mylnjyvb7pjl5wvd3m899j7w9cp5zl5yvp";
+"texplate.source-1.0.4"="02wc2aiqcrrgc514pn1m7yn1b5k6vg1p8d92kk99pkiz46vxnfj8";
+"texware.doc-61719"="1zv8m1y6gvnk7nbqmzkvg83iq1pgncg1qvxg572pxnqlm0lf779y";
 "tie.doc-2.4"="0lfjracp8ifkaj0pyg4i5lccqwybsrgxn11ji3p1g6kfxcy5hmgn";
 "tlcockpit-1.2"="0sm882jxczx8q4dvqaxnyb2wzlpxd249ayv77gj9vgq4lx9v0l27";
 "tlcockpit.doc-1.2"="0zd8hx3f6jhm5rklhr5dxb84y17p4rbgwa7wh95ab5f6n8i5pgwb";
@@ -771,8 +780,8 @@
 "typeoutfileinfo-0.31"="0w48qf9d7qh57s7b1745z6d5abc8rlgcjpmf402gqxv636589dcr";
 "typeoutfileinfo.doc-0.31"="1pffnydxqlkjixa71g09f7754ay0gnyphay51dys9gvvmwzv5npq";
 "web.doc-4.5"="0ssyalwg7jb01pmbr309n656paxcd4dhrr1m0m1iwc70ml70k5sp";
-"xindex-0.34"="0wz2fr72v4aiapxq62lysrw8zmrl12scd7xb0asmkm14ipnhsb5i";
-"xindex.doc-0.34"="11h8jp4n5a89mgwryg0jas2ha6rm851gxr8fc7c7jk144irvwd2k";
+"xindex-0.41"="1ln32di94wfvh1brcwpwkjf3j8129dkc7kmpm6bl15hdiw0j5knc";
+"xindex.doc-0.41"="1szvd554nf6ml4m0qjwfgm3bpimpbacw5lplffykajjzc3mcb1y5";
 "xindy-2.5.1"="1pb2146xb5g3l5jbqsgzy01lc4zkd39v7rd0rdnwdf7yrxad4zax";
 "xindy.doc-2.5.1"="119lq9mqczsh1np0876fz4gdfyq1rxmc0ghaqyriwl4fzj6lka1n";
 "xpdfopen.doc-0.86"="130wvaypfrg9sav0pdcdy1g10fll8pqcsqsy70fxlzzr937glsh1";
@@ -781,15 +790,15 @@
 "lm-math-1.959"="0vsmzr71d5iqhr9bwjnp7khzlg939mvfnbg846854cxk8wfm9hzn";
 "lm-math.doc-1.959"="1j6jcki1hxdr17njy8sfpb82mxh6bpllccf3hnjvylvpjf45nxm3";
 "manfnt-font-45777"="1cdd2a3xj00bwsby9z5iz5f2iy2iwsjl35gcack9q83hacbf3ssb";
-"metapost-57972"="1sk771ll9kv7sdrgg1xp8bmr1c0yd8g2g796pzyksfrjzbvs6fdn";
-"metapost.doc-57972"="0y7wfxi4l8dbmfmr570x3gx268nav4zhhlg83qv7blh9p8x6h822";
+"metapost-61719"="1sk771ll9kv7sdrgg1xp8bmr1c0yd8g2g796pzyksfrjzbvs6fdn";
+"metapost.doc-61719"="0y7wfxi4l8dbmfmr570x3gx268nav4zhhlg83qv7blh9p8x6h822";
 "mflogo-font-1.002"="1dx834zwbrwgp2v61fagf5m4zmxf2qkhib4mkpw6iadcgfqv6x7f";
 "mflogo-font.doc-1.002"="03b3qg42axqhs1lvm3pz69m4jmhd1385gzg1sw8bqyajlrdnydyh";
 "stmaryrd-22027"="1vvnhyk7fq6kh1jb2zd19r6qq1j8zzp14gyrqvw7yqm5amjff7fp";
 "stmaryrd.doc-22027"="0dvcn4yw7qlb7gh3b3z9vk4rx12b1086glkk0x21cks87kphdxib";
 "stmaryrd.source-22027"="1wmn7bwahn28lwipkpsla74wn3a018808rmh7yvxdkbxfbzcwqcz";
-"xetex-61114"="09124rd2k40dihk4c1pidkd44rvhv1b0ain1bfk5ry1032ky7wly";
-"xetex.doc-61114"="1abwysg8587lppng8fs783b5wzpa8ld6wmxhv9c35xkpvg1pngv5";
+"xetex-62145"="09124rd2k40dihk4c1pidkd44rvhv1b0ain1bfk5ry1032ky7wly";
+"xetex.doc-62145"="1abwysg8587lppng8fs783b5wzpa8ld6wmxhv9c35xkpvg1pngv5";
 "xetexconfig-45845"="1253njshiwdayzq0xir9cmbi8syhjb3sc4pyrw9p6kzyqvckkcxm";
 "context-account-47085"="1j1rvgcznn8c637dayxpdagpwjq6fbn52sjmrb0wn4gd4b4q3nk8";
 "context-account.doc-47085"="0lfx6aa235jx7sz27qh0328n68ra3z2bw3dsh5p2wzkg1wxbaa6g";
@@ -815,8 +824,8 @@
 "context-degrade.doc-47085"="0d0fy68hk20az7vh2z87h76hc8x1hmgfl1r5saxg54l20a31a96j";
 "context-fancybreak-47085"="00zdyzfb70fvgrdna9z4958pxhmjv85jxl5vhfryprqkrbw05pr4";
 "context-fancybreak.doc-47085"="15igbqj52g2ybpykqzkzm8b9gqayccip5p6srv30458zmxhci9jw";
-"context-filter-60786"="13hs66icrlnjcfhbij3n6pvi6grxpn5pq1bqbsng7k1ykyzq8i1r";
-"context-filter.doc-60786"="00gn28cyqrksi0gml7abhwa6xx1ay3cc9b53d1vkwzcfkffycdlv";
+"context-filter-62070"="1vj8kimqsmn9xhkh22pywqbn4sal5gxpxjbcbv8xmxcrby02gsfn";
+"context-filter.doc-62070"="1f6phdqxgvdg9c6f37m654ha6i226d88i81147h9x6sh01i7qd0b";
 "context-french-54215"="1wdn7ajvmfj413x51v0zcnbibr4378s1sla7f097xllak9iyd9yy";
 "context-french.doc-54215"="1lyi3hwijhc0jl93ygldpjm44fbiw4c7zky2ydrm4s56l3di2sil";
 "context-fullpage-47085"="0i7cwd0q9fcdnh58w6hgdbnxxwv8g01nk33j7naqwc0f087az7qn";
@@ -856,8 +865,8 @@
 "context-typearea.doc-47085"="1sblwx44pardqrp265xzg5hjpiflgic7k5xfai0q9nga9qi56n0l";
 "context-typescripts-60422"="1vvhd18qd6vka9rg048arpwn61rqw3za116k2yqfy4lnp2rypk0g";
 "context-typescripts.doc-60422"="0pll9scpcsxzwgsy77mbpw4s0yv432h5p0av70kr81zzskfxabxd";
-"context-vim-61301"="0w449i0nl9rbg02k71mi6ddqmj2vkaqyv298ry858xff95pj3b4r";
-"context-vim.doc-61301"="1vrk0h30pm39lg8x1arxnd37rhr87vy3krh3xmd3zhng93qm36ip";
+"context-vim-62071"="1jinagfnv3aghjn8gsack6zl9d3rcycwqmxir5jdjhbw4r66yp0y";
+"context-vim.doc-62071"="0gc1m894ad0y8l1vis5bc9n6avg8npzlqa4xr20z401nxhxmbv6h";
 "context-visualcounter-47085"="0n20r8315py52ghivwy9kh7g7yj4ixakmkn97phw1fxgz21jk6qg";
 "context-visualcounter.doc-47085"="18ncq5d4chmnmxmhazbjh9ypsm4c3577vgcmnx0y1pmzgb2g8pn9";
 "context-visualcounter.source-47085"="18yyv9974cxzpw45rzw6ia2jamrb07bzw6gqchdprdjs0xmhz308";
@@ -865,8 +874,8 @@
 "npp-for-context.doc-0.98"="11bzcxi27yia87ia7ych62gi2y59jx379fz63avc4qyq4m9686ag";
 "aboensis-60059"="171586kjnfg1qb4wi50mrc9jd8h2ybg6r68kwyhgc5y0gyhyg08c";
 "aboensis.doc-60059"="0qc74wvq6ibxgil36wp0b5s66d7m7axbn0y1qpzy9hyrh8v8jpav";
-"academicons-1.9.1"="14d479mcgc99pvz7idnnkn60cgldq3bckbbi2k78afygvcpxik8r";
-"academicons.doc-1.9.1"="0x6s563w0ay2ad8hm8n0g1k0prfp8jlr7afwdaaldfxhnhbbj9gs";
+"academicons-1.9.1-2"="1x8aahfd4ai0a9wgqz1wrj4casmda07xryci0gnmyspha5r8x151";
+"academicons.doc-1.9.1-2"="1a3vlc8cxh35vka08q8qz1hc1l2hfk4lkmkrdlnd040im2h6v3wk";
 "accanthis-32089"="1vwz3c8xgd4arx0c41b4d0pzh00ds7y1npwlq4rz8rqyabg0ix55";
 "accanthis.doc-32089"="0za0ja43vv6yn7wmw7m0f7xmjkcly1ml7f9d3352i8lk3gj8i7r9";
 "adforn-1.1b"="1cb6w50xb9wkl6x384dhldrhpjbk5l73x5gzpbm8za4gmh1pc94v";
@@ -889,6 +898,8 @@
 "almendra.doc-56035"="1g32m3b6nhydxw0siwc7bw59da6cwav2xrypj636i16hvlck9kg6";
 "almfixed-0.92"="0qrai75pdkf4py7nhggvwzaarv4jlh04dqsy1b593jabq7ngaap1";
 "almfixed.doc-0.92"="0arhvv7z8yf8kcikzybhbsgsj6m9zy4is5ryr6hcf6a6incnkp1d";
+"andika-6.101"="0c5l6xz3frn9v25r6i64p07wzvphh2arswwyllalsrvpxsln5ha5";
+"andika.doc-6.101"="1s046wxpc1xwfjgh8mw097ag1kxzr8xsp5bzzilyfa383y6s0jnx";
 "anonymouspro-2.2"="1qk10w52722yzlyvk2k733sp1h2vic3rjcswkhx8j21a2g9xgmjh";
 "anonymouspro.doc-2.2"="0ijsn9cbkg1f29x0pj6a4p5d4q14rqrh2mjid57cb9qjhvgvqrm8";
 "anonymouspro.source-2.2"="0fl9sd9adhjx49hja3k4iy9pcx3hal0wjzxg10kjmi4j6qvz829s";
@@ -922,8 +933,8 @@
 "astro.doc-2.20"="07kad1fzv7p6inh7nkrq6b34c1792h4v49rxaaxqyldmf4pwjr84";
 "atkinson-57624"="1c1z9cj1vs4jczjcg9vaq52qy6y77217153i1ivd00v73bsfsmc6";
 "atkinson.doc-57624"="1hx779qjjabgsmg5a0halwxd074qdkh0c3qp47yb4ahjsys38c15";
-"augie-18948"="08m2n7wqqj1pvvrw6q8j514mgr1168brckm1dl44yp78afgm6vra";
-"augie.doc-18948"="0ygmvlk1h6n071lq8jnlpdqaxhcxvwrzf1kgvacj78kijaqd0lix";
+"augie-61719"="08m2n7wqqj1pvvrw6q8j514mgr1168brckm1dl44yp78afgm6vra";
+"augie.doc-61719"="0ygmvlk1h6n071lq8jnlpdqaxhcxvwrzf1kgvacj78kijaqd0lix";
 "auncial-new-2.0"="0nqz71wdm0w34xdg5p34ph6na12jlvxz7v1bfigjm2v87pbn5lwz";
 "auncial-new.doc-2.0"="1dw0gbhk3hwfapdzysf12kz5g3dfsr5pxpnga9s1ksqicck26b5w";
 "auncial-new.source-2.0"="1gyilj1ldx6c5lfn8vrzsbss4gl77grr2mw4v6xhimv2vsyp29a1";
@@ -1009,8 +1020,8 @@
 "cfr-lm-1.5"="1inzb3q94b42n1g3hchqld687qhs33m2zxvxvgyciwqnwfn3h968";
 "cfr-lm.doc-1.5"="1ska7y1xg6qq86kccplwxjd70bdbiw492d9y9n17d7hryg2nxw66";
 "cfr-lm.source-1.5"="10layppddcanvyzjbgn6grgba9ff47kn7fqdxmwfkwnpw0qlw5k4";
-"charissil-6.0"="190wl4vpy6z10mci6cyq1k60jhgrgg26m25gm69iz2cnk247ai7v";
-"charissil.doc-6.0"="0yw08lvb6mxih7nhm66nz42k7r7q6hgd9vxs661s5gikws4g9aj3";
+"charissil-6.1"="0slxs5v8wdr0lc6l241y6m30hx0nd6jrx44vh97widiq5n4m64rm";
+"charissil.doc-6.1"="0m72i0n3nrq3rhaindxyvxjdknwdp7yd75p6y8hr9jj9jg9vdcqz";
 "cherokee-21046"="1h8q9ysfnwdc29kfc6yj4545xk8cyncl9ns5a465kh6li01zw5i0";
 "cherokee.doc-21046"="0ijq61im5wsv64qibwcllc2mi69d72915c5qjk0dcnsn7k823si5";
 "chivo-2.1"="1nva1995nzxs9mqahqhsqr5ipfg7swi9mms2gy0ir4miv17fpi1h";
@@ -1045,8 +1056,8 @@
 "cmtiup.doc-2.1"="0rr69cqg5pblx5h8xyw1zkap1fj3pmdznycplxx0kd4wqzbdd47z";
 "cmupint-1.1"="0y3pf2mbhxhn67skzy89850fhn17xr0b0ghcxn1ayq19qr66yrj7";
 "cmupint.doc-1.1"="0v180y0j3md4iyx54fvjr7g00mavmkw6b99bsm07nncfq0anajms";
-"cochineal-1.074"="1pfi9c6h8nd07wjwdbc3hfvdfxbphq5mx5h29kic339nd68vacw1";
-"cochineal.doc-1.074"="1dg8m2026vxf03m5f0fhgvfwqg4hwn1zp40gry09jsikwj0jdsrv";
+"cochineal-1.077"="07gachpd2xz1npifg11mlkhkz5q1q5vmi5v9b35xvpk9a68j4a6i";
+"cochineal.doc-1.077"="0qbbgri75qaw0gkzgzwdmvh8in7s74f7fmrs95czhcga0wdcjz52";
 "coelacanth-0.005"="1flbg98xil54zvjdcig4allc9pqlliz43a681kx3wacn8c48nqp6";
 "coelacanth.doc-0.005"="1py3h3hx20jfpjxy3mylzz31vrxf4fs851ffprymf6rs9c5n6hm8";
 "comfortaa-3.2"="1kfxl806y2g6axx8csnd7njyd0skxx1gpw7fm3paz8yrzvyyw89g";
@@ -1055,6 +1066,8 @@
 "comicneue.doc-1.2"="0wr71zjk337h9p38nm67ga8js60vqyqfslwn7dqvzg06p0741bfk";
 "concmath-fonts-17218"="061kfzds7clbxyq62ilxwcrdkfghi2lx8afik7vi9gg0hysbki7y";
 "concmath-fonts.doc-17218"="1x6wb92k4da01sv8b35p3bly9hj46hh8k9wr22m7lj3rxnndnpcq";
+"concmath-otf-0.20"="1wk9hfh33m1zlaaa6afxsvg17253pivw02vda1976npinga637qx";
+"concmath-otf.doc-0.20"="1rxnkpb7rh8mrvh0rypm9bzbfp4niam8plz8gxglhxgp4mb7xf1q";
 "cookingsymbols-1.1"="0kz8aaf7bp0y2ph0iia5lkrxnxch9r63iy7y4zpqcawh1ajl10ji";
 "cookingsymbols.doc-1.1"="0dws0sdcg13jpz23zvkw6vfnc34qc1s464nm2nbdybhjwc9gdbdl";
 "cookingsymbols.source-1.1"="1l1jkd6mcxdldvjyk9myig4jsi89mg6n4ab6ymq5lqf25d260h0j";
@@ -1143,10 +1156,10 @@
 "epsdice-2.1"="02i2fv7c0kxg9d96k8gwcvm56vd4rjkndc68k1x2wa19f1ymsmi4";
 "epsdice.doc-2.1"="1cxrwbnrfg161ddc707msjya678fvvmvgsrrigdzmqrngpi7vh61";
 "epsdice.source-2.1"="0nj3d8nqc8x41lmqmicqf67wc4wirg0q0djzi0nbk77g2m1qjs0l";
-"erewhon-1.118"="1js2gfhlsh9j23xipx2nv9iq4qja2ixywv3gf75r7qzgas7gfych";
-"erewhon.doc-1.118"="1ih35d5yr01qfb0ls9yjcnlks46cd84ajzs8nyxd1x3nbc7ik3q1";
-"erewhon-math-0.47"="0v5yp6682y0lylks1vlrhyzb439fign66b0wkpfvhxz29vkkis23";
-"erewhon-math.doc-0.47"="1vp2cynyrcnwl1z6p5fc5vr9lqmwf13s9gz28iznk9f3wq2hmnrw";
+"erewhon-1.119"="05dhxlrnbq1n68lgyv2xa358z8vhvdy6yydn38zqvr92yl2235fx";
+"erewhon.doc-1.119"="1r0rc5rfr2690r3v41s24qacnamfnspa9x92a0sy4qxsfp195ms5";
+"erewhon-math-0.50"="05ydq6vjxdjmbn966llx83h4iwgbqy1v4bk7lj78bqgi3z2gmasz";
+"erewhon-math.doc-0.50"="03ad8d8zj11iwf73lpsfm7wsw428vs8ipwrxkzi3jl2050ykj1hx";
 "esrelation-37236"="1gjwrnd63bb66vy7f74alxshcr5pqz8g8q178wkgyrm37xql6kni";
 "esrelation.doc-37236"="1nnwpgjy0mzc2h7sp2igqwain2nz6374qn4mjvj6g8x02lkc1hsa";
 "esrelation.source-37236"="0aqb63mzvx5hl178kmy6aawyv5ri8favficfjjmkpq3d4hgnrwl8";
@@ -1155,8 +1168,8 @@
 "esvect-1.3"="0fgcy91ypllj3i706znwwzri36ja2ca2inx838q08zbs8gqq4zah";
 "esvect.doc-1.3"="00xpfzzhyrh5p563faa7ks0vrrc08ndcpn72a72jmlhk8y8bn7sb";
 "esvect.source-1.3"="1han75c642d3qmr47ppn11f7q1lnz8lcwj3q39nh1f81vi2w6li8";
-"etbb-1.055"="0fj3z3j5jz24z800m524wf6y2vkkvr6fcy1k019jsahv49sjgsqf";
-"etbb.doc-1.055"="1c7ka3w0z6xkhz6hs7r99bf7aawj27fy5fdjg5hgqz0mjdl7wxax";
+"etbb-1.056"="1qpfadd544dzf61q7p6xirkv80bqz9jvvx0jm5rd3jjm12d95rkl";
+"etbb.doc-1.056"="1hiiw6hhks2w4ngk3aw992swmxcfhnkf2b92ryspbmd6mycs70ka";
 "eulervm-4.0"="1x0zgqw15r5z9mf4pcpnf1bdbwbpwbc49ij7gjrhf9jzzlkwraf8";
 "eulervm.doc-4.0"="1bbd7f4dz3xp7ylgpi2wh9jf8nz4z6i2cvphfx53xvg555ln5v1m";
 "eulervm.source-4.0"="1if22m5h8ma3bvrlp4jzzhjm410r5r7r2ij17prycj3cpj4r2nl7";
@@ -1195,8 +1208,8 @@
 "fonts-churchslavonic.doc-2.2"="1zjd1v8kq1v1sf4wfqb13x8jz12wpkpydmvldjn8l1i5rn0d7d4k";
 "forum-56025"="1kjzmzjnxwmcrgbcs23kn8p4z2izp1sp7xjv7ya6kl0wbza6fsbb";
 "forum.doc-56025"="0x8z7k4xbi1skzz6nw2r4lsmv28aih3hm98bhpgv50q97dyzx3rk";
-"fourier-2.2"="1f5pj59r1wa4fsx2nnbx8dn9gi1hsjpcyxwbfb6mzrcji2lzqhpz";
-"fourier.doc-2.2"="0fjhgfg23g79rfhcwnvi3k2nsiqqr14mzdw497ppxbcmnlknj8ks";
+"fourier-2.3"="183dsh8z5dh1q45qrpkas40ga2m4mbrgl727v0khqsxxim5vlzi8";
+"fourier.doc-2.3"="1zcr023w2hdk6y3x1d69nrwzsv3qd8ip63rwcksh69k4q35r9xkz";
 "fouriernc-29646"="1vv4whd3axfacbmm8nksdc37d5zras4gwa6ykgw1svplqgg3zjk3";
 "fouriernc.doc-29646"="128n1cnv9h1hr4s6bp3xs1v9p7skhxlfy8afslpay2bm0ixf0cs3";
 "frcursive-24559"="063909r7iga0cirxq8qx538407qly4p2a440xq7c603fmgcb8n6k";
@@ -1208,8 +1221,8 @@
 "frimurer.source-1"="0qxpdybwz0rp748rqfs026jvps026sffq3c7zi7bdy8a34mqmgsb";
 "garamond-libre-1.4"="01q3jymj6npbip8n20ql4icr26ws8hz3nnd6mkcr5r5l5z0yd3bs";
 "garamond-libre.doc-1.4"="1lcpnra1rabi8xyvw7khky3fkdc6vq6i1ccjy3v7pl829q0fabhq";
-"garamond-math-52820"="14cfrwk0xqrs5ij0fkg0nb9lx6g5z8lbmacjw4h68s4zm2nhas6r";
-"garamond-math.doc-52820"="1bipgq1vh2si94hsylckq1jcmdn3j7c9pnf2ig7fpi41lylpc4kl";
+"garamond-math-61481"="1bjskvaqq4glba1vmcksfx69p6r025sl8aynlbk46kh7x5fa6vj8";
+"garamond-math.doc-61481"="1jb0kcy715fmxhbzg95qwilwnmp45znh37iisiny1dzy8919nlbh";
 "genealogy-25112"="0w15jrd6aycdjh8qznvm549kzwl15v2zvs7awgk96380nzcsmhqf";
 "genealogy.doc-25112"="08fxhib7wydjbd3bf24kw6zbbz2sv6fhgmg4q2c1lgxddmm8mpzy";
 "gentium-tug-1.1.1"="1i6qxccddl61vlrfm1lvqaxy3yahqh9qd3zkinn93dmwdll4axgz";
@@ -1251,6 +1264,9 @@
 "gudea.doc-0.0.1"="0rk9g6kcb8wjhf6is5wcbrr95hv7ahwl9xa9vqnfq6m1yy1bah13";
 "hacm-0.1"="05layzjb8ngwmqvg49abdi55j9gl1l74sm5baipm0yi0k1kr8xy0";
 "hacm.doc-0.1"="1d1znq8r384b4xpc9f81023asq6yrkbvyif70wjn7h64x1wpnnn0";
+"hamnosys-1.0.3"="126amkwf4aapxk26n1h7vyv08hgyj6gac4sz6v76qilwpp6m6sga";
+"hamnosys.doc-1.0.3"="1n2bk2yp8c4bvqcjq0hahfs14zlrgrgj9jwvrp903c46zb83lfc0";
+"hamnosys.source-1.0.3"="1jxdiqbvbkmhv5p3fs3vl728wb6izfx9wbjqyylzxc9fr7b4qpmf";
 "hands-13293"="0x0vdn7hq6k7wr7yxn8pnkvjhjq3mfl781ijrs2mpvjqygqffzag";
 "hep-font-1.0"="0qzq9bqqfx8kk6gfarc4nl21pw9xi0fdqxanmak8xhbf79v92yai";
 "hep-font.doc-1.0"="1wi8kig3rlimg7d491lrngahhps33w1lxvixhncn4n916r307w75";
@@ -1328,12 +1344,12 @@
 "libertinus-otf.doc-0.29"="1i7bypqfgwq9dl05vwk7r1cvsis2h8n6r8bs6dvhysxf6w1mw7x2";
 "libertinus-type1-57754"="1xy94cck1rhid4a06n3kygy047xwlw5l17mj40n92dg188azfxkc";
 "libertinus-type1.doc-57754"="0fkn8p60m8761mcm3wa3nggag4h9rq0df1bdndafqazwvwnfc9m1";
-"libertinust1math-1.2.5"="0rkskq6lnwnkdh2q7jvccp50rc6wplbhzr6gggcjsacpivj99qmp";
-"libertinust1math.doc-1.2.5"="0gsfmk8bsgrbp732s4vifai9yckyf0g9n8qw3fw6dlvb2q4m9v40";
+"libertinust1math-2.0.2"="05wjf6gqc6c3m599wlxshimzdz8g4wbpix0c1a82rpqqys364lrk";
+"libertinust1math.doc-2.0.2"="1miwg4m8f0fpxksdc5c2pwy2pkll79mhirj5v0ppc1g0yzxis31y";
 "librebaskerville-56018"="1xv6f8bw0ygvwjlxcr0pciz6gamw8xvaqrryj87jqhl9phm12y33";
 "librebaskerville.doc-56018"="1331px6bv7zz8ijq8l368r6jml3rm4f81mrpw0hj93x90asa2fhy";
-"librebodoni-39375"="143ccap2ah0akw3gznf99bcw8dri83vrh1fsgzwmw3qdvqg73ynk";
-"librebodoni.doc-39375"="1wigr8r4z4a0cy8m2psz79fdm4dxpj4ara1am8zdvi5rb0nga4as";
+"librebodoni-61794"="143ccap2ah0akw3gznf99bcw8dri83vrh1fsgzwmw3qdvqg73ynk";
+"librebodoni.doc-61794"="0fcj5h6jdwa5j9v9s8m7dciy17rxm7p74vanpjv0iayyyb8awbcw";
 "librecaslon-56003"="1rla3bnpr548phkcq98h57bj57pk6x59dhpjcadrybhjg02hgx79";
 "librecaslon.doc-56003"="1y1rkqwpjbd7kq14zm8n6z9f37ybvy2g51axfkfx5q1cqc4cx8ml";
 "librefranklin-54512"="1p5nc0vbrrv4ak42hm6h8wi8nn4m9sfrbppxyry5dsx7bpilkndy";
@@ -1391,10 +1407,10 @@
 "newcomputermodern-4.1"="1mqzpd66dmn5ykr569671lkxkl5mvzdrlf1cnm0aaq32lkx74mrm";
 "newcomputermodern.doc-4.1"="13zq9kjm67v3vg4zjvrr3m6qakhkf7fdcxj2v2vgjlapah9d9k49";
 "newcomputermodern.source-4.1"="18bx02s8c74z7m791flipcihp0pc7g88glml0kn80bvbxnhh4mw6";
-"newpx-1.503"="0q3xj534bhzxqpbhqddcpm957ll0vxnglmn4d2d6rlvcvd8am0jq";
-"newpx.doc-1.503"="0nb9all9mdk9k3lfd52hdh44xqsy22vf1sld89mksp0f9ic8vh82";
-"newtx-1.7"="13pyd567rs7x0fjjs0jz0s0fnsx5k2rnp3ipspmik2dz955rig9v";
-"newtx.doc-1.7"="1z03inzzpdipy0c0l6nd9bx9sks8s449mhz957zf2qs39kl6r56j";
+"newpx-1.505"="030mw0wr5gs2kvamyjm4w3chnd9f0yf9979byrg5qhmr31f72n5c";
+"newpx.doc-1.505"="1bcdwr79kaiib555mzmgglcdxgv28nk7hvnnrzcawkkqmkqh57v2";
+"newtx-1.71"="0ah3pmxi99z8b7sv8xhjlnwj9l5pqh2p8m6vbbscgacpv9a3w9w9";
+"newtx.doc-1.71"="004rgsavjy3n5221az47wj2h1v1y76pjsxp0kv6n6wgv6j42zk9i";
 "kastrup-15878"="139ynj6jr5iniwg4ry57b61bpalchwmk2lvxpzi6rzhp42ifv1j1";
 "kastrup.doc-15878"="1bzjky4plcl24fg5rwbjizixwfn7nkbzb6wwydxd7s2053zba07a";
 "kastrup.source-15878"="1c4ijjifc4lwimzrhp7ym5804fz5afmccn4bnfayypmjqpc8x6jw";
@@ -1406,8 +1422,8 @@
 "niceframe-type1.doc-44671"="0prjzgj1fg71kf38asq8622l6yjvn1pn6am1nxkwrpfmn3bmn76n";
 "nimbus15-1.014"="06bir9vnihawgmc8v4cxjfcgk2fahhh9c603b7d9wzl7mi40prl9";
 "nimbus15.doc-1.014"="1fr7k4vh7726xh03qz5116winps1dkalnskdywvcvbwk18a2m07q";
-"fontools-61067"="0h7alqz7dqjm8f7a63jiw3h1mz8x1wi94qz58d96xdlsin7890qa";
-"fontools.doc-61067"="17lrd9vp2wfh6m6q8i9p3iw8mdmjq8fhjfcvblwwcqz336wawnmd";
+"fontools-61726"="1gsgzmwf6mcnv7xyab8q3dwk3m2pbp6bmwqgwg4q7aa4nxby31a3";
+"fontools.doc-61726"="1ss2ksx3kfshn3cxnh27gzc76kd3rhz70xi5342ax0y6k2z5xivg";
 "nkarta-0.2"="0mhi640hsr7dy7jbvkqq2yl224i9ialf01jkcma0cq527nvrnm3f";
 "nkarta.doc-0.2"="0bqix170zf7lgiv11v4mqyq3iva707zv91z154bi71cvnlknbkns";
 "nkarta.source-0.2"="0f6m2wz1cd99s4nxppzdq9jm1hg02xzswgm85dmi18jffgrd2chp";
@@ -1508,8 +1524,8 @@
 "sauterfonts-15878"="0x2j4rz8n2v5qw1j71h2yasjv2yh5g503svjrcy70n27njcic2dy";
 "sauterfonts.doc-15878"="0r3xc4128x9nz9wqqs9y7a45lfgll99l7n6k87cb2zkyckr0kk6f";
 "sauterfonts.source-15878"="1k5fix44afwcx3rihmipji2zalc2zhz8m0rcpybpz76mzqsrc1fi";
-"scholax-1.030"="1znmi5l96dis86x5b5ff9yr2ghvnylrl7gn0x02qj8s0j52w07gj";
-"scholax.doc-1.030"="1f110d56spi8gjsniimxjpcnbklxqlck9nqnc8fm3r4h7rrm715x";
+"scholax-1.033"="0is3py7zig7whp0hzga4d4a7kfs4h32w1irw4gmrjb3cqndg8w8s";
+"scholax.doc-1.033"="0m73qqh86cpgrrxw8v2nz5al0x850danniqyw8359bl26r8cj6wl";
 "schulschriften-5"="08dsnba3p8nz3hnzh1sd5cd09ngg73vl8yq1h5l8qcnynwwbrcdc";
 "schulschriften.doc-5"="0vaqj4m0yxbbmqf51s107k28l2wms68w3km801lph4nfz8khaybs";
 "semaphor-18651"="1fk3qdnkpv28zc8q172w9yn1aq8ff9ag6ql2ghh8aa64j9gygdsc";
@@ -1598,8 +1614,10 @@
 "venturisadf.source-1.005"="07isrwhzw538w4asc5baw6wbfydzdrflrp3pk1qilq3a5wcj1n00";
 "wsuipa-25469"="1grz4s0zi7dlgbks7rx0h0rkjvchilhjabs59h81f92f835lafm4";
 "wsuipa.doc-25469"="1zw7ibbqc75k4hplbvqpdmnqg5ks9bw75mrwcg14q1rb1807sp8w";
-"xcharter-1.224"="0v50y4qvvxwh021wvb1vd4my9fsn90mya6szipimaxhclzrdfzzl";
-"xcharter.doc-1.224"="053s8fx6gfwpiq8kg144cxhipra577pspcgmr0x242vg6cy7hhq3";
+"xcharter-1.23"="1qkr253flrjimpccys7f7c2shxx6zxk271010lggbimif1sqj23p";
+"xcharter.doc-1.23"="0jkinbc3z6zlrilnv6jqx68sc8123ncvmi090hzw0miq1lggahn1";
+"xcharter-math-0.30"="15b8bwvjk0gz4g6rwqf1ndds0945mp1nxc49yzzn17mlw9sdpygv";
+"xcharter-math.doc-0.30"="1rmy56f8z266v2v036zkkbv40zwl81zkrh8llcp48mdbglzbrpvm";
 "xits-1.302"="0hnjyncrb0r9ssp6aj9lih23b0z031fjhc7fjjsjc89igbxb8v58";
 "xits.doc-1.302"="0iv1bs2i1fn0pr3gkz07xaqsdfw9idcyfdd6bzqjryynas25aia2";
 "yfonts-1.4"="1k7b78fr6x8kp6354viqfni3k77d96qmx9r76249m5j140hi6fk1";
@@ -1609,16 +1627,16 @@
 "yfonts-t1.doc-1.0"="0h0gi1j5fcn1nkvf0abf2aimj2q3h6bw4rx7kzg5xra735fqpl4n";
 "yinit-otf-1.0"="1yjz72nixv6di0ifsimbnc34wlw6s8nqkwflkag2p75q0jw52qrg";
 "yinit-otf.doc-1.0"="15yjqa1s4zrpz8cj199ak9dgriys76q8iccspw3909g2ci4xyyfv";
-"zlmtt-1.03"="19i1nf4qqw573kis48bcp0rdh9w212qp0m039rh6slbbvsi1bi05";
-"zlmtt.doc-1.03"="0yp1532r174r757mjvl4vk4x91q72p7ird4m1vdybngakj7n9i30";
-"avantgar-31835"="0zqa5rz9rzczpnifcq4rwj6ybvpl365371jnz65wvaq0l5zgnlip";
-"bookman-31835"="12wkjwpzxn1a1k3bb41gpnky1jjsh7gzj4xahsjd087fpmrsj9p9";
+"zlmtt-1.031"="1wm4kb62qc83yq15qks2625lpp0ghxvw8qkwa6pk7mcbazk7qxh4";
+"zlmtt.doc-1.031"="1v27sbxx3c854ypjn0gz2bvj2pr4d709rj1kz5c1xpy3q33qh7l8";
+"avantgar-61983"="1200x40k7wprm4n7srxvgrax2l52vn6d5ri2x0q7zbzzsfxfzkym";
+"bookman-61719"="12wkjwpzxn1a1k3bb41gpnky1jjsh7gzj4xahsjd087fpmrsj9p9";
 "charter-15878"="1z9145ri2g732bs4fb8i74gc0ymak33k7sclahln2bhdpxi286fm";
 "charter.doc-15878"="0gm9pwanxvzv0zmxq6pf54ygxaxvg56kh1ym6f5ij9akwvhf6nwb";
 "cm-super-15878"="0vpxkin8zvanasm0n6zzgmy7wssca6bm5yia2mjdi7nxzqyawlwr";
 "cm-super.doc-15878"="1ygbv3gwijyaaj8yzwxzsjqsfjdf52m3lm3f7rp1503d2wvq2qzx";
 "cmextra-57866"="00my52lh3cn8bn211fpn7373b7khaylx4fgkrd2m72xgaymil308";
-"courier-35058"="08g6lm12b0k6333pxcaqdf67v87fz5mrqp3jgal8qhrls5ym8q6r";
+"courier-61719"="08g6lm12b0k6333pxcaqdf67v87fz5mrqp3jgal8qhrls5ym8q6r";
 "euro-1.1"="02kkwf4psrmp7n5mqyrc3745kj82p3nxswad9x8rw1hd7a278y3n";
 "euro.doc-1.1"="1ajqx7axgqpmbq4kl2gmk97ibwbijqsq6z8ln71qla61j0mkgj32";
 "euro.source-1.1"="1hkzjy4vmvh06pk8bhkpz09ln5jygvyhwzyznqkrzffay3i89cll";
@@ -1629,15 +1647,15 @@
 "fpl-1.003"="1jpbgs674zkjayx5xbg4ymnmygxcc15ysvr4cpz3abp333cqzjb4";
 "fpl.doc-1.003"="1860bzvxbajy3r5gpz6hwy0vib632fkdig2zcb51yy2qgg3vbal8";
 "fpl.source-1.003"="1fr7ydvn8ql0jhplkwxzrl5cppxbklg97nqb2rjigvmqqidjk0i3";
-"helvetic-31835"="0c3f1ly7y6404z0akbfbbfql13sz717v0n0g69qjpr69hi4n0nsl";
+"helvetic-61719"="0c3f1ly7y6404z0akbfbbfql13sz717v0n0g69qjpr69hi4n0nsl";
 "marvosym-2.2a"="14i2alqxpz0imgdlx03gyg2nn56wrhlc0rziyx93h4ya9nz6xzbl";
 "marvosym.doc-2.2a"="0qyfyz8qfcchnf78r71fp5p16hmsrq6xf54g5mnwjb4p5ipbd9np";
 "marvosym.source-2.2a"="0vbiq807pazw2c1ck799w8sy3q8wcpb6smmq5qqw4nqcxzwsxk78";
 "mathpazo-1.003"="05j5qgq8fralghp5wkx6bha1cm59vha29ppq96nllq2k2nqhpi3d";
 "mathpazo.doc-1.003"="1z76cb473nb6r0vjjxjwiymnk9wsf7pnycc3ad3ba4vd3yl1827g";
 "mathpazo.source-1.003"="0lmyc1q7jswlhlzz4fd6ia407jj4pzi7wvmrcgfyw20j2nghfcgp";
-"palatino-31835"="12jc0av7v99857jigmva47qaxyllhpzsnqis10n0qya2kz44xf22";
-"ncntrsbk-31835"="0i6a48zbn9lg4pwbw8ya2wjjgppwac816fnbpmahm67kknx4d7ij";
+"palatino-61719"="12jc0av7v99857jigmva47qaxyllhpzsnqis10n0qya2kz44xf22";
+"ncntrsbk-61719"="0i6a48zbn9lg4pwbw8ya2wjjgppwac816fnbpmahm67kknx4d7ij";
 "pxfonts-15878"="0vkhx82ywv17rflmq119jxs3ib08rfw6lkjgr3mp9vf6vplgqzki";
 "pxfonts.doc-15878"="1afcy7c1n63zi5czbpnajrrgwfp9xdymkgwf5h9865adjbb3lm82";
 "rsfs-15878"="0q1iqlkq6swy905jh73y42ya9zb55xvg9w991x7lsmdxc0bzdf8z";
@@ -1648,7 +1666,7 @@
 "tex-gyre-math-41264"="0vqg04im4s6k1sjfclrn855liilgayh5kca774aicifzjgsigs1d";
 "tex-gyre-math.doc-41264"="0s6s2bs6q2ar4y53fyckz104y8rbvz3msjvyb4sv2p4j6x0kwz4g";
 "tex-gyre-math.source-41264"="0vl9ggi62bn1cpnjmqanx62b6an5294375jg68gskg8fwi8j6gir";
-"times-35058"="13g41a7vbkvsf7ki9dgl7qm100w382mnlqkcngwgl3axp6s5s8l0";
+"times-61719"="13g41a7vbkvsf7ki9dgl7qm100w382mnlqkcngwgl3axp6s5s8l0";
 "tipa-1.3"="1vax0padc42ks1b4rvl0ikfqmb5i04ii27k1711vfdbzmg87j217";
 "tipa.doc-1.3"="0wwnbarpvjcq8ibbn8sr0zqrlg3clplc9nyh46r5gsr06qgd1prf";
 "txfonts-15878"="1dfrd8dzrzj9y5qnz9c554xn2g9931slhj9ylan2i71k5asxmkiv";
@@ -1662,7 +1680,7 @@
 "wasysym-2.4"="1i8pvf5yfw5j0rkcpy6v8czvr85p1yk18c8h18iljgsdvfj786h7";
 "wasysym.doc-2.4"="07lhw9ss609gjlhv9f0bbyv3z327v3jqblfwhcspwg2sjvazzx8l";
 "wasysym.source-2.4"="1i7y0si6mbd6kxbbyvcfak46hrcf95xv8x6nc29nc6adqjbygkiw";
-"zapfchan-31835"="1753lvv2bq29g43s4chc884n742695agvgal0b99gsrvlkyfp8gn";
+"zapfchan-61719"="1753lvv2bq29g43s4chc884n742695agvgal0b99gsrvlkyfp8gn";
 "accfonts-0.25"="10z7c7cgwm62dyzxfnj0jiy328zj3wccqjick37lz641vqifrd4v";
 "accfonts.doc-0.25"="17mbr2ydbkc4md6zd34km3d4s2vjmqzfwb2l01n4y30vjz2lzsn1";
 "afm2pl-54074"="1nbb9lcxqxj2aary7a65fai3hgj4nwzm690iy0xv62v580krdbck";
@@ -1679,10 +1697,10 @@
 "fontinst-1.933"="1jqhfib1ml33wq292x9ff03shyjrn2b3grw44cxzxndg4vq7mn1l";
 "fontinst.doc-1.933"="1ff19m49rawz7jlqi85nly05d9k8940ld94six21c1ik0v7cxn74";
 "fontinst.source-1.933"="133myqzr4xlp4a3pw8ld815mpl7l9y6rhz620ja77sv4fmci76v0";
-"fontware.doc-57972"="06n3am526l1g44db1pyjj0y3jj7792z4z0xd9crc8w7khqc0jmna";
+"fontware.doc-61719"="06n3am526l1g44db1pyjj0y3jj7792z4z0xd9crc8w7khqc0jmna";
 "lcdftypetools.doc-52851"="0yjbc6rsf8c62qa1lyi9kjyjy2p0xlps19llnvly3xyhla08j76f";
-"luafindfont-0.05"="0l4jncffqp3rjj7917gv4p5ljgh5k35i7d0rs5dmqgdc0mjs1zka";
-"luafindfont.doc-0.05"="00vhjbkicndgq6lb663b0s8a14c65i8vdsqqysib7jilrspj3b51";
+"luafindfont-0.06"="1q6814pvifiwq74hj29zfmria3mbjqpb17lf1p6j8fly0flyd7gi";
+"luafindfont.doc-0.06"="0mgxvr96dpg3yv98i4nic9ma1z9ih72lsz1yjwl40ny0k06zjibf";
 "metatype1.source-0.56"="1nhbsn33w6zbzbvi3a32ng6ib5dbh0vll9g2c5ssiv1ysxqrg6yq";
 "mf2pt1-2.7"="17kjgjbjvwnh3cn4cky3qj4kaskiis4h2zxd0mmq5h87qs24zj9y";
 "mf2pt1.doc-2.7"="0iwnr02wbh36q9nfj8jxc5d5kfc1wzap5gspix8n5rl3yzi9xgk4";
@@ -1773,6 +1791,9 @@
 "havannah-36348"="0zdbwl36d8a374yhaqfb4f3561ncch10v0vh7nxj22f267lgl2n3";
 "havannah.doc-36348"="1pkkslz2f66j606j44rq32dp9qhfqcr959wrp8j9xgkw76i9lprh";
 "havannah.source-36348"="0gyndaw2g2j2j22njn32839mihqx3pl7sij35vhsyahyamnipk2h";
+"hexboard-1.0"="1rbyaspfnvcms41rakzrchjrkggd0m5nshpzyhcf36gv6vxcz8ix";
+"hexboard.doc-1.0"="18fmqz39xwns749klira00vlm779gxja0i8g0rrpy6f1pfch93by";
+"hexboard.source-1.0"="0c6a9q1yj2dam3892m6105r737fn9ygiksd4fhmbmqpz9rxlm5zg";
 "hexgame-1.0"="0s68961p0dsaila2a3symqswvgdhh4ah08aphqjfs7licn50yy4d";
 "hexgame.doc-1.0"="1bfrm8mz98l8nrxgnvp8q54pr09ixm81wy1ds1ww4syczpw7jypm";
 "hmtrump-1.2a"="13pq5h9pwnp8hynsc35ib8wzblh3y4gx2lmrrvd0big80wwsdhsm";
@@ -1939,9 +1960,9 @@
 "qobitree.doc-15878"="001w9a4kxbrx11298gnvjamx8c6plag1gp5b7x9vq35s25kdy0i8";
 "qtree-3.1b"="10a9v90yspc1pq3ja9bzixdq6wxl6q4jxz5na7x9yw9g44z3xaf3";
 "qtree.doc-3.1b"="0ja3xpng871h96q220nrlq2iypk2spjs4qr5vpmri89b5nvngf6m";
-"reledmac-2.38.2"="0fkk48p4i0lrqznaipxxqdpgghxh4a8dnqflsy90khkwhs4vzdnp";
-"reledmac.doc-2.38.2"="1dzr1dfllbj4qy87dsglf8ss59qzikcfxskpvbr79xjdnr22ccaf";
-"reledmac.source-2.38.2"="0y91ql8y32sw091sl7il7zf8xh288qg4rjaq3hxg558yvida3pix";
+"reledmac-2.39.1"="0i83j7jl1r83yl36hxgl41y87bi76j45zg8v1qzv0blnbafafsc3";
+"reledmac.doc-2.39.1"="1sn26djrllvhi7snq57xdspn9snc3k0ag9hpy7gd4dgchz0i0lsn";
+"reledmac.source-2.39.1"="1dx8wrdj6zj5s11y8m08b85cq810bkczmhzghmg9dvf24b2c2wnr";
 "rrgtrees-1.1"="0jihs23929pzbgpgnb2v9i16fcil9kxkggdv1dvg6xq9f2fh21md";
 "rrgtrees.doc-1.1"="1skw79hvvh0xkjff4bfl0nqdd8znwhhwpdx33v8ns43xxamzmnwy";
 "rrgtrees.source-1.1"="1q7y5mbvnrykrp87kljcxw7zdglh08cqz92iahdsaac4xffnz6bc";
@@ -1988,9 +2009,9 @@
 "arabluatex.source-1.20"="1g84xxm5fvp6dzdrkyxcjn4wlih0iydrdyxn93dffx1a9n1c3yyg";
 "arabtex-3.17"="1nbbl9306n6mxd2ijk8gvygaws6rxp6y4wfnp47wn4914ra5h8nc";
 "arabtex.doc-3.17"="1xdx2bf1jzl6ixdp49cn2ya5h1z1fxh7jljdvafjv2fhiaaqfckd";
-"bidi-36.3"="1nyd4zz12gxlk5n1bg6vinkm4isy1zi0iq9d6vfk2p6w3qwy9dm2";
-"bidi.doc-36.3"="0wx2bpygghmjxz938qs4gb8739accp7hnwlinrbids3pc38mxhl0";
-"bidi.source-36.3"="08apy9pwz55b1r2ab706slvjnmyc8ik0qz451jyrvlb48gf3g89i";
+"bidi-36.7"="1wmdbhp889rnxw4bv811pzy9z4k5m8nz412vnhnj7ibfj3hjrriw";
+"bidi.doc-36.7"="1m1ba4vv03chdrxa02484vvd220n3h4x8y65ww2srbq9bcqi39f3";
+"bidi.source-36.7"="1w5v1sry1h98wwnkn5kcr1i0472j3zcmh7nwaf5x3rm2h60mh7kw";
 "bidihl-0.1c"="09wrzqlldxy3lcxp21rdqi9bnjzza9wvdgssqynynjdmfggahd34";
 "bidihl.doc-0.1c"="1k67d2zd16ash4krnkwvmwx4wl668r0pdg720vr9xq6q3b139y9d";
 "dad-1.2"="1sj53bp0fp8d2d3qnwvl0lm7c6pzbvv8ds9ww3x6qhrna630iwaw";
@@ -2021,9 +2042,9 @@
 "texnegar.source-0.1e"="1bayaa5vffnkmvdmg64q5rsnh69grr8qirwd41mlfi9symh9gm2j";
 "tram-0.2"="1bk233y9pin9r76vsbkg5j2wadp3c6p2x3mgqchnmlz2ip54x336";
 "tram.doc-0.2"="17b0vw6r2ijgxs3dix1ff9r342vkz1gsa603mxixxxik62j5crk5";
-"xepersian-23.1"="0y3r7hy2sxwim38msy87rd338hncygc920140i8bs9ii9qyxddwx";
-"xepersian.doc-23.1"="0g9n3pkd5zj705iyyw6rp4k88mnqc8kl4ng0jvcma1wj48xjzl83";
-"xepersian.source-23.1"="0yj8z89hhf083fzw4kr2475zl7q0zg5frh04hkj617a3cylc3r12";
+"xepersian-23.7"="1k379xwrqggbahb9a3h70n25nzq7y8b8wqg0xw3l3g596sk0f227";
+"xepersian.doc-23.7"="10b7z3vp1balm40q0064w94m2azn91yq4g704q2wgjca1r68bwpb";
+"xepersian.source-23.7"="0m39rq0vssfvk4kyxx06dz08ykr6msigfvdhny2j8pv6kfsrcgm7";
 "xepersian-hm-1.1a"="0qj98xrbnh9bam0a6c6vy7ffaia3iqsx5s71bjlmbnyl6y2h8lwp";
 "xepersian-hm.doc-1.1a"="16f5x8jv8mqf5a32gvrzqwh1xz4s5nxwqsq4q8sg1za6micqniyg";
 "xepersian-hm.source-1.1a"="0zcq75xzkr0bgpf1xdsphrkcv70q17vs8jkhzxvjrfzilh9h3iqr";
@@ -2073,15 +2094,18 @@
 "xcjk2uni-1.0"="1x77gmg738r2zbyd0mc7q079hz5wbvabyszmwizfdj6vflm86w3y";
 "xcjk2uni.doc-1.0"="0xig1w251dsn2qd9iywcdc20plibadiw8hl1iwygpzfa3187djjf";
 "xcjk2uni.source-1.0"="12hbjjdypk0s5k5iaac80n2n4z1zlkg5lp59y58dwnn4y1dx6m6z";
+"xecjk-3.8.8"="18ja6v7pb9sz8q0alq5yhjk2401hk9s9zcandp4pa06yvcygb9xb";
+"xecjk.doc-3.8.8"="0msxlpd5ljz0w8j78g214fxfzxms6hxr7lnhkhkwrza92c3gsrxj";
+"xecjk.source-3.8.8"="0qgywayy978vhr17p5swpk1li5yl5kjqgpidazab0c9q93j7y1r7";
 "zitie-1.4.0"="131kiycj7q9javr3xs7maa2qjczmva7vj98bw36pv7znwchspcca";
 "zitie.doc-1.4.0"="00daf6p699y5204lrdg7hfcnmqh3ah764fpjymblvm8hy5f1w5g2";
-"zxjafont-1.2"="1blq826xrv3wqkpdndd21wmd5v4gp1b45yw9rkb1g2ypsighmbwg";
-"zxjafont.doc-1.2"="1vaavdxhjq72ri2aw5qnsf8jiijwn1y36fhgnpb1x0dhkhwz8076";
+"zxjafont-1.3"="0p1zmf0bwd5fpyyz8cwdwc8pnxcqk31570p4722lzwqiplm0azfc";
+"zxjafont.doc-1.3"="16w7iqlb5zwz8qqyyscmyd0zdzb55n38gf10qd5cra6c161fi7b3";
 "ctex-2.5.8"="1k20gnw84g1bgxj91k05fa6g0zgh5h1g73hqygzv6rm3gc133vl5";
 "ctex.doc-2.5.8"="0f078qhd92m4h64gja8n5npbl1qd98jmx461pjkyrqxysgjvvbl7";
 "ctex.source-2.5.8"="0k4yy6wqnf6dsw6ys1cwm2zmzngx8xmfknln1jika556wgv2lyah";
-"beamer-3.64"="0qbcbn5hiwqdai12qy9hqg2cbjsxm473gnpqmfn173rl37hwnxn0";
-"beamer.doc-3.64"="0sxbds7ac4nqi9x0r3wz9kld7k7p4a0b4kfv1gzg3v9rf6s0ab5y";
+"beamer-3.66"="0fy79m0zqpnhppq8ykx37dn68aliwgnkv1qjnxa293chli0c1v36";
+"beamer.doc-3.66"="08la2h0km745ybgjlks7zb7scd4ryypfgq8j6qqr7a0x5x36mpfb";
 "pgf-3.1.9a"="1fv8k0p3qsl0y3fzfkrzn0zw9bclxav7anzhzswl62s250bfzx7h";
 "pgf.doc-3.1.9a"="02kng22cfnvmxcbxwisrs48jyx4w27l2rq6b2iz7gliqx6rvm7zv";
 "pgf.source-3.1.9a"="0g81wcsn7dx21q44b29jscikxayw1pa5vqclwxvd54p1x5f98ch0";
@@ -2100,17 +2124,17 @@
 "everyhook.source-1.2"="0hv04cn2j7sf6032jxv18py368zbpp4ya15wv18qymbk6yv5najs";
 "fandol-0.3"="1l6h2brl2d6bnam6p6j0p1d2s13jnva5zkr1xr4sarzzxj6zlz2r";
 "fandol.doc-0.3"="01ax7za7wcr644ncpv3rpfvl2ndqlppqnjzbjp8y2d0hawc3k5m0";
-"fontspec-2.7i"="14fl3r5zvx2va4wl3jikvlkan9w8cc1g6ri7rm2rizlksi0dad53";
-"fontspec.doc-2.7i"="0bwfq45mx5cdxjpwjdhdjxyw400933ns0zynxkijcvkvzhjx4pha";
-"fontspec.source-2.7i"="062mm06inkgmpv58c2rqc9cpbr5fkg7bznabdvyq8rvvy4qiwd5n";
+"fontspec-2.8a"="1lskffvb9a3jmzq4m0kgq0v4jhl39aa70zkz8ha1i5zhljwg4r6r";
+"fontspec.doc-2.8a"="12rxb0f61jgh9xbgzq0479zxzqwahsx57s9nl5ygrwcigwzglk0a";
+"fontspec.source-2.8a"="1zxfi2adixnk7fcy3j4iixr86clv9gckgwimycrmsf4wvvaf031m";
 "euenc-0.1h"="0lh0k5g6icbbzl1xzzcj4sw7vjhqpn59y9xbc6cn58klpww8ywdh";
 "euenc.doc-0.1h"="0likhzn8afsq302aiyjk6adhjimz0naqffjrj2s06c6681z2inh1";
 "euenc.source-0.1h"="0bwr4cabh3w4jbx476ygxv6afxj6sblszr47awr2nixx0m018ndj";
 "xunicode-0.981"="1h8ixz9zy9izv5j7555094jiwfp5js5y8mp4bh993gn9xn1rb6b2";
 "xunicode.doc-0.981"="0jrxnpas07np9a30cybk6jqv4ng96vjqpyyadbl55szkiylzwwfi";
-"luatexja-20211024.0"="051mjzf1p4mykjdlcrh829p4plqwfwlmwwzasqlcqh0idbglhig1";
-"luatexja.doc-20211024.0"="14zas75ni7phhbcrwc87s23d1f481baxx4pshp0d2661nmjiw1g4";
-"luatexja.source-20211024.0"="16nk56zmp8s4jd5k79yq1zlg2wbswb3im83jw5n41dlk7g8j8zfx";
+"luatexja-20220311.0"="0qc7yd52f0wimx2ychx3fyswjkvgq355q9kxpfbc47an24wjfqs7";
+"luatexja.doc-20220311.0"="0fc9g0p819pwh3m6w6ypl0lrbh9zw4y0s55kcm6wvva0zvxndkx2";
+"luatexja.source-20220311.0"="0636c01zlimwaczf8rgdw2jrl43nn1l664g7zvf8c0wzmm1ihvk6";
 "luatexbase-1.3"="1zrwz661gilr4iizcfsxwmfr9dgx7v28lypaslmvp3zaf52zl2q1";
 "luatexbase.doc-1.3"="118azb2x20gyaj42r5w0749dx8rzhhri1nz3szy9vv64h0fig603";
 "luatexbase.source-1.3"="0vsg8q5k8l66sy3d0bskr6cv1f95lnhap3b9yl754x7ynv272xcd";
@@ -2122,31 +2146,28 @@
 "svn-prov-3.1862"="0r4s76i89wh1fjrmf9imf6y2sf96xznznyjfcivi3sp8dvf5ln5v";
 "svn-prov.doc-3.1862"="1al7qiwd5ajjpvs2f90p7frlkd389p1ama019yl0nnxc1l45m067";
 "svn-prov.source-3.1862"="0cg7qwgv20jvvw6bibkskj3p8jc5l2mhgzwq6x0wzy1ds7x1f6b7";
-"uplatex-59450"="0kmw51xvg44jrzn6r1w2biz2d0m3j533qadi4bfjhf2dzi4jdg61";
-"uplatex.doc-59450"="1q5ghbbcknwvi2css4j7wjl0gcknkrn0sp0a8a4f1mfarbprw01b";
-"uplatex.source-59450"="01gpwxp81hz8824y1hffq6b035l0pxa8wyfkjm9kh5m58j52s50w";
-"latex-base-dev-2022-06-01_pre-release_0"="0c4zx73aaw6726b0clr1gkv2bkk9nxw4jm1xk99axi3a4ikb05gq";
-"latex-base-dev.doc-2022-06-01_pre-release_0"="01m3xvpxla3js1gbvanm95m1hm46gffh177xzhjngdmqa5ih4cn5";
-"latex-base-dev.source-2022-06-01_pre-release_0"="1sb8g1249j6pkdd6d88nknxmc11s5335x7p9sw5ix41s97gf3cdy";
-"latex-firstaid-dev-1.0q"="16zxxas9zlzx7b9pri2xva30a5m886svrmy9cxj63a9wi861js5j";
-"latex-firstaid-dev.doc-1.0q"="1z3kfxbh3s3hwfvp2vmyj2da37kvzimsxd3jbbgjmys0vyspyh0d";
-"latex-firstaid-dev.source-1.0q"="06icyzb02vymczpqyb92hin4aniyg652j5rx6581vl50cn75kkvs";
-"platex-61273"="123kfimgsp0jgsqvijb5f2fkpyjm5l36h59ykpig73fyb3l5yld0";
-"platex.doc-61273"="0a0zs1yvw8dx3h4pnhxc49s4ks6ykbsv66i2s5l6b586r1qi2kri";
-"platex.source-61273"="0hx16zbka5zbhskh2zvix0acz3051g3jkgff62f92wikhyhgcgws";
-"ptex.doc-59502"="1jh14hzww79218bmz0ndbcfg1yx020h36nh1r0a3c22rsmz1k4fc";
+"uplatex-62145"="0kmw51xvg44jrzn6r1w2biz2d0m3j533qadi4bfjhf2dzi4jdg61";
+"uplatex.doc-62145"="1q5ghbbcknwvi2css4j7wjl0gcknkrn0sp0a8a4f1mfarbprw01b";
+"uplatex.source-62145"="01gpwxp81hz8824y1hffq6b035l0pxa8wyfkjm9kh5m58j52s50w";
+"latex-base-dev-2022-06-01_pre-release_3"="14phpn8q5lp5392igxdxhy0671hmsgkg2xk9bjpk98gmg8i7jy6a";
+"latex-base-dev.doc-2022-06-01_pre-release_3"="1xqlcf1wwnh8p7q3yhjs2p9k0n18d8r2fa6bmnilb4za95z1fhzp";
+"latex-base-dev.source-2022-06-01_pre-release_3"="1zp6y80zvzrfs93a6ddv70lksxm329xls338ra0xpa3zq6naw96c";
+"latex-firstaid-dev-1.0r"="1qypmml1s626fmy7i8bgkgdy2xgpj4sz50xzpbbkzhglsr440fxi";
+"latex-firstaid-dev.doc-1.0r"="1sazgbwxby8rnba50vgmvmd4gchlz9y2mw6xk4fdprqfjnv7w49r";
+"latex-firstaid-dev.source-1.0r"="15m1a4kbxayv9vjw2vhp3pap088i8pbn6fm7h629czjlmkmc4d7m";
+"platex-62145"="123kfimgsp0jgsqvijb5f2fkpyjm5l36h59ykpig73fyb3l5yld0";
+"platex.doc-62145"="0a0zs1yvw8dx3h4pnhxc49s4ks6ykbsv66i2s5l6b586r1qi2kri";
+"platex.source-62145"="0hx16zbka5zbhskh2zvix0acz3051g3jkgff62f92wikhyhgcgws";
+"ptex.doc-62145"="1jh14hzww79218bmz0ndbcfg1yx020h36nh1r0a3c22rsmz1k4fc";
 "ptex-base-59406"="1h14n8hj9xh97y2g8fnz7q3vrzmm7nkk1yj9194v0y6kjggf732h";
 "ptex-base.doc-59406"="12nxgvrinkd95hiwczd8nykiyldjyvh8sk49m2j8hl9g4g6slkg6";
 "ptex-fonts-46940"="1vvgb6kxl4py4knh9jqnwjy5a9xf0r0yr8n6rihpxmmw3lymwrip";
 "ptex-fonts.doc-46940"="1fys51jjzzmcxrkkc2iq6yx5p68mspqnhm3gap292f7qbh2n9jp7";
-"uptex.doc-61107"="1bhnhaj3ahyq5jirns6bh5pfn9j02y84awbqpjjgpra6zf43sy41";
-"uptex-base-59407"="0g1ihpqi9im0k7zg8vmwzz8mz3qpy2nfgsq5r7kidsar4yrqcj1m";
-"uptex-base.doc-59407"="10c6yrjafnfmw9kajdazkfwa98m78hj344npfqw06byca6433jiz";
-"uptex-fonts-54045"="0q4rn470yg1d892mb6g9z1y8y3w1rw7a66ag5gal6j0ndxllgghc";
-"uptex-fonts.doc-54045"="1nc9fmaq2vyp6387k7rdpvpzclabr2g30cpng5ry17k3qmliiaqz";
-"xecjk-3.8.8"="18ja6v7pb9sz8q0alq5yhjk2401hk9s9zcandp4pa06yvcygb9xb";
-"xecjk.doc-3.8.8"="0msxlpd5ljz0w8j78g214fxfzxms6hxr7lnhkhkwrza92c3gsrxj";
-"xecjk.source-3.8.8"="0qgywayy978vhr17p5swpk1li5yl5kjqgpidazab0c9q93j7y1r7";
+"uptex.doc-62145"="1bhnhaj3ahyq5jirns6bh5pfn9j02y84awbqpjjgpra6zf43sy41";
+"uptex-base-61795"="0g1ihpqi9im0k7zg8vmwzz8mz3qpy2nfgsq5r7kidsar4yrqcj1m";
+"uptex-base.doc-61795"="0sihi5hj6p0hj42niykav1rzdkhiw2ph0cn02vcs47wdkh7vmzq5";
+"uptex-fonts-62593"="1yi1vid5dr9zif40adil84fniach4j4n2ngqvyfkjabn24gsaa4s";
+"uptex-fonts.doc-62593"="0jqjcjj19csf7rgc5ndvpy3vmp6rpf89pi76yli2nd8vvvnxg1nc";
 "xpinyin-2.9"="107l74kvfwhk3r325hpvvs9p92s07mxq46qlvdvaq4yr6gjvlh6s";
 "xpinyin.doc-2.9"="0w5pwgw1hd8bpl4j8nm6qmv4jdj25rdv549dfhkwncxwb10ds5xq";
 "xpinyin.source-2.9"="1qi4paa3bvwhny0xysq8a88czzdn736mm7fg7cvxlclfn5v9r0xx";
@@ -2167,7 +2188,7 @@
 "hanzibox.source-2.2.0"="1bqnnx4dhgrhxjk8hn4xiycxyi7wbqbsvchc70s9kz347zina3gj";
 "hyphen-chinese-58652"="08sbasjp9b4wl15zmx0diayqfa9i7pf65nnsa98lbc9rpyydvhn3";
 "impatient-cn.doc-2020"="1pc20pb0las3slam1d9hmqigipmr6r98wwif12m33mm750vmq65i";
-"install-latex-guide-zh-cn.doc-2021.12.1"="1n8z99mh0gzj6w0khnl8snwqw7i0xb9kg7gbsfa911l19gc42xjd";
+"install-latex-guide-zh-cn.doc-2022.3.1"="1g81j4cwlfxwicn3kzj4p3ppw34n5w2sv8z5gnkgp0fkvfhg88ng";
 "latex-notes-zh-cn.doc-1.20"="0w9rmd7b5fnfvix653n9vbnn1k8yxlaaak79ipvm8p53dx75xfxd";
 "lshort-chinese.doc-6.03"="0455mdpcv3yg4m5vrbdp47j7mcwi43mvsy2p9clp7794agaf2ir6";
 "nanicolle-2.03y"="1sk2frvlsxzrl5cv1c1azqpxbpfr4b06ssli54j0p5aikf0rls1f";
@@ -2202,12 +2223,12 @@
 "babel-russian-1.3m"="02zvg65m1g15a1fbin635gvx2mxw2ljv4srd0wjjfcpdyfg53sl6";
 "babel-russian.doc-1.3m"="1bs2q9xxqyjvpqxr3zfbmk0lkf58jg1ksi5a9mp07vznzplz01i2";
 "babel-russian.source-1.3m"="12ik2dwkih2g0gqpbg83j0kcfwsb5grccx27grgi0wjazk0nicq6";
-"babel-serbian-2.1"="0fr17sryc46m5pzi97i140ikqx9m7v68q8gbpm5yxiz60rd7x25h";
-"babel-serbian.doc-2.1"="1h3r0ywv5isrrzswdn8chqk31bxsbmlm411qkcsk3k09ck590wzi";
-"babel-serbian.source-2.1"="1nci9p1haqfd1668nf2q3vksw8fi4kr6qlmc84s4iyrmdcck0gp5";
-"babel-serbianc-3.1"="1waqvv8nd3rgqf11bc0ci1dvf8pg0w3j2j5rr5qwy41jmdj6zjrb";
-"babel-serbianc.doc-3.1"="1nb1lcssaq28iv6s5m8p0sdnmgq3f53692fl6cd6cgs58hrdbd90";
-"babel-serbianc.source-3.1"="0akj6diwkvcyimy0dcn2b2lgm2br65d0vxgjbsxx9z0zcmsqc514";
+"babel-serbian-2.2"="1d6mz27y5dc7ia2a94kmlvifmihwj8x734nddk0n0cf43w41wzjn";
+"babel-serbian.doc-2.2"="0fg2w49pmc67ddzg4lf2a01x8qigpnrabw5d4m4h5gwzy5hs9chv";
+"babel-serbian.source-2.2"="0fhd1rvvjgjkcsxv5qq7qnrwpw7c6sx8fb8x9icc2z6ngjgmcwfg";
+"babel-serbianc-3.2"="0v0xm1in3cjlxmfijvalcxgfskw9nb562zig2algh4ybijazk4iy";
+"babel-serbianc.doc-3.2"="1gilgvs1sk6rjlyyn3c1clyr799fjv09j46775jqzkanw17p6s8j";
+"babel-serbianc.source-3.2"="1v55iiifih0vkyhfx3f8q3xma1alkb40yl92qghai9ph99r4x9q1";
 "babel-ukrainian-1.4e"="0fm0sbr6i1lx2zg90w3mlwlyg0j0f11ya6as2n1w4gbm1inmc62w";
 "babel-ukrainian.doc-1.4e"="1h3ag9pybhzysb65xg3m217jll1h02ks04icrlhkp97sx3gs9wqn";
 "babel-ukrainian.source-1.4e"="1v7w99b86iclp16qxdjfqsxnh2p9zg669pwdlman1467y2z13p8s";
@@ -2292,14 +2313,14 @@
 "cs-41553"="0nzzcg1yvbslhqm5lsfcpqh6sbzkmnmmgyakg9l8855qpa8g9bf3";
 "csbulletin-54433"="002dpnpxvppdrx5g523n17fj4f7jdyhfam85zvrf3qbqiahij3n4";
 "csbulletin.doc-54433"="0p2wbn2ndsmzrwry79408qfmfaipnkg4cjsd9phifpz1hygc0a96";
-"cslatex-57972"="1qdcnf755fak3kppl02yi2q9ghb17kxr2cyxc2y80idaafqgr9sf";
-"cslatex.doc-57972"="0b2a9hrbqzhd7k4ac9sqphs6zvj1hc03acgm5afyijy2mkx865v0";
-"cslatex.source-57972"="0ig4a8nksmsm7pb1hxfy6gksfv27bgayqx60ygiaphcz0ir73546";
-"csplain-Mar._2021"="068g31l2ralz03gsv58j67dm85vy0ad58dvdkh93ws0yzf0rnr5f";
+"cslatex-62145"="1qdcnf755fak3kppl02yi2q9ghb17kxr2cyxc2y80idaafqgr9sf";
+"cslatex.doc-62145"="0b2a9hrbqzhd7k4ac9sqphs6zvj1hc03acgm5afyijy2mkx865v0";
+"cslatex.source-62145"="0ig4a8nksmsm7pb1hxfy6gksfv27bgayqx60ygiaphcz0ir73546";
+"csplain-Mar._2022"="14z479gkiwgw17pdghrxh5q0rlxnij7ccj49kgf3macwgmh5lm0r";
 "luatex85-1.4"="0ss7c5x0x7sx6lsn1iq6lyyp6w0xb1iy01s1f7zf7mlb9n1yzffi";
 "luatex85.doc-1.4"="126y3priwz6anp8sj0296bnxd53lz20nchpxw74zphfpwrv4hzih";
 "luatex85.source-1.4"="15bc8g0pgrkqpb8q2dhb6zml2d4jwrripih9898mmalsjixy62x7";
-"cstex.doc-58354"="0j3ifcz9myixr875rf71nh4ly2mxa5yz7cs3w8waapif82yybj3x";
+"cstex.doc-61719"="0j3ifcz9myixr875rf71nh4ly2mxa5yz7cs3w8waapif82yybj3x";
 "hyphen-czech-58609"="050b4vmp8n9nwqzagpw7mq1ciin9rwgdicmbk1ajl9gvci7q1q8b";
 "hyphen-slovak-58609"="1vn6i784fdz35dcbxdcv85886mbg8vbjvx0w6sx230gjjxs1s571";
 "lshort-czech.doc-4.27"="0ar9qa0cg0mjv6ydgx1phaa1qpiy25s3jciznbylgi5xprvnnfa9";
@@ -2315,7 +2336,7 @@
 "components-of-TeX.doc-15878"="05wq82pa2m1hdpjxx2bhj61nkwcyynjn3fprbnngf2llv8yzb9ag";
 "comprehensive.doc-14.0"="1pa76hkxfmms5h6y6zyg4l5wrspprhnycfdigby8302srx676vhi";
 "dickimaw.doc-32925"="1mxjqn4lblnpbmad3jk453lyx1qzcmrddis59j3jsgc5sp929w4k";
-"docsurvey.doc-57362"="11qir5haz6k0caa7c3gf1iads9z5nwqli7gvblzclxv6g97n9374";
+"docsurvey.doc-61447"="0f2kzmmpm7qwci04krmnz5impfwwmy2wwanmgq05878w8xbcqjj6";
 "dtxtut.doc-2.1"="1szg0xvwm0jbzs8waillijzrff4kv04a73gsqh9c12ap427xfryr";
 "first-latex-doc.doc-15878"="13ngk5pia5vbrbb4jrrlq1lmyja08m7cy4ydcjasxha8kns001ss";
 "fontinstallationguide.doc-2.14"="1i6im0nckcr9fzs0kc54dvcj3jvjz2j8jd55xgjm0r569qjj1hi5";
@@ -2332,11 +2353,12 @@
 "latex-brochure.doc-40612"="0xba20sy8q10ac9hxwnz9axh853hrj06vp7mfn12ajax31miznmy";
 "latex-course.doc-2"="0z6q95l2vvxrspc04ki9wnrzhz76nynb5ai6969pgw6ihl68384f";
 "latex-doc-ptr.doc-57311"="0mamlfnxzi4lwh5cpss8zcfr64jdnf6vnj9fp48accrqdj2rpfs2";
+"latex-for-undergraduates.doc-1.0.1"="11kp03n0p985j7hfmpp3f5z4alwxzhs8mkv2bqnfapic96plmq9h";
 "latex-graphics-companion.doc-29235"="01zs32gck1sl9zlbhghyjmjwxyvw0jha5vl2hd10knyrb3z4dhxc";
 "latex-refsheet.doc-1.2"="169h1syday30qiw032k14fhxikdwszggvqz8b9ga4i9wwxf1vh4m";
 "latex-veryshortguide.doc-0.7"="17i8zmr7mjfrx911psdy9cbn05c5inn4ixqmnjkpr9sbgsninyc4";
 "latex-web-companion.doc-29349"="0v018lwf88z3qmzyqpyvfql7dbwk5a9r0wj3jfjc9cp2ksl8zf8f";
-"latex2e-help-texinfo.doc-60038"="1j19znwdvm7fn5g15igkjndk65wvpyw6rad319dw0jaldc0fq19h";
+"latex2e-help-texinfo.doc-61750"="1z1mvgi6705f734885iybzsyzbdvzzpc99bxvdf7gqxpgpp17nr1";
 "latex4wp.doc-1.0.10"="0xyk6w8jmmcsccbd9q4ikblfq6nacjjyrmf58ddjxkb6v0lzndph";
 "latexcheat.doc-1.13"="1383rsi21ma0291asi779bjr33m7fii019di8gv8kxwgci692fz0";
 "latexcourse-rug.doc-1.1"="027siznmshk60flxgra7dgzvwbmgwvckwb6r257b91x3rm77anv5";
@@ -2357,7 +2379,6 @@
 "plain-doc.doc-28424"="062d6hg4npy57307avvyd2sdxnmyrh5ia2rdb17p6cx555k8zxwq";
 "short-math-guide.doc-2.0"="1wjcjgw0xk4zx57f364cpl57qpxj3lq4lahlkbk6iiin1h9v2prf";
 "simplified-latex.doc-20620"="1cgf1p7p2ikda1nb0c2vhhx7ai6rd973pz6a00pr9yanxsvghp6d";
-"startlatex2e.doc-56809"="1nn9mcazsmhlb7gdw06qcyf3grf8sbgqll9j8825p64ahy35al6q";
 "svg-inkscape.doc-32199"="1gw3jp7wph0ys6372z2rgjwlpmmawdax7xpgrp4hzg5hxz748pn5";
 "tamethebeast.doc-1.4"="13shw7hcimckn7pp8pj0cr1zsi1wq6r400x1v6akpmwwjxkw09g5";
 "tds.doc-1.1"="10j98fv34p0mwgsgjps8mfpn81kbzghfchz9nr7r5bwz93s3ycsz";
@@ -2365,16 +2386,17 @@
 "tex-nutshell.doc-0.7"="179sczl1kcd98rxvaa17kppkmjlcppwxp878lfjph1kam9j9pa5k";
 "tex-overview.doc-0.2"="1agfya9rwvyjvip0alvibimz75jivpf19hp4jvlv7z0n9m26m9jd";
 "tex-refs.doc-0.4.8"="1w7hcd3qsdhmb2siakjg2hm3h6kxa90ncsaif9spr4xkxs03ib6l";
-"tex-vpat.doc-1.0"="1a64z737lby5v0w3wvvy2icc15f5ak6yfxc67sd327pfxxxijx1x";
+"tex-vpat.doc-2.0"="1swbzqja72yz13ndha5s9fxjf935001f4a3fxv41x15k3h7vh281";
 "texbytopic.doc-15878"="0pnh1hsd6k434c8i1xdjq3ywrwylmryrsl86d6h7i1cnmzz4pwlx";
 "texonly.doc-2"="0h40f8hj03ha0ilpj2fx5kzzvdv0yplmr4528s2rmmy62l9kgdkd";
 "titlepages.doc-19457"="17ib7rpb2dhb2m724x66fdzddv8cqd808wxy5kkvx0vb3rl27hyh";
 "tlc2.doc-26096"="1ysb233rjb8gpl9s35qql1dny5rj6fn8ssy2dqdqsn5xj9pdasyy";
 "tlmgrbasics.doc-60588"="1zn4xlmichd2r6vjcasysk0vd26vrn2drmc4ng8hz8136bq5zb71";
 "undergradmath.doc-57286"="1z8my3fwqc8rfc1843j7lcmfka2023z9k0js4ygh1m8kilc2nrr7";
-"visualfaq.doc-60200"="0fjx5y95n8bhsnwsw34sazbgygznvw76z01rrxmn1bp8za7751n0";
+"visualfaq.doc-61719"="0fjx5y95n8bhsnwsw34sazbgygznvw76z01rrxmn1bp8za7751n0";
 "webguide.doc-25813"="0wid2sxrif3mm3lrs0s6pil949byviq4d7924yzvmf9hkrs5f03v";
 "xetexref.doc-56291"="15gb91s8zmqh1zwar2r3yca3ywp1lz654h8ha6xg52lg83vjzr2v";
+"yet-another-guide-latex2e.doc-0.5"="1k0fbpxq66knsmvppk032cxadljgc9r8sb7527wpjcpm9jhz0822";
 "armtex-3.0-beta3"="0m8z77lvwkrmk6zdlbxy1gcic8sgn3xwcnkgv9nfwxrjnxxmbhyr";
 "armtex.doc-3.0-beta3"="03inlslwgi0zgnndz4p23r40rdwpl4lxbxpc1w683c673b258hnc";
 "babel-albanian-1.0d"="170mxpwnnsc1g9s7qnlhjcryw79cy72d8c4m8bhr36i5c78my0zg";
@@ -2492,6 +2514,7 @@
 "hyphen-turkish.source-58652"="0rjwv5b0jwnwhlp6ifzd6p8iid59zylp2wbfk5crfjnknrl48qn9";
 "hyphen-uppersorbian-58609"="0rvb1k16rs9hvb9xgf3yv79mh2gkndvk85blmjjsq49awwgkd8y5";
 "hyphen-welsh-58652"="1klj6ir4b918cx96jd772ps9fl2fljh8kwkakdwaqqi8szzr65d5";
+"kaytannollista-latexia.doc-2022.3"="0g9rhbqh8vgwcgqdjm1x1ji6gwj5j1df3zgsv15pbbkq0agx469r";
 "lithuanian-46039"="09dncv4i7jqc2c28k992qm94iqg3x3nbnw5wqiva3xn3jiwx0fg5";
 "lithuanian.doc-46039"="17kac4d54nvd0bh0kqz00j7bm26vi4gnkbl5il1zb12g76r5afv6";
 "lshort-dutch.doc-1.3"="160r060gmw6f6lgbnyvfxafjpqvyr4jwd56ddkjfm3ir2bfl973d";
@@ -2561,13 +2584,18 @@
 "impnattypo.source-1.5"="0qc5wz5a4rgvrzv361gq3i6h4hp3v176klgn6fhiwshk84zqccn4";
 "l2tabu-french.doc-2.3"="0c6fbmgwv2adlxbhl1shvpa1w6xd36gmrwvkjgdp9xc3q999l4dj";
 "latex2e-help-texinfo-fr.doc-57275"="1kbp36h6nlnw1h1lbi783jmwsznvi6xmv7szlvdc3fkc96qn5cgn";
+"letgut-0.9"="1lv7c8zg0nkp511cf97g2hps65wklav8s23zq7gld2yl9qc9whwf";
+"letgut.doc-0.9"="0mv7a796f17kjdxzk1gp7mjyzdz7s6vd73yl7gx4vvfnal45y0s0";
+"letgut.source-0.9"="1qgs5nq1s5kqz3xd389gnr0vjpdcjria1cjfr1nhgdf8742p6kk6";
 "lshort-french.doc-5.01fr-0"="1hdl0w7b1ablx7qfcvgniz7dcbgazb49b8wfw7c08hlb38gxfqh7";
 "mafr-1.0"="117qd3a06lpiqimizj12lxd0vba82lsc211b46ags0mwgrqhcyz9";
 "mafr.doc-1.0"="1m6y9mpsp4w9cnbln8pv1pn86vqj9piki4kg2q2rq5m9q0g57vsd";
-"matapli-1.1"="0hjrcjkihb29z0z2xspvkbmq8qj18z3yww3lgifxlc9ydp7bppd3";
-"matapli.doc-1.1"="1r0szrdmmdwjjmhhy97bdyxkbcx0xy1c6papnh58hllx45lbznk7";
-"profcollege-0.99-i"="0rkkq7wvyq8z51862xdbkai37xq5xcrg70y5nngw8vf96fy5j8bm";
-"profcollege.doc-0.99-i"="0bljgg3qk99s1a4lpbq3s8nb0yjj6q7kv5aqgydidxfrb1wg888c";
+"matapli-1.2.0"="0r6xibqz726d68cli8izl20r4x2ncvrmlrjb711jz82qxbgs9kvg";
+"matapli.doc-1.2.0"="1cmyrnrijghjm15lhi2isza0dishbll3k4hpzq84jjjbcbs4gvyp";
+"profcollege-0.99-m"="0sd2ljnlqamc36284q3fz3a01rzzn81v2bidgiw7n2d305vmsz2i";
+"profcollege.doc-0.99-m"="1w7fk14sfyj0mrg4mn0kbc4vvqphqmp3zp9p9nmnv99wicbi1ij3";
+"proflycee-1.0.8"="1hsgvg2vpcdnfbypyradq6gwwfy9jxmpfzqyvvwch8qkbb16y3sj";
+"proflycee.doc-1.0.8"="1x916zby0wdaikkn332rd30rzz5y5x2zcyjrc6zkwyhgm49y2h17";
 "tabvar-1.7"="0350mqq0hnqcx7afgy2phs4zl1x8ipzkmkmg7lkabrhhwq2haa6g";
 "tabvar.doc-1.7"="1qrr3j2b86shaka288mhz4hdbfm0kz4fkjfyz2xf90cpgl0ly5ql";
 "tabvar.source-1.7"="1v39fas0k1wmjjzkyii54j5ycafm5kwcriq65j26vzkwz4ykb0px";
@@ -2581,10 +2609,10 @@
 "translation-tabbing-fr.doc-24228"="1cih442gp6zf8nwb2lbgjn7a64aglyrcw3aciqy5pkdw09pwn0an";
 "variations-0.3"="0cij0zdvlv3icymqxsfn6mfzdmb3jrxnfa3lz2kz0xx3x8yn0sx7";
 "variations.doc-0.3"="0dwsw8j2bhk5cdw61xlcvlg152z6k6306zpbap2gjlfhf0z57syj";
-"visualfaq-fr.doc-60273"="0f79s8cb7wxa4k9awmi9nb3kwr6lwrayr9hj0ax6a4xhbd9chr91";
+"visualfaq-fr.doc-61420"="0xk0qly49dqkrw1qjhnyp4r7y5jykghlp1y26hipghlaqqhdynga";
 "visualtikz.doc-0.65"="1q0a1mhc330z8cnhghp2p46bxsmzz8cdba8hcvssglz0gsq5z5fc";
-"apalike-german-54080"="143ipz8vajbakcbr3rr4kwdh4xl939q0gxwyq0kajvkdgzax9yw6";
-"apalike-german.doc-54080"="0i1wiibv0v3c4r94mq95wv8q6yb8mil0pr6cmj66gab5np8m8x1i";
+"apalike-german-61719"="143ipz8vajbakcbr3rr4kwdh4xl939q0gxwyq0kajvkdgzax9yw6";
+"apalike-german.doc-61719"="0i1wiibv0v3c4r94mq95wv8q6yb8mil0pr6cmj66gab5np8m8x1i";
 "babel-german-2.13"="120912c0nk3zdvnrxp7pv78vnywbw68d0xc9iv8x2cwdl2hfwzrj";
 "babel-german.doc-2.13"="0nkblrxgckb1kxrxvj02v0mx18f3cmv905xpd56i3lsp7rhi2wjm";
 "babel-german.source-2.13"="05nwdy9ly2cdl2aayf573hc8v380avxlw568np9kfvf7nag3p7al";
@@ -2592,8 +2620,8 @@
 "bibleref-german.doc-1.0a"="0q69vfak1yrv564qcw3nrklhq4sf62hi6l7z8w2hcj3c325kii56";
 "booktabs-de.doc-1.61803"="1ld7zdr88xjhnnl2x734rxr7h0fz84awapmv50p1kzn6fczrwyam";
 "csquotes-de.doc-1.01"="087c08c44811vd8p00l1xrkg5w6fsl8as64jq83m6gf1hfan9w4c";
-"dehyph-exptl-0.7"="00h4zwp6pdpxiwdck11vyglnhymkmlahzvk2pk6nvqafsmwz5rzp";
-"dehyph-exptl.doc-0.7"="1niraycxd0myvxh3p6dn90j21mzdrd2hrdvh8nxm7rn3npm1kl4s";
+"dehyph-exptl-0.8"="150c1w2m80vwdkbd134kpj498awz69sjdw90gyfxn20ji96pk1dv";
+"dehyph-exptl.doc-0.8"="1w012rlgv0kdry2adjc9ph2zcxfllg9hc6z38fgnfl5cpszgr2cj";
 "dhua-0.11"="16gq48zlsfk9llafs8379797v908khv954q8lw2dvzk0v69d0qki";
 "dhua.doc-0.11"="16l76rvba4fz3vfw8mzkmks7b7206h2dva5dgw3m0j30ds8d6vm2";
 "dhua.source-0.11"="06vws91qfar1h87d57c9f9cw04isjk0szhg2aiw7sc8ligs0v907";
@@ -2692,6 +2720,8 @@
 "lgreek.doc-21818"="0r86kjbayji1cha84dg37ajn1hnlidyw3cf4byq3x63vyvx0ag3c";
 "mkgrkindex-2.0"="01db35xmg9583hkr9bpflr6rj8bmvidaqahpvkr38bks21466sxz";
 "mkgrkindex.doc-2.0"="04p2xaycwszq5dp8s2h6gdm36l800ipvigblkm8m58bgycm553fw";
+"talos-1.0"="0pffvqdkhmc0adl7g1sfckgwwjsfgbnf03jfry3yfq6za6mk05d0";
+"talos.doc-1.0"="1narnqgf3221fpf66w2vlw95cr17swbap35lvb7dzviyad0ailcf";
 "teubner-5.4"="19a788wm84k5gb1k7fn9sm53b5h3hwj45316di0gy3m4h8bafpby";
 "teubner.doc-5.4"="1hsq7x9g26b6rs9796n411dpm6hvylyr4vsryr0sbk67cnf30spd";
 "teubner.source-5.4"="114jgsrdvs5klrq2vd51mvwy2v7j9mhsmsq6fxamanm2asgvzxs7";
@@ -2744,8 +2774,8 @@
 "bxbase.doc-1.2"="0ny2xzg6z92fpw4s012pf2h90a77d96csi4x0cqdlvzv1f7bqhiq";
 "bxcjkjatype-0.3"="1b2srzs5pwaind8pjsghkbq6hwf42ipx4bmcim2zbfxmzyb1ga44";
 "bxcjkjatype.doc-0.3"="163farvip06haph6dhwf123dk12rnls1mgvdsyvvszgyy9m96bgp";
-"bxghost-0.3.0"="0xkc69hq51qgdmjqnlyrgaird7p5lfd4mf84mkb726nnm1hhgq49";
-"bxghost.doc-0.3.0"="1b4sja3wz9782cny96lfbi6r41mfzmybc95b0dnd2vv09w96d00j";
+"bxghost-0.4.0"="07cv7889n2s3l7sl80bds214dp4i8gga7i3dnfc8n70a35ffql96";
+"bxghost.doc-0.4.0"="102135q36fqflzfijsdbgwx3i7v60j4p10qx3g7qhk89sh0aym8z";
 "bxjaholiday-1.1.1"="0qxc2s07rqnyi0a8a050h2qri4kaqfcwc26c2dz0x8ypg18s6nhq";
 "bxjaholiday.doc-1.1.1"="09a5q2cra7by0q4zxl9nfa672ryz0cdv3xkw730cq3qyyxgc06ls";
 "bxjalipsum-0.3a"="1j43iihid2akjgd9npyqmg14g0m57izzp8lnrpqz2ybbp3mbh0r0";
@@ -2754,11 +2784,11 @@
 "bxjaprnind.doc-0.4a"="1x3wh73nga2l8f7l24pyabpz0b8g2k6hkszwl5dijrppicl875ym";
 "bxjatoucs-0.2"="19n1wr7i1mfrabmrsgnmvk5wgdqhbc9lfpz3s5qhnsqsz69rzi00";
 "bxjatoucs.doc-0.2"="0icd5zj0cabkvwjgncsjmqwx79d2rqsm7ddp54ahczfl6mfg7fwj";
-"bxjscls-2.5a"="18jxsr0qvmhxyhcwxmfch8n084dw29bc9xlh795xbakb3n1bsgs4";
-"bxjscls.doc-2.5a"="0fhhd1yfvwlcwf8myz9d0gyqpxnq2nsnvwsmc66a181whpgmj98x";
-"bxjscls.source-2.5a"="1na0j4bb9lh8qk01ph83ymnah671p12n5dpndpiv6ag9va712xlb";
-"bxorigcapt-0.3"="0z4yyfrw0ga1gd8xmdj0npd40zrnhw1g4anfyswypkdnh4l87jxy";
-"bxorigcapt.doc-0.3"="16hzvpff790qsaxnwrxbv773pcr06gbavqirac8021g2sgn6h2h5";
+"bxjscls-2.6"="01p1wl0ndbsxiyd5hmv1wdasjsaf541vqis4imgzwwqa1xfjqcxc";
+"bxjscls.doc-2.6"="0b9s0kl51gqxcyw2mp4rzf2x17s8pws2ql0zidn58k17nzv8y0d0";
+"bxjscls.source-2.6"="1mv9g9ngnwynnd1xzvdlc02c7cah7m08w006glv86nbqi5cs9n75";
+"bxorigcapt-0.4"="1gx4v1x2ij6c3xnpx7p0g2h7bhkfqsh1dqb1m0k0p9jxwhr9sn4j";
+"bxorigcapt.doc-0.4"="12qikh1ybh8q5wyv73lirydlalq0bhlhzxyq4iyhqzc841zrwd7w";
 "bxwareki-0.6"="0b0n3yhq6y4dq13nwm40zyw6hn1jz5r3bawsrnaw691amvfb2blh";
 "bxwareki.doc-0.6"="0ay0rsjnvpi1g7iyn6dvwc4awfswd48n379qqys5xhzd19bncs0j";
 "convbkmk-0.30"="1hb4ahbgihnzqmcszxlq67bsiqprrxa9vf25q8yz31j70sg7s18r";
@@ -2769,22 +2799,19 @@
 "gckanbun.doc-1.2"="1rpgm6jclifxzs4k5ybkn9pxsl60vl167jjhffg6d319g3miy7al";
 "gentombow-56665"="0pzvwd6qpp5r7is7iwahpjgqyc3ikgq1jy248kbn4g2kq38hffhh";
 "gentombow.doc-56665"="19sqdvw9fazb8aw8ss9v9sxc185dqcvw8pnimm0bkzkmz9jnp5ws";
-"haranoaji-20210410"="18jgcny2593pgk1pylszbgcgdafwfz94whja6v9pjvd7g1pcnx71";
-"haranoaji.doc-20210410"="15i2y9i2a7kd9wsf1c752mr4lifmjrhdj8wf5bvrr3nvazc3d2yc";
-"haranoaji-extra-20210410"="0fppk1zb1zjkwx5mfp65676znlwzxrblangy3hm2yjlnrr2dnrxk";
-"haranoaji-extra.doc-20210410"="05k1vl1w3ip99hbpcj7inb3bpn4bfa823nw3bbrp3vfhl7iirb2i";
+"haranoaji-20220220"="1b3cbikd32mqa895n3d7jvcfvb9b6zz7jfibfzcf6cvpmwi8a99c";
+"haranoaji.doc-20220220"="0wikzp3iw6cvphc91ih6f9302jskhp38b1nqj02xmppjr17q8vc9";
+"haranoaji-extra-20220220"="0n3apfxhs210cngmxmv1vq0a6bx7b5v0rk2qbpy3mzb9d4h8xikj";
+"haranoaji-extra.doc-20220220"="1ffjl9d2sxhiqms5hyvf8z4wk6n7fb42p09qhxhvjpziadjzfijc";
 "ifptex-2.1"="1306l8knljkyaa3mx0nmpl7sb0saj05qbr8pwd157miz3sn3lrd8";
 "ifptex.doc-2.1"="1gf9yfss9lfaf54b31p1bzb3ncdi29763665xflq2dvjybqzr8jv";
 "ifxptex-0.2"="1wb1laq1nn02klvjgwvjgansi4anmjaik04fl0lylr7x5996qa9k";
 "ifxptex.doc-0.2"="0bh8bqly3zzzzgs21cb51a06023l9xfig5qjfzrlyvfqms7wj19z";
-"ipaex-52032"="12rd8b6kbnn2hvsimmfirfq3nj436h2ckg5129qxnfnqfqr9pkl6";
-"ipaex.doc-52032"="1g2z2ichh3wdjmn9jjd48jic1b2xw5sb8sksqv0hm043hk5makaw";
-"japanese-otf-1.7b8"="1c0xz9mwgl1ywfks446647gndkwifh5kc0132a1g2p226mzs8hhh";
-"japanese-otf.doc-1.7b8"="016v8wnhxk8l57fcxh7p6hpvqlrwn93dsrxr736xkz4kvrzznjqq";
-"japanese-otf.source-1.7b8"="0pdsmlcy1h76nfvh19pibxywnmm50474g9yk9rj05p1amapnpkja";
-"japanese-otf-uptex-0.26"="0y0bv7m11g1nh11il7b74v65vfzh8fh3lzvv1ssbika8w83zjw6y";
-"japanese-otf-uptex.doc-0.26"="1qgkfqx1fbnsnyjgxg5iwcax1gz64nzq2sjlz38pi55h5gka4nrx";
-"japanese-otf-uptex.source-0.26"="1pn7k97px1b97lsydw5dwxkx3r8a2aa8cjrm2ffxijgdslb1nys8";
+"ipaex-61719"="12rd8b6kbnn2hvsimmfirfq3nj436h2ckg5129qxnfnqfqr9pkl6";
+"ipaex.doc-61719"="1g2z2ichh3wdjmn9jjd48jic1b2xw5sb8sksqv0hm043hk5makaw";
+"japanese-otf-62456"="1qn7nak2sgwdz8vmvibndr31dx94w92caagc9ly17b1na4ifj9ih";
+"japanese-otf.doc-62456"="0r52v7dd2l49gqsy5xskcaz5a2nacm8wgyi46zlvr2nsnj87m1xs";
+"japanese-otf.source-62456"="19f6bxfvn1dm6xbhjx0sxlwjg5667z1l3fz28bz5b0nphryrj42g";
 "jlreq-60947"="0aiq850mk91vrpilj19izl06ppvi595f61i6izprq3d6nq22jnh8";
 "jlreq.doc-60947"="0358jfvj27ymfhpmc9a2r8ag33lshwrmyjj4nl8lbf7a94mz0nkb";
 "jlreq.source-60947"="0g4689j7ica7vxkmhxyvlxwmn7k75bvgdzcb382s8ippp2c4vq99";
@@ -2793,6 +2820,8 @@
 "jsclasses-59795"="1v97h4h3gv7xmavyvrhih6qmzilpsgk31vjhamnxwp55vggp50ng";
 "jsclasses.doc-59795"="02j0sjrbhrs701fk1n9blfifpzcycf3s4svf2wa6rz2j4y3m3iky";
 "jsclasses.source-59795"="1cdc2cjji3xmy4qrbj2m3acwd7r415jn7lhmzyz220gb70am3p7a";
+"kanbun-1.2"="046zvhsmw56a30s01pr50bv1m3s4q1fnv8hbays3v56xbj8rk7ka";
+"kanbun.doc-1.2"="1qsz9krhmgav37k0386il90h91c0sxk1q2zvma272fnpbw5rbq75";
 "lshort-japanese.doc-36207"="0mfxig980jyzhay1i83d69p294hgbr92v3kk2a4z8ca3fwzy8w74";
 "mendex-doc-59706"="0ab3hrln124gwvgsszd4l4jjrc705x3wbnmrrf27rx8p6fcwwrmw";
 "mendex-doc.doc-59706"="1bxwclfnm3j4w2qk0nq1lpcjz8xcvrzkpgjnda3c0n03h56a6way";
@@ -2800,8 +2829,9 @@
 "morisawa-46946"="19b8nzkwdnqk61p1fc7yygjlrdimawmbam18akphcm70qx2h01dj";
 "morisawa.doc-46946"="1y218bablhn06njs5zqmsl6jvvsgyihm4il1x9722pqvvyxxf9q0";
 "morisawa.source-46946"="1flrf2c2jxpq33g26i0m2h63yd5jfy9bdh80idpx1m6bi6hhq7ac";
-"pbibtex-base-40986"="0h5yi27rmh7ajih3ww4wn3z746mkdwrvz1pn44kklrz9nqryqwhl";
-"pbibtex-base.doc-40986"="0980gdzdygb1frw0drf2pkk27xv4qq238syxpsbcf5rp78855byi";
+"pbibtex-base-61914"="0h5yi27rmh7ajih3ww4wn3z746mkdwrvz1pn44kklrz9nqryqwhl";
+"pbibtex-base.doc-61914"="0j6dij9yx7cj4j0l3sbszskqdq9mr5svzjz21andfdhlp3pxdaa5";
+"pbibtex-manual.doc-61915"="09pd7gjn6mnb7g56pjwb83276xwprbgi3y076r9jpixbjzwi01px";
 "platexcheat.doc-3.1"="04hvm19x4z7vq2md3p3r2wwa7iqkgkxnvvj1xx3s9145m6fjib5a";
 "plautopatch-0.9q"="16m2dsqws4z0i04wfman4m7d5p9y5dij8rl6bs0vphq4n0hcqhh1";
 "plautopatch.doc-0.9q"="04npb7xbhibvjjxh32m1g2c0r3q5j5jhjgc7hn1nyzj2hzz415sr";
@@ -2817,8 +2847,8 @@
 "pxchfon.doc-1.9"="00inqzcya3q5p6a3azgkjds89r444kmbmgw46wfx0sj3drrlgcz8";
 "pxcjkcat-1.1"="03rci00d4p56ibg7yn18jn86mji3yj5mnq89niwiaixzb9x2s9g9";
 "pxcjkcat.doc-1.1"="0lj0s8q357gw05i0xfldzm7wgwc6x2b4jka2hjpayqshh1zm01wa";
-"pxjahyper-0.9c"="00qyj7q5xrxdxy7hiq0517nfdr2sn2mk9z55z3b7mm3rfmldzsql";
-"pxjahyper.doc-0.9c"="0hfhlwi4668zqs0x6cs30x7pxlv0ha8c4q6mp41paa9h8mnvdncr";
+"pxjahyper-0.9d"="1pw0cd0d2r89y6pmhxm9g7nnxm7qa5a02jvkinsbkjjx1mc8c1f4";
+"pxjahyper.doc-0.9d"="003m50wpfgvjdi5gya5xad86016jlpnx4x7dngm5bqs4zq8p6pvv";
 "pxjodel-0.3"="0gywpypmv9c6bqyygyz336v7dn6bnx5ibz2p6f38paamk6bqbyf4";
 "pxjodel.doc-0.3"="16nf7za81mq77irbdqkxw2iwxgi3jpy5vh1fijp67bq3lx0az7is";
 "pxrubrica-1.3d"="1xz98vzi6cng9f2gj1xqbsvk3cw1h98q3yn1ijq2xkphkjv1sfhi";
@@ -2835,13 +2865,13 @@
 "baekmuk.doc-2.2.1"="00y0iglv170b8pz79xjc0kz3yjphbb6a9alk5gg6hsdwvc6gf1by";
 "cjk-ko-2.2"="1q4phpb831scwm6w6bicxvnb1skcyfgmmmdld4qwcdcnqv0qbj1h";
 "cjk-ko.doc-2.2"="1ij8yx9lpc5m4yp8yif3f1yz7agr2xs47jglz27lqca2dcwbih3w";
-"kotex-oblivoir-3.0.2"="15n64rm22vxv2a5ca9x0f2wg7jaf8wpxv9sw3b1l9yfqv84mg10x";
-"kotex-oblivoir.doc-3.0.2"="0g8pm6s6c3kid8iswzwk9cx89dndfi1v41jwz4swnblyiv71apwd";
+"kotex-oblivoir-3.1.1"="1na3py268mzn39fwwqnsax3pc7ng3alc3s582j225v329if1g5r9";
+"kotex-oblivoir.doc-3.1.1"="1kpmryqrq6is4immmckg55irr99n0gdrdyfbc88f0b6v4c9mia90";
 "kotex-utf-2.1.2"="12klbs9as0immwm6v75ibjdhq7g5ybv276ab1ffd5a6nx0nksxas";
 "kotex-utf.doc-2.1.2"="0ppqzzzhkf9cqa6sqd5ys6m146xdnsz5v326g7d7m2b9104z9k62";
-"memoir-3.7p"="1g42hmlikks9nswgd1bin64w25r4cn29r230c05kz9qsqgcmph3m";
-"memoir.doc-3.7p"="092mw5chngnsgl75120c76h7023wbi25qvvnsy150dhmyfd3pcgs";
-"memoir.source-3.7p"="0iglqhs14y86nlzgq1h5hrmw7974lhmni0f8f8jwx7c8bgrq1f6h";
+"memoir-3.7q"="009413ssqfvdx4ws712f2qk00b3swkdnd741smwlqfxkkqa9bd4n";
+"memoir.doc-3.7q"="122p9szhhaffksfa9sl8v83sijh97fivl5jsbs031cnx2mkxddl8";
+"memoir.source-3.7q"="0x23hkhmvvq8xh7bigdbgsg5pklghfnl71i7rjxiixsw61mnjac2";
 "kotex-plain-2.1.1a"="02y214iy349yz9x2l541ynhypwc0rlq3y97sk35dzhdy3cnvsmrp";
 "kotex-plain.doc-2.1.1a"="0hj3mbh74nzk1s2sff2sv1k7b2mrcs3bg8vn7kka89q8yf56gwmq";
 "kotex-utils-2.1.0"="021hgi7iw47b3c637mk0g4v52h5ygx5w1060bpcknjlbg0qb09aw";
@@ -2855,9 +2885,9 @@
 "unfonts-core.doc-56291"="0225vsqaj8l0g1igc4h8m94cfk6wv17vlnappdgxwws1fknz0x5m";
 "unfonts-extra-56291"="1i7skyjqlprf6m1pnz5l2hn67f1cix4n3pai6v1a8adrrx7vcfdx";
 "unfonts-extra.doc-56291"="0d3cxfm110lg12n3c9hc88lqmx77rcsil1s6yph384scxadlg3bn";
-"aalok-0.5"="1ldb38941jc1j5lzlzf7vlcbm4jg2sfk74pzi27sj2zacnnkppla";
-"aalok.doc-0.5"="11hbg45fv9nlkpgchk2zqrjn066kg0ynrnwp3z4nrgn36d633bm8";
-"aalok.source-0.5"="1488gs0ip8s2g8d1vvrg97fhlq8gxkqvd1g90621w6g454wjln9l";
+"aalok-0.6"="0mvfl7llr57ykdv81y4c4h0fflig2msvxka08axsjwp91yn8dpmp";
+"aalok.doc-0.6"="1sz26qrydb5dl3z0g3p824f6yzs473p2a50q1kpk4zqgh4ghwigk";
+"aalok.source-0.6"="1crpql5mypbyycxzkckfy4nwn7shq1dkzlbn44lhnj7jyi4qkg3p";
 "akshar-0.2"="0g1pbihbpl3b7k7c19qiq7lcgx3zrfn15065dyan85bs8h85c2cw";
 "akshar.doc-0.2"="11a18b7a592sx3wha1lpy659hgh1wnka16zf8m0cbc99f867xfln";
 "akshar.source-0.2"="0g8j0015dm3mhphg06ma9dkgc28ywlihr6pcbi254qaxgk7kdn9g";
@@ -2903,9 +2933,9 @@
 "burmese-25185"="109492p6k58bdgs4y0nb1hfnk63pdpf0x4b7az8frfff4wg2jvb1";
 "burmese.doc-25185"="1lwgifmixkyxscy6ichwmc8lv26dwmcvy2nm68z2wq0cz7cihjli";
 "burmese.source-25185"="1iwnsjnacafq1w3n6asj93n7nfxxyslf69jj0rfrl05fai0iq458";
-"chhaya-0.3"="134r2m8i2adxa8h8skndaxcjhjqhilij9fvj9m069qx1vpxdqbhi";
-"chhaya.doc-0.3"="12bfidvrs6k8xzhqg4zdpp7i92mfx8jnpby4d01gkv7h8ix457yd";
-"chhaya.source-0.3"="1km18608n9cv5yizpc411s7s7im5a4pnircdqs0x5yl8srcwzihl";
+"chhaya-0.4"="13x83hzrqriwcsc1q1yl93jpmgy83fq44jq890q2vfqjl22afmbm";
+"chhaya.doc-0.4"="032qz2d0zflyj8aslhpq4n7mzr7rpl8kpdzrp9ahl3dxqzcrnwj5";
+"chhaya.source-0.4"="0ld5zwwzznvc8a8n9l01i0236a9zw9n5jbiinxkhf8fk0gis1kb2";
 "cjhebrew-0.2a"="0my3jp6pi5lbbhn24jn07gx95laq2p7fqk88pwic7wwyji097vxw";
 "cjhebrew.doc-0.2a"="09ldma056ipsamrd558z24k63p187ziw2bh8qgy4na20pp22wj0g";
 "ctib-15878"="0vm3aw2havsabkrr8sx4m6px9hi189vgsmqy0s922dlm479d8bcy";
@@ -2944,9 +2974,9 @@
 "latino-sine-flexione.doc-1.2"="1wccb0ksrrysqjp68l3wnf6l4n3s64ny3cvxiqgalrf0mlfipxmi";
 "lshort-thai.doc-1.32"="16r9gx902a342q2mj570y269yw97yaj6hrbqrk4h49ihm695z30i";
 "lshort-vietnamese.doc-4.00"="094lfry6cqvpk02c3acss6581mgb7j30fnja1b3qwzxmyxjdblwa";
-"marathi-1.6.5"="1xmanqc10wrkbrrj9yc2g5ilb93q4v2dpq7m1hhfrw43dpb069k5";
-"marathi.doc-1.6.5"="0kg2z72ncqgzw4q8y9n765a9n7i8hx7nsp6z8pw89ajjikripzdr";
-"marathi.source-1.6.5"="1wn78s7dm91xs87kvyviv4lnijk9az5fpg05f1w7h6gq7vqvk40g";
+"marathi-1.7"="04nf43i9z0s8hndjwhfdyysjxz8k1jargsrx03k19i9lihdjfjs4";
+"marathi.doc-1.7"="0ybafny55hvpv4kia7jybybjn4vq8f2g7h770xzq2b1mimyn7dkc";
+"marathi.source-1.7"="1ja8kbhsbhkcm0ig6954l6k5absdfppikzwawifp33dwpjkk6w0h";
 "ntheorem-vn.doc-1.203"="13lkgb4qjiblbfm4jcxgkxsf08zk90lqz02bxrmim1n8gvyihwcc";
 "padauk-3.002"="1yjqxzqsvk2mdsk837bgwqf3nfm9gh873bnir19wj5kj622zfh4d";
 "padauk.doc-3.002"="0331w1z1b5x15yb3xyxv008l95idv5yq9xb87da5r9p5fzfh1z0y";
@@ -2970,17 +3000,17 @@
 "velthuis.doc-2.17.1"="133f9scdzjncbvqqf9c5nj6vjszp1f235vrapg2pjlg018hlhv9x";
 "xetex-devanagari-0.5"="0i6hkzl2jbiixzrw2gvngnyzqkz0lfdilj1zz5xi6ypffi4vyihx";
 "xetex-devanagari.doc-0.5"="0ahcawr9872lipz33jrv870lj2601j593fwfqcn5x0jhas93ch6c";
-"vntex-3.2"="1hvpvfndmhbv0d25a26syp36a1035kv5wbbb7pq7ljnbaf4a9qfh";
-"vntex.doc-3.2"="0ssdvddzj738m6z86861dfnh1xvg3blfj7vb2z8iq1md01zvk005";
-"vntex.source-3.2"="1slib4ha6avplxfhmnvv7k7dbamlr8m8q6aijx9b83fy6vxjvmf2";
+"vntex-3.2.2"="1857xywsc16rgarwhj30jk9mfdw62483g31gsir9rgibpxdjchsh";
+"vntex.doc-3.2.2"="040364kv9mizvb2bw22in4z6smzplx7jg9wac7h3wl7739qcfwgl";
+"vntex.source-3.2.2"="0f7il38l3yp8v6yxgg5mszgiki9z0as1s1i99ky50bvvb049x8zg";
 "wnri-22459"="16hcapjdb5dx48gbcvk2bkpnp1w9knswni2vs8v1l9shxz03nnxa";
 "wnri.doc-22459"="0wpf06is1vkaw4ivhrz4hfii3qrgs71cawgn1fnm8fdzalgb2frc";
 "wnri-latex-1.0b"="06m6xwvm1pxz2bjf2xa7k3x6m70p1f5866wn5imipmhw4wjs2jp2";
 "wnri-latex.doc-1.0b"="15d9mcvdhs1jd574gm6a9ppxyy7avclvq54ikcmlf4vn20lygidx";
 "wnri-latex.source-1.0b"="02x8fdavhkxfnxhvr891adpn93yhqccs31w05h8f9hyg34jlnb30";
-"babel-polish-1.2l"="07b286ssppna5gvv5l9gg9lwprrzh9wn28jnr65ixr9w817kphml";
-"babel-polish.doc-1.2l"="1ssr8wgk8csj7fkjr0d4s9szm8mvap2ps8vbf4lr72z34bb6zmf8";
-"babel-polish.source-1.2l"="1jymxl98mwxmq0yq90mhrr7bq7c613rh1rnhl7l3bih36af55rwr";
+"babel-polish-1.3"="1n1cz0jixlyw2zbcgz2ik03s5qarsh4bl12krsqjk2knqk1r456n";
+"babel-polish.doc-1.3"="1yydj18aiaa90n7g7c6widczi5kpslhcy3l1bxnq1dpx0g8wi94p";
+"babel-polish.source-1.3"="0wjkcbs2ghwg8x6mp6blihfrygc4ssy7nb1adj4vz3wx63li5j04";
 "bredzenie-1.0"="1mcl52mlbbw0yxbs53x9a7kh3xlaka9c7nszfajlhpvj4s3jr1pd";
 "bredzenie.doc-1.0"="1zgmhhyqf2bwlf0mi509nrnzqqa5g4qxr3zj46rsa8jz0giaig44";
 "cc-pl-1.02.3"="0cvyi72p74qx82qqw6cwn6kdrrsfw83ngwwkjrgywqr08q65v1an";
@@ -3046,7 +3076,7 @@
 "hyphen-spanish.doc-5.0"="13kmgf0lwxm54gs39lm8vgg2hhajvqwviql1chhv2l7d66mxrcrm";
 "hyphen-spanish.source-5.0"="05r3c2m5xfs6yl52ms6kc95v3x82zbs4py9ip6xznshfs5xakb85";
 "l2tabu-spanish.doc-1.1"="1p83xflgv8x7nq9mylh468zn3hz5pv3zxprc63q51fwx0ylxfdbk";
-"latex2e-help-texinfo-spanish.doc-57213"="19rxbwk1xqhsp7wkgrx50q984n77lqx9zxy5s4741wfma69p7g9i";
+"latex2e-help-texinfo-spanish.doc-61937"="19rxbwk1xqhsp7wkgrx50q984n77lqx9zxy5s4741wfma69p7g9i";
 "latexcheat-esmx.doc-2.00"="1d6nk9p9adlhgr28mnnizrxzzqlk20zw2clcddqlaa8pn73dqhcm";
 "lshort-spanish.doc-0.5"="0ls50syrg3dl5dl5a3fi33cr9j990l2xr6pribn1vqglsqrh191l";
 "texlive-es.doc-58221"="025q4pn9x88qb4jxlczwxhw94fz780cxkyf19z6c06wbvwgv9cy1";
@@ -3072,8 +3102,8 @@
 "achemso-3.13c"="08m9sl0smkn6nm4693pwmd33aqrxnz9yg95pg6w1v1c8m5y7pw55";
 "achemso.doc-3.13c"="0f34lgxfjgd37qzmkymm34kjipw42l7dhfcqjc4wg15zhdbr7654";
 "achemso.source-3.13c"="154d6siflvq22gz5dyvcxp601zr4wjr6as0as1iwy7w8yrhpd8lq";
-"acro-3.5"="0cpajq4ifx584qd6wrmpv0ga4g069hw8387sa6gda4kmzck9l387";
-"acro.doc-3.5"="196gs8x2hsdvrz9l99fdwwkjg5pa4payqga1yhvk7176rjxqln84";
+"acro-3.7"="1alvrx9wzfi6ywq4hxywv8h507slq6i2r01xs0xnb2h9y4kjlgdz";
+"acro.doc-3.7"="06yh8axdcz0sxzdxjqwhk0nnxz2933yi1issa5dqk9ns8s3cd9h4";
 "acronym-1.47"="1gq7j83gjzlfbnrnz1cl0lihpdalsn6ww6hqxdfxikm28vynk88g";
 "acronym.doc-1.47"="0zscjwg22s81awq27lhqs14davwbhf5y4zsl9dsq2135rppmmyvv";
 "acronym.source-1.47"="16dds23mj3ha1b64fxz2dnxk7wsrcmhpmpz0zgqda46vaab9qiw9";
@@ -3120,12 +3150,15 @@
 "altfont-1.1"="1nrcjmf59r672gmqks8spqwz3vn4jrwc272zvx7ncylphsjmip70";
 "altfont.doc-1.1"="0c5hz0zjcar69w489zz2a04rbnc3j2lp8yccw9zv41ninzl94ifv";
 "altfont.source-1.1"="144m2ph835fl9x3ypc7wfc444719rv4clfdar3bk73gvf53rmjr6";
+"altsubsup-1.1"="00yva44w281zlba1c1m1jz0c1j5bwynfxf37k4sw5am7asxzizvs";
+"altsubsup.doc-1.1"="0nzc10vbf16bk8v60d97nw02ryl7bd5b6dv26g6rjwfpfdic08pn";
+"altsubsup.source-1.1"="0kdsv62j78ypa6z9098d60rilk9p0n72628cwihzyp8kv1g05049";
 "amsaddr-1.1"="1f5w9dhlmni4qp1snqb7l8c6h2ffhicpq74dhb79q18b00dlfi8x";
 "amsaddr.doc-1.1"="04rq59d00gqyzg6a6v17ifmcn45y01r6f426izkgbq50gky9xlxd";
 "amsaddr.source-1.1"="15v1xh051j16qgpm7s33d8hsz73pxv4qq58i6kxwq63mkrnwgac5";
-"animate-61019"="0bx7q4h45bz3r8g7fh5gpb5kvw456r69xqgxv947jcp9vqbsi7i7";
-"animate.doc-61019"="0fyzy0gb2yndwqxqws6yri8p0f7zknzcib4sqbc4ifi9392l88q7";
-"animate.source-61019"="18145y2k5srmaknmql9irp614dix769rsq2ps29qvqzj48wdj084";
+"animate-62123"="0vpzgn5zln46982hmzkfb54nqa3z0cfigr727x2si09097css35d";
+"animate.doc-62123"="1w28m07nnkvns75zrw77q03pzq8am5ma7iaishlwlflzar6gznvc";
+"animate.source-62123"="01bjl2wbmx2y59hy44xzgjia9x0slzpfsnvi8brgdr6dmjx8kh6c";
 "anonchap-1.1a"="0nz53v74sigvlb4dhgk5qcalw7nrc1vafbjx754j3gfyp2ilaf1j";
 "anonchap.doc-1.1a"="06khbq6p3drxsbjwgkm1sd163f7nl8hc52pjsm55g2vknib5caa9";
 "answers-2.16"="18s0c7hdk5qnj3svni93m9lpj81dhla9v7nsmcgh0jabhwy8n3v2";
@@ -3146,9 +3179,9 @@
 "arcs-1"="0qahab6a041wn6s6isnjn93yrs6zk82g90x5aqpv742b2y8cj5ix";
 "arcs.doc-1"="05wgq5pkzxg3vj9anlzjq1jvwj7b6wvsp7a02syca6n4qvy1v5a7";
 "arcs.source-1"="0jnvkhhcqv7qgs4knwx1kz38x305a19kh13wn47zqlqn65991bpp";
-"arraycols-1.1"="0i7vm2znai3wgc3h44vhwd3wrrw0az86b3g3ndhy8yyyl17jk3hg";
-"arraycols.doc-1.1"="0gq5ss2rq7qgj4zqvf6n9a45j1kqsh0k9myphfjhdrf0s1sq8w9x";
-"arraycols.source-1.1"="08vfglpdhjc0b33b5r8x0mqpjamciq4g83m49gxwn1dd71hvwqiz";
+"arraycols-1.2"="0i7vm2znai3wgc3h44vhwd3wrrw0az86b3g3ndhy8yyyl17jk3hg";
+"arraycols.doc-1.2"="0gq5ss2rq7qgj4zqvf6n9a45j1kqsh0k9myphfjhdrf0s1sq8w9x";
+"arraycols.source-1.2"="08vfglpdhjc0b33b5r8x0mqpjamciq4g83m49gxwn1dd71hvwqiz";
 "arrayjobx-1.04"="1ry1gix4nz11kyrfpbhy160c8dir2y68jbmnds64qcdafhfv4b9m";
 "arrayjobx.doc-1.04"="1hqjhkjh5ryhjpi98hyi92raffmish9n9193ry75mgfx1p2b2w0g";
 "arraysort-1.0"="00wbmciwdnafwknxxrnprxj4xvs24xxwdwmn5y5xh1c8c3q8rn09";
@@ -3172,6 +3205,9 @@
 "atenddvi-1.5"="1lw42kgkviwh5gl0fnc4kp8x578bss6fj4d3jqp3jh0iqj53wwf4";
 "atenddvi.doc-1.5"="1f4210s4llsbgnnf6s91j7gpdajclscnqlkrmrsmiphhvgjihcws";
 "atenddvi.source-1.5"="11sxy0c5vmbf17w1h46dc033lisp4aa8sjqfi1zdzlp7ha4c6rr3";
+"atendofenv-0.2"="0r5y45wzyhynl6f1bsk11ha50rhzidjgqynpz0qqx55pwj1lvqg8";
+"atendofenv.doc-0.2"="15s783gvnj5vd7vhgvzvvxpszsy065x20ag5i3kmhd20rdm8sy6y";
+"atendofenv.source-0.2"="1j1z580b9v2w8b1zqjan8fi5smnyyagnhak262cx5fi212dzivnl";
 "attachfile-1.9"="0akvm9al5rz67b81bsl0k92gjqwxjrd6dwxj9qmwrb9c6pd311n8";
 "attachfile.doc-1.9"="169kh9zrf5ykal633zn8n3i41dqbyv7jdrm905a7q47icvd4ar03";
 "attachfile.source-1.9"="1b9s69vvclpvdm02gi9x7zv5mf77q68xv7zd784cldns8h1a553l";
@@ -3191,8 +3227,8 @@
 "autopdf-1.1"="0fd1dw6h409ffn2prcsmq4rsgjshhs9if0igsz3ibxb6wkngbphv";
 "autopdf.doc-1.1"="1rf0l15pp475f41si7qkx9rw7n6938jj2k1wybx4ck7pf6hs7i9l";
 "autopdf.source-1.1"="1vw58d9g41ra5j2av1vdkzqhh7g5nrprr27qgdrn8nlirvwzbx9m";
-"autopuncitems-61381"="12hgmvjaccrfgz4kndmi30xyqh29zy3p7wp0pkv92ba839688lqn";
-"autopuncitems.doc-61381"="1zyh8vyxyx22hmmij757s9s92ivj9lbh6cvl6r8d0zrkii6rdll3";
+"autopuncitems-61825"="0vsc903wrd11isyvm4mzaq1z702prl94hi6pkrg2h4cx5bzlqmf4";
+"autopuncitems.doc-61825"="0cpjjrbx02bl02rk3fh8ybixbk6d0njji5ksa8n9qqh7iahjyj94";
 "avremu-0.1"="1j7mg5in2jhpb07jpky76qriyb4m0qq0rlkacs6amrhh57299prx";
 "avremu.doc-0.1"="1p7z2vj25fnx23rl6m76h82q8kli8nfl2vail4mpkx0brimn4j7l";
 "avremu.source-0.1"="1zz9b5d08i3sjj74q609k5kyi9nr7yyczk00i3dqfz5x3rlyljsm";
@@ -3232,6 +3268,8 @@
 "beamersubframe-0.2"="06csqdbh272jbh3zpi0f8zblbmi0sp5iiz1r1qa9qc0lw81mdh7m";
 "beamersubframe.doc-0.2"="1g29xay21yr8aap2fzklkg8q3ybz0xmz22xx5cd9md93c8k9kg7l";
 "beamersubframe.source-0.2"="1zb42dsisab4234s79xvva74rlicd1gg4pbh867rxd15ajgy14k5";
+"beamertheme-arguelles-1.2.1"="0rw3q89f6pvzs3qm1rp80g67b04klsiwgpjjbjaw5yg4qkmw1w5c";
+"beamertheme-arguelles.doc-1.2.1"="1gqh6hydhfwnllgi7jyn1djk5n688sjy1a9w5r3fw140a3r90gnh";
 "beamertheme-cuerna-42161"="1r6c3ar29s06b0yfn85wssxccayxn2706y9jxdx2pxsr85ndc4js";
 "beamertheme-cuerna.doc-42161"="0a8mmg184chg2lljv1k7ffydg4sgcjpjbnfjzqcg43cqd01v5dmx";
 "beamertheme-cuerna.source-42161"="1avywir51zks1hygqypsfi6lkrba9ld6x5mkr8lln7b2s4ijnysw";
@@ -3239,8 +3277,8 @@
 "beamertheme-detlevcm.doc-1.02"="1wfq3wc7b3516s81sbp6md6mx9szbzq5ycqvsr50y3s2wfvvj2lv";
 "beamertheme-epyt-1.0"="07pjgzgkjmr4hdf16m7kx2cf1448253jwgc522akfvvnmx9fi26p";
 "beamertheme-epyt.doc-1.0"="1a987h1cg48bw05zjh79ga23qb37s82dkqhhgvp7gsnwz10pax2j";
-"beamertheme-focus-3.1.0"="13kcwiqw2wjkbi67ss711lgidx94cz20sk64ng7g3bz3kg5i5r5h";
-"beamertheme-focus.doc-3.1.0"="0q7crn3mwxal75kf06rvr5yimiq503my4v14nd07pdf8hcxg79vs";
+"beamertheme-focus-3.3.0"="0v151kp4fjglck75sykyms8j2i96syb8bn0y8abg3q8hpsfg222c";
+"beamertheme-focus.doc-3.3.0"="0q9bcn6k35gwc8g1rscqfmp8vn1psra5hynhy2pxs9xa8ys43fbp";
 "beamertheme-light-1.0"="133mvm4cayp49l8xvh33q0jp4qzhmvd3q2kq2aij3sh6i0bzh5aj";
 "beamertheme-light.doc-1.0"="15s2s3b10w0czq513mm2y7qrczm7y91qhghd0zsfvmy129mwfarv";
 "beamertheme-metropolis-1.2"="1pmvcyjn04pgcmvanj369hxqjha0s7lh1z4b6fbhaj2aj32l52r7";
@@ -3257,9 +3295,9 @@
 "beamertheme-saintpetersburg.source-45877"="1r4cw99zffqsvppc9l7z9k8l93sfk1nk8pzj50nm2bmkrdbfk32x";
 "beamertheme-simpledarkblue-60061"="11m8p3n45qf697sjzszjpkdwqfgy92pzxh9k7dx72ikpdah7ba9h";
 "beamertheme-simpledarkblue.doc-60061"="1ifbh5r0sxk8nsf8cd1g0d1w26ypb5hhsylc7pni6wn9n70799jy";
-"beamertheme-trigon-0.6.2"="0scsia3qz8vql5j0zvbqirv3h10qd1dd19n9n3ayalzbm05vklcb";
-"beamertheme-trigon.doc-0.6.2"="1ravl34djclw58qx78wrniyhi9bbcplq8iwxjm3105865a3hnnsx";
-"beamertheme-trigon.source-0.6.2"="1n689ssav272qjk0ydlynmxki20y7if5d12faww97fgiq5dfqpks";
+"beamertheme-trigon-0.6.4"="1l4iwqgbn9gh5lykfajgcyyzxva2d7frp9iqinvrklbv6frpjb54";
+"beamertheme-trigon.doc-0.6.4"="17l4d616ixb6c3r0v03ynqvd87zp40kc6cbv5klc5r7z8081pn0d";
+"beamertheme-trigon.source-0.6.4"="1l9g8i7sk2lxx5i9yprlv5mcgjshpvadzchv09mwbm9k0fps0i0c";
 "beamertheme-upenn-bc-1.0"="09a7da5ghgf5q4qp0djp3pya35zsm45wkiy5srz8p9q8pwg04bdx";
 "beamertheme-upenn-bc.doc-1.0"="1m1bc9mxdwfdm0v2lb0i3pfxgf5as1lpm8a05icrm7bdvii0vsiv";
 "beamerthemejltree-1.1"="02ccd8qqyjkvqqyxr94p1gc6qjryl83vpa72wcm5ywr8gmxci0pi";
@@ -3272,16 +3310,16 @@
 "bearwear-0.2"="1xaq0bmv8jv1zss6lwx2ccx8inrmyw1r9bjv3sbqfhp2x4d5xjrl";
 "bearwear.doc-0.2"="0vm9lm6389jnmcgzx0ffmay2bw4d0h1wfmsfbj3x1s1vrfl62r8j";
 "bearwear.source-0.2"="0dzmlcrc4izb63862dcafshzsaglq5m88z3cxmwivmwpikhh0gb5";
-"beaulivre-61338"="1rj3zhm9150xy09g4j7j6dmb30gd4d96l3axj49gm57m93w1m2jq";
-"beaulivre.doc-61338"="1j4vmg9xkrs3yw5bmqn99j39i73x6raz2h5rzaw1c7d7m55gpmi6";
-"colorist-61338"="1045hsa4qkd6zyn1bxbyckmzayr3j3azigdva5dgh3gv3s90ijaq";
-"colorist.doc-61338"="19nsmrak3mlgd4cvlvar32xlk4p7pp6dwsqbrszbr5vp101ai28s";
+"beaulivre-62834"="162diq80d98bq8pxlqj2925h8vjc5xzb2ma7s5sh3q74rgvi4hkq";
+"beaulivre.doc-62834"="1iz8knqlr5ish3da2insvh5kbfb9n150g85r1vwn0hqmwjpcri9k";
+"colorist-62834"="05fswrxy9fqn4q6hhnpbqc4lajjmrmyw1h6ydx096yddnmwdmkkd";
+"colorist.doc-62834"="1fh07zdirk8civas4yn8vcsaq28i8si34zrfzv2v18sjzd5lmswy";
 "beton-15878"="1rjj64wnd9xvh940rl9scidhv9ridqz38n8ndzs35hyjm8n2lx5f";
 "beton.doc-15878"="0i8lg2iyjkzpxjzz9ym61v4zkqczkhvs6qjb7zf5xw557l2i55gw";
 "beton.source-15878"="1l82y1fz86qsnv58gjq9rm58zf3ki80xmcqkwlmgfp334j9jqz8y";
-"bewerbung-1.2"="1gqj9cxjx8sn94rqlmhg6f4a8a4wnjccf6cjc4kbi9p3p27s8smz";
-"bewerbung.doc-1.2"="1g2nkv66926yh9fcnv4yhmrbs220cidw6bilcz50f6jyv6zj6lr6";
-"bewerbung.source-1.2"="1678hss1pfp9bijrsn1ll7fh3y3vxjm6d80x6lnqjm51igczl7a2";
+"bewerbung-1.3"="1grnipw9vjrqy657wkrg656wmh1553wzd1x84jc6zf9gp3v1440p";
+"bewerbung.doc-1.3"="0ny8ps46wxkbsd5g5yxyrh2jd74b204r35lggy9r7ckk4jab2wj9";
+"bewerbung.source-1.3"="0y79pmsbjzpykldic1a41l188wmkmn9izhvg5p77i7phx35s9qjz";
 "bez123-1.1b"="13l8qvnhfq575pg1nvcpbrwyv5wvq3bhpkmh2306mds784hvcib2";
 "bez123.doc-1.1b"="0qrskibmq7sv07g60gzd5cp34p21ragr6yn9g6384gib8vx60nqf";
 "bez123.source-1.1b"="0ab153h8i8nmc6v5g9xwvpymjvpp605mbj9dmxdyl3ic49cpnl08";
@@ -3299,9 +3337,9 @@
 "bilingualpages.doc-1.0.0"="1bha7ixvvw04a3gj5lhpyw4pcarxzf16vkkl0d378bypa3lq5212";
 "biochemistry-colors-1.00"="0d4bbm1p3j6q28ckkl7ilkywrjx6iqvmx0qb27rpldw3jabf1lp4";
 "biochemistry-colors.doc-1.00"="10pa8jwpxr37hs0wcywzsq14x1jgjx1cqg94lpghi505mlrikcg1";
-"bithesis-1.1.0"="16ik8mwzg2lh6kbnsvaqy4zzpyrs54a7q8mn4dghnrzkz6gva59n";
-"bithesis.doc-1.1.0"="03c6rf2mpvlp26bzp539lmbafc2dfjyfkvnf3qmhbgqfypcb3r8v";
-"bithesis.source-1.1.0"="0aj7fh6nk0k1n1slshra15si6j97g7p6adq0c02150qa5bp9f28w";
+"bithesis-1.1.1"="16ik8mwzg2lh6kbnsvaqy4zzpyrs54a7q8mn4dghnrzkz6gva59n";
+"bithesis.doc-1.1.1"="03c6rf2mpvlp26bzp539lmbafc2dfjyfkvnf3qmhbgqfypcb3r8v";
+"bithesis.source-1.1.1"="0aj7fh6nk0k1n1slshra15si6j97g7p6adq0c02150qa5bp9f28w";
 "bizcard-1.1"="0s6c3s99hid9pkilskd8ssc4hv5d5yg5lvw6kqz9szyii4rb6a18";
 "bizcard.doc-1.1"="0ic6c43nng4lxsznkpj7w86ampdzjrqqcsdsm1f758rfds7wbnf3";
 "bizcard.source-1.1"="0ywip83r43a721yfzrfnkfms0saly4p2ihagyp6259h2kji3vdjs";
@@ -3323,6 +3361,8 @@
 "boites.source-1.1"="1zirqghkw8kk8fa3xahd27dh60phxg3blp98iavh6bdhj0rm7iar";
 "bold-extra-0.1"="0samckbdgi91y5ay98h6jcaywcqfbmzcdb90kksjxv160nsvf5ca";
 "bold-extra.doc-0.1"="1101922s78y5d9rjf5immfir46vf0i1ig20wp360zcal571csgjl";
+"book-of-common-prayer-1.1.0"="1i6dk9ibp6al8jxhk6f6a8vsgpy40cr7m5k8zl1wq8fnm4wp13nr";
+"book-of-common-prayer.doc-1.1.0"="0ija5x2rgs8qxz3p4i81c3b9sznj749hasznxnlgn7anlv3s84rq";
 "bookcover-3.3"="0bna2navb27gzc30bcmgc5hjg6g6njcnq96s8s60b2lhbjigldpz";
 "bookcover.doc-3.3"="11wyk4r1z6m47j3a2yncjwq9vgz6vj752px33pc46qsm2xfllb0l";
 "bookcover.source-3.3"="0rp0fbv1hhaijb0mc077dg9g34dial6l7ldfxnpg8px4b33iwy67";
@@ -3388,8 +3428,8 @@
 "cals-2.4.2"="03100nskddcxi7z48iwm7vnwlrdkxj7xh8wgbb8bx3vfcrz731jr";
 "cals.doc-2.4.2"="08y10p0i7y0jndknkwrwdws6ja78sz1qf8vxvhhhcpivxc7a5gl5";
 "cals.source-2.4.2"="19sh899dbk4z728h9v72xrf54cij8jhnb4k4a035xfb7ijc0jcrq";
-"calxxxx-yyyy-20.21a"="0zlz35ni88p5zb0318mr6hl432d30mjkz0c10nr04bsl930w9hjg";
-"calxxxx-yyyy.doc-20.21a"="1kd2kxrhv602pb0d82h00dl3hj87wdcxpajb6s9f1866g9b70qqx";
+"calxxxx-yyyy-20.22a"="02x5vg0zfz31841x9cd4zgkb3zqrivcyw33g5k1b8hircziaarqs";
+"calxxxx-yyyy.doc-20.22a"="1zxn7gb39zas9jj8pnw9n569nr2li00wssk6h19cczm8mqvl0sdc";
 "cancel-2.2"="18bkqkdf888nd6j187kd39g0vgfhfh118bky8r5wwzy2aq843061";
 "cancel.doc-2.2"="1x6dhr2xyx66i8qwk98li3vp40rlalfrf5lk8ah4gq03ndhmygfk";
 "canoniclayout-0.5"="0smvc9bmcqybim01h2r6lx6xdr6y7218lfl7hhjrl0w25hiszaa4";
@@ -3443,10 +3483,10 @@
 "cellprops-2.0"="05gr1jgr9m7yfrl1d8pgnh0z8xm7rk8522vl5wck2s2slmk8schy";
 "cellprops.doc-2.0"="15f1mbagh41qvzkqf1bdzlvchfn4dibsa2qj7zwaqszc6smscl1c";
 "cellprops.source-2.0"="0yb9gjglaqfivifxi6n1al6w1nm0ah3r4d9y8bc7xnfxikhx3sym";
-"cellspace-1.8.1"="01sm0xv3jbh0n45xql6p22dz1i4j9qxzsz7mkl8rgrypbdhv5f2c";
-"cellspace.doc-1.8.1"="02i83pfa5pvvky3bhw0fx4pplws8s03v4zpjawls4vwmgz012lpn";
-"censor-4.0"="1bbsx35551nacx4hg9wkaan4k4qmrghq9yx8j28c9l9r0yc5vxa1";
-"censor.doc-4.0"="018jyz4f3lvkxps2dpn4ga3gwrmhwkg0nkr2hdif4xa5xj9d0a0j";
+"cellspace-1.9.0"="0s0f11xrs670zhynqq43sbrx9b290jph8r6fp6s7damrp9wnz9fx";
+"cellspace.doc-1.9.0"="14znyc212pydxgnyzqwxd6vlvd72b64qjllmsjpcsxqi0f7am0ak";
+"censor-4.1"="0d62zlwi9k2ihqxiqk24qb4rcchryavgkxvqkpcdr5ydqb68p85l";
+"censor.doc-4.1"="05bff1cavrv0s9ah5jlgwj7zkgfspya9sddyfrjcqkz45d1nywnw";
 "centeredline-1.1"="15paqcr4acypfgisqrcbd4qg5ma2z0msz7d76shzlc8a8bxahkph";
 "centeredline.doc-1.1"="0zfj31277wg4ymlzc3z3skq4c20b5c6yw69460knw4jj1qi9pp0v";
 "centerlastline-1.0"="0wc1pwppiwycm5w3hp5ysnv3wgsw9s8m9p9ra3xbmlkqxd6zjwnz";
@@ -3513,6 +3553,9 @@
 "clicks.doc-0.2.0"="04rc6xvhfbh98xgyjwads4bzqqmm4hlshn9z39hr77hlp7wkdyi8";
 "clipboard-0.3"="1i9facsdigll3rzl8xv1i85cqyvlc54xhia69cv5cv0gly00p1dl";
 "clipboard.doc-0.3"="1b6wvadihwglj0653bn8fnnq18whx2hymigvyknw00fyn3xjgvgk";
+"clistmap-1.2"="0xl0310x3wrk9lhwhbqnzi3gsvmbvk5smd4wq50wj691vmag9ivh";
+"clistmap.doc-1.2"="116n1w0zfc6ad3nnq2wvjibpl4ywcfbgffax43vml5aixkpdlcq7";
+"clistmap.source-1.2"="1cr6hbvln8mvrs6g8831153l62b4h1k5731s2d0xdm46wwmq4m3q";
 "clock-15878"="0w5z1ffi25nabsaqh91glby7ifn40c9rhzxlz2kbyvbrdg6a3and";
 "clock.doc-15878"="1wp9hglx1vw8zfa182m2103xb0rhg9hmp51rc7bzm6fh3iyz52is";
 "clrdblpg-1.0"="0p38c8p426dn4i40wwhi5hisx3yc8bqdi7vwxdbya02smixkpp5f";
@@ -3534,12 +3577,12 @@
 "cntformats.doc-0.7"="0015ynn7mw1y8v14qckbqkvb1fn5xqaz7rcs6gid1n19f1qsbh6f";
 "cntperchap-0.3"="0g7211nljimm9a5fvry89ch4nf49xhad9ka7prdmlpj87h9ygas4";
 "cntperchap.doc-0.3"="1fmq2r8ssvp99ykil3aak8w301qvh4nldsph389m7qar2pviy1sk";
-"codebox-1.0.0"="0q1ix25f4jac0v4c2n5gc4w5gca131zk78n3cylv5mcwjan25wzb";
-"codebox.doc-1.0.0"="106vrp0xnkplwxri46hnbdwcrviajji6c2dyf52h1f4gvgjipwm6";
+"codebox-1.0.4"="0s0145rdpqbbagc2klx2w5h6mlx4ns0qlllws31qbvy6byh65ngk";
+"codebox.doc-1.0.4"="1pj5qnzfa7725v6cixkznrs7yybc2v0ik9q2pxa4d25rpfxap524";
 "codedoc-0.3"="1zz70vp8ssblnacrqdsq9nwvf1lw69mlk9d94cfjc818szcgi9v6";
 "codedoc.doc-0.3"="1f3i3vw1cmdvgp05xckr748kzbairhvdpfvr844y7wnmxzr4rfzg";
-"codehigh-2021C"="16rfi3i1qp6gw7bj0h1g8gz94y3f2925h52hijr65vdh408aswww";
-"codehigh.doc-2021C"="05p48qhj8wai6jidvhk58gibhv0giixf9x1wqxrr8nf88625b65s";
+"codehigh-2022D"="1i7j2gggf3v0bsn37qhcpnx068i4434mww37018pgcb9l3y36ch0";
+"codehigh.doc-2022D"="1sxaha14d39yif006kqk8s4rjrfg5ynh0003kqpsknhlrwmrm6b6";
 "codepage-51502"="0kxf5zr3mhn5pd8pzmzslgnngk8gms27ax6cqn1z0n35zvh0p17h";
 "codepage.doc-51502"="1sd01q8lzrzgk9v1dyhf4m7a4fspjll3w8wwkbzp7gc693xg3lm6";
 "codepage.source-51502"="0b38lcswx2x1jl6ydmvs6yr1y0kiv6gdicnbrx5qs8xhwd93bcag";
@@ -3563,9 +3606,9 @@
 "breqn-0.98l"="0dm9r7zjdwcdv8hq0l08k49lq4pvvf78hrlib16rk9s03rz2v4g6";
 "breqn.doc-0.98l"="131y7g7hia9dgzf890xd5g4wfw23zr753kk78ajrdyn0jq1ipshs";
 "breqn.source-0.98l"="1hja619zcayr2gxsxhsfpv3gp9x0bx8y56mjcpb9ykwlxax4zfpz";
-"caption-56771"="1y0rvpimkhzwjgc7v4f5dvsl4dmsydzikfk151wn5pfsv7y4282i";
-"caption.doc-56771"="1kg5jmrvwnajmmgcilgzncw3bda7kv0n6kchl415bl7l6s1yqkbm";
-"caption.source-56771"="1bjhsn8gzb37mm5j55cmqrwljjx7wfdqlcpqvdqhqc7gyfbnw6z9";
+"caption-62758"="06gr7sz3gkiji1rfsfxlpg9vbp5x7rnbfhbzfqv48za1lfj057jz";
+"caption.doc-62758"="0avy43a2jgs0rqlcb8888mnj1a5vm212zfvzb7n4kgrvkgcjp0qr";
+"caption.source-62758"="0sw8n7aachgy9iw6pa8qx3xbvajq8rgx5ywaphpqgsxvj3xlgw34";
 "cite-5.5"="07nw7axvgir19ayi3zy0b2sp8bb9pq1nl36x0wv3nrqjilvgrwr5";
 "cite.doc-5.5"="0pg5fc41iwqc1y9m9b47nh48fqp5dpnjbx14ny7ch9irxblg5d31";
 "cmap-1.0j"="11ki3gqlk6hjbpffmi2zdlj0rg5z5drcx8zw9nc480mxz931h273";
@@ -3612,9 +3655,9 @@
 "jknapltx-19440"="1jw24izfsw3l8bn27qci3mblmhpkal9wcldhjll7h84fgjb9q396";
 "jknapltx.doc-19440"="0m3blfj4ninra6zn501x17q6b2qzckzcavgihgqmk9q51yibd5aw";
 "koma-script-3.35"="0m5w7drfgsxh0s3d124ybr8y5l6ivzypkm9yvkbnv1rfh43b1lzf";
-"l3experimental-61040"="1k6gf62k4rp8rb60ffs79sg7a69mz9l9j4y77jk29aa9nhm6pgsi";
-"l3experimental.doc-61040"="1pfdcpgzhnkrahx3wj564mpja34qvfic1g0fchj2msw95821hygm";
-"l3experimental.source-61040"="0c6ivwdgmqlmqqi22x8yljwxfx6nz9yh6rxnhbplzc56wbcj8yjk";
+"l3experimental-61903"="12b1j7khza4kh34x5kbpksykxqqw4z9fvbq7kvnq9bdrppxxa0zp";
+"l3experimental.doc-61903"="18vlndpsnhi6503m8m9kbda25bmvq4lych42j0w6hn07yx1dsqr4";
+"l3experimental.source-61903"="0bkq70jk9m283w0c7f8yfpap99jcm41ya5i07h1i46m5sb8aydsc";
 "latexbug-1.0l"="1ndjq6lfasn16x2sc64xqx44x7amic4vqbi46ifvsjr3l2zglvyi";
 "latexbug.doc-1.0l"="0rwn941gj39y9lb662q61q07zj2fmwwllvbbdy31yyv6f9ngb3v5";
 "latexbug.source-1.0l"="0l25xl1hg0r2b1z0rld7b31g2criwcyiagbx7mjgypxldyvmn3qa";
@@ -3624,23 +3667,23 @@
 "listings-1.8d"="1xlqk347698pq8w7rqgdd9fq39a279hjixcnxz93nzhcp9v93jzi";
 "listings.doc-1.8d"="1c3b3mhbaz5nk58wb569b6r9hwjb65wyjf3r70hrn6z2y06rq9lw";
 "listings.source-1.8d"="1q7k6dmma7l3vraic7k6gycb1jbpfzy09njj4g5pjc7j89qfk3sj";
-"lwarp-0.902"="1jwspjrzs19lz339k1d6djkrsam3n7d82n5i0qhm2fkrar5z2v6v";
-"lwarp.doc-0.902"="1y5fsklaiji55i431wx1zigr69cm1k4bf2f2lz7rn6lax3v40p9z";
-"lwarp.source-0.902"="0igcfgzwid2ixb6js3n7ijxfnkrfibws44g3zmb0288h88zfjv7f";
+"lwarp-0.904a"="19z3xycaahm4jh1p1b45zvjfzpjigjnn44mgq1g3m1fifc3sn25c";
+"lwarp.doc-0.904a"="198ng2virjp62bxrs7bmzl6blhnmssry2pk95agl30kizvhx7qz2";
+"lwarp.source-0.904a"="0iljccjk9vzw9w36hwdad9ygpw0lnjwy33yc20b0m2fkv2p9rjsg";
 "mathspec-0.2b"="0gspy6kjnx7bs5dxap8ym8s0k9i8hczi6s4s97y7av7vc8j1fb5w";
 "mathspec.doc-0.2b"="07mmfcd0fvhrhafsfk4sb4dvs5x8x1rjk1a2xl20kwpfpp8l1rb6";
-"mathtools-1.27"="1qscza5ac7wkcmirv6i8yyn51dcaisxzzxcifnxxzb11hizng96y";
-"mathtools.doc-1.27"="11r0a828bm1n0z68zhqwydji26ff0anz2ysyl34fx1drczrb8ffz";
-"mathtools.source-1.27"="0fgrsrbcafbcmx52s184xxnj9f4zpg7gg66x5gb3n3fs8hxrghfp";
+"mathtools-1.28a"="0znx3qvdvfz29fqzhr0jl23n4yfr5w45cdz5vn01ypk5g1bgzsj8";
+"mathtools.doc-1.28a"="0y5kci2n6cy2rd0znjh475aw1f7ix2ja2jbhp3vr40xr2w4h1mzn";
+"mathtools.source-1.28a"="0n6r40kkhjbvqqzhnjd6prcs32s5dv05yf639b7nq8psahbkzawp";
 "mdwtools-1.05.4"="0l40ydzljgydp8qfq1lm9v8nz0mrz4zxpjxicypn2hx7bxs2b9rq";
 "mdwtools.doc-1.05.4"="09d2ahrpksnjd4x7gqfx7yw51ivfpv4pwi6ms5c394c3v30xak94";
 "mdwtools.source-1.05.4"="1w3sjwa0n3pyn33k4lwnzcswm86zj9givshk0raq2qdb4znvxsk4";
 "metalogo-0.12"="03crm3sswv7mz5akghqvkq1zpiy9jdpy32ivwwmf14sfrrri2cz7";
 "metalogo.doc-0.12"="08vgbmjhynb4ramaj68i27hpgijg51j80lm0qf1jrfpapz7lrzij";
 "metalogo.source-0.12"="1ak8qbcbqgirljfwhq7ylxk1w2frxfkjvadjq00cclj007idr3x8";
-"microtype-3.0b"="09ps1fwwbnxyg9jwcsi6zlhxwhyw65nfz3rbl77xgz1k2gm8l8s5";
-"microtype.doc-3.0b"="12i0afra5y0b82nsd0g7m97gqsxzxx2x8wsh0smmgsjhiilbnd5g";
-"microtype.source-3.0b"="0i594ksy812rnvyx0nlj2w1l22dmk8rik9xr9qgz7hk3vnpvc9hx";
+"microtype-3.0d"="1j83fkjq09grmi5a86x111d1cf6a051xwcxif7r353jaa6cmqfky";
+"microtype.doc-3.0d"="0252ncfzghh2wkz46wn941nkmi1yfa0083x6kcc386k5n8f85fya";
+"microtype.source-3.0d"="07b3x853izi96l1k4kgm2j7lsf0xamppbxx382r9qkxrfay3vnlx";
 "newfloat-1.1l"="01l6gl8hjml0q2kf3wzdnypr96ib3dryspgqd6hhfg33h26dji5d";
 "newfloat.doc-1.1l"="0lagdv0hd7kjxf221a2vzpgskvfr2h2wcdps0l90ycr48g9s1j68";
 "newfloat.source-1.1l"="151qai42ssn1ngn4fqi7098hmfb9v858bkbxh0qrszawhrz4w5q4";
@@ -3653,12 +3696,12 @@
 "pdflscape-0.12"="04r7pgna2bziz6jsxkm0kkva37gbnz5q42ib1r23pah9knhw584d";
 "pdflscape.doc-0.12"="128rzqfkvx5ys3f5402fi7qf7iw2rrgmrs3jvrglmj9719fv8g94";
 "pdflscape.source-0.12"="1idx3b5ndgnfnyafhvi6xjqvgsyjp2cvmhd7dwd6qn6m88c3dhki";
-"pdfmanagement-testphase-0.95i"="15vgms076qbm7p92hccxh63v0wql6c4rw2h0ksyijck8syqkaisc";
-"pdfmanagement-testphase.doc-0.95i"="1a2pq1f95c99ngzyrqvcfr1vhgb5szyq3xg18q0fw6qsabjszdq8";
-"pdfmanagement-testphase.source-0.95i"="04ppnab3xlbiwbxy822xv9bvavg72lf07rkpr5v5ahn6wv9pag14";
-"pdfpages-0.5t"="0p41hryggm71xlfjv7cbp9dq59wjsc7l4nvzyvzb2d20qnvgv9v7";
-"pdfpages.doc-0.5t"="1mc18d74fcw273lcpklpy1iyxjz2ijvl7yp5wm2sn8cj0dnywb2z";
-"pdfpages.source-0.5t"="16wlid55jihy0xglhc63fwv1c1nr3scy8p64yyxwz0gc00l2sipp";
+"pdfmanagement-testphase-0.95m"="048djbcp7brywyrkmfl46m6hz4zvaxaw493sqjsnyszn58gmzp0p";
+"pdfmanagement-testphase.doc-0.95m"="1rhaynngv1nyny1dm5xpxq1xawah4gsaaxrwysc8wvfc17054jfq";
+"pdfmanagement-testphase.source-0.95m"="1jrv74bzpp7n26b9l70chdd0nq95pzknkwyg1y70qdksrdbj2y5g";
+"pdfpages-0.5u"="03h68bis3jr37x9fflfha2125p1nvgd7d9blp2i94mr2z7pg9aaz";
+"pdfpages.doc-0.5u"="15jaax17k7xpx1m9bd2xb8dffd6vlzxygh76l79vh89q6360kqbc";
+"pdfpages.source-0.5u"="1s7ap9gnxsak6ibfvwag7wdl50rfbvxlyh3cwga9ypq9fi8d9sqz";
 "polyglossia-1.53"="1w4hdkxf5snhvmhp5hq9cxqd5qyg3spg57rz5ssgvrjm3rvc4y05";
 "polyglossia.doc-1.53"="0gqxb8izfx34575rdynibyz2xmjqqxvqkx4nyq9kix1xw6a03vg1";
 "polyglossia.source-1.53"="1hj2a27aw8xf5byzvz25nh1hlip27nwlz6yj87hlxx7lgspiqk92";
@@ -3752,6 +3795,8 @@
 "byo-twemojis-1.0"="1c43vgcnkdvag1wdhivl49qm3c9pf29w89xgy0m02jrxryrjy6i5";
 "byo-twemojis.doc-1.0"="0bva1q3zxzkkrz2cc2zrin955p4r251hlb0w0gyfm156dss0iqrb";
 "byo-twemojis.source-1.0"="1msy8ja579nysqd0rmbw1xsh6hksm44ddi5q3x0i5p68k2pk1i8x";
+"byrne-0.2.2"="1bzlyhysyiwfxgjzdsz0ax8mkdvf3ln9fnwb33px92p167s1mdx1";
+"byrne.doc-0.2.2"="1wn4gqvaym5gjdnxa1pjbvnk77xzk6dzvpjil59nagibp0ap48pg";
 "cachepic-1.0"="1j93lljbpwca363sjk5qmljrfq4f671kg4qrnfyv9zqcxcpyfmmg";
 "cachepic.doc-1.0"="00j7j75zq3wa6z1liy0y6wzxjv96sq5r4dh7kp9f9icmxzs0x8xy";
 "callouts-44899"="19khsdal0siv0vvj56bxgkrj7bk1yyd3lw8iz6zijchp0by6gbbr";
@@ -3761,10 +3806,10 @@
 "celtic.source-1.1"="1w3wm5ci6kzpnvlaxbpqndclhxlbs4xiwq90iig98wf97b85lfi9";
 "chemfig-1.6b"="1iv0wvvvv6zdx2y7522qd6h670mailbpm04rpkm3bwrsahb19drm";
 "chemfig.doc-1.6b"="0p195ah3ar5b17k9vpjvdx59aki14nv7dhp8sz19mxvbiqw1b2b9";
-"circuit-macros-9.7"="07cbpxyawy44ds1vy6kpp9cxgv2mlh78i1wakzw30q0bj4rksw7b";
-"circuit-macros.doc-9.7"="06hs6qqh9qfbd44pxanngxnm25a2i27mcvax9as7crzl2hjzkii8";
-"circuitikz-1.4.5"="1xgji8awkbrd9abs9q8zrh24bhzk9azlyc0w6d6gp3j0j58lhj48";
-"circuitikz.doc-1.4.5"="1y5jn9r2xf05zibf6knbsfjy9q4mjkxyjfy9nw337hhp34hwh09a";
+"circuit-macros-9.8"="07cbpxyawy44ds1vy6kpp9cxgv2mlh78i1wakzw30q0bj4rksw7b";
+"circuit-macros.doc-9.8"="0k9xg8y1ihk7vgwa2aax7m6dmvpzja39cwvyqp4xm1l30lby46l4";
+"circuitikz-1.4.6"="0fd1fs8xa9z588gci4lwgsvp5z1vrah344bxajkqqh6iwynxxjbn";
+"circuitikz.doc-1.4.6"="0gcl3qa9x4lxjh45ld9bhgir3n7v3b5sdsjliz2pgc838nlhl645";
 "coffeestains-0.5.1"="1sfxi8zimkp76nc3fg7r3qyf628sh9p8rh2b8l0wq5aga20951n5";
 "coffeestains.doc-0.5.1"="097c2xgrgy95w7v5xb9lkgih65ji5jlxzdm6szdyqnf659bmibm6";
 "combinedgraphics-0.2.2"="12569y2i0q2lbmnwlwjfc02x0drpa3vcy58wbch4j2xzv1cih69s";
@@ -3851,8 +3896,8 @@
 "pgfopts-2.1a"="0g7a22d0ppdzcazrif8yjic19lvz143p6vwflz16p6zh88yhcdm7";
 "pgfopts.doc-2.1a"="17q1mlaql7f510pz86n64sm4m97nii72jghf75qs5yr9h9lqrq6v";
 "pgfopts.source-2.1a"="1mz5nzbhmbgzjkpkglz2w3s9s8kzrigg3wrd91dmdhjsm4d4kczi";
-"genealogytree-2.1.0"="1g1lhbv7nkgb11x59jklp51nfpxqmxbzgsn7mhvzjjv2w2iimi2l";
-"genealogytree.doc-2.1.0"="0fgi9aiidm9k4nx09i0dx5119vg79b2qns11hvsbyhmnbzpnyxis";
+"genealogytree-2.2.0"="1jpjzsmhm0pc1sd186h4nxm8hbmdv4yhlply6aa5q39kj0c7a789";
+"genealogytree.doc-2.2.0"="1psanx3sddk1kdb1zdg83ab48r8zq3dg66y717n4qmprdn2w1xki";
 "getmap-1.11"="158fwravmqda1zwzw6qzvq7lrd1xsjm9cdw3qgif2jjq6zsrnjqd";
 "getmap.doc-1.11"="0s9djdlchnp6w7wr7w2b4jj6iq3v6f8r1ri5kbp5q3hfshjgah22";
 "gincltex-0.3"="0w1pk80idhws2yva3zvlbnwy2xbrqa0dckhwj8d9sdqxn5j2va4a";
@@ -3887,8 +3932,8 @@
 "hobby-1.8"="02p8xxqxkq486dxz2fy3vghm9qnc13pznz84w3grn1b1cys1sbmv";
 "hobby.doc-1.8"="08q2nn1av4wcqnlacjjh6bgbx57qrc9vigb695x5zrrydcqdac0g";
 "hobby.source-1.8"="1pbzsba0z0i3zf9np60fjx0wvpvimslal8xq15pf5p9lrjq946r5";
-"hvfloat-2.34"="05gaf0zgy6knj8p4rhs3ygc8jljqbzpv5v3csb9ysds3cz2g4brk";
-"hvfloat.doc-2.34"="0k151zrwlfwyvnsrg9kmc97xbgrwdvijfn24nli7bcn3mm9jsf58";
+"hvfloat-2.37"="1w2cskh458a6kjkccqs3jarx3x6kb17xl218s0lddbnkivc9hxf5";
+"hvfloat.doc-2.37"="1l10mcnbvxqg92aanc848yyycz3ir2pr59rx0jmzcqpc4v8vihkf";
 "istgame-2.0"="0zr94dl9q3whjlsjmkcdjyhxndcj4dx0d2ynm21inksavhxc9xbs";
 "istgame.doc-2.0"="1a0xrxblfh2kz1bx3iqw908cifhh0gwvxxpxcfrvjsilzbd6hc7w";
 "kblocks-2.0"="001mn33pf532iwp3d8likhbc5a4nsgq72dirbilbdgaxqxndmx12";
@@ -3906,6 +3951,8 @@
 "latex-make-2.4.3"="1dgw31znxh3ch6xyg7y0ngnkjmpny7fbq9nhapd3am4l6qb0598j";
 "latex-make.doc-2.4.3"="0jmms953klgv8z4k5d8rj2l5barwxx02pmzk6ihpp1wdggfjxrfy";
 "latex-make.source-2.4.3"="0a5jqry52x11iga5ky89b57l1ww0hbl8z0mkkv6nvvc7bg5gg6w4";
+"liftarm-1.0"="1s2whdy9d5h7mf04rsq5mhs5bgkvx25j3cgzinc4r9dhb16a0dx1";
+"liftarm.doc-1.0"="0zq3wqzy038lc253iifk9rcp6qlchidvnljxiicinbmzm9v1w05q";
 "lpic-0.8"="0axszk7cpnc58rs7w7pwy3vpj39l6zc27g8lfxjzkzlnc8hbnycd";
 "lpic.doc-0.8"="0hyg9v30h6n38j8a4pbqfjxkqfc9ls3hcp1cf8n8dwr3ajyhvins";
 "lroundrect-1.0"="0s44pbvm6iwl2jyffnxriqlmpp6zs1y70z4aix8wwfasx86gq131";
@@ -3955,6 +4002,8 @@
 "pgf-cmykshadings-1.2"="1v9cpsh206r45hjn53hvxixi3kh3l094xgj5yq9vqsviiprassd2";
 "pgf-cmykshadings.doc-1.2"="07p9glm33cz2dk4891r338z45y1wqbfbmmdk51if8jaq52dp9w18";
 "pgf-cmykshadings.source-1.2"="1fpa9iqc6rz6j9qja43yfhrcahgg21ij3jscbpsvwq5iy7j96n46";
+"pgf-interference-0.1"="1l3gryb96av9zwxn4naxz5vy0y2245fv5zlm1dg31p88lflh2s5d";
+"pgf-interference.doc-0.1"="09vvbnmcv8d6y75hxdln9gqspm35fada4g66w6z4kv1bg7z3vrlj";
 "pgf-pie-0.6"="1g0hjvw86i2a6gcn8hz7jdjc12g5nd0c0irrjpkb1fkxdns58nhc";
 "pgf-pie.doc-0.6"="1y59pd9z2qyk6ixmdpqzdzrd28fvb9gx948wxwfn0l9qgnjqpn65";
 "pgf-soroban-1.1"="1y1c70a9v9zy8i58j19g5c8nc7f00zcdrdjmdcbm19r8vi2r09fr";
@@ -4031,6 +4080,9 @@
 "realhats.source-5.0"="13knaq4jzjd3f6fhvayfzva61svkra12z4wfiiwii5wdk60pi0rm";
 "reotex-1.1"="113nfw6md0v4522n54q63smd2g2iwm89qsqld237f32r3rdkbcl0";
 "reotex.doc-1.1"="0lapzgfp019a7qihfhf1cp2szwq98j8kmcy80c3gf1fa1x0c3x1q";
+"robotarm-0.1"="10xlswn7bkad45fyv9j70pd77319mynldwk530y23lc2874s3yn2";
+"robotarm.doc-0.1"="00qwsv5vxidjzkm31v21sbzd6rp1pvz2vrs66gmlm1xbfsv4kd0p";
+"robotarm.source-0.1"="18zffnyyhc3mp8xpw7bc52q29z3skqfxg6h6x4b18mi9jpyd2x6q";
 "rviewport-1.0"="06nc81iapfymbp0kxfk0srpxilfhk94xwhslv6az8n5a3bvp2mq5";
 "rviewport.doc-1.0"="1m4xvkafdf2skhclg60fjgvyd6vd5y9jrn3186q0hdi66pa7dl66";
 "rviewport.source-1.0"="1hijca49b0cvh3w8dqwng6wdssmg2fjjj7ga9ifmziznb2k4qng6";
@@ -4040,8 +4092,8 @@
 "schemabloc.doc-1.5"="0cvbwk285i01brrbpalclm0bfhxs4hnngrmn9aw42ywdi44ls624";
 "scratch-0.41"="1gd2yq2w2v7n3kfsid71qv2v5q1rvpfm49rsk4815pk4k16kxhg9";
 "scratch.doc-0.41"="0jhy08h2v2qf3p8dvh8mz5yqqrdzxnzlx1p50ng7xn88d9ihpqdb";
-"scratch3-0.18"="0z7adggc9lc9j98ljpgfz36ys0bz2119cmfxdyx8gljaray22w70";
-"scratch3.doc-0.18"="1687l1infxryaf6hngfgm72wx2xqzn48ka4si18x4acj79nqipz3";
+"scratch3-0.19"="1in71jxpq9mljn7gvaslsnaji21d43yj6ckzim42fyd9zk48waz5";
+"scratch3.doc-0.19"="0yr18cyzdfrdz6vs0slbgzgp82gklrmxh34k1p135g7255gw8k0w";
 "scsnowman-1.2d"="0991pn476g7pqhj6njgyal21fn0k5ig3c0bwzv2vfric6v52nk9g";
 "scsnowman.doc-1.2d"="0kn1dhgq8qkfvfhg4ip2zsz6x3w31ax92nwypcg9scd1p5s125r7";
 "setdeck-0.1"="149m9s33isx98vkl3498ywjy6f9q31jkw8schc16hxxm1z0jadnh";
@@ -4057,8 +4109,8 @@
 "spath3-2.4"="1aq6vfhwkvqgjbyfv7x29dwr5iiby3iswsbw33pj351hzjp78a9k";
 "spath3.doc-2.4"="0xbhh91d0rwzhjwlmnrcszva6z4h8cnvnv6di31k6s5cs0akla1n";
 "spath3.source-2.4"="140g4blf80szkkyc7l2lpz8vcd1q32slha9d6wh4f02akg5kx157";
-"spectralsequences-1.3.0"="1zkhpn3r8bq18izbz5j7alhxdvg2051clc9wxnfd9rv873wxrdrj";
-"spectralsequences.doc-1.3.0"="0r4bjspk6c17v7jqyg8sgip9qg5y35r1ryyasmgih0wp1ryhl147";
+"spectralsequences-1.3.2"="0jdpaq1hyvbgh6nc5d9355cfj7qya97326x0gq7ivhl8riarh6nz";
+"spectralsequences.doc-1.3.2"="07w30pf47mlr36z6wliz53ncj971fy7i6zi4d0q56h1yrkvcaymg";
 "strands-1.1"="0i2k3b3kb570k5h7yag83gchk9ss971v8w1xqr2kb448f1yqkjr3";
 "strands.doc-1.1"="1clpm1i4a0477zbrixscwpg6qyli0y5vp61lblgn4iqgw0sndhlz";
 "strands.source-1.1"="0ckf9ipirn8m795df5za2qd5w96cxzxmmv1kcn0gl4aj3ypia6b9";
@@ -4099,8 +4151,8 @@
 "tikz-inet.doc-0.1"="15mvq4gpd22nah4p84dazld4ncdshygmffz7sx42s2zqyjwrm6wi";
 "tikz-kalender-0.4f"="0lkvvwzfilmhcamy00jdfrwhxr75d3jzppyhvvb26ymnzm6v1inv";
 "tikz-kalender.doc-0.4f"="1pxc1wii1hqmhr42yskil16ahjslkn7y6q8qj8hbq85y7ymm3lxi";
-"tikz-karnaugh-1.3"="05z4p2bk780gwaawjx3h4v093d5djd5igmw0n3wnjy0pwid6453f";
-"tikz-karnaugh.doc-1.3"="1rq7c6klaa7fw8bw5ifjwi8fnaqd9nxxpf0jkgmws0nkshj7ca2p";
+"tikz-karnaugh-1.5"="0bhnh37ydzfrkvjwfyzih59sadfzw9y02y337wym3gqaa0m6w7gh";
+"tikz-karnaugh.doc-1.5"="1p7rrg2jrpg4hqlvnzbniiwpcfxyfxbqq29izbsijlwlwfhm2zaq";
 "tikz-ladder-1.1"="0a1bbsfk9dqdmp5y3qgc2i9r9fl3wdj4fbag7yisxlgrh447k4nj";
 "tikz-ladder.doc-1.1"="15pjhbyfwr6029bnkilx35wz1nc07440zy6w0wg3fhaa1ynn5jnn";
 "tikz-lake-fig-1.0"="0miw1aws614ffb4q8szr6zh5rb0216hz1scl50ambx1qv97azsgm";
@@ -4133,8 +4185,8 @@
 "tikz-timing-0.7f"="145r878hxqfx1sdn4hdagmcnfx8xqcihfz775zabn5sbzki87ywq";
 "tikz-timing.doc-0.7f"="0na0rjgnala2lyww8chnkqyp26c1y2siaj7gqh6h8fjpi5bpamdf";
 "tikz-timing.source-0.7f"="17wzwm58194p5jlwb74z30864q7nzg9fi4q4dbcp26b3p6kn5cxs";
-"tikz-trackschematic-0.6.2"="0drg1qywj5z8004zqw808g8lzn21gwj5w6rgyycz8czpqcc3ddix";
-"tikz-trackschematic.doc-0.6.2"="0zbfm20pll0fgkrc4gksal2firp8xz454l617mak0c9nmrzh20h1";
+"tikz-trackschematic-0.6.3"="0vc7pxjcywzsy2is6rrjvqqqp3kqrqh7rmy8pwh7rkpll0k7yc8z";
+"tikz-trackschematic.doc-0.6.3"="0d1nl9cfaidqfjd9ng4i3y4mqh6id099x0pw3cgwdsaf3i614521";
 "tikz-truchet-50020"="00yf9044lpsazd8wnmcz39lnazrxpqd7lpyr8ss24gk9gm33b563";
 "tikz-truchet.doc-50020"="1vlsyyh7xj1fn6wkafh7ps4ys439n1lmvmgk63pya18laxkphxxk";
 "tikz-truchet.source-50020"="1zbp1xb9sbbnr4iiqgg352ymn9ybfmkwmwd49r1ws3w7iy3qdvrz";
@@ -4184,15 +4236,15 @@
 "timing-diagrams.doc-31491"="1w3qzl1j3viaj6qi50qcyx51w2ms23j27p17h526iz11x39w0gw7";
 "tipfr-1.5"="1a9vj3r5b15chzyrpfd7rn0f19qkq9lqklzxvzm4xc5b5n802zbw";
 "tipfr.doc-1.5"="02x8fikl1vnirfcrw42xq2cbkf6wpciary55xyk6xwnnhh3abbgb";
-"tkz-base-3.06c"="0bff82v1gpdjyclklkfd1ns90dinwdhlr7k4jr6amql1vqh04jqi";
-"tkz-base.doc-3.06c"="0hi30szzssy594m6i45lk5418a23xhb689j353dxfml4rc9hgm2h";
+"tkz-base-4.05b"="0bfkph3lvc8glzvwmmk1x8jc3m4s4na31xrf17vism7c91y6q85b";
+"tkz-base.doc-4.05b"="1l4k45rj1hapidg1r01b2daw5qv7kpqic874ysfjwd7vzhn05hsg";
 "tkz-berge-2.0"="1c9kgzsagh5ww0zlwywpddwn3mx0wrf8yc627gjap3f7nyyvixn4";
 "tkz-berge.doc-2.0"="07bsfmh9qyn8q9z4brd4si1clmw7sn2vh2nr8idqnm1z1jqdnq40";
 "tkz-doc.doc-1.43c"="02p765y97adxc354hn4fw40hhcx42j3xavxjyv5swz8jn26dys19";
-"tkz-euclide-3.06c"="1kcd294pqi2plkgs9gs2lp9n5baca62l2yzkmj53wk8ql1028886";
-"tkz-euclide.doc-3.06c"="1m95b6bz31fcbwyp9xvhqw03abw1x2jbd9wsglkgdn95ggvjlarv";
-"tkz-fct-1.3c"="03rd7731f4kvln990bbjfy3xhjbprplyxwwvnvr97ks6i504phfy";
-"tkz-fct.doc-1.3c"="1p47gkq52l1kh1mvychjyfrzakrpckcb2g55gxg3pnglqbj7p5ca";
+"tkz-euclide-4.051b"="1hmbw8ijfiski125z0mc8n1wdrqn30f1pjylh7mnjlqsvg41qzil";
+"tkz-euclide.doc-4.051b"="0hsqq3zrk83njq8jpsx2aizzmkpp7h44fjm5adsim5sic2qn5ysn";
+"tkz-fct-1.7c"="0hlcxnllmkhmxl5dwap1sb2jg822bz4glllqcv59dx7jqab5bv8k";
+"tkz-fct.doc-1.7c"="1bjkya9ssr6m4aw6rd64nniwffgz57ikz16ciba2x149f39pkcx3";
 "tkz-graph-2.0"="08kfjaniwrlw23vmz24yq9gbdks9fwcf0g4jyy98ikfqh9phhhs9";
 "tkz-graph.doc-2.0"="1drk9va3bgq62qfkcvp5z30gvnscl7mbjz66m27wmgagb2ki2f0q";
 "tkz-orm-0.1.4"="020bi7dgjipd2ancqji6fa1zcf9lh9d8n4zbacy5l5nclxfiphcl";
@@ -4220,8 +4272,8 @@
 "sauerj.source-15878"="0l5p9c0fl1p7gy815l5064x93msfgb6z2lnvm2x24mwfnfpykrqg";
 "xifthen-1.4.0"="0ys8yq13vhval5jg9a4n4pv7b3v11w1yh63ssvyx3pnr767ay5r8";
 "xifthen.doc-1.4.0"="1miqc1bfwi2ssl6yp9aqw7ygnars27vks0grpyfns494yimy8nc0";
-"tzplot-1.0.1"="131aj29l8crs9xxppb36pzrwqfyb6d7ch2iwch4izxjphb8pycfj";
-"tzplot.doc-1.0.1"="0kkl95g9749a6bz63yy86kf1q3s6p2dak0ndpsxdybvx03b2psj7";
+"tzplot-2.0"="15j1y2ww2jiy0m636rpgjydb391pacw7gm4541sryfafn68pivhn";
+"tzplot.doc-2.0"="068kbnxy1dx82cdk3yh5czwyajvypyjhsgvmh97kjwg6j8l75pm1";
 "utfsym-0.8.3"="1bkrmrd31r2r8aq2ldqvwrlx0k9pgnh8hnm0qzgjxb5mqj7rhwwj";
 "utfsym.doc-0.8.3"="1qllclbkqvr6nqjvfxkr1xdv2af6vi90sc40igxssf4d0gcbkp1s";
 "venndiagram-1.2"="1v4hbkc214fjh5wc2myqxa6jcvr6sa31c7nz9avzj2kf40kp3ip0";
@@ -4323,6 +4375,9 @@
 "cooltooltips-1.1"="1apf2qvfs606nqnnps2rny9ly6y0hs7yv8injrbbk64x3nxk86xr";
 "cooltooltips.doc-1.1"="11qjqqicakybmnqz4vx5jb0cqsj8gw86rywj7ycvg96s93zkh12i";
 "cooltooltips.source-1.1"="1spsydk6mn3qzclav2g2al20sdnaabz9b0f01gq95w2qygl26hy6";
+"coop-writing-1.2.4"="123rbingcrgjg5dyafciwz8wm2bpl9bz9w54pi2jim87lgibnf92";
+"coop-writing.doc-1.2.4"="0jqrf8pnpsq8d432s7b3qva93ydf8gng18fn3drfbzsvb4sqaf97";
+"coop-writing.source-1.2.4"="0yhynaxvvhfhnx97p5p12xf66zng989kddlfw9pp6sv5alxfnvaf";
 "coordsys-1.4"="12vpxh6ll7q2jpsv85j68ij0m3b0335hflpqahk40dagybjkp426";
 "coordsys.doc-1.4"="1jcjvd577886q8sqzcsqil81b2lm31vjxhbdrgs38fw8n6q9g0sq";
 "coordsys.source-1.4"="0npd3qqigvp0i5zdgizm68sr1g5xcplgwfahrkak0kq4g882qmdd";
@@ -4348,8 +4403,10 @@
 "cprotect.source-1.0e"="0lrf75hvlp6jpwfppkj0dwv7a9q51n897bwrf3gzwswb7icvqnf2";
 "crbox-0.1"="0ni16ldwni2gyzlivd5ii2fdq15h6np4mv73raa5g76i5rw42sbb";
 "crbox.doc-0.1"="1yk96bajna3ihvyhx482jrwiccbmqdr9852w11x00xkcvvc6azfp";
-"crefthe-60961"="1nx7qpzww2bpsbh4k745a53lndxqbwv3rqpzl5502jdnpwz7naa4";
-"crefthe.doc-60961"="12bpcf1warrnnimbj5f26l4xhxnyvf1h17r8ni9zx34c1l7cn8ry";
+"create-theorem-62806"="052mlk77g685fp45kalcrpqzphysx3xky6rgnyxfgrg7zwi8yxwm";
+"create-theorem.doc-62806"="05m73anrzca3qal6cdlys1m3c9wscsxpjv59x4i6iix9ky39v35h";
+"crefthe-62350"="0swyxrrqixwqavry7lkv3s4m7v98yin1zyjjcbvwhgr693bmbynq";
+"crefthe.doc-62350"="1f3i2fk98d1269w6rcv45z7dqc5zh6ix630bhji5733zs1x0q6yw";
 "crossreference-15878"="0xc8d3g8j86dzpfxzfcildiyk8zi2apc9af88v2zg6zjra6vra1x";
 "crossreference.doc-15878"="1iahzjwns9zapa5y7z6yy2wjdcy6qiqrqvp9q9v4ky2zgsf7n5pi";
 "crossreference.source-15878"="0yajk2dxnsfy74r6a50zs4lc064aha0lzfqp26gpgnsx2h0bvpix";
@@ -4364,8 +4421,8 @@
 "csvmerge-1.0"="0fyrqx85mklws5zny7gmmyscnsivjfvwmgwi52k3jk2c97nvsy8z";
 "csvmerge.doc-1.0"="18pmc5h44jmlh583cg0hjr24k2pj369l6ya4hqm9kwka0bhg29nm";
 "csvmerge.source-1.0"="0mggp5xankhif93firc5g01c6b160bkwqwbhc04wcm4ndlamvip1";
-"csvsimple-2.2.0"="1iwb97jhbgas2xqnvc6v8p3h0aqkid5rjwsg155pgsb2dj9zn53k";
-"csvsimple.doc-2.2.0"="0y0ifb7pf605x8fcf28v6dvw3sjz9xf4jqxcxiss6mrpapm6dd5f";
+"csvsimple-2.3.0"="19y49a2ilhh2hdhm9zm4vql97awkmrmpy9fqw6aji9bljq7gmazx";
+"csvsimple.doc-2.3.0"="0pzym17yywxkxkcd9hhacrydk444nwg34fza8a81i4dxhd5k2kga";
 "cuisine-0.7"="16kvfkx5sj6xp5dz0gqlbp5079vh6snkpixmphvz2gzyaqnmafi0";
 "cuisine.doc-0.7"="1mbsgn7mvy39pwq5gn7l3h6l3lc53vjyqyvc50xj8h9gs1gpdrb3";
 "cuisine.source-0.7"="1r14f44bjdry108f6iy7byzms4dybc0wi936dwkg5ahwyq07pmck";
@@ -4412,15 +4469,15 @@
 "xfor-1.05"="0m4y0caa22fps0r6735kb9pr2f89z5a8wflzrvpbms4nh3a61zgc";
 "xfor.doc-1.05"="0c0qg60h631d3m9rqr0nwj9772zjv3ch0d2p1ksnqnjf30idydl1";
 "xfor.source-1.05"="16xp7hziirlnd507g9bjvszm90wk9iv6ankq8bx27qkyk1shhjfq";
-"datax-1.1.2"="1zn3yh4r58vks9c71sh6l7krby2jpyjpj13wad3qqn7ip2snjnjw";
-"datax.doc-1.1.2"="0aj8f1qwgcy976ybkyhp2kjig6pmh491ljacavchvzla2d3fsayp";
-"datax.source-1.1.2"="05ksf1abgq5ix5d2zxw3qlp4ia0zfkh0nkgp5zzlc8z7j3djl9f7";
+"datax-1.2.0"="0sqyx1waaw57v6qfh9q5mcf5bwz3j4v4c52x7dcnh7zh37cq6dmj";
+"datax.doc-1.2.0"="1kd6qjkvdi3bnkibihzfhcabs3f6ik2bsqhg609qnk6c5cyz08i4";
+"datax.source-1.2.0"="19va3a8b7f1l93b6ky1b3li4y6fhxiycg6gjpv9i3vyjhc0cr0sg";
 "dateiliste-0.6"="0vzq9y9ilc6pnhg60psvwsand6sd4w5238rq3xhwnj2nq80yi38s";
 "dateiliste.doc-0.6"="1gxjc45zim6vykmskmhrhnkviw9i7la56d2zfyi89c5nyjbry5a2";
 "dateiliste.source-0.6"="0ks8aka4km6z6xcn6sihsff935z8kg74cyf3czk31wmr9qay4yq0";
-"datenumber-0.02"="1wc1cixsvcb6346jvvy5811my0kgpc60hrs355w9v3z5a9c2vl4s";
-"datenumber.doc-0.02"="1lhqb3fj5dazlmnnxgxk80lq4n5gbbwkcf2dd228d25pnmx7jirv";
-"datenumber.source-0.02"="16cx0wgn2mxxp1wrfb51ngmxvj9r8fmfb1gxyqp1sd5pxiwdshnd";
+"datenumber-0.03"="0jcpzz01g8n8gxl12pahhbl0wi91in08vmpwf3lnwz9cdsm2n53s";
+"datenumber.doc-0.03"="1h7nm009as764cwkdxy64zh27qwwsqlchzfd2qd4wx9gpvg3dg20";
+"datenumber.source-0.03"="0qsbqqh4lm075gfv9bjmb795z2awf78nr66lrsj72p6z8wa01scv";
 "datestamp-0.3"="0gwmg94562bfc3apjqkf4bb2g0diczdc9ik0dp2i7ha5kqxvczpr";
 "datestamp.doc-0.3"="03a24ssl9x33jw5vqg2as0cvrjq9llpdr0qncyxl7i03mfpiwyy4";
 "datestamp.source-0.3"="1byhi7ka2qkzcph85ba5kzqfqakqpw8abxzvf50cddppfcr2gc52";
@@ -4558,6 +4615,9 @@
 "datetime2-welsh.source-1.1"="0d21jimjq8sipg1qh4fxwb9cmq3sga0wjlrcqapjpy559bnfgmrx";
 "dblfloatfix-1.0a"="1r8s36il4bmqvvvlrsdbhdp4nanbyd1lh71dac4f774bf5pkhzi3";
 "dblfloatfix.doc-1.0a"="0znp5j2v20q7bsic5j7cjqxmbi1dannffl0b14g2w0jp3p6hpfxn";
+"dbshow-1.5"="0cfp89n7r5jn6rsg8qrjmwfzi1i9qrvxh4aiz4r33sgi8qy5iljx";
+"dbshow.doc-1.5"="00nksa78l2hi8dwp72wcz7b4sx1z5p88c9pyha975xr4l5lbli4q";
+"dbshow.source-1.5"="0pgyjb07flhfr0dy1rqk4j237wjskxfsldrl58hzdanipqn0jyyi";
 "debate-0.1.1"="1vk6n4gaiiv6ms7wk8azbmxr9cl9i4sn8x1p51cy2yla9wbk4rdz";
 "debate.doc-0.1.1"="17l5j5m74zlvavmjaiqcx3g7ddmf3b4k857345vsr3d7mbwqxi9y";
 "decimal-23374"="00byxbhi2pqccd1vd6hsh4ri0vzvq1mwjnvqmqqlrbr3qfv05zla";
@@ -4649,11 +4709,11 @@
 "draftwatermark-3.0"="1xrsh755whbaxizzljcpk5an5k9s09f6hcndp1lhw2z9mfnl2na7";
 "draftwatermark.doc-3.0"="0cnzbj2wg5kifqg08i081d0043462vswbxr68spnnxp2y3b5ysdj";
 "draftwatermark.source-3.0"="1k66347n1cf3ap8406dw2qa21k6mazwhv6brr569i0khsxypfw0a";
-"dtk-2.08k"="0yhk0wg9d453g9mvcm4jjvyij9qz2ni2a0vmbvpzw2wwlhs3kyqn";
-"dtk.doc-2.08k"="1cp5f0g9k74mimykhkbfcvn44sswnjig1w5yplahfwayps5zw90r";
-"dtxdescribe-1.02"="0xl8q9rb9nsfac6cjlbg2ind900agza2n8zid4ss4vr8g8zxaadv";
-"dtxdescribe.doc-1.02"="02hh98qbdymaxfp0nc8dg2yiw7kl94jam56636kig6ik7305zhwj";
-"dtxdescribe.source-1.02"="0fij0m7yrwc391imbafhzc7iynpc230myfjb2j3czzaklan46p7c";
+"dtk-2.08l"="10aslxxgpsfr2x3apvmwhyb8y40w56bqbqdmf41g4bvs8zaqd1dy";
+"dtk.doc-2.08l"="028saal6dbg8w9r015z1p39kg7qqg6s9i7hn28l47sv1qsa1mncr";
+"dtxdescribe-1.04"="149zyfzdd5v2zx6d2izb3f8c32744x7fvvxk1pch39z1ppw9rzbs";
+"dtxdescribe.doc-1.04"="0r71dy5xa4mv7mzlcswbgc0iwav773625f9137mj4hrpprddhybn";
+"dtxdescribe.source-1.04"="1bs9yb18h4j635cccfhqkbdf5jwlncmqd63npc6dlcxfz5c3k83l";
 "dtxgallery.doc-1"="07c403zbx7sxkhhrwrfw3np20xlqhdk893b4bd6r8lqb0zipp5b5";
 "ducksay-2.5a"="0m8dznw00in6hpsw3qwv42aqn7srxrzl54azby1a0wpf1c1nivpg";
 "ducksay.doc-2.5a"="0d4a3ldjvblq0n4mjkdvizswklhaz67z8myak8clc60fd2pv5f80";
@@ -4674,9 +4734,9 @@
 "easy.doc-0.99"="0f72bawmxrxqk60xb61y079bqpxj8kmvn167plbq5whq5b1fsxfl";
 "easy-todo-32677"="0fkwlzgx20lj44cvwv8hqv79v528k1gghx30lvqhg44wqirkmy86";
 "easy-todo.doc-32677"="1yj3c25mhkp16n49riza4qchr2pqycqmb2k80syn5w3dzrj021s2";
-"easybook-1.42E"="0c5aq88ndaqn5yz11jffzvyqiyjx7kv88qyh62708gacwyhjpikh";
-"easybook.doc-1.42E"="0skxp6i6wpl1kdbjlvn6bzqcwkl1zxdpq4szz9lqkiaryp1s53pg";
-"easybook.source-1.42E"="0cxmnymlvwg7j5k035f65c1l2bpxdqdr0lfx290n5j1hgqkl250c";
+"easybook-1.65"="1pb93b21hjir75x7x8n5b13cjkfn8xhjq7wk9mvbwzbsch1d0za3";
+"easybook.doc-1.65"="0dfycvv5rap5085whj198qpds533h766awdd8kncyfalbryymjd6";
+"easybook.source-1.65"="0zliqnwplf71xnw9j40rc7xayfiq9x2v1n23km8k2v7qlnw5fvqx";
 "easyfig-1.2a"="164ncaq1l6hdrjp0zinynf825hwsky1xam2yqxphhk90438n5hzk";
 "easyfig.doc-1.2a"="0hc63z5456f00a2x70ckvf3r54zld4d3r63a8d4ra7502kk8s9n6";
 "easyfig.source-1.2a"="18f4bb9yf3f7q96w79rhx8h4svlxnv0xc6xwcawav63zsk40mk7q";
@@ -4721,18 +4781,18 @@
 "egplot.source-1.02a"="0qsyqhmx0gcl13hlhbia9rq82kkkhc6mhmzp56g9b62qy2wl1ss8";
 "ehhline-1.1"="11db4dh948g744bynf1ydlg6jk562picrzfbh5pszxvfdag91kar";
 "ehhline.doc-1.1"="18jr25hnp8hg3dbjgf16cskdhm6kx9nxliiggqixb7c1ii6mmn2v";
-"einfart-61338"="0rjrf24384gyizryj240pbqgvvh1vndidzmphx3fxap1j784cqpd";
-"einfart.doc-61338"="1vcr0lldycj444xxqn239d14yim974x51q73qm0bf4qrj18gh1dx";
-"minimalist-61338"="0ckkg9qzibxm8ivipiizr43nbbgkmipxxldfdwd1s6lkhz5ksdkb";
-"minimalist.doc-61338"="01jpcs671xw70b78hicwv8qxil1x6n6fhc818hcjz319pjjdpdmk";
+"einfart-62834"="1m4vb224171b2lvafx56zpx7sc67wnw2kndcyh2yg46jd46pcx9w";
+"einfart.doc-62834"="1ddxsk5kivkf7g7cn9dd85xdlkvmhlkb7q6akd6z8jhb3v3bkkk1";
+"minimalist-62834"="021ikgvxiycxkswd5hyb399p0mw1gc59g1hjk71kmd8l06x6svf2";
+"minimalist.doc-62834"="1k11s61zbfr2jhdyw8jyhhjkx1z8s5camqw8j51k59zfrhqs52k3";
 "elegantbook-4.1"="0wnkq1bf9d50wsm76llgffr2rhvk4zjn41as92nr1yhc71xcjvk8";
 "elegantbook.doc-4.1"="0mxlzchk6grrwbqxfwyyxa06sb378qkajgpz1ifkmhvgfdjbkyss";
 "elegantnote-2.30"="0wdhwn4c1brqalghyj2mlpvn32kln9rck1nai16inihq41zqnz1m";
 "elegantnote.doc-2.30"="1byqlpjxz53c29sdc48073agpy9pg88yfbhvp0wf4fp7l9jl2m0l";
 "elegantpaper-0.09"="15mi33d8ml27axgkfqdvddwa6hyg02w4bqyd5wnsvai9fisigivd";
 "elegantpaper.doc-0.09"="140mrxwr89gkdswizwrgn0dirq0lm3gf5vvrwr5f7p961swqzk6h";
-"elements-0.3"="13hcg8vysd5ljbkpjicxpnvrdc1dg1c2vcf8lz1m7x25g2sgwq1x";
-"elements.doc-0.3"="1fp0jjgyd5f46pxs80wnz550jg6vv0dmpr45zn87anbq8mkxzcyi";
+"elements-0.4"="0a3dzg3d1wz1zni57k8gibrxczjg0k16vqqkbwcd509blwxgps4r";
+"elements.doc-0.4"="174467pvz1q4d72z215pni50084ywddfvf8c36ibagijpdvrym08";
 "ellipsis-1.8"="1zbasvm792cghiji6gkg27ixjx7ms46rgqbi3wphpm9dix9296ap";
 "ellipsis.doc-1.8"="1w9hp2k4qvhg5275iq5kq79ws5z6i7jb1536h0qrznm0lkw33c4y";
 "ellipsis.source-1.8"="1z8f3x734nc364gybhslxzvvv4502a29dmb4nlz39hm0kzgqq3h9";
@@ -4777,8 +4837,8 @@
 "engrec-1.1"="18qzqg4i4f2dcpqdw4zs9lk8cxlxxn01wbh8a275wiaqj5fi7hzn";
 "engrec.doc-1.1"="038a925h1047a8wnwm54mmyq12332waxx8nbrg9m3pacr45hwmgy";
 "engrec.source-1.1"="0x32a3cgh7pidln750qbwxl7bkzcjwj4brxbqmhyfydnhzw1xzar";
-"enotez-0.10c"="16qlbi1s3sa8m1zmns78n2hv05f3qm93xhcmagix2aya7srifv4k";
-"enotez.doc-0.10c"="1iygaqm1gdiyk6s786nby1ahwc0rgaps2b1h4b141gdczm03dyn8";
+"enotez-0.10d"="1nxn52jbgxp2r1zlyp3hmr0k5kwilmf8fkr46scnh9w1ijxxmmp8";
+"enotez.doc-0.10d"="1jw2mbyz3xnshrb031b6xzycqckpn422rc1ddrdj7r2j5lzy7l2n";
 "enumitem-3.9"="0hp6sk3i0a1jwwvlr0lk4w75fc57c2fvqw9x5ir8db049380ixyp";
 "enumitem.doc-3.9"="1byxv6d9g38fhd83f4g23yqha8nvr5iv6lv97w40jn58i492dyrq";
 "enumitem-zref-1.8"="1isvqbp7wvib81r0yn7sngxa2dygkfm4jn4rdvw0kp8rknam91qh";
@@ -4815,11 +4875,11 @@
 "errata-0.3"="0hp8pls350swslim7m3cpnw23v94vnqj9avfvx9hq0bgl99szc5c";
 "errata.doc-0.3"="0h30iip57km31074cya5fyhlmyamix8anpk19rqbsfb43h3988g8";
 "errata.source-0.3"="00bdq20dwwmq0nw3c271ah0bclzkzkwbr5ak4y9asnab1g6fl5yw";
-"erw-l3-3.1"="1103f0mwhjwq575fg099v1xsqmm3jg0rfgmz7d8xqpjjy3y6g7gd";
-"erw-l3.doc-3.1"="0zhbp441kw9h9xmhfvzxkzisx4kzq3ba4jgkkdrlnd6zxl82fdgm";
-"erw-l3.source-3.1"="1yhz5jmbapzjr5xk27pqjs6y1cg0civ78gzz8h0g6klp4jjgsigx";
-"esami-2.6"="007mlg35y6y74bndwj2ab5r5drxdcdiwiklz7fmp5mjgnclcxpi6";
-"esami.doc-2.6"="0sp6acrdzgr5qnw05s3ilv6n9yh6m6jg3ms43yl6ia6cdafrrlza";
+"erw-l3-4.2"="0klwkq6x58bhqgc849yv68vg7w8ivvzib8rl84ipf3gl1hk42761";
+"erw-l3.doc-4.2"="0qkg31gi4jhgvc3i42cbj00ccavwrxfmygngn8qxfgmsphx3a41z";
+"erw-l3.source-4.2"="08lh56xzj3wjh1dp72ky8ckga8k73d3alf0vxjkwb6b6krzz4gm9";
+"esami-2.7"="1v5fzb9ws2785ylh5swfb0hjp3x8m74mbfzd2c5z9l3wbigy8kpp";
+"esami.doc-2.7"="1s1x0mld47z50dqfyhglsgwyjqzphky0zqy67jbkrn7mmxzz00y4";
 "esdiff-1.2"="0p5d89r6pzsf0hzaky89843pa4z2n4dgq3yg8li4gb5m2b4fjfkg";
 "esdiff.doc-1.2"="0jw4rhkshni47zdk18b3gd4amyhh6v9a1mgja58wmp2vrwv1nn2f";
 "esdiff.source-1.2"="0iwkbkmkl31wmdrd1wapd94p70mwd45lqld3b7pfb0j287nzkzl6";
@@ -4852,8 +4912,8 @@
 "eulerpx.doc-0.3.1"="0l5kw6fz5f2idr5glnkmvqi2if6m8sbqxpipzbqc5a8c0dgc9yvn";
 "europasscv-56829"="06vqrnfzcq04mjk38q75n1k1dw3ap7z5xnzpjmgss8rl6mjn4v3d";
 "europasscv.doc-56829"="032298ir415l36gakqalg5n1nk70c47xbm2svvg1ygb32sgn4afp";
-"europecv-61398"="1nxnx90gynv0l9c0gwh4li6fi9jhmd9cgrjh2i47j3dx03j7w1ad";
-"europecv.doc-61398"="1xmlsnfk3fzjfkaknmjpgl38wh4ii97kdiszvlcdrz77i3l8n23x";
+"europecv-62685"="02hyclfz14ak7mpl8ry8jn0cbf3zzy3lym06qmcyzhbjv6sk6vrp";
+"europecv.doc-62685"="1ia20ijh0kirczzp5ldh4kiljz39zbrk40c5sprg4ys2ajf88vrb";
 "everypage-2.0b"="1i8fjcbk3flywzd55y0cbsdmzymvkynvgc5cvv6yh5y6nr514rjd";
 "everypage.doc-2.0b"="13drphjv7gzgdzzwd6fxlngm2rprhls60gj4lz1v69sqifymnn4h";
 "everypage.source-2.0b"="0vdi8yd0r33ajnym0f3j42ajkc2xs8b5yn3kmklmgx19kpc93ln5";
@@ -4910,9 +4970,9 @@
 "facsimile-1.0"="0mfzqrn76b2nhz60rqjdr55s6i9fzw96ya74nncvdjjcvaqpjrjk";
 "facsimile.doc-1.0"="1i3vv6a8r1mmkmpjwr66r0isha7s5ksp5cwgx3rj9sl3wfnywsfz";
 "facsimile.source-1.0"="0icxnmiwmrjsp1lhhdkcgsjif1s396lkdxp73vz59afzhwdm6l0b";
-"factura-4.00"="1jlql1yfkcrsbfbgjdwhaz8rjcmm1d64z0na93ycgldv7k8q87ly";
-"factura.doc-4.00"="0cw8gkcacf93xhj58j8zxnf6xn8cp27z98jlhdha3kic4k2w79q9";
-"factura.source-4.00"="1gzhz8ighvggbybjcvcnbnk79j679i1vjqizwdvbky1qpykgiz96";
+"factura-4.32"="18p09q5r4n04r3pr636zxbq2jp027knlzphd4zpns3d2szgw2j05";
+"factura.doc-4.32"="19d5nsjxzghmk56l1v9ppr237ykdrgk7bql4cdr4d2rdvqbk4r19";
+"factura.source-4.32"="0l77127yc8r4n0iyv4q3ilcs9hrfjn0y56rc805av4gdrgil9xgq";
 "fancyhandout-46411"="0fgyvrww1h79bvwf77h83p2lwff5b564gk8cjjnkp26zjpphah22";
 "fancyhandout.doc-46411"="0r5wzyw7z8gsm2k1y06h9gj5cfxnclawicxdjpq50dnb6233ac08";
 "fancylabel-1.1"="0fyrhiknwb658rg4lkdkfb221yrvzfs5g2rmxfas69p6aambyv36";
@@ -4932,24 +4992,24 @@
 "fancytooltips-1.8"="18hygq6ks8pihlamr1pyvmsrbsl8wa0kx2qy8san53hd450lqn0y";
 "fancytooltips.doc-1.8"="0q28xlckjlm231r14ysl05ic3kb6aa5qnwv9x0qj3iz3lmyfq9zs";
 "fancytooltips.source-1.8"="0nhmjrivw8a2xhblhxnjbyvmz4hp68sjxnnfzmqyrf1agjgwz8m0";
-"fbox-0.05"="18974iy4qh17kmhzjrbnzm208y5wv4bq7aq9l4cdqnvzacnkad0i";
-"fbox.doc-0.05"="1m81a4n1ar5k5rpsjfbmqnwd2mnrhidl4bfgd8jmmlxnsfd59q4q";
-"fcolumn-1.4"="1rja2n465991inzhkadchrs74s7h3v2yy4r8lvj04zsm8adg6mhb";
-"fcolumn.doc-1.4"="0xrp77ac4i50x6ahyir5zk64163cgzhbspsx3hrqyc677dna3npp";
-"fcolumn.source-1.4"="0d22g5v3745wgvi3kczpl97l3lxms8yfl8zzj1jpdjwfwl1v20a1";
+"fbox-0.06"="0nwzysjhg4z2h3sym5yw5gccybb9dwb7jb67fz2b3yl4m06nwphl";
+"fbox.doc-0.06"="18f2w2cr07lnj77lwcqqrj6j1sm9gg1sxmax6rdjysl425dn9ybr";
+"fcolumn-1.4.1"="0bids6ifprfwrrifx8dkmf8piz721x3paha7gqlx8419dnvnp384";
+"fcolumn.doc-1.4.1"="1vkyagcr5f0bwjix3ih469jxq5hkg6g4q9kvkf7g1mvfapfpszya";
+"fcolumn.source-1.4.1"="09y02rbzhzwjghdcxz81lcwxx12421kdf8hb2kjvhbfh0bm36cg9";
 "fetchcls-1.0"="1pccfz68chmnbfi9qnrmdnyq5kvkq6ir5dl09jqbjlcw7hw82ka0";
 "fetchcls.doc-1.0"="0if19dgb2k75qhyka4jiijnl3msk8y8kj0fzhriarsicivwd47ds";
 "fetchcls.source-1.0"="1qb9ymkvbxmxlpcs3drcyk02bc372s0vhw6wwpig2bchb1hwdl44";
 "fewerfloatpages-1.0b"="04903zr0lk50i88vywpbzpg908zkmy0w8vcfks55cmbfb2ja37qd";
 "fewerfloatpages.doc-1.0b"="16hb3xm2aszwlagzq9w3bi2hyanbss3s4f09sypg07dkilifdnv8";
 "fewerfloatpages.source-1.0b"="17rcaydy16vqnlgn76ijhjlv2jcnw962wrsssca8z8y6dfvy0aqs";
-"ffcode-0.3.2"="040ks0hw1zc6j6slpa9p5p5h4b3sw5nmww67aps3qq020bcqc8l9";
-"ffcode.doc-0.3.2"="0wz29dnsi3dy2ph0nnhya9v4yy2jjx43h4wz0li1fwbyrmyd3hy9";
+"ffcode-0.4.1"="1q2kgzc2hr9nl0p7brg95hgga6bzcp4xhi5d5ixwfkjrcx7m4irq";
+"ffcode.doc-0.4.1"="0bwln7642666pi5y4q0cndpvzk5gji9wn5c1schzhc0101fvlq46";
 "minted-2.6"="08n53ynrdrxy0piz3719qgqczvjl1ya4z6d3yxnr7n6qbh2yk26l";
 "minted.doc-2.6"="0acv3fzcm28w9lxzlfi52p49y0nms003sqngdbbc192azrc4cfqs";
 "minted.source-2.6"="1n6jzm7dkpwgawl6wm95s5jl591pbfs50giiplvmjq0gdg27fyjm";
-"tcolorbox-5.0.1"="0v9ca65zxwfvi8pjy1py2w42c6nsvjqjxx61ms2yf6v2035rr26k";
-"tcolorbox.doc-5.0.1"="1jrvjwd03as9aisf9fx99jq655p25nk55nms1afqj1xi2jpypi4v";
+"tcolorbox-5.0.2"="0n6xgsglvx4g41sa57022pxr2q8yyq8b0r0rb8ygmlmlzbnf59az";
+"tcolorbox.doc-5.0.2"="09c86idap5sxf6zni7fd52m165ka705k4vqnbj7dd2xrr5qlbcmz";
 "ffslides-38895"="1mpfpawdhh16rl6pnvxnkj95gf9hjs49gj7cwfyngmqkjc2idi8j";
 "ffslides.doc-38895"="0z5kpim798zxj20p70dpcgmwg4vx9mb0zrmq620sprxxdr2gd059";
 "fgruler-1.3"="0cicjknd9djh0csq1s7fx90a91yx4q25nllsyamsmp8br2c5rsyb";
@@ -5004,9 +5064,9 @@
 "flagderiv-0.10"="1rnnj84vl29061hnbayz5sxp6h1civl9c9w2n3b0s56i9kxv3dd6";
 "flagderiv.doc-0.10"="0djwrp2rjyyd0wk0sg55w2l75fwj3gabd6bim1smpvjwsps0fcd0";
 "flagderiv.source-0.10"="1q0g5127vyhkjb1g0v20kd0x3p0b67a9haich1a6yp71iikl1s8p";
-"flashcards-1.0.1"="0jq9xq3i2rsrajmvlxziwijf75np9y6q6rvg1rxk620q3dzghwp4";
-"flashcards.doc-1.0.1"="1cwy5g4rxydlayaw5b68m2qrj1h5l6nzs3h4cawdgh2hdi6zd7li";
-"flashcards.source-1.0.1"="0vkldfg44kyw02zpbc66496yd8zxx68gfh40k0b592hha7ch4y4s";
+"flashcards-1.0.2"="1xih8g4znfwgd5cim1z63q4syg9jk8nz99q7fgc9mahzq7xym2mf";
+"flashcards.doc-1.0.2"="17as1mkgllva5q92qddwzffl7dsirx22wlnxn12yvv6a0h8hx57l";
+"flashcards.source-1.0.2"="162r74jij0b8yf22xyvrakbrzfh7vjpfl1800ahljas7n8g3h1wi";
 "flashmovie-0.4"="01rmqf1rg5vbxzs9wap7m8d19fw73mh3k7min4msbipvg1vqhgi5";
 "flashmovie.doc-0.4"="1lza6mv55da69v8jwjlcd08v5y2gs2s87z5h1hrsp3p3mx3chya1";
 "flipbook-0.2"="15b2nzhpgj6018769ggajya6qmhq9rnyzha0sic9fff24jwdq62x";
@@ -5040,8 +5100,8 @@
 "fncylab.doc-1.1"="11w7z5q433lnzfm4c72697f82yb7rljk9zq41dl5bdb7l9wd7325";
 "fnpara-25607"="0rn4yk1zd4h2r5xhghv7v0ph0raspq4r6mw812hn80bn8rhjjrlq";
 "fnpara.doc-25607"="1w0pkqqgkq379nnqk0wx419z961l3g81ldkh8ivfhn9q5vk04p0s";
-"fnpct-1.0"="1kwfzz1mfk9700rs3hcq0l2px9qcbqlj3wv66v0bgj176g2mpjkp";
-"fnpct.doc-1.0"="1ilj77lbr7qa9wjf1m045grs7334q17xy03q73rf3si3lcdz8mqf";
+"fnpct-1.1a"="127n7966vy4rdwypbsczi1aksrf6pxl8xdywssviivkk3npmhwvs";
+"fnpct.doc-1.1a"="0qixawqmjn2b1yy0fs140a5wfq0py5bi58gpz8c8564vx29yva5q";
 "fnumprint-1.1a"="1i04c2j1jnw9qkbv92nd4rr0zzvwwdwwk0ya5f4g4rarvw9h4z5q";
 "fnumprint.doc-1.1a"="1cwc4jv9jxxinradairp45rlr97h52vxghfxin6dwszw51ac8p7n";
 "fnumprint.source-1.1a"="15d3jpxs8zgsj40xipg3mfgir41p46c3ppwh4629a1dv4skxg2nj";
@@ -5050,17 +5110,17 @@
 "foilhtml.source-1.2"="0zhva600hf43h01n9ycjcjair84y0wzpn00z6ihyh8s6g199g428";
 "foliono-1.000"="1k91x2yyxp7n1akm8wm4kgynl977gq7z6pf439aaij9r0zzic2pm";
 "foliono.doc-1.000"="0f92kpv6jvvmr9fh24c7iki37y8ph53n3ixi3qjk8bb55yldyz46";
-"fontsetup-1.1"="0v957zqng5bxi5h4a9nvabpvgr00v8n2jdmzzbaib23g3zy6rv38";
-"fontsetup.doc-1.1"="04j5civ4y0vwarqjs3ydwx1h9xj6jydnmcirjzgspvwiii8w6m9z";
+"fontsetup-1.3"="1769ljdy501i261686zwfkqyvpc02dziw0cj0mzgk20k0xnm5lvl";
+"fontsetup.doc-1.3"="08455mxmdql6ysln0a2zqkcqs0qi09krjrldklpcw6plm4y4caz3";
 "fontsize-0.8.5"="0614lcl1cxc7a6irrjinp5x1rx2cbzns0al7d9f3njyyayp13qhq";
 "fontsize.doc-0.8.5"="1c6p4yz000rdcmjkn7pgz3ckw3p42xkz4clk5dz01fnxifmmlf1l";
 "fontsize.source-0.8.5"="0lvywzrc56rfkkwipwhqahkm8a70cnff0r01rpl92d6n6znl278d";
 "fonttable-1.6c"="1vz99pfw4akid9hjf7dcqf1fx5h30sr25i1f9q6a9frk0wpwff72";
 "fonttable.doc-1.6c"="1inb0ai6q8rjsrcwgv8ns6as60ifdidqzqb8x9ygaw3j5ykzr02q";
 "fonttable.source-1.6c"="1qjilvy77072jpbdc4p4qfy5d4n2ww2wcm5drwvai6p2aclqf29x";
-"footmisc-5.5b"="1lnvcwxyq3328m7lrdv8plzzvphwz6206y1y3c025g50k11jvkil";
-"footmisc.doc-5.5b"="01bcysxxzlvmya4npjryflgbn9bqiza3b9hjin5csljfmgpkkypn";
-"footmisc.source-5.5b"="1wh9sq39amiqp79wy23flqv7a415k56ik7hdrgvfxgq8sk6aysml";
+"footmisc-6.0d"="0qw5sp4pad4asjq0n2hp6p6nzyn6mcc9c1w4l33rjsj8x3a72caa";
+"footmisc.doc-6.0d"="0jgyya86vfbh78vnb4ypkf9p1qfm26964dxb1g43cblijzxi9d6f";
+"footmisc.source-6.0d"="1glgl68nfaz867c7paia3c2mgqpy1kslyd4gph2zriq0mbzksp0n";
 "footmisx-20161201"="0f6csxzkwbf4nlw6z9rfyys1f7fc0vpdi2m36g7y3k9l3j6wb3mq";
 "footmisx.doc-20161201"="1962sivh4jipsxd0z0cpzpd0jdw8v4afbpzfinklivnla2c9hp4g";
 "footmisx.source-20161201"="09w5bfx94533q36z3k0a1sf9jx6acz85qgqypgn6b0b5mkhjsmar";
@@ -5116,6 +5176,8 @@
 "fullminipage.source-0.1.1"="16q6f9nss1jx3pw1xq0j82y4gn70hdjaj9m7pq3947m6bkyz92vd";
 "fullwidth-0.1"="1kis1p158phkwxdfhpb4ihfs2w7wywj1lighc44sfkpima9c4nmx";
 "fullwidth.doc-0.1"="056k7w66rh0z1kxf1m91sbjhg8kdy9jvfkwm3jmi5mkclil5ihi9";
+"functional-2022B"="16kvmp8rnfrrj3f5lhplj9xwj8p7z2lamz713zmy1yav9h9x42zx";
+"functional.doc-2022B"="1ys5b0l6vqkaznkbsz9l4x2pigsmnb6477h1zcmg26w4z2b0646a";
 "fundus-calligra-1.2"="1rnrqblg06qkwcy7f460pd1hnh4bwl47zyswa1iv4iknx00rd8a2";
 "fundus-calligra.doc-1.2"="0jvbvalqyj0kyf6cwr6zf18ylckh3fwpshwhmnv7ldg5r1ylia9j";
 "fundus-calligra.source-1.2"="14a0d7d8mlsw7qwpspqc2rmcdyhnfy6l7f57bk9v9jc8pg9fxb6m";
@@ -5240,6 +5302,9 @@
 "grabbox-1.4"="1w9gmzwzy8dmk5rymwhn75rlciszk2wyx9yiiqn3npz872b55sf2";
 "grabbox.doc-1.4"="1h4fzi0199gfzdsx3f4pz76q14lv90sgad8ixfixn4kq6zywg4cs";
 "grabbox.source-1.4"="0sg5ahgxmm6vwa2ng0w8dmgxb4d3x14929i8apkm21bainhaxg4d";
+"grading-scheme-0.1.1"="1cbprwzwz019nscz0j3j0cdxkrmkqs9r220qvfms1vfmjs1j9dg4";
+"grading-scheme.doc-0.1.1"="1fc3i5h4xs40z3ndcipyjl7vz36vbaqd9zcw8nlvw746whf4g2lw";
+"grading-scheme.source-0.1.1"="0kidqf4l7gy9qg1i01ghvb9rqm9ygjk0ii22sff3n1jpbc2vdvh2";
 "graphbox-1.1"="1hvhadbpd988nvrlcppvv3bnm5lzmlnxgwmfp6r4mgsr1q7xgg6j";
 "graphbox.doc-1.1"="1gls7j4753s16q6lgdsaa3yg8fc4vzxh74z7qr2ykz9b8ij0sdr5";
 "graphbox.source-1.1"="0nfmfn7y1qqbm4yifqxfpxn9yw2xb9yj4smv9fmxrs57ism8d9dp";
@@ -5291,9 +5356,9 @@
 "handin.doc-0.1.1"="1k3ar5yzyndnfqkv3bhl7q8aczfbaaghv9mkhzpfri4za5ks6fnn";
 "handout-1.6.0"="1563x16fgw29vzw9bzjrc8maj1r8337p288y7v066qjaq886x3xz";
 "handout.doc-1.6.0"="1y1wpkpjwhq7aya9b98ym4xsv15zavmv8k1i6q0vx302awi2r5yr";
-"handoutwithnotes-1.1"="1f4vd3r6hvaxgpjiik4dq06l3fvbcrqsshjyw1jzsncn1x6rk527";
-"handoutwithnotes.doc-1.1"="0s90n23kqzlzfs2zaka5010qd3wg8374qasiap1j1hr4lipjx1gq";
-"handoutwithnotes.source-1.1"="0ss9zkvybvvfa7dx7m791xz59i58ky3241njbfj3byhy3cqnb670";
+"handoutwithnotes-1.3"="1wxy2a01jvxhw1pna1bfljigabfw9i66m346n0yshhk6rf3zabgd";
+"handoutwithnotes.doc-1.3"="0i1viv2wkn2afvkcm1z7vxz98aj2yyn63cilnhm5kzn7ngdrkxcj";
+"handoutwithnotes.source-1.3"="1jiz406v43khg1p9kpaz96bwd7iscl078315xjfsirlbk33c4y2c";
 "hang-2.1"="097qbqwbib8gj53qlydflff7sqp5ghcg5812hjnav9a0rgklpw8y";
 "hang.doc-2.1"="19falj7rm7diwr24q5rpab3rp39awnyg0hdxfhhalkpdmjwqk2iy";
 "hanging-1.2b"="0s86yaxyfv9zxf4svwg9s13by9vrw38apfg0hsfchsimsdd6gsbb";
@@ -5372,8 +5437,10 @@
 "wrapfig.doc-3.6"="1c3xd0ja4063qzag0v07mxkk52yczlcwdbwn84gsfp5hdmd5cibr";
 "hvindex-0.04"="1wk4q29iyqrk83kafwhah5gvvj2ywpnqzvnza6cwrkb85fd1q2i8";
 "hvindex.doc-0.04"="0vcdmn3xc4cm3rkdkzi0qvqakgkc3hrgy8nycr5c8vcb6xaiw0gr";
-"hvlogos-0.02"="1drh7fv0ln4dq4hchwk57wk2zzp20g1ny6zafl8bjbicg8rrkpbr";
-"hvlogos.doc-0.02"="0ba86l3q28n0m7p9llcg5c4fy8z5527ixff5646688f8c2vr8vv9";
+"hvlogos-0.07"="0rnqg4z9ghj8br3r9pjbjwswnqi8c1wan6d5aiyw8si7cncb9j01";
+"hvlogos.doc-0.07"="0n7a4fw9pfnli3z2dk28s67f0gy4z2rfjb5yqc3kbbsvp2dhhqad";
+"hvpygmentex-0.01"="1rnra0v65wmz8yqwfa6zqqswx0m7j54z6wpzvbrp2d5gx8azsdv8";
+"hvpygmentex.doc-0.01"="16r1sqsaw8ij5jxf0ygm2kgdhxpzsq5g61jhj9rq0zhpjma7fhdx";
 "hvqrurl-0.02"="11qriiimmh8wmcjdjh98bi1sghpavl3lnbq13m4d6rgc46q0n3k4";
 "hvqrurl.doc-0.02"="0zamvdxp0i25165k0i4v6172plfhzs4a5ydgcbz3662qliggsn51";
 "hypdestopt-2.7"="1753c7vjx3smnhl1iylg4x0sdcqfg6gb0wdbwqmlass4qdn494w1";
@@ -5404,8 +5471,8 @@
 "idxlayout-0.4d"="1y1vzyb1l5b8q3qqs62zfiw7vfd9c1pdha9z4nm5xpsar1nk69qx";
 "idxlayout.doc-0.4d"="11qiyzcj4zi8kd9h2k2jhg8i8rzfwdam9rhr7cmvbxqsqirf0fp2";
 "idxlayout.source-0.4d"="0fkpj4gn06wkq3saprsb3gm7myj04yll4spz3j7yi28yniv4cr5c";
-"iexec-0.4.0"="09bpsp5aa8bln2ry42b09xsf76yfy67p4bg71sjk9q1llgdh9ba9";
-"iexec.doc-0.4.0"="1h8sgk16n7x28bavfnqpdiyya5cb4zrs00b7bykb1xkh3dj248cj";
+"iexec-0.5.1"="0r039rwaw7rx7qn2ldbqdqnzqjdj4x8h40p52ahxzqq2y34rmv0x";
+"iexec.doc-0.5.1"="1kz7ys37m6mxmvkcfhymmlqn0wvjbb7k07wykyrilr22rk86ymsi";
 "ifallfalse-2.0.0"="0pn37mzlkpswyykciwgfkw981098gccqmp7wllffr39qxhcj6gdl";
 "ifallfalse.doc-2.0.0"="1583p9f3lv7kkjygqv368ag70jq2b184j47v32aqpgnwlmyn55jr";
 "ifallfalse.source-2.0.0"="11636chvmy2icfq6f7mvdq0fpcn36yl15g9ffpp0flqdq7c8nd14";
@@ -5492,6 +5559,9 @@
 "iwhdp.doc-0.50"="110x1wm1ii7b5r23zng2dx4ly8vqqwr137gfl15a6v6hcr4zxvqg";
 "jlabels-24858"="03fpym9q84g1b0pns6sdsb4jx78aq7sclr5fkm05ckvkk4v3wmsj";
 "jlabels.doc-24858"="09qa8y6axg9pvma507b9w63dwd2jrxnmd64f5rfd7wpznamhbc0w";
+"jmsdelim-0.2.0"="1087jag55rnf02r9s5v7brfqhqncibq1xr0xjq680lvb62f65ln1";
+"jmsdelim.doc-0.2.0"="12k6m7i81d6sblgqijpizssnpkghq5snf6bq44lkxv1l39flzjrr";
+"jmsdelim.source-0.2.0"="06kp4zsdzi2m26h9m99x6kqc0lfic96cidzb63mvmdfqcf2plba9";
 "jslectureplanner-1.12"="1kciz53cg9p1f710j5rw8pilfmbiz755a24dqxckam98jy5g4b8s";
 "jslectureplanner.doc-1.12"="0lcq9dygfjrs63yjwdkjkssxyfx6phmbydh6c8lcfpkg984pfg5c";
 "jumplines-0.2"="1d5w5nh0pkmhjjjq9x2n4r72ygjh2mrbdr23vsrh8cyvj3xym4w1";
@@ -5511,9 +5581,9 @@
 "keycommand-3.1415"="062i4fr9h2sc1zy3ybyqrq5hw4g3g54gx708rrznkl4zmpf93ppr";
 "keycommand.doc-3.1415"="0ls9fbm0815aar19hg40p91n1iyyfhn68ndhvapmwfsxhi6f2d9j";
 "keycommand.source-3.1415"="11blfbqdn1a00bfdv3nwd7501pd5qrkk7pqn2ffir1461xivz26f";
-"keyfloat-2.06"="0bx2kbvsbcqy9ipivwfzihbcrr9r7akn0q77214crf2109ly1jkq";
-"keyfloat.doc-2.06"="1gzswik0gdh8l1qifvygca6h1sn790xhp6yw9jvixp9pcn94xiz0";
-"keyfloat.source-2.06"="17h3bj2lsfzscsh6jk8mnmj0rwjmp8dd0whpj45cwrd882s02izw";
+"keyfloat-2.07"="045yciyqnwz32rkpvgp2qnqq7s3sgzlbghb9a20npnb7k9jcnwxk";
+"keyfloat.doc-2.07"="1xpxkigsmzsapzh4rnvhcbdi8a7nfrzwsv89275371dfv8pxb6ck";
+"keyfloat.source-2.07"="08igyhw71x263pdri8qdcqd874576f2gply02886rmzqh26wsn0n";
 "keyindex-1.0"="0fsszjcw1r3kws565pgc5j7chifbkf3dh1hnlclwwsjpxbji4n6c";
 "keyindex.doc-1.0"="02n7lxz8pd49q9nf6pavhs01410zj9pbszqqbmk5c1ld077276x7";
 "keyindex.source-1.0"="0k3img6kb6v853wzmhsrrhx7lrh275ssx57b83vk3yx9m831qwmb";
@@ -5531,9 +5601,9 @@
 "keyvaltable.source-2.2"="1j14vyp20r7wnylpmik8zfg5zcbva4rzxckazk21xjapgpy9w951";
 "kix-21606"="0w5qaq50wki5b3s3j7p11akx7mb8z1khchhy6093pzzrny0hd5c0";
 "kix.doc-21606"="1jblprmz9vfriqdmi9ihh3ihi7pc9wf9cp8qfli89iir2xy7lv3d";
-"knowledge-1.26"="029afj9yrx6ikpvbsxv2qwirs3bdvp0vn1g9m2sy422a3nwxrfi3";
-"knowledge.doc-1.26"="0g051384p5szn7r2f0v0d48baxdi635jdkwvgi5d16f6c27xss1i";
-"knowledge.source-1.26"="1y9fskd06v0a9cnrk4f9yr86099m9kz5dnbj2lj8cxs2vpxn25qh";
+"knowledge-1.28"="0459xp20v02awl3h9ada0j9p0nasaz4fwv4whc6p4hwzzw86052j";
+"knowledge.doc-1.28"="190gy5kj2fypvqa7b2s3p0j25drx6rd665yqq9s2gjsqzar18ql3";
+"knowledge.source-1.28"="16xspjjic7vydd310ldxjjipzwl53dw726693q7kckbfv0vmpd7m";
 "koma-moderncvclassic-0.5"="0kgsbg4is158j1ssjwabicw38mh2cd4n1ggxinflb8i18xsmlgh0";
 "koma-moderncvclassic.doc-0.5"="0f070dxww75g36il70gmrx9bn0f0d3mmh26fmzqb5zmf93hyhcsf";
 "koma-script-sfs-1.0"="14qhq2h6pfjy878nkglbif7yjc12g6q32kl4xfc7kk3kf9syp0kf";
@@ -5547,9 +5617,9 @@
 "ktv-texdata-05.34"="1md2iv0csmr5f2mcdlb3lacccwifd6iv7yp6123gra5xcp06k4y0";
 "ktv-texdata.doc-05.34"="14sk7x2va8ja65a65fpksj2nd16v6rc1f0828gmm8j81d13cci6y";
 "ktv-texdata.source-05.34"="1ws256l59plnhmw1rycfznwpndni5i47liqhazddwbg2hragfahh";
-"l3build-61312"="066dnb23bkjyz6sx6gz1lr2mhkkbrnw3ygpry8pnszi1ci8bswnm";
-"l3build.doc-61312"="1gzivrxmx5w97j0idyiiglfxi15nz1sn9y3xxfj1n1qll0rm4ip0";
-"l3build.source-61312"="04is8k9l4qji0llfanadqpvf7m6sinilxrxxwknxm9g9q4gg96lf";
+"l3build-62726"="1hs9vba75bf63i5gv2dadaj7zb3770dgnwf12jxxb4kc0f9v2hl6";
+"l3build.doc-62726"="1ih7ywnnmi6dnh04lnzz1nlk9wljiawzlbfwc8x7bcm256fxiw13";
+"l3build.source-62726"="0dck5shywmw3shgmwqshvy6q1prvbi9ybdfl44xif5a7lvfz7p26";
 "labbook-15878"="1qh16jjmpyqdfndfs91nmbfhwxif5ygk35zlsailngpgnp1r2x7s";
 "labbook.doc-15878"="0za4mp2zq9s1z90sgqcvf6zac7w0wqbf8y5w1qrwmlv6r6kg3s1s";
 "labbook.source-15878"="0w7nff8c2ffrn2ywz1dahd8n4cb959b6zf3ka0s913nv04ifdkgi";
@@ -5567,16 +5637,19 @@
 "lastpackage-0.1"="0wjpjd3b48fj4mqqdx38sqalbaa9ab3c6rywyjqhvrd1pxfap2g0";
 "lastpackage.doc-0.1"="1123lz0ki4kww93952wqrhrw9l2cnk4wrrwyi0dxc5w1yfn2gg87";
 "lastpackage.source-0.1"="176fk84mbb6w5ql94381kz05lh8q8im7ri6rfjff7f4ymfjnh2jk";
-"latex-amsmath-dev-2022-06-01_pre-release_0"="0w6kdwlgagpv4qlp5hwv4lll1z0x3k585cayvprldp2vckyb3qbs";
-"latex-amsmath-dev.doc-2022-06-01_pre-release_0"="0k8lk5r05m2mcnfv2003a7lrwwpiywgzi1yxvh3p5sq6vb6xrvak";
-"latex-amsmath-dev.source-2022-06-01_pre-release_0"="1axv6zjs3wy2z1gbm5aavgvx1m82yj9zbbwfwz3ipxgahc0462xr";
-"latex-bin-dev.doc-59005"="0kig2hc245vnmhfnpqvxiskbaaqf0fv8j569ihsfr1fv3x94bdzq";
-"latex-graphics-dev-pre-release_0"="17cs57j08nmqwhy85wql9ihqdblpf1zqn5fcwv3p0cypmh52fgk4";
-"latex-graphics-dev.doc-pre-release_0"="1kvvilzxkhl70lkyk7g1lbg86cn0n7r7m27pxv0dacdyr8wk13xf";
-"latex-graphics-dev.source-pre-release_0"="1fbxxxg0jj934qpc2ifq15iyks7xkgj2f114kgxiyhga7744z70z";
-"latex-tools-dev-2022-06-01_pre-release_0"="0pzazdxwh5j1a671nw27vxrd9d8hdwqk0r0pyi6q6l916p2wirf6";
-"latex-tools-dev.doc-2022-06-01_pre-release_0"="15bvafw8z4wfbqi6q3x5xrl43zz60bww7bvswcqjsyc4gz5qgidb";
-"latex-tools-dev.source-2022-06-01_pre-release_0"="07n5l7y76blj3m7897z02mr1s4zxpmcw6ml7xccrh1wkyki82jy2";
+"latex-amsmath-dev-2022-06-01_pre-release_2"="1wghg5677r5h9k8xni2say0xa5cqzny51nykd74vijwasyy7ywwx";
+"latex-amsmath-dev.doc-2022-06-01_pre-release_2"="1hrwhpsmhh0m3wn37hhfy7s4h8ppcf91q8f883ipi7k5pnmk50zi";
+"latex-amsmath-dev.source-2022-06-01_pre-release_2"="0pwyhrln5bfc34rcmpak2fi1xhb47gsm40izpknnfg2wm1cp2f1l";
+"latex-bin-dev.doc-62145"="0kig2hc245vnmhfnpqvxiskbaaqf0fv8j569ihsfr1fv3x94bdzq";
+"latex-graphics-dev-2022-06-01_pre-release_2"="1kgczx7r83485hscbxyr6xfivjq8vcnvg27c3gia7lzrgjsf3hpc";
+"latex-graphics-dev.doc-2022-06-01_pre-release_2"="0nnfgv4jzs2l71ww1mgvc8442aqy9x8jwkmzpsd08ga2yzvp86k9";
+"latex-graphics-dev.source-2022-06-01_pre-release_2"="1lwyvswdayvg7zcn5hbhj486l9w6kf3aif4n0q20hvrfj56jckf3";
+"latex-lab-dev-2022-06-01_pre-release_2"="1mv6yd7dkdyi979whf748cgfph73462w8jqknfbxjq4vkjavzh0c";
+"latex-lab-dev.doc-2022-06-01_pre-release_2"="1czr8p2h86jvj4ph3wa4shbhkd1a61sc9fwawqgmpgcmnbmn1x6r";
+"latex-lab-dev.source-2022-06-01_pre-release_2"="08kzfrgwj0yz71nrrcp7n5vxpgf3v78w09k70g7gsmxijq69q1zk";
+"latex-tools-dev-2022-06-01_pre-release_3"="0xpwzifnvxzixmz0hbkiz5723y3hzf1l8sh3x93j69rlg9856xyb";
+"latex-tools-dev.doc-2022-06-01_pre-release_3"="1xj5qcls5h9dfd79d2ivzqrdnsmav7xgawlmjl4jmgkkssgh6m9x";
+"latex-tools-dev.source-2022-06-01_pre-release_3"="0w435a6bfrgfpn5dmxlvaqmwdjivi1v4435pfa3c5kknnyxp1ac1";
 "latex-uni8-0.03"="1sv4n2v0m3lck7x320cwbay23k7r9fh4wm1vxg9m4grphc72n2b0";
 "latex-uni8.doc-0.03"="1y3p08mni1ng6dyp0g98in7hh3mbzqq42249idy90vjhc177rjc1";
 "latexcolors-0.1a"="1wpa7vw8vphdghdv1ap5ilcgzj5n6vyvn4a6lfvswg2d47s5y1a9";
@@ -5608,12 +5681,12 @@
 "leaflet-2.1a"="04fvi31wwpsnkpsni3r6f9m3vr8b6h71f2znb79aban9g1qvnyh6";
 "leaflet.doc-2.1a"="0f82hm37i7w547jpmxkl8a2k4f92bw29vdzq4ywwllk2hdcq3sv6";
 "leaflet.source-2.1a"="0igkl1rjl14raf3xv631c7sn0mc1smyc44mldwgzgnzxxkv5kzzf";
-"lebhart-61338"="1nqqm3cz4xq4ny9fl0j4v5n009hwx5rqfifw7ickq1pllg3yc6g6";
-"lebhart.doc-61338"="1zrx57z4l2a4qj4s5xakpybyifl3s41yjj5csbrvcwy1mn9d4h1s";
+"lebhart-62834"="1q6lwv879f3a9k4lfpv0jlx5q1bzpnk6z3c23q4a56zarg8vv9h1";
+"lebhart.doc-62834"="07lbr9l8al5wxrzw9lmh8qclfwm8hjg00kpvbbsn6z6wrcwxib0x";
 "lectures-1.0.5"="0qdhkf7z1rnxm2ql0ywfk11y3aqp8yr1p9202d4ha6729n5pyima";
 "lectures.doc-1.0.5"="1xakcm4mmhl4ahnvcpn7k748v4j2m8p6d4p455claqhf7xg4jz15";
-"lectureslides-0.1"="17a0zn4hnkr8mp6rhmm5snjq85i023r6fjpmhpzbkw37l40lfjf6";
-"lectureslides.doc-0.1"="1rwcpga5xk5kns62mcrkrcnsmb13klvykzvclnm7w76hnybd0f4l";
+"lectureslides-1.0"="1x61bpgp5ddgld0v05qb5sg2lwb7lzqn6r65imshvcjz1xbwpvdb";
+"lectureslides.doc-1.0"="1awy6zgj393q0lm195hh8ky51fczm5s19d46fc7mivxyh03w3wk6";
 "leftidx-15878"="05fi4rp3s0s9ank7pphdwxnlnanc2r88dxhyxbz64fb26sja25gy";
 "leftidx.doc-15878"="047a5clwf0r43r1j87k2zfv0pa3nrii213y0zhv5r3zkmwvm1qky";
 "leftidx.source-15878"="0a8rzkycppx8qayqw3s7ndzz2xp4zqgx3qd8dp9s5ynlm10020nv";
@@ -5760,9 +5833,9 @@
 "makelabels.source-1.0"="16dcm1mrjxdxby7szqf4h534w9g7z5klx15jyx9s568c4arnvfyj";
 "makerobust-2.0"="0nm751w11p7cqg8ihckn338i6908kcn513644c6a1qc9rg847hlp";
 "makerobust.doc-2.0"="0bidk4f0q6486vgwqvifzchkn0xi1l9j65yqwgcdnl3yg6vamqzw";
-"mandi-3.0.0"="1czmifms6nadklizl6w1i3sa5y3kkxc5a1qk0mrqya2xzlwqhgkn";
-"mandi.doc-3.0.0"="1xg1l3mclw1pywqazz350pcb4gn3lcpwqsv883ff6c92kmfcc6b8";
-"mandi.source-3.0.0"="0pyxbva5z175ccr4wz3lpq9zffnif55v4926rwh76vsyic4d0c10";
+"mandi-3.1.0"="03xi7a33b2gmbgqikr40ncvnamacs3f72i55kfznfgxnk1v77ljc";
+"mandi.doc-3.1.0"="0k66660qc7ig2a8cicgcvvrjyiybw1idfb456i6jrsxs4c5vijfp";
+"mandi.source-3.1.0"="1a559lvi5lyss1vj2zcq2ajjhc1m3i1x867klzr7xgmcyq6iifky";
 "manfnt-54684"="1fzfcvifh013xs6dm6xq2gpvmf3v0qn8scrbjj3yak2ba98bcy18";
 "manfnt.doc-54684"="15rs74sfnyq2k27bs3dvjiachwamima3q4vp0dp0ic95as2n61gp";
 "manfnt.source-54684"="1v3j47xa7k66dadz8dyy9gm3k4s6465zgqpzb320isjpb77p7r48";
@@ -5780,9 +5853,9 @@
 "marginnote-1.4b"="1vyv2n265y8j8r9ch7h9qjhwlmlzmqx62gc4zzm4zxrk0mvigpa4";
 "marginnote.doc-1.4b"="1cl1xrb8d7dpr4mwa56664wdkabzx8zr8cn6kxcn9bgl543ka3bc";
 "marginnote.source-1.4b"="152bwxhnssj40rr72r6cfirvqbnc0h7xnagfrbz58v2xck53qhg1";
-"markdown-2.11.0-0-g4505824"="18a0pdhaqxz31p21lcqzn987hj16wjmv7jq5zgpjrha6v9pq31gw";
-"markdown.doc-2.11.0-0-g4505824"="1806sgfvx3qqvlxillxixb5jwydmnlsdazj9kmrw62s3izw7rs5l";
-"markdown.source-2.11.0-0-g4505824"="1fs4kbq37kz1zxafkfa1vy2p782c73iz9qab13aqb5gfif13rsmw";
+"markdown-2.14.1-0-gb933d81"="1crvwkf7jw0mqra9saaiz7qsy53h4zfgfplaacz6bvmwv40c2zpm";
+"markdown.doc-2.14.1-0-gb933d81"="0lb9db3m3mjih1ng47ycqlhaagpa30p9szjm9bi5nqpvwm0n40gy";
+"markdown.source-2.14.1-0-gb933d81"="1kw8j8sk3ql75mpky2rv2bpr1jjl2w3qy43ws3fav62mfypq9d2m";
 "mathalpha-1.143"="12fsn6wsgixbpnay1szkmv16a2wfsl60nkcbyjksy1j06gr0yf5p";
 "mathalpha.doc-1.143"="0ryvikvngpgnqbcf5mp4g99cg0r72x53p7q6h333vd3s2qjah7x2";
 "mathastext-1.3w"="078rlq72ivyavgmghk3nswracjhp3args4z2lv61z22x4q9qhvbi";
@@ -5793,9 +5866,9 @@
 "mathexam.source-1.00"="1p0lalc0ny1zb8gc4bbg7z9pm6airbg63l1k0qqmwg10wvxpsjn9";
 "mathfam256-0.5"="0s97k46ysqvgs6a8aq5q8iwab390s90drd3g0ixd8zmv9a4hy1z2";
 "mathfam256.doc-0.5"="1zk42fsknkbzyx4m7xn3yjw9lrdvf6m7crnqsp1q7qb2nv3hn1br";
-"mathfont-1.6"="1cchrbpzjkvdfvn5qnzy9q9x39x9fvggf2hil6msqrri8wahspk2";
-"mathfont.doc-1.6"="1lrb88kx05ckyn9pf9w0d4snjydggfsg9qy3cm95288xxhn8z26f";
-"mathfont.source-1.6"="0vk88801illr345nvxi6adw27m1dj9v1l5s0j137gbyqb53cqdyg";
+"mathfont-2.0"="0j5rmh2z04c819zdmpdjc16iwh7v1ss7yha1yr3q3asbnafwd6dr";
+"mathfont.doc-2.0"="0q5v33022r6zglmmvq5z5zkylf644mw6isw95780h7by2skincs6";
+"mathfont.source-2.0"="0qzhi4q3zw0xfd9n0bvyqyl1y88yy8013dfqpziwdbfcx2nm674g";
 "maybemath-15878"="0qb9nr6m819axi9qn8i32fynlmkjvyvc45gyp6pckwj54kxzx06q";
 "maybemath.doc-15878"="078s9v2bly2q802wdidzpvwaqfdkz00wkgyhn6867bkbq89g4aa8";
 "mcaption-3.0"="0bfcl1swwgz83y4f80a1kydmxhdyqxld0d5cjfgxfhnn9dxp3wc9";
@@ -5815,9 +5888,9 @@
 "mdframed.source-1.9b"="0p96sl69p5342yy9fgw5cnkfi2xabdwb74mw7i1gbxvj0vx1f2q6";
 "media4svg-0.6"="14wn0cmh9d9yzqyqspl14f0rhsmz6jn68zq91yi54xyvglj1fwgs";
 "media4svg.doc-0.6"="16h80237dyb44635g1ydfbk0mgs4g7aa73g79kzj2ns550xa4i46";
-"media9-1.23"="04vhifj0akdis9d1p5i6x14r4w17b94kjkz8iwyksjvf9kjdkc9r";
-"media9.doc-1.23"="1wmjsr8nc3pss93g3bvjgicldi720f9cdq8ij17bq1v5z9m97pw3";
-"media9.source-1.23"="0lby8w91av5svhknx82r1yaynpqvz1y6bzjy08p87x8ba9h7q730";
+"media9-1.24"="1r36azdlk7amp6rfwnpyr2smsyf9b8cyi27chdhs7ra6dypk8b2b";
+"media9.doc-1.24"="1x5n9qpk388bhihv782lna9az3zd3g082fjghih281wvhgx2f8yf";
+"media9.source-1.24"="0lby8w91av5svhknx82r1yaynpqvz1y6bzjy08p87x8ba9h7q730";
 "medstarbeamer-38828"="1cndcpdvkdvjx07rfan5dd7yg6sv532b6vvd97cm7ag2g1aqcilq";
 "medstarbeamer.doc-38828"="0i995yaqv91h4iv3h7r5m73vb7xvpjkzrh6nddcjjcsv2gvpjcxi";
 "meetingmins-1.6"="0za2aqj7gbmxxdm3hqkq2sqkhl3c1q8a3s778hw164dfpi8jx85r";
@@ -5864,9 +5937,9 @@
 "mi-solns.source-0.6"="12xrddxlrngjnk0yk35spk886yd9p3nnz6jrp51dfzw1xz6pkivr";
 "midpage-1.1a"="0hh4r2sgdgzm0nryzqymd66a7hr74rvcsn58y7dc7di6mhikrysn";
 "midpage.doc-1.1a"="0jfw5wd6qbxhf90mpi8fmv0nbazkbg9h65z91613j1ynqqf0087y";
-"mindflow-61338"="11gznzlf408xx1m5x1myz002c1jijgkn50g0wv7kbfbdal95wpg6";
-"mindflow.doc-61338"="1pll2jqrv7rzmm84nr4phzb8f44gi0418x0i609p8v4c7brkpr13";
-"mindflow.source-61338"="0f0j9w6msfyfdb4qgxbwhljngr0flskr11ms82l1lr9bfsq6hplm";
+"mindflow-61843"="0q7i2bki1sh4jngy6a3888hnzyqwkl7vkwljl7m8dmad1rg6ghkv";
+"mindflow.doc-61843"="01czwpi02jnlfaxl18k66bsvl4hvh17abjd9v38pn19zccl3x7p1";
+"mindflow.source-61843"="12pln12fjckn2hdyfwc9k5nc3xnxpgbqi150ngcx825ss6qps052";
 "minibox-0.2a"="0r94l5sy4n97p895xk33ir3dli1ngy3p67w2d3i7f6hi6czvykm2";
 "minibox.doc-0.2a"="0bzd55wkdxw8spw4706nj0sk478zbnvq9cnkpid638cwb6csb21c";
 "minibox.source-0.2a"="1dm8p6rjivm0xxa7px5dvsnrqs48zwn2kiq3vr6gdqmiy0ld1v93";
@@ -5899,8 +5972,8 @@
 "mnotes-0.8"="1vzc4p8vki02himcvqja44lv3rhf9wh9gxi6aw39g7qbf3j9k28c";
 "mnotes.doc-0.8"="0wwf1651zb4jigmg2l64wh9j0y68fppfzn4gaq8apn5b47b68vl9";
 "mnotes.source-0.8"="1ihlcxhzms48lmqy169qx2d7cavwwf4k96q93cd4dxrxdph0ccz4";
-"moderncv-2.3.0"="10ymqzzj76g96v2jn7ydl89kix5f9xi8zzm96z5kwq38l7gahil1";
-"moderncv.doc-2.3.0"="034vhjgxclrpmjysndklfr1mz205x33b9073wqzmgq0maxvcbrkm";
+"moderncv-2.3.1"="1icns5fym56yp1wymsf50cl1wh1vc9vdix7lxapp18prx3y3kf0s";
+"moderncv.doc-2.3.1"="1sj75g51dx8yd13ywyyhs8r135pgg5jv1h0zshxsdpj7b7hbdxf1";
 "modernposter-1.03.1"="1qc422hbqiyy6b539r7kyrshcja58mifdvs3bva1ikdxanxhnaq1";
 "modernposter.doc-1.03.1"="1z9b3fanm97c3ik1q6v06qfwrgqcqwyi79h5dlhcnpwsm5dxqj0s";
 "moderntimeline-0.11"="10alhs944akmqfslqzi09436mmnjz8nm85r8jpjwpfcx28vfdwnh";
@@ -6049,8 +6122,8 @@
 "nidanfloat-48295"="15l4rdj7bk1279xjjkgh9a7scfmm6w88civ48shh7gwx8gsvcscb";
 "nidanfloat.doc-48295"="06ccf5yhrqvshj3d8ic3pbnvmdpjxq54i57y3141wgqcj5h062dp";
 "nidanfloat.source-48295"="04q480lddynb2gqz8azmyik8170vl056fhfjsnq8ydqj0rchnnqi";
-"ninecolors-2021C"="0xjcb1frmysn1j1ba5ipnxy2hgqfbryb55yd6ksmhgc4idbfxvgz";
-"ninecolors.doc-2021C"="0ajhssfz47zd89s9jdplyikwh805bjsycga3bdgmqv52wq4ydwsg";
+"ninecolors-2022D"="0qvjykxzl9154wbiybwpv4j9da5vyvw2r14hkg9cvyqqd0fn7g3p";
+"ninecolors.doc-2022D"="14dmp0cm8hbjrd14szkcvkrff3l7shk4k9zlzx6hzkpmjc9qkl0w";
 "nlctdoc-1.07"="0jgnmp6pfjz2jmlvrvnbqsmxk0bj276044hzdgkxl635ilzkzds6";
 "nlctdoc.doc-1.07"="07yl0i42zzb7xw0wbdwzpm7ibz6imds379ag1s77zii5zvlir1x8";
 "noconflict-1.0"="1flkwyz36xycq4aidj9v6ga29ghbww8ss5dkz4lzsr96nv38q78r";
@@ -6363,9 +6436,9 @@
 "prettyref-3.0"="0akbp6wsxn4swk0kwxw27x3lpf5anwk49bb8pvssaj4xy68hyq1h";
 "prettyref.doc-3.0"="1wmvvsz7y0idwfki553qkfhg8j7k5h79nlhmaz6ln448x8gym8y8";
 "prettyref.source-3.0"="1w9qckaw403a8nyqyx8qyqdn3zfkxzgfzj1hdw5vwi2805bbfy1f";
-"preview-12.3"="1jfhsdygkfnsf454rgsvgdh15vi4qa9yhlm7h2chkaid8rq5ig69";
-"preview.doc-12.3"="11xcl7k24ymm12g3s8g3qkwldn6w60km0rvq5xc3draim95qs254";
-"preview.source-12.3"="1hvvv7qbmq47kx94jxyrkwqi8lv95z7khk6hb808kwyjkrq5jzg2";
+"preview-13.1"="02397l99gs9mmx8arh12xyvzr6zlj0bfz8hp5g45ki47a4xqi329";
+"preview.doc-13.1"="0isix7b9qn6lhashmzr4dns0iyv0nq8x20y6y0hgz6zzdqg4a72l";
+"preview.source-13.1"="012ihy1wbcl6pbw6la13qbiz9kaqhw124cz7c2glxyvy37jmhn8a";
 "printlen-1.1a"="1h6q95dvpldmrfbpdv9v19p34iwq3jzz7vs0z7b6fnijyybjxnpm";
 "printlen.doc-1.1a"="08p9zwkgjpkh7ip3i54qjdazgnwq79v15hvz4j4y2dvh294nmrgn";
 "probsoln-3.05"="15zsh16v5rs0baqvy9jwn59d95qj6glvc5h054ldb8sy5nwkl3sk";
@@ -6377,9 +6450,9 @@
 "progress.doc-1.10"="0r303dr6yf1r5kk38c1njjra7vgvp9qrblxj7zd8fw1vlq2sc7fg";
 "progressbar-1.0b-4"="1d0d6dy9ssiij19s259d2ns2k5v2ccc45anhz1qm7iqli12ij0m3";
 "progressbar.doc-1.0b-4"="0bxsgvql8hqv4qw1pv18vdxcshphdpbb29mqp3pbbsd4crp4qb5z";
-"projlib-61338"="10qshi1jmaxnm9my1bd41kynqm81j0kdqp0r1y9614ii5wnplavz";
-"projlib.doc-61338"="07c7qjbmnizyc6w176bqgwmssz86nvnycm2ydv6alx3mdcgym6i4";
-"projlib.source-61338"="0bbv0axsiap2bn4ppyarpq2m9ny7g110mjqjmg3f7v082hdaz33k";
+"projlib-62869"="14yinnyw7y0d0yvrhb211bxqkx8qwwv4y1iwkjs7l0nv2s74qic7";
+"projlib.doc-62869"="1qknc4gd7h50qkxfh8j0vs1aizdaxs5iqfbzlbk94nwkyf1d9kfg";
+"projlib.source-62869"="1082bhw4sb5xr1829rs7m4ambbkvxcxz3l4hbzlc7kwn686j8wyy";
 "proofread-1.04"="0gnn7zkzrszglcqcwz8c4i13apildg7s93rkp1z3h5m2gr9w9v42";
 "proofread.doc-1.04"="05g3k77vczdqk19gigs9b6w8rccvcr0d382ysqn0yg6cgd70bi43";
 "proofread.source-1.04"="1mggrm4cfji364ylra3ffdhwbx6phcxwfzw2mwls00msk7jdzpsg";
@@ -6564,9 +6637,9 @@
 "schedule-1.20"="1p36glmixr7qadjj91j9rlzph03rp8hfrrfdqcg1ayyzkinr9a6i";
 "schedule.doc-1.20"="198yxgq4255q9bqjj141d5rvzjxq4rw1363gcwy40yagqs4xhxs1";
 "schedule.source-1.20"="1gc4zpw7ylnnv9k9kbqjf8r83srxbiqmqyy10xnp8gx7xrnbmnyx";
-"schooldocs-1.0"="0j8s5mcwgc0xgbp5n0nhgf4v8jdzqdi0iamz8nbny2makz2z1gab";
-"schooldocs.doc-1.0"="1rmjx23s5r4xz3szpq4jhapg18cjmpzmad8whgyzw7hxcxd0cl8s";
-"schooldocs.source-1.0"="0qkb9912i062g7a1gr22d1dhzy05sr2g513sa07h02y1kblcf3sh";
+"schooldocs-1.1"="0j8s5mcwgc0xgbp5n0nhgf4v8jdzqdi0iamz8nbny2makz2z1gab";
+"schooldocs.doc-1.1"="1rmjx23s5r4xz3szpq4jhapg18cjmpzmad8whgyzw7hxcxd0cl8s";
+"schooldocs.source-1.1"="0qkb9912i062g7a1gr22d1dhzy05sr2g513sa07h02y1kblcf3sh";
 "scontents-1.9"="0jjc5q254c4qqvhv23r6f92dqh8fgza9kas6vpc7j9kiklkjilmd";
 "scontents.doc-1.9"="1l1206yvlyf59hcjf8y3gsanwxims96jp4k52g3wbr0pqgq3dfh6";
 "scontents.source-1.9"="04wzz12zh694ds8p7x2rmymg352ahkf5hcx1xacz3craf3p0sjcc";
@@ -6585,9 +6658,9 @@
 "sdrt.doc-1.0"="0y1gxcyms3wprp47y2mlfcc68gijyvyc6h10ivif1yydmxq1b2ki";
 "secdot-1.0"="0pnimi0vfgp5zsp0iwak0r0j562w59cl1fn3pnp1gwjz65q2229i";
 "secdot.doc-1.0"="1v8j3l2bh055b18zxl3287ardn0ns5qjgbqkj08qxz5ls912y2br";
-"secnum-60365"="0y3fw544612i3llpz36lgy8g6lyyzr3fhs7r3mg7mlfipvhm2yxh";
-"secnum.doc-60365"="1cnaf4x2kk60jnqrr1irzk1fb01fppxcqsji0lvbfj0sq1n7a62j";
-"secnum.source-60365"="0vm8gz9f6v2l5g1i9vh4ap6y4h9hvnz83gscxnajj599bkqkaiif";
+"secnum-61813"="1zpxz6j5is9f2iaj53bqq2m73040lmzn60h9rwp9kzvlafciss7x";
+"secnum.doc-61813"="0dabcwh85mvq73sqyi9zkbslzbhhns1sqrmvddvy1yjww0lf2q3k";
+"secnum.source-61813"="1f8dfi9vrlh71bfb1mi2ll0gqcd6jbv5k96jpmvrpqy0pv1i2ckx";
 "sectionbox-1.01"="178z63iys35al6g5lavqgdd1lcadha9rp25bzm41gyg84f2hpljk";
 "sectionbox.doc-1.01"="0mk0ijbrvmvky4awh03y2q14ks4x9hr2pa84ia0380xfx56849kp";
 "sectionbreak-0.1d"="097mwp2iqg6rk1xxlppqnks0j1k45b0hlrg84x12y0cgrkd7cdbn";
@@ -6677,6 +6750,9 @@
 "silence-1.5b"="1zixww8d87jymdvxjzjhvhjjr5f8fxhbjwqyzivki2rhw6dpsp2v";
 "silence.doc-1.5b"="01qb2z62da0ji751i3wbhq10rfin23q20r7wr0fzvqv163niy93v";
 "silence.source-1.5b"="1m5xiy5j8l0xy9731mf0jvk4f6bh7d22vbsgpjpvy5r0vxafgxwv";
+"sillypage-1.4"="1mqmv57jhiddwwpidhi371jg8jk6aqsc029ch0ddl71g4y566hmw";
+"sillypage.doc-1.4"="0dplfcm2yzl8kq4j01d75qw8glr37bj14024wxmg7mhalka1ivyx";
+"sillypage.source-1.4"="1rgj67r5k1yxanhdzhgp4pw3pavwxxjjbn5hzynbfss9ndcpxk05";
 "simplecd-1.4"="0d6gw59xd1mqc991yy6k5jva88j66pd69k5sl5jrysl4rw1mxxng";
 "simplecd.doc-1.4"="11fzk8p911v1myphghzpmkj7k62vk4sdicirys1jh8rd2cpnnwcl";
 "simplecd.source-1.4"="16g6fcsr0nw7isqimjq29g0zyf72z11qx9xz36zq8z4khxsl09ln";
@@ -6685,8 +6761,8 @@
 "simplecv.source-1.6a"="05ikxmvflqz5m3qallwgyncda49dzq4fibllgc1j77pdh99cy3vq";
 "simpleinvoice-45673"="1mdc6aij1id1jxlbkwfdvdv87yh55v5qyazfciffpbf91qm87z0s";
 "simpleinvoice.doc-45673"="0lvk87l3xafl4s303rhmksfajnw77qd90yvzhdk126dp1prh7i6p";
-"simplivre-61338"="1sifkchv6pg766phhjczj0v0jl3iv0pba3w7kb1d90fyvczl1vf2";
-"simplivre.doc-61338"="1jrvgj0mnsy9dhrhhys4icyd70ddv6dqsjx4wyy6z7w38mli3fnw";
+"simplivre-62834"="0r2pmmrj6ghnj47plms3mhr3krr1hjkri6cvxpb094rnsr74xsj4";
+"simplivre.doc-62834"="1vv82fkkiw8j60401a89fpvf5lj16y9v2nyyl354rvjrd7441g9p";
 "sitem-1.0"="19z6zmwriwrlcpgdgn5yl2bzbz0fkn3p8g5hrwd368bq7wyfc8mi";
 "sitem.doc-1.0"="1wwnqhl3ffqnp5qxddicqwsr7515g6j53rx1rgi9b5z3cv42f5qj";
 "sitem.source-1.0"="0y249krv2h241wy8xbi5xjrxypa56zipi8fbmqbziw9cjjnz993v";
@@ -6712,9 +6788,9 @@
 "slantsc.source-2.11"="1jw70y8052qvjkr796sz9w0c6kdyammi3gy5v8iq0wwmf38jl8qf";
 "smalltableof-20333"="1g0kh262h9xv5zr2yix9as4ghfsrqnhj8y9gzb66xk90i82pri0j";
 "smalltableof.doc-20333"="1q96blk44d3nv5bihz81a25a43vbf9b86d9w00cl9kkin1zzkf6w";
-"smart-eqn-60178"="0bjkvgyd67v876dgzp6zwifal9dy6mlhqvjn2rzrigrddvvn3j87";
-"smart-eqn.doc-60178"="0m3ilj749zh2apxr0748dhhm6bfs0a6gnc02azjsv8wqj32bdz11";
-"smart-eqn.source-60178"="0jxbyx3fsgqmydrzjymqa3zi21xigqpnid46y1izam8vc1m78w23";
+"smart-eqn-1.0"="0bjkvgyd67v876dgzp6zwifal9dy6mlhqvjn2rzrigrddvvn3j87";
+"smart-eqn.doc-1.0"="0m3ilj749zh2apxr0748dhhm6bfs0a6gnc02azjsv8wqj32bdz11";
+"smart-eqn.source-1.0"="0jxbyx3fsgqmydrzjymqa3zi21xigqpnid46y1izam8vc1m78w23";
 "smartref-1.9"="0g8dy72b8q65pw2zmcs2yipclpx3g445v9snjnyxbb3q82asqy5v";
 "smartref.doc-1.9"="1nwl85jj0d97djdqkczdw3544vhazy57fx8psdcvfdncbvpk84jy";
 "smartunits-1.2"="0jiz4mhyf4zaikq0fi4jvan27ngksrv7z5gmch88qj7fapg4xhna";
@@ -6724,8 +6800,8 @@
 "snapshot.source-2.14"="0bh7gy9inl30h8y9v072fh2malc07cjwizgxc6wvm07n2x3vidfh";
 "snaptodo-61155"="0wxnac52wv3aknjs8vsw17ghxn77xiqffn6badyp0scyr7gvmkbc";
 "snaptodo.doc-61155"="0036gs7ybs2ilhp4lhzc489r5ai6ffx0ha7fn674qzk3qn5j7zkl";
-"snotez-0.5a"="1dgwmqwxsr0drs1qyh8v6q7v0yxa24jxrg3dm5lyzx39d98mh24s";
-"snotez.doc-0.5a"="07hhfh7d081d1jmzxcnynszwgjp2x683ki6f5q5pj7rzvlnhmm14";
+"snotez-0.7"="1nq3ggbdpkpydaqzpfawvvny8azgbmnbwpl00wsl4rhi7jbqsfwc";
+"snotez.doc-0.7"="1v82nn2y2kk8h34j8gidrzlx8nwah5wmdk3qigw8aa1q7vrkj5h6";
 "soulpos-1.2"="033c0arpqhrypwy5grpc8c6dnlc7k86iq5wglm6r02bdk4mcw7hk";
 "soulpos.doc-1.2"="1g99lgnl1m7nffwdfhmmb4zgjwpaiq3pggbgmi19p24z7qc1sjlz";
 "soul-2.4"="076n834lx41qw6p661dgq6massdxycq8b3gl4564pkh5c1s98ggp";
@@ -6737,8 +6813,8 @@
 "spacingtricks-1.4"="094lwcn8mlzkkq31m0dwvmn279zghzvy8bd1x807knsw3zx95n5v";
 "spacingtricks.doc-1.4"="18p3m3q4imavrf8fcb1gvqjvps2fnn88b5w5256sg08kra65jdcf";
 "spacingtricks.source-1.4"="1vgg4h9qwgsm2c9iy6inih5fpa19flv887c8cqafd3na65g5g9rr";
-"spark-otf-0.05"="0kgfj9kmsyi501a8xl41c9dqw0msqn60wsh99znhh4b1b0hk0qw7";
-"spark-otf.doc-0.05"="01pa2m9q90amkpcpa90z8azhz9hcb2k7i3yh67a7yh2ndi97qn8r";
+"spark-otf-0.05a"="1z9k0dnahkq2nfqs3plpyb3fdj48x8vcav0ahykd554fygv5h4x3";
+"spark-otf.doc-0.05a"="07pq90xx911rdjdyr0sxg4zqfg1yb5kn43xc5l6hn0y81m9j151d";
 "sparklines-1.7"="1mb6c3mial9ashhvmjhynczjpb462j18qyy2an4ckgwgc46pwhp3";
 "sparklines.doc-1.7"="03j6xdkvsv5p71bifmggf69w3s1n7758yii1caz9p9bcqmqbnrk9";
 "sphack-20842"="18vav5d5846hzn6ry7ypnbj9vmxxxxjxm8wpxah9mlml6kjy5hc0";
@@ -6784,9 +6860,9 @@
 "stealcaps-1.0"="1cfq6w2s7yxdsjr2c61zwndcnlhin57y48k8y3lr3m5affhcrac8";
 "stealcaps.doc-1.0"="1jj9g83q6g7pv0k35jfa0wiq8ypqymh9sjjhppnnagd5zxvysr3x";
 "stealcaps.source-1.0"="19pnsn1w7bvpghnc8gg3zw5m29hyacls94gp3lh1aa3avmsks21b";
-"stex-50489"="04ranihj8is2md5ag94iiwak16ld7v1vr98fnzd5jcs28sjxngrc";
-"stex.doc-50489"="1rzss5g5j6avn2946g1dl4cciry6fc5dlcscrx48sz8incf9l84v";
-"stex.source-50489"="05chvd8rb9i17lbrqlwg7nxsqqhsxivcsgxxkv8pxv90zycbd5v7";
+"stex-3.0.1"="1b23vlg878gf09dmv0ypysg8v4lnascpi0338aggwhd8w7y6ny6h";
+"stex.doc-3.0.1"="1laga965256hqks0a9h9y3sfgv6173hn4a42irzm6pn65ia5jhrk";
+"stex.source-3.0.1"="0bl92cmp96p8fdnp7ysjsgbmyr0x3ak7gmkv8m2mxdi8ydgszssf";
 "storebox-1.3a"="0vy7iavq6qqxpmwhm9cz4gxp67nriq230kcf1mr1gq2w0ncy7kjc";
 "storebox.doc-1.3a"="1crb1bkra0y2gjzf9wndr5c3nvc83v57lkdglxb8v1pzpy7halmx";
 "storebox.source-1.3a"="1ybpjfrria57fwvr9kriiw6y76ivwvsyb6ayp0bi750smsv8k5n1";
@@ -6845,9 +6921,9 @@
 "svninfo-0.7.4"="1npqdiwj6lnwgfnzb4iiyjl6bl55pjc8mml3gyrvd36j2f6cl1z2";
 "svninfo.doc-0.7.4"="0728psfyzblwp3nciax4hncbf7sw4ww4rmrlz4jyrpmnv80qjp37";
 "svninfo.source-0.7.4"="18rcrh0kkqfz1k84my8adn2a8y7ppjprcy77pfqayix4lyzw6syn";
-"swfigure-0.9.18"="0ryiifcsxkiwgmq2apa1pfabgmw2g52agylf45b622q97akgknjw";
-"swfigure.doc-0.9.18"="1xbbjxm49ja41cbz08b0zvmwgp3dm6asckwjgqj8yv93a2fmxx02";
-"swfigure.source-0.9.18"="116cdphwhm29jp8rbf2p4zmnwj1sb3xby698jgkj52ha45qixs38";
+"swfigure-0.9.19"="0sc027dahxxwc24m6ccqd22hjy6km3p33dvc1ahal48lfjfcjgsw";
+"swfigure.doc-0.9.19"="0nn2y5jpjw14c3g4x7xmg7gp15lr1bxdinxjp0l7lrjk5dl0g1cx";
+"swfigure.source-0.9.19"="1fk4r90n7zrxghg11wcw6ia0ka6nk4hb9z9ydls28h3dhhsj9xhv";
 "syntax-15878"="1gd38myk5lf5fxlx1j8cvjv6pcpcr15r0370ikxf7fczv8s4ab2l";
 "syntax.doc-15878"="0l6rkyidqvvhkrjxs8y316rssayihqimbyqwvmdzqpnfd16rdxpv";
 "syntrace-1.1"="19vx1iz2zxv49znddhcsl7aw4i267fmxhxpszzg2i9z0klm9b3nq";
@@ -6898,8 +6974,8 @@
 "tabularew-0.1"="0g9pbr0vhhjj2lz9bbgwvm49wl8bdwvv1jjggq2dnwwqbr4vc4p8";
 "tabularew.doc-0.1"="1ff62dxvnhi4q1gy8f7qhc0zz1jiayl6f8j96dp0rz38l2is7m86";
 "tabularew.source-0.1"="0sfpx5w61xrmmgip0c746mghhj06r2mn2jmj56zingymm2djiad1";
-"tabularray-2021Q"="0lf7r96gpz41lxbflrp73p8ch62a2fb6lbdy95avw1pl9924a3vj";
-"tabularray.doc-2021Q"="0izh78anp1wbl7hqa3mms5dngc1ikary0padizw9mwyn9anv7p8k";
+"tabularray-2022A"="0ffjbkyw8kldiyq54j5ib20mb9bz5iaqfrf29z6ig66qv6y3hilk";
+"tabularray.doc-2022A"="077zcq01yjnvnqv517chn6vix6i4yxl1603h373i2r7i41sihyfk";
 "tabulary-0.10"="0z57030pg4pfvghjii8bgqba589cabnj8qsr9w1abpwp3pfy4zbs";
 "tabulary.doc-0.10"="08r21q2h7sjrk875x84lngcqgiy5ijik56ly7g7wyzhq3jyxds0f";
 "tabulary.source-0.10"="0lsdypidawyhzj73c3yjs8k4xy2sds7gz8gazxfy460zndsz675m";
@@ -6907,16 +6983,16 @@
 "tagging.doc-1.1.0.1"="1pv7savkzm6jhaliw5ilb7qmhlj3iyiz2w6kxchanwrg4pnqabx7";
 "tagpair-1.1"="08qjcwyjs90sg8agmpmm3122h20898hy6dwkm0lk3dba1j3w5drj";
 "tagpair.doc-1.1"="1dkn4gq6zxfqw9h64h7ggkbyrk9vzyax8gmnk9qk8dccdvf5n2sv";
-"tagpdf-0.92"="1vanx0gb7yqii64vplin2c4qdc3r57nadzbdghjrd9npwxygzyfs";
-"tagpdf.doc-0.92"="166k7zvxgijkl9nq5rkjr9ncj1g1v83xpz8jjd06d5sxnv7ggkfp";
-"tagpdf.source-0.92"="1g5hbn4m4cn599vzdylr5sysif2yw97qz6fklla2xgcq25awllrp";
+"tagpdf-0.93"="03hqas2shzh2msj1dr5rsajy6cjmwb6q1vi9556rjj53gl52g0a5";
+"tagpdf.doc-0.93"="0i2dfrjgdxjl5nxzlaqm2vh8szgwc4isv9mvkkjszp28pzmxsxy7";
+"tagpdf.source-0.93"="1hvbcj339n1z92bcacpnzkjy5k9886bkqr4735bhd5k4fi6gx106";
 "talk-1.1"="0i9whk49bahsm2kbj53pjdh3fpg1ixfyxmfvcp563ylr8j2ibimb";
 "talk.doc-1.1"="0rgil00i39p2agz9fybg0h3xmpq0wxcpjcqpbpzjw5lcf4mpcni5";
 "talk.source-1.1"="0kdrknwwivyxiyn8xqappf3k5l1brkwkkhjqa0l5n0abzafkjcy9";
 "tamefloats-0.42"="0mhiz5lxz0szi8ygmajjmldz1bjf6f1lpyxj3b9zb17h9aw8gr4x";
 "tamefloats.doc-0.42"="0s5cy9m8jpxh81c10fgdvn8wy7pnv7sa25hy8wbv6qkr1qwz8dss";
-"tasks-1.3a"="0n9byy7yai7cpyqghp1warj134r9m83kk9qrzs8plfb604lbznvr";
-"tasks.doc-1.3a"="0fradxaivwq5vvqm37n97rm07ja4p6gxk9zz07yixj3nnsbspczp";
+"tasks-1.4a"="1gwl8g4a2x3sbvqg91ry577hmpxdc4dgcj9ixhsla25h23jl414b";
+"tasks.doc-1.4a"="1pavbpzm6z6najh72z52j089mdg6gqzsa8sb9qyfsql7mndnxznz";
 "tcldoc-2.40"="0gz5v5hi7r6wr8qas79lakwr7gnf8d5kypf7cp62qvrybp0ljgqs";
 "tcldoc.doc-2.40"="1vy7k0f6ri4kbjrhby0napsas9wwlq5by2q1dakbz7r80zr7dc3k";
 "tcldoc.source-2.40"="150p69vd9465icda6p0wp37gg9vl8y3c2ys3b8f9ij9a88x5775j";
@@ -7002,9 +7078,9 @@
 "thumby.doc-0.1"="1v1934z064ar7zgjpnpxvmc7bkaq080h0hka0snkj7kwqm6sfry7";
 "ticket-0.4d"="0qpqzff2hj01g2k8nq9vc91l4zvg7kx4p7nf0gd6ji9lf0q5caaw";
 "ticket.doc-0.4d"="07xa7nf2qgvjq5pzaj7k75wzg2ldcpxb47ypx53swssz277ixvp7";
-"tipauni-0.3"="10zf8s35nd13nlmn36lxdcbs2kmqm13w8jsxzinsva1w7zxnnz0b";
-"tipauni.doc-0.3"="1rarbyb7xm0j2vc6yyziri1lyagxa75lsw7kyjxwy5gp5g0bxpmq";
-"tipauni.source-0.3"="0w2sslggg3sd42a8max1ig78h83wglq3zracad5ycbpg7x0l6s6a";
+"tipauni-0.6"="1cx8rj3gwsyyx68ll9v4piax8rv565dp4akq7840zsbpkf4rajjz";
+"tipauni.doc-0.6"="1cy4mfvmybwarzms4w2zsxb8gwjs8cjvdv4cj51nx1cb8myxxchp";
+"tipauni.source-0.6"="012bh7nj08rd2a5q5p7m1y4r3b06r9473bvj0j33a0aqrpq9yhn2";
 "titlecaps-1.2"="0rvggjj8rwdk0nln1c2f5ljvimvrk2bg0kqpc007lwajd71aw175";
 "titlecaps.doc-1.2"="1acn8ch0n29isx36ndpdksc5v9cfavn4ganv6a3vdhrrnc6mksr2";
 "titlefoot-15878"="0c0nhhxhb3hmvg3a64lr5npbqsmrmprqqj9pic91j007k4s1in4y";
@@ -7054,8 +7130,8 @@
 "totpages-2.00"="1z6brrn4kb6w6an8iz6das0yykwj2cbaswa9wy2p3rfc0w95x0ms";
 "totpages.doc-2.00"="0nm7x3rv5rxg40k0xls5d3s5dqrpc8vw9g93sa3jkdn18xkxh2zs";
 "totpages.source-2.00"="1b0glns220jsmn1607d5f44k2lijjp95cd0dkxabdc3p576ipmmv";
-"translations-1.10a"="06dj29zxiggxg3j7mprg7w764i1gr7j39gp92igs0j9cywq8bwqv";
-"translations.doc-1.10a"="169asrvl2r8297a46q4vg141055m0yb81p62q5h08ha0d3zcnvky";
+"translations-1.12"="0cs8wvvcgmzsnx2bv1qhmcmcswpj6kbk79573yr9vmiws43djng2";
+"translations.doc-1.12"="02z9ggyi83hiqmvc53wgvkxw7q3jn8sb5vd1pzxmw5kvhdgkzy2p";
 "transparent-1.4"="1285prqgw1gl2z9rlvamlca10xxy2x8l9aj63q3zvvz97jbza3kr";
 "transparent.doc-1.4"="05zb4vc7ab9am2dl66xkj23cmk7kylcanicf0fcs57znzyy2l444";
 "transparent.source-1.4"="08j4c9c211s18ljacgvp8ck8wn6rdpdy4g057g0czfgdvg9b7w0k";
@@ -7114,9 +7190,9 @@
 "undolabl-1.0l"="0arbapmf5dfxaiakj12nkca4qbyyhc3idjjhsahv8brj886jg8zz";
 "undolabl.doc-1.0l"="1sx0q3084dkfx1hkbjfc0cwhj4mim0gpwr448iafs11czi316x6r";
 "undolabl.source-1.0l"="12msg1fh7f978rw1mjsrprqrr1wbvlfai3vg61dzl329a1wc39mq";
-"uni-titlepage-0.7a"="1vaad5mia52c2xhg1xjbpajfvmml9y0hmiiygyvqimr8qimfh9cf";
-"uni-titlepage.doc-0.7a"="1dwdj5y749al3ggbkkihyzknaw6gql4p238ac8g2bac824ilnqk6";
-"uni-titlepage.source-0.7a"="1cswvm79mzb8c779yg4q4lp6hg4i0c0ysgg8rjddzfna2h8r6dy2";
+"uni-titlepage-0.7b"="19xhq0hlmny22lxz4y0znrscvmhxfask7nbz7xz3zmirvvrbqfq3";
+"uni-titlepage.doc-0.7b"="0l551s7zyakarzcgx8jvzjd05mr13d12lc639dkh6jk5wpfx19z1";
+"uni-titlepage.source-0.7b"="1sndrpbv96ax3knarqiawzdf5abn9cfply01lv71yzvx47jb5782";
 "unicodefonttable-1.0f"="028vrmw68mia6phnxmx58k7adjq69001ahwr0jldf9jbavak0vx7";
 "unicodefonttable.doc-1.0f"="0lxqhwz6wk4vygpgbgwwyk58zr5ndniq2lbvvsqbxdx2gk6b8yjg";
 "unicodefonttable.source-1.0f"="0q7l8s47xas01ma5ndim2daaa3m4rl6kl6jczjhfcjf7gxzyid5g";
@@ -7128,8 +7204,8 @@
 "unravel-0.3a"="1kixvhz6l4mdlvjl8823jqa1fzx7m0w5vcznflcjww53n7jhrj66";
 "unravel.doc-0.3a"="1lafb702nv1103kap2yldigp5y6f4hmszbcs1j4sijdj44cxaaa4";
 "unravel.source-0.3a"="10df5gx6idfi23r92p9m8axcm3lisyh94xp301synr1yfpyw80zl";
-"upmethodology-20210708"="1hmkrm0ys4ax37hirirmzl570ij8sz50sira8yqb5h3qfk9rp8jr";
-"upmethodology.doc-20210708"="1vw9azpz8vwanfg60vr1a9bbx39k8v6jhvn505pvmf8fqgkqd9ch";
+"upmethodology-20220210"="1k7fzs0krfz30s4y38ib3rznlisbaiydv8fq3wjgmcm4gcf9i9l8";
+"upmethodology.doc-20220210"="1vw9azpz8vwanfg60vr1a9bbx39k8v6jhvn505pvmf8fqgkqd9ch";
 "upquote-1.3"="1zglh6pb1fq0ipsivhj0knhcwcg04mjkxca5s2adbbfk2xs1iqgy";
 "upquote.doc-1.3"="125756iaikya3v0wk9a712klp39ndw7i68bybnrif2klm4c695lm";
 "upquote.source-1.3"="137lbzacpmkm1fdmp548m6r83mnhclsrcyqk1s0rkp558fpnqpp1";
@@ -7166,9 +7242,9 @@
 "verbdef.doc-0.2"="06zh9v72ywrg84wlb96p0y28sn9919pn2xjgqhaii6irdf3hmlma";
 "verbments-1.2"="1iv716hb41cy7bc7bk2420lwdykpccyg6wxvbxb8vk904fsgdk2a";
 "verbments.doc-1.2"="0hzrzb6m8iakip93in80x6k15b08z9xwjrbki12d28xdadqkpqcc";
-"verifiche-4.2"="1p26kl92z44qa0axpvgxpbicxkqxi5gd31xmcad8f9s2qbalgjav";
-"verifiche.doc-4.2"="1wn8m4f2nm2naw2q93fj9xz84gxqrr3rkbkdikyg3g6dh5rjmcgf";
-"verifiche.source-4.2"="1a5fspwmjlsrasv70mb4n84iskck142idycih60cmqsz781vbaqb";
+"verifiche-4.4"="0wr8qr9ch2qrcb6x80f307q8cfz2d5wklj2mjld88kjby8smsyj2";
+"verifiche.doc-4.4"="0zvkhx4ap0z5md8824gb51lgwrld69wika0zmv20wlggk7il6jzq";
+"verifiche.source-4.4"="0md49avxrgrrxhj501amvf0ff8ni08y03c1qimfw13j1wnvhhczv";
 "version-2.0"="19b4h22lqvgzqqm0pivjjhmpxmijrr5rfy0xc9g9y7czsrp810hb";
 "version.doc-2.0"="17bsgyjvnna790nz3x94wbwslxkkz3958vj2l3jbyphm5vv92fxz";
 "versions-0.55"="07bxhbpsqgdbpwph2w7gam699605m181xmj8jhpcsf4rwcpnjik7";
@@ -7231,6 +7307,9 @@
 "wordlike.source-1.2b"="1azirdir33aixw7zh9ps9npxy1v8ckgsdjb96ri1ma0cy2z5d1ij";
 "worksheet-1.1"="1rsh38fx4ayai0mlakqgpzxpnwp6ckzjcpiwy7aqlpia0504jgpc";
 "worksheet.doc-1.1"="1hagdjrf472ip4jjkrjv6mgycwjlhbggval7kkk449i0xd9kiz39";
+"wrapfig2-6.0.0"="1l8w1w709vp66pcr59qvynpygq031rkq4vhc3f7xnmqahpdd35gq";
+"wrapfig2.doc-6.0.0"="1jv3zc4afzl54fijc273mj017xzv420608vm44rsaxi0nghznpap";
+"wrapfig2.source-6.0.0"="1fm3a22bysh83b67b4h34lj5d2slj8mwqgghsac1imc9a2h1sabn";
 "wtref-0.4.0"="118ajsdd1d1g1fr23pnq1zrdczl5qgdcrqp4ly6kp8w2iwjhqdn0";
 "wtref.doc-0.4.0"="1nk1w4w8x9xfyr8wdr68gx24vw3arf89ak72rbiwjkspzjl1h9fa";
 "xargs-1.1"="1r4giz5gp4pcnxw12lr8hnsa45yv1lm1ddq6g33rkgs1qjzkhv02";
@@ -7292,18 +7371,18 @@
 "xpunctuate-1.0"="0bqv9l0f3fwvzv2hcp2913spilawj21zbhdfgs9k04knda4xb7wm";
 "xpunctuate.doc-1.0"="0r06jwsc38qac0k4b2rmm56phxi0qgmmvlixgk3w3mk51d26jz0f";
 "xpunctuate.source-1.0"="1i5xcn13kr9nbfx8nc34n7qn7zj3p1hggws1yd1bqjpvj2dbssk4";
-"xsavebox-0.16"="0qw2fsic14k7wcb50wpf8apkv97rx9jldgqavvrmk63wzmv3hn7i";
-"xsavebox.doc-0.16"="0vx8k47bj3pqn1j09hz1mimp2jpk44dqyc6wivlrqkhrjqwla4n8";
-"xsavebox.source-0.16"="109n0kvp3a4gb0wqpml2glmb9b6xsagnh4s4kcnwvia72h5fwf0g";
-"xsim-0.20c"="0ckr4ygax1452xqfai6yxrbq6cqk23yvlasrs95nfsiflsl2xrsv";
-"xsim.doc-0.20c"="19ydl87qxpgrqxhfqp9jmvspha2zv7rh1n09dgcqxw4f5hfcylaz";
+"xsavebox-0.17"="1jbnjvzp2rvxdnmlilj6nhsjlq8qdligkmim5ahnrdpplbdbhgay";
+"xsavebox.doc-0.17"="0wp7wxad1s5pw82ba3sl5x9m65jz7s63fncsb2q17x5fa3dp3l2d";
+"xsavebox.source-0.17"="0w6zikkfavrfiqwxhqb8zcl5ylyd77p991x952f7mmbsjb8f3jx8";
+"xsim-0.21"="1ajmvlrmx97f94k7aci6bni5bhhlrf07c7vb8vnjgyq2iik12ys7";
+"xsim.doc-0.21"="0ppqjy9sgkrwcycfj5z1igi6w56rvcb5a12p22spa56fpsh94910";
 "xstring-1.84"="0b8n65c18grhzkjnps5g5grg6i7pc5lic137w0axq46cd5vizihy";
 "xstring.doc-1.84"="1gmik9slrwynmq2i71hqrvx2mnd6wk43phaydqg12jn3al16cvxk";
 "xtab-2.3f"="1cpcs7k8liapv68cghfwj5fw80rz71qrld7l9lsnli50h7ph42sz";
 "xtab.doc-2.3f"="1z3wp3hqy98a4l34kgm604zajdyv0b2vq0jipywmdc12115cw63f";
 "xtab.source-2.3f"="1im5cv88g6n88rxzx8lqcxfmhkihywrv2h9gclmv0jx2mmwvwafv";
-"xurl-0.09a"="1430pz7rliwv0x8mx52v5xznkzjsxh2xxj71106ga6skczcszp4w";
-"xurl.doc-0.09a"="13j7y5j4grjw5zn0rk3ad6yyhadbb4f107zw090dy8wwnvgmfd1v";
+"xurl-0.10"="1qbys9b3zd3rlabdmbpndf65fzmvkz24d6v3k7cml2bmdzzqv2cc";
+"xurl.doc-0.10"="1q6npbv8iy1bgl2fjs3ngjw6wb78y51nmjbc2pndas7klbvdixc1";
 "xwatermark-1.5.2d"="013zwh6gz8npgyvdj8daa6y9pb8554lqvbskchsc366k0m6xrwd8";
 "xwatermark.doc-1.5.2d"="01x4rkl6h9afsbfis3ixbqi9inb1sgvavd0wld9jbwcrmv4qxc76";
 "xytree-1.5"="14f3vxkfmv2s944qpdhxpvbrpxq2p259bnk5sxlcv8lbsk2fvvcx";
@@ -7334,12 +7413,15 @@
 "zref-2.32"="0s0306k858i40v3hwvq4z66ip2y023npd4nl4xf31bilqh240p19";
 "zref.doc-2.32"="1rb9jbj2lj8z8iplnjz1qi5qvhn32qvphgmw872qxn9gm0hx82r3";
 "zref.source-2.32"="0lrxqvqj7s8ia0fhzkf00pqgxgi2wnrxdclfc3k865nfj59ybshn";
-"zref-check-0.2.3"="1jnlldakz2dg32zckay2jklzn6bd6f6lmpm032cgyxn4cvsbzl9c";
-"zref-check.doc-0.2.3"="0wyy78jbr38qk48ydbiy4nila8324pw1dmjx6057w5mx95wf99aq";
-"zref-check.source-0.2.3"="1c8nlgn82j071kmh5m3gx9cap1vwnp6ihgf2n1fv00fq0rd24974";
-"zref-clever-0.1.1-alpha"="0ajgrg4k1h4f997ffj8dgkbp9h4x5zgdbqn5s7m09s00kq3swqb7";
-"zref-clever.doc-0.1.1-alpha"="1g7409qc3f52gb4qv003g9r9gjrgiqv93ywkgx7fv242bk61ll4a";
-"zref-clever.source-0.1.1-alpha"="1zbp3imy3j6wky0gr99wy90y3yhpy0w41jy4a2gvbjvkaf2v9392";
+"zref-check-0.2.5"="1f07la0kydzvrnrsz2jww9v17hymqs5q6lkx0q40mf0qvk3spgji";
+"zref-check.doc-0.2.5"="1cp2v7hhq6jdx5g7gxahdfdh29024bdq8qlzp6prkh842n706nma";
+"zref-check.source-0.2.5"="0z3crxmvlrpq53pljqp9g68hhjjmq89w7nnmlx8d0vgrb4qjz5by";
+"zref-clever-0.2.2-alpha"="1n0g4b72abkhhpzjk5lb31f6jzzywi3a8njv9ki60p5nrhh29w1c";
+"zref-clever.doc-0.2.2-alpha"="0pn995xk5pr99dcdz14f06affdd6jn15m5h0jrq6q699z38mlx6n";
+"zref-clever.source-0.2.2-alpha"="0fgnps6lldpz2ah3xmbrl7gbc1hmja5vycmjpnsi6djapqqdcx4c";
+"zref-vario-0.1.3-alpha"="0m2ccp38gjv0f530j37fcls54ljqg69arjmfwadbi38d0g0mapdq";
+"zref-vario.doc-0.1.3-alpha"="0c7lkz2w770rv2ss72jwrddzi1alda8b03c7szh06cc2z1nwvgml";
+"zref-vario.source-0.1.3-alpha"="0grj8mpgfw6lmd603xd1yvh4k39xbxrbbav6xw2819m80qhmgrvh";
 "zwgetfdate-15878"="1fgz3z1f9ifcbrwiq166hnff23gmlgp5vn0djm2znci26bcip4s9";
 "zwgetfdate.doc-15878"="0gda7xd1sbiaaspb253xgl47jm6bcn8hj101m6ih69mxrka6sz60";
 "zwpagelayout-1.4d"="1vw3fq52fyn59n4ia99pwdhpah1l4nql88l578zrcmarhjviwvvc";
@@ -7382,6 +7464,8 @@
 "interpreter.doc-1.2"="1vgdgriiwv3lbdwp72pdc7yz5f702xxykqdp4ih1ssx1sl9pcw05";
 "kanaparser-1.0"="1cwik91vx5bzq5jn8xjgr4ffz7n9d2qpx9v9xr298afmadg65h0x";
 "kanaparser.doc-1.0"="0y7j8qp9j33hw80dypc10nr28x2zn174sq1rbbbr8gc7vsvz5pyw";
+"linebreaker-0.1a"="0c3g9hf365zgm0q33jzfywb1hkbsw89cdqnq3p6cvr46ipgrp376";
+"linebreaker.doc-0.1a"="07yf14fz60hjb6bxxr9v2lhm2rbzagj2j1kynwsj74rn363s76gh";
 "lua-typo-0.50"="0myd5mvbrf5kfvhm8x21c8aqv0mpmxhvhdb4bhzrqqpycgzdlmai";
 "lua-typo.doc-0.50"="1c6ayx322m9j0z7j9lbj9ciar52y5kiil14flr9lq4frvs5x3nhi";
 "lua-typo.source-0.50"="1azqjaa75gs7l9apzprz4cw313qapkizyjxzmlwnsba7aldf5v4j";
@@ -7391,13 +7475,16 @@
 "lua-ul-0.1.4"="1vkxmv628xngaqxl54rvyqmd4fgqya9c9xb57d61plbl16w5rcc8";
 "lua-ul.doc-0.1.4"="0n70qy6gcrhyp33i83vp7qcp7nlbbyd5v0dr8ng73mfskl9m0f74";
 "lua-ul.source-0.1.4"="1hsshqp3zs5qrm6zs4brxnh4gvkqzsiylhx2jxw8c9xmbz5k3z83";
-"lua-uni-algos-0.4"="05d28y4p19qdz4cykyqsk88sixmpr7z41r7w52bbann7ajnnzxcz";
-"lua-uni-algos.doc-0.4"="05lq83arsy7im5cmjqj375f21vd8p69gqxlb10p898zw3zzy1z3c";
 "lua-visual-debug-0.8"="0qnp6zvfdwc2jy642a42npwjwzlz5nl0kq67zc5ajylc8pvd9xbb";
 "lua-visual-debug.doc-0.8"="0iac45h1d6szsgm8xj4nz9xcd6gwz6c3d7bn2kxifyh1lpxnq7hw";
-"lua-widow-control-1.1.2"="07x10418m68dy9gzlcl4k0zzh620ix7vvybhc472nnhbldy5659y";
-"lua-widow-control.doc-1.1.2"="1kjdach0xzz3kgx37vfjpqxg1r6wgzxpf4qh68n3gr3nv48pkazl";
-"lua-widow-control.source-1.1.2"="0sb3fq7ks9cjm7d4920ib28p9jnx3j5ihyinrnd2sam68gjrphck";
+"lua-widow-control-2.0.2"="0mk9v6fr0wgd4hb3cx2bikiqdk1q1cnd3lbigr86qdxan6bb469z";
+"lua-widow-control.doc-2.0.2"="0h7f0xlbp1pfz13vc3sx15a3qfyggs6vmdmzkbvk0vbg24l6haiq";
+"lua-widow-control.source-2.0.2"="1zrp1hv29n7vpbkmnmkw6pljrgscymigwgk3jfsa52maylpy8f4w";
+"luaaddplot-1.0"="024k6k9iyqiw29l614n0rj0k32y50fgisd2g1abfis7lihc1nlv0";
+"luaaddplot.doc-1.0"="044yp2522hns6hshlph91c990lh43bwvf40cgkfid47mi4zr79l8";
+"luaaddplot.source-1.0"="0x09ac3qlz7p27nm478lcawdrj98622527ba4rz7004b5p2d8w8v";
+"luacensor-1.1.0"="1n1dgnamm5l3hqpbrm4dwgsayqmr99m41iy4038s7mfzz6dkf0g7";
+"luacensor.doc-1.1.0"="038838s5p5ynvxycdhassvkq1vhpv823bfr5ppir00zd7mv8c7b5";
 "luacode-1.2a"="0qk8vadwymhcm7yw3sffdh9i171hl8vg07j1b5gbsl1sa70cpam1";
 "luacode.doc-1.2a"="11d6ak1dvdx64k0i12k4c5kh24f5vqy0ihvj9a5lxa9gqypflrga";
 "luacode.source-1.2a"="1fafh2nq66cz01jsbkb0mk907sppahlswsbb35pa3q5j7iqjzyav";
@@ -7415,27 +7502,27 @@
 "luainputenc.doc-0.973"="0h6wjb0kjdqfrmzikvbddq4w31d55mxlcl5n3phr56fa9i49qmgm";
 "luainputenc.source-0.973"="1yps04v6fvqspq3rip0c6pw5a5y3annwfaij7w27i53419h83lbd";
 "luaintro.doc-0.03"="0xab7yymknvhsh4c30xnhrlvk798mbnl9fbf7njqx8mbmnv869bi";
-"luakeys-0.3"="0r65xzr9h8v6xbml88qhr30hiawkijv3k3g1l9ggf2jpf40s1qgq";
-"luakeys.doc-0.3"="072gz5wm0ijmm8cw66sbhf1flxbr1vsagb44c61dabm5h2d8jn9g";
+"luakeys-0.4"="1v1k8rjk22cq84f08rw9qfd8h0gidkdap8yij6y5s882idl36rzw";
+"luakeys.doc-0.4"="0qmz8pqkbxbksfi7hp2rnk4ff6mhfl25zikvbx99gf209j14myb9";
 "lualatex-doc.doc-30473"="12kg6l5lrq791qnh9gzmfbqn693fpnbp1nn8fddd5ybw6gr61qr5";
 "lualatex-doc.source-30473"="0q34k7x3lwhx2m7n0xl3c0jqv3hzz9zpx6hi5dy06k305qjr2lv8";
-"lualatex-math-1.11"="08glvsdbpyk00xzfc2k4npmaynaw1gk3nw488pjq4dqa3w5sh7mr";
-"lualatex-math.doc-1.11"="1phy8yw6v2l7bgj8zxvizlf683l0aav4n7jg4mj6x6h15s06sjpk";
-"lualatex-math.source-1.11"="1jzjis1pmv23zjc5yp05pbn7qkq0zvyz5gn54cqq30f80fc194h3";
+"lualatex-math-1.12"="18m4jab4yy3fvwkn6fyb1qajsq4nl45v06l1kdjimcws5vj0wbv4";
+"lualatex-math.doc-1.12"="0di41c5rk5raf88hpz59syhg330can3gb5s25n2y5c47qj0aph1w";
+"lualatex-math.source-1.12"="0v470ky6shgcfy44b6a1b987cylqiz6rk0dk9qfhiqd6b93p3axd";
 "lualatex-truncate-1.1"="02plqfp0xi406wya3c6cdgj0777m11fzkbk9nbharima6zhsc1nb";
 "lualatex-truncate.doc-1.1"="0gkgbliv8bzpdk27mkff02v1d03vggyq4nk50yawrimz0k7q64bn";
 "lualatex-truncate.source-1.1"="159wcqiyb5rs9a7wfm5mj5vcqh4kr9gv4pv6w0d7vfylkrlh76nf";
-"luamplib-2.21.1"="073jiy3lgyxnv2h298s23w4splg9z4c392vsmmn9zdm408p7i38a";
-"luamplib.doc-2.21.1"="0rdpxx5fn2m6j56k2snl7igghbbqk7qipapifckisqvhyxkvbv50";
-"luamplib.source-2.21.1"="1k3dg20syrpp1hg7v4ja20062a7vid4rhscd7qm6ygqmflg4h45d";
+"luamplib-2.23.0"="0x6r6jiv2i8mapsxaymz3l2avjm0c3swhfzvwl0z0pqgh2m4wlfi";
+"luamplib.doc-2.23.0"="1dq5bdfxp7iv403dvc6ggw96v4ky033qgw002x4nr18snswax06w";
+"luamplib.source-2.23.0"="140ghg5l9vndgx62zfhs7cx93ibph6hjghy4267f6h4d45bizk2n";
 "luapackageloader-0.2"="1ynqy88drl04ld2lycrpvjj3cxddmbycznfamhl1bmn01c1q9784";
 "luapackageloader.doc-0.2"="1fn9kqab5hyvscjqmd34vxjkdcr7bapgw7w3ckwvlsslxrv22rfs";
 "luaprogtable-1.0"="16jmy3cvn7rmzf5i03x51yp5l90kmrdy0iqg8ji4z3xwrf0iq79x";
 "luaprogtable.doc-1.0"="1d0k83dyiml9abnfc3b9l4n6w18lgm37bijr8xj3chyv04v85392";
 "luarandom-0.01"="08pmalwh5w1gih9f29crnwqx40x6npizpr8vnjmjfw3iy442gbhx";
 "luarandom.doc-0.01"="0kgwqk2mh8c2hkv2x1gzl3a04q7azi0aqcv6ab3nf60ipmq81n1s";
-"luatexko-3.3"="1db2wjwiihwgpp0fj8yidhbhwlis8x6l22b6k54ks1i0if7grjzi";
-"luatexko.doc-3.3"="0wv800lax0nzj3lzp19ghl7llci3qrglqbb809i1iyvyfsgnh6l5";
+"luatexko-3.4"="05ni67qjd794viai9aikqygfqwram1y2gbsnnijvdlw34yv1hmay";
+"luatexko.doc-3.4"="00pvjq8zbw7yrpi75462hrnw4p6f3k5qr50xp51yn72lyhgx78wx";
 "luatextra-1.0.1"="1dx2hc1md8csvb37lckxj4987zaldfd73c86y0ni8fzd4zg55s7z";
 "luatextra.doc-1.0.1"="02dl0skcr30hh9wgm7bkdv5zvx3czcdkxv3zdqnasdk0b7r7mqh7";
 "luatextra.source-1.0.1"="1yq5i4v2dxayhfzn1yw987i3zjm6gy4fqckx5kybzh8f6jr9167b";
@@ -7443,18 +7530,18 @@
 "luavlna.doc-0.1i"="1xv8gzjxl0awaqhhs1ls7lvxy48v8k5lsvxq4lzlvd452r8i82k0";
 "luaxml-0.1q"="0w4c8sy0bjacrkfh3qb9rnv9ls5izzkma3fr6yd4zmwjzn09hh6j";
 "luaxml.doc-0.1q"="1giy76w9p3ribicsbwghh4ckrdijcfxnpyflv59ry0c9008xdrr8";
-"lutabulartools-61003"="0y3zhb8mx1j79x36gkcnbc9m28fjwhiy9i89fjxg7ddzv6qa7lpp";
-"lutabulartools.doc-61003"="0hzma6fg85xdyrz5zjjjk409ypngl4pyqc5qahc6imzl6c06s2xn";
-"minim-2021-1.0"="1ks2kjscds409imk4bvgq858wf8g45lfh530a6d8kl6kzd07s8mv";
-"minim.doc-2021-1.0"="1d2d6n4i7y2gk9881ia3i9y41f2pi8dxzdggk87a8lf364zbbh6a";
-"minim-math-2021-1.0"="0da0q0588fyj9py64fziqzmfy1kj0897gxi898nrdnnia7xbz2bi";
-"minim-math.doc-2021-1.0"="1c0csim3742s8h4xqming6vhgx38400r15wyjhkvi50fgns820gk";
-"minim-mp-2021-1.0"="1wcyray67fzhmlhah425j2m3c2h7q52xvyi3pbkyr2hfc77q2yf8";
-"minim-mp.doc-2021-1.0"="1n3j0mjw6gshhvp26aja5pgbpw71h840534lqzld8cajhc93m937";
-"minim-pdf-2021-1.0"="1wpm1raw6p0y6j0w55crpc1ypf8q9spp6w0a66wpb24c79vhyis8";
-"minim-pdf.doc-2021-1.0"="112qzryhcw6n0cnx749fxy641k1vy42mmyzd1wxxs0j65yvb2vyc";
-"minim-xmp-2021-1.0"="0jj2ix76clxjd7bm70113hld3rjjnbgzp3n1ha3ijwlj91kjs2z8";
-"minim-xmp.doc-2021-1.0"="1j4rhjqvgl5a6dllsq2jgccrri9gckkyxn1z8yh7aqfbm5ncrr49";
+"lutabulartools-62253"="01zcvk8rbr15dasy890pqjcf1bx4yhs4p94vinz6krgp1c8ymvzz";
+"lutabulartools.doc-62253"="1in26d3877l0dafwfnshgvvj85piiqa0qp3v699a7r99klr39rlr";
+"minim-2022-1.1"="043mj17b7nk1i04j44rgv1ybaqv3cxdhyn0i01k9jxn8q28ddw4v";
+"minim.doc-2022-1.1"="03cvmakq76l56aa76xph6ph6pzmxy8a4cy3xnw5913hapzj8kd9w";
+"minim-math-2022-1.1"="1d1ss22m002rb105x10l5m5nd1s8g5qrs4agxpdyq0f87k380khn";
+"minim-math.doc-2022-1.1"="0ks8lkfq0bvsl14nc8xdv3p6dvmrysd3665k63gbpq8xmkywsn7s";
+"minim-mp-2022-1.1"="1jh88678bxffpjlb68lg970jrzk5d64zxc20m7g742x9lysxm54p";
+"minim-mp.doc-2022-1.1"="1j48v08zdlm01a7nhmwiqk0v3xs464i52gq1i9s5qh4gc8x4nb59";
+"minim-pdf-2022-1.1"="1wy6izypvvyc5kpgrbn8vzk4d067q7v902hfvs09ickz6p5c0a08";
+"minim-pdf.doc-2022-1.1"="09h4jh4hj5gpc47yy0kfd1w21imfffijxfgn7qb7iv1ha4w50vi2";
+"minim-xmp-2022-1.1"="0km534w8w7l945nbnd9mj24c8j94mxpbz17wp08hk96q42q169k2";
+"minim-xmp.doc-2022-1.1"="1gmmh6an8dh7fca7w5q7s2nknsabnh3np10qd9rckfv9k78zpyfg";
 "newpax-0.51"="1i4ss5q9afxpskqdvz97svq2535i7dx4a7jhbxi1s50qr8f9fba8";
 "newpax.doc-0.51"="1zwpazpzqz3inkfx3vj0nbh8041jjch6daiqb8mcy80gchq3fcw8";
 "newpax.source-0.51"="1lc8j1s43327sy8wxqhmkvp6v4qx66zmsi4fan15w7sljznwd1pg";
@@ -7463,21 +7550,21 @@
 "nodetree.source-2.2"="14p1zfzf1wrw20b8dsb8ppalw5djqrj2k6xw5di3zbggr3zzjcjy";
 "odsfile-0.6"="03x3kfvm31l8lc0n7bic06xf1ypgkd22x4yv331vam9r8kw2i9wf";
 "odsfile.doc-0.6"="0p5iqdqrlxkq7zq5h8jk8csdsghkc71jhdwqhn151n92zxn6lg2w";
-"optex-1.04"="0gf6h33byvdgql4k0gfy4avg8qi9ab2jvfmm3hm57gvrhhskqrh7";
-"optex.doc-1.04"="0gf2p3w7ksmajdhra97k0qwsr9dsk368n79s06n14ky1wp8y6kzb";
+"optex-1.06"="06rjbgcdj8xlpfy4jb6774kh6alz01p8m1qjaa8rhs8gvpyb632k";
+"optex.doc-1.06"="1cqza3f6j0rchhjcm2dgjcnca1dzagx9zb44j9rshfzanv7g91n3";
 "pdfarticle-1.0"="123b9f0nl8wyyxfnbs5krr5ayrgl02hg9z8w87lj6g0lxch7dfhf";
 "pdfarticle.doc-1.0"="1pg4iix7i0m3smy27xk5p03x8m6rq737kyhpf5qzckm276n88fzf";
 "pdfextra-0.2"="16jdj9z3966zz7r8pmsrq9kk5cvc25pb0m7daplsxnyflismkp4y";
 "pdfextra.doc-0.2"="0j5lg0wxzxz86agjm585qmcd9bhdn5nvipjdwxf06a3b9nzfcd26";
-"penlight-61326"="0g33d4i0hbsn86hm27i69wd07qbrfsvx57q0f2k695lm931blx5j";
-"penlight.doc-61326"="1l508104pnqqhrwvnjxj6m405xki3i1skykqdy4k153d6myyisxg";
+"penlight-62720"="13hxjcv54vikvh1b9jnqrrz58wggm21d132hjxgvjzj5ldxms7j2";
+"penlight.doc-62720"="0cl9av81y9bl4k08fzdi7gzf2xhh3anypcn447cykhf478nymccm";
 "placeat-0.1d1"="0vmvw0k1s023siwsrl4hr32wyla5xmkvz449p7vlfv1n63383c1g";
 "placeat.doc-0.1d1"="0j9xm75xv0lqkqzm4g8aqxy6cs8vxydmm50vsjj4g4aah7n8jygk";
 "placeat.source-0.1d1"="0118s2p8vfam65fwynf3vabqj4kz0kkw9kbq49k7akwwj1wpyd7f";
 "plantuml-0.3.1"="0pr3i90wdf440x5pdxn695xjz4cpc17y12mkvnyd1rxpw09003jr";
 "plantuml.doc-0.3.1"="1z0pgf56601gyhmqqq2mcil4rp1n6r6nsrvxpw0kra6lnvkppisr";
-"pyluatex-0.4.0"="0lgi1hm14i3hwbha9y83dfnkl1zc7diaciv2m4i1ghns0lmxb9hz";
-"pyluatex.doc-0.4.0"="125226x4s2hkp9cyylqdhszf9r9ymm9fnm6bi9zy1p20cbipiv9f";
+"pyluatex-0.4.4"="04wnl45r9468076hdqgz8bdvqj56gcnq9rz6kh5igfgbkbf0jv92";
+"pyluatex.doc-0.4.4"="1yq4knhgfyvn9sqk9b5pzr40258vx6yc48wpphwj10qmxa963mi2";
 "selnolig-0.302"="1xrndff5if1jbk5vzycj2alj72r123xjwmyr1lrsjkpkp6jqjg0y";
 "selnolig.doc-0.302"="14ppr67fbhsqi6d5x0f40awac7j3i90kk7mwrjm1ch1572im5dhc";
 "spelling-0.41"="08zkbw4fdfmfz1pxcr96xjhrs8lfbf6sydp8crp8110fikksjv9i";
@@ -7490,8 +7577,8 @@
 "typewriter.doc-1.1"="0lz81r7jv8frdgb1aglxlr98cngacacjvsa4wjzwr9cvahc1q5r0";
 "uninormalize-0.1"="0ai1w8n010sq2fmwvp7625dfmmlvzx9d67ji34zwxdl2cyjlgsw3";
 "uninormalize.doc-0.1"="1dksyk07zjmwbzgc7c2d5lz7fkvrllbj1nrpb34vd54yxl4azgip";
-"yamlvars-61327"="0r3xdifv03ls0lx3crv4hi0yxjbcsnhxr9hzqq7gbiadwf74bjqw";
-"yamlvars.doc-61327"="0qldgrhgww3yry5wl4nr681k6v8l2c08lgxjfll2yiwzczfhivl7";
+"yamlvars-62722"="0p0hw5lmpwf37sw6657p9shzvpzx0jqkwglip9akiixval3rbhz6";
+"yamlvars.doc-62722"="0189vgn91sbb6wwahy0948m8qggzp7g1a5mmd4n7qr819w2nrkid";
 "12many-0.3"="1lh034gihn9gmpzf5sz9anrxqlb7qifaasa98dira5vccizs4axd";
 "12many.doc-0.3"="10f5f3xf2bmrf794ipj5xjsv73j7gqmhgg2fjrdmmsvqij7ljjk4";
 "12many.source-0.3"="01nldk50shy8ynkcjz0176rzkrjhxssi7x37bd7x1gbw6pd32m3a";
@@ -7545,9 +7632,9 @@
 "bitpattern-39073"="1j01vh1jy41714k3hms4nkk8j5c5d4nizgrm5syi20n8pcn3l9pi";
 "bitpattern.doc-39073"="0a9120z9rsq8pqi33iv7f4j79gimjgxfqf5jhnrnmz0hgqdpl2mi";
 "bitpattern.source-39073"="16bjmxm11kh0ww6ymk82qs947zgavm100nsfnjl60hxwjl3yknzn";
-"bodeplot-1.0.6"="1915np9d7lmn3agscp7j9d112m3c9lmb94jh302qwm3fq4p3za7h";
-"bodeplot.doc-1.0.6"="0allfh102cwrclcpj6msnxv4im53lp59livdlv4y8inslhh5300s";
-"bodeplot.source-1.0.6"="131h23n6qk76db2khnqyxy2a11h1js5q0lilng6cn9ml7lz6fc8z";
+"bodeplot-1.0.7"="0ii0lx0w37ydk5k7jj4n4fhchdx093g2szspfw1c6vg8ba5i54nn";
+"bodeplot.doc-1.0.7"="083c68f0kdnznwym29y704i8gkr8ixqn135732i4swya1abykfnk";
+"bodeplot.source-1.0.7"="08laql783q7fa52hr1wb4dyhpi63842ir5zqpj16vy2lf6d38xvc";
 "bohr-1.0"="1fbrgfp1xnxa5cf5yqk9735wp0qwkjkpf8sv8gdjg6a06mpixn6m";
 "bohr.doc-1.0"="1jbmck8ld3rg0nw5rs9lbnr0i34gi2sxncri2fmcdpl8pp3xnw55";
 "boldtensors-15878"="0nywpj03fzn31fffyfy9plxgq9008hhs2v1d3nsy3ggas5kvrm5c";
@@ -7578,11 +7665,11 @@
 "cascade-1.2"="1r5dvh96lybdibq4lspxl939z587hdk7l51xfc8d4jryz1xc45vq";
 "cascade.doc-1.2"="17wc8w2wwd9d7nqwwkdwzih7gx8x1m6qlhl57rw8rl2x81a43v68";
 "cascade.source-1.2"="1nz1mcybb0zpdp2626pbg1raxryhzpanbwq12kv8rgzri6v5rawp";
-"causets-1.1"="0l7dlry3np34gcgwn14rzzkhhyf8wp69ffanlyqc5n9v1nzzpzjy";
-"causets.doc-1.1"="0afqh4mhixi7lyzii8z3yx9zndm4lzdg24d72y3cqrym4lzf5dsj";
-"ccfonts-1.2"="1rwzpbv0vaf4p77k4hf9ac14l9sw8hsvvqx5diq9dirsfq2js0rb";
-"ccfonts.doc-1.2"="0wccdc79b4qzm3xcwfa8nbbvcp248xgwhh7dszlxw3wh1ggl2lp6";
-"ccfonts.source-1.2"="0avnik79dw3p1wvrg5rlqcaxr3w06mr5jvyms54ha18l2d63yw7q";
+"causets-1.2"="0y0bbm1ggs0lblgvq9ji0a9zpil669mp12grwby1n2j5wdxj3bgj";
+"causets.doc-1.2"="1kq91p0llv2z3wbga903cy9rvfm50w3jax5ddlawwr5mmxbw8fq4";
+"ccfonts-61431"="1rwzpbv0vaf4p77k4hf9ac14l9sw8hsvvqx5diq9dirsfq2js0rb";
+"ccfonts.doc-61431"="1pbc945s3xjhccjm83y721xx1zrpqjbrirbf469anq9r892g33av";
+"ccfonts.source-61431"="0avnik79dw3p1wvrg5rlqcaxr3w06mr5jvyms54ha18l2d63yw7q";
 "ccool-3.2"="1snafp7x6mvnmnkc2k2sp8kkj3lxm13x1nkwvyvbmylrh7zvjw6i";
 "ccool.doc-3.2"="11lkm79n0d713dmg4l4fwb0vk8k3pyf9icdyvbaj2v7zy6w028gg";
 "ccool.source-3.2"="1iy0jm88hvhprn70b9cg5bbh21z9mziyqcil6arq67r9a389npx8";
@@ -7596,12 +7683,12 @@
 "chemcono.doc-1.3"="1kcgfx2clh4x59h4scw5mg035wqr2cp5kidn7f6p2aaf5607xid5";
 "chemexec-1.0"="0yj6sygdzs247fpajjl8gk3c6yhk52npbjahgngchqmblhmhlkc0";
 "chemexec.doc-1.0"="0pqksv69yk7vf622x2p2ah735p0a93agfnfyg8hm2jadwjmhzikj";
-"chemformula-4.16"="1cxg6qf8yxgjjj407n983n3lnnldnrwrlwqzisg588apmdjl01df";
-"chemformula.doc-4.16"="117yw6acki6pkb4gybayvw31bmxgkckr0a1gpciyqm75vb8j8gvz";
+"chemformula-4.17"="0q0vrz2agxw3g7cy5clya5hfsdv8s8qf18szhway3inzg5mfr895";
+"chemformula.doc-4.17"="0h1nbyhj463zxj4d15cx88h9pwb2wxpq3r9dsbzdi63fb1mnr4bz";
 "chemgreek-1.1a"="0di3w4yqnjs49im28g2a2qk31d6cqhrbwpq1jcxykk8am7g2sn1c";
 "chemgreek.doc-1.1a"="065mwb7ah9h4qwqp36n0sdlkjv435bwrljz3yzsgym7a4xqvhfwh";
-"chemmacros-5.11a"="113zzfnrbg20ymvb8lp9dy66krymdnvsv13zs974h0xjwhb2kz5z";
-"chemmacros.doc-5.11a"="1rmyhq5fqg13z7b5nalf2d29y85sz8rlj068kxwby9i8xhz0cn6a";
+"chemmacros-6.2a"="1phw4kgp7h5mcrr66vb4kazzi3kw6abmxqhybn3amd4ishgbzd8q";
+"chemmacros.doc-6.2a"="1rz1a7nc2c0cf78axch98zsaxah84hzr7h8rpvz3zz1vfa4bmk5s";
 "chemnum-1.3a"="05z6i3cva4cq45z280ls3y5hrqk9m3a1v5yq51rdj1ilk3yh1a4g";
 "chemnum.doc-1.3a"="0g0q6a845xgpfwkhi31dg6w2rrza8cgxj925rm5m6mg026rd7v03";
 "chemplants-0.9.9"="1q7pvkkr4i4a1v8519a2ysrhya7zgri84is4c4hljqiqqv8sx4ir";
@@ -7657,8 +7744,8 @@
 "delimset.source-1.1"="00hp5f5pfad36n4lkmra8mc2n0ynnq9ynnspqfb9378cx3m81cxq";
 "derivative-1.1"="0cb0lw63r66434r8zavyk58ry96v2ardrfdfjaqhjxj4ansv6ysf";
 "derivative.doc-1.1"="1kp6qkm6ci8dn3qs8nprd7fx2m1baf4knc5mxa9argsbd2xifz30";
-"diffcoeff-3.2"="12k33yfzk814ans730pj9q6h8valvaa11b87f73zn6cd0qyljpwx";
-"diffcoeff.doc-3.2"="04ffwi85qva4r6adddp1hkd28isv5pcrazsj1rdidkagd7gg2q89";
+"diffcoeff-4.0"="1y9iplgsdk3lp15bvh4rhbyrsmqc899n4183msc698p227w0dn8z";
+"diffcoeff.doc-4.0"="0hzbkpbzanibwhy2cc8b374kj09kfq7pkxdrjs9dg33gny5m2j0w";
 "digiconfigs-0.5"="1irv3jc87bpnc289r5zh7pgfdgk4bvfwbyv6666kyq8f8yl7m1kh";
 "digiconfigs.doc-0.5"="0fnibq45xgwrha5vfav8lylnb6p2i0brd2k1yp8jm8id6xdsxmq8";
 "dijkstra-0.12"="18gg38x09m7xi80wkpd1sdlk9p1bsnlcx84s7nc1wpar88w4irrk";
@@ -7710,9 +7797,9 @@
 "fascicules.source-1"="0d7crimrdcxlh8hd24qfwqnadxfjsfrfnjr4hx5rrj75mm946zmj";
 "fnspe-1.2a"="1w5ibha9cxychlvqrbj2v49kizc7hg14lhn1smky2m9ijqrrdwyn";
 "fnspe.doc-1.2a"="1ix8midc7hy8443fh3vkrl875h1v9hqfwmgjw750gdy9x7y06fmv";
-"formal-grammar-1.1"="1q2g27b73fiix8sx34vx8ijsp7w7qbnvr2n650g188pszmdqklgz";
-"formal-grammar.doc-1.1"="1km240dfxnsc1fw9c5kq6znb7z9pc6l92yd38bcwfm9qyjn1v0gd";
-"formal-grammar.source-1.1"="021vnfzwwnn0lrsm8f136adsjh5cnqdkfb84rkljq1ma7sxgbalg";
+"formal-grammar-1.2"="044fz33qawb2s81c8walxiz0qjam7vsvsnsvqchmf4izd0svw998";
+"formal-grammar.doc-1.2"="11rj5pbampim79ffipm7asn8q7nf8yy7l96j0j8xjyfxcqqld6ca";
+"formal-grammar.source-1.2"="0xy21vgswxjr80q1qcx633g09qivgkd3i9gf0fwjmykva23q603z";
 "fouridx-2.00"="033f2yhslmm70byg4pkw64g976vgssc6yiizmh2f1chlfhsz1qhz";
 "fouridx.doc-2.00"="1k6zirff9bqbz7assfrlq0r83bjqgzblgxix7697lmp6ww2rj4l8";
 "fouridx.source-2.00"="0il905sqxqvqk0fgsns3yb9hjh740h69imykxd84p92fndaha5mn";
@@ -7766,9 +7853,9 @@
 "jupynotex.doc-0.1"="0xar0qf1czdpzbjn13x2hwrby18qh6s1909nv2q24rl3nrrpzpcc";
 "karnaugh-21338"="0a8bbdd8khib2bfk4n6527d5ggx31gva1fkqbfw2jwc5194rk360";
 "karnaugh.doc-21338"="0n9jqsfn3v78flgqc6ir3w0lymh1j2kl2pcjxq4wnhzgjy8blbq7";
-"karnaugh-map-1.1"="1762fik0bi2530ws92jqfg3bh516wn9pdcyjy6wq2pr3hw33sqfb";
-"karnaugh-map.doc-1.1"="0vpa9xg98ab29lswrwh50i40q7zkkfjcg8jahay7mjbc1w7k882p";
-"karnaugh-map.source-1.1"="0f42riy86dbjcpls7ic4j9z26xqg8310l5r3n28x605jsbm3bwar";
+"karnaugh-map-2.0"="1q4xrsxjmzvfhivg2xycfpfsbcb51nq1cq255slpc06q4ycyxbnm";
+"karnaugh-map.doc-2.0"="1mnwkmkf4lx3cd11rzgqq2rlfc42728zi6xj67x38wqqpi9ak15x";
+"karnaugh-map.source-2.0"="0vphzrj1y5r6zmlqg4wxykqqww0ihgh6rw3z59c23f1v3j83jj4r";
 "karnaughmap-2.0"="01b0ndcd6vcg4y6v4zbi6cymfprv0s4vhh20hwlghh3wy5aknwvl";
 "karnaughmap.doc-2.0"="1xk80qqqpxagvwp1vfh9vgrqihakp7bkd89alb3j9bqaikgdiqdf";
 "karnaughmap.source-2.0"="11b5bjdccy4p3w65268c8im3c6bam9ql60mik8pifwfbn36bhpqd";
@@ -7816,22 +7903,25 @@
 "matlab-prettifier.source-0.3"="0vr8cll1v3hgikrng1rilqb5d3kbggcmdy92hsdnip7dr0hxc39y";
 "matrix-skeleton-1.0"="1ixn62c0jj73wjh41r5p5vazhpkh1pq5lp1hmzlch74cynw509h8";
 "matrix-skeleton.doc-1.0"="04fm0506pvrqw11lpsdpjn3386dnjmn49g7lhjhbz4ny5k42ky56";
-"mattens-1.3"="13rjfhj9im0rag45b8dlp9sxhd8c77m2qhszdxpg1myagzhqi81m";
-"mattens.doc-1.3"="037kj0fhgy66mcpdwi5hkx1gfdsczqb9hd6zdn3gfid0cm3kylsq";
-"mattens.source-1.3"="1brp2vf133py1a1vbi6rz254008pxi2q9ya6igahfbkj8mh20cqy";
+"mattens-1.3b"="1az5ld75djha5949bl1wiqbm5mzff77cvcyyk11qjvg7pjwa3h1z";
+"mattens.doc-1.3b"="0mqsr5a2bhgrllvcqp03aacvsp7wymqnvsk1zswwscsrjl9dh5ka";
+"mattens.source-1.3b"="15ww1gl01yfaw7gcm66z8zd2yhhnj15pw53crj6ma6j94akn1zff";
 "mecaso-1.0"="1hsgs52844fv3yfzhylb47hpgjdfkx5wvgx1ihslkg9xm432z18c";
 "mecaso.doc-1.0"="066zg20m9hnm2h0bdbzfbxcjsgpbm52l6xwrszbl2ycinqf4rwdx";
 "membranecomputing-0.2"="1b53zrv4zjdprb0vczf23ksvc49m0j3iymljsgvspvz03jb8xzgw";
 "membranecomputing.doc-0.2"="0lcigpnsfpyf1v9drlkg2pq8v5dy7bizknf7v7yrzfc5yrmc6dmx";
 "memorygraphs-0.1.1"="1ph43wp3h3pz5hh6dp3n6dzmmbn0fw11w3v2fjf6d07a73jqh97j";
 "memorygraphs.doc-0.1.1"="1k8gppgv5kkx7i799mwc9iclp2rv9hgdk2bwnqcyc3j3rmnpyiwa";
+"messagepassing-1.0"="0kl0q70004m64ykpbh1ravkw4ywajkfaxq7gicb4y6kz7navzbzw";
+"messagepassing.doc-1.0"="1dll59aw1c88cfqp45hrqq0kfn1i4kj7252sns38wmblh54r6g0v";
+"messagepassing.source-1.0"="02dfkdjkjhw7pplc1n109rwxng2k2i2dfqw1v894r4x5whfjj76q";
 "mgltex-4.2"="11xl6nw76hana2mdcq7m4h6kx6zx91apxcqkgjczcw9f7ip6m3cl";
 "mgltex.doc-4.2"="10jqlxxdp5kszxpwxyjf5mqaz6pzbp559kdzicm6qvif23cfgacx";
 "mgltex.source-4.2"="1pdlxf2qfyzm3pjjpl0wir4sr255lqnspbsvxfy7wz78aii2ik5y";
-"mhchem-52662"="0cp7dfkry418kb0md1bvkv5b7x8m5r5ygj6lnz3arym2fzmmrp7z";
-"mhchem.doc-52662"="1n1zviwdcdlg33lx8k6q3q70ccjqhk15dcbnvxrq6mh7hs5d61d6";
-"mhequ-1.7"="0r670dwmnr70dwxq4si58km2znp1dj6xy40w45q0bdiqzs5rbc8r";
-"mhequ.doc-1.7"="037is4p9k9x9my8migiiw6n5yzrb9zfkhhyjjgmh855fdnsri26r";
+"mhchem-61456"="07dnb38z8p5a46fp8rx3nqhqni0lwg48wzi2bc2nxb4yb0wlcfai";
+"mhchem.doc-61456"="13b1yc9zi2kblrmmlrg43arxg45g7y2l8kd2sq64jys2nw7sq17n";
+"mhequ-1.71"="0f0srylfpzirxykn1infyqwqrsnw28a7nmvh1gzb7ns7fq22wqcn";
+"mhequ.doc-1.71"="095sy68hw3qyybqd8nx4fnjxxm1b4wps41x42q1lpha85y31yzpv";
 "miller-1.2"="1nk31l9g231c3dk70fqph444z9x5rdjy6g7wazy4ygl3q4gfh6fj";
 "miller.doc-1.2"="1vvxnbbjn325y9s5h7qp6v2z1xy6wwppwqv6iwdak7mf47gww2gf";
 "miller.source-1.2"="0jpyvjpaqz1x5avqy1dzf22qwss7ksbp917ncmgjdxhj82jhy2d7";
@@ -7848,9 +7938,9 @@
 "nchairx-1.0.0"="0nv33zq3gyda9cxf4q7ixw0q73aabjm47mjxqipl9cyp1wv3r0kz";
 "nchairx.doc-1.0.0"="1pjnazl84w4bz7lydhy6lklh3kjxri12gswwffw18a92jff88acl";
 "nchairx.source-1.0.0"="1gva51szjww2qr33mizyxsgd262xcw4116nn1dm9z0dg278hwy8l";
-"nicematrix-6.4"="0hdz8nnf7id4y21n4497ywxxhkvav6f3yaj7l7g3psby1gbmqxxn";
-"nicematrix.doc-6.4"="1siwsxfrjv8ajvjmcp7ijgw1rah9am93v1ykqv8d7lh3d723wa9s";
-"nicematrix.source-6.4"="00nv34zcghbasmlqjcy26r2vslb812dnmk9vdvjvpvhrs587d4zi";
+"nicematrix-6.8"="1pg3jz3f0kr5i5n1n0zqjiz2bd8kr6bl9p2s0024mcpsr026q7jj";
+"nicematrix.doc-6.8"="0ad5c6lvf5l33bgfvkj58a3fm4ww5bm4q3arcbrd4cnj8b52z5pr";
+"nicematrix.source-6.8"="0d1agg255z3b71b1vjh4qkb545vi8n1b4gv3si88igs5gzrbclk2";
 "nuc-0.1"="1918fk7bh6pz1grm1655fag16i0ir67ywcx28jsggsly6641nkm9";
 "nuc.doc-0.1"="0r4345bpjdb9f5gmcdjf6zav64gab5f9i4nfql01yg7b7mhk487x";
 "nucleardata-1.1"="0rrxpz66rf6g9cp6ix4rrbjqj9s357qsbv87dhri62iy3alw5bv9";
@@ -7862,15 +7952,17 @@
 "numerica-plus.doc-2.0.0"="1lpv72f54a2ny9ilhqrmb0dxqyx6m6wsnl32j79n42k1cahhyh37";
 "numerica-tables-2.0.0"="0dw5zdivhhnh2vbp83wnv0cijd0sqd9ddqx4fsbc3z06a2r1pcs0";
 "numerica-tables.doc-2.0.0"="1x60sr6l0p7d599dslpxxlnch9fnzpd97h2p82r7awyz52q2jjm0";
-"objectz-19389"="0s93jjwcmyjd126wmf2rw3776jgq0ldk40f269cp29968q00sfn3";
-"objectz.doc-19389"="1qxqphnsgh412lizx6jij6qhnlx1d558bzd3klqf950bp2hy3cm6";
-"objectz.source-19389"="1l8afdawrrcnbpqdhjls28ncksg8lzs7g59viqygwixwplha0fb9";
+"objectz-61719"="0s93jjwcmyjd126wmf2rw3776jgq0ldk40f269cp29968q00sfn3";
+"objectz.doc-61719"="1qxqphnsgh412lizx6jij6qhnlx1d558bzd3klqf950bp2hy3cm6";
+"objectz.source-61719"="1l8afdawrrcnbpqdhjls28ncksg8lzs7g59viqygwixwplha0fb9";
 "oplotsymbl-1.4"="1x5wqngjdmc4751ci5qaivzgqynmmg00kg2clngxjqf48n4fakdd";
 "oplotsymbl.doc-1.4"="0bj6w6h4g991rfddmrxgc02090vay2h2qjx36cb0hfx55gwkmh3b";
 "ot-tableau-59318"="0c3nlrm4h0fs3ddm54jpv9w2qpyql7ys1j4cf3y7svas59px4b8v";
 "ot-tableau.doc-59318"="0sj78f1vgr4zy0pyjqf82jf0xyrmrj29xn9a0zgzhn15rgh8wdyj";
 "oubraces-21833"="1rhavggv1c50krafvh7lwnvarh7lh59x7lwkipw24qakq7l2a6mg";
 "oubraces.doc-21833"="1bw3b54cn5dk0j4diq8qxfba0w3p0f78h4kycb2bqd2gq7258vyq";
+"pascaltriangle-1.0.1"="06gbr5jgfbms6p7ghdkq2cs9d6p8yr3mvhb0h811y5rphrfzh36g";
+"pascaltriangle.doc-1.0.1"="0fch8y78vd7ykwn9qdgl6m787m89ff3h1fpj0vvzj5vbxmvw6cli";
 "perfectcut-2.3"="1hjppa3dv8a5740nr5jya445y5nb0nb2z1jlkqh386bnvgby8393";
 "perfectcut.doc-2.3"="1ly3zrrrfb3jihf02p2j5ym3m2gnr18pf2v5qg8rsj2l258xlark";
 "pfdicons-1.0a"="1pxw1mhm2lmggs67ql176f6csajabhylmlxaxp47irk6mlihiavk";
@@ -7888,8 +7980,8 @@
 "pm-isomath-1.2.00"="0kl56njrcs2qklkr49bnkx17qd8csa5bcanc4ypxxv883895qg66";
 "pm-isomath.doc-1.2.00"="0glkk1l2gkqzkjg4vwi9qd3yfv3xsm4ssi03jizy9dxrxbgl60z7";
 "pm-isomath.source-1.2.00"="1ly3bh0b1xl5wf3gxvzrwwg2kglvqmaj3mb7alq5x8q2wn1sxyrz";
-"polexpr-0.8.5"="1jfqjy862yy8ampc3amkqly2zyz71rrdhjkm1j7kb5yyvlq1gwyg";
-"polexpr.doc-0.8.5"="0z2fcrks710p9m2kdj79q2iv1ny1m0jgqsdd8bk0b4ww1zrmyb33";
+"polexpr-0.8.6"="006s47psyd75qzgjznbsw3x27ngxrr06f5zpl55h3w9m3167yic4";
+"polexpr.doc-0.8.6"="0lpzqs2wbwwhrdrm4hs96d3q41m65bzdcz0q81xy2v7lg1wxf8pc";
 "prftree-1.6"="1sdb56cvlfrys3f884hg6qpv1nwd6ywfyiq8168bs78g4q2ah4by";
 "prftree.doc-1.6"="137f5nbcm6p428an3v20j5cx5djvdri12ph07czj13877pjy9ccf";
 "principia-1.3"="19xxp7m5vwlsa45a4yc42g0h0l988ml60c6qvs5m3cmz0aaxxl28";
@@ -7897,9 +7989,9 @@
 "proba-15878"="15d8n2ik6m5sc4vlp3k2w3h5h8h5s4agijgcnlkmklw3qv172vii";
 "proba.doc-15878"="1m2mbbn1fa616dfxkb7x8azqsvczyifygjmbblsyfkd5kl6f8dwp";
 "proba.source-15878"="0wbnfa1i6vbpbq2a4yhsvpyifiw1pirz72qasxm1nwmgfg5dndx7";
-"proof-at-the-end-51194"="1z6288wnaj3k0ql1797l6c72nrzrvg1x8py46g93q0awlihka6cs";
-"proof-at-the-end.doc-51194"="0vpjp1s66ns81qd03nqkw4782i7pl2va7w4nbngdmn38fs18l2gw";
-"proof-at-the-end.source-51194"="14d7xbxsm61f6z05442jhx47zblpc1d8yi57ns3vcbggaiv23h3q";
+"proof-at-the-end-61933"="0r10lfzqvpq1zmg8jyq5v3ib8sdahnrrnd7d4d2z2mxnk1q1k1q2";
+"proof-at-the-end.doc-61933"="0gfhi29fv44awwzr1cbbsnm734kglgayi96w0yk7i7g1shd1qhn4";
+"proof-at-the-end.source-61933"="17p1hi4xhmf698as0py5na76hzbfmqzlhn5sb5675i9qs5gw6syh";
 "prooftrees-0.7_svn_8641"="08ijsd4gfkgczfgz3wmlyk6pb61cqdc7f36v5131xv12x6s2kd4l";
 "prooftrees.doc-0.7_svn_8641"="0ldhmf22q3m3nhxw2m1z9f19xzw753qrm0nw8hch6wzk419p29k9";
 "pseudo-1.1.3"="1yiqgp1ymhfjh2c1j8qa64bj6cq74jv6ba1wz3i6akngyvbmgqpf";
@@ -7928,9 +8020,9 @@
 "rmathbr-1.1.1"="1jlafpdjryj0sic2zpn5f90754ydnfbb74x8b3q19klm3n20bsr2";
 "rmathbr.doc-1.1.1"="1nfcd9ypyscqv3ghlaljrnj4rm2md5h5k6yl173n15zrr56sxkfd";
 "rmathbr.source-1.1.1"="08mzgxkwk6frzgd2hq8fz30dliwrkrk23xmqy9p0qjmq9vi7vbf9";
-"sankey-3.0"="1f336mia2nr3sz3xcr878ymm4anyja94lmglz86skvl75jmh8p83";
-"sankey.doc-3.0"="0yb8sm559fqskd06lgkn3zc8zm24p9869f9d1gimfsk373hb6mjf";
-"sankey.source-3.0"="1q73vwvc2f6a820fixyg35mw0wp8z649zn8p6k4bd5hfzg7a3s7j";
+"sankey-3.0.1"="0njrbv0wghzsyhhxlahy6gc4jbgyz4q43qzqc3jb8lln6s6yn6bj";
+"sankey.doc-3.0.1"="0v7pfxj823fxl8w8v8khgnd64g0wr7198071ai7s6bpd9byq3pkj";
+"sankey.source-3.0.1"="1qr7nfgh8zigjj2hhwsvhnd3dl6933dfaqjidbraid3l93af8ynz";
 "sasnrdisplay-0.95"="0qhvx1nc7v6l2gq8c3av4sqsjlzm1raw6cmrf2lls7dg4dpz60pm";
 "sasnrdisplay.doc-0.95"="10f3cr5vfdgb7g0yw3pjqdfiaciwb81m2gssn0in1hv8izy09krn";
 "sciposter-1.18"="1pihppjlynvdlsin8brrhl2mg2jif3fa1mvsard686m4ar6id25f";
@@ -7961,17 +8053,17 @@
 "siunits-1.36"="06x797504p5lzb3xlkri1sc9whyjjz6a95gk8kvpympglm8fmpxz";
 "siunits.doc-1.36"="06saapj9rh5gbrj0npb9rm60xrww8rl1y5brvx97gj4qvc3i2pic";
 "siunits.source-1.36"="1clhfsmydg2xjajak0ssa9v5sd3id957si5zvyq3njgl9cpjwi9r";
-"siunitx-3.0.37"="0yg5jgf0wf6q7z99p2k602s7zs8gd9bxrfjz8mbvyhvrg29f4nj2";
-"siunitx.doc-3.0.37"="1sk9dhdn5g39yz5xcjp78xs5f594ppdc61bnblqnrfhjr7zmkapb";
-"siunitx.source-3.0.37"="11fwphqih749jwz0qnnp3zkm33hr5k41iqm99b4v88sgcrap0cgw";
+"siunitx-3.0.49"="005q2x65zjm16fja1l88xzhns3a0iwfimg2j4lp7n7invfv1qp1q";
+"siunitx.doc-3.0.49"="0i4z1cfrp5nr92iwy4kwhx1qk0l1lxpmdkabr2srdhwil4li8hmj";
+"siunitx.source-3.0.49"="1i712bh0d0a0r8vjxqx6w1rl5sqhdlph19743jm1fsc3y5r3bnqi";
 "skmath-0.5a"="144iwn9hv4d71420878y7dzygmyyyr2l12gsqrbb44mdal68q58p";
 "skmath.doc-0.5a"="0an8w64z7dvbxgagga33zar0m2l44327q4lpz59n75g7c6qswnv5";
 "skmath.source-0.5a"="0finxgy2sj5wpzmjh5zfcq9l3dzka1mlffbgmhzp7yk57rrz9lr4";
 "spalign-42225"="0wy2kliv3mrcqvandk3qbbqjbri6xq69d5jsi80l7qdiij86z3g2";
 "spalign.doc-42225"="0jp34h19q4588rli6k0v5kg47j6i1gjpjgk772fkb7l0f5wln7k3";
 "spalign.source-42225"="02qzd21qzb8s2jsip2fr1jgf11xd7xmiyi7fv0s9ylyfr259c5b1";
-"spbmark-1.2H"="173xmmr69d4682glhqa95rrqpj14kc35bha66jm7jrdg1h1amqlj";
-"spbmark.doc-1.2H"="1yk7s064w5px1vhsdshq6qg48z7wqp82rglc8i47f4mqxxnszikg";
+"spbmark-1.4"="1dvydq78xwkjp9scsa8xql6yd4x7c4c9rwi3in0lpvwg7b4zgcr8";
+"spbmark.doc-1.4"="1hn6yaqzfdmv30rz5lz2b5h9dk6dm36759zqyfl05v97y1zq42i0";
 "stanli-3.0"="05mq6zhs6x5qjqk58gwws9lw3p876bd1f8a5c2jvb2azjl7d9r4f";
 "stanli.doc-3.0"="091knxhx7jsjiv4ip0z2jbazvv3xmbvandbraxbipp4zqqakb8bj";
 "statex-1.6"="11qpdrcszbsrasbasmk6h9wg5r2a11pm116i16h7mvw73vjaq76f";
@@ -8030,8 +8122,8 @@
 "thmbox-15878"="16c6p3n4zc2726adj8z131h03gbzyhmh5bj8hzc286p96131swdw";
 "thmbox.doc-15878"="15mkfzmy0141k5wgspngbwnnldf0i1rvbmq2bkzcpb72v9vcj8fd";
 "thmbox.source-15878"="0lv5mr23wwhig6r9fyy7rlv2cqxlr35y3g89i938w35s9q25xx08";
-"tiscreen-60551"="0ylyr60r8p08bwp8z0svih5syfwskhifnki12lamnn7ag2ndfsjp";
-"tiscreen.doc-60551"="15nwsryrqsx9m6vqzfw42civ3ka3yxg477pgk7bshz8s7yn4n238";
+"tiscreen-62603"="143c2w00f4s24qli3wbnhps6b5pbrvrhaddpgpgn52pmy20f5z85";
+"tiscreen.doc-62603"="0l0qs27bm0hy835zljyapyhs7iwvkpn85vnd0z02wy8l0nb11ly8";
 "turnstile-1.0"="1br0ny72qsv5fpfw4x0v7q3dqy2jgicyd97ibzpxc04mp967njjr";
 "turnstile.doc-1.0"="1iv8ysamcqzc7lavhskf8kwi29jn9xcda0am0ak9s1c7nz7pb3ly";
 "turnstile.source-1.0"="0aadq0w193hl3rlb1d8xv60yy0fam4aprz4j96dphnanbb9g27ll";
@@ -8043,9 +8135,9 @@
 "unitsdef.source-0.2"="07v6xpwkag6fp8p331gcfbb0p1ca36rvrs9kbkayc986k6nds688";
 "venn-15878"="0kfq2wnjsbvk0ciwrm4923fpr7whmzyv240r4zps41vzpc4mykiy";
 "venn.doc-15878"="0izj8qsnxj9jgslwzz37xwr9n812y3cxmfs52yd7p4638qid50im";
-"witharrows-2.6c"="0zvrvhyn2c1s8h9a74g0dhnipbpkgzwld3l6ara2zfisx8rhs0dp";
-"witharrows.doc-2.6c"="18nxizvzlfhhsili06h19x1p2jy0dy4h1q6zaap3b013sipljhii";
-"witharrows.source-2.6c"="1815k8n2m6bsdw4ks9az3af4mcazqgxx1mi2mmrp3dypjkysa17x";
+"witharrows-2.6d"="1lj7acqibm3pq0n4gyl8ll6870rlrbw7ds85w20mgv45gvh2gvsy";
+"witharrows.doc-2.6d"="06xr14f9fhazmh5bbvlhimaw2mpgfss30dw95lvjrymx4mxf8c4x";
+"witharrows.source-2.6d"="16q3n27070y5dk66y9rsbd3mncnyd198pl5h5k81k21kq7f44cdn";
 "xymtex-5.06"="01432q9vnzbxzli9bdkdsd7ccvw3ksc76cs3568lsr35bkq1yy1n";
 "xymtex.doc-5.06"="0bx00qsgnndw8kq59nbihlzlnwvdf6gncdl3ljckcdn07i4mhl7i";
 "xymtex.source-5.06"="0gxi985kgkfyybg90f14y2w068ysy5vk4irc8lfvdgil3y8jwi4l";
@@ -8055,8 +8147,8 @@
 "youngtab-1.1"="18h6a4b4psbm0hjxq2xnk4bkmsa1wd2fvarrzfkhcj01hgn8bz17";
 "youngtab.doc-1.1"="00jkdw02iary6s5szh7hf4qjlr7r8y9lfmvlnrpqkhh6pdhsy3jh";
 "youngtab.source-1.1"="1hjqkj12jx9imfqm7y1mqdvp1knhf69kbixr88varbh09d6r9p66";
-"yquant-0.5.1"="1l9rl5fv23za8xad7k2ch54gccqyc4m0ja1vxa1498nqas9lrqii";
-"yquant.doc-0.5.1"="07ip1m65p43riy3byfzvdb06pnjx6wmp9y887f0hyndqvfa03i5i";
+"yquant-0.7"="1d51imps4w3lg9jdlqmymhblkk4dxp53ijgygz64lzgq0sk096ip";
+"yquant.doc-0.7"="1zbvmwbdhnx3xy0i6yapvd6245762ri552h9w05v94p1r1xk7bd2";
 "ytableau-1.4"="0gfpxbvar3m21pj74j19qnj8qakbknhvssyvfyw61jwdd8ygdxkd";
 "ytableau.doc-1.4"="00k10759qihk3330bwfpzmrm9bfb8513w3sak9jlfy5inay59rbd";
 "ytableau.source-1.4"="05pxlbj3rdgr15cqfdxviyp2698b7l44rzgssx18yv2a8qnaxylh";
@@ -8094,8 +8186,8 @@
 "feynmp-auto-1.1"="1yhvcxiq6ajjmlsvnznzvp35sap1qsnj54zv70dwpl29rkrgrmsp";
 "feynmp-auto.doc-1.1"="1y1pwlplkz2z7lqz84ay7ch1lw4plh4n69isqzsvhilnr31fkf0a";
 "feynmp-auto.source-1.1"="0ja5yqs9szyk4s2mk9cbjf6p98dagwk7pycma84y48kinkl96s0s";
-"fiziko-0.1.3"="1raicsznsws4rykrl9azi9lysb107cfbff6sqpp53y4m326xvn1f";
-"fiziko.doc-0.1.3"="0hfw1l9scfmr5k6jka8v5kajxqzcvdp31j65w3p9dsz9xvlslgc4";
+"fiziko-0.2.0"="16r25wagw155fnz5lngc3jqxaf5sy1f2mbyzdklnizaazh2vbfdf";
+"fiziko.doc-0.2.0"="0pdnd0h3hkdw32m4yjmqj14ijg3qix8ajjxkhvi88h3pbwd0wjiy";
 "garrigues-15878"="0qr2ak20416p5zlavcbihxkjvifzwj3cf03ipsnxlp4a0r3m0hgy";
 "garrigues.doc-15878"="03cx077kcvny07dkg9dpgvdb5vh4z7v0c80rn82vqj1l3i0qrxkn";
 "gmp-1.0"="1c98y5fhnq5w9b6kkpnrag364269s90kccgbqwr33bn9ixhsf0dq";
@@ -8103,8 +8195,7 @@
 "gmp.source-1.0"="1qg01aaf4s939ixzl7wdariaxxg1d5z4s76cz50rpw0p7rgdqbay";
 "latexmp-1.2.1"="03rgabck8mcxnbg1avl638nhxdk6smvyd21v2ns61hx3jn09cpv5";
 "latexmp.doc-1.2.1"="1ad9axqv8h2s2xckrdxcnl8kazpgijrgpxmbwsb3h0hqb3liznsg";
-"mcf2graph-4.76"="0agz99qvlfmcqyhj5lvrdy7r9mdqpz2xb6dla112m03zk3wr709y";
-"mcf2graph.doc-4.76"="0z9mrqcg95v2wvpp4fpxvii2n1h6zx1rpyh1wg5bqdsych8p29ic";
+"mcf2graph.doc-4.82"="13x2ciqjibmzmjm9hpsrpgl9i1vjp03kw87ggnr2b4xb7yzrgw2f";
 "metago-0.9"="0km18bf69rf3rs42b0azc7i8bypy14201vk13yf5ahsypcjcgqns";
 "metago.doc-0.9"="1bx240q75pq9v23gz82i26vrp7z4cb00f9nb3cvvknbndk8y7hy2";
 "metaobj-0.93"="07p2r8975ps1ricqralyw2qz1zq5lmaaf50xqd68qwxmgrs3541z";
@@ -8121,8 +8212,8 @@
 "mfpic4ode-0.4"="0jdqbdi2gqb1v4cqahwss1rj44iw0753cq262j8zmaarski351a0";
 "mfpic4ode.doc-0.4"="0sbsb9lysz6hysrpf9dfgm2zn5qcsv7aaf5llmy9kan0m4h84afm";
 "mfpic4ode.source-0.4"="0iya4y3msmyq468zj2msq93xpa01044kmnv4dspz1fmh0324iklm";
-"minim-hatching-2021-1.0"="1l5yd41n52h3z12vi15njay6bihr697j71q6iwvvy1qn16b1bmkp";
-"minim-hatching.doc-2021-1.0"="0fanqsqq03iway8mdmpvk2yy5ga0h4q68jmf5hx3kpa56jh4sr02";
+"minim-hatching-2022-1.1"="0raih3zsaxpas4myf4m0bmdxqm1av62cldjs4z768nndkv6xl1iw";
+"minim-hatching.doc-2022-1.1"="0bngn9d24w77dxi1s7ad87gi27m48d4jr2j51cpmmagfdvlqnfsi";
 "mp3d-1.34"="18wgwwvh2vj1adbvbl1q6lh0wy0cynfvrx6cgq0m5nqps7b3idra";
 "mp3d.doc-1.34"="032ywwjrv21ypnlidvn95dcnq179pdiail86s4nxxllkjrryc2db";
 "mparrows-0.1"="1hmbpfw1wn13zp8dksnlc86vb19zs0dbwx9hy0sbiyfmb7hidznc";
@@ -8191,8 +8282,8 @@
 "harmony-15878"="11vh6dy95n049bfr46yyb6a5ziawmh3n8dr8l7cqhj4pqmkpgad8";
 "harmony.doc-15878"="00kf7kbrfr2cqv7izx1v90mpa81ncsn0r9jkxkhz8df8fsizaigl";
 "latex4musicians.doc-1.0.1"="1zvy2pa93kyn056d5n0irzdq5xmzki6d35zxacxfy19r0g9rwq6f";
-"leadsheets-0.6"="0y4g6k85p411qcp5lg9jwz4z7caw4g906xgqf9813xcnry8y82a3";
-"leadsheets.doc-0.6"="052bjwhdl1gb2bsnhm40h4xi7hp6xw3kdwz62rm8lsb446kz7v5r";
+"leadsheets-0.7"="07w8h1wv322dy0b69d13b9k59m6iid53rlpn20ps5ss2j20b62z3";
+"leadsheets.doc-0.7"="17xbqxhmxc39gxd5ckvzsmhiabsi2afh2r2jv91im8inqfqi8j1l";
 "lilyglyphs-0.2.4"="11mb49rcsi051k7yd7s02k9ca5g4mmifdjx1nqkvs6rl922wcyki";
 "lilyglyphs.doc-0.2.4"="1wl5ppgazb27s3wxgmz1xw8cwwmnnn0s582k5swx8qy91qdl08r0";
 "lilyglyphs.source-0.2.4"="0657barhxkzh3jj3b8rk5rl9i47k2h0p1wa2vxj00fdfqfdjn161";
@@ -8217,8 +8308,8 @@
 "octave.doc-45674"="1r9wywnqhgrg2jjlzyafhdnyxd3fa17zjbbw1bj2a3r2jzd201h5";
 "piano-1.0"="10gfxklfwf60p54wcbs4l1jpwasxvvbnkjhjpiygnk6mvzjx7dyl";
 "piano.doc-1.0"="0czqrjlfx1i6k02aa1r1crvkw7k2fl17vzqzrkc97msprrymxwgk";
-"pmx-2.94a"="1dwg3v91z6q6hcbv8imrddncxcf9kmyfsra589drnjldcxcl5629";
-"pmx.doc-2.94a"="0v52qrsc2qif5av3jnb7gs6ph6ixmh97j8bscxxhaip4dv2hi6sd";
+"pmx-2.98a"="1dwg3v91z6q6hcbv8imrddncxcf9kmyfsra589drnjldcxcl5629";
+"pmx.doc-2.98a"="0v52qrsc2qif5av3jnb7gs6ph6ixmh97j8bscxxhaip4dv2hi6sd";
 "pmxchords-2.0.2"="0yv1c0s3zjy5w65cpv9gmdr13wkfg04jc0g7b1f0mh8ychhdab1a";
 "pmxchords.doc-2.0.2"="0n6g5f4szxsr6zqqp2czi29m1dncfgib1pd90mbrjprvwh0filf2";
 "songbook-4.5"="1qknajn3s4vpw68hwn0mjf9zllhba035gjgiwj807nifhgm2bvpv";
@@ -8277,12 +8368,12 @@
 "expkv-1.9a"="1mvm8xzrgvpmypvyf15yba8hbnw8hb738gvkhx62qlpxnipw063f";
 "expkv.doc-1.9a"="0r6gqpsdwvkxq48x9rgsha9j4mcralw0kd3h8pfr52l6f2jjiff7";
 "expkv.source-1.9a"="1j1rr7138fhxb4h3sdsz7iqnrgzjdfq4y7sc40ikq2z5zvvg35kr";
-"expkv-cs-1.1b"="0aj49hzlvsdydxvw8ygf8axj8hz8lq2nh7dxzcy5wkv61n99dmv0";
-"expkv-cs.doc-1.1b"="1a78k8wdrfqmkj3xwgw493c7w61gnd8l5r712gm1qk5dwfh0dps4";
-"expkv-cs.source-1.1b"="1j98hcz0sifdwsxf03xgy8ls9l5kwnzmr7xm82m33xj85903s3wy";
-"expkv-def-0.8c"="06k2qxycgxaciayx92c3rxg9zqsrjx9hxq8shw9301b2rqvdlqax";
-"expkv-def.doc-0.8c"="1kar0qhpqbpqmcwwyg601knz4jl3q9saixc7d3qb4x3pf71g6zcw";
-"expkv-def.source-0.8c"="13v7af3kbz92mln0rlmxkk9yc0m3821srxbngr3z86lfczra6p2z";
+"expkv-cs-1.2"="131rg0km4iwl3w22mgdsgm27c0g2d8w8zwmpz4406w71b0ii0gvm";
+"expkv-cs.doc-1.2"="1w4szgfy0lm1mi6pqpq5ksxrh3h375xq5d0n7wghl2k006l54r7p";
+"expkv-cs.source-1.2"="1n08zk7k63cx1nsvyng0dq6vq3mqca8ivg9zmd9bbdxbxy06flj6";
+"expkv-def-0.9"="16fmma7rcw4ggyd3p02ccsv85zp5g42rz7qsg1nqal50jvws8574";
+"expkv-def.doc-0.9"="19pi7qjg3b81w3ypmbgkmbihhkqk1rw28c4jz6g29ml7qv309v9z";
+"expkv-def.source-0.9"="1k2ip1w7fk5c6vz8jlfmiibvf4z2wyc4jf63n5gn60xas6sys6pr";
 "expkv-opt-0.2"="0qxk3nbwizvczjrqkch6r1d53bxrnnjxkjyakj0rrlbaqpyw4859";
 "expkv-opt.doc-0.2"="05r8p2k94fh4fs6bmf75g4njpppqya51kvqnznzlhf17b82lf5iv";
 "expkv-opt.source-0.2"="1z8plih94z428g95avckmpd29g3byq1r20d37sw379adwfzdcwci";
@@ -8384,12 +8475,12 @@
 "plnfss.doc-1.1"="0iw938rnvcfly3z5v5gikd3svx4mxwfhw0gsyv26m37l5slqvf1w";
 "plstmary-0.5c"="0cda8irxd0gxa18x47v6d1wiwwwh6w30fl9ipxdz112h67l342k0";
 "plstmary.doc-0.5c"="02ql0pxjkp5a803f9ayvr9splfchzk6yhzjfrmh2nxzwgczy9s50";
-"poormanlog-0.05"="0k4j77q0h7c4y3aa21ngkkrida8l0lp9k42489kilxzpx6ppjb4i";
-"poormanlog.doc-0.05"="1s54lg1mh57k31j0mcfqiqh54ia7prqf48fzpsv5xgfp2spccnpq";
+"poormanlog-0.06"="0k4j77q0h7c4y3aa21ngkkrida8l0lp9k42489kilxzpx6ppjb4i";
+"poormanlog.doc-0.06"="1s54lg1mh57k31j0mcfqiqh54ia7prqf48fzpsv5xgfp2spccnpq";
 "present-2.2.1"="0irxkzfg19h5pn0drgl5dlpz34j1p5jpyii05b2xjz4810gnl79h";
 "present.doc-2.2.1"="0c7pmcjhc3p4ilx3fr6pxc4708kl7iw1lds5ngh8mlrwz0hhsd96";
-"pwebmac-4.6.4"="1ghb8vvdfzh4ic2cjnjp03m862kzkc5k88djgydhi71d5hcvdrpl";
-"pwebmac.doc-4.6.4"="0jgbp3nlc5gfqm28axw58jqr4wna9sz172bls05q7iflfg9kvff7";
+"pwebmac-4.7"="1zhpzcqsy07k0xgkjjpz4l3m9lli9nalvs1wffybmclb73w6f5fc";
+"pwebmac.doc-4.7"="1iqpw68wk0wy992f8h8kylbd0ldyqqz5wl9mc10f7l6k9inlj8zq";
 "random-0.2"="1y4dn1i3kmd99b5br7a2j6ppf0ikzp744si5p6m5rmvg4vh1jh69";
 "random.doc-0.2"="1gfcswp2krrfswyjbyhck4pb0lq03jh2mfwzm2iwvd3zlndvccbz";
 "randomlist-1.3"="1kwbg73d8hk4wh69fajl1zqyvkfyfxzyv5xykknpa5s67pxkh9c5";
@@ -8414,9 +8505,9 @@
 "termmenu.source-37700"="0fvv10j1s49swvif5prjiqvk699l82js29n09scv0x1ixcy40h14";
 "tex-ps-15878"="0i35b4pp38d1l5rac059znlkazrcqa62qm8brhdmx7zzkbhyysi7";
 "tex-ps.doc-15878"="0kgf7y3nxkw8x42wpc1g5mmmbz28n73vgwd9d6rf6fjpzrycc2zx";
-"tex4ht-61362"="1xg14fh9d1a4jb84hmmai9y94rcza4n59ydqhsrfcgabzp8m3irf";
-"tex4ht.doc-61362"="04z1bsgy3lisx7ifskxzna5jcbjkbwwjlqfwbfppnmjp5rwphxdv";
-"tex4ht.source-61362"="1a75yk51r2s6k9bysrjvpsggbv5icim1fj82h15i1c5cdlha6lp8";
+"tex4ht-62532"="0pd2j4mm1z8akscjw33sm3v7b1ivsahy8amnaxdm7hky0ri6b9s1";
+"tex4ht.doc-62532"="04z1bsgy3lisx7ifskxzna5jcbjkbwwjlqfwbfppnmjp5rwphxdv";
+"tex4ht.source-62532"="1cxmqn2w9bs2vcwc3izd6nddcqa2zddqdjag0wp650y86wn8p5hp";
 "texapi-1.04"="09cnhqn4gxf0alkx0276jkpcsd0myypbn94jzsavnjq8jknp6850";
 "texapi.doc-1.04"="0529cncxbw53km02pymj57iphgziri3d9cj54pqmjqjx9qmgwfmm";
 "texdate-2.0"="06bqyfl1vnj4gadqsx94lj8cm1ia3w3bmlsfjwwfaad0al3ncxdp";
@@ -8456,8 +8547,8 @@
 "bclogo.doc-3.1"="0vf9fvm607fzw3rvc93crxjg9ilm6d7x7q5n1qrfmkzmkm5mjj89";
 "dsptricks-1.0"="074z88g37hq9xjlvbncmiccq5klr3x8ffprps8xnzvhk7cdwld2f";
 "dsptricks.doc-1.0"="0jj47j46l587hr11n764wl167rkp7w8q9z16zwnnb63dp0gi18s2";
-"luapstricks-0.3"="0haw20l4a6sgi6096wdbj11ipvikv45a2ypksklcxfd95b7v35wa";
-"luapstricks.doc-0.3"="0dyd3q96l4jnm17pvkrmx5660w08b0y6z8f1wmdy3g1dxh8ii4mb";
+"luapstricks-0.4"="0zj0226g77g13b6xqj4sz08cj4dz8kybhmkkk29l0xm5ii4hapnj";
+"luapstricks.doc-0.4"="0hvyfi5c5l86rrlmcbzyklnqgx67sbvabb4hj72fw552wqvk53sz";
 "makeplot-1.0.6"="0qp0qgcli40hd2dxgbd8fv9s03r81dlhh48pb8la9sh28qrb9i51";
 "makeplot.doc-1.0.6"="112chsx5wxrc7k4w3qzf23pjgr0np1ip1ylqs2igdcihchz6syyd";
 "makeplot.source-1.0.6"="1zksg7iqb9g6my9zyyrmwkhx04qy0118lxf60cm00njwmsi8w1pq";
@@ -8475,8 +8566,8 @@
 "pst-3d-1.10"="0mh6xbrvwxx7nxp4yqm71hhpqjb41g4kinxkj2vmspw9wrwclbj4";
 "pst-3d.doc-1.10"="1dp9l6vwhb306j998hydb07c6ig10ibn7h0wwiaisgabn0s69xqh";
 "pst-3d.source-1.10"="0m9lvgmjzzc2lmp63vnly30j9886qabgbhqwpbbyl035cy6k684n";
-"pst-3dplot-2.07"="0zj7r5xprkc136cvi5wmjdc18g3h4s7cdv0z8sibmsh75kzpswh7";
-"pst-3dplot.doc-2.07"="0vmbf45bndmjvgw4m21qhnvwh1ar3k8cmigmd4iybqs4fj0sf5ra";
+"pst-3dplot-2.07a"="1km0iilm9rqf422sn8mkiiw6b3xlmhrr9nz4w85dv4af70hwvx4x";
+"pst-3dplot.doc-2.07a"="05vsiaglfgqzfwlzs2qmrchrfgzycszac4mjyvgynqzvfpy6djcp";
 "pst-abspos-0.2"="0pjh72cjpim4v0ri92b7nbjdmilpfa7d49vsvhfqddq68k02m0yc";
 "pst-abspos.doc-0.2"="1nwjynxlpxgqld6slhhrzlsalp9296nbnj2kzr6a9c9b4sjxxbp1";
 "pst-abspos.source-0.2"="1p9i5bg4jx8s6bb6ilbaa702l2mn911g09pjdmk6mnb405d908fy";
@@ -8553,8 +8644,8 @@
 "pst-gantt.doc-0.22a"="1fqkwzsliv1mg3lyidgcsy652l5d2qy7x1rjix9swvk4vblx4fjs";
 "pst-geo-0.07"="09br33z2vdr2dlsfyqf8rya3qj7bila8r2xwqbc6g96yhn1c3r19";
 "pst-geo.doc-0.07"="1xxyazg51s4nj8hz8adzv3lvpr2dc1ji0sfm46xr763srwxpjjd8";
-"pst-geometrictools-1.1"="025ai7cw5vv9a4n2gdp68gavmplp4cj3s3n14jhk5ga26a411s0n";
-"pst-geometrictools.doc-1.1"="1z2pgbf426p5qqqcpd3iqhdhk5izgxshqilm0bky4b459wagh9wx";
+"pst-geometrictools-1.3"="0i80r2n3vsnf4sczqkh9ri4dfb7dfxg9jcyhrrx2az552q1mr33h";
+"pst-geometrictools.doc-1.3"="1ff7302f5ik2a367c81hgk3d88kkapm1jp5nd2mlybywa2nj5s0f";
 "pst-gr3d-1.34"="10jn2wdc908z2imnpcv03ffm83228fam0cqgmgmcss1774r2nc18";
 "pst-gr3d.doc-1.34"="0985ydi7jfsvlynjs5ddjhyhbh11nficfphy6qnvbv0jj367rabq";
 "pst-gr3d.source-1.34"="1z981d54aclpbq9ggy28qgnsspgwkavalm0j68pj69jxbcfxrpby";
@@ -8595,16 +8686,16 @@
 "pst-mirror.doc-1.02"="0bfzs55sj49y3lznll477bag80yf06pcv0hh0xfg3zzvhmpcpiky";
 "pst-moire-2.2"="16zhb6gqrpdn56cggm80q67yp175dkbvyj5iy6zr5bxwj6qj8px3";
 "pst-moire.doc-2.2"="05g9hsxfcm5yl6afrlpba7hc7hd1kr0k00m9zj0jcqp1ggsqnb6a";
-"pst-node-1.42a"="0ma3q1l68v5dzch9z6z3idixgs8v9vp0rqij4fqafp3lx3vcpdi8";
-"pst-node.doc-1.42a"="00cmh35ciz3vmy814id8i0phj0j4hfjkbsm18wjyxj83spy24pyw";
+"pst-node-1.43"="0a8bijpghvf5zx9zsd5m4bcwzl526f4r9vqa4dbqdxww0zxwk6gr";
+"pst-node.doc-1.43"="0w0wr8xc237qjsz14yf4aq56d6jm8a4gmzp790rsphqaavab677a";
 "pst-ob3d-0.22"="0pglxl2prdi347qqrjpyk6hr3arhfc4rrcz1mnyz7q5jyamlskp5";
 "pst-ob3d.doc-0.22"="0s0jyb1s21pkmdnz4wdz793lbvidl9qdfh9cfqa0bwx9mmjvhpnb";
 "pst-ob3d.source-0.22"="0v9kih4gxk7aqwynihipm1595iswwkv5y6qj262aikhr6bz8v0sa";
 "pst-ode-0.15"="19kqlpsrrzbisg7wjk2z3a9f1xdl3msx01x861yw9nrqh3qn1ddc";
 "pst-ode.doc-0.15"="1bgc5hi7q0sjjq1qfdkfa80nfb7d4k964k7wx4382b9cg6m87zlr";
-"pst-optexp-6.0"="0j41zdqyv33mdk70i8smkhznz2bn9h4gzamgcrv0744ydibyijg5";
-"pst-optexp.doc-6.0"="1rbz7x37y20xnabd233frd4w1zpssd70mvl8pzzclyr40d8s66vw";
-"pst-optexp.source-6.0"="1sbpjr2d8k7ycg072hvl535lhh0093nnmhvb935p66r7ipcqx2lf";
+"pst-optexp-6.1"="194g5i604i33bvnprfyjab50smag094lv4gx2skd2h16zfzmg9lg";
+"pst-optexp.doc-6.1"="1dgcb3fax1n15hz15fr0pzihyn3yyzvidw6nacysc4qxq2l6b56d";
+"pst-optexp.source-6.1"="1cw69vk791rr15dc3z6ivv5lbcziab0bwiar8cr767fpm0w4rrfb";
 "pst-optic-1.02"="1591vaw8y2k99vr0g8dy11grrp98hvgqw5rl9zp501dh3hnf181d";
 "pst-optic.doc-1.02"="0q76b92w32x744y6ri1nf2dnzv00kyw32xyv3l5snvs728qdvayd";
 "pst-osci-2.82"="0gz1ac21gwhv2xqf5ny0zzgi83yg84qlxgx8mdj9xpnnpv6mccig";
@@ -8681,16 +8772,16 @@
 "pst-uml.source-0.83"="0q5x7m84qdv8sy7x2nqfbhwp1lryr5vkji4hf74a0ialc617nfvd";
 "pst-vectorian-0.41"="0q4yzrn6rk488awv2g7qlba08w6807p12dlk1pydp42sba3a3sll";
 "pst-vectorian.doc-0.41"="0wws88bwd9zmlhqv4xw6v31cl5dj64hzvqgw944gpjcgxpz19215";
-"pst-vehicle-1.2"="0ibvvjlfnlxdrsfhm35r60r66jms2y674libsqlpk7f5bww19x4v";
-"pst-vehicle.doc-1.2"="034zhw30ii840mzg2ix2gf3xlqrkiffpjfsszw0w9nqqyp8r6vls";
+"pst-vehicle-1.3"="0a8809rs553n79zvpi8vcg92lly643n1ss53pfkvk2jki5nszzwl";
+"pst-vehicle.doc-1.3"="0adwpcxnmn8nabc2nsw1d5rj6p0rxhdidcpyhmkdw0rxf17604s2";
 "pst-venn-0.01"="1i9frqc6b4wg3pb0ks4v0xxsfzs348ddhncr31mhfs39nbj6029d";
 "pst-venn.doc-0.01"="1y2pz45hlm2gd1lvj8p40ldnl04pzccgbsa3asnbpcifkx3gj4s7";
 "pst-vowel-1.0"="1p1adlrg62jsqzkjkl8avb79w26kkd5jdssmkcsd65dg5qfa9x50";
 "pst-vowel.doc-1.0"="0wyl0mvx2d0zd8q0sdmyrqgr72i2igv0669ajv0gz8miv04vr41k";
 "pst2pdf-0.20"="1rm0frzi52i3irfy5703kw38d3f1grby27nryjpb4ziiw6n5yizb";
 "pst2pdf.doc-0.20"="1sll10kps82b47npv2g2r1l3kkm5y75mp2p2pzqsnxxivgl5kp2l";
-"pstricks-3.11a"="0zk3b44sadldzbapds2ps4r13djr8n5pyp8xm84fgciff0qvm8m4";
-"pstricks.doc-3.11a"="0zzm7pqr4zyzg1nlwvax0w4vdbk4ljynfsp5frg4505b9virn2l0";
+"pstricks-3.13"="1whpg6a6b29dm7znp6w5wz92y4xq5skg2svp1w3wmbflrvy7kgyq";
+"pstricks.doc-3.13"="0vyxwz1dj1vvvqkg7yxkkw1lkx4vfhlc8nschkpnf68mqarc2zsi";
 "pstricks-add-3.92"="0aj7h2qhmscdpk23fvvxk0hgjq7v1pcg5aqw0awdi14pm75ajyd0";
 "pstricks-add.doc-3.92"="1kf6b5p9462fyz1mhs3q556njmlyv08pg44w7lx4k50jw871cq3x";
 "pstricks_calcnotes.doc-1.2"="00vgcdf73p4143dfjcvs4b5v4phvisv76ink3iiijl6s6f9zbmy3";
@@ -8707,9 +8798,9 @@
 "abnt.doc-55471"="00m174q9gxsm23j3fla7m7lj5fbr7iqfw02dz9s6481nfsjh1wgy";
 "abntex2-1.9.7"="1q7r2j7c5p1f0gbrc3sjd5gjq2mhljf1nj5n5760snhwj3qblr66";
 "abntex2.doc-1.9.7"="1id5yj5kh0qgjywbiajaf5hf9ix9jq8178fv2kvp1yslra7r20s2";
-"acmart-1.81"="0kr5a0wgklygzpva52fj6f5k8120akmnh1yhyww8wci2m0lg7pq4";
-"acmart.doc-1.81"="1pwyqccn2w3kf2zlyvv9rn0gmzarsw2fgdvmxif4q89vfg7wvi6y";
-"acmart.source-1.81"="0awxba4vxqcy7qafxvi6a5s1yf4ln1sz693xgkc2s9na6jz2jjjs";
+"acmart-1.83"="1dv66v1309z6x7h51ccynjwdfycd1bahs1arpdcqlb7x0bx1gr5s";
+"acmart.doc-1.83"="0xl7p4xydfdv08q1hvshr4749b8gjih2z4r400kcmjf2a5r0c3px";
+"acmart.source-1.83"="1g8a77ymln6zkrad32h7syw7mjal30clswmfy9dn9cv9qhllhh5h";
 "acmconf-1.3"="17l1kcwv6wk5p752lmanlx0bmh2py4hfxranapgbdrhjpis4jm9i";
 "acmconf.doc-1.3"="1vyhkwqg0v3pxjnlwzwnmiffh6b3d9nrwnpaqjm24j9d2sc6cxcx";
 "acmconf.source-1.3"="1n8cf6n2fdb88xmnj2m5r3cjz3jlp9n7bn1yr717fsp2ks81pr3f";
@@ -8745,9 +8836,9 @@
 "apa6e-0.3"="1da46dhvpwmjvm3ma4zbnfgsc2yiqg9d6rdrw3bd5h2ibs3vnlmg";
 "apa6e.doc-0.3"="17m97m9v0pcs58i3k7sdj9h1vifv3f0cxxyn4fzi8pxvzljwl5qm";
 "apa6e.source-0.3"="1155ic0k6f6gw6zmqq8pv74hcn45skjzyarf9vpkcksj96qr07ba";
-"apa7-2.14"="0qyg2zp2m3hc47ff91akpz9as5k8b4vmz71svxj5a602337v5v2d";
-"apa7.doc-2.14"="1gzpgz3sk9109gfa6pw4p76jfzkx81idbpbbkx2jvsz0skjrzha0";
-"apa7.source-2.14"="194wmd47mbnmwiw3bqd9grkdfkr49frdyb80jhkmjf12f83i89kg";
+"apa7-2.15"="0ypp42gxnwpv5p3m92yd4v1wl4cbw5pd2r2mziwyrmz9r4sxfqbp";
+"apa7.doc-2.15"="1ivirfb2c7v47c335c5bys6k3bkz2ys1s33v0n7s8yrd41yhajxi";
+"apa7.source-2.15"="0wnyniya9x9dd0fhin39chhlfansh7zldmix4sb2kzz4xm6aq5pg";
 "arsclassica-45656"="13fql9q89zkdhid841hwxyrdbj6bd692lnc52d0yiibrd9gd9f4a";
 "arsclassica.doc-45656"="13cqb49296wzph7msrhpzswlyknvhrjaa81509l4j4mx1snxyk4b";
 "articleingud-0.3"="1ydj9dysf2qgk36ssp8pdr4c6dh5iw27kcw4ykzkx22ih5an0n01";
@@ -8757,34 +8848,36 @@
 "asaetr.doc-1.0a"="0whp9d9pas44j775i4vn7zh5ss0yr4q5vbx51kz768zwgs5x8222";
 "ascelike-2.3"="039w1lm3bpfrrb5inrmzklmr9yic7x1fs0lpjl8z49mijvqsv1df";
 "ascelike.doc-2.3"="1hb732idc36m86qgss7wwsyqj6zgirh9qvf7ybpmqz6arwsml46j";
-"asmeconf-1.27"="0y4wyxdp42rxr4bhh0j342q2y1603m68ykifksayh465lv7xyw3p";
-"asmeconf.doc-1.27"="1b8y1hdajr9n2m4fl69493bdgw600ndnn5f6gb3198xi8z41pnan";
-"asmejour-1.15"="0pc8h715xa2rw89yal3ngchghi8qvlkfrw9gxjgd5sln9lr94w6j";
-"asmejour.doc-1.15"="01xckzsf9s3jph1dchc8l627mv55n4hyzwracnxh0i076jk34vsa";
+"asmeconf-1.30"="0pjl3fdb6kija97923mc1n7z8pkq6bxdp36212lvxgxnxdwzprgf";
+"asmeconf.doc-1.30"="1zwm56sffpi8n5xzircahdyvf2p63p3kx1l89ym1ncwf0akjzmm5";
+"asmejour-1.18"="07b7f2k9zvp93nvm63gvjscyv04qxvz7wjszzgcrz1z9y6alj0fs";
+"asmejour.doc-1.18"="177mjrn6sh6i9parq1sabxlz1rkp44949n02mq0dna8a5l981qc5";
 "aucklandthesis-51323"="1zlsa80vbby0jp46jicygq2fn64f1mgppbw6bq4qm9ncsapdz92j";
 "aucklandthesis.doc-51323"="09n2pdviw6xvh9ymka32pyscn16vgcxbij79nq0hxn6b6msxnlq1";
-"bangorcsthesis-1.5.4"="0sw9hzzpmgdp44xfg2iw6vv6492zhyhbi2k9xjm5xdz92mqhy4f7";
-"bangorcsthesis.doc-1.5.4"="1lsfbwcs3z5ddry5d0a9p3lij509hdkyynvd0d7iw0793q2i4adr";
-"bangorcsthesis.source-1.5.4"="03pj2633lasfq4fw2c7s09vh0abaspc5jz9n5ki85nn5kz1nlp75";
+"bangorcsthesis-1.5.5"="1814fspfg988qg7ihx3rwfxk7c79avd2fxwyxcs8pp0pk38lg15f";
+"bangorcsthesis.doc-1.5.5"="0lv6iq40wcd9zanvs51c7k251qnxz59470pidr0gy3swwpa8aqwq";
+"bangorcsthesis.source-1.5.5"="1q0kdk6m143d9niwa59lcihifgfhl4j603x53dzwaj68hil5h3g2";
 "bangorexam-1.4.0"="0aq9bswsygpbsjsi3m8gg3gsgwhp8i1hfapdvlf9055i7d09lyxb";
 "bangorexam.doc-1.4.0"="0x5bhac4gryhmld733dk6zhz2z9w7gawy7yv432v57hc9vvbhhw0";
 "bangorexam.source-1.4.0"="18w8zf29fz1ilas7h9nzvn0saj52n825c8vkqsq4np40sa2ccn4w";
-"bath-bst-4.0"="1psaz3dw0qd9z8cp888hyfl68j6rk8nn3pldvalfpyb1bmzr6aza";
-"bath-bst.doc-4.0"="0v4vap8rvcmlkz147y60pc0prc8ggc0v78laags7jnjpw6f887xx";
-"bath-bst.source-4.0"="1m0j1rm20q6h8ywcsf0d63srgbnr93kxacs53jllan4pc7vjd7vc";
+"bath-bst-5.0"="006742phm7xwm8yjxvbrx1by99f0mbpfa6l9j86ibmx2zdkak3wb";
+"bath-bst.doc-5.0"="12bbnq32slw6i0n47lgkmwvvxn0jhgjj639g8mv5n3wqdrvq6gyq";
+"bath-bst.source-5.0"="0dfkaaska55fnhzx0f9ldsfz5rmrxvpnkikr66cz5nah37wnnsiz";
 "beamer-FUBerlin.doc-0.02b"="1ragp50ky0p240cyx9cbwhri5k4ghzbvclps9p40wzgjlqf8a5ws";
 "beamer-verona-0.2"="018ckad1q7ffkixvf6q9a5d4fzgpkpf9qv06cfv0rjwp80k7psyg";
 "beamer-verona.doc-0.2"="11vv18n971pcmn8lf2cya7jf55x8zw1d9s4sg2l3q76rdj7l53ra";
 "beilstein-2.1"="1xh2955zfnss2n9g8rsa0m1kad4b4xpsdrjj891kj97hhgd9hpdf";
 "beilstein.doc-2.1"="0k78mwjqqib6hx7c6lcxkzrbg3gfw64a68fj32g0wpvdyj406ssf";
 "beilstein.source-2.1"="120gcmpz53l2pzagh40nsji9g86fq4xvahzhwqqw7p01r03wc0cl";
-"bfh-ci-2.0.0"="1r5pbcyppqls9pf4ig6860bayx13rga00np8c1ygr30dgilr36sg";
-"bfh-ci.doc-2.0.0"="1q6bbclvvmlbmhnqc1qlki8xiyjyv03qa7v3jiz4aq2dvbi16p0r";
+"bfh-ci-2.1.2"="1adi4fqg27zl509nd3w9jjb8mb8is0iffj7p51bhxcznqzhbyakq";
+"bfh-ci.doc-2.1.2"="05w9ljw1v07p8ypgar1qq6xi6xrhmb5xnsmlzmyjm5vafdmij4vh";
 "bgteubner-2.11"="0a8zhnl1nxzg5r525sn8sz44crjdm5fmy09glp8cjj7nic5xj32g";
 "bgteubner.doc-2.11"="04nh6c3q2w984x7kmgj023dbpjq9mqciyg4xrypgc4zv8wvcgv1w";
 "bgteubner.source-2.11"="11g65q55cv4s72cpraxw7yj4qskkhqhc0mz0sfy6c8jrq7255ils";
 "bjfuthesis-1.2.1"="1gmd1fjwl49h98mh1bqhlxw63bcpy3p6ri33642p49aypj9iyk80";
 "bjfuthesis.doc-1.2.1"="056iczn516aqi3n04qn4q86w06q5xb3cz07sdb9lr4yp35gxmfzh";
+"bmstu-1.0.0"="0wjmndhd1nv6rwzgql74a463cnpzj7nkci0p9mrg89s58k6hay1c";
+"bmstu.doc-1.0.0"="09d3sb46rjfjjwksk2cl1mj04mfqxgi9sb6jw8rmadfsnzqclklr";
 "bmstu-iu8-1.2"="0xvxli6na2nc03qwn4x68sq4jdr2x830yvfb507j1990pni1y01v";
 "bmstu-iu8.doc-1.2"="0kimc29vl79ib5xmrlb1ipfslq2y4i3hnabxcaisrb54z0y3rp1p";
 "br-lex-44939"="0pdhzadajg5vx5da6ildn9k2nfvf1ks4pxjgm32ajpcpfxbjpwk3";
@@ -8797,9 +8890,9 @@
 "brandeis-thesis-3.2"="0c4hd638rqqhjgnw33l4myxzc02lxd1ki2dfsldfklfhhmk57xx3";
 "brandeis-thesis.doc-3.2"="0g4b92mmadzqw7kcyf80jl9bashqnx9j2sjq2n19gq7gaksjzc53";
 "brandeis-thesis.source-3.2"="0k14yxds0jlmkrl3xdw8mc4240rgv605ahg35bqfvaq6nws5q0xr";
-"buctthesis-1.2"="1cyhcmk65aj8mln0jvra25b9yvgnp78asqw282y330jav4am568y";
-"buctthesis.doc-1.2"="1l2vdkr7sywfdl6ij7549dwpc4qkm87skavqzaax4675l3qy1570";
-"buctthesis.source-1.2"="1s7fp83xdky348avnr30ms0ihnnqdw90lh1angfb6xz854miw483";
+"buctthesis-1.3"="0zgqxw2252msasrfbixi6x9917pi5kkpqpvwsp75nw26nrni98gc";
+"buctthesis.doc-1.3"="1sirbd5zkg6v43gn6cf5mlpri3ccaylf48q1ays4sfa74a3799y3";
+"buctthesis.source-1.3"="07xrapjfxb4zwjnl5qjvmr6vpahdkmddcgifrpp21pimcwgscdb4";
 "cascadilla-1.8.2"="013x6his54n8q3qp2xx12c0s2fbjca1ffmcb1kjy0yr0qy0y698z";
 "cascadilla.doc-1.8.2"="1l8xpfmdp2sc54qxx0ywh7im342nd3kbmgkx2pfzwmqz3xhpybfd";
 "cesenaexam-0.2"="15n0abwviaz213q00nv6faxc67fyqz44mvp28zcyysrhmrcxw159";
@@ -8824,9 +8917,9 @@
 "cquthesis-1.50"="143w42d3xw31dy8wdpqx01r8q9vs2an1ixnyil8n0q0af29j49bs";
 "cquthesis.doc-1.50"="1b7k2s3ils5s5yb3fdd6h0is494pss7s76awfn3dj6yxiaps5zvn";
 "cquthesis.source-1.50"="05gypg8zsdpfhp11rk7nii2vdw4rand5lw6ijkm23lbq2b5nwvwj";
-"dccpaper-2.2"="1xg7w64yw4gqnp6b134qd4sz39mrw69953ai91mrb0wmq3yavym4";
-"dccpaper.doc-2.2"="0mzbl4n33qhmwxg46pb8zy5b1h783gmji4apijn7bfsn6ap9pp4i";
-"dccpaper.source-2.2"="17v81a9zkgx8kfkbcdrjxk6xpp8b0s5r6hxafymv3v9sb3rq0ghh";
+"dccpaper-2.3"="1q0hdlkr80qsgw17d4qlsm59wl22qz1b6fmr2cawfbcwd7aj6jd2";
+"dccpaper.doc-2.3"="033dhadkcknyhilqkwsmw4hx5cmkl35maanjvxb5jdp8vayj0d9y";
+"dccpaper.source-2.3"="193bikyd65k1wd3xykq6innzzhqrgxlcz21fa49cgilwp44l08z9";
 "dithesis-0.2"="0spbmfqf2i12sp0qvh6875vp2zrgpkrhvbmjzwyxj6mjn1yr7r9b";
 "dithesis.doc-0.2"="0w9xgl8y2w1f7ns2nn9j5rs7hd39w6as2drcjmw4dc0vdbklkayd";
 "ebook-29466"="1jy79jrf8cd1rljg9f3g0hzkihxkpybvbgjnkzd5y6cfz7zaynp4";
@@ -8892,9 +8985,9 @@
 "gsemthesis-0.9.4"="1y9wj43qpcgp82sfi5s7izyf284hzkn5py0v145jx03l2kxhv90c";
 "gsemthesis.doc-0.9.4"="0fyadx4x8d64h75fq3xgmfxympcbfjhwwmwg4bpj20d3dbf0rh32";
 "gsemthesis.source-0.9.4"="1i5w77zwb9c4qc90hxz7sna8g2c11mkf3vnkkm3scm6pkbg9z0av";
-"gzt-1.1.1"="0xz7lgl4awqrb5cz3x6gymlzgk1fibvnqahds571qy4vcnbkig97";
-"gzt.doc-1.1.1"="1cxk9lf26wi4naqn8ki1kf07vnqcp0s0smplyxf07vxd5pmgz3cg";
-"gzt.source-1.1.1"="0zy2wgjm8b7d2zg892yrhl4cixc5822d4bwdcnpypbqg989436fj";
+"gzt-1.1.2"="1yncx641p2d66wggmznm8qpgps3j4hh5sxm56xwqnj4lhpqpn9bk";
+"gzt.doc-1.1.2"="1lv1609v7hr84vb7gb44wyxjxs8792mrwm1bfxcr8bzx7npklr8r";
+"gzt.source-1.1.2"="1kmkvpa7p9wgrchijldvsp8av67iwphf2rnrrgm695fbvpy5gnzl";
 "h2020proposal-1.0"="1yz8bz4nmccv0v700zz7x11fjdqhs4hgkz8cd6bnqr3v0n8k4xrf";
 "h2020proposal.doc-1.0"="0yd0iffrvahaci04bmnd20bszgshx28apsij1i35l1wjr1hlnfcz";
 "hagenberg-thesis-56798"="0zfp35s1mmi3qa3r7xwlyynncbrqbgxr1mxbcpf01fszyx5y3lw3";
@@ -8952,9 +9045,9 @@
 "iscram.doc-1.1"="1p0p4w7pkyc9xp5af1afmsibbbrylcfrdcbn16adscw8y6wmds05";
 "jacow-2.4"="06w817m1ll5p4bs3jngq8csy7xc97h918r9z5a2n43whc6azpw3v";
 "jacow.doc-2.4"="1vsc0nhdyzjjl4ajynl68cqvkcfal8ndknkb2zrzfmx2iic443g9";
-"jmlr-1.28"="14j317nhlc0ihr6d413ly2n8p2a38q8g25pii2a2j3jvdyyas83s";
-"jmlr.doc-1.28"="162cglkqy9dz0iydzk5f2g6dfwhi574xqw8xhq5i7mrrq111211n";
-"jmlr.source-1.28"="09wxsfm0x3l3y68brdp4jn3lg5w9kg23b1mjsvscls6pi0ac5sw5";
+"jmlr-1.30"="1vliagbbyy5nzfs8pkl71gy0zvjzgqibrh7c480aampwf5qi1gq8";
+"jmlr.doc-1.30"="0mv7yxa1rn0qaz3qkzxh705ia27gqrjzpcqi5gpp340hvi8hm09g";
+"jmlr.source-1.30"="15p4dsbn25gpsm7avswx8vw3ljfvwmwbp91qlzm4cabsb54kbnhs";
 "jnuexam-1.0"="0550skzwdanpzxa22rv8mx6c1ihr930rfaq51yp82dijgd211sql";
 "jnuexam.doc-1.0"="0ghypsr9h50cxafhca7h8pdvzh8jn02gh889zw6avk5wx5vixav5";
 "jpsj-1.2.2"="0yv7lkv7sr7qhqv0rmyislf0a5rcd125kqwbnfj3696cwhm5aqf4";
@@ -8962,8 +9055,8 @@
 "kdgdocs-1.0"="1p1rcb0lzcsmgyqz5750pl2r73fd18k76gry45zfsr7750kwx7x9";
 "kdgdocs.doc-1.0"="0b2j3mw8z0f3d4pffqw2r9zxpmyvykd36sskkhfg7wa4q521nf3d";
 "kdgdocs.source-1.0"="0sipsvbi9254zpg0bmcfin60szx9q0vnx07a9bdm9ma11qb1djpb";
-"kdpcover-0.2.2"="0ncykqhwnvgwh048f265w851q90icgxmjbn8sm6lmhjsz951gbwz";
-"kdpcover.doc-0.2.2"="02x1160lx0wkpf4rf5day1h0d50nzdw4jp2q8ij4z9syvd6p2ip9";
+"kdpcover-0.2.4"="0bgirpmm3mgvzy8a8jbj5cr8q39mvvs6mpsq9x5q3vn5xg3zmgyc";
+"kdpcover.doc-0.2.4"="0qnivs3y65g4p5byx0crd1bq8p9bbmdvrhis58mdxxkghr7wiz58";
 "kluwer-54074"="15av38sb3pzffxvrxlbwxzgvhnxhsjhkr3qwrlqswwq1sy4a2ssc";
 "kluwer.doc-54074"="1cx0xya0s27mybl37gw3yx1rmcyvrxnrp8c4012gvmqiyqyx4sjx";
 "kluwer.source-54074"="17w0ybfzs9x8yixzl8cfldqi42sq2jpkyap8i08mvp8krqgviz1n";
@@ -8971,8 +9064,8 @@
 "ksp-thesis.doc-1.0.2"="01pbmmwwjzd5cq4xxmx3fknk8d4q3fda3680g344g5s6ra5i45nj";
 "ku-template-0.02"="1f45rknbzb3d3h72vznfzspg7vx9im59w5s5lwv4z0b4sk7n1d18";
 "ku-template.doc-0.02"="04gpy6a0mpjhbl9h2rnflvhxsj5b7x7fwll8z211fl10cnvalcxv";
-"langsci-58820"="03hi3cj6wbg2l539gwsws26hh30jsaha89g0a3xn57jg8g4yziyd";
-"langsci.doc-58820"="1mhpmfgiyxglxgjbji1dak7hfai8f5fkjyk15hyara7p7j1kw4bc";
+"langsci-62061"="11rqrmm9l5a67x6ar6kla45a378srki54pib476dg5d7l4arx4c4";
+"langsci.doc-62061"="0gg8f7chgvliwq7v6flhqycc1fg4i7kz9mg1j38fr9p2zg4vjydh";
 "langsci-avm-0.2.1"="1ayf5xbplhjgf2fcpxzhmdz2sz9bcjdnn64x4pc1k2yrk7zrva89";
 "langsci-avm.doc-0.2.1"="1b780ydqh0v0phapnjk1p044cn4hs4ww9ahx0fm2d0gj77fqsd31";
 "langsci-avm.source-0.2.1"="0rkhl4pkcs6cjvrd3f14l18rwk0ylq15kfc8k1n97bvhwy7azk5v";
@@ -8981,6 +9074,8 @@
 "limecv.source-0.1.12"="0m0li0wa9pk2p5m3gqzr7n78qglz68akw7f5nq69iddqwh5r827b";
 "lion-msc-0.30"="02xxyl35xl6c48x0fdlfkcv4bfhz4hghp1v3ff6pf9yl3cvqlh15";
 "lion-msc.doc-0.30"="0nycprcfi6769r47llwma71hzdb9a6sprdkkk6p898pmk367wbnf";
+"llncs-2.21"="0wqwzrjqv5zljfpvah70byl9zaq8d41yw9qyjr6j0fdwpp0dl006";
+"llncs.doc-2.21"="0wjg833s1i6w2qhlcxlahqvdyfykc4pv91l03bq3pk77c3934h2s";
 "llncsconf-1.1.0"="0c1xjmpr9jb0k7xj6nj5p9qli3lxl98gnyq0dr94m2h31zs5hpdp";
 "llncsconf.doc-1.1.0"="1a4l8piav4ihc628ac3sjxz1v0rkva7in6q10xw3vhwdxsxbkhvz";
 "lni-1.7"="1y1g323qij5xdjw1c4n31lkzldj5bkfg5k1vs0snnqppmznp4afg";
@@ -9011,17 +9106,17 @@
 "mnras.doc-3.1"="1ml220k5md4hpj6lcmx297pbmdbyp1dj1j9vb55dcl5ypc6jr3sy";
 "modeles-factures-belges-assocs-1.0.1"="06n2871v6jx29r8qjgcpg4h3qbnc6kw24kfk2f08wbc2rg2xdkxn";
 "modeles-factures-belges-assocs.doc-1.0.1"="1509xrny3xvy7nii0v1rga8ip18g8bv3d6vf8a3qn0cayfa9p248";
-"msu-thesis-3.0"="0cs29ym525ggqsk3nvjkva6pq64175m4a6ggxin1614532h0skb5";
-"msu-thesis.doc-3.0"="138da00kdg42k1kjgg7kmvbkcxdxpdc64npkya9hsn19xfhsa68z";
+"msu-thesis-3.1"="0v7pa7b2hi1sfvc24g6xc9fcv11z67m5csnikmkhsgfqqgaj0xj1";
+"msu-thesis.doc-3.1"="1xjd05yiix0jhzfmm5iikzc8dbwcnvhngc4ibx5yjaqbd2a2qqri";
 "mucproc-1.02"="06x3hqdp6d6nm3n296wnj4j4w93cwgjpz0nlw5qj0z44zlghs483";
 "mucproc.doc-1.02"="0y33jak5lzhjp4v5d4pzfj7jlrr87dl6wdnkqcc0p9fr4fd2h1z1";
 "mucproc.source-1.02"="0xzv1m01rj74gg188snznshir510lj5myckfjx7am6sxwlfni63i";
 "mugsthesis-34878"="04r4y2xvwfmfa23cadgkz6v0q5djlhm291dqmnmmqq7lp569037j";
 "mugsthesis.doc-34878"="1wjlcgb5lvfjmxz6dngd76bj6046sr8lfzrnpg4pjbw3s5v2jd1n";
 "mugsthesis.source-34878"="0fyslrcw5f9fzchjlw5pccf32vybh7vn1jl9dpc8y86x8gg7ngf9";
-"muling-0.2"="0mh2iyjikxmcnag0ww3n1zw2j8vyky8q148nhrmjcacbb6q6xgwc";
-"muling.doc-0.2"="1grdqc0i4jiprspfwjq7qlvnbz3z6wzgl9x81r9fxzp6ic6zl86r";
-"muling.source-0.2"="0d69hrm92c3j83jz14zv40rv8hrshaw8gxx8jmgwf4avrq5civgv";
+"muling-0.3"="1y69g2f37fppvgasy06w40v8yg6aqgacfjynz0azfw409xm3b7av";
+"muling.doc-0.3"="09i58z3268k20ifc4rp9lf9mcpaqvd0gza19l3m1vg8r4x049fw2";
+"muling.source-0.3"="1awvkpd1flh3l938dclwfv819f8iqnqhkfwrqmkq0nbq8n9l929q";
 "musuos-1.1d"="0hfrgx3lk7mf9kzf6n8hswzh116pmllx0k3djbfinvvvhnqy972s";
 "musuos.doc-1.1d"="0zxdnzd8x42z5fpvkarhsvdw3x4bz6qppn0iyjff1fjzwl8q8dzh";
 "musuos.source-1.1d"="0igksc3i5ydqps0g172i2hkb854bnkf7xh4jqvwlimrlnhs7nnkk";
@@ -9044,12 +9139,15 @@
 "nih.doc-15878"="16klyjxzxj4mipql71admicnzlnasnv9hb5pl52wyk4ic8ggdgwh";
 "nihbiosketch-54191"="17gggbkag8y4fjvj248wc8kqiklsqmilcyisx9lwcf5irngql646";
 "nihbiosketch.doc-54191"="17lfnfkgjdhj8i5zv08v6lgxrrjg8hzbbq9ihnpcbhj2scn96g7s";
-"njuthesis-0.13.0"="1n5n66l2jdbs8yknbp4fzwz322vqzy919r6q56q7wmqlndgdl3n7";
-"njuthesis.doc-0.13.0"="016mrvmwajmvx10si6wafsxjjdsmqkms9mb7glry782cgmbgg9qf";
-"njuthesis.source-0.13.0"="1lnvp22sy4dgnfzjh05vhbmjp2wapsdw57fxlb0vc51x57ina20a";
-"njuvisual-0.1.3"="0s1y1873fjk9kr5flq47rwpmjpcrif6qzrgaafjlv294z93n4v45";
-"njuvisual.doc-0.1.3"="1490c2r4vask4q89dpiwaq4y033sj96vrkdca8hyrhhdczxrb5m7";
-"njuvisual.source-0.1.3"="0hd6wih3g3jz4n7bkv4ppca2l748s8f4sdrkm8wbbnljkd5g9yz7";
+"njustthesis-0.0.1"="1ar359ssgan8pk72bbvd4lp2yg63ww6g2ymbjlxbv63qh6czvqrr";
+"njustthesis.doc-0.0.1"="0s7dwmmhpb4qr2nnzr7jjh1zfk5fcvk51nxrf7i7ikq8jss0ic7s";
+"njustthesis.source-0.0.1"="12lq39rhj0z6msdpshagqylknn31dd2pl6ymk1lfagm2bq8mvx30";
+"njuthesis-0.16.0"="0bzrxgmx39q7nrxpzlqgfsqw9qv13bzmrkzcjbmcf56hf30ssjxg";
+"njuthesis.doc-0.16.0"="1sdzs6zds28f37235ip9v5l7fmp9s51xpxpvcb3zqkvq6k98kz7i";
+"njuthesis.source-0.16.0"="1ibzarcjni8gv55q4pwrqa0zyv0ms75xsbbla5j3s75swsj769in";
+"njuvisual-0.2.1"="0qb6z0mqrb10cprq2jn7ki51s90vw2bnj6p0qhsqjwjkvs65d50h";
+"njuvisual.doc-0.2.1"="1dlmk1mdglz4xmxy23sy97z1nc0wra6pbmkxarj54n9ldikvasym";
+"njuvisual.source-0.2.1"="1gibqcgs87cwg64pmfg0kd8ybk1fjmybsvlrfqyf0nlvlczz4qk7";
 "nostarch-1.3"="181a6pjdr7ffsngv7j84ddps84csv7ir3wr49qjax3lr5fhiw7qi";
 "nostarch.doc-1.3"="1sjd4yz3j70pncr47ryis4w4459lbs4jpbb75wdzvgygv9qxz3w2";
 "nostarch.source-1.3"="0f6qrlydiajnla9n4mqnv8f1iyl0f8ip98hbx6dzmmjz0k5i9bhj";
@@ -9058,12 +9156,12 @@
 "nrc-2.01a"="01pczvyzfc2vnrfsab180fg0nz13cmry0dvdxmq3lxzp75ji5aqj";
 "nrc.doc-2.01a"="0l6lpvddg25k8dynqr26gj7fnaq7k6zbzp5p62684sz9351pvz6c";
 "nrc.source-2.01a"="0lzfw45m3mw7yd9sx6lya6cvan696p74wrxgvmqa73prc2lhmbv8";
-"nwafuthesis-1.01"="066s1n4zzn22mb833r3800pj57cdn2iysgzckvslk06ci9013rxy";
-"nwafuthesis.doc-1.01"="1dyxginsnxmas3i42r0ss4dcyrmi7fcschlxp4qv9ns5v3l0flyk";
-"nwafuthesis.source-1.01"="1v5fh5wf40a2dca2yv8mngy7qkjllki4xf256rmdk5cb83mh4ph7";
-"nwejm-1.0.2"="1bqbqx7knh6p4zj5x24i4dslrkrhj8wmf3az1dixw4ba4mv9g60s";
-"nwejm.doc-1.0.2"="0i1cqqxgbl4sdb580mjaqv6khinrg3lb8ap3ckx98wv8q8n6k58l";
-"nwejm.source-1.0.2"="1w9dmb5x3mqis980j2732p7sfbc45ikp06vf58axz26vjfzn9xvr";
+"nwafuthesis-1.10"="1kj30zcyjxs1ingsbz9wbbjh5chzljnvrhfgkr52wp9qs81rhwk8";
+"nwafuthesis.doc-1.10"="1np1px0dz84ppn6aqyvm98824p0vps18qkjs03vppvqcf3rhkp1k";
+"nwafuthesis.source-1.10"="01p3afmfsab3zxmxr4qvrjb7j11aiyx5jv60b8lw2y6dgb7z9gz8";
+"nwejm-1.0.4"="13alyi2bhjh8fwl0yg1vpz4wwdf7qys70zpjf8b1ghdi0ybbszcc";
+"nwejm.doc-1.0.4"="0cfr85wbyq5r78y6xxv21hl16a0nmvpqk2qyy6xfwnr4n4xnsirb";
+"nwejm.source-1.0.4"="0wg2hm7lbicnn8ax1zh1s4cfn36iw2n4z2xaxm06l7hv3q4yninh";
 "onrannual-1.1"="0bj29lk2nlsmky82ablxl0r6k6wl627zrsv9g97hydgdmi5nxasz";
 "onrannual.doc-1.1"="08c3xmyiz91623lnps3iahi5ga9941nc6bvxmdihadxhm2lk769z";
 "opteng-1.0"="07a6dja6s7c1759i9afgacx4v0fli98s6mcq5zig689hpkw841fg";
@@ -9114,9 +9212,9 @@
 "revtex4-1-4.1s"="13azycwjj9ihirfkcgmjrpvjha4wngmgkm6irh3388zwjs2sh7sj";
 "revtex4-1.doc-4.1s"="057yf32dsx1j3b89wl9jqrafvib8p0x6l3w3zk1c98p9vp8c0lm8";
 "revtex4-1.source-4.1s"="03dy16s50bkgj2l2zkm3z6mzf9qwhrax7cxll2p0rxxwfgvpgh8a";
-"rutitlepage-2.3"="1h6z0p6m4a1ivr57165w48b9rp5jiad37cdp2z9akk3pxdg3ywq6";
-"rutitlepage.doc-2.3"="0d8gi3ks8wjjbc6zhw4gmpsx44pr93iw7bw9ak5xfnm04p9vw81r";
-"rutitlepage.source-2.3"="098n2wkddrc7f74jlbrfvxzvplyj05dr1i7czah2ciw2z93m53z1";
+"rutitlepage-3.0"="0gslb7lkinbhlqdgp8pb60h9x6ajypb5991z17p4d0jwifz063jk";
+"rutitlepage.doc-3.0"="11h7ppnimbf6znqla0r1vq8six0ri5ihzd82dj66hhh6ic5pq9bx";
+"rutitlepage.source-3.0"="10k8l66sjzdfrg6cbslx19a8nrvw7w5xaicn78rkkf095pyh1qpy";
 "ryersonsgsthesis-1.0.3"="0zn3hp9ipjq3624h1kdz1r55wxhawylxkmh6fi7v6cz37cnn36wx";
 "ryersonsgsthesis.doc-1.0.3"="08bylz7p9ygmzy6m8h7w33l4lch9iqnaqnb3nxw30d5gp0rsb3j9";
 "ryethesis-1.36"="18d9lw5inr4fxxk4x4xjxnnvbp2agz25c9h328gi1c3afsmi4lsr";
@@ -9125,8 +9223,8 @@
 "sageep-1.0"="0yavixnkhy1y69l38xj6pbihzm83ncvnsl6pyr3l310hif6r0wcg";
 "sageep.doc-1.0"="0z2n1511lr2m39vn4bdamw8xbxlw92p5hrsxzrnjlrg39ysymsyd";
 "sageep.source-1.0"="19547avrh6yv2v86w8f7b0pbvh8xvwa5z8q69bxcvhwj0jqjicps";
-"sapthesis-4.1"="05lql3yqxpld4f1j0745aglvnfn7jr3914m4s5579s5q99aa2m5j";
-"sapthesis.doc-4.1"="1vjmq2r7a55v1msj2ca1lpz855zbiaiv485204bwh3hq6k3vajrj";
+"sapthesis-5.0"="0d14nsxdpb3idxl714kwwgzg685ln9mifzg0jbjgis7fya1ia93g";
+"sapthesis.doc-5.0"="0bkj4hcbs6mksara8bh8cjz7jkar702vm78fklfsw1h5shlpdv5y";
 "schule-0.8.3"="1x6lddxv0gxqz7xh2wcjyrqgsfmsh7van1mwiw92ws4xd2a4m43d";
 "schule.doc-0.8.3"="04m2ar25p77bbn9hzbrprsh786dfl8rypl4w5zrnbs8kd0a582jr";
 "scientific-thesis-cover-4.0.2"="1ggghh7w9grb1l1r7xg1igdw79jswcanyn49rpnwiq5rj4a09r2j";
@@ -9138,6 +9236,8 @@
 "sduthesis-1.2.1"="1i8rdk8m8bc5lk35p7qd4pqddi3knpq1ylbxv67ij7g8sgrl9xwg";
 "sduthesis.doc-1.2.1"="0i7f9zjxs297hx3hd6cm70hkkc50wb1pcr83xk54cy72yqiq119p";
 "sduthesis.source-1.2.1"="1j6asblirf0x4f5zp8zbmpm7ak5nsilqf4ksxr4bgrca70vfava3";
+"seu-ml-assign-1.0"="1g37b3qrv358mhbq8924alaw56fzpfbykaap0nq0c40hf1x8bfcw";
+"seu-ml-assign.doc-1.0"="1sxqr3rjlmxs31v9153ky09ax03pyyjzg3qmlxzq6gm67ylcacb5";
 "seuthesis-2.1.2"="0yfan3cpx7h7hrnqncn152ccawlrsaccj0c53kzza0wnkr3hc9rc";
 "seuthesis.doc-2.1.2"="1hnrl455lz61y9ybhmrvxjb66y5816sq3yqb76zszrscxh5a8h5f";
 "seuthesis.source-2.1.2"="0dw7ipk6l0mwgrwrj9sxg8vidwmmy22vmpwm6j2ksnznz0238yf7";
@@ -9146,8 +9246,8 @@
 "seuthesix.source-1.0.1"="09qpilk53k37c8dzc3q3pgvm6yf7i7a09ln0yn586wslvm2dmmhr";
 "shortmathj-0.5.0"="19rscnl84f9x6r7kajj6wjh80di5y1mc4g4nybafnisap76r3c06";
 "shortmathj.doc-0.5.0"="1kzzbkv36hj2wc9kz1wjr5dlgx3r21vlyj7sy8m8i72yfnmajgbx";
-"shtthesis-0.3.2"="0kyhf8pb542mlpf1jd14lral76vlkya1iv3jyw59x11vw9c911vi";
-"shtthesis.doc-0.3.2"="02xqm4dkikb18ha2z0r63i41czjmxm7sr2gzpcgcvf7ql3n49cp2";
+"shtthesis-0.3.3"="09g79h7dwc0v06h06svj3h43q1xf31fli33xxlqnckz28i1a4y95";
+"shtthesis.doc-0.3.3"="14fqspd33n3r642mvmiamswjl4qjda2g7p62amxs69s64cqfliv2";
 "smflatex-1.6"="1w55jqw3m1a3s28hkv68vmqmbh14c7wnsv88z5qhmyqav1nbb13z";
 "smflatex.doc-1.6"="17pffyp6d7blwz0a2yjdwa84lim9b7jbg54q5gknmwi02sqdqsb0";
 "smflatex.source-1.6"="0xd02c6zzvx9av0xjmv8navff8ik9ibanmid9kls10jancp47waz";
@@ -9160,8 +9260,8 @@
 "sr-vorl-1.2"="0a87b640qdc7bysxlgr0y63znls4ryjgibi3ablnw9q3rhzbbr7c";
 "sr-vorl.doc-1.2"="05zpxq3qjhziidiq8i30hj295yh2qa3g79lx9ywlldbkyhq928cy";
 "sr-vorl.source-1.2"="1ddwga4af9k70c05v2a8frn3q779d2pw43h5bpfks5w889ss6rr2";
-"srdp-mathematik-1.9.3"="1f3jdb7vn3cg0g7ai0652nwhq99kaxh2a8kd75by04h6d5wy07xg";
-"srdp-mathematik.doc-1.9.3"="1xpyh6h2959xdq0b2lq2w79cmcp2figk4nngx3jjk7cd6z2qcfgl";
+"srdp-mathematik-1.9.5"="0glibbfy2m6bsz2vb1zxc3hanrpjiq2sqv5hbaqlvs30mscqbrbk";
+"srdp-mathematik.doc-1.9.5"="1zp61pmp24sqlyfxbvnk3cdsivlzmz5i9il3smfy50dymzyfbmch";
 "stellenbosch-11a"="07j555jrcg91nk6rgr6c9dq8y9b3i0677j339hlcb6mk7949nz3m";
 "stellenbosch.doc-11a"="0xrpmbzaa4y3v86zzdws9al13v723k5yjbxgnd9l985fgq5w21bz";
 "stellenbosch.source-11a"="16mmz7pq4y9blxskrxjq8w15zq9vrbcr6nj8ynfy13b7wxvqqrcn";
@@ -9194,9 +9294,9 @@
 "thucoursework-2.6"="18f3gbydg1z6hiaidqw3j9yqybzvcp9ykq5a7frbd3ww051rz9xq";
 "thucoursework.doc-2.6"="0pq5i3kd19ng122nf1gd97xsc8gd58l5gplg7iswfjykdk5zv562";
 "thucoursework.source-2.6"="016r76nsk9lnr2zkkwz27r2i35j154rlnk5izd11rlmsyw3ix7l0";
-"thuthesis-7.2.3"="1w3n98703grbjs83fq5yhpjk1ni0ckvb0pklv03q33s8yybyhw8r";
-"thuthesis.doc-7.2.3"="0hxip60w94jbcl4pamj838h5l842s570xd69pfrpc9xgvc4pqyrf";
-"thuthesis.source-7.2.3"="0sh69vyyx0fwzhp9xsxh88kkqx67k85n8srifcjjjawnwqw8qhk2";
+"thuthesis-7.2.4"="0vq49s15nv5lp80xgpxc1ba2mma9d2m4qkm6ywsvv6ypv3698rvb";
+"thuthesis.doc-7.2.4"="0ix25s5syamngv6y5hgypjaakjnnfmiyfgilq9dbjyw10bzi6ri2";
+"thuthesis.source-7.2.4"="0f6b4qq41kv219ldf5nf1za0f0gzj4jvj50gq3h0wk6wjbh2yqkw";
 "timbreicmc-2.0"="0inffnb824kv9lswj46b8p0zb36f4s3pfix4m7x7v0d216xa75pw";
 "timbreicmc.doc-2.0"="05x699cyrkfnygbwfifzz4ih0g5nm7pzlj6ygkh6pysyzxkb5w94";
 "timbreicmc.source-2.0"="0hznll8725wbjmayxilg0hvjw2vf63wj4cxmznvfly9lk8z5zh5m";
@@ -9208,16 +9308,16 @@
 "toptesi-6.4.06"="00qd8ap3dgrj16g831458m2kp0jivvbvmya2xzcyp560njsvqqca";
 "toptesi.doc-6.4.06"="09hnbj0g7x76m9lnn47z3cjjnlbbfmapmln3hi6ykb6lh534c4wa";
 "toptesi.source-6.4.06"="1nr54n7hsij9rjn54wgnij16xgay0dda2h6vl2qc44s8yz892jc2";
-"tuda-ci-3.20"="1y1m3kx32rm6zl9qjffzh6iccaf6qpzdzb0c83myfxmbcp0kdpvx";
-"tuda-ci.doc-3.20"="1z7i8b0vxb693jyxbx9ykk4hijxqs3z3m5qsx87s857z1gd6jv3y";
+"tuda-ci-3.22"="024s7smqv5hkq9p77n04x0j1w6yqffv085mf2h30mny61n31k83v";
+"tuda-ci.doc-3.22"="0a5svz2klyrs8iacbr5sfpjhqv9ivdnvl97cg540m9im426sr76z";
 "tudscr-2.06n"="0viihfab13h2iz8j0zn54psbjm0rww9hkazfvb0hxjf3wqvv3jwf";
 "tudscr.doc-2.06n"="1z2zwf865q6h30nmnl2wjpq724mvn8z96kvfnajxx3xzh2cyh7py";
 "tudscr.source-2.06n"="0dj8cp9kv9s366xiv5730vwx2ks8pbyaiwk6zqf8n5hn3ylx4j63";
 "tugboat-2.26"="0077saa6x7hdz6cnznrkrp06kv4xvxbqd93il41v0cmpnbi1cmi2";
 "tugboat.doc-2.26"="1b3jf6z0wfjs309idk0l6lq9hcq71cga15qdrwvbqbbd1w2ay8pr";
 "tugboat.source-2.26"="1r1xm17dn7bbvx931iynavfijc4jilnq5bq0millzirx9mqq8g31";
-"tugboat-plain-1.25"="1nq7lzyxy4nazdbdxk62jcsk76ysvqaqwi9vb5iwkl2c6bpgw3lz";
-"tugboat-plain.doc-1.25"="1bvgxf460pdxp312n0yv9l95jiq5hr0mkmphf7925d2w3n724rrh";
+"tugboat-plain-1.26"="0igb03dhdrvvzg2n6snrn3yvsh6glyxqr2ms727zrf7ji7ix664s";
+"tugboat-plain.doc-1.26"="1lxd4cvdrgyaafvjvn7kwcllxjicy6xh444kafar1hw2yijyj1ll";
 "tui-1.9"="0liczx2jcdks6r5040r7dqcyrcj225xq0035ccdb9kjmp0rmc90b";
 "tui.doc-1.9"="1m73fc2nj7qsy144fmbqhld3hx431ry64jv5p7h0r4p0giadwxgc";
 "turabian-0.1.0"="0fjqr88a51699p57d9mpkpf2hn9rrmdchsxhpjng8hkx3yjl647g";
@@ -9273,8 +9373,8 @@
 "unifith.doc-1.6"="17q97073nni7x2d1zlplrwfvnxw9pkjgk79jwcvbgfjq09cq374z";
 "unitn-bimrep-45581"="0vv9vc9cvw3bjfndlfyr69kpziymlgalyvc11av9kq2x5b4jlc5b";
 "unitn-bimrep.doc-45581"="1wyiar6xjhsjcfnxhlz8y1l9xvlcpgmkh360am85llfqlnar5w5f";
-"univie-ling-1.16"="1azhnfdpry6cnf2k2vkszzvh9pnb84kcsp61h49fr3f3aq7bdlzc";
-"univie-ling.doc-1.16"="08cfn58shdxg3frfq6x4vfdz61g1ninwblxbmgyhwb8ccp0fmd7a";
+"univie-ling-1.17"="00jjacragfb64v9pn0ckszlpvh5qkgl0ziszwd8xwvm34p7alqhx";
+"univie-ling.doc-1.17"="15qp3hhxdak89vgsr1zxdr5w7l31xxas3nalhddba9n6fykmrqi0";
 "unizgklasa-1.0"="0clwxzngdy6n7iwk9zrn21i1frmahdf0s9qq2nqlhk4h6rxwb8jb";
 "unizgklasa.doc-1.0"="1q7q2fpgpjdsmbfj9zijccqpl2m6n0dch72wl05a64hxg117jbl4";
 "unswcover-1.0"="05nkk3xgpjcdlsk8xrj0mn5r3kwzi15awish2hd205v1rnbjiaz6";
@@ -9325,6 +9425,8 @@
 "yathesis.source-1.0.10"="1iffkz83jnw36p3q1v17rf7wkm6csna83qlpsscm1xqnfa1b4h6s";
 "yazd-thesis-0.3"="1bhjqd6k4lqk4sypssmrsjl9lqrbha9d0n42qbaq1mg5whpl2b8x";
 "yazd-thesis.doc-0.3"="0krsm9s3ym6f3d323scvxn8cf1wjqppglhmzbxwn0cpjq5nl01pg";
+"yb-book-0.1.0"="17s46ps8b9ash6bnqyggr6v16k8hinzpfk4556xvs7zz0i75y3l0";
+"yb-book.doc-0.1.0"="0kwh73z59p8c5mmd84akzbbngpsb3mn475rc5gpvdibwqdx4ml0q";
 "york-thesis-3.6"="04c8g1wkl795caadm8kqfy6kdqqgwlk46lijpmyiiykbb8z54wq7";
 "york-thesis.doc-3.6"="0zp6pfr3giqm4nbsidg06q0c3x9gr4bk3g8qq7wxl9a2pgk3z45p";
 "york-thesis.source-3.6"="0105amrybkm78pwb9hrd7n8r69sj6lkh1zm7c9sskibb13lqrk9p";
@@ -9334,8 +9436,8 @@
 "arabxetex.source-1.2.1"="077r71723zlzfjmc471a8hbxs1v2g6j2xpiim3g2klxsj589bxfn";
 "awesomebox-0.6"="0bjnvgqj4g1i6djzzzdjdrnlvli3dm1v2w2mi59s5s8pyc5pag60";
 "awesomebox.doc-0.6"="1m1cjic1dqf2zvym1ma83xy66b5irqma2fb6fy0qnl31f9bfg6x2";
-"bidi-atbegshi-0.1"="0lcg9h78shrfk11dqjr9mccyh8n2264vyl4fnjl0cyc0ccsciv25";
-"bidi-atbegshi.doc-0.1"="1xzb3v8fc82p2s3hwkfxz7jz1za2cy4slyp490dbwzq9hrrvs5wl";
+"bidi-atbegshi-0.2"="0wpwp2fr233f0pac6llb5gmhz2ca41yjcmkqdil6qhpxscfpqizg";
+"bidi-atbegshi.doc-0.2"="1nzg4cgdhjjsalwml50xl7ac25w0qfd5q18cs8viicj7bbjp13wr";
 "bidicontour-0.2"="1yj7vl5z4xh8i420y1ycz21rw0yy83z0v9nlvi8k3ph2qis7lp8m";
 "bidicontour.doc-0.2"="085xfi5w350vbp4vnq8kgbilnz3jxwf4g0incvziy5hxh4isqirz";
 "bidipagegrid-0.2"="1nh14lla3xv9zikqqpnw7nb26kshjd186ijlz9snz19nkgddq28x";
@@ -9344,8 +9446,6 @@
 "bidipresentation.doc-0.3"="0hp0zbr5mpwsrd4rh3rc8qmy4srp93838k38phmsm6dwgqkda2z3";
 "bidishadowtext-0.1"="0jpz5a5q9c9c569ssyzk48y77msvfkd5csdvv0cd0r62ivrai5jh";
 "bidishadowtext.doc-0.1"="1bcbz6fiydj6dx8xzkrdsrm2vgcvn1jj4fk2jh1333la6rygvvav";
-"book-of-common-prayer-1.0.0"="1aizm7rr09161zz8qvcz7vrj6fiwirbb04zghv6cnb9kv4bzi573";
-"book-of-common-prayer.doc-1.0.0"="1q93m8517l7w8yp36jyj776dqd199a7rhpayimkwkghc7ffvx1xr";
 "businesscard-qrcode-1.2"="0xv56yqqj8y4270955srbiw7qy8bm9r3ih0zazlkrxnrxyh82jlk";
 "businesscard-qrcode.doc-1.2"="0nfvak5730q4ci88dyqln97ljhjbwxn3gk34rq2b5rk5cy2inabi";
 "cqubeamer-1.0"="1r63ahd6m6ll0phqaxc02hnbrf3f6xjdghrhn7wdqxnf8n9k34ff";
@@ -9378,8 +9478,8 @@
 "simple-thesis-dissertation.doc-43058"="1wrxjkgbvps1wyicwlhkx59xwb3vcy1n0wf7r7dllw11r7hdg6f4";
 "tetragonos-1"="0l8b3kjk0jk70mmmv37zrdb16id6yrjvgsgsmji7pzdqiixy7jh5";
 "tetragonos.doc-1"="1g2zcx3b1pfc9dh76p5iprdgsxp0yndp7rn5ksbq4s9k4m7ikpzp";
-"ucharclasses-2.4"="1w04lfm8bjgrg9qndfz2zwhd7yakrlps1kk29ldvvd0200ns7db4";
-"ucharclasses.doc-2.4"="1arp54hwrfjm7x1d5cz5qvc4r83x9kdla5z81p7ld2zixjdsbph5";
+"ucharclasses-2.5"="1c1c285qhmj6g2j4s3a7rlhs9nznkxw7b2k9w3p8ykz8zfwnqgnf";
+"ucharclasses.doc-2.5"="1qs0dcnv5533r4pgk231fpika576snfc5rdykvp7g5q0c1mqc28c";
 "unicode-bidi-0.01"="1prl0i2a9dg5yc2yl1x1k0zmz9lww051w1zwy8cbyvk3rd765a72";
 "unicode-bidi.doc-0.01"="0ab0gym9sjllmqdclkjfbc4fh9n20999mv7z2gylfybirm0n7i7c";
 "unisugar-0.92"="1dx088b21apj2rpij4pxa9srx29irzsfmlp9vn8fjpm1ag60md98";
@@ -9407,8 +9507,8 @@
 "xetex-tibetan.doc-0.1"="0p5l36zb8l3h4x8sjk8cwxj5psvfa4j0kg6jb93sj1ln3yfrwfr2";
 "xetexfontinfo-15878"="1sc0lm5w94320f5abv2hw2bzqprhk73fjv2lkv380fgkpdfi7pdv";
 "xetexfontinfo.doc-15878"="14mc9snykdwzcmq013bs8vzn5w80lblpg05jk57g7fl2z9x6xl38";
-"xetexko-4.0"="08wy26wp8jgbah4wf0ma45z3c64kcnw3g434zlwx4s90mr92llag";
-"xetexko.doc-4.0"="0csy6h056wm69aq4i1gm1029sybqfy7als8zw1mknq2vx2qygflj";
+"xetexko-4.1"="0ps02ca5zbxr6hqhp4c5x9yvpqm9mjk51apnz3r5x0qihb2ixn8r";
+"xetexko.doc-4.1"="0n6hz2x26kdbq29k5m0pa9ijsf8llipl4dn0yxykvhvryglralgf";
 "xevlna-1.1"="16ayk70kxk2s23r6nxva1hkb1z7aw7zz1zhmcis1bsijx657kw25";
 "xevlna.doc-1.1"="09aaf3mpbh07mix5xvr20zybbbrbgbwcmkd5q0rfsd0ac8cm72fh";
 "zbmath-review-template-2.1"="1zyll0lpd3d2cjizq6f2zxnb1pmdl2qkhd1fcm9f9l6i5fqmjk15";
diff --git a/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/pkgs/tools/typesetting/tex/texlive/pkgs.nix
index a0714b2fbad5b..456cda5c1b33b 100644
--- a/pkgs/tools/typesetting/tex/texlive/pkgs.nix
+++ b/pkgs/tools/typesetting/tex/texlive/pkgs.nix
@@ -53,13 +53,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "aalok" = {
-  revision = 59602;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "9e202d3c3e33c38c1cc7ce5fac9ab9759c2dc684d17c9b450ade236ed392acda87b11a2d028c65da74c6fbca2d962a09b2bbd854b7dc298865791009ee18b1b4";
-  sha512.doc = "db2a25f5a83a7e2f85c439186327a7a663156631af38c6c9945a2783b6b7d02539f762dc4c946497368f828f615c31a6a4d392ed78489111230169e18357a78f";
-  sha512.source = "856e4b95df45104f0c8e2112e06d2ffd6b878312e6159bfc204c875db1e2c34722b7c9fa4e3e0cc344300263b1639dbb26a43c7db26dede6532b3051f7cf41ee";
+  sha512.run = "03d1585e9b92e26044066d1f5b8d2dec0ad298627cc94fc1ab11e45307f62c573934f1a2cae6c5318a9cb377834d4f5a490144cc07bdebd9dc22cf298315630b";
+  sha512.doc = "702145c708edf984d24153822036acc0b563038c50423af0cd3cc6b008b7eb3bc8d67eddaac350ac6557650177218260e5adfaf0ca5807130b0e23ec7127470d";
+  sha512.source = "b452ccf38dfb3436aa8a6907798101621fb2f5a66077cc24b316760013b0e665ef26d69b444c27cc8521dd6c06828be8a832e061df74bdcc70577f262ae987c3";
   hasRunfiles = true;
-  version = "0.5";
+  version = "0.6";
 };
 "aastex" = {
   revision = 58057;
@@ -132,12 +132,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "academicons" = {
-  revision = 61159;
+  revision = 62623;
   stripPrefix = 0;
-  sha512.run = "99d9fb8730b61fe18ce7bdc74777f259f6d322895909dc320555e0db9543c6daf63ad3dbe6231c7f43dd531db3b6dab9cd795a37f97ca8049156235831e1761f";
-  sha512.doc = "d1e82a45769adb3f000a100523f38a8017f3d060f28cd618792b6ff3df8d782e2fa473c0c7a5f2df5e5c83564aec6db290ab15f0ae414cd82977d1eb6d3aa065";
+  sha512.run = "aafa2fdc63da4dff2638a7af76258aaf2bec349658d12d40f69dcb522b6be7a562bf05bae2918e6ea86c082657779cfd2a1a1a08620364ffc53ca5d57f949f0d";
+  sha512.doc = "e72afedb8b48d6840d16741e87254a4b61003d6865a1c52fdc46550f6e6a93f059f9a3a6319ee9e1e77a4382c18c96821fa74b44734fe632ef2e02ec0cba96db";
   hasRunfiles = true;
-  version = "1.9.1";
+  version = "1.9.1-2";
 };
 "accanthis" = {
   revision = 32089;
@@ -189,13 +189,13 @@ tl: { # no indentation
   version = "3.13c";
 };
 "acmart" = {
-  revision = 61233;
+  revision = 62157;
   stripPrefix = 0;
-  sha512.run = "1054235daaac6026efb3592fc08ac68095b61ea21bc884ee9af4142bde1e7527864eb64325c21a3bab404bea320ce5fe35e9aefc21bded7360ec43e83bb33f73";
-  sha512.doc = "f98d64df2f1cb7c82fb1cd4b99d3e8f1ca102f2ab6dd55ff8da92c42b889ea62dd0269b0f584d251ad5c639cf11ce24114c9409dfa65551b267d1140af0b4b31";
-  sha512.source = "8373736287dbbbf0919169c0b4c4e9a256eea82d9f54d821f1cfbddeae7433ece647e931374538a4d1545d626e08c2db6f3c6510f9abbc94189be651ede1bc1f";
+  sha512.run = "792dbb8af66fc0e540151ddc3f7c578a4571d077f5249eb92f911903093f05b618bb7ec9323ff0e3d56a1968c079184238169a345d5ee506c4169f4ee8702431";
+  sha512.doc = "f13918e64c7e568cfca822bb507193c628845a88879e9f85e985084c40979007536fd33b166de782bd04d20b28b117bf993defcc20ae0e3e20dd427a51506d48";
+  sha512.source = "41b61a671953968898f6483ce5c260fa732a7df69f8f300b1ec85508af92f9b595c5acf01b95e26a2445f2efba068a1925267143647b8c733e36f6504bf1747d";
   hasRunfiles = true;
-  version = "1.81";
+  version = "1.83";
 };
 "acmconf" = {
   revision = 15878;
@@ -207,15 +207,15 @@ tl: { # no indentation
   version = "1.3";
 };
 "acro" = {
-  revision = 57447;
+  revision = 61762;
   stripPrefix = 0;
   deps."etoolbox" = tl."etoolbox";
   deps."l3kernel" = tl."l3kernel";
   deps."l3packages" = tl."l3packages";
-  sha512.run = "5f0b03e3ceaab172a0c92e7f29795a0878118a07be27f079800703c0f59f127c2ca09b53922d7ce3f16ae772ec28528a69ac407092dccc2f5bb621460e6f38ee";
-  sha512.doc = "5d558296f2b0a4442b82e49be12ae1f3dc80d40012d138ce4ef12ee8e22ef1b6d934acf7364c59be0138077311e8dc7b5bfac42478aa68a14750a6c41de1c6a4";
+  sha512.run = "ea08c14724aa2bef27b7b01d94b73330d0cfcd305abb083f028744fb9519f72a86fc5020fa0c9454253b77a921e31da5e512c31b5cc9b0d26edb1bd64723a2ba";
+  sha512.doc = "222af2ac3e1fca522eae70a20ac6e3d24bcb3ff30e2ea9e20232c331443e8b56da6ba6ce140c9b3451bedc2a38fd04e8c229f0c86c390434b1d93839ae29cff4";
   hasRunfiles = true;
-  version = "3.5";
+  version = "3.7";
 };
 "acronym" = {
   revision = 54758;
@@ -227,11 +227,11 @@ tl: { # no indentation
   version = "1.47";
 };
 "acroterm" = {
-  revision = 20498;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "fbcd24989570b083ec51365b560ad2a082a136fc8b2b57aaca4a03059f66dcbdca1efe39c959c8f1a049fdd978ab58a6920f914589c242264b9d803124d0e0cd";
-  sha512.doc = "603375e44822841b1dbf52d7aab0c91c0ed36dcdada7e6fab607ba805fa896473674123a2594714fa0f698c559570431f09ec55ca41720586fd522df24453253";
-  sha512.source = "e289d4cce2bcbb70b20d1f59055cc019453e526ff2c0bee6e5a2d04573060d1d4490d89ec717fe55e4dd3754170f794e60acd453b21b884f595ea56bb6f95adc";
+  sha512.run = "f8ce516ba2de1367bf414061e14c260be31304ce93693a95e6b9ed29d5cf170bb041248eafb76546cfb1547e687d07ec51333177405ffa8a5c9ea76070394832";
+  sha512.doc = "66610cbd2e77d8f9b0eda3c61382dc1a8436169017d363a5716e0ad1991849824a1958552af4a14545dcac37191302c0907b505884f7cf1c7d83f8087d888b6a";
+  sha512.source = "531b5768a7312bd40797b6cc67abc58050481ef97455219698018a635a298f542506669956211dab32d51dce2c86f3d3d6a2e913c4a0f81f072035a63470e5c0";
   hasRunfiles = true;
   version = "0.1";
 };
@@ -671,6 +671,15 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.1";
 };
+"altsubsup" = {
+  revision = 62739;
+  stripPrefix = 0;
+  sha512.run = "38a5daec9d8d9fab8a242cc6239986e614f1b84a5f5ee9ecedaf3f080f5784717a141424a65ed38010adb1b0673af5d351ae5c87e13e831008884a7242b3d14d";
+  sha512.doc = "8c25604a8606d8d1fecdee3eaf3c146ce5f214f56aaf419d9b1dde462f6f26fbc2ec23862081eee3d4e86f70ecef2ed5a1e5358cc92baaf449ce8833d45153ec";
+  sha512.source = "84148dd309341553986c4a4d6e53ed181d62e41b627a96dc2c9a6b7dd5ae9d7fc0ba94d5241c0b2d39513c44933e2b9d4a720b7c671c45ab43a290ebe1c08af3";
+  hasRunfiles = true;
+  version = "1.1";
+};
 "ametsoc" = {
   revision = 36030;
   stripPrefix = 0;
@@ -728,11 +737,11 @@ tl: { # no indentation
   sha512.doc = "8c08813abf65f00b68441d1e5cad3eb4a16fc1a77b30e10d96e22f34d6af547804af4d47b62ef0dfc895e2bc7cc5ecf7bc08d912448fefefbf716430c4502a64";
 };
 "amsfonts" = {
-  revision = 29208;
+  revision = 61937;
   stripPrefix = 0;
-  sha512.run = "ff1256ae20f435327c12424613a15aa8f207e9133325e3a823ca7ef9951b8d52acb56cc69cbf9f3c0860ac43c9a74ae54154d1cd956d7e25612307dcc6e74585";
-  sha512.doc = "fe0df1a9efc821e21adc0e21bcfaf2defb1749e3206d7dac8cd9b667747c37303cb2c69283a89aa8740fc3e08e8803408903a2a95eb0b91e910931a8333c2fca";
-  sha512.source = "49a99f519fbba1ae7ba91ffe392b4c1bf7b9246ab573a4f2c8b41fa252f080efe66c5df2acc36a5ea9570e51d55890bd89565ec2174ca7aa98980b49aa060a98";
+  sha512.run = "6a9f80bc8b6b2afc3ff6ad151a290743d37e10ddeaf7efa969f3fec40cab0492860496c7bf0abeb410124aeaaa15a53640017c8d12b630e68c59dfe186519e52";
+  sha512.doc = "fe0917bf9d65d15155f287626edb17d692db7ef2e888fce30b867bb0c873b0166949b3b5f3965f70b6b237d7b874a7fd3411e53b87368acc7447dc0e8bda55f1";
+  sha512.source = "4145ce58620f84133e8d7a7639fe376631c92398161283c69c9d1119c14e4d404ed067f2aff2fab7cc0c2249d1fcdea81591b45a1cc72bc08835b99ac8a5a6f7";
   hasRunfiles = true;
   version = "3.04";
 };
@@ -771,11 +780,11 @@ tl: { # no indentation
   sha512.doc = "814539a2a82601c930097113a9baca5166fcf68d1b0c4dcf25d8afa8991e667619517879bc415ff114b9e86664b9ff5e25a7bcf1bb04160b9297cbfabb4a639d";
 };
 "amsrefs" = {
-  revision = 30646;
+  revision = 61937;
   stripPrefix = 0;
-  sha512.run = "a0993aa374bf845952c934a421d2b344564726207245102dec82915a3cddf33ad8cb1f2d4d48d71ba0263fae0c24c78f0cc21e0b923a875af02d12c602a375d6";
-  sha512.doc = "2c472849194fb72453a541ba443b2232fbf876cd2d4071dd6e6eb65603845ac9715629bbc7b1f44dc0268a809a1a5d74a08f0dc27a81e9b30787a44d133bdd57";
-  sha512.source = "9cdfcb0e841f6dcfb23c5fac930d12cc610ae8002aed13a4867bf384fa0f177f834cb58482647c2daf7c52c0267f85e8dc4f93575b14fe58e2a634307b7bab49";
+  sha512.run = "01416fea668e3717b14086199280582d7547cc7c555e19d2f88b7ee94dfb6863719375a140feaa5ecf7461c6d6c6f0ef52bffb544ff132b34771f11556ecdf09";
+  sha512.doc = "b704ccb7bf8a49c141277b240e08ed7d22c71bdb91d625997a726b25ffb2e8f494637cd9ac7cee031f9b45476006441190ba95331e32c4ad3af4e25ecdcc6f6e";
+  sha512.source = "81b8aa65cc79f08133a6390915ed7753db3439448b608ce04330e23c849f876ff2242403b9bb3e08b9642cb0362732adbcefcab9640e75260548dce3938baa25";
   hasRunfiles = true;
   version = "2.14";
 };
@@ -798,12 +807,20 @@ tl: { # no indentation
   sha512.run = "17631e2d6306887236f11eed586454a784f256c36c14955be1eb30377f1f73b189686b37ba6c95188fda2e0b0aac9a1f40469a32bc7787b5d4c244de9a01ccdf";
   sha512.doc = "2d35f87da43f957d7ec3d1e61d052d14b4dc207207fc2e6dc4de08b699e5211db17a84f0305888294ae163691e4dee2d067fb1c3a29fadcc34214033fe8e22eb";
 };
+"andika" = {
+  revision = 62157;
+  stripPrefix = 0;
+  sha512.run = "df0bafc3729979847a5e1c77827db96870822ebf5e8e7151931aae65eb6a29e48d04a1566b118df6ea56900fad3c07761cb2fbc4dff913423ac202233cd01388";
+  sha512.doc = "652f67d8a1ba113ea47292cd560cc71d298b480697f02d56f3eafe68eff6125efc40d7737bc2d903ac30397a6c00093fc080ea0f5c0c02fa94c36feefc4e879a";
+  hasRunfiles = true;
+  version = "6.101";
+};
 "animate" = {
-  revision = 61019;
+  revision = 62123;
   stripPrefix = 0;
-  sha512.run = "e3f2fa0de9986b7cd50088dcf4c325636e4b42d0668757a6e86ae60caf4550da231f9b46d4a5e35ad1646e63200949923c60a8ee5f9350707bd3280fa0d63b9b";
-  sha512.doc = "9703ee826860bc0022682a29d9e192a09331ded997d6f650706dbd466ee74108d9642126ebe989f10102b5e34be4b9121dc146f61f8a27045a08429fffb90cd6";
-  sha512.source = "03710b40488d70d07653938e3ad3fda38c3373d084582d1c3d2f81de23f3fb5f1e0dc3475a5c33f489af714615c6114ecc456818e36a18aec5d2cd091813d21c";
+  sha512.run = "30646388abeb2df2f00f1ddb03a6b714a965ce7ed0320112ef171fd240237cd83d014456353b1c2eae6a570d577a647bc63e7b56b2e7718cddfd6369f4fa7b9c";
+  sha512.doc = "4000fe2ae0371db3097d6280231ec7288f0813cd4a48933ee1f35ba234968ac4d091439c5448c91147ce4d51c6eff29383f76c022cec8ebb2ec30c0c55100129";
+  sha512.source = "64a149d70608c1867d09eebe6acd454a0b5a5655eb5b398ff013adadf016fa4a35cd091e86fbe01f996d8844e7f5ef20abe1e8c7d4ef933a1a7ab100ca4db73a";
   hasRunfiles = true;
 };
 "annee-scolaire" = {
@@ -955,13 +972,13 @@ tl: { # no indentation
   version = "0.3";
 };
 "apa7" = {
-  revision = 61110;
+  revision = 61647;
   stripPrefix = 0;
-  sha512.run = "12d161bcf16690019766e5bdee9d043dde811a7983bf0143d23f58c28673257463e03b617ab3b7d22d6e7d20753b32c8dd3ba62b94c7ce0b62a8c5481f0f668b";
-  sha512.doc = "71c6326f67344b4bc48a3e79f3ba5e60a170634855fbff881da5d58f527cec77c1fa9b1095860f23b82fa8b3af00a92a2b2dd262d96741d57bc5529f10946e6f";
-  sha512.source = "594271b545da974f3a8fd01fc31054aae21fef5b5e57d28e08284c29da0fc1119aba122b1506c9c169d2b262344974e2f10bc614e581765ad5617111f30090d9";
+  sha512.run = "6163ecf805b3f07317a5859ed162024bf5a3fb2a9a6b5b2dd74cea849c497728c8d3a2736f2a849cb42ddb8409430b1135b5a7b57724d36bf84d0f3a3079de3d";
+  sha512.doc = "838f5c8aab9caf483cdc84c2263fc0c1b8b5c2d6cdb62397fc5fe96970446b1111118168ad94bab141edc41d73ee3805049d16d4ade310e9e8ebd2237e6f97e4";
+  sha512.source = "a747cb984ced7b3df8533f5add1091c272abd4ac34ae8026cb6af493fe0b941392efc8320c58b0e16507d672de9fdf3b08e05c3e07323bcb82da29d02fc6dd74";
   hasRunfiles = true;
-  version = "2.14";
+  version = "2.15";
 };
 "apacite" = {
   revision = 54080;
@@ -981,10 +998,10 @@ tl: { # no indentation
   version = "1.2.0";
 };
 "apalike-german" = {
-  revision = 54080;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "8e9a0dd594dce98e441f256efacedecca7afddcb3d8b6bf64e6490aba74f1f3584c71584b7ec115cb054eb425477ec801a20c84ee75aeedbe588ad6302780612";
-  sha512.doc = "fe58a0f2be0b8793ef15f07029d1b81232046b92b48a6d8fa00032bbdb482aef3216ca80f5d9c80424f32d75b8d57e4e4e74b5397711209e18b576f6860d3b33";
+  sha512.run = "46f79d5e0b95f9a89611abeb1797f08be355524c4d28f66e18aa3bc267f76d80b6ab74fcae68a7ade731fbb454cd10334107b6c3c293937f806d891812c37a00";
+  sha512.doc = "dd0d69c76c6e265cfc18441bbc391d98710474d40d4c9e282ef6dc9aaf8a51e90458941e9208c3a8e01ea026d33b5a10b7c57d147fc3f72c30ea5fec35917c9f";
   hasRunfiles = true;
 };
 "apalike2" = {
@@ -1116,12 +1133,12 @@ tl: { # no indentation
   version = "1.0";
 };
 "arara" = {
-  revision = 61370;
-  sha512.run = "2d32be197013bd1280c5bd1475847e653f29549c2776b3cbd353796a0c2eb86a08dadaa80b69f7c40a68a5670b69e33ca44e4c0a468f84b336a06959f2c05a11";
-  sha512.doc = "82218fa054ba54b2e3a33f85c236970a42495d3948a89e0385110679aef541b4cdeb33f05cf1813a83d3218e83ebbec4176ad5ef006100d23b444f749c19b70c";
-  sha512.source = "487aad824c0feabaa06c2b3a2ab3e144c0e5cc1da9fa77d069d2afa1be22c186c7b7a346574cf37d5c4fc69f8253926ff00380947d717e982aaed86d174d2400";
+  revision = 62339;
+  sha512.run = "ddba071cdb6e8748e8e605e8d2015844bdc3cc8174d5a12aa7674116d9a9ff74ccc3b5199bd34e4d931e10025fd13310c50e55b60e0c0fd724dad635a64ed230";
+  sha512.doc = "cdcd6ef2219f49b893a52ad9b6f4a788771bf351bd29de843f7e4202e3b8b1fa7e7d6a2e6e59f4a59ca485e41e9a2bb48abcc350d46578a9fb1314c7d78c972a";
+  sha512.source = "16a882d34625b68065a2d6862e5089b1bb71fa17d504aab0d7f88710f53e83abe31c9f13cd682c1c01ff5d8655e88d753c7300b055bf17c02f8052e558f1aad6";
   hasRunfiles = true;
-  version = "6.1.5";
+  version = "6.1.6";
 };
 "archaeologie" = {
   revision = 57090;
@@ -1201,13 +1218,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "arraycols" = {
-  revision = 56997;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "68ee9188b13dfd1e45552fc0845b80df2a497a00af9d70eee726694708b214b9351d7955819d1a9e21deb6873cf5dab90416b05a58ebfcc2d31495992bc989e0";
-  sha512.doc = "43c31b4a1cf254891226c796193415d81d299cb0e831e617c61d62728b6bca768cfd813ea4b3b1fb15a702411bebf53bee36e025bf8ae8c287cfed51b90710d1";
-  sha512.source = "65a24651f3cfef479b4027a0e3a687b43016bb02f67ffbc69071f57b43914c4f3cb5ade46616b7841df948562ce3b8d9eb051739280181205d68f64f3104b8d8";
+  sha512.run = "3f97d2424091e5690feb3e1e290d1135332ab146019c1b290e8c69ea7f048ecd779dd81c9b3d3f9a0d7c919f1bc9bb949bdccfb3939148a426b336cd22993398";
+  sha512.doc = "bab50fccd4ec8bbcc64684208eb8ad60b17ee55b534f287d0640562bbe1f1e2ef25698ee2fb80baca9e984e79e36fabb8411e6fa330bb33fad680b00ede665e4";
+  sha512.source = "e19bc42fa9a0d2bdd843eed789275f4d5a987adf9061535090f9d56ed182a19bd3950b10730c5cbe640f0261b545cf09212cb771b9a9a44163c6fc052b8c08fd";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.2";
 };
 "arrayjobx" = {
   revision = 18125;
@@ -1342,20 +1359,20 @@ tl: { # no indentation
   version = "0.2";
 };
 "asmeconf" = {
-  revision = 61412;
+  revision = 62716;
   stripPrefix = 0;
-  sha512.run = "17ae6017f0f6535a9448592a7f515283fdf859453ee93a7bc20cc5b9b4dacb0d9201666a9035366a2344493131a931635201921feb8888d49920a924db6b87b6";
-  sha512.doc = "604fb5e989c1cf9f8007fbe04947cb1211a2f009e4f07b96e2c1435d4dca295db0bb05ddb8f1c3e94c9326c5f9b8475d1445da1b305dff079ea75a8475e58d08";
+  sha512.run = "bc9540236bd97f6dd430da1654be68a263231d30780c8cc37df6ab2b3421e69709a81f945563a193c2a2856721b1660becaad1c89d002e43d15db23579f69b3d";
+  sha512.doc = "3837e149c7f9c31a4b983ffdef65b849be429c2e7e993ce6fbe51871ccd56ee362b4b20a27062560d5b616ef542304488821696f87f81162a2125387c0faf562";
   hasRunfiles = true;
-  version = "1.27";
+  version = "1.30";
 };
 "asmejour" = {
-  revision = 61388;
+  revision = 61568;
   stripPrefix = 0;
-  sha512.run = "417d78b244f15b4a4687954a8011a7c955f125ea2d04a4cf33585daa8266aece1f02ea5e9e92d1b7c5a2519427126f1881d6275b0e8633a677defbba8a3f20b0";
-  sha512.doc = "dce1af7422529f34bd9451a3a90fdb64784d59d027f2077556b517a00b26e1d8eaa5f45a53950d346fe9f4ecf63d72e655051813a458b8bdaa5552721c202275";
+  sha512.run = "e1d44c716073b655008511d509367926ae8e8a239859b398e776f647b85b154e043694ccaad634a6e127c7e502c0c05b9eb48fb68beab9cd592d88d1c35c9741";
+  sha512.doc = "407cfa6903607440d5ffb47eec384fe198d2aed77aa3662157d31d7fed84f3b30f7e648178401ee44feda016044a3fe5697fedc0f4e6e2a0fe9487c713f7fde8";
   hasRunfiles = true;
-  version = "1.15";
+  version = "1.18";
 };
 "aspectratio" = {
   revision = 25243;
@@ -1381,10 +1398,10 @@ tl: { # no indentation
   version = "0.8";
 };
 "association-matrix" = {
-  revision = 56759;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "1f33388d8d9230fb11dc1318cb9c189fb7c14ef7404193d1df35e83863869ab8cd7f918bef8fcfdcadbff29b3c20db7309026d0ee3935e78db0f5e3365f065ae";
-  sha512.doc = "d22756e5fcb921c6f0e80c6d0f5322dda0be1a52a5de60b2a0d7ca719b4d92e4039c395e06f7b4a6fa080aed59e4c4c30ae9ace8139963943134048cc40e6c94";
+  sha512.run = "da84a9048985e8987d8e528533ac3fa0b307d996e159843ce8a3b3754f697191b30264b21b58e0d3dd9ee6c1fe478d84e92996ed3186c10c6d944a33f21f7db0";
+  sha512.doc = "19eec11c03b3ab612a14ed2e90e850b8d2961aac85c2400d988a3c478b847dc45c61d03654b5b567978fd69d9fd6a2bfd153bc9278f38c121476e9cd098e38cc";
   hasRunfiles = true;
   version = "1.0";
 };
@@ -1406,11 +1423,11 @@ tl: { # no indentation
   version = "0.1c";
 };
 "asymptote" = {
-  revision = 58569;
-  sha512.run = "810f80e2594099f3813ef28d06a4905a0d0e678c16213f2a900c970e3900ad1ba1d72255ef466d847fc03c1ce90db4da41362679e542bbfbf5b0665e194d67a3";
-  sha512.doc = "b2d76f550a026ff433193d86c3ddb284efab9d53a2b6e08e22eaefce9f95966315dce373be813b704b7b8447e5de61e3d12173ad295343eacb1a2991a0a915b6";
+  revision = 61937;
+  sha512.run = "a9182ddf40ee5680aa40801184716c6311b139cf95ff40053dbeea0b8111d918d71265b6a0abf088288429c5f80bfc7b87e1d99126bd29d958a07e0eaa8fe90f";
+  sha512.doc = "f1127c446092846b7e3bfe4dba16c17ade58cee2001af0e30f0f866cf038c60372d0021e2da1ab8a402344ae767b5dbfca5cb76fb61c56f9292d620fc9fd8a92";
   hasRunfiles = true;
-  version = "2.70";
+  version = "2.78";
 };
 "asymptote-by-example-zh-cn" = {
   revision = 15878;
@@ -1457,6 +1474,15 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.5";
 };
+"atendofenv" = {
+  revision = 62164;
+  stripPrefix = 0;
+  sha512.run = "04a6c644b9235dce6495c46e2bcc093c03dfadf279d354c8b43b81a0b4a14daae71e7105642bcc95025c55ce92094c01292be2fc379e6c0c720aaa9b5a21ca9b";
+  sha512.doc = "22249061d4340939e597d50a5ae4c09f8b4514ddcb0862003ec7fff7006bebb207b5926ffcc0d723190b409435279c815a5880c6fc989294f26098c3db15d1d4";
+  sha512.source = "7b457f3643595f98138aeb25090e7cfc98f2d613689428559aae60898f81d586d509b7124ad3fd77383f9524f8611ac8bfcd361391670cd689f1025cf0078859";
+  hasRunfiles = true;
+  version = "0.2";
+};
 "atkinson" = {
   revision = 57624;
   stripPrefix = 0;
@@ -1498,10 +1524,10 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "augie" = {
-  revision = 18948;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "e8e40eb1e59b7bbd3e6b042e8c8ed40f604066fff6bffa3b46e0e7b7e5984fb25e880422d392209f6dcae6771339bb49a27bfcc7e9e33bd0b638b0794a5e5098";
-  sha512.doc = "40db247d40e98bba2c79e5adbd564b77e09b52c34e75a41bb1447e586f605478e4e7399a8d294b078fbbe508eafe5d0c6a68b7e3b7c875af85016f72c74376f0";
+  sha512.run = "a862fc140ee85e9f48908e7251dca78f6f328bb194bc1031ce7b521feabc62bb148764e7574341b9ba39a1bc76bb4a718c3cfa45bba7480aff168eb17661d74a";
+  sha512.doc = "434c1d88522ae41e8a41fbeda6685a059fafb8f6cdec26d8737b5f6a6ddcf1e4f2a443ffdffa6b62a74f4abd2ed2e947176f59e64bf5691debeb62d9d54e719b";
   hasRunfiles = true;
 };
 "auncial-new" = {
@@ -1638,10 +1664,10 @@ tl: { # no indentation
   version = "1.1";
 };
 "autopuncitems" = {
-  revision = 61381;
+  revision = 61825;
   stripPrefix = 0;
-  sha512.run = "c23d52218f03abe396954e3eb4685f2f66c4c7da0f57ae8887e4f518fe27134c02eb0e0ffa7a89b7959fe17b70885e0994d165d8cd843c63371c9adcd3228eea";
-  sha512.doc = "0fb4c362a6d0312d2d48d35c0389625c9b73da16271703742fea55a1178407dbe6e10b7568e944935ed8f86d090b6c5cdf9f35557f8934e5f465fcd0ef622308";
+  sha512.run = "3233887b2605c4287e85822915dc26a151dbe0c20f035e723e9f76ea6d390fc139f975f33c549b27b2b2c6abb673e8431baf8ac976c97eb2f15b27ea26da9f34";
+  sha512.doc = "2807e17025f732f5d0362753c3f6e9143565ac19226a5c03bca7137d40aaf405a0325b56b6d794fb3107fc44d686dffc5ee83683c7762c1af62b4fd5231f2a24";
   hasRunfiles = true;
 };
 "autosp" = {
@@ -1659,9 +1685,9 @@ tl: { # no indentation
   version = "1.6";
 };
 "avantgar" = {
-  revision = 31835;
+  revision = 61983;
   stripPrefix = 0;
-  sha512.run = "cf5f4701305bcfe2dcb2c92d43fbf2d0ab3b027b2c9b772926216094532e935cec234866f43135e7e050068679d0b1de5a11833696fd103ddae949458cd03044";
+  sha512.run = "c08c987c385bf9eeca0f4f5b7edcd41570c81f18751593824da8eea770c29d63725bed100fa2ff37a80a5c70086533ddc1e91848d5ddeedec3c5c669907ed20b";
   hasRunfiles = true;
 };
 "avremu" = {
@@ -1708,13 +1734,13 @@ tl: { # no indentation
   version = "1.0";
 };
 "babel" = {
-  revision = 61186;
+  revision = 62203;
   stripPrefix = 0;
-  sha512.run = "092fbe0ad51a12b48d5726b7be1e5a5261d10eb69e1a7c4f45ff3447ef4bed8a8b65833a062c4375acc02c5530c7f11821600b60753bd123d41a2a21f436f6e0";
-  sha512.doc = "b46c03ba4611cfba32a7748c190afc5f0a7db7e62cc170063879986221988488e2f727af1e4948fac70a63ac0e2667bf4552e0be4850bda7e176da466c599ff7";
-  sha512.source = "21c55ddba7bb6ed1d90b3e51fedaacec756b4cd8a3597a5a6c02cf5c921949756021d63f50262482c4eeba1c81b93ae87d28e71d96f2a07f527a92b8b7dcbaef";
+  sha512.run = "d9d59cbe3f170a51c5d0698360674a9812ab8b37c26724aa8c5656c202d79b61e751b06e71cdc6f3494eb2fbd6bbab9fe6880e82b68c5c621fff267b3e3b72c6";
+  sha512.doc = "b39012a469033103419b9301cef42edaca68d785cd0cbfd18a9db226e034f08cdec6ad653676db4f0919c300284ddb236dbc10291d74ce98ce998e61e0f7c21e";
+  sha512.source = "168924d39cd278c3eda6df5e46d4b39cf0695f2de0554349d1fbd28c0e318f8c5962895cb172d0322f026f8852a00274ad90b628bf26cf10b600d1e78815b48f";
   hasRunfiles = true;
-  version = "3.67";
+  version = "3.73";
 };
 "babel-albanian" = {
   revision = 57005;
@@ -2055,13 +2081,13 @@ tl: { # no indentation
   version = "1.0";
 };
 "babel-polish" = {
-  revision = 30283;
+  revision = 62681;
   stripPrefix = 0;
-  sha512.run = "cfd5f27f92e75883572adce926cbcfa9d9248367979c3b3411e6ca1c2d4bf441d2fa790dfff94f0f6001c68f354628334aa0a920ee68900398879c978cf962e4";
-  sha512.doc = "6f12e4c792eda6ec33db820bf3e0c9a0fbec8f07adf413c4c98d40624cbf8d46588e16271e459eedcb37ceb2f89f13c3a9dab89122172fe2b8ee9330ab6109fe";
-  sha512.source = "19d6cd158e48666b843628d0325d0e52ebbe137d28686d8b31199e9bad1c4d3393487aa300179688af5b9f7307eea8376f8ba82ed2209efcf39abef094787d82";
+  sha512.run = "7fb2ecdbd158e44450e79455d9c6644a629873af3c193aa60a27d6aa63b33c238662638ba0e84a77319874fa070e5084c2499484cdf0e5ce46b30164afb4df35";
+  sha512.doc = "50e3d424b9ead34ddec45e136d8639cfb998d0cc15f9b7cb3e0646dc86b69747d939de675f6d3d8f75f2f909bf4d790ee3b576db5283a0711943c153a3723a33";
+  sha512.source = "49bb009ca3e5976eb698347ddaf7ad22139c3d6f7c13384a035638419815a315a079ea2ee9b1df2547536ef1cb541647e9a59e7b274fd22ae7cd0ae1a11faa54";
   hasRunfiles = true;
-  version = "1.2l";
+  version = "1.3";
 };
 "babel-portuges" = {
   revision = 59883;
@@ -2117,22 +2143,22 @@ tl: { # no indentation
   version = "1.0g";
 };
 "babel-serbian" = {
-  revision = 58836;
+  revision = 62041;
   stripPrefix = 0;
-  sha512.run = "d754a40fa68732f70582b6ca548f4ce8ba43af39ed299dba4a4cad5b10afbacdfea2bd79d332ab29a2a0a81422d6784fa5beb57e5a5a90c6a29c88407c8e008b";
-  sha512.doc = "371cbe277b92b229816dadfc417137269a06cc49a0c7db3eb4e50cc21be01afe215bd2f378df89752600c8864c95126950ff42b0a3abc85064a4cdfe8b788352";
-  sha512.source = "2f96e458d6dc3770bac7319d7ddc5a7105a3809b5a85523c1465da7a07443c5c61fda4034485202f1f57db5251de72cea1e32e58303552ceeb8e2ef3dfacd337";
+  sha512.run = "b52692a15c5f849b903401a7f8f6e5d2da68b9aa3d04675db6fbb580fdf3458ab7a00526891e85e23dcfd48281056eb86028d08ab15576fbb1ed14107e4673f9";
+  sha512.doc = "d63d87f48d7e36c3848f982de275ae3833237114368fc5095db0015cc35e6352d351af521d3570c53ec6b1b2dddfb7c28f0d714ba167e63ae981329fab9bab7f";
+  sha512.source = "9821d0dc6bf28006f32b7f331037d0731f4931253c635fb6f60d8d07864c66ea61018ca927a7173de3eca97998371ea92f593867af17d03b133e968b92be60fa";
   hasRunfiles = true;
-  version = "2.1";
+  version = "2.2";
 };
 "babel-serbianc" = {
-  revision = 58816;
+  revision = 62110;
   stripPrefix = 0;
-  sha512.run = "d0c1abd87fc2d8284bd3369398b3bd5d22d8bd6453aa315c4100fbcb88e3a7166e639c31876677fb656a8123049324a87cc9a68a227ac771951a3249fe0d68dd";
-  sha512.doc = "e025cd674a8fa6c9c14a311c8132c98db6e84ebb2391171f8441683fc3ae1eddc0a3905d73ea48231ea9eb0eccacf168acf48413d60456fc8a30b81d451f88b2";
-  sha512.source = "470d88336301b2a95beb6f854924972be2c54067d02307629b635288c64baf542404c17833d60782a2a2c4e3a832766bef1f35602567a5942e541a034d0e6c21";
+  sha512.run = "40c67be9ea1503472ba110a8085feec7b1192c2a99c26d457ab29d9f6265ede1d69ebb628d38d0bef20ebc2dd852acac7dc88edb5761a2597b60b1bb85b128f9";
+  sha512.doc = "94bbfdce4b72b7ca9f438e2d15bfd8f55275844f44be6c04dab43bbf198440cb3d5cd31f7b8b739e9cd16094004cd86aa64f9e882d6bdac34a9fad42a6c89693";
+  sha512.source = "35eb5d49e9d96d70476f197a63f064c3dbfc52f3f584f168920222efaab92c839ac272490621b0f953f5f0f5f5a7163c4fd43357d957f6973303a8e7ff93b27a";
   hasRunfiles = true;
-  version = "3.1";
+  version = "3.2";
 };
 "babel-slovak" = {
   revision = 30292;
@@ -2277,13 +2303,13 @@ tl: { # no indentation
   version = "2.0";
 };
 "bangorcsthesis" = {
-  revision = 61037;
+  revision = 61770;
   stripPrefix = 0;
-  sha512.run = "da60a3d264abf24f91f2a4a0bd12c99962dd618324e7b26c59c4df1a57456691fcd801ba234e5cec305c4bc1eb05f3beefe1ff1ff57440dae6c97a4c70531426";
-  sha512.doc = "b8d12c8f2351b615d94a5da9a46b6ed4a9d28d23decc1188f7fba36dc6166ac0d0a6247a7caadca8409a52cccf643e21e6a80f25833feeb9ef0782141ca892a3";
-  sha512.source = "2b652b8cc16285d7a367ea07b8dbf3e77503b6f6efa80ced52219816d80dd4f9ff6ea2cdf6326c5ac7888546f21dc009709e2b43d35558a29be599a300d7770f";
+  sha512.run = "3d297ec59cff75977addc7320f90a68a6fdd87bcf5aee4947c14e122dc7741e443582075eec4a9b327c3e988da500934fb5426d5e9fc17c7decab4a4872cce8e";
+  sha512.doc = "be5e7eb308d2678c3cb7464e234bd63f551a560677e67bb6b5c9dec5ab59b29bd6f8a66db300065cb472b9772420e443a3fc7a4d31ebd2557868b3a6b2fcfe2a";
+  sha512.source = "3141fdd4bde1e82edf0677625c3b599516ff8b1f71b19c4a486cf5d68361135983f4fcefbdbb390bbf324d78eafe4bb6ad9ffdca8f7b257fa98faf590ff23c06";
   hasRunfiles = true;
-  version = "1.5.4";
+  version = "1.5.5";
 };
 "bangorexam" = {
   revision = 46626;
@@ -2408,13 +2434,13 @@ tl: { # no indentation
   version = "1.05";
 };
 "bath-bst" = {
-  revision = 57925;
+  revision = 62394;
   stripPrefix = 0;
-  sha512.run = "af8b36282e28556b9dfc8729143d2d38cc49d524df5a0280dbce6536e65dab1266b7b8fc31dd878b5540b9794f90309fcaa6fb14fcd6a069de68ee287bddb386";
-  sha512.doc = "5cf9e77bd84dacb999edc16d81d5cc0ea54bccd25ecbdff21be8eaa8a6ec2e5db893b77ab0235fcee1c4c234d5ab8cccf52f102948279d0859e37e8b291f13ec";
-  sha512.source = "76c9e3b0ae60b42caca389a43f3e3b69e8f28331f0037049febff40f4c990d38373a8fdba1fc22b3afaa13a79e607b9c0f596fc130fa2bb43830248af514c51e";
+  sha512.run = "d47a4f773e7790ac5f7f7789ae0a021e75ff5c7bdb4fe7aa1a17406efdfc4bcb72c78e5bc542b1eb71538c7c76f2f5ad2f6544405c65727b80f66e9a70f25a2e";
+  sha512.doc = "bc0ebe327b7a58f1c68d80daeeb38854e699e6984e1d074cb840abaedc43040d5a265e57101d0dda9541191bac74c3e2fc53ed72fcb71aa7eb7db512881c5edc";
+  sha512.source = "5963cbc64788c5d5d3e8b0211d681004f58b535c2bee68a59542e0d5f2bbb619d2cad7026dce4f4f6118728902ff8080ec6993e2be067fa960fa0bbc2d6f996e";
   hasRunfiles = true;
-  version = "4.0";
+  version = "5.0";
 };
 "bbcard" = {
   revision = 19440;
@@ -2488,7 +2514,7 @@ tl: { # no indentation
   version = "3.1";
 };
 "beamer" = {
-  revision = 60801;
+  revision = 61954;
   stripPrefix = 0;
   deps."amscls" = tl."amscls";
   deps."amsfonts" = tl."amsfonts";
@@ -2501,10 +2527,10 @@ tl: { # no indentation
   deps."pgf" = tl."pgf";
   deps."translator" = tl."translator";
   deps."xcolor" = tl."xcolor";
-  sha512.run = "9880737a29ef84dcb4f7e987e6e0672330aba2aa01bf82bdfb7051e9603576fde1c6c559a8c897e2edd8447309df2dd8bc9ef52f2debe8a7b967448efdb6e80e";
-  sha512.doc = "ceb5458b1fe57a9ed366db89cfda611cf6187ee77a7cd8afed7a4dfb30a4c9d9f23781dcaecee616183bd6771c14c29abf880333bb45250f7bfead17fd4722ec";
+  sha512.run = "6d778b4375765f80030de5810ad0ad0d15d802f8842b0b54442c5ac58d169d94d25d2cbd7901ffd653f76aa718e09dbb59c6510a135f5d2466970ae5a907e84f";
+  sha512.doc = "8e5ca18d718e8798a592164e360731d095bf388e739daa6d88521d7ff2e5a4819357d0f3cff2a5d014e35a6bd33e10f6dec2a9c76fefca2fad28a2387a62756d";
   hasRunfiles = true;
-  version = "3.64";
+  version = "3.66";
 };
 "beamer-FUBerlin" = {
   revision = 38159;
@@ -2611,6 +2637,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.8";
 };
+"beamertheme-arguelles" = {
+  revision = 62627;
+  stripPrefix = 0;
+  sha512.run = "7d73190071efb67f7b4bd49e288869e623009558b8209516b8b67029ab4188b5322d6124e4a49bfa89a3bce56c484ffd8d51e324e89733550921610c97bf65e6";
+  sha512.doc = "92918b3fe435905719c408118cba7ccdee94b2ab24185377ac1ee1a2cc16bc7a49362bba42f7e5c768569c2353b87c90910bd6a3653b5de0c7e35161d49f9823";
+  hasRunfiles = true;
+  version = "1.2.1";
+};
 "beamertheme-cuerna" = {
   revision = 42161;
   stripPrefix = 0;
@@ -2636,12 +2670,12 @@ tl: { # no indentation
   version = "1.0";
 };
 "beamertheme-focus" = {
-  revision = 61258;
+  revision = 62552;
   stripPrefix = 0;
-  sha512.run = "8dc4696a6276fab4b86697e294a9c22dde3f27218499affa985dce72692356ebab3b58764ac05bff2eab10397643a989dcab56b12671a65465783b47e1acfa44";
-  sha512.doc = "3d95d14097caeec36bc971f04b69a7f1af2ee95aa40bc4af22620dd5ff6589d89878d415f7270a73bdb62a5d03f6e634cbeb06b69e33ee67e1d29d4961a2b897";
+  sha512.run = "8b375814299ee6911ddc1049833afe01302d9823ad6870f847c38e0c11f9c409f919561dc4f9fcd9e5c948d2e6173528e1bdb7d4e7ea5034e3ed7dac3afa0352";
+  sha512.doc = "29806348f68bea8cd66f8bec97fbb0445b51431533aec7b14639877ada46637af670b6dd2fc553b067761ffdf9dd50c15f72ccf8d27006f27c53fb68b4ceb3bc";
   hasRunfiles = true;
-  version = "3.1.0";
+  version = "3.3.0";
 };
 "beamertheme-light" = {
   revision = 49867;
@@ -2700,13 +2734,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "beamertheme-trigon" = {
-  revision = 61020;
+  revision = 62828;
   stripPrefix = 0;
-  sha512.run = "f5c1d49ffb30e06b7494d07fb8762e8eb9499f2960d0775b0067ab524817ce2a7092993438e8dfc4aa243ba057a545179b042762a2116c9afad73b65e53a7f15";
-  sha512.doc = "763f9f0b3739995950dfee6e3d5c262c29781f9c1b0ae77f4dcda33022889a80091010b706b8cb3a52ac091ccad8abc2b7de510d7c3f78605a5fe19180b6fc33";
-  sha512.source = "406f580ac238dd70047fe1c2bf54fdd7579d37bceedd2da38a1f0b034c42937b9c7ab8402b19ccbb04b5fa056c134004d51daa2285e331a53cb6e2ffa2e55c16";
+  sha512.run = "fb65ca4b0b6898a9ce7c8d8d8d4bffe23d2cb6dfc513ee2da0a7add1ca553753d9702269e1e35e06995ab5c2a2c6acbe54156821dfe2c5441d86ec00cc160f6d";
+  sha512.doc = "e8627054b1f8251da7edb2705bff51c099155ea3304ed4b8ea688f764b586bfd47f2e8665b38403cb6721ec6fc9da20b85580692f7f1cd40fca6b0f643437993";
+  sha512.source = "d88b3e03a41d004530d08607103c8e600ee35821cceee403080143ba19d179bc934f863ce84d3052a8859917d9090179ae999d02461e9660dc061cd840defd58";
   hasRunfiles = true;
-  version = "0.6.2";
+  version = "0.6.4";
 };
 "beamertheme-upenn-bc" = {
   revision = 29937;
@@ -2757,17 +2791,17 @@ tl: { # no indentation
   version = "0.2";
 };
 "beaulivre" = {
-  revision = 61338;
+  revision = 62834;
   stripPrefix = 0;
   deps."colorist" = tl."colorist";
-  sha512.run = "3a54eaa79fb61977464f32553aee7b32c873b17fc40145756d7afd9244f81a3aaf96c18aabfc68c6239f2cdc327bbb304a146fe2faa5fd5b9ffd326f40639926";
-  sha512.doc = "cfa878fc8055c35555e0b0db494f5b0da312406cc76586aefa5fbe87dc65f1643c0636e107c04bed9ad3c28dd27a5638b12a641bdebc61b9bd96a944a37038d2";
+  sha512.run = "2ab008998a3b8df3b86c6e2720837b5d8cba15e1024ec786fd0fc64d2c7fa427f1b39da41bae2fcae54c3b817a21af35e31272659305d5c70b6a8f22b8331048";
+  sha512.doc = "de51a66a402e4f8111464a4300574ac7f8ae0f73f450548eab9a7e25b900d73c8e06478413d57c01bd778f16c4378e4c003431d5976972f855d5079b51b691b9";
   hasRunfiles = true;
 };
 "beebe" = {
-  revision = 61345;
+  revision = 62425;
   stripPrefix = 0;
-  sha512.run = "d95597c7afa63585202d1f415073ec6b004d5481bef3fb0307ec10631d18b43a351b7d8b06ed5d92014ea5fc076611b5091a968fb16387974ac2fb0b92744a10";
+  sha512.run = "1562ce9764bd2c2caa37ec8ae547a1594f50275e220a84609919813c681ff60cab42af17cbd09c3f562cb912c3fae8d9e2662904187463e8292b72eef4669a09";
   hasRunfiles = true;
 };
 "begingreek" = {
@@ -2867,13 +2901,13 @@ tl: { # no indentation
   version = "1.3";
 };
 "bewerbung" = {
-  revision = 56998;
+  revision = 61632;
   stripPrefix = 0;
-  sha512.run = "85ea6341316c231786612a29fbdd4bdaa412512f23e84431669a60262b5594fee908f68b8805ec79adf8445eed724327e4df8e692e75717710498486f86a7f22";
-  sha512.doc = "c414d4d98b74e8720e487ec2ff5040e9e3de59dcce449698d5e781abb300f13679a5beb2c4af3439a8ded3072a9e69d7bab431869309e87a7b5e803ad684d177";
-  sha512.source = "25749c09482ea181ea35b95bebabdded49908ab6796ece3d907261907581118eaf626dba418987349d503a4ce8dfde87faa5ff2b750a53bfd6ccb4c7525ea141";
+  sha512.run = "1a5f652ce8e7ad60f22b7c3c5cc46c3963e5511965445fdacef01aecb157ecc4fbd3eed07140d64716b90a11db96f1b7dab8b4568aa41f7049f8a3a1ed0e290c";
+  sha512.doc = "1713c1d4ef0982cf635ea57cb7af7805b001b48cdfef5bf770c627f5460f57945d2d2ead87c6e0ae8ad7cdc66036caa5dffafccc5ccd59ba889154cc6e4f9f5e";
+  sha512.source = "df95e8bcc71b83dc196699dc9f4581ce3482ae9f1b673fbd2bb2551d84c68c97cbb70771ad710052d1f2652bcb2d32d8a4392a038e747e4ce7a25b65aaed2e79";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.3";
 };
 "bez123" = {
   revision = 15878;
@@ -2893,12 +2927,12 @@ tl: { # no indentation
   version = "1.4";
 };
 "bfh-ci" = {
-  revision = 61397;
+  revision = 62319;
   stripPrefix = 0;
-  sha512.run = "8904deed16eaf205b0adb9e8c169301da6a7e9584d326e911a57beb7d1c8d260aaf5c77dcdad9a44036b1245924ff3343957bd6ac6f80ce783d0ba79097d4583";
-  sha512.doc = "cba4417ae2ed8397dd2e0fa700e8d05749fab8bddc66c7fa38d8386eacb91fd0fafeb5511b0510ac3ed2cdd23edc2f3aa7b8510d0c205d071f99fba06243be24";
+  sha512.run = "698109d0f08635696c961e20d1b37582375f06db43dccd62e01c0aaccb8c209e6e6e164c50a216ee3c8c01c56366949564f412836eb08fb02b0c5c2079df84c9";
+  sha512.doc = "d8951d398f3e9226f69e33b97e0a70ea5d4bf772909bfc5c3ea14b58a427646aa86294020b87b5ae97a7619d18948345bc1ac125c82c9fa646e44810d303553f";
   hasRunfiles = true;
-  version = "2.0.0";
+  version = "2.1.2";
 };
 "bgteubner" = {
   revision = 54080;
@@ -2944,20 +2978,20 @@ tl: { # no indentation
   version = "2.9";
 };
 "bibarts" = {
-  revision = 61242;
+  revision = 61569;
   stripPrefix = 0;
-  sha512.run = "87795521571e106ee08d611c8c4baa5709150aa146b17065aaa6251493906065ffae78408034d2954d0e37768c27b54b75bfe8139e62105fc93ffecf5b28c84a";
-  sha512.doc = "e735b3bbcb43501451633d8eea303db52d82ecf56b919ac284476ea8803bfdcd87732b564732959005a1d52c42f7cc48922a3841884f7878ddc06f45a588876f";
-  sha512.source = "0575256f662942ccf3a93a31e9f66c4cc461b03b01ef25c7223119d0bb2e07c416bd671dd547a0dd8faa43074f20cf03cb64f4341643ccde79e03cba2dbfe609";
+  sha512.run = "21d7673174a53bfce1453fe8b9693d4635cbcd7cbaccc28fa49c6ab9b38197e629601019d9fb93ecbc80c4afe1f9d86678ce171fa55767840b39650ef10749aa";
+  sha512.doc = "8bed474b083e4e033e168732c3b8b133904c8ed8078270776c479b2ad1e4989c97febefae2ff89b671d9daae74569beba9bd3ad96a18b372e705aa2d0614d3f1";
+  sha512.source = "7c22719ddc2aaf521059d3863dd391b3506d9c54b4d621789ac0bbb7a90e579256f88aa07762174e4b7b3031de7b403b8dfde830d4d355c928708ed13dc4185a";
   hasRunfiles = true;
-  version = "2.3";
+  version = "2.4";
 };
 "biber" = {
-  revision = 57273;
-  sha512.run = "85c07705dda6e4dac7fb3d3fcafaa156abee84f19ce8652b71787ef5a631ba4519ca35a34c8d0d83f90b8f14c583f83f820add220d0f764c19d1abf4c3b7a3db";
-  sha512.doc = "9d86fe6df7fe33221259395aac86729708481ee5222868a455153e7976c91c48a9469a9813bb0decb83c7eba2a3ec408150ec47533f9a41c974587415266f6e2";
-  sha512.source = "396398323e6e9ee4df904a827bab9b246e6fbba15033076cbbc3a63e4443641f81c19646a4145c0c0fae38af37f54a5fd2166799685f39183d349c8273d13459";
-  version = "2.16";
+  revision = 61867;
+  sha512.run = "32d7349813eb4c8d66187f77e7ed86b9f1847e2d7e32bce2d2bad53887fe11ead512fe80d9b21ae37889b72a107e6519fb214ba6b8ecfd20544091375904c4c3";
+  sha512.doc = "2ec3267dd83db2a2807d9d259b3a01aa6fdfdc9b963e54ddea3de4b8899532ed63f8febe6da9666f5327e31aec7554eef416be48e507513296b77fd1840215f8";
+  sha512.source = "dc42ed52b198e4b47c09b5d509ba4e382755db1cf6fe51599cf186cf283438bbb52dd4f12bf2ce90801207856f627e3eafebf629c232ac651c9891f994712ebe";
+  version = "2.17";
 };
 "bibexport" = {
   revision = 50677;
@@ -2976,17 +3010,17 @@ tl: { # no indentation
   version = "2.0.2";
 };
 "biblatex" = {
-  revision = 57272;
+  revision = 61868;
   stripPrefix = 0;
   deps."etoolbox" = tl."etoolbox";
   deps."kvoptions" = tl."kvoptions";
   deps."logreq" = tl."logreq";
   deps."pdftexcmds" = tl."pdftexcmds";
   deps."url" = tl."url";
-  sha512.run = "9d8fbb720f69afabb42ff17287ba61760d910b40c4b90923bf46fa0aa9e6eeb188cbf09f533f0916af145a361702387fce95ece74feb3a535d6409a3fb39f684";
-  sha512.doc = "c81fd0590e7662c7887274effc3e1e0badf0d0c67fc44f32abf8c8da3426549a1adbf6703fbd530e595a2cfedbc4a5a089c703f3a542ec0416705839ad093bd5";
+  sha512.run = "69ea7fee07e0dd3432ded2cb12ee68ffb2345a245de421fd3aa340466e382f9dafc17027ef69420870f1467c01cd3a1087a767b177aebb5eb35a39492627cca3";
+  sha512.doc = "21b55961ea6c0289a001e85ba87a9582598e01dc5c0942f4fad624b07b0bde020f1267033100057917547aef853c54fca4a62105405c5359cab7f491a025d55a";
   hasRunfiles = true;
-  version = "3.16";
+  version = "3.17";
 };
 "biblatex-abnt" = {
   revision = 49179;
@@ -3046,13 +3080,13 @@ tl: { # no indentation
   version = "1.2";
 };
 "biblatex-bath" = {
-  revision = 57924;
+  revision = 62400;
   stripPrefix = 0;
-  sha512.run = "d88e903aaa1535f662a90d993491fd94e8af55a14ad226890b8beb65395383c2b92c8c362fb21483519998f5e1b9bae088a215992fef4336af04ebf3e49e23b6";
-  sha512.doc = "a22433cf6a0255f1a50cc59cae09b9c84150d4859694334b395d6fcddaa16b38923a8873dbd48e07433dbc4edf68a97dd8dcf65b13239b689dd9066f8e959520";
-  sha512.source = "b79156a217b8c1eb9b5a4be100f87d80694c20fb48d84dcd3a631b871c95d8afb1dd428ec0591eb2f0a38421b699bbbe8d3f3c98500929982bd0ce57c49d1d62";
+  sha512.run = "c374f4ba87adf6837c6445f64d31888a03654dbdbfbda3bdcb79ae2378ddb7b45dd28ac7510200eef7e4b27862b6dea552df04fd8edfed206322267a26b20fea";
+  sha512.doc = "b3eccb497b805a778413a2230bd49843faf0e2698ca2b9fd799f80156548be76b5f87f61262f9149cd9adbe1f9b1c469460186a265e60fc4b17881934e5203a9";
+  sha512.source = "cf294b7ed7ecd01634d90f6429c98e0919eeea98d08b7b05324ae44d79ed6f439ba81942caa7c96ac415292cf2cc06de3bccc4228815dbdd520f6078756f0928";
   hasRunfiles = true;
-  version = "4.0";
+  version = "5.0";
 };
 "biblatex-bookinarticle" = {
   revision = 40323;
@@ -3141,12 +3175,12 @@ tl: { # no indentation
   version = "1.0";
 };
 "biblatex-ext" = {
-  revision = 60379;
+  revision = 62472;
   stripPrefix = 0;
-  sha512.run = "5cdd74fbd738385a63f9fe78185e4e883f0ea1a7957dee30783f93bd3549eb179d44ac1d0f4f13cd66788ccd78e83ce512f6b1cbb955bdd195d9f08398ac2c9e";
-  sha512.doc = "f782583a1f77c361dfce7abb03679bfaf18e4574e7670cd910840051db316d8f74bc190c1b2aeb6e9870302480f33c9a5e792b07e5013f541b700ea704265ab2";
+  sha512.run = "fc4c326495f5be4a9c836f4d548151047072d43d2784bf72a34ffa8d36eac339b7a8a930073238025382360820a1cbdb07333e9a7f510447069c68d51683f85c";
+  sha512.doc = "9f1cae878cd26679a950f9e31f3c3d77895bd2f0e9691e77e5ea8099f2d2c3562a35536c41a179eca7c985e8e00f66c0d692d10a609fd2b5510b0dc30b09b9e7";
   hasRunfiles = true;
-  version = "0.14";
+  version = "0.15";
 };
 "biblatex-fiwi" = {
   revision = 45876;
@@ -3157,12 +3191,12 @@ tl: { # no indentation
   version = "1.7";
 };
 "biblatex-gb7714-2015" = {
-  revision = 61274;
+  revision = 62705;
   stripPrefix = 0;
-  sha512.run = "c1229f94727c82d0cd8d089cfa5dfd8685e1953b4b26983227483eebe250387ea05d2ccb3089a2b949811334349281befd2b3596111adb77ae56fd0377474d8a";
-  sha512.doc = "1ec8fad46855d2b069a26c7e45cece0c9968f1b04a358900aad3399ae9f57f45aafc18576557aadf04672f03d4ea7d580823f44cfca86a2b4511ac8ccaf1800c";
+  sha512.run = "bc0f3dcc6b0c6a1a86b8ee7a2c74791b674d7b8654a3e24b47b48d1556f4067809435ea38559fdd6d606230156ae94d4666381cfad368b1776b562f127ba4421";
+  sha512.doc = "552ee4cc5bc4e0ecb7e592218aa6c3ef35f8e76e1fcc4f7416fff779426961b319c8da3bb315d22b5df386d2ef1e0697314e53a28ab6e182aee59d96ce01fb4d";
   hasRunfiles = true;
-  version = "1.1b";
+  version = "1.1f";
 };
 "biblatex-german-legal" = {
   revision = 56939;
@@ -3205,12 +3239,12 @@ tl: { # no indentation
   version = "0.1";
 };
 "biblatex-iso690" = {
-  revision = 54561;
+  revision = 62867;
   stripPrefix = 0;
-  sha512.run = "70469c6baf7e9f644e9a012d48bae8d7904cd53c883f5238f42c20ee904c11df2381a5721d77ccebe23303975632321e276ef7eac158f4ee1f8d897de41faf2f";
-  sha512.doc = "a9012321245247b6c4331312dc3e371bfda7e70e500b1296b092a12343dd270551496b9787c90ff935c50fcfb4ed2a3b6dcdc5dd722b7ddebda316ecbe9719ac";
+  sha512.run = "9b97f15fd343585126ba8b114503d53fba03977bfbb6f95601eb732f718bc33e34f5c7b5fdb8af32fec488c21ad1e40ab83ab0af519df3bd198953e04e83d3a1";
+  sha512.doc = "c680a4c2e7fe44d1fcbc9684eaf923a62cbba7d7091b4e7358437509e978c07ed404a11bfbd5eb6d43d796541b52b56f3f19ddab057640d3e5167f56bb53417e";
   hasRunfiles = true;
-  version = "0.4";
+  version = "0.4.1";
 };
 "biblatex-jura2" = {
   revision = 56133;
@@ -3237,18 +3271,18 @@ tl: { # no indentation
   version = "0.1";
 };
 "biblatex-lncs" = {
-  revision = 60303;
+  revision = 61633;
   stripPrefix = 0;
-  sha512.run = "4eb20f0094dde1739568f8dafd47e861c4e440f9f34021e889c399e27c72247c04f8ba2711750a41450db52bbfff7a001100d5cbd81842d00357b22597b953fa";
-  sha512.doc = "a454a1b4237070aa0f939b121dfa4e03996b2db922659c8db2fb86de83847d952fc28481c4271cb251380428af403b453de1f6108e94ee792765fe6ccfaed7b1";
+  sha512.run = "b629ccce8c85ae96719b2d2672971ec5348123014fe1d09fcd3f62a44c615cb0e078cfb0c3093093dd62151beeb92eb12ec5c5a8236d1c2f94fc8e7be7ec2b86";
+  sha512.doc = "ee6c3f271e249ea8959ebdcdf7f8d42a8f313d2ae81e59836946aecb1dc87f66d52ec5d6ad6e09c16005b791e6deb169255c65b661db2783411a406db431240b";
   hasRunfiles = true;
-  version = "0.3";
+  version = "0.4";
 };
 "biblatex-lni" = {
-  revision = 49935;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "9089117cc653cb9251622299b20d79525ae9623661de402732c9b9f47b2b296cc0b756bda279487f5d042316693ac624b18352dcfd04e6cec436a402b9bbba57";
-  sha512.doc = "23435bb5cdcc7cfaa58d732582e23d3a23589ee064122b231794f17ecd0137e7a4a0e21057835d3925c149d637a7bd12270b4dd05cff6259f103498e0989ac66";
+  sha512.run = "c91f3f8cc6e238602682893ef0ef20af2ac87a518d845e46262f17773f9082c5ed7ffb59329ac4852d8b3d72b3b1364395d3d16aa9ddff52619d9591f2b7257c";
+  sha512.doc = "19bd2d8f8f7539543c876c214731d407def9c193d70ea3eeb7a9869202fa26242674a996934a599004e36bddc62669bc769c6a76af6cec6ca85bf44436c41de0";
   hasRunfiles = true;
   version = "0.5";
 };
@@ -3269,12 +3303,12 @@ tl: { # no indentation
   version = "2.1.2";
 };
 "biblatex-mla" = {
-  revision = 59529;
+  revision = 62138;
   stripPrefix = 0;
-  sha512.run = "3f9ce622de66c8bc936954e9f29381fd8a604c5ba94ce425c577ec5850a4099ee5f09e6b5b2bdf05eae9c4fa6549878b3061c25da916ccc0041d302534512623";
-  sha512.doc = "1f9ee8d696dcc31e56d47edcb9e53fac525fe1ff5408f0d649ca090fcdce5d132dc3191c82f43aff94e02ee34e3445b2dd0be3513a21b963f72ef1f2ac058d5e";
+  sha512.run = "f286ec7553818df5900e6d5e791d56c815711bdf6dbc3a317bd416dfae9e7b86d94e4d43cb4846cffcef9e9a246f0a059835ab6812172130a31984dbf39b58c1";
+  sha512.doc = "a6e5861754ca4e1bb42dc054188777b63d11c1438f83399c4752ea849284bfc7a97943e891983b88117047f59652441c31edf82f382370ba233deafa0445c17f";
   hasRunfiles = true;
-  version = "2.0";
+  version = "2.1a";
 };
 "biblatex-morenames" = {
   revision = 43049;
@@ -3360,12 +3394,20 @@ tl: { # no indentation
   version = "1.1b";
 };
 "biblatex-publist" = {
-  revision = 61302;
+  revision = 61500;
   stripPrefix = 0;
-  sha512.run = "65718066f32eaf114b9e00a2ca0ccdef328846594eed522c6fad7438be0d382623a4182d0c284763e83a0c77c43cfedddcae70a8cc4af42eddbb5cc4c682b2e4";
-  sha512.doc = "4cd41e01c75b897f88d78a56a0909de3a8df6511ca89c4f7cd68925a3bb88c8324f1dc9763d4eaf4d5bc6cc6cc8238868db66c838a80ad0b687b689698b70640";
+  sha512.run = "1eb44630405055802747131b59c19aac40d541448223f6e99e7a2d37b0ddac88ecdd60b3e576f7fc9dbfba8f030ac9313aa2ed2d4a2a3410913f3479648f2d56";
+  sha512.doc = "62cb22ad19649f9a631163d8446407cecc24eddc89cb16881258dc5e4f4bec991ced1b44a8673e14d07fbce0457bb8a15b64c139713c049231e1a280caa82c04";
   hasRunfiles = true;
-  version = "1.25";
+  version = "1.26";
+};
+"biblatex-readbbl" = {
+  revision = 61549;
+  stripPrefix = 0;
+  sha512.run = "d74bd07be5983c2731a418ae0167d99e2bdf8d1a9569186a8940f89af3b9a6fe82f641717638c693b98b61637a705fe280d033282d1e37c279aeb080c4b66399";
+  sha512.doc = "9ca0584c36e7247496cd0375e0f6585695f509c4e88d29f23158c5c5c7897758d678082c9c836d0cc878423ab23d54e9a0c2b40c5b63830fd8996a35b4aa09cc";
+  hasRunfiles = true;
+  version = "0.01";
 };
 "biblatex-realauthor" = {
   revision = 45865;
@@ -3408,13 +3450,13 @@ tl: { # no indentation
   version = "0.0.1";
 };
 "biblatex-software" = {
-  revision = 57366;
+  revision = 62372;
   stripPrefix = 0;
-  sha512.run = "25c2a7ebf41761d3b2b7b2dce0f754073d8808b6bf7bd413fbb10aedc465de543431fb297914236c51546b362b9215423e94f9464c5e071d24c6f7b9064e6b1d";
-  sha512.doc = "5b9671e77ed59b57724a7682ad3b23f7403d4fbc31387443e5adcc170f3aac4ea288454263c091ef71530f3ae7c5b458e48065de9c7f66182b036a9db9119ed9";
-  sha512.source = "e3ed4c9292271223c084bb66913a6c4c7a27774cf2590e63820a40efe36cfb53e452e45d5b2d0d73390a42d51c38a51a84f8894d24685026731dfe6e34b6f6ce";
+  sha512.run = "fb8ddc8a678724558ad01a50bf7808f8a58fa80f1a9c4818b363e65d2b2f7ac1127de4b62bed313430581417987f1ccff095e4eebad868b532b523755e2540bd";
+  sha512.doc = "84503fbe1152b53520cdf1204c86406e9daba9ee4c348688fbb08f4a8de18da1edd6e7d41e4a1261a3d2be8542ae750cc489a3363ea5470b4cd0aadc4f046323";
+  sha512.source = "5ac10388ace19d5e808f6cc94cc800a43030b8386a16516eb5df94741381976a5bebbb239b65d9eb2cfe80e2494b0d3c7c3123872ff6ea65143f77fe731d70b2";
   hasRunfiles = true;
-  version = "1.2-3";
+  version = "1.2-4";
 };
 "biblatex-source-division" = {
   revision = 45379;
@@ -3425,12 +3467,12 @@ tl: { # no indentation
   version = "2.4.2";
 };
 "biblatex-spbasic" = {
-  revision = 61380;
+  revision = 61439;
   stripPrefix = 0;
-  sha512.run = "642ab8915e4b94f7c57fb9ee27577f41f65c118c60e44476935386fbb4806a4b5f30d54f39668b698ef310c53a48a22d02da8681c3439de1da89a1851a9a0f57";
-  sha512.doc = "9a7681c9528d74c70c5ccc1eb11449cd8a3a17a0799bf37ed2f5685182655fea80eb2b387fc399562d8403851d9857c73cb2fe4c8ab4aa2110dc909d65f4b168";
+  sha512.run = "478c5cf4f9996e8b15b13a1ea08b53ea03ef731666095f5374bbca6e16c93d0f049b891540742821140e91a30a8af1fe3c233ec45df1dc777b7c408b52676d97";
+  sha512.doc = "9c12f5fc1b328ef0369e7c82c2a25162568cd1d1568aed4ace480a639a38e10642e93ba20939fb0adfed2ee16b44e9a7abcb3eeb6fb51bcbe47bce7436a590fc";
   hasRunfiles = true;
-  version = "0.03";
+  version = "0.04";
 };
 "biblatex-subseries" = {
   revision = 43330;
@@ -3441,10 +3483,10 @@ tl: { # no indentation
   version = "1.2.0";
 };
 "biblatex-swiss-legal" = {
-  revision = 58661;
+  revision = 62509;
   stripPrefix = 0;
-  sha512.run = "0d15d1a11d6f7a85d2443d3376b3ad8ed0941474a7e598ebacc08450a89b20b1909dff15111d209605297dca720ea6d7b6772869a39c14786199b0c4eab4e011";
-  sha512.doc = "db4e7cb54f2002afe099e65402c43bc5574cf2e9bb1ffc11bc0467401f0a8bb48124681fbcb2a95e950517a20baff4dfc79822bbd7152e7408d4aac04651dc5b";
+  sha512.run = "3a0fa6b9caf5071a747683a57848f0bf9fd86cdbbd98db3830c7af20f175424717d3c66ed7d637559d74c707cbd2cc4e43969bfa875d166784dc3d7b97769b18";
+  sha512.doc = "275521f31b5e13eb06168d2dd45ba07afb9988714599acc99f114f07ad3a329dc168d415e4dcfc1db06f1048c8bf2178cea6006db975ba90ffdd05fe46ecfa11";
   hasRunfiles = true;
   version = "1.1.2a";
 };
@@ -3465,12 +3507,12 @@ tl: { # no indentation
   version = "2.0.0";
 };
 "biblatex-unified" = {
-  revision = 55290;
+  revision = 61920;
   stripPrefix = 0;
-  sha512.run = "930867328f0f818d03fd5d8cacad6113214609500f43e06b77b711c00939a3a3c99e8e3bba8a093721e719b8449abfc29be50c9b5482b65f3c47f4b7b3a344ad";
-  sha512.doc = "7196a1c293864f8cbe9e1421ee074cf249bac49c9d9a8cdd811a0252d4a0700f1874bc7d8f3cf22f3ecfc50ac214ce17d30ba8e7f84ae92428578e540ce66429";
+  sha512.run = "0c4789b1372cf56675a9db1b93fda299ec62fa5d579f1e7d38e41da53752e1937c31ead9742d283ca67c56e4cd0b90814b31a9b502fafed4451f2b968148e787";
+  sha512.doc = "8b0a5ae0e37380e45059a95e2247cb240521734bc160b381d6c4c4a09c9dd65a2f55a82f49b8f51c6a39d4cd8c88172484d5bf78682d4be66f11a7c40c1a3068";
   hasRunfiles = true;
-  version = "1.00";
+  version = "1.10";
 };
 "biblatex-vancouver" = {
   revision = 55339;
@@ -3481,12 +3523,12 @@ tl: { # no indentation
   version = "0.1";
 };
 "biblatex2bibitem" = {
-  revision = 60890;
+  revision = 61648;
   stripPrefix = 0;
-  sha512.run = "33cee5b052448e46173eee2622c5b4aabc20f0590f6d17d450359e8a13704bdc79d209de49ba112243b50f820e69dec8fce79e91c12a296b9f0222dd007a6cf3";
-  sha512.doc = "60605625c4c8fe1923fd415e1afc827348d1e3ce59ed94f2f916f29d9a37dc8c17380e5153c8f591655b369b8feab3fc62d2b0e7032c6d0f3b479fd59634fd44";
+  sha512.run = "c5c80c9c9951ed57cbedb64976e96540dcbb7797e7af58e3cd983779863617f8deb4cca3b4223f6de2e1f4bd15940df02f6b87188e937b2b5a79ebcf2b1a068c";
+  sha512.doc = "a44dcfab5daf60da858ad548e306732c7bd3bcd4121f9143f5bbb7150616edae5b42fabe301c7f3fa271bb6fe851276528304c801fa8d7c3aed7c41f5fbde91f";
   hasRunfiles = true;
-  version = "0.2.1";
+  version = "0.2.2";
 };
 "bibleref" = {
   revision = 55626;
@@ -3556,10 +3598,10 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "bibtex" = {
-  revision = 57972;
+  revision = 61719;
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "9d695d2335d5cb1abf2810016f227e368bcd726d9cb05cf197df93b68a18415a5a7be17ec81d888ca5fb837960173951eef2d04d8abcd3dd6bccf33673dc4ac4";
-  sha512.doc = "f3c241a15108671934a8c05014d68dadfde6c87a00375b45c92b4924a48c5a342c202b71be05035313ee764c0bdc63ab84cc5d80b4d5eff2411562bba6f798a3";
+  sha512.run = "f842f854c13c94cb54167ad4725767c3c6adb40e317fa763e21b5c445503eaf9ba17f9d0f843b4adbb40c884785fac96ced8fa7a7aaa5b8878cfa60d2ca9c9b1";
+  sha512.doc = "b417df9af3fbd6a42a67cd6c85f7133336a6e46a191da92e70947efd35c2672bd1f625890e9e922e220dfe1c27d15648ab5fbf77505a640817da8d5dba30d671";
   hasRunfiles = true;
   version = "0.99d";
 };
@@ -3611,21 +3653,21 @@ tl: { # no indentation
   version = "2.2";
 };
 "bidi" = {
-  revision = 55193;
+  revision = 62073;
   stripPrefix = 0;
-  sha512.run = "dba36e375340a6d852eba98b83ad8e0821e684424a53069a4eb21acad43ba32cba11a68b971fa8bbbc6380a89c2432916e8a048de85cd5ab377d7811570a9be6";
-  sha512.doc = "16e8062ffec0b64faaa2c1f4916c8decb38510af7279607d11ce0537cdbdd57dd90e9901e47b7396758b9653321f8e14716a809740f5d4c0f610358899ce333d";
-  sha512.source = "bbdbf08f87deff3ba6ff97869bcfb36b996f2985f4b28b4f598ea76827242d54b3e319379a9b027c2a6790f86e4503edf7d3f7e131f6ee34d48cfb042a8eed80";
+  sha512.run = "6f9ccac604ea3e8550f3459fd8a5c3644a85f75019ce8bd006a5d44b5e7ca74e7684288310c332dfb2bfb586ae248cd616611c93ee70f0d3fcfabd776d0f7d7b";
+  sha512.doc = "054fca2837aaa14384851a75d0f8436b0b4f63dbc22fa6555d9a7190969ec52f5698be80afe347ec23c2bfe2cc2a3b6fc5a40733b85f7eed1c0d8d4431b8be20";
+  sha512.source = "eddb35271b71dbe2a8987f9935866cda046ecd7590bd549368c3081fa5aef493252610a6bc9fc18fee03cbaa0f746bb98e8a6f68d2d64c8af5528c0d0e2493cf";
   hasRunfiles = true;
-  version = "36.3";
+  version = "36.7";
 };
 "bidi-atbegshi" = {
-  revision = 35154;
+  revision = 62009;
   stripPrefix = 0;
-  sha512.run = "1295c87c038683212deaf52a4436bb6adc2a0cc0220b6767e770aa909d88eaeda4a0bd2dec739a2415745609aaec78cdd91d4949f90663323aeec63cefd45d01";
-  sha512.doc = "6199c4d5b6064244c2fd38d8a0d6c4eac3c790cc786625502d89a5a8a2426f7182cc0e7c4b70513971a0cb4b1230bdbd1382c05762f6537a63a34fa4e79c020d";
+  sha512.run = "5b16cfee9c71927cff133db3b967dc835634553d0980f74164fe8996ef86c3529439e85e00678219879cab41bde2027f3258b2862906b58634713e4b7d16c515";
+  sha512.doc = "05b8118cbc59f06aeb87ab3b5b6a7f7a14dd23543c9d45621352ceec58998601a97af31bb6b0c999047efb362c24508f769be3c2e483c21a814b8ff35bd0bb96";
   hasRunfiles = true;
-  version = "0.1";
+  version = "0.2";
 };
 "bidicontour" = {
   revision = 34631;
@@ -3734,10 +3776,10 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "biolett-bst" = {
-  revision = 42217;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "e593f073daea4a8326d0a472999c128f511becde100c5dbedd540fd6ea116c5585b2d3673165ed39abf1942fb66c8372ca1961cef90501244f5320119117af05";
-  sha512.doc = "7b3f9666225849463683a38a3ccb4e5bc9c0869312d31173f48776c2b209eb269309699b2173c2eb5fc9163baabefd1bf6cf288ca683142285dda6f0c6d95b61";
+  sha512.run = "1a26b364b958c52727b4bbb75430e8ee3a685eb543f6a4fea7e6b2e37b044b97685139f5f26e74c434e9a5b2b11089de1125fcd18bca2707b153fffbc9e1f924";
+  sha512.doc = "df77d5919f3777c6748efe50b974f3ea6594dc91fdb3d8d44e781d2fec88ddb1ec34c3e7dae8f4fe0200a8704847933c00a27680b8fa9a276ef20156e6894fe3";
   hasRunfiles = true;
 };
 "bitelist" = {
@@ -3750,13 +3792,13 @@ tl: { # no indentation
   version = "0.1";
 };
 "bithesis" = {
-  revision = 60452;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "c7e3b1d0550c8f9fe33167d01fdd531c7711592de2c1bead232f00a4175c12d542785c18d66dfbc63916fa1668516339a7f3d9a29de4a9f688333ca7ad8fbd6c";
-  sha512.doc = "9eef61914627c4c0fca3a7c6847853ae6b21685777cc0a0c21218a41c179c0a4a25c1c94c4dbcf9481206bc253363b6498d1388f6769f83ab8a9573d65b23063";
-  sha512.source = "93486e82d66f648a7adec186377adad47282abf6dbe624d18bff32b638947c36a273fb89aba5325eb4a978b72dac0349f71399a39644eae40d9a25d49ad5394c";
+  sha512.run = "2b56a95fed5d9e80c7baeb423c7efc6ebacd45218735c18f7840ff1d59b29a7f8c3d5486d5a611f55c2247b2073f93386d84b4a9332a13bb3f080099a11368a1";
+  sha512.doc = "6e7976e8bc9f11e0b2d48ee18c49abc9e69e198cde401acc2a9b60c0ddfaeb229148f535651cdc507212f1a6aee091592804fb1fcad478c6ce1a8e9391c1d703";
+  sha512.source = "97094be2e5b0910a0c908e7d9567a299ecd569c7eb1c86e8db0f1a5f27fa0e7212735a689400cf468f996319ed299092b7c6e3bb8b6ba08d11c7549734e95f86";
   hasRunfiles = true;
-  version = "1.1.0";
+  version = "1.1.1";
 };
 "bitpattern" = {
   revision = 39073;
@@ -3874,11 +3916,19 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "2.51";
 };
+"bmstu" = {
+  revision = 62012;
+  stripPrefix = 0;
+  sha512.run = "38587c3ef1eaabfb6ad0148ee3442d6f2a5e5402b46b5ae4957efe983bf24afde2a7f45cc422a1504c3548538c46cc08c9e346875d09700ed366747855537e6c";
+  sha512.doc = "a07bfade77db170c2bff6292895f18f98253a57fd3ac75f1d867747c2ee91fd47e680759b0ccbfc3e5d56fb831d7def6261156de9044106ea390b5d020ea8e84";
+  hasRunfiles = true;
+  version = "1.0.0";
+};
 "bmstu-iu8" = {
-  revision = 59576;
+  revision = 61937;
   stripPrefix = 0;
-  sha512.run = "5bbadf510d8b3880603e9f45a93a3f126175c4b6825a65488df95ba15bd138d37a7511b845dc6c93095b405189c876427a6dfa883a7b4b6d2c1d99824f33963b";
-  sha512.doc = "d7decc544efc16600ddf75c5cffbc8602230379a9e86553f2c532732e5874450c976ad562e37b06a023fcaadfea88571f3b0bc36f2c38f6947e76936c7acb466";
+  sha512.run = "7d4d2f575bf4a3a14024b478610a1d3d1fb9a9609492890ce4edf9f3ed1e34abd99f519d3574c39347f35f8bd2bb1b19569ed6a3652443063942bb0900877ba6";
+  sha512.doc = "142cceab83b83c5a0eddde753f67b44cb2e881cd01a4de1059606e02cc241d6d55f271d525db523f82f6ecd68bf6bb09dffcb15adb1b4b080b5701e041ec6f2e";
   hasRunfiles = true;
   version = "1.2";
 };
@@ -3892,21 +3942,21 @@ tl: { # no indentation
   version = "1.5";
 };
 "bodegraph" = {
-  revision = 20047;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "eb4be1d54f84a372bda79a35aa928be028aa3fdd13c589143e3bfbdd111f4819ac7927bc9eb7473c64fb9035b5bbab789b55a5967e4569e916a7fe516933612d";
-  sha512.doc = "479d5d95643a0b5a673df4d48049f6a7d89b4dc8d1511676d6ff53e039f65fb27994e35d3db3adeef0cdb30658d3eaa454d997ab4649567148fe90938602024c";
+  sha512.run = "abec68060be55077c615c7a4dde1f0a1c59d2b94120a1c5e3f578572b2c23ff814e20344ee767ec7af4c30371e95a5647256f39be11e54fc8d6ad661025887c8";
+  sha512.doc = "463c7fad4432c366c59d1ad9ce029cf1264b4f398021479ac77ba04bdfe2b1e6983553e46c5fac3b248b0df07f2ac9ea07fff7d4c8019b30874316e08f3522c1";
   hasRunfiles = true;
   version = "1.4";
 };
 "bodeplot" = {
-  revision = 61092;
+  revision = 61661;
   stripPrefix = 0;
-  sha512.run = "6c9b59a70f65588af78c36675063b85ba2336c8ade9708d2e699ed64f522a94df7650c4f3adbaf279d78da0c211a53d177b1e7090dae013c196f2ecc291a00ef";
-  sha512.doc = "4dc0a31631809f10ec08d284bb75cfbb159518cd3e2fea0c60ca67758e090dbfab100edc3cf476d864879531121642bdd0a96d09d9040d9be1288c05b78c6765";
-  sha512.source = "fcc50625372e7c41f3a691cd85c7619b6548caf1eebe60298bb83faf9016ac2c4b9508ddd9c08a7426e3c96792f52b5d260590972d5e32bdc7be2c230b55d224";
+  sha512.run = "921d943535390cbfe0134587d831072071df6fec76ed020473f7a59bdd3adcb7300694dc819bc0ac519af9f0a7fd3af03c715bb117c72fb7362eb2ad41c19433";
+  sha512.doc = "8732acebd794c619db376d6baeec955f6854ff2f8c8cee0754e1d03bb901bae78c499800902109d0f07cce7bd2829dc280ad425c60ad0d0b783a6a17422284c4";
+  sha512.source = "f8e1ec58e3356d9788cef23f7d2a7fcf5c52a1c382a16b4ec9d5a41cb52867ffae55c24266abf1fda4c7a93cb1a745486a80169850a89a84bb56e8bc80fe9b0c";
   hasRunfiles = true;
-  version = "1.0.6";
+  version = "1.0.7";
 };
 "bohr" = {
   revision = 54512;
@@ -3966,12 +4016,12 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "book-of-common-prayer" = {
-  revision = 59742;
+  revision = 62241;
   stripPrefix = 0;
-  sha512.run = "0760350b49c1487d35ae04ff0ee57d552f6ffa0c7df9d02c7f74147d3c459926881a0252fd95d5b7acf3064fc63eca92f72aa088f8fca418d86f5e6f9b9febca";
-  sha512.doc = "ae73dba4c8bd043772ea4bf78ff9cfb0fa210d3de15b2e045356522349f11930e34dede648022be75d015893a91ecf9d57812b19475352f59a4f84de5a520055";
+  sha512.run = "7010a4a3665d760cb2a8f4559a0bf890c45c6a287ca2c0f862cd8edcf0a610671f7b44bcc8137061ef91e91b9f46148176b5cec478f8fe7c70df1b13e61438f0";
+  sha512.doc = "1ae5d0a20bb86610e4f9eaad8079447f7e13e2bea0a8bba258969e8bd27157d297aa1f46f710e1e544be6171bb560f57cc507b52a019a3caf7f6d19065d37e4a";
   hasRunfiles = true;
-  version = "1.0.0";
+  version = "1.1.0";
 };
 "bookcover" = {
   revision = 57326;
@@ -4016,9 +4066,9 @@ tl: { # no indentation
   version = "0.7b";
 };
 "bookman" = {
-  revision = 31835;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "bcc6a2ca260350a22927d806b29dec9b7a6c7d9bfff2517d3c64072c9bcb3b73ec72937c004d36c2570a2c78f073548db6897195591e36bae7b6eaaecf6b6023";
+  sha512.run = "8bef9b6e467384a2b5adc6bd61ed2e410f026f6ee867a5a62239c55391ebd6eb5e521c82f9bd0e4de995591458ec32f98ce821493a85113beaeef6535b938ff4";
   hasRunfiles = true;
 };
 "bookmark" = {
@@ -4261,13 +4311,13 @@ tl: { # no indentation
   version = "1.0";
 };
 "buctthesis" = {
-  revision = 60708;
+  revision = 62474;
   stripPrefix = 0;
-  sha512.run = "015f93fe7b7c5aafff34a0a24166022b9e1d5cfc6f983bcacda2da5b4ac8a5315fc00320708dab53da32d0573859fbe3e0d692966d76369dda11f2c08a9c2cf7";
-  sha512.doc = "d94312d06d2228f97c0a5c05d004e53dcc8dc0c6ef80f56d08d41cfd4c88ab38aa4df8b6cdf07de8aa6b5b6e9a8afcd86e9824d193f317eba380f4656f810c1e";
-  sha512.source = "b35809ecf963481cdde1ef6dbb0b215a306ebc5595b988b883e70b06d8f0f6f80079d7bf3d340f8c301330471444af6614cf5588347c22e896651d43de9917ee";
+  sha512.run = "59db65878dd3b100cc3e616ac3e5a02a0bebf91fd1013fa93029d2a790d6736f6deb1d65b053f1b54a475429939c3bc6518da3b3b201847df08c77eed2f84225";
+  sha512.doc = "f39017d6cc051c689101a8108d15d79bf1e6d7d37f672d856a1e2651b5422b42d16f799c252fe7d48391fe92e985ef7092c0e8b8b36bdd501d00ca01e7ea7923";
+  sha512.source = "26526f51d54ade589267dd1026290616dc1ece05b2d5a22adbc086427052179d199f8dc5d9c17d0365e3c844f937714c82abd77673ca95ec237321ad5fb6ca70";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.3";
 };
 "bullcntr" = {
   revision = 15878;
@@ -4294,10 +4344,10 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "businesscard-qrcode" = {
-  revision = 54080;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "66e98af04011a9a17104dac23845ee6bbc5f4fe3aeec37899f82448a85493c5b722f5de59139f2a29fc84390cf5480af3a491ea2d1270edeb16ada734e2cb57d";
-  sha512.doc = "d488e313d538d9faa956b4279974faede62ca231ce744d010b11d8a98a9b596d225a3804ba0aa72a13a6749a6207321b9937617d524e5803f490f9bb8933bb8a";
+  sha512.run = "d991a7dfb9be936018a1946d2d3fbe24b775d99bce08da27e7451b54c679bf6565b207a7645ee4def2464ce08187b6ff25614dff9ec6925bce66fb6f48809412";
+  sha512.doc = "6ff58a45f67ae55d82721f125bf3e9c8a5cbd049515b840eb4bdc79eea63bd82bccec41f53b05cab9e6720f3719cc58e882998249a738eaa9f033f14569b9f88";
   hasRunfiles = true;
   version = "1.2";
 };
@@ -4375,12 +4425,12 @@ tl: { # no indentation
   version = "0.2";
 };
 "bxghost" = {
-  revision = 53606;
+  revision = 61989;
   stripPrefix = 0;
-  sha512.run = "72b5a376d5a927297fc466936ae55ed4fe4fe8705aa8f31fcaa4f4b558496b19952b55ff8b02318f5d5cc8c6cfe31c6310cbd22900084d353a93f348291e0c6e";
-  sha512.doc = "718c59d1c05689fbb4641ead9437b2ddde19f848b6f7c9fd5f4c91b10abe9fc6413c531c2f5af3f9e70e30578341116e5b4731a8f873f75fd4ee0803f3597a3b";
+  sha512.run = "0b887dac7fb97c7faeabaf1863c0dd9b086b0f8d6e91e399c6a19a1d7950d1940a117a0176104256d8ea18ae822c6bf111140eca3ec9173e458a94233af4537a";
+  sha512.doc = "a6b06eb89e575e917d7bfed36b4080170d98001b70f257a94bdcf5fdd20779562a07a357469da56b85d5d1618e5bd9e6406d1f6679ec6025579f49e19c670558";
   hasRunfiles = true;
-  version = "0.3.0";
+  version = "0.4.0";
 };
 "bxjaholiday" = {
   revision = 60636;
@@ -4415,13 +4465,13 @@ tl: { # no indentation
   version = "0.2";
 };
 "bxjscls" = {
-  revision = 59253;
+  revision = 62826;
   stripPrefix = 0;
-  sha512.run = "55dd819a17df692beaeccc41eb9c9258b2ce6df426eb476457eddea117551698ecbfb5a34c339891e276fe0c98f8ee0a676640d7dd066778d0f6e74b6c5fc9cf";
-  sha512.doc = "6c922c350ba11095dfa1c0ca9ef6b7b3b23ff7b3a265246cd4938bc85c9c98589d1d423136194341ebc888b57aa8f0a0503ab4283f9ecba023ecf19c728bfe40";
-  sha512.source = "e030c2a706035e6bf894f7c92a5f5fbbaf5c5a887e654bc33769fb27412265dc8ac84ea5f283131e7071287244c983cd72e3cbebfd73d3f6b17ba12b41b8e948";
+  sha512.run = "1ed2ab825b3a83c4074be21b6cbdc0ea7513109963e2aaeeef87dcb17272346790fb8b30571077cdb3c2e4ef6d038407ea2653deb013966004c7502440060b87";
+  sha512.doc = "5cf49258316bd412bc902275a87c1d649c5b2802dd015c2cc28a941fe063f5c054d2879bd615e8ae6846e7d2f5a2899f431b0f95e2a77674daa2640d152053f4";
+  sha512.source = "c4fd3cb3b96d595cf51bd4c06ca9234ffcb97bd439e29d3db3a83e6608164fe00e8d25bf7432c38641b93ae097ca89229e4f8ca842a4991c7c43967b64c4dbff";
   hasRunfiles = true;
-  version = "2.5a";
+  version = "2.6";
 };
 "bxnewfont" = {
   revision = 44173;
@@ -4432,12 +4482,12 @@ tl: { # no indentation
   version = "0.2b";
 };
 "bxorigcapt" = {
-  revision = 48606;
+  revision = 62715;
   stripPrefix = 0;
-  sha512.run = "de76176e7448732d3d429c11b605f24a01779651dc5bb3969a6cdd45ac1801a9d2472dcb4bda9751aae09428d7962981a4c9c581244f15b68b6a4aea43d54972";
-  sha512.doc = "0ec8b913862e51f89f661de3f628bb51a306d09d04adce4ff46183d8bb24c351f73c877b08b699f704661ae2c31131b7a959ad863a3a6613235318f8825136a2";
+  sha512.run = "44b292b6fd4ec9e173ba6eaf3708d6b167699dc6df2a79c28957543777d0d8995aec5d85a20fef43dcac96fc4fb3f121a5f84eeaff86258271492af07261c825";
+  sha512.doc = "425cbee5dde9ac64fecd065d1032fb4b6b025a23545f4fcfece1f08b142700be776945c5c122bf715b7208a86ad93e662bc31eded84502ee78ac44a501b6b921";
   hasRunfiles = true;
-  version = "0.3";
+  version = "0.4";
 };
 "bxpapersize" = {
   revision = 56491;
@@ -4480,6 +4530,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"byrne" = {
+  revision = 61943;
+  stripPrefix = 0;
+  sha512.run = "ef27aa477ed05bfbfbe3729fcfe119f9e7e3335b9669a34ae812b21084c2063b819e1201340f3db269f9f2234b5644054ab30fb3112b6bae142c7e5a0c6831ea";
+  sha512.doc = "d0c03c352aed98d7b1abff22d8613f34d206807fa8e0635b88b764f136bc851dd53f8757aff45f636e1c17c32ddbe481867a3e30218dc97ca07f25a147c1e435";
+  hasRunfiles = true;
+  version = "0.2.2";
+};
 "bytefield" = {
   revision = 60265;
   stripPrefix = 0;
@@ -4600,12 +4658,12 @@ tl: { # no indentation
   version = "2.4.2";
 };
 "calxxxx-yyyy" = {
-  revision = 57282;
+  revision = 61463;
   stripPrefix = 0;
-  sha512.run = "2e9355442fdf8c4389fc09c8966c5e6b72cfe2df1b3209ec698db686579bef9ab41c17a36bd9714b3e917a8bcbc8ae568ca34bc7112a5a39d00a5b2c5340ac65";
-  sha512.doc = "849652e8def77d6f9f0d16f29753df5e5b9095bcfed9be8105294df7ddc26644d1784a27a8b203d9e6c295c0f1e7f58d36f17bf98752ec9ee26ac3ac5a2f361d";
+  sha512.run = "d100ebfbd0b52945d0cf943995dfd2cad8f8bbfc8fd7260ce288a3f164b1ffdce9b4b604900bcb9f69e95e4a302c574746757c79b7af9e7d5fa20d349e7ce107";
+  sha512.doc = "cd1be496767b9817978e9baacb7a3edf6c1d025b6aafd701772a289318fe86998904863148e8e2e807f74207fb089e27a1e3e60100587c4179fa91363b85864a";
   hasRunfiles = true;
-  version = "20.21a";
+  version = "20.22a";
 };
 "cancel" = {
   revision = 32508;
@@ -4657,11 +4715,11 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "caption" = {
-  revision = 56771;
+  revision = 62758;
   stripPrefix = 0;
-  sha512.run = "d0e7276e6e84cabc85d64bc397fd2e4a258e913e4f78022ae40f3c7293e7f9b3f34dd011a944223507cb1555dbf2031dc563e34a5f7064e9903964bda5a893c3";
-  sha512.doc = "50018fff476b99763a3373b9defdf9de854915af11cf37f3a00907483ac481b9a0709d23f6d3612ab754c3f079eda905c5fa3447f576dadcb65f83a5ae5a98e8";
-  sha512.source = "5f961b0fb1a11d5f28d75f58331d0b79bb87800d4a5412c57a66c5693c07225a46e49cb42f8f0653e06a74e2c7de38660f99d89f12905892f47fda5ba6820826";
+  sha512.run = "13ec8a47a33bb4fa39e7d3a326b1dd91c7b12b43dcdd1da95d21b7a8cb80b7a904a92929f23f296170ad0395c3530194f4d49cc406e72f8377baef255efa653d";
+  sha512.doc = "ebc895097c37b3d3ada7b6f62b406e4d8736ca5094833c0d907da65dc2fb62e2ee82dd755e06c23fec4c30fd79737cc29ca37df25b65f9f6e1a698bfe1e2087a";
+  sha512.source = "ceeef51d4dc417245a58cb679c49f5ef2d0a3255c2ae272ab8e3ac9846ac47fd28e2a479c0e334017b2027708499b164a6e879811af9bad9accd68f099cb700b";
   hasRunfiles = true;
 };
 "carbohydrates" = {
@@ -4789,12 +4847,12 @@ tl: { # no indentation
   version = "0.2.7h";
 };
 "causets" = {
-  revision = 57139;
+  revision = 61916;
   stripPrefix = 0;
-  sha512.run = "3dbe4a3c2e5985dbb4a36134a3739adb97636086ad2c1d3f510e4607fb6a6d0d01cbd2d4e135835a9eb88d63128e3b9a4408bce3b910c406b47dad0d0b5c19b6";
-  sha512.doc = "77f5ec1d8c16bb6d3772a78913825a1652c5130327e7851ddd16d5a5b0da9315e09dc113c880659b03d4263558781c36e1ed9ac546fabb9df88cfd4b4a3fb84b";
+  sha512.run = "48663667984e3a54effeebe59cc819815fe3e2b0a98efc40b28fd6812dc30fea796b70675b7404514efdf33b703a13a37a283e874a81483cebec5d60c568ae9b";
+  sha512.doc = "4e67ccd6777d5142412545afa30daa438a39f564420c4c5e76f3219b126caec5162cb93b1987c7c666957a604ce52b41e4757986e9118828e88f3703ce22f99b";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.2";
 };
 "cbcoptic" = {
   revision = 16666;
@@ -4839,13 +4897,12 @@ tl: { # no indentation
   version = "3.2c";
 };
 "ccfonts" = {
-  revision = 54686;
+  revision = 61431;
   stripPrefix = 0;
-  sha512.run = "abac4ad2c89e2d07281de95ac76922066713c511a77d067219dee9fff64e6ed54870da0db5cf83bacca89af11b2e720e352638eee1adfd4265e63a9e887ade14";
-  sha512.doc = "a327a036c804040973462e836c6028895cbb3897047785c1e1f9152ba85393aaa0ab6c876b8878e58bc8e124656ba22e38bcc90ca75ba8d7d74fbbb66a1a4955";
-  sha512.source = "fe3f77676ac1ddad784ef83cbe96e5a70219b7f7fd5b624f7338a95655851cac79d7c28951ac4ec1a62fbb62cd087b22bf38712b0130e05a833f2d46195d62ec";
+  sha512.run = "fb111cd33ec70fa672e759c9fc2894f6b0338e40bef7d1b2fda2c37a437fb1a5ad87ec87169ec389d9eb21068c890c960a5cc24efd6e443b5995d5001f4f7115";
+  sha512.doc = "b0e9b5ce6010b03afc52b6f4f7a978e8d5a8f1a382750bdbde0b758209e7f8dc57f84d950163e64381c2d7a8366a50a34c02286cc2011b9cde3e0d40810e01a4";
+  sha512.source = "30a301941132ba7b85c59b7e806d2b28ff314bcaae30c228337344f09846cc1051a73df1e4a2b76e36d499095c5a21000f250ec13f967a6080280ea120dbecc7";
   hasRunfiles = true;
-  version = "1.2";
 };
 "ccicons" = {
   revision = 54512;
@@ -4901,11 +4958,11 @@ tl: { # no indentation
   version = "1.0";
 };
 "cdpbundl" = {
-  revision = 46613;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "142dc5657e1482cdf7392ee7df6967557cf09e5b733b12e8c7559863c2edc66a3439b29c7cf16c2461cc1090090117337f63db899bf7bba0cc23d04bb573c633";
-  sha512.doc = "3fbfe5b5a8771bf3a74c6adc7a90e04f6085179c11a6db4ed8ebe644e00e334f447f3d32214d72ac341d18e3c79d3bfcfd788053d2065eeced76ad7c7ce6a9aa";
-  sha512.source = "579575c916a417be5d097d7e766c0cc599856d0b2aa3d4eae5880748c57c7735457aed493d3818974f25f07990b7496b6c5a92ceee39e0116510c420ae69d81f";
+  sha512.run = "ab13c84673df8a4da5b694256ab14f3c4fab34ff32e8d2faa8712da128baefcedc19c8bcccc77a585171d25e17369af274176971a33679e07d2bd138d4766603";
+  sha512.doc = "5ac8e2878434ca3b30ae20c6d1ca7c19b7ac12a38f9598d265ca6c7c214beccc144b75ff5962faf3b58b74b1ec91ab2c265d5429b98206db1fd1c558fa79385e";
+  sha512.source = "b958ade1a2a9f9b685c6d7821e1a97304f0c07b9405a95231a166fe5d8ccd8f89dbf168d38996e1e633629042827cb316b81754996d9b09f4d951573967dcea9";
   hasRunfiles = true;
   version = "0.36d";
 };
@@ -4926,12 +4983,12 @@ tl: { # no indentation
   version = "2.0";
 };
 "cellspace" = {
-  revision = 50374;
+  revision = 61501;
   stripPrefix = 0;
-  sha512.run = "d2de1e55913a434eb5b0ab19f615ee325dca750eaa8d61222045220153d521eb8149bf025aa03b1e6a7c625cd994b8bdaea241b227b28d1622c1a75ec72d76fd";
-  sha512.doc = "a1cdfb273e8c32374b03dfcd1d2ccbf12a19918fdeada025cf948fefa624decda07f8c3384a4dd859efdaa9048adcf0c513f59f28e48f31062819c1f9acdcd0d";
+  sha512.run = "75c32e958beab58086d8ba91da3bf1a4a4b9f3ec306dd5369798298c45cc67ee44c591e616062072ae399aa89c90edabe597665901ec60f46fb9fcd9d4c462d5";
+  sha512.doc = "3a6044a5b3e38ea425174481bf0f079943b53b9cc7d68668f5666c72c33cc5edfb82aac08bc3347225e4838dc32579ea611e8fcd2619468e080cc63c11a38da3";
   hasRunfiles = true;
-  version = "1.8.1";
+  version = "1.9.0";
 };
 "celtic" = {
   revision = 39797;
@@ -4943,12 +5000,12 @@ tl: { # no indentation
   version = "1.1";
 };
 "censor" = {
-  revision = 61389;
+  revision = 61969;
   stripPrefix = 0;
-  sha512.run = "1d3aec8389a5c2c85a68ceb5b69cba5292f7f53913c2f1c79fa1dd3e1d37c2368401d5bbb58869ad281f981a663d55a8dcf792e71fc2440278d58f9ee65f4b3f";
-  sha512.doc = "78fccd2b3e36161eb80340134978017e0091c085aa53d58ddd65ea068e77eb4e7d54d2ebb50496feaa12d825c3580563e145d38ff903376a36447ab6b50687a3";
+  sha512.run = "63e12a97658a262b3492ed96d39acb6cad19dd87b07e0151548230fbc46f6e1d18b9ea1747708be1a506f014716a2ddd5638c4f161785b217c89254d577779d2";
+  sha512.doc = "7d5c118621ef6bc8abd85ceb0b3a83e3e0a9983fc2a7b74152704aa1c9e9a9484f17cee68e14ee7531945f1f331782c9cd19624dd6cc13d1f384f0ab2d43a7f0";
   hasRunfiles = true;
-  version = "4.0";
+  version = "4.1";
 };
 "centeredline" = {
   revision = 50971;
@@ -4977,10 +5034,10 @@ tl: { # no indentation
   version = "0.2";
 };
 "cfr-initials" = {
-  revision = 36728;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "d67830168afffe72ef37784db45176528065210d4956b4aef2a166d41c886f5b3874e0878da9c56302412cf5939291451e1e20ba3e676429c598342982b64083";
-  sha512.doc = "0d628f9134254a92c7b88d0744b588bb197c6850d7d5e44a90e91c1ed128625c7add731916b727c2d3b532ade017daaf17f45e446e4bc6f0e447bb5fdb770066";
+  sha512.run = "b4799007822a3bc82370b72ead503661f70cce1beb7a27bf1bd2523283a248045b0ef863ab1dd9bd93b39441e50d51fabe11a12fe6528a7966219a2da2618141";
+  sha512.doc = "124dbae846ced93e4cbf5b9c16235295c7e76306830bc9e08cdb5a4e8d0d5f9deada4706c6c41cc383f440e9e874cc1cc338176787ad029f8164bbeba99db965";
   hasRunfiles = true;
   version = "1.01";
 };
@@ -5055,12 +5112,12 @@ tl: { # no indentation
   version = "2.0.1";
 };
 "charissil" = {
-  revision = 60294;
+  revision = 62157;
   stripPrefix = 0;
-  sha512.run = "71c215dbbfc5d846ef00c9d4f40e22904dffb0b28587630527fddc7cf0cc40d4c68b7b913b8494a2fdb782e56048f5cc352ddc9b33ea2a2c9b7c3c97a4328507";
-  sha512.doc = "74d9d178c12d85f91805d46bdd6fb07f1367a14ae75f00377b97455c904b1436b068abf3ae52a4d9c6e2e7886e2f2211f09a2733422c05eef4d71e7a8a925b38";
+  sha512.run = "e79c5711cccb3dfb0d7958eee7941736810c49d8af7e761d3c274e3ee2c6f297c236fefc49ae54e19f0d238f700372c1199d64370955532ad60a7f28e8fcfed2";
+  sha512.doc = "12dd8f9dea6792396465e425fc53ef5c11fa944b179a4303eba3a956dd18295ddeac7ac66c9f42aaa40ab832aee0fde4b12a0cf21165f756bd7478e367b05c9b";
   hasRunfiles = true;
-  version = "6.0";
+  version = "6.1";
 };
 "charter" = {
   revision = 15878;
@@ -5166,13 +5223,13 @@ tl: { # no indentation
   version = "1.6b";
 };
 "chemformula" = {
-  revision = 57206;
+  revision = 61719;
   stripPrefix = 0;
   deps."units" = tl."units";
-  sha512.run = "6f1cbdeb8a7a30cf561febcc1232d92feadaa59c796a96881ebb04379c49804e8d39cc65dc96bba02d1843118fba347660e23906ea5633af6f00c4fb39388e60";
-  sha512.doc = "61da2685650fa1652e20c97c4ed51930b133cfb137f3c1bf8dbe0477b22293693e6837c9545bed3175aa3722e8710441ca12d063bb36542b13e2cd413849cd32";
+  sha512.run = "907efcb72ebf3a315bffc11a8d78caa82b510993b4a4de1da8a960bbd6c66bdf5bc202933fce5f4f0626ad4507a5095b571487beb2414bc49bd37e735f0299f1";
+  sha512.doc = "c839fed7313744c6abb77fd4f803524c47af7f9ca0e4b533b307a198cc2fefc072541d58afca8cfab6a17b85ecdda4d3bacd451ac9616b47a448560a97f3b62a";
   hasRunfiles = true;
-  version = "4.16";
+  version = "4.17";
 };
 "chemgreek" = {
   revision = 53437;
@@ -5183,12 +5240,12 @@ tl: { # no indentation
   version = "1.1a";
 };
 "chemmacros" = {
-  revision = 56983;
+  revision = 62656;
   stripPrefix = 0;
-  sha512.run = "9ca4d903e5d1126aa4f6fc6c07ea2efc86a5750883c354f3bcd48dbe3960ac3ea2cbc47626c67c8f8bec5343d7dd4d61aa548faa33cc42ab09d15011da551a2a";
-  sha512.doc = "3482d6c49bf23bd604a2d0c4f506762c61abc1e2785cf83685af2f96006b9093886d51fed8c16a5e430b35f138ccbd35d183291208df47e1281b47d758d7d123";
+  sha512.run = "d6f6b8a68a1fe654fea76a46b9880e12b41215ef37f4e12c4616735caa15080841193b16536b96404eb658618d3d3a19dd848dbe1e11bf70b0b5a28854069814";
+  sha512.doc = "308fa2c41ce1d5a9347e6e9c6a2ec9bcff8ffaedf6046c2ad48dcbccbddd530bf5f4ef39931cb8630d72ce5e41d78bb190a39a115367196bb008f39dca56db1c";
   hasRunfiles = true;
-  version = "5.11a";
+  version = "6.2a";
 };
 "chemnum" = {
   revision = 57490;
@@ -5293,13 +5350,13 @@ tl: { # no indentation
   version = "1.01";
 };
 "chhaya" = {
-  revision = 59566;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "b5b85d8a65922ebb610bb49ae574138f93efb4cfd0bb5bf0610ebaa6f31fa14e393d47a27b831b6e894f4210222809e5d5d50f0e6df5cdba377f9d8695db38c6";
-  sha512.doc = "c255cd6183edd207ea269f32bde1a3f613b39cfe460695527957bcd42228ba97844eac4fcbb691affb91718e3c3720226cf3e60ffd8b49875644089ac7a7b8b2";
-  sha512.source = "3034b556c8932cc645fba70bc5a00b2fef63922c47a88c19dfc1d9c11793abc5ce24be30e420ecce16053970bab82df624c47bf964b20d6280690dabeeae6f2c";
+  sha512.run = "c8174ee6bbb8a57448caee6cd23bf7e41790dd1ff40cf496360548fadf1e7161b2e08b2ef53abb51b1410b406689267ce2d4a8668d052754e323a1d836670ba0";
+  sha512.doc = "0e6bab691d5a5965ab8ee575f84aeae44d26ed12fa8c7f636fd0997a4ec7c1d4efc4a43f3f451659b69bd367c759dc8c3239ca51c5d12c91ef7182e43acfd126";
+  sha512.source = "635430d05de402f7e56110516fd16ef455c1393cda27b61198ebf92cb9787b01ce85f58d0e06389d823a98a73514470d83624d87a035565d159323524de09439";
   hasRunfiles = true;
-  version = "0.3";
+  version = "0.4";
 };
 "chicago" = {
   revision = 15878;
@@ -5488,20 +5545,28 @@ tl: { # no indentation
   version = "1.3.1";
 };
 "circuit-macros" = {
-  revision = 60690;
+  revision = 61987;
   stripPrefix = 0;
-  sha512.run = "1487a935b764969c641e308aec9dc82c0b68df03f427dd2b9871b1035728303e7f16cabcd6f48d5a1c9289ef4541038b8a73cad66f77a7cafb8ba5b125afb406";
-  sha512.doc = "1f7d2dcbff417fbdb3a0f3208339236bbdc2066c1fa94520ee006f0f326faaaa3bb5f037a70a3c7eaa04e7a07319c58c8346613da8d0170bb36abd2aedc6e3f2";
+  sha512.run = "77dc6e34bd1e09231b1f6ccfebebdf0197dd633023feba1d9498db089204c9b703f268915e4f76eccf24fffaf15fdb2b8962f498f174085eb76563b04a30f3ce";
+  sha512.doc = "2c13ea2e449b19670e4faf81baec04e54d06ced867a578ff6e875dba6f8cfdc363a29787903590be8c834ceaa50512a77e696e3d6721aba88a2151b70966785d";
   hasRunfiles = true;
-  version = "9.7";
+  version = "9.8";
 };
 "circuitikz" = {
-  revision = 61231;
+  revision = 61873;
   stripPrefix = 0;
-  sha512.run = "d67f5c1285401bb8bee981b943bfcb248eb5f184fe2682dedd9639a391dfda0129c940a28f05542869cf1a211ce6e6f4ac8504c82d8111099e11f080fe133194";
-  sha512.doc = "8af04c7a0b5897b20179270e31c50dd4b0a152cd309a3201c60cb0447e8544b51dc7d0621bfa913e312b28017b19d407b266edadca3648ebb225e3b70c75fea4";
+  sha512.run = "39ae7dd2007955ccfb1a90b0dd9a82160d00d5e306d9fc07ba3ebc5757507bc5104fa5b70aa1e67d46f93725b3a531defd834c3be496c305aaafe65af1316951";
+  sha512.doc = "ec72f73aa3f0bb0b580f2ee6e88d9249b95f9b7c21953c233c302ab025b130249baa08df84960f0c95d6dfe236ff21396208cf129ff5451f7443eacb684ad760";
+  hasRunfiles = true;
+  version = "1.4.6";
+};
+"citation-style-language" = {
+  revision = 62863;
+  sha512.run = "0e65dfe464b95978d42600dda7c55d4a5be5cf9afa1efb670abdd10758ab7d382c1521cb147a9129a5332488f18de879f49572028561807995a8c99317f6c98f";
+  sha512.doc = "02367f6e148d01bace6b04c1243d79f32af41233f32a537dba7453797176f3ffecda0f4954bdda19c2ce45b7a03fd354b92b28838fb4cb3d208a7b7b4f9b46f5";
+  sha512.source = "936fa66896065b525510d5423bfd5bdcfecaf47e8d18e0386931f7434013f221601d216dcd74344d9eb3f0563317d9fa263f99697b6296720bdf0278abd75cf2";
   hasRunfiles = true;
-  version = "1.4.5";
+  version = "0.1.1";
 };
 "cite" = {
   revision = 36428;
@@ -5648,11 +5713,11 @@ tl: { # no indentation
   version = "0.1";
 };
 "cleveref" = {
-  revision = 47525;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "669e122c22c55c1fe95353533a2c35adcd161080ab2e4f3120dab2286b60df316f4de792e9a6fe5b971d622bc2b087061836a3c0aebaf0bc5df17c854f64990b";
-  sha512.doc = "3885fe13cd51967620f1e48a25a82c2a4916b07ee45c963dfe9ea933a920f347512cf5c30f29ccef9c49c3862df4c9176fe0fa57b1043d3ac230b7cd8b3f8d78";
-  sha512.source = "71a49c96a943dc152cc1621e9e0ce1d0fe62762fa51f670ecd4a0e5a3613ccc52d41db355cfb0c31fc81867bdc07c26acd3e9ad74e0209459a099be823df2308";
+  sha512.run = "7e425fd19bd559a2a3f3091f6dd3d6711e6bb4ec01f6a3f8c1dccd60cb6518f3ffe563c1b68e3b379eab7be140f7ff5f3c68dabf3dc85d196aa2d41f81a67acd";
+  sha512.doc = "87760a9503b5ead92a1a8f26f9c0195487b5e7a1f97cb11519791f247cf87d35f044f68738d3563ac4a84d7f283d3907eaa816f2d4f8dc4f9cdc5114df639d99";
+  sha512.source = "aae3fc03f3ccefc9c58b1372a337afc9f0fc201d3db9938a01a1832711ce10e0f0b13e72da021c328f6bb1099dfafc8378663016ca6969ecef10dd5bf3683937";
   hasRunfiles = true;
   version = "0.21.4";
 };
@@ -5672,6 +5737,15 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.3";
 };
+"clistmap" = {
+  revision = 61811;
+  stripPrefix = 0;
+  sha512.run = "71da5b4136bd73945ec0e1d9fe429892960a9167b39febc0d53b7a628357db59240929ed6d8c31096c170cd0b2f5c60452f364d8903be40a6a4bf0b590069520";
+  sha512.doc = "8c0ca62ecf95989e1e4f90b6c606e421bd5f536ca9d7e3745384537b33b5745b221c6485e0fc5d5a52ddfa720e34f6260eb8bec0557d7e4171406ad4985b789f";
+  sha512.source = "b93a6e3bda06ce394c006964046d683576474d1ccc6b8cdde069c188cf8d146be43420c5d55a9d22bca554e87ea9309faaa73b5d0b8bb1b56981414b4b99e46a";
+  hasRunfiles = true;
+  version = "1.2";
+};
 "clock" = {
   revision = 15878;
   stripPrefix = 0;
@@ -5934,12 +6008,12 @@ tl: { # no indentation
   version = "0.3";
 };
 "cochineal" = {
-  revision = 61309;
+  revision = 62063;
   stripPrefix = 0;
-  sha512.run = "8dad7837aaad184ece6f54ee03b39e1e988693d64b2cb31b370e2577b20a10bb2aa14c8575150ae71c218626f3d3f75be2d9a6af59eacb564860406d4abdeb1e";
-  sha512.doc = "76dccdc0895a2f69bde1fec39ccc8ef5af68241c4938e49f69d8647f30539b21cedb58629ce136340f4114b78a0c7b1384d17f1e073332d4f0b077090f4f0656";
+  sha512.run = "9ab8abcb37615f7381132181a991adf35d34d61c81ed5100e02e9d314a0e555669a6488edbf9fd698a239ead8f49221410333705d2074046eb3e467f31ea7196";
+  sha512.doc = "5bf6a83c03d5a87567a42379c7f8462b1f52245fad5b18839532761cf855f45e596b76ea266e361527a6f269b008c6a2515cce2a616f372daaf06e6ddd6efe73";
   hasRunfiles = true;
-  version = "1.074";
+  version = "1.077";
 };
 "codeanatomy" = {
   revision = 51627;
@@ -5951,12 +6025,12 @@ tl: { # no indentation
   version = "0.4-Alpha";
 };
 "codebox" = {
-  revision = 61415;
+  revision = 61771;
   stripPrefix = 0;
-  sha512.run = "1d5ac25299755e3fff1adf6e0d06daf87d5f2885ed59f65374c97a89f3060f83353fe53eef5cd9c73c680b817d8cb8b4cab090d702e0e98875f8fb5565c508b3";
-  sha512.doc = "335ecc7cb568e2f06be995148a1da0e979e3fb07e294c734ec7298b9d4ca70eb270a5bcb01dadffc3bd33cde298bf44ca33009caacfc66df8a7a1edbd9ae7d8d";
+  sha512.run = "04f63b435f360fdfa81bb7afeef38117a8a4b81b70562e21020470f49f33abc33038d6c55665a5ae4573ff61c19ed9120e824eb319ea97523fe1fa8e82ba9424";
+  sha512.doc = "165fffcfbff35064a3c55a0fe1b095f3a45a5c01d1c8a8704cd151cbb20c440592edecc3be71900b1a7a5e7af28d6a8d6c4a3b9fd09f850c7da71362e2377ddd";
   hasRunfiles = true;
-  version = "1.0.0";
+  version = "1.0.4";
 };
 "codedoc" = {
   revision = 17630;
@@ -5967,12 +6041,12 @@ tl: { # no indentation
   version = "0.3";
 };
 "codehigh" = {
-  revision = 59173;
+  revision = 61937;
   stripPrefix = 0;
-  sha512.run = "715c81105caba420b192d9223fb4be038e11a2a434dd73c033280ce9908de91659b41faea92299eb656b7d3974ad7f29393591bff8c87945d6ffb1d9199dad0f";
-  sha512.doc = "147abe790b005630f48f84f589453e526f2b92b81ae311eb29a2be3304cb97c546b35a311b55a45a51e5d7b184469ace286cbdd90b20a6034335fb60dd436e75";
+  sha512.run = "60111e55fa14f890bb808e98f6ee06b2c1f2208dd317a9558e484863596d8bedb6e39d5a4d28cb19fc42f3d9a6b46c79de32003fa64b825165c3b2f2b15ebd3a";
+  sha512.doc = "dcc71d0de5f5ac580e2694816230bc9daa7680c52297c52abdc20b27f5d01b63a86ce0b07eabacbc4f0fcce97c532cd7a66097fdd28883b69a36c149bd969801";
   hasRunfiles = true;
-  version = "2021C";
+  version = "2022D";
 };
 "codepage" = {
   revision = 51502;
@@ -6079,7 +6153,7 @@ tl: { # no indentation
   sha512.run = "4241bc3a3ef21502faa9a2e0b16295126c357fc15813a625306552b40f9da804164abccce642f4ec1e677092f81d61381958b87fcf515120a12f9b7a19055370";
 };
 "collection-bibtexextra" = {
-  revision = 61166;
+  revision = 61687;
   stripPrefix = 0;
   deps."aaai-named" = tl."aaai-named";
   deps."aichej" = tl."aichej";
@@ -6146,6 +6220,7 @@ tl: { # no indentation
   deps."biblatex-philosophy" = tl."biblatex-philosophy";
   deps."biblatex-phys" = tl."biblatex-phys";
   deps."biblatex-publist" = tl."biblatex-publist";
+  deps."biblatex-readbbl" = tl."biblatex-readbbl";
   deps."biblatex-realauthor" = tl."biblatex-realauthor";
   deps."biblatex-sbl" = tl."biblatex-sbl";
   deps."biblatex-science" = tl."biblatex-science";
@@ -6176,6 +6251,7 @@ tl: { # no indentation
   deps."chicago-annote" = tl."chicago-annote";
   deps."chicagoa" = tl."chicagoa";
   deps."chscite" = tl."chscite";
+  deps."citation-style-language" = tl."citation-style-language";
   deps."citeall" = tl."citeall";
   deps."citeref" = tl."citeref";
   deps."collection-latex" = tl."collection-latex";
@@ -6240,10 +6316,10 @@ tl: { # no indentation
   deps."windycity" = tl."windycity";
   deps."xcite" = tl."xcite";
   deps."zootaxa-bst" = tl."zootaxa-bst";
-  sha512.run = "4a1af72d2fe5b01c48edef29cfda816dfeb9b5f7b247080bd93a590b7829e17863698b1a5e3c714837da6190072cfc5cac8927528c6c80923c422ea06a4151e4";
+  sha512.run = "cb594df1d769e879ed998ffc0aea6407654df2450b71740399cbfdb097ff758c1a557e055edd7ff27bc647d857a04977d8179bdeaeff08a710090db54ede974c";
 };
 "collection-binextra" = {
-  revision = 61328;
+  revision = 61780;
   stripPrefix = 0;
   deps."a2ping" = tl."a2ping";
   deps."adhocfilelist" = tl."adhocfilelist";
@@ -6335,6 +6411,7 @@ tl: { # no indentation
   deps."texlive-scripts-extra" = tl."texlive-scripts-extra";
   deps."texliveonfly" = tl."texliveonfly";
   deps."texloganalyser" = tl."texloganalyser";
+  deps."texlogfilter" = tl."texlogfilter";
   deps."texlogsieve" = tl."texlogsieve";
   deps."texosquery" = tl."texosquery";
   deps."texplate" = tl."texplate";
@@ -6347,7 +6424,7 @@ tl: { # no indentation
   deps."xindex" = tl."xindex";
   deps."xindy" = tl."xindy";
   deps."xpdfopen" = tl."xpdfopen";
-  sha512.run = "2c43f846d80779eec53041c31be14285a361f5f7087f2f33856084875f1b3f941bfa6a9968731d53e28aeb4a1f0a2777b8d8a9a8a7fea2eea28f22f474b60664";
+  sha512.run = "4d0596370bd11012469ac81c3875dc56cb2428207b38a887b1dc7b9e1ce1f4ef557dc7dde3ae5b2001573e3d9e5efb87b72898a233010f26e7d41df8542b817f";
 };
 "collection-context" = {
   revision = 54074;
@@ -6393,7 +6470,7 @@ tl: { # no indentation
   sha512.run = "5bd74e1a434549cf31ce31777e9a32f90baa14148e6658633945508a46dbf6611644c4212b53812bb32a399e850517369e3d89bb0e495c89e6f2a979090ed765";
 };
 "collection-fontsextra" = {
-  revision = 61165;
+  revision = 62069;
   stripPrefix = 0;
   deps."aboensis" = tl."aboensis";
   deps."academicons" = tl."academicons";
@@ -6407,6 +6484,7 @@ tl: { # no indentation
   deps."allrunes" = tl."allrunes";
   deps."almendra" = tl."almendra";
   deps."almfixed" = tl."almfixed";
+  deps."andika" = tl."andika";
   deps."anonymouspro" = tl."anonymouspro";
   deps."antiqua" = tl."antiqua";
   deps."antt" = tl."antt";
@@ -6481,6 +6559,7 @@ tl: { # no indentation
   deps."comfortaa" = tl."comfortaa";
   deps."comicneue" = tl."comicneue";
   deps."concmath-fonts" = tl."concmath-fonts";
+  deps."concmath-otf" = tl."concmath-otf";
   deps."cookingsymbols" = tl."cookingsymbols";
   deps."cormorantgaramond" = tl."cormorantgaramond";
   deps."countriesofeurope" = tl."countriesofeurope";
@@ -6570,6 +6649,7 @@ tl: { # no indentation
   deps."grotesq" = tl."grotesq";
   deps."gudea" = tl."gudea";
   deps."hacm" = tl."hacm";
+  deps."hamnosys" = tl."hamnosys";
   deps."hands" = tl."hands";
   deps."hep-font" = tl."hep-font";
   deps."hep-math-font" = tl."hep-math-font";
@@ -6725,12 +6805,13 @@ tl: { # no indentation
   deps."venturisadf" = tl."venturisadf";
   deps."wsuipa" = tl."wsuipa";
   deps."xcharter" = tl."xcharter";
+  deps."xcharter-math" = tl."xcharter-math";
   deps."xits" = tl."xits";
   deps."yfonts" = tl."yfonts";
   deps."yfonts-t1" = tl."yfonts-t1";
   deps."yinit-otf" = tl."yinit-otf";
   deps."zlmtt" = tl."zlmtt";
-  sha512.run = "e539f0113027096949bb29bcf4d05d6baea025203689ad9031df999357b72aaff2caf655bb694f759ab88f24fc76446f58932c351daab6dd66199fae564588c2";
+  sha512.run = "7c6abb230bf1b78579794de45b5a75ede8364db0dfb88fae1daa88c6068e479c101cd182d4431d2306cf34a31035fb11e1becd486e366048f8cd5dfb7e2183a5";
 };
 "collection-fontsrecommended" = {
   revision = 54074;
@@ -6821,7 +6902,7 @@ tl: { # no indentation
   sha512.run = "7700a6cc293a1d45208794db34a276d5de5c975fe91cb00e5b1896515f288b05437344f00997501a54ad2af515bccc983930a75ddda55c6951edc625cd6bda35";
 };
 "collection-games" = {
-  revision = 60276;
+  revision = 62102;
   stripPrefix = 0;
   deps."bartel-chess-fonts" = tl."bartel-chess-fonts";
   deps."chess" = tl."chess";
@@ -6837,6 +6918,7 @@ tl: { # no indentation
   deps."go" = tl."go";
   deps."hanoi" = tl."hanoi";
   deps."havannah" = tl."havannah";
+  deps."hexboard" = tl."hexboard";
   deps."hexgame" = tl."hexgame";
   deps."hmtrump" = tl."hmtrump";
   deps."horoscop" = tl."horoscop";
@@ -6863,7 +6945,7 @@ tl: { # no indentation
   deps."sudokubundle" = tl."sudokubundle";
   deps."xq" = tl."xq";
   deps."xskak" = tl."xskak";
-  sha512.run = "18d6ed96d053855a6aaad235f953a77bff3717aefdbdaef7782aa9144255ce26be628accf440b2b4c5d2887b74abeebd47923c494bb8a844e1a3adf0312a0cdd";
+  sha512.run = "b5dc1af44bece3e3497431f073c2a6730eafb224b6af7188c16b6310685b2e0d0a6c536cab7daf5333bbcfe0bf74251afb49870dd0d557aa59e3a1b745f67603";
 };
 "collection-humanities" = {
   revision = 56575;
@@ -6959,7 +7041,7 @@ tl: { # no indentation
   sha512.run = "3fdcf41fafd94373254281f3f7ee9f2a2e136cfa1adc1dd38e4b5cd6f90d0364e6a20d3284fcf255f245158352421e28cfb794c673b8b96399a20343ed991fc2";
 };
 "collection-langchinese" = {
-  revision = 60575;
+  revision = 61913;
   stripPrefix = 0;
   deps."arphic" = tl."arphic";
   deps."arphic-ttf" = tl."arphic-ttf";
@@ -6994,10 +7076,10 @@ tl: { # no indentation
   deps."zhmetrics-uptex" = tl."zhmetrics-uptex";
   deps."zhnumber" = tl."zhnumber";
   deps."zhspacing" = tl."zhspacing";
-  sha512.run = "37c2d9098d0436881a60f5b23506cd973902b6cfd61e21d2d60841b41a939290fe4b03c660ceb0b9698b5be9bb0603e819800a6b1cc80afa2ac63f21e8996dc6";
+  sha512.run = "3df5cd6944b02a2760836149ff9c80e8fcbceee26607974ff9c3100c5ab0b8be35a9df9a5bcbba8ff3c502471c5191d01403bc358d03a7eb589b4c1495a338ae";
 };
 "collection-langcjk" = {
-  revision = 60595;
+  revision = 61912;
   stripPrefix = 0;
   deps."adobemapping" = tl."adobemapping";
   deps."c90" = tl."c90";
@@ -7013,9 +7095,10 @@ tl: { # no indentation
   deps."norasi-c90" = tl."norasi-c90";
   deps."pxtatescale" = tl."pxtatescale";
   deps."xcjk2uni" = tl."xcjk2uni";
+  deps."xecjk" = tl."xecjk";
   deps."zitie" = tl."zitie";
   deps."zxjafont" = tl."zxjafont";
-  sha512.run = "c8ac36a28cf38e9cab5069a396777821a07ad58bb9b00eeebd8520971933ae57a53ddac267805196687993ac0403f68d1236ffe6de9321c2c0a3c659a1659ffa";
+  sha512.run = "6b00955359e063df2a7c02f2d44f88e6190d65834b8e5c77e9c67e44b8c9de9cee612cd298e79fe3cd598fd58996ace0829d3a5463cdc25b543e7565b1455e31";
 };
 "collection-langcyrillic" = {
   revision = 54074;
@@ -7091,7 +7174,7 @@ tl: { # no indentation
   sha512.run = "719c321173ca12660891080dae509080934f72d13a9417b2c40a22add963c7c5a1ee95d3b306f0d6c26b0db97d69979c27fbb15d1690849aa03b06d4b0193a67";
 };
 "collection-langenglish" = {
-  revision = 60687;
+  revision = 62606;
   stripPrefix = 0;
   deps."amiweb2c-guide" = tl."amiweb2c-guide";
   deps."amscls-doc" = tl."amscls-doc";
@@ -7120,6 +7203,7 @@ tl: { # no indentation
   deps."latex-brochure" = tl."latex-brochure";
   deps."latex-course" = tl."latex-course";
   deps."latex-doc-ptr" = tl."latex-doc-ptr";
+  deps."latex-for-undergraduates" = tl."latex-for-undergraduates";
   deps."latex-graphics-companion" = tl."latex-graphics-companion";
   deps."latex-refsheet" = tl."latex-refsheet";
   deps."latex-veryshortguide" = tl."latex-veryshortguide";
@@ -7142,7 +7226,6 @@ tl: { # no indentation
   deps."plain-doc" = tl."plain-doc";
   deps."short-math-guide" = tl."short-math-guide";
   deps."simplified-latex" = tl."simplified-latex";
-  deps."startlatex2e" = tl."startlatex2e";
   deps."svg-inkscape" = tl."svg-inkscape";
   deps."tamethebeast" = tl."tamethebeast";
   deps."tds" = tl."tds";
@@ -7160,10 +7243,11 @@ tl: { # no indentation
   deps."visualfaq" = tl."visualfaq";
   deps."webguide" = tl."webguide";
   deps."xetexref" = tl."xetexref";
-  sha512.run = "b5d9f13c65fb79f647204e5dadb7cbf9c72cfa8408a92fec25423400ec238e823a851b7a83f24c2482cfcd58e81ff92c9bd6f352c2a09b65181c6e85135fe52a";
+  deps."yet-another-guide-latex2e" = tl."yet-another-guide-latex2e";
+  sha512.run = "e42fa06f9a57ea2e267ddb692ad445307cf78eda9d1222e9e304d00e01ea6612bdfc93d012b3539b1f2574623efc0737e0b459c7cb2587479fd47b37174591df";
 };
 "collection-langeuropean" = {
-  revision = 58626;
+  revision = 61419;
   stripPrefix = 0;
   deps."armtex" = tl."armtex";
   deps."babel-albanian" = tl."babel-albanian";
@@ -7222,6 +7306,7 @@ tl: { # no indentation
   deps."hyphen-turkish" = tl."hyphen-turkish";
   deps."hyphen-uppersorbian" = tl."hyphen-uppersorbian";
   deps."hyphen-welsh" = tl."hyphen-welsh";
+  deps."kaytannollista-latexia" = tl."kaytannollista-latexia";
   deps."lithuanian" = tl."lithuanian";
   deps."lshort-dutch" = tl."lshort-dutch";
   deps."lshort-estonian" = tl."lshort-estonian";
@@ -7232,10 +7317,10 @@ tl: { # no indentation
   deps."rojud" = tl."rojud";
   deps."swebib" = tl."swebib";
   deps."turkmen" = tl."turkmen";
-  sha512.run = "a1fe7a0531b3a0581591988c62cba7c3032bab5ed8291edbff2c8573adae0ce96ea9087c7f4b018ad0ae341070a826501fb6a92d768ae939a632bae41c0d84f4";
+  sha512.run = "ea3c6897bb6ecef53a21ab9adc8a80c9578107b96f972193909fb47d2bcbe9515099a8d2dd7276492ece95d2ff3c5e98d92446deb42bc0dc9a7c9fdf21621055";
 };
 "collection-langfrench" = {
-  revision = 60273;
+  revision = 62880;
   stripPrefix = 0;
   deps."aeguill" = tl."aeguill";
   deps."annee-scolaire" = tl."annee-scolaire";
@@ -7264,10 +7349,12 @@ tl: { # no indentation
   deps."impnattypo" = tl."impnattypo";
   deps."l2tabu-french" = tl."l2tabu-french";
   deps."latex2e-help-texinfo-fr" = tl."latex2e-help-texinfo-fr";
+  deps."letgut" = tl."letgut";
   deps."lshort-french" = tl."lshort-french";
   deps."mafr" = tl."mafr";
   deps."matapli" = tl."matapli";
   deps."profcollege" = tl."profcollege";
+  deps."proflycee" = tl."proflycee";
   deps."tabvar" = tl."tabvar";
   deps."tdsfrmath" = tl."tdsfrmath";
   deps."texlive-fr" = tl."texlive-fr";
@@ -7278,7 +7365,7 @@ tl: { # no indentation
   deps."variations" = tl."variations";
   deps."visualfaq-fr" = tl."visualfaq-fr";
   deps."visualtikz" = tl."visualtikz";
-  sha512.run = "1c2f420219068bafd0ef9050514b070e932de1e818666409f87985b92fbaee75e54e84b117c28982fbd0fc9791267d8e7d494386393935944722975d6f652642";
+  sha512.run = "9cae5e7b61afc743e3b1b4b3463fb9b076da33180bf75562fd4e58dc8688782d6cc7ab7bee59cf4302d42e7801703dfe6b2498ebd537998f483fc9633dac425b";
 };
 "collection-langgerman" = {
   revision = 55706;
@@ -7332,7 +7419,7 @@ tl: { # no indentation
   sha512.run = "19b9f47b68ca6068900c413d8216e13c20d25ab084cdcbd500694a18a10cbaa35ba5681be09392e0b20873788519a436c28c1ea89a728e3f546083ce0883c15c";
 };
 "collection-langgreek" = {
-  revision = 54139;
+  revision = 61820;
   stripPrefix = 0;
   deps."babel-greek" = tl."babel-greek";
   deps."begingreek" = tl."begingreek";
@@ -7355,10 +7442,11 @@ tl: { # no indentation
   deps."levy" = tl."levy";
   deps."lgreek" = tl."lgreek";
   deps."mkgrkindex" = tl."mkgrkindex";
+  deps."talos" = tl."talos";
   deps."teubner" = tl."teubner";
   deps."xgreek" = tl."xgreek";
   deps."yannisgr" = tl."yannisgr";
-  sha512.run = "15a0ac0f1e4e3c4f1e107e34ae2794e637b20a00e1d40f3a8d8fda225ff8a9e948fb77153b043bbcd0e7aaef4840a97ce9e19ae059ce2560d468fc373fc37cfa";
+  sha512.run = "baebeff22de8ed3847b39eb7a2a8de90e02f872e98a427461a278a7fcf186695b640d7872dd9e99c54a0f352204703c22eeb6a0a6592a5752d7ca230a769755e";
 };
 "collection-langitalian" = {
   revision = 55129;
@@ -7385,7 +7473,7 @@ tl: { # no indentation
   sha512.run = "6ec5e8a62e3c1ed8e3c23542381091d38c77af507af7088a55e44f1e34b85d01ec19342db4541d9d6cd712c0929d54a3fc663e1d8fde3c53fef0d6fc43be4994";
 };
 "collection-langjapanese" = {
-  revision = 58754;
+  revision = 62077;
   stripPrefix = 0;
   deps."ascmac" = tl."ascmac";
   deps."babel-japanese" = tl."babel-japanese";
@@ -7410,15 +7498,16 @@ tl: { # no indentation
   deps."ifxptex" = tl."ifxptex";
   deps."ipaex" = tl."ipaex";
   deps."japanese-otf" = tl."japanese-otf";
-  deps."japanese-otf-uptex" = tl."japanese-otf-uptex";
   deps."jlreq" = tl."jlreq";
   deps."jlreq-deluxe" = tl."jlreq-deluxe";
   deps."jsclasses" = tl."jsclasses";
+  deps."kanbun" = tl."kanbun";
   deps."lshort-japanese" = tl."lshort-japanese";
   deps."luatexja" = tl."luatexja";
   deps."mendex-doc" = tl."mendex-doc";
   deps."morisawa" = tl."morisawa";
   deps."pbibtex-base" = tl."pbibtex-base";
+  deps."pbibtex-manual" = tl."pbibtex-manual";
   deps."platex" = tl."platex";
   deps."platex-tools" = tl."platex-tools";
   deps."platexcheat" = tl."platexcheat";
@@ -7444,7 +7533,7 @@ tl: { # no indentation
   deps."wadalab" = tl."wadalab";
   deps."zxjafbfont" = tl."zxjafbfont";
   deps."zxjatype" = tl."zxjatype";
-  sha512.run = "7bccea1e7b80bf4ad0af3f0f6b5636088cdac94562fc87b4b619cdef5c9b2d0abef1ab588a6525acf920449a3bdf2e201f146f8ccba2851cdb70b46da92128fb";
+  sha512.run = "375d8f04d68e1ffa0ab790612aac02152c84d33c6904c7285d0f8ed2254eb3233af5a26100de92ed6a4d8b24f6b7c0b9977f8a9474a9caafff5a9a4ce66e967e";
 };
 "collection-langkorean" = {
   revision = 54074;
@@ -7651,7 +7740,7 @@ tl: { # no indentation
   sha512.run = "0568a3251d71fb3106fbb3961427200419ae1df22d39b5e72c608e2d94fc35a0e5c77fbe41bbb6fa33610321f2620624264d99675e2f88e72f9d156693143a7e";
 };
 "collection-latexextra" = {
-  revision = 61415;
+  revision = 62648;
   stripPrefix = 0;
   deps."2up" = tl."2up";
   deps."a0poster" = tl."a0poster";
@@ -7680,6 +7769,7 @@ tl: { # no indentation
   deps."alphalph" = tl."alphalph";
   deps."alterqcm" = tl."alterqcm";
   deps."altfont" = tl."altfont";
+  deps."altsubsup" = tl."altsubsup";
   deps."amsaddr" = tl."amsaddr";
   deps."animate" = tl."animate";
   deps."anonchap" = tl."anonchap";
@@ -7700,6 +7790,7 @@ tl: { # no indentation
   deps."assoccnt" = tl."assoccnt";
   deps."association-matrix" = tl."association-matrix";
   deps."atenddvi" = tl."atenddvi";
+  deps."atendofenv" = tl."atendofenv";
   deps."attachfile" = tl."attachfile";
   deps."aurl" = tl."aurl";
   deps."authoraftertitle" = tl."authoraftertitle";
@@ -7725,6 +7816,7 @@ tl: { # no indentation
   deps."beamerdarkthemes" = tl."beamerdarkthemes";
   deps."beamerposter" = tl."beamerposter";
   deps."beamersubframe" = tl."beamersubframe";
+  deps."beamertheme-arguelles" = tl."beamertheme-arguelles";
   deps."beamertheme-cuerna" = tl."beamertheme-cuerna";
   deps."beamertheme-detlevcm" = tl."beamertheme-detlevcm";
   deps."beamertheme-epyt" = tl."beamertheme-epyt";
@@ -7762,6 +7854,7 @@ tl: { # no indentation
   deps."bnumexpr" = tl."bnumexpr";
   deps."boites" = tl."boites";
   deps."bold-extra" = tl."bold-extra";
+  deps."book-of-common-prayer" = tl."book-of-common-prayer";
   deps."bookcover" = tl."bookcover";
   deps."bookest" = tl."bookest";
   deps."booklet" = tl."booklet";
@@ -7837,6 +7930,7 @@ tl: { # no indentation
   deps."cleveref" = tl."cleveref";
   deps."clicks" = tl."clicks";
   deps."clipboard" = tl."clipboard";
+  deps."clistmap" = tl."clistmap";
   deps."clock" = tl."clock";
   deps."clrdblpg" = tl."clrdblpg";
   deps."clrstrip" = tl."clrstrip";
@@ -7888,6 +7982,7 @@ tl: { # no indentation
   deps."coolstr" = tl."coolstr";
   deps."coolthms" = tl."coolthms";
   deps."cooltooltips" = tl."cooltooltips";
+  deps."coop-writing" = tl."coop-writing";
   deps."coordsys" = tl."coordsys";
   deps."copyedit" = tl."copyedit";
   deps."copyrightbox" = tl."copyrightbox";
@@ -7898,6 +7993,7 @@ tl: { # no indentation
   deps."coverpage" = tl."coverpage";
   deps."cprotect" = tl."cprotect";
   deps."crbox" = tl."crbox";
+  deps."create-theorem" = tl."create-theorem";
   deps."crefthe" = tl."crefthe";
   deps."crossreference" = tl."crossreference";
   deps."crossreftools" = tl."crossreftools";
@@ -7970,6 +8066,7 @@ tl: { # no indentation
   deps."datetime2-usorbian" = tl."datetime2-usorbian";
   deps."datetime2-welsh" = tl."datetime2-welsh";
   deps."dblfloatfix" = tl."dblfloatfix";
+  deps."dbshow" = tl."dbshow";
   deps."debate" = tl."debate";
   deps."decimal" = tl."decimal";
   deps."decorule" = tl."decorule";
@@ -8185,6 +8282,7 @@ tl: { # no indentation
   deps."fullblck" = tl."fullblck";
   deps."fullminipage" = tl."fullminipage";
   deps."fullwidth" = tl."fullwidth";
+  deps."functional" = tl."functional";
   deps."fundus-calligra" = tl."fundus-calligra";
   deps."fundus-cyr" = tl."fundus-cyr";
   deps."fundus-sueterlin" = tl."fundus-sueterlin";
@@ -8232,6 +8330,7 @@ tl: { # no indentation
   deps."gmutils" = tl."gmutils";
   deps."gmverb" = tl."gmverb";
   deps."grabbox" = tl."grabbox";
+  deps."grading-scheme" = tl."grading-scheme";
   deps."graphbox" = tl."graphbox";
   deps."graphicscache" = tl."graphicscache";
   deps."graphicx-psmin" = tl."graphicx-psmin";
@@ -8277,6 +8376,7 @@ tl: { # no indentation
   deps."huawei" = tl."huawei";
   deps."hvindex" = tl."hvindex";
   deps."hvlogos" = tl."hvlogos";
+  deps."hvpygmentex" = tl."hvpygmentex";
   deps."hvqrurl" = tl."hvqrurl";
   deps."hypdestopt" = tl."hypdestopt";
   deps."hypdoc" = tl."hypdoc";
@@ -8325,6 +8425,7 @@ tl: { # no indentation
   deps."issuulinks" = tl."issuulinks";
   deps."iwhdp" = tl."iwhdp";
   deps."jlabels" = tl."jlabels";
+  deps."jmsdelim" = tl."jmsdelim";
   deps."jslectureplanner" = tl."jslectureplanner";
   deps."jumplines" = tl."jumplines";
   deps."jvlisting" = tl."jvlisting";
@@ -8359,6 +8460,7 @@ tl: { # no indentation
   deps."latex-bin-dev" = tl."latex-bin-dev";
   deps."latex-firstaid-dev" = tl."latex-firstaid-dev";
   deps."latex-graphics-dev" = tl."latex-graphics-dev";
+  deps."latex-lab-dev" = tl."latex-lab-dev";
   deps."latex-tools-dev" = tl."latex-tools-dev";
   deps."latex-uni8" = tl."latex-uni8";
   deps."latexcolors" = tl."latexcolors";
@@ -8794,6 +8896,7 @@ tl: { # no indentation
   deps."sidecap" = tl."sidecap";
   deps."sidenotes" = tl."sidenotes";
   deps."silence" = tl."silence";
+  deps."sillypage" = tl."sillypage";
   deps."simplecd" = tl."simplecd";
   deps."simplecv" = tl."simplecv";
   deps."simpleinvoice" = tl."simpleinvoice";
@@ -9019,6 +9122,7 @@ tl: { # no indentation
   deps."wordlike" = tl."wordlike";
   deps."worksheet" = tl."worksheet";
   deps."wrapfig" = tl."wrapfig";
+  deps."wrapfig2" = tl."wrapfig2";
   deps."wtref" = tl."wtref";
   deps."xargs" = tl."xargs";
   deps."xassoccnt" = tl."xassoccnt";
@@ -9064,9 +9168,10 @@ tl: { # no indentation
   deps."zref" = tl."zref";
   deps."zref-check" = tl."zref-check";
   deps."zref-clever" = tl."zref-clever";
+  deps."zref-vario" = tl."zref-vario";
   deps."zwgetfdate" = tl."zwgetfdate";
   deps."zwpagelayout" = tl."zwpagelayout";
-  sha512.run = "87e0f99ccb8a1c83daca15bc5922588dee935eecd6e30a8d4841113a6077a621fa71a73937022ef6d5d1c9bde8f8915bd00d678c7c8402a95cd388b1abd774a2";
+  sha512.run = "780fe50d363bf11e58ef3bb63bc0d52723df5b37400ae7621c48a16755b092e79b586afaaff830d8c56520d6542db80371992d9a880bf68acab690aeaf065dd5";
 };
 "collection-latexrecommended" = {
   revision = 57862;
@@ -9146,7 +9251,7 @@ tl: { # no indentation
   sha512.run = "f763ff9a6832abce7a148bc5e8b9e5860f883ce0a56ad2119d9e18e7fb4dad794456fdc07b3ea107dca17d4174910ebf1613f1072b946a80f29d291ae513d097";
 };
 "collection-luatex" = {
-  revision = 60764;
+  revision = 62830;
   stripPrefix = 0;
   deps."addliga" = tl."addliga";
   deps."auto-pst-pdf-lua" = tl."auto-pst-pdf-lua";
@@ -9167,12 +9272,15 @@ tl: { # no indentation
   deps."innerscript" = tl."innerscript";
   deps."interpreter" = tl."interpreter";
   deps."kanaparser" = tl."kanaparser";
+  deps."linebreaker" = tl."linebreaker";
   deps."lua-typo" = tl."lua-typo";
   deps."lua-uca" = tl."lua-uca";
   deps."lua-ul" = tl."lua-ul";
   deps."lua-uni-algos" = tl."lua-uni-algos";
   deps."lua-visual-debug" = tl."lua-visual-debug";
   deps."lua-widow-control" = tl."lua-widow-control";
+  deps."luaaddplot" = tl."luaaddplot";
+  deps."luacensor" = tl."luacensor";
   deps."luacode" = tl."luacode";
   deps."luacolor" = tl."luacolor";
   deps."luahyphenrules" = tl."luahyphenrules";
@@ -9219,10 +9327,10 @@ tl: { # no indentation
   deps."typewriter" = tl."typewriter";
   deps."uninormalize" = tl."uninormalize";
   deps."yamlvars" = tl."yamlvars";
-  sha512.run = "525f00fc9e24e6b20fd7933061f3456a15cbca6e2df6ea9666dd62edd8d006c247f05492236de64bae5bf9517e73997af6f884a5f03d63e28bec631fb94d2803";
+  sha512.run = "d7c0617e12c436aa2fc9083571e6ae58a241e24741177bd5b597347710979029a3aa2ca21b15fc4eec29a3a034e4c88bd7251b456ef709544349a1c92f8db266";
 };
 "collection-mathscience" = {
-  revision = 61288;
+  revision = 62560;
   stripPrefix = 0;
   deps."12many" = tl."12many";
   deps."accents" = tl."accents";
@@ -9359,6 +9467,7 @@ tl: { # no indentation
   deps."mecaso" = tl."mecaso";
   deps."membranecomputing" = tl."membranecomputing";
   deps."memorygraphs" = tl."memorygraphs";
+  deps."messagepassing" = tl."messagepassing";
   deps."mgltex" = tl."mgltex";
   deps."mhchem" = tl."mhchem";
   deps."mhequ" = tl."mhequ";
@@ -9378,6 +9487,7 @@ tl: { # no indentation
   deps."oplotsymbl" = tl."oplotsymbl";
   deps."ot-tableau" = tl."ot-tableau";
   deps."oubraces" = tl."oubraces";
+  deps."pascaltriangle" = tl."pascaltriangle";
   deps."perfectcut" = tl."perfectcut";
   deps."pfdicons" = tl."pfdicons";
   deps."physconst" = tl."physconst";
@@ -9456,7 +9566,7 @@ tl: { # no indentation
   deps."yquant" = tl."yquant";
   deps."ytableau" = tl."ytableau";
   deps."zx-calculus" = tl."zx-calculus";
-  sha512.run = "c703c298d694651ccd82d803ccf2324a95d84186e889cabad13c12f74c0fe3b8b5081e93917f7ffc9c18ce58ba0b45dd04e857bf5bfa5290b852fb7c142c7959";
+  sha512.run = "dcba4c00ddc2e6dc96c5005b230cebaa3488a0c2d42e345cc493ca634406733846dcd27a41875dcac34dfc0da85e21fc871f740f45860270c5b3087ec6c4140e";
 };
 "collection-metapost" = {
   revision = 59531;
@@ -9549,7 +9659,7 @@ tl: { # no indentation
   sha512.run = "bc842942513a72c6a0f2346025739f09477ae1e920eaefc5e396e0b68ba53465b745db9d9c4534ec39b70f43410a0ae036c69a4e2226944b8f128b507340cc15";
 };
 "collection-pictures" = {
-  revision = 61392;
+  revision = 62567;
   stripPrefix = 0;
   deps."adigraph" = tl."adigraph";
   deps."aobs-tikz" = tl."aobs-tikz";
@@ -9569,6 +9679,7 @@ tl: { # no indentation
   deps."braids" = tl."braids";
   deps."bxeepic" = tl."bxeepic";
   deps."byo-twemojis" = tl."byo-twemojis";
+  deps."byrne" = tl."byrne";
   deps."cachepic" = tl."cachepic";
   deps."callouts" = tl."callouts";
   deps."celtic" = tl."celtic";
@@ -9629,6 +9740,7 @@ tl: { # no indentation
   deps."ladder" = tl."ladder";
   deps."lapdf" = tl."lapdf";
   deps."latex-make" = tl."latex-make";
+  deps."liftarm" = tl."liftarm";
   deps."lpic" = tl."lpic";
   deps."lroundrect" = tl."lroundrect";
   deps."luamesh" = tl."luamesh";
@@ -9651,6 +9763,7 @@ tl: { # no indentation
   deps."pgf" = tl."pgf";
   deps."pgf-blur" = tl."pgf-blur";
   deps."pgf-cmykshadings" = tl."pgf-cmykshadings";
+  deps."pgf-interference" = tl."pgf-interference";
   deps."pgf-pie" = tl."pgf-pie";
   deps."pgf-soroban" = tl."pgf-soroban";
   deps."pgf-spectra" = tl."pgf-spectra";
@@ -9684,6 +9797,7 @@ tl: { # no indentation
   deps."randomwalk" = tl."randomwalk";
   deps."realhats" = tl."realhats";
   deps."reotex" = tl."reotex";
+  deps."robotarm" = tl."robotarm";
   deps."rviewport" = tl."rviewport";
   deps."sa-tikz" = tl."sa-tikz";
   deps."schemabloc" = tl."schemabloc";
@@ -9772,7 +9886,7 @@ tl: { # no indentation
   deps."xistercian" = tl."xistercian";
   deps."xpicture" = tl."xpicture";
   deps."xypic" = tl."xypic";
-  sha512.run = "b53fb9863bdf0d488c6848967c7787912cf66416e8957e1b301a5b47f45d37534e3425061e24eca1b8d4d49d9abfd9a7faaf2699ffac1eb57797c5e7c224d546";
+  sha512.run = "15970f401c7e54a8ecbfe3b1736d0ebc73002154df0fa25492167fcaa6157e67aaba119bdc8652f2797fed767ed1c75342cf4979ad323f9ac426800d4bc5aff3";
 };
 "collection-plaingeneric" = {
   revision = 59850;
@@ -10007,7 +10121,7 @@ tl: { # no indentation
   sha512.run = "54e2b23dfd58d514d577f535e4f8bab08b2a124c43abdea796847d5c8cdf5c7519c277db49ca65c2d50751c03c9ffaa6ce7493c82eba7863047ae969ee5e1bc5";
 };
 "collection-publishers" = {
-  revision = 61397;
+  revision = 62835;
   stripPrefix = 0;
   deps."aastex" = tl."aastex";
   deps."abnt" = tl."abnt";
@@ -10044,6 +10158,7 @@ tl: { # no indentation
   deps."bfh-ci" = tl."bfh-ci";
   deps."bgteubner" = tl."bgteubner";
   deps."bjfuthesis" = tl."bjfuthesis";
+  deps."bmstu" = tl."bmstu";
   deps."bmstu-iu8" = tl."bmstu-iu8";
   deps."br-lex" = tl."br-lex";
   deps."brandeis-dissertation" = tl."brandeis-dissertation";
@@ -10125,6 +10240,7 @@ tl: { # no indentation
   deps."langsci-avm" = tl."langsci-avm";
   deps."limecv" = tl."limecv";
   deps."lion-msc" = tl."lion-msc";
+  deps."llncs" = tl."llncs";
   deps."llncsconf" = tl."llncsconf";
   deps."lni" = tl."lni";
   deps."lps" = tl."lps";
@@ -10149,6 +10265,7 @@ tl: { # no indentation
   deps."ndsu-thesis" = tl."ndsu-thesis";
   deps."nih" = tl."nih";
   deps."nihbiosketch" = tl."nihbiosketch";
+  deps."njustthesis" = tl."njustthesis";
   deps."njuthesis" = tl."njuthesis";
   deps."njuvisual" = tl."njuvisual";
   deps."nostarch" = tl."nostarch";
@@ -10185,6 +10302,7 @@ tl: { # no indentation
   deps."scientific-thesis-cover" = tl."scientific-thesis-cover";
   deps."scrjrnl" = tl."scrjrnl";
   deps."sduthesis" = tl."sduthesis";
+  deps."seu-ml-assign" = tl."seu-ml-assign";
   deps."seuthesis" = tl."seuthesis";
   deps."seuthesix" = tl."seuthesix";
   deps."shortmathj" = tl."shortmathj";
@@ -10263,8 +10381,9 @@ tl: { # no indentation
   deps."xmuthesis" = tl."xmuthesis";
   deps."yathesis" = tl."yathesis";
   deps."yazd-thesis" = tl."yazd-thesis";
+  deps."yb-book" = tl."yb-book";
   deps."york-thesis" = tl."york-thesis";
-  sha512.run = "b079111174e27c874c78f905ba43f30471027a4afaa960613fe894f99e4468dbf3c5cdb3efb0d63c43d7d2c9e48c43b0f927d0180b447e19f9ab2af4086e3095";
+  sha512.run = "9d1c4d5ce6bc56dde1b5a5c72c3744e63f9ef4e52fede8e44e0ad27c60b2a80cffb7ad0fbd86ffcb579b36dae2b038a71494f3dfb691a94e5fe9802b57fc487f";
 };
 "collection-texworks" = {
   revision = 54074;
@@ -10279,7 +10398,7 @@ tl: { # no indentation
   sha512.run = "9bf4c58094748424c1b60a3731d9cb2b1ad1d24764469072da693de26a4e4e857df3bcab6d4c2b5ae7454a69f9730fc596fd156b46b7704eafb1421f6936d66a";
 };
 "collection-xetex" = {
-  revision = 59742;
+  revision = 62241;
   stripPrefix = 0;
   deps."arabxetex" = tl."arabxetex";
   deps."awesomebox" = tl."awesomebox";
@@ -10288,7 +10407,6 @@ tl: { # no indentation
   deps."bidipagegrid" = tl."bidipagegrid";
   deps."bidipresentation" = tl."bidipresentation";
   deps."bidishadowtext" = tl."bidishadowtext";
-  deps."book-of-common-prayer" = tl."book-of-common-prayer";
   deps."businesscard-qrcode" = tl."businesscard-qrcode";
   deps."collection-basic" = tl."collection-basic";
   deps."cqubeamer" = tl."cqubeamer";
@@ -10309,7 +10427,6 @@ tl: { # no indentation
   deps."unisugar" = tl."unisugar";
   deps."xebaposter" = tl."xebaposter";
   deps."xechangebar" = tl."xechangebar";
-  deps."xecjk" = tl."xecjk";
   deps."xecolor" = tl."xecolor";
   deps."xecyr" = tl."xecyr";
   deps."xeindex" = tl."xeindex";
@@ -10325,7 +10442,7 @@ tl: { # no indentation
   deps."xetexko" = tl."xetexko";
   deps."xevlna" = tl."xevlna";
   deps."zbmath-review-template" = tl."zbmath-review-template";
-  sha512.run = "701b40c44e9292bdcad0fc09645d1d7b2e99364a8c54dc84f6ddceee3b512e708d9a82d7c820a8c14efcdacfc8893b8dc0e6c14d697590686a43291a98e5054c";
+  sha512.run = "04f7b34e5516690f11403cf139893425369de705fc2b4e4e35e202322f439fd129321f77aac0e7afafb83058c67fc4b431eb1274185d8c0c85d7537e8b8914e6";
 };
 "collref" = {
   revision = 46358;
@@ -10379,10 +10496,10 @@ tl: { # no indentation
   version = "0.2";
 };
 "colorist" = {
-  revision = 61338;
+  revision = 62834;
   stripPrefix = 0;
-  sha512.run = "bc06f7c4caa41a7bb8c6ebc0fd3c3f0b211d65ef4ac9ab7e39cb4ca63d78afe8ee18bcf1ccc12cdb2d3ef5fb088b5d136d0ee37656f73cd68fcfd07a78b0d0d8";
-  sha512.doc = "faff9fe25109e0613096fa4aa124f7b7519bc05ec84f97f7fea9c8354798db7a454274b1b430cb4d235a0debd4b5ea25cabea5065aa6c6924a25606058e27253";
+  sha512.run = "90107faa3cf884ba50d4e2bd466dbf5eef1f15d44971d25bfd5312d0edfcbe00b88ba48f3caff1a25fa1ce998a40e36351379be9adbe2e758d710b62e9c6753c";
+  sha512.doc = "e34e5f54a9f82aa48cfa96114b4fdc14692b7a0cded9cbe2e341e10efceeebcf5d9c0cf33b23baa995bd557ec23b673d9fdb2a54ef76a9eaf0631e197b954117";
   hasRunfiles = true;
 };
 "colorprofiles" = {
@@ -10624,6 +10741,14 @@ tl: { # no indentation
   sha512.doc = "7b2db9b8f2f23816cf413676dfbf6ca3413a39bb20cbc12070b9202bd2e98714a86dcb5f27a746ae197efd2284eb794f06af1b2941667abfddb72773ceb61378";
   hasRunfiles = true;
 };
+"concmath-otf" = {
+  revision = 61613;
+  stripPrefix = 0;
+  sha512.run = "24b71af36ee399bac47a70e86f23ece5b18699d001e2e68bc0cce4b317981c038e4dd8a83689dd87b7ac8a86dd6ca3ddf082bb959630f7638d9f7635ccc17cd5";
+  sha512.doc = "23f2cfd25bb3278dcb7a2768547defec6047d3d5f5b82864ed3b23aa0ad874b9a3cfa4c660529a9178bf1274148e89cf060f7a8088f3a9854b9553463c40f924";
+  hasRunfiles = true;
+  version = "0.20";
+};
 "concprog" = {
   revision = 18791;
   stripPrefix = 0;
@@ -10788,11 +10913,11 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-filter" = {
-  revision = 60786;
+  revision = 62070;
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "294286db1d374f99e49fd249234ca19a5fae95cade586ff08771c2f9ecfdcb9bb729d6a3da546d8c85989104dcd1433568e31359d44fcf2447c8d4a0a0c8db85";
-  sha512.doc = "8328312ae81748e38dfffeaef00b9aa20638ef7536357eeafa94cc86c21ac3af4fb908e79f4ef5e61ac2e02414780edb82185b9504181f0fa2393a1fb23cccab";
+  sha512.run = "c2534b543fd5444776a054f43fafa393040af5bcb67f869d61d200a4a1d0355f1d81c64adab683d15a6be806a21dfc9ad661995bbe51da3c0bfb841ade4b077f";
+  sha512.doc = "a9c2ea88b0e2514840c368ea7686894dda4b86c93ec8f34989238ffdf5704f1c1898d0ee5e0724035314d2d37803f1a1afdd445dd802a94f5ff4223148f81767";
   hasRunfiles = true;
 };
 "context-french" = {
@@ -10948,12 +11073,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-vim" = {
-  revision = 61301;
+  revision = 62071;
   stripPrefix = 0;
   deps."context" = tl."context";
   deps."context-filter" = tl."context-filter";
-  sha512.run = "788e36df52b815e35f01fe09207f9b8f34021879aad5992d06f20561af6f111458a9e21c76a8f985cc3aa3c4ea344f54e9c283b73b6c325ad38a688714ea9966";
-  sha512.doc = "9a8638d773b3d27937d5f9e2a7a1b93a226aa8e95d33bbb6fcdb4e89d14e5b89388838831a47c79e334ba55af5b5f231e7ad71c0d0791abe9f0dd5becd122eda";
+  sha512.run = "12100c7aa3eb555cf9dbe72454a96e63feda52329a8a192ff86ba30477acab4ebaaf84c15a79f16d4e3f95cef02baf8146e5810b8c9e8e94c25ba1317bf4fc2c";
+  sha512.doc = "0f49e22b9e1d465f46727a9e952e095eceab55e77a2559fe497cf14690377f77ca42aa23ce7eaca659e9b0983e5a950b36733eef49b0473fd33a8f783edb43b1";
   hasRunfiles = true;
 };
 "context-visualcounter" = {
@@ -11079,6 +11204,15 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.1";
 };
+"coop-writing" = {
+  revision = 61607;
+  stripPrefix = 0;
+  sha512.run = "b00d0ba304a9aa88929a0f130b3e73bf8c095b25cebc6b33d8d01d15cc73766ac3db3a588719fe6480fb4105ed0bde32d5ab2354f2cc223c2e3bb90a8e6f877a";
+  sha512.doc = "489060dd92b0044cb76c8e4f3f17aecf85da7b320406875b0c9b46fde2edf485868669e4986d9d602eb317ec0199e6ab81bb34096f7635fa4479203e03336577";
+  sha512.source = "f00f9b9db508f6fb924a4371413631eb6a269f1e70034891a1cf1f6b8df6d81f5f3e7d12e5ff7df29524d5354fd2e6123651d549e997457cf4723a8e723053e4";
+  hasRunfiles = true;
+  version = "1.2.4";
+};
 "coordsys" = {
   revision = 15878;
   stripPrefix = 0;
@@ -11147,9 +11281,9 @@ tl: { # no indentation
   version = "1.00a";
 };
 "courier" = {
-  revision = 35058;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "a7a7350f23921254b9a37e498c2360aeb67d4aa8161072dafa38c941eca35388eaa5d8a341e8b490e783f346ed6b0f4a4d356dd914f70a858c92c76ff1808440";
+  sha512.run = "30d6c8906671239b9ef04b3c4d571f59e928ffefc965cd592ecd3277062c778b6f8cb0782f5eb8c6bc27d03b69a88a120593477ced93bcc44cdd4fbc3e5b8adb";
   hasRunfiles = true;
 };
 "courier-scaled" = {
@@ -11183,11 +11317,11 @@ tl: { # no indentation
   version = "2.0";
 };
 "coverpage" = {
-  revision = 15878;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "6ba22fe89f292ef65ec41a958a93a8ab729954fab33f10677954791bb2be8bcbca71ba4953b6ec47066d3b92e444ebbef9b5f465952076ff0c679706f0ba406a";
-  sha512.doc = "01346bc57d5742be2196c8768106fc06534ce03571dc1e3e9d48957ba6d0e1a3aab1a4ac070d4e545f058d1b3833e908398fff62d3ce6bd462b927646ff1e60e";
-  sha512.source = "cd47f6d17ab585e84244164bed3b905163157e911dec81ddcd630f23f0b520763b9972b3430f25ff4039e27310eac21e6257727aa4544b7a0e40e7020fc72b42";
+  sha512.run = "74f04d4b77177b457f984cbbc93d766509fe1a6889cf337e127f753fc699600a6c459ecd2124c6d45a4cbccda1d4ef71f985281d53bce1ad76a4da439e9cc998";
+  sha512.doc = "c8490057eac2b7821c17e0bebdc3e7c97b90cb14bb6c585c38c8c14e69ed2b69dad81080c45cd0fbd9e18479ab9c100ef1c6e7b2be6d197ba61774e3e0df5b49";
+  sha512.source = "37a6e7121863b34563f7f06abf44a5ada55b75940c69c4469466ba44e313b1c329c0cf7ce329547d0c8e427df8bf78eb826e7bb85153100fd4fd29296a3d567f";
   hasRunfiles = true;
   version = "1.01";
 };
@@ -11233,11 +11367,18 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.1";
 };
+"create-theorem" = {
+  revision = 62806;
+  stripPrefix = 0;
+  sha512.run = "5c0c60ff16784e9ea1c99ca14252d9de581251ffcda65d4f02e7eb3fd126d9cd935fbd73f1c5393b17eddf76b5ab67bc69b0bc4b9d7c11b0a24c5a45e71a5e2b";
+  sha512.doc = "808d59f8a0b1109ac18b766e5b3f45fb6bb0dbf52abf2a4da13783400b016c1977287369ce5396bc16ad5c6526f8cbdfcd1e34a5160665a229fe04515adb0a4c";
+  hasRunfiles = true;
+};
 "crefthe" = {
-  revision = 60961;
+  revision = 62350;
   stripPrefix = 0;
-  sha512.run = "ef69535427477153ed4608755634b6c45eed64b64df70f250da79ba98e65ea4f674b17de527a48f091cdcf5508c8c391304c591f489013eaa7018e53f36763fe";
-  sha512.doc = "beea700aa21468283615cab567ab199ebc365f15e7cd9d46d149a689aba4f4bc50223a45fb5bf2395147e332a818543a89a7a57951af35ecdcf3e540d9b4cb69";
+  sha512.run = "123a072ca4d90088143996536abc04e6d20cbab6bfb224254dd1b3a42599227682103fe7479240c69af72925b4be261edfee75e55f1f5d58fc4da7a320e39399";
+  sha512.doc = "d13613fe7d926db9b689b85b81198ae283f016967d37e46a2c6a8ca5302d1361860027a78201913c2de4e4907081411300b099edb1b6229fa2a5f4d74446427a";
   hasRunfiles = true;
 };
 "crimson" = {
@@ -11344,7 +11485,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "cslatex" = {
-  revision = 57972;
+  revision = 62145;
   deps."atbegshi" = tl."atbegshi";
   deps."atveryend" = tl."atveryend";
   deps."cm" = tl."cm";
@@ -11359,13 +11500,13 @@ tl: { # no indentation
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."unicode-data" = tl."unicode-data";
   hasFormats = true;
-  sha512.run = "dd6b98eb22786f39c830a4c012396507dca694d727f1a7eb147a1c8c2d4442d8120e016de4c08c038239dfac866f828bc7686d8fd124d1af63edd0994db80f9f";
-  sha512.doc = "8ec3527c25c07641788b809cca4f4cc8bb034f63f1100b74270041b503dbc8926a410429a370692502596bd6ffec69a970a19b1c32178e4722f81acdbf0ea934";
-  sha512.source = "0563f453bf7e34b4948a29d832207f8148082c5186a6915a6bdc1c41d0c08399505491ccdea0b45e8bf326a8e8459d37eeaca546143d9f622ce4dacba11cac7f";
+  sha512.run = "b603e9bd2cfa7332d8698c49463c96e5a29e1dde2d10b62b8478354ae5a042b4539b655da4161d4a8c125bd61ac52b9360d879f521fbd7df81c20dd01d2f528c";
+  sha512.doc = "f2d6e4b4e36901c6f6e1f7d39b6eb1efd0400e0a063015daad6ad2d109b11effdd7ee28561b6dffaf1271f79aadfd1ce52da0538bfb50b59f645cc6cdb74a871";
+  sha512.source = "0b7f64803cdf0ccdf56600dd321af586027b734a5d68a2cd77b5243bc4eb3fd7ebe1869b07e7666eed0952a5baff4796a085ee4bd1b018897f69bf5c70ad6af8";
   hasRunfiles = true;
 };
 "csplain" = {
-  revision = 58353;
+  revision = 62772;
   deps."cm" = tl."cm";
   deps."cs" = tl."cs";
   deps."enctex" = tl."enctex";
@@ -11377,9 +11518,9 @@ tl: { # no indentation
   deps."tex" = tl."tex";
   deps."tex-ini-files" = tl."tex-ini-files";
   hasFormats = true;
-  sha512.run = "27fc3fbb1aa29693fcd1d39abf92e3248fa769b8c4e0171948c2a7957e52dad2e08759050321401f7cb900285de62246bc0013d22141281111a82681c11802e4";
+  sha512.run = "9b10a0b35a6ed91535e4a1b023ddb16766f9fcffc15b2af2d08ced4d7169a935ba72cb5546715cf0e7602fdd138ffcd8f619376dacd90f5e826e82c4ac7b1a43";
   hasRunfiles = true;
-  version = "Mar._2021";
+  version = "Mar._2022";
 };
 "csquotes" = {
   revision = 57844;
@@ -11406,10 +11547,10 @@ tl: { # no indentation
   version = "1.02";
 };
 "cstex" = {
-  revision = 58354;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "bc27207c1b7ee821f876f9adbe6187b6e6c1c5d0fd207a99bb76fa8a01f3738012150c96fd2d16e99a2736a11f8505696d1ea6e22426dc5049a43be9116f5585";
-  sha512.doc = "f9cc9398ecbe1e2d97391f27d9c997cd730c33f275708e399fd5604239f68bda7a408cc2e7ec3ba8220173090d4f5fa3771825c7904f7f4a81a477b16fae0ac9";
+  sha512.run = "859d2eb2270562e643ab10a5a8b588915399900c11bcaa13e4317954d37238dfd947132c6fd4a03bcce829c3fdd92d3d6a0fdf25769e5b7259200a2e73a666e6";
+  sha512.doc = "8e32b929eef7744eb7618793883d5f5b5c6d92a2bafd3ea9918161d6e6590d419ddf65806d5920c329d54adaf7e4569400c62c99104b01d5a45e0a2514337044";
 };
 "cstypo" = {
   revision = 41986;
@@ -11429,12 +11570,12 @@ tl: { # no indentation
   version = "1.0";
 };
 "csvsimple" = {
-  revision = 60470;
+  revision = 61839;
   stripPrefix = 0;
-  sha512.run = "25c21f971f3315025c7f6d3fb757f77d3ed53755d6e5cbc7dcdb62afee34c3dc2a3539758f048d01caf42c3f777e1a997a12df4765d85f511c2a9e7b3175d8e7";
-  sha512.doc = "f419c39966466b73cf7eb95a12853cf9b25b581a23e0c4116cdb905787e949ed5b9aa4be599a2ccf94962fd04d6170c0d011e39e5460365dfd7debedac6909fd";
+  sha512.run = "33d1b741c6dd03081c01d77daca569358f7b801dd50577f936f250e119272395c118b2c36ab772a87477177090d6267a6ac47d64ac569e595215614a352d90b6";
+  sha512.doc = "bf8ffb88fdf31c8a8b9430a163fd381e8aec891613d6fd572f3247e08890ca232f83657f194fd9a1fe093d7297b75dcbaccd28fa3116e12cc23f98b42a4fae98";
   hasRunfiles = true;
-  version = "2.2.0";
+  version = "2.3.0";
 };
 "ctable" = {
   revision = 38672;
@@ -11665,9 +11806,9 @@ tl: { # no indentation
   version = "0.2";
 };
 "cweb" = {
-  revision = 60085;
-  sha512.run = "86e23f2f005d23cd1ea1db8d767e61d9cf1ab494174fadb0433d6428f9fd0d216a32f84991bc3acf5fd75fd7190f36854d243b083052d4ee0eed91d7d57a61a4";
-  sha512.doc = "e9f96202b01503cb85678e24c876d3f8d2cb184ecd21527e1729eb5b5cfce9438f3402e6e08dd02dcdc74cde31df0734590774aa356482ccb20fac3a3186785a";
+  revision = 62023;
+  sha512.run = "3e200b96f278472696924e35eac9460479c7dd60bc0bbe74ca909dd0d6fa253986e4e86f6bc0b6680775b0bd40ef49b38140c218229fdaca873a67230468de4a";
+  sha512.doc = "3ef863f14483cad6c6e7c9e0b53f670c754d958c332dff85e5ef359f44d7ea0c985664ee0d2e8f2700d1122c92945e8eb9815452f09e543c646a048792bf3a83";
   hasRunfiles = true;
 };
 "cweb-latex" = {
@@ -11801,13 +11942,13 @@ tl: { # no indentation
   version = "2.32";
 };
 "datax" = {
-  revision = 60580;
+  revision = 61772;
   stripPrefix = 0;
-  sha512.run = "d33691c71297f909cc160e1d4ca1bdb4343edc2b5e2058eb7ef3edd58255b72f02d57e5a1d4348cd0de1b890648e6ea529b60d100b84c7cd2ea868570129e28b";
-  sha512.doc = "2b30224581baeefdddc50bde5f6f14df317108e7a0be89f0d7add5a2e966f6cd21ddfc5b9278f4c6f1f2fe9337c1789d191099f60244d978261da070558f0b63";
-  sha512.source = "00006e1bedbca8b6bfc52818a2add87fd39e7071814cc2ef81fdb70eed628612f3fbee439a7e9fd5c88e984f7b90c760a80be35e77a77eb5d1f5cf73a437e85d";
+  sha512.run = "04de65ca5219e0e3b53fd0c0b92fa514bec77be2f889e48ad100f93113f54e738016fdd93ae59d79ae7f4ea31108efb9cbac87a6db010b71008fb17dcfa19900";
+  sha512.doc = "e1dd35b5dce9a4ea5b1bb9d9db14b8e6b6f8ab1a8f374079c2328862fb231b4eb69a05e1bddac424401d063925b4a75a9994000ee4c36c43e3fa6344badd6f5e";
+  sha512.source = "076509cc39ab41b028cc17551342bcc26cf8bbcd5c12d25d291e2eafb3610d390610d36e917a192b38fd7870c6ddee60a365bfa9711b024c6de2a3494dcc498a";
   hasRunfiles = true;
-  version = "1.1.2";
+  version = "1.2.0";
 };
 "dateiliste" = {
   revision = 27974;
@@ -11819,20 +11960,20 @@ tl: { # no indentation
   version = "0.6";
 };
 "datenumber" = {
-  revision = 18951;
+  revision = 61761;
   stripPrefix = 0;
-  sha512.run = "f87518683c9820e816f33e535bc8e5d7e31fcda124178593f9635b040151d1f43f6eeb4d69ca974b847c97efcf19fa94f571d5534dfdc8ac0e40d711d26190b3";
-  sha512.doc = "b9c156b19bd6abbb3f996495dcda633172f8e559add744ebe25bb58070ba06bc233c2dda54c93415da14aecc30d2888241bf9b80c0dc5922b46cd3ee05865701";
-  sha512.source = "ffeea9042501496e815db5c90cf8a99931fe96bb8dbae6e2551994242336892567c140ed352ddf962d1f144844960eaf03187aec6869780a2c3e218446940174";
+  sha512.run = "5c7d23f949684000d0e38855e11e4869433c33f82fc42da0568d4b74fb0e69fe3fbcd5f72516222059ee446938144c18b10552290e24e077f2e624286e729d28";
+  sha512.doc = "18f2573f8c02685d20085c31384b75dd1ab5a47a5bb2b9dcda036a7cd1ecec80db175a674c1f148cd51a078721ed88a3c9b7a0915acd7c023c02ea9a16e2a1f2";
+  sha512.source = "7835857f1c4f3e59918fe9ecc903dc09139191b050b1b0166e4e1fbe4a5d0c95f33b8591f30012ef5d69af324e8a71cf24b39893029519c13e13d8044b191261";
   hasRunfiles = true;
-  version = "0.02";
+  version = "0.03";
 };
 "datestamp" = {
-  revision = 61304;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "dff60190a2504f544c7400850f33f21674fe0c62b0cf6857874fc441bcfdaaa2c1223e251eb24c8905c6f656ab88800774c9d6eba6561f7e4a1525635113a1f9";
-  sha512.doc = "896e9165f3710cb5bbff02828e77600061699ce360c80bff7a2474ec6b4d0bf33fd0ac3972093f034e9a75eba306347fc98acd9981fea2bd07aaed18b102a893";
-  sha512.source = "7561450d4d79fe5f4523522aded0e2bcdb32a29770718e62838811d91242669a3d62c3a780178d6b8527375bb49707eeedc9e94a790640b8dbf2da306fbac88a";
+  sha512.run = "558e8ec60ec317f8342efd63d0146b92e43ca37a772b8fb200a40234d48a71e5374cb3f3f15bfdef129fd1fee8ed27491bcb8b69ae2b681abee72a3dcb8f18af";
+  sha512.doc = "d9627cbb294f0bcb96b019d3497b12ecd4b4eb656a1dfd70d1adc6cc4cd217bed9d4f9e209497c683f925cff4063d759b02b44bfc1f38421a9044aa8ef8bc988";
+  sha512.source = "3afaedee82a4e4c6f92f465fa59ccb29976272a75aeb523d8c161b07bbe313b5e79dfd96195d0426926a3ddb3117944ab21838d085e1cd59256bae31419e243d";
   hasRunfiles = true;
   version = "0.3";
 };
@@ -12241,14 +12382,23 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0a";
 };
+"dbshow" = {
+  revision = 61634;
+  stripPrefix = 0;
+  sha512.run = "339bd686c658c462c9da56018234c6a31e72a3def962798772bed17bd453efa94c5f8e2d72a2f033714eaabbde8b45bbeed07d302e311d65a27c37f8ef177a2f";
+  sha512.doc = "4d4ff36d121b950d7569f4ae8e7fee7e0a4790f61e8d2b58c136644d0ce455e8b8f4c1857c8df68d2f230016e5ea28a35047234ee101b3f949d1598f4e15e52c";
+  sha512.source = "189d3f8bd131bb3fb8bc7481215fa670001ec9bbe20a4d1ec99a9864005b44fe9fb582ad5462ef23f62ec538fe8d2dd9136cf79e94756c4b6e02d644e2d66a1d";
+  hasRunfiles = true;
+  version = "1.5";
+};
 "dccpaper" = {
-  revision = 60413;
+  revision = 61763;
   stripPrefix = 0;
-  sha512.run = "7ec4066600126a651170af633f309ffa4f5137879e63335815a33d51cc5a741ee4ba491681b4eadec88f7fd91f54464d29b8a77f892d0f457e17994ecfc71901";
-  sha512.doc = "ac292f912fa3539ec383f9d4328e06f4125cf65a52668cc29bc8e80c14f963266e210c6aa7f7326c0ed9e5b55ecb16c152af4b9552499b721aa86a2d7f3783c0";
-  sha512.source = "ed6f2527e1b11cbca308d644ad68f2df85c915784e1fd8e9531ca606a31ba4342587de36517b092ba79e709f34e3e40546fcd4f99372c7b7d5a86355a9e26116";
+  sha512.run = "98648e229632afa6503388edbf7418b2f92fb46351bdedf7d678132be91b3740927ce4c17ccb2ddbee6e24cfc0810b415c013cb61aa81db986efb5daef311aed";
+  sha512.doc = "e9809887d68592513d5d9992add687dc7fe82e7570fcbc46cf582f66152c94d5f9729735f0f5714245421556b470fcf0f6cb0129017fd79df20e96fc0f4548e2";
+  sha512.source = "da0843ea5f46a187b0d454b5a421699865086af684512a2202aded1e50c240e1345130753fff0a779794d5897f32be793006802c59a7aa741a0f53b4ac002f91";
   hasRunfiles = true;
-  version = "2.2";
+  version = "2.3";
 };
 "dcpic" = {
   revision = 30206;
@@ -12267,11 +12417,11 @@ tl: { # no indentation
   version = "0.2";
 };
 "de-macro" = {
-  revision = 57349;
-  sha512.run = "558a55b14822cda4cfaa05511bbd6030049145916669b699795827181462e628d0a84baf087b8d56e3dccb353d17f581af9bc1662506878124e5cfaddbd97b9a";
-  sha512.doc = "af0a7a463c7a9623050a3fe73782076965eefb58dec17752c80e35a647b5a7a6b354a1dea89ba03b503eef0faffbd2f134a6e5666f4c68665d322bf3b77922d6";
+  revision = 61719;
+  sha512.run = "8952325be56b193440dd24f0e6847ed1a9bea4cf8aed86afc7b7ff0a0f6d61130320834e679d55a020d8114d555733a92e645eea8fa1d3afabeb8cac5ef097ea";
+  sha512.doc = "079dfa97d55a2989e300856e7877591bd041b239454a0a0f72ed20e329fe2f9ebbbff22497eec1b622e2679316242a845eacab5716e01e74c5c810fb357c1636";
   hasRunfiles = true;
-  version = "1.4";
+  version = "1.4.1";
 };
 "debate" = {
   revision = 60720;
@@ -12314,15 +12464,15 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "dehyph-exptl" = {
-  revision = 58212;
+  revision = 62735;
   stripPrefix = 0;
   deps."hyph-utf8" = tl."hyph-utf8";
   deps."hyphen-base" = tl."hyphen-base";
   hasHyphens = true;
-  sha512.run = "ed2a3c4d91ecc125ecc2179594e66b5bbe66bb806c1b232ae1b71fdd0d29152a2d28e3dc6dbb2e1724650b8b8cb67e8c8bdf5b7506357207ba61c636768fb8c5";
-  sha512.doc = "e40955db986b94bb9bbbbf9daaf6a12d2898ae736741fb0a5626755b55908b056a2b4dbc1d87e9681201d7e45c99297393d6e1d2de17d135d8d74c732106897a";
+  sha512.run = "4c98b82ef67b0041ca11ac43bfd9776d0d13ea5b0436a5858f40c258bdd1b46839467333c1955602b521a614d4b9a4093ed2bb020fb69b8ac4983f1261842b12";
+  sha512.doc = "9a95ae0841ae743c7caf10ce74dce9b1058c32a0f3e11102320335b52e21ea0c6e950efeaec63915ade19158f4268a20bdf622d022ea53eb8926f07cd011a0f6";
   hasRunfiles = true;
-  version = "0.7";
+  version = "0.8";
 };
 "dejavu" = {
   revision = 31771;
@@ -12480,12 +12630,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "diffcoeff" = {
-  revision = 53244;
+  revision = 61432;
   stripPrefix = 0;
-  sha512.run = "4f8a1dd23b34cf7d6f213a6bf6699286c7e0df73a8a81ce59d6bd2d500f108f60293fac6f1c938c73afd5d4b1b20f64f2ccfe74f5031b0dda8cba65eabe7178a";
-  sha512.doc = "b45ae815b92e542d0158da9a75978f97b2ca14056484a776dbd236da551dabe025fd85366fe2ca230b095119bb47fc3048fbb8f1cc4943f7fde9aa4820f0cb36";
+  sha512.run = "15c8d7d506e609936663c812b2b23d55d0dd957b8d7d11a75635c1c0afca97c04207cd013c2d98e6d2ae618d35f0669a99671cb576b599d42041b1a4b36214e3";
+  sha512.doc = "8a475f83242a6e14728dbe8968b231081810498ddd6e43267182b2361cda1526bad7649e5131a3f5a94eed69efdb401dfdfe2ab7f21f9ce0f042ea868302d02e";
   hasRunfiles = true;
-  version = "3.2";
+  version = "4.0";
 };
 "digiconfigs" = {
   revision = 15878;
@@ -12667,10 +12817,10 @@ tl: { # no indentation
   version = "1.4";
 };
 "docsurvey" = {
-  revision = 57362;
+  revision = 61447;
   stripPrefix = 0;
-  sha512.run = "89b01331fcfe0b039716b7b56f34c6006a15b69d9e8862426d0137221ed6c2909f7537f5252f657eb0448a1484d95bce57a947867bcf25486b893f679ef14072";
-  sha512.doc = "795cfea7772c3a0a596dee18c0e2398e883c03e10f9d901a8bbc6dea0e8e599936502acbd687b22fc617d73f96993c6d0eb7801a5445ccf448e42a6ed1605eff";
+  sha512.run = "bfb93b2510b2b2e334e63468dbb4a4860d4a2166c36b5ce5ff706007a2af605ffb1b5b64c567fe1a3bc46a4fe420fef4020ce6bdc16a4a6d3396ef00dc69d076";
+  sha512.doc = "5f91a58cd18315c612860bcfcac7b85ffd402b02dfe669e6fae1efbbac5eaec683b3a286231f9db1cfe5ba967be67f08b1319dea72263f7bbcc84cfd913ffc1a";
 };
 "doctools" = {
   revision = 34474;
@@ -12974,12 +13124,12 @@ tl: { # no indentation
   version = "1.031";
 };
 "dtk" = {
-  revision = 61047;
+  revision = 62608;
   stripPrefix = 0;
-  sha512.run = "1b56e53aca93cbc91f5389d1185375e14f44403d0a540d782d1c63ec7a27f2abc9cf0387cf57e86a0022cbbdf39e7d979056b43a762004e636a8a3c6041d9abf";
-  sha512.doc = "9b82f9832c0aa4b80f2e97913e1c25bed32f1e51461c77c64eb9683a4016d487e573d1b449e60e67566111f2ccdf56c6394e77d325e6e28b5f82d4dceea4fbd0";
+  sha512.run = "5a22a12a8cfd99c5be2c9380b755c39d60baf5764febdf1500f7ead7e220835b01487bbfa8666e2f9afa1b27e13e712025b9d94a3e1793f87b961f7ae12b09b2";
+  sha512.doc = "1a12eb49d22be84617ff22234258a024147fa548d5f211509ac319195ae87b0f8374590b24148af65538e75276f93ccd1277c57c74c764cf18bef71d7674c5b4";
   hasRunfiles = true;
-  version = "2.08k";
+  version = "2.08l";
 };
 "dtk-bibliography" = {
   revision = 61396;
@@ -12995,13 +13145,13 @@ tl: { # no indentation
   version = "0.6.1";
 };
 "dtxdescribe" = {
-  revision = 51652;
+  revision = 62554;
   stripPrefix = 0;
-  sha512.run = "4f226da178f26f2e3310a86e2d884aee681f87528c0d43f942f23c68b6e335eb21bef830233524d44d2945a1d287ff9542bd69744c15c722a54ba38a5af73d96";
-  sha512.doc = "45592bc0c6836d83f1db18f7852394a0288c2557aa708ccbd1407656b7939cefba07556e924fe495da36078411b81bd00702f7998332a5fd801aac0327655f47";
-  sha512.source = "9ad27a4f1fc13deb348a3bb73dfecb634ed3f0b69565f4ab06763cafdd652b4899fa4914d64c9596534cb561ac9724c86ea713939d7d6e6c7820c869acb0289d";
+  sha512.run = "56191e6f26307f4bbb383ba4823e5eead49d7ee61ad7c065dc070497bf3a6078e3f20c07a8fd6acdd13af6cbe0e80846d96fe110136ed3987d67157f0fb62db2";
+  sha512.doc = "440931d2f78a4e71f247f599e3e067548e793d49b54f6f35ead9f9424d388535d096e8d4008f5420bcacef69cba4563238ab84f0828c5f4315911338d5abf8e7";
+  sha512.source = "9cd47893022df927ee181eaa61745bac8ec69a0f0fd1e465cc01d38dcb69dbe3c6a067cf9145c401526c99187b655e5937d8c7f0970d2ae61ba2ebdacb5c3e05";
   hasRunfiles = true;
-  version = "1.02";
+  version = "1.04";
 };
 "dtxgallery" = {
   revision = 49504;
@@ -13103,9 +13253,9 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "dvicopy" = {
-  revision = 57972;
-  sha512.run = "f288fd83823c4cd7e01353dd1d7eb8d09cabfd3dce4c5db482e4063d187ea57ee1d2027cedd3f93ce373e03fa1d840075d6c05b27bd4ed084f0c354da22cc9cd";
-  sha512.doc = "0bafb5f769c7b59551028ebe29e30e3761a0f78ff0515a4414597b07b27b633ab537b9b0409437ec05e70889ff14692fc5fa53ea5aee9a0ab2ec7d0b34d2621b";
+  revision = 61719;
+  sha512.run = "a9b184e017e3ca29f2238ad7d0967a9467a8d41f73f31ce15a2a84ed41e9d91a2776db7259d095154286b686ced3229cdfd8bce49f3bc7fa4c7ed32abf1a8f03";
+  sha512.doc = "27c6fbb00f482dbc5649a9dbdb2fa65c6774ff629c02be7d87116eed53aba8e1eafc35df6538eb78eaf11f82357e10e48489eae7022a63c6cd9cacc7f72aaf3f";
   version = "1.5";
 };
 "dvidvi" = {
@@ -13157,9 +13307,9 @@ tl: { # no indentation
   sha512.doc = "2bf3fd5bbd7b6e1fb8a263dd0e3deef358bead727df5de280342376225fd7366ff470b9c2fca8f763890d1047fe2c7a5b138ade1b5fcab383c8113e10f245199";
 };
 "dvips" = {
-  revision = 57972;
-  sha512.run = "31069dd768bfad8c3430abb001e5d73d1b5481c6a0216801c3e04c5571e9e841a77ef6176b6d42ca3ffd5b8860790f37ac6dded1a453120aea96ac7a2c207563";
-  sha512.doc = "a66136f6f457a6e4953f25e7489c98668d950da10c37668d8332ccf5b20eeec5f493b84ca014c944dd8b241cfe3b0621f6096ce4b3a6f732e3816026a7835245";
+  revision = 61719;
+  sha512.run = "ec872f68ac7aaf3e5540d396f264c4cf0305b09e26fa98c7139be2e99b841d918b9fd7327bdb7febbc172fa119ecf4d189effaeffe9067c9cc5fa7b4c302ee7b";
+  sha512.doc = "0c49c4f4799b10cfd3f1072cd24213d59bf94f3e7c05b2259eb012ffa12d2014e8f832cf97b57e2641e7abad313a4933b48bd54e6617176b12bc6257aac25d75";
   hasRunfiles = true;
 };
 "dvipsconfig" = {
@@ -13170,10 +13320,10 @@ tl: { # no indentation
   version = "1.6";
 };
 "dvisvgm" = {
-  revision = 57972;
-  sha512.run = "bc91b0f9ec49020d3b7d9c0caa0456a844b7d9783dde5ce21b75407725139da86bc30bf0310fa5a99d12d5f5e812d674a872f0a10dc62576bc51bd3a6cdd2355";
-  sha512.doc = "668040316023becd76605d16d9b7f4e16eb2246e51d2cdc05910ee9a78f85edd227ede70ca57d280f3473e2a7eea60b41f0ad76e26789963eafcf400e49a12ed";
-  version = "2.11";
+  revision = 62509;
+  sha512.run = "e3e5e6a653d22cf4b93cb13d70121eec2b23434e85b1b01e9400bcdaa2b73e106e4b984fb946269b2964ba189f3ccbac2f47b0392aea69ee75fb50c85de44eec";
+  sha512.doc = "067045e21026fb97d2b0275ae69ba54e4702cc652d3b58cabd5b2115491e2bb03757626bb201aedf52e21b60a80894c001ca1198df6ae34d47c78e7de2975827";
+  version = "2.13.3";
 };
 "dynamicnumber" = {
   revision = 38726;
@@ -13256,13 +13406,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "easybook" = {
-  revision = 61413;
+  revision = 62785;
   stripPrefix = 0;
-  sha512.run = "c59d18285e07b123028c441322fb1e8afa2ba18994dbc15cd468ab50e70bf5df9d5578fb2e0bef1517cf43a13cfae365f4583ce3c1269fafc1a03541123dc1e2";
-  sha512.doc = "680f64ad614ad78b3e51367d41946f6a34bc1edff9029285de66f4cde79fa85bfa7b976be9f0a5fd8ee867f43b81b86209ff8bfa4313fffdc15de7e15a00949e";
-  sha512.source = "50222faec79a3e413b2db338aac0662265e0929e85cec6cb5982f96317e788aac0682c7eb7e213b2e01a04bde62054bd4d5f451912040a606338babd433913a8";
+  sha512.run = "84463e17b5b2da174c546349ef9f69fb26fba6a291455cd5a1debd7d47033d3b100bd694d7929b7f9a114fbb1cc4fa4cf98ada2e4409e212322063e348d3e3e7";
+  sha512.doc = "b5b6ad203a7ea578762b78664c602fbb81fec6dcc2a2bd518938a4235dc6b8dfb55f2303e70b1de8f1e1953a73de08f8903059c332462e2ea18d6ae532295771";
+  sha512.source = "4296a70a8ec2917691eee65649450e5ef9c00b3179c8d0a55c05bdecd073784c3eff041dd92800d7e729a953a8d55417d3a6718066227cba3139535604a2f246";
   hasRunfiles = true;
-  version = "1.42E";
+  version = "1.65";
 };
 "easyfig" = {
   revision = 56291;
@@ -13426,12 +13576,12 @@ tl: { # no indentation
   version = "1.0";
 };
 "econ-bst" = {
-  revision = 59327;
+  revision = 61499;
   stripPrefix = 0;
-  sha512.run = "8791b0d0949d46d9badca09629c9afa5159b9a0a88a050ad8de0d7777addbe6a97f133cda4d3b29ee512cdad282cfe282fb8c3bfa7f981970e72d1f0ac1a6972";
-  sha512.doc = "bed7c93ec480e8dda2f98e4790910b5199f893cf2c9ea6013044f2a6d1259ae6847cbb0f07c819db8cc55583931c9004ff5d3030beb7a38c7f8c3098f3ad8b9f";
+  sha512.run = "f236b3a15da35eb09e878d56f6d7c4cd632b71f262b9c470c3c64dd96aa43d305a44400d93786b8bc7f3a59773812c4ea03d6e8901cd1e7e469aa36e948bfa26";
+  sha512.doc = "60761364032deb253bb69aaa13fc10d6e8ec2747fc6af77285cb5fd53f250465d1e461110ae221050fba8150a5b1b5db9d4879689df00a33f9c8106e3e385f4a";
   hasRunfiles = true;
-  version = "3.1";
+  version = "3.1.1";
 };
 "econlipsum" = {
   revision = 58390;
@@ -13508,11 +13658,11 @@ tl: { # no indentation
   version = "2.01y";
 };
 "edmac" = {
-  revision = 15878;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "a9f12f0745305ce261b142f96ed496341997098461df749715723fb09d978ebb037976c7fd7176eae2475d24c71df201a0123b1651749b2b96c9ed9429746f6e";
-  sha512.doc = "a54f4b1171f8f6edd6e655f49adec69f21a8293af03a02228056ca700feb7b656cbf715047a20f45127695fa851af45fb5e4852ccbf7d28374a02d14f6e55acc";
-  sha512.source = "b32626fb4acd41e9d853131d1c32e43d2cf10ee021ada41b06b8cee5c88b1f8ec8511057f83865c9237d8a96a9648edf8696d9fb6166e4c9f072e8dfc10808a2";
+  sha512.run = "12395b2429372cbf88794c197e28ceab4b69ca7d14cf78524e9538491b2ca8d14714e1ef00f2643a0e3e62db559f12a9a53a56d4bc7f54420d3f125727fca557";
+  sha512.doc = "d78db33bf2b2fdd17f23eae23ab9605efb29a217e52d89df5feb64db1907c1b5a497441eeb1fe2373342b7c9b09296c06efa24d6776edce84406e22a1967bb64";
+  sha512.source = "995092e2ea0776377938076b67f25042329ab76ef31f83f6f40aba449a735a90bc697be52f16fa6a2ac02cbe4ff2ef99762fdc03bd14eebff7a363f6c7f46c13";
   hasRunfiles = true;
   version = "3.17";
 };
@@ -13608,11 +13758,11 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "einfart" = {
-  revision = 61338;
+  revision = 62834;
   stripPrefix = 0;
   deps."minimalist" = tl."minimalist";
-  sha512.run = "afe9035fbe06dd350c194a0aa0e079cadb6bc80800725323e20fe5b22b71faf469f2adea95f7fc99b96c71effae8dff32567026933383c2d53bd82b320042d2b";
-  sha512.doc = "837fde461e705e8df9c18cf42a7e5ff24b43838e7023a89d40fa553d2fd72713c8e0dad908ccd22d9087fc373713ace40eecf54098cb3b374386e8fbb23ae00e";
+  sha512.run = "0dc87f6177b348d96a3f16a0a67157de9365f7c2e115f8a4eb6354bc1b6214843116125e3beb9fd0ee12dc700f321ac7222609db0da414eab02f54e247aca7f4";
+  sha512.doc = "95ef2026de948bfd62d3dfcbb5f41707bf132845f825c466b44af3c7fdc455a63b187c0b291c0bfaa5c7d89c2bf458479eafb214ffcef5d33afbf4b2ed4db4ca";
   hasRunfiles = true;
 };
 "ejpecp" = {
@@ -13711,12 +13861,12 @@ tl: { # no indentation
   version = "0.09";
 };
 "elements" = {
-  revision = 52398;
+  revision = 61792;
   stripPrefix = 0;
-  sha512.run = "777546b1aa3ab2c4a951d618f73b0a37f15de10afa72f710786ae5c9b29daed45ac61db978e07a010f72531203d6fb066853657c6cd728a6dd8850736756a063";
-  sha512.doc = "d72b74d189689b77134347ab0e76e7219fa2b4cafbf33cf7f9504a9293635487488b652a0cb293be2f28291481b2eb990baf92739146ac7a554d710b01b6df57";
+  sha512.run = "576b318c0972e8862b8d4cb9c248a3303125019a321b2f5efcc0b6d6c7dbc5cee4a1db725af49754360633d654447d83a58dfc7e25c13e91e034e73ccd5765cc";
+  sha512.doc = "6adb7fd993275022e49bda34889a21ce000ff7c247d6c3747494bd67adbfc1776f4c2e8d9affd57dbe659740cd9a5646bd34ab87975d306e8568a27899555e9e";
   hasRunfiles = true;
-  version = "0.3";
+  version = "0.4";
 };
 "ellipse" = {
   revision = 39025;
@@ -14009,12 +14159,12 @@ tl: { # no indentation
   version = "0.1";
 };
 "enotez" = {
-  revision = 57130;
+  revision = 61490;
   stripPrefix = 0;
-  sha512.run = "1bd49ee7ece262d28d0b80f418e7aaf130044447ad341ae799c4f84c4c4e69300662951dab2733d996abf896280470857e8c35832759008881cd23f35fd52e30";
-  sha512.doc = "a04cad229111ae30cb51aad4c843488661a3e59287280c9335bd82d5a5172429ebcbd31e1d7f6e2c7ec5d9a3f068bf00c88e7dc67f3e39a794f32107bc705f3a";
+  sha512.run = "0f292fbfa3ad395857bf04c50817376152765c1511bc1b922fb6612033a0924a416b83b38e15a36ee792ec5ba351614e93cf6b70c6b2eb8cf78ca74cce6438ec";
+  sha512.doc = "6a52564111cc5af280ecb578c916a340ae0f0a8e1848f6d19d97d4c8dae863af7c8c0ecd057f5eb54ee701fb1f3f0b101bb4b6fde2500af71867b5d38a29cc8a";
   hasRunfiles = true;
-  version = "0.10c";
+  version = "0.10d";
 };
 "enumitem" = {
   revision = 51423;
@@ -14051,11 +14201,11 @@ tl: { # no indentation
   version = "0.3";
 };
 "envlab" = {
-  revision = 15878;
+  revision = 61937;
   stripPrefix = 0;
-  sha512.run = "ba20028efa3c286132133d8c292fbc02d77881e64923ca98cece98fbe1e60acf4033b8308a3f9f31f144de071938698a75add803436e1205f7baa820a308a4f1";
-  sha512.doc = "4dedc851e00f82ff3bb912e99bf112f4e464b129b89ed75ac41cab9e9ec8c54a32ace3901a3bdc11c90597cfc0481fc7cfc89b4b95bc9aa0c8850a1e8ec88cc9";
-  sha512.source = "9181b7083e3b57329effd0c9ef462a626f8de6db5eb6dbf6800237348a010b74eaeaf11ffa2b491ddf324f0d9bb2c792b9fdda238b887df057b82dfa4fbf04cf";
+  sha512.run = "d4272cd079bc0b48835d675f1b36d0155d7da4cf920785dc7fdf608c311f43afb88e6861087c79774af6a434aacce05dda59f9e53aa7b2f3f37e06415eafa01e";
+  sha512.doc = "dfc28fe6df6822fd8f45b3bd31a66e635cf621daadd5465408dfdca47a176e0f23e66501b5b89a8f803265c68a02db6a7ba1e05e0f9ba0f35287bc582d1f48a0";
+  sha512.source = "39ba3371b9aeab277968d8847ba5fe519ea3035306fdcb2a6376b6fec881a3d443ae7f4912039216058fcf7918ddeace617ca08e85c6f21c70820e8d379805bf";
   hasRunfiles = true;
   version = "1.2";
 };
@@ -14083,10 +14233,10 @@ tl: { # no indentation
   version = "1.5e";
 };
 "epigraph-keys" = {
-  revision = 54851;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "27b5cc031d2a90c9240f199f745b28c0eac189750062632708356b898701651eef34353b4e54e7065c85b41efe6371e42875607aa5b16c3cf2bb7edfcff473e5";
-  sha512.doc = "34c9b77529870df1f4e4476a454ca8f08ff68e0d0c523d081d47224a43f07fa0c6db6d665524e5bbb1b68c975b833927321295fdaed38b2ea43445fac9752400";
+  sha512.run = "5e92bae46fec0037bb0a2b92c2b44de0c73ef4b434584a0bf13aa4e6f09e89e5e4b7fcc3e4809cd0f5e574d627285b8eb97f3971c65745e48591bd8e4a60f7fe";
+  sha512.doc = "21c4e1f6b5c3a5b4402e3d3189b6b2424aa952e777994d330e4905393563030f9cd2dad9cc20c2157accc0e78fe98e7828781d5d63a7fb1c6f1ecd504c67f037";
   hasRunfiles = true;
   version = "1.0";
 };
@@ -14099,7 +14249,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "eplain" = {
-  revision = 57186;
+  revision = 62145;
   deps."atbegshi" = tl."atbegshi";
   deps."atveryend" = tl."atveryend";
   deps."babel" = tl."babel";
@@ -14120,9 +14270,9 @@ tl: { # no indentation
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."unicode-data" = tl."unicode-data";
   hasFormats = true;
-  sha512.run = "a5b93a081e9b2201a65bf7e7fb01381480f5c1f31aafaa78c5785981d895a384f1f8db1d474db845c06cd0850cf70ec4bec0e3935b67fe506b8b07512ee97479";
-  sha512.doc = "44d804287cdd427043f766ea9f5f352d93d65f941b3e18727dfc9276fc381f51fccb3a025707f24dca5efd59cccd1a340e5de0d452d928ec0296b4faa46abf67";
-  sha512.source = "8edb47575e32de1d7947bc2b7e1e354eeafe287cce6b4c7bafa1266d9d7c1bd4c8df363ecb4c17da9eb35cfc1e3393e2297ae6d90f9f4aa8147b4467e2ae1c89";
+  sha512.run = "5bc922f1ee34577bbaf68447519c5f2dc1fd3d7bd1e311652dfcfeb260dad26b6183d0534a6165ab0e5faf33ab2547b6ce16c507978429b8d130d60b32dc296b";
+  sha512.doc = "bf2f9a8fb98ffabcff593b189b5ab589da38916f9a38edf4eaa23c4327821ab1edbc898a9971fea42e9d77c40321ccfd476c5c3a2a8b966c0857aded5d9b20db";
+  sha512.source = "494226ef0fad26861e39c8e740bf7bc0aac3f561c76494356121eabd94062dd3d0075d35cd7d7085fe1a22b682a2ea1b692af5ec122d13ced0076b0e47fe333b";
   hasRunfiles = true;
   version = "3.11";
 };
@@ -14181,9 +14331,9 @@ tl: { # no indentation
   version = "0.61";
 };
 "epstopdf" = {
-  revision = 48684;
-  sha512.run = "6412bb97554b271cf5412dbccd316f3d69d7bcf2f524a5d6d1a75f69cfa11a981fc4ab063b6ea8302c2a0236ff93c59f1ee2f8f2b7f33dc466324080fc5016f4";
-  sha512.doc = "7fef59ad3bc72b2e3fc10021216b88b8d5465f42503d9938031c3d40d93fbaf637094fdfc87b19ccc1da4d9a28c9890beccee7c30b915a513a909edbac6e0a25";
+  revision = 61719;
+  sha512.run = "270c4135be9ae2071f3a84bde85097056cd67bdd2efc36e53a9bab22c55d5a533c561ca7b1a2a25f0b131111f045f5a8bc5711ccf4ff5e4c551373a52cbba0cc";
+  sha512.doc = "7ac71de0494b5624d009d324a47a6a08b1b61695405fcdb8e76540ef7a12f08096982f67a09e28f9f6113959bbcda4f2d58e384df36ad58bc906eedfc0c93971";
   hasRunfiles = true;
   version = "2.28";
 };
@@ -14279,20 +14429,20 @@ tl: { # no indentation
   version = "1.1";
 };
 "erewhon" = {
-  revision = 61395;
+  revision = 61835;
   stripPrefix = 0;
-  sha512.run = "0eedf87605020e9e012a44fcbc43eeb88ab87286143b5516a4cb3e9450a859927b93f488759b190059feff7e4dfd45f28a9d6cca81a0e4c9438dae273efd9abe";
-  sha512.doc = "140ed114d442bb947627106d6274f05fabce2592fbcb8fe85a82192c9509e250ee484e352b2a5df74bfb6db128d075013ad50fe164592dcb02b7124a8e936ba4";
+  sha512.run = "0a17579582954be3559992aab90409e5f594d6f2bd4435dc0263a512993797955572dfa9005e0eb720189ea9ab907d4e1e2fe491a093a04f0a9bb1e930937db7";
+  sha512.doc = "68aa85bdda80d6c068ae5d52288aa0e617129ec70546ba5e358e38accb0773cc3b7ad713a9dcd5a18c4ac4535cbdde3c23dffd1f13c990dbdebdc3e6505a7502";
   hasRunfiles = true;
-  version = "1.118";
+  version = "1.119";
 };
 "erewhon-math" = {
-  revision = 60614;
+  revision = 62098;
   stripPrefix = 0;
-  sha512.run = "c82d28bf92bb30b45ba070c620564ac1a94f5576bf51ae85dbe2f6f9e155ac2c0787193e4c3542a1e32d1c3ff170fb9585e8ea3ee5be8b03daa27cb57357ab2d";
-  sha512.doc = "ed6be6a52b9e59bc2244e4f54cf52c5f1817af051e164d5b01d1c905559b8d43ce133f7b09fd35ae23e54efb191b8869bd7662fec0b5c1363bc2c64e7f9f6c47";
+  sha512.run = "62ed92927d12c1d80e0a6240e037a951d1fea7a15d4f97da7b20a2a98ec84f7fd52ce44a552026c65247205decf337bf7a8d157abea85d2c4f8c50957344110a";
+  sha512.doc = "70ccc1ddc7731a72cf3a191c6c051617f1acb8fd362c4e49ce1ea61c2d7998d5fb870adb37bdd4e695537b92af30e9fa3b7a0e46320b5f4ad60f5767c69b12c7";
   hasRunfiles = true;
-  version = "0.47";
+  version = "0.50";
 };
 "errata" = {
   revision = 42428;
@@ -14304,13 +14454,13 @@ tl: { # no indentation
   version = "0.3";
 };
 "erw-l3" = {
-  revision = 55414;
+  revision = 61799;
   stripPrefix = 0;
-  sha512.run = "5f006723665945d55f7365f3cd5076fa7ca924c0ce08c797ec684230edefd71483f37b456f5627b7d6b3d8f10fbf97101caefa67365eb155fe3f93d115e1bcf4";
-  sha512.doc = "fcf42f6392ae01414868f2d36883d9204bcefc06d772e6ced603ffe01b2b4d0cc15b7dd161b1dd57f5e58816d6da4290b738a9727207de28b1738d233c82fb3e";
-  sha512.source = "27f357e13027f67764d4818a1cbb786678260272264ba7af13e6867923fc395c49636a09a5f2e4a444ea37f9985d0c7edc5a52ebffa172843bff24764112cd47";
+  sha512.run = "551a7c38657547038a8bcf5973ecaec81cccb4b803961145d4aedf7416834e3cfefe736a59e20c80cc1621d415216371d58f3d0c7d2b0fc3dc0a182e1ba91acd";
+  sha512.doc = "8a0a823482fd19c80471e9c1a38312b5db7f04f618c8fd8381324c38bb9b9ebe8eb8fc9ce90137d4a4f1de7b6b65aa1c1820cfe0f009f4ad743613f53b549323";
+  sha512.source = "babe7d5b286f4c20f469112efd76e4a37980bdb709ca9cd058263bf74a5d20b4b7c0aa3a4aba7fba512b5c63b538b6da1ae90f1903bd58ddeb36e2dfa4339e32";
   hasRunfiles = true;
-  version = "3.1";
+  version = "4.2";
 };
 "es-tex-faq" = {
   revision = 15878;
@@ -14320,12 +14470,12 @@ tl: { # no indentation
   version = "1.97";
 };
 "esami" = {
-  revision = 60730;
+  revision = 61596;
   stripPrefix = 0;
-  sha512.run = "83f00130432776d8eae210c15b6bc171d98b23d636ecf043424248357fee8efce3a025340772de933c8b920dec4fc7451981734439d2b82724af57f343216784";
-  sha512.doc = "7e1dfc05961f8635eea0a67aa4b2007029d4f8d9ad629a9dca317c5ec279336b28d01e1c51bceb93814a636802f3ea1cf8d6090ffd81a99050589efcabc8b11f";
+  sha512.run = "2e0c1bd441ccb4376d1dda69f32cff55bf4d043315dd2c004bf6bebacdc510ddc9a1347bcadbfb96dea7be94b6d59ee050746afb04f50196dd7c99937b7e8505";
+  sha512.doc = "6bc50f4083cc401278a526c44a76e5a9569d0cbb7280d38270e95676fa359c08a25779709576c1532ec9296457d970d2abd82eeb78b2ac4923caad9559da77ed";
   hasRunfiles = true;
-  version = "2.6";
+  version = "2.7";
 };
 "esdiff" = {
   revision = 21385;
@@ -14447,12 +14597,12 @@ tl: { # no indentation
   version = "1.2";
 };
 "etbb" = {
-  revision = 61377;
+  revision = 61872;
   stripPrefix = 0;
-  sha512.run = "0b5165504a2bf40b4f95f1f0d6de547a43f680831e0777ca12f8ce85e0e0514279bcd3d65f4228a61e004c93ad2aad239940364cb9e35927ceefd40c3ae73757";
-  sha512.doc = "6beb4f5d4430d11bb96248e77152d06c91077d92b5408c29436546de1001887f860c2cd9475a5a99c476fe4c902c9dd1b2607aa11d15b69ceb2e485e6ac53078";
+  sha512.run = "986a063266a6081571e9a9db60674f1cc795f15b32eaa954214b4620b29cb43043b6ba6cdc9cb02f20f809a65939dcfb157590bfcf867d999299ae34520f9f8b";
+  sha512.doc = "1278c7281a247416f4439b9f034d2acab7bd03e47c63038d8a4ac12793968e2508cf562940d0a0b510abc9ceec3517dcfb277cc365c9d3998797237610936613";
   hasRunfiles = true;
-  version = "1.055";
+  version = "1.056";
 };
 "etdipa" = {
   revision = 36354;
@@ -14638,10 +14788,10 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "europecv" = {
-  revision = 61398;
+  revision = 62685;
   stripPrefix = 0;
-  sha512.run = "7c9884f1d080659f648454ce2935d1d503a1fa8b54a33534e43621d8808455e4245e859fcd4559ca6af5370c55a2e43b56f5760c783bcf8d8c81e3bddd8e3275";
-  sha512.doc = "2860cd7079568d49aeeebc28d49b523dc86b8b76fa1e0d0133808f08b43471d267ccba9cd7dc888ed1e94f3b27fe4a01c093b5e439572d41004d9f1bb32088b0";
+  sha512.run = "fa63e478c7cb04b8065373166bd0b7b25fe3d46b744a3b16c9b9cb47dc933e8fbebaa118dd8cc49840442d478a278eef84eca94696230f288682ae45f77a7d46";
+  sha512.doc = "4854a525b05107c39ca705ae4c12c3d31b06e71bb3ee97e7e278312e1edf015c41b0d584fd36b64137b07e4197d8602c6a46201d5132ec7f99ded311c136d034";
   hasRunfiles = true;
 };
 "eurosym" = {
@@ -14712,10 +14862,10 @@ tl: { # no indentation
   version = "1.1.4";
 };
 "exam-randomizechoices" = {
-  revision = 60125;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "b6650105435a758ab59d705f1b7ec691c56549376f914efae023db2b40bcc290cd080db81a0ab2a304195774b8c6685ca6e78b95519590984ac7d82ea62f3fbc";
-  sha512.doc = "898a7ed9df2238b59e956f115b969e74f29649086ca4801e35ab3752c68a9b21b2757d712c75161e5092002dd4b30f0a1f294b86e100b579c0112de547c3b5b8";
+  sha512.run = "bc29ee238d430b0d1b536084568ec8e68381c827c7ea7a4742eb497c7092ac8eb0bb990c3356eaf5939420e37979412c61ecd2e83a98a0e36739f1d6c73be3e1";
+  sha512.doc = "0cc99d67ba7b1d8d27048b33a1f1b9864e35c542ba8683c590598d5da3d4be5d3f93c9a01f339dde6fb0945982e20de19847805d185b4b28aee2c7d86bfc631f";
   hasRunfiles = true;
   version = "0.2";
 };
@@ -14845,22 +14995,22 @@ tl: { # no indentation
   version = "1.9a";
 };
 "expkv-cs" = {
-  revision = 61109;
+  revision = 62003;
   stripPrefix = 0;
-  sha512.run = "eb6b03b1c69ce3a127ed1cb32a117c5a39ae14068baf26fab7978a482f8c5e40fde07c9fff486cfc331b61c27e32a70a374eb91e5e06b142837842fe68307c5c";
-  sha512.doc = "abdfb23e0a2862670059dc392b8b15865c551565ae71f5a9053f25b0725682e7bba428138bc545c836af0a264f30215e0a361a1b128bf225939faa21f6e41203";
-  sha512.source = "4bbd92d41d84aac9c67a6af5e9a6bf977c8a11a88505cc11cff52e59ec12ee280510a1f97585415569acef8ec2aa03541bd27c5b99134fd41882e7bdcf71fda7";
+  sha512.run = "2d2b736151dbd3df233d848c8b430985491da3e9b5212b34088ad0932bff4fa2e51bc50b9763da2aba76407ce18a085a839d5308e259d81e2d4d2e6e50356020";
+  sha512.doc = "4375db000d07c40d1da239a1abaac2a7ac753f75c36d2bfccaab94f82c067d886395f37c8a4413034adfb3f2f49251dc21b09e5f5dcded9a4fff7d609efc084a";
+  sha512.source = "43078d5499d8f2586be022bda7d77c9a9678686bd633eaf790faf289a3e6bb583ed4f66f65a6f4c64f3d8f594652be326f5a05a5cdeecf43e7d3ed6694d53a1d";
   hasRunfiles = true;
-  version = "1.1b";
+  version = "1.2";
 };
 "expkv-def" = {
-  revision = 60572;
+  revision = 61796;
   stripPrefix = 0;
-  sha512.run = "fb18169c900e8e22aa110b4bedd57d06f69bb87d728a4aa92eda0bb734650a6df2bd5de9939f1d4bac34e33329824bb3dc71009fff18212f2632cd4fd37a9a57";
-  sha512.doc = "83bec61be058267c276a915aa059cff789e93e890a20f259820e17d350a771afbe28405edb47525ea09f1f904b24417e755cc7fcf955cee875dcb727d64ab06b";
-  sha512.source = "3631e9b8e8af27880f7a227f3bc494c2167877dfc3cfb4e9b4a4cc9acc9a37f4b8538a0a30b51bf3698bb4a2a820fe1ecbeb1173a3f2a91bb0467099f81ae9df";
+  sha512.run = "e783fff82e60385cf5f6bf71df65fe7f78e96cb872a1219d5a525583160d5dd1ca04951f9e57fcff5894fb5e81ecb86771cf485df45a528a6437040f4b22345d";
+  sha512.doc = "675f3593096ca214caf706dbd65f8c2a6fc3b334b83ad2e04c3eec562cb940ebe0839108a7c27a4a9d99ab3ce3137d0e195a6ca35f148e1a790d3054f2f4b35b";
+  sha512.source = "52387ba0731a46eaa32792cf1f552116a82357ac23f13235dc3013944435c157736800278047424a6151a47bce3fdedd104af5ab03ca08a097d421e96c75e1f7";
   hasRunfiles = true;
-  version = "0.8c";
+  version = "0.9";
 };
 "expkv-opt" = {
   revision = 58772;
@@ -14965,13 +15115,13 @@ tl: { # no indentation
   version = "1.0";
 };
 "factura" = {
-  revision = 56948;
+  revision = 61697;
   stripPrefix = 0;
-  sha512.run = "a4c20cd7b7b2dbc58cd7d1e2c7cdde59710c9363a7e4878825d5aaeffa992bbf471169bdfa01c83aaf3e82aa96ab5fc634676656e2e4e6bff55cf5c4e5407f53";
-  sha512.doc = "7822a8f8cef63485f2c707e180c14b67148cbde8f8f1b6d1ec6bd0d9f6e124cf4b63bafc7d01c6ec72c8b5f1edc36f68f9f48b9bac523ceaa093a861a5790f2c";
-  sha512.source = "14b3c407a61583fb5cf3813d7ef379fe34415f10b985d7e71dba622dda7b118dbb197e7c8b1cb2cbb45378e38eb333f539c4e95daeb57253983699e3015e4395";
+  sha512.run = "6a90efed09588600991644ba847b16641aef40dd0b989b1944f7b48581d6bae642645fc97023e6cb0f1dde76593086c3007580df25e5997b92593020140dc212";
+  sha512.doc = "f449e749dc4b61a8a15062fc9e5556414868cf904bb279c5e997402fbd6d7f21f3e8f19c19af5ab4049a1512070d8e74064d4823d56ee7a20ed03f2a2eaa1b91";
+  sha512.source = "d26418ce7f0c6d95a1019f16406f39e791ba79733632cf5072b041a3ea3b70530d08356590aa5305b9d52fda0d882669d52b1bada9a3d0c458c2888cebe35b9f";
   hasRunfiles = true;
-  version = "4.00";
+  version = "4.32";
 };
 "facture" = {
   revision = 43865;
@@ -15142,12 +15292,12 @@ tl: { # no indentation
   version = "1.2m";
 };
 "fbox" = {
-  revision = 55627;
+  revision = 62126;
   stripPrefix = 0;
-  sha512.run = "6274daeacfe6901b63e1ea839990a00334ce218cd76d145ddd37e4a414e1fd395d8937bd019455e45bb52b557dd6b2b49cf90d84ca12cff797cdb8162414ea50";
-  sha512.doc = "13f85034f1814c814d7c6885650a35d97c483d47fe4e7279ae3872cf155d240084132732f71b38f6a0440d38fc1a2ed33cfa4ecc6d7a4c11b89f4c7d6b482204";
+  sha512.run = "8f4786fd15b1f6f2bf64a00e9367cd346716edef54298bc3334046166a067815112eb85a6277d7165ad5e4e830b1cd1ae149c907842df46196f6d33c2ba6534a";
+  sha512.doc = "e52d356422df18f8e29243b5323cf888c5d0b6f89c3c822613b577509d8dff44bd4d4e1ebd5f7b6c72abbbc782f362ed9162803b572a2d995482db86153678bf";
   hasRunfiles = true;
-  version = "0.05";
+  version = "0.06";
 };
 "fbs" = {
   revision = 15878;
@@ -15181,20 +15331,20 @@ tl: { # no indentation
   version = "1.0";
 };
 "fcolumn" = {
-  revision = 61130;
+  revision = 61855;
   stripPrefix = 0;
-  sha512.run = "5d17c65e0cc6f3fd74857e681fd6ce4bb6f3ad0767d162e3b88c48cd51bbe3f61d4ab7974b40435b909bbbf3bcbfe0ccb709fb3da64756cad5a152a14e8d47b4";
-  sha512.doc = "a6951a47758b10603ee69d4bc65b45dfdb0b29ad9986939bd89f74a6fbffa877d7af258ee64e70c7070a71640250701d7e7054a07fac60fd8c72e08a361d1d9e";
-  sha512.source = "738bfbcf9a6689ff1fab74d6fe1235285fe1241cf7fde91d51071be5cf7fc2a5bb2181d3ad842389b0343c57f430470bba5779ecef8aeba8ac1d525c78cb9d09";
+  sha512.run = "17820804588458b805a65eee92f4fff31a73b7285f85546e0006ca6ee374706bc4df9f78eb044d8b79ea26b27b16f3ae38f035d8843906efc0043e1754f6ed3d";
+  sha512.doc = "d7822b79097ec0d58468dbf46e0b2651f97e763c3212102def2c247ff3088dab4088afe2c4aa5d97bd6360b24e38da6e872fd25f9928724f151c03769ce2c219";
+  sha512.source = "f3d27931c2586d48fd34fe59b5277c67a3e1a6e25f486a1c3226385b3ada23c655cfbd25b26470ca84b80cd7d9c1d9b72172a0b11e1e0f35899cd3a3608f42ac";
   hasRunfiles = true;
-  version = "1.4";
+  version = "1.4.1";
 };
 "fdsymbol" = {
-  revision = 26722;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "37f716e9d540d7742f53cd38155141d763d3f8509d1aa1f3cff53ff33c45537c44dc68c9608558021868de3072302d7ac84909db05e8b25813c23ea01c87edcb";
-  sha512.doc = "7d1f3fd153bc17e65a99ce6a38c8992b2172c1d0b85254fcc7e926b9539928ad403809b8af4355abb1e93196b4e4d5461b587c8ad94d04cca7785c8a334b4ac1";
-  sha512.source = "d30403e01b2a33372ce49477ed81fcfcc505b50b1c0eb511dc360d86ec3793ff2ac0c8964448bf2525bec1bc5bb3792ea9729679e2ddd8215948c65bfd44afd7";
+  sha512.run = "e8b2d08c3e64def77a688dc9d96c0b9da9eaa4c942e571578fa0a7e6dff9eb3910ecc66a7be9334ecd41fdc0023f89d8c98facc2d42cd0095c75d6e1b4da69ac";
+  sha512.doc = "88efcb300a84b6c214fec37603ea23cb51043af78e1af8aa6e3ce157bab1c8e395e71991c7ea7854051f4706c6b702fe0d48edd76e919a4592e57320b1f77b98";
+  sha512.source = "7be26193e05d57fba2a91d57b49cbadaf5594d9ea843b9d9f1ae15608cf7d45e40112aa286bee73ee16da976c7ca7bb7aef5627cf8f0023cded506a493426b31";
   hasRunfiles = true;
   version = "0.8";
 };
@@ -15294,16 +15444,16 @@ tl: { # no indentation
   version = "1.1";
 };
 "ffcode" = {
-  revision = 60500;
+  revision = 61719;
   stripPrefix = 0;
   deps."microtype" = tl."microtype";
   deps."minted" = tl."minted";
   deps."tcolorbox" = tl."tcolorbox";
   deps."xkeyval" = tl."xkeyval";
-  sha512.run = "0151738d8bf73bbdeb742ec238038eb63c8dd979ba156ce36cdf509dbbc2e161e80b031e4ccc552a85dbbb09238e634d93bb1835b7068fcbc82b8a6a7539a846";
-  sha512.doc = "878e6d0bfe32f4d38f1a0a2710010944dbbcdd29a679f8d66be41df1f31f8212a9d249a980f50d7b7b6d03b214ab7dc8befd07f885c062b55075f280796e3ee6";
+  sha512.run = "d7b0c22a885ae1e1823f37ceb61181918e04f1440b73690c059f24aba32161ab3c53530a75d9aaf4803f65f9bd75d9a136139fef62ea05889fd603f4bf8742ca";
+  sha512.doc = "2df4e67cab554a564f8206d62963ea1954ed15582c13b662d1c9c2341555724c5c841f5fb5e94e29373146ff4bc9652c62fd30717dbe5583fa7a08240f76f9fc";
   hasRunfiles = true;
-  version = "0.3.2";
+  version = "0.4.1";
 };
 "ffslides" = {
   revision = 38895;
@@ -15609,12 +15759,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "fiziko" = {
-  revision = 54512;
+  revision = 61944;
   stripPrefix = 0;
-  sha512.run = "d76d828bbb7d54596c7e3127d2d2c92f9da7572892d5b0a5b139536e9d765875555bb831aeafc67e56e4f2234462aed14aaabfff2685b30bb53bce89cadf0e90";
-  sha512.doc = "c04516bcdaa607d01a558f1f30729792365c9aeb4bbd116f4523f398c261a6fbc01eaeb64b5fa6ba008c38a8f1f2e4c9fae8de40bb4255e35bc80059cd50d23a";
+  sha512.run = "4ad67bab5850464deee4a3a29fd7c02d011eca50dbba03dafc5059ee54aa434bfae5c173e6022fef4cb761f2c760b6dd5aff403b33b7ddc8e632961ce4f8dccf";
+  sha512.doc = "e719652f76de617201a2562ac5b3a04df1577ace8fbcbf10b874326a85cc0ebe3549b0b427f39cfbeda0f34f7f3fe4ab6458ad1df2613572260fa77cb8601dcc";
   hasRunfiles = true;
-  version = "0.1.3";
+  version = "0.2.0";
 };
 "fjodor" = {
   revision = 53207;
@@ -15650,13 +15800,13 @@ tl: { # no indentation
   version = "0.10";
 };
 "flashcards" = {
-  revision = 19667;
+  revision = 62104;
   stripPrefix = 0;
-  sha512.run = "ea1d530296c2b3e11645bbf09b4776394cf1725db5f30f23297818fa68b5a8d1d860d5873755d1be010c8d7a3d01567d878f3a12490fced35f6f825034f1c9f6";
-  sha512.doc = "f42cef1b5a093861818d03f2df9cc5029546a1bb9b01a4349b815fa26d7320bbb9d596adceadd0583dfee7bf7bf8a011c8296ec06058717a61ddce10baf19e53";
-  sha512.source = "c9d90cbb0c0fa854a6d187ffafb20cefad24549083c166a5088dfa05c3240869996bd16097ddf74adcdd658ab953d39021c896eda94dd7ad426e5bd972d78c73";
+  sha512.run = "0c336f9609fbb81bc373fad344a44b8159c7d142d2a62de795dc7f1b7a8aadba563ab7a4788164058c19ab6f6c9835af1f1a0dc275377f51aca9520b3a8a2327";
+  sha512.doc = "6ef79cf1f91bb8dc7b9b3785da64af582891d1536962ea9ac9232bfb8fcb156e7c33319970793fc6776db2224ac991796a93a287aa3eed2e0cd0ea741c6ef9cc";
+  sha512.source = "9d428930e3993de9d2fd407a78b19d2b851d9e7faa88a5d5c0bb44ec014432518fcd4ebb6cf68e5b3a0693cb4ab7bbee0068f431e0ca169423ecb5959ec233e9";
   hasRunfiles = true;
-  version = "1.0.1";
+  version = "1.0.2";
 };
 "flashmovie" = {
   revision = 25768;
@@ -15795,12 +15945,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "fnpct" = {
-  revision = 57508;
+  revision = 62249;
   stripPrefix = 0;
-  sha512.run = "cb423c17f6d4a58f400c0d59920aabeb33abffd70338d158e63fd4cff90e1e6ba43c1480320470851cccebeb66ae523cdd2c7362b33a0570aa20759605ef0be8";
-  sha512.doc = "99c51fd746c61028079a6fe9fa8a29cc2cc141a9d3b81f9e2fd33e35af02cdfcf7f7833e8125d0e03a2d39ea6518ba5c0eb589548f5ed35a9fee7ee4b4e3e5a9";
+  sha512.run = "d97956ba06f806d28d77a286cf12ba9d67f74f4d4c8de56d25381eade1448d352e5a7de958990155f732875605f9e57095ad94a72bc55664d16836e944ef4af8";
+  sha512.doc = "1ffa5f00383a8307f26ccecd0e2f2178035365008d637560fa626173fe6239be4a2c7c5eef82dc1d5e081a5baac941c68329cb60c116f4483fe0eeb10e6c712b";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1a";
 };
 "fnspe" = {
   revision = 45360;
@@ -15834,11 +15984,11 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "foilhtml" = {
-  revision = 21855;
+  revision = 61937;
   stripPrefix = 0;
-  sha512.run = "80b177c1eb224dbbd086d3b8a0b10b3f0b3434e977c8d71b34a58f76a5a73757148b4e7438a275f1be186df51e36342de132940ebdde9608e7c741664ea200d7";
-  sha512.doc = "a24c9f048f7e1cf187d40f6eb3370cf68f6de80e24f2f72b077d782be5dcd369cf3a7ce9bc7d0a269c285d04cbb543481cf439710037a26a7597164492b277fb";
-  sha512.source = "a6fc97ea007ddddaef17cfb4bf86d75ee34a5525ee48b58b111188cf6a2e6269052c4f90d87ff3aa6157d1523fcca3f8f99471fef108cc8c1e69dffa7c6656ca";
+  sha512.run = "88bd7239cc37cc4429be37de0e68ffd6291844bb81f34a3e9e8c0dab14641d66b6d3990e44d58e5322d2cbac8da27901fe7dbb3b64a59be577ec0f94a036bafa";
+  sha512.doc = "c444f13c4c60cd7a723d9bca8d687a3f995438767d077c812797b91e0111372fed6c76fb51f264c0332cffb1a598e5f2a17a63882dc18b4e682f08a3ffee0900";
+  sha512.source = "9904924a8b8b1723e7496960fb9856e91efce76313cb49e756d99be5f6f97022e1cf8f27edec0ee738281137e3fe4d251448caae54335d30b0772a1be44cb8e6";
   hasRunfiles = true;
   version = "1.2";
 };
@@ -15916,10 +16066,10 @@ tl: { # no indentation
   version = "2.2";
 };
 "fontinst" = {
-  revision = 53562;
-  sha512.run = "1703570199fbc41d589817f83b5782bef5552030ab54646d464423f0788b1f2f3a5017a92846de55ee696b4ccbe1d46b2220382f7446ac7cafc9970c58d1b5ba";
-  sha512.doc = "dc7aca7d63e13fb908df02363542abebb1760b66669bf360c2ab33e790ae6d3ac0ac1808849efab2784c39499ee1eb5e2fe43091d41b0270a4c402c2394f6fec";
-  sha512.source = "f0e4fd7818432ccf95a91f6e5d307aefe8d6d0bc3bcef464fa5b94cde24304c693466695e3a57fcc7d3bd388fc16a2ebb23fb80ecd3e5887ce845151983ed493";
+  revision = 61719;
+  sha512.run = "22cb935e295d08acb7d700c6a9279d0c7b53faeb85529e8b57db7a67f2b345ac06187936ffb9c5cc0b10a357dcdce4e15439730bf6790b2b525cc7a5fee77719";
+  sha512.doc = "b9f2ae2b231a1bfe26b834fa008f94cd5f811a3be8b0dac431011f79a7eee9623511e79d45d38954157e6acbd7e23c452efe60c18afc1662bba86692662a568c";
+  sha512.source = "e00ad6e893bde8d0941dde60950f431d1e73151c19e0fdca25a5220e7a06ab22b0971a69fb962b746b8f74cf10155d007d5abb265f349cef28854637e204d209";
   hasRunfiles = true;
   version = "1.933";
 };
@@ -15945,9 +16095,9 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "fontools" = {
-  revision = 61067;
-  sha512.run = "81deb8f801835eba78d496cb83c7ad396192c98112bc6078fab6bb8c1dc35ac907b716ba07a039e6648795ac2ed7585afb1d301d8db1e04f290b25df9e731c52";
-  sha512.doc = "8be27ebb9eeaf1826d98d3b7cce39d8fb7076493c525456cc6f2bd65de784e9c30faf131421df9594452975cddea5ce12e0e4752d07089e914e92f11e3b9f235";
+  revision = 61726;
+  sha512.run = "641f6fb19b69b721c1df9996d5f97e10e187ff39ad57e4827b13640fddd0a93c687157690d3fc51250e90bbeb3ca0a0e3f815d2c17b857366764e5e91fb5b2e2";
+  sha512.doc = "973522d7d88d26559e8692852d6ebdcdc44182aaf6aebe7b3552702f0d239b474c95cbb5db10471bd343f5c00049887939b9d1a586e0b8cdd710dfa79c4e0f1d";
   hasRunfiles = true;
 };
 "fonts-churchslavonic" = {
@@ -15968,12 +16118,12 @@ tl: { # no indentation
   version = "0.7.3";
 };
 "fontsetup" = {
-  revision = 61261;
+  revision = 62478;
   stripPrefix = 0;
-  sha512.run = "382ad3ef0e6b5501313a9c2fdd31555be9391c639fe36f45e5758498587f2d5ee61b16e30378f30389ec10947e054eb127b8ffb31238edacc7afc1fc46d542dd";
-  sha512.doc = "4dbf61c2a0dd897f17992770459641bdffb460d46da473ebb6e036bc74f4e68cf49ace575b1816af1570697ce7320e6253702f730e9b480997923431b426c9a1";
+  sha512.run = "72f2124b7298cb48c6e97f6aaaabc251d1253f63ae4d785255e5cefbde5d1a94ce5a8fe238b1c4a0085d4973bb46a43ab2600b0ad385eeaca495155d7471a4f2";
+  sha512.doc = "da86ea783fbb7b17a866dbb5d7c2f0c17e5b5c89e068241074ff0de4bf4f1efd279b5fd322492dbbc7f394f3f11461f7cdd2b8caaf2a02fd79c1635664160297";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.3";
 };
 "fontsize" = {
   revision = 60161;
@@ -15985,7 +16135,7 @@ tl: { # no indentation
   version = "0.8.5";
 };
 "fontspec" = {
-  revision = 56594;
+  revision = 61617;
   stripPrefix = 0;
   deps."euenc" = tl."euenc";
   deps."iftex" = tl."iftex";
@@ -15993,11 +16143,11 @@ tl: { # no indentation
   deps."l3packages" = tl."l3packages";
   deps."lm" = tl."lm";
   deps."xunicode" = tl."xunicode";
-  sha512.run = "5c2013702cb65edbbd8d6e2c94eb8e181c7400f55593771d48e790cd32d8651e2ccb8fb41d89dffe7fb7ddd3219745102ec1934ad0dc5a24701f2c6a29107078";
-  sha512.doc = "bef134b11346e3d06e33fd9ff0c80fa6d904c8cd481d2c55702766cac2d9553298f05dee9e0b4b57238d1c9e140176fa26d29dcdaee990712fd4a3f0148b26fe";
-  sha512.source = "b64ffed6c06042ffab0faeba22b0df184b2fd0d27f8b312c65b33967021b860915d0c73f1ac9e3a9ac3125c5c7238038790b5d73127d02cb2ed51c64fdfaffab";
+  sha512.run = "910b6dbf1ec00882086b1abf93e4a736b4a9b07b89d920fa84094aaf8fde11c6d25fa8cbc4448987bf249c71925ded5e82056ca44e4bf8f10030ab6bcbc3fc46";
+  sha512.doc = "03f1d92fab61b594d51e0befff26b95d39fb08eb3a250649b042fd02493f07b402fa71c2a3aab9fa3da48730be060c46ee77a41026f513c5a61894d8cec192f4";
+  sha512.source = "3852251a397d4122026aab6ebf6f99e04f6f6f7b46da0fd38e858676cf8b090bab4c970008b32701130f3a2e5bc13b5ae5c1dee0a5da8941b037165bf6ce6aba";
   hasRunfiles = true;
-  version = "2.7i";
+  version = "2.8a";
 };
 "fonttable" = {
   revision = 44799;
@@ -16009,9 +16159,9 @@ tl: { # no indentation
   version = "1.6c";
 };
 "fontware" = {
-  revision = 57972;
-  sha512.run = "3e0dbb5ec5b2c1a616afdb209c9733c65786d59c621e43095a21ca5c1478815937361314fcbb9a161eaec8abd5acc5a05b1107cdf5919d152d01f318789a41cb";
-  sha512.doc = "c76d1c81a72743c59ea37ef7bbd71ac7e49793cebf38eccd36c5dfeaf591ff7073beb4de8692fa5bd2ea453588582d50316a34818137e70673a701a7e4b4796d";
+  revision = 61719;
+  sha512.run = "80ca33d19a699d54791495dbcbc39328be302f21a6d61b429499b5c7729d83be96281f406515cd528286e47db6f5f703fb0220468c8b547d8dfde3fa96a16c76";
+  sha512.doc = "b18e42def71fb2e495730a0c7ab1df0b1908feada1405dba1d7b0a1768556864da89c30e51835917e8ee6fe04519f3d11023496780087c21f4e9f59d8dd6ea43";
 };
 "fontwrap" = {
   revision = 15878;
@@ -16030,13 +16180,13 @@ tl: { # no indentation
   version = "2.0.7";
 };
 "footmisc" = {
-  revision = 23330;
+  revision = 62527;
   stripPrefix = 0;
-  sha512.run = "50d0d02b243936d2455ad2353c0da1b77aab9f8f822033a98062d979b686163b94798784dc6b8496dda3ef38eadbd04a21e153f0fa9a76b499c50159c169fb85";
-  sha512.doc = "3a732fe8a1ca364275a7b0849be097e307ba322ff611a650a4625cc47792410b974055c75165b62ec8d5d2a128b0d6a194d798248bcd6bae266c7638ffe67e01";
-  sha512.source = "3489b4c09a145ba19d25120a48368470d65c2407a8c5697946ae669fdd63f0dc7176ea171ccd2a815055a6fc16f02523f7b2ca084c60159c1768a8a3b2eccf11";
+  sha512.run = "c55f3aac5f84a30738bfbf6ad6110a39e27ad9be50a6d454794512612649c008e6c55d94484abdb57a0ba9d76e8fd9ce85c7ea973e2bfab718f49b94c7f52f5b";
+  sha512.doc = "c5a29fa3c76554d043a4ee0b7eb429428a4158a00c1617ab57e616ad99e83b3ef2319bd447fcf80d66e9038cb8972d557f4a6db9cc29aae8769d3c0f702df578";
+  sha512.source = "d6f2f90be95d4a459a2cf658bc0c1d5cda34fd61a4c4022924861385ba0e177e065736e9e1542dd15dd420ad2aa4a1bfa412161cdc2e2bea162174acddf8957f";
   hasRunfiles = true;
-  version = "5.5b";
+  version = "6.0d";
 };
 "footmisx" = {
   revision = 42621;
@@ -16131,13 +16281,13 @@ tl: { # no indentation
   version = "3.0";
 };
 "formal-grammar" = {
-  revision = 61062;
+  revision = 61955;
   stripPrefix = 0;
-  sha512.run = "b780535573e46257b0663e09f7b923b95258adf6424c5134fc56486937bd82cd993fe360c1d759c230224ac53f6edc49f225a3983c4de59f5845580457660743";
-  sha512.doc = "1bae850e65fc9ca375a1848b4bf579cf4a21cba2c28d743c61a2ebeceb7017eedfdaf7c713a151887221f69d86944f0bd0f71943fadf10031cedf8767338ea57";
-  sha512.source = "9903b5460e12bce7d5ed565751b789d80b6e62bef793dac38bb663673319efe4a3d58d566f28e5f1c492c225dd2a4a91a73e52a63faf73c7b511251bd7a4cc3f";
+  sha512.run = "9a14266ff45b4d153000f27694869ce0b3a159d646ec0343726e4510ed8444d9e1ea08209f64ac2b88d8875e860880d048fbc67c5dd5292e60c02521f89de3be";
+  sha512.doc = "48d80287ee514f4a846e45b3c0af655644817a3a8dfd2e95e7955fcf4866cb15d5b771e73076cd8cb6717d2d70bfd615e2b613ba58e79380905d3cbf23beeb9a";
+  sha512.source = "55c30bdefed19d9a794cccef0a437cac4fcc8d36b62f3fed1a8fee4c8ee68414fcbb5bf14203eb6510d4be32058388adc4829be1572aa9fc44915bfd362f67ae";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.2";
 };
 "formation-latex-ul" = {
   revision = 56714;
@@ -16190,12 +16340,12 @@ tl: { # no indentation
   version = "2.00";
 };
 "fourier" = {
-  revision = 54090;
+  revision = 61937;
   stripPrefix = 0;
-  sha512.run = "4e4e5bad7ce25c67ec925145531e1a27344735e32e2c7053fa73ddd1559ad3d2f5fce00c92c5dc09731a90666fb5c80aa9702adc7bc4469239ca5ae62c23644c";
-  sha512.doc = "59d1d7ebe7e44c1b5409a9b49e83845aeadcbcbecbf30176b3bc4156f7f611878fd3ee17405df48d3b4e41dd8c95d6dcc24080f15801959c1b2ae83a7a2311ae";
+  sha512.run = "127699baefe3be6cf18d50da60d162ad0daa8794797b2200d91d11f290de4f209f2d6097283e9340fb49f20810bac7fb376e014e419994444a6611718670c301";
+  sha512.doc = "7f6ac2665a52e2bf4fd4769629e00ac2192c68628784e3bb9bc5cf4f9f4c99e8e46485344e7a1019182be0af086e2b5b0ed557650b1d02ed8a9f6e2dd075d59e";
   hasRunfiles = true;
-  version = "2.2";
+  version = "2.3";
 };
 "fouriernc" = {
   revision = 29646;
@@ -16400,6 +16550,14 @@ tl: { # no indentation
   sha512.source = "f83465845900ae5bc872fceead5a83fa972c9fa8b858606007237251ee2dd77cbd095376194aca0356e5c8be53fe653a88f5a10c1f73effa8201b3adf55c5a17";
   hasRunfiles = true;
 };
+"functional" = {
+  revision = 62805;
+  stripPrefix = 0;
+  sha512.run = "e88379aee42a247ba572a7ad6167599eb988ae8015dfda1e0e6f4c9be7e52dc6605e4a7c7ab1625380a9cf0d82ca8d731e907d5edbad2fc79be832da14711c40";
+  sha512.doc = "b6a3464f846385bbe449aaca7613a6e4fce7d6dd6f7bbfef37550e1324fc4936b40645a935cd2539af03fbca1467dfa750f2a5b57a26927bf6f1408df8262434";
+  hasRunfiles = true;
+  version = "2022B";
+};
 "fundus-calligra" = {
   revision = 26018;
   stripPrefix = 0;
@@ -16501,10 +16659,10 @@ tl: { # no indentation
   version = "1.4";
 };
 "garamond-math" = {
-  revision = 52820;
+  revision = 61481;
   stripPrefix = 0;
-  sha512.run = "5a6520612a6cfc8633149f4ea795049c017cb1a483104dc7258cd0c0afa0388d4348ebc0fd7d5b7229031adda5ba835c122b69d5310091106c972c5b8aa32891";
-  sha512.doc = "3afc74609589c22ad0e540f2915c8cc27a2712a2409f0085098cd00df74007e2cecdecaa40cfe79e99ac6538e496d59bed9ca44cfb18dd2b7fce2620805623b3";
+  sha512.run = "fcab922fc4faa8468a2d8076664567c8533e95dc6767eabedee5c053bbdbb721890731f0d976a2d6047709f058a4d5e029996a5a5574912d21cb493f2975a76a";
+  sha512.doc = "c7c5795e7d9de09a590dbfd7311786027be9dcbe51b1f40284639341953effbb0dfcb331061cad0a8d01df55c52611a8d61a6b62fba701565bb643826ba55734";
   hasRunfiles = true;
 };
 "garrigues" = {
@@ -16562,12 +16720,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "gbt7714" = {
-  revision = 61282;
+  revision = 62861;
   stripPrefix = 0;
-  sha512.run = "75cad8b2657d4eb23baa95755b573e9ca3e5c8e318dbff805607b5be8179a6e1ab00e50faddf24db237e28b5b408f5cc040f394706560b54686cdee522618653";
-  sha512.doc = "7862c027931a3d437c58d69aa5db5678cef860a403f64368d4a1debffad97f2c5e66fc65f299c282569dee48fbc41a6a92af526e94a3eb93b3c90a7c58d8cf2c";
+  sha512.run = "c4612212bd95014f908e4123b49b9143d6552e1eae07f3d77a646c07c2b3558503efc90fd902338c8922cbe1c34351d64598ed983258f63edc06c7c72a67e8e7";
+  sha512.doc = "3c47c0d85f6a8b1d2cda1cc49e2ae29412cb620bd9f7407d7f093c8a42dd7ed3a5d3d72f7c0a874fca3dc98d521b51c5042e1221a78bbcfd2e24bbd66298a443";
   hasRunfiles = true;
-  version = "2.1.3";
+  version = "2.1.4";
 };
 "gcard" = {
   revision = 15878;
@@ -16594,10 +16752,10 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "gckanbun" = {
-  revision = 58754;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "e3847d0d2d7273f0abf73d3d07524eb07358a7a61f42e9d72516bc20c4521916f1d68d1cf22cd266f7eb9e20b6687e8ff3cb12ef6524b02e713d1b1e653887cb";
-  sha512.doc = "201dcf0ecf62b39ca8249f6fc9dcdaf1716c32102d0115924a37c4e0fb588af3d86130409c8f928a762a3a423273711136e9c2fe3fe33ad708a11d37a292b64f";
+  sha512.run = "ccea354895392747e5c84d750ece8f3717a0f9c529fd5b8b7ae2554bbe607b4497b9a8d213c479d5ad11e8ebc40187799ffced6f08f4fefb4e6d3cf223566c98";
+  sha512.doc = "4a885440883d615ad20dc083c768c3b64c3cdc627e1daca4008dbf07672ad62e8020a9b14f732d181c4a902adddd49908c4a0e41b3afbe2d68d2f90c5989e78b";
   hasRunfiles = true;
   version = "1.2";
 };
@@ -16626,12 +16784,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "genealogytree" = {
-  revision = 60562;
+  revision = 62760;
   stripPrefix = 0;
-  sha512.run = "f364f331d9e3769bf25130edce8cef5b9c30db51ccbd9517f1e335ffce0d2d8a362114dbb1471856746bf5737eb89c773fbabc4225b5cd655b1daad6153b0004";
-  sha512.doc = "64bbcaecd5cc923bfe38273fbf01bd2dfc2fbfcfb14b2a5cd815704bc7e5f043cc3794ceb891cf018a1735441e225539dd21187606b6188d7eab4862224e43dd";
+  sha512.run = "402cdce58452843e99d6fc915032af666f80fd19b316a7e534e67d172667494bfdd36efb2ddaf93584d657f671b4384b27043bf3235916bef67198ea869b9111";
+  sha512.doc = "ee71a2466fb20a3b201a458b3a77020ef5abee396a7bc60d8217a426b72483c2fa15d192ba5f53166c9e73ece8186d4e31aa17bc0130cbe1dcb5f59e2bd9c510";
   hasRunfiles = true;
-  version = "2.1.0";
+  version = "2.2.0";
 };
 "genmpage" = {
   revision = 15878;
@@ -16643,11 +16801,11 @@ tl: { # no indentation
   version = "0.3.1";
 };
 "gentium-tug" = {
-  revision = 54512;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "4cc398baae4fd17854f92b2c995b77316111018d3e7c86c89cbc966febd26b329024227d295be440019fab6d4f6008dd2110a3005d1a86d88113e104b9f2c9e8";
-  sha512.doc = "2bb2267aa54d027fc83f492125943529497c3c611e187eb12d099d46f96fe5d48a56837332eec1c7ffde97007f6f311057aadf4e1ddc1862a490912b7a1c434b";
-  sha512.source = "ff084fc9f2644ac49e9267c1f3a87c09445399db4e3e8633e25bee5b54b15a091053a0754ecabb2f67a0e85a07060ab81cdf8353adc24dc7f0087ed104bd8d92";
+  sha512.run = "09ce49517d98aa3535f803f8b6ee03286089c3842a0b527996dea7e26d4da2b2bb0a477ffc6d07ebeaede9532ae6e621746ce9610333b3c08782cecba34beab5";
+  sha512.doc = "67f7320fa74748de6f007d5542ed67bb3e6a7f1fa2566fbd661cae051f12c4891bbc6d6ff9260ef34295b5b975bdb329bd6dbfdd846d69a4c3df166d53605d3f";
+  sha512.source = "cb918310ae197c6570a4d48ae308e6f1901175e72c8c247fe62801fe1414ba42c297695c12275d608c904a60531ff5f78eb6f99518f95ab7b3f6539599f915f9";
   hasRunfiles = true;
   version = "1.1.1";
 };
@@ -16665,13 +16823,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "geometry" = {
-  revision = 54080;
+  revision = 61719;
   stripPrefix = 0;
   deps."graphics" = tl."graphics";
   deps."iftex" = tl."iftex";
-  sha512.run = "ca5393e23639894401094084c3c2e30acf12491dcbd3968a4af79037b6dfb6b86f07acfec6886d89a261991cbdebdc846d9804f125aecd4cd77c3e71968bcfe4";
-  sha512.doc = "4bd5ec66f725516ef4d5d3e83e3b75a9b4408fe947161e3d885b929b34c4b60437c3fcd32472486aec12c9665b5c0d71a22896055a613c641bda4c4aa987f76f";
-  sha512.source = "03c27863d6bded295176550743bbe7cbe6aea2b8f1365f7d0cadabd6d29b699efab98b98d2ea5f8baeaf19963a681b9852b2bd01769b326942c781fd0644644e";
+  sha512.run = "ed64996404299bd8379197b293baed752ff064e04eec87ffafdfd55cf21c2c48174560eb1c3bcdb0b06190badb9d9cc699aaa7a2ac8a5c537b0c818a423770fc";
+  sha512.doc = "a58ab22ae6df349d81b5ddf18a4e9b7dbb5804a497bbaff42acde18ca59fe8a19bfee34293debc23e44c690456e6a1b1d87614fbb85dc6cb3b3b7d330fc866d7";
+  sha512.source = "f4e1e8c0f5b8f443c8f5e6ad948cb1736ed944384daec20e9402c871872e86248b3167c72e07fc94fe32ef6ab36c17d2f177135ccf99f68d1c892af0a695bcbf";
   hasRunfiles = true;
   version = "5.9";
 };
@@ -17291,6 +17449,15 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.2";
 };
+"grading-scheme" = {
+  revision = 62509;
+  stripPrefix = 0;
+  sha512.run = "9c753bde2b9df0987296a2cac7e9213250588951b0952e27ebfc2c502dfb855076ec6bdaf1788925e0d3d720a3f6212cccef056f693a82d4cbffe9f1eee58b7d";
+  sha512.doc = "bb51898acaa4bf43217a92a5fc7921a7eaf4d6adaee0a957b8f4a8fa207bbbde4dccbb1af8bf00108345a7fb631035919dd85ddb6135d42975ee6c3798d9f5a3";
+  sha512.source = "a4c8434f294f4beefd4d701ac4d2229f4a3e926534013a42ed87466cc90f20da7a6a192157006c4a18a92ad848d7e96a8e54d3f37d96d71b6263627147b09eae";
+  hasRunfiles = true;
+  version = "0.1.1";
+};
 "gradstudentresume" = {
   revision = 38832;
   stripPrefix = 0;
@@ -17351,10 +17518,10 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "graphics-def" = {
-  revision = 61111;
+  revision = 62085;
   stripPrefix = 0;
-  sha512.run = "b0bcab88322ef2c11f2c94552b5d64dd929bb0cc4ae7f060ecf8aa871bfb6ec2756ca47548dfd9f2dc83b9008f919b2a4f006c53320e097585b4b7fc4e27e925";
-  sha512.doc = "a860f3ebe751de6b1dd8f0670803ddc85eae7651ec37e3436cea62ef3bdf705d1edda3b8f7f84cafc80b25e9015f88193a2c4cf443ab1287e3469fc8acc36862";
+  sha512.run = "0a427939d98618a357241fee7512c9f2f716a88b207b49fb31367ba4088643136004619a2a5fb0ec720895577188a5ec0860d4499e159af129f7f788f5d6d380";
+  sha512.doc = "7ae1018461ac342ca2ad85f7cbea7c6d04a48964cf4e07d68d1e2887ffe3081f1144a037899335cba24c4b5d6badc61b480114d10dc4fb45615b0f85897c4fb0";
   hasRunfiles = true;
 };
 "graphics-pln" = {
@@ -17507,11 +17674,11 @@ tl: { # no indentation
   version = "0.2";
 };
 "grid" = {
-  revision = 15878;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "c8a6c0d6ac1f6043411d5484c87877a939d891aa3bbaef31248f8dc04f39bfc5f7f13344ab2997724682f228f180025bc5afcba8712ee95de983d7182785a8fd";
-  sha512.doc = "9fa0fbf1dfd0fd334c9dd57f50e6d1f893a222bda6402345c70240fce48ea07065fa25ce890fda77983dcb537c8b3b4740cea71ed6a6b4b94275f1e2bd8ea983";
-  sha512.source = "01b7c6dc356487d9e1d9b210828bdb6af50382a59d65b85c8246defe963ada4ee0796a93793d90d25c37ea9c86432d9c05c3eb05598c72410fc2f865e1e69836";
+  sha512.run = "312b142c43ef4bb9624fd6589d086d733593dc0d387894bf58749b3f6251f33df415656b974935352a0d4fff090953f136d0353b98329ed3051ad179708af12e";
+  sha512.doc = "c3559726bf89f766b0d95e3b493046ee6b4c0edee43e4c581adb150e6ad5358ad0a1a3a67b75ea1095f2da87393734972a59693332de10b7b459579a7f73e534";
+  sha512.source = "dd59a48ee18940509d89ea55219706f7c0ae6d7f699b77137495fd4a850cd9d373f01cd9f2485a2ec47204c380c0a17c4986940e0a0ef21740c383e0eec81f0e";
   hasRunfiles = true;
   version = "1.0";
 };
@@ -17684,13 +17851,13 @@ tl: { # no indentation
   sha512.doc = "268a01f59660e5225c1c21539076e6239381294e6aaa31992032ff8e3d777cb7e4195247c92d9f22efbee498c8bac34cdb915e0a5b0f6cb2b5c0b72c15695d72";
 };
 "gzt" = {
-  revision = 61323;
+  revision = 62808;
   stripPrefix = 0;
-  sha512.run = "e1db9628affe8eebb6f9b79bb386b05d62705fdde689c435963d3b61b017c7f3a10cac5b74473101e69ea1ad0d3deb19c354133ec6cc38242321504ac0a10989";
-  sha512.doc = "c599c08e0f8f3ceae669beae774bd0069b0b3050e9109b9cdae3086ef38460aee61fae265d9c735d9d6511bd89e9641af765b7a853dd0a62d4b34798bd77cd67";
-  sha512.source = "f9c56d75f787de79e3c888a1b7df2f30190a5ae560d0daf61079061db38b961cd0d1b261e8858c12e8ad1f86c67eac24be63eee320a167fde90a82007561921c";
+  sha512.run = "298272e11d626a5c3758413f8549e836a5949b1cf12e0ff1e530671a41762fb9f91fd083ea275c2beb4039494e73201e3057942d24f3d48e8083d8745cc8372c";
+  sha512.doc = "6dfd308ca5f6b00db28d92f814ce90215424d444624ee032943b2608c0a4f99a2972279e47b10965645d258a4dd89b1003c26f86de10ea481749495fa0ee0e8d";
+  sha512.source = "031375766a09883d7b6665cc261361b7ebdeeed736b15ec5629dc569e351c90a72a96b123ea1bbdded5babef1faf1b3cc92e67a50e52111f57c1e9ffefb7ce1e";
   hasRunfiles = true;
-  version = "1.1.1";
+  version = "1.1.2";
 };
 "h2020proposal" = {
   revision = 38428;
@@ -17740,6 +17907,15 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.11";
 };
+"hamnosys" = {
+  revision = 61941;
+  stripPrefix = 0;
+  sha512.run = "36af23f5eb95a743a691047d9dc02a19825e88e8fa62f1931f5c2f13e95f89351b42dda6a204493d5f2a147e0d8c039b6b5bbb2aa82bec00824c7c5612d5056c";
+  sha512.doc = "068e8232cf97513c69845e66eb6772e80de0dcf9422a3547db3b002ada137a1b385829a7e8258145ec2b5a05becfd08ad5ee40fce71326b93c3241bbc9f8c0b6";
+  sha512.source = "bacd0fdea3934bcfd32749c759d1e57e740c0e47e477790dd3c706d252c9439182c0af36eba30b8c00c785bf782605c319bf63b7d9ab677c799a5997f63af32c";
+  hasRunfiles = true;
+  version = "1.0.3";
+};
 "handin" = {
   revision = 48255;
   stripPrefix = 0;
@@ -17757,13 +17933,13 @@ tl: { # no indentation
   version = "1.6.0";
 };
 "handoutwithnotes" = {
-  revision = 60986;
+  revision = 62140;
   stripPrefix = 0;
-  sha512.run = "6d633397b97aa5a0a63898577c60dadd8beb845c50928ebbd1fc93153c8dcfffb670da08afd44eabfdec1f66455a9f35f9c83fa8d5cfb7e70246b39e53e61f54";
-  sha512.doc = "c2f7d3ecaacec41cee39d65fabd79e3c4313e0034f0044b984ac43713820818a5e51b255903c39b52cf27ed5b74be4b1673fc7aca2471ca18905c47d038ec926";
-  sha512.source = "2ba124563c2df167686822d5079cfbc4bb7dbca8369df82068978e7dbd2b59820dad72310f60be560f8ec9aecf5a44e0bbbe626779f6777fd30dd016efc1b627";
+  sha512.run = "cac79ba06d60e99e151b272f28d6a8a04f1f766f406801c6f4fb24f4b4c74cc59d78fc6961624b1f77405bab6687ad896826426d8bad30b3b210e7ad5be035af";
+  sha512.doc = "f4f604fd888f5e072d8c002fcd72edb726d3f5512b5fd511446f3fa1295f5a6608510dabdfc6a162d648a3e020489d1e1ecaccb7e563f54e8ec156df51be6dd8";
+  sha512.source = "b41429450b42e341df413bc1d7e4266836370617ee94fe685710ce66c7b559b0ed44e3ecf95963fd84595845eef57b695982b9ce300f214901bd967a06f09269";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.3";
 };
 "hands" = {
   revision = 13293;
@@ -17820,19 +17996,19 @@ tl: { # no indentation
   version = "1.0";
 };
 "haranoaji" = {
-  revision = 58830;
-  sha512.run = "13029f3d1a25d11e2f9f04213532910bfededd9c8fc6f13913fd52c0018db493655a31084ca3ee3325569b500de5a641e69337a6f23ed575e429475d66940898";
-  sha512.doc = "0e6b2d9cb7afbef675d4a0cff16b80729ac70d48bad26a5b2e784ef6386aa8f8dcd156b51f19d9eacdfc38962da135aeb1a3bf735f38fc7cfa300b9100b57ce9";
+  revision = 62100;
+  sha512.run = "4c575f1bdf9eeffc33316f09a9a573669f7fa0c152a3281412fe55e19d0a0a0ff26568acb4c8e1dd2e0a5df47a2c62b5a9a4a8f3702a16d3e805009d1e011fa9";
+  sha512.doc = "ecdde06810b9541f0900dcfaab155ee6beaab10bd7f784ea927b3a78736ebf1849d4a652c66a962ee47ab38bb67befde6656f0f1ffd900c4cfe6bbcbaf5f2e28";
   hasRunfiles = true;
-  version = "20210410";
+  version = "20220220";
 };
 "haranoaji-extra" = {
-  revision = 58831;
+  revision = 62099;
   stripPrefix = 0;
-  sha512.run = "97d75fa7b631b9319c66c4c9ce7768154efb3ccef02e8d8a0f19660972e171b59ad1a7cb53df976d6f593f7d7e19c897afdef3fdf1a2cc47648e53ee1512884b";
-  sha512.doc = "46e4516105a996f0abd7a848e51e98b739d7e525ecf5ce3db2bb7542849219414032db56e304e62a588d6dbc26cb9cce174189c75885d161a06a5dfc6d6c69b3";
+  sha512.run = "db93e6079cb8793e24b162d1c36d2b464dd36053166209f69b1bedeb70e42be19cab957823888316020b6092e858e56a82f4dd365c5e0477166296b6eea6f07c";
+  sha512.doc = "785b9e852d39720eb52f3fe13094ee44f0f511bf86f69b9fad15ccfbaa5f0ac519ed2d9e4d6eff36ffeb8d2dc4fbf36680937cf5bef516038e4b63095f447bba";
   hasRunfiles = true;
-  version = "20210410";
+  version = "20220220";
 };
 "hardwrap" = {
   revision = 21396;
@@ -17950,9 +18126,9 @@ tl: { # no indentation
   version = "1.1";
 };
 "helvetic" = {
-  revision = 31835;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "db1921bbf180287cb735ef403948585a91b3d84fa0cb5c99ca1bd06db57632f2533f40d0b7aa04c01664ca7898166482559e130f375a85242bc44f362079ec8f";
+  sha512.run = "243904e50c3458e62bf346f5a48332709db226e54b17c731ed0bdac5fce04d76b19411a12b01b51ca93b5ff7f06eee38f78a8375f6244d7b7d53116713d601b8";
   hasRunfiles = true;
 };
 "hep" = {
@@ -18091,6 +18267,15 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.092";
 };
+"hexboard" = {
+  revision = 62102;
+  stripPrefix = 0;
+  sha512.run = "e82683253d7790448bddbcefc617d0f0e91b5373de477f1c78a5db9256d632983b1d5f700a0c6fcb4490b746e932de3fe40a22875a6c0d37f6d0ae728867b73e";
+  sha512.doc = "97c92b9c8644cf060da8b3306c8a3f26d1c59f36b1731ca4b6af06ec77211ab676963d5ed8fb70c6a63096a7224cfaac22cf77d5dc39f937902815bea778f323";
+  sha512.source = "f2ab006e01d1ff8ed68252f594d3340441a5a6bed7cc0cbee6c28e119a923a20b186e1f08db7444c75de52c86afdb9aa86767278f0b506a9c601064783baef95";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "hexgame" = {
   revision = 15878;
   stripPrefix = 0;
@@ -18264,11 +18449,11 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hologo" = {
-  revision = 61078;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "e825ae9d985c17cba001d2f0b670743b7ade2d32b67b165ed6529b38d0f7f687d6b4eff5cfdadb389c55285f10a37e1038104b7cc9502423fcc98da0a4fa7a6a";
-  sha512.doc = "65b67851411c17105f12df60903550be206bc070da37e3e1cfc20fdee50bb0e84bd5ebe293617652efdedcd4b9ef6f86760502bb4edf9d470ff64285136df4c5";
-  sha512.source = "c9a8e2a3b4f35dc2da6339f9f2ba8e612398c7fe92455f021b5c006db34ce6e7e7a7a3cba08e5407516b8c171deccb742ecde1de0ba4e341392ded663ca280e2";
+  sha512.run = "d4c5899f35a7405ff19ba810af17a86c25ba76cd01597dd19e074ec468052a95c85f8a80e1f0467f48f72280246c152bb24928a68fbbdb2cf6f0788cf94703b0";
+  sha512.doc = "f92326ed2d0bb3ac455a54889b469f69563d4a91e80883bfcf0ce92fb55c0dd63423be8ec800696f8c078bede28929e8a79d43174e8cd1a802b4a6ac88cff178";
+  sha512.source = "38d75dffe94c9af12005254231b3fb7fc8bf577993aec3ac3e132d14f304e400806627058a98f5ed1f8f9dd5f4ce6d8caef1214ab8d5dee31aa66f47126bf22a";
   hasRunfiles = true;
   version = "1.15";
 };
@@ -18405,12 +18590,12 @@ tl: { # no indentation
   version = "0.02";
 };
 "hvfloat" = {
-  revision = 60587;
+  revision = 62323;
   stripPrefix = 0;
-  sha512.run = "d629582a73c825cd47d4b5052e12422274267b792f639856d8868732dba2ef34987ed778b46725728a183120cbf8f8c3311f5a1ed284bef2b9b98e619bae023d";
-  sha512.doc = "5df6bcaf09b681f036362442ab2aa4910752b3c79078d482f0e950609d3d2018e39187095a494355e78258a55f2992d331676f201619707dc55db523d5dc52dc";
+  sha512.run = "b5afa54f65a1240303a8c0bf14a563c97c8af3e1ec745e9d1b67b1c0635bf01fb42fc758067427e58247781a75e9200c9015f357161d75ffc8adb9c9954dcdbb";
+  sha512.doc = "f4a15f402efab70cd0faa32f398917bd5005290be6a6a170d568b006cb0730d16d63bcf6d5d3faaf86632ca170db2ee6fa97c93cca2f4c896341a0b4742cab44";
   hasRunfiles = true;
-  version = "2.34";
+  version = "2.37";
 };
 "hvindex" = {
   revision = 46051;
@@ -18421,12 +18606,20 @@ tl: { # no indentation
   version = "0.04";
 };
 "hvlogos" = {
-  revision = 60236;
+  revision = 62325;
   stripPrefix = 0;
-  sha512.run = "b869b0c559a2494958d33585f22ba64ebbcdd0da14695f94439baca964f20d51f51716838482480b971a72b78871b3b87d06cedb0f360c7e4ad74eaf468a41ef";
-  sha512.doc = "968bcd1e98be87794d71e37967d64105c27b5dcefac97fe4fda2141ec88067f081cf2fce1583573257875b91bd6d69483346eb5c1afdc5dd206a26da8f022676";
+  sha512.run = "de91afb2590ac698c633efbc0c6decd07eb030e5c850cb41ed9ef9898230ee4d00f5931791755eb4d9dc84548fa48a19b027b1472b7a87449342262412cf5761";
+  sha512.doc = "bc54f79ba8b6db5deae6a18fb711327cf93c2f8627e5dfc84f7d641d120b4bf9f1055622c7a6170457605211931afca8e29b386b0ec633ac88e24dba8d437015";
   hasRunfiles = true;
-  version = "0.02";
+  version = "0.07";
+};
+"hvpygmentex" = {
+  revision = 62406;
+  stripPrefix = 0;
+  sha512.run = "96a3f1f2ddbb11d91b47f9ef790965850470cc207b9eba9fb332e6858d22bf0d6adbd12909dd1c4d5eca4c832c436092deabdebc31f502f4409bb3f967a20454";
+  sha512.doc = "11bec8b66c8e413786791fa36c528aae40faf93c7f666086c5715cf185a254106c88ca50378300d70cd49d9220a643a3fd5374a00882471d348d32230c33d508";
+  hasRunfiles = true;
+  version = "0.01";
 };
 "hvqrurl" = {
   revision = 59256;
@@ -18497,7 +18690,7 @@ tl: { # no indentation
   version = "1.0b";
 };
 "hyperref" = {
-  revision = 59511;
+  revision = 62142;
   stripPrefix = 0;
   deps."atbegshi" = tl."atbegshi";
   deps."auxhook" = tl."auxhook";
@@ -18516,11 +18709,11 @@ tl: { # no indentation
   deps."stringenc" = tl."stringenc";
   deps."url" = tl."url";
   deps."zapfding" = tl."zapfding";
-  sha512.run = "dc42b72e2eccdb7a29181cfac8f95a6bf41f1eba9ec7943f2b00fd71b85ff46269d4ad437a924e7f6d5af81e375ae8cf0a1a64dc301e0ccaa327e1d073f41f3e";
-  sha512.doc = "3e79668b8e7e032f272f23cb0d89faf420c8354b41a80beb50cda4fc0b914add05979b5de753b38a634d8da5f9c45d8660074d7e23f04d2092cfefaabae8eed2";
-  sha512.source = "165969bddfb4d12fe8cc4d646d49369c382ca5369c74f7865462014ab7da0edb188520ca003b4ae3040015a3a2a9c3e0e565c5c811c0b1178a78895e102f45de";
+  sha512.run = "1f36f263f577e66d12e9360e34cab4cb0b9d6364ed5e80e0d0a9810d3763629ec5e110ec9aa00f0ac772c5dde2798e748cce954ec5929f7a8a3b7cd3130820dc";
+  sha512.doc = "3b70f6fbbc789d55f61cbd78b30243be4782693d71aa8db5a2383354afbe5f4e4debe79bd53a3d72e090e7bf25459c8cb82d60db129f27f164c502615c55101d";
+  sha512.source = "24816ef84e06ab000bb7fa54194b4749eac1874fc8eae5ab86b314c02713ef484845d35bdca89e440409832f26561398cf500eee479ae6cf2a1dbf88b8a89e14";
   hasRunfiles = true;
-  version = "7.00m";
+  version = "7.00n";
 };
 "hyperxmp" = {
   revision = 57004;
@@ -18531,11 +18724,11 @@ tl: { # no indentation
   version = "5.9";
 };
 "hyph-utf8" = {
-  revision = 58619;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "dc14e4a6aa57764113b9945c76f3f485f370e6c399196916bea2e0451f8238c577100c0db89e742d1233a16b7f51f56674ef1f458dd04f49e207f62744e8ea47";
-  sha512.doc = "09e4a5ae3b0541b5e6b721f164592c364ca00b0c96986085632461b9201a81fa3f0fe375156a91fdbcdd1f4d5f207d8e7c16d35b6fbe2cd196b4c7025a933d6f";
-  sha512.source = "3dcf4d89d34db765459694329be8cd3182f0021ebbead0ffaab9ae3810c8392b69bab6d0baf433c209becd7eb5ec55b8fdc4c3f145d7792b0c7456129c997430";
+  sha512.run = "64055aa046fdbc721fda474b7848b37d094b1a8f5f01e507df80003ba591dd959871c880f04d5bc6e0bf169e99bf89f5a1a7dad1195c8839773fc613f3719d9f";
+  sha512.doc = "c4aac42267b75a16559705e7de3716eafbec96a285d523d5e7b2f77f345d8e344e174571e247b9c5de8fac75942bc1b0f924e81efd8356b52c9ed91a149d8f09";
+  sha512.source = "2ed5177a81f46bb538517447d89129d82bab87f937c98e4afc6c74863d5f4cc3342470f66d2f5d05247fb3ac26b23ed4b6ce4fd093fcb61fbabac6dd330889f2";
   hasRunfiles = true;
 };
 "hyphen-afrikaans" = {
@@ -18575,9 +18768,9 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-base" = {
-  revision = 61052;
+  revision = 62756;
   stripPrefix = 0;
-  sha512.run = "1cb3099a93b71cf862cbda46a07321032007591f18c43ba4b90a8ff5a41ca2c5d8bbfa0462bc38995e9bddc780049942291262d173f015703b3dbbc9ebae7774";
+  sha512.run = "f17d62db75cb7b299946d821671e1ca770176010592a6e01abe35deb796d786a9d56e83eb57ccd06cba5a7c7141189a76b331dc2d504b56e0bf7eae5fabb73d8";
   hasRunfiles = true;
 };
 "hyphen-basque" = {
@@ -19170,10 +19363,10 @@ tl: { # no indentation
   version = "0.2";
 };
 "identkey" = {
-  revision = 49018;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "b04dc4859826ad3f4fc4dd4a9b19abc0f6125d66d200519652a130c522fc6b49de8565af73f81efa9e75d592036ccca6d373a368e66526d8997dab9d8a5f806f";
-  sha512.doc = "c676908535a4a67efd8569e81a1d3ce5a47bf7a5ec755e87e62830e370fa3307bf0d6a84f3ec7c399bca3cc365f97469393a6fc954bf83b2e2fbc9eda9983811";
+  sha512.run = "3f41af7a6b1f253dd34c670c3726f9b5fba2849230787827f69dfffd7008ec7bdf8bf84d11e7151b9e0a47b486f60ed2e475f30ed3f6cf35d68e283ff6a9c558";
+  sha512.doc = "58574d462eee30612617c9340e00e956968f04b8da292babced36016516272e4d190f06862c9bc41466c85ced264f380192c4e9376c4b0ed58e673f37efd3cd0";
   hasRunfiles = true;
   version = "0.1.0";
 };
@@ -19227,14 +19420,14 @@ tl: { # no indentation
   version = "1.0.0";
 };
 "iexec" = {
-  revision = 60138;
+  revision = 61551;
   stripPrefix = 0;
   deps."tools" = tl."tools";
   deps."xkeyval" = tl."xkeyval";
-  sha512.run = "a00220e8b516556e3db1a676fab6e72f6800bce5e68ef3c6b3c57d99d62285b86df02a7a488713a64e23d63cd7457d277510ee77b3587edc065f5458b1396af9";
-  sha512.doc = "56c204e92d1539d6f599de728c05c6f8857393c9e8d577f36ad5f21fa3c64f73e226fad5606272fc00eacd352f9db56984acd115b0ba0f4517196da65e93a4dc";
+  sha512.run = "43d374797f2106c1782a3347f7ca39efc2849e95f72d741b45a33269e7542fc7aa6fbc617abcbd61ff2441236c1d794a8560b38b8b9bfa22825d243c54925c03";
+  sha512.doc = "ba35d036db3507b2a81789b649e3e17850fa972f6ca1489c1b8d80e1302341651afbf3e2068222822c763d533da5af18f176661a6a96e4d6953afca0df9a1cdb";
   hasRunfiles = true;
-  version = "0.4.0";
+  version = "0.5.1";
 };
 "ifallfalse" = {
   revision = 60027;
@@ -19314,12 +19507,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "iftex" = {
-  revision = 56594;
+  revision = 61910;
   stripPrefix = 0;
-  sha512.run = "07e15945295e3d5c2f6a6e4087d16f1f5ca6014f2ae98bfd25a18d32efd07c4da4542676fa164ecdbe326d478b1370337577638ed2031cdb9f0b2b1961b86855";
-  sha512.doc = "a0497c07ddc2087b8291c9f017101950bb774ae387db082497b859491e38d4fe22d7f69ee9bc093ee9d70d7b67796fdbe643b76322f5fa3577aba5733c7aa105";
+  sha512.run = "ac7958c10c0cd5ee3a82273632445423c347bc9c5fc2015b97fdb7018d7a07b7e1316761698973b325314e945fba6c86be0dd49e058ecf74a55ccf2b9df8774f";
+  sha512.doc = "d51b452532fcffce4b1078ab26396bc4f8739e2c3025917b4ce88af2e5aecfbe0a54e481f1683afe2d25259c6f73e27be8f257beb1b599f9817dc37df427fd70";
   hasRunfiles = true;
-  version = "1.0d";
+  version = "1.0f";
 };
 "ifthenx" = {
   revision = 25819;
@@ -19524,10 +19717,10 @@ tl: { # no indentation
   version = "1.0";
 };
 "inline-images" = {
-  revision = 54080;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "7706dce6a4c0a6dd9b3222d296654c974ee3d6265ab5baeea762c708863f45d7f351158b04075f4365de5a5913fd9cdae5e777ddea69e19d7feb4067491d6515";
-  sha512.doc = "1c24afd0757ca9b9a0cee81192498b15a250994ebf45dc1ad4e26800a1266cad6536c922e97b11999a6b2999ec8ab111de0ff8de46baead06510d2de2296f737";
+  sha512.run = "8cb6a0ba51ddbc06a795dc21c40ca4f18921fa978cf17254aed279e85e769b29e7dd6a0266738e5f52e22bfed87599e6b2099bb04aa656397f04d6d51722c56d";
+  sha512.doc = "ce56e90e90da8ed441213eaedaee7bc388714248547524701ad49021899ef439ae78884ad1de6e60cd06b5916649403d75ea7fda051fd3b87e89bfead9ccdf10";
   hasRunfiles = true;
   version = "1.0";
 };
@@ -19600,11 +19793,11 @@ tl: { # no indentation
   version = "2.2";
 };
 "install-latex-guide-zh-cn" = {
-  revision = 61190;
+  revision = 62313;
   stripPrefix = 0;
-  sha512.run = "f8259eaa9bbd9f1c8ad2f5de309c64f8f14fcd0629415f70f8b054e395c52cd94be3330fad8d9cdff101b97a18097b1b6c11f2a631d121def82b077215d9f710";
-  sha512.doc = "6cd07537b0a399d0a1a3150f6d235f47afaecb8ca99e80e3e951f9e502d3b7eb173bbb68729e1646543b4c43e55d98fbbe1b61408b5713cd0c4fb159f787c88e";
-  version = "2021.12.1";
+  sha512.run = "d15cdb8da4ea42770c66cbd08655edaec38de65121fa38dab8cf6099176d84f6c65c95e5413c1f6c974f1391c42a3274dc372ac10994b9ee41c44ffa91fe550e";
+  sha512.doc = "7aba197bb2eaa000e6ef76ff7b7832e004213f90ec308edd15d1e00850da840c33ac61b95045aa377ce7f1c20f1091d948807a5a81122c83d58e9b73b8cdd0ac";
+  version = "2022.3.1";
 };
 "installfont" = {
   revision = 31205;
@@ -19743,10 +19936,10 @@ tl: { # no indentation
   version = "2.1";
 };
 "ipaex" = {
-  revision = 52032;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "c15157c117594f670a5779bc33e1cac043fda730e2b7a95d781470da2f42075e387d2a939976d469f1b0d05804b2907a7daf7ddb7d9f45074239c6893d89c21f";
-  sha512.doc = "04fca8414689b3b828937ba46767415b3b2de1a4cbc87ae95f790aee4bc82b658c1ff0ff705bea0c45952589693cb357cdf00c1721722d7c340a32f502d3b961";
+  sha512.run = "dec0527223fdb0f897ccf54e96691cd68b933ac61de4c036e21fd35bff93d32766444fe6971492ce64328f92621bd2949ebb669ab33b6b6f4ede88280351292d";
+  sha512.doc = "c53cf11bc81d9a8f5aa19c264a1970d4819400ceaffa20b688d0709546113f932b82b6b6d12cf9fb31b2a3d2c0d45b6b33ee3cb3bd0060c961360389839b1475";
   hasRunfiles = true;
 };
 "ipaex-type1" = {
@@ -19908,7 +20101,7 @@ tl: { # no indentation
   version = "2.4";
 };
 "jadetex" = {
-  revision = 57186;
+  revision = 62145;
   deps."amsfonts" = tl."amsfonts";
   deps."atbegshi" = tl."atbegshi";
   deps."atveryend" = tl."atveryend";
@@ -19966,9 +20159,9 @@ tl: { # no indentation
   deps."wasysym" = tl."wasysym";
   deps."zapfding" = tl."zapfding";
   hasFormats = true;
-  sha512.run = "985e1ed14e5db0a23e9be510e5a52456fdf07ff8c8746add0d1123fa8b8684b3a0c5d9e99e06aa193c667ffa2dd648419d4359a75685d6514e81b9ef0d92ff22";
-  sha512.doc = "bf83fb4dc700f10050d34905197a630f8de75a6a27146188efc254b831ad0d68cc873b610f7457a3dc1140a10793aa05c567749efc38225089014df99fc2c895";
-  sha512.source = "63bf7f94983a971833e1e1b7d33afdf684d83117e4ce846334952176641b45acfe0c18b2fe983c2f24d98e68e91469560c2c10582d53015d069802a38066280f";
+  sha512.run = "6e483a821a791efea669cde597e0bd90018a63a449826b5b6dfe5ba08c45b2ed5dc8bc3fe12cf440aff4669aaee473933174a73ed1cf8af0212cdc8884255031";
+  sha512.doc = "c414e595078bd8896686b1448e823f8b0924f1f7fd39bf6848f6b42addc09a5edd571dc164556e1f16da552af7a692af0b505b5d124a64d4ff1e2ded251c428e";
+  sha512.source = "89dbb28c35889e7926a0d9e8d9779919c106840a84136e0c018de1797b157029e3215f4d98c41f7523def53c4650afc69da8c5f0b464a764da70d7751e2af755";
   hasRunfiles = true;
   version = "3.13";
 };
@@ -19981,23 +20174,12 @@ tl: { # no indentation
   version = "1.12";
 };
 "japanese-otf" = {
-  revision = 57826;
+  revision = 62456;
   stripPrefix = 0;
-  sha512.run = "09c4a30bf8ea079119cbc094eb21591e8402b5364e4a497abaa2048278b0a54322f012c7bed44b4a5b30eff44cdb360be66d8271d8e6fd22dc92622862693f47";
-  sha512.doc = "92f23d5d376451a6103183e6924328432e3e983577a98f8a911da5cf2421baaffaf617065c48c339bdd0a33868976c55ba2a8b254f3f0a3d7d8a85414495c902";
-  sha512.source = "0f429dcb8ac083503d65dc73e065746d6b2e5849927ceb013e708df4567017ad6554d50cbcfa5cec8da8cbac8461a66599cfa7e26e246a01951ff72d0ed634e5";
+  sha512.run = "5dbef0bf1bdec02059f3db75802da4e77af2a227df25a08eb3973789005b31e41704a4794bb4d9a0e26b382f35e32397c3b34aee3f286f89a7fc4e15e0ea2b61";
+  sha512.doc = "520067b48213157e5d708e8c15e4519aff5b3b2e6aba430d815313d416f87338dd6f705549910ab9992aa922155d802cad850022f836d3978434405e2d808034";
+  sha512.source = "e45e1d633fdf92761678430ae51845b3ec968f5b18fa34ed2f50ccf7b87ac4684b1a29e40f1e70434fb25a48390a43a9e864441ea3f9999ac4130c6a6d3fd7b4";
   hasRunfiles = true;
-  version = "1.7b8";
-};
-"japanese-otf-uptex" = {
-  revision = 56932;
-  stripPrefix = 0;
-  deps."japanese-otf" = tl."japanese-otf";
-  sha512.run = "cd95656f02cd97a06119134406b519928ced50c31647a4dd421850d7e83b3705cd2b715be2e23c45b77d1634c47fd5cf8733aea05c654a0d3fd7fd223a3742a7";
-  sha512.doc = "c67265456120136645bcd45f099e62174efa2350acbc5a13e45e35e959421f94cc2f1492bba9605b087008c3fe565ae8a52f4842070ac98039d7b6d8a9bf2172";
-  sha512.source = "efb029012b07e8bffa1311424138f923b4fec963bd2373a9aa083ab048007b05a2cabdf1fe53eadfc0d2431d0a48209f2e532e9a36d914868cb0dd932ce55098";
-  hasRunfiles = true;
-  version = "0.26";
 };
 "jbact" = {
   revision = 52717;
@@ -20067,13 +20249,13 @@ tl: { # no indentation
   version = "1.21";
 };
 "jmlr" = {
-  revision = 56395;
+  revision = 61957;
   stripPrefix = 0;
-  sha512.run = "950f1d737ccf93c12d497ae04192f63c861a3a03279e69aa54c28ab0dbf4299dca3339ca19933c96f1c5f42dd9e2d860dda9c201d2f89b6aadbf75d73c16a878";
-  sha512.doc = "c86b3f5c1e1522009b2a31fa532c98a754354ef744be12ddaa24f1ae0c3c7f36522d1ff886aefb220796375541949a55ddefe0a085fdc0b607383a183f70234f";
-  sha512.source = "163df127f2f448d0ae23144d91fc7aa28c423f3d2ffc63d7cd34d6532b734721215e5f3f31cb3f6662544d3609da83a9a2fd3970a8169841b6cdf129a58a575f";
+  sha512.run = "95a5e59c8f4617b8d3d459a2cfe0730465d46a98781e4352debb9eb0c4357e74c8f519e77873a236f127dbecc235f611e30fbd7348818d9024a27fb8f0ff1eac";
+  sha512.doc = "a481634eac642925340aa02323deee2aeee1577696abd435814a2f27d6e4bf6e61be2b2618778c762f3ec60a1e5067d634da74125dfacccfd940488b6a812175";
+  sha512.source = "1dee8b499ad2c5427082a69b5a3a65c173a96ea298a05f94b96d448d8d7554d96819798dc724e1e8f55afdd1b25d9e6ed6e7f3474bd83af83b2f89add907f2c8";
   hasRunfiles = true;
-  version = "1.28";
+  version = "1.30";
 };
 "jmn" = {
   revision = 45751;
@@ -20081,6 +20263,15 @@ tl: { # no indentation
   sha512.run = "2e250c3f115911c56f9b8d46d358fdef289c624a5b24c9b4213bbf7818bf42c7b778df55d4bf181bce115b388915cedc90ef7cfa99ee6ad8dd621e7853fc7c29";
   hasRunfiles = true;
 };
+"jmsdelim" = {
+  revision = 62631;
+  stripPrefix = 0;
+  sha512.run = "ceacc34fd4390226ed1bd6b6ebd365b0fe5deadae4dbb883cf66931208414d1492d514fc60e73fbb5176e9483ebe843fd6343b69c847a271b1f9830e85902723";
+  sha512.doc = "611c8f3795b8d4ce086e7125e8dc81589bd42c4c36955002ee277626b9dc7e0de983054a6d7202b96a4449c4c0fd358cfa6983cebc662bccea8d4a70f67ae520";
+  sha512.source = "841760ca67ffb750900a2946da4bb4284ad46130cbb937f474b98cecf1fa898bb34ab4af96b18ac3674652e0268d0eb3ffbfab0893c6a4449e2c702924e32c21";
+  hasRunfiles = true;
+  version = "0.2.0";
+};
 "jneurosci" = {
   revision = 17346;
   stripPrefix = 0;
@@ -20144,10 +20335,10 @@ tl: { # no indentation
   version = "0.2";
 };
 "junicode" = {
-  revision = 53954;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "a0e447471da270a19659d19bb4e18699eda7447ef65b5c5abea1662ff6ca631ccf1a4c0efbb192208a835d8acabfeb51aba3c576578c7e40c13d6d28e727cbd4";
-  sha512.doc = "f692c94008d88ed2b0b0d91678072cee6cd379e5a3fe58831a69393cb2de3058c0e7320409385a2112b41c9369255ddbc6919520a222adccb38223b5b2576790";
+  sha512.run = "dd565975fe8ce096d575c0237caae274c0c3efb0a7b3b3fc3cc561636536ea71d62f20e73e549711580a1792e69fa794677d88ebbb7cbad28bd6c82a53797167";
+  sha512.doc = "120772bc43e50cd12e936fe0903d6b91202c2379f073750372d30ffa0abde39cc5f6092089e289fac97ef95b955e2785c07030496f601b805193138414bcc271";
   hasRunfiles = true;
   version = "1.0.2";
 };
@@ -20228,6 +20419,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"kanbun" = {
+  revision = 62026;
+  stripPrefix = 0;
+  sha512.run = "2ca12d697ed80a1f3182ac2e28897f670f8d770d99ce6fb3d8cb692e8e40d45afb463959ac8668b60ac7d67c9d8dd8f88ff5ec9e83a96f656ea8cd59ac419187";
+  sha512.doc = "853230ef31da0bab5215f62e68162553b5ba54619e1e6b6e84c9c57fbe43b5af5715af2696c384a14807a1cd6507dee600d37bb205e5b82d42cdae15ce30e940";
+  hasRunfiles = true;
+  version = "1.2";
+};
 "kantlipsum" = {
   revision = 51727;
   stripPrefix = 0;
@@ -20245,13 +20444,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "karnaugh-map" = {
-  revision = 44131;
+  revision = 61614;
   stripPrefix = 0;
-  sha512.run = "dc2327e4cda55e4b60365d6354f679f9bc68d87a3d3695eb98c2754d7a5f7f64d65db8732b107f686fc39a07868d4703afc0fba754f42af3fd567a143199580e";
-  sha512.doc = "0daa9aafafd67df8934ff2b7b31794b23c8ebc53fb142f23111e64957a75904c4813c6f40512e4a440861351a2185884969cffef35209dfddbfd9ac4007e6557";
-  sha512.source = "3de03d6661f8a8d0955de760bd8e0a9e2c5592e1ec95e55224994c9b5580036da6c20a9e68a2e59195fbdbbe0ffb5f431dd025400a3c1c57c44fa92000575dfc";
+  sha512.run = "789421645939ff491e3ee00aa06813a5e194108c2d55a5e06ffb4dba593a095352ec54c5194ef8ac536f4226007d2323a923ada94966b5cdbd147117856ba680";
+  sha512.doc = "6a04bc71128802a62fa2dbf92a513c9859f9bab336cd2208d05fcd3b9404a1531e4f20cfd69a1d58186cee6660582ab03e89ce87511c3e1173f84bc6ac132f29";
+  sha512.source = "520bcc77beb97f2f106c92682898244160c2ee45ec85118776dc375763363b272e1459e73d3cfe1c27c7f82f24f723953bc9705cf1f506e7c4b679c0f3063804";
   hasRunfiles = true;
-  version = "1.1";
+  version = "2.0";
 };
 "karnaughmap" = {
   revision = 36989;
@@ -20270,6 +20469,13 @@ tl: { # no indentation
   sha512.source = "60390a053fe2fa53685403df1d67a2bf8795f49db0f4eaa5a147ccaed951a55c1ed50c9cc5802bcdb5e356b694c2b4be78715022842c958f784908cab89a3f75";
   hasRunfiles = true;
 };
+"kaytannollista-latexia" = {
+  revision = 62550;
+  stripPrefix = 0;
+  sha512.run = "7a14c765030d4efa4b87cae3e1dbd6e8895cc5891f1fcad7cedc81b918a0231237280c553c65b7d380ca517e2eaf71906518956a7c1c59d561cff28b2f55f5a9";
+  sha512.doc = "c10470b0573f3e22840747bd0fafd2813125cc88584dda5a6fc9b6df0797780c65174a6baca2af47e8b22ff2cb51443a1ce784854dc4973f4076ece7293e7e25";
+  version = "2022.3";
+};
 "kblocks" = {
   revision = 57617;
   stripPrefix = 0;
@@ -20288,7 +20494,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "kdpcover" = {
-  revision = 60404;
+  revision = 61552;
   stripPrefix = 0;
   deps."anyfontsize" = tl."anyfontsize";
   deps."geometry" = tl."geometry";
@@ -20301,10 +20507,10 @@ tl: { # no indentation
   deps."xcolor" = tl."xcolor";
   deps."xifthen" = tl."xifthen";
   deps."xkeyval" = tl."xkeyval";
-  sha512.run = "c7be0c04597b5b29a23c3ee32c4c0b4d11f5e1680db07eb2fcf447857300fd8a6b9f87edc0562a4851be23f2fa48533180c7689bf7f4ab6099a5a844000a23af";
-  sha512.doc = "742a628cdeb7600a69567335db07baeedebc65c8f7e18b5d0081b595310354a4b59508e7be9991e0be34f8f46b61b6d30012b479e7be808713963634e38c9481";
+  sha512.run = "ebc0a78c14ee916e841ff2f5b0ad31c3acf495687f77e7f14e4c4466e8722229c605f971eb4049d29de90cd1d78222533300cd1bf651e2af560fbf074152f624";
+  sha512.doc = "e239aefa94704d793af1a1377b598dae62e9dd37a12c8a1e8f7983d926669c815605a1346c845969e36396ec10f985db3aac32a8dcd06911400c53c74e1f5f9b";
   hasRunfiles = true;
-  version = "0.2.2";
+  version = "0.2.4";
 };
 "kerkis" = {
   revision = 56271;
@@ -20340,13 +20546,13 @@ tl: { # no indentation
   version = "3.1415";
 };
 "keyfloat" = {
-  revision = 59759;
+  revision = 61561;
   stripPrefix = 0;
-  sha512.run = "f13bc22a648934a07fa91ee9ce500f01562dfb6c43883bef82628142f62cbe366a66b0e60ff7d41a9670cffa63601390cf34e331173f8834eba7aa341fb555d0";
-  sha512.doc = "cfe525673a6dd8d1918ea41f33a4496ee7a6e9b8e59a3bf0cd18afcc017e8f7733de5c983bf9b0dd75212a0375638a089c1eb197b0f8bd3fa1dcc48c3ac3a0c7";
-  sha512.source = "e7803dd94cd8fd0733fb916b157a4f3a3a154fef6594b866911d3f75e3994d585d633c021cfb92346613fbcf1529978823c38f3457444a97e93aed3ed51c6462";
+  sha512.run = "76b4cf33604e8bab362a033057a23bc499e76a6845247ba69bc9f37b9601c9fb78838d5c57268928b7d7c9458bd5c906f10ca803bfdce0c5ae5f25073c38b2a9";
+  sha512.doc = "73725614f79e736102836f4b0c4c59daaa7d4b27e978fad6ff0e8c10fbd0531c8722d970b525dc4fd45e8d951e1e4a97279d16a55f051a66a39b0d749a804198";
+  sha512.source = "4ba7353da7caaeef4d419936602d22ff1a818e31abaeb2619951e3ba6601fe70014544a800c3c2ee942d015289096defb7c490dd6d78713718bd9cc7209e424e";
   hasRunfiles = true;
-  version = "2.06";
+  version = "2.07";
 };
 "keyindex" = {
   revision = 50828;
@@ -20445,13 +20651,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "knowledge" = {
-  revision = 61356;
+  revision = 61991;
   stripPrefix = 0;
-  sha512.run = "515a9f6a4d4b1df7bdd51994efbc45d62582696b970b616dc3d3250efd1525bb8523e04e8b56a0391acce8c2bff991a477c72078d4ea840dc9d1b377e15facb9";
-  sha512.doc = "84b54a2544760cd138ea6f663a3a41899549555c4205b91d5f553c6b4411dfe034b4564bcac0c20e377abc47ccbf723c72fb3e404591b0c8f04a1fd6e16c3b6b";
-  sha512.source = "bf30d237fbd28fe29f6ae06dea71766cc74518251247ae6e6d00d754b8bea1a9f6a799b7406c44f4a94a7e16b64b01ff541928eafd49de3428cb6ebb1503ff40";
+  sha512.run = "dac315840aaabc1efb96d52d96e1ee789f61c65964c0343fc35d340694a3f13f7cf9e0ab101bbead9f3d25ef9e3ea2723916864abdd192a89c319a0370b566a5";
+  sha512.doc = "0f95f35d60513fb181efa2d5d9579efa000838647b167521b364305774be164731c4c09ba4fa739ed3749cd5c43b19b59cd417f8237bbca2f930bc4b22ba0c68";
+  sha512.source = "5843dfc2fec15d5cd0a57eeb5aec12bfefa2914bdb8f4ebe2522e6576fcbea73f5663b437ff2654f8ddd7d6f8ef92ecc8aa96c59bf7d76ac58029fee85e1bb8d";
   hasRunfiles = true;
-  version = "1.26";
+  version = "1.28";
 };
 "knuth-errata" = {
   revision = 58682;
@@ -20472,10 +20678,10 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "knuth-pdf" = {
-  revision = 58470;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "281dd6f88f543a84b66ecc6b7f53cf1b9c7c295079e97dc722212fdfb337dd5adaea510d687916d477c990042382066e80f0aec3b2eb29d22b29cdf0968f7e1f";
-  sha512.doc = "b6bb93794b064466c8bf7f79425a55a111a276a9888b720b7780756b5dbab86c6a573dedcd3946e4f7aa661b6bc6eecbc5f92068a50c0f17a3676e4077acfe0b";
+  sha512.run = "f7e0112d59469be8c65fcf861bdc0ee1366db6dfdf87238a4b8333309e3968fb79d84d0cdbe884c682025dfd68b1683c1f2dd2858a64a2e2a130b0cac1e75c01";
+  sha512.doc = "51e833bba38551ec366e648eae5cfe5092930c10280acfe6048bce05be8030aff69dbe029e7db12cf5494ce6d6ad6da98939c02376e71931624f0a5dd6f2aeee";
   version = "1.1";
 };
 "koma-moderncvclassic" = {
@@ -20526,14 +20732,14 @@ tl: { # no indentation
   version = "0.9.2";
 };
 "kotex-oblivoir" = {
-  revision = 60579;
+  revision = 62398;
   stripPrefix = 0;
   deps."kotex-utf" = tl."kotex-utf";
   deps."memoir" = tl."memoir";
-  sha512.run = "b29afee6d80e081872d470be9c82fea392f05568bd61b5dc47405a8dbe5db03038f9207e960bd1ee8abb53ce2d3954443bff1c5bc6939565f59724ffaaf15907";
-  sha512.doc = "01bdd6748c9a8e846d86bb5a30227b1c88fbb1033548875bbb99e8a22d9b0eb73e0857e9d0558d3ffc44aca047d27ccefe712a94dabd7366dcc8520ea9853eb8";
+  sha512.run = "a07630c14819d0ebf56c64e3ee64d632d827a08cb34b6fab35ffd5c74d1846a00382aa8dd3340e4f640b31c42db5a225f1a7df6ee63e52bc2d1b3638525e922d";
+  sha512.doc = "785bfdadb20445622f18ad74138af189d41f5cff77837c01e6e3af36a901f59711b86976dbb4c321386f18a76c701031017eddaaed6c7c23a63392197e3b536f";
   hasRunfiles = true;
-  version = "3.0.2";
+  version = "3.1.1";
 };
 "kotex-plain" = {
   revision = 38630;
@@ -20561,9 +20767,9 @@ tl: { # no indentation
   version = "2.1.0";
 };
 "kpathsea" = {
-  revision = 59203;
-  sha512.run = "dcfe9d0b853bac7917e87b5783748568cb84a9b6e060dacb720826840aa93dab192e9aaf7799aec9e3c99f2aa54e02470918a72047e67568339aed2e2e3a61ae";
-  sha512.doc = "155db7d61fa4011640a3c7e90efeeb8336b970bbb64f8fac5bf69a7f51bbd9132024256d6f57cf649cb83ea590cf9aa106230628196045d3f98bfcafa803ed54";
+  revision = 61937;
+  sha512.run = "df20be2b2eea72c77af8761160991e32003ced9b258a08c8436ba300fd3a4596c0114ec6ae31f60a84107d5d93e7ebb4022f6cc97ac96086324b68c6ec7fd529";
+  sha512.doc = "bc30337799d601561e38442e103a38b49ec5b23f7a1206005234b0486b662ab61e0d2ae0a89dbc013ca929a990eb677ecce6d29f1f52aa6a6c07e7c4de95b14d";
   hasRunfiles = true;
 };
 "kpfonts" = {
@@ -20713,46 +20919,46 @@ tl: { # no indentation
   version = "1.1";
 };
 "l3backend" = {
-  revision = 61303;
+  revision = 61931;
   stripPrefix = 0;
-  sha512.run = "a860287ae480b1c14804e07a5985fb8b45d862cd9ef8250824bdbba5dff2adb010a9a3c61af2945da87a01153df6ba8264248e02ad2c87d45b6161c0acf7d67d";
-  sha512.doc = "1422a6feb08107935ffe7646276893f8a2d328a24137368b9bb743723a22881a4fd061ddab34b26cf31d40768d8935b12cb3cf6b39c6b0c5bbbd6d5c968d8929";
-  sha512.source = "40e033667381b9824f2e6d4a603007241ef085fe76432fae16203c581db09e2ef0514dbf1cc037fe6d0bad2b09ef91fdfac086f20af7fcb16c6d83adf1fccf0f";
+  sha512.run = "f649744e0c04a7cb2174c41dca5b2cb8cc64fcb79a7a124d3ab7f9dd4faa3d4c49ba468d8331a15e86be97356ce578528a862d9d821d065465d0e04e57116e7d";
+  sha512.doc = "dcdca15d29fe6d3ba9ff1f609c96f3c9e005c6f87f202d5e07be8f8e946770095cb3a95a1dd2b63aab244fd659d90642e8cf95238710a182d47954d70e5d5c27";
+  sha512.source = "5df9ee0f982f92db74f3d7af16df400eeaefc21fb95dde9fe38b3d65b839417ee1571f06ce3608b9350e29532a8e02f8db4ce2a04925dcfe3e249f2704a73165";
   hasRunfiles = true;
 };
 "l3build" = {
-  revision = 61312;
+  revision = 62726;
   deps."luatex" = tl."luatex";
-  sha512.run = "332b834eb718a3e95942c1a293533effa8adf87bd7b0b3ae10b6192d72797dda095766f843ccc72309059c4fd577b1c45530551b95978d4c06a8dd4e1925d6d1";
-  sha512.doc = "0e060167aaf50d10e3e68248b6beaf89bbeedac2504ea8628920889a64d1a9f52dbbf4b96ab319a088953f71f4dfe7e50812bc7212ce496d7045ec689f431fce";
-  sha512.source = "5360b179f321bd517689bec2290ee126d1e25449cffdd72bfc918b2df7616b2261d901cce99dc36624cb1f594f80d012a0e0b7986f4b6394841e63250f112bf5";
+  sha512.run = "41c658c92b39a8ca9f87ea15099c9bf6f652bdbb2a8f89978b791c6b3da4744718de53fcba73d3d99cc0992ced52d6bf9d004f486dcc9dbd2fe47a2222f15428";
+  sha512.doc = "dc15d15db355e3fc6dfe39cf7e39c856d16d37186cc5837ae7d2f7fd3d3a4558624ed4c4efe4e646f638731e2f12c3f71051302afa1a8fffe3a4478a1f989b8a";
+  sha512.source = "98eeff82a12a9a852f4f483c93838d4b6f711de801b877f6d1c6f226fa8a77589aec2508cc7bd8758125b9d21768e38b82958a24a5fd99b7123967c6907375a2";
   hasRunfiles = true;
 };
 "l3experimental" = {
-  revision = 61040;
+  revision = 61903;
   stripPrefix = 0;
   deps."l3kernel" = tl."l3kernel";
-  sha512.run = "a90af320c8be0e8c168d9da205f00326172591efb68f8a3940c4484ed4d782924b8d5e0179b6bc469ee698a1991872fb0eac15a4417faa4f2b3f9bfcc23c5dea";
-  sha512.doc = "811efb82fd5022de46d4411b9ca5961c3932715e90c157ae3b1caf0001bc106bfa7c140a6d53ed64b4a1a52fddbfa69920070f67feff2b9f9da800dc4a37e02f";
-  sha512.source = "a8f08cdf948db1b81ed2d9c87c4f4e174125379d9131e62bbe01aa1b9d40b488dda470b20167e8b2098364cff26a6f5237487f985263f9fc547b842d75adddc0";
+  sha512.run = "0e73d57fd0f68acd69b8e9f2de64f794a02c446ea570f584a9af4fe8c6a303f12ce45d0786f553465aba568e6b24d9940d52bdace651ec4e1a3fbb777777a511";
+  sha512.doc = "830dfacd9b39228b6d83cc69b6387b3e7bf621dedaeae98790a8034ffc84b72b9abc6e34904d99ecf1c5303e30af65dec3311059e266ceef3c61565dd689406d";
+  sha512.source = "982a69d46a67803c88594e7abe26f1d380d4a4f3fc2fd8b1667738abcd60cf5076547521108cfd78b58762465131384a1a3345ac486d60e388ea57b76d7a2484";
   hasRunfiles = true;
 };
 "l3kernel" = {
-  revision = 61121;
+  revision = 62165;
   stripPrefix = 0;
   deps."l3backend" = tl."l3backend";
-  sha512.run = "a82e2199e56b039b4ffc50c7c8cb02076d182f4a3df1481b1e1a89510b5bbfb1b0aa35504c9df0d781699837c06f1a72d08efe0898b4456b352f45ad19f5972d";
-  sha512.doc = "b97c8810586549231879494f8f162f0d5af47fbee459bb1d173f5e0962205c0e107c4b58fad1b4dc73c98f49a1689961eced9d2ac6954b4f9511f07e14d405b9";
-  sha512.source = "aa3c5069c5670eaf2a4a8f674c4f67e00ff220ca5cd40d0213fd99ca76937dd8bb7f43ed357ca339769c74cb5a5ad82be4a46f689778d9097ff202c098747a31";
+  sha512.run = "3bb00c73964ec1c442515ae4f8f5746b93513a8421c76db05f4e890de4f69cbff60a365e77fb19c4dd52aaafa10b1c3fec4b76272e820037fa8a364c7b90fbd1";
+  sha512.doc = "e147f508126226fad8750c5822adf5e0afc84c38893ce895bdd53467daa8e8aefd15b122a4130b5c6fa9284d54343ab2fe552637508df9e83ca424f21490cb1f";
+  sha512.source = "97e4e0da7686a4b2b23f241d94abb8ee2b4a2f40472624d5cc992a03ce82f542cfcd7eebcdb2f465a88df3585d6d536f1fb682c7f43261bd791e19473f218925";
   hasRunfiles = true;
 };
 "l3packages" = {
-  revision = 61040;
+  revision = 61588;
   stripPrefix = 0;
   deps."l3kernel" = tl."l3kernel";
-  sha512.run = "1ca8e7484f5d86fd85197e4bb0058444e68f73caf68c04f3ad67ce0a96f29c181d496227f069938604dd5a4dc095e15c0f2addf26f150da0ee7ccf6d48037536";
-  sha512.doc = "4c133f7ede9a37057371e838355daa1138b4cc9e1e8714d9f62925cb56b91645d1c9478b3bdf1050005c3a08b2282881fbc84f50c166173c958bf16604630814";
-  sha512.source = "93dcfe3b4d04c60a9880d34f8a6d924ae5e800d0cd9a2116726c2e651ae43665b34e7bc232640857c4b4f235eaf3ab25eff62d43f175721e9272b1b65f09b3cc";
+  sha512.run = "4a6ec384f2b8ad262eb05f0d30a9b622f99a2c641b2382dfc8601b0c8bc7f4c105865b28e1275c917519d32095fc5b7e66a8c0c4253f7da32af01072092e85bf";
+  sha512.doc = "a62939dad7274a3394e642167ba0ec4adb3fd76fe4e468f09b4bfa2d6e212607b121c26bba7ee9bc15d1e37c84d5b1e8876a0d3e50efcce8de192781809feda2";
+  sha512.source = "da245467908e1ed7245b6d57420dedf1ddc1b9f37b00c76725d6dbe45ed2b2ce172c1c003c4ca2e2b88fc6b220182799a73a15b3eb43240f344c842afef39b36";
   hasRunfiles = true;
 };
 "labbook" = {
@@ -20841,10 +21047,10 @@ tl: { # no indentation
   version = "0.2";
 };
 "langsci" = {
-  revision = 58820;
+  revision = 62061;
   stripPrefix = 0;
-  sha512.run = "bff440adaa56f45ff5a2e8d84d9af8267dacf1c1835c0ae151aac8b30d08b50a1b9b432343603fc6c5426d157befd70cc6d80e2c70470f85c875bf3e733927a4";
-  sha512.doc = "570af6bd6f945aef36cc533d5a7fb05f7ffe615d01c9fbb63d9c1cbe2fa8120444b484ccdb84cc3a1c9805bd00b92c7cf744688b3d02166bb03c735404088a19";
+  sha512.run = "479c4edce9a18fbfc8ce4ff70c88aa2e1703e8eaba793077636d2f0d78879859391d319494034dfc33c4519f44ae49bbc648dd6aae36642a711334af389fee6b";
+  sha512.doc = "2d397c882f03e7fe130cc42bc7ac2f0b9ad33175469256ebac36ad6e67ab4d3fc49acf3d68736d17dd0fc2e4d527a5d3826a0df5d7dc06a76105734be25c727c";
   hasRunfiles = true;
 };
 "langsci-avm" = {
@@ -20896,25 +21102,25 @@ tl: { # no indentation
   version = "2021-11-15_PL1";
 };
 "latex-amsmath-dev" = {
-  revision = 61076;
+  revision = 62726;
   stripPrefix = 0;
-  sha512.run = "94f8395f17bddb61cdd2a61738bad0d9fb177609435e31d15a885ae3ff76999ec08ae36a75f8a4284447ee0038090dd1db37801a4664a01585b2956a3eeab6ee";
-  sha512.doc = "d553ea65c6bde91e7a02585a0c3a5302a28125cae3f990b4cdbf05070086ece00db9a76121e80b887709f8d6f0f1b82c3db1eb913fc71000ff44dd33c2c3fb43";
-  sha512.source = "41dac01263848e79fea146e928891f58795f7cfc1fdd5ed6818dbf4eeacb0c4333e9461079abfe9459b006d6784e1ae32f5e149af89736cbc147b626344a83da";
+  sha512.run = "81ba30ea7706ac0dc4a5795802b0a1115a67cd6a020da6d1d65926ccbbac9f122fa86a58c80fb3536a1d0ef35c0f8f147090e3948e7b5f381eb0c85c4bb7b76e";
+  sha512.doc = "23a0d3627ff739806a24c48b74c16515bd6dd7d928e679af8440b1af98cf5fba76498ac211d59877813ed94a932e2a4ab69a3fb664ae4361087aa45ebe3a6083";
+  sha512.source = "1c758c5595ef0dc59f58ebb1a8e086caa70eb1869447c9ae1be4cfe2d5c80e8d7b020b13b9a35ec44920c3225650c8bcc22b01cd90a5ef32aa6cc5142c3a5456";
   hasRunfiles = true;
-  version = "2022-06-01_pre-release_0";
+  version = "2022-06-01_pre-release_2";
 };
 "latex-base-dev" = {
-  revision = 61076;
+  revision = 62726;
   stripPrefix = 0;
-  sha512.run = "6261ede2b83ed8c13d66345206d412117b3287115701191e2bc6cc68ba6a4629b0305ca3c8d33b9f0f9ac9a6ef6adc1c45467b9e2969ac841053e8b3d34e629f";
-  sha512.doc = "5ce8066cc8098b7946f6756b41476033c42b649f2effcee36feb4b88215e1351ca981d888894124468206a711e8189cdd26e79862478b329d0b4f943f8ea9ae5";
-  sha512.source = "6f8674c52cb1bea1ac6352453c7dc0e5da92e96cddc12f97fe3a6ab5b38a60d64914c7d8ed4dd1049e41ec49adc724fa573cd0b8034197d88eb0ff5a0158074e";
+  sha512.run = "1be1522f20a449edfccff1603adf0edf455ee7ab2f1bcaf47ed52e6f9a3c8603d957438f11271c4eed3ab55792f9a4c26561792f1bd3fe72635ec9fe062f3e4b";
+  sha512.doc = "8c6202df21370d296906d4b3dfd6ebd0a0658ef76725f6753f17c7bd4e0e1dfdafa110c968747c3bcaf546382c5c8b343a77c028c786d4d35a466e7dc096612e";
+  sha512.source = "ad3489239c75fc9357e7bd6a56c5153f27571643d10eca85999f37e0c838d7044cb6438e759716f8d0c8da7ac09e07469480813a87824a11ecb73c7c9b874f36";
   hasRunfiles = true;
-  version = "2022-06-01_pre-release_0";
+  version = "2022-06-01_pre-release_3";
 };
 "latex-bin" = {
-  revision = 57972;
+  revision = 62145;
   deps."atbegshi" = tl."atbegshi";
   deps."atveryend" = tl."atveryend";
   deps."babel" = tl."babel";
@@ -20939,11 +21145,11 @@ tl: { # no indentation
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."unicode-data" = tl."unicode-data";
   hasFormats = true;
-  sha512.run = "b349e8fad2765c4a87b471532dcfafedc0a9711237c6e967011727da7bad3a5ed27a89eca81af324aa84958872d0b78c68e6d9490fced44eb7636b2fbf36611f";
-  sha512.doc = "7cfb465f4db5089e7fa41762a0437f5f51445efdb9aba5d676dc5933e0fbcfbe0fda31baf83e20f2d16e6a7a0019c71752af8744d02ad12636adb9afb8cb3041";
+  sha512.run = "b88578c4e2b7ff3e2aac32c6299818026819cce2d04c9213e8e1cff32076af898019e5c2335a3e29a84fb3c3b83f092d7492fd5c53fd30ac2430d1ae8fa6d88e";
+  sha512.doc = "821831a3126be1408b7f034c6160cb63529dd95b333abe1d060a57caee5d974e17613f95af68d0e185c9c1aa9aa36cb7708f87e5cabe6f92da746e7a1cb45780";
 };
 "latex-bin-dev" = {
-  revision = 59005;
+  revision = 62145;
   deps."atbegshi" = tl."atbegshi";
   deps."atveryend" = tl."atveryend";
   deps."babel" = tl."babel";
@@ -20970,8 +21176,8 @@ tl: { # no indentation
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."unicode-data" = tl."unicode-data";
   hasFormats = true;
-  sha512.run = "5d44e0274f584509e2d600f0c27f6bb395d5c9a9d18cef9df67199a8ebb30b00d32a6a944ad7e195a47ac7bd87e0bd2d8f116cd513678a0cdf2a7d45db8c065a";
-  sha512.doc = "f7ac33d09631c9054f8ccb0ffd91a6ab83bedfee96a299ec5727be9ffeae226d2844a08633cf19e5ed45a17fce9c15707e02aeb53778d06281aba0b612c90a60";
+  sha512.run = "5d2cb9e5c97650a9685223318cb5c3a685038d6c157893db3e5bbaf03a6a3197b2d7e61906a41a5188ebde0fe12f83332399b5883fe9080fe75a0d4ce63d3b07";
+  sha512.doc = "6e79ec67ad9d00e25f28c6e294046c6e41acb4160f3aadb44ea5a3512eba4fdec155216268d91fc4515e54e1d8edf8a30f44d33b447dc175b2196ff46cd3b215";
 };
 "latex-brochure" = {
   revision = 40612;
@@ -20993,13 +21199,13 @@ tl: { # no indentation
   sha512.doc = "c7d7217a9136785cfd6ddb000e51d455e7482bfe395a9131329767bfffc71f918c2349b1426b615a6740263c958530c68c044ee3ae78300a004a8acf20bd8bdc";
 };
 "latex-firstaid-dev" = {
-  revision = 61076;
+  revision = 62726;
   stripPrefix = 0;
-  sha512.run = "1d0d0194e3808dac38992780df3ec3f0c7d6085c0fc7751741b22c486222c2bf2df7e14517e20145209e055b2af674b7d9b8876fca1e4f24a4c711f7b2c892ce";
-  sha512.doc = "c549e8321a0bd994bd2feed0d4124df593ca6ef4e5394a83f3cecf6f6ecd1af5f7a31d3bc1742c7cc23fb651095a7d2a32673e351d2b84d4654ebdbf523ada8e";
-  sha512.source = "da8753ff5ad1df2c267e06e1d353502bc1c08e2f8c8100a2da510f417b30f88e5b8454e3d27032f10195cd226a2d800046f0df9b20ad66d06fcc0961aaa7d45a";
+  sha512.run = "8bff0c8a3adab1876c98f0d7275a47bc61f0b94ced7e43da2c7f84cd815f1c3efb6480d112f92d7642760d4197cfbec0e98a0940315538ee89853a63304d1107";
+  sha512.doc = "12e44cfae5c6a5ad4ba72112e6b86b77e08400beb4b2a18f28314b000badabfd49401a3c8b2b2b217753a8b5ffef6fd8c578a05421bfba4e3009b5b8c7842e41";
+  sha512.source = "772039c2bf0c7e7ec2acccd63e500bfbc07065cb45933dfa5ac9f238f03eb8ef97be282a42dce7dd3d2c4b06f0b1c76f14ea1524d682ae0d4e7324f86d4383d1";
   hasRunfiles = true;
-  version = "1.0q";
+  version = "1.0r";
 };
 "latex-fonts" = {
   revision = 28888;
@@ -21008,6 +21214,13 @@ tl: { # no indentation
   sha512.doc = "4d3162776a17f31caa8e6a0fe05eed9447b681d77e653371cb5fa5d8dd2f01bddddc9f95ca916f233c11f8ec7d15e02fe575dc953fdd18c34ba877829a142bea";
   hasRunfiles = true;
 };
+"latex-for-undergraduates" = {
+  revision = 62509;
+  stripPrefix = 0;
+  sha512.run = "27a730194eee216e717600be38b1dbdfae3e7728d1b22ca3c087e163c9d0fbda530de2c0bfa80e20f751bb10ebad477b2313581197480301d21431cba5eb0da8";
+  sha512.doc = "78dddd85908912593838e326eac59013f01898953e9e8dad5030315e77e389757a42d541bb4e057da8c18f7cb6d4e2b321025ebebd2341b1565a2d4ce2ef35bc";
+  version = "1.0.1";
+};
 "latex-git-log" = {
   revision = 54010;
   sha512.run = "15994c6eb9ba1b194df270c68a3d74ab3db11974875ce192559182b2dbfa9b308d598056a3145f2cc2f6718865a5b140ccb95dea22a9e23edee527e5b86362ff";
@@ -21022,14 +21235,23 @@ tl: { # no indentation
   sha512.doc = "ab9d885c811af3964e8cdd8576349059bd45d660e6b9a7e931697f7c7fa5282c725e044817de8f2648ded59519d1592945e0804ba7cbe0054ce2bd4d44606af5";
 };
 "latex-graphics-dev" = {
-  revision = 61076;
+  revision = 62726;
   stripPrefix = 0;
   deps."graphics-cfg" = tl."graphics-cfg";
-  sha512.run = "b87a4ce8f6751cb251d17d976a43d01118dd63e8b74cb24d8d5835d674fdaa50116066f7ac5fb3384e9d5f511ec82ce91867b026f9b1e2d48acf1bee87188e45";
-  sha512.doc = "0f0864424a653cd1166e7f422f3740fa777e6b88813d8059041a6dec5c0b4921798060f3d3069b1bd23acc869610fda988693d297f52d99f39f31ef6c1e3e5f2";
-  sha512.source = "a71b652ecc00bfb2628fac7d8afeda361bd8f4d87048af29f304fc10d768e9bbc1ecd31f642f1b645ac2ac50d76ab2652d4e0532c94d54278cd9b827ddb5d694";
+  sha512.run = "7b0968f9033eed13b154aadf534f0fb91ca9e114c79af0098afbab2f23270bc6634b529defbd7fa4aabe78c005b59e39b5df4accd8b619b071fc67713ed7ea67";
+  sha512.doc = "3dc4ee8c48a5abbde7d1b2301e8b8f591b533f103b4fc3e0f2f02fc03814642ca48e8cca4eb3de472093a6eec500ec4c845e93e50ffbb700dfb94a99db5566b8";
+  sha512.source = "3b60e4bb64c200ce4556703250073c456c7d986d1e75220bca658bdf0b8c272b7dce86d83e3c150598b9f56cb048c900caff8a9e52617e61bd6a2cb7e75bbeac";
   hasRunfiles = true;
-  version = "pre-release_0";
+  version = "2022-06-01_pre-release_2";
+};
+"latex-lab-dev" = {
+  revision = 62743;
+  stripPrefix = 0;
+  sha512.run = "5cb996a107408c2822d6d32d4a9c7bde8d9077ca7037ffe29f27a20ec90a9bd3b8e967d8e49f3d48622b8a959b5d2c356c8108b7803751f4bf4e164ea4b7fc30";
+  sha512.doc = "891865f23138a882926bbf45ad8f9217bbfca870b8c1d65304dae1f178b4410fe2daad37e29ce59e25b228a430c132fcd8a9a285f9e2606fc074714f4cbed350";
+  sha512.source = "c5ca04757f3d8fc65a8b33db79b5d0f6f0bad7598d13ac08beac1897ba345d0bf695e19ac7475a896d7f835eba449c22312fa68e049c848d808ac5872a075136";
+  hasRunfiles = true;
+  version = "2022-06-01_pre-release_2";
 };
 "latex-make" = {
   revision = 60874;
@@ -21069,13 +21291,13 @@ tl: { # no indentation
   version = "1.2";
 };
 "latex-tools-dev" = {
-  revision = 61076;
+  revision = 62726;
   stripPrefix = 0;
-  sha512.run = "4cc4e438acad4ae4e375a3f6f57afcbac85034a174d987d6118c1af2446950e175bcf93faf9a5cf821699d836352810eb7a546271af8ffb9617c306c9d006f58";
-  sha512.doc = "815da908df305d2d79aa892d4060761681bfeeae1541a1d6be05c184d49d8fa74fdb653591b9178db3e34e8e3887be90a9bc63fa69738d38439be26a8d2c82a0";
-  sha512.source = "a154957c29fd126f29fe123eac281f5b0858187122c4f53ecc5e475526bdb0f88f047b4d32d8d88d3bc5394129caede8c3905955c77af461cd503b5e8af8ffce";
+  sha512.run = "b599619e33dc54b412d0f71f4c681cf827c1a8eb32cc4fe9e21918446a5afcf67c85e4adea6dbcd520e5fe3517189b7ea401c59cf655f79d5004442e65f1efc7";
+  sha512.doc = "f5c4e307613d68e460f81c41b2b9b56a299afe66a7ae64ac75238454d34c2627601c0613d6008a4f8df1624c815045224feada99e752108aa6204a8a19d1655e";
+  sha512.source = "8dd13aa452b99a74aafae49d415588084fbd079f5d7ed680cf63517948888f682efc08bbe7169ef5c1277d5e621cb5c7b2bd6c09c2b88084ff86ade415a24a27";
   hasRunfiles = true;
-  version = "2022-06-01_pre-release_0";
+  version = "2022-06-01_pre-release_3";
 };
 "latex-uni8" = {
   revision = 49729;
@@ -21106,10 +21328,10 @@ tl: { # no indentation
   sha512.doc = "a972860f65d763c6fb45e9726e5dd7b8234509b90634f45b8b25e090da92d0ac577bf8b33ea7b0a0f91e4e5639bf62c07086dc36708ae697c1e16e644acc83f0";
 };
 "latex2e-help-texinfo" = {
-  revision = 60038;
+  revision = 61750;
   stripPrefix = 0;
-  sha512.run = "dff005a0b80915f4c1ffc520f95f1d1efc6437f1c46f18417c6fb2b4dbb48c8bacbde3d02554d08a149092bf499313c189010cf1963c67dcd55ffab2ec3eda28";
-  sha512.doc = "988c25f80ce06dd1a2e192231c2e6bd0faac600fc15fc772d1f88aaf48b7bf1f12f593f34505cc829760c4a3176c243a3c2271a8914b0578b6944587f5360362";
+  sha512.run = "e6d91ee9cf4503166a49038903eacee609a1e2c494f945d39aa60c1b530709de70155fed1e7d17e815363e7be74afbc7472dbd6e02e6286e5d467e358c10318b";
+  sha512.doc = "56b6f667484858ee4da9e3ab6e01e5d3f2169d512a8b4cd897114cdbd4b6737ae39726dcdaa2ee1e35265e4753bdbb3cbe04fe834fb7eb24a4419d818a1fb192";
 };
 "latex2e-help-texinfo-fr" = {
   revision = 57275;
@@ -21118,10 +21340,10 @@ tl: { # no indentation
   sha512.doc = "91f4166da251720271be473412764934212e19fbe21a4487245a0b19e08967c2693b81c89d98788ff7a768f1da462a5cd44aeec95ac459c912e0f128ebe65ecc";
 };
 "latex2e-help-texinfo-spanish" = {
-  revision = 57213;
+  revision = 61937;
   stripPrefix = 0;
-  sha512.run = "d6181f2049056c06911b5eabe977d07d24099bc2bfbfee3ff4d2bee811af9b2a6165fd8ee464fe68172f5b8d47d85ac9ae973a2bbe8dcbe0529c9d68d9c3c692";
-  sha512.doc = "8b8bc956d914b97d2679274e6f3e4ef62022eaf32e20dbac83e0c995e0c85ae33e8cf707f94a2ae9890747bedcc27ec46f627dd4a2923f10a4a7ec62d039194e";
+  sha512.run = "30d0f3b0d2f7ce86b7c6e2bc69034a7776403951aed97e0a3d9bf3c5ed0b22e7a448153e40145b429c72a9b8f5908fbd70a683f60fa98339349d0779e9329d6a";
+  sha512.doc = "52960e408e53170648aa3f8978ad0a4cd6e65657e3491f249006114883f7d5f06ef339aa8ce6035815c5d20da1e4d0fbcbd5192c525fe9ac92631642dafae2ee";
 };
 "latex2man" = {
   revision = 49249;
@@ -21234,11 +21456,11 @@ tl: { # no indentation
   version = "0.1";
 };
 "latexdiff" = {
-  revision = 55540;
-  sha512.run = "cd69ad7bea121664c600e77438eee882e71447bfe5ffb034773a72269ea856f41b54b1369aa701b755586e12f121948d9773688f65d6b0bb161e3a052d95c5f6";
-  sha512.doc = "33931c4a47ce1ae61119a54caf074049504ea044159afb6a8ad59dcfea1d54782939ef5d2e8f3303f0aa623c64c4dc84a209eefb179fd057b6903ef6c9409f67";
+  revision = 61434;
+  sha512.run = "9fbe7f644012638bbc5f10c114adc5d0027475c7a872dbe36016522c5cdbe2fd7c31af20cb389aee79e83b03a9e470cf01cef734f2caa623c7048f2b020e80be";
+  sha512.doc = "b3c09b5ea391ad7b2d5821e41e3e4e05d4749b2aaa8b8aad1219c7f81aeccd65a98e3fe77ccbf4770d658dcb4797d9bf37a42604b380f666a6bd281d8b677ed4";
   hasRunfiles = true;
-  version = "1.3.1.1";
+  version = "1.3.2";
 };
 "latexfileinfo-pkgs" = {
   revision = 26760;
@@ -21265,18 +21487,18 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "latexindent" = {
-  revision = 61385;
-  sha512.run = "8c3ca82b20daf3bb1d84ac5070fee9199b1f1df53a6d7ee8e2b61212df3fadaf695db8583c4e25647309cf5c8e4af45e5a5246e18897980aacba307663d4cce6";
-  sha512.doc = "2f081821ec57fe1cd7562e5ad8235c491a2f397cce0227f4fbc037d0a4adf64010dd562ef61758733f0e1bab448b2ca8c40a14e3adf51592e3a14dbfc5483389";
+  revision = 62691;
+  sha512.run = "99191de7780c96373c2cc08ebb4ecd91a41d76572a0497bf78af3740e1484d20781ef65a0fcf234f14ffe31ce74e875fb9e66334d9904232e2ffc2e95b17f2eb";
+  sha512.doc = "04842734524a69a989247733662b5819439be275768f748b26136fd1d0d7cc0893f9f4eedd9cb6775768469b03b6a21d14f53dbbc860674d05a2f18ce95be4b1";
   hasRunfiles = true;
-  version = "3.13.4";
+  version = "3.16";
 };
 "latexmk" = {
-  revision = 61146;
-  sha512.run = "e61a7bbfdffdf07f6c2c6cc9e549602ed6900677cf13e605379c3a1be206edefc4b0c2a7f7ba649184650413929b47e82b9c20a9245f788331d528dc833d6c36";
-  sha512.doc = "03cb839f5bca7063bb477f5843bf4a30236d12258dbfbd86bf97f54faba41a6bab0c403509ed1d1d466e4a59a94d15030455e337c3cfaf61689ff556d6f02a15";
+  revision = 62768;
+  sha512.run = "1aec8ad3efbb858cc3b9510dbc12553cb4a6c7e9a7c713d2829040925bb605f408b640c142eb8620dc2eaf05bbb45a5959e3f5a2690285b650e5128ea5c0286c";
+  sha512.doc = "c25aca63cd9c0095ea9c59b51bf6e5df96cba04cf65e35e55fc70eb9b351ef27de7c7aa16a3bdd5d37ac98716d8ca8c86fc7396050b1ef6ce948ee1bd7544213";
   hasRunfiles = true;
-  version = "4.76";
+  version = "4.77";
 };
 "latexmp" = {
   revision = 55643;
@@ -21387,12 +21609,12 @@ tl: { # no indentation
   version = "0.3";
 };
 "leadsheets" = {
-  revision = 52275;
+  revision = 61504;
   stripPrefix = 0;
-  sha512.run = "e7a84348b6347962fad95171059e968f35e7601da51ae6fa278add1ed4262bd7ab84bddad9b48780e7481056bece9c311ed1cc25e77c57f9d9e0649abc9197e5";
-  sha512.doc = "dea48a9b053aa67f6d9e3dcd3560ceccd104d743a5797320e76d43cdb8709afe7236f7ac8ef23dc9175268fe57c97898c92d0dc329a4e3151b017544fa537521";
+  sha512.run = "026e310ee9617108ac60fca69b0f08b2031d9c9dc583a400095765458bc72681c5c39332602994fd8a7dd4757b5214924d4f5d75bc5861365ef65e8e33b6e143";
+  sha512.doc = "dafae48e690e6f0a2272d268204cbe58967eec5dc895987ecbff563061f23a53bf9d0d39f4a269b852524c1cad8de08fb121aa8291d2c723c01615f4c83b3231";
   hasRunfiles = true;
-  version = "0.6";
+  version = "0.7";
 };
 "leaflet" = {
   revision = 56878;
@@ -21404,11 +21626,11 @@ tl: { # no indentation
   version = "2.1a";
 };
 "lebhart" = {
-  revision = 61338;
+  revision = 62834;
   stripPrefix = 0;
   deps."colorist" = tl."colorist";
-  sha512.run = "33a117be62734eaaa4c5062e85d28c8ff768f4ee71b76081db2b4f31985ca57b62e42146da417e6ce87e2947ef2523a3709e4defaa0db716ec0b23e9170311e1";
-  sha512.doc = "5fd2fb76c7756ee9a033eea1a479858a21ec483efcd964b53fcccebff410de3c48cead6388092f745225f15f705390c702798c8a8a79fa6dc6190d3c98ec9126";
+  sha512.run = "19ac4074066b76fb7222280da8ca9a6d602e0c94bb55172b6c74537ff0189ddfe4011b19953e32924c05c3664dbed54754199e8940244867eef85e22f736f10d";
+  sha512.doc = "876544fc826ea0263a3cac256d7311b7762e110e777c175cfc68488ccac1c5afb7354fdf30765d60a2937905b884870ef3ad6db6a11badca36434ce49b700088";
   hasRunfiles = true;
 };
 "lecturer" = {
@@ -21427,12 +21649,12 @@ tl: { # no indentation
   version = "1.0.5";
 };
 "lectureslides" = {
-  revision = 58393;
+  revision = 62293;
   stripPrefix = 0;
-  sha512.run = "8d5c2e6872ae1f6acbfadabf997ff8b4286398afee2cdb01a0be17b243df25fa9677d360872e422ab62b1c8f3150c6fe4e896eb2dc802752ff362df51d684004";
-  sha512.doc = "77822069774285b57a68ae543a287d09dde276266f3a4acc767f101eafd113b74a53fbcaa0ee71bedda18edbbca23f2bde5b77a4f33a0f0dd26a631e3b0945b7";
+  sha512.run = "151132141bc245f653b8a728ded42b60f3157fcc3720e780d0d67b10f1b3b3fc6207dd093ecad28089a43d1df8d1f43adc6baa73504601ad5368e4576295d3e4";
+  sha512.doc = "9a06e97f47c5658df6ef8a9cc1ecb0f0c19461652e50136673803b414ff0e45101bfbfc71b4d33e7db9ca23508b99c4f220e04d807974cec2aba178099e8da3b";
   hasRunfiles = true;
-  version = "0.1";
+  version = "1.0";
 };
 "ledmac" = {
   revision = 41811;
@@ -21477,6 +21699,15 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0a";
 };
+"letgut" = {
+  revision = 62880;
+  stripPrefix = 0;
+  sha512.run = "768875ebc9f8e1857241f8bbf7814ddf36f682f7cea791783c8e29d02c17af80bed79ce4f5d2c270e42760213731797d97ac6e39e07bfad6043e5ff368799583";
+  sha512.doc = "c38257f2bb06a24c65943dfd105180bbad97f86635b74d28591185b3cfcc9be3c8b6b4cbe5092e5937f2b07ca663594a3a0129ecce2a234e4ab44f173c7a633f";
+  sha512.source = "36dd602cd29d7546bffd0b8c4a3d6b65a21fe1ed3193d62be9bc6fac608a7314de2cdb3c08efc0585797416bb1bc091ce8f59a307a3e438c18905e3d0347b2c1";
+  hasRunfiles = true;
+  version = "0.9";
+};
 "letltxmacro" = {
   revision = 53022;
   stripPrefix = 0;
@@ -21618,10 +21849,10 @@ tl: { # no indentation
   version = "1.01";
 };
 "libertinus" = {
-  revision = 55064;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "ec36e8d1184e4b8aad46391bf6cfe54a48006af6ab70cc2a4e20892bdaabdf39ec145e216a12e8be389e3080a51ce5d81be2376be631e32f48ddd5f9548cc564";
-  sha512.doc = "35e7c7ccb8c10bf2d5d24c03b47174a6e53dfabb9f7629f778f6ab3624f146371b4970f577d28765cbcdb1094dbf8414a729a2b808a7f41f418b911899ee0698";
+  sha512.run = "93fc163a66e711943c22f383187d4f7e81aaca32f36eac6e6f944682169282544c9233d05a2b5e6d263dd95de3d8a8106871a0ea1fd2028899031e2cde1244c4";
+  sha512.doc = "8865b61037690bd3569654879866592750561d3fdeddd7943280ef772e7798194cf0bdb95809ab4373e1f082d1a1468b3b4456971b72dc892b07e73e2dcdecc6";
   hasRunfiles = true;
   version = "0.02";
 };
@@ -21649,12 +21880,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "libertinust1math" = {
-  revision = 60495;
+  revision = 61751;
   stripPrefix = 0;
-  sha512.run = "bfce92d05045e5f9c381a82ccb5cabe9843c9e65ceb6a1bb8028aae5fed4ad1106b94055bdfd38ccf6178bc5b1fc82dd0436d9cb2977fa11cee9e25697a898c3";
-  sha512.doc = "9ffef9c46f0b91500494798fcd6558cc5a286f728fa3ccba8276b141265fc2d59d6995283a9284a26dda3e4523bcaf74493b8bc1b85d4c100cd249387032ee52";
+  sha512.run = "444d23e7bff1a6c1b3c368730a589a033c211f9fafb1032b3852e55ade7cde260f1662ab7266291136919558d9c2995986655f0302c38a677afd4dd2f74d5376";
+  sha512.doc = "d3bbc0ef7e507affc60a6a76c4f33e42b42f5b9742098b5e967d6581f79d9fd68231cb7f67ff97b7d5cd8a47a023885306439125419375537412024d5bbd9f88";
   hasRunfiles = true;
-  version = "1.2.5";
+  version = "2.0.2";
 };
 "libgreek" = {
   revision = 27789;
@@ -21681,10 +21912,10 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "librebodoni" = {
-  revision = 39375;
+  revision = 61794;
   stripPrefix = 0;
-  sha512.run = "eebacf9b045b46df1a8c806deebbd94742e2c1615e45da85946c83cbb82a3a2ff278a6a0bdf47059c5713ed1c2dfce8988ff82c4682aeeadc05772c49426372f";
-  sha512.doc = "5cad86257fd423e1f7551a014f888c28d4b61a9fea14aabb0128458fa17ad81372668f247d9e7a81ab0801d9ece0a0529a304d16ae2f06dae5598048bef4d036";
+  sha512.run = "fbe72c5a23229d64312b7b93cc1a001d3b793928b03e9fa83621202fa24d8d405e6a42367702b993a44f16a15986b93125a0d99e40474147dcd2bd7e6f4512b3";
+  sha512.doc = "c623cf324dc6719856ae1e9ccec92f844c90023b3163a76c83574336f43022220ebd7768d1e0946a9c2cdbd412f3b5a25a8948d5df4680d065d743980557da9e";
   hasRunfiles = true;
 };
 "librecaslon" = {
@@ -21711,10 +21942,18 @@ tl: { # no indentation
   version = "1.007";
 };
 "lie-hasse" = {
-  revision = 53653;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "ecd15640967371587139b06241a7031e86b72a6855a762e90b5b96ffa629c520613fafa95f08f346bbca365ef4e2156b2d1db6051f5e065bfd94291d942b2a44";
-  sha512.doc = "e33467606f46bf04dc4b42820a1016a3da4222e17dc3ee0fd44290b6e8cd831ee8080beb3536a66f961406066884bffd1488b103ec2fd86c1bc01399b1879bfa";
+  sha512.run = "b71ed475c73a94a92b8a8078a4edccc73f7d688bad7a1a5e6218bafba823b76a20b79da83c7591903fa234c6f0e7f776317dd8b740e5fd7cd014821f8dd77c94";
+  sha512.doc = "d846971b6b8429e58521ad0cc564906fc06623a3764117069fdb1912aeb84858e7af93ea2f4a7732c6e677f260f10a6a9b79488d43caf56ad158152245f8e4aa";
+  hasRunfiles = true;
+  version = "1.0";
+};
+"liftarm" = {
+  revision = 62548;
+  stripPrefix = 0;
+  sha512.run = "366d6d834c74e044364abb34047c0bc9308ca8da4cfb811abccca819b361e332160bf4be7f058e3d2ead2b3c9683f4a51ba8777bab73504d17c9fa0b2dfbf670";
+  sha512.doc = "aaf73e0c29b25ed3f4ded37debb648663255f855aeb44a8c81fa050960f5d890707ee98b1402bb832dc037fbafc9569caaddd941254ce37c5c143557977ab953";
   hasRunfiles = true;
   version = "1.0";
 };
@@ -21759,6 +21998,14 @@ tl: { # no indentation
   sha512.source = "ffbf77f9c3f97acc3bed0445dc3d7c92b9d4cd095e117a2f9ff1ba54cc1c3f96c734c1d22951fd520a194ca3f385504db06821a0797a4394079fb221d650fb7e";
   hasRunfiles = true;
 };
+"linebreaker" = {
+  revision = 62664;
+  stripPrefix = 0;
+  sha512.run = "99ff9f815a5b9127b562069e48fcfef6cbaaf202464b93cc3615e90eda9e7273a442cca9c78b4462316036319f688f2ff938c177097d7ab7e4ee3e3ebcfc19ff";
+  sha512.doc = "ca23b92513ece333926751516c5c27d51b53dba7d1c54dec3e6f2f9911b67e31e3aeff641cf6be31dc6e7ee3de592683f839094d8b92e013e2c1d2c1f28c510b";
+  hasRunfiles = true;
+  version = "0.1a";
+};
 "linegoal" = {
   revision = 21523;
   stripPrefix = 0;
@@ -21769,11 +22016,11 @@ tl: { # no indentation
   version = "2.9";
 };
 "lineno" = {
-  revision = 57866;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "be1b8112411650d579727b5f30b0f9cd2d716b43ef5039b6ebfdf6cd6f5b39d948dddb7f41531a91fc5df4bdfc51d2182d2bb99f1c22e3a88cb54d3364dcc5fc";
-  sha512.doc = "440a8d04ffb923991699c23cae01ac2c5bc5a050c9fe66c3893d50db2138b7b204ca649303be244a03cff46f9ab19750ea1f5233fb24c7918e631fd72baf827c";
-  sha512.source = "919c0b2b98257ab3106bbecd3c25c35c723e9d4105cef3cdc8dec0fde81fb82b9da7f53de81971a1ffd9f7d1d8b6f90bf2ba7035b88e0ade1bf9d04227d21ed0";
+  sha512.run = "0a813a8e6154963d7cf7c879c4f25c2b428bdfae11e8d8e158538a64c80335078f011473a3b7ce3542750ecd2caf8edcde5b4d90dc70bf744f1780bf639fa910";
+  sha512.doc = "677d99aa82fb433082b063f2ac8f5d2ac4d2c90c0511b766524d97a6f9e3efcc64b8fa7c979ac16961eba3e36ba99948ac5f90c544473ff1fbecefc96093425f";
+  sha512.source = "a3536d669d8fac02db619a714fc3e793ddd403b034c3e3b5f3062005078444640c2b19f1dcfbebab6b69e32c28073826861037e5d1b70b2101fa0bd5c62ec734";
   hasRunfiles = true;
   version = "4.41";
 };
@@ -21941,6 +22188,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "3.1";
 };
+"llncs" = {
+  revision = 61638;
+  stripPrefix = 0;
+  sha512.run = "2783dc49f50302288c7ee4b18030b62ca18a04e791733488fca6d08cb7f5366dd2ee2541641fc6efdf1ef41c3931297b5ba82132dad7dee88cea5245dd672223";
+  sha512.doc = "f14e7cce2b370c795c4313fd2a9b197bd4ba85b3e28f3416bcee6d1f7da1920402af5f77ac8169482fd82b22b64c259589b7063ac2d4f7af856615bbc2c45395";
+  hasRunfiles = true;
+  version = "2.21";
+};
 "llncsconf" = {
   revision = 55117;
   stripPrefix = 0;
@@ -21950,10 +22205,10 @@ tl: { # no indentation
   version = "1.1.0";
 };
 "lm" = {
-  revision = 58637;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "d758e51742787410416bfa4ea4e32951484435b977c9ea3bc7ce51d919ec4d28b2ade387d3b1129f034aeb41db481bf72729fca5d24177e65d2719200798febb";
-  sha512.doc = "c8d6d05ee42d060505ecbdc3e4a5e1d0e6e3c5e919fb4be04162b45723abf697f629d412f359b6d205013d5716f575bfc4d6a7dc115fad05ab47d12ac0dafe5b";
+  sha512.run = "07448def04c2dc6805d7077b7a65b4e353c99d22d802c56ef7e147ce6a209e9b2303752b5d56763ccd44b9cccf700207e48c246b141e63deb4d1895347d6d307";
+  sha512.doc = "d628f4ad7288eb378df86b4593738c0f755ec6a08a762b38d7fda95b2cee163acd81fdebec7bba693380bcf3d2b2510281f349fa17ac3da1fbe9ec40106a728e";
   hasRunfiles = true;
   version = "2.005";
 };
@@ -22507,12 +22762,12 @@ tl: { # no indentation
   version = "0.1.4";
 };
 "lua-uni-algos" = {
-  revision = 60194;
+  revision = 62205;
   stripPrefix = 0;
-  sha512.run = "dda72953163220a2f0e7bf7cf1ca5500d45d90f8dd877c41a586e89fa60b9a038ea9f680cf1180d982ea843168f905d4775681479351922e52c3400ffb744697";
-  sha512.doc = "75c9015411a471aef18480b2aa58754145d01a2364156e56362f0665d4cb841652456b2e4929b550db1dbb33821032d456c7ae39f5aa74c7d2a80afc046a7831";
+  sha512.run = "cc7f78cc1df602e575cdbb662e555e7c382e0f409799d12ebfa293fe82a612ae0394ef712a8e8da817eb3d0a5a0790f3e3c26a22a050dd06acd7ecf051ba60d4";
+  sha512.doc = "07ddec416685d34b077b0f377569f9f039d2eebed0d1fb4e8a589d7ea6292e77ed670a8a14baba044b7eca3167373e9e4345f5ac47431f4485fca16daa781dea";
   hasRunfiles = true;
-  version = "0.4";
+  version = "0.4.1";
 };
 "lua-visual-debug" = {
   revision = 57349;
@@ -22523,13 +22778,22 @@ tl: { # no indentation
   version = "0.8";
 };
 "lua-widow-control" = {
-  revision = 61317;
+  revision = 62871;
   stripPrefix = 0;
-  sha512.run = "38fb32d72b52507e64d908f43cdb22321d70344ff96b7cda29214fdc13fb0f5012ef24785825d792590a9c712ce0059f062e892410c57e4bb7432c5399cb0885";
-  sha512.doc = "033c6ac77ca441f042578f13d0a6df1421d6e9911d4c5b7cac93c2ac5a00e2ec75b89c16b2f32bd455f2dcd41bd931fc8c14ee083d9c568f74c9c30192dc4f8f";
-  sha512.source = "ce31763c29f920cb39b0a73e66e54168049cc88c53094a5d1e69f5c0c4850af13822ecc32ad982dd5ee1f51ad46e391b370127378cbca10903a4ac7295196465";
+  sha512.run = "1a7c86a26474f085e7530dc6a6392516fe146ffe3d2164e07045f450f914157bbb2581b2d0301df4803d7cc132d7b4cbadd721b45299ba181dfbdf283c4c59ec";
+  sha512.doc = "8c2b531f59b66cb38e33109966cee399626107ecc68069455fd429cd19fe103e144931418c926d0464a515d6579b888b933ab17a9e2b5bc995ef9c525d6f2d28";
+  sha512.source = "a969e753e1b9108fb1dbb6e74af787b9f5aaa7415c6749edf02bacc3d02683044a67a4ca5421089389e6a760146a18a6921fea9aaedce5fab7857125342bcc9a";
   hasRunfiles = true;
-  version = "1.1.2";
+  version = "2.0.2";
+};
+"luaaddplot" = {
+  revision = 62843;
+  stripPrefix = 0;
+  sha512.run = "5c0046f2a418cae8056e20e085bd1504d7fe09258aa64ad61dd5a6f3198ea426f9d85f549d54bcb4c03f06fc3628e530256f524bd980baabdbb67743a502e930";
+  sha512.doc = "4191f692ef7e175b52c46db515cfbb4b11c2223af2c9ad967bc14a9a0fd432e1b5563c622a64f6cdb0e7e19da58b5ab3f70eb36cd29a7e618d4529cee3904ca2";
+  sha512.source = "11bfe0943e2c4323c9ffa60d8e88886f57e862c3190bc2b75c75fa4fd081324edeb7891a3726149826544dd01a9f315af5fca549ac26147496e084ca24c9b17d";
+  hasRunfiles = true;
+  version = "1.0";
 };
 "luabibentry" = {
   revision = 55777;
@@ -22548,6 +22812,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.5";
 };
+"luacensor" = {
+  revision = 62167;
+  stripPrefix = 0;
+  sha512.run = "6dbcc3a2870106eb49955b6e67fd621019fcd759b9d68d37e86af9d4121231e50ecaab7abe7fdc7720021575b8f6a28f28c4a11edc72f6ea71f7cba2b76909c6";
+  sha512.doc = "95cf6068dd5812806f3a7fb40349f8adab9099c453459789937c68d49e8238016575148254b436724b7764a0eee7caac2459b96ab214746d3c12ba1d268cef45";
+  hasRunfiles = true;
+  version = "1.1.0";
+};
 "luacode" = {
   revision = 25193;
   stripPrefix = 0;
@@ -22567,11 +22839,11 @@ tl: { # no indentation
   version = "1.17";
 };
 "luafindfont" = {
-  revision = 61224;
-  sha512.run = "3ed857c1297ee8ab9dbf8664b5a7a15c23da5d7e7060fd6bee0be89a0835424e2773b4598a7fc142a754f0b81d5b0825fcec8ef2824d4ea5e7a4b33ddb390e7f";
-  sha512.doc = "83bebd7e06d830a23c843a1c2af0a99d4791ceb95668242860c6c2529f84da4743f96bef3865f57088481ee7beaaf86a84351f243a79d96a92f4089102c57db5";
+  revision = 61959;
+  sha512.run = "5b763388468761296246c5cbfa63f926f68a1321cf762088e736c89aa591e91edc3f91d9a3b9030c36da5ed0534354edd851abf36f4dadb2f7cd43349cab480d";
+  sha512.doc = "1e3555311aeadf360e669210f2cf525f54d74d3f7b8a458e4a9116114bb10de63936497eb50e3965ebb204bf8cf40e37e0c737453d2a30726e1fe4a196b59371";
   hasRunfiles = true;
-  version = "0.05";
+  version = "0.06";
 };
 "luahbtex" = {
   revision = 57972;
@@ -22645,12 +22917,12 @@ tl: { # no indentation
   sha512.doc = "a6a17f70a44655e1aba11ac1353cc13b36bee762083be76a31c04d90ae73d021659219a3a741b70f0b43888d6b6a6ab356f378fa5850a23ce7423b28a721e924";
 };
 "luakeys" = {
-  revision = 60980;
+  revision = 61458;
   stripPrefix = 0;
-  sha512.run = "d50f0a0abff49a776c54c31ddc5d8361c4e28d93f5f79792ea95b081b7a352b75ae6f20f3f35f2725b513a1f5af4976e18fa3a3ad4ed5692767818959c00b4e1";
-  sha512.doc = "6f4728b77d6ef56a2fe97b7d7418103b550c0a97a1a07430f3357c78ce81d1668dd60cc051f32007ccfc17bba0530136bf5d9203bc105ecf91438a366da3339f";
+  sha512.run = "6713bf52d963018c7eec50ac321cec56eb32ff2b5145249c89ed7893195b135ea8412e48c7c4140558a2c9a020fb50ada7bbc7877e7a39058ff7eceacd7c5e6a";
+  sha512.doc = "4db16db4d638dc685eb7536e148e20e200c850e4be4d32a9eeb82c81619a6628172fa232f64f231ad90763eb680661afe5d5a2a74acd0cb4273c3e8a50653162";
   hasRunfiles = true;
-  version = "0.3";
+  version = "0.4";
 };
 "lualatex-doc" = {
   revision = 30473;
@@ -22667,15 +22939,15 @@ tl: { # no indentation
   version = "1.0";
 };
 "lualatex-math" = {
-  revision = 59847;
+  revision = 61464;
   stripPrefix = 0;
   deps."etoolbox" = tl."etoolbox";
   deps."filehook" = tl."filehook";
-  sha512.run = "ba37954065b7e61aea353106d3a5374303d75a3d1d1d1e12394112bce2048ac1b70a2f59d55708ea1be0a86c6c7eef54763629734fa4abf451f2b403a43e8a67";
-  sha512.doc = "49e74c241db69d6fff8f9b89cad23305c84a363bcf3c47fb2619d2ee65808835295cf8e7744b537a9d48db3aa436b79a564d000fe05e2a18852343eaefad7d12";
-  sha512.source = "80cdad65bf1d705d136fcf5960a10703b04c5a87aaaad609c97c130053699653477079beedf8703d11f20f88404756a27fe87adc00a82d9a698a7ca7c8096787";
+  sha512.run = "16c945e72165acd9f4bcf20f81e6c5df9ec22f19d45cbb8f076763d2d1a1a2e230938dabbadfcc065e3a060487885ac2edb223aae22d12f6981f5fca5c0f951f";
+  sha512.doc = "f5a8db238ae096b7b1a2eaa84643f063cd28e08b328cbcc780171a60c571e858a1cd1941a8ea9053392a8c65b965a81c8cd585ce2accb27e797e3e4e8ad3a127";
+  sha512.source = "e04a36a2280fbccb9572539ebc9bafba4edb7ccada25c4b3faadaa61c2f4458d9e9a90e54fa00b5ba675e59f42ed2d076b39918e5c126e2f619f2f69ff904d81";
   hasRunfiles = true;
-  version = "1.11";
+  version = "1.12";
 };
 "lualatex-truncate" = {
   revision = 48469;
@@ -22704,24 +22976,25 @@ tl: { # no indentation
   version = "0.6";
 };
 "luamplib" = {
-  revision = 61133;
+  revision = 61587;
   stripPrefix = 0;
-  sha512.run = "b713b37d4bb2a7c527105de476b66ff9ff7f940e1ebd675016f7b94ab72da8a2e2f110284f4893fce8858ef90d063fa4997cb93c6b3121802e2999efa0b7ffdc";
-  sha512.doc = "cddb68e0e74f07732acf873aa15346b3e6a95a157f0b9574b101215d6afcdeb7a9863ff16a72fb6d54b77ff86fb527b317570cf65161270b8366887148b1f90b";
-  sha512.source = "b1e1e1b5c5ea54cee1056d80360cb6f1a7a40ad3efe85417e10eff90370fd1b1fc671e9330cde65150213cf3ad9aef927c5bb96a9f5025b2bedb90dce3406e81";
+  sha512.run = "daa0a03eca57570f485d2b7decf564eb9f6614a5799d93b798310c20ecb2f055b6dd469c87fbafc1722cb931dc387eada416bb83d609d76a9cfc8c482298edc8";
+  sha512.doc = "13b6b7322faf3fda798049bada6d1737f30cb2ce7841ea858ac798fa3f63818ae6661a4e050e4dca336dab37ba9292fa19446a9e1d07a86509c0856793716975";
+  sha512.source = "097a263699067a731409704d7de358c85f4509bfc6426dccd2b193b85430413c441a2c5dc011da613e1e673e6670f7d7ed847e59c58c74d6caae66b7b3c2a29d";
   hasRunfiles = true;
-  version = "2.21.1";
+  version = "2.23.0";
 };
 "luaotfload" = {
-  revision = 59293;
+  revision = 62789;
   deps."lm" = tl."lm";
   deps."lua-alt-getopt" = tl."lua-alt-getopt";
+  deps."lua-uni-algos" = tl."lua-uni-algos";
   deps."lualibs" = tl."lualibs";
-  sha512.run = "821a5ea31a6131bea129929abbcc114959e1a32325a42f1b22fc6d37f7213d1dbb2f20cefcdcce38089d82cc366328b7dd80cad192a374694a925506073de8dc";
-  sha512.doc = "911f1037ddd942f357c1f9644dc424984e93a483b5c5a10ad279a77287cc3f9cfd94ce0113b3b0d6dc6d00dbb13814cb8b46c113ef6877b0fd0b7093caf64746";
-  sha512.source = "0669681ede7befb415e30e96c575efd9722b030f9d5d5973d13a095826900dfc05d3cddcc29eb64257b77d221156031f0dcf5a1c2f3adcae97c61bdb039668d1";
+  sha512.run = "c4042a5a1384a9463804dac9018b1d72961ecea5675033b4fe591b8c7ed004bbe7d3d62e8ae5c2749515bfa23eaf488ace780bdce476d249ce21824c05eddf56";
+  sha512.doc = "73203d9ae5ffe49d02cabdf7a5f6b14400c158a16c5d89ce0d4167cd472b73ebcfa5ecf9120c7dddc477877663521bb89ce3eeceb987bb9dae388c67eeac0484";
+  sha512.source = "5ea25226a1afbefa53c5b73bfed97aa1d7c933196363f2b1a394a6dfd10b7d4185dc7efe1ca08450d840c5e2e0ca13f08747dddb56d450ca9f1a4047c9350621";
   hasRunfiles = true;
-  version = "3.18";
+  version = "3.21";
 };
 "luapackageloader" = {
   revision = 54779;
@@ -22741,12 +23014,12 @@ tl: { # no indentation
   version = "1.0";
 };
 "luapstricks" = {
-  revision = 61036;
+  revision = 61446;
   stripPrefix = 0;
-  sha512.run = "11fbfba2f47dabd8db58e4cf502d5b033a13d08f248be071d0c8c4ddb81e7940e1b22b078e75fa50910883a17b71670d328fff00b488b9b6d3d681bc5f784d45";
-  sha512.doc = "a32552fd6c6038650f2427cbeb320f87bdde17f3ce8a3a07071b22cd71f2a0beef6c730c1af6d7de426403a3793dbc87d7e511792ebd1cbb6dea5fbf4ee3465b";
+  sha512.run = "dde995725426bda2d03aefae7062db29911ee9a0dd2179393bcc8b9e07470a378122694f9a5d059bdc2ca797ba99433bd8c31aabfcbdfb426cbf53d8922d8205";
+  sha512.doc = "e7f5f1790a9a0b6520fd808ef8bd5f080f4fb42db6f020080312e3ef4b4fd65833b48975cca33a8121c49a0156a632a7b406fb605439575fdc00ea52e12b0ccb";
   hasRunfiles = true;
-  version = "0.3";
+  version = "0.4";
 };
 "luarandom" = {
   revision = 49419;
@@ -22765,7 +23038,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "luatex" = {
-  revision = 58822;
+  revision = 62174;
   deps."cm" = tl."cm";
   deps."etex" = tl."etex";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -22775,8 +23048,8 @@ tl: { # no indentation
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."unicode-data" = tl."unicode-data";
   hasFormats = true;
-  sha512.run = "d24bb6b9ac86d31c6b43a553f8153482f962d42dde813b41f41467ec2e7b5606f065108fda172217cee9b48e8b75237365eb6eda354d16def2bc2919cc0815a1";
-  sha512.doc = "9096aa4d630bbad43fb4eecbdcb8ceaca94709fd734fe7e9a3f09a9bc5d57209c922d1359f71e8a2d1cdbcbe127d3c09c2311b96c2d2574d5356ae9f9f6bef7e";
+  sha512.run = "e938ec27451a06143eeea72cc323b0329872fa2b8f01e8d669fb8d06ca046a1673c51ac63a1f38c37df75b96b1c06b86776e83b98df74e5332be8da05827c4fe";
+  sha512.doc = "5f9074e8657d0a788d4b70a7c405c710b48004c2f37e0d6d8fbb695dbbdf3084c4932f213a038865a60cc465accdd438feea4b8cbdb8c4e938115f9d0141ad6e";
   hasRunfiles = true;
 };
 "luatex85" = {
@@ -22799,22 +23072,22 @@ tl: { # no indentation
   version = "1.3";
 };
 "luatexja" = {
-  revision = 60862;
+  revision = 62637;
   stripPrefix = 0;
   deps."luatexbase" = tl."luatexbase";
-  sha512.run = "c86d8475e8ed95f31e8068646061e08845faee7749d5bac40cd9f55c20b5d7a5410f2af7ab66c91a0b470e1f7048d95bbbcc5182b24541cc470b1c235e00ae85";
-  sha512.doc = "dfac6f66fa5248e94e9c0dacd6aca177473563411ad5cb749faafa83ab8fe058184005557495aac2b137c87f2988e85760bac454e8fb3277e4b631ab83f0372c";
-  sha512.source = "3571d85fcfb142ec58d68f2a104c375a89088e201ba0f80ddcce0ad381851e60529665e5e1ae3f7fba1d0e4aef7bc7422abdcc80e04adef9ca88747be3329a39";
+  sha512.run = "3e417b8c4d98b4cdcfe6b84aa354f772a41d2947953d85fc4485cd1f29161e06b028cf9cbb587ba76cb938b15ceffff20b3fa6281fc78110ccb902d783e575b1";
+  sha512.doc = "ed08992cacefe02ff5bd4c42bb53ba825976a6ad6753f9286fabf2d2909930f412f6fc15d462ac3400fad1987621bb1d69146710d799cc548e04d1a020b6cddf";
+  sha512.source = "91080d18f5588ed2e0b50025a208a160d7eeb8daaf8ebb6739f23741abacf712cfde91398cdf82150145341762bfe37a0efbf296cfbf468ae1359e1ef529243d";
   hasRunfiles = true;
-  version = "20211024.0";
+  version = "20220311.0";
 };
 "luatexko" = {
-  revision = 59892;
+  revision = 62832;
   stripPrefix = 0;
-  sha512.run = "0d585cd6c5a5391aa38d3cfb34d0f5f8b86baed302526d61ac4ddd59521f356f4db63d02b0c3f795b8cb7245f41b566a9c180c289e5be7297e198e5d216afbba";
-  sha512.doc = "5825f168e592b17c78a2406f27f201705f47684bf90c5916f394edc2f3c9312c4afb23387e07647f90de9e4ca6daf16d38fee9d7d15f0c3fb80b5602803f4796";
+  sha512.run = "d3c7261cddcb64caa62d66f1eaf14641bc626a961cdb320a6547d0c494b39a0ceb326a1fbf344c0e75c30b0fea202d902b4b3052b1ea0095ddc6cdbb0e1a92ef";
+  sha512.doc = "fcdacde1d4bf7dd22531c69bc6282e3aeead19f39de6c53cbb5112be78b978fb6bc0e91f3fbbb609bf219749268969a632285d22d7a106ac6c05a8c998baac21";
   hasRunfiles = true;
-  version = "3.3";
+  version = "3.4";
 };
 "luatextra" = {
   revision = 20747;
@@ -22851,19 +23124,19 @@ tl: { # no indentation
   version = "0.1q";
 };
 "lutabulartools" = {
-  revision = 61003;
+  revision = 62253;
   stripPrefix = 0;
-  sha512.run = "5c2d1b5d712801bf4bd14802bbd9d9b1cb93f51ae9df8102cdaaab463b55ec4a6c5a167a905d210947920f9624c8d882ce4a8fa9bb2fe8631f4f7cff04ae1118";
-  sha512.doc = "b4721642982af15dd46e3fcc8d8bfb5576a106a833850f66a9872ff9b8bfa5a996e618d0df7b7150482cf147515f87eef424f7be0fd65182b91bb3ee5316b737";
+  sha512.run = "881b31e9fb29a03d6f3668ae1ebc1bed9302866e8a102a9ad21792242618798394ba471a581c5235e4ee736406d5f99dfc0ef02e99423f8d0e02fa7d89d09f9e";
+  sha512.doc = "fab930fa3fd9fcc18cb9b5edc710ad9625d2525bbe1c1d98fb572b8cf049d126d6ce7437bd7bd173c3fa321023cb80e30b210837794719c17d0ada9c7cac8999";
   hasRunfiles = true;
 };
 "lwarp" = {
-  revision = 60674;
-  sha512.run = "37b2e031e75fad5fb8ce276c7bb9acc67dd38558f25394c099519c5535a8a0e27385bfe88c7de25b3435fc308115cf18830b24693c486fa918f87693d254e7fa";
-  sha512.doc = "7d325390f3e07ed8c0533ffd39b7bd4417daa90b5ee88be1312ae925a1242ba8f67d14dc9385830d81e21d643c4a9f0bb3caf60f59bb26154c81f12166fcf48d";
-  sha512.source = "c7240a571ffc5b5e7a09adede558b0996450789c40217919173244d25dc7565a6aef5cebdc0df1ead8eeab5ad0d996c0f2d1930ae4d9651a0824e22ffede26ea";
+  revision = 62762;
+  sha512.run = "4b9c76214813d2be90d1170efe4888627ab8d9a8ad47c624e5f7a908dd4a34933b8bfe6d04b924d896083b8a7de8fb85ae1ebab286c0728bedb7d0237605a592";
+  sha512.doc = "339308133fd68f616bce37448dfdef327b4bccf4befec74283a72f1b0a054430f1abe5796744a2a157bee5eca9f39b209befa73676570ae59e672ab846799bc5";
+  sha512.source = "3a214ab1243da396d2b649750ce94893a9c68db98b4b0f81f3b898a77daeb7806de302cd77b2c2bc3b8313bea7c6532dd15d08c74022559d1400ea56ac367664";
   hasRunfiles = true;
-  version = "0.902";
+  version = "0.904a";
 };
 "lxfonts" = {
   revision = 32354;
@@ -22982,11 +23255,11 @@ tl: { # no indentation
   version = "1.0";
 };
 "make4ht" = {
-  revision = 60738;
-  sha512.run = "9fabde9f3f9bc9cfdcde8dcbe343c4c9a1345573ec5bd8124523ef3b9805903553cf15f69774ca7a3e703168c56883bad72b8dc18d66e2073d402977cbb0f200";
-  sha512.doc = "31d4a239804ca2dca178789accfa640d6fbb04e38948a36712a27bc1ad42ae0dd15792df07306e48f235018e18a5349a83aee2749fa7e2fdfaf8c035cc03a133";
+  revision = 62075;
+  sha512.run = "4e05da70d09f43c3dfa10d2e8c4836eb8589b876b73b2de6ee53ea28ead4080ce58273b44556b6dfdbd200e5af9d8355e8e92526e0a5e883c707dd0c03d04be8";
+  sha512.doc = "7a377e846ef6a569bc2f3fa7b4eb245fa14c6b9435ddd3f01dd5993d734d1d8bbfa899128006b2ef5af3d3719eec2f2184ba9fa0f6393530e5abc7ba2042c755";
   hasRunfiles = true;
-  version = "0.3j";
+  version = "0.3k";
 };
 "makebarcode" = {
   revision = 15878;
@@ -23110,13 +23383,13 @@ tl: { # no indentation
   version = "2.1";
 };
 "mandi" = {
-  revision = 60311;
+  revision = 61764;
   stripPrefix = 0;
-  sha512.run = "94f561092ee67cfc27354612be8836bab835cc4f3db4cb0c92db859803429ae29f288f584363128a42fc516c9ceafb65f710777c8d0c5384bd157e2baefbdc1c";
-  sha512.doc = "8d2bf11a141d9475ca699245df345418c74185dda498098bfd5540349765c8d59cff4739a731d6220a7eb45811a48a9247d10ecb57cdcae3f468f8da557887e1";
-  sha512.source = "803989d743ac0ddd66a922bc61787d9228e96276cd2b5533c2517ce1ee05b93a2972da2a3b9529f0df441cbf0db9efc760bdc727f644deeccb68495d56e55a68";
+  sha512.run = "9bac7973ac229756b5263ee0e8a8a4381bf64400a1ee58b0abafa6765e1cea6dae0b660243e1dfa87a8072f1caf1851c11c88db81dae1b231ec6def9f965991a";
+  sha512.doc = "4debcb2b892563755cd0779db9c1784f7feba4d0e35118cdb00569bc4eaddf23423f1236f0cf28adb1c399e220b5f348ef898b0e7f1c59e031891056b9148fdb";
+  sha512.source = "1cf1912cd6db652bd927378970a1740153906f0c14e92da47a428c564c04f66f3496be8f639fcf3f0f0caab48fff0909ae72dd81085f2bd8a92d5ae08fce07a0";
   hasRunfiles = true;
-  version = "3.0.0";
+  version = "3.1.0";
 };
 "manfnt" = {
   revision = 54684;
@@ -23149,13 +23422,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "marathi" = {
-  revision = 59642;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "c713cf05356582b01440fcd0cded691e7e3c13852888c7911016bac8265801cb46bfa8969f7bac7c8ddc9c60b841f3f1dbac35488a944b6a5ca876c61085d2f8";
-  sha512.doc = "f9175cacbdb94c98c91b8e303fda02ad8952730fbc6ccd9516f5d07893b8ec524f747472752d081c47a4ca191118c8bfc4cb0c4899fbeca269a1ae71e09a4a74";
-  sha512.source = "34a9dbfaabfedf42a2deddcd2163c8d2048c331f4ea557e3d3f2ab6a70dbb75aa7e49b1da9fe64c2150f23a91f2760d8033a82a5f268f642cad51ca59fa541dd";
+  sha512.run = "5ff1e45d4434c68f09fd011fb0d0bf7652002a9ef6c36035e953a5bb9871baec4dc1998b0c0ec1749ef93cbca8bd40512457d962bf0e9f3bb4c0d36fbeb6f301";
+  sha512.doc = "8ef83a4eef0d877473a24ad3d5efb9e4d374dd1c2e00b210251ce145d889d8cf8eec7ff368d94db888b134104770901877fb4e943bf758f921b341bb7bfb5f3c";
+  sha512.source = "6cd0135286dbc64b59628e7af8e84e3c4277705bca226155ca899f9ad438751cf5f5da73dfcaa500fdc1d4779f707f8290922098409c69216a5c66e2bdbb73e5";
   hasRunfiles = true;
-  version = "1.6.5";
+  version = "1.7";
 };
 "marcellus" = {
   revision = 56016;
@@ -23201,13 +23474,13 @@ tl: { # no indentation
   version = "1.4b";
 };
 "markdown" = {
-  revision = 60667;
+  revision = 62343;
   stripPrefix = 0;
-  sha512.run = "9e0a0cc36d95aff7567a90c64fe3ab81459175c64fee4a12412184c243820f9507cee87ef1e5c49347473ea585924c24d8d386f8633774ab8360f7394d2eeb6c";
-  sha512.doc = "7be13326efc5b437395e13b373e7486909446e1b34cfa965adfa02f634314738077a5ba93d8f2d503763731a656607986b55174a68ad117c57e2a3e8bd625251";
-  sha512.source = "1ac3f533a56aa89b6afe0d7b364899f4889a4d08cdf2a00ed0e706ae7e344371225871d81cca1ba56f77cfc29681911bed1c1d37bb86c50f887295e2a4a9abf6";
+  sha512.run = "19755f35d7a93c9b27f0790cb8ff16be96cb0bca7dfdf1c0bf7460df9c422ba75d195b47adacd602739083031f006e6813fa90e7b6d0954b3a703f858432a419";
+  sha512.doc = "0a7f338246bec399817d37d5ce2d568596ec647e8454dd273ddda39678f8b90a8e9f55c23ce26cf6e7be4c3995f45f088a3ae71fc9abe0076877c48cf693f7c4";
+  sha512.source = "46dc47f55508bf0ac2d4592e7b1054bca39c36755660bfef02388ccfe15f3f6cbab63e2cfdaf3eade8e5d4b49b51e453522701a38e607c075bad076e19285f0f";
   hasRunfiles = true;
-  version = "2.11.0-0-g4505824";
+  version = "2.14.1-0-gb933d81";
 };
 "marvosym" = {
   revision = 29349;
@@ -23219,12 +23492,12 @@ tl: { # no indentation
   version = "2.2a";
 };
 "matapli" = {
-  revision = 58635;
+  revision = 62633;
   stripPrefix = 0;
-  sha512.run = "540a0ee0f38d910995437efabff5b4775a5ce496275407dadb99a24d969a90bef7127abeab535f00db5009db0e90d3ecaa85651f735db027ef87ea93051421a3";
-  sha512.doc = "907b09780665470c0055594b3908fb875a9af575195f603e343e877a47a8e8d35d492cf2e03bf1ec9f62bdbecc973384c27bad09ca0ecff5636f16c4cfdf6b2b";
+  sha512.run = "9162f74f8accd8cfe3928681b9cd6fb0d78c120eb9da8cff8a1f8413f41a723bab853060e2be251d17229adc1d4d84a378ed2b34fb4a43b59553f694f49ea9e6";
+  sha512.doc = "ebdebd6c132cf7f31720db70ea50a9626fcace2c441606d4634f45a686d164a79876b030484e8b0887d34bfd4c177e0ebcc2c467662e86c3731cc4e545754fff";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.2.0";
 };
 "matc3" = {
   revision = 29845;
@@ -23351,13 +23624,13 @@ tl: { # no indentation
   version = "1.01";
 };
 "mathfont" = {
-  revision = 53035;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "5951daaa320cedea9d40ce0af8b13f9e15e926bcc14cc31f64bfc92bbd22e5a600e1c696f0e7bbbd1cf6a31141c6d3a985433a8000df7c0eee0139c40393667f";
-  sha512.doc = "a09ec87af77663740e5cfcd271e7ebae1cacbee24a31093912a7ef3925827bf35800db424d3a88a40338fb1f1e63d033071b8cd3449493d6d3a64ada760289b1";
-  sha512.source = "8120ed30e7911dd224586f66ac93bd96ef3b87684239a69c21868968d112532c49d2d0a356e05ec17e1fd05433898c83b20dc3e8d8a51539d46a4ae53998fba6";
+  sha512.run = "d865f7aeacad69848e20419e9ef88db46f70c04d0e9f9f0a8388cc35fe4d98ef1af26aa6060892efb181addd8b14d592f2a1033be26451979adde7762b23bcba";
+  sha512.doc = "05cc45350103bfaa9954b458e77a001d37edf0686de855f6fd2a60069454f7aa8e1e7b266a13eddb74d1a32d151ee529c9b4c0bc15e0e563b1ebc4c4036f949d";
+  sha512.source = "7b4a411b4783a7d1a3e1ceaca8c26e6831ead98f8f73eee63b2fa452399e95505edda1bf983759a8261e66a1436496b02c5811074745b64fb64b4d93fc361e22";
   hasRunfiles = true;
-  version = "1.6";
+  version = "2.0";
 };
 "mathlig" = {
   revision = 54244;
@@ -23417,13 +23690,13 @@ tl: { # no indentation
   version = "1.13";
 };
 "mathtools" = {
-  revision = 58856;
+  revision = 61937;
   stripPrefix = 0;
-  sha512.run = "ceb283012776179cdec04899c28cd55c76811d9ece89b3ea188ae47619296db94983f8b768dbd0cf0909c9e7da4b0f1b1bae7e3de4a96193249ed57fc987683a";
-  sha512.doc = "c4ae884edb6c26c832d920b8f04b31641359fcba68e208b9f0eafaf37ba3ab7f465a39869b9890d0b8431861062414be52d9233836ea60a6255731a17374bc9a";
-  sha512.source = "46a21e495a34fc85d59d7952f3089e59f28d5aaa85e980c49c6b61df49c6e7582d98c2da1092be80a2a6191f6186395ad8d7086d3638176933843a6592c2c8c2";
+  sha512.run = "cf7624715cd7b228f47a00e7084af3da423b91cb7dbe0f9e9a868fe0643a74d4cfa81eb3e3438076b06b8750d15b0e51b4a112a723d6f080ed772772f0cc0e87";
+  sha512.doc = "a5b1fa02e530d6198e9cbe858c225ea50d3c4a6ddd87edf1f065e6e04b5132a84f40c108daca6462fecec3608d222f2ff5e561ae2754ec33b9a3c7c1de0ff926";
+  sha512.source = "b8a90dccb339a97fd5297df7b2cf34aba8db482d73ac5a5a744659bc3823d374932822452d85ab50ca5db72c9f04c6f10bf5d2df72ea21f8d88b15b320d6ffd4";
   hasRunfiles = true;
-  version = "1.27";
+  version = "1.28a";
 };
 "matlab-prettifier" = {
   revision = 34323;
@@ -23443,13 +23716,13 @@ tl: { # no indentation
   version = "1.0";
 };
 "mattens" = {
-  revision = 17582;
+  revision = 62327;
   stripPrefix = 0;
-  sha512.run = "9ae7b4d3e3386a5c9b94a30eafc02d00c9a6376ed356755ba283f7b9b43fc27d3b9dc2994d808360b77d23f39014e230434f404bcf6dc20bc974d9efae97a3dc";
-  sha512.doc = "d67ce30be2e20c5182460b8e567d955c41b364383acd350cba1c07b52576d78016a865148ed871ce7ef3f937eb045201e64e5d5f52fd5b173fe93cf84def2119";
-  sha512.source = "d199c5fe62172d98e7184a2689c3415944128251b75ee45e0629da5200cbb7b954cef1243a165ce2713582afcdac30dcd9f1445ffcaa18a69ece0aa79391d852";
+  sha512.run = "f30c542530ff73eaa62ca593e3a23dc09ee7aa0a7b40c2d7a1aea9e880fc6811cfc99f5451968fe5261dfebdd85571e49704becc097ba1a47bc7b80227f87f75";
+  sha512.doc = "cd161e82d2cd19ec241c403a46981a91df14e86d88e9537f35995e0be730c06797d18f543ff6f960f308bd728bcb965ec3570c8d58aa1a430d1bc529d132d430";
+  sha512.source = "b15acb5b7aff6e8829874a5e8159e84b0bde2653c3ebf48b5277ee3f99830011f0e7a61fdd38c02becbec24d809a07967b7fd5dd2371ad8a8d17949ee8901bca";
   hasRunfiles = true;
-  version = "1.3";
+  version = "1.3b";
 };
 "maybemath" = {
   revision = 15878;
@@ -23483,12 +23756,11 @@ tl: { # no indentation
   version = "0.5";
 };
 "mcf2graph" = {
-  revision = 61354;
+  revision = 62679;
   stripPrefix = 0;
-  sha512.run = "e702c5a9c9b3bc1362badeccf71657792ab6412a5291356779d4818e9578a4c90a658e338b804546bd773dd28e3524f0d4460e59fd772831e645211fa3ab8353";
-  sha512.doc = "a376540a7911f3be5d34e719afb6be0b15893d3ef078dc8584a9dccfd30ebbfe2f191dd9c4bbb9b47e5e45282b934cb3503c76fb757caa1b89622d2ad4dfea54";
-  hasRunfiles = true;
-  version = "4.76";
+  sha512.run = "30570fbfff668869e020fb0f15c694a176652e8c4aaf8679f0b491c4cb372160ea60f755631091520067f43da5a718db28ee045ea6385a82764a73ab097f2c0e";
+  sha512.doc = "da7af37e0965ccd7afe2d998972c3e59e749cda2f3e118f6b6fe4158e4927310cfb91c9abfd257b67b6b83438843e669f2e812ba617b152fea48ab1251089ad9";
+  version = "4.82";
 };
 "mcite" = {
   revision = 18173;
@@ -23568,13 +23840,13 @@ tl: { # no indentation
   version = "0.6";
 };
 "media9" = {
-  revision = 60796;
+  revision = 62787;
   stripPrefix = 0;
-  sha512.run = "b0e69e3309359acc85533724fe3bdaf3f5485de7000e51b412281fc1934d03f8050d7cf39cba1a4346cb5adda605cf24303a997aac30f308fba565aedd45b5d9";
-  sha512.doc = "0578ae43ab9eb94129cb24a9ed8986d8f4c16dbd5797fa2db302833992a49ebe62e8eef5be665ba93923a90c2a2615631b7e61c10b0de8f09ed97d7857eb63ca";
-  sha512.source = "5ee30f8b68aa323bfff2234d45798a713d843aad80146421d7d1fdd997014d23d037e67f73f8267e5b827cc76c20321983f6150de9ce9fe797cba8c25c68c1cd";
+  sha512.run = "51040a58924b9c6d827e348f9c52c84e85dd7fd0e046086e95ff43ded46f918ff2b54534a576f5e8399484e07da686fb3774f31593d36fe9089e39373e12c80b";
+  sha512.doc = "4f5bf3361c98041a550e6267217f6abd77655804628134edd502adb8ee7631135376d7c268707041c6a22e76ea7993123ca40317d3edaf9f752bc8afb3da0793";
+  sha512.source = "109631122ea1a30f2d178cc50aa24147ab2593c187e940cb110f6325470c8ec4e74c8a2465be4b921893c23f855590bfa3be4fc01bec679b4489f0a681ae5eb5";
   hasRunfiles = true;
-  version = "1.23";
+  version = "1.24";
 };
 "medstarbeamer" = {
   revision = 38828;
@@ -23615,13 +23887,13 @@ tl: { # no indentation
   version = "0.1";
 };
 "memoir" = {
-  revision = 59610;
+  revision = 62105;
   stripPrefix = 0;
-  sha512.run = "50709cfca673907333c9844d9199d8ebb7d17f22149bca7a8a5b986d0948c9af8577d4678a038eca4324d30c67917927d5410411d106ca6083143344cb0597b4";
-  sha512.doc = "90eec6d9a4d013f952196f7761f7a4b54784739bf4d847a415896240820c183bb22c5a69f25575da400d08d8b1e8cd9503df50a8a478ac9cabb2e618f0521b88";
-  sha512.source = "2a28c7038f21b71b29b91732e8872110f5ae5bd3d9f9b5efdf5cdf06b91f98de3305d23a71185a74f363c6e51c802576e8a6c3862cea54ed1096b380e2681c44";
+  sha512.run = "526dc62682d6a081cbcb5b3fe4fcdef784efe32e73455bf57d6f9c29fc0b70f0edcef47f74a6ec8c8702b27a24a0377090ba4ed321fdbea481d4d82d77d8f51c";
+  sha512.doc = "a96bf91f04d6c09c86b48be5e0797da15bef53661495b18e9873cf68ac1707b8d4ea44a8784e625bfc0ed8303d4c5433f02b48dbafac8582dd177ad8772c4f4e";
+  sha512.source = "28bf032e0fa69f28258f1085f9c0c36d563287881639e9f146410c75e12d7c00e8404dab16a73d6e58f85a531e7579fdb33f50606fb9e865b1bec9e8c29004e1";
   hasRunfiles = true;
-  version = "3.7p";
+  version = "3.7q";
 };
 "memoirchapterstyles" = {
   revision = 59766;
@@ -23713,13 +23985,22 @@ tl: { # no indentation
   sha512.doc = "d67a277eaa4e4783d9014ce5d8fe67f7c7cc17e04474150b1c5a9df13d894ef7ddecd599464a68aad95ac17393b1a3ed0bec6fcab5aee0b7c53c89c8674032fd";
   hasRunfiles = true;
 };
+"messagepassing" = {
+  revision = 62560;
+  stripPrefix = 0;
+  sha512.run = "6355051b7a66d648b9b1b06a93fe692ebe71d7b7f05aae919f20595e8a954768848ea6df7011b331037781d1ac85e4a298e5b8b95e08bcff07b443eb8eb57b8a";
+  sha512.doc = "3cc7047819ea35fba9366dea4aaef7cf38e7a6621d9911109fc916f09f09bbc72ee6dca151c0c93144ac431877641983dc20e5f1dc4118d4b54e3596b9cdf2b5";
+  sha512.source = "315f26c691eca595e61cfd1919ec8c1f6a5ed8687b2d39fd307983feec952fba2207a4c82ab5f8abd3bf3883e458e3368a2f569317966a0defd2740ac66cef60";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "metafont" = {
-  revision = 57972;
+  revision = 61719;
   deps."kpathsea" = tl."kpathsea";
   deps."modes" = tl."modes";
   hasFormats = true;
-  sha512.run = "7ea3271c2a9682ae5ee29a05a95e794f4a6dc5a6244a6c243e856aaa857310127d5593b0643d4ca53eae7feb9c205574f5ea216b7c3c0b731e7f98be99bf1588";
-  sha512.doc = "95e7221ac9e3438d4cae336296e7db855df9a7e49ebaaec5dfea294565824938f3d6544459cee9ecbf17312daad4e44c92a7a9a65269feebd2b819f226f305bc";
+  sha512.run = "1e767aecca37b0859f44a92da1dbfdafb807587d8bf30de513ab7fd230ce00ddf627431afe8d476cc51239dc21badee254a434cd3759c0e4640ce435c4a77baa";
+  sha512.doc = "425188cfbc28a9664514f680fe0f58950b78a34635ebf4890e53404d4f3236703a67dc569fdd069b3bcea54fedf65e26af3ad4af580a4f49f0f000b394ff9012";
   hasRunfiles = true;
   version = "2.71828182";
 };
@@ -23780,10 +24061,10 @@ tl: { # no indentation
   version = "0.91";
 };
 "metapost" = {
-  revision = 57972;
+  revision = 61719;
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "3a3e14f2be0ff7eefe322d4cbf961e62376ec1815a5aece95dc028ce6e75978d272ae04f972aa686ffc7eda27a9c1978f9d4201d33e143fa3cb657f57b260d47";
-  sha512.doc = "a0962cc5094703f577bff3c1b93592d93684f9b3b3045356db3461cbf52ba853608dd3af1432d42e55e2f13cf7ad98c41232f06556f42006c3498e23c87b7f82";
+  sha512.run = "f510fbadbe4b3bdbd0593d246346bd6db5704eff42ed65714e6cba4ff430d6da748509168da0c68a227275a8c9e334399405daca9060819856d7dc29b23517a5";
+  sha512.doc = "4a4de6a576d8879037a6618516ebb1e91704c15786441c236d2763678dbb9757b6e0ddbef42ea5b2f0ca4e228984f5f65d77007b340195c84a74e214164a3865";
   hasRunfiles = true;
 };
 "metapost-colorbrewer" = {
@@ -23955,9 +24236,9 @@ tl: { # no indentation
   version = "1.0a";
 };
 "mfware" = {
-  revision = 57972;
-  sha512.run = "77b679b6b81515451da4b6068b5e7ee793faf8bb209b3a68356aa131e0fcf27ffed912ee72a3bb8f347e7db2893115de5843351dcdcb6a3ac49a7e88eacacd56";
-  sha512.doc = "3655d6796318db16f26dfa3031a0339608cc9e6d7d18698628be0ff1cc9234c95d4914a2fd047d775b83bfb9fe3a2091e52e4a8b96dbca86ee901fce0e99fd5b";
+  revision = 61719;
+  sha512.run = "867f3ae8517503fd08f965c1c62d3d0e4afc84ece022ba7731c7fca4766780f03bc55896db337d68ba84dfefdeef31cbec37a2111484a002c2c782ebe685577e";
+  sha512.doc = "f90eb4376b40b52c8851d089f039a35be1f963813d640b55cc2961f41a6106f71a51b2e3afd95c5f8285d476997ebfc9c0cb49b86c88b652ac89fcbbe5f10414";
   hasRunfiles = true;
 };
 "mgltex" = {
@@ -23970,7 +24251,7 @@ tl: { # no indentation
   version = "4.2";
 };
 "mhchem" = {
-  revision = 52662;
+  revision = 61456;
   stripPrefix = 0;
   deps."amsmath" = tl."amsmath";
   deps."chemgreek" = tl."chemgreek";
@@ -23978,17 +24259,17 @@ tl: { # no indentation
   deps."l3kernel" = tl."l3kernel";
   deps."l3packages" = tl."l3packages";
   deps."tools" = tl."tools";
-  sha512.run = "32c9a82b2c4f6c2ca5a48d3f781206e4384df91a13d2ee8f7f5ad0ee5ff454e6c70c545eb576b4d8431cda581ed1f8ccd57dbd22d281d764c4872fef28c6626f";
-  sha512.doc = "5911b5548fa03abf787ca009b08553e3e575bb0d6601f36d878d7541e5e5cea0fcfceb5c3c69e6459f3aa6b791f8090bc244edb35c116112230bc5928b15f901";
+  sha512.run = "fffeb1ce083d8eb3da6543409e5cc735c9699f9145114c8325c336b93d2dab2a9976fc448c6324318407c3af888cb91cc7764fcf3bd24369e4940f00dda66429";
+  sha512.doc = "cd4c41a329489149b3f2bc79dd50e0517707681f452888394870459d10888095a0cbb7b7c18500f04264c6c85f791d9af9d799b1b4e221e991af32690e7405ba";
   hasRunfiles = true;
 };
 "mhequ" = {
-  revision = 38224;
+  revision = 62562;
   stripPrefix = 0;
-  sha512.run = "90f7dabe6486f6566ad6f835838ddf58a6568364ca2b5a82ea9cb96f283c5025c1f93fb50bac98405e8200de32b2c27e592e401a44fab691331fe4f77d27a202";
-  sha512.doc = "0d7a258a96604328231c1784f218ef3351f9ef02a0a9a9da42db36c89324ab5f74559f3ea91c12553ec5a39d14b3a5f282f61ab9e001994e22e266ce394df26c";
+  sha512.run = "b155a980e9cd46c19200307e9252e76f6843cfa6f078719bc587b8e2f6e0291aa5a1bd13327cef46826299de73b5ae95d83cd0434c4cdb51314b2dde487ec295";
+  sha512.doc = "27b99b591ccf7b4429a4f80a0f578e037a53781a3abf827d5cd057a04541d9af809987daca307a6ff2197fe7b55560d62845066c665c02a24a8d5235572b2e43";
   hasRunfiles = true;
-  version = "1.7";
+  version = "1.71";
 };
 "mi-solns" = {
   revision = 49651;
@@ -24009,13 +24290,13 @@ tl: { # no indentation
   version = "1.1";
 };
 "microtype" = {
-  revision = 61266;
+  revision = 62718;
   stripPrefix = 0;
-  sha512.run = "9750c821263b26667c9a235d2f167962fbdd55ab3719a8a5234be15a47381138120af4a3c40627a9a827e08cc7c3166290894ca17b5c76f6d952e34c663e3897";
-  sha512.doc = "c48e763db211d9405b4da181a9ea079cc03c64fc21e7b04b26dc5bd3e70bddf442a92774a75b324dc54044a7f1a300f4d5f93464a0aec3c5764a078bf15465ef";
-  sha512.source = "4362c81b57b88291cb8dd11c050a2da56fac0f372b5d0ef592468114ab8f1b6f8580d64db7128d9ce0486d4489afcda7cc1f12fa04e02c687059c02e15c50211";
+  sha512.run = "ab7077468c11482f81fc59a64fb07dadc0e562b8fbd6ddf326a91f27fd23c276fe42ebee39e0fbc702e4876ec4539da82cc0db1dcc6f2c9851885d2f66398672";
+  sha512.doc = "50c6f588f8382d5071e5789f3df1f84c9ee9af7833423e317b474f124f86676457cce6b85f9d06383864724e554c080e56db888170fe423c328123b00a299cc0";
+  sha512.source = "6f4873de50445ecc7ca9ef4ca53cfe77683eb5be44b4059003d7de51fb0f4c645e72f75da332f6d62343e235d7ee6c4101b7eb98061d15d3873f9cbaa8c7ce44";
   hasRunfiles = true;
-  version = "3.0b";
+  version = "3.0d";
 };
 "microtype-de" = {
   revision = 54080;
@@ -24065,11 +24346,11 @@ tl: { # no indentation
   version = "1.02";
 };
 "mindflow" = {
-  revision = 61338;
+  revision = 61843;
   stripPrefix = 0;
-  sha512.run = "6e71e0613bc99917ee6e9b2cdb0d28fa2171e9a0634cb1f79eeec21b10d589f1d8cb3905248f98ef6ae226c55af88124f070a350f68e3fedab6452ad82f85b46";
-  sha512.doc = "e8825858001fe04e667f7c5b6952b816b9ef4cc7443b599b366dc86176d7ce2408dbb39f25360e56546bcd62a3434b0166e498b4a92738ca75bfe2bbecff129b";
-  sha512.source = "247c5debf10715249e0d46b4e7330a587cc8c57ba5e3bc0d988dc93b6ebb08115f80a15fbaff1a53700a1efad4df21490a67d13b468d1e5dae16f4b562a2ce1a";
+  sha512.run = "2c54cb3fffdb037329ac7cc02a4821a16b0ad1b2a4f3415ec247ae1d48ad24e8b86338bd7b2ef8a004a70388b9468766e997c6fde896c92339a450768fba7b42";
+  sha512.doc = "fe12152f885fb65a466fc0aa2a1921a2bf3a252c036a86330700ccbf0717c256a49d7675f4e3fb2f45beabb5329123aae85bd6a0560fbf8c13bf290a7a46421b";
+  sha512.source = "84657523767c4e20b77cc2ad4fd860c33c5d9aa03720f4bc0cbcf1d37970c0b2f4e27259ab414e681cb049696897a3480fc8b7a9baf45052699b3b8d644f8479";
   hasRunfiles = true;
 };
 "minibox" = {
@@ -24100,58 +24381,58 @@ tl: { # no indentation
   version = "0.96";
 };
 "minim" = {
-  revision = 59536;
+  revision = 62420;
   stripPrefix = 0;
-  sha512.run = "f5a7c16a30f877c0a867b4fa79d00721e48ce1790eac136a474c74310867abacdc14cc5ff62fd6c3a8d856816edf8838796fab90eb4acd776b202422d92414f3";
-  sha512.doc = "b65c4714dafb1b5199e51cc294dd5a28f974e217b3d888eaf6b517cae8ecc0c8e39ee70052b46e51fe40e517c6cea423fc33828b99e189fd9b3f5014c71d7db4";
+  sha512.run = "0fdff4cc5f8c5690b0efdad9941b428ff66787b430b51e54486b66c80d0ed9e6c5a9eb1676fde65acb3c6cd107eb4a15f424ff35d879586b805bda3e423a7558";
+  sha512.doc = "c534b29c7c6e9bc7dd3693d9c9fc48ea97ee162c0a629c105a3649589833f5702164f0a324afcb9065729d499d87b529059fb66f3617133031fb82af3efaffce";
   hasRunfiles = true;
-  version = "2021-1.0";
+  version = "2022-1.1";
 };
 "minim-hatching" = {
-  revision = 59531;
+  revision = 62396;
   stripPrefix = 0;
-  sha512.run = "2ef4fdef86cc308d2202fc2a60a410679b6f4974f2770d7e7a348dab5f26059c652a65a7cac0832781f29b5eeb389d7a5ace0ebeedc65a5ba6efce03c705a48b";
-  sha512.doc = "2535f5d3958d099a8f1f8be8da0c871b1149346f700b2b9c5c6bab873facf659549491df979c805b7e328bbcacf0e3e679e39ebdab64f9395486099dd39507e3";
+  sha512.run = "2ff4d6cde5410a576f2f8bec2a185c71c51b5d20e78a9bb13f0b14fd0c99b3e9b7b68e958e8bd0cc98678f48e148ac13ef36057fc593447baa3afc3f31195b45";
+  sha512.doc = "1d5cd011b134fd264c612a0de07cd714723925d483256d764142925512f283c8677104d9ce4cb820a3d94c8ab46dcea839025eab227ea6661408672a52b6c6bf";
   hasRunfiles = true;
-  version = "2021-1.0";
+  version = "2022-1.1";
 };
 "minim-math" = {
-  revision = 59537;
+  revision = 62420;
   stripPrefix = 0;
-  sha512.run = "c9d48b920c26b20195e4afd1a8d7f74a3862cf32ded6be1739ea2733ad3e2c1d727271a8caca5dbe7992438ac0f43289f50272615ca63f34f585f730467303c6";
-  sha512.doc = "3940f8a9fd61b4c9901f8c69f3bf6303e40ae805aca619f24be14a187d969a55e8a6c73de9c998f987c3375c3f453f4fa0453a9d316be7a1d85a2a329c6cf28e";
+  sha512.run = "b9adc3bff2da4e710dee5277a266049e0a67567d2f6377cd0d4d527f1d1e98aadae6ac61a75367fb52532a43ca34eb040d7ccd60e29c95b42d0d35134578c017";
+  sha512.doc = "90e50645986da31fdad5a881b410ade79b9723c7f95a8e2ea44c77f624e8322a1acacac9845cb1319d0dbbcf4d1b41277ea04f145a0ca9a17f64843609bd8a81";
   hasRunfiles = true;
-  version = "2021-1.0";
+  version = "2022-1.1";
 };
 "minim-mp" = {
-  revision = 59538;
+  revision = 62420;
   stripPrefix = 0;
-  sha512.run = "a98b4db3e303fb993852b92901937e0f8031269e5ce51651fbd59b787574504bc8948522243e3525efe3eae68c2fc00030763dca855b605575c722d5ca89aecc";
-  sha512.doc = "a1398b441bb27a3a7e340edd152dffaca406fb9b4151523e64132f8a13c44bbdec22e3aba22208dc60a2d209c0337824cc54ed4f32910ee91d709428dfc029d4";
+  sha512.run = "0c925b269262d9b76e9fc502c39a8b4245a3b711ac17e3b76b1a604a79c9b8e0ac0d2a48d6e9af61a76de85dc9c4e32ebe053d83d93b1fb9ebb83a52a224904f";
+  sha512.doc = "5744ba4c705d94e44a7e29b9d4077f71493dd2a356a5d031b2208bbb0ab0ce91a2b7988532a3c1eb664d319bd4c9d823d69cc87e97caa83623f0970dade31c49";
   hasRunfiles = true;
-  version = "2021-1.0";
+  version = "2022-1.1";
 };
 "minim-pdf" = {
-  revision = 59539;
+  revision = 62420;
   stripPrefix = 0;
-  sha512.run = "e45568da0fff7ccb2024cc791cf48303d1368946227cab47474790de647a4215a55f898d9c9c6e402ab1693cc211a77f8d9e3f637ded806ea587fbeccac84ce6";
-  sha512.doc = "184c5224f703a7f2713e19a675855921a0effe47aa4bb57b696f232539eab8fb1de35eb8da51f49f9e74b0c903d8f63879f3405087efffe107f500d858a72464";
+  sha512.run = "518996918c9dc5655192a4e3c257008d8927e6a2fc3659fd5c42c2ac4a4478f05c54568299f3bc2e141c14343d7a964310f779df2810851c64ccbcf08b68a606";
+  sha512.doc = "c7a38db79db2e7986b54a0e1324d6462424360e419fe6610504ace970b6a7fccf97027ef64e558038d5321c3e6351ac4a90aa6dc483c8e925729d29c6c2bb0d8";
   hasRunfiles = true;
-  version = "2021-1.0";
+  version = "2022-1.1";
 };
 "minim-xmp" = {
-  revision = 59553;
+  revision = 62420;
   stripPrefix = 0;
-  sha512.run = "24ddab94e49752a686822aa10035f93da45b6fbd1612411602238608769bf9675d19aff2de49e74ecfebc36474fc20a2a0120c43cb93a2f8da21b4e0d4a1e6ad";
-  sha512.doc = "2f33c23fd359ccfafe7e4679ad6a55bf97a6464f565ce6ef893fa5b0e1272ec2bc4b39baa4fb6cc20c7d19400ecdb1ee3d6ff0f5b6bd6472f32a9c91bfd78adc";
+  sha512.run = "68a4b2fe53aa194c9f74708382ff27f353128b88830feddf2d431befaf6a85be0e425bc9880002a0e5c58181b7182fd46fedb27de19513404a7c221dfd6901a5";
+  sha512.doc = "b1abe6c747b479ed7a4b5f188eff2e748f1aea3c114c709d3f11232af9b9ce1f526f51e196bfcd8925027c49421dd1e305b7b099e00cd8de038fbbbfb5927597";
   hasRunfiles = true;
-  version = "2021-1.0";
+  version = "2022-1.1";
 };
 "minimalist" = {
-  revision = 61338;
+  revision = 62834;
   stripPrefix = 0;
-  sha512.run = "1b18601e73156f176f983641d8fc638e5601cc4c167a31caeaccd9d4107727f501bc74444c6720d159a4e55206d1784149f4ce68e89a6fe9dfaabf860132fbed";
-  sha512.doc = "bbfbc5199250d06b567d4e47a2b186368db223831bc8c6d64847f2347c40033862ba4415bf5728333951de642508df4e80d8e6b20844238b20214848da34a1ed";
+  sha512.run = "4edc0a37d9f56b6c20bbef0bdcb8049d985a18abdb5dd713a6259dcc9e157d2810c2a272778c037062605b6e522c07494eed11a2a931729b4e2bc1857968a0b6";
+  sha512.doc = "20a529fba559aea4db0a32d566899de050aedf1ba81237caac4011d2e23845073474539a9c71b2fc43ad4b1b4086cf1ddebd6df6f9575386d842542aab094532";
   hasRunfiles = true;
 };
 "minipage-marginpar" = {
@@ -24171,10 +24452,10 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "minitoc" = {
-  revision = 48196;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "c5af65f4c1d7c19ac5bca84a6a8b465a6d00805164e0224ad3adfa473dbff8604d1ec39958568b3ab611364bf09aa671d277a7458595eac130b121b0972ee32c";
-  sha512.doc = "c193a77791f3304b09ae58faf19490bd68bf129c8ec435c378d3ebce6ecb47c284ab1e1412d10e43dd2e4d5ef60a9fc26088d8c35054f6099fa2675076adb6ce";
+  sha512.run = "e2d2503ac4888198c56e9007b20f489a04e31fcd29c946c5504b7d193506fb58e2577c6085be5d9d17c6f5b21ff77208810385c73688468f3988f0b651fb81a4";
+  sha512.doc = "15955f17dfe2916081156e1464299b598f1bba780518516f6bee7da55cd1c45e2fc90c27402ba9d8ab4a994ba5ea1675ca9593699792a08407cda5b3a2230908";
   hasRunfiles = true;
   version = "62";
 };
@@ -24221,10 +24502,10 @@ tl: { # no indentation
   version = "1.8";
 };
 "missaali" = {
-  revision = 58771;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "a077053382e5ea428b274239732f8bac2a4b943e19d40110df76d19499768e12f47c37f7b9d132cbe2023821fe82d4667b414b9114cdfb23df9534bdab2b5214";
-  sha512.doc = "2ba1713de8741c0c01eac1e35ebfbf544baeb2e92ffc587960c969e0ca01a141fcf983e99796e239cfe639ab4ab686875393f12649f0528024c0779a8f549893";
+  sha512.run = "552f53302060b3f4c764a669feea4fe1dbadfa3abf53c226f9fde2d0e876bc8992ff2dbd4be6cd3e261ab0e01ed4d1ad2b5a38c2cfb780c4fc099a79ae52b46f";
+  sha512.doc = "c80c201b7d3fa5808bc337415e86fe7e009ceccaf8020e587fae72f7024452f7c02b65ce48b2e8543c9796e8b3ea6431e0b8a5f1dc25b5adbd6f2ae7146e75a4";
   hasRunfiles = true;
   version = "2.0";
 };
@@ -24301,7 +24582,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "mltex" = {
-  revision = 57186;
+  revision = 62145;
   deps."atbegshi" = tl."atbegshi";
   deps."atveryend" = tl."atveryend";
   deps."babel" = tl."babel";
@@ -24322,8 +24603,8 @@ tl: { # no indentation
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."unicode-data" = tl."unicode-data";
   hasFormats = true;
-  sha512.run = "0b3fe440055cc4c943fe8cdee93997718a3625782c5b2962cb514011f2038ad14518f7cffc55dee41f0a57f7401b8f2f493631a2b9cbeb806ae75ae80269f3b5";
-  sha512.doc = "a3b962871878f3f34c2d419fa9ae1c27518f3901212796d32649b5524f49fa103a71f46403726b9568ac358ab98afe7b23356a0f2d2d8592c0b84cfc186d5f53";
+  sha512.run = "e04f33b83474e58c4725abbba21ae56659920ad2929faba7f25b47befeeb7e207e36888e1dbf7260ecc95c126e1732f6f5dced3d277db7c3889f2b08590b04dc";
+  sha512.doc = "e9d5a1cfdc6183bf99ef369b447c73e9ec5926952a80a75708db4fc6343ffc1a10d599276c13f295005f7c8c56e2e35ad9edc9dee3ee06928fa8c7b267d82bbf";
   hasRunfiles = true;
   version = "2.2";
 };
@@ -24379,7 +24660,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "moderncv" = {
-  revision = 61324;
+  revision = 62128;
   stripPrefix = 0;
   deps."etoolbox" = tl."etoolbox";
   deps."fancyhdr" = tl."fancyhdr";
@@ -24391,10 +24672,10 @@ tl: { # no indentation
   deps."tools" = tl."tools";
   deps."url" = tl."url";
   deps."xcolor" = tl."xcolor";
-  sha512.run = "3ade3aa7bb82b39e63d83f1827fc3b09f324d5c28e07e4d97b2e5ede3c2b6a48b2daa913885678dc35789742e7b6c45081bad2cd54c97c50ce72c08a1b28a72c";
-  sha512.doc = "47dc6060ae81ec7da7d1107dd41c2d3fde1d7248739975b07ef51a64bdc049add06b02d42997bd8efc3645a2281416f8f37a614cf010c0df4ef42bfdff944a24";
+  sha512.run = "988cc5f400af4ecdfc0730a63d7f2a13fde81b9120f198622a5e2d145ca94e1d5bc952e261ef2f4cacefda8a23626119975fd1e00b44f4a66b1fbb7f4c011d40";
+  sha512.doc = "9527fa84fffc4eb2ac92dab59cf0e5ae87a6f5befd4ed05acdd85cc7050dcc669f8b814ef928e69bb1c1e8bb3bd774aca1f85acf6b750a1c9555a3165eba0281";
   hasRunfiles = true;
-  version = "2.3.0";
+  version = "2.3.1";
 };
 "modernposter" = {
   revision = 47269;
@@ -24414,10 +24695,10 @@ tl: { # no indentation
   version = "0.11";
 };
 "modes" = {
-  revision = 56303;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "09318fcdb58e5175882fd7a2750ae71322d0be227a2131e05c8b9d20879260c9ac906a735582c1fc8229f3ad4e7df7b71d6a2a6ba9b82c653463947d59f9116f";
-  sha512.doc = "dd7d78b8b355d7d056d288c0026d83115878abf91ceb183b48a3505620f0be4c8ef04ed0259a8f5a079c6191f33fc1331e9a3b1660b9312d165914b9176524e8";
+  sha512.run = "86931543910145093d3141fd40512ef6c1a99901a757d178d8ba592761c25638383f9511f4937af657c414642341c05ad6278d871e5d397117e03cf86706a9ac";
+  sha512.doc = "4ba301dce255d22c23cd732e6c1b1e887a96918d594a06f8386563b0ca46fce015c0cdf17aecb2fb13211360a7db24843ec99664b048a53ed0ac76a1a4188c76";
   hasRunfiles = true;
   version = "4.2";
 };
@@ -24648,11 +24929,11 @@ tl: { # no indentation
   version = "1.5";
 };
 "mptopdf" = {
-  revision = 57347;
+  revision = 61520;
   deps."plain" = tl."plain";
   hasFormats = true;
-  sha512.run = "69181f1facef413b4e2317180f8dba551fe40bb06e6af8d9378319d8cd3fdec985241e632f19888f32b70f16a40d11c66581f7e3c409bc38b7cfad3733cba2fd";
-  sha512.doc = "f0cbd95500324a6b5ca835d62065c83028241e0ce5fa35a313458dc30e6726a21a6d1c267669627061d23f2dd7d7397f471581021e03c817c281cb6efa1d2769";
+  sha512.run = "3e5bb2983ea7329e4d3a48a29a5902d0245b0bd07f6cc3d272358701bd7df8bef808cd23810a70ab60209dea2d8788624e98497c6c04c917a59874a84ed94a30";
+  sha512.doc = "7bb6c2bc9dd0bceddb4b5aaa8d7143c40fb41baac2065cfbaf14642acb33bb7f05703d7b8469da0e92453ec10f0b8252d00b05588d7846835d622be097a83f8d";
   hasRunfiles = true;
 };
 "mptrees" = {
@@ -24696,12 +24977,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "msu-thesis" = {
-  revision = 59613;
+  revision = 62408;
   stripPrefix = 0;
-  sha512.run = "531ac0d958cb9c8912c630f7ca3e74964b91681b27c202e37c4dc80e862758123d41b4a8872b11d372729e9967739fa4ba938418dade78ce27ae7350f1580f88";
-  sha512.doc = "844c69a803874331252cdb4a83a7df8eec1d9d1573bcb1d45161ad254be3274f7ba0e4da330c31ce05ee4818b5eac32a4ffea5555f1befc1030f114a9b653886";
+  sha512.run = "df550aea08a92c4e5bf265334db2b0a7e44a5b1127db9b178959b2de0e523517ed236421a753f59c4c4ba1b77181d5343b3aa32e5eef89e9cd369173f28dd822";
+  sha512.doc = "f5bfff2561bfadde943debb5fd27131879ea9867b0dd40e13f694236d67ac33105dcb39ea432d9c82716c0326ba6fcb4a13a53cbe4757b5060b1d98e1ea62aeb";
   hasRunfiles = true;
-  version = "3.0";
+  version = "3.1";
 };
 "mtgreek" = {
   revision = 17967;
@@ -24730,13 +25011,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "muling" = {
-  revision = 56991;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "d5b89d93bb67e46618a30e5bdbc988a6849a7cbfee84f4486cf4557e750ae53f64aad188f74b1a96b1dfbaddfaea3a6a0380bd955ce79ebeb095fe1a54194e5a";
-  sha512.doc = "ce1e2ac1e50e164bba6ff3911fe9ecb8f85ff2930f21f21e6721e153ffdc9c81798857cfe73c62f783f8909a644efd9f5a048565e054b0543973c4625d96976f";
-  sha512.source = "877f34b070dd1549f649ce99a322f7221c9dcdaae5aa80ab36c6e340285ac9ebea09e9496ec87e6d881608f30d9d7b24faff6f8671f57a2b18ff96a127a30311";
+  sha512.run = "2f6521255e8e0ac777130f0e108ccacb5a81f74264e6d7b830514e292f9733ec47dac9e3a618143fd9dee224ca60ebcf85a74d4c14104cb21e65d2b4d4c59908";
+  sha512.doc = "8ef724f07c630e1fe6511d0b8846f4729084fab1ece44489b0fa4cb40dc506cb2f666bc84b9a020103bfb98206d3c3f44ac78203a86d160f1b4e7f55e2f2f77d";
+  sha512.source = "9aa6c144a54359d48e9eb7f0425e88f7e790ecb2c6342ee86b92d43608b3ee595f1f2b17c3e2ec66f2f19e921004ba5068c8fa45fef598c0cda51336d608f89b";
   hasRunfiles = true;
-  version = "0.2";
+  version = "0.3";
 };
 "multenum" = {
   revision = 21775;
@@ -25163,9 +25444,9 @@ tl: { # no indentation
   version = "1.0.0";
 };
 "ncntrsbk" = {
-  revision = 31835;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "e023d0a407f666de1415728a90014041feb5d04ceb1007e8fc293452ecef1b9bdbd014adedb9e25993e57c0196632b1413ec19893f4c37c26a8e8e42a20a9de9";
+  sha512.run = "cafa6f6ba366c07bfa0fe37ae415cf924ca54249288a52726eed52b9c8147925b6ac4a85fcb69a19596944ed8585cab4ce8fc2710a7c32998b360ea2ab143d56";
   hasRunfiles = true;
 };
 "nddiss" = {
@@ -25217,10 +25498,10 @@ tl: { # no indentation
   version = "1.03";
 };
 "newcastle-bst" = {
-  revision = 59904;
+  revision = 62509;
   stripPrefix = 0;
-  sha512.run = "183dfc00f4b2a1bf0268ffa9387331c689c53cac297be84b7d93840ea645acb57c311e5a10e13a25843c16aed61104b5114f4fa9c2acc9a7e6b834327a312d5a";
-  sha512.doc = "45929373fce2cef1131a9af22b09f5b60f47a40fa90a47fe09c2c9dc51ce73b9c3a6bd3f979562ae418d53f0a442dc3574d255039e5f1f169acb426d8a64abb2";
+  sha512.run = "3697907bafeff8c7612f5dc8acbf6a5d13f6c522f4160b5c6d427188d5d4f738eee48b90dd87b4467401e8bd191191af373b9bdf732a42b8d88d3506201dabe5";
+  sha512.doc = "c2bda7a311b2273f98ca67b40e44a96db028890c1e716687d00b62a700fff81f80a3ed10bd58f80e4bf772371cdc1751d4a115a7ff14dd4555b290db7554c347";
   hasRunfiles = true;
   version = "1.1";
 };
@@ -25285,12 +25566,12 @@ tl: { # no indentation
   version = "0.51";
 };
 "newpx" = {
-  revision = 61404;
+  revision = 61806;
   stripPrefix = 0;
-  sha512.run = "8e5391da65c0f37b3f33d54b03896aa3b8740edace54e1233d36109819c1a2ca6a5a32882524a44c5f46013da55bce9b5f1383277ee65d5382d0eb9f59bd04ac";
-  sha512.doc = "de3d0142a43eeb416c2694a81a3c3d75fbb27925447598bddd9a569f330c13e7718a7f77616c3d5cb979ac2aaf208784bc518656a4466647f10233f7043591f4";
+  sha512.run = "19a2ae1d832d48a082d3cc693914ff93475a3d4526347fa49dd35a7afa56c65f98ff54ca49f9f1674732922e36bc6e66d8b368e0bc924270af9b4ffe04347cfa";
+  sha512.doc = "ed38d727e5d8af16730df66860fbf2dc0701d9ef850fd2d77dbeaaebb38e826fd435f9a78e3771f7498c2fdce25efaf59909340e330da84ae831b880ee7393b3";
   hasRunfiles = true;
-  version = "1.503";
+  version = "1.505";
 };
 "newsletr" = {
   revision = 15878;
@@ -25309,13 +25590,13 @@ tl: { # no indentation
   version = "1.0";
 };
 "newtx" = {
-  revision = 61408;
+  revision = 62370;
   stripPrefix = 0;
   deps."kastrup" = tl."kastrup";
-  sha512.run = "b4a0df083e9d490bae747833ad505d1f5374dadcbbba63ca9a088104762f0096996b6b5b58cb30f74adfe2ec7ebb40d6fe7ea184389df3faca3fe55a8dd36f2e";
-  sha512.doc = "e6616264b98e0ef79f1df3beb0697387262831a4f3fd23dfeede9b8f66cda0c425b61ea50fc788609ce08e0301a43588cfc43047b980ba5d2598e60a9ca67fc3";
+  sha512.run = "422176ee7322b2c98064aa10d367f812b240f2d9d440bc1ef1339b25429bfc398093974ba511e9e6cbec01f13e8841ad6a6b7372b5199b4b1c2b367d11f657d5";
+  sha512.doc = "db0725c233d0f135b434cf8690c87d9b433c52e80aca8e0f62b873438028d8793660e934f97b255ffa67cff75751a9635487ef3d4a086a0bbcdc8746bccfb2f4";
   hasRunfiles = true;
-  version = "1.7";
+  version = "1.71";
 };
 "newtxsf" = {
   revision = 59227;
@@ -25400,13 +25681,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "nicematrix" = {
-  revision = 61142;
+  revision = 62659;
   stripPrefix = 0;
-  sha512.run = "0fff589d39fcf7745b5c32829b2a5c0db8737f261fb6f0e3f5e037fb101312eb45e7ea62c63d3bbf4a036430593182590d27822d1ed9cc27699c63191aefb04f";
-  sha512.doc = "ba4f5d753b409e79e9d518c8597e9969557dd22a8c4942c4567c371df311b026e566337ef227ee7a32b9f8b82711d199582d1284a03ba057dc0e11c017485c09";
-  sha512.source = "8bcee0caae05c1a85143f2d7c7d9b7480c22b1cad8c2d5b87546232891f05da84022c56e17bbb6e45e67fde59ae1ce39a5340e3a4530828203b4b78b93d6df69";
+  sha512.run = "59c91ef3e70e190cd6a9809ac53c798f43133de1978c5d614e26934b12ba20ca03259b5936da70fca31d8630ba377dd8a805af57b4be625ae2798e7dc4157713";
+  sha512.doc = "2428ebd792d4b63f744ff238dcaa6a331d23762514f3ae9099cdb6e6c777eeac2f7a2317f49e4e38287846b344c1c545057a32304b204c230f94fbd6be15b8ed";
+  sha512.source = "6c53b7e7fd5753ab52f40345802e81637e1d46c16f2bcb83f08750772cc739454318df450cc7cc7fa48e50356d9869dbe7e12b7c77a408ba4220be544aac9004";
   hasRunfiles = true;
-  version = "6.4";
+  version = "6.8";
 };
 "nicetext" = {
   revision = 38914;
@@ -25458,12 +25739,12 @@ tl: { # no indentation
   version = "1.1";
 };
 "ninecolors" = {
-  revision = 59330;
+  revision = 62006;
   stripPrefix = 0;
-  sha512.run = "276b119a025ed809dd17a1f72ff19c341247e5efdcd06d4723b8e489139223cd937453d52231e9bb4a9facb43bbb19135f34030f502d9bf63ab57f3d44b915ff";
-  sha512.doc = "b22ac4ee6e32f33b93a2776bf43fb7a1415b5e681de83307e3f793eb516742fed3eec180b98992bce5e2fbe9552074c70109fd5217d6ab10f0abe22064df52b5";
+  sha512.run = "f755768830e02aa434432ab4e879646ad43d092f50b7e38e39009c98327c5ddcd23d0b5a7ee8d8afad30e69b6219bb871a14dc7b274ae11a60aec33df2c94ae6";
+  sha512.doc = "0550d7b4a8b7040541edf156c5b82bf61d350a21c732c4ef324c58289eda288b7e30edd1f36d8650d453a590bdeb97b61d0c782f3d945b033b0fb746b6c802f7";
   hasRunfiles = true;
-  version = "2021C";
+  version = "2022D";
 };
 "njurepo" = {
   revision = 50492;
@@ -25474,23 +25755,32 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.1.2";
 };
+"njustthesis" = {
+  revision = 62452;
+  stripPrefix = 0;
+  sha512.run = "37f06d8e92e19da4005ee639ab66bf8c36d61ac06e203d3b21d0e402aee2edb7115c40c26dcd9b358e0a9d5f36034ad435334b4ec790e3fd54b2e0667b7351c7";
+  sha512.doc = "7e4020892be4abcd5ffd003dbaed06d811b9813a6f2907c97c5fc2998b1b403dca71f72f1dc23d3452a61c53c2b3d33a2365070559d7257ca6447dca888c20a9";
+  sha512.source = "095fce367bd02654ad9f47253b345cd8bc830a29633cc97636f4bdca2967aeef17587603407367300216b4567299a3cd0ff48154a7cfc03616a4499e0c5ef072";
+  hasRunfiles = true;
+  version = "0.0.1";
+};
 "njuthesis" = {
-  revision = 61293;
+  revision = 62814;
   stripPrefix = 0;
-  sha512.run = "599bce07768fd6cf8a3d7ac110b30ad5c5bb4dbef0a9b08e692fd98b1c9b8d116080e8cf30b6bd240ff9e1541fe62837309449b9644540bdc6ec910d717c3c76";
-  sha512.doc = "ee2c429baa8429b8f1012b1f61a88404dc593d8e1a5a21ffb7063b3667cad24adf270ba0d5938edfcefcd6b2e4423bcb19c65cacb3aa0aaaa805c91ea9e3f3ff";
-  sha512.source = "9a5a398756fce1051dbd3b55a61191a31a5d4bcaf953423da8ba5d7d2aa11a561ea2f6aa1ae833399775ae242de3b3cf182062ec7716a6eb3e3d0af06e646769";
+  sha512.run = "cac0709c3e7cd09e4ac6243c78f4adcd19db585ca5e3b6a96aaed048bbadb1b22b073e1be2a4766e080d4faabba0fc05d542b93baf8140909b915fad30958d7b";
+  sha512.doc = "e5717261f583b679f14f863e3599dbbb38b8c72b268cb9688c99defba72ce04256f248f9eb20bd48b4eeedbf5cdc228318eda74d8bf83a5901018297ab5fe67e";
+  sha512.source = "2bab3b29b93038957ffb3d04db795cc6d51e31a4719661ea859de10c54a343956bb026fbbb8d034a42143de468958ff08e0589b5695a874a1f6d8734153b64b1";
   hasRunfiles = true;
-  version = "0.13.0";
+  version = "0.16.0";
 };
 "njuvisual" = {
-  revision = 61179;
+  revision = 61555;
   stripPrefix = 0;
-  sha512.run = "385d9dc8153ec75189159eeefd3bb6721cb21c974b9c13b6c622f62683167b18e63c52b1a407189057f0416238ce8d5e303459e51ae2926c21e925cae71d30c3";
-  sha512.doc = "0c4528d1f674b1af677c0d755a59c65f74509efe4a0dcc13e7f71476287d4a42864a7a64574502d44a26107ba3356524f909c9f393bf5def4e0ac1384c72b3a2";
-  sha512.source = "137eab9b1c65d7db91a35555bf99cfd7d0ace4e66ff60fe47e3ce083036edc4d67f3ccc26dff8df5f086a277cb62eee39e184be17c7552be902f69ad34ca75e2";
+  sha512.run = "46a958d59cfb73728f30123dd4a2eb046ab59de57ec8144adef14e6bc375c45c1e71effed5b179b88bc05142ae3ab9e0210cd890f3b71d3b23a53e828dae93e9";
+  sha512.doc = "384ea71dc4ce25c0ccdafb820136f6af2093525e90ce158bf01709335a033e6d05705a3042db1ecb437863b5ef0ffd8042f3cf1b7d6cb33e7e3e30014da28800";
+  sha512.source = "5078f3abff181a14941846fb4fb6fe1b130e8708ee5a03111b8ccd55158101bb0a27a78ddab36c914a5449e8d467ff453a24579dba28beec498536cea7c9bfc2";
   hasRunfiles = true;
-  version = "0.1.3";
+  version = "0.2.1";
 };
 "nkarta" = {
   revision = 16437;
@@ -25905,22 +26195,22 @@ tl: { # no indentation
   version = "0.0.1";
 };
 "nwafuthesis" = {
-  revision = 60187;
+  revision = 62873;
   stripPrefix = 0;
-  sha512.run = "56f9b8f7b3075588b92c51ad680f4be80599b31ac8a5a1b9da08a65ba84c143c2d028c7a83b45915464906c2184da82ccaf3c9c0d9889164ede27626bbda8818";
-  sha512.doc = "10c9fab653bedb469c1dad9a554276da52936240a48581a28035e867d76675bd9dd3230afa8d082780c8511efd3a0c0a18809e4d2528c7c7472d4cdcfab86324";
-  sha512.source = "b5393c09d910126e8d1b9bccee745848157a2f55fb3d9c725abb3a1311002a3343f6dc5aae6b346909beb485f55b2c7becb38f53a9d26c43066928edfd4a53b2";
+  sha512.run = "40d3b0d5f097012bdb2813959622ec6855aad491e19aaf56c87fcc9807c3ff3b012a2349753f47f58bcbdc5aa7ed530d6e4ccd1ad0274123537267f09e96f7d0";
+  sha512.doc = "87ad312f741700cfa24dd215500bf61202318a850a881676639bc7f5539f009296688fcd33e746345cd112ed8bce295e93b379667895409c424ed21e3ad4725b";
+  sha512.source = "218cea39d0125dd005e07977eef9db53f30440fb86e357c16898ec1422071847453065df1e3a08c76028737b24a61dab8e2967dbea989cddee9ab3146b3ac08e";
   hasRunfiles = true;
-  version = "1.01";
+  version = "1.10";
 };
 "nwejm" = {
-  revision = 60753;
+  revision = 62129;
   stripPrefix = 0;
-  sha512.run = "6e03bc619a93737c3b83e3a32b60abf58d5f3bb155a3a8c9d4096f036c06ab4c3511ae085724ef509bb70183f9104c71a8b73d43f29d89ded2ebe870b6b028c9";
-  sha512.doc = "e19ac3f06b35d2bedc00218daa4d2068ddd0e86a57e163f0db37a74a11447de223854a15815039d9a2cec4a63297a7b4ba68836650c1c2e62076bc71f33b8b44";
-  sha512.source = "1c79fa4fa12265d361fc95aae30b300d4a2ab37db12278f16e39466a6e42c43ea5866a85198dc722bac5b491bf743b65f7e9bf23e0a3e8bfbb4f267ddae66d8e";
+  sha512.run = "5b349e509088d67543f3cd133b96cc475166328853a05429a368e0be6a96206a09c44ecf7ee4cd7de6a35cf94de3a36ce70b4770a8dd8ee1d6c2e574a95138fe";
+  sha512.doc = "8ecc8f7e439b8e5adf7d34dc2e2adf40959db22eaada9c9ecbcfed6c0251ad9f26f614a6150a35c4eb4407bb3715aa7078d71c66bdb808e117874582b5c469e3";
+  sha512.source = "89b999e52b400ec5ada8316ca47875e692813b844ae7f0bde2b260354caa8235a2e26a96e2ffdff6adf8cbfacd1bb1d5f504fc902d58467bfaa9255a99c79066";
   hasRunfiles = true;
-  version = "1.0.2";
+  version = "1.0.4";
 };
 "oberdiek" = {
   revision = 61066;
@@ -25938,11 +26228,11 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "objectz" = {
-  revision = 19389;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "e98bb9208838b8e55d9fe793af3eb6439aff2809067878051a9849cf483a42e612ca7c9a43a86520e582161b1a9f575e4e7a5f4bf7bbcabbbbdb314595c58fd7";
-  sha512.doc = "afcb2681f0983c345ddcf4cd484d337461a53af27f6d5467b12a5368f6ce3974b9d54cdd77365995e7268895f4f0edbb814a4f4e61e4cee947f6ea49c8381d85";
-  sha512.source = "c2bd789d5acb1174aeb50cd3eace6ab67d0074adcdb8c00d6ec0581be096a931a5f9a666630e96abd30dda31a418eb7b9e6e0f06c3d93eecbc7a287c4a7e61b3";
+  sha512.run = "15aab03ef1773a4ec72a3dea3fe036cca671abd3e55721d69201c43902d9655a9b71b6b109c13824015a9db740cd8e463016f59dd84a22a3648c14cf7e95f2cb";
+  sha512.doc = "b1918ee04b6b1755b947d12485abd250ec91ce4dfe52403631e00b6c3dac88db2c3c3801912c952d26a00b06d8dbf7a9d88586ab7aa348aa0b2ec7cac1e4fb2d";
+  sha512.source = "77332f847ae68cfcbe61b1568e7079a9d2c5a51012c0de3bbad166df71f3cc2af61317d886e4092192e647ad2ac13c7f768b9397770587910ef63a89acff117e";
   hasRunfiles = true;
 };
 "obnov" = {
@@ -26166,7 +26456,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "optex" = {
-  revision = 60332;
+  revision = 62641;
   deps."amsfonts" = tl."amsfonts";
   deps."cm" = tl."cm";
   deps."ec" = tl."ec";
@@ -26176,10 +26466,10 @@ tl: { # no indentation
   deps."rsfs" = tl."rsfs";
   deps."unicode-data" = tl."unicode-data";
   hasFormats = true;
-  sha512.run = "96f6fd5ed9156cc06987d2145443f020cb42f24b183e9798623b2fea40843a1e7cfc9f09f5682623319177c8839303d8f514e2a6932d8d603e4b4155633e3056";
-  sha512.doc = "28a8cae2c7ad190c1f512131b1cabec89881188a91b2b5a8d652ec7a72de544e4f256b29c6f6ea1376e2943f04f3080cac66cdf2001a831e0c2f04971410f654";
+  sha512.run = "2676e89351da6b1154e323ad85a4c559bafed1418f41a554229d40cf15cecbf523d161f7d50f595801843ff0c86989474d5076a531fe1a1e32eccfb0b781b92c";
+  sha512.doc = "cf0a49524d4934037444c7b842582125fda9fabc7dfef9afc2c43b1ed12d28b26a55ca2d742812ae029e14bb021cef9e4a9eb23d6fcdc6cbaed1a97e29590316";
   hasRunfiles = true;
-  version = "1.04";
+  version = "1.06";
 };
 "optexcount" = {
   revision = 59817;
@@ -26299,10 +26589,10 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "oup-authoring-template" = {
-  revision = 58661;
+  revision = 62509;
   stripPrefix = 0;
-  sha512.run = "138fe4a15f05a1c5b952febf0af211d1b3d13d202ce3cef953b770a1779464da6f7fb1cdbe77ac0f617cb1a1eeed4cde09288fe61cabea439570fc2a0a254df9";
-  sha512.doc = "35c7e4e4597924adda46994a50e9e55f8af9f440899bb8ed3c85549d94f96cfc601436eebe0db730dab68762957121e1ddef094f60ed7eee041abbf80a841aad";
+  sha512.run = "a626a91ad26049236e6b9e69baa274cb99884fda7274921bf7488f71e4e4d138a8110bd551791dab57afa21c3640fa0ada144e0de3cf56865edf13375ad353a9";
+  sha512.doc = "bb261dc4a4cf0b7f65add70d2738a391f81424919fba485b50ce91f01a2614ca6e9a433c02105766180111fbbafe8e4f165942b013b8ebbfd6e35d3dac7af1cb";
   hasRunfiles = true;
   version = "1.0";
 };
@@ -26448,9 +26738,9 @@ tl: { # no indentation
   version = "1.2f";
 };
 "palatino" = {
-  revision = 31835;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "f21fdeb0423853294f52427bbe1477bbfd49b1a6255bed5f561dfa2156cf8309b2f71d2c09ad74bd64bc1fd69fc73816e3d84e72d975db5925d4c3c4db6fe8ca";
+  sha512.run = "5db043495b8daf0a5a854367ca1c82007a154d09b2bcae9f399e8f851f30a554fa98970cf45ccd8f0681f70ae7e01f54dfd414bcbd888b802e93993c2ed172df";
   hasRunfiles = true;
 };
 "palette" = {
@@ -26620,6 +26910,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "2.01";
 };
+"pascaltriangle" = {
+  revision = 61774;
+  stripPrefix = 0;
+  sha512.run = "0736284ad69dc62a9f97887f09aaf4e527438d068147319be8710c53708bf88c156964c9737548df4b2210b1e6bf5219d157e5d5baff53a510fa373684a8eda5";
+  sha512.doc = "137c13f7878fcb5f3f2e7d4d47d05e8a25f7fd19f58672d7b521ba944a5eea22e90dd12418d4b056dbb1a94faaae750a9f2e06e4dfc8fcd206609f5f95e97a5f";
+  hasRunfiles = true;
+  version = "1.0.1";
+};
 "passivetex" = {
   revision = 15878;
   stripPrefix = 0;
@@ -26707,12 +27005,18 @@ tl: { # no indentation
   version = "1.1.1";
 };
 "pbibtex-base" = {
-  revision = 40986;
+  revision = 61914;
   stripPrefix = 0;
-  sha512.run = "4c807466ddae93f7b12a62fb32b4a8a8dcdf16eb8935548aaeeccaa90de15484e396f307f229cab8a2980212aa7627e80047502a067847114ca7ff6a9ae22c3b";
-  sha512.doc = "a87c2feac2b0a115ccec0ced7ed9b5215c8b7501020a4ca14fea9a5062bc0994fa31c892c1a738c582118b73ff4df5aba371abaef76d3c15a00d5268bef85031";
+  sha512.run = "dcef21019daca2ec8a2a649f58f3e648cc580c6d46fdb1c7a315fd66fe6e9075dfac8d12dfe901be0487272419cb10257007b8e34a0a6d11d93f6b5f67b5f988";
+  sha512.doc = "897d18ba8ed56a44541dab0d07c0f1fff059e08ae02165b1205e439bb3b0b61484a2008a8a463690f9fbc628fbd462d271643957715a32a712e35cb9dda3bfd4";
   hasRunfiles = true;
 };
+"pbibtex-manual" = {
+  revision = 61915;
+  stripPrefix = 0;
+  sha512.run = "6e5f1058a6e8c1ad0ca88638b91fe9dd1263f733c0e1da4d04edf345f584419ef4809126a583fb99abc308bdf1bd21c85934961ca9658267f3c5b3092279fb99";
+  sha512.doc = "3b574a4d681a91a89d45cfd89f614a44505ff450fce32432508abee13469cf6f4a8e8a1962685eb5e610fd5a14e24e38ad555ecf86f446d7a6d4d6964ab40fb8";
+};
 "pbox" = {
   revision = 24807;
   stripPrefix = 0;
@@ -26805,10 +27109,10 @@ tl: { # no indentation
   version = "1.15";
 };
 "pdfextra" = {
-  revision = 60553;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "6cb9903d116aea1fdb6a00f9588e3815a4dc56b5e4c2eda19e665bdc87511c7e4dce2a94c792d3a87c181e476f06cdeb0c71c02d48fcc265c77472a784faf98c";
-  sha512.doc = "398f316661cac3977130970e50970d04fbbaf569ebe4ae6b9434eac4a5a8155fa6b1e45cda929dc19f8cb82991dd8b760c3ece64af54b141efbbe83f570d385f";
+  sha512.run = "2276413818e73fe0c1a6dcde308a5ac00b3d094f5269e7fbee90e35fa336ca5e79bc888bdefc67fd132e5bab1e43ff0b9d3728fa52792a1faa4138f360da78b3";
+  sha512.doc = "5a937aaad731f643b7b21002e42a28c556459e6025cfdeaa171922a5d54432d3756004c4ad72c88448b520ff0270cb25c4c6c3eb95b231316c1c4b87cc1314dc";
   hasRunfiles = true;
   version = "0.2";
 };
@@ -26836,13 +27140,13 @@ tl: { # no indentation
   version = "0.12";
 };
 "pdfmanagement-testphase" = {
-  revision = 60347;
+  revision = 62764;
   stripPrefix = 0;
-  sha512.run = "f63501fdc8184135bb649fa15e22d055a4e17a66e57411c31f6c455cfaa6680d0047eebaf34969c031ebf3f55fcce341ed1f6c0365dccf8bf86c808ff2465b4c";
-  sha512.doc = "0107d3ebfa15c1701a0fb2d25fa0ae19c32a38add6866dd262f0db71b59dd194b5c3127c56242c756db990a0cf6af674c9dec67f892aa6354273439b0d98341a";
-  sha512.source = "4c45ceb89d8625c7d7a7a264bf1d31eaa89a31f5ad4e5d956f6a312853132eb1e550ccee23aab53ae03850a691c1bd8f4154b8a7273f4b4ac4150735e219ac31";
+  sha512.run = "ffe6e5815aba360b85995d93b891e5d398183f6bb6d93dc0d94cb3b9bcb96cc427ddaf8157e65df009566499754255d86a15c787e1342a98a1c8c36cf70e2d7a";
+  sha512.doc = "cb48f621027458f09d4b09078ae54aaa15acabd6e79d67bd7a4682f884cd7f31c06266988875718a849de71c19fd363486ebc232bf4f0ea8e083de3e3e76815c";
+  sha512.source = "4654aa05586f6297e179c8ae87859cd2b26e2bf77eed5677a790abfd7be5bbd9d998aed33f97f15cf4c0224193c4a3aaa0c47c09480cb4379970112c8959ceaa";
   hasRunfiles = true;
-  version = "0.95i";
+  version = "0.95m";
 };
 "pdfmarginpar" = {
   revision = 23492;
@@ -26870,17 +27174,17 @@ tl: { # no indentation
   version = "1.4";
 };
 "pdfpages" = {
-  revision = 58212;
+  revision = 61801;
   stripPrefix = 0;
   deps."eso-pic" = tl."eso-pic";
   deps."graphics" = tl."graphics";
   deps."oberdiek" = tl."oberdiek";
   deps."tools" = tl."tools";
-  sha512.run = "a2b9394389ef8a14f6e82b4b62e33fa1cc18c2f7c1069109afdec8ad5769b4869c10b8cc50118aaaa6af87b08150979744cd16898804bac40daa043e49d36aa9";
-  sha512.doc = "b71da54d15d16ea74e72e09a46403d545e32c8e0fd44abf2b3bb7dff7ed1cc51c93bfacaa482037adb2b0010b060366836c25e66def3144ed504bb6623629f80";
-  sha512.source = "979c80e7590d9d1b40d667a69da2e2311ecc814575189d8411f13a1095ca3f09dc5ac97a40d4eea2d6a22616d1312c3e4aca45777610f365d24ef97b9acffd50";
+  sha512.run = "4baa870f33d598d596ffa0ab540460828120b77fe3d0468aad4217837b15dbe4a53f75fc861c632803f23b26f7bf127aaf57e34c37c6d753179564488c779000";
+  sha512.doc = "5d934c70eb0de4335ad147fb2957f1623916f4e85906f86574917054f3c86036c81b5bb90c07f795e459e29f92cf25b62c2b79126ed5a165f24d5a81f3383321";
+  sha512.source = "9e02d45a236fb22e2842c893dd0ea9d6af88aa3e5c95c041a2f058a322bd8d2c748360687ded04559abae6ab933955166d1b5e66da834df8405512b5f9ba1ed6";
   hasRunfiles = true;
-  version = "0.5t";
+  version = "0.5u";
 };
 "pdfpc" = {
   revision = 57735;
@@ -26939,7 +27243,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "pdftex" = {
-  revision = 57973;
+  revision = 62145;
   deps."cm" = tl."cm";
   deps."dehyph" = tl."dehyph";
   deps."etex" = tl."etex";
@@ -26950,8 +27254,8 @@ tl: { # no indentation
   deps."plain" = tl."plain";
   deps."tex-ini-files" = tl."tex-ini-files";
   hasFormats = true;
-  sha512.run = "17c2b07af5e14f9f581d1094f4a3657ec1fe2b19fa96d952d1e4859265dc26e42743dc1fd7e8d6a7de56867be1b50a7071524d0580a8a680c605146893e7ff1b";
-  sha512.doc = "8422210dceae381676a4c03784ab2c9b0e9233913eca6d25a9a7d5c5675f9ecb32f0a93dd624dbcc715f20d7e386a7844ea00e6e85473c1af14f8e384cd3f61e";
+  sha512.run = "d650630b9c552540cc1c510b3915cff4f9dc91ec403d6f49e1f8f3da172e47e2372a9fa65958e6e7558ec2ba4cd413fb0817f4699265ae37bde40b7e314c3cb6";
+  sha512.doc = "a6b5e38755d7858ec110a6006a63fc82ccbde93686f87ebcfbd9844089ce5c50a6dfa615ff119329df37a01245718e36ab963ab55077b0faf3c077a44e64071c";
   hasRunfiles = true;
 };
 "pdftex-quiet" = {
@@ -27031,10 +27335,10 @@ tl: { # no indentation
   version = "2.0";
 };
 "penlight" = {
-  revision = 61326;
+  revision = 62720;
   stripPrefix = 0;
-  sha512.run = "d6f1e6d6d3e8ca2fc38905f5c8af74fef1a02b83dab7fcf00dd12802d062a2e0e74307e96ec53f226ad0ea10bdb1efda0638d1af0c6ac43a991a7bad27c97fc6";
-  sha512.doc = "78817dadc25de4b7ba7e065a8bf5080747d041de530d0090073b14c4acffc4edb7bf2f2196a0f4935dcf6219d7f846f395b99d5bb980ed1df5dce0672bb648d3";
+  sha512.run = "5d2f7ed720d50bcc1b9bbf2af965478863a343160b63496bdc50aca1ef63cfaf3add6f5ca9358ee074c2de2a94f1ee9e626643de9021517cb869371928d00d7a";
+  sha512.doc = "6247ced2a2636bf0595b0b4a6833086bfc01eb65a49b5b8a812ab716b4615cb37d203ca00fcb62a8d01253480b6ab04a54cb07fb0ec228d1d032403dfa9a54b6";
   hasRunfiles = true;
 };
 "penrose" = {
@@ -27148,6 +27452,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.2";
 };
+"pgf-interference" = {
+  revision = 61562;
+  stripPrefix = 0;
+  sha512.run = "569dc2b0f5b11d93aa447d54649df07c3df375dcdaab509229d0304bb25523bc45062916089b15776b727a9c05205688a161bc79cfb4abbc466a243b2c8c57a4";
+  sha512.doc = "106f86c28759b0c105a6f57df9c8df416190f781b73f1bbb7398fde6e88192fca5aa3e198e7235dfc23c2fc3bb41a5cd0cfa060f9dbac4faab30bf04c484e9f6";
+  hasRunfiles = true;
+  version = "0.1";
+};
 "pgf-pie" = {
   revision = 60115;
   stripPrefix = 0;
@@ -27265,12 +27577,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "pgfplots" = {
-  revision = 59243;
+  revision = 61719;
   stripPrefix = 0;
   deps."pgf" = tl."pgf";
-  sha512.run = "8f4661e193d6b2d9a5e3f488ff7f35849fe559fe4587b5050ac67256aa4b93e24c79948e8f8757eb901e6b531fffffd6597049b1e457d79db36d5043f00e10e5";
-  sha512.doc = "998246b7c5415e910ff168ffea064aed80957a9f29b09875f8871c9f04d2a52c50a33f7f3cd490a1195c5566ce310330cfba0a5bb7155eb14b944e05e9d1557c";
-  sha512.source = "0ff864f02131b1f46cd03cc01c9c25e841542c42e87599b7652866d8f0e73be9b836e70784f7b77716745a6dc752c7ab9fcf4837a454583e09a6b53a845ce6ea";
+  sha512.run = "8244e65860f37d74d05535a627ef6cd321407a69a142d156bae190c562a9402a0d7e927df732c32cc5f556dede1b51f7aeca5d7d3a26167348a21f2e3d8be5ac";
+  sha512.doc = "720a77c574c81e7c3619e3b988c8a359bd6cf284ad3fa7c795eb01c371ede85ad727dde8e5f19d8f683947b5dc5752324581e364c59e8a644b5ae34d6b75a96f";
+  sha512.source = "d840015854794de1a311f1d8a9935a93c71a098c46fb1c5cec8a57228a924685f75ea76fc9cf2a9f9f30ed39920bbf2092fbdef2645ddaa5ad5a3787839c1d2a";
   hasRunfiles = true;
   version = "1.18.1";
 };
@@ -27688,7 +28000,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "platex" = {
-  revision = 61273;
+  revision = 62145;
   deps."atbegshi" = tl."atbegshi";
   deps."atveryend" = tl."atveryend";
   deps."babel" = tl."babel";
@@ -27708,9 +28020,9 @@ tl: { # no indentation
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."unicode-data" = tl."unicode-data";
   hasFormats = true;
-  sha512.run = "bda130dcd16365c2a280f9ebcefab940d50de17ef18088076943e70df147e7fa38cd9cf45025c84e7e0d5fa5846a539cc9c7cd5667fbc88a82f41676284f345e";
-  sha512.doc = "4b2104e4e19b515bc96aa38a1dd085f29666b3a5aa38005ba35e4e4b94d538475277445241583d326b31ffcc2caa8db16c91f9143d8d247c403118323347ac51";
-  sha512.source = "2227e6000b83e889904aca03099e96111be2d0fb054a666688a5908a40ee7f71ec318956cdeb5be88edd9d2d507c3db8dbb27906bd7bc6e6a371caa9e151625a";
+  sha512.run = "54e180a3e6d77be78fdbd2a13fb9ef9744bda96dc34cc8a9f0c70a4ebdaaef915405a04340a815e3cacf1645d4d07a4aef89df62c9a9095b82f0337a058f6a84";
+  sha512.doc = "d9329c8795ac7e6faf22ab24ce599edbfff53e51923f313a551de55c1a81d82059db145ffc8e56056de37537c8c1a2b04ca3924d26e48947f31d23840a3b3d61";
+  sha512.source = "dbb1e5416c9506ca10f1693ff90f7a73399a3b58798d358a27b40bfe09ec871232507a6390f43de65a60236be9ed01dfcab7065f1c6cc7fcca26f6d1554c3eba";
   hasRunfiles = true;
 };
 "platex-tools" = {
@@ -27842,11 +28154,11 @@ tl: { # no indentation
   version = "0.4";
 };
 "pmx" = {
-  revision = 57672;
-  sha512.run = "9b798a99cff71901d5200fbf843746de4c380cbf0aa5ab00c19deac443b84bb891a6ccca953dfb9f384a53f5a9a96c81fc5da0a6887bb4e7212cc977ed2a2348";
-  sha512.doc = "7ab725c1d6d99e25379d4373526f12e14770f7a1f9b610fd8b09dee121b00f6b79faf4e548ef13a1429f00dcad83755acb47c7f7bf01c5517e2de852b30b0853";
+  revision = 62509;
+  sha512.run = "dbe1986be94f49a745e4dd1e4c220d265bad52aecec3a5d8b1069406830e1df45a49b0f798fd800a0fc9eee21530cfc5c4550e715976b7a6e2528c2627047773";
+  sha512.doc = "82ccad2e88426333c34243cb9bbb1a127eb30bc7e2bce63c9e38b3ca5b72e14820f78949c0532aabdef2504660330306b1f3b3c61a4337ffbe36c5b29af19560";
   hasRunfiles = true;
-  version = "2.94a";
+  version = "2.98a";
 };
 "pmxchords" = {
   revision = 39249;
@@ -27897,12 +28209,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "polexpr" = {
-  revision = 61191;
+  revision = 61559;
   stripPrefix = 0;
-  sha512.run = "0e699457e9e8b27a1845ad75227271095e03b0b331b74122da868c3b33932a511ac59d89ccf4ab228aa16f8486ef1559ac2c75bb181f4275c1fb25229f701b43";
-  sha512.doc = "37de69478cc78e4ee75c896d7bbc41cfceda6e012c0ecd8d57912e0c73373dcbbfbb97b795c86966edec7d03f9dc3e1005a41dddc7504137e2e4e5323e10e80f";
+  sha512.run = "8dd44f06d28916747f4a03a1dab3309169013f75fa7c19095f8867469dd7a5251fc481dabc9290caf2b51caf2b300d259efed4d3a66588402155ab4191defe93";
+  sha512.doc = "7cb78498a0c324fb2f2c6b487d4f390a0e01f12165b47408f6ea926c2d806e1ff8e05943fc612998f3ad378f54061319d6bdece7b55be692413c1953ea90d0d6";
   hasRunfiles = true;
-  version = "0.8.5";
+  version = "0.8.6";
 };
 "polski" = {
   revision = 60322;
@@ -27966,12 +28278,12 @@ tl: { # no indentation
   version = "0.8.6";
 };
 "poormanlog" = {
-  revision = 58966;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "a1d252b99f78e6cf0c11310079b392a7a557fdc78233bc870859dc8325bc7c1a50655b52cae052e4edbd2e2b333b409f0929d696b93cd8015c66f14ddafa36fe";
-  sha512.doc = "6ae369601d824ca7f62c10327415c48cac9e58ff495238ddb2f00f71920df1b5f3a0c948c2a5eaf418f688f10e547c945d5fd726ab93eb5c106848c3355c8cb3";
+  sha512.run = "164b275fb5cc59563b4b8d8662722b503cb5aad9f64585f776c0ef4bf46254fdebae80201b105dde4f661f6f655872d2f8476a9bfe3ced3c1319d36d64697103";
+  sha512.doc = "c6c0becdc7cfffd2cc55d334f003f9ef2d533e96965875cee78bf046a5deb8c8fc92342bcf0b83048b8622bd5425f4cedcc18fc3f31255a608a0f4af9911e121";
   hasRunfiles = true;
-  version = "0.05";
+  version = "0.06";
 };
 "postage" = {
   revision = 55920;
@@ -28032,11 +28344,11 @@ tl: { # no indentation
   version = "0.13c";
 };
 "pracjourn" = {
-  revision = 15878;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "40e7ea03f0b244810952cf93cdc7799e0e130a7b11d384893b88e420ce6adb4b5606462ab6f2dbb2e134770eaf32540b9feb59393dea72a70f4d881f6f6fa43b";
-  sha512.doc = "8e9b171919bd6412a3adb75abf1124beaf0fd562cca49076c1729814c7907b5b3f9b240fdb68d91055225e9b366749c2be6a2e421f52142d0a138e377a442046";
-  sha512.source = "a0f40eb8b245c3f6ca2c6e84f4b13d80b2c9d5f67a70c74fc14928fb3b4eba3659bdcca9852d0bcce18088f707955e8f0ef77e71879bd720c9dd8d59ef9713ce";
+  sha512.run = "ad416756dca8491f2920d13b8374157bf1b49f236cf2ce1f66d6415c8de7282801645f5cedc31f2652304b1133f787a32ca4afa9f0e65a8bd5cbde956e54b82d";
+  sha512.doc = "2cc3efac5b128bc6873034fc451124cbb9d6c4040d9d1c1053367aa99d57687eff642cc55a52d833732cfe88c5e139c67998020ae220a1657744140745ffec30";
+  sha512.source = "819dcb9329ec553889d50646b7ac4ec52e2d82b329ad48d6b1dd391a7f575115c49c317497ebd32237c3925741cc6f7d497851bc5fd938d3f8e7341a05150d21";
   hasRunfiles = true;
   version = "0.4n";
 };
@@ -28100,13 +28412,13 @@ tl: { # no indentation
   version = "3.0";
 };
 "preview" = {
-  revision = 56708;
+  revision = 62130;
   stripPrefix = 0;
-  sha512.run = "8a582c5e78e5a4ef28d3857e397d62579be41f4445a3b0ea1ea76b9080997e5eb23f2bb90197237101d03fccc8cd53c8a3263d19385dac4b63161a568528b017";
-  sha512.doc = "d6edac136429cc1d0af86381812c798d72e15b0e33cc0dec643e86fc5a323df057bfe196293381f2d85644f6784cb97bd7a612828ce829d0d8baa57a51f00bce";
-  sha512.source = "f9e6df7cc6c5649e103832477218237d4008e66707a229680448a05a058d5b9ee47775c96466068723a6cdba362a17420d3154d69535c7b3b65c1e752e6654e7";
+  sha512.run = "02c4864a68cf7208e87fb0a4f25ccfe2092e198541551c3db11b75b0fd0b49188ebf9217554020f07154313418febb942e04c92b78d84c6f53b88c12d5a162ff";
+  sha512.doc = "a722fda1fbc3c4319edefb65a30ccde72711a65c19e6fbe7300ba2dcb47b72f12aa436c593f1dc97f9fda1a1fd4d359b4d56928877a9cb80b324ff046d0cd9e3";
+  sha512.source = "d22c78058df91b03af32bb3f3c6584f492cffe6762a06a854811a3d2b3cfb1dae000252f483e78a40830d5bd808184b76b86c7e100c365c420f24496464ab53d";
   hasRunfiles = true;
-  version = "12.3";
+  version = "13.1";
 };
 "prftree" = {
   revision = 54080;
@@ -28173,12 +28485,20 @@ tl: { # no indentation
   version = "1.1";
 };
 "profcollege" = {
-  revision = 60999;
+  revision = 62687;
+  stripPrefix = 0;
+  sha512.run = "907183e6eb62f4cce764cd1de486199deaa43012d674d0c55efd8bca0e345a4d92f7ce8b8159e966db1d3bc6bf8f9a5d1d003d44243b98eef0d7c49bfe4e9a2a";
+  sha512.doc = "910e436700228f1cab796e3cdaa9ff6ed33dd93698504eaf1f7274e1618277f5b49a671dc05137cfadb8a41be71417bbc319caad3f866cd1b79a0fe0bac22fc8";
+  hasRunfiles = true;
+  version = "0.99-m";
+};
+"proflycee" = {
+  revision = 62741;
   stripPrefix = 0;
-  sha512.run = "47fa6b0691d64f2396799dcb2eee0a9fda4bbaa32a0cac8bb149ede2c25c6d8957bca229c334c82b6f36332ada04c8cbf2d96ae50733fd3cb4d1cabb36e6c167";
-  sha512.doc = "e85d86712f18ff279467787faa7a7c336a4d5de40b476b5d225f40cad11b1083c0bc37c7ca2700ab3c0ef4c6c3c83a329dd82274748cb25bbdaf7c9271e806a5";
+  sha512.run = "5f81321c08ad6bca4b5fe2dbbfb4829a67a78f77679e424ad576999733051658b258c9f9ead95e001d5f8a4362b61a886088f2dfe8520c0d1fbc128c8e554051";
+  sha512.doc = "7ac1bb62626c9c076bdd49a29e6c95d1f0b63cc1e8e0c9f54e8f0c5c3e7f6afb2349629e733ae3efd27f0bea182b5bd15fcbf1e0f06bb10fadfb59c7c27ad90b";
   hasRunfiles = true;
-  version = "0.99-i";
+  version = "1.0.8";
 };
 "program" = {
   revision = 44214;
@@ -28205,27 +28525,27 @@ tl: { # no indentation
   version = "1.0b-4";
 };
 "projlib" = {
-  revision = 61338;
+  revision = 62869;
   stripPrefix = 0;
-  sha512.run = "24db5449be1b233520950d78ae0db7d31fc02e18e6bde757d8f90d7b92b3df7b425fd0a8e34d7a3d834fbaabaed2eb7d3826738cd4ea1c34d015f994c3e785fc";
-  sha512.doc = "237e6a2237a824bc83ea9761f65bce4c4da0ad749aef6c90363dc90438f22aa3795ba8a6c5ca1cb2b83ab35f992a7fbd999b32f7540996a62255c2084013dddf";
-  sha512.source = "fb35ee3d6b0a8390340ff4de3d4a052c9ceb203af6e8380818c50ed58289297b257a45eed8fe8132724eff242be3188a60a70a59aee3c8d6653f0b1d1f6ea69d";
+  sha512.run = "6d91644462efdc17895e19a9cbf7260418325fdcfd0effccc582f7f396b51a7947309fed9dfc4ece4f248989e8d30b774a94a3815cfe71c65678029628091b84";
+  sha512.doc = "3d878382dc601c6bae223d78dd8b6b1ac5a835a1214482782588fb6643f49f341d5ac081adb215353fd8570570d21cc451d1d66de704e3e1f1b3376095a57613";
+  sha512.source = "5f9f30a280e17761fb58537ef3bd4bba806f342b9ac957aed06b18aca614a98a3603dd477fe3a891380bfb58466ec79f5faf6bea5b92822e912d325fb7a691b6";
   hasRunfiles = true;
 };
 "proof-at-the-end" = {
-  revision = 51194;
+  revision = 61933;
   stripPrefix = 0;
-  sha512.run = "1e5647e1421742e9f0198c5ff8ae5ac315eccef96d0a7c9c5f1dabef167fca5ac9221cdf60d99dafbdfd60f6960a897ebb2d2c4370edcc0d0a36942c0041a777";
-  sha512.doc = "9100916a9ebf426502d7c25e5f848fd4eeb19050faa01b0a4a795b838d4084849b42a1f6a187dc8218aeffb6df0cbe592b512e1c613a1045e467198119b33555";
-  sha512.source = "ea0b286182db09ab249a704ef25abc8bd951b51e8671ddb2a8110997b9db4ed353c059f44170e8a5bd76878ae97d34b460701994849425c1f40925d663d0ac6f";
+  sha512.run = "63adab06785ea542df6b451bcfbf1a8eeaba3dd4804a7f322e9e500ce6708e8fdc50bdbed70f6d514a375c69abaec179350d58cc6255d1f8fe577a7646ed04ac";
+  sha512.doc = "bcb3ee6bec5d170f0e552efbf58eafabeb5117c52916d548a5e022d745d8ab214f414b72507aeec5edb5c0384912f907468f9b7a979919c9959197b693aaf86c";
+  sha512.source = "eae3ee4a8ab4ec8e0b91aebf2f6e45629e62b156b81b4112c75ca03b12c44435e5cd6e96621dbd2ac9a92b656c7421896f9f81c9979c13da7236d7b78525b85e";
   hasRunfiles = true;
 };
 "proofread" = {
-  revision = 50938;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "ef0d35bb06d1bf31cdea9aec2f342eef4b8cf053863a26f5c223c1966f6715a547fb61b2f92d4ac273c3309fcfe219f9a78bdf8c9b3ec3886bb96dabd7935033";
-  sha512.doc = "6b1ba0b1e009e2f7b337aebcc5c54882f2ef3f2089261d3b9355cb0adfec8aa3c7f207636955979cc0a74554e5878423a23982340bd26ed3c2a634f821497565";
-  sha512.source = "9a434d59a1540e1dee97e9baf1cda034f768a7a24e1deca7e0f454f7d7918cbd7645e19454fa7683c3754f80e1c9da54b3b2ade2dd58f4c332d2422fe1690935";
+  sha512.run = "79787978d7888ba127b9b72ea38f0f3e7ef9d427cf8e493120849cf7c2852ffe79b5fbf349160bac419be0725a9d79f33a00c13d6b3eded2cf0600b7d0994513";
+  sha512.doc = "e33aa6e720a22bebe6f64d90b00bc4e01b0892ae66c5f9c4dc8758e6494fe2bbb9ba84df442471b9db652223fd3e7f40fae486f09c7500095f7a2d1cb2280b3a";
+  sha512.source = "b1b334a3bc3dc61dad0eb071a1c5dc3595cb9231a3b7e50856bf0d5c50a4ecf188f5efbaf7a0065ad51341c2408cbf3d81a6e7c473bbd003289cca02d1962f46";
   hasRunfiles = true;
   version = "1.04";
 };
@@ -28414,12 +28734,12 @@ tl: { # no indentation
   version = "1.10";
 };
 "pst-3dplot" = {
-  revision = 60619;
+  revision = 61615;
   stripPrefix = 0;
-  sha512.run = "f20bc26a1a346b9b1c33238cb25209a9f573cddbf86b8b58ae185e5a2eb33f03fab122b8b1490563f5da3b525a0c5f7b04c6183ffb099543b56aa6fbf3e1c264";
-  sha512.doc = "4c4b1f1cffe7b3a2144eee8534352083ce1a91637ecc8de717a3b033fad130e22e135ab2b8881467bdf2706eb76122d858ea9c36f84b81da5613ae44e47f4b7a";
+  sha512.run = "bd23d297253501185e817e0b5f8f13705434568d73be8f4e1c8adfcd3b6c55438a72997601b6696af91cb6733d2330ff810a0678e19f79203bc979c49c5cf722";
+  sha512.doc = "544b0fc05fe259d49861e71718e090a45dd0de233e90d2ab248ce2ed427f1113891fc58062126763295651e540fc306f0bf9b4fd516069b205cf063060a03c3a";
   hasRunfiles = true;
-  version = "2.07";
+  version = "2.07a";
 };
 "pst-abspos" = {
   revision = 15878;
@@ -28473,10 +28793,10 @@ tl: { # no indentation
   version = "0.92";
 };
 "pst-barcode" = {
-  revision = 45096;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "6c4799d7410da7f13225acd9cb5628d65bdbbb525e2bcb114d7f660d4c752122f8e9028763d3ecbca04c3c9da36b7910d64c981e8593b2c5df6b4cb372103785";
-  sha512.doc = "918891da185bcbd26051a4715cf585fd8539e6ac534ada4a2524bfabec328f87cc998cbd65b7fae8a2fbe4de029403811214c0196e59125a77f8af715b3ed3f0";
+  sha512.run = "a7d3c386fc8793de8f4024ede603d18704bb88560ec2a9a6f7fc69bd919434f6e8d3d9b7bd8080a39c24f37d354251309084e6994bb334a886e3ff998ec51d5b";
+  sha512.doc = "40a1649336ea298374985804433dde7282d29ccc8b4ad28200612aef602b726f6bde9916962c6f9aede8a0a3fd2780f45e5100daf6039c55a13121901a864aca";
   hasRunfiles = true;
   version = "0.18";
 };
@@ -28703,12 +29023,12 @@ tl: { # no indentation
   version = "0.07";
 };
 "pst-geometrictools" = {
-  revision = 45319;
+  revision = 61430;
   stripPrefix = 0;
-  sha512.run = "1949864f97f21c6cd2a0e706028d5a0ecb4102c0afc5874b78c2bf883aa6698551214ac232f406bad9955e0f0a78f059118a4d950bc4b69bd30ecf9b6fc38606";
-  sha512.doc = "adf2ae63d32d2cecf77c2aa950c8b827b51d0ae923dfbed7c851f0f0e7d6018216d92cf524b2cb4002c4040dbb579cff552a37cd5ef57cd2d0579b01128a3be6";
+  sha512.run = "838ddf95e3ba7a13fcdb5cf97d85647cb6b15bb6735947d26e358af83a34a4d5bf55530c4624f006eff4a9f0794d1fd7f5a3ed351607243e31537e36bda33b96";
+  sha512.doc = "4b7d2316dff80420ed5ce03046115670a4ad51c705dd960f56f6e7debf20b0d3c86030d93cc635410e01535aec1b42dd3497d18126e6c86bb9304c5cd506306d";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.3";
 };
 "pst-gr3d" = {
   revision = 15878;
@@ -28859,12 +29179,12 @@ tl: { # no indentation
   version = "2.2";
 };
 "pst-node" = {
-  revision = 54687;
+  revision = 61838;
   stripPrefix = 0;
-  sha512.run = "655a9f7a373415c1721a8192aff5868c6eeb20fbbbac394b19ff15a66f6322c9cb3e2a6edac3210b14f94a62bccf18ecff1fe3af21951f382477ed27e37ab36f";
-  sha512.doc = "da13d6f9584cb2810b0aac8ed65af49a48128049433a845b6a2d73bc2395e043f6ce89ca84978eb52455cdc713931a610cb1047e46badaa2c6b4baf5073c15e6";
+  sha512.run = "663d072baef5277519157175183313c9b80385d1574dbbc1502b60aabd111688286499426e88d28b3b5252b8ff23b3d325981b6e14b846fce3b92ff391ab5a7c";
+  sha512.doc = "5cf9cb60b0c36915945a4e2fb4e79a35e2ff9e957df1b1e39d8158560843fe1dae6867aa6270e70cf3ba387b104e9dd8b6965434168d89748e65aa77368a0707";
   hasRunfiles = true;
-  version = "1.42a";
+  version = "1.43";
 };
 "pst-ob3d" = {
   revision = 54514;
@@ -28884,13 +29204,13 @@ tl: { # no indentation
   version = "0.15";
 };
 "pst-optexp" = {
-  revision = 57977;
+  revision = 61917;
   stripPrefix = 0;
-  sha512.run = "92302c9c3c4a5a0e7a82fbdb6c72f08aae2ea6a5286f6d8916b19021ace0bdbfd1e935ec4aaac8a18c938c6bb0fa66520f3d98631de419111c43605ad2dc0fbb";
-  sha512.doc = "dd920f80c8f271737d8dd8077f06fc851034812233b4f7c30e0ccbe4fc57fc08b430efa9b4eb737744acbe0a0c2e898797efa939bf37468f90e6241e1c28667e";
-  sha512.source = "ccdb1330d6ae5835927ce28c5a38162ab632a0b113d74854d2bb8cabb3d0da7d29e39f74a6245be9e30c03a765c383830cb76a9b6bc8d39aece5b0a05be3824f";
+  sha512.run = "e38087805258cc4daaba9944f5b7893f9e5ee4c0c7370b447bd35a5bd5990eaaadbf1d1c2df41cf06b8a1b170d56a692e0061590c78df94b7acd6c2dd6ac17de";
+  sha512.doc = "256c88d611f26c1944b163ecc29e23bb77fa04a3317e01d2f287c52334eb9d08437d8d279d7e4c3452b340b90980d4343c458af46005211fbaf367bf5b7317da";
+  sha512.source = "065ab372fecab825dda1584da4fdacde88f388887df959d7c6f52c2974c67daa970a2d7679b65f24f8876ecde0497a13368ed757cc16e01cdae6f83ed7d9dc0c";
   hasRunfiles = true;
-  version = "6.0";
+  version = "6.1";
 };
 "pst-optic" = {
   revision = 41999;
@@ -29050,10 +29370,10 @@ tl: { # no indentation
   version = "0.13";
 };
 "pst-solides3d" = {
-  revision = 49520;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "7e725978c030da337d882e05069b749a4398b1a1c479a50db34fc63801cb77b78630e2d1dfd0c3a39aeab3e931236dad91b6c722c4d6e06dcfd867f007ce99f6";
-  sha512.doc = "a00138b042c58700438cfb3f094f836b029d31ee3de40ed290d3f5475a31cb3fc949c13402c35d088dd1cacf13c66bcee934a0ad59e97ceee5ce9db1f99e7c4d";
+  sha512.run = "b70a15acf3f8ec551f8c10d9441101950c7d6b2e886ebcbd9584ada67141d3068b66339e2df9cbad85db9b3950f4463cc3d9ff92a4f93241c37b591b5b5ecc6b";
+  sha512.doc = "15a7bac7f5aaf751c4b450e07c1b7222bc569ce9e9b7359cc53019f9295561b85addc3ac0cf16c791a21b88c6cfae720a54603ac1da2055f0c99296238b02fd9";
   hasRunfiles = true;
   version = "4.34a";
 };
@@ -29075,10 +29395,10 @@ tl: { # no indentation
   version = "0.91";
 };
 "pst-spinner" = {
-  revision = 54080;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "230405003645525f89e4713cd38d2dc015a5c41218202003626a154a620354fcfd4297480415771064ddf72768afd15d19fb331fe7fe3029375b681487e09f58";
-  sha512.doc = "998388d1098eec8f15dbccc5852b4577f392c9e01dd0a258927086940b5e8fd33021101244403c3d81b575bb1214ad0730160828a7fcf83630bdb765d4c34444";
+  sha512.run = "097ab0b7667cf8da530627a9fae05afa183148b90ce928880a9522f79b4a7b9dff7135ac4d9a5a32462cfc9abe9702a078326ee272f2d17f25c70cd805067068";
+  sha512.doc = "67b34a250079f8844ced0349b1f4401439619a58854a3ab65e52e3075ab9375bcbae30f1a6780ced92ebee447b3b809606a27766584ce3a98f72b476b413da1c";
   hasRunfiles = true;
   version = "1.02";
 };
@@ -29165,12 +29485,12 @@ tl: { # no indentation
   version = "0.41";
 };
 "pst-vehicle" = {
-  revision = 45320;
+  revision = 61438;
   stripPrefix = 0;
-  sha512.run = "4e5a5dc0227641a8b8f96913cfd513279c91f841fa1dd5960015ad79d5877a86cafcf87db38bd692611d5afd73a8a91505822d83433299db4efa9e4975a8da42";
-  sha512.doc = "1183b285d9438c7360f2cef9c40d86424ed2891d36a4aee6281e57b84773dd6b2366ca6c2bcff200911e583bd11f2f5aa9615b45656a240b28b1809acacf4145";
+  sha512.run = "1cec74ed600c4c4df629942b158d47b33f26e3a38d3d363cd506e5dc7c9673e0da1af4af8bbf71bf735693d15f0b02a36d8b148e07405ff4181efc820e73eeaf";
+  sha512.doc = "e252811d71bc400b3cb72a29fd9099247044cb1d1c79676cf4319d58cc60293839b022a73706a9685434d338c9daa24e8b9bc5b7390a75870379385dde0d9c7f";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.3";
 };
 "pst-venn" = {
   revision = 49316;
@@ -29204,12 +29524,12 @@ tl: { # no indentation
   version = "1.5e";
 };
 "pstricks" = {
-  revision = 61084;
+  revision = 61548;
   stripPrefix = 0;
-  sha512.run = "6aa799e9c28a11324c5a979059af293ba45c559e62d422d9f6928feb402fb85f927d2052bec1037e1a44502e5283cbd8b1f325da82a2a8246441297fbb6e8a87";
-  sha512.doc = "89de2d39bb24b21accd0d4092bb830646b91b66ee053469b10dd18a69759b6e2f8c1812c04044d8717626c55b20a878dd108d27d8000f694d9de0935e116be43";
+  sha512.run = "3e68cc5bf7905d496a7fa857ae355267de54ac23ec62d1ecbb95b82e7ebab20dc5b691f8aa07ffb05ab6a23d9ed64056b67accd1242bc31419a5158d158c8604";
+  sha512.doc = "4817db2ebfb842535abfefdeb54b47b3da5c7ae0c6fe4bd02fcbcff56ac78221007c84e1decd8348241031a58f828e199c63581264bda6138c3064d401c003ee";
   hasRunfiles = true;
-  version = "3.11a";
+  version = "3.13";
 };
 "pstricks-add" = {
   revision = 61407;
@@ -29234,14 +29554,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "psutils" = {
-  revision = 52851;
-  sha512.run = "737cbffd48eec8244b11d6715a41feea6ed25cd6e53326dcbec0a5fe60881c5376dba508d70345db30a3c3515b24d3995f133b92015d2e943accea1093ea7c1c";
-  sha512.doc = "68505dab374e4e4ffd9da0ce6e6ee41008ebc0e2eaac1cd89ba7746b6882ba7bf6fb93143b4dd5a3a8fada821104ab8ca66fea5ffe313173631f98b221fdc62c";
+  revision = 61719;
+  sha512.run = "1489c9cd3ae9e1063367301f038cd52f0fd7f5b2d548ea78c06a2bff56100aa613cd01026ce601527b6a32f88b6ed1df96f9c8c6a591d16a63dccdc8e32d6969";
+  sha512.doc = "8b4814c2a769b1ea8831aa945352f31125267aeebedd8dc8abf6381928707799bcb1eb29214930152046bab63b1a56179ea035ae6568595fd5ac83bbbd22f588";
   hasRunfiles = true;
   version = "p17";
 };
 "ptex" = {
-  revision = 59502;
+  revision = 62145;
   deps."cm" = tl."cm";
   deps."etex" = tl."etex";
   deps."hyphen-base" = tl."hyphen-base";
@@ -29250,8 +29570,8 @@ tl: { # no indentation
   deps."ptex-base" = tl."ptex-base";
   deps."ptex-fonts" = tl."ptex-fonts";
   hasFormats = true;
-  sha512.run = "4183d235d990089401faa180297940df927621d5c0846d7e4e1e04a8c82257d75f0dd868590e724568fec92fba09ba1c9a0550673dd24c5484de562e8079d8b6";
-  sha512.doc = "d05bd8a2379392db485e6d544584513983d4fd598e49848df2daef8b76f3ecfde23445184ba902cdb311fa3bde648c66629a9bcea2b65f10d85e5985052e9bbd";
+  sha512.run = "26c84a96b8b15553c55c2dd3b51224c627ffd9fba19341dd0353582e3c1c5d50ee6d67f2f4257180e32c9f4236bc5d0ad7da058f99833e50e93b684161d1eb74";
+  sha512.doc = "a314b70ce2362da62ca45f42213214d336a93fbb70f0c08f59cb72b44791e5acc216e045868f50c48b6d69c39e7d8b7317c48f2b495408b0138a5b3f87d0b297";
 };
 "ptex-base" = {
   revision = 59406;
@@ -29352,12 +29672,12 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "pwebmac" = {
-  revision = 60979;
+  revision = 61922;
   stripPrefix = 0;
-  sha512.run = "0d0c14f1e623aac1258894a06f9e92eee51c209afe9e230f4e3b9cb69049221b9f3955504127386ff4ec03ed458556250a0a9b03ec0edb59c157c32a42fac094";
-  sha512.doc = "c4f73e463dc63c556d02462a63de51beb1b4128b19eb3e98ed6fa006fbe7bd1460ee95097d5359b67916f69145b1480f797bc2740bd7e4280498dc25f0b65af8";
+  sha512.run = "3dea02607cc864180fd14cc19dd18cf3fc4338742dcf6f6a843b316188656f9d576ae050ae04ce702790d59a450bd8f20a280cc99e452455b41bd9c0be72c174";
+  sha512.doc = "4d45d5f9ca292ef249ebcb0fe20fbc0dce6c365267922ed4186d3c714e9cacf3ca742132031f6e5325c9a75778addd94390e6f6aa6e8742fc173d5e858bda069";
   hasRunfiles = true;
-  version = "4.6.4";
+  version = "4.7";
 };
 "pxbase" = {
   revision = 59473;
@@ -29400,12 +29720,12 @@ tl: { # no indentation
   version = "1.0";
 };
 "pxjahyper" = {
-  revision = 59508;
+  revision = 62737;
   stripPrefix = 0;
-  sha512.run = "320e75cfa1b821e1e4cd61db12b907025add9e5124256959af1c1c101c626b3566e56425b9d65efa22c2db299ce69ad282451a93fcae203a17afb83a6faeae3c";
-  sha512.doc = "d7d683d7b9763c5e1a21c1208034610f4da6410dab0eaf4254bf7ba19bda5cd25756bec630e4374a29b9cf755163583ec1e2c36dbd8b5b4e1fe04af912c7b384";
+  sha512.run = "8d772ea35554e196079eab943fbaba6b7e20c9961d576e3fdc2f368caf60b19f7dd63239cfcbe82168d9009540dd22284061a5bb8a5aca9dd34646412eec0b1b";
+  sha512.doc = "8e454f5bc1fbec5c8104dff154174d8355b2bf35b97f60cff06939ba40446f9a2d784945638eda37db4c6350fdd142e736de2aea05a76190a8f95c5403e4a130";
   hasRunfiles = true;
-  version = "0.9c";
+  version = "0.9d";
 };
 "pxjodel" = {
   revision = 55006;
@@ -29473,12 +29793,12 @@ tl: { # no indentation
   version = "0.10";
 };
 "pyluatex" = {
-  revision = 60977;
+  revision = 62766;
   stripPrefix = 0;
-  sha512.run = "4fa1b2f21c620bbe8a0ffaf8d3637fa4e722b72a0263dc9d265f7e7f609d295681abe4676bf620de790a23084ddbd997139a0ebe049c4e2b72237e8fa10a09a9";
-  sha512.doc = "f4a371a9fec20b21e5e7d0e07684cd01b375cb65106a40ad1646ce1800eec3fcc29e0c21b4f4fc13d77ab2d62aa00ee2a9bd12bfed04fb9ee6fe0a3e1a0b54fd";
+  sha512.run = "3ccba6e3b6fe98a99c8a8df0e16cbc2a04ec54678357dffdc5239431bb0a55cc1167b8e8f0a39a24a1da9e46741ff892a7bd66e6930d617fcc1a0e42d9f90ae4";
+  sha512.doc = "be7ee547428ec8be67538b917d40696c6a4c53e353191767976ccd4e481ed65bc49f6e13e190bc189489415014359293fbb6c370aa66647875982fe0aba1437f";
   hasRunfiles = true;
-  version = "0.4.0";
+  version = "0.4.4";
 };
 "python" = {
   revision = 60162;
@@ -29774,10 +30094,10 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "rank-2-roots" = {
-  revision = 48515;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "43d76c8461a724c48e5e510701032c01a5bfa645734402b0fa0d0766f2d0cb7520f2e3d29d6c3abfe44ec369988445aab9216135f70c43a18fdec152cb4ae92b";
-  sha512.doc = "f9e58f16b30b075b19929a9ad1ac0c47e53b2aea038e34db69dde6d64e1cf3281fda597499dd07aea03b3bb325c06a1c7abbfdca42a80f03fa2a3d272bf52e5b";
+  sha512.run = "5124c4185eab09ff6e855409bb9d8b235fa3c304864886eb7d96fb2bc3487214eb388e27b4a3cc25f6d3b12bc9b77a073e2404792d2b0654e243a540c5fa00e7";
+  sha512.doc = "b19096334754f7d02b0a16d936c885e9ada82adaf1ed4011df815bcd703b4e79dec62d133fa3b32cf9663e2ef69081a95ae647504d8b6eb0f27f86909980506a";
   hasRunfiles = true;
   version = "1.0";
 };
@@ -29825,10 +30145,10 @@ tl: { # no indentation
   version = "1.11";
 };
 "readablecv" = {
-  revision = 57433;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "2165f742cfad485942ec3ce085c3f9eeb7de1b75028020f143661e69a8694ea4f321779c79ac04895771170310e85e4f9019a86ffea0cc4cce97eab2f4ae055a";
-  sha512.doc = "78d4721ac35a4361141f0a1d84a5d7d7a416976a1e8445f96c02963fbd924e86555f6c0c7a7beaba1573b9488086be4a3b65ae826ae7db3e16de6e386fee2fda";
+  sha512.run = "ca024cf78918406ca68a750832bf4046b22ca36cbd8ad7784cc2cc9aef6440de43c7d5c38aea95d738ec1f67685f02e1fd37440dc90d76046ee663cc475a187f";
+  sha512.doc = "c7b793994b11ae49bc93c8b39c0e257c24c54ebf19026db125ff1ae236f9b8443290b31443baff3a587fff073259621b001a75b0bb4f8f4e4963245f7c739019";
   hasRunfiles = true;
   version = "3.0";
 };
@@ -30011,13 +30331,13 @@ tl: { # no indentation
   version = "1.0h";
 };
 "reledmac" = {
-  revision = 60935;
+  revision = 61878;
   stripPrefix = 0;
-  sha512.run = "d1984388cabbb16e9637c3de854ab63485740eeafd5c59a6e72e68a0a15590b193e3d1b86693fd27cd3df86a4806e30aab924b4691f349d2e0251375242d336f";
-  sha512.doc = "d4547703161915730ac6930c98c15a8604c6b1601583203b99f1e917cf68193e60db43f5ab7734871df6e39cd90bd00dea190d6fb98e36c8c65e70fd2f2ecf07";
-  sha512.source = "ae8956dc707fcfe8b3f66f628c192b12f48ac1f86ae0d33b578b2f546d0fea66cb2ea6776cbb20f2b6602771b7b16f90443c314c3108e07928fef05668db998d";
+  sha512.run = "1e809fa7cb84813b022d74a1d6756958673b10938af3c6a9e6381ed52ed6451c1981a86e6777baccf6185374cb2f259236a78abdfe8f1defe665a62493f646c3";
+  sha512.doc = "3975b51c43aabc58a3746b2d6dc67f9ac606a02a605a3b21f3553e831664aad9f2ab9a03bd3663e44d72df01237c050262fd687f020a77beb9d483be43d046cf";
+  sha512.source = "0d9ed87212ae9ad724da0c2ea9799d0b9f11ff26804dd34cf02c28a980a43c6dadada5e2facfd3d0fb946c631af0e8f1291788a02f41647127cf64cb7941d005";
   hasRunfiles = true;
-  version = "2.38.2";
+  version = "2.39.1";
 };
 "relenc" = {
   revision = 22050;
@@ -30214,6 +30534,15 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.92";
 };
+"robotarm" = {
+  revision = 62567;
+  stripPrefix = 0;
+  sha512.run = "d3f39efa6eadd4b12a94c585fca0af2d9b7e3edd839cdab5a0f14a92b61055552c7cb3fe2ec481e7fcc953c72e41aaec417b08746d29f5f80d5d5d7e2b90b76a";
+  sha512.doc = "55bfe62eef858c875937248f0341236511d4de9c01584b7c73951f46461026dd809dcad9e199f011180a15a9df1dada9b7e1ef23650b74347ad6cd4f90b071fd";
+  sha512.source = "34ce2e93b0269cc76c74b434e2d24909c8c3b09aa9ed17538530d0855ba0546689c147950c7ec1f8361205775346b859b28041ff2bdd0b1f14f2f3f5361801f8";
+  hasRunfiles = true;
+  version = "0.1";
+};
 "roboto" = {
   revision = 54512;
   stripPrefix = 0;
@@ -30450,13 +30779,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "rutitlepage" = {
-  revision = 51073;
+  revision = 62143;
   stripPrefix = 0;
-  sha512.run = "e071bf5dfcb8572dac3287394be5052ca04c6ec90182e306f020ad02c8f4db134c92b41f064423c1063fe5c1c465cf952a8d0d8fec4e917aba82f76850cf38c9";
-  sha512.doc = "e6884d2eaa6e5fc9448c033f1a48ee218f171d5fc16e7a977db89f7807c0bb6d1bb4c212ee489bd882d87149003d9aea2da3170045e165150bb8f7578b719107";
-  sha512.source = "bff9526027292b6484d9a5ebe66d57400eace4fb94f39c97569aeda1c1dcb32e30ace085b07bfdac096ca0dcd587bd7ab8509190dfe9dcd08e4fa7d737fed66f";
+  sha512.run = "fb7d3aa93191c443ba31e1a366f34efa7dfcc896c534d3696002ebc54f3b24cb34131c50fc7d584f4b725d3b56a323628441398b2e1116789437460b97e21fc7";
+  sha512.doc = "f8293227a99eb022a2c3a3ac75d7e8ba6f61880b62f5cce11eb791bb489386de93cefcc2b607cd4880ca58bb933328af66ad93b4c6ce0e16a842c56fed231206";
+  sha512.source = "f42d310b3697077a842fc13f580adc605826c94984102769b6b27de26548792cfac59517319ebbd20719068c012389d0c0a10dc0a89986a89855c8ab8d039620";
   hasRunfiles = true;
-  version = "2.3";
+  version = "3.0";
 };
 "rviewport" = {
   revision = 23739;
@@ -30518,13 +30847,13 @@ tl: { # no indentation
   version = "1.10";
 };
 "sankey" = {
-  revision = 58661;
+  revision = 61874;
   stripPrefix = 0;
-  sha512.run = "be2f6f2ce386abeaba3537ac4f4c89b1c880241193661a3079f0603451ff8675409405717d5d8c34b7b6478d3b340c453929fa371ce2564215a7fd833749f1a8";
-  sha512.doc = "4264cbfa8089740fbf05867886ac157383cc019eb61f9844158acd8fb7dd1a65b48fb648b8b4b258ae3c66e67f18a709502177aff35fd4f7ac3a676127258a9a";
-  sha512.source = "9a43e7b6bd6ead59a6fc56e27546b998565b97ce9e83821df9042295e7cf031f5f2506bf6f8ea6dc2ff306fe827b50b48aa38b4c76b6ecb45ea5d16099dcd98b";
+  sha512.run = "8a77f2ea3b4c2167d823a839fe2fda2c633ffeb775678e6fa9cb84558dad547f4fb03c3fda6c1f85c4984628ce1515ec874482e8a223385bf1c24b2c30dfb362";
+  sha512.doc = "a3d18d1a43f22470ea5498423c10246c780116769b0493356174c8e9acc6d9aaa32657f7582b795d2cd720fdbb6786319090303548661f899a650da4a0442629";
+  sha512.source = "92b3d428919f217c8c869d3896829e324670647c29321bd868753e3b408c5e227acdc15097c81dee01b3319c08fcd94da1cb5e11ceb5d5775a90235a54e997bf";
   hasRunfiles = true;
-  version = "3.0";
+  version = "3.0.1";
 };
 "sanskrit" = {
   revision = 55475;
@@ -30565,12 +30894,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "sapthesis" = {
-  revision = 48365;
+  revision = 61542;
   stripPrefix = 0;
-  sha512.run = "92253d6532c6740ae1bd25fdc76b566ea2d488f31e6a24f90e3b55ddc15d471b6c4ce5c4e7ef29c9a416d9810af49b04ab51530e9594c39beb19fffdc066a917";
-  sha512.doc = "a1d8c40975283a7301c1a842355149f4ae291fd7fd72cc5a44a292f96558b79bae734ec12a78b429c333aadd6f433e9603f7cc75a71eba84d42294461e87767f";
+  sha512.run = "0792eda010b968997077fa7deb82396e02473f7ba5870dbbdeca65369c21797c3a37db176de523319cbbecb682537d1cac368842e2988671ec0e294c889203c7";
+  sha512.doc = "b88b0ace426136e0307465010598fc92fe90d0615f0c2d559e2f703ed7f823243af110576bb45689ef5c77f2b330c482a559f3352a72f98f384c33c141ee396c";
   hasRunfiles = true;
-  version = "4.1";
+  version = "5.0";
 };
 "sasnrdisplay" = {
   revision = 45963;
@@ -30964,21 +31293,21 @@ tl: { # no indentation
   sha512.run = "fe8b53391733392a72be2e2c80892ec68fbdb749c70636c307825c8bfd6284945c9961610fd19f8b5d6b03ec50f0a1543c7d159f5f2a19534d71b221addfb708";
 };
 "scholax" = {
-  revision = 58733;
+  revision = 61836;
   stripPrefix = 0;
-  sha512.run = "67818d34da2803257ae4de877eeb696d34eb887bd6ab54613793f4f1737ababa1fdb657162588c6ec353bf9604113403fbeae2203bf662b888f5197032e57924";
-  sha512.doc = "fb9cf815fb45cb513f8322597e1deefefc77c1829d2ae2f8cffb52a225bfb6fe9712be523ed861aca096bbe80317979dffcdfce87970b66fb403343a5e5e43af";
+  sha512.run = "f7062ca975c2801c220c6c34844d87e410e501442313974c77281aaa0927b27fdfbd2328676405cd1820c809e0354edd332e9fba0d04fa1e9a8d28f91543905c";
+  sha512.doc = "7c64a884165087b72f052e7d3fe8c57857d62b92532bdfc6bcd46e66b12f8b12112bd71ab88d4a9603237b612d1eab5ad10e7de0c14e69ccabeefafcfd380302";
   hasRunfiles = true;
-  version = "1.030";
+  version = "1.033";
 };
 "schooldocs" = {
-  revision = 60560;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "295228025ce4884ae987ecf329d957ad220306c7bb44369e40c6d42a2564b78194a3cf32571f4f188e9557f9db7281bcaf1ade341b39e3eee300e58fbc278213";
-  sha512.doc = "f62105d0f0c130d718db6b91fc3768d81e97b6ee24af4ac1eee00cd4e5d3ea605f2168883340e5662b18b2791fc3aadf405f8287a0562e9e13a254776878448e";
-  sha512.source = "c7717a15ac1170275cf2dda3905f0f6cc504e8b3eaeb6a41ae58c32e2a8d22fb752aaad588526914bfc28905bc4d2af77fdffb3df6881467415c78131d34c60f";
+  sha512.run = "41c980670fb57b6758aadf3f77e9de1795060bf667e74dc20d6fdc1d0dbab801a8e7d5c75fc303c28f53b24cd42e80ff580e8b79c329d4440011cbcfa7425f73";
+  sha512.doc = "aeb5a6485099437bc556d3a78d900b48013082a4948d903d797e594161f22c705bb5225a31a2b12e3d5ca3d741566c3a30c081b988ed8eb92ef0af9bd584cc7e";
+  sha512.source = "d9fb7e94ee08c48bdee1f8344fe9f632876cc17de8d4505c1aa899774632e3ea8eca80889cad3edaaaa1a5672861aded9a9d2bff0255a8bd1d2f1ccf00861a63";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "schule" = {
   revision = 60210;
@@ -30989,10 +31318,10 @@ tl: { # no indentation
   version = "0.8.3";
 };
 "schulmathematik" = {
-  revision = 61347;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "e24ba267da9a9fd00b1de1ef6e878f36be2df2e5860d8e8af65a2c3d91ab04dda143f1aa69bfefc2ccef1970e2149a4fcf2a8ba0d92a0f062a71526d19529795";
-  sha512.doc = "b648305dc48871c5ba4b52af333bad7873038cae7740559383199715fa10e6ed0bb23d3972d80081b9d57857bde80d12fba55730b9af09f6733b0397d9f416a4";
+  sha512.run = "8597b417f703de8aa5353d9ba604559a01890e9745a0c59b6b4e52ff4744d559b1639ddcd55bd2d03a5b35c2006ff10cc278a0ed52315b49142b2ff172183b64";
+  sha512.doc = "aaa4efc0f5c8bc41e446a657a73726700da79962ef6ea61a7537b2d5b7b27de39719e375f0ee110e3e1291848e8c03d03b49f335aa9ab8c9d91fe0731f4be6cc";
   hasRunfiles = true;
   version = "1.2";
 };
@@ -31066,12 +31395,12 @@ tl: { # no indentation
   version = "0.41";
 };
 "scratch3" = {
-  revision = 56258;
+  revision = 61921;
   stripPrefix = 0;
-  sha512.run = "40d781fcb2ba3628e6e7825d48873917c6a138b46ec2b5c5be894639c1ada93eb3632e17e5be6dbb9974d092f3b75c891dccb33cd93fbdb61dc3261400065d2e";
-  sha512.doc = "93fecddc8a36f4ed1c302939678e314b178b600b5983754a9bf7b2b343a8e61174dd7c9aa7926c9c93714045e3e8b9fecc77889562f2f407fe2494283265d69e";
+  sha512.run = "f33f18d725253b11097443116e6c0cf4930b7718a5f8678b0d8fd97d8e4854efb31bd016a40a7dec2701a99bf2b5ac6136a856798ead314a8c21cf38013bb513";
+  sha512.doc = "97a8e684ff98c9aca2ab57cf93be2cf8bb4c0464fa772828c033622860e46d8c61bf563e346aeff1123665c878bf3fc68c58727ec2c1579e815c7a8ece078ff5";
   hasRunfiles = true;
-  version = "0.18";
+  version = "0.19";
 };
 "scratchx" = {
   revision = 44906;
@@ -31167,11 +31496,11 @@ tl: { # no indentation
   version = "1.0";
 };
 "secnum" = {
-  revision = 60365;
+  revision = 61813;
   stripPrefix = 0;
-  sha512.run = "78d92a6e4fca2e1a8c24f9f94f0872afc8bbbd3ecb64c5bc15bccc8ca2a04fc58024ba436820f399aab7f7e1a243d89e72c902d0167df5b286a7a5160bee0289";
-  sha512.doc = "c0cc2998f191759f32e5ea5e7faabca63de02493a355550f53c004c66db1ae82c5d89cbf9655e33ff878acde8a0ecb1208b5aae1a72dd7f74bbe296225c595d2";
-  sha512.source = "4a49082da28d518fad99006c7612b5318f875d70f184de07ea3f9851841a91e894709bb8a1915674ed88f1648b9cce960d4a24e2b69782919632536145a8bf79";
+  sha512.run = "543d290e5ae38ac65cd22217aec417f4c1098d629ce9acfe03340b529a7bb89ca012e2edf5321fd90331d79bd87cb5e6f15eef3e599857c2aaaad22bdfd1be78";
+  sha512.doc = "da4ec2a79e7a04bbf4296f1fd0929971bd577cf4f55d0852923a0bbb73e78e28eba392d203f1abaad1fcbcdffa9e2206fb7d78003b10a2ed428c87562b01de02";
+  sha512.source = "ca61cea878ed892f46b4defcd0a05176578d01b01b5f3924dfe6278278fb77ed89df3d41bd788a06bd7af389904421439ca06afac2440ba557948aa4e80a5817";
   hasRunfiles = true;
 };
 "section" = {
@@ -31407,6 +31736,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "6.7a";
 };
+"seu-ml-assign" = {
+  revision = 62835;
+  stripPrefix = 0;
+  sha512.run = "05f6b2bfadcdfba6eb92745e6348759f4f4c2102bbf7f36df77d0edc6c120bd425889d8cb09b909f38e48c1c29b467c3294f36e83276e4fc8e54cdaae8b5c3fd";
+  sha512.doc = "d691287c3cf8d426810c22269c9209dc54dfa8d802d40da1b62194ba8fce0617b238b1844dd15107fc39f121f4312b9d058a87f8749bddd5600982766d11d62c";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "seuthesis" = {
   revision = 33042;
   stripPrefix = 0;
@@ -31631,12 +31968,38 @@ tl: { # no indentation
   version = "1.05";
 };
 "shtthesis" = {
-  revision = 57740;
+  revision = 62483;
   stripPrefix = 0;
-  sha512.run = "50a81503c33b2d38f04315335c4184f8949b23e0a535297b611c1c28248a87871ca288c1953db0edefa50cc4de238b270400a47e530339601207bb9cc2560429";
-  sha512.doc = "e4817b159e7b449f440750bb9bf2fc479f61e0532bfb832b34af989bddaada5d45be5a1be7dc24baca11c0338c4fb91219454b93f9024eef5dc861f2caf844f4";
+  deps."alphalph" = tl."alphalph";
+  deps."biber" = tl."biber";
+  deps."biblatex" = tl."biblatex";
+  deps."biblatex-gb7714-2015" = tl."biblatex-gb7714-2015";
+  deps."booktabs" = tl."booktabs";
+  deps."caption" = tl."caption";
+  deps."colortbl" = tl."colortbl";
+  deps."ctex" = tl."ctex";
+  deps."datetime" = tl."datetime";
+  deps."enumitem" = tl."enumitem";
+  deps."fancyhdr" = tl."fancyhdr";
+  deps."fmtcount" = tl."fmtcount";
+  deps."lastpage" = tl."lastpage";
+  deps."latexmk" = tl."latexmk";
+  deps."listings" = tl."listings";
+  deps."lua-alt-getopt" = tl."lua-alt-getopt";
+  deps."lualatex-math" = tl."lualatex-math";
+  deps."mathtools" = tl."mathtools";
+  deps."ntheorem" = tl."ntheorem";
+  deps."tex-gyre" = tl."tex-gyre";
+  deps."tocvsec2" = tl."tocvsec2";
+  deps."transparent" = tl."transparent";
+  deps."undolabl" = tl."undolabl";
+  deps."unicode-math" = tl."unicode-math";
+  deps."xits" = tl."xits";
+  deps."xstring" = tl."xstring";
+  sha512.run = "277d38ac72c0eefbb52ce1cb44ba1400dee506b823c2a7cdb2b8909d2e48ae1d6c56ae843381d48830592550a52238d390d9ce51c22c5e4ea5658383cec64044";
+  sha512.doc = "220b0229c84252c7b4d699951a14826f033d9904ead9f6318ba28eefc7ca2c3ad3cd7f4c986abaa976ad057e62cf8c6595f26ed49b12d16fccc60d572ee34e9f";
   hasRunfiles = true;
-  version = "0.3.2";
+  version = "0.3.3";
 };
 "shuffle" = {
   revision = 15878;
@@ -31690,6 +32053,15 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.5b";
 };
+"sillypage" = {
+  revision = 61857;
+  stripPrefix = 0;
+  sha512.run = "b61813d02861afa70cecf154e14de2ced48f087d363732e05a477727e4992bd460b8475a20d1eb94cfb276f01625516d0b3da8859b1a7e21c2919187cc644e3b";
+  sha512.doc = "eff5ae4f1785432cebc6a1b9fc370df8808d9c9a1a6fcf449ed4151ede386ac2a33fbc8102f78809a744fb5c399aa21c48b2e030916c56f673a044fd262a827b";
+  sha512.source = "e6d1e9ad52142d9f1b028c38eff926396e277916a91899630bcdce6cf56cdc8bc2e542c7765d857e2fd2985bed03669cbfc24db03c1724bd7b8709bee99d9bbe";
+  hasRunfiles = true;
+  version = "1.4";
+};
 "simple-resume-cv" = {
   revision = 43057;
   stripPrefix = 0;
@@ -31777,11 +32149,11 @@ tl: { # no indentation
   sha512.doc = "f5bf92ed89cfc83f306cd4b2599446a11b73f73a0b82afbd0f441e26d837e6f436913bd2df18585c5e215fa0504bfee3d5d4f5ef4da8925161f85c70c14045e6";
 };
 "simplivre" = {
-  revision = 61338;
+  revision = 62834;
   stripPrefix = 0;
   deps."minimalist" = tl."minimalist";
-  sha512.run = "495195229000b74ded294ea807922bb8c1448481bad07eac676b6ce3e5ebe7de2d98d44c88e12aee53e0816f85eb4507d3a283b750031fb964d2c239c1344772";
-  sha512.doc = "99575208b92d107bb22b23f947b918dd920c8d34f0f5e42af1895731cc84faeaccc11231115198f01d4a0461416bf984526a974ff82f17bf775be6b99002ec58";
+  sha512.run = "e8a54be20a59f365db8485712b8b54873898aba1eec95c81e5dbe819dc577f25eb2d45e3e6d313916e57d2ee3e375ece82b57f4aa237e69856701fdd35d881e1";
+  sha512.doc = "c8442062bde35c1537f31ac5617f1da74b6425a1e324f245e7e9411de4e22dcdba161e119db2ffdf847a4bb62e56c45fb6bbf3980bef49dac0c79b9e2824d38e";
   hasRunfiles = true;
 };
 "simurgh" = {
@@ -31820,21 +32192,21 @@ tl: { # no indentation
   version = "1.36";
 };
 "siunitx" = {
-  revision = 61216;
+  revision = 62048;
   stripPrefix = 0;
   deps."l3kernel" = tl."l3kernel";
   deps."l3packages" = tl."l3packages";
-  sha512.run = "7c326ecec5031ea93eed4c2c94c63a3907422b6e1e5a90bd3314c7fa4964d66e366ec798eb1b0ccc8c8b29a96a9cc9ece8da130e20f5d989b14045118714a004";
-  sha512.doc = "6ced0f90a64f6d6cfeca304852ac00fdc8c94930176115c0f5c4b3569eee3bf7ea0bf2c131c123f58602a5c19856969e4a53a079f1d825ddd89a1f6d9d6116e9";
-  sha512.source = "a81dd931a41995b23952bee644febdd8390545eaecfd8f127cf73e0bc7a371d440f41f68a8c7f5fd68b3f0eb520d8ed73b0d9588d95439cd7dc3d76f7db86e15";
+  sha512.run = "7ec2ed709db234abdb2a8771f37b86cfa0621aaa58aeebe648f0abd9b228f8384922624e5363665ab62007b77780dfd0ea60033f4d254d0e81ffed6a7a8ab463";
+  sha512.doc = "ee3638b1cc78e249ed8663a250c91e615e191b52df273ab6639e3bb984fac2630f9a8d489f4b67441e232adb0ba56ff1c1d48028d1da8f7fe76ba7a4217a6a01";
+  sha512.source = "3599abea49d79bc1c1375efba54a5e7cf80544e5285e79a318019d6bda0937a5d741d55c01bb45641b6ea13aac911de6113609cf3ccc9d2557a81977b9467968";
   hasRunfiles = true;
-  version = "3.0.37";
+  version = "3.0.49";
 };
 "skak" = {
-  revision = 46259;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "7bf473f1f35fa05c1cc7cccec212b035619382ce850c287a6b0734cd52182046df35133bd919a335532db9fd5327d2038ce1c3e98342055d93a5dc3b16028697";
-  sha512.doc = "443d98538fb732bfe9f3df26e05e46be54641006df255d3084697301cfa93f48cb8d307a9a5b58f25742b96065658f446b52968c3bd8ce14fdc864f32cb920e4";
+  sha512.run = "df1a6adea32b01c8ad8ad7509c68e025ad2e1005d9aaf26cc35c67f82d21f510d1e414831f5df0a2f0703e295fb4c187d359ef7dbfe8afd76a8ce75a90f3b4bb";
+  sha512.doc = "ffcb56dfae0a0ea91e716b99d1d91d4f20fedab8eb7b637f62630dbc4a8fad0562120cc02a754df475dc16c4b1a09fb2da48b8a9e22112d0c69550016026f76f";
   hasRunfiles = true;
   version = "1.5.3";
 };
@@ -31946,12 +32318,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "smart-eqn" = {
-  revision = 60178;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "6c86441ebc231e92b5ed5663b2ebd59783e05afc6cf8bba91d69f7aaf5386f32b0f37779488057be3e01b2dccfaf9bc764e408d47528bd71d73add32bca817e3";
-  sha512.doc = "3f4e0eb5ab5f2a40604f4d93657ae8b118f41bd6b37ea61740c64c9242e6bf3d664be6d120371b85fe47f44f2c80cd4a65fcaeeeac84ee1eb42b917e394316d3";
-  sha512.source = "6be5d69818d3af289514d1dea73726bf65e45383ddb65e4c25202f38e621b53eba957b1576a74c2667cf83edff1f57a21f3cab740f091e8c90112354277f2bca";
+  sha512.run = "03f69303ec66b59a7425e06a4e8941a5c93414514b5f80cbc138a75a5619791dfa3ff2f1435ddbfbe7fe5af298a1af5325f279f36d924e97a5074ef930b42997";
+  sha512.doc = "85eb6e8ccbea66cb6e30f862491adc02316af9071753459eb56e8f19011e9ab7865f87868ed348e5b0f6192b2305dffe5272d885486b881e2d286ceb211c77dd";
+  sha512.source = "f7bd8c3b2e616a739b0d5ad459e1041c492b1e00cb9258b55ce4631465e510e71c166a3f6a94b8244a7e1b4bf098ede5c9379a7a5a6baa90eb28026e9be0bad3";
   hasRunfiles = true;
+  version = "1.0";
 };
 "smartdiagram" = {
   revision = 42781;
@@ -32004,12 +32377,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "snotez" = {
-  revision = 57147;
+  revision = 61992;
   stripPrefix = 0;
-  sha512.run = "f55e6af23e02c4a56827b405cefff308087be9a78c1c171b4d8a20d9669cff44d43cb60f522694708b39b8b010576ab0ea6ad2d2355f5b9113ba9e19ef913a87";
-  sha512.doc = "b68442cfbe57907bf3bd1843cfd4006fc3fd0947d5ff06c18afa50d206f4f2890f7e804f55bb9a3c4f16677deca81f3fc41c75bcc5fa4d55e4aec23a644a86ec";
+  sha512.run = "8e827171eb8ae6281d0be97bddd251db57349f935ac6309eace72396be37c33e8bd79d792701f56a5e338eccfae452411de520bdab5f5747e6fb741e5215c1bd";
+  sha512.doc = "230cd4f3f8922fe520c7b476f8f7b31e3965029e72e58828107e5f7c761b87a64f5c5df9faadb610277d45ff95052878c070e690932759850da34fd82fb028d0";
   hasRunfiles = true;
-  version = "0.5a";
+  version = "0.7";
 };
 "songbook" = {
   revision = 18136;
@@ -32123,12 +32496,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "spark-otf" = {
-  revision = 51005;
+  revision = 62482;
   stripPrefix = 0;
-  sha512.run = "863587da0d6a03267dd36437b112be4a1391537d7186db0f9acae2d5c3721b2a303d7b2ca86d47a619b9265930fb4795f87522498cd34c80d057ef56d1b8daa2";
-  sha512.doc = "2b3a9fab8e29c1fd9bf1b3a3f729d4d728fd22d6dba86aa746febac2eafe59df1afe65f557c9e3c816983eeeab8d798bb4f54712be8f5590706bcc49a2e50199";
+  sha512.run = "bb8501ab9387357ea304d4dc420f2abc3b14ab98e2020c15283af74f99bf773fdcb01d9c0e8664d2d6c7cb909a781e918702b0a11e901f37bcb0581d8e5e810d";
+  sha512.doc = "48603e9b42b13206e1a592fc623d39ea7364fe28e89d3ac92f6dd56abeb8cc1256f91fc36df7fc799c42bd6b2d6626091a6219eb3fd5224fc207c52f2e41def4";
   hasRunfiles = true;
-  version = "0.05";
+  version = "0.05a";
 };
 "sparklines" = {
   revision = 42821;
@@ -32148,12 +32521,12 @@ tl: { # no indentation
   version = "2.4";
 };
 "spbmark" = {
-  revision = 61383;
+  revision = 62448;
   stripPrefix = 0;
-  sha512.run = "ada1d4db0c3b59170eb7f5fac544ae628bcb81ab4ec5dea3ec4d1ed235ac4d4ada24f6ff6837c0a659e9e8d2da37c70af529fedfa578ec0e53f47acb3646a87f";
-  sha512.doc = "fcb1049bbe587c0f4c77476d5780d2f9d4cc4be9f6a58ef200c1c0b85c5a271a8d3e80bf4dbd047a71ab3470e876ce53d2627d45a7c10586022ec0547b6a7d07";
+  sha512.run = "7d3662a08b43c225d8c62ba13ea0071d4eb367d9400dfd3b35b9367b238129c68aa066178db23bbefafe17f1303b6ef4e854a667c0a00445566676da2f526da4";
+  sha512.doc = "1e973f568453b02e85f67d4cc2f2cfe51ab8af4b31c4f7f48df9d4d4a2bef649549bcf5803bbc66d1459a592e2e644d7117b6aceff56867ee7e34d704549698a";
   hasRunfiles = true;
-  version = "1.2H";
+  version = "1.4";
 };
 "spectral" = {
   revision = 57296;
@@ -32163,12 +32536,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "spectralsequences" = {
-  revision = 59992;
+  revision = 62262;
   stripPrefix = 0;
-  sha512.run = "6865ffce4891cadcffe77b43572f0073a5e53c257b660e3e6ee6df004b2560d7e98bffad70195150c87952152304439e5602c9dae7d0d5e763c81fb8694c8d3d";
-  sha512.doc = "99529e9a783df04be7ff4d02b9579b82a1e4ba98b04fbb5bb89df7e34a338a1a0188359942dc4ab3a61d5928f496417465c6615cacf6a0f3923ced35135b59ca";
+  sha512.run = "02ed7d4a46d6bf7046985f6f63845234c31049cf4ebec352be7704a6076859533c4180fb7e73f52755f5fdcc1fa3a15fe1dbbad2daed88f1946a4b03bbc14892";
+  sha512.doc = "7e77757234287b9ddb0936a6df71dbc377a4a4872e07c7fe5713693fb31aa70520dbeb1083c510d165ab4c2e12df3c9f1cd40093b644a094b2b1dbddfa436ec3";
   hasRunfiles = true;
-  version = "1.3.0";
+  version = "1.3.2";
 };
 "spelling" = {
   revision = 30715;
@@ -32301,12 +32674,12 @@ tl: { # no indentation
   version = "1.0";
 };
 "srdp-mathematik" = {
-  revision = 61382;
+  revision = 62418;
   stripPrefix = 0;
-  sha512.run = "136e82abbe636476439596ffc746539ec587adcb3990111d8d3a6da6d9fcc8232809f75f269921b04b21f4494d26a28f542253a982b3735dc98e31d84c87b99d";
-  sha512.doc = "d1ed31b68c9ba52fde6aa1e676a7cc74ed1086447bdcc3190fab8e64e9c32dc30c348a6e0a36306d0b3d31f5fe7dca47da0016990648a00e4416e291dd3bcf28";
+  sha512.run = "72de0b3d5bdfa56804c36b6cd641b357c31466f3478ac6ff334fa5881c800865af2912ad429e70d440a9e5d0b642828169047f63782980e684be11b06032da65";
+  sha512.doc = "205eab689b65e8454fa5d4aa0da91e2561e1d67828b690f2a6d20b2c3fc06ff992ba63cf2116174379a04d0a1fbcb40768259f0366cb05d3fe44b7af8d0b1ea7";
   hasRunfiles = true;
-  version = "1.9.3";
+  version = "1.9.5";
 };
 "sseq" = {
   revision = 31585;
@@ -32384,12 +32757,6 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.04";
 };
-"startlatex2e" = {
-  revision = 56809;
-  stripPrefix = 0;
-  sha512.run = "e8946fbe61c9c52a3fe5cc7b6b4adfdd8a90312fc146f331f0dff774e819ed1a789ad047c2587816b7b8568f4a520b2c0600a4b39ff3586254bfb6f15db28b79";
-  sha512.doc = "767c9defb727f206c8e2090a1501e8435bf77859b6546690c7a8d1cb6481ae4c576346449fe760423eaf126858e521b020404cbe84ab2f02c95f07e1af8f93c5";
-};
 "statex" = {
   revision = 20306;
   stripPrefix = 0;
@@ -32503,12 +32870,13 @@ tl: { # no indentation
   version = "3.0b1";
 };
 "stex" = {
-  revision = 50489;
+  revision = 62231;
   stripPrefix = 0;
-  sha512.run = "43d9cb084f47b1fc2bfab9eb11ec9253fda495f29640d333c00de5d7a5681bf37e0331002938e141679b0ab10345e23d5cbff19cb33fbfa01d25be62295b18dc";
-  sha512.doc = "3e936e5905f5dac9a16030af94037398c60b6b79feeb6180af4b7542eb8293a681a213115dd082d9e2df8264771d6d92544e6ec514cf40cf4a136cf74a0a6e51";
-  sha512.source = "5cf2ccb75d699f86a095481c4fdefe0d2a981340d3df72c09ddfc4acd3798a35546674eca62c8aea07431b50edd643c514af901d86513a3e5d0d3af9588f24ed";
+  sha512.run = "e47a724caa1a47a3d88d88e3ecb69c3336465df2b777b6567fb23c97506d413251a3b300e39e86ece8bb3271aeb13b00daa0f798463249ce1717783df7eca14a";
+  sha512.doc = "47ac36659667c4743056f86ef9e807656bea77b24a0374c4a8f02826b62b9e1121034785f3474b5726b862f523a3620657606d005f45521e51592cc9dac12f39";
+  sha512.source = "14ed535a53be60c2d6de6aba088c52d915c9f7b656ed4eac9ebb78a53e0ed9573ac2eb691f097d7d7d26a9d70df6abec4fac4ae6e641aa083af09179c7650f02";
   hasRunfiles = true;
+  version = "3.0.1";
 };
 "stickstoo" = {
   revision = 60793;
@@ -32905,11 +33273,11 @@ tl: { # no indentation
   version = "3.1862";
 };
 "svninfo" = {
-  revision = 17554;
+  revision = 62157;
   stripPrefix = 0;
-  sha512.run = "efb2b358bbf5a05b17a591114d0f45a38ff42837751d00b88183265d9bf595ba39377fc53dfe69ca01ae8c1776e6d4ded9c0f636e0e697b946f1d193b39c1537";
-  sha512.doc = "f8f20578da98d54181475d23be625a80c35af5e464fdcfca80643f8701a029bfdf03cfb13ec42be34312eafc372e42e5bbb4260aaa5066fe004b2fd6fcb2acc7";
-  sha512.source = "7ce865a81c8fcd47ff2cf00b5304e40ca0d534ee63b23cf24eb716926f3258a8081ec6aa9bf160a3fce741f1dab6c62e069ada8f5298f9a354d92c34ab36058b";
+  sha512.run = "ca2e0a3d0a5f4ab6950d5995b39f785ba071294134d947a47ca3e1f7e0bedc69398f9d0fc2162f349a635aa19ce8c963ec7c88d4bed2100d8f3da05219235655";
+  sha512.doc = "aa4bd06d31bad0a2441623b80f52702d67fdef03912b6f96058f3a89d00f4601cc4bae76a24f49540169ad30883177d038ddc7dedabd8d643b59df5c94be4a65";
+  sha512.source = "f9f65dcc56ae6b9cf2f5cd9dac27e3760f12428bee623e70018a767dbbf0b919178994349051893e52a04de75b8455b1c218b0f779f4a0ae4930480ba0ed24d1";
   hasRunfiles = true;
   version = "0.7.4";
 };
@@ -32930,13 +33298,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "swfigure" = {
-  revision = 57213;
+  revision = 61493;
   stripPrefix = 0;
-  sha512.run = "128965eab86a5028904bb2486c7adfead525ccc26a912cd4f69b63a11e18fadb3f8b0f42a9ba3e8296952afd3be0be052fa721a0edd6df320827acda82e6271a";
-  sha512.doc = "968b87d733ec7bfabab4a7996482c54b184e8e46c8f5e30078e9c8957923c2fda3f136b65d5b1be392b62fce5fd1e016066dd86d42da3e43997b04a723a491fd";
-  sha512.source = "fa34afb85d7380539e283d5f1aca26468c31b6d631d28618a3cde73e3bfa493a3106f4321a5cbe172d86ef547165fc255f02f44957b28abf15c1b08d36e72952";
+  sha512.run = "ba65a58cca232d80058a392aad3b84ca77fcb7d5730ca7193e7db3ae91a6558dc6dfdc8a9c41226f2b837065d94c37869eb5879bc5e5ec56889eca87aea3b1ea";
+  sha512.doc = "193a0d1077291aa5eef1c8f570a4fb6c10467d022691076302f985a7da07ba32f0d550a13b8dab55050456c587d00acf94bd3d619c4764b332345eef65928c3c";
+  sha512.source = "37ecae6859974fa4855c68de0611520e5a2186e71ba9e737c72cc63518c14d98801bf6d2683cdbed170c4a1da6a85d94266ac355a5a75c4b1bd4dc93323dee2e";
   hasRunfiles = true;
-  version = "0.9.18";
+  version = "0.9.19";
 };
 "swimgraf" = {
   revision = 25446;
@@ -32960,9 +33328,9 @@ tl: { # no indentation
   version = "1.2";
 };
 "symbol" = {
-  revision = 31835;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "d942031f4a865c9db3f1deb68e9468132e811c88a4de67661a25431506a8ea41b2a9cd36ae0855208802d5b7cd4495b3cc27e9e18996dbf96f2529fecf4683e0";
+  sha512.run = "1a2d3239cf7c9910b19db527d5c2b43af2b399114b3186505e790a139ae5ef82c2ff1ecd5adc858a46febaf2e46e028037ba65bd5b84fec0737edd89d5061c09";
   hasRunfiles = true;
 };
 "sympytexpackage" = {
@@ -33171,12 +33539,12 @@ tl: { # no indentation
   version = "1.4";
 };
 "tabu" = {
-  revision = 56615;
+  revision = 61719;
   stripPrefix = 0;
   deps."varwidth" = tl."varwidth";
-  sha512.run = "cee6894fac19a98293402b714cc52eaf8ec0b9965a8e9ab9f5125388a2e4709e5d33063286eac9e45a3470f551d1aeeb41d09623b5dddd6563c1c462c2582ba3";
-  sha512.doc = "9e10613a8ca8b29d61ab5a394ece8e25e0e8abea4b7a70b01382935650c86e9554712635c78f3b097afc5f9560cef2fceb984b383826e206233c28144f332c2f";
-  sha512.source = "7b88f0fee52dead2555b4dcc11699ff167207f210f663faccccc1f951e40a53a5a572840c43070d4f86bd183c5e0d9e456c548013160a39264bcda10e71ca49d";
+  sha512.run = "b40dc1e91084912df03175a6529223c6f24ae3c0ec77cfb8f1f8625816ea78c044c8f01f1b473e84696421d6772d9201fa4b59aa93e6f014b73598d16c09a6cd";
+  sha512.doc = "5ef0a71d643bf5069a622aa8c807bf87db7445caab1f17b5202ee25ddab5368e94e796eb16de4fb183f294cedc232d48cbdba68f45d2451e01a2483d6869822d";
+  sha512.source = "7c80ee8d25933e5d1c579357cffdf7177b0a419a847ca1e671cb1dda19fbde9b3680658df6b814d5d92953dd13eeee5100a5aa2fdb5fec3cbc1e213545cb3a78";
   hasRunfiles = true;
   version = "2.9";
 };
@@ -33207,12 +33575,12 @@ tl: { # no indentation
   version = "0.1";
 };
 "tabularray" = {
-  revision = 61200;
+  revision = 62329;
   stripPrefix = 0;
-  sha512.run = "b73fb6fb0ef945b79a41438d0a1282e367848de551daca4b274379c9906b65af0d49397f7e040c430753818ff967c5b5f148653c5807e4af33b2294cedd7eae2";
-  sha512.doc = "c3d7fc1a32ccb649d00019804212ec592d5a7b474547aa61362ab6a403c6b8407f9240aa1bf390f199de80371369a7d555a96bedfcdd7963f98e0d9ce0636c5a";
+  sha512.run = "b48eb4bd562d3a660524d738e32048f43924eae2d802681c8b131e6df8f667814983d6fa76790766b9a7448450fd8fde3546b1ee0c75daab257290122417506f";
+  sha512.doc = "6cbbe594e1cb4fd5092ce1dbfaf90cd4e4109e0196e9566f5b9897be7d6358892b21ea53e0b261d0eddb441bf7b630944e229dbcade62e1db53de5b26f041ac6";
   hasRunfiles = true;
-  version = "2021Q";
+  version = "2022A";
 };
 "tabulary" = {
   revision = 34368;
@@ -33249,13 +33617,13 @@ tl: { # no indentation
   version = "1.1";
 };
 "tagpdf" = {
-  revision = 60366;
+  revision = 61600;
   stripPrefix = 0;
-  sha512.run = "30c433b859248ad73c87daa65abfb816d464f8e1f3335aa6cf8d12a16d330b5a25140537dfc428b22540cab93d1c867e3b2dbcfc1b591ccaa41012a9510df8a6";
-  sha512.doc = "a874989022eb3c75fb9c43d3883e960b9e9c56ad055edd90364292b0c102b04657addcf289d28303bcb6e8b1a9b7c0697ffd7ef7fc834ce2613ff0c063887ac9";
-  sha512.source = "9ce6b3b72c14c620e05a0575c09c5cf871bd1041704d42e535a6b38ad2daab3896fb928031e19a16a02e91796cd10bfafe1a022825a7376038d356d237171f6c";
+  sha512.run = "d976d6502f5356aace244de0a790debc8b43014679a4ac04866ae697d000f273eb9cc2bb44a5bd7f394e9e2cf14ea96e1086ae9799a01dc3d3199b24304b9cdc";
+  sha512.doc = "1c676f769fe449102ef16c12ab46aef747318ffab5b1166478bc1f0dbfba307e063710f7c46f1ba77290c86fc7a16243bb08a4bb66c99ee2cfcbd644631b1c88";
+  sha512.source = "02bf6eb605c6c9d324e68e11eb12dcf02fe795622075ecd74bcf05f364b733951ef411bcccb23fb9790a365cf36d0b1fe1c5849b49ffd768e296242f43c76627";
   hasRunfiles = true;
-  version = "0.92";
+  version = "0.93";
 };
 "talk" = {
   revision = 42428;
@@ -33266,6 +33634,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.1";
 };
+"talos" = {
+  revision = 61820;
+  stripPrefix = 0;
+  sha512.run = "50a35159c65afa43900ee8633d2b86effa5aec6a430f2e8fa85f77442da35b140012b27959155564e29286aba465d9bab17c9f5ce5ec0a889ec4ed5dff1b4dcb";
+  sha512.doc = "9bdbd72f86e0b957580bb008ba349eb428721913010e9fe2cd9ee9b01733d6259914712b60a4a7f0f5804041e6cf876d8bdda2910de1b191715c1d9c8d8fbf77";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "tamefloats" = {
   revision = 27345;
   stripPrefix = 0;
@@ -33298,12 +33674,12 @@ tl: { # no indentation
   version = "0.2";
 };
 "tasks" = {
-  revision = 57835;
+  revision = 61541;
   stripPrefix = 0;
-  sha512.run = "995da480ba215f79bf989524f3fe8d66919529aa8cd9bf40d5e42276f3fa0ec27c4a0da51281b8070dd956af1cf80403fdea0916d39e54a9f21796c16773ebc5";
-  sha512.doc = "2ac26058e157163991fee0704d4f22e8f0480a22391f029e29aeb5fb76772955b753ba29261db58918391129e24c5a31efaae6273aab653ef13a34f863347dfc";
+  sha512.run = "0625dd459eaf53f842f6c36a550808c3efa8004a76cf25bc892b4c50a640ba588c2d069ce8df10f5c8febf5461390517357040b8a472532fd1f9b9ceddd9e5c3";
+  sha512.doc = "a3240edd6bd7e87b7e1b6292fc227e166b54cbda7f130dc5f03c92707577a9b51f4da5377375419feda6a91a710f48b787dc3da90a1befe1d1328ea9a799f649";
   hasRunfiles = true;
-  version = "1.3a";
+  version = "1.4a";
 };
 "tcldoc" = {
   revision = 22018;
@@ -33315,12 +33691,12 @@ tl: { # no indentation
   version = "2.40";
 };
 "tcolorbox" = {
-  revision = 61358;
+  revision = 61524;
   stripPrefix = 0;
-  sha512.run = "c0e45202f18657a68a2701047f95325ed34b103a4798fa167ed6513b21c4219b886a4fa82ac7015c88a5b2ebfbf459934f80fdb592cae4616de9756df396f2c6";
-  sha512.doc = "fb38e16b3ab149892c97071d4693ad1a61e0b75816313977081c9424f6af625e302bb84ab8b02ac709e5fac51231c3d4b8e03564ae3b3723891e98002687febe";
+  sha512.run = "35ead6c1859d6112eae3e3f5c33abfa58eac55de2154aebf21131d73aac96fa96f7214e662c5eb174ba4ebb6ce26ee0838dc6ee1762f5d4824dc17c7bd6850c8";
+  sha512.doc = "64bf381bfff6b87b431bfbd32596818a786f99676f596adab78cc0b447895cf9f63b234ed9e120c543c7af7fdb6c58a114d15c0d4494171b2a3ba49085e4976e";
   hasRunfiles = true;
-  version = "5.0.1";
+  version = "5.0.2";
 };
 "tdclock" = {
   revision = 33043;
@@ -33331,10 +33707,10 @@ tl: { # no indentation
   version = "2.5";
 };
 "tds" = {
-  revision = 15878;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "20b739d69ba9804c12761c0eb76c0b7961657d2ba2fb00db9d083022279cca2b2b176fc7aaba11fceb77da4b7a23ba53c80e98a492fb4929adb545d56f5e8958";
-  sha512.doc = "ab08ea4220a30ac896add47e5422dbf2ff3eb65c3c89e90c87983c5dff75dfae6fc4d6f8cda58f2da51dae505f537ea07cee0e2378da845c20e790f8a1724f7c";
+  sha512.run = "306ac6f6f21e7e2a26ae759130b79435fca4720d0cb810660a254b3b30c21a3dff5eab2c8c739771a92580f9b2fd2580e161ccfe97e00e5e1d97109a6327e8e0";
+  sha512.doc = "6719270a877a241cf123a84ee01794dd3b9d77e8ae437a8bd6c91dad3bd9a327bfc9ae75f9001a03e57630baafdb06adee84c31a972d08b046ee5cd8cec9d2f2";
   version = "1.1";
 };
 "tdsfrmath" = {
@@ -33505,15 +33881,15 @@ tl: { # no indentation
   version = "5.4";
 };
 "tex" = {
-  revision = 57972;
+  revision = 61719;
   deps."cm" = tl."cm";
   deps."hyphen-base" = tl."hyphen-base";
   deps."knuth-lib" = tl."knuth-lib";
   deps."kpathsea" = tl."kpathsea";
   deps."plain" = tl."plain";
   hasFormats = true;
-  sha512.run = "e38f62fcc5ccee22a909eae5ea196e055eae59eedc652ce9788a3b4520995e97f64c683f1ba940853a06030a7ea6f1d749ed4dda1cb30433f87f5f9cdce5a9a7";
-  sha512.doc = "3056263569276ca7a62ccb03542eac99b648d36c398ded17204a2624f06920c506985aedd1a639a48bc60af6394d091cdfd9ec44000730bd8e8c83c2234bb569";
+  sha512.run = "a1043df4c4cefa34ac198b9ee0adb74b99321fda3989bd090622308007b1baba4f1d4338ee675208bb8baea66e8e1e4abbb72e30d5eabf68e67b61dd5cfad218";
+  sha512.doc = "ad4b956f6749868fc1ac550932443e44e05d20d40e543e91bccf183cf81d2134ae86997aeff1b781659025492bcfd139bda37a89f01c1a9cd22a4a35b92c28a9";
   version = "3.141592653";
 };
 "tex-ewd" = {
@@ -33606,24 +33982,24 @@ tl: { # no indentation
   sha512.doc = "aa73261fb0ffdbb7cdbf85df354490a72bd95e4d98e4a497e98666e6f5533a7f05a7132533db044ba993d86e03fc21825bc6fa7f262e5a0bcdb6de8114d38eee";
 };
 "tex-vpat" = {
-  revision = 60687;
+  revision = 61810;
   stripPrefix = 0;
-  sha512.run = "e68812733ec787ad7fb7f80ad589fb0d207520a6fe6904060ce7c383d7d45805d206d3610e31c34dfadd011a32c81740f0fd91330b30a24ba2f64fbdab1d5f96";
-  sha512.doc = "909865a736bc77a01e9ebf78c0650dc598acf0d2d078226541d5d236d72f08fede27343f15c0ca832fe17d0eaafe4749431974b062daa7076980e94dc104469c";
-  version = "1.0";
+  sha512.run = "748b2918120012869223afd9516197992485078eb10b6c9406069376cb2b7afdd74fa848ad0a6e3b85c8e89f869283ffe89d9add89d64d388eb83fd02f37874d";
+  sha512.doc = "f52fcf79d04eca3dfb3351da667efa8b80be894400490048da3ec1e39d973fb1f17fb126381a6f5f04269da6f5f880607a6410931fbccc2d8d3ff1f59a89f934";
+  version = "2.0";
 };
 "tex4ebook" = {
-  revision = 61012;
-  sha512.run = "6493b58680c1e2437f8c8f964722fd45b860b577d1090356952dc46b5ea7d1349c526f41ee0254655fd1d33df8e427d83cabcbd237696e95950c570970dd291f";
-  sha512.doc = "b7a226a5249496dafac9ad09252ab8172f7c383a7f0cc82fd289b3831b7fc1ac53d76c8bedbb26c662c41ffa7502e773dc3f79dcbd3a2e26e62fb5d73efa21f8";
+  revision = 62076;
+  sha512.run = "ce9a19544d63fdec5e37fd129bfc87c6fa7c35ebfd719a703b9ba59dfd4ddcded42d03d075f2fd80730a5f295b2393c083098e5782b3a0ab2cbace335bb78c50";
+  sha512.doc = "08bfe7b1ca1b245174df6b4e4a1640ba0cf7c5c821ed76cb9b85b512055088354ab0d59383b5973720fd83b298efae795f46a61c7cc95c2816edd57408c4efd7";
   hasRunfiles = true;
-  version = "0.3g";
+  version = "0.3h";
 };
 "tex4ht" = {
-  revision = 61362;
-  sha512.run = "624d0cb9c86d0a9b7f36a44fab3515ca0d480c843fd319347670d5bd2ef5b8c15974579debc3d674f23314e81362282d7b099568f4513f0b1deb4be8efb8ee7c";
-  sha512.doc = "1c7f345d6666d4f474dcf3d38d2077dc739e532e1112880e5c63514300363d5c826320358cf666c5f291391c3f5dfad53d3b2648124717a84395ec427c57831e";
-  sha512.source = "6d7a2b5e75c0e185aca7d67ca2813619e7101c0ae9af7a2b017462c3e6a423f9948da702395787e44a9c21b9cc939b7eb218807770c5dc0fab71a8c2ffe12b44";
+  revision = 62532;
+  sha512.run = "3d8cd7697c508dce7af2b2c5fc580d619c792f920142f0288881d9a5d07c7f4e655249cabbfb8b41d75bd3a5ffd0cd3c899c5209d3ddadf40e2d896c3711cb1b";
+  sha512.doc = "da7d20c1cd3ff1e7b5251877858e7f988763236afca1d8b7cd858b1dc1fd9e155c079b656e9adcd006357810b8062fccc792f5fac19ff119098a7e4a7fa36a43";
+  sha512.source = "3972c22d592cf2707cc8769a3e2b50637fbbfa9ce58fe7c829b55f7b868c57f5c724ac5a2731b0b646db0386951bc0ee8c8080111c3975363f02bb528e1bad8c";
   hasRunfiles = true;
 };
 "texapi" = {
@@ -33687,12 +34063,12 @@ tl: { # no indentation
   version = "1.3";
 };
 "texdoc" = {
-  revision = 59283;
+  revision = 62816;
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "1504bbeb86a1329632fad25b98b967bad8c68fe8249f1ac9f4c017a50fc1c79994f58f3545681741213fe28d94b568bf4afb8b2010e93198a7df2c75bc3cebeb";
-  sha512.doc = "bb79a2cf6c9a013a9b3c4c11597f86617043c8abea84b86f11a9ad5093655d68e0ce8d04e59b077f832c513c25e407d9ec06bdc412c3427d9ec43bb5103ea42e";
+  sha512.run = "a160a32f5a29c87548bc09bb9c7529ca629ddbfbecbc3751bb913b8b22f5b211a1bf97279e071df6f4a74202dfd284b5978a91b6e6aaab207152057c33894620";
+  sha512.doc = "0d496c27cdec8c4fd4ab7ff3205c667fd523821e6fdb91e123ad10d0ba97da87f3d64b6182bac8fd627dea0cf654d067726737ff826372abdfee020cba2fc824";
   hasRunfiles = true;
-  version = "3.3.1";
+  version = "3.4.1";
 };
 "texdoctk" = {
   revision = 54557;
@@ -33711,11 +34087,11 @@ tl: { # no indentation
   version = "v2r3";
 };
 "texfot" = {
-  revision = 59040;
-  sha512.run = "101a37bb79e58f25c2a9198f1327ca911ab292578fb7d80769cee8d0b4459bec9e3b49addd64ac1064523de0685a595c4bce86cb272fd02294d3168b3db28bf4";
-  sha512.doc = "883a70368bbc9797e7e2967a4c451f6ab735cba63d92d1ec65ce954cfdf7235ca2ad4291dd2fb50cc09eb0e6c3831e6befd67839ba9b9c522f1199f995cae772";
+  revision = 62157;
+  sha512.run = "6f3495de09a1aad317a7187e5cf5e6868f722b36f766497ae3dde0ae511381e67290404bd96c9ae99f5e992e9609a9c608a830b2a567f5e186a1409137407365";
+  sha512.doc = "d2e9dc71ad4924f699a0e1084906759da4dd867e827d116b4014e8f8be50690e488bea71ca7498e37f17e458d0b47937248e911667228425e1a81cce03c453fe";
   hasRunfiles = true;
-  version = "1.43";
+  version = "1.45";
 };
 "texilikechaps" = {
   revision = 28553;
@@ -33732,17 +34108,17 @@ tl: { # no indentation
   version = "0.1";
 };
 "texinfo" = {
-  revision = 61024;
+  revision = 61498;
   stripPrefix = 0;
-  sha512.run = "1b2dcad2c8bbb0f6c9e2487921beae4791407594e45ed07d111b476619985b863f20fc077b5bb3d8108407b652ddc3f79d852367f8bfaf70027f4fafd8c3f668";
+  sha512.run = "da1f4ded25a13164072cd502bfa28eb4fb3c5ec3bbadb0478dd8c4e3750949ec15e6e01cdd78f5afd8da17d1eb248b2a3921ea2704dafb7785461e9732142e43";
   hasRunfiles = true;
   version = "6.8";
 };
 "texlive-common" = {
-  revision = 61281;
+  revision = 62149;
   stripPrefix = 0;
-  sha512.run = "98e8b947bc399ea0ce4c5de8aa8bb811c57e9486fd419066ed323b151711f1cf92e7dca7e9e8c0f6e8e96bed8a38d1b51af8a0cb9d98636b1e44ec3a5b2cdb6d";
-  sha512.doc = "ba7d2425d50de29f0c0dc4738b27b5eea24974bdafa790d301e223e4d45d44a1b53c7892fdbe1add59261cf41d1a65795faccd63dea7b76d5c48994dd5edd022";
+  sha512.run = "ce40836bf640d6220172f358a92a6bdee6117be73bc61e02efc9182bdb41119c64db7beadbbe62c65ff8bfc66bdbe1f055bb1bbcb567d770ea9cb303bb4a904a";
+  sha512.doc = "8c1acab57ae2568e3c4b1d42f65cefac3493fa92be674c43ad1cac8fff5fd0df3e83269ae7810a0c5ac0a85cfeacfe8767dd7ca3fa1aa9256ddab53cd8110cf9";
 };
 "texlive-cz" = {
   revision = 54496;
@@ -33757,10 +34133,10 @@ tl: { # no indentation
   sha512.doc = "d51df93981312475c5c4b4976e4de00441d6ed4ea9e51d30d5c8360e314417f9b33c5804acae3c6d50c714bc76966120de37095b3ef33c78c06744ca17e3855e";
 };
 "texlive-en" = {
-  revision = 60536;
+  revision = 61754;
   stripPrefix = 0;
-  sha512.run = "eac0677660ac137244e06125215f8f04a58e361e990fe219a50381a1d4e3bebccb58b0c1ee4530b90672aa3c7f364511364887026bd2a355ea70c1b9c9091a7b";
-  sha512.doc = "fb985ef820a525e7b2ae7a8b67c49fa798c8ea333513f458be4e0369765f56ef4d68de00aab6fe0f93caf7d68fcfe18fffb6c06b6fc161a0f0be4674ff68611a";
+  sha512.run = "b15a02a548161baced900fe27491345f64091857fc8dca051495ba85fbe7cdd4e27d24181ecfae29950ab3cc4d433ffbcc743c73e8c1ea24eca8970b0f34cf25";
+  sha512.doc = "5a9df21d50e50522166a1fff366faab48a94019f55fb5e67be1fb14e7a4cb72ca3988a965fe5b303122e981745fca94993e9e24c2a97c2e57bc283c3af1d4901";
 };
 "texlive-es" = {
   revision = 58221;
@@ -33787,8 +34163,8 @@ tl: { # no indentation
   sha512.doc = "1445ec4257d202f77452df48e70105e423e048ae9150ad70acbcfea350f8b8686ca395e9452d40eedbd6824df7a2d8560c5c761fc867cdda0d2ba9182eba5f16";
 };
 "texlive-msg-translations" = {
-  revision = 60760;
-  sha512.run = "2d9b5040eda6606ecb6050452d0485332f6265b7876169f1507c629d59d587a5c74a9b7bec606d8e028a1cf5f5bc9e0a92d30d36588ac637bfa1d9508e862f47";
+  revision = 62192;
+  sha512.run = "128b5d755d28b56047fea43d40904bff2c865915186aee18a89b729a73fdee2af6adb0290c111c007172c35f16f9b7a6d3f2fcd665b0f9828c68613b84f1d931";
   hasRunfiles = true;
 };
 "texlive-pl" = {
@@ -33804,9 +34180,9 @@ tl: { # no indentation
   sha512.doc = "40e8b29f29ed61addc2b9e7ce4b73d12bf2e59f1c50c65e59e9c8cac5e6c3ef264ce2071b0d54e15f5029c101a51d0efcda0144e113aaedc714eb1300aa9635d";
 };
 "texlive-scripts" = {
-  revision = 61410;
-  sha512.run = "d416567a07229a424dbc3fc7d8ca3333eebd4a176d6ded56e31648f7d94bd2ccc100996566236b598942e680973471efeb3dc8f242990f1ff8e3390460c5a52b";
-  sha512.doc = "e1103262c70e3d92f3ee6bf8f5b0a5ff740b5fc165270d0b11f5b63870cd6cd71b3b77ee86c8f23a4d511990e52ec3a35b82185e1e2f28793ecc54698571b2ce";
+  revision = 62847;
+  sha512.run = "493b934989dd131988be727acd6a7ea7d1d1d2e8b6abccba79ead18be0bbb1dd201e2c0adad3c4cb3c96007efb606853b6a65f8c6745cd053341099641327993";
+  sha512.doc = "ff733bed0a1d83eb99b74fa30d17e43f436192fadb4e9d5666e0913d8072083eacab51bc2effb9ff86bc82011dbe31fc37574dfa7b75dba54b9f0fc6d1d29ce3";
   hasRunfiles = true;
 };
 "texlive-scripts-extra" = {
@@ -33840,6 +34216,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.11";
 };
+"texlogfilter" = {
+  revision = 62793;
+  sha512.run = "deca1b05ad2f0f6d5514dc3a06f99328ea85cf49a78c57d30d939cbf891d91114129b1c08156cee7170157a3bc09d6d2ba2629d24ec30b665a80ec6d6f2977c1";
+  sha512.doc = "26f5af320fab0fda057e1b69b63bc677948f60e23359a985937d1df9e099df6af1bda3e9e85a4c1d113282e7979fdce867d601e0ee4c4e86c426e16baa85b87b";
+  hasRunfiles = true;
+  version = "1.1";
+};
 "texlogos" = {
   revision = 19083;
   stripPrefix = 0;
@@ -33848,11 +34231,11 @@ tl: { # no indentation
   version = "1.3.1";
 };
 "texlogsieve" = {
-  revision = 61328;
-  sha512.run = "badcd49c37d94e74b342512fe441b552d09347749ae210fd9d4a01be4cb019064a20759ba323466ee358e61da3eb190a87560f6cc7e12baa77dd8520924cc7f4";
-  sha512.doc = "e3ecd023b1ff72e5347ecbe5bc1c148e9ae2cba41657129fb501bbd0d7cd24841e0221e27e5f3c1211bbaf92e118ba58090e8a9d6df07b49b10600e95551df11";
+  revision = 62724;
+  sha512.run = "c75064b0aa3612a4b6dfbe39ff8b009d788a1070cb0248ffac9ddcba80649a1b67782ae4cc1c970e5915560d72f68058fb59e4064df4dc6e546d5e29237d2d4c";
+  sha512.doc = "ddd095b6907930c1ed63d22a1f05d43a20285e61ee162f6016137f91f23f19283563ea19449a00d6482d45c700fc51ad934730988f4884502d90e4e2bdcdc2bd";
   hasRunfiles = true;
-  version = "1.0.0-beta-1";
+  version = "1.1.2";
 };
 "texmate" = {
   revision = 15878;
@@ -33897,12 +34280,12 @@ tl: { # no indentation
   version = "1.7";
 };
 "texplate" = {
-  revision = 60096;
-  sha512.run = "8a373115e5826f1704d80288d4a56803c0ad577a5745625c5cfa3272e3c77543cd7fec1cb761fcb1d6a58e7b5a4b37dbba9a7b4387e8abceed8d526fa18d0e19";
-  sha512.doc = "8c3e0b7a3606dc9665db06138b7f7aeff0c4a822afe85c7509f0bfc0072898db8203a931c4713b455aac99c850c908d6c0ed8d68952a87b574f8c8943fc97dd4";
-  sha512.source = "e1240d690d0255cd80cf28bd1f44e2269873df8a8e85f8129992726c530baf7fb3e202696b3a30afbad7010df4e3c0fcc695ba91271e1837d88cb5322ae754bc";
+  revision = 61719;
+  sha512.run = "5b19c1f2d5bdaacb1c842e78b1980ecb3f4fc548873e6a36fc9c5a70c3e3649b812819cc0d3bf68622acf31ac6c687cc4ba657ce2a4682bd13faba4070b0a1d7";
+  sha512.doc = "e28f0f3476e710fcec772206138a2f423ea6f9df903bfd4c4a278453f217752b7f4ffd7e68f10821ee36a9251a14e6226887ed5aa7a5fb53e5deb7a1685a04e8";
+  sha512.source = "658467f513fc37799df279d636f5927477c51cf0adfbff2ea1597bc8bbd4d9edc3f5f22e2f09d9049a6015a6825bde043ae10e8b55ef78ba8dbbfb04604de0b5";
   hasRunfiles = true;
-  version = "1.0.3";
+  version = "1.0.4";
 };
 "texpower" = {
   revision = 29349;
@@ -34042,9 +34425,9 @@ tl: { # no indentation
   version = "1.1";
 };
 "texware" = {
-  revision = 57972;
-  sha512.run = "981a66b9f52d53ca1b9a5059d5cacdb325663a5eaf6ea5c15902e687bcfee894005b274064f662252a0689222c62937c2841ee2aef5e38cfd88f2169f7b01893";
-  sha512.doc = "3ddb71949ce4c8dd406f65e547a5099851c9b8ba00aec1fa65ca3f40093c49d34ea13955e3970683d1937569d0dbd3d6abca65fef8bf15f255063703262421ca";
+  revision = 61719;
+  sha512.run = "8762e22c00dbba0f60d343b3c9ff3fbe0de4a4d56c3d0aa6648bb58189f95d34e427cc403d5b723b976eafb9b996e67c28d791b69623e10d4c67b24e6098ed41";
+  sha512.doc = "706d43c61676650add8afeef45e25a555cadac364b4cc2a9c6d38a91504e54859c96d2a0f01d7ee580937cdb72327a40ab2c9d366e0ee1bf9166ccaba928332e";
 };
 "texworks" = {
   revision = 54074;
@@ -34272,13 +34655,13 @@ tl: { # no indentation
   version = "0.1";
 };
 "thuthesis" = {
-  revision = 59411;
+  revision = 62810;
   stripPrefix = 0;
-  sha512.run = "e11e9fe9cc1c9739a1ae2f34a3a628145b8898834a03a96aedd6d6d354c0519137d16e8e3fd3090e44bd3caa9f173f1df4053c3139b6ab874d616f6c141130b6";
-  sha512.doc = "f7a6fec40a8768e94753a0391d39201721985d0da219a830caaa2716d9fcdecf4e32fc56734e52e2c77ba64d93f206c476490684672e11044991ce1e854d189f";
-  sha512.source = "df772cb4f627671e2d74bfe571156dc81214bcd40b5db3b278d21740b1dfcd971d051edbb917ae51bb8bcd5309d8251ee6d84c5e01d6ba5a264254f0479ef43d";
+  sha512.run = "6e749b4ac48ab4329dcaee3068349c8a61b27ec99ab45ffee1302c6a7123c1f8af2265af1500e53b73e876742266995cc1582bc18f0ad097a9035811f928f147";
+  sha512.doc = "74b99b39aa4ebd66cbbbc162589bc5cc9639f594aefebb4f643bca0e8a79b664d2c03821f458e14424429a044e4e415748c4d7c45557cdfc008ec7112d95ce8f";
+  sha512.source = "8f5ee076eee4c23750f376fa8250124a6dc5c06faeaa1014f9a6b42d12185379795a4e87713f71516c0f8626ca31cbbad0c5317e97fdaf9c6d605df7000903c8";
   hasRunfiles = true;
-  version = "7.2.3";
+  version = "7.2.4";
 };
 "ticket" = {
   revision = 42280;
@@ -34410,12 +34793,12 @@ tl: { # no indentation
   version = "0.4f";
 };
 "tikz-karnaugh" = {
-  revision = 60750;
+  revision = 62040;
   stripPrefix = 0;
-  sha512.run = "46687db5ab1ca3789ac98e438e14daffdd3b64db2ab3dfd7e6110b0ce752901d2e46f54bf10af19e5947750c568e2924ea9886d78941528dfe0a922a44b1b492";
-  sha512.doc = "2bb3b177a72aad086cbc0ef263fa8a99993327afb55d414f03a79126f2353e0abdbe743b946cb0ccce67da4ea933edbd866b2a3ef6698d3ebe692751f9edd888";
+  sha512.run = "aa7bb0cbaebbae2657002c01098e9904c21483bb9e67a415834d54b2bcdeae75514a2e98a53e98ba87996b3147af84226e43ec9d121eff52b4f77d57d1802db5";
+  sha512.doc = "25ccf7b40c1e808bf5fc45241d3f811e603bdeb770b21e5d98779e04ccce1ff67e73012816b763a083d07f1c62a16cce8feffc0e1c87ced8b83339de84d4cd4f";
   hasRunfiles = true;
-  version = "1.3";
+  version = "1.5";
 };
 "tikz-ladder" = {
   revision = 46555;
@@ -34540,12 +34923,12 @@ tl: { # no indentation
   version = "0.7f";
 };
 "tikz-trackschematic" = {
-  revision = 60767;
+  revision = 62046;
   stripPrefix = 0;
-  sha512.run = "d293ba361fc713c616d48c146cf3eb05b0933c1d0963c6a4a7342843833ec339033bb48b17bcc23bbe26948b3e2888f2f4dd940dbd1c8b212688d651c7264b3d";
-  sha512.doc = "ad6da1f9789d63690f13e0475c743504d3a16ec12701b2c777af4716e29c482d90ea9c8d8c34a746479a1814525095d0b0ac2bb0c38737edfffb87f293bf6b31";
+  sha512.run = "5ac6d9888fd0f03e6812cbb5a6dac52cedacf20027f4874a21d57e59ab07a3a8fd3c123de2ac4f19ff1f20737e28a11b04974ef35b172978f64d37f710a77f7d";
+  sha512.doc = "8b3812f10d2907bf18beffff417ac93beaebc3fc7f297986227cf393894e40b2af3a394b62fe6eeb1d858e5e6ed79bf7719f7477c91deff59ff42af0d8d82c0e";
   hasRunfiles = true;
-  version = "0.6.2";
+  version = "0.6.3";
 };
 "tikz-truchet" = {
   revision = 50020;
@@ -34706,9 +35089,9 @@ tl: { # no indentation
   version = "2.0";
 };
 "times" = {
-  revision = 35058;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "252c933fb17ce2533f6e0f2b13a478d62223a596ee257937558c61e224c30753c157c92ed9d5ce3ced5ade0f5eb00ec15368fc75c10a182011312d6a0668911d";
+  sha512.run = "06f93b823a6141a51554bbd682c128977676775b1c097f7787916c0c14b76d6e9c4041645003111d5a1b905de4faafde5b3efb61d9be9740b9627ab57f3f8eef";
   hasRunfiles = true;
 };
 "timetable" = {
@@ -34747,13 +35130,13 @@ tl: { # no indentation
   version = "1.3";
 };
 "tipauni" = {
-  revision = 60669;
+  revision = 62131;
   stripPrefix = 0;
-  sha512.run = "38ed0adc940cbbc1008079b542f5207341b7ee47da571a309c6786c43b505c9afd73ebe08e20200d914de30283c30897be1b139de1a828c52858b0543631e766";
-  sha512.doc = "bef81b313c0e9e738bdf6c9bfce2d4905c8dc886203c392c55a4b90796df91b40a9440e7e23f63cc76b947df1bfd9cfdf247291ea27d9fbec9070ed380e36048";
-  sha512.source = "4c73876a8fd9e465249d712cb2d4ebe29eba59ef4c66a2e58353feb303bad6a2e4abb640814eaeb6b4f32def15a5b464395bff1a28b556d5c6a6dba24778c155";
+  sha512.run = "0ae22eb3baeb0e360a561e646512b9148ccc9180dd795ea85c4efc80a827832491fdbfda441038c3d53d08b567758facbb8bd1d5eab576a53a2be2b31d3f1b44";
+  sha512.doc = "6ce540233b90a0b2dc25b02246c846f77d50cce08a4ca320526ea94806d5dd16fd17bbeea6c9c73f7815c69664bb6d2b04beae9f8a33c050f46449372f96538f";
+  sha512.source = "7ece1110d0cf0e0e354b75ceb543dba7777080a13f722607ca184848e723147d95d05d787cf3af7ce8d93a6a3b0138d9c077f50233aa14ef5db6f96aeab7216d";
   hasRunfiles = true;
-  version = "0.3";
+  version = "0.6";
 };
 "tipfr" = {
   revision = 38646;
@@ -34764,10 +35147,10 @@ tl: { # no indentation
   version = "1.5";
 };
 "tiscreen" = {
-  revision = 60551;
+  revision = 62603;
   stripPrefix = 0;
-  sha512.run = "5f3506fbb5952be7477f9c29bedc6a1ef229753ad12b484e1c286c6211bb5fc62df69f9985b44740f12728e067c69140ac064d764ca034d1edae099f623413cd";
-  sha512.doc = "c964f4b02f2399bc1bab1753681442076099c2f7377facf62241afc13a2db877287692b3020ca39d9a56370b13a8148d45317a4643e1552b7a436dc87c2da0f0";
+  sha512.run = "d44cd64d7f73300fe7e86faab8121887d22465f6a8247413ac1d23f6e346d72ae91d212e41fb9a4f903a18e36f92b73cd2ef24cf0fec28825d243d1342e56c34";
+  sha512.doc = "5588a22096422e30293f4c4b68faa1f340e5e842f046c625ebe0b0d7ed587706a55e199bcf21b5936d6c0aaaad52e10fa814bf648155fbffba5054447595ef14";
   hasRunfiles = true;
 };
 "titlecaps" = {
@@ -34824,12 +35207,12 @@ tl: { # no indentation
   version = "2.1d";
 };
 "tkz-base" = {
-  revision = 54758;
+  revision = 61947;
   stripPrefix = 0;
-  sha512.run = "9cba8d8d79c7cb01965660fee7913aeede3b0d2cc19bd7624982fc5854224f19f7dd2d2af0ba93c99b4f16827fb028564fcd9a1e9afed1988ce836188516f891";
-  sha512.doc = "c0393a07d50626349ff214bf8047bd6c20e14da3c036ca0ca277ce30a220bd52d2fa02cdb56d28733f9a69bd5f22d611f8b80dc130f6016cba46f4e889e0aaca";
+  sha512.run = "50927be9798589a8b933a151201df96948df5db1fa8434787c7b274810b94637d58e508794510e48b6367e3e405be9c72ae6d44bbdfb8a731ea4040b76f622e8";
+  sha512.doc = "afe33901a229b5f5b1152481db34b9cd901d0fc66c933cf1340bbb70776a7060601bfa522229dc6106cbf7135b5c0a5148c3830bff0f20a4120b93c4f0f185c1";
   hasRunfiles = true;
-  version = "3.06c";
+  version = "4.05b";
 };
 "tkz-berge" = {
   revision = 57485;
@@ -34847,20 +35230,20 @@ tl: { # no indentation
   version = "1.43c";
 };
 "tkz-euclide" = {
-  revision = 54758;
+  revision = 62178;
   stripPrefix = 0;
-  sha512.run = "c8a0e2c6411ae844575010d0f749ede9ab818de766794d60a62aafd306aa781ce09d252183c57a8d762e6655c7e7d1c2ba35b4f169261df6d65b8ebd833b091a";
-  sha512.doc = "aa8e10477798393dac1780bfa839faa36d9eb9f16bc34ad86aeefbffffaa1810ac3642058ead46be933e359f7a9e0fd0d7894226083095056910a233f017e3d7";
+  sha512.run = "01194c7923c772563dede16e412089fbadea0fa9049ce3eaea0af87ad7fe88523598148bef95c0ab6fa230fdc8cd992965f48c29ce4281c82382fc3ce699b8b5";
+  sha512.doc = "9edb03d529cd14835a643e84c02d0a11f68f155792824b5a5fa60870e05f47889f353b3fe374110fd9bac3c79bfc1985e04f53a8d3e200d0dceed0bbddd8e89e";
   hasRunfiles = true;
-  version = "3.06c";
+  version = "4.051b";
 };
 "tkz-fct" = {
-  revision = 55031;
+  revision = 61949;
   stripPrefix = 0;
-  sha512.run = "6defbc1265838eacb6612f87d969590db6cb2eb0a1c9316c1f52e700c7b7e576f971080538982d7adccb12af6ce7392cb6d6da13a9d3e537e5af8fc2dc290a89";
-  sha512.doc = "1cbfeac7939ba45c6111cc7cb9aeea195690cdfea8c75e488a9dac6a49b2968d21d0eff74e03fec3229afdcec92fe2841a8dbb866314187ef98a317f07e9f346";
+  sha512.run = "ce605595518cb9b400a5b49620b5f359de8e0fefbc939d88b8f5aa2113a856ce05f4e9f56bb149c73e5f46c65d7d340a65edd6f1b55f6cca68b10dfaf7e04a87";
+  sha512.doc = "c2de4bd1cd9ebc5e0747608de7b1780ec97da00c512d3e1b2ce3150431c307c043f24b0bf1853d6c3e96203c33573322d66dbf0db7cd82f5b1a026ee5b7c6d77";
   hasRunfiles = true;
-  version = "1.3c";
+  version = "1.7c";
 };
 "tkz-graph" = {
   revision = 57484;
@@ -34871,10 +35254,10 @@ tl: { # no indentation
   version = "2.0";
 };
 "tkz-orm" = {
-  revision = 54512;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "dba6b58f1e3063d3af6d535c2c65d3ad0fe57f0b88aeca8684192b546d79570386cdea0d23870b5ac88f38b8ea0a9899efd1be581108b43ea16044749dcf965b";
-  sha512.doc = "65ac0e7657fd78d7d496b466d6cfae3bded966249d1c90eef6df1d34041b6b7ab5be807f7de41c04d28e6903748dc874fa245bce3b19b96d2a1f0d91316235b0";
+  sha512.run = "41263c9ad122a3cfce3eca3cd4ba8798e61ef662ebf7f00be99dd16a25b50f5419fb6c04a84bae6bd0ce2b349d4b3216a1a88c6e3d081d8a064ff561536a7e71";
+  sha512.doc = "ba9a6a67384478cbcf5b76f7148f60bb0f2f1932033f95945b28794f146d89b21e82c4d59b87735d46bacacd10c1ddca2b19e2e7ae4045a331383f4085a99221";
   hasRunfiles = true;
   version = "0.1.4";
 };
@@ -35219,12 +35602,12 @@ tl: { # no indentation
   sha512.doc = "ae2f1aa60162512287f15c770a465c2e39abe1fa5d1223d96c524dc81bf065d62f307893d22dfc06fc50da8d63d817ed60c8f07fd4fede984b6febe9c8b7b710";
 };
 "translations" = {
-  revision = 57461;
+  revision = 61896;
   stripPrefix = 0;
-  sha512.run = "bc85fb20313e9e1e6eca3373eb1fa58f0dd3971c04039ead0cdff9479f9d8a2f7ace407bfef0b7a5caa9194573911e3cd0dafda51243db34e922d39af42b0f1e";
-  sha512.doc = "e5faff88c1b8f9588e6b7bba20aa3aef9711ee273d79623ea79f90345be6c6420595dcbb5419f87463c2a89b019b8999c330627a74f4f03ebc1af41ee7894006";
+  sha512.run = "82d2a821c42bda66658f8557d85f2c52bee6324c88cf44e5440cac4de5bf7e938a3e37f7fe2371069a923c1f3fb794f8860274765054f902eaba560ea195297f";
+  sha512.doc = "ab72edcca1d3407eaef679acd3f3d2a49f559e5ca6d9d1ad7221dd76152560be307722155cd4da54215e3b7f561f39e08ae737c70ff2e7fea1ddce2561b506fb";
   hasRunfiles = true;
-  version = "1.10a";
+  version = "1.12";
 };
 "translator" = {
   revision = 59412;
@@ -35340,12 +35723,12 @@ tl: { # no indentation
   version = "1.0";
 };
 "tuda-ci" = {
-  revision = 60754;
+  revision = 61958;
   stripPrefix = 0;
-  sha512.run = "4a9ae40df9c2f9165aaa23bcbc1065c4f78023e0f4284e14093140a35daf7b630159d8317812a7a7207aa5899cce9dc8c80541a7ef0eed33a13226083e21a75d";
-  sha512.doc = "60d971063b6a4821a49a7ccfa8add4dc2e9171fbd2a95b777ea2960bbcf0dd60fe007c3fbf687ba499557d33cc50f14435448c6a40854616e6e1e21b24c74f24";
+  sha512.run = "1000a43218d04637245126a88a344c2a811efe0689bb4bdd2b580b16ff7b1de7872aaea90cf3d655e4f1594fcd79f598859938dc02d77c812bfbe5fb96659f38";
+  sha512.doc = "fefd5c55cd353b7a66f791f0a4949b8bcb18b3e96c8c3a570b45cae9539c2515c6d48cf776be518ecccce7cf74851933d314d187a39c6fc673a195f5c2542bbe";
   hasRunfiles = true;
-  version = "3.20";
+  version = "3.22";
 };
 "tudscr" = {
   revision = 59942;
@@ -35395,12 +35778,12 @@ tl: { # no indentation
   version = "2.26";
 };
 "tugboat-plain" = {
-  revision = 51373;
+  revision = 62689;
   stripPrefix = 0;
-  sha512.run = "a2541eae8834f9a78fadaf4123aa1dbfed2215d3697299e17fcb0c9635091be57b5171514d771c2e14ee7c94ee2ab18e0907a1b3b3cc5bd60b3a3c74e305f45a";
-  sha512.doc = "747ac188b7d738ae33808da86716712f80f98ec2f69b60bc45514cead00d837fde1dcc99c65804e61c9e35e94e9276f314617f885dd081fe6fce75f7a2baaf9e";
+  sha512.run = "4729913d9bebc3045ae79926707a676cd2a0dc55766a6826fc6053890ab312b7fdee757af02c56beefca61436e51a058586cc921b688fc4a8a0a40218ad50bd7";
+  sha512.doc = "e2e7e30c0a3c1d70d4f6f6fb8c1947f96364a1c885ac6f7450be3f6701a0a54552b9e92f9dbf9a241009c96ecd6c68199809c90e1fc2689aa88e365ddade59b4";
   hasRunfiles = true;
-  version = "1.25";
+  version = "1.26";
 };
 "tui" = {
   revision = 27253;
@@ -35583,12 +35966,12 @@ tl: { # no indentation
   version = "0.21";
 };
 "tzplot" = {
-  revision = 58558;
+  revision = 62289;
   stripPrefix = 0;
-  sha512.run = "21705dacc5923685b56c47098df79313b94d95040210eb812da48fe3aa4d405a0d2292f395fbe3d88b2da39ca325653ab2c551faff46f34f912e2830736f09f1";
-  sha512.doc = "b957597b7a38652e6f510e21611def7bfd05f1302bba1bfe1cdeca62f9d0ee6ae6b21abd31c414a43048963e8d4f19ffeb13d18d4ade97a6ab0aef3a2d524522";
+  sha512.run = "54aff40ea0279c5b5bdcc1341bd3997cf317922b119849802ba6060af6fb0ea5f43d8f3dc7775f94d28c3ed8372f50547a0c1de4a67065ae158ac3cb6a309f0d";
+  sha512.doc = "0c59a98edcec302befe5be775b88999dbcd1bb6bf40becea96d4cd6d470d7fd912d55a1a32521df24d7f956618b0826e9b1ca63ac01623c842242424ded46041";
   hasRunfiles = true;
-  version = "1.0.1";
+  version = "2.0";
 };
 "uaclasses" = {
   revision = 15878;
@@ -35657,12 +36040,12 @@ tl: { # no indentation
   version = "0.03";
 };
 "ucharclasses" = {
-  revision = 58029;
+  revision = 62378;
   stripPrefix = 0;
-  sha512.run = "2b4a160c145fa6e4d73be4f0590d73a302655bf4274822219c5b41e145a8dc5076b3b8bf39dda488a5cec80329290db6f3dce431733ed8b4b9c59bd22a0187d5";
-  sha512.doc = "4d715b69d34dd6a2eb485aa4098e51f2f72213ba5972bb51bb0fd60bbdbc3db5846f87c859d77e694b2d55be4475bdabf3bb507020480f68f7b5f3884dd3382c";
+  sha512.run = "07dfeeefbb785bf8adfd8487e8ab607ce8d3a40b44994c8a989cf273d7dca866418e8ed175141dcce2b0e37e2611580c94e50027f5a727369f776097e4ac6eac";
+  sha512.doc = "3286668974165c8afe477b71cb136e6ecff7269df27d93cbb1ad5f923d891575f5abad1a60bd63967cee991cba3592acdf9b280f04b6e0db983d53ecfa6e26b4";
   hasRunfiles = true;
-  version = "2.4";
+  version = "2.5";
 };
 "ucs" = {
   revision = 35853;
@@ -35929,13 +36312,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "uni-titlepage" = {
-  revision = 60924;
+  revision = 61729;
   stripPrefix = 0;
-  sha512.run = "ac5bc2d392c635f8f59f0aa0dc713a57c78159f70285a04147d63feb38918e1ea11fd383d7f30a174360d8498454ef5f2e598180a21cafc4403e91d1ed1b2c5e";
-  sha512.doc = "9073091ed24656362d232b4083f5b350054a6a71ff85aeba4ca7e0814a28c34d8b71dcba42a44952458bb401aaf7d42bbcfa65a19de0b0d4324416edd003f4e0";
-  sha512.source = "50e85efa5691d2227c1f4804dcefe6bfc34f14ed13314ab3d48a8dd45917c081dcc7e3f2ee8bf4ac7f51c2790c083bac3fb57eafd42708c9d507466cc23cb053";
+  sha512.run = "05d1f19babf218a56731938ff1cb066b0ae7a7e7683f0800d5d3b1d7bf3c77ffad71f59235df21697caab07a39f3a74568ce349cacd0e5ec890527f099e8165d";
+  sha512.doc = "a49fb5c7890c6af860c971c88dec82dc2b42c8fb5708f5cb5b438a309308471ce98c0cf0980a696431626a3543176b9bbe9f0b220f989d6f9c966c1b2cab0b06";
+  sha512.source = "d4f7bf60fe393135ec846258c43b6427cabb00bd50321dd2592a40f83080196ca13ef5a64a1c16f5beed8ef826d83b81e269feaf772b40ec0bd002e7107a7f14";
   hasRunfiles = true;
-  version = "0.7a";
+  version = "0.7b";
 };
 "uni-wtal-ger" = {
   revision = 31541;
@@ -35977,13 +36360,13 @@ tl: { # no indentation
   version = "1.15";
 };
 "unicode-math" = {
-  revision = 56594;
+  revision = 61719;
   stripPrefix = 0;
   deps."fontspec" = tl."fontspec";
   deps."lm-math" = tl."lm-math";
-  sha512.run = "f3682781aac853ae96d7f09131cb102832c16d6554a070da6c6a499c7e7cfee90f05ffaee0e30e6b2e2e1c9d7d7f0fa285b6912ec95f4ad318df3dc1f529b23b";
-  sha512.doc = "ac7d2dbb883098b9ace6a1a99af61afa2498e7ee3e02131e4aef41eae6585061f04c181c0d73f23e126f8f2a5fa6f5ea6475af8ce6ccc1d9ccf8d2b82a22b1d4";
-  sha512.source = "13ae4f09246d2a4ea4f2595247a1b56955a905beb026dc78da37c07583388db387f66e574f1513ba89375f9e2e0ec1be0b65ad38e0364dd05404a7aed895bc2c";
+  sha512.run = "05dd4b08e8e766c2c8e719a12aa5a28259bc429fb1f1d05850e865ef258ab5e1372a785a2787098ea50bb31c852727ba8269ca656ce55ee0a7355fe4fd7344cc";
+  sha512.doc = "c8d05fe09c6ed76f29978eff8b7688d8989865f6517f06a58acb899603265e499db5d962895b5b3a0b6bf8d235f29da88f76a3b7b35778953878d02f2910b524";
+  sha512.source = "b1f21cf06c5ece08e75575cb2e23f7e9815c0670cdb2af0026c1037556e646e81c2103740bcb14e95375cf88b3a665afa3b24a4fd6c33f416c36f588649de79f";
   hasRunfiles = true;
   version = "0.8q";
 };
@@ -36079,12 +36462,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "univie-ling" = {
-  revision = 60937;
+  revision = 61900;
   stripPrefix = 0;
-  sha512.run = "b65a9b854f9b1fbbe679c5c3be049336daba41e70db1f90dd474b1d3386fadb200b24c0e580f1a10f34cca848ff1ccd5864d6ebc607eac1d02cbed4a0347fa15";
-  sha512.doc = "23efe505ec0c76d846526778c448885f0e1d5b15d34645fc33f8a9eab0421fa45fa81a7dc31e2c24753e041bc9bf50468c9035a68875e6b67ac8c9d59c2dd1bb";
+  sha512.run = "d51b4f5cbe4b796ad0b314457c107d9b5b71b5b9f4bebbe4e11840bcadb209512be4250d357548f2a9d8aab9cf9eb2f6564b91de8570cbf79d27f86c1eadd9be";
+  sha512.doc = "8e7a257e938b0b58d84d7f372355f976a8734d25bfa0e9c2ae5cd4f8d2a69552f95144553e16a8e7668d8eb2415d5acb574b51613fc1117990d6aa00246da488";
   hasRunfiles = true;
-  version = "1.16";
+  version = "1.17";
 };
 "unizgklasa" = {
   revision = 51647;
@@ -36144,7 +36527,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "uplatex" = {
-  revision = 59450;
+  revision = 62145;
   deps."atbegshi" = tl."atbegshi";
   deps."atveryend" = tl."atveryend";
   deps."babel" = tl."babel";
@@ -36165,18 +36548,18 @@ tl: { # no indentation
   deps."uptex" = tl."uptex";
   deps."uptex-fonts" = tl."uptex-fonts";
   hasFormats = true;
-  sha512.run = "6d9c990c0458138c3753cb8ef1d0ae075ed8322cfdd1e4173374fc37f6918b951152f3e2385b3d24f0278e20c6d0da9a256fda2db3d0a3869cb000ee9f8a99a2";
-  sha512.doc = "e18c72acbbd80445b7a45d91a40230bf57a806c6e0c74387d20cba12261fb43fecc9b2183dc7e754905ef27a50e2cb209099761adc91144077b5661db3f661bb";
-  sha512.source = "e567fb0b2a557f2b1cf441fbbe80b0341e31a71bb848f5aa924ca3602db9df9cffd023ac10d1eb388bd3b31aaf88f9f6fca323d0eb8ce774872cb20f3d34eb65";
+  sha512.run = "c6921321aea4bbd27ae38dc7181f7e5f2991b11d02475f07eae4f67d86c4c6b35fc7a07daa1e24775386b84e651b9d827e0833ce1c3b9570d36e6e50388e199a";
+  sha512.doc = "2f7b23faacaf8decea79007ba01f98138fc456d8fc90140cac58f8c31695972d4046e35eb0fe333e1369b2b71ea499ff4b279d3ffc9b5f585c543089a6c5291e";
+  sha512.source = "eaf73039d2ae9f2b6c902d0627ea2af7efef6584dfd60ff7b6debd06c32aec54fc5b4374078ff0250ffd90c53f73d03512dc24cd78f3dd11c25a5b5ed58a7845";
   hasRunfiles = true;
 };
 "upmethodology" = {
-  revision = 59878;
+  revision = 61972;
   stripPrefix = 0;
-  sha512.run = "c5940e7135468b197916213ed949a8a56d1304453b79b4452257aeb1b1c04a3dae6767fbb49ab0a3b982fb20a5d1ee893c4efb9dfb1cfe66a3bf896c33cb9a16";
-  sha512.doc = "5f91c9882b90ac90e984d87edba2eb22d5bdb798aa41c62edafc3ead8e5a4696dc2d05876006f646f4d513d0bbe2c36787cdc2a09e5e9cb2e14e9fa9ff59efa9";
+  sha512.run = "b4ff76f08060eb2fc289ec74c652bc24f28f8d4d47306143951189403b7dc9a4ee8af3a34f078fcfacf97ddc4e427e4563b862e2cc114c7fd3b9567b4c993dc8";
+  sha512.doc = "ab8a3700d57d0ab511a2eb438737adeea3d0e4bb0bcf4d8e97af26aa436720b9ffc0ba23d4791d2cae0c0f73c6a585948650a700ff31425facb893b6f23d70fc";
   hasRunfiles = true;
-  version = "20210708";
+  version = "20220210";
 };
 "uppunctlm" = {
   revision = 42334;
@@ -36196,7 +36579,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "uptex" = {
-  revision = 61107;
+  revision = 62145;
   deps."cm" = tl."cm";
   deps."etex" = tl."etex";
   deps."hyphen-base" = tl."hyphen-base";
@@ -36206,21 +36589,21 @@ tl: { # no indentation
   deps."uptex-base" = tl."uptex-base";
   deps."uptex-fonts" = tl."uptex-fonts";
   hasFormats = true;
-  sha512.run = "4237df16758a5495555936a94d3e075bd23a53bfa12da26bf04c9da852bf3daf5847b055327dd5eaed10dbb45e09ec514640138ec7a2cd4cb358bfbc2e1d29f6";
-  sha512.doc = "fd8ace9f65be4a636bd39be9acde4dc23eb4214d54a51f8773e5232fe8864fdd36d34af4c892e12db4cbd768e52d5f0fd6271063e4b3ceb740448ffaac3d3bdb";
+  sha512.run = "92e903bb603e956faa34cab85c4b184b492ab7381358a0c401a47848392b6ffcc1b888b3e36be046fa1fd2279235a737d020c8f4286c9162a20de359132b3649";
+  sha512.doc = "2cf664d0ca66b6cfb5cb8472ca1b2d0c8db650ac518dc3fb24a1c98ee7db5ad556971a59be064a7f4c6e9c3a4ea2e041f0d76e1edaaff6c304e72201eb3072af";
 };
 "uptex-base" = {
-  revision = 59407;
+  revision = 61795;
   stripPrefix = 0;
-  sha512.run = "060758b358587a4b4ca9a07b7fbcc61a1ec057fad8c676bdfdd1d0e16473295f18b81e54adad2303a1f99e5509e93dbc3ac9cabb0b878030821e67e070de14a9";
-  sha512.doc = "35a29955e5348baeaccc38714c1861802147112e1a3c9419584f6a9745f3748a028c10cb0eae5e74e6201ce7753bc127794906945ed65bc3240d6b2faaf93751";
+  sha512.run = "8003f3ccb6d2c7de511ebd417f080868b5dec4b72ca613e4d4619b17127d6f0072ef83331ec0d021c7f8fedeaebaa1a9c95153e12571e14336a49cf9004f481e";
+  sha512.doc = "783b2e886ffc1609fe885b2592334b517219b6b5263e75f7d440a013a1b59fa489e32de0c17b5ef342a95893199de961bb0b7725323b9cb3eb3a22a1c92f4196";
   hasRunfiles = true;
 };
 "uptex-fonts" = {
-  revision = 54045;
+  revision = 62593;
   stripPrefix = 0;
-  sha512.run = "600d47ed277ce4bc0ad0de219e307b2c4741229c0e02ad94f7dddb2f309309922fcfbc9de5e115d85ad45b53485ff844e70d5af8086f7a16980ac579795c2e7f";
-  sha512.doc = "3c41c19b078bb5f66b8231025e39df2b7b9b959d3a4a45b04058f670d6a08e83bef50c889045aa55caddfe7ccb8a5c7582c43115b4749232490f999574fd0ec7";
+  sha512.run = "89fa503990e768f5125de1a3161c2b6e14cf7eeeccb81664dfff43cd097b59210988464c587a199202f0c4836fd598c6ff6db6e7d39ab36a3be41e9e14e1f6ea";
+  sha512.doc = "2a6aa685c8b1636c37021a76dd40703744af62942aa3f36c4f33f6d2e5961cb96f5379056207d807bfe9bcfabb0265e9aaf64a84f9c80ebd084e2520ca4d31e2";
   hasRunfiles = true;
 };
 "upzhkinsoku" = {
@@ -36307,11 +36690,11 @@ tl: { # no indentation
   version = "1.0";
 };
 "ut-thesis" = {
-  revision = 60331;
+  revision = 62509;
   stripPrefix = 0;
-  sha512.run = "10cc7477b07a495a80277cb0a7633eedbf738bf15f8d6a63adf55a8483bd301a2f2c592bc47aa2e87f819a3aaf2256e3c9e4785a8032d9e0c43ddcbe18c9e5f3";
-  sha512.doc = "bb30beccde671907f5627b4ad25bfe4833bc47299b06149aeb4bd6d8d29005920654ce406b411e555971c66209cb4dec5c9e3de8fc28fb409e303b8939c999aa";
-  sha512.source = "25b973b62f569e66c90635da3a1d105edbb8e934b5bf79ecc5209f7b32d5175571f16e86982e007c53cc017861cfd55eecdd62a38399a37d191c97eb1c08d57b";
+  sha512.run = "0a8174582e84804f0e7321fb36ccab2f1b84b95d7ffc376c094c336bd6ebfbec06870c335fb41891c611dbdeb89b140b128eed5cf7ec6e953f5a703055fd4beb";
+  sha512.doc = "015412992a316a3bf34c50588dba871e1e0df7187b1bba8369ba289eeaf177bc8a9203c62efb339ae84a1cc2c972f331595600776e582b08fff706cabaf83943";
+  sha512.source = "53e298b75f4f2cecee1c9bfe1c9f5cfa30ddfb88401a5adaa32ff278dfd9ee473569979caaa2453b5d2d89624cbbdd9590e718579375cc4e7603b3340f56c5d7";
   hasRunfiles = true;
   version = "3.1.5";
 };
@@ -36362,29 +36745,29 @@ tl: { # no indentation
   version = "1.0.0";
 };
 "uwa-letterhead" = {
-  revision = 60635;
+  revision = 62509;
   stripPrefix = 0;
-  sha512.run = "9277f935e5769bb49cfcb1e90a8e6040da4bff341f82bc673076d0ecf0778d795a3ef480d94373d28b7e14e5c2083ab8e01737dcbdefa87cd042448d7cff3a32";
-  sha512.doc = "1d778538ed1c9f8b1f2fda030a1c37dad0f3d8b6ebea71a3b5b784f695ce636414e5144402f50f10279df599e5698de157a9549edb77c2a788c68dc0cf869072";
-  sha512.source = "1b0a5d473a5deea6355cf021ef62e564216792ef14b8eeeaad18da441d2e42cdfe7356972b165126cec9e8d239aa5fb14222e1b6c93fdcc7a563b00a1a2024cf";
+  sha512.run = "7abab97d7536fe45f4add9acf8a73c77285ac90d4229db10baa362f80077f9e77b93983a5dd05f6d10fb2a1bb2ddb8dcc58307a0c841b08172340e4780934329";
+  sha512.doc = "166eabb78a136f5a20f3cfab61ebf79a4f09d1d0c927666584899f53ab655d45a2ea77520be9aba5b5cd1975f29e8df97cf8f6f30c437774235eebdd3a3da6ac";
+  sha512.source = "3ec6cd9ec480c6eb8475d5adc28bcaa366fc8d72079845ebaccf04bd803edbb7335809912454a5dd4bcbd8232f24c327b6db87684bada0cef279c635af78f74f";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "uwa-pcf" = {
-  revision = 60641;
+  revision = 62509;
   stripPrefix = 0;
-  sha512.run = "96a5ef7a7b016e48ecbd80210a8737ff624e30ae7814218c4bfac89f527caef238d5651f700d5cd1428aa4ae3e30fcb8225420d46043f0f1280e3ea35645adf2";
-  sha512.doc = "58bb43df7b6e36da128848c0ae8c1526eba889b628e6de987ecac40f25a0e359a257a7b9e0713d8422fc4f2f045615e52374691107c5b02af3a02a737e91ade5";
-  sha512.source = "8f0a0615e36b2f745e44cac73b853e906e9956651f8614313ef95ecfef977b7a456432c6710b2aadca47c695a030b2339ee1a10c0d728a798d269aa6578e58bf";
+  sha512.run = "7409cff6e531f338b0708c2adf14e4f88e57b0ecefdc7189b5c262104d9d73c7dea0df321dd4f5f25bb33f2d184ea50c871504c893ac65399f3968a84e5bb08e";
+  sha512.doc = "5a12971ba608e85c56297d4a72c83c8d4d9aefafccc7d33b67b87d53a728829be460afc05e0fe7bc95df007cce0572fd07354644ebbc672edd83a91c18aeed9c";
+  sha512.source = "15c3f190df8fa3832348175f8f93f0d52dfff8b77e92ff125249c97e6d5817ca8cf94f8980d48af615e523bea4e32add5f531e7e6530fdc4272b457f031926f8";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "uwa-pif" = {
-  revision = 60640;
+  revision = 62509;
   stripPrefix = 0;
-  sha512.run = "728907dcd2ebfc289afdd798a83081d3ee357635efd36f757b7a29e3ec49911c60462fa2cb5e9988b86c9cd22be74f71a92e1962b2c1d1a20c860f8c6c66eeb7";
-  sha512.doc = "8891ef73abccc06efe541cbd5b68e5c40fff48df12dd008b3a864993af0ab3ab46e9514ac261a51daee93cd53a74c884e33c0bce1d21c9625acf0ef0b0c046a2";
-  sha512.source = "b10a63d7b7e7fc39440a53dfee84385c2e6e4d574fe98814eb3340ef9ab97a142aadff54efdf55510f16a38f70745f456cc2fb4990434a2ec41607b08d3bdf60";
+  sha512.run = "26d15214d007ae5e518b3a2d05ebc048de9a43fa5ebb9d4a980afc5c368701b1b2f31071e2cfea2c2b45a2cb9e06bc25297b658fd5554b498353eba7ab11dc21";
+  sha512.doc = "2de223eb89cb97ee15ac641804ba51830f22fdba47cc7a8ea2101dab68e75a0bdf6506c6de3b93b2ef6e43c660f95305a49a0af2dd78e44fd74fe0e14a47225b";
+  sha512.source = "2e9856dc00bb3e4dda6b8b23014c07b5d135ac3a3e99cc17428aaf6bdb87a716bf3f4830a681ca9ea22130e703dc2d1d866946cc7e9e511fe7f5c0ce0d40a581";
   hasRunfiles = true;
   version = "1.0.1";
 };
@@ -36573,13 +36956,13 @@ tl: { # no indentation
   version = "1.3";
 };
 "verifiche" = {
-  revision = 60269;
+  revision = 62635;
   stripPrefix = 0;
-  sha512.run = "c0fd327c6d720ee95501137bf7592881bf07aa91843222815cc3ebac33bc752658ded93a2f6005acceef5d67b2ffa2d31ee51c2599e9d144da113527fee69fab";
-  sha512.doc = "16f755fc9731b062810cb4dc6d1354c2c29e2355423209da9fc58f4891078af1b449dbd530818afc6c06ca5612574b82e9dd943eb5ac0a18fc21f44b988e35e6";
-  sha512.source = "d949b96ff65fcd4a3d021496a77d219b8619687ca12868c7ff1d036ed960b3b213958149647f52c0a13c6a8c8404bb69056de1495e337a57f0dc878a664b1992";
+  sha512.run = "f96d50f964fb320a830687af3637e0fe6817cc762408fa135620b8e04c9a052f9686b9b9e16ef074cf2480f06e73d2364c8e74a793ed2301f493bc5cb9df3673";
+  sha512.doc = "cade40561fdb0d55a32619916609552ddd2a6aec483accfb414a714316c07263fba43b98e4ea52caa0ab8531b8aefd29d3165628a46980d95f741d90a248d694";
+  sha512.source = "0c92a9e7be40f62d3d0d9ad682f0c9d443962b781aafd6627a40ba4b368d80467477951b04e57de9b7e365b7826e26125f69f7d815d6ae20e271c45f333ab33f";
   hasRunfiles = true;
-  version = "4.2";
+  version = "4.4";
 };
 "verse" = {
   revision = 34017;
@@ -36633,24 +37016,24 @@ tl: { # no indentation
   version = "0.1";
 };
 "vhistory" = {
-  revision = 60124;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "8581151902ec4954f09277c8d4485aa9b8e98f8bb34693a1e6e79f769e8a47e8a8a3f797f74e7b236b3c24cc3efcbca85adc538bd5509f17244de46f2d1ae1b1";
-  sha512.doc = "5a253f13fd4ba05af75275a080545392d3b92dd63aa56b768a4eb20db062cfbc85472c8933e2528fcff8e7f01b233a4b61dc0c22487f790d2e09a16eb7450abc";
+  sha512.run = "1e8bc961ce70a199403f548bc918efbfff57ae6514338d32928a670f1f381ccd0474f3e2e4bcb957e72ae0b74b959f9eb98b552e62dfdbcbea995549bd87ca70";
+  sha512.doc = "25420975890dbeae7b322ed9769eecdc67b9271f36e3269b6dae582af19968b79593ccc0306486de5d9c277be752569591953b423c52f8aab396430331c61e27";
   hasRunfiles = true;
   version = "1.8.0";
 };
 "visualfaq" = {
-  revision = 60200;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "16bd8f010035e9eb0282a119ec6a7699d2c8926b6a7cc997235ab242d19f554523bb766845dd2385858694aa06653be7ee18bd406fcd578dbcff7fab1d61c0b5";
-  sha512.doc = "3380785d5b4fee8a68e8e1c16aa514719ae2e7275cc1cb6ecdf9b3ca6901c9c85a686b61eb3a763b2ad6bb99d246aa79c54906284da85d548316aa2e7b29079e";
+  sha512.run = "e746106e0525c9d40c3600e283e1b652d2a5e4e99381dd7ce88ff2ded109024d86610b6305fdcc6f06220802c7ce565b3e01f9562c00884fe5e161104ad4f8ed";
+  sha512.doc = "cd8f11ebec1eda30ba7b673fe6fd241e61c4ef42a769988d34e58546f608af6a4ea569b2a30957dec0463385c5a4df70f7d10bc6e5b898229c5e6cf46f7e4fca";
 };
 "visualfaq-fr" = {
-  revision = 60273;
+  revision = 61420;
   stripPrefix = 0;
-  sha512.run = "6a2ae768985a6ae59bd70fc137164fbedfb6c99ac137a81cc40d86b2543bd98f29ca1f9beac47220ed8ab69039684ca7dd90c3cd2c5d9a2b90e4a8c5c2a3e3a2";
-  sha512.doc = "7ee33b3544ce6b8a5bd905f518036ff534c4bd677ecd385dccf004d874a59d108bc44a1779a61fe7cbcb6e97588587be1d38e4e96f048db70de042848d3e312f";
+  sha512.run = "ed7bcfc871d3ff533d954a74bd0212a72349fe0317258edfae79941e7f7cfd47e13de24acfbf524bccddcc66f6e75e9491b25339d26d513cf8170853e1e7ebd4";
+  sha512.doc = "2cc2f861a505f4a705ebb03481c00ba6ecf394041e0fcd2a12bc3c96d2a3ae875fd3ac3e236c03c15e2646228945c036647031a0d95377a2373cf9086e5ec888";
 };
 "visualpstricks" = {
   revision = 39799;
@@ -36681,13 +37064,13 @@ tl: { # no indentation
   version = "2.5";
 };
 "vntex" = {
-  revision = 30579;
+  revision = 62838;
   stripPrefix = 0;
-  sha512.run = "f39c04998d0685125d494c1a314f4cddb9e2924af4eb4bd8488be237125d818199640041a9c23d6b8839b9da1861e0b621f71488b316b65903c5f3a0366adec0";
-  sha512.doc = "506c719a29a64611cc7ba228f1e13da9abface3168aa0122ec64dffa423a7c38b6f3a4fed43b787eb60b82bb8fec71a96e4432a9b0c05702a804a31997ccd49c";
-  sha512.source = "93f6fb8e9d49e8a7219a584aacc5f957da0ec2f7e29cf0c5dc37dd5b063cedf4eb2c56662b28c588083b1c158504da5da9cff4250498fa6ab8bdbec9e3eac875";
+  sha512.run = "95ed837dd38c07c552c525b1980bc3333b3c836ee6a78ca7bd9671b1ac048a197cee08580e2a09d9015459b55271577fb855c45a7a156f6497dbf4c981872c6d";
+  sha512.doc = "392d5270c4a98b0f08b56e3b1e4ab4cec862392ab881fff6591dc7babbd69f1a847574d9ad464faac0df5616ebbd7eb9031ebe72268c7d9fd1246858276e410c";
+  sha512.source = "977c9d77f9f28a79e83774e1a0b3aa74dace03a7a73fb42752918edde66f74d6a9c24a1eef934c29f52f4e9fb46501456a1bbae0520349c626a7838c5eea33d9";
   hasRunfiles = true;
-  version = "3.2";
+  version = "3.2.2";
 };
 "vocaltract" = {
   revision = 25629;
@@ -36888,13 +37271,13 @@ tl: { # no indentation
   version = "0.3.1";
 };
 "witharrows" = {
-  revision = 58120;
+  revision = 61449;
   stripPrefix = 0;
-  sha512.run = "75f87cfce4089e02f5e1023ebd1f66c0f9ab62932c2fbb7edb8a63948e31efab3a3418b946db7270e6ea88e6536525db5d191f904f5d7ecb0e8f3cdfaea743b6";
-  sha512.doc = "b22081b8ae14217f4a58f71507314e3bdc50659e6fff761cb1648c8ea03819182a0d4d30122456e4c5d24e307fb301d52eb37e092b8add0b698dacd026e6f5d9";
-  sha512.source = "fdde37e183614ffe887b7813db7d09ebd7586e73c4e54c7eeffaa4daa48e23f2f958306f2547bd2b683343b883b3d26f5f9779b9cbf2e755f8b265678b826c9a";
+  sha512.run = "0b597999e6289943f860db1f280df57debd1a4830768f6a93f41e4a3e1cf3595807d6091a32a4d15c5f7d71d41987c787d7a65bf69978b9630a75882aff5115b";
+  sha512.doc = "6da6379637880005527d00dfe48730b1f1616a70181de2e1936ad4d0eaa8d3215f1b7c64ae0a799d16c216417fadce5050dc5314fab5c7632bb331f1b5d1a4a2";
+  sha512.source = "a6012de14f0cbdfb08b16a9eb85d23846ea518b701f9b92c292897fea3289d69829d8ab5bf056eb8fa3dec470071ca42861b4ff18c7662b0780c55e758ffa828";
   hasRunfiles = true;
-  version = "2.6c";
+  version = "2.6d";
 };
 "wnri" = {
   revision = 22459;
@@ -36944,13 +37327,22 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "wrapfig" = {
-  revision = 22048;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "ea9d0693a43f985b9ab13a51e0af82b866adc8500dfb9f42e8b20ce8facd07d0534749bda61d13bc86b921300336c9f7e6099f252c4c65370a2e2cb4423589ae";
-  sha512.doc = "9ba4292d2641a31f3719ca66e3d80ca70638f9c943bfad9e9e08543f57a53eccc1292930e95d6a3677d0696e0deb1d1ca698b83eb7285baae275b70ac808be33";
+  sha512.run = "afa6eed496f63dda436a9a57c9f056ae88fb7985328d58d81fddde743a737b1ec69a5409941a76a28840d938397928925500628b2e11859713871977545278e2";
+  sha512.doc = "27aa1cfb0641876516eefd483f5f37e25e06c24bc255fe81afadd985d9a5ea73d311184ad46120d57d8dfc584da02f99c90128c6e0cead71064d00c1bae09f7b";
   hasRunfiles = true;
   version = "3.6";
 };
+"wrapfig2" = {
+  revision = 62039;
+  stripPrefix = 0;
+  sha512.run = "5f8059f2aea539f11946e4433c2bdb41530076109e2758f13a289f9009e972ce730cb7d472ce831c7567b0f4281ff54b29fb8df5d6c7f58b98030096ae88e35e";
+  sha512.doc = "b390941a37f348545a319359d216ea9eb4e44f8a1d50b25825a7288f77d3e3dab8e183efc19ed1382420083bb8b7cb940b175057462e88761149ea8611d0488f";
+  sha512.source = "dca40cd88a8650cb5b77de58b3be4c484b2160862e5dc19609237702cc0e71abe0e86b35cf0661e6f61c28948e24b4ca67da3ae710ebf1c0b6786734e1c48cf0";
+  hasRunfiles = true;
+  version = "6.0.0";
+};
 "wsemclassic" = {
   revision = 31532;
   stripPrefix = 0;
@@ -37001,12 +37393,20 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "xcharter" = {
-  revision = 60749;
+  revision = 62200;
+  stripPrefix = 0;
+  sha512.run = "92fb2e7b2fac96f2a447276c3a4bd4f2c0bd71062992f8245c1af790b36cbb0d3d3659dda711d3b810c5447ea4d1d72f783645c9cd987dca6396b3508a02610f";
+  sha512.doc = "107d9dd35890efcd3c40e9ebf100993ea67cc8663075e308e9f3c64a446cdd498568c6770d5f04b8ef1145c8390aef6b70ac1409a4109345df990cf6c7e6a612";
+  hasRunfiles = true;
+  version = "1.23";
+};
+"xcharter-math" = {
+  revision = 62057;
   stripPrefix = 0;
-  sha512.run = "17fd9af030ccd69b9f1a3b4760518f3b84d1f944b2bc4297a2fedd25691b81b249cb003af28ab07a60cdb2d14d6e9b5bab5370f78654bcf4efc281b50a673d57";
-  sha512.doc = "2dbaf1200619859fd8eb5d758f87c1ebd0c7921a47b7500ae1e6fb0437066e5ca115db8caa0d804cdfd35b7777f64a26bb68f2f58424e0fe76ed04a8006a526d";
+  sha512.run = "ca677fc35a3afd5551b856ab7aab9b0d6e5ff55c83ea3aea80a33c2926a090260ab47d32575037bb7354312907c5342795da6853e1c40210443b0314ce5f8b4e";
+  sha512.doc = "a63fd4ed59d3d61f42a6facffbba8adeb638ae84a1b246c5aa348bb59645cc7e096cf67b464d966475e517255bcd144f68cf4b9a6dd53cc15578b76ade7734f7";
   hasRunfiles = true;
-  version = "1.224";
+  version = "0.30";
 };
 "xcite" = {
   revision = 53486;
@@ -37053,11 +37453,11 @@ tl: { # no indentation
   version = "0.1";
 };
 "xcolor-solarized" = {
-  revision = 41809;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "be443123bb994c40fde0c1783c9863a2ce8b75a8e3e3d311cc34596e72f2830dc92feee9fe87638adee2e942d540424bc389460e12aa0e33fe4014b28a1d46f7";
-  sha512.doc = "a448de4d83ff30c2112c90fdf80f530b8e1ee46d6b3f574ad0933cbd415debd1f94cb1c55d6de5679d5502cf8e0e28b71cdbca803f0569422e79bf0ced384f45";
-  sha512.source = "c7f4bac922f84d2e6323f93cbbaa8ec61aa8f532383469edeb8712d4aa557a25509c4c85d160a30715af9a4077d17e6149b737c499dabb22af8a9cc398f4ec9b";
+  sha512.run = "fe743e9aa394c6a8a75f8c9e87cb7349d87df114a8c5753a157d4dd129a677af6a0381969f7719712a9abbb9fc720e0d19f8e7ffcc2bd7ba09ee8cb3df3c8d95";
+  sha512.doc = "bdc4d9a9a0e1ace78a90e9c64fba0894599179592c948494588e43efb21e3b329d6f0a0c403b21073943251796b4cf37f8d0665a8e8bf438b09616fed19c03ff";
+  sha512.source = "851e8ac38bb8a5f6e3410daaa307ba54a5762f08e10b656234feb020354b79caeffaff1de58618e6e9f52cfa50d40013fdeb1e32f6605593dc224cf3650e54f1";
   hasRunfiles = true;
   version = "0.4";
 };
@@ -37128,11 +37528,12 @@ tl: { # no indentation
   version = "1.0";
 };
 "xecjk" = {
-  revision = 61287;
+  revision = 61529;
   stripPrefix = 0;
-  sha512.run = "7b2a43e2523c207a19ba688912bc832ea38431acec4dcf29218f863e7cf68d2057eca1e30e0fa1851cbd44fbedde06889390cab72c7ff9329a0778d02d059625";
-  sha512.doc = "a2c80e3907af4723925a52c20c6ba2b7b6cf2f855824cb403f65c53f771c97523e30f97f559ba4a7a42f39c06079b82bd4454697104cb5ed3b044b3f271e916e";
-  sha512.source = "2944d3905021933eae4dc940cdcefc6cc6d49494ba005ca34d54f8d2ee3fa88ae575a9cbfdca5541de65c5f172ecd2444c0dcc7c837e439016b072f9995241ef";
+  deps."ctex" = tl."ctex";
+  sha512.run = "66213771726f5752495b9936a17b07a80e654cca988ecbb00e1695a4f136ef22a7cc9f2cae763757f35fa11545c825f70ea71940903e076af66ef28aedb9040e";
+  sha512.doc = "92bca289bd907817c95924340256df9130f0dc7c0a57b9586d8f0e9b8e74d87d67f01c51b48c40c723b6a33299d30839c44fe56ad687a548fa9e6ce3057e6e2a";
+  sha512.source = "899d9ffa00d7606d91515a14eafffc3210860ee1055ea0518db37af564155df9bfe973df349263205dc7275ff5d8829b590fd4642235c66ecc986bad4c7294ed";
   hasRunfiles = true;
   version = "3.8.8";
 };
@@ -37170,7 +37571,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "xelatex-dev" = {
-  revision = 58842;
+  revision = 62145;
   deps."atbegshi" = tl."atbegshi";
   deps."atveryend" = tl."atveryend";
   deps."babel" = tl."babel";
@@ -37190,7 +37591,7 @@ tl: { # no indentation
   deps."unicode-data" = tl."unicode-data";
   deps."xetex" = tl."xetex";
   hasFormats = true;
-  sha512.run = "9b8998710f85dc6f685cf3b423f34b08d0945c90e5f94bca141e40248acc641d6a687d39e91cddaca12aa51475fd4120cc482650b7536662cf3d9f07d3409680";
+  sha512.run = "088c917758f727ba08b8571d302c93f0b14fc15ca6dcb0ef7a89df4ba144c508d8d42265cc6b1915707329b64aa1d1030ed0b5513987fbd4437d0a58a232b5db";
 };
 "xellipsis" = {
   revision = 47546;
@@ -37202,13 +37603,13 @@ tl: { # no indentation
   version = "2.0";
 };
 "xepersian" = {
-  revision = 55194;
+  revision = 62109;
   stripPrefix = 0;
-  sha512.run = "c5880fe199b5a239ecce8e4370396f4a981a886e8412cfad36032c4d2b7fe9fdc7d6818e14b53ca22be36909f19be7f363b40cd58644231ce015a627bd65a48f";
-  sha512.doc = "395bdd506072a2e234bb45f120ad748322f78657fa5c7013097af28688dfc7e58d2a7c865fd2c80592132fa46a02e35f65aa4bbfa752c5fb6b4b829a79a302cf";
-  sha512.source = "866a5fb8007fa600c50b343903a306d17e26d5616eb7fc14487ae93005cb7bce1209d382104021cd2b345ea02f2a4b058518454bf797600ad59e8f9254bee8af";
+  sha512.run = "d118e2e60559b0083e64b89893efc2727fa7736699512ac2f2b95fef519cd5676ce817043038d727b8a64e321d41358a841530afaef7b881b3291fd55a9161e8";
+  sha512.doc = "3445a2597325df097514cbc4e184b3ccdfd1191ed6002cc4291197daf6392309ffdba3862fef68704762b758f6229d3d2f1e7cb9f6a718c915c9d0526fb64efd";
+  sha512.source = "e8a6b860a0ca67b0c77f59482874465538a524b2a19d215e31e03243f0e8dfa0db4d091161ca9ca176f661f2f3f2a6234f1796bd2f19807df5c9da00c5bdb1a4";
   hasRunfiles = true;
-  version = "23.1";
+  version = "23.7";
 };
 "xepersian-hm" = {
   revision = 56272;
@@ -37237,7 +37638,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "xetex" = {
-  revision = 61114;
+  revision = 62145;
   deps."atbegshi" = tl."atbegshi";
   deps."atveryend" = tl."atveryend";
   deps."babel" = tl."babel";
@@ -37258,8 +37659,8 @@ tl: { # no indentation
   deps."unicode-data" = tl."unicode-data";
   deps."xetexconfig" = tl."xetexconfig";
   hasFormats = true;
-  sha512.run = "c5cd9bcd20cc1ea6765d8c2adcc9aad2d2c6d2cee54998f4d27bcf2d2ceb58766bf125ecff6957e0806204333390be9ff646bb0523e97754c7056f80ca0e9d99";
-  sha512.doc = "470d453c9fd81cc88b7a7de3e115c2ce6c83f770b5f7be2af40cb712bb62004f2e093dab0d8a373383ffc85fdec6ca1ecd9a7ee7440e8235e57c29de3b330d4a";
+  sha512.run = "18ffa3f65ab85097a6366b820e1a2e482fc5c4d0c3a251b896df8da9871e755ee7616d6db0da5b86f8ce5baa908a5cd768b441a251b8df078b87e5a810ba9506";
+  sha512.doc = "72fe0fdcf6aa7a0ebe740877e3b5dd2f824e7969d636f87937d7f6931594b26a88d44ae81cfbfbcbb583bdc0c0005586a6f72d79b6ab30336744232e0214c9ec";
   hasRunfiles = true;
 };
 "xetex-devanagari" = {
@@ -37307,12 +37708,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "xetexko" = {
-  revision = 60444;
+  revision = 62791;
   stripPrefix = 0;
-  sha512.run = "460d2899cccaafe3f98eb46c5aa32ae4dfff923e70f997193ace6e502910d82635b0a949b4ed48cd10cc35405a41fb5704f988328f1ccb97b3dce065cc085d39";
-  sha512.doc = "48d281ffb0268d4d6a08680e4eb022108a3b18a78a9de908e781477d670367f1ae05cf7666e0edb72bc4b7d3c1bdaefb1ecf63842e72d7b60075094e191fecdc";
+  sha512.run = "01c147b287238527272f4f605a622e17eb07fdfb7095667a5a40e1fdec62b1e6900912f9f507631479d17da1c52fca0daf319d91ed29aa27f76552d49dd8409e";
+  sha512.doc = "e00fec8d26c15c0ff71ab8c14a1888ee7c60362127f3f3fed3895d8f8a4f31b500f2d517b6a090cf2d7428e9bfacc9c6d96d64eb2924f443d77028683d197a81";
   hasRunfiles = true;
-  version = "4.0";
+  version = "4.1";
 };
 "xetexref" = {
   revision = 56291;
@@ -37384,11 +37785,11 @@ tl: { # no indentation
   sha512.doc = "50322d89f494d07793d964fe515b8a0bacb74bd5706a6da80f6860771a8e3cad35c7d06bf398217a7e4364594d54f4dc490f39980194804a04460047ff5083f8";
 };
 "xindex" = {
-  revision = 60997;
-  sha512.run = "c34ba1d358204e117e5ef1ded4d9bbc2b745ca2f711a47d9fff6ead4de03d6fd782025e24427ff528299921fa00827dea9db70f3162aeff4851acf0a51fa1039";
-  sha512.doc = "94c7b56000e161b09aa593e20841928e604665fdc1be466ff3b933f5a55e646cb1a9ef7d52d90d2ebe232f876a5554b9e7304116f86b692bc58af77992e7136a";
+  revision = 62521;
+  sha512.run = "a3b95fb98bf238b3620053aba0329a2dabd34ce76632d5887e8980d6a86ca2d31e74d0a5987d799202b90eb6648af2b34cb69eda58582722c2172e774a90def0";
+  sha512.doc = "637b56f0928582599ca3117106a6dc02aea77dbba5b5c6b4b00f531c6b9714f54fe2ec532b514bf1e04eef1ed4f0cfbfc9ea34761cfffc9072c4899ffb70263e";
   hasRunfiles = true;
-  version = "0.34";
+  version = "0.41";
 };
 "xindy" = {
   revision = 59894;
@@ -37487,7 +37888,7 @@ tl: { # no indentation
   sha512.doc = "973960f65159f5107caa7e9a041dca75f0171fc61f94794c7b7560eb9b6898534974fb8b360a28dfa3a01d422b71618bcaf8aba2ed25ae4d4b9f67d24ab730be";
 };
 "xmltex" = {
-  revision = 57186;
+  revision = 62145;
   deps."atbegshi" = tl."atbegshi";
   deps."atveryend" = tl."atveryend";
   deps."babel" = tl."babel";
@@ -37509,8 +37910,8 @@ tl: { # no indentation
   deps."unicode-data" = tl."unicode-data";
   deps."xmltexconfig" = tl."xmltexconfig";
   hasFormats = true;
-  sha512.run = "e98a3ab9986d63d2605c87463bb32835d8ffcdd93f577b642da8e8f2447b6a74363c3a5799808c35f2e4b099af2789698ea471e04457a31ba8753ec4762e0ead";
-  sha512.doc = "340859a95a102759494222e0cbf19b7f851c44d4cfeac77cee178b69f576151021de53c32ffb8dcb8ed911dae2eecaac943941481b5cccdfb5302bb8291724fb";
+  sha512.run = "ee01abb25b18e99f18bc78357be04fb1405473e90fbdf74ed875e2910812550c44fcc7aee960b2bdc53fcd7d78e9aa706e46929da65d5cb78d9ca43ba475d675";
+  sha512.doc = "d87c6d1f4c472b436104b0746d48a463977dc7eb520de3d7a53f48bc1c8e5682a23d604bbe2ebda1b5029d4a6dd33c2d2bf8b917ad4f54d2c7472874fdfe8509";
   hasRunfiles = true;
   version = "0.8";
 };
@@ -37570,20 +37971,20 @@ tl: { # no indentation
   version = "0.86";
 };
 "xpeek" = {
-  revision = 27442;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "dc1dd0534645be0754551b2d3bc146c7e7663f7cc9f2daf40b13a383e13883d25ba46f320317d4e9f251594dccf3a880f5e123683f302638eb3b37018b369ce4";
-  sha512.doc = "047080eda80f9134b98196bf8a06e446ef856028aaa0f936da16db7f63be144b404708045d2a49c5bdb70b7a6f0b6b505697e95a5ff8b98b5b4f1ee8b2949367";
-  sha512.source = "a7e8c3f165314ab79f8702b8ccc82200398e5d5798815c02a7ae3ea0d70dd521d534c50e93b822e41042eb6a0faea07d5f129f05f427e47c2abcaff3adbba459";
+  sha512.run = "1b264f383d76e1c213aab0ac650a934ac6a91eb8dea8122229b2ac6bcb6ed694d62acecae3882b41abf34bd016922109064de0775f91222ad88be8287bd62931";
+  sha512.doc = "0633a7a51a329ff6849d080bac626b4174567823b8c597187f62158004a8df647fe40653af371d55d6a4743991fc3ca650e034f68e5b737448245c7df79cba84";
+  sha512.source = "38165be35b6fece20141ab61b4e212d6a754d2971e340a0f98bb02468aaad6b470aecbb5f4887969a987c9e7c45be109cac5e190b534264caced15fdc803f14d";
   hasRunfiles = true;
   version = "0.2";
 };
 "xpiano" = {
-  revision = 37604;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "3554bd514e1108649bc98d38dc84951edf17533758325d46726f55d9909d1a3747024aeff62842dc6eb1b5fc760c41a452e207b156bdee06468e9d7732e223b6";
-  sha512.doc = "257c484983eed03adc77b1776c9207ff89b4152b817aa09fb57cb41d8f6494af0db191c61b954a7f2a605cb8695fdd0562cbab1e0c48f85329c3ad61fef0e62d";
-  sha512.source = "b52814268736b61fe3f417f410e4b29f778b6492f838d16894d33db85645799d52d3d744f10b429e68e315a142964b2f5ff57f15e9c4ee7e93a58dbd4b0fa2e2";
+  sha512.run = "892f018e4bcad350e4418b2724b6bf2d18aca9f74aa01eb10906b90630b36ec3497a0b96b293e44ec136eee22648b53a13d7a9b614a36c0b79f5a7b94dc37403";
+  sha512.doc = "467da8be6903252b1d1a9436750b8d2f0f5eb1f1f7ad1178acf0a1ddbea253ce38ddc842c89ab6a22c4bb72ec311a2ee2536dee5834ca3ead427c36592c35100";
+  sha512.source = "bfd5a1dde7e05755f3c0167f16b7af2d83881b25d31e96644d18d193f4afb8f9f359b5149fe4534e43243e9364c1ab6380576196422c79077c82c4269b7619a0";
   hasRunfiles = true;
   version = "1.0";
 };
@@ -37631,21 +38032,21 @@ tl: { # no indentation
   version = "0.4";
 };
 "xsavebox" = {
-  revision = 54097;
+  revision = 62605;
   stripPrefix = 0;
-  sha512.run = "bcfb1ea2043163f3ebba520235ebcf8a0cb69a4e167a439adb24f0582166f3e7a74072ba5ccfc5482948a6a423c6684dcee4dda7f0170f6eea2e86292087818a";
-  sha512.doc = "0722ad2a511709f68254c97cce7eac6a2e0d5b452d146dcb9f264f385444d6f92021161378cfadd1c26442696e2fcee3cab7a720ce4a68463f4eccacb11639a0";
-  sha512.source = "6064e060001f189f8a58b5fe3de87d68366d48bea8c6b0ad8e41f32ef6eb0d87dd12662aa8ad27e89b8701c32822503f6bc830837f7c33ba46ef3a9db651fa48";
+  sha512.run = "a88e6345a40406e568673bffa319dca5bdd47ba4cb64051751966bdcf8ef048d5310a993a735d849ae6e9a2eccbd201bc1469d571f73b35fbde10c80704396b1";
+  sha512.doc = "97baadd10cf6de0529af35dba2ed970b93f9ff02a5fa2f02bd018892900963c544bc3cfd5a1dd4e0af9ab492e051d23d5d9e24b5548f175c575b51adf12ba671";
+  sha512.source = "924788ba1a0bf0287fb7a4b0828866a17185e1b61ed31b9c294bf79000ee4186a367ade34b64bcffca2d087b5cdc94d38dfcfdf79fa33652f792d09d7e9fc4a1";
   hasRunfiles = true;
-  version = "0.16";
+  version = "0.17";
 };
 "xsim" = {
-  revision = 57619;
+  revision = 61988;
   stripPrefix = 0;
-  sha512.run = "37325711b273ad2f2b5fb762f91ec4a0373c92d6b0f418a68d0560c1d83c8d9c673b7cfbe93bab446f61209ae2d49b298aefd6da43b0be9732be5cd996125910";
-  sha512.doc = "2b0c825844d220efe5d4bf77ae53e0a155a5b8603630b361b45b4267083b15b3d7149d1d4fab1191064b3edc650195eb4497e0370c06ff39a93d673adafcb9f6";
+  sha512.run = "daaf1cc1ac8c34c4a63de3a16baabbcb661177172892bf4bf85e588cd150e8736b5b3ef382656c4ca5e3486f93889bfe00a9895988284a3fde84caf222e9744c";
+  sha512.doc = "a020e1c60dd909ad48607b315e63d2225a9a884f2939f1cba2a783e9336b86dc002e1fd771469daae9a4c16d80b4c9263f04a545b270ad666749d5d4536d3e7c";
   hasRunfiles = true;
-  version = "0.20c";
+  version = "0.21";
 };
 "xskak" = {
   revision = 51432;
@@ -37691,18 +38092,18 @@ tl: { # no indentation
   version = "0.981";
 };
 "xurl" = {
-  revision = 57265;
+  revision = 61553;
   stripPrefix = 0;
-  sha512.run = "51251afe43f9b175e4afd901f10edd63bad590b0591f117d423866ed1a82e2c0ab35dee7e03250c331f8a8605f9c6ba8357e93ef0aa80d40dc03379bde24dd1c";
-  sha512.doc = "df7e35d13f340c44813e0656c36148b92319a7099ae47eb02513d33834b642528eff2e81299aa670c2a4572e78c830d48c83b46996700e9fb568db16b84f1e57";
+  sha512.run = "df2570d0eefb64df3a0533237ea09f00b9e22be0000134b32de40198649a6e98ee48a31d769dc750847672be7e3577fcd8eabe25e1ae8ee493d77e40ce684147";
+  sha512.doc = "e02cceecac468713453432e118dd1cbe3f872a4dc33fcbdfc769861f353ac4ff5c117f51197b297a4eadf295f75f1f0254585ef0a48909aa004f4a598d796491";
   hasRunfiles = true;
-  version = "0.09a";
+  version = "0.10";
 };
 "xwatermark" = {
-  revision = 28090;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "705c9eeccda8b2475cee782f6bb167691e985324361e6dbf147ef9843489f572f2e0b9e47a9f2beb7fdce68ef12ba2bbcb2ccf23c39db489d7d4486f09ff5787";
-  sha512.doc = "70436c9927ed6c3c7604e1e70fa877b9be80287a18d9257abc85526fd756be5b0712b28b47b3271787f6ab062743964ca6eb5204005fec33c3a63d2dcab960ed";
+  sha512.run = "c8b7e89cb39ef5b3f01f24a89cbdce729ad2061a0b3a1ef504933ab7e116b4b67ba8f1a68db74d46839bfbb60cecad4fc459fdd5d913716ad6542d8952ffd926";
+  sha512.doc = "a812651c587a76e086076bc8c810dc218431b40aad223644001f42d098962a401246781e0f83789afb3407fd93a0379755f82e30d815c14b4bc72499a9d8d26e";
   hasRunfiles = true;
   version = "1.5.2d";
 };
@@ -37724,10 +38125,10 @@ tl: { # no indentation
   version = "5.06";
 };
 "xypic" = {
-  revision = 31859;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "5bf1323499bd801e2d5e9ca2eaaf3d7726ed6b8063dee18180eec775ea4d2f86cca8bcae262375455af64ae00951a41b34386fd90666a2a89114a2fcf23ccb7f";
-  sha512.doc = "cee264a3a8ee8f599b2310b4c9b722835a61fe8455c3f873ba91ad22ac7890cff8a1ef25f3d0b80aedd6420f31742f4e533fe20fc81dc83e4cc018684180c7ff";
+  sha512.run = "431451f2028cc87d2d22b4d6ce95ac8f216755da312301195ba7af46146382cf76c27f9964a94817e90afdcdbc7a01dbd887d45808296984fa0b3a3a1770b46d";
+  sha512.doc = "9664336d5bd14145603a8c3e861f8fdf062cd4587b8f739a29d93ac78a946c06a0985da4f011030df575276bd43555e55ba467eb4c640d60b2db0a07be706908";
   hasRunfiles = true;
   version = "3.8.9";
 };
@@ -37773,10 +38174,10 @@ tl: { # no indentation
   version = "1.1";
 };
 "yamlvars" = {
-  revision = 61327;
+  revision = 62722;
   stripPrefix = 0;
-  sha512.run = "1c0f473b95db6d4eed19d60e457271acda699a36d9d5de84f70e7f81411e23779a235b7237354b57c786e4b1af9e8d09294f55271da36c26dc42c93816c3b589";
-  sha512.doc = "1f9613b9463616b38a34ad8b913e599e9c13124bf7e457ca541eec4aa67a3e2b95cc3869c7a4fc012e150afc1fc93accdda89b05340e3d4484a5b0a4ca9986d3";
+  sha512.run = "edfcc2f088dc8352be7386eaaee1e7babf01d4079eb37237e404f20d85309096deeda44bae0c3838f816db53a47b89578b6befcfbaab83395877bb19467afa6a";
+  sha512.doc = "62fbe644e41ffe332770f3e2cecc24626c0305ce1b1f9a48487420bcecdee74a32c261aee12953a717c36c6791cd89d94d3b6bf600f3d135e70e11031c3d9819";
   hasRunfiles = true;
 };
 "yannisgr" = {
@@ -37804,13 +38205,49 @@ tl: { # no indentation
   version = "1.03";
 };
 "yazd-thesis" = {
-  revision = 51725;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "9f8350ad1d606769e5c5825bfa92832775ca7a120287013119f01e3cdd54b052a9bf51cce2c7350e5f7241b4817a4b840590bade6c07646fc519be5ba2d9e11b";
-  sha512.doc = "315a82c7e548df4c971d9281f5da6e58a58282a3b05ab23eb41befe4cbe56b278d9a975c920d10cbd387f8809a2301ce800b9fc1c482dd6c3821040ac5911aa0";
+  sha512.run = "d19e817cc925a0ea08e1b15f3a2b1d6ee4b7a8f9ac420dfa7b6db7cc55b5a24777125a0be7923707606b215ec95044fdf16a2f8a5e5682d8403cf6857dc3252e";
+  sha512.doc = "b065c1fabfa4eb394b5ffd3ed048a42c005cb183c82027d5ce1d21e53c2a35f8c0d3647156567f47cdced936ed061fcf303651d024fe3050e8a135c693ea8c28";
   hasRunfiles = true;
   version = "0.3";
 };
+"yb-book" = {
+  revision = 61484;
+  stripPrefix = 0;
+  deps."anyfontsize" = tl."anyfontsize";
+  deps."biblatex" = tl."biblatex";
+  deps."changepage" = tl."changepage";
+  deps."chngcntr" = tl."chngcntr";
+  deps."csquotes" = tl."csquotes";
+  deps."enumitem" = tl."enumitem";
+  deps."fancyhdr" = tl."fancyhdr";
+  deps."float" = tl."float";
+  deps."footmisc" = tl."footmisc";
+  deps."geometry" = tl."geometry";
+  deps."graphics" = tl."graphics";
+  deps."imakeidx" = tl."imakeidx";
+  deps."l3packages" = tl."l3packages";
+  deps."lastpage" = tl."lastpage";
+  deps."libertine" = tl."libertine";
+  deps."mdframed" = tl."mdframed";
+  deps."microtype" = tl."microtype";
+  deps."paralist" = tl."paralist";
+  deps."pgf" = tl."pgf";
+  deps."qrcode" = tl."qrcode";
+  deps."setspace" = tl."setspace";
+  deps."soul" = tl."soul";
+  deps."titlesec" = tl."titlesec";
+  deps."ulem" = tl."ulem";
+  deps."wrapfig" = tl."wrapfig";
+  deps."xcolor" = tl."xcolor";
+  deps."xifthen" = tl."xifthen";
+  deps."xkeyval" = tl."xkeyval";
+  sha512.run = "1f73b26023c553ef747ed7db6af03e68be64b79576384f0f9a58719a1cafa8fa7e5b1cba4e605748e40990fff9a6b955defa49a61e88e1d520523e5963a05735";
+  sha512.doc = "71176d67bf784433ca53e35504c5bef4ced8702e8a5a8ace096a92be06e2ce14608129dd8e6d44bdd84b83fb6b3077e72cb11c105ad43c568e6254ed85d86191";
+  hasRunfiles = true;
+  version = "0.1.0";
+};
 "ycbook" = {
   revision = 46201;
   stripPrefix = 0;
@@ -37827,6 +38264,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.6alpha";
 };
+"yet-another-guide-latex2e" = {
+  revision = 62565;
+  stripPrefix = 0;
+  sha512.run = "d6e6222758560d2602d358a7ef833579560b0d8396210ba284772ac099b048331a0ca2ddeec4217022eaaa32719f920670ad4d27124799b6fe668f4ac009d7ea";
+  sha512.doc = "d83040f3b0922c3f86f7681db9912d6b619369851c3e97237947b1f0c2d456886abaea77ae0ce6d3123b1943b85bd005cf6f78adf53865ba7abd2fe7531843ec";
+  version = "0.5";
+};
 "yfonts" = {
   revision = 50755;
   stripPrefix = 0;
@@ -37886,12 +38330,12 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "yquant" = {
-  revision = 60420;
+  revision = 61897;
   stripPrefix = 0;
-  sha512.run = "6d5d8c48e2103d2f97ffee6b367a27a3a2fa4477f7b08c2ee4e77b74bd93485c7a0f39d03124ea890fdc469289e7eb0b28e62cea84a413418445e67019240f33";
-  sha512.doc = "22388a724c3c669087c1eb350705efb76fa70aeef735fb20fe3a66a308b940f11824c43d3ca72094588ad98ec9104c389ea30f712d56e14ee1abfd7a4dec46fe";
+  sha512.run = "d990bd5381d0dd2c2b273c645566d8d9256391981434a1499b990921894a3f2bcd7953c30872315a98d48fe8864e18b944161ff460a2db3fd2ee267a2551ae88";
+  sha512.doc = "dbdb5461e4cd0aeebf465d43c332eca810ecf419d9706569812a62794edd939f80c3984a9961d7578c1240482cff11fda74e95e205a8d383b600b9980fdba0f1";
   hasRunfiles = true;
-  version = "0.5.1";
+  version = "0.7";
 };
 "ytableau" = {
   revision = 59580;
@@ -37903,15 +38347,15 @@ tl: { # no indentation
   version = "1.4";
 };
 "zapfchan" = {
-  revision = 31835;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "46a104a6e4d1cf681bf10bf22fa32510982939cf52dd255a7ec50e5a9f95acf72457195cee13499c6f517a7f2b03be8a285eb6730f659d59ee5aa42522ba34bb";
+  sha512.run = "a5a8a672e1753cd39b44dfb43b9b83673f7bd20dfb4e4640630ba0908c228dd75dda7933432d6d6f7e2c4920d554aa8cd41a523ebe665832edbc4aa7b8034332";
   hasRunfiles = true;
 };
 "zapfding" = {
-  revision = 31835;
+  revision = 61719;
   stripPrefix = 0;
-  sha512.run = "e3e6e69b82858d8bd653bcb112ed81b8b5aacc0b915b5e4ed4288f5aef896211e75b85b1b647989e0ffa431ec204a9d8ad27b2e60bc2b28eea83eb3518945bf1";
+  sha512.run = "3e0503c2d4e30c8d727caa1d9438d4c6b12c3a15729eae65d5c4a8dd9ab0d0c8eee2f63138e9d267f4ae98ef7607388888f7acd78e189a5c322bda22827166fe";
   hasRunfiles = true;
 };
 "zbmath-review-template" = {
@@ -38005,12 +38449,12 @@ tl: { # no indentation
   version = "1.4.0";
 };
 "zlmtt" = {
-  revision = 61379;
+  revision = 61567;
   stripPrefix = 0;
-  sha512.run = "3bde356a92ced2170521dc1ca606f02db31467d2584064d7d2faaf518af8a3d8ceea6a6ce6195d280230188395b27399da4b92dfcafb04348948ae2c44e92f57";
-  sha512.doc = "810f538e57601f8dfa1143acf1803f5466e42d7705a5e5cf9aaa63ebbbabede669801ddfd24a6008f6d059b1a2e23f48f1baa07a546837027e52e23199f09ff3";
+  sha512.run = "beb32b3a3a89f02f1dadd51e4c585d4f268c277f78dbac11325299dd59de1987c12ffee92f2ca713e92ecc797d9228779cb542a31428e4ef6b73255b7f5ce987";
+  sha512.doc = "f877777cb814d325b54f88c69adb663cc0c9851994e9960977904a39de1168a4ec344b4861a5c4cb1b125ef41ae3f180e51e6a318fc99dc2344ce900f892e94a";
   hasRunfiles = true;
-  version = "1.03";
+  version = "1.031";
 };
 "zootaxa-bst" = {
   revision = 50619;
@@ -38030,22 +38474,33 @@ tl: { # no indentation
   version = "2.32";
 };
 "zref-check" = {
-  revision = 61359;
+  revision = 62011;
   stripPrefix = 0;
-  sha512.run = "8695bf0fd5a1d4c94219aefc7a7022a7efc2eb315c270689df726e9727bc8e38709c816bde2ec41b3a61691b96b0e97ac101c09b7af7cd5edc4f3855a94241e3";
-  sha512.doc = "7906814e90d8ca6b35c9153e086dc66c34cd5432ca600a59b5bf1c4969d3928e6e0f494dfd0ba124d264606e6a1ec2fc0782df1e10d198bc6b5ea60b3d8de32e";
-  sha512.source = "141ea6d6a296b2bc7effe6ac90f831a68484f1bbab3fab1add2985bc4d94b6d3fdba98ef80d5cb4ba284738c8c5203d252286161a59ba7713fb5447c39dd7beb";
+  sha512.run = "af3f51e40dfa6b9f34e032634ffc9d52cbf86e8b07ee865681a9d3b6c5f610a1ee6498223ed2c0cc3f612f7696e43527c9852b20d07854cf3cbbb1dac34d15e2";
+  sha512.doc = "3b683f4b47e7ce201d6ac83c2c01ef98a2b283af0dbfd898a2581320355fa74ff69c49523bf732e7cf2e5ce533c5cf0a9eee8a80863fa9d403102369980ab327";
+  sha512.source = "288dd89731fa136559d020179ac73edea4c25afacb8c91845f189d036dadcc0a80a398f82c901478344f6bbeaf60f3987e2bea3b6400f70f9c5ae5312d333ef6";
   hasRunfiles = true;
-  version = "0.2.3";
+  version = "0.2.5";
 };
 "zref-clever" = {
-  revision = 61246;
+  revision = 61994;
+  stripPrefix = 0;
+  sha512.run = "13df97fe0eb3fedaf2cf4e0c6315a3950833c8498336cca9b402007039c06f1da1b11c7344455bd39154c9a9fee309e589740c20312430d0e6296072bbd7a4da";
+  sha512.doc = "0f93b690ae200e340b55c736ea93a213c710f68f4ac662cdfe27e0743a399184d85b235028a4af6cd655ee880b255d00993b9ae0d6bd53034d2144cae3337715";
+  sha512.source = "3b64811689d5c3d32e31c2fc2ecd31fd9c66bfa343f8af33791fff9ce34ba5655eb175028d0a6341236c2b6db244c273c9aee737b90411adb2c332bf2d903f88";
+  hasRunfiles = true;
+  version = "0.2.2-alpha";
+};
+"zref-vario" = {
+  revision = 61995;
   stripPrefix = 0;
-  sha512.run = "65f66f94bb2dcdb470cde4c0cea5f947359956726db46acc59a5c963e3601f350b2d6ea50fd0276f69d81b48086314ab4a6a1fa3b76d9c2746ff231cee047c2f";
-  sha512.doc = "e173be442a3ecae85c24005ce99c141e29900b5f0178d8dee3db6874e1e91068839ef4c1f4e98d0ac49e41ddfc1e4dc8f523238555cb2ce8c0a66282d38b7a72";
-  sha512.source = "b3cd945a1ad1e86b2042abd88354877b2f3834a65530f0e58704b36f1ae6a2cc3e06c292f0c2971d063ba3b8e18c96d9d06cb2773af1cad155fe8932c8d5cf79";
+  deps."tools" = tl."tools";
+  deps."zref-clever" = tl."zref-clever";
+  sha512.run = "26a10ab2d9fdf28654658f8b2d376c2d49fe90f7478089ee858d6ddb6350bcdfcfabbfa96c4981d11aceb958dd7893f125575d93ac34ebbebf3519dfc1d5dc22";
+  sha512.doc = "d5d839f8d850a59f8d37a0acdbb6c3236bbba97efb015e5170d4df52ce3a07937dea55886358aea64a3b315dcccd693c47ef6f8ebba6465e9dc5083e395225c8";
+  sha512.source = "854bb3583b9e8a961dbd2aac05ca0b7121d44e79b1454cf35c1de327587e859a6269a97684b238c89b7ed12b0bca7f87fe9dd2595ffb6183e091884aa80bcd2b";
   hasRunfiles = true;
-  version = "0.1.1-alpha";
+  version = "0.1.3-alpha";
 };
 "zwgetfdate" = {
   revision = 15878;
@@ -38078,12 +38533,12 @@ tl: { # no indentation
   version = "0.2";
 };
 "zxjafont" = {
-  revision = 53884;
+  revision = 62865;
   stripPrefix = 0;
-  sha512.run = "bb6047e07b1d3c326cdee875809053b90b7e753078ae1e6c0b3cad19cb645e7e46321b07509f86b8d8dc2eb331be8e50588a2f9c926afd413aed20c99f4f6a40";
-  sha512.doc = "c1cc759857b60c123ae798e1a9168f85e7fa663b875f241a8d5160b14cf366bcc282d09b9e527469986ee268b160cadc89a906facf8f38bd76ffb9d07e0a7ffa";
+  sha512.run = "4bf2a38c58a042a611ba069067cd9985b09e453acccffc6955b0ae74bab993d9b3f610743d3cc8eb63048a45ce775e4e240ad0b00b7b6b5ad171e6c1178c03a2";
+  sha512.doc = "9802925d6c692d8fbbf50500aaa1dd4d465a3717580a9768f3b41e95ccf5a3a8cb469697d3bf8d668a83f8ca7e4af9c0ec515da95733425bd6c31b0b1cc03b34";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.3";
 };
 "zxjatype" = {
   revision = 53500;
diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index 8230768e997a9..998ae80e306e8 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -11,13 +11,6 @@ let
     };
   });
 
-  changeVersionHash = overrideFunc: version: hash: overrideFunc (oldAttrs: rec {
-    inherit version;
-    src = oldAttrs.src.override {
-      inherit version hash;
-    };
-  });
-
   localPython = python3.override
     {
       self = localPython;
@@ -26,7 +19,15 @@ let
         botocore = changeVersion super.botocore.overridePythonAttrs "1.23.54" "sha256-S7m6FszO5fWiYCBJvD4ttoZTRrJVBmfzATvfM7CgHOs=";
         colorama = changeVersion super.colorama.overridePythonAttrs "0.4.3" "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9";
         future = changeVersion super.future.overridePythonAttrs "0.16.0" "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773";
-        requests = changeVersionHash super.requests.overridePythonAttrs "2.26.0" "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c=";
+        requests = super.requests.overridePythonAttrs (oldAttrs: rec {
+          version = "2.26.0";
+          checkInputs = oldAttrs.checkInputs ++ [ super.trustme ];
+          src = oldAttrs.src.override {
+            inherit version;
+            hash = "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c=";
+          };
+        }
+        );
         six = changeVersion super.six.overridePythonAttrs "1.14.0" "02lw67hprv57hyg3cfy02y3ixjk3nzwc0dx3c4ynlvkfwkfdnsr3";
         wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf";
         semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54";
diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix
deleted file mode 100644
index cc4af17b47d0e..0000000000000
--- a/pkgs/tools/virtualization/ovftool/default.nix
+++ /dev/null
@@ -1,230 +0,0 @@
-{ lib, stdenv, system ? builtins.currentSystem, ovftoolBundles ? {}
-, requireFile, buildFHSUserEnv, patchelf, autoPatchelfHook, makeWrapper, nix, unzip
-, glibc, c-ares, openssl_1_0_2, curl, expat, icu60, xercesc, zlib
-}:
-
-let
-  version = "4.4.1-16812187";
-
-  # FHS environment required to unpack ovftool on x86.
-  ovftoolX86Unpacker = buildFHSUserEnv rec {
-    name = "ovftool-unpacker";
-    targetPkgs = pkgs: [ pkgs.bash ];
-    multiPkgs = targetPkgs;
-    runScript = "bash";
-  };
-
-  # unpackPhase for i686 and x86_64 ovftool self-extracting bundles.
-  ovftoolX86UnpackPhase = ''
-    runHook preUnpack
-
-    # This is a self-extracting shell script and needs a FHS environment to run.
-    # In reality, it could be doing anything, which is bad for reproducibility.
-    # Our postUnpack uses nix-hash to verify the hash to prevent problems.
-    #
-    # Note that the Arch PKGBUILD at
-    # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vmware-ovftool
-    # appears to use xvfb-run - this hasn't been proven necessary so far.
-    #
-    cp ${ovftoolSource} ./ovftool.bundle
-    chmod +x ./ovftool.bundle
-    ${ovftoolX86Unpacker}/bin/ovftool-unpacker ./ovftool.bundle -x ovftool
-    rm ovftool.bundle
-
-    local extracted=ovftool/vmware-ovftool/
-    if [ -d "$extracted" ]; then
-      # Move the directory we care about to ovftool/
-      mv "$extracted" .
-      rm -r ovftool
-      mv "$(basename -- "$extracted")" ovftool
-      echo "ovftool extracted successfully" >&2
-    else
-      echo "Could not find $extracted - are you sure this is ovftool?" >&2
-      rm -r ovftool
-      exit 1
-    fi
-
-    runHook postUnpack
-  '';
-
-  # unpackPhase for aarch64 .zip.
-  ovftoolAarch64UnpackPhase = ''
-    runHook preUnpack
-
-    unzip ${ovftoolSource}
-
-    local extracted=ovftool/
-    if [ -d "$extracted" ]; then
-      echo "ovftool extracted successfully" >&2
-    else
-      echo "Could not find $extracted - are you sure this is ovftool?" >&2
-      exit 1
-    fi
-
-    runHook postUnpack
-  '';
-
-  # When the version is bumped, postUnpackHash will change
-  # for all these supported systems. Update it from the printed error on build.
-  #
-  # This is just a sanity check, since ovftool is a self-extracting bundle
-  # that could be doing absolutely anything on 2/3 of the supported platforms.
-  ovftoolSystems = {
-    "i686-linux" = {
-      filename = "VMware-ovftool-${version}-lin.i386.bundle";
-      sha256 = "0gx78g3s77mmpir7jbiskna10i6262ihal1ywivlb6xxxxbhqzwj";
-      unpackPhase = ovftoolX86UnpackPhase;
-      postUnpackHash = "1k8rp8ywhs0cl9aad37v1p0493bdvkxrsvwg5pgv2bhvjs4hqk7n";
-    };
-    "x86_64-linux" = {
-      filename = "VMware-ovftool-${version}-lin.x86_64.bundle";
-      sha256 = "1kp2bp4d9i8y7q25yqff2bn62mh292lws7b66lyn8ka9b35kvnzc";
-      unpackPhase = ovftoolX86UnpackPhase;
-      postUnpackHash = "0zvyakwi4iishqxxisihgh91bmdsfvj5vchm2c192hia03a143py";
-    };
-    "aarch64-linux" = {
-      filename = "VMware-ovftool-${version}-lin.aarch64.zip";
-      sha256 = "0all8bwv5p5adnzqvrly6nzmxmfpywvlbfr0finr4n100yv0v1xy";
-      unpackPhase = ovftoolAarch64UnpackPhase;
-      postUnpackHash = "16vyyzrmryi8b7mrd6nxnhywvvj2pw0ban4qfiqfahw763fn6971";
-    };
-  };
-
-  ovftoolSystem = if builtins.hasAttr system ovftoolSystems then
-                    ovftoolSystems.${system}
-                  else throw "System '${system}' is unsupported by ovftool";
-
-  ovftoolSource = if builtins.hasAttr system ovftoolBundles then
-                    ovftoolBundles.${system}
-                  else
-                    requireFile {
-                      name = ovftoolSystem.filename;
-                      url = "https://my.vmware.com/group/vmware/downloads/get-download?downloadGroup=OVFTOOL441";
-                      sha256 = ovftoolSystem.sha256;
-                    };
-in
-stdenv.mkDerivation rec {
-  pname = "ovftool";
-  inherit version;
-
-  src = ovftoolSource;
-
-  buildInputs = [
-    glibc
-
-    # This is insecure, but we don't really have a way around it
-    # since ovftool depends on it. In theory we could ship their OpenSSL
-    # build... but that makes the reliance on an insecure library less obvious.
-    openssl_1_0_2
-
-    c-ares
-    (curl.override { openssl = openssl_1_0_2; })
-    expat
-    icu60
-    xercesc
-    zlib
-  ];
-
-  nativeBuildInputs = [ nix patchelf autoPatchelfHook makeWrapper unzip ];
-
-  sourceRoot = ".";
-
-  unpackPhase = ovftoolSystem.unpackPhase;
-
-  postUnpackHash = ovftoolSystem.postUnpackHash;
-
-  # Expects a directory named 'ovftool'. Validates the postUnpackHash in
-  # ovftoolSystem.
-  postUnpack = ''
-    if [ -d ovftool ]; then
-      # Ensure we're in the staging directory
-      cd ovftool
-    fi
-
-    # Verify the hash with nix-hash before proceeding to ensure reproducibility.
-    local ovftool_hash
-    ovftool_hash="$(nix-hash --type sha256 --base32 .)"
-    if [ "$ovftool_hash" != "$postUnpackHash" ]; then
-      echo "Expected hash: $postUnpackHash" >&2
-      echo "Actual hash:   $ovftool_hash" >&2
-      echo "Could not verify post-unpack hash!" >&2
-      exit 1
-    fi
-  '';
-
-  # Expects a directory named 'ovftool' containing the ovftool install.
-  # Based on https://aur.archlinux.org/packages/vmware-ovftool/
-  # with the addition of a libexec directory and a Nix-style binary wrapper.
-  installPhase = ''
-    runHook preInstall
-
-    if [ -d ovftool ]; then
-      # Ensure we're in the staging directory
-      cd ovftool
-    fi
-
-    # libraries
-    install -m 755 -d "$out/lib/$pname"
-
-    # These all appear to be VMWare proprietary except for libgoogleurl.
-    # The rest of the libraries that the installer extracts are omitted here,
-    # and provided in buildInputs.
-    #
-    # FIXME: can we replace libgoogleurl? Possibly from Chromium?
-    #
-    install -m 644 -t "$out/lib/$pname" \
-      libgoogleurl.so.59 \
-      libssoclient.so \
-      libvim-types.so libvmacore.so libvmomi.so
-
-    # ovftool specifically wants 1.0.2 but our libcrypto is named 1.0.0
-    ln -s "${openssl_1_0_2.out}/lib/libcrypto.so" \
-      "$out/lib/$pname/libcrypto.so.1.0.2"
-    ln -s "${openssl_1_0_2.out}/lib/libssl.so" \
-      "$out/lib/$pname/libssl.so.1.0.2"
-
-    # libexec
-    install -m 755 -d "$out/libexec/$pname"
-    install -m 755 -t "$out/libexec/$pname" ovftool.bin
-    install -m 644 -t "$out/libexec/$pname" icudt44l.dat
-
-    # libexec resources
-    for subdir in "certs" "env" "env/en" "schemas/DMTF" "schemas/vmware"; do
-      install -m 755 -d "$out/libexec/$pname/$subdir"
-      install -m 644 -t "$out/libexec/$pname/$subdir" "$subdir"/*.*
-    done
-
-    # EULA/OSS files
-    install -m 755 -d "$out/share/licenses/$pname"
-    install -m 644 -t "$out/share/licenses/$pname" \
-      "vmware.eula" "vmware-eula.rtf" "open_source_licenses.txt"
-
-    # documentation files
-    install -m 755 -d "$out/share/doc/$pname"
-    install -m 644 -t "$out/share/doc/$pname" "README.txt"
-
-    # binary wrapper; note that LC_CTYPE is defaulted to en_US.UTF-8 by
-    # VMWare's wrapper script. We use C.UTF-8 instead.
-    install -m 755 -d "$out/bin"
-    makeWrapper "$out/libexec/$pname/ovftool.bin" "$out/bin/ovftool" \
-      --set-default LC_CTYPE C.UTF-8 \
-      --prefix LD_LIBRARY_PATH : "$out/lib"
-
-    runHook postInstall
-  '';
-
-  preFixup = ''
-    addAutoPatchelfSearchPath "$out/lib"
-  '';
-
-  dontBuild = true;
-  dontPatch = true;
-  dontConfigure = true;
-
-  meta = with lib; {
-    description = "VMWare tools for working with OVF, OVA, and VMX images";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ numinit ];
-    platforms = builtins.attrNames ovftoolSystems;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dc86887cba152..18e920573046d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -87,6 +87,7 @@ mapAliases ({
   aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26
   avldrums-lv2 = x42-avldrums; # Added 2020-03-29
   avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18
+  aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05;
   azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02
 
   ### B ###
@@ -102,19 +103,21 @@ mapAliases ({
   bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22
   beret = throw "beret has been removed"; # Added 2021-11-16
   bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07
+  bird2 = bird; # Added 2022-02-21
+  bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21
   bitbucket-cli = throw "bitbucket-cli has been removed: abandoned by upstream"; # Added 2022-03-21
   bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22
   blastem = throw "blastem has been removed from nixpkgs as it would still require python2"; # Added 2022-01-01
   bluezFull = bluez; # Added 2019-12-03
   bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # Added 2020-12-10
+  botan = throw "botan has been removed because it did not support a supported openssl version"; # added 2021-12-15
   bpftool = bpftools; # Added 2021-05-03
   brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24
   bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22
   bro = zeek; # Added 2019-09-29
-  bird2 = bird; # Added 2022-02-21
-  bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21
   btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22
   bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14
+  buttersink = throw "buttersink has been removed: abandoned by upstream"; # Added 2022-04-05
 
   # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30)
   bitwarden_rs = vaultwarden;
@@ -139,6 +142,7 @@ mapAliases ({
   caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02
   calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement"; # Added 2021-01-13
   calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement"; # Added 2021-01-13
+  callPackage_i686 = pkgsi686Linux.callPackage;
   cantarell_fonts = throw "'cantarell_fonts' has been renamed to/replaced by 'cantarell-fonts'"; # Converted to throw 2022-02-22
   cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20
   casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken";
@@ -150,8 +154,8 @@ mapAliases ({
   chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15
   chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07
   cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22
+  cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11
   ckb = throw "'ckb' has been renamed to/replaced by 'ckb-next'"; # Converted to throw 2022-02-22
-  callPackage_i686 = pkgsi686Linux.callPackage;
   creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01
 
   # these are for convenience, not for backward compat and shouldn't expire
@@ -177,6 +181,7 @@ mapAliases ({
   compton-git = throw "'compton-git' has been renamed to/replaced by 'compton'"; # Converted to throw 2022-02-22
   concurrencykit = libck; # Added 2021-03
   conntrack_tools = throw "'conntrack_tools' has been renamed to/replaced by 'conntrack-tools'"; # Converted to throw 2022-02-22
+  container-linux-config-transpiler = throw "container-linux-config-transpiler is deprecated and archived by upstream"; # Added 2022-04-05
   cool-old-term = throw "'cool-old-term' has been renamed to/replaced by 'cool-retro-term'"; # Converted to throw 2022-02-22
   corsmisc = throw "corsmisc has been removed (upstream is gone)"; # Added 2022-01-24
   couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03
@@ -276,7 +281,7 @@ mapAliases ({
 
   ### E ###
 
-
+  eagle7 = throw "eagle7 has been removed because it did not support a supported openssl version"; # added 2021-12-15
   ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08
   ec2_api_tools = ec2-api-tools; # Added 2021-10-08
   ec2-utils = amazon-ec2-utils; # Added 2022-02-01
@@ -307,6 +312,7 @@ mapAliases ({
   encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06
   envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
   epoxy = libepoxy; # Added 2021-11-11
+  epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15
   esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12
   etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22
   eteroj.lv2 = throw "'eteroj.lv2' has been renamed to/replaced by 'open-music-kontrollers.eteroj'"; # Added 2022-03-09
@@ -436,6 +442,7 @@ mapAliases ({
   google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07
   go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22
   gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06
+  gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17
 
   graalvm11 = graalvm11-ce;
   graalvm8-ce = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19
@@ -451,11 +458,12 @@ mapAliases ({
   gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22
   gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22
   gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01
-  guileCairo = throw "'guileCairo' has been renamed to/replaced by 'guile-cairo'"; # Converted to throw 2022-02-22
+  gtmess = throw "gtmess has been removed, because it was a MSN client."; # add 2021-12-15
   guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16
+  guileCairo = throw "'guileCairo' has been renamed to/replaced by 'guile-cairo'"; # Converted to throw 2022-02-22
   guileGnome = throw "guile-gnome has been removed"; # Added 2022-01-16
-  guile_lib = throw "'guile_lib' has been renamed to/replaced by 'guile-lib'"; # Converted to throw 2022-02-22
   guileLint = throw "'guileLint' has been renamed to/replaced by 'guile-lint'"; # Converted to throw 2022-02-22
+  guile_lib = throw "'guile_lib' has been renamed to/replaced by 'guile-lib'"; # Converted to throw 2022-02-22
   guile_ncurses = throw "'guile_ncurses' has been renamed to/replaced by 'guile-ncurses'"; # Converted to throw 2022-02-22
   gupnp_av = throw "'gupnp_av' has been renamed to/replaced by 'gupnp-av'"; # Converted to throw 2022-02-22
   gupnp_dlna = throw "'gupnp_dlna' has been renamed to/replaced by 'gupnp-dlna'"; # Converted to throw 2022-02-22
@@ -469,6 +477,7 @@ mapAliases ({
 
   hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07
   hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15
+  heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05
   heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22
   heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06
   hepmc = hepmc2; # Added 2019-08-05
@@ -496,6 +505,10 @@ mapAliases ({
   infiniband-diags = rdma-core; # Added 2019-08-09
   ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project"; # Added 2022-01-12
   inotifyTools = inotify-tools;
+  intecture-agent = throw "intecture-agent has been removed, because it was no longer maintained upstream"; # added 2021-12-15
+  intecture-auth = throw "intecture-auth has been removed, because it was no longer maintained upstream"; # added 2021-12-15
+  intecture-cli = throw "intecture-cli has been removed, because it was no longer maintained upstream"; # added 2021-12-15
+  interfacer = throw "interfacer is deprecated and archived by upstream"; # Added 2022-04-05
   inter-ui = inter; # Added 2021-03-27
   iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06
   iproute = iproute2; # moved from top-level 2021-03-14
@@ -554,6 +567,8 @@ mapAliases ({
   kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23
   krename-qt5 = throw "'krename-qt5' has been renamed to/replaced by 'krename'"; # Converted to throw 2022-02-22
   krita-beta = krita; # moved from top-level 2021-12-23
+  kube-aws = throw "kube-aws is deprecated and archived by upstream"; # Added 2022-04-05
+  kubeless = throw "kubeless is deprecated and archived by upstream"; # Added 2022-04-05
   kvm = throw "'kvm' has been renamed to/replaced by 'qemu_kvm'"; # Converted to throw 2022-02-22
 
   ### L ###
@@ -842,10 +857,11 @@ mapAliases ({
   parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22
   patchmatrix = throw "'patchmatrix' has been renamed to/replaced by 'open-music-kontrollers.patchmatrix'"; # Added 2022-03-09
   pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22
-  pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15
-  pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22
+  pbis-open = throw "pbis-open has been removed, because it is no longer maintained upstream"; # added 2021-12-15
   pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project"; # Added 2022-01-01
   pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03
+  pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15
+  pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22
   perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22
   perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22
   pgadmin = pgadmin4;
@@ -962,6 +978,8 @@ mapAliases ({
   proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30
   proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead"; # Added 2021-04-12
   prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16
+  prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05
+  proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15
   pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22
   pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13
   pulseeffects-pw = easyeffects; # Added 2021-07-07
@@ -1147,6 +1165,7 @@ mapAliases ({
   tahoelafs = throw "'tahoelafs' has been renamed to/replaced by 'tahoe-lafs'"; # Converted to throw 2022-02-22
   tangogps = foxtrotgps; # Added 2020-01-26
   tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead";
+  teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05
   telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead"; # Added 2020-07-02
   telepathy_farstream = throw "'telepathy_farstream' has been renamed to/replaced by 'telepathy-farstream'"; # Converted to throw 2022-02-22
   telepathy_gabble = throw "'telepathy_gabble' has been renamed to/replaced by 'telepathy-gabble'"; # Converted to throw 2022-02-22
@@ -1391,6 +1410,9 @@ mapAliases ({
     targetLlvmLibraries = targetPackages.llvmPackages_git.libraries;
   });
 
+  # Added 2022-01-28
+  zeroc-ice-36 = throw "Unmaintained, doesn't build w/glibc-2.34";
+
   /* If these are in the scope of all-packages.nix, they cause collisions
   between mixed versions of qt. See:
   https://github.com/NixOS/nixpkgs/pull/101369 */
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65c5b9e133f04..227cdccaec1f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -201,6 +201,8 @@ with pkgs;
 
   aesfix = callPackage ../tools/security/aesfix { };
 
+  aeskeyfind = callPackage ../tools/security/aeskeyfind { };
+
   astrolog = callPackage ../applications/science/astronomy/astrolog { };
 
   atkinson-hyperlegible = callPackage ../data/fonts/atkinson-hyperlegible { };
@@ -670,9 +672,9 @@ with pkgs;
         };
         nghttp2 = buildPackages.nghttp2.override {
           fetchurl = stdenv.fetchurlBoot;
-          inherit zlib pkg-config openssl;
-          c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; };
-          libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; };
+          inherit pkg-config;
+          enableApp = false; # curl just needs libnghttp2
+          enableTests = false; # avoids bringing `cunit` and `tzdata` into scope
         };
       });
     };
@@ -1541,8 +1543,6 @@ with pkgs;
 
   aws-nuke = callPackage ../tools/admin/aws-nuke { };
 
-  aws-okta = callPackage ../tools/security/aws-okta { };
-
   aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { };
 
   aws-sam-cli = callPackage ../development/tools/aws-sam-cli { };
@@ -1723,8 +1723,6 @@ with pkgs;
 
   codeql = callPackage ../development/tools/analysis/codeql { };
 
-  container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
-
   fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { };
 
   ccextractor = callPackage ../applications/video/ccextractor { };
@@ -2482,8 +2480,6 @@ with pkgs;
 
   bustle = haskellPackages.bustle;
 
-  buttersink = callPackage ../tools/filesystems/buttersink { };
-
   bwm_ng = callPackage ../tools/networking/bwm-ng { };
 
   bwbasic = callPackage ../development/interpreters/bwbasic { };
@@ -4244,12 +4240,6 @@ with pkgs;
 
   cilium-cli = callPackage ../applications/networking/cluster/cilium { };
 
-  cipherscan = callPackage ../tools/security/cipherscan {
-    openssl = if stdenv.hostPlatform.system == "x86_64-linux"
-      then openssl-chacha
-      else openssl;
-  };
-
   cjdns = callPackage ../tools/networking/cjdns { };
   cjdns-tools = callPackage ../tools/admin/cjdns-tools { };
 
@@ -5322,8 +5312,6 @@ with pkgs;
 
   epstool = callPackage ../tools/graphics/epstool { };
 
-  epsxe = callPackage ../applications/emulators/epsxe { };
-
   escrotum = callPackage ../tools/graphics/escrotum { };
 
   etcher = callPackage ../tools/misc/etcher {
@@ -6440,10 +6428,6 @@ with pkgs;
 
   gtk-vnc = callPackage ../tools/admin/gtk-vnc {};
 
-  gtmess = callPackage ../applications/networking/instant-messengers/gtmess {
-    openssl = openssl_1_0_2;
-  };
-
   gup = callPackage ../development/tools/build-managers/gup {};
 
   gupnp = callPackage ../development/libraries/gupnp { };
@@ -6803,14 +6787,6 @@ with pkgs;
 
   inql = callPackage ../tools/security/inql { };
 
-  intecture-agent = callPackage ../tools/admin/intecture/agent.nix { };
-
-  intecture-auth = callPackage ../tools/admin/intecture/auth.nix { };
-
-  intecture-cli = callPackage ../tools/admin/intecture/cli.nix {
-    openssl = openssl_1_0_2;
-  };
-
   intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { };
 
   intermodal = callPackage ../tools/misc/intermodal { };
@@ -8797,8 +8773,6 @@ with pkgs;
 
   otpw = callPackage ../os-specific/linux/otpw { };
 
-  ovftool = callPackage ../tools/virtualization/ovftool { };
-
   overcommit = callPackage ../development/tools/overcommit { };
 
   overmind = callPackage ../applications/misc/overmind { };
@@ -9099,6 +9073,10 @@ with pkgs;
 
   pleroma = callPackage ../servers/pleroma { };
 
+  plfit = callPackage ../tools/misc/plfit {
+    python = null;
+  };
+
   ploticus = callPackage ../tools/graphics/ploticus {
     libpng = libpng12;
   };
@@ -9212,10 +9190,6 @@ with pkgs;
 
   proxysql = callPackage ../servers/sql/proxysql { };
 
-  proxytunnel = callPackage ../tools/misc/proxytunnel {
-    openssl = openssl_1_0_2;
-  };
-
   prs = callPackage ../tools/security/prs { };
 
   psw = callPackage ../tools/misc/psw { };
@@ -10451,8 +10425,6 @@ with pkgs;
 
   teamviewer = libsForQt515.callPackage ../applications/networking/remote/teamviewer { };
 
-  teleconsole = callPackage ../tools/misc/teleconsole { };
-
   telegraf = callPackage ../servers/monitoring/telegraf { };
 
   teleport = callPackage ../servers/teleport {};
@@ -11237,7 +11209,9 @@ with pkgs;
   };
 
   unbound-full = unbound.override {
+    python = python3;
     withSystemd = true;
+    withPythonModule = true;
     withDoH = true;
     withECS = true;
     withDNSCrypt = true;
@@ -11491,6 +11465,8 @@ with pkgs;
   xflux = callPackage ../tools/misc/xflux { };
   xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { };
 
+  xfsdump = callPackage ../tools/filesystems/xfsdump { };
+
   xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
   libxfs = xfsprogs.dev;
 
@@ -13311,18 +13287,18 @@ with pkgs;
     inherit (darwin) apple_sdk;
   };
 
-  rust_1_58 = callPackage ../development/compilers/rust/1_58.nix {
+  rust_1_59 = callPackage ../development/compilers/rust/1_59.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
     llvm_13 = llvmPackages_13.libllvm;
   };
-  rust = rust_1_58;
+  rust = rust_1_59;
 
   mrustc = callPackage ../development/compilers/mrustc { };
   mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
   mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
 
-  rustPackages_1_58 = rust_1_58.packages.stable;
-  rustPackages = rustPackages_1_58;
+  rustPackages_1_59 = rust_1_59.packages.stable;
+  rustPackages = rustPackages_1_59;
 
   inherit (rustPackages) cargo clippy rustc rustPlatform;
 
@@ -13490,6 +13466,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  ograc = callPackage ../development/tools/rust/ograc { };
+
   rhack = callPackage ../development/tools/rust/rhack { };
   inherit (rustPackages) rls;
   roogle = callPackage ../development/tools/rust/roogle { };
@@ -15384,8 +15362,6 @@ with pkgs;
 
   krew = callPackage ../development/tools/krew { };
 
-  kube-aws = callPackage ../development/tools/kube-aws { };
-
   kube-hunter = callPackage ../tools/security/kube-hunter { };
 
   kubeaudit = callPackage ../tools/security/kubeaudit { };
@@ -15542,6 +15518,8 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
+  nix-bisect = callPackage ../development/tools/misc/nix-bisect { };
+
   nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { };
 
   nexus = callPackage ../development/tools/repository-managers/nexus {
@@ -16359,11 +16337,6 @@ with pkgs;
 
   bosh-cli = callPackage ../applications/networking/cluster/bosh-cli { };
 
-  botan = callPackage ../development/libraries/botan {
-    openssl = openssl_1_0_2;
-    inherit (darwin.apple_sdk.frameworks) CoreServices Security;
-  };
-
   botan2 = callPackage ../development/libraries/botan/2.0.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
@@ -17137,10 +17110,6 @@ with pkgs;
 
   glm = callPackage ../development/libraries/glm { };
 
-  globalplatform = callPackage ../development/libraries/globalplatform { };
-  gppcscconnectionplugin =
-    callPackage ../development/libraries/globalplatform/gppcscconnectionplugin.nix { };
-
   glog = callPackage ../development/libraries/glog { };
 
   gloox = callPackage ../development/libraries/gloox { };
@@ -17163,7 +17132,7 @@ with pkgs;
   gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { };
   gmp6 = callPackage ../development/libraries/gmp/6.x.nix { };
   gmp = gmp6;
-  gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });
+  gmpxx = gmp.override { cxx = true; };
 
   #GMP ex-satellite, so better keep it near gmp
   mpfr = callPackage ../development/libraries/mpfr { };
@@ -17259,8 +17228,6 @@ with pkgs;
 
   pgweb = callPackage ../development/tools/database/pgweb { };
 
-  gpshell = callPackage ../development/tools/misc/gpshell { };
-
   grantlee = callPackage ../development/libraries/grantlee { };
 
   gsasl = callPackage ../development/libraries/gsasl { };
@@ -18952,7 +18919,7 @@ with pkgs;
 
   libusb1 = callPackage ../development/libraries/libusb1 {
     inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) IOKit;
+    inherit (darwin.apple_sdk.frameworks) IOKit Security;
     # TODO: remove once `udev` is `systemdMinimal` everywhere.
     udev = systemdMinimal;
   };
@@ -18984,7 +18951,7 @@ with pkgs;
   libva-minimal = libva.override { minimal = true; };
   libva-utils = callPackage ../development/libraries/libva/utils.nix { };
 
-  libva1 = callPackage ../development/libraries/libva/1.0.0.nix { };
+  libva1 = callPackage ../development/libraries/libva/1.nix { };
   libva1-minimal = libva1.override { minimal = true; };
 
   libvarlink = callPackage ../development/libraries/libvarlink { };
@@ -19626,12 +19593,9 @@ with pkgs;
   openssl = openssl_1_1;
 
   inherit (callPackages ../development/libraries/openssl { })
-    openssl_1_0_2
     openssl_1_1
     openssl_3_0;
 
-  openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { };
-
   opensubdiv = callPackage ../development/libraries/opensubdiv { };
 
   opensupaplex = callPackage ../games/opensupaplex { };
@@ -20595,18 +20559,10 @@ with pkgs;
 
   utmps = skawarePackages.utmps;
 
-  ucommon = ucommon_openssl;
-
-  ucommon_openssl = callPackage ../development/libraries/ucommon {
-    gnutls = null;
-    openssl = openssl_1_0_2;
-  };
-
-  ucommon_gnutls = lowPrio (ucommon.override {
+  ucommon = callPackage ../development/libraries/ucommon {
     openssl = null;
     zlib = null;
-    gnutls = gnutls;
-  });
+  };
 
   v8 = callPackage ../development/libraries/v8 { };
 
@@ -20768,7 +20724,10 @@ with pkgs;
   wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; };
   wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; };
 
-  wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { };
+  wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix {
+    inherit (darwin.stubs) derez rez setfile;
+    inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit;
+  };
 
   wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix {
     inherit (darwin.stubs) setfile;
@@ -21439,8 +21398,6 @@ with pkgs;
 
   hasura-cli = callPackage ../servers/hasura/cli.nix { };
 
-  heapster = callPackage ../servers/monitoring/heapster { };
-
   hbase = callPackage ../servers/hbase {};
 
   headphones = callPackage ../servers/headphones {};
@@ -22043,7 +22000,6 @@ with pkgs;
   prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { };
   prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { };
   prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { };
-  prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };
   prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { };
   prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { };
   prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { };
@@ -22978,6 +22934,9 @@ with pkgs;
     enableDmeventd = true;
     enableCmdlib = true;
   };
+  lvm2_vdo = lvm2_dmeventd.override {
+    enableVDO = true;
+  };
 
   maddy = callPackage ../servers/maddy { };
 
@@ -23410,11 +23369,16 @@ with pkgs;
     withTimesyncd = false;
     withTpm2Tss = false;
     withUserDb = false;
-    glib = null;
-    libgcrypt = null;
-    lvm2 = null;
-    libfido2 = null;
-    p11-kit = null;
+  };
+  systemdStage1 = systemdMinimal.override {
+    pname = "systemd-stage-1";
+    withCryptsetup = true;
+    withFido2 = true;
+    withTpm2Tss = true;
+  };
+  systemdStage1Network = systemdStage1.override {
+    pname = "systemd-stage-1-network";
+    withNetworkd = true;
   };
 
 
@@ -23542,11 +23506,11 @@ with pkgs;
 
   util-linuxCurses = util-linux;
 
-  util-linuxMinimal = if stdenv.isLinux then appendToName "minimal" (util-linux.override {
+  util-linuxMinimal = if stdenv.isLinux then util-linux.override {
     nlsSupport = false;
     ncurses = null;
     systemd = null;
-  }) else util-linux;
+  } else util-linux;
 
   v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
 
@@ -23554,6 +23518,8 @@ with pkgs;
 
   vndr = callPackage ../development/tools/vndr { };
 
+  vdo = callPackage ../os-specific/linux/vdo { };
+
   windows = callPackages ../os-specific/windows {};
 
   wirelesstools = callPackage ../os-specific/linux/wireless-tools { };
@@ -23695,6 +23661,8 @@ with pkgs;
 
   chonburi-font = callPackage ../data/fonts/chonburi { };
 
+  cldr-annotations = callPackage ../data/misc/cldr-annotations { };
+
   cldr-emoji-annotation = callPackage ../data/misc/cldr-emoji-annotation { };
 
   clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { };
@@ -24411,8 +24379,6 @@ with pkgs;
 
   hasklig = callPackage ../data/fonts/hasklig {};
 
-  interfacer = callPackage ../development/tools/interfacer { };
-
   maligned = callPackage ../development/tools/maligned { };
 
   inter = callPackage ../data/fonts/inter { };
@@ -26224,9 +26190,7 @@ with pkgs;
   };
 
   # Git with SVN support, but without GUI.
-  gitSVN = lowPrio (appendToName "with-svn" (git.override {
-    svnSupport = true;
-  }));
+  gitSVN = lowPrio (git.override { svnSupport = true; });
 
   git-doc = lib.addMetaAttrs {
     description = "Additional documentation for Git";
@@ -26236,11 +26200,11 @@ with pkgs;
     '';
   } gitFull.doc;
 
-  gitMinimal = appendToName "minimal" (git.override {
+  gitMinimal = git.override {
     withManual = false;
     pythonSupport = false;
     withpcre2 = false;
-  });
+  };
 
   gitRepo = callPackage ../applications/version-management/git-repo { };
 
@@ -27178,8 +27142,6 @@ with pkgs;
 
   kubectl-tree = callPackage ../applications/networking/cluster/kubectl-tree { };
 
-  kubeless = callPackage ../applications/networking/cluster/kubeless { };
-
   kubelogin = callPackage ../applications/networking/cluster/kubelogin { };
 
   kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { };
@@ -27979,8 +27941,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  pbis-open = callPackage ../tools/security/pbis { };
-
   pcmanfm = callPackage ../applications/misc/pcmanfm { };
 
   pcmanfm-qt = lxqt.pcmanfm-qt;
@@ -29277,8 +29237,6 @@ with pkgs;
     python = python3;
   };
 
-  sslyze = with python3Packages; toPythonApplication sslyze;
-
   ssr = callPackage ../applications/audio/soundscape-renderer {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
@@ -30117,6 +30075,8 @@ with pkgs;
 
   wlc = callPackage  ../tools/misc/wlc { };
 
+  wlclock = callPackage ../applications/misc/wlclock { };
+
   wllvm = callPackage  ../development/tools/wllvm { };
 
   wmname = callPackage ../applications/misc/wmname { };
@@ -30509,10 +30469,6 @@ with pkgs;
 
   zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; };
 
-  zeroc-ice-36 = callPackage ../development/libraries/zeroc-ice/3.6.nix {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   zeronet = callPackage ../applications/networking/p2p/zeronet { };
 
   zexy = callPackage ../applications/audio/pd-plugins/zexy {
@@ -31047,6 +31003,10 @@ with pkgs;
 
   btanks = callPackage ../games/btanks { };
 
+  bugdom = callPackage ../games/bugdom {
+    inherit (darwin.apple_sdk.frameworks) IOKit Foundation;
+  };
+
   bzflag = callPackage ../games/bzflag {
     inherit (darwin.apple_sdk.frameworks) Carbon CoreServices;
   };
@@ -32883,13 +32843,6 @@ with pkgs;
 
   appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { };
 
-  # Since version 8 Eagle requires an Autodesk account and a subscription
-  # in contrast to single payment for the charged editions.
-  # This is the last version with the old model.
-  eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix {
-    openssl = openssl_1_0_2;
-  };
-
   eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { };
 
   caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { };
@@ -33239,6 +33192,8 @@ with pkgs;
     swt = swt_jdk8;
   };
 
+  argononed = callPackage ../misc/drivers/argononed { };
+
   attract-mode = callPackage ../applications/emulators/attract-mode { };
 
   autotiling = python3Packages.callPackage ../misc/autotiling { };
@@ -33454,10 +33409,10 @@ with pkgs;
 
   ghostscript = callPackage ../misc/ghostscript { };
 
-  ghostscriptX = appendToName "with-X" (ghostscript.override {
+  ghostscriptX = ghostscript.override {
     cupsSupport = true;
     x11Support = true;
-  });
+  };
 
   glava = callPackage ../applications/misc/glava {};
 
@@ -33553,6 +33508,8 @@ with pkgs;
 
   libjack2 = jack2.override { prefix = "lib"; };
 
+  jacktrip = libsForQt5.callPackage ../applications/audio/jacktrip { };
+
   j2cli = with python3Packages; toPythonApplication j2cli;
 
   jquake = callPackage ../applications/misc/jquake { };
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index 7a5b4bdd17989..948eb5ef9b72c 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -32,6 +32,24 @@ let
       feature = "run <literal>checkPhase</literal> by default";
     };
 
+    allowAliases = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to expose old attribute names for compatibility.
+
+        The recommended setting is to enable this, as it
+        improves backward compatibity, easing updates.
+
+        The only reason to disable aliases is for continuous
+        integration purposes. For instance, Nixpkgs should
+        not depend on aliases in its internal code. Projects
+        that aren't Nixpkgs should be cautious of instantly
+        removing all usages of aliases, as migrating too soon
+        can break compatibility with the stable Nixpkgs releases.
+      '';
+    };
+
   };
 
 in {
diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix
index 6771ffe65b1d5..88d3aea46cbe3 100644
--- a/pkgs/top-level/kodi-packages.nix
+++ b/pkgs/top-level/kodi-packages.nix
@@ -153,7 +153,7 @@ let self = rec {
   trakt-module = callPackage ../applications/video/kodi/addons/trakt-module { };
 
   trakt = callPackage ../applications/video/kodi/addons/trakt { };
-}; in self // lib.optionalAttrs (config.allowAliases or true) {
+}; in self // lib.optionalAttrs config.allowAliases {
   # deprecated or renamed packages
 
   controllers = throw "kodi.packages.controllers has been replaced with kodi.packages.controller-topology-project - a package which contains a large number of controller profiles." { };
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index bd7bacf300044..ca80ea02ffc04 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -317,6 +317,8 @@ in {
 
     ena = callPackage ../os-specific/linux/ena {};
 
+    kvdo = callPackage ../os-specific/linux/kvdo {};
+
     liquidtux = callPackage ../os-specific/linux/liquidtux {};
 
     v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { };
@@ -476,7 +478,7 @@ in {
 
     can-isotp = callPackage ../os-specific/linux/can-isotp { };
 
-  } // lib.optionalAttrs (config.allowAliases or false) {
+  } // lib.optionalAttrs config.allowAliases {
     ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;
   });
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 255ba4eb47848..17015119cd92d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -982,6 +982,14 @@ let
 
     ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { };
 
+    ocsipersist = callPackage ../development/ocaml-modules/ocsipersist {};
+
+    ocsipersist-lib = callPackage ../development/ocaml-modules/ocsipersist/lib.nix { };
+
+    ocsipersist-pgsql = callPackage ../development/ocaml-modules/ocsipersist/pgsql.nix { };
+
+    ocsipersist-sqlite = callPackage ../development/ocaml-modules/ocsipersist/sqlite.nix { };
+
     octavius = callPackage ../development/ocaml-modules/octavius { };
 
     odate = callPackage ../development/ocaml-modules/odate { };
@@ -1285,8 +1293,6 @@ let
 
     spelll = callPackage ../development/ocaml-modules/spelll { };
 
-    sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
-
     srt = callPackage ../development/ocaml-modules/srt {
       inherit (pkgs) srt;
     };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 91ee27af4736c..fb81f95cac5f6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -25406,7 +25406,7 @@ let
     };
   };
 
-} // lib.optionalAttrs (config.allowAliases or true) {
+} // lib.optionalAttrs config.allowAliases {
   autodie = null; # part of Perl
   AutoLoader = null; # part of Perl 5.22
   constant = null; # part of Perl 5.22
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 0abf2b5898648..db0b456d905dd 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -35,6 +35,7 @@ in
 mapAliases ({
   anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
   asyncio-nats-client = nats-py; # added 2022-02-08
+  bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15
   blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29
   bt_proximity = bt-proximity; # added 2021-07-02
   carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18
@@ -48,6 +49,8 @@ mapAliases ({
   diff_cover = diff-cover; # added 2021-07-02
   discogs_client = discogs-client; # added 2021-07-02
   djangorestframework-jwt = drf-jwt; # added 2021-07-20
+  django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05
+  django_appconf = django-appconf; # added 2022-03-03
   django_environ = django-environ; # added 2021-12-25
   django_extensions = django-extensions; # added 2022-01-09
   django_redis = django-redis; # added 2021-10-11
@@ -72,6 +75,7 @@ mapAliases ({
   lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
   Markups = markups; # added 2022-02-14
   MechanicalSoup = mechanicalsoup; # added 2021-06-01
+  nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16
   pam = python-pam; # added 2020-09-07.
   PasteDeploy = pastedeploy; # added 2021-10-07
   powerlineMemSegment = powerline-mem-segment; # added 2021-10-08
@@ -87,6 +91,7 @@ mapAliases ({
   pytest_6 = pytest; # added 2022-02-10
   pytestcov = pytest-cov; # added 2021-01-04
   pytest-pep8 = pytestpep8; # added 2021-01-04
+  pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09
   pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
   pytestquickcheck = pytest-quickcheck; # added 2021-07-20
   pytestrunner = pytest-runner; # added 2021-01-04
@@ -118,6 +123,7 @@ mapAliases ({
   tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25
   tensorflow-build_2 = tensorflow-build; # added 2021-11-25
   tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25
+  tensorflow-tensorboard = tensorboard; # added 2022-03-06
   tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25
   tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05
   WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c224f5b635ca1..b908f68882906 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12,8 +12,6 @@
 , python
 }:
 
-with lib;
-
 self:
 
 let
@@ -40,12 +38,12 @@ let
       }
       else ff;
 
-  buildPythonPackage = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix {
+  buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix {
     inherit namePrefix;     # We want Python libraries to be named like e.g. "python3.6-${name}"
     inherit toPythonModule; # Libraries provide modules
   }));
 
-  buildPythonApplication = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix {
+  buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix {
     namePrefix = "";        # Python applications should not have any prefix
     toPythonModule = x: x;  # Application does not provide modules.
   }));
@@ -60,15 +58,14 @@ let
 
   # Get list of required Python modules given a list of derivations.
   requiredPythonModules = drvs: let
-    modules = filter hasPythonModule drvs;
-  in unique ([python] ++ modules ++ concatLists (catAttrs "requiredPythonModules" modules));
+    modules = lib.filter hasPythonModule drvs;
+  in lib.unique ([python] ++ modules ++ lib.concatLists (lib.catAttrs "requiredPythonModules" modules));
 
   # Create a PYTHONPATH from a list of derivations. This function recurses into the items to find derivations
   # providing Python modules.
   makePythonPath = drvs: lib.makeSearchPath python.sitePackages (requiredPythonModules drvs);
 
-  removePythonPrefix = name:
-    removePrefix namePrefix name;
+  removePythonPrefix = lib.removePrefix namePrefix;
 
   # Convert derivation to a Python module.
   toPythonModule = drv:
@@ -1238,8 +1235,6 @@ in {
 
   bitcoinlib = callPackage ../development/python-modules/bitcoinlib { };
 
-  bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { };
-
   bitcoin-utils-fork-minimal = callPackage ../development/python-modules/bitcoin-utils-fork-minimal { };
 
   bitcoinrpc = callPackage ../development/python-modules/bitcoinrpc { };
@@ -1891,7 +1886,7 @@ in {
   coveralls = callPackage ../development/python-modules/coveralls { };
 
   cppe = callPackage ../development/python-modules/cppe {
-    cppe = pkgs.cppe;
+    inherit (pkgs) cppe;
   };
 
   cppheaderparser = callPackage ../development/python-modules/cppheaderparser { };
@@ -2236,7 +2231,6 @@ in {
   django = self.django_3;
 
   # Current LTS
-  django_2 = callPackage ../development/python-modules/django/2.nix { };
   django_3 = callPackage ../development/python-modules/django/3.nix { };
 
   # Current latest
@@ -2246,7 +2240,7 @@ in {
 
   django-anymail = callPackage ../development/python-modules/django-anymail { };
 
-  django_appconf = callPackage ../development/python-modules/django_appconf { };
+  django-appconf = callPackage ../development/python-modules/django-appconf { };
 
   django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { };
 
@@ -2898,6 +2892,8 @@ in {
 
   findimports = callPackage ../development/python-modules/findimports { };
 
+  findpython = callPackage ../development/python-modules/findpython { };
+
   fingerprints = callPackage ../development/python-modules/fingerprints { };
 
   finitude = callPackage ../development/python-modules/finitude { };
@@ -3637,7 +3633,7 @@ in {
 
   gst-python = callPackage ../development/python-modules/gst-python {
     inherit (pkgs) meson;
-    gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;
+    inherit (pkgs.gst_all_1) gst-plugins-base;
   };
 
   gtfs-realtime-bindings = callPackage ../development/python-modules/gtfs-realtime-bindings { };
@@ -3727,6 +3723,8 @@ in {
 
   hatasmota = callPackage ../development/python-modules/hatasmota { };
 
+  hatchling = callPackage ../development/python-modules/hatchling { };
+
   haversine = callPackage ../development/python-modules/haversine { };
 
   hawkauthlib = callPackage ../development/python-modules/hawkauthlib { };
@@ -4655,7 +4653,7 @@ in {
   });
 
   libgpuarray = callPackage ../development/python-modules/libgpuarray {
-    clblas = pkgs.clblas.override { boost = self.boost; };
+    clblas = pkgs.clblas.override { inherit (self) boost; };
     cudaSupport = pkgs.config.cudaSupport or false;
   };
 
@@ -4669,7 +4667,7 @@ in {
     inherit (pkgs) lzfse;
   };
 
-  libmodulemd = pipe pkgs.libmodulemd [
+  libmodulemd = lib.pipe pkgs.libmodulemd [
     toPythonModule
     (p:
       p.overrideAttrs (super: {
@@ -4694,7 +4692,7 @@ in {
 
   libpyvivotek = callPackage ../development/python-modules/libpyvivotek { };
 
-  libpwquality = pipe pkgs.libpwquality [
+  libpwquality = lib.pipe pkgs.libpwquality [
     toPythonModule
     (p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; }; }))
     (p: p.override { enablePython = true; inherit python; })
@@ -4706,7 +4704,7 @@ in {
     inherit (self) python libxml2;
   });
 
-  librepo = pipe pkgs.librepo [
+  librepo = lib.pipe pkgs.librepo [
     toPythonModule
     (p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; }; }))
     (p: p.override { inherit python; })
@@ -4717,13 +4715,13 @@ in {
 
   librouteros = callPackage ../development/python-modules/librouteros { };
 
-  libsass = (callPackage ../development/python-modules/libsass {
+  libsass = callPackage ../development/python-modules/libsass {
     inherit (pkgs) libsass;
-  });
+  };
 
   libsavitar = callPackage ../development/python-modules/libsavitar { };
 
-  libselinux = pipe pkgs.libselinux [
+  libselinux = lib.pipe pkgs.libselinux [
     toPythonModule
     (p:
       p.overrideAttrs (super: {
@@ -5255,10 +5253,10 @@ in {
 
   monkeyhex = callPackage ../development/python-modules/monkeyhex { };
 
-  monosat = (pkgs.monosat.python {
+  monosat = pkgs.monosat.python {
     inherit buildPythonPackage;
     inherit (self) cython;
-  });
+  };
 
   monotonic = callPackage ../development/python-modules/monotonic { };
 
@@ -5440,8 +5438,6 @@ in {
 
   napari-svg = callPackage ../development/python-modules/napari-svg { };
 
-  nassl = callPackage ../development/python-modules/nassl { };
-
   nats-py = callPackage ../development/python-modules/nats-py { };
 
   nats-python = callPackage ../development/python-modules/nats-python { };
@@ -5539,7 +5535,8 @@ in {
   nghttp2 = (toPythonModule (pkgs.nghttp2.override {
     inherit (self) python cython setuptools;
     inherit (pkgs) ncurses;
-    enablePython = true;
+    enableApp = false; # build only libnghttp2 ...
+    enablePython = true; # ... and its Python bindings
   })).python;
 
   nibabel = callPackage ../development/python-modules/nibabel { };
@@ -5614,8 +5611,6 @@ in {
 
   nose-cov = callPackage ../development/python-modules/nose-cov { };
 
-  nose-cover3 = callPackage ../development/python-modules/nose-cover3 { };
-
   nose-cprof = callPackage ../development/python-modules/nose-cprof { };
 
   nose-exclude = callPackage ../development/python-modules/nose-exclude { };
@@ -5678,7 +5673,14 @@ in {
 
   num2words = callPackage ../development/python-modules/num2words { };
 
-  numba = callPackage ../development/python-modules/numba { };
+  numba = callPackage ../development/python-modules/numba {
+    cudaSupport = pkgs.config.cudaSupport or false;
+    cudatoolkit = tensorflow_compat_cudatoolkit;
+  };
+
+  numbaWithCuda = self.numba.override {
+    cudaSupport = true;
+  };
 
   numba-scipy = callPackage ../development/python-modules/numba-scipy { };
 
@@ -5784,7 +5786,7 @@ in {
   openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { };
 
   openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings {
-      openbabel = (callPackage ../development/libraries/openbabel { python = self.python; });
+      openbabel = callPackage ../development/libraries/openbabel { inherit (self) python; };
   };
 
   opencv3 = toPythonModule (pkgs.opencv3.override {
@@ -6381,6 +6383,10 @@ in {
 
   plexwebsocket = callPackage ../development/python-modules/plexwebsocket { };
 
+  plfit = toPythonModule (pkgs.plfit.override {
+    inherit (self) python;
+  });
+
   plone-testing = callPackage ../development/python-modules/plone-testing { };
 
   plotly = callPackage ../development/python-modules/plotly { };
@@ -6862,7 +6868,7 @@ in {
   pyctr = callPackage ../development/python-modules/pyctr { };
 
   pycuda = callPackage ../development/python-modules/pycuda {
-    cudatoolkit = pkgs.cudatoolkit;
+    inherit (pkgs) cudatoolkit;
     inherit (pkgs.stdenv) mkDerivation;
   };
 
@@ -7058,9 +7064,7 @@ in {
 
   pygetwindow = callPackage ../development/python-modules/pygetwindow { };
 
-  pygit2 = callPackage ../development/python-modules/pygit2 {
-    libgit2 = pkgs.libgit2_1_3_0;
-  };
+  pygit2 = callPackage ../development/python-modules/pygit2 { };
 
   PyGithub = callPackage ../development/python-modules/pyGithub { };
 
@@ -7979,8 +7983,6 @@ in {
 
   pytest-pylint = callPackage ../development/python-modules/pytest-pylint { };
 
-  pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { };
-
   pytest-qt = callPackage ../development/python-modules/pytest-qt { };
 
   pytest-quickcheck = callPackage ../development/python-modules/pytest-quickcheck { };
@@ -9407,12 +9409,12 @@ in {
   snuggs = callPackage ../development/python-modules/snuggs { };
 
   soapysdr = toPythonModule (pkgs.soapysdr.override {
-    python = self.python;
+    inherit (self) python;
     usePython = true;
   });
 
   soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override {
-    python = self.python;
+    inherit (self) python;
     usePython = true;
   });
 
@@ -9430,6 +9432,8 @@ in {
 
   sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { };
 
+  socksio = callPackage ../development/python-modules/socksio { };
+
   socksipy-branch = callPackage ../development/python-modules/socksipy-branch { };
 
   soco = callPackage ../development/python-modules/soco { };
@@ -9662,8 +9666,6 @@ in {
 
   sslib = callPackage ../development/python-modules/sslib { };
 
-  sslyze = callPackage ../development/python-modules/sslyze { };
-
   stack-data = callPackage ../development/python-modules/stack-data { };
 
   stanza = callPackage ../development/python-modules/stanza { };
@@ -9896,6 +9898,8 @@ in {
 
   tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit { };
 
+  tensorboard = callPackage ../development/python-modules/tensorboard { };
+
   tensorboardx = callPackage ../development/python-modules/tensorboardx { };
 
   tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix {
@@ -9928,8 +9932,6 @@ in {
 
   tensorflow = self.tensorflow-build;
 
-  tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { };
-
   tensorflowWithCuda = self.tensorflow.override {
     cudaSupport = true;
   };
@@ -10037,9 +10039,9 @@ in {
 
   thumborPexif = callPackage ../development/python-modules/thumborpexif { };
 
-  tkinter = let
+  tkinter = callPackage ../development/python-modules/tkinter {
     py = python.override { x11Support=true; };
-  in callPackage ../development/python-modules/tkinter { py = py; };
+  };
 
   tidylib = callPackage ../development/python-modules/pytidylib { };
 
@@ -10201,7 +10203,9 @@ in {
 
   trimesh = callPackage ../development/python-modules/trimesh { };
 
-  trio = callPackage ../development/python-modules/trio { };
+  trio = callPackage ../development/python-modules/trio {
+    inherit (pkgs) coreutils;
+  };
 
   trio-asyncio = callPackage ../development/python-modules/trio-asyncio { };
 
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index d90be7f3bb4c9..f341857222014 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -35,11 +35,12 @@ let
       name = "python-tested";
       meta.description = "Release-critical packages from the python package sets";
       constituents = [
-        jobs.remarshal.x86_64-linux                 # Used in pkgs.formats helper
-        jobs.python39Packages.colorama.x86_64-linux  # Used in nixos test-driver
-        jobs.python39Packages.ptpython.x86_64-linux  # Used in nixos test-driver
-        jobs.python39Packages.requests.x86_64-linux  # Almost ubiquous package
-        jobs.python39Packages.sphinx.x86_64-linux    # Document creation for many packages
+        jobs.remarshal.x86_64-linux                     # Used in pkgs.formats helper
+        jobs.python39Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert
+        jobs.python39Packages.colorama.x86_64-linux     # Used in nixos test-driver
+        jobs.python39Packages.ptpython.x86_64-linux     # Used in nixos test-driver
+        jobs.python39Packages.requests.x86_64-linux     # Almost ubiquous package
+        jobs.python39Packages.sphinx.x86_64-linux       # Document creation for many packages
       ];
     };
 
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 1945762c50dfd..422a7500516b3 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -152,7 +152,7 @@ let
       res self super;
     in res;
 
-  aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super);
+  aliases = self: super: lib.optionalAttrs config.allowAliases (import ./aliases.nix lib self super);
 
   # stdenvOverrides is used to avoid having multiple of versions
   # of certain dependencies that were used in bootstrapping the