Merge branch 'master' into emacs-team

199 files changed, 50834 insertions, 7897 deletions

diff --git a/.guix-authorizations b/.guix-authorizations
index ce6b79a6fe..bac49f71a9 100644
--- a/.guix-authorizations
+++ b/.guix-authorizations
@@ -37,6 +37,9 @@
   (;; primary: "2453 02B1 BAB1 F867 FDCA  96BC 8F3F 861F 82EB 7A9A"
    "CBC5 9C66 EC27 B971 7940  6B3E 6BE8 208A DF21 FE3F"
    (name "glv"))
+  (;; primary: "220F 98D9 5E86 204C 0036  DA7B 6DEC 4360 408B 4185"
+   "F4C2 D1DF 3FDE EA63 D1D3  0776 ACC6 6D09 CA52 8292"
+   (name "hako"))
   ("2219 43F4 9E9F 276F 9499  3382 BF28 6CB6 593E 5FFD"
    (name "hoebjo"))
   ("B943 509D 633E 80DD 27FC  4EED 634A 8DFF D3F6 31DF"
diff --git a/.mailmap b/.mailmap
index 9e0dc9c805..ee6dd3f4f2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -39,6 +39,7 @@ Joshua Grant <tadni@riseup.net> <gzg@riseup.net>
 Joshua Grant <tadni@riseup.net> <jgrant@parenthetical.io>
 Joshua Grant <tadni@riseup.net> <tadnimi@gmail.com>
 Joshua Grant <tadni@riseup.net> <youlysses@riseup.net>
+Juliana Sims <juli@incana.org> <jtsims@protonmail.com>
 Kei Kebreau <kkebreau@posteo.net>
 Leo Famulari <leo@famulari.name> <lfamular@gmail.com>
 Liliana Marie Prikler <liliana.prikler@gmail.com>
diff --git a/Makefile.am b/Makefile.am
index 5ffcb6a12d..922913355c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
 # Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 # Copyright © 2017 Leo Famulari <leo@famulari.name>
 # Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
-# Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2017, 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 # Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
 # Copyright © 2018 Nikita <nikita@n0.is>
 # Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
@@ -454,6 +454,7 @@ EXAMPLES =					\
   gnu/system/examples/desktop.tmpl		\
   gnu/system/examples/lightweight-desktop.tmpl	\
   gnu/system/examples/docker-image.tmpl		\
+  gnu/system/examples/plasma.tmpl		\
   gnu/system/examples/raspberry-pi-64.tmpl	\
   gnu/system/examples/raspberry-pi-64-nfs-root.tmpl	\
   gnu/system/examples/vm-image.tmpl
@@ -615,6 +616,7 @@ SH_TESTS =					\
   tests/guix-refresh.sh				\
   tests/guix-shell.sh				\
   tests/guix-shell-export-manifest.sh		\
+  tests/guix-time-machine.sh			\
   tests/guix-graph.sh				\
   tests/guix-describe.sh			\
   tests/guix-repl.sh     			\
@@ -696,8 +698,7 @@ EXTRA_DIST +=						\
   build-aux/compile-all.scm				\
   build-aux/compile-as-derivation.scm			\
   build-aux/config.rpath				\
-  build-aux/convert-xref.scm			\
-  build-aux/cuirass/hurd-manifest.scm			\
+  build-aux/convert-xref.scm				\
   build-aux/generate-authors.scm			\
   build-aux/test-driver.scm				\
   build-aux/update-NEWS.scm				\
@@ -707,6 +708,7 @@ EXTRA_DIST +=						\
   etc/guix-install.sh					\
   etc/historical-authorizations				\
   etc/news.scm						\
+  etc/hurd-manifest.scm					\
   etc/kernels-manifest.scm				\
   etc/release-manifest.scm				\
   etc/source-manifest.scm				\
@@ -774,15 +776,30 @@ endef
 # in <https://issues.guix.gnu.org/48963>.  Each 'eval' call below creates a
 # 'make-*-go' phony target that builds the corresponding subset.
 
-first_half :=								\
-  gnu/packages/a% gnu/packages/b% gnu/packages/c% gnu/packages/d%	\
-  gnu/packages/e% gnu/packages/f% gnu/packages/g% gnu/packages/h%	\
-  gnu/packages/i% gnu/packages/j% gnu/packages/k% gnu/packages/l%
+first_fifth :=								\
+  gnu/packages/a% gnu/packages/b% gnu/packages/c%
+
+second_fifth :=								\
+  gnu/packages/d% gnu/packages/e% gnu/packages/f%
+
+third_fifth :=								\
+  gnu/packages/g%  gnu/packages/h% gnu/packages/i%
+
+fourth_fifth :=								\
+  gnu/packages/j% gnu/packages/k% gnu/packages/l% gnu/packages/m% 	\
+  gnu/packages/n% gnu/packages/o%
 
 MODULES_CORE      := guix.scm $(filter-out guix/scripts/%,$(filter guix/%,$(MODULES)))
-MODULES_PACKAGES1 := $(filter $(first_half),$(MODULES))
-MODULES_PACKAGES2 := $(filter-out $(first_half),$(filter gnu/packages/%,$(MODULES)))
-MODULES_PACKAGES  := $(MODULES_PACKAGES1) $(MODULES_PACKAGES2)
+MODULES_PACKAGES1 := $(filter $(first_fifth),$(MODULES))
+MODULES_PACKAGES2 := $(filter $(second_fifth),$(MODULES))
+MODULES_PACKAGES3 := $(filter $(third_fifth),$(MODULES))
+MODULES_PACKAGES4 := $(filter $(fourth_fifth),$(MODULES))
+MODULES_PACKAGES5 := $(filter-out $(first_fifth) $(second_fifth)	\
+			$(third_fifth) $(fourth_fifth),			\
+			$(filter gnu/packages/%,$(MODULES)))
+MODULES_PACKAGES  := $(MODULES_PACKAGES1) $(MODULES_PACKAGES2)		\
+			$(MODULES_PACKAGES3) $(MODULES_PACKAGES4)	\
+			$(MODULES_PACKAGES5)
 MODULES_SYSTEM    := gnu.scm $(filter-out gnu/packages/%,$(filter gnu/%,$(MODULES)))
 MODULES_CLI       := $(filter guix/scripts/%,$(MODULES))
 MODULES_PO        := guix/build/po.scm
@@ -802,7 +819,27 @@ $(eval $(call guile-compilation-rule,make-packages2-go,	\
   $(words $(MODULES_CORE) $(MODULES_PACKAGES1))))
 .PHONY: make-packages2-go
 
-make-packages-go: make-packages1-go make-packages2-go
+$(eval $(call guile-compilation-rule,make-packages3-go,				\
+  $(MODULES_PACKAGES3) make-core-go make-packages1-go make-packages2-go,	\
+  $(words $(MODULES_CORE) $(MODULES_PACKAGES1) $(MODULES_PACKAGES2))))
+.PHONY: make-packages3-go
+
+$(eval $(call guile-compilation-rule,make-packages4-go,			\
+  $(MODULES_PACKAGES4) make-core-go make-packages1-go make-packages2-go	\
+    make-packages3-go,							\
+  $(words $(MODULES_CORE) $(MODULES_PACKAGES1) $(MODULES_PACKAGES2)	\
+    $(MODULES_PACKAGES3))))
+.PHONY: make-packages4-go
+
+$(eval $(call guile-compilation-rule,make-packages5-go,			\
+  $(MODULES_PACKAGES5) make-core-go make-packages1-go make-packages2-go	\
+    make-packages3-go make-packages4-go,				\
+  $(words $(MODULES_CORE) $(MODULES_PACKAGES1) $(MODULES_PACKAGES2)	\
+    $(MODULES_PACKAGES3) $(MODULES_PACKAGES4))))
+.PHONY: make-packages5-go
+
+make-packages-go: make-packages1-go make-packages2-go \
+  make-packages3-go make-packages4-go make-packages5-go
 .PHONY: make-packages-go
 
 $(eval $(call guile-compilation-rule,make-system-go,	\
diff --git a/doc/contributing.texi b/doc/contributing.texi
index 86fae497f1..69f0327afb 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -1589,10 +1589,21 @@ will automatically show up at
 @indicateurl{https://qa.guix.gnu.org/branch/@var{branch}}, with an
 indication of its build status on various platforms.
 
+@cindex feature branches, coordination
 To help coordinate the merging of branches, you must create a new
 guix-patches issue each time you wish to merge a branch (@pxref{The
-Issue Tracker}).  Normally branches will be merged in a ``first come,
-first merged'' manner, tracked through the guix-patches issues.
+Issue Tracker}).  The title of the issue requesting to merge a branch
+should have the following format:
+
+@cindex merge requests, template
+@example
+Request for merging "@var{name}" branch
+@end example
+
+The @url{https://qa.guix.gnu.org/, QA infrastructure} recognizes such
+issues and lists the merge requests on its main page.  Normally branches
+will be merged in a ``first come, first merged'' manner, tracked through
+the guix-patches issues.
 
 If you agree on a different order with those involved, you can track
 this by updating which issues block@footnote{You can mark an issue as
diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi
index 2e58c6c795..e90d611171 100644
--- a/doc/guix-cookbook.texi
+++ b/doc/guix-cookbook.texi
@@ -21,7 +21,7 @@ Copyright @copyright{} 2020 Brice Waegeneire@*
 Copyright @copyright{} 2020 André Batista@*
 Copyright @copyright{} 2020 Christine Lemmer-Webber@*
 Copyright @copyright{} 2021 Joshua Branson@*
-Copyright @copyright{} 2022 Maxim Cournoyer@*
+Copyright @copyright{} 2022, 2023 Maxim Cournoyer@*
 Copyright @copyright{} 2023 Ludovic Courtès
 
 Permission is granted to copy, distribute and/or modify this document
@@ -78,7 +78,7 @@ manual}).
 * Containers::                  Isolated environments and nested systems
 * Advanced package management::  Power to the users!
 * Environment management::      Control environment
-* Installing Guix on a Cluster:: High-performance computing.
+* Installing Guix on a Cluster::  High-performance computing.
 
 * Acknowledgments::             Thanks!
 * GNU Free Documentation License::  The license of this document.
@@ -87,36 +87,86 @@ manual}).
 @detailmenu
  --- The Detailed Node Listing ---
 
+Scheme tutorials
+
+* A Scheme Crash Course::
+
 Packaging
 
-* Packaging Tutorial::         A tutorial on how to add packages to Guix.
+* Packaging Tutorial::          A tutorial on how to add packages to Guix.
+
+Packaging Tutorial
+
+* A ``Hello World'' package::
+* Setup::
+* Extended example::
+* Other build systems::
+* Programmable and automated package definition::
+* Getting help::
+* Conclusion::
+* References::
+
+Setup
+
+* Local file::
+* Channels::
+* Direct checkout hacking::
+
+Programmable and automated package definition
+
+* Recursive importers::
+* Automatic update::
+* Inheritance::
 
 System Configuration
 
-* Auto-Login to a Specific TTY:: Automatically Login a User to a Specific TTY
-* Customizing the Kernel::       Creating and using a custom Linux kernel on Guix System.
-* Guix System Image API::        Customizing images to target specific platforms.
-* Using security keys::          How to use security keys with Guix System.
+* Auto-Login to a Specific TTY::  Automatically Login a User to a Specific TTY
+* Customizing the Kernel::      Creating and using a custom Linux kernel on Guix System.
+* Guix System Image API::       Customizing images to target specific platforms.
+* Using security keys::         How to use security keys with Guix System.
+* Dynamic DNS mcron job::       Job to update the IP address behind a DuckDNS host name.
 * Connecting to Wireguard VPN::  Connecting to a Wireguard VPN.
-* Customizing a Window Manager:: Handle customization of a Window manager on Guix System.
-* Running Guix on a Linode Server:: Running Guix on a Linode Server
-* Setting up a bind mount:: Setting up a bind mount in the file-systems definition.
-* Getting substitutes from Tor:: Configuring Guix daemon to get substitutes through Tor.
-* Setting up NGINX with Lua:: Configuring NGINX web-server to load Lua modules.
-* Music Server with Bluetooth Audio:: Headless music player with Bluetooth output.
+* Customizing a Window Manager::  Handle customization of a Window manager on Guix System.
+* Running Guix on a Linode Server::  Running Guix on a Linode Server.
+* Setting up a bind mount::     Setting up a bind mount in the file-systems definition.
+* Getting substitutes from Tor::  Configuring Guix daemon to get substitutes through Tor.
+* Setting up NGINX with Lua::   Configuring NGINX web-server to load Lua modules.
+* Music Server with Bluetooth Audio::  Headless music player with Bluetooth output.
+
+Customizing a Window Manager
+
+* StumpWM::
+* Session lock::
+
+Session lock
+
+* Xorg::
 
 Containers
 
-* Guix Containers::            Perfectly isolated environments
-* Guix System Containers::     A system inside your system
+* Guix Containers::             Perfectly isolated environments
+* Guix System Containers::      A system inside your system
+
+Guix System Containers
+
+* A Database Container::
+* Container Networking::
 
 Advanced package management
 
-* Guix Profiles in Practice::     Strategies for multiple profiles and manifests.
+* Guix Profiles in Practice::   Strategies for multiple profiles and manifests.
+
+Guix Profiles in Practice
+
+* Basic setup with manifests::
+* Required packages::
+* Default profile::
+* The benefits of manifests::
+* Reproducible profiles::
 
 Environment management
 
-* Guix environment via direnv:: Setup Guix environment with direnv
+* Guix environment via direnv::  Setup Guix environment with direnv
 
 Installing Guix on a Cluster
 
@@ -144,6 +194,10 @@ experienced programmer to use them!
 
 Let's get started!
 
+@menu
+* A Scheme Crash Course::
+@end menu
+
 @node A Scheme Crash Course
 @section A Scheme Crash Course
 
@@ -192,7 +246,8 @@ rest are the arguments passed to the function.  Every function returns the
 last evaluated expression as its return value.
 
 @item
-Anonymous functions are declared with the @code{lambda} term:
+Anonymous functions---@dfn{procedures} in Scheme parlance---are declared
+with the @code{lambda} term:
 
 @lisp
 (lambda (x) (* x x))
@@ -208,6 +263,9 @@ which can in turn be applied to an argument:
 @result{} 9
 @end lisp
 
+Procedures are regular values just like numbers, strings, Booleans, and
+so on.
+
 @item
 Anything can be assigned a global name with @code{define}:
 
@@ -234,6 +292,30 @@ A list structure can be created with the @code{list} procedure:
 @end lisp
 
 @item
+Standard procedures are provided by the @code{(srfi srfi-1)} module to
+create and process lists (@pxref{SRFI-1, list processing,, guile, GNU
+Guile Reference Manual}).  Here are some of the most useful ones in
+action:
+
+@lisp
+(use-modules (srfi srfi-1))  ;import list processing procedures
+
+(append (list 1 2) (list 3 4))
+@result{} (1 2 3 4)
+
+(map (lambda (x) (* x x)) (list 1 2 3 4))
+@result{} (1 4 9 16)
+
+(delete 3 (list 1 2 3 4))        @result{} (1 2 4)
+(filter odd? (list 1 2 3 4))     @result{} (1 3)
+(remove even? (list 1 2 3 4))    @result{} (1 3)
+(find number? (list "a" 42 "b")) @result{} 42
+@end lisp
+
+Notice how the first argument to @code{map}, @code{filter},
+@code{remove}, and @code{find} is a procedure!
+
+@item
 @cindex S-expression
 The @dfn{quote} disables evaluation of a parenthesized expression, also
 called an S-expression or ``s-exp'': the first term is not called over
@@ -280,6 +362,9 @@ they provide code to be executed during the package build process.  They
 look like this:
 
 @lisp
+(use-modules (guix gexp)           ;so we can write gexps
+             (gnu packages base))  ;for 'coreutils'
+
 ;; Below is a G-expression representing staged code.
 #~(begin
     ;; Invoke 'ls' from the package defined by the 'coreutils'
@@ -347,6 +432,9 @@ defines the module @code{guix build-system ruby} which must be located in
 @file{guix/build-system/ruby.scm} somewhere in the Guile load path.  It
 depends on the @code{(guix store)} module and it exports two variables,
 @code{ruby-build} and @code{ruby-build-system}.
+
+@xref{Package Modules,,, guix, GNU Guix Reference Manual}, for info on
+modules that define packages.
 @end itemize
 
 @quotation Going further
@@ -396,7 +484,7 @@ definitions in Guile Scheme, organizing them in package modules, and building
 them.
 
 @menu
-* Packaging Tutorial::         A tutorial on how to add packages to Guix.
+* Packaging Tutorial::          A tutorial on how to add packages to Guix.
 @end menu
 
 @node Packaging Tutorial
@@ -438,6 +526,17 @@ It does not assume much knowledge of the Guix system nor of the Lisp language.
 The reader is only expected to be familiar with the command line and to have some
 basic programming knowledge.
 
+@menu
+* A ``Hello World'' package::
+* Setup::
+* Extended example::
+* Other build systems::
+* Programmable and automated package definition::
+* Getting help::
+* Conclusion::
+* References::
+@end menu
+
 @node A ``Hello World'' package
 @subsection A ``Hello World'' package
 
@@ -643,6 +742,12 @@ easier for everyone to contribute to the project.
 
 But first, let's look at other possibilities.
 
+@menu
+* Local file::
+* Channels::
+* Direct checkout hacking::
+@end menu
+
 @node Local file
 @subsubsection Local file
 
@@ -1293,6 +1398,12 @@ empowers us in ways that reach far beyond traditional package management.
 
 Let's illustrate this with some awesome features of Guix!
 
+@menu
+* Recursive importers::
+* Automatic update::
+* Inheritance::
+@end menu
+
 @node Recursive importers
 @subsubsection Recursive importers
 
@@ -1456,17 +1567,18 @@ chapter is to demonstrate some advanced configuration concepts.
 reference.
 
 @menu
-* Auto-Login to a Specific TTY:: Automatically Login a User to a Specific TTY
-* Customizing the Kernel::       Creating and using a custom Linux kernel on Guix System.
-* Guix System Image API::        Customizing images to target specific platforms.
-* Using security keys::          How to use security keys with Guix System.
+* Auto-Login to a Specific TTY::  Automatically Login a User to a Specific TTY
+* Customizing the Kernel::      Creating and using a custom Linux kernel on Guix System.
+* Guix System Image API::       Customizing images to target specific platforms.
+* Using security keys::         How to use security keys with Guix System.
+* Dynamic DNS mcron job::       Job to update the IP address behind a DuckDNS host name.
 * Connecting to Wireguard VPN::  Connecting to a Wireguard VPN.
-* Customizing a Window Manager:: Handle customization of a Window manager on Guix System.
-* Running Guix on a Linode Server:: Running Guix on a Linode Server
-* Setting up a bind mount:: Setting up a bind mount in the file-systems definition.
-* Getting substitutes from Tor:: Configuring Guix daemon to get substitutes through Tor.
-* Setting up NGINX with Lua:: Configuring NGINX web-server to load Lua modules.
-* Music Server with Bluetooth Audio:: Headless music player with Bluetooth output.
+* Customizing a Window Manager::  Handle customization of a Window manager on Guix System.
+* Running Guix on a Linode Server::  Running Guix on a Linode Server.
+* Setting up a bind mount::     Setting up a bind mount in the file-systems definition.
+* Getting substitutes from Tor::  Configuring Guix daemon to get substitutes through Tor.
+* Setting up NGINX with Lua::   Configuring NGINX web-server to load Lua modules.
+* Music Server with Bluetooth Audio::  Headless music player with Bluetooth output.
 @end menu
 
 @node Auto-Login to a Specific TTY
@@ -1907,17 +2019,23 @@ One can run:
 mathieu@@cervin:~$ guix system --list-image-types
 The available image types are:
 
+   - unmatched-raw
+   - rock64-raw
    - pinebook-pro-raw
    - pine64-raw
    - novena-raw
    - hurd-raw
    - hurd-qcow2
    - qcow2
+   - iso9660
    - uncompressed-iso9660
+   - tarball
    - efi-raw
-   - arm64-raw
-   - arm32-raw
-   - iso9660
+   - mbr-raw
+   - docker
+   - wsl2
+   - raw-with-offset
+   - efi32-raw
 @end example
 
 and by writing an @code{operating-system} file based on
@@ -2022,6 +2140,77 @@ security key'' menu.  If it works, congratulations, your security key is
 ready to be used with applications supporting two-factor authentication
 (2FA).
 
+@subsection Disabling OTP code generation for a Yubikey
+@cindex disabling yubikey OTP
+If you use a Yubikey security key and are irritated by the spurious OTP
+codes it generates when inadvertently touching the key (e.g. causing you
+to become a spammer in the @samp{#guix} channel when discussing from
+your favorite IRC client!), you can disable it via the following
+@command{ykman} command:
+
+@example
+guix shell python-yubikey-manager -- ykman config usb --force --disable OTP
+@end example
+
+Alternatively, you could use the @command{ykman-gui} command provided by
+the @code{yubikey-manager-qt} package and either wholly disable the
+@samp{OTP} application for the USB interface or, from the
+@samp{Applications -> OTP} view, delete the slot 1 configuration, which
+comes pre-configured with the Yubico OTP application.
+
+@node Dynamic DNS mcron job
+@section Dynamic DNS mcron job
+
+@cindex dynamic DNS, DDNS
+If your @acronym{ISP, Internet Service Provider} only provides dynamic
+IP addresses, it can be useful to setup a dynamic @acronym{DNS, Domain
+Name System} (also known as @acronym{DDNS, Dynamic DNS}) service to
+associate a static host name to a public but dynamic (often changing) IP
+address.  There are multiple existing services that can be used for
+this; in the following mcron job, @url{https://duckdns.org, DuckDNS} is
+used.  It should also work with other dynamic DNS services that offer a
+similar interface to update the IP address, such as
+@url{https://freedns.afraid.org/}, with minor adjustments.
+
+The mcron job is provided below, where @var{DOMAIN} should be
+substituted for your own domain prefix, and the DuckDNS provided token
+associated to @var{DOMAIN} added to the
+@file{/etc/duckdns/@var{DOMAIN}.token} file.
+
+@lisp
+(define duckdns-job
+  ;; Update personal domain IP every 5 minutes.
+  #~(job '(next-minute (range 0 60 5))
+	 #$(program-file
+            "duckdns-update"
+            (with-extensions (list guile-gnutls) ;required by (web client)
+              #~(begin
+                  (use-modules (ice-9 textual-ports)
+                               (web client))
+                  (let ((token (string-trim-both
+                                (call-with-input-file "/etc/duckdns/@var{DOMAIN}.token"
+                                  get-string-all)))
+                        (query-template (string-append "https://www.duckdns.org/"
+                                                       "update?domains=@var{DOMAIN}"
+                                                       "&token=~a&ip=")))
+                    (http-get (format #f query-template token))))))
+         "duckdns-update"
+         #:user "nobody"))
+@end lisp
+
+The job then needs to be added to the list of mcron jobs for your
+system, using something like:
+
+@lisp
+(operating-system
+ (services
+  (cons* (service mcron-service-type
+           (mcron-configuration
+             (jobs (list duckdns-job ...))))
+         ...
+         %base-services)))
+@end lisp
+
 @node Connecting to Wireguard VPN
 @section Connecting to Wireguard VPN
 
@@ -2103,6 +2292,11 @@ this post by thaller}.
 @section Customizing a Window Manager
 @cindex wm
 
+@menu
+* StumpWM::
+* Session lock::
+@end menu
+
 @node StumpWM
 @subsection StumpWM
 @cindex stumpwm
@@ -2158,6 +2352,10 @@ or it might be something you have to set up yourself. If you use a desktop envir
 like GNOME or KDE, it's usually built in. If you use a plain window manager like
 StumpWM or EXWM, you might have to set it up yourself.
 
+@menu
+* Xorg::
+@end menu
+
 @node Xorg
 @subsubsection Xorg
 
@@ -2821,8 +3019,8 @@ from foreign libraries or configuration files that are available
 system-wide.
 
 @menu
-* Guix Containers::            Perfectly isolated environments
-* Guix System Containers::     A system inside your system
+* Guix Containers::             Perfectly isolated environments
+* Guix System Containers::      A system inside your system
 @end menu
 
 @node Guix Containers
@@ -3006,6 +3204,11 @@ caches or log files, etc.  In Guix System the demands of this kind of
 software are satisfied through the deployment of system services.
 
 
+@menu
+* A Database Container::
+* Container Networking::
+@end menu
+
 @node A Database Container
 @subsection A Database Container
 
@@ -3208,7 +3411,7 @@ concepts.
 reference.
 
 @menu
-* Guix Profiles in Practice::     Strategies for multiple profiles and manifests.
+* Guix Profiles in Practice::   Strategies for multiple profiles and manifests.
 @end menu
 
 @node Guix Profiles in Practice
@@ -3287,6 +3490,14 @@ Games.
 
 Let's dive in the set up!
 
+@menu
+* Basic setup with manifests::
+* Required packages::
+* Default profile::
+* The benefits of manifests::
+* Reproducible profiles::
+@end menu
+
 @node Basic setup with manifests
 @subsection Basic setup with manifests
 
@@ -3601,7 +3812,7 @@ Guix provides multiple tools to manage environment.  This chapter
 demonstrate such utilities.
 
 @menu
-* Guix environment via direnv:: Setup Guix environment with direnv
+* Guix environment via direnv::  Setup Guix environment with direnv
 @end menu
 
 @node Guix environment via direnv
diff --git a/doc/guix.texi b/doc/guix.texi
index 409ca2ad62..6105195bd9 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -96,7 +96,7 @@ Copyright @copyright{} 2021 Domagoj Stolfa@*
 Copyright @copyright{} 2021 Hui Lu@*
 Copyright @copyright{} 2021 pukkamustard@*
 Copyright @copyright{} 2021 Alice Brenon@*
-Copyright @copyright{} 2021, 2022 Josselin Poiret@*
+Copyright @copyright{} 2021-2023 Josselin Poiret@*
 Copyright @copyright{} 2021, 2023 muradm@*
 Copyright @copyright{} 2021, 2022 Andrew Tropin@*
 Copyright @copyright{} 2021 Sarah Morgensen@*
@@ -116,7 +116,9 @@ Copyright @copyright{} 2022 Antero Mejr@*
 Copyright @copyright{} 2023 Karl Hallsby@*
 Copyright @copyright{} 2023 Nathaniel Nicandro@*
 Copyright @copyright{} 2023 Tanguy Le Carrour@*
+Copyright @copyright{} 2023 Zheng Junjie@*
 Copyright @copyright{} 2023 Brian Cully@*
+Copyright @copyright{} 2023 Felix Lechner@*
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -448,6 +450,8 @@ Home Services
 * Mail: Mail Home Services.     Services for managing mail.
 * Messaging: Messaging Home Services.  Services for managing messaging.
 * Media: Media Home Services.   Services for managing media.
+* Networking: Networking Home Services.  Networking services.
+* Miscellaneous: Miscellaneous Home Services.  More services.
 
 Platforms
 
@@ -1403,7 +1407,7 @@ The system types the remote machine supports---e.g., @code{(list
 "x86_64-linux" "i686-linux")}.
 
 @item user
-The user account to use when connecting to the remote machine over SSH.
+The user account on the remote machine to use when connecting over SSH.
 Note that the SSH key pair must @emph{not} be passphrase-protected, to
 allow non-interactive logins.
 
@@ -1497,6 +1501,11 @@ archives of files from the store (@pxref{Invoking guix archive}):
 # guix archive --generate-key
 @end example
 
+@quotation Note
+This key pair is not related to the SSH key pair that was previously
+mentioned in the description of the @code{build-machine} data type.
+@end quotation
+
 @noindent
 Each build machine must authorize the key of the master machine so that
 it accepts store items it receives from the master:
@@ -4801,9 +4810,11 @@ Specifically, @command{guix pull} downloads code from the @dfn{channels}
 @item
 the @option{--channels} option;
 @item
-the user's @file{~/.config/guix/channels.scm} file;
+the user's @file{~/.config/guix/channels.scm} file, unless @option{-q}
+is passed;
 @item
-the system-wide @file{/etc/guix/channels.scm} file;
+the system-wide @file{/etc/guix/channels.scm} file, unless @option{-q}
+is passed;
 @item
 the built-in default channels specified in the @code{%default-channels}
 variable.
@@ -4905,6 +4916,11 @@ Read the list of channels from @var{file} instead of
 evaluates to a list of channel objects.  @xref{Channels}, for more
 information.
 
+@item --no-channel-files
+@itemx -q
+Inhibit loading of the user and system channel files,
+@file{~/.config/guix/channels.scm} and @file{/etc/guix/channels.scm}.
+
 @cindex channel news
 @item --news
 @itemx -N
@@ -5050,7 +5066,9 @@ guix time-machine --commit=v1.2.0 -- \
   environment -C --ad-hoc guile -- guile
 @end example
 
-The command above fetches Guix@tie{}1.2.0 and runs its @command{guix
+The command above fetches Guix@tie{}1.2.0 (and possibly other channels
+specified by your @file{channels.scm} configuration files---see
+below) and runs its @command{guix
 environment} command to spawn an environment in a container running
 @command{guile} (@command{guix environment} has since been subsumed by
 @command{guix shell}; @pxref{Invoking guix shell}).  It's like driving a
@@ -5060,6 +5078,21 @@ invocation can be expensive: it may have to download or even build a
 large number of packages; the result is cached though and subsequent
 commands targeting the same commit are almost instantaneous.
 
+As for @command{guix pull}, in the absence of any options,
+@command{time-machine} fetches the latest commits of the channels
+specified in @file{~/.config/guix/channels.scm},
+@file{/etc/guix/channels.scm}, or the default channels; the @option{-q}
+option lets you ignore these configuration files.  The command:
+
+@example
+guix time-machine -q -- build hello
+@end example
+
+will thus build the package @code{hello} as defined in the main branch
+of Guix, without any additional channel, which is in general a newer
+revision of Guix than you have installed.  Time travel works in both
+directions!
+
 @quotation Note
 The history of Guix is immutable and @command{guix time-machine}
 provides the exact same software as they are in a specific Guix
@@ -5069,6 +5102,23 @@ opens the door to security vulnerabilities.  @xref{Invoking guix pull,
 @option{--allow-downgrades}}.
 @end quotation
 
+Due to @command{guix time-machine} relying on the ``inferiors''
+mechanism (@pxref{Inferiors}), the oldest commit it can travel to is
+commit @samp{6298c3ff} (``v1.0.0''), dated May 1@sup{st}, 2019, which is
+the first release that included the inferiors mechanism.  An error is
+returned when attempting to navigate to older commits.
+
+@quotation Note
+Although it should technically be possible to travel to such an old
+commit, the ease to do so will largely depend on the availability of
+binary substitutes.  When traveling to a distant past, some packages may
+not easily build from source anymore.  One such example are old versions
+of Python 2 which had time bombs in its test suite, in the form of
+expiring SSL certificates.  This particular problem can be worked around
+by setting the hardware clock to a value in the past before attempting
+the build.
+@end quotation
+
 The general syntax is:
 
 @example
@@ -5092,18 +5142,21 @@ string or the name of a tag), or @var{branch}.
 Read the list of channels from @var{file}.  @var{file} must contain
 Scheme code that evaluates to a list of channel objects.
 @xref{Channels} for more information.
-@end table
 
-As for @command{guix pull}, the absence of any options means that the
-latest commit on the master branch will be used.  The command
+@item --no-channel-files
+@itemx -q
+Inhibit loading of the user and system channel files,
+@file{~/.config/guix/channels.scm} and @file{/etc/guix/channels.scm}.
+
+Thus, @command{guix time-machine -q} is equivalent to the following Bash
+command, using the ``process substitution'' syntax (@pxref{Process
+Substitution,,, bash, The GNU Bash Reference Manual}):
 
 @example
-guix time-machine -- build hello
+guix time-machine -C <(echo %default-channels) @dots{}
 @end example
 
-will thus build the package @code{hello} as defined in the master branch,
-which is in general a newer revision of Guix than you have installed.
-Time travel works in both directions!
+@end table
 
 Note that @command{guix time-machine} can trigger builds of channels and
 their dependencies, and these are controlled by the standard build
@@ -6218,6 +6271,14 @@ building or downloading any missing package, and runs the
 guix shell python python-numpy -- python3
 @end example
 
+Note that it is necessary to include the main @code{python} package in
+this command even if it is already installed into your environment.
+This is so that the shell environment knows to set @env{PYTHONPATH} and
+other related variables.  The shell environment cannot check the
+previously installed environment, because then it would be
+non-deterministic.  This is true for most libraries: their corresponding
+language package should be included in the shell invocation.
+
 @quotation Note
 @cindex shebang, for @command{guix shell}
 @command{guix shell} can be also be used as a script interpreter, also
@@ -14529,6 +14590,26 @@ gnu/packages/guile.scm:147:2: guile: updating from version 2.0.10 to version 2.0
 @dots{}
 @end example
 
+In some specific cases, you may have many packages specified via a
+manifest or a module selection which should all be updated together; for
+these cases, the @option{--target-version} option can be provided to have
+them all refreshed to the same version, as shown in the examples below:
+
+@example
+$ guix refresh qtbase qtdeclarative --target-version=6.5.2
+gnu/packages/qt.scm:1248:13: qtdeclarative would be upgraded from 6.3.2 to 6.5.2
+gnu/packages/qt.scm:584:2: qtbase would be upgraded from 6.3.2 to 6.5.2
+@end example
+
+@example
+$ guix refresh --manifest=qt5-manifest.scm --target-version=5.15.10
+gnu/packages/qt.scm:1173:13: qtxmlpatterns would be upgraded from 5.15.8 to 5.15.10
+gnu/packages/qt.scm:1202:13: qtdeclarative would be upgraded from 5.15.8 to 5.15.10
+gnu/packages/qt.scm:1762:13: qtserialbus would be upgraded from 5.15.8 to 5.15.10
+gnu/packages/qt.scm:2070:13: qtquickcontrols2 would be upgraded from 5.15.8 to 5.15.10
+@dots{}
+@end example
+
 Sometimes the upstream name differs from the package name used in Guix,
 and @command{guix refresh} needs a little help.  Most updaters honor the
 @code{upstream-name} property in package definitions, which can be used
@@ -16924,6 +17005,13 @@ Alternatively, the @code{modify-services} macro can be used:
   (delete avahi-service-type))
 @end lisp
 
+@quotation Do not panic
+@cindex Scheme programming language, getting started
+Intimidated by the Scheme language or curious about it?  The Cookbook
+has a short section to get started that explains the fundamentals, which
+you will find helpful when hacking your configuration.  @xref{A Scheme
+Crash Course,,, guix-cookbook, GNU Guix Cookbook}.
+@end quotation
 
 @unnumberedsubsec Instantiating the System
 
@@ -17969,6 +18057,10 @@ administrator's choice; reconfiguring does @emph{not} change their name.
 @item @code{home-directory}
 This is the name of the home directory for the account.
 
+@item @code{home-directory-permissions} (default: @code{#o700})
+The permission bits for the home directory.  By default, full access is
+granted to the user account and all other access is denied.
+
 @item @code{create-home-directory?} (default: @code{#t})
 Indicates whether the home directory of this account should be created
 if it does not exist yet.
@@ -21230,6 +21322,8 @@ client.
 @end table
 @end deftp
 
+@cindex Syncthing, file synchronization service
+@cindex backup service, Syncthing
 The @code{(gnu services syncthing)} module provides the following services:
 @cindex syncthing
 
@@ -21247,7 +21341,14 @@ syncthing} daemon, The value for this service type is a
          (syncthing-configuration (user "alice")))
 @end lisp
 
+@quotation Note
+This service is also available for Guix Home, where it runs directly
+with your user privileges (@pxref{Networking Home Services,
+@code{home-syncthing-service-type}}).
+@end quotation
+
 See below for details about @code{syncthing-configuration}.
+@end defvar
 
 @deftp {Data Type} syncthing-configuration
 Data type representing the configuration for @code{syncthing-service-type}.
@@ -21277,7 +21378,6 @@ directory is @file{$HOME} of the specified Syncthing @code{user}.
 
 @end table
 @end deftp
-@end defvar
 
 Furthermore, @code{(gnu services ssh)} provides the following services.
 @cindex SSH
@@ -23726,6 +23826,23 @@ The GNOME package to use.
 @end table
 @end deftp
 
+@defvar plasma-desktop-service-type
+This is the type of the service that adds the @uref{https://kde.org/plasma-desktop/,
+Plasma} desktop environment.  Its value is a @code{plasma-desktop-configuration}
+object (see below).
+
+This service adds the @code{plasma} package to the system profile.
+@end defvar
+
+@deftp {Data Type} plasma-desktop-configuration
+Configuration record for the Plasma desktop environment.
+
+@table @asis
+@item @code{plasma} (default: @code{plasma})
+The Plasma package to use.
+@end table
+@end deftp
+
 @defvar xfce-desktop-service-type
 This is the type of a service to run the @uref{Xfce, https://xfce.org/}
 desktop environment.  Its value is an @code{xfce-desktop-configuration} object
@@ -24994,12 +25111,11 @@ String or G-exp denoting an mcron schedule for the periodic
 @command{updatedb} job (@pxref{Guile Syntax,,, mcron, GNU@tie{}mcron}).
 
 @item @code{excluded-directories} (default @code{%default-file-database-excluded-directories})
-List of directories to ignore when building the file database.  By
-default, this includes @file{/tmp} and @file{/gnu/store}, which should
-instead be indexed by @command{guix locate} (@pxref{Invoking guix
-locate}).  This list is passed to the @option{--prunepaths} option of
-@command{updatedb} (@pxref{Invoking updatedb,,, find,
-GNU@tie{}Findutils}).
+List of regular expressions of directories to ignore when building the
+file database.  By default, this includes @file{/tmp} and @file{/gnu/store};
+the latter should instead be indexed by @command{guix locate} (@pxref{Invoking
+guix locate}).  This list is passed to the @option{--prunepaths} option of
+@command{updatedb} (@pxref{Invoking updatedb,,, find, GNU@tie{}Findutils}).
 @end table
 @end deftp
 
@@ -25151,6 +25267,20 @@ There is no need to add this field for contrib extensions such as hstore or
 dblink as they are already loadable by postgresql.  This field is only
 required to add extensions provided by other packages.
 
+@item @code{create-account?} (default: @code{#t})
+Whether or not the @code{postgres} user and group should be created.
+
+@item @code{uid} (default: @code{#f})
+Explicitly specify the UID of the @code{postgres} daemon account.
+You normally do not need to specify this, in which case a free UID will
+be automatically assigned.
+
+One situation where this option might be useful is if the @var{data-directory}
+is located on a mounted network share.
+
+@item @code{gid} (default: @code{#f})
+Explicitly specify the GID of the @code{postgres} group.
+
 @end table
 @end deftp
 
@@ -32521,113 +32651,6 @@ network or obtained a DHCP lease from dnsmasq.
 @end table
 @end deftp
 
-@subsubheading ddclient Service
-
-@cindex ddclient
-The ddclient service described below runs the ddclient daemon, which takes
-care of automatically updating DNS entries for service providers such as
-@uref{https://dyn.com/dns/, Dyn}.
-
-The following example show instantiates the service with its default
-configuration:
-
-@lisp
-(service ddclient-service-type)
-@end lisp
-
-Note that ddclient needs to access credentials that are stored in a
-@dfn{secret file}, by default @file{/etc/ddclient/secrets} (see
-@code{secret-file} below).  You are expected to create this file manually, in
-an ``out-of-band'' fashion (you @emph{could} make this file part of the
-service configuration, for instance by using @code{plain-file}, but it will be
-world-readable @i{via} @file{/gnu/store}).  See the examples in the
-@file{share/ddclient} directory of the @code{ddclient} package.
-
-@c %start of fragment
-
-Available @code{ddclient-configuration} fields are:
-
-@deftypevr {@code{ddclient-configuration} parameter} package ddclient
-The ddclient package.
-
-@end deftypevr
-
-@deftypevr {@code{ddclient-configuration} parameter} integer daemon
-The period after which ddclient will retry to check IP and domain name.
-
-Defaults to @samp{300}.
-
-@end deftypevr
-
-@deftypevr {@code{ddclient-configuration} parameter} boolean syslog
-Use syslog for the output.
-
-Defaults to @samp{#t}.
-
-@end deftypevr
-
-@deftypevr {@code{ddclient-configuration} parameter} string mail
-Mail to user.
-
-Defaults to @samp{"root"}.
-
-@end deftypevr
-
-@deftypevr {@code{ddclient-configuration} parameter} string mail-failure
-Mail failed update to user.
-
-Defaults to @samp{"root"}.
-
-@end deftypevr
-
-@deftypevr {@code{ddclient-configuration} parameter} string pid
-The ddclient PID file.
-
-Defaults to @samp{"/var/run/ddclient/ddclient.pid"}.
-
-@end deftypevr
-
-@deftypevr {@code{ddclient-configuration} parameter} boolean ssl
-Enable SSL support.
-
-Defaults to @samp{#t}.
-
-@end deftypevr
-
-@deftypevr {@code{ddclient-configuration} parameter} string user
-Specifies the user name or ID that is used when running ddclient
-program.
-
-Defaults to @samp{"ddclient"}.
-
-@end deftypevr
-
-@deftypevr {@code{ddclient-configuration} parameter} string group
-Group of the user who will run the ddclient program.
-
-Defaults to @samp{"ddclient"}.
-
-@end deftypevr
-
-@deftypevr {@code{ddclient-configuration} parameter} string secret-file
-Secret file which will be appended to @file{ddclient.conf} file.  This
-file contains credentials for use by ddclient.  You are expected to
-create it manually.
-
-Defaults to @samp{"/etc/ddclient/secrets.conf"}.
-
-@end deftypevr
-
-@deftypevr {@code{ddclient-configuration} parameter} list extra-options
-Extra options will be appended to @file{ddclient.conf} file.
-
-Defaults to @samp{'()}.
-
-@end deftypevr
-
-
-@c %end of fragment
-
 @node VNC Services
 @subsection VNC Services
 @cindex VNC (virtual network computing)
@@ -33088,7 +33111,7 @@ IP address that no longer correspond to their freshly resolved host
 name.  Set this to @code{#t} if one or more endpoints use host names
 provided by a dynamic DNS service to keep the sessions alive.
 
-@item @code{monitor-ips-internal} (default: @code{'(next-minute (range 0 60 5))})
+@item @code{monitor-ips-interval} (default: @code{'(next-minute (range 0 60 5))})
 The time interval at which the IP monitoring job should run, provided as
 an mcron time specification (@pxref{Guile Syntax,,,mcron}).
 
@@ -38632,6 +38655,94 @@ parameters, can be done as follow:
 @end lisp
 @end defvar
 
+@subsubheading Cachefilesd Service
+
+@cindex cachefilesd
+@cindex fscache, file system caching (Linux)
+The Cachefilesd service starts a daemon that caches network file system
+data locally.  It is especially useful for NFS and AFS shares, where it
+reduces latencies for repeated access when reading files.
+
+The daemon can be configured as follows:
+
+@lisp
+(service cachefilesd-service-type
+         (cachefilesd-configuration
+           (cache-directory "/var/cache/fscache")))
+@end lisp
+
+@defvar cachefilesd-service-type
+The service type for starting @command{cachefilesd}.  The value for this
+service type is a @code{cachefilesd-configuration}, whose only required
+field is @var{cache-directory}.
+
+@end defvar
+
+@c %start of fragment
+@deftp {Data Type} cachefilesd-configuration
+Available @code{cachefilesd-configuration} fields are:
+
+@table @asis
+@item @code{cachefilesd} (default: @code{cachefilesd}) (type: file-like)
+The cachefilesd package to use.
+
+@item @code{debug-output?} (default: @code{#f}) (type: boolean)
+Print debugging output to stderr.
+
+@item @code{use-syslog?} (default: @code{#t}) (type: boolean)
+Log to syslog facility instead of stdout.
+
+@item @code{scan?} (default: @code{#t}) (type: boolean)
+Scan for cachable objects.
+
+@item @code{cache-directory} (type: maybe-string)
+Location of the cache directory.
+
+@item @code{cache-name} (default: @code{"CacheFiles"}) (type: maybe-string)
+Name of cache (keep unique).
+
+@item @code{security-context} (type: maybe-string)
+SELinux security context.
+
+@item @code{pause-culling-for-block-percentage} (default: @code{7}) (type: maybe-non-negative-integer)
+Pause culling when available blocks exceed this percentage.
+
+@item @code{pause-culling-for-file-percentage} (default: @code{7}) (type: maybe-non-negative-integer)
+Pause culling when available files exceed this percentage.
+
+@item @code{resume-culling-for-block-percentage} (default: @code{5}) (type: maybe-non-negative-integer)
+Start culling when available blocks drop below this percentage.
+
+@item @code{resume-culling-for-file-percentage} (default: @code{5}) (type: maybe-non-negative-integer)
+Start culling when available files drop below this percentage.
+
+@item @code{pause-caching-for-block-percentage} (default: @code{1}) (type: maybe-non-negative-integer)
+Pause further allocations when available blocks drop below this
+percentage.
+
+@item @code{pause-caching-for-file-percentage} (default: @code{1}) (type: maybe-non-negative-integer)
+Pause further allocations when available files drop below this
+percentage.
+
+@item @code{log2-table-size} (default: @code{12}) (type: maybe-non-negative-integer)
+Size of tables holding cullable objects in logarithm of base 2.
+
+@item @code{cull?} (default: @code{#t}) (type: boolean)
+Create free space by culling (consumes system load).
+
+@item @code{trace-function-entry-in-kernel-module?} (default: @code{#f}) (type: boolean)
+Trace function entry in the kernel module (for debugging).
+
+@item @code{trace-function-exit-in-kernel-module?} (default: @code{#f}) (type: boolean)
+Trace function exit in the kernel module (for debugging).
+
+@item @code{trace-internal-checkpoints-in-kernel-module?} (default: @code{#f}) (type: boolean)
+Trace internal checkpoints in the kernel module (for debugging).
+
+@end table
+@end deftp
+@c %end of fragment
+
 @cindex rasdaemon
 @cindex Platform Reliability, Availability and Serviceability daemon
 @subsubheading Rasdaemon Service
@@ -38997,6 +39108,12 @@ implementation of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual}).
 You can add @command{open localhost} to your @file{~/.dico} file to make
 @code{localhost} the default server for @command{dico} client
 (@pxref{Initialization File,,, dico, GNU Dico Manual}).
+
+@quotation Note
+This service is also available for Guix Home, where it runs directly
+with your user privileges (@pxref{Miscellaneous Home Services,
+@code{home-dicod-service-type}}).
+@end quotation
 @end defvar
 
 @deftp {Data Type} dicod-configuration
@@ -40779,7 +40896,7 @@ QEMU monitor and the VM.
 @cindex image, creating disk images
 The @code{image} command can produce various image types.  The image
 type can be selected using the @option{--image-type} option.  It
-defaults to @code{efi-raw}.  When its value is @code{iso9660}, the
+defaults to @code{mbr-raw}.  When its value is @code{iso9660}, the
 @option{--label} option can be used to specify a volume ID with
 @code{image}.  By default, the root file system of a disk image is
 mounted non-volatile; the @option{--volatile} option can be provided to
@@ -40798,7 +40915,7 @@ qemu-system-x86_64 -enable-kvm -hda /tmp/my-image.qcow2 -m 1000 \
                    -bios $(guix build ovmf)/share/firmware/ovmf_x64.bin
 @end example
 
-When using the @code{efi-raw} image type, a raw disk image is produced;
+When using the @code{mbr-raw} image type, a raw disk image is produced;
 it can be copied as is to a USB stick, for instance.  Assuming
 @code{/dev/sdc} is the device corresponding to a USB stick, one can copy
 the image to it using the following command:
@@ -40936,7 +41053,7 @@ of the image.
 For the @code{image} action, create an image with given @var{type}.
 
 When this option is omitted, @command{guix system} uses the
-@code{efi-raw} image type.
+@code{mbr-raw} image type.
 
 @cindex ISO-9660 format
 @cindex CD image format
@@ -42887,15 +43004,17 @@ services)}.
 * Mail: Mail Home Services.     Services for managing mail.
 * Messaging: Messaging Home Services.  Services for managing messaging.
 * Media: Media Home Services.   Services for managing media.
+* Networking: Networking Home Services.  Networking services.
+* Miscellaneous: Miscellaneous Home Services.  More services.
 @end menu
 @c In addition to that Home Services can provide
 
 @node Essential Home Services
 @subsection Essential Home Services
 There are a few essential home services defined in
-@code{(gnu services)}, they are mostly for internal use and are required
-to build a home environment, but some of them will be useful for the end
-user.
+@code{(gnu home services)}, they are mostly for internal use and are
+required to build a home environment, but some of them will be useful
+for the end user.
 
 @cindex environment variables
 
@@ -44160,8 +44279,8 @@ font installation path (@file{~/.guix-home/profile/share/fonts}).  If
 you configure this service directly, be sure to include the above
 directory.
 
-A typical extension for adding an additional font directory and setting
-a font as the default monospace font might look like this:
+Here's how you'd extend it to include fonts installed with the Nix
+package manager, and to prefer your favourite monospace font:
 
 @lisp
 (simple-service 'additional-fonts-service
@@ -44476,6 +44595,82 @@ kodi} for more information.
 @end table
 @end deftp
 
+@node Networking Home Services
+@subsection Networking Home Services
+
+This section lists services somewhat networking-related that you may use
+with Guix Home.
+
+@cindex Syncthing, file synchronization service
+@cindex backup service, Syncthing
+The @code{(gnu home services syncthing)} module provides a service to
+set up the @uref{Syncthing, https://syncthing.net} continuous file
+backup service.
+
+@defvar home-syncthing-service-type
+This is the service type for the @command{syncthing} daemon; it is the
+Home counterpart of the @code{syncthing-service-type} system service
+(@pxref{Networking Services, @code{syncthing-service-type}}).  The value
+for this service type is a @command{syncthing-configuration}.
+
+Here is how you would set it up with the default configuration:
+
+@lisp
+(service home-syncthing-service-type)
+@end lisp
+
+For a custom configuration, wrap you @code{syncthing-configuration} in
+@code{for-home}, as in this example:
+
+@lisp
+(service home-syncthing-service-type
+         (for-home
+          (syncthing-configuration (logflags 5))))
+@end lisp
+
+For details about @code{syncthing-configuration}, check out the
+documentation of the system service (@pxref{Networking Services,
+@code{syncthing-service-type}}).
+@end defvar
+
+
+@node Miscellaneous Home Services
+@subsection Miscellaneous Home Services
+
+This section lists Home services that lack a better place.
+
+@subsubheading Dictionary Service
+
+@cindex dictionary service, for Home
+The @code{(gnu home services dict)} module provides the following service:
+
+@defvar home-dicod-service-type
+This is the type of the service that runs the @command{dicod} daemon, an
+implementation of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual}).
+
+You can add @command{open localhost} to your @file{~/.dico} file to make
+@code{localhost} the default server for @command{dico} client
+(@pxref{Initialization File,,, dico, GNU Dico Manual}).
+@end defvar
+
+This service is a direct mapping of the @code{dicod-service-type} system
+service (@pxref{Miscellaneous Services, Dictionary Service}).  You can
+use it like this:
+
+@lisp
+(service home-dicod-service-type)
+@end lisp
+
+You may specify a custom configuration by providing a
+@code{dicod-configuration} record, exactly like for
+@code{dicod-service-type}, but wrapping it in @code{for-home}:
+
+@lisp
+(service home-dicod-service-type
+         (for-home
+          (dicod-configuration @dots{})))
+@end lisp
+
 @node Invoking guix home
 @section Invoking @command{guix home}
 
@@ -45010,7 +45205,7 @@ then directly boot from it, without any kind of installation procedure.
 
 The @command{guix system image} command is able to turn an operating
 system definition into a bootable image.  This command supports
-different image types, such as @code{efi-raw}, @code{iso9660} and
+different image types, such as @code{mbr-raw}, @code{iso9660} and
 @code{docker}.  Any modern @code{x86_64} machine will probably be able
 to boot from an @code{iso9660} image.  However, there are a few machines
 out there that require specific image types.  Those machines, in general
@@ -45362,6 +45557,10 @@ record.
 There are several @code{image-type} records provided by the @code{(gnu
 system image)} and the @code{(gnu system images @dots{})} modules.
 
+@defvar mbr-raw-image-type
+Build an image based on the @code{mbr-disk-image} image.
+@end defvar
+
 @defvar efi-raw-image-type
 Build an image based on the @code{efi-disk-image} image.
 @end defvar
@@ -45371,7 +45570,7 @@ Build an image based on the @code{efi32-disk-image} image.
 @end defvar
 
 @defvar qcow2-image-type
-Build an image based on the @code{efi-disk-image} image but with the
+Build an image based on the @code{mbr-disk-image} image but with the
 @code{compressed-qcow2} image format.
 @end defvar
 
@@ -45442,7 +45641,7 @@ wsl -d Guix
 
 So, if we get back to the @code{guix system image} command taking an
 @code{operating-system} declaration as argument.  By default, the
-@code{efi-raw-image-type} is used to turn the provided
+@code{mbr-raw-image-type} is used to turn the provided
 @code{operating-system} into an actual bootable image.
 
 To use a different @code{image-type}, the @code{--image-type} option can
diff --git a/doc/local.mk b/doc/local.mk
index 89285b9f35..9d1e3ff7e4 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -229,8 +229,8 @@ $(srcdir)/%D%/guix.1: scripts/guix.in $(sub_commands_mans)
 # The 'case' ensures the man pages are only generated if the corresponding
 # source script (the first prerequisite) has been changed.  The $(GOBJECTS)
 # prerequisite is solely meant to force these docs to be made only after all
-# Guile modules have been compiled.
-$(srcdir)/%D%/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
+# Guile modules have been compiled.  We also need the guix script to exist.
+$(srcdir)/%D%/guix-%.1: scripts/guix guix/scripts/%.scm $(GOBJECTS)
 	-@case '$?' in \
 	  *$<*) $(AM_V_P) && set -x || echo "  HELP2MAN $@"; \
 	        $(gen_man) --output="$@" "guix $*";; \
diff --git a/build-aux/cuirass/hurd-manifest.scm b/etc/hurd-manifest.scm
index 1b1d0a53b4..1b1d0a53b4 100644
--- a/build-aux/cuirass/hurd-manifest.scm
+++ b/etc/hurd-manifest.scm
diff --git a/etc/teams.scm.in b/etc/teams.scm.in
index d7ac146fda..9481b44168 100644
--- a/etc/teams.scm.in
+++ b/etc/teams.scm.in
@@ -614,11 +614,15 @@ GLib/GIO, GTK, GStreamer and Webkit."
                        "maxim.cournoyer@gmail.com")
   gnome qt telephony)
 
+(define-member (person "Katherine Cox-Buday"
+                       "cox.katherine.e+guix@gmail.com")
+  emacs go lisp)
+
 
 (define (find-team name)
   (or (hash-ref %teams (string->symbol name))
       (error (format #false
-                           "no such team: ~a~%" name))))
+                     "no such team: ~a~%" name))))
 
 (define (find-team-by-scope files)
   "Return the team(s) which scope matches at least one of the FILES, as list
diff --git a/etc/teams/qt/common.scm b/etc/teams/qt/common.scm
new file mode 100644
index 0000000000..8e11ac220b
--- /dev/null
+++ b/etc/teams/qt/common.scm
@@ -0,0 +1,50 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; This file returns a manifest of packages related to linux-libre.
+;;; Simplistically, it selects packages whose names begin with "linux-libre".
+;;; It is used to assist continuous integration of the kernel packages.
+
+(use-modules (guix packages)
+             (guix profiles)
+             (guix utils)
+             (gnu packages))
+
+(define* (qt-packages-manifest #:key major-version negate-version-test?)
+  "Return a manifest of Qt packages for MAJOR-VERSION, or any version if left
+unspecified.  If NEGATE-VERSION-TEST? is true, select all the Qt packages
+*not* matching MAJOR-VERSION."
+  (manifest
+   (map package->manifest-entry
+        (fold-packages
+         (lambda (package lst)
+           (let ((uri (and=> (package-source package)
+                             (lambda (x)
+                               (and (origin? x)
+                                    (origin-uri x))))))
+             (if (and uri
+                      (string? uri)
+                      (string-prefix? "mirror://qt/" uri)
+                      (if major-version
+                          ((if negate-version-test? not identity)
+                           (string=? major-version (version-major
+                                                    (package-version package))))
+                          #t))
+                 (cons package lst)
+                 lst)))
+         '()))))
diff --git a/etc/teams/qt/qt-manifest.scm b/etc/teams/qt/qt-manifest.scm
new file mode 100644
index 0000000000..0d8fa95bfe
--- /dev/null
+++ b/etc/teams/qt/qt-manifest.scm
@@ -0,0 +1,34 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; This file returns a manifest of packages related to linux-libre.
+;;; Simplistically, it selects packages whose names begin with "linux-libre".
+;;; It is used to assist continuous integration of the kernel packages.
+
+(load "common.scm")
+
+;;; Commentary:
+;;;
+;;; This manifest can be used to update the latest Qt packages collection, via
+;;; e.g.:
+;;;
+;;; ./pre-inst-env guix refresh -u -m etc/teams/qt/qt-manifest.scm
+;;;
+;;; Code:
+
+(qt-packages-manifest #:major-version "5" #:negate-version-test? #t)
diff --git a/etc/teams/qt/qt5-manifest.scm b/etc/teams/qt/qt5-manifest.scm
new file mode 100644
index 0000000000..34fdf479bf
--- /dev/null
+++ b/etc/teams/qt/qt5-manifest.scm
@@ -0,0 +1,34 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; This file returns a manifest of packages related to linux-libre.
+;;; Simplistically, it selects packages whose names begin with "linux-libre".
+;;; It is used to assist continuous integration of the kernel packages.
+
+(load "common.scm")
+
+;;; Commentary:
+;;;
+;;; This manifest can be used to update the Qt 5 packages collection, via
+;;; e.g.:
+;;;
+;;; ./pre-inst-env guix refresh -u -m etc/teams/qt/qt5-manifest.scm --target-version=5.15.10
+;;;
+;;; Code:
+
+(qt-packages-manifest #:major-version "5")
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index eea2233563..fd043ca131 100644
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@ -162,14 +162,14 @@ owner-writable in HOME."
 group records) are all available."
   (define (make-home-directory user)
     (let ((home (user-account-home-directory user))
+          (home-permissions (user-account-home-directory-permissions user))
           (pwd  (getpwnam (user-account-name user))))
       (mkdir-p home)
 
       ;; Always set ownership and permissions for home directories of system
-      ;; accounts.  If a service needs looser permissions on its home
-      ;; directories, it can always chmod it in an activation snippet.
+      ;; accounts.
       (chown home (passwd:uid pwd) (passwd:gid pwd))
-      (chmod home #o700)))
+      (chmod home home-permissions)))
 
   (define system-accounts
     (filter (lambda (user)
diff --git a/gnu/ci.scm b/gnu/ci.scm
index 7acd88ed29..520ac28110 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -24,6 +24,7 @@
   #:use-module (guix build-system channel)
   #:use-module (guix config)
   #:autoload   (guix describe) (package-channels)
+  #:use-module (guix memoization)
   #:use-module (guix store)
   #:use-module (guix profiles)
   #:use-module (guix packages)
@@ -342,29 +343,32 @@ otherwise use the IMAGE name."
   ;; Return the name of a package's job.
   package-name)
 
+(define base-packages
+  (mlambda (system)
+    "Return the set of packages considered to be part of the base for SYSTEM."
+    (delete-duplicates
+     (append-map (match-lambda
+                   ((_ package _ ...)
+                    (match (package-transitive-inputs package)
+                      (((_ inputs _ ...) ...)
+                       inputs))))
+                 (%final-inputs system)))))
+
 (define package->job
-  (let ((base-packages
-         (delete-duplicates
-          (append-map (match-lambda
-                        ((_ package _ ...)
-                         (match (package-transitive-inputs package)
-                           (((_ inputs _ ...) ...)
-                            inputs))))
-                      (%final-inputs)))))
-    (lambda* (store package system #:key (suffix ""))
-      "Return a job for PACKAGE on SYSTEM, or #f if this combination is not
+  (lambda* (store package system #:key (suffix ""))
+    "Return a job for PACKAGE on SYSTEM, or #f if this combination is not
 valid.  Append SUFFIX to the job name."
-      (cond ((member package base-packages)
-             (package-job store (string-append "base." (job-name package))
-                          package system #:suffix suffix))
-            ((supported-package? package system)
-             (let ((drv (package-derivation store package system
-                                            #:graft? #f)))
-               (and (substitutable-derivation? drv)
-                    (package-job store (job-name package)
-                                 package system #:suffix suffix))))
-            (else
-             #f)))))
+    (cond ((member package (base-packages system))
+           (package-job store (string-append "base." (job-name package))
+                        package system #:suffix suffix))
+          ((supported-package? package system)
+           (let ((drv (package-derivation store package system
+                                          #:graft? #f)))
+             (and (substitutable-derivation? drv)
+                  (package-job store (job-name package)
+                               package system #:suffix suffix))))
+          (else
+           #f))))
 
 (define %x86-64-micro-architectures
   ;; Micro-architectures for which we build tuned variants.
@@ -417,9 +421,9 @@ valid.  Append SUFFIX to the job name."
               (map channel-url channels)))
        arguments))
 
-(define (manifests->jobs store manifests)
+(define (manifests->jobs store manifests systems)
   "Return the list of jobs for the entries in MANIFESTS, a list of file
-names."
+names, for each one of SYSTEMS."
   (define (load-manifest manifest)
     (save-module-excursion
      (lambda ()
@@ -430,11 +434,12 @@ names."
     (string-append (manifest-entry-name entry) "-"
                    (manifest-entry-version entry)))
 
-  (define (manifest-entry->job entry)
+  (define (manifest-entry->job entry system)
     (let* ((obj (manifest-entry-item entry))
            (drv (parameterize ((%graft? #f))
                   (run-with-store store
-                    (lower-object obj))))
+                    (lower-object obj system)
+                    #:system system)))
            (max-silent-time (or (and (package? obj)
                                      (assoc-ref (package-properties obj)
                                                 'max-silent-time))
@@ -446,11 +451,13 @@ names."
                        #:max-silent-time max-silent-time
                        #:timeout timeout)))
 
-  (map manifest-entry->job
-       (delete-duplicates
-        (append-map (compose manifest-entries load-manifest)
-                    manifests)
-        manifest-entry=?)))
+  (let ((entries (delete-duplicates
+                  (append-map (compose manifest-entries load-manifest)
+                              manifests)
+                  manifest-entry=?)))
+    (append-map (lambda (system)
+                  (map (cut manifest-entry->job <> system) entries))
+                systems)))
 
 (define (arguments->systems arguments)
   "Return the systems list from ARGUMENTS."
@@ -572,7 +579,7 @@ names."
          (('manifests . rest)
           ;; Build packages in the list of manifests.
           (let ((manifests (arguments->manifests rest channels)))
-            (manifests->jobs store manifests)))
+            (manifests->jobs store manifests systems)))
          (else
           (error "unknown subset" subset))))
      systems)))
diff --git a/gnu/home/services.scm b/gnu/home/services.scm
index 042eba4780..8d53f2f4d3 100644
--- a/gnu/home/services.scm
+++ b/gnu/home/services.scm
@@ -33,6 +33,7 @@
   #:use-module (guix diagnostics)
   #:use-module (guix i18n)
   #:use-module (guix modules)
+  #:use-module (guix memoization)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-9)
   #:use-module (ice-9 match)
@@ -63,11 +64,16 @@
             lookup-home-service-types
             home-provenance
 
+            define-service-type-mapping
+            system->home-service-type
+
             %initialize-gettext)
 
   #:re-export (service
                service-type
-               service-extension))
+               service-extension
+               for-home
+               for-home?))
 
 ;;; Comment:
 ;;;
@@ -515,6 +521,67 @@ with one gexp, but many times, and all gexps must be idempotent.")))
 
 
 ;;;
+;;; Service type graph rewriting.
+;;;
+
+(define (service-type-mapping proc)
+  "Return a procedure that applies PROC to map a service type graph to another
+one."
+  (define (rewrite extension)
+    (match (proc (service-extension-target extension))
+      (#f #f)
+      (target
+       (service-extension target
+                          (service-extension-compute extension)))))
+
+  (define replace
+    (mlambdaq (type)
+      (service-type
+       (inherit type)
+       (name (symbol-append 'home- (service-type-name type)))
+       (location (service-type-location type))
+       (extensions (filter-map rewrite (service-type-extensions type))))))
+
+  replace)
+
+(define %system/home-service-type-mapping
+  ;; Mapping of System to Home services.
+  (make-hash-table))
+
+(define system->home-service-type
+  ;; Map the given System service type to the corresponding Home service type.
+  (let ()
+    (define (replace type)
+      (define replacement
+        (hashq-ref %system/home-service-type-mapping type
+                   *unspecified*))
+
+      (if (eq? replacement *unspecified*)
+          type
+          replacement))
+
+    (service-type-mapping replace)))
+
+(define-syntax define-service-type-mapping
+  (syntax-rules (=>)
+    ((_ system-type => home-type)
+     (hashq-set! %system/home-service-type-mapping
+                 system-type home-type))))
+
+(define-syntax define-service-type-mappings
+  (syntax-rules (=>)
+    ((_ (system-type => home-type) ...)
+     (begin
+       (define-service-type-mapping system-type => home-type)
+       ...))))
+
+(define-service-type-mappings
+  (system-service-type => home-service-type)
+  (activation-service-type => home-activation-service-type)
+  (profile-service-type => home-profile-service-type))
+
+
+;;;
 ;;; On-change.
 ;;;
 
diff --git a/gnu/home/services/dict.scm b/gnu/home/services/dict.scm
new file mode 100644
index 0000000000..b8a4653276
--- /dev/null
+++ b/gnu/home/services/dict.scm
@@ -0,0 +1,32 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu home services dict)
+  #:use-module (gnu home services)
+  #:use-module (gnu services)
+  #:use-module (gnu services dict)
+  #:use-module ((gnu system shadow) #:select (account-service-type))
+  #:export (home-dicod-service-type)
+  #:re-export (dicod-configuration))
+
+(define home-dicod-service-type
+  (service-type
+   (inherit (system->home-service-type
+             (remove-service-extensions dicod-service-type
+                                        (list account-service-type))))
+   (default-value (for-home (dicod-configuration)))))
diff --git a/gnu/home/services/mcron.scm b/gnu/home/services/mcron.scm
index f51edd6634..23be44ba07 100644
--- a/gnu/home/services/mcron.scm
+++ b/gnu/home/services/mcron.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2021, 2023 Andrew Tropin <andrew@trop.in>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2023 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,16 +20,9 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu home services mcron)
-  #:use-module (gnu packages guile-xyz)
   #:use-module (gnu home services)
-  #:use-module (gnu services configuration)
-  #:use-module (gnu services shepherd)
   #:use-module (gnu home services shepherd)
-  #:use-module (guix records)
-  #:use-module (guix gexp)
-  #:use-module (srfi srfi-1)
-  #:use-module (ice-9 match)
-
+  #:use-module (gnu services mcron)               ;for the service mapping
   #:export (home-mcron-configuration
             home-mcron-service-type))
 
@@ -55,86 +49,16 @@
 ;;
 ;;; Code:
 
-(define list-of-gexps?
-  (list-of gexp?))
-
-(define-configuration/no-serialization home-mcron-configuration
-  (mcron (file-like mcron) "The mcron package to use.")
-  (jobs
-   (list-of-gexps '())
-   "This is a list of gexps (@pxref{G-Expressions}), where each gexp
-corresponds to an mcron job specification (@pxref{Syntax, mcron job
-specifications,, mcron, GNU@tie{}mcron}).")
-  (log? (boolean #t) "Log messages to standard output.")
-  (log-format
-   (string "~1@*~a ~a: ~a~%")
-   "@code{(ice-9 format)} format string for log messages.  The default value
-produces messages like \"@samp{@var{pid} @var{name}:
-@var{message}\"} (@pxref{Invoking mcron, Invoking,, mcron, GNU@tie{}mcron}).
-Each message is also prefixed by a timestamp by GNU Shepherd."))
-
-(define job-files (@@ (gnu services mcron) job-files))
-(define shepherd-schedule-action
-  (@@ (gnu services mcron) shepherd-schedule-action))
-
-(define (home-mcron-shepherd-services config)
-  (match-record config <home-mcron-configuration>
-    (mcron jobs log? log-format)
-    (if (null? jobs)
-        '()                                       ;no jobs to run
-        (let ((files (job-files mcron jobs)))
-          (list (shepherd-service
-                 (documentation "User cron jobs.")
-                 (provision '(mcron))
-                 (modules `((srfi srfi-1)
-                            (srfi srfi-26)
-                            (ice-9 popen)         ;for the 'schedule' action
-                            (ice-9 rdelim)
-                            (ice-9 match)
-                            ,@%default-modules))
-                 (start #~(make-forkexec-constructor
-                           (list (string-append #$mcron "/bin/mcron")
-                                 #$@(if log?
-                                        #~("--log" "--log-format" #$log-format)
-                                        #~())
-                                 #$@files)
-                           #:log-file (string-append
-                                       (or (getenv "XDG_STATE_HOME")
-                                           (format #f "~a/.local/state"
-                                                   (getenv "HOME")))
-                                       "/log/mcron.log")))
-                 (stop #~(make-kill-destructor))
-                 (actions
-                  (list (shepherd-schedule-action mcron files)))))))))
-
-(define home-mcron-profile (compose list home-mcron-configuration-mcron))
-
-(define (home-mcron-extend config jobs)
-  (home-mcron-configuration
-   (inherit config)
-   (jobs (append (home-mcron-configuration-jobs config)
-                 jobs))))
+(define-syntax-rule (home-mcron-configuration fields ...)
+  ;; Macro provided for backward compatibility.
+  (for-home (mcron-configuration fields ...)))
 
 (define home-mcron-service-type
-  (service-type (name 'home-mcron)
-                (extensions
-                 (list (service-extension
-                        home-shepherd-service-type
-                        home-mcron-shepherd-services)
-                       (service-extension
-                        home-profile-service-type
-                        home-mcron-profile)))
-                (compose concatenate)
-                (extend home-mcron-extend)
-                (default-value (home-mcron-configuration))
-                (description
-                 "Install and configure the GNU mcron cron job manager.")))
+  (service-type
+   (inherit (system->home-service-type mcron-service-type))
+   (default-value (for-home (mcron-configuration)))))
 
-
-;;;
-;;; Generate documentation.
-;;;
-(define (generate-doc)
-  (configuration->documentation 'home-mcron-configuration))
+(define-service-type-mapping
+  mcron-service-type => home-mcron-service-type)
 
 ;;; mcron.scm ends here
diff --git a/gnu/home/services/shepherd.scm b/gnu/home/services/shepherd.scm
index 5585ef61b2..bd068c37fc 100644
--- a/gnu/home/services/shepherd.scm
+++ b/gnu/home/services/shepherd.scm
@@ -141,7 +141,7 @@ as shepherd package."
 (define (shepherd-xdg-configuration-files config)
   `(("shepherd/init.scm" ,(home-shepherd-configuration-file config))))
 
-(define-public home-shepherd-service-type
+(define home-shepherd-service-type
   (service-type (name 'home-shepherd)
                 (extensions
                  (list (service-extension
@@ -168,4 +168,6 @@ as shepherd package."
                 (default-value (home-shepherd-configuration))
                 (description "Configure and install userland Shepherd.")))
 
+(define-service-type-mapping
+  shepherd-root-service-type => home-shepherd-service-type)
 
diff --git a/gnu/home/services/ssh.scm b/gnu/home/services/ssh.scm
index ac72129b6c..34b1fe4658 100644
--- a/gnu/home/services/ssh.scm
+++ b/gnu/home/services/ssh.scm
@@ -203,6 +203,9 @@
                                           first))))
         (memq keyword ssh-match-keywords))))
 
+(define (serialize-match-criteria _ value)
+  (string-append "Match " value "\n"))
+
 (define-maybe match-criteria)
 
 (define-configuration openssh-host
@@ -214,7 +217,7 @@ top-level options.")
   (host-name
    maybe-string
    "Host name---e.g., @code{\"foo.example.org\"} or @code{\"192.168.1.2\"}.")
-  (match-criteria ;TODO implement stricter match-criteria rules
+  (match-criteria
    maybe-match-criteria
    "When specified, this string denotes the set of hosts to which the entry
 applies, superseding the @code{host-name} field.  Its first element must be
@@ -288,8 +291,7 @@ through before connecting to the server.")
              (G_ "define either 'name' or 'match-criteria', not both")))
            (string-append "Host " (openssh-host-name config) "\n"))
        (if (maybe-value-set? (openssh-host-match-criteria config))
-           (string-append
-            "Match " (string-join (openssh-host-match-criteria config) " ") "\n")
+           (serialize-match-criteria #t (openssh-host-match-criteria config))
            (raise
             (formatted-message
              (G_ "define either 'name' or 'match-criteria' once")))))
diff --git a/gnu/home/services/syncthing.scm b/gnu/home/services/syncthing.scm
new file mode 100644
index 0000000000..9c9eb94ea1
--- /dev/null
+++ b/gnu/home/services/syncthing.scm
@@ -0,0 +1,30 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu home services syncthing)
+  #:use-module (gnu services)
+  #:use-module (gnu home services)
+  #:use-module (gnu services syncthing)
+  #:export (home-syncthing-service-type)
+  #:re-export (syncthing-configuration
+               syncthing-configuration?))
+
+(define home-syncthing-service-type
+  (service-type
+   (inherit (system->home-service-type syncthing-service-type))
+   (default-value (for-home (syncthing-configuration)))))
diff --git a/gnu/local.mk b/gnu/local.mk
index bdaa9935b1..99819286d7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -91,6 +91,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/home.scm					\
   %D%/home/services.scm			\
   %D%/home/services/desktop.scm			\
+  %D%/home/services/dict.scm			\
   %D%/home/services/symlink-manager.scm		\
   %D%/home/services/fontutils.scm		\
   %D%/home/services/gnupg.scm			\
@@ -103,6 +104,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/home/services/shepherd.scm		\
   %D%/home/services/sound.scm			\
   %D%/home/services/ssh.scm			\
+  %D%/home/services/syncthing.scm		\
   %D%/home/services/mcron.scm			\
   %D%/home/services/utils.scm			\
   %D%/home/services/xdg.scm			\
@@ -588,7 +590,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/squirrel.scm			\
   %D%/packages/ssh.scm				\
   %D%/packages/sssd.scm				\
-  %D%/packages/stalonetray.scm			\
   %D%/packages/statistics.scm			\
   %D%/packages/stb.scm				\
   %D%/packages/stenography.scm			\
@@ -611,6 +612,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/terraform.scm			\
   %D%/packages/texinfo.scm			\
   %D%/packages/tex.scm				\
+  %D%/packages/texlive.scm                      \
   %D%/packages/textutils.scm			\
   %D%/packages/text-editors.scm			\
   %D%/packages/time.scm				\
@@ -770,6 +772,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/tests.scm					\
   %D%/tests/audio.scm				\
   %D%/tests/base.scm				\
+  %D%/tests/cachefilesd.scm			\
   %D%/tests/ci.scm				\
   %D%/tests/cups.scm				\
   %D%/tests/databases.scm			\
@@ -1056,7 +1059,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/dbus-c++-gcc-compat.patch		\
   %D%/packages/patches/dbus-c++-threading-mutex.patch		\
   %D%/packages/patches/dbxfs-remove-sentry-sdk.patch		\
-  %D%/packages/patches/ddclient-skip-test.patch			\
   %D%/packages/patches/debops-constants-for-external-program-names.patch \
   %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
   %D%/packages/patches/dee-vapi.patch			\
@@ -1089,7 +1091,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/elm-ghc9.2.patch	\
   %D%/packages/patches/elm-offline-package-registry.patch	\
   %D%/packages/patches/elm-reactor-static-files.patch		\
-  %D%/packages/patches/elogind-revert-polkit-detection.patch	\
+  %D%/packages/patches/elogind-fix-rpath.patch			\
   %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch	\
   %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch	\
   %D%/packages/patches/emacs-exec-path.patch			\
@@ -1140,6 +1142,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/fasthenry-spSolve.patch			\
   %D%/packages/patches/fasthenry-spFactor.patch			\
   %D%/packages/patches/fbreader-curl-7.62.patch		\
+  %D%/packages/patches/fbreader-fix-icon.patch		\
   %D%/packages/patches/fenics-dolfin-algorithm.patch		\
   %D%/packages/patches/fenics-dolfin-demo-init.patch		\
   %D%/packages/patches/fenics-dolfin-boost.patch		\
@@ -1155,6 +1158,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/flatpak-fix-path.patch			\
   %D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch	\
   %D%/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch	\
+  %D%/packages/patches/fluxbox-1.3.7-gcc.patch			\
   %D%/packages/patches/fontconfig-cache-ignore-mtime.patch	\
   %D%/packages/patches/fontforge-hurd.patch			\
   %D%/packages/patches/foobillard++-pkg-config.patch		\
@@ -1321,6 +1325,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/gpm-glibc-2.26.patch			\
   %D%/packages/patches/gpodder-disable-updater.patch		\
   %D%/packages/patches/gpsbabel-fix-i686-test.patch		\
+  %D%/packages/patches/grantlee-fix-i586-precision.patch	\
   %D%/packages/patches/grep-timing-sensitive-test.patch		\
   %D%/packages/patches/grfcodec-gcc-compat.patch		\
   %D%/packages/patches/gromacs-tinyxml2.patch			\
@@ -1375,6 +1380,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/hdf-eos5-fortrantests.patch		\
   %D%/packages/patches/heimdal-CVE-2022-45142.patch		\
   %D%/packages/patches/helm-fix-gcc-9-build.patch		\
+  %D%/packages/patches/highlight-gui-data-dir.patch		\
   %D%/packages/patches/http-parser-CVE-2020-8287.patch		\
   %D%/packages/patches/htslib-for-stringtie.patch		\
   %D%/packages/patches/hubbub-sort-entities.patch		\
@@ -1472,7 +1478,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch	\
   %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch		\
   %D%/packages/patches/kodi-mesa-eglchromium.patch		\
-  %D%/packages/patches/kwayland-skip-flaky-test.patch		\
   %D%/packages/patches/laby-make-install.patch			\
   %D%/packages/patches/laby-use-tmpdir-from-runtime.patch	\
   %D%/packages/patches/ldns-drill-examples.patch		\
@@ -1591,14 +1596,13 @@ dist_patch_DATA =						\
   %D%/packages/patches/maxima-defsystem-mkdir.patch		\
   %D%/packages/patches/maven-generate-component-xml.patch		\
   %D%/packages/patches/maven-generate-javax-inject-named.patch		\
-  %D%/packages/patches/mcrl2-fix-1687.patch			\
-  %D%/packages/patches/mcrl2-fix-counterexample.patch		\
   %D%/packages/patches/mcrypt-CVE-2012-4409.patch			\
   %D%/packages/patches/mcrypt-CVE-2012-4426.patch			\
   %D%/packages/patches/mcrypt-CVE-2012-4527.patch			\
   %D%/packages/patches/libmemcached-build-with-gcc7.patch	\
   %D%/packages/patches/libmhash-hmac-fix-uaf.patch		\
   %D%/packages/patches/libsigrokdecode-python3.9-fix.patch	\
+  %D%/packages/patches/maturin-no-cross-compile.patch		\
   %D%/packages/patches/mecab-variable-param.patch		\
   %D%/packages/patches/memtest86+-build-reproducibly.patch	\
   %D%/packages/patches/mercurial-hg-extension-path.patch	\
@@ -1688,7 +1692,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch	\
   %D%/packages/patches/openmpi-mtl-priorities.patch		\
   %D%/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch    \
-  %D%/packages/patches/openssh-hurd.patch			\
   %D%/packages/patches/openssh-trust-guix-store-directory.patch	\
   %D%/packages/patches/openresolv-restartcmd-guix.patch	\
   %D%/packages/patches/openrgb-unbundle-hueplusplus.patch	\
@@ -1729,11 +1732,12 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-pypdf-annotate-tests-appropriately.patch	\
   %D%/packages/patches/python-sip-include-dirs.patch	\
   %D%/packages/patches/python-sgmllib3k-assertions.patch	\
-  %D%/packages/patches/python-shiboken-2-compat.patch		\
   %D%/packages/patches/python-telingo-fix-comparison.patch	\
   %D%/packages/patches/python-typeguard-python3.10.patch	\
   %D%/packages/patches/python-w3lib-fix-test-failure.patch	\
   %D%/packages/patches/python-wxwidgets-type-errors.patch	\
+  %D%/packages/patches/qtdeclarative-5-disable-qmlcache.patch	\
+  %D%/packages/patches/qtdeclarative-disable-qmlcache.patch	\
   %D%/packages/patches/quodlibet-fix-invalid-glob.patch	\
   %D%/packages/patches/quodlibet-fix-mtime-tests.patch		\
   %D%/packages/patches/qxlsx-fix-include-directory.patch	\
@@ -1783,6 +1787,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/plib-CVE-2011-4620.patch		\
   %D%/packages/patches/plib-CVE-2012-4552.patch		\
   %D%/packages/patches/plotutils-spline-test.patch		\
+  %D%/packages/patches/po4a-partial-texinfo-menu-fix.patch	\
   %D%/packages/patches/polkit-disable-systemd.patch		\
   %D%/packages/patches/portaudio-audacity-compat.patch		\
   %D%/packages/patches/portmidi-modular-build.patch		\
@@ -1878,7 +1883,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/quagga-reproducible-build.patch          \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch	\
   %D%/packages/patches/quilt-grep-compat.patch 			\
-  %D%/packages/patches/qtwayland-gcc-11.patch			\
   %D%/packages/patches/qtwayland-dont-recreate-callbacks.patch	\
   %D%/packages/patches/qtwayland-cleanup-callbacks.patch	\
   %D%/packages/patches/ragel-char-signedness.patch		\
@@ -1917,12 +1921,13 @@ dist_patch_DATA =						\
   %D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \
   %D%/packages/patches/rustc-1.54.0-src.patch			\
   %D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch	\
+  %D%/packages/patches/rust-ring-0.16-missing-files.patch	\
+  %D%/packages/patches/rust-ring-0.16-test-files.patch		\
   %D%/packages/patches/i3status-rust-enable-unstable-features.patch	\
   %D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch	\
   %D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch	\
   %D%/packages/patches/rust-ndarray-0.14-remove-blas-src.patch	\
   %D%/packages/patches/rust-nettle-disable-vendor.patch		 \
-  %D%/packages/patches/rust-nettle-sys-disable-vendor.patch	 \
   %D%/packages/patches/rust-openssl-sys-no-vendor.patch	\
   %D%/packages/patches/rust-webbrowser-remove-unsupported-os.patch	\
   %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch      \
diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm
index e0a362ae4a..0b5fb79f13 100644
--- a/gnu/packages/accessibility.scm
+++ b/gnu/packages/accessibility.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
 ;;; Copyright © 2018, 2021, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Andrew Miloradovsky <andrew@interpretmath.pw>
-;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 Hunter Jozwiak <hunter.t.joz@gmail.com>
 ;;; Copyright © 2023 Ivan Gankevich <igankevich@capybaramail.xyz>
 ;;;
@@ -212,7 +212,7 @@ incorporated.")
     (inputs
      (list libxml2
            libglade
-           librsvg
+           (librsvg-for-system)
            gstreamer
            cairo
            gtk+
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 6b6b05c4a0..65d2e387b5 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -55,11 +55,12 @@
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2022, 2023 Matthew James Kraai <kraai@ftbfs.org>
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
-;;; Copyright © 2023 Juliana Sims <jtsims@protonmail.com>
+;;; Copyright © 2023 Juliana Sims <juli@incana.org>
 ;;; Copyright © 2023 Lu Hui <luhux76@gmail.com>
 ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
 ;;; Copyright © 2023 Alexey Abramov <levenson@mmer.org>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
+;;; Copyright © 2023 Tobias Kortkamp <tobias.kortkamp@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -97,7 +98,9 @@
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (gnu packages)
+  #:use-module (gnu packages acl)
   #:use-module (gnu packages algebra)
+  #:use-module (gnu packages attr)
   #:use-module (gnu packages autogen)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
@@ -174,6 +177,7 @@
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages terminals)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages textutils)
   #:use-module (gnu packages time)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
@@ -5914,3 +5918,39 @@ Discover other RouterOS devices or @command{mactelnetd} hosts.
            ;; Note: applies to src/md5.{c,h}
            ;; This file is likely to be gone in the next release.
            license:zlib))))
+
+(define-public bfs
+  (package
+    (name "bfs")
+    (version "3.0.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/tavianator/bfs")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1ffma9p82bl0ai4h439cnhvcyyy8x593m27xlf16gsg6knpldm58"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list #:make-flags #~(list (string-append "CC="
+                                               #$(cc-for-target))
+                                (string-append "PREFIX="
+                                               #$output) "bfs")
+           #:phases #~(modify-phases %standard-phases
+                        (delete 'configure)
+                        (add-before 'check 'disable-exec-no-path-test
+                          (lambda _
+                            ;; This test unsets PATH. It then probably cannot find
+                            ;; echo since it's not inside _PATH_STDPATH (?). We
+                            ;; delete the test to disable it.
+                            (delete-file "tests/posix/exec_nopath.sh"))))))
+    (inputs (list acl attr libcap oniguruma))
+    (synopsis "Breadth-first search for your files")
+    (description
+     "Bfs is a variant of the UNIX @command{find} command that operates
+breadth-first rather than depth-first.  It is otherwise compatible with many
+versions of command{find}, including POSIX, GNU, and *BSD find.")
+    (home-page "https://tavianator.com/projects/bfs.html")
+    (license license:bsd-0)))
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index e5c318c8bf..e8499bb4b4 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -9,6 +9,8 @@
 ;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
+;;; Copyright © 2023 Iliya Tikhonenko <tikhonenko@mpe.mpg.de>
+;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -75,6 +77,7 @@
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
+  #:use-module (gnu packages sqlite)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages time)
@@ -3951,3 +3954,38 @@ orbit around the Earth.")
 for optimal @code{matching} of weighted N-dimensional image intensity data
 using (multivariate) polynomials.")
     (license license:bsd-3)))
+
+(define-public unsio
+  ;; There is no versioned tag, use the latest commit.
+  (let ((commit "25e52468298e1194c9726ef5dba9d5fbb46870f5")
+        (revision "0"))
+    (package
+      (name "unsio")
+      (version (git-version "1.3.3" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://gitlab.lam.fr/infrastructure/unsio")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "110i2p5608zhh5w3pf3b5r2651hykw2ayspgq6vpqsffhya1p170"))
+                (modules '((guix build utils)))
+                (snippet
+                  ;; force installation into lib/ instead of lib64/
+                  #~(substitute* "cmake/DetectCpackGenerator.cmake"
+                      (("lib64") "lib")))))
+      (build-system cmake-build-system)
+      (arguments
+       (list #:tests? #f ; no tests
+             #:build-type "Release" ; to improve performace
+             #:configure-flags #~(list "-DCMAKE_CXX_STANDARD=14")))
+      (inputs (list gfortran hdf5 perl sqlite zlib))
+      (home-page "https://projets.lam.fr/projects/unsio/wiki")
+      (synopsis "Input and output routines for n-body file formats")
+      (description
+       "@acronym{UNSIO, Universal Nbody Snapshot Input Output} provides
+an API for performing input and output operations on different kinds of
+n-body file formats (nemo, Gadget binaries 1 and 2, Gadget hdf5, Ramses).")
+      (license license:cecill))))
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 8c15189b2b..b786375599 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -37,7 +37,7 @@
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
 ;;; Copyright © 2021 Aleksandr Vityazev <avityazev@posteo.org>
 ;;; Copyright © 2022 Arjan Adriaanse <arjan@adriaan.se>
-;;; Copyright © 2022, 2023 Juliana Sims <jtsims@protonmail.com>
+;;; Copyright © 2022, 2023 Juliana Sims <juli@incana.org>
 ;;; Copyright © 2022 Simon Streit <simon@netpanic.org>
 ;;; Copyright © 2022 Andy Tai <atai@atai.org>
 ;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
@@ -45,6 +45,7 @@
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023 Parnikkapore <poomklao@yahoo.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -116,7 +117,9 @@
   #:use-module (gnu packages pulseaudio)  ;libsndfile, libsamplerate
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
+  #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-science)
+  #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages rdf)
@@ -4691,6 +4694,45 @@ flavors EBU R128, ATSC A/85, and ReplayGain 2.0.  It helps normalizing the
 loudness of audio and video files to the same level.")
     (license license:gpl2+)))
 
+(define-public r128gain
+  (package
+    (name "r128gain")
+    (version "1.0.7")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/desbma/r128gain.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0zqclskkjb9hfdw9gq6iq4bs9dl1wj9nr8v1jz6s885379q9l8i7"))))
+    (build-system python-build-system)
+    (arguments
+       (list
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'hardcode-ffmpeg
+              (lambda* (#:key inputs #:allow-other-keys)
+                (substitute* "r128gain/__init__.py"
+                  (("ffmpeg_path or \"ffmpeg\"")
+                   (string-append "ffmpeg_path or \""
+                                  (search-input-file inputs "bin/ffmpeg")
+                                  "\""))))))))
+    (inputs (list python-crcmod python-ffmpeg-python python-mutagen
+                  python-tqdm ffmpeg))
+    (native-inputs (list python-future python-requests))
+    (home-page "https://github.com/desbma/r128gain")
+    (synopsis "Fast audio loudness scanner & tagger")
+    (description
+     "r128gain is a multi platform command line tool to scan your audio
+files and tag them with loudness metadata (ReplayGain v2 or Opus R128 gain
+format), to allow playback of several tracks or albums at a similar
+loudness level. r128gain can also be used as a Python module from other
+Python projects to scan and/or tag audio files.")
+    ;; 'setup.py' claims LGPL2+, 'LICENSE' is LGPLv2.1.
+    (license license:lgpl2.1+)))
+
 (define-public filteraudio
   (let ((revision "1")
         (commit "2fc669581e2a0ff87fba8de85861b49133306094"))
@@ -5936,14 +5978,14 @@ while still staying in time.")
 (define-public butt
   (package
     (name "butt")
-    (version "0.1.34")
+    (version "0.1.38")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/butt/butt/butt-"
                                   version "/butt-" version ".tar.gz"))
               (sha256
                (base32
-                "0zd1g1673pv8z437y34fllxska8dzpd7mygpham35pzwpdyc5c1p"))
+                "10i3xpxzccdl4pidiyymw9cfavhy50yhn7xi5bd77y91f2903kp9"))
               (modules '((guix build utils)))
               (snippet
                '(substitute* "src/butt.cpp"
@@ -5966,9 +6008,10 @@ while still staying in time.")
            (uri (string-append "https://danielnoethen.de/butt/butt-"
                                version "_manual.pdf"))
            (sha256
-            (base32 "0kadqzzbk25n0aqxgbqhg4mq4hsbjq44phzcx5qj1b8847yzz8si"))))))
+            (base32 "04aixxqshfj11ja3ifh0zvywl2mqzmymppcd0xj8sv0j7whjibaq"))))))
     (inputs
-     (list dbus
+     (list curl
+           dbus
            flac
            fltk
            lame
@@ -6253,7 +6296,7 @@ and DSD streams.")
 (define-public qpwgraph
   (package
     (name "qpwgraph")
-    (version "0.4.5")
+    (version "0.5.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -6262,7 +6305,7 @@ and DSD streams.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "06pgkma0i9dbir74cfhgnnkqjcq8z496by4lk1whqcj7j9ldbi2l"))))
+                "186c3s56py8xjasbp4380m9sqdba9mf7mppqz8hkli1nhbspbix9"))))
     (build-system cmake-build-system)
     (arguments (list #:tests? #f)) ;; no tests
     (inputs (list alsa-lib
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index d484c34826..6961d9358c 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1401,14 +1401,14 @@ archives.")
 (define-public grsync
   (package
     (name "grsync")
-    (version "1.3.0")
+    (version "1.3.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://www.opbyte.it/release/"
                                   "grsync-" version ".tar.gz"))
               (sha256
                (base32
-                "1z1m782b50x348kgynzf753apy8yszkl31y32y1jsc055skcdixp"))))
+                "1ly6ng211wj9sc0la73jsz2lviwd7b4a7bhw16kmnbm6v8jhxk1k"))))
     (build-system gnu-build-system)
     (native-inputs (list intltool pkg-config))
     (inputs (list gtk+))
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 1fdfaf8a57..5a3d5aced5 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -78,7 +78,8 @@
   #:export (glibc
             libc-for-target
             make-ld-wrapper
-            libiconv-if-needed))
+            libiconv-if-needed
+            %final-inputs))
 
 ;;; Commentary:
 ;;;
@@ -966,6 +967,10 @@ the store.")
                      ;; library is empty by some criterion (such as their file
                      ;; size equaling eight bytes) rather than hardcoding them
                      ;; by name.
+
+                     ;; XXX: We forgot librt.a for the current version!  In
+                     ;; the meantime, gcc-toolchain provides it, but remove
+                     ;; that fix once librt.a is added here.
                      (define empty-static-libraries
                        '("libpthread.a" "libdl.a" "libutil.a" "libanl.a"))
                      (define (empty-static-library? file)
@@ -1648,10 +1653,10 @@ package needs iconv ,@(libiconv-if-needed) should be added."
          (proc  (module-ref iface 'canonical-package)))
     (proc package)))
 
-(define-public (%final-inputs)
+(define* (%final-inputs #:optional (system (%current-system)))
   "Return the list of \"final inputs\"."
   ;; Avoid circular dependency by lazily resolving 'commencement'.
   (let ((iface (resolve-interface '(gnu packages commencement))))
-    ((module-ref iface '%final-inputs) (%current-system))))
+    ((module-ref iface '%final-inputs) system)))
 
 ;;; base.scm ends here
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index a365cca849..c4cb7c2ff7 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -14,7 +14,7 @@
 ;;; Copyright © 2020, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 qblade <qblade@protonmail.com>
 ;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2022, 2023 Juliana Sims <jtsims@protonmail.com>
+;;; Copyright © 2022, 2023 Juliana Sims <juli@incana.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 1d70ea9fe0..c057bf3443 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -978,7 +978,7 @@ generation.")
 (define-public googlebenchmark
   (package
     (name "googlebenchmark")
-    (version "1.5.3")
+    (version "1.8.2")
     (home-page "https://github.com/google/benchmark")
     (source (origin
               (method git-fetch)
@@ -987,7 +987,7 @@ generation.")
               (file-name (git-file-name "google-benchmark" version))
               (sha256
                (base32
-                "1hls0aqqj5cfldn9jfpvzjhpxkhrydrz9crp477rwllwjsybdxw7"))))
+                "1p72bw7xcd88d8268fmmzji59408f552fbiv37jmsixml5dmq9wv"))))
     (build-system cmake-build-system)
     (arguments
      '(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 05aaa827f8..e177b27e9d 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -87,7 +87,6 @@
     (native-inputs
      (list eigen
            mmtf-cpp
-           msgpack
            googletest
            pkg-config
            pybind11))
@@ -248,7 +247,7 @@ molecules.")
 (define-public mmtf-cpp
   (package
     (name "mmtf-cpp")
-    (version "1.0.0")
+    (version "1.1.0")
     (source
      (origin
        (method git-fetch)
@@ -258,11 +257,13 @@ molecules.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "17ylramda69plf5w0v5hxbl4ggkdi5s15z55cv0pljl12yvyva8l"))))
+         "0rs2f1ppgqz663c3m22p8wsq6z839bj59zy29chci46ypfhwv6ph"))))
     (build-system cmake-build-system)
     ;; Tests require the soon-to-be-deprecated version 1 of the catch-framework.
-    (arguments
-     '(#:tests? #f))
+    (arguments '(#:tests? #f))
+    ;; There is no support for modern msgpack versions yet (see:
+    ;; https://github.com/rcsb/mmtf-cpp/issues/44).
+    (propagated-inputs (list msgpack))  ;included by mmtf/structure_data.hpp
     (home-page "https://mmtf.rcsb.org/")
     (synopsis "C++ API for the Macromolecular Transmission Format")
     (description "This package is a library for the
@@ -574,7 +575,6 @@ symmetries written in C.  Spglib can be used to:
            glew
            libxml2
            mmtf-cpp
-           msgpack
            python-pyqt
            glm
            netcdf))
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm
index 00be723eec..25566bc0fa 100644
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@ -58,8 +58,8 @@
   #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR)))
 
 (define-public cuirass
-  (let ((commit "b82596778bf653a572b5fcd483388226b29b96f3")
-        (revision "16"))
+  (let ((commit "7416bb916315730cd1ea74e7914f7532a1aba193")
+        (revision "17"))
     (package
       (name "cuirass")
       (version (git-version "1.1.0" revision commit))
@@ -72,7 +72,7 @@
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1246cs3bmpkp8jis0xxasmrpq622p1ds3s0payrv5bxng9j6dbfp"))))
+           "1wc39c7aqva5sp3gpdxq2kqa17ywy21yn5w8r66qgxjinvj21a68"))))
       (build-system gnu-build-system)
       (arguments
        `(#:modules ((guix build utils)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index fe6f025257..9604f06a47 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3459,31 +3459,32 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
     ;; still use 'package-with-bootstrap-guile' so that the bootstrap tools are
     ;; used for origins that have patches, thereby avoiding circular
     ;; dependencies.
-    (let ((finalize (compose with-boot6
-                             package-with-bootstrap-guile)))
-      `(,@(map (match-lambda
-                 ((name package)
-                  (list name (finalize package))))
-               `(("tar" ,tar)
-                 ("gzip" ,gzip)
-                 ("bzip2" ,bzip2)
-                 ("file" ,file)
-                 ("diffutils" ,diffutils)
-                 ("patch" ,patch)
-                 ("findutils" ,findutils)
-                 ("gawk" ,gawk)))
-        ("sed" ,sed-final)
-        ("grep" ,grep-final)
-        ("xz" ,xz-final)
-        ("coreutils" ,coreutils-final)
-        ("make" ,gnu-make-final)
-        ("bash" ,bash-final)
-        ("ld-wrapper" ,ld-wrapper)
-        ("binutils" ,binutils-final)
-        ("gcc" ,gcc-final)
-        ("libc" ,glibc-final)
-        ("libc:static" ,glibc-final "static")
-        ("locales" ,glibc-utf8-locales-final)))))
+    (parameterize ((%current-system system))
+      (let ((finalize (compose with-boot6
+                               package-with-bootstrap-guile)))
+        `(,@(map (match-lambda
+                   ((name package)
+                    (list name (finalize package))))
+                 `(("tar" ,tar)
+                   ("gzip" ,gzip)
+                   ("bzip2" ,bzip2)
+                   ("file" ,file)
+                   ("diffutils" ,diffutils)
+                   ("patch" ,patch)
+                   ("findutils" ,findutils)
+                   ("gawk" ,gawk)))
+          ("sed" ,sed-final)
+          ("grep" ,grep-final)
+          ("xz" ,xz-final)
+          ("coreutils" ,coreutils-final)
+          ("make" ,gnu-make-final)
+          ("bash" ,bash-final)
+          ("ld-wrapper" ,ld-wrapper)
+          ("binutils" ,binutils-final)
+          ("gcc" ,gcc-final)
+          ("libc" ,glibc-final)
+          ("libc:static" ,glibc-final "static")
+          ("locales" ,glibc-utf8-locales-final))))))
 
 (define-public canonical-package
   (let ((name->package (mlambda (system)
@@ -3560,6 +3561,13 @@ COREUTILS-FINAL vs. COREUTILS, etc."
                        (union-build (assoc-ref %outputs "static")
                                     (list (assoc-ref %build-inputs
                                                      "libc-static")))
+                       ;; XXX Remove once an empty librt.a is added to
+                       ;; libc:out.
+                       (copy-file
+                        (string-append (assoc-ref %outputs "out")
+                                       "/lib/libpthread.a")
+                        (string-append (assoc-ref %outputs "out")
+                                       "/lib/librt.a"))
                        #t))))
 
       (native-search-paths
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 1a71c86c3c..3b949198c7 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -783,7 +783,7 @@ lock-free fixed size queue written in C++11.")
 (define-public gperftools
   (package
     (name "gperftools")
-    (version "2.10")
+    (version "2.11")
     (source
      (origin
        (method git-fetch)
@@ -791,7 +791,7 @@ lock-free fixed size queue written in C++11.")
              (url "https://github.com/gperftools/gperftools")
              (commit (string-append "gperftools-" version))))
        (sha256
-        (base32 "0s9qhx940s8q6glc8sw74k5gs8hdhjfigq20zci92qawgm7zsicm"))
+        (base32 "1mwsa4y696m8zjya0k7xzr9vsgb24dq4aq13m21hb5ygy7nh47id"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
@@ -1976,11 +1976,11 @@ validation.")
     (license license:asl2.0)))
 
 (define-public bloomberg-bde-tools
-  (let ((commit "094885bd177e0159232d4e6a060a04edb1edd786"))
+  (let ((commit "f63dfe9114cd7df29623bd01f644b9f654253972"))
     (package
       (name "bloomberg-bde-tools")
       ;; Recent releases are not tagged so commit must be used for checkout.
-      (version "3.97.0.0")
+      (version "3.118.0.0")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1989,7 +1989,7 @@ validation.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0mbbai73z8amh23ah3wy35kmy612380yr5wg89mic60qwqmpqb02"))
+                  "1a5sw4xjwd222na3zkflm2gkmzhnfq17i8qapyaxszpiayf3hw6v"))
                 (patches
                  (search-patches
                   "bloomberg-bde-tools-fix-install-path.patch"))))
@@ -2003,11 +2003,11 @@ validation.")
       (license license:asl2.0))))
 
 (define-public bloomberg-bde
-  (let ((commit "b6bcc0e24a5862bf77aea7edd831dedf50e21d64"))
+  (let ((commit "77a0f39d538c20ae28bece9a81cac99a9e1df95d"))
     (package
       (name "bloomberg-bde")
       ;; Recent releases are not tagged so commit must be used for checkout.
-      (version "3.98.0.0")
+      (version "3.118.0.1")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -2016,7 +2016,7 @@ validation.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0y3lipi1lj9qazgc935851r2qsx5aq3vvc4y52jq57riyz8wg3ma"))
+                  "0nw5clkc9yipd03kijh4c8lxi9zkxfxcjhszl1xzwvgz8xmpampf"))
                 (patches
                  (search-patches
                   "bloomberg-bde-cmake-module-path.patch"))
@@ -2033,26 +2033,28 @@ validation.")
                      (list "groups/bal/ball/ball_asyncfileobserver.t.cpp"
                            "groups/bal/ball/ball_fileobserver2.t.cpp"
                            "groups/bal/ball/ball_recordstringformatter.t.cpp"
+                           "groups/bal/balst/balst_stacktraceresolver_filehelper.t.cpp"
                            "groups/bal/balst/balst_stacktraceutil.t.cpp"
                            "groups/bdl/bdlmt/bdlmt_eventscheduler.t.cpp"
                            "groups/bdl/bdlmt/bdlmt_timereventscheduler.t.cpp"
                            "groups/bdl/bdls/bdls_filesystemutil.t.cpp"
+                           "groups/bsl/bslh/bslh_hash.t.cpp"
                            "groups/bsl/bslh/bslh_hashpair.t.cpp"
                            "groups/bsl/bsls/bsls_platform.t.cpp"
                            "groups/bsl/bsls/bsls_stackaddressutil.t.cpp"
                            "groups/bsl/bsls/bsls_stopwatch.t.cpp"
+                           "groups/bsl/bsls/bsls_timeutil.t.cpp"
+                           "groups/bsl/bslstl/bslstl_deque.1.t.cpp"
+                           "groups/bsl/bslstl/bslstl_deque.2.t.cpp"
+                           "groups/bsl/bslstl/bslstl_deque.3.t.cpp"
                            "groups/bsl/bslstl/bslstl_function_invokerutil.t.cpp"))
                     #t))))
       (build-system cmake-build-system)
       (arguments
        `(#:parallel-tests? #f           ; Test parallelism may fail inconsistently.
          ;; Set UFID to build shared libraries. Flag descriptions can be found at
-         ;; https://bloomberg.github.io/bde-tools/reference/bde_repo.html#ufid
-         #:configure-flags ,(match %current-system
-            ((or "i686-linux" "armhf-linux")
-             ''("-DUFID=opt_dbg_exc_mt_32_shr_cpp17"))
-            (_
-             ''("-DUFID=opt_dbg_exc_mt_64_shr_cpp17")))
+         ;; https://bloomberg.github.io/bde-tools/bbs/reference/bbs_build_configuration.html#ufid
+         #:configure-flags '("-DUFID=opt_dbg_exc_mt_64_shr_cpp20")
          #:phases
          (modify-phases %standard-phases
            ;; Explicitly build tests separate from the main build.
@@ -2072,6 +2074,8 @@ implementation of STL containers, vocabulary types for representing common
 concepts (like dates and times), and building blocks for developing
 multi-threaded applications and network applications.")
       (home-page "https://github.com/bloomberg/bde")
+      ;; Out-of-memory on i686-linux, compile errors with non-x86.
+      (supported-systems '("x86_64-linux"))
       (license license:asl2.0))))
 
 (define-public gulrak-filesystem
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index b16d4ab3a9..223d1d3a3d 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -19,7 +19,7 @@
 ;;; Copyright © 2019 Nicolò Balzarotti <anothersms@gmail.com>
 ;;; Copyright © 2019, 2020, 2021, 2022 Wiktor Żelazny <wzelazny@vurv.cz>
 ;;; Copyright © 2019 Arne Babenhauserheide <arne_bab@web.de>
-;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019, 2020, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 Todor Kondić <tk.code@protonmail.com>
 ;;; Copyright © 2020 Danjela Lura <danielaluraa@gmail.com>
 ;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
@@ -29400,7 +29400,7 @@ automatically show a loader when the output is (re)calculating.")
     (properties `((upstream-name . "rsvg")))
     (build-system r-build-system)
     (inputs
-     (list librsvg zlib))
+     (list (librsvg-for-system) zlib))
     (native-inputs
      (list pkg-config r-knitr))
     (home-page "https://github.com/jeroen/rsvg#readme")
diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 7512002751..1bd61d7f19 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
@@ -902,8 +902,52 @@
         ("rust-serial-test" ,rust-serial-test-0.1)
         ("rust-serial-test-derive" ,rust-serial-test-derive-0.1))))))
 
+(define-public rust-gio-sys-0.17
+  (package
+    (name "rust-gio-sys")
+    (version "0.17.10")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "gio-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1hr84vgpz1hbs9q7wgvpnwhbxwh9kim0z5aqv6v6ki0j1b1qgkqc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(;; XXX: Tests are sensitive to the version of glib, even though
+       ;; the library supports a wide range.  Skip for now.
+       #:tests? #f
+       #:cargo-inputs
+       (("rust-glib-sys" ,rust-glib-sys-0.17)
+        ("rust-gobject-sys" ,rust-gobject-sys-0.17)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-system-deps" ,rust-system-deps-6)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))
+       #:phases (modify-phases %standard-phases
+                  (add-before 'check 'extend-include-path
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (let ((gio-headers (search-input-directory
+                                          inputs "include/gio-unix-2.0")))
+                        ;; Tests rely on these headers.
+                        (setenv "C_INCLUDE_PATH"
+                                (string-append gio-headers ":"
+                                               (getenv "C_INCLUDE_PATH")))))))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list glib))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "FFI bindings to libgio-2.0")
+    (description "This package provides FFI bindings to libgio-2.0.")
+    (license license:expat)))
+
 (define-public rust-gio-sys-0.15
   (package
+    (inherit rust-gio-sys-0.17)
     (name "rust-gio-sys")
     (version "0.15.10")
     (source
@@ -913,7 +957,6 @@
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "13fgmc2xdzg9qk9l3nlp1bilwn6466mrqbiq4fhc9qkia93pl59j"))))
-    (build-system cargo-build-system)
     (arguments
      `(;; FIXME: some GLib macros are not found
        #:tests? #f
@@ -934,15 +977,7 @@
                         ;; Tests rely on these headers.
                         (setenv "C_INCLUDE_PATH"
                                 (string-append gio-headers ":"
-                                               (getenv "C_INCLUDE_PATH")))))))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list glib))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "FFI bindings to libgio-2.0")
-    (description "This package provides FFI bindings to libgio-2.0.")
-    (license license:expat)))
+                                               (getenv "C_INCLUDE_PATH")))))))))))
 
 (define-public rust-gio-sys-0.14
   (package
@@ -1030,8 +1065,56 @@
     (description "File format checker in Rust.")
     (license license:expat)))
 
+(define-public rust-glib-0.17
+  (package
+    (name "rust-glib")
+    (version "0.17.10")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "glib" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0jqlipn9zixj8fpqlg45v0f06j2ghdz72cml2akcxlnlm1dx9ynk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(;; XXX: Tests are sensitive to the version of glib, even though
+       ;; the library supports a wide range.  Skip for now.
+       #:tests? #f
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-futures-channel" ,rust-futures-channel-0.3)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-futures-task" ,rust-futures-task-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-gio-sys" ,rust-gio-sys-0.17)
+        ("rust-glib-macros" ,rust-glib-macros-0.17)
+        ("rust-glib-sys" ,rust-glib-sys-0.17)
+        ("rust-gobject-sys" ,rust-gobject-sys-0.17)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-memchr" ,rust-memchr-2)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-smallvec" ,rust-smallvec-1)
+        ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-gir-format-check" ,rust-gir-format-check-0.1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-trybuild2" ,rust-trybuild2-1))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list glib))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "Rust bindings for the GLib library")
+    (description "Rust bindings for the GLib library")
+    (license license:expat)))
+
 (define-public rust-glib-0.15
   (package
+    (inherit rust-glib-0.17)
     (name "rust-glib")
     (version "0.15.12")
     (source
@@ -1041,7 +1124,6 @@
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0pahikbwxr3vafdrr5l2hnlhkf9xi4illryan0l59ayhp9pk1c7d"))))
-    (build-system cargo-build-system)
     (arguments
      `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display`
        #:tests? #f
@@ -1062,15 +1144,7 @@
        #:cargo-development-inputs
        (("rust-futures-util" ,rust-futures-util-0.3)
         ("rust-gir-format-check" ,rust-gir-format-check-0.1)
-        ("rust-tempfile" ,rust-tempfile-3))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list glib))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "Rust bindings for the GLib library")
-    (description "Rust bindings for the GLib library")
-    (license license:expat)))
+        ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-glib-0.14
   (package
@@ -1160,8 +1234,43 @@
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-glib-macros-0.17
+  (package
+    (name "rust-glib-macros")
+    (version "0.17.10")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "glib-macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "09nyh22nryip4i22mdrixzl4q0r5h5lxcn40mgqr30rk6y9wg9gc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-heck" ,rust-heck-0.4)
+        ("rust-proc-macro-crate" ,rust-proc-macro-crate-1)
+        ("rust-proc-macro-error" ,rust-proc-macro-error-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-glib" ,rust-glib-0.17)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-trybuild2" ,rust-trybuild2-1))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list glib))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "Rust bindings for the GLib library, proc macros crate")
+    (description "Rust bindings for the GLib library, proc macros crate.")
+    (license license:expat)))
+
 (define-public rust-glib-macros-0.15
   (package
+    (inherit rust-glib-macros-0.17)
     (name "rust-glib-macros")
     (version "0.15.11")
     (source
@@ -1171,7 +1280,6 @@
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0r3cr0c79rs91z0sps089nsf8ppnm8agp48qwwqlkc32lqqq39i5"))))
-    (build-system cargo-build-system)
     (arguments
      `(;; XXX: Circular dependency on rust-glib??
        #:tests? #f
@@ -1182,11 +1290,7 @@
         ("rust-proc-macro-error" ,rust-proc-macro-error-1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "Rust bindings for the GLib library, proc macros crate")
-    (description "Rust bindings for the GLib library, proc macros crate.")
-    (license license:expat)))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-glib-macros-0.14
   (package
@@ -1237,17 +1341,17 @@
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-glib-sys-0.15
+(define-public rust-glib-sys-0.17
   (package
     (name "rust-glib-sys")
-    (version "0.15.10")
+    (version "0.17.10")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "glib-sys" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1m5sqm69fdk8vaw6hggyizhs1r1vivx73splrdvczsb5iqpijjzg"))))
+                "1w64ppa12s9ky6gfdaqhq9w30ad6hskll812jb3sl2xsggmac2nq"))))
     (build-system cargo-build-system)
     (arguments
      `(;; XXX: Tests are sensitive to the version of glib, even though
@@ -1268,6 +1372,29 @@
     (description "This package provides FFI bindings to libglib-2.0.")
     (license license:expat)))
 
+(define-public rust-glib-sys-0.15
+  (package
+    (inherit rust-glib-sys-0.17)
+    (name "rust-glib-sys")
+    (version "0.15.10")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "glib-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1m5sqm69fdk8vaw6hggyizhs1r1vivx73splrdvczsb5iqpijjzg"))))
+    (arguments
+     `(;; XXX: Tests are sensitive to the version of glib, even though
+       ;; the library supports a wide range.  Skip for now.
+       #:tests? #f
+       #:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-glib-sys-0.14
   (package
     (inherit rust-glib-sys-0.15)
@@ -1335,8 +1462,41 @@
        (("rust-shell-words" ,rust-shell-words-0.1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-gobject-sys-0.17
+  (package
+    (name "rust-gobject-sys")
+    (version "0.17.10")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "gobject-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ql0pcab6dxjapiglxcjaavbbh1sznyc2wj5q273b9j0fwqw6d6d"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(;; XXX: Tests are sensitive to the version of glib, even though
+       ;; the library supports a wide range.  Skip for now.
+       #:tests? #f
+       #:cargo-inputs
+       (("rust-glib-sys" ,rust-glib-sys-0.17)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs
+       (("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list glib))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "FFI bindings to libgobject-2.0")
+    (description "This package provides FFI bindings to libgobject-2.0.")
+    (license license:expat)))
+
 (define-public rust-gobject-sys-0.15
   (package
+    (inherit rust-gobject-sys-0.17)
     (name "rust-gobject-sys")
     (version "0.15.10")
     (source
@@ -1346,7 +1506,6 @@
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "02hyilvpi4hw4gr03z2plsbf1zicsfs5l0xxadqx3v3b4i2cwmqd"))))
-    (build-system cargo-build-system)
     (arguments
      `(;; FIXME: Constant value mismatch for G_TYPE_FUNDAMENTAL_MAX
        ;; Rust: "255"
@@ -1358,15 +1517,7 @@
         ("rust-system-deps" ,rust-system-deps-6))
        #:cargo-development-inputs
        (("rust-shell-words" ,rust-shell-words-1)
-        ("rust-tempfile" ,rust-tempfile-3))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list glib))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "FFI bindings to libgobject-2.0")
-    (description "This package provides FFI bindings to libgobject-2.0.")
-    (license license:expat)))
+        ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-gobject-sys-0.14
   (package
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f9574e2797..77a41a5116 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1661,8 +1661,100 @@ deadlock, like the standard Barrier).")
 syntax (e.g.  EasyList, EasyPrivacy) filter parsing and matching.")
     (license license:mpl2.0)))
 
+(define-public rust-adblock-0.5
+  (package
+    (inherit rust-adblock-0.7)
+    (name "rust-adblock")
+    (version "0.5.8")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "adblock" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1qgjcrm7vqxq5ispdj95ql7payy5d5rj0zfwba4b076xxvw1q4yq"))))
+    (arguments
+     `(#:cargo-test-flags
+       (list "--release" "--"
+             ;; Not all files included
+             "--skip=check_works_same_after_deserialization"
+             "--skip=check_matching_equivalent"
+             "--skip=check_matching_hostnames"
+             ;; Skip tests which require the network.
+             "--skip=check_live_from_filterlists"
+             "--skip=check_live_specific_urls"
+             "--skip=stable_serialization"
+             "--skip=stable_serialization_through_load")
+       #:cargo-inputs
+       (("rust-addr" ,rust-addr-0.14)
+        ("rust-base64" ,rust-base64-0.13)
+        ("rust-bitflags" ,rust-bitflags-1)
+        ("rust-cssparser" ,rust-cssparser-0.28)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-idna" ,rust-idna-0.2)
+        ("rust-itertools" ,rust-itertools-0.10)
+        ("rust-lifeguard" ,rust-lifeguard-0.6)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-rmp-serde" ,rust-rmp-serde-0.13)
+        ("rust-rmp-serde" ,rust-rmp-serde-0.15)
+        ("rust-seahash" ,rust-seahash-3)
+        ("rust-selectors" ,rust-selectors-0.23)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-twoway" ,rust-twoway-0.2)
+        ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-csv" ,rust-csv-1)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-reqwest" ,rust-reqwest-0.11)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-sha2" ,rust-sha2-0.9)
+        ("rust-tokio" ,rust-tokio-1))))))
+
+(define-public rust-addr2line-0.19
+  (package
+    (name "rust-addr2line")
+    (version "0.19.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "addr2line" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "15ywmr5wx22q69ffnn79qp65ir5p1x0k2q06plcpv6v74c5xcvx7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; use of undeclared crate or module `auxiliary`
+       #:cargo-inputs
+       (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-cpp-demangle" ,rust-cpp-demangle-0.4)
+        ("rust-fallible-iterator" ,rust-fallible-iterator-0.2)
+        ("rust-gimli" ,rust-gimli-0.27)
+        ("rust-object" ,rust-object-0.30)
+        ("rust-rustc-demangle" ,rust-rustc-demangle-0.1)
+        ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+        ("rust-smallvec" ,rust-smallvec-1))
+       #:cargo-development-inputs
+       (("rust-backtrace" ,rust-backtrace-0.3)
+        ("rust-clap" ,rust-clap-3)
+        ("rust-findshlibs" ,rust-findshlibs-0.10)
+        ("rust-memmap2" ,rust-memmap2-0.5)
+        ("rust-rustc-test" ,rust-rustc-test-0.3)
+        ("rust-typed-arena" ,rust-typed-arena-2))))
+    (home-page "https://github.com/gimli-rs/addr2line")
+    (synopsis "Symbolication library written in Rust, using gimli")
+    (description
+     "This package provides a cross-platform symbolication library written in
+Rust, using gimli.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-addr2line-0.17
   (package
+    (inherit rust-addr2line-0.19)
     (name "rust-addr2line")
     (version "0.17.0")
     (source (origin
@@ -1672,7 +1764,6 @@ syntax (e.g.  EasyList, EasyPrivacy) filter parsing and matching.")
               (sha256
                (base32
                 "0sw16zqy6w0ar633z69m7lw6gb0k1y7xj3387a8wly43ij5div5r"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #false ;use of undeclared crate or module `auxiliary`
        #:cargo-inputs
@@ -1691,13 +1782,29 @@ syntax (e.g.  EasyList, EasyPrivacy) filter parsing and matching.")
         ("rust-findshlibs" ,rust-findshlibs-0.10)
         ("rust-memmap" ,rust-memmap-0.7)
         ("rust-rustc-test" ,rust-rustc-test-0.3)
-        ("rust-typed-arena" ,rust-typed-arena-2))))
-    (home-page "https://github.com/gimli-rs/addr2line")
-    (synopsis "Symbolication library written in Rust, using gimli")
-    (description
-     "This package provides a cross-platform symbolication library written in
-Rust, using gimli.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-typed-arena" ,rust-typed-arena-2))))))
+
+(define-public rust-addchain-0.2
+  (package
+    (name "rust-addchain")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "addchain" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0w45hpybsx9gzhlxf6x9451kycg8xwj3x8qzjnk8wqm55926jbiv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-num-bigint" ,rust-num-bigint-0.3)
+        ("rust-num-integer" ,rust-num-integer-0.1)
+        ("rust-num-traits" ,rust-num-traits-0.2))))
+    (home-page "https://github.com/str4d/addchain")
+    (synopsis "Generate addition chains")
+    (description "Generate addition chains")
+    (license (list license:expat license:asl2.0))))
 
 (define-public rust-addr-0.14
   (package
@@ -1998,32 +2105,6 @@ ciphers implementations.")
         ("rust-aesni" ,rust-aesni-0.6)
         ("rust-block-cipher-trait" ,rust-block-cipher-trait-0.6))))))
 
-(define-public rust-aes-ctr-0.6
-  (package
-    (name "rust-aes-ctr")
-    (version "0.6.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "aes-ctr" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32 "0qspjxzrclnb83501595y01dhc0km1ssrbjnwlxhcrsdwp6w6abp"))))
-  (build-system cargo-build-system)
-  (arguments
-   `(#:cargo-inputs
-     (("rust-aes-soft" ,rust-aes-soft-0.6)
-      ("rust-aesni" ,rust-aesni-0.10)
-      ("rust-cipher" ,rust-cipher-0.2)
-      ("rust-ctr", rust-ctr-0.6))
-     #:cargo-development-inputs
-     (("rust-cipher" ,rust-cipher-0.2))))
-  (home-page "https://github.com/RustCrypto/block-ciphers/tree/master/aes")
-  (synopsis "Pure Rust implementation of AES")
-  (description "A pure Rust implementation of the Advanced Encryption Standard
-(AES).  Use the aes crate if possible, as the aes-ctr has been deprecated.")
-  (license (list license:expat license:asl2.0))))
-
 (define-public rust-aes-gcm-0.10
   (package
     (name "rust-aes-gcm")
@@ -2263,8 +2344,43 @@ This package is deprecated and was replaced by the @code{aes} crate.")
         ("rust-opaque-debug" ,rust-opaque-debug-0.2)
         ("rust-stream-cipher" ,rust-stream-cipher-0.3))))))
 
+(define-public rust-afl-0.12
+  (package
+    (name "rust-afl")
+    (version "0.12.17")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "afl" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "05f7wrz15h97b6xqa914syiv6ij849ndgyb5iwmgwkv26qpjzhzn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; We don't want to add AFL as an input.
+       #:cargo-inputs
+       (("rust-clap" ,rust-clap-4)
+        ("rust-fs-extra" ,rust-fs-extra-1)
+        ("rust-home" ,rust-home-0.5)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-rustc-version" ,rust-rustc-version-0.4)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-xdg" ,rust-xdg-2))
+       #:cargo-development-inputs
+       (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-assert-cmd" ,rust-assert-cmd-2)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/rust-fuzz/afl.rs")
+    (synopsis
+     "Fuzzing Rust code with american-fuzzy-lop")
+    (description
+     "Fuzz Rust code with american-fuzzy-lop.")
+    (license license:asl2.0)))
+
 (define-public rust-afl-0.8
   (package
+    (inherit rust-afl-0.12)
     (name "rust-afl")
     (version "0.8.0")
     (source
@@ -2276,7 +2392,6 @@ This package is deprecated and was replaced by the @code{aes} crate.")
        (sha256
         (base32
          "1rw11hycfjhqbc7z1smn75m0sczq519msjwimxh7b8s6n4pzk5r7"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -2288,13 +2403,7 @@ This package is deprecated and was replaced by the @code{aes} crate.")
         ("rust-xdg" ,rust-xdg-2))
        #:cargo-development-inputs
        (("rust-rustc-version" ,rust-rustc-version-0.2)
-        ("rust-xdg" ,rust-xdg-2))))
-    (home-page "https://github.com/rust-fuzz/afl.rs")
-    (synopsis
-     "Fuzzing Rust code with american-fuzzy-lop")
-    (description
-     "Fuzz Rust code with american-fuzzy-lop.")
-    (license license:asl2.0)))
+        ("rust-xdg" ,rust-xdg-2))))))
 
 (define-public rust-ahash-0.8
   (package
@@ -2366,7 +2475,7 @@ using AES-NI for high performance.")
   (package
     (inherit rust-ahash-0.7)
     (name "rust-ahash")
-    (version "0.4.4")
+    (version "0.4.7")
     (source
      (origin
        (method url-fetch)
@@ -2374,7 +2483,7 @@ using AES-NI for high performance.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "06bxygcis4pfx0axi1ld0lclg8mf4plywdy7fnkyw2hrhcb74rkd"))))
+         "0vm13qaz4nzj0gd397d36wpyav05bflg6m2nbhs82nb0ns6lm7vk"))))
     (arguments
      `(#:cargo-inputs
        (("rust-const-random" ,rust-const-random-0.1))
@@ -2437,26 +2546,43 @@ using AES-NI for high performance.")
         ("rust-rand" ,rust-rand-0.6)
         ("rust-seahash" ,rust-seahash-3))))))
 
-(define-public rust-aho-corasick-0.7
+(define-public rust-aho-corasick-1
   (package
     (name "rust-aho-corasick")
-    (version "0.7.20")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "aho-corasick" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1b3if3nav4qzgjz9bf75b2cv2h2yisrqfs0np70i38kgz4cn94yc"))))
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "aho-corasick" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0has59a3571irggpk5z8c0lpnx8kdx12qf4g2x0560i2y8dwpxj3"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-memchr" ,rust-memchr-2))))
+       (("rust-log" ,rust-log-0.4)
+        ("rust-memchr" ,rust-memchr-2))
+       #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3))))
     (home-page "https://github.com/BurntSushi/aho-corasick")
     (synopsis "Fast multiple substring searching")
     (description "This package provides a fast multiple substring searching.")
     (license (list license:unlicense license:expat))))
 
+(define-public rust-aho-corasick-0.7
+  (package
+    (inherit rust-aho-corasick-1)
+    (name "rust-aho-corasick")
+    (version "0.7.20")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "aho-corasick" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1b3if3nav4qzgjz9bf75b2cv2h2yisrqfs0np70i38kgz4cn94yc"))))
+    (arguments
+     `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2))))))
+
 (define-public rust-aho-corasick-0.6
   (package
     (inherit rust-aho-corasick-0.7)
@@ -2706,6 +2832,26 @@ address that is aliasable when coerced to a raw pointer")
 types.")
     (license license:expat)))
 
+(define-public rust-aligned-0.4
+  (package
+    (name "rust-aligned")
+    (version "0.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "aligned" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0md67hsr0yw5qydr9hjlfz4wfxbbl39y7abkhpycf9m682a1p8l0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-as-slice" ,rust-as-slice-0.2))))
+    (home-page "https://github.com/japaric/aligned")
+    (synopsis "Newtype with alignment of at least `A` bytes")
+    (description
+     "This package provides a newtype with alignment of at least `A` bytes.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-alloc-no-stdlib-2
   (package
     (name "rust-alloc-no-stdlib")
@@ -2750,6 +2896,26 @@ options to use calloc or a mutable global variable for pre-zeroed memory.")
 be used with the stdlib.")
     (license license:bsd-3)))
 
+(define-public rust-allocator-api2-0.2
+  (package
+    (name "rust-allocator-api2")
+    (version "0.2.15")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "allocator-api2" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1sdgkqs0pyk61m4yjksl5fv8wld11s5rp7v4v3p5hhccvkw6rz2n"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--lib")
+       #:cargo-inputs (("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/zakarumych/allocator-api2")
+    (synopsis "Mirror of Rust's allocator API")
+    (description "Mirror of Rust's allocator API.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-always-assert-0.1
   (package
     (name "rust-always-assert")
@@ -2986,17 +3152,50 @@ it outputs messages to Android's logcat.")
 escape codes.")
     (license license:mpl2.0)))
 
-(define-public rust-anstyle-0.2
+(define-public rust-anstream-0.3
+  (package
+    (name "rust-anstream")
+    (version "0.3.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "anstream" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0qzinx9c8zfq3xqpxzmlv6nrm3ymccr4n8gffkdmj31p50v4za0c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anstyle" ,rust-anstyle-1)
+        ("rust-anstyle-parse" ,rust-anstyle-parse-0.2)
+        ("rust-anstyle-query" ,rust-anstyle-query-1)
+        ("rust-anstyle-wincon" ,rust-anstyle-wincon-1)
+        ("rust-colorchoice" ,rust-colorchoice-1)
+        ("rust-is-terminal" ,rust-is-terminal-0.4)
+        ("rust-utf8parse" ,rust-utf8parse-0.2))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-owo-colors" ,rust-owo-colors-3)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1))))
+    (home-page "https://github.com/rust-cli/anstyle")
+    (synopsis "Library for writing colored text to a terminal")
+    (description
+     "This package provides a simple cross platform library for writing colored
+text to a terminal.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-anstyle-1
   (package
     (name "rust-anstyle")
-    (version "0.2.8")
+    (version "1.0.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "anstyle" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "10kdjcyks9hcvmhk44afagnrxi4pczg6jnldjdadzbi4kyi2wqah"))))
+                "0zbazbfqs4mfw93573f61iy8c78vbbv824m3w206bbljpy39mva1"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
@@ -3006,6 +3205,92 @@ escape codes.")
     (description "This package provides ANSI text styling.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-anstyle-0.2
+  (package
+    (inherit rust-anstyle-1)
+    (name "rust-anstyle")
+    (version "0.2.8")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "anstyle" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "10kdjcyks9hcvmhk44afagnrxi4pczg6jnldjdadzbi4kyi2wqah"))))
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-lexopt" ,rust-lexopt-0.3))))))
+
+(define-public rust-anstyle-parse-0.2
+  (package
+    (name "rust-anstyle-parse")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "anstyle-parse" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1vjprf080adyxxpls9iwwny3g7irawfns9s2cj9ngq28dqhzsrg7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Not all files included.
+       #:cargo-inputs
+       (("rust-arrayvec" ,rust-arrayvec-0.7)
+        ("rust-utf8parse" ,rust-utf8parse-0.2))
+       #:cargo-development-inputs
+       (("rust-codegenrs" ,rust-codegenrs-2)
+        ("rust-criterion" ,rust-criterion-0.4)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-snapbox" ,rust-snapbox-0.4)
+        ("rust-vte-generate-state-changes" ,rust-vte-generate-state-changes-0.1))))
+    (home-page "https://github.com/rust-cli/anstyle")
+    (synopsis "Parse ANSI Style Escapes")
+    (description "Parse ANSI Style Escapes")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-anstyle-query-1
+  (package
+    (name "rust-anstyle-query")
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "anstyle-query" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0js9bgpqz21g0p2nm350cba1d0zfyixsma9lhyycic5sw55iv8aw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-windows-sys" ,rust-windows-sys-0.48))))
+    (home-page "https://github.com/rust-cli/anstyle")
+    (synopsis "Look up colored console capabilities")
+    (description "Look up colored console capabilities")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-anstyle-wincon-1
+  (package
+    (name "rust-anstyle-wincon")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "anstyle-wincon" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "12714vwjf4c1wm3qf49m5vmd93qvq2nav6zpjc0bxbh3ayjby2hq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anstyle" ,rust-anstyle-1)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs
+       (("rust-lexopt" ,rust-lexopt-0.3))))
+    (home-page "https://github.com/rust-cli/anstyle")
+    (synopsis "Styling legacy Windows terminals")
+    (description "Styling legacy Windows terminals")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-antidote-1
   (package
     (name "rust-antidote")
@@ -3305,7 +3590,7 @@ coverage-guided, mutation-based fuzzers.")
   (package
     (inherit rust-arc-swap-1)
     (name "rust-arc-swap")
-    (version "0.4.4")
+    (version "0.4.8")
     (source
      (origin
        (method url-fetch)
@@ -3314,16 +3599,17 @@ coverage-guided, mutation-based fuzzers.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1zwswfi9n7n3hiq51w1xv34572k2diazx680rrxlc9w07c9akf6p"))))
+         "1a3vg89xc7r2166mc25ciw3rbqfxjylfbjwlq4wrfy433wc5mgns"))))
     (arguments
-     `(#:cargo-development-inputs
-       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)
-        ("rust-itertools" ,rust-itertools-0.8)
-        ("rust-model" ,rust-model-0.1)
+     `(;; These tests require network access.
+       #:cargo-test-flags '("--release" "--" "--skip=test_html_root_url")
+       #:cargo-development-inputs
+       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)
+        ("rust-itertools" ,rust-itertools-0.9)
         ("rust-num-cpus" ,rust-num-cpus-1)
         ("rust-once-cell" ,rust-once-cell-1)
-        ("rust-proptest" ,rust-proptest-0.8)
-        ("rust-version-sync" ,rust-version-sync-0.8))))))
+        ("rust-proptest" ,rust-proptest-0.9)
+        ("rust-version-sync" ,rust-version-sync-0.9))))))
 
 (define-public rust-arg-enum-proc-macro-0.3
   (package
@@ -3438,6 +3724,28 @@ coverage-guided, mutation-based fuzzers.")
 too long errors.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-ariadne-0.1
+  (package
+    (name "rust-ariadne")
+    (version "0.1.6")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ariadne" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1dhxrhqgdwbl7v03m29zv4rb2fvjgw8a82lybp5xhzjp97khkm83"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-concolor" ,rust-concolor-0.0.11)
+        ("rust-unicode-width" ,rust-unicode-width-0.1)
+        ("rust-yansi" ,rust-yansi-0.5))))
+    (home-page "https://github.com/zesterer/ariadne")
+    (synopsis "Fancy diagnostics & reporting crate")
+    (description "This package provides a fancy diagnostics & reporting crate.")
+    (license license:expat)))
+
 (define-public rust-arr-macro-impl-0.1
   (package
     (name "rust-arr-macro-impl")
@@ -3631,17 +3939,17 @@ ArrayVec and ArrayString.")
 (define-public rust-arrow-5
   (package
     (name "rust-arrow")
-    (version "5.2.0")
+    (version "5.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "arrow" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1zj2sjlnkwz2sdfc83zcz75vg1d3900h8ix15nkjsbz5hd1pzvri"))))
+        (base32 "0c8j4766cfjc04dmcyayigbn6mim9cfys78a64ilw26qrxpyhy16"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f
        #:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-chrono" ,rust-chrono-0.4)
@@ -3660,7 +3968,11 @@ ArrayVec and ArrayString.")
         ("rust-regex" ,rust-regex-1)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-serde-json" ,rust-serde-json-1))))
+        ("rust-serde-json" ,rust-serde-json-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/apache/arrow-rs")
     (synopsis "Rust implementation of Apache Arrow")
     (description
@@ -3668,39 +3980,6 @@ ArrayVec and ArrayString.")
 format.")
     (license license:asl2.0)))
 
-(define-public rust-arrow-4
-  (package
-    (inherit rust-arrow-5)
-    (name "rust-arrow")
-    (version "4.4.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "arrow" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "141qb0yqk179n324qrhbv14ysz13mcfsw00d6m09882gx9637wzn"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-cfg-aliases" ,rust-cfg-aliases-0.1)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-csv" ,rust-csv-1)
-        ("rust-flatbuffers" ,rust-flatbuffers-0.8)
-        ("rust-hex" ,rust-hex-0.4)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-lexical-core" ,rust-lexical-core-0.7)
-        ("rust-multiversion" ,rust-multiversion-0.6)
-        ("rust-num" ,rust-num-0.4)
-        ("rust-packed-simd-2" ,rust-packed-simd-2-0.3)
-        ("rust-prettytable-rs" ,rust-prettytable-rs-0.8)
-        ("rust-rand" ,rust-rand-0.7)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-serde-json" ,rust-serde-json-1))))))
-
 (define-public rust-arrow-format-0.3
   (package
     (name "rust-arrow-format")
@@ -3778,49 +4057,6 @@ code of Apache Arrow spec.")
 a re-write of the official Arrow crate using transmute-free operations.")
     (license license:asl2.0)))
 
-(define-public rust-arrow2-0.5
-  (package
-    (inherit rust-arrow2-0.7)
-    (name "rust-arrow2")
-    (version "0.5.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "arrow2" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "042m859jfffnhi84qc919pkyanlr98wqqf67pcrylk4hhh0v84xx"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-ahash" ,rust-ahash-0.7)
-        ("rust-base64" ,rust-base64-0.13)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-chrono-tz" ,rust-chrono-tz-0.5)
-        ("rust-comfy-table" ,rust-comfy-table-4)
-        ("rust-csv" ,rust-csv-1)
-        ("rust-flatbuffers" ,rust-flatbuffers-2)
-        ("rust-futures" ,rust-futures-0.3)
-        ("rust-hash-hasher" ,rust-hash-hasher-2)
-        ("rust-hex" ,rust-hex-0.4)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-itertools" ,rust-itertools-0.10)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-lexical-core" ,rust-lexical-core-0.8)
-        ("rust-lz4" ,rust-lz4-1)
-        ("rust-multiversion" ,rust-multiversion-0.6)
-        ("rust-num-traits" ,rust-num-traits-0.2)
-        ("rust-packed-simd-2" ,rust-packed-simd-2-0.3)
-        ("rust-parquet2" ,rust-parquet2-0.4)
-        ("rust-rand" ,rust-rand-0.8)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-streaming-iterator" ,rust-streaming-iterator-0.1)
-        ("rust-strength-reduce" ,rust-strength-reduce-0.2)
-        ("rust-zstd" ,rust-zstd-0.9))))))
-
 (define-public rust-article-scraper-1
   (package
     (name "rust-article-scraper")
@@ -3916,36 +4152,6 @@ extracted from Askama.")
     (description "This package provides shared code for Askama.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-askama-shared-0.11
-  (package
-    (inherit rust-askama-shared-0.12)
-    (name "rust-askama-shared")
-    (version "0.11.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "askama_shared" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1g3ksf5is0qwx9rd5lxn5gbvxfcpby5gl9cahg26wl1w1xzbg0i5"))))
-    (arguments
-     (list #:skip-build? #t
-           #:cargo-inputs
-           `(("rust-askama-escape" ,rust-askama-escape-0.10)
-             ("rust-humansize" ,rust-humansize-1)
-             ("rust-nom" ,rust-nom-6)
-             ("rust-num-traits" ,rust-num-traits-0.2)
-             ("rust-percent-encoding"
-              ,rust-percent-encoding-2)
-             ("rust-proc-macro2" ,rust-proc-macro2-1)
-             ("rust-quote" ,rust-quote-1)
-             ("rust-serde" ,rust-serde-1)
-             ("rust-serde-derive" ,rust-serde-derive-1)
-             ("rust-serde-json" ,rust-serde-json-1)
-             ("rust-serde-yaml" ,rust-serde-yaml-0.8)
-             ("rust-syn" ,rust-syn-1)
-             ("rust-toml" ,rust-toml-0.5))))))
-
 (define-public rust-askama-derive-0.11
   (package
     (name "rust-askama-derive")
@@ -4020,19 +4226,6 @@ library for Rust.")
      "This package provides #[derive] support for @code{asn1}.")
     (license license:bsd-3)))
 
-(define-public rust-asn1-derive-0.8
-  (package
-    (inherit rust-asn1-derive-0.13)
-    (name "rust-asn1-derive")
-    (version "0.8.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "asn1_derive" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "098w0mxz4bx9w7v72gsl5wva6f0qbvzyc52m0s0n8svqbyh4z2dw"))))))
-
 (define-public rust-asn1-0.13
   (package
     (name "rust-asn1")
@@ -4057,28 +4250,112 @@ library for Rust.")
      "This is a Rust library for parsing and generating ASN.1 data (DER only).")
     (license license:bsd-3)))
 
-(define-public rust-asn1-0.8
+(define-public rust-asn1-rs-0.5
   (package
-    (inherit rust-asn1-0.13)
-    (name "rust-asn1")
-    (version "0.8.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "asn1" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1caacmvgn463n1yc4ac6vl9phrh56ij7l3xgf6qgzbpyjm8v7zyg"))))
+    (name "rust-asn1-rs")
+    (version "0.5.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "asn1-rs" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1w7zq0392qs7kkv0nzw50bfqvq7q9zxv48fsp3sxyl83mzfxavvz"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-asn1-derive" ,rust-asn1-derive-0.8)
-        ("rust-chrono" ,rust-chrono-0.4))
+       (("rust-asn1-rs-derive" ,rust-asn1-rs-derive-0.4)
+        ("rust-asn1-rs-impl" ,rust-asn1-rs-impl-0.1)
+        ("rust-bitvec" ,rust-bitvec-1)
+        ("rust-cookie-factory" ,rust-cookie-factory-0.3)
+        ("rust-displaydoc" ,rust-displaydoc-0.2)
+        ("rust-nom" ,rust-nom-7)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-rusticata-macros" ,rust-rusticata-macros-4)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-time" ,rust-time-0.3))
        #:cargo-development-inputs
-       (("rust-libc" ,rust-libc-0.2))))))
+       (("rust-colored" ,rust-colored-2)
+        ("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-oid-registry" ,rust-oid-registry-0.6)
+        ("rust-pem" ,rust-pem-1)
+        ("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://github.com/rusticata/asn1-rs")
+    (synopsis "Parser/encoder for ASN.1 BER/DER data")
+    (description "Parser/encoder for ASN.1 BER/DER data")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-asn1-rs-derive-0.4
+  (package
+    (name "rust-asn1-rs-derive")
+    (version "0.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "asn1-rs-derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0v7fgmnzk7jjxv51grhwzcx5bf167nlqwk3vcmq7xblf5s4karbj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1)
+        ("rust-synstructure" ,rust-synstructure-0.12))))
+    (home-page "https://github.com/rusticata/asn1-rs")
+    (synopsis "Derive macros for the `asn1-rs` crate")
+    (description
+     "This package provides derive macros for the @code{asn1-rs} crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-asn1-rs-impl-0.1
+  (package
+    (name "rust-asn1-rs-impl")
+    (version "0.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "asn1-rs-impl" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1va27bn7qxqp4wanzjlkagnynv6jnrhnwmcky2ahzb1r405p6xr7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/rusticata/asn1-rs")
+    (synopsis "Implementation details for the `asn1-rs` crate")
+    (description
+     "This package provides implementation details for the @code{asn1-rs} crate.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-as-slice-0.2
+  (package
+    (name "rust-as-slice")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "as-slice" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "05j52y1ws8kir5zjxnl48ann0if79sb56p9nm76hvma01r7nnssi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))
+    (home-page "https://github.com/japaric/as-slice")
+    (synopsis "AsSlice and AsMutSlice traits")
+    (description "This package provides @code{AsSlice} and @code{AsMutSlice}
+traits.")
+    (license (list license:expat license:asl2.0))))
 
 (define-public rust-as-slice-0.1
   (package
+    (inherit rust-as-slice-0.2)
     (name "rust-as-slice")
     (version "0.1.5")
     (source
@@ -4089,18 +4366,12 @@ library for Rust.")
        (sha256
         (base32
          "1q3a9494ikaq38zjg5px5gwwrbdgnyj23b505224njlmwd4knh25"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-generic-array-0.14" ,rust-generic-array-0.14)
         ("rust-generic-array-0.13" ,rust-generic-array-0.13)
         ("rust-generic-array-0.12" ,rust-generic-array-0.12)
-        ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))
-    (home-page "https://github.com/japaric/as-slice")
-    (synopsis "AsSlice and AsMutSlice traits")
-    (description "This package provides @code{AsSlice} and @code{AsMutSlice}
-traits.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))))
 
 (define-public rust-ascii-1
   (package
@@ -4359,6 +4630,23 @@ assertions on the result of your program's run.")
      "This crate provides file system fixtures and assertions for testing.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-assert-impl-0.1
+  (package
+    (name "rust-assert-impl")
+    (version "0.1.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "assert-impl" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "17jvig9rwdc1sf1j5q8q9k69njg3k8g7x7g6wcb711hcvq9l6in3"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/upsuper/assert-impl")
+    (synopsis "Macro for static assert types implement a trait or not")
+    (description "Macro for static assert types implement a trait or not")
+    (license license:expat)))
+
 (define-public rust-assert-json-diff-1
   (package
     (name "rust-assert-json-diff")
@@ -4432,31 +4720,6 @@ objects are the same.")
 capacity and random or least recently used (LRU) replacement.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-aster-0.41
-  (package
-    (name "rust-aster")
-    (version "0.41.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "aster" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1q704kn23wnwnrxml7w1mxw6a3xb6386x5wgys6ibnyramrxzksc"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-clippy" ,rust-clippy-0.0)
-        ("rust-compiletest-rs" ,rust-compiletest-rs-0.2)
-        ("rust-syntex-syntax" ,rust-syntex-syntax-0.58))))
-    (home-page "https://github.com/serde-rs/aster")
-    (synopsis "Libsyntax ast builder")
-    (description "This package provides a libsyntax ast builder.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-async-attributes-1
   (package
     (name "rust-async-attributes")
@@ -4482,6 +4745,33 @@ capacity and random or least recently used (LRU) replacement.")
 Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-async-broadcast-0.5
+  (package
+    (name "rust-async-broadcast")
+    (version "0.5.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "async-broadcast" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0avdqbci1qdlfc4glc3wqrb0wi5ffc7bqv2q1wg14syayvdwqj3w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-event-listener" ,rust-event-listener-2)
+        ("rust-futures-core" ,rust-futures-core-0.3))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-easy-parallel" ,rust-easy-parallel-3)
+        ("rust-futures-lite" ,rust-futures-lite-1)
+        ("rust-futures-util" ,rust-futures-util-0.3))))
+    (home-page "https://github.com/smol-rs/async-broadcast")
+    (synopsis "Async broadcast channels")
+    (description "This package provides async broadcast channels in Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-async-channel-1
   (package
     (name "rust-async-channel")
@@ -4610,27 +4900,30 @@ AsyncSeek if the inner type does.")
 (define-public rust-async-executor-1
   (package
     (name "rust-async-executor")
-    (version "1.4.0")
+    (version "1.5.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "async-executor" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0ilivvzc082ynr096xxghc8hdmlmacxilcpn738ylh5lqxq7k1zb"))))
+        (base32 "1yrs723d4djhia5mimc85blrvly0kl8bj260b5vz0r4559gxr8vg"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-async-task" ,rust-async-task-4)
-        ("rust-concurrent-queue" ,rust-concurrent-queue-1)
+       (("rust-async-lock" ,rust-async-lock-2)
+        ("rust-async-task" ,rust-async-task-4)
+        ("rust-concurrent-queue" ,rust-concurrent-queue-2)
         ("rust-fastrand" ,rust-fastrand-1)
         ("rust-futures-lite" ,rust-futures-lite-1)
-        ("rust-once-cell" ,rust-once-cell-1)
-        ("rust-vec-arena" ,rust-vec-arena-1))
+        ("rust-slab" ,rust-slab-0.4))
        #:cargo-development-inputs
        (("rust-async-channel" ,rust-async-channel-1)
         ("rust-async-io" ,rust-async-io-1)
-        ("rust-easy-parallel" ,rust-easy-parallel-3))))
+        ("rust-criterion" ,rust-criterion-0.4)
+        ("rust-easy-parallel" ,rust-easy-parallel-3)
+        ("rust-num-cpus" ,rust-num-cpus-1)
+        ("rust-once-cell" ,rust-once-cell-1))))
     (home-page "https://github.com/stjepang/async-executor")
     (synopsis "Async executor")
     (description "This library provides async executors.")
@@ -4727,38 +5020,40 @@ AsyncSeek if the inner type does.")
 (define-public rust-async-io-1
   (package
     (name "rust-async-io")
-    (version "1.3.1")
+    (version "1.13.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "async-io" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1zg0bvb58615qar6ih3ddr1cyjh0fsrfdhpy90z1qxjnfpqgh5ck"))))
+        (base32 "1byj7lpw0ahk6k63sbc9859v68f28hpaab41dxsjj1ggjdfv9i8g"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-concurrent-queue" ,rust-concurrent-queue-1)
-        ("rust-fastrand" ,rust-fastrand-1)
+       (("rust-async-lock" ,rust-async-lock-2)
+        ("rust-autocfg" ,rust-autocfg-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-concurrent-queue" ,rust-concurrent-queue-2)
         ("rust-futures-lite" ,rust-futures-lite-1)
-        ("rust-libc" ,rust-libc-0.2)
         ("rust-log" ,rust-log-0.4)
-        ("rust-nb-connect" ,rust-nb-connect-1)
-        ("rust-once-cell" ,rust-once-cell-1)
         ("rust-parking" ,rust-parking-2)
         ("rust-polling" ,rust-polling-2)
-        ("rust-vec-arena" ,rust-vec-arena-1)
-        ("rust-waker-fn" ,rust-waker-fn-1)
-        ("rust-winapi" ,rust-winapi-0.3))
+        ("rust-rustix" ,rust-rustix-0.37)
+        ("rust-slab" ,rust-slab-0.4)
+        ("rust-socket2" ,rust-socket2-0.4)
+        ("rust-waker-fn" ,rust-waker-fn-1))
        #:cargo-development-inputs
        (("rust-async-channel" ,rust-async-channel-1)
         ("rust-async-net" ,rust-async-net-1)
-        ("rust-inotify" ,rust-inotify-0.8)
-        ("rust-nix" ,rust-nix-0.18)
-        ("rust-signal-hook" ,rust-signal-hook-0.1)
+        ("rust-blocking" ,rust-blocking-1)
+        ("rust-criterion" ,rust-criterion-0.4)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-inotify" ,rust-inotify-0.10)
+        ("rust-signal-hook" ,rust-signal-hook-0.3)
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-timerfd" ,rust-timerfd-1)
-        ("rust-uds-windows" ,rust-uds-windows-0.1))))
+        ("rust-uds-windows" ,rust-uds-windows-1))))
     (home-page "https://github.com/stjepang/async-io")
     (synopsis "Async I/O and timers")
     (description
@@ -4770,19 +5065,23 @@ that expires at a point in time.")
 (define-public rust-async-lock-2
   (package
     (name "rust-async-lock")
-    (version "2.3.0")
+    (version "2.7.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "async-lock" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1yrvnshs94aiimvprqkhcg1z7x9abzsja8f4ifcakr5x6abn15hr"))))
+        (base32 "1mrd4kai92fcgl9974dpmibiq6ja9drz41v3crvv0c27a8kzf97s"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-event-listener" ,rust-event-listener-2))))
+     `(#:cargo-inputs
+       (("rust-event-listener" ,rust-event-listener-2))
+       #:cargo-development-inputs
+       (("rust-async-channel" ,rust-async-channel-1)
+        ("rust-fastrand" ,rust-fastrand-1)
+        ("rust-futures-lite" ,rust-futures-lite-1)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
     (home-page "https://github.com/stjepang/async-lock")
     (synopsis "Async synchronization primitives")
     (description "This package provides Async synchronization primitives.")
@@ -4949,6 +5248,32 @@ primitives:
      "Async networking primitives for TCP/UDP/Unix communication")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-async-oneshot-0.5
+  (package
+    (name "rust-async-oneshot")
+    (version "0.5.9")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "async-oneshot" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0qslzzfz3j0fb4lvsmq5nx6lkjfbdq5sjmsl7xgj0hym08mdwixf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f          ; Uses unstable features.
+       #:cargo-inputs
+       (("rust-futures-micro" ,rust-futures-micro-0.5))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-futures-lite" ,rust-futures-lite-1)
+        ("rust-waker-fn" ,rust-waker-fn-1))))
+    (home-page "https://github.com/irrustible/async-oneshot")
+    (synopsis "Async-aware oneshot channel")
+    (description "This package provides a fast, small, full-featured,
+async-aware oneshot channel.")
+    (license license:mpl2.0)))
+
 (define-public rust-async-process-1
   (package
     (name "rust-async-process")
@@ -5008,6 +5333,32 @@ implementing async state machines that can later be wrapped in dedicated
 futures.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-async-recursion-1
+  (package
+    (name "rust-async-recursion")
+    (version "1.0.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "async-recursion" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1fhwz7jqgsakbjsr2nrsvgs245l1m5dkzir6f9fxw4ngwrywx5qf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; TODO: Tests unexpectedly pass.
+       #:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs
+       (("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://github.com/dcchut/async-recursion")
+    (synopsis "Recursion for async functions")
+    (description "This package provides recursion for async functions in Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-async-std-1
   (package
     (name "rust-async-std")
@@ -5161,20 +5512,24 @@ crate.")
 (define-public rust-async-task-4
   (package
     (name "rust-async-task")
-    (version "4.0.3")
+    (version "4.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "async-task" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1w0a1c8jim6s5bvcyiiwg9m4bdv3xnd4hbjm97ndgmphmgg32679"))))
+        (base32 "1bis5aqnjw3gxridzpq2cwrlj4y8alrfqy19rly6ag2vh50spizc"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
        (("rust-atomic-waker" ,rust-atomic-waker-1)
         ("rust-easy-parallel" ,rust-easy-parallel-3)
-        ("rust-flume" ,rust-flume-0.10))))
+        ("rust-flaky-test" ,rust-flaky-test-0.1)
+        ("rust-flume" ,rust-flume-0.10)
+        ("rust-futures-lite" ,rust-futures-lite-1)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-smol" ,rust-smol-1))))
     (home-page "https://github.com/stjepang/async-task")
     (synopsis "Task abstraction for building executors")
     (description
@@ -5247,7 +5602,7 @@ crate.")
 (define-public rust-async-trait-0.1
   (package
     (name "rust-async-trait")
-    (version "0.1.57")
+    (version "0.1.71")
     (source
      (origin
        (method url-fetch)
@@ -5255,18 +5610,18 @@ crate.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0vw256zb104ni4lw0r5j3jdws54r9n01mvl8gs6pacmwp1348ikn"))))
+         "1grf5p4m1bb79isbb3g4b8w7wpz51sw003a88x69ql2nvlhxar55"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))
+        ("rust-syn" ,rust-syn-2))
        #:cargo-development-inputs
-       (("rust-rustversion" ,rust-rustversion-1)
+       (("rust-futures" ,rust-futures-0.3)
+        ("rust-rustversion" ,rust-rustversion-1)
         ("rust-tracing" ,rust-tracing-0.1)
         ("rust-tracing-attributes" ,rust-tracing-attributes-0.1)
-        ("rust-tracing-futures" ,rust-tracing-futures-0.2)
         ("rust-trybuild" ,rust-trybuild-1))))
     (home-page "https://github.com/dtolnay/async-trait")
     (synopsis "Type erasure for async trait methods")
@@ -5508,7 +5863,7 @@ bytes or encoder from file extension.")
 (define-public rust-automod-1
   (package
     (name "rust-automod")
-    (version "1.0.0")
+    (version "1.0.11")
     (source
      (origin
        (method url-fetch)
@@ -5517,15 +5872,13 @@ bytes or encoder from file extension.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1z8kdbvvz0k8mfs45mvs16lr9xj59cdcp0sm45fawfh93gai4mhg"))))
+         "057sa45859nb8arbshkqc6va8b8jf5a8vx6zr739viibqbj989md"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))
-       ;; Tests not included in tar.
-       #:tests? #f))
+        ("rust-syn" ,rust-syn-2))))
     (home-page "https://github.com/dtolnay/automod")
     (synopsis "Pull in every source file in a directory as a module")
     (description "Pull in every source file in a directory as a module.")
@@ -5875,7 +6228,7 @@ built on the Actix ecosystem.")
 (define-public rust-backtrace-0.3
   (package
     (name "rust-backtrace")
-    (version "0.3.66")
+    (version "0.3.67")
     (source
      (origin
        (method url-fetch)
@@ -5884,23 +6237,24 @@ built on the Actix ecosystem.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "19yrfx0gprqmzphmf6qv32g93w76ny5g751ks1abdkqnsqcl7f6a"))))
+         "1jk48laqafvbyc0mn1v0didk307qc0zji3z5jcq2lpqqdmnkfg93"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f      ; Not all files included.
        #:cargo-inputs
-       (("rust-addr2line" ,rust-addr2line-0.17)
+       (("rust-addr2line" ,rust-addr2line-0.19)
         ("rust-cc" ,rust-cc-1)
         ("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-cpp-demangle" ,rust-cpp-demangle-0.3)
+        ("rust-cpp-demangle" ,rust-cpp-demangle-0.4)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-libloading" ,rust-libloading-0.7)
-        ("rust-miniz-oxide" ,rust-miniz-oxide-0.5)
-        ("rust-object" ,rust-object-0.29)
+        ("rust-miniz-oxide" ,rust-miniz-oxide-0.6)
+        ("rust-object" ,rust-object-0.30)
         ("rust-rustc-demangle" ,rust-rustc-demangle-0.1)
         ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
         ("rust-serde" ,rust-serde-1)
-        ("rust-winapi" ,rust-winapi-0.3))))
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-libloading" ,rust-libloading-0.7))))
     (home-page "https://github.com/rust-lang/backtrace-rs")
     (synopsis "Acquire a stack trace (backtrace) at runtime in a Rust program")
     (description
@@ -5967,6 +6321,27 @@ systems.")
 API for Rust.")
     (license (list license:expat license:x11 license:asl2.0))))
 
+(define-public rust-base16ct-0.2
+  (package
+    (name "rust-base16ct")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "base16ct" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1kylrjhdzk7qpknrvlphw8ywdnvvg39dizw9622w3wk5xba04zsc"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/RustCrypto/formats/tree/master/base16ct")
+    (synopsis "Rust implementation of Base16 a.k.a hexadecimal")
+    (description
+     "This package provides a pure Rust implementation of Base16 a.k.a
+hexadecimal (RFC 4648) which avoids any usages of data-dependent branches/LUTs
+and thereby provides portable \"best effort\" constant-time operation and
+embedded-friendly no_std support.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-base32-0.4
   (package
     (name "rust-base32")
@@ -6180,18 +6555,18 @@ c6e7d37.  However, this package works only up to 128 bytes.")
 (define-public rust-base64ct-1
   (package
     (name "rust-base64ct")
-    (version "1.3.3")
+    (version "1.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "base64ct" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1818i0gpg7q35s6yglmhgciwi3jwx65mqc2ipjl54jfbmm288kw7"))))
+        (base32 "0nvdba4jb8aikv60az40x2w1y96sjdq8z3yp09rwzmkhiwv1lg4c"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
-       (("rust-base64" ,rust-base64-0.13)
+       (("rust-base64" ,rust-base64-0.21)
         ("rust-proptest" ,rust-proptest-1))))
     (home-page "https://github.com/RustCrypto/formats/tree/master/base64ct")
     (synopsis "Implementation of Base64 (RFC 4648)")
@@ -6219,7 +6594,7 @@ portable \"best effort\" constant-time operation and embedded-friendly
 (define-public rust-base-x-0.2
   (package
     (name "rust-base-x")
-    (version "0.2.6")
+    (version "0.2.11")
     (source
      (origin
        (method url-fetch)
@@ -6227,14 +6602,13 @@ portable \"best effort\" constant-time operation and embedded-friendly
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1hfy0wv7j5ynd73yk1vyr32pqa77rp15lkrc54f8ky9c6hcbc80v"))))
+         "0w02sdqvg7zwm91agb2phikw4ri8jmncw32paxsv8ra1jv8ckfsc"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-development-inputs
+     `(#:cargo-development-inputs
        (("rust-bencher" ,rust-bencher-0.1)
-        ("rust-json" ,rust-json-0.11)
-        ("rust-rand" ,rust-rand-0.3))))
+        ("rust-json" ,rust-json-0.12)
+        ("rust-rand" ,rust-rand-0.8))))
     (home-page "https://github.com/OrKoN/base-x-rs")
     (synopsis "Encode/decode any base")
     (description "This library provides for encoding and decoding any base.")
@@ -6862,41 +7236,6 @@ bindings to C and C++ libraries.")
         ("rust-diff" ,rust-diff-0.1)
         ("rust-shlex" ,rust-shlex-0.1))))))
 
-(define-public rust-bindgen-0.49
-  (package
-    (inherit rust-bindgen-0.50)
-    (name "rust-bindgen")
-    (version "0.49.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "bindgen" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0vjacbvashvds5rbrlqvq5fy55wmp50iia3mnczvycap7mzhh1sc"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-cexpr" ,rust-cexpr-0.3)
-        ("rust-cfg-if" ,rust-cfg-if-0.1)
-        ("rust-clang-sys" ,rust-clang-sys-0.28)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-env-logger" ,rust-env-logger-0.6)
-        ("rust-fxhash" ,rust-fxhash-0.2)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-peeking-take-while" ,rust-peeking-take-while-0.1)
-        ("rust-proc-macro2" ,rust-proc-macro2-0.4)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-shlex" ,rust-shlex-0.1)
-        ("rust-which" ,rust-which-2))
-       #:cargo-development-inputs
-       (("rust-clap" ,rust-clap-2)
-        ("rust-diff" ,rust-diff-0.1)
-        ("rust-shlex" ,rust-shlex-0.1))))))
-
 (define-public rust-bindgen-0.48
   (package
     (inherit rust-bindgen-0.50)
@@ -6932,72 +7271,6 @@ bindings to C and C++ libraries.")
         ("rust-diff" ,rust-diff-0.1)
         ("rust-shlex" ,rust-shlex-0.1))))))
 
-(define-public rust-bindgen-0.47
-  (package
-    (inherit rust-bindgen-0.50)
-    (name "rust-bindgen")
-    (version "0.47.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "bindgen" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0b9fyq3h4lz5xfy6gv5h8v6j3hzyqcarlylvw9zc715pas1pz09a"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-cexpr" ,rust-cexpr-0.3)
-        ("rust-cfg-if" ,rust-cfg-if-0.1)
-        ("rust-clang-sys" ,rust-clang-sys-0.26)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-env-logger" ,rust-env-logger-0.6)
-        ("rust-hashbrown" ,rust-hashbrown-0.1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-peeking-take-while" ,rust-peeking-take-while-0.1)
-        ("rust-proc-macro2" ,rust-proc-macro2-0.4)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-shlex" ,rust-shlex-0.1)
-        ("rust-which" ,rust-which-2))))))
-
-(define-public rust-bindgen-0.46
-  (package
-    (inherit rust-bindgen-0.50)
-    (name "rust-bindgen")
-    (version "0.46.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "bindgen" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1qclvj5pydn5camw396b0r3nz4nn3p5wpxg4fgg1favp043pyzwg"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1)
-        ("rust-cexpr" ,rust-cexpr-0.3)
-        ("rust-cfg-if" ,rust-cfg-if-0.1)
-        ("rust-clang-sys" ,rust-clang-sys-0.26)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-env-logger" ,rust-env-logger-0.6)
-        ("rust-hashbrown" ,rust-hashbrown-0.1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-peeking-take-while" ,rust-peeking-take-while-0.1)
-        ("rust-proc-macro2" ,rust-proc-macro2-0.4)
-        ("rust-quote" ,rust-quote-0.6)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-which" ,rust-which-2))
-       #:cargo-development-inputs
-       (("rust-clap" ,rust-clap-2)
-        ("rust-diff" ,rust-diff-0.1)
-        ("rust-shlex" ,rust-shlex-0.1))))) )
-
 (define-public rust-bindgen-0.37
   (package
     (inherit rust-bindgen-0.50)
@@ -7462,28 +7735,32 @@ types.")
 (define-public rust-bitflags-2
   (package
     (name "rust-bitflags")
-    (version "2.1.0")
+    (version "2.3.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "bitflags" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1cxcbx6mm1w2d7x9xd2vcqgr69a2ydw9k110ir7rrkmmrdwyn2y7"))))
+        (base32 "0hifjw3191g3w5cwqqvbx8knrr3zchdwfc3rs6mn11p5si9yf2v3"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:tests? #f      ; Not all files included.
+       #:cargo-inputs
        (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-bytemuck" ,rust-bytemuck-1)
         ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
         ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
         ("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
        (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-bytemuck" ,rust-bytemuck-1)
         ("rust-rustversion" ,rust-rustversion-1)
         ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-serde-test" ,rust-serde-test-1)
-        ("rust-trybuild" ,rust-trybuild-1))))
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-zerocopy" ,rust-zerocopy-0.6))))
     (home-page "https://github.com/bitflags/bitflags")
     (synopsis "Macro to generate structures which behave like bitflags")
     (description "This package provides a macro to generate structures which
@@ -7872,8 +8149,33 @@ streams in big-endian and little-endian formats.")
     (description "This package provides BLAKE2 hash functions in Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-blake2b-simd-1
+  (package
+    (name "rust-blake2b-simd")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "blake2b-simd" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1g04mc4gf6jyymyj41749jhhplm3ymnc6z7rhkc1fqwclv4hsbrw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-arrayref" ,rust-arrayref-0.3)
+        ("rust-arrayvec" ,rust-arrayvec-0.7)
+        ("rust-constant-time-eq" ,rust-constant-time-eq-0.2))))
+    (home-page "https://github.com/oconnor663/blake2_simd")
+    (synopsis "Pure Rust BLAKE2b implementation with dynamic SIMD")
+    (description
+     "This package provides a pure Rust implementation of the BLAKE2b and
+BLAKE2bp hash functions.")
+    (license license:expat)))
+
 (define-public rust-blake2b-simd-0.5
   (package
+    (inherit rust-blake2b-simd-1)
     (name "rust-blake2b-simd")
     (version "0.5.10")
     (source
@@ -7885,19 +8187,12 @@ streams in big-endian and little-endian formats.")
        (sha256
         (base32
          "12icvk8ixlivv3jv5nyrg01sajp4s279zb1kmif0nfja4ms2vyyq"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-arrayref" ,rust-arrayref-0.3)
         ("rust-arrayvec" ,rust-arrayvec-0.5)
-        ("rust-constant-time-eq" ,rust-constant-time-eq-0.1))))
-    (home-page "https://github.com/oconnor663/blake2_simd")
-    (synopsis "Pure Rust BLAKE2b implementation with dynamic SIMD")
-    (description
-     "This package provides a pure Rust implementation of the BLAKE2b and
-BLAKE2bp hash functions.")
-    (license license:expat)))
+        ("rust-constant-time-eq" ,rust-constant-time-eq-0.1))))))
 
 (define-public rust-blakeout-0.3
   (package
@@ -8346,8 +8641,56 @@ programs.")
         ("rust-parking" ,rust-parking-1)
         ("rust-waker-fn" ,rust-waker-fn-1))))))
 
+(define-public rust-blowfish-0.9
+  (package
+    (name "rust-blowfish")
+    (version "0.9.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "blowfish" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1mw7bvj3bg5w8vh9xw9xawqh7ixk2xwsxkj34ph96b9b1z6y44p4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-cipher" ,rust-cipher-0.4))
+       #:cargo-development-inputs
+       (("rust-cipher" ,rust-cipher-0.4))))
+    (home-page "https://github.com/RustCrypto/block-ciphers")
+    (synopsis "Blowfish block cipher")
+    (description "Blowfish block cipher")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-botan-0.10
+  (package
+    (name "rust-botan")
+    (version "0.10.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "botan" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1vzl5pdysh848zpphsgvj9c40zdi3ynl32zzixsd8vg4vaflhb49"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-botan-sys" ,rust-botan-sys-0.10))
+       #:cargo-development-inputs
+       (("rust-hex" ,rust-hex-0.4)
+        ("rust-wycheproof" ,rust-wycheproof-0.5))))
+    (inputs (list botan))
+    (home-page "https://botan.randombit.net/")
+    (synopsis "Rust wrapper for Botan cryptography library")
+    (description "Rust wrapper for Botan cryptography library")
+    (license license:expat)))
+
 (define-public rust-botan-0.8
   (package
+    (inherit rust-botan-0.10)
     (name "rust-botan")
     (version "0.8.1")
     (source (origin
@@ -8356,20 +8699,35 @@ programs.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32 "08bmiyn7c3b0dgx20w6hr28d9jcq7cj78cchr84pc686sb2s41ik"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-botan-sys" ,rust-botan-sys-0.8)
         ("rust-cstr-core" ,rust-cstr-core-0.2)
-        ("rust-cty" ,rust-cty-0.2))))
+        ("rust-cty" ,rust-cty-0.2))))))
+
+(define-public rust-botan-sys-0.10
+  (package
+    (name "rust-botan-sys")
+    (version "0.10.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "botan-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1cbjr44gc5dhmgl43sfiqzbsma4anfi3h26m4yzsli23yd1lmyf8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-botan-src" ,rust-botan-src-0.21903))))
     (inputs (list botan))
     (home-page "https://botan.randombit.net/")
-    (synopsis "Rust wrapper for Botan cryptography library")
-    (description "Rust wrapper for Botan cryptography library")
+    (synopsis "FFI wrapper for Botan cryptography library")
+    (description "FFI wrapper for Botan cryptography library")
     (license license:expat)))
 
 (define-public rust-botan-sys-0.8
   (package
+    (inherit rust-botan-sys-0.10)
     (name "rust-botan-sys")
     (version "0.8.1")
     (source (origin
@@ -8378,28 +8736,22 @@ programs.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32 "1m11zblxfanrhl97j7z3ap7n17rr8j0rg91sr7f9j6y2bsniaz1x"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-botan-src" ,rust-botan-src-0.21703)
-        ("rust-cty" ,rust-cty-0.2))))
-    (inputs (list botan))
-    (home-page "https://botan.randombit.net/")
-    (synopsis "FFI wrapper for Botan cryptography library")
-    (description "FFI wrapper for Botan cryptography library")
-    (license license:expat)))
+        ("rust-cty" ,rust-cty-0.2))))))
 
-(define-public rust-botan-src-0.21703
+(define-public rust-botan-src-0.21903
   (package
     (name "rust-botan-src")
-    (version "0.21703.0")
+    (version "0.21903.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "botan-src" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0s2ad9q84qsrllfsbj7hjhn7gr3hab9ng6lwzwqmimia6yvja8y8"))
+                "19fhll4g0v8hbyjxg8c790l9ln5xgf4r6xdcnw438mpy81hvrdxy"))
               (modules '((guix build utils)))
               (snippet
                '(begin (delete-file-recursively "botan")))))
@@ -8410,6 +8762,22 @@ programs.")
     (description "Sources of Botan cryptography library")
     (license license:expat)))
 
+(define-public rust-botan-src-0.21703
+  (package
+    (inherit rust-botan-src-0.21903)
+    (name "rust-botan-src")
+    (version "0.21703.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "botan-src" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0s2ad9q84qsrllfsbj7hjhn7gr3hab9ng6lwzwqmimia6yvja8y8"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin (delete-file-recursively "botan")))))))
+
 (define-public rust-boxfnonce-0.1
   (package
     (name "rust-boxfnonce")
@@ -8535,7 +8903,7 @@ Bresenham's line algorithm.")
 (define-public rust-brotli-3
   (package
     (name "rust-brotli")
-    (version "3.3.0")
+    (version "3.3.4")
     (source
      (origin
        (method url-fetch)
@@ -8543,7 +8911,7 @@ Bresenham's line algorithm.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0gk1g3fx1vps2ic8kh5n32gzq9h5w1j3ff6lvjm171ph428r2abz"))))
+         "0s7z0nrv04wxniwijh5iig1w31sphc6lz38zc8lr7qlarkdv3851"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -8693,20 +9061,46 @@ alphabet.")
      "This crate provides encoding and decoding support for BSON.")
     (license license:expat)))
 
+(define-public rust-bstr-1
+  (package
+    (name "rust-bstr")
+    (version "1.6.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "bstr" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "01bvsr3x9n75klbwxym0zf939vzim0plsmy786p0zzzvrj6i9637"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-memchr" ,rust-memchr-2)
+        ("rust-regex-automata" ,rust-regex-automata-0.3)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-ucd-parse" ,rust-ucd-parse-0.1)
+        ("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))
+    (home-page "https://github.com/BurntSushi/bstr")
+    (synopsis "String type that is not required to be valid UTF-8")
+    (description
+     "This package provides a string type that is not required to be valid
+UTF-8.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-bstr-0.2
   (package
+    (inherit rust-bstr-1)
     (name "rust-bstr")
     (version "0.2.17")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "bstr" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "08rjbhysy6gg27db2h3pnhvr2mlr5vkj797i9625kwg8hgrnjdds"))))
-    (build-system cargo-build-system)
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "bstr" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "08rjbhysy6gg27db2h3pnhvr2mlr5vkj797i9625kwg8hgrnjdds"))))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -8717,13 +9111,27 @@ alphabet.")
        #:cargo-development-inputs
        (("rust-quickcheck" ,rust-quickcheck-0.8)
         ("rust-ucd-parse" ,rust-ucd-parse-0.1)
-        ("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))
-    (home-page "https://github.com/BurntSushi/bstr")
-    (synopsis
-     "String type that is not required to be valid UTF-8")
-    (description
-     "This package provides a string type that is not required to be valid
-UTF-8.")
+        ("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))))
+
+(define-public rust-buf-min-0.7
+  (package
+    (name "rust-buf-min")
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "buf-min" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "146wb3p4n62jbka6ym7sagziydcbixwhamw0cknl49w4ys66km92"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bytes" ,rust-bytes-1)
+        ("rust-ntex-bytes" ,rust-ntex-bytes-0.1))))
+    (home-page "https://github.com/botika/buf-min")
+    (synopsis "Minimal utf-8 safe buffer traits")
+    (description "This package provides mminimal utf-8 safe buffer traits.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-buf-redux-0.8
@@ -8950,6 +9358,25 @@ users can send along with a bug report.")
 constants from build.rs or a script.")
     (license license:expat)))
 
+(define-public rust-build-context-0.1
+  (package
+    (name "rust-build-context")
+    (version "0.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "build-context" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "15jnnh6vk7ifc98j08rv8v9yapzaciz7awdk4q2lrna868dnzhjh"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/taiki-e/build-context")
+    (synopsis "Build environment/target information available in libraries")
+    (description
+     "Make build environment/target information available as constants in normal
+libraries and binaries.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-built-0.5
   (package
     (name "rust-built")
@@ -8982,7 +9409,7 @@ constants from build.rs or a script.")
 (define-public rust-bumpalo-3
   (package
     (name "rust-bumpalo")
-    (version "3.7.0")
+    (version "3.13.0")
     (source
      (origin
        (method url-fetch)
@@ -8991,13 +9418,16 @@ constants from build.rs or a script.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0ccn025n0x1gc0ijjlabin2xs7dkx5yfagkskr93yw9c06pyfncw"))))
+         "1h9zmxb9d14m2sx34daz88fsjw1lx7d5mhaqbldwqgl8xzdc7qm3"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f                      ;cargo_readme_up_to_date test fails
+     `(#:tests? #f                      ; Not all files included.
+       #:cargo-inputs
+       (("rust-allocator-api2" ,rust-allocator-api2-0.2))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-quickcheck" ,rust-quickcheck-0.9))))
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-rand" ,rust-rand-0.8))))
     (home-page "https://github.com/fitzgen/bumpalo")
     (synopsis "Fast bump allocation arena for Rust")
     (description
@@ -9129,14 +9559,14 @@ of built-in fundamental numeric types.")
 (define-public rust-bytecheck-0.6
   (package
     (name "rust-bytecheck")
-    (version "0.6.10")
+    (version "0.6.11")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "bytecheck" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "07vxs7y441f7d6mjzmli80ykmfajwk9jqci549b29sr319j13zhk"))))
+                "09xnpjfhw36a973dpdd2mcmb93rrix539j49vkkgcqf878174qwb"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -9144,7 +9574,7 @@ of built-in fundamental numeric types.")
         ("rust-ptr-meta" ,rust-ptr-meta-0.1)
         ("rust-simdutf8" ,rust-simdutf8-0.1)
         ("rust-uuid" ,rust-uuid-1))))
-    (home-page "https://github.com/djkoloski/bytecheck")
+    (home-page "https://github.com/rkyv/bytecheck")
     (synopsis "Type validation framework")
     (description "This package provides a type validation framework for
 Rust.")
@@ -9173,21 +9603,21 @@ Rust.")
 (define-public rust-bytecheck-derive-0.6
   (package
     (name "rust-bytecheck-derive")
-    (version "0.6.10")
+    (version "0.6.11")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "bytecheck_derive" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1r9dlkx5w1p8d5gif2yvn6bz1856yij2fxi4wakq2vxl7ia2a4p3"))))
+                "0qdgfqx23gbjp5scbc8fhqc5kd014bpxn8hc9i9ssd8r4rplrv57"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/djkoloski/bytecheck")
+    (home-page "https://github.com/rkyv/bytecheck")
     (synopsis "Derive macro for bytecheck")
     (description "This package provides a Derive macro for bytecheck, the type
 validation framework for Rust.")
@@ -9214,22 +9644,22 @@ validation framework for Rust.")
 (define-public rust-bytecount-0.6
   (package
     (name "rust-bytecount")
-    (version "0.6.2")
+    (version "0.6.3")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "bytecount" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0bklbbl5ml9ic18s9kn5iix1grrqc6sypz6hvfn8sjc6zhgv7zkj"))))
+                "173wsvyagflb7ic3hpvp1db6q3dsigr452inslnzmsb3ix3nlrrc"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-packed-simd-2" ,rust-packed-simd-2-0.3))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-quickcheck" ,rust-quickcheck-0.9)
-        ("rust-rand" ,rust-rand-0.7))))
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-rand" ,rust-rand-0.8))))
     (home-page "https://github.com/llogiq/bytecount")
     (synopsis "Count occurrences of a given byte")
     (description
@@ -9890,31 +10320,76 @@ spreadsheet file.")
 canonical filesystem paths.")
     (license license:asl2.0)))
 
+(define-public rust-capnp-0.14
+  (package
+    (name "rust-capnp")
+    (version "0.14.11")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "capnp" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1wwp619sib07raykk93n6j7amvsinlchnicxfjnnb7bx5if0ijid"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-quickcheck" ,rust-quickcheck-0.9))
+       #:cargo-development-inputs
+       (("rust-quickcheck" ,rust-quickcheck-0.9))))
+    (home-page "https://github.com/capnproto/capnproto-rust")
+    (synopsis "Runtime library for Cap'n Proto data encoding")
+    (description "This package provides a runtime library for Cap'n Proto data
+encoding.")
+    (license license:expat)))
+
 (define-public rust-capnp-0.13
   (package
+    (inherit rust-capnp-0.14)
     (name "rust-capnp")
-    (version "0.13.6")
+    (version "0.13.7")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "capnp" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1bx2pj0ysmyd1ryd5s43m3c7n5k067x1aciqiiyg4kjswlcs6xjf"))))
-    (build-system cargo-build-system)
+        (base32 "1xkfv6mm38y4d6ykxmvs1pdfywnn3n5bklsqcsz9xh72i9ffd3s5"))))
     (arguments
      `(#:cargo-inputs
        (("rust-quickcheck" ,rust-quickcheck-0.9))
        #:cargo-development-inputs
-       (("rust-quickcheck" ,rust-quickcheck-0.9))))
-    (home-page "https://github.com/capnproto/capnproto-rust")
-    (synopsis "Runtime library for Cap'n Proto data encoding")
-    (description "This package provides a runtime library for Cap'n Proto data
-encoding.")
+       (("rust-quickcheck" ,rust-quickcheck-0.9))))))
+
+(define-public rust-capnp-futures-0.14
+  (package
+    (name "rust-capnp-futures")
+    (version "0.14.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "capnp-futures" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0fp6lr04w50mzfpxvvrbdm9pny8ch17514y7qgcsk6giqqf808cq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-capnp" ,rust-capnp-0.14)
+        ("rust-futures" ,rust-futures-0.3))
+       #:cargo-development-inputs
+       (("rust-capnp" ,rust-capnp-0.14)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-quickcheck" ,rust-quickcheck-0.9))))
+    (home-page "https://github.com/dwrensha/capnproto-rust")
+    (synopsis "Async serialization for Cap'n Proto messages")
+    (description "This package provides async serialization for Cap'n Proto
+messages.")
     (license license:expat)))
 
 (define-public rust-capnp-futures-0.13
   (package
+    (inherit rust-capnp-futures-0.14)
     (name "rust-capnp-futures")
     (version "0.13.2")
     (source
@@ -9924,22 +10399,42 @@ encoding.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "18q93ncbfcnjq7zhvy9idnifypmi2qcp775q7454y3r4lvvdcyyw"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-capnp" ,rust-capnp-0.13)
         ("rust-futures" ,rust-futures-0.3))
        #:cargo-development-inputs
        (("rust-capnp" ,rust-capnp-0.13)
-        ("rust-quickcheck" ,rust-quickcheck-0.9))))
+        ("rust-quickcheck" ,rust-quickcheck-0.9))))))
+
+(define-public rust-capnp-rpc-0.14
+  (package
+    (name "rust-capnp-rpc")
+    (version "0.14.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "capnp-rpc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0pm9bjw481lw1zp8lmzkpsjrb85lbjg5s46piqbc3wk8dzwifksc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-capnp" ,rust-capnp-0.14)
+        ("rust-capnp-futures" ,rust-capnp-futures-0.14)
+        ("rust-futures" ,rust-futures-0.3))))
+    (native-inputs
+     (list capnproto))
     (home-page "https://github.com/capnproto/capnproto-rust")
-    (synopsis "Async serialization for Cap'n Proto messages")
-    (description "This package provides async serialization for Cap'n Proto
-messages.")
+    (synopsis "Cap'n Proto remote procedure call protocol implementation")
+    (description "This package provides an implementation of the Cap'n Proto
+remote procedure call protocol")
     (license license:expat)))
 
 (define-public rust-capnp-rpc-0.13
   (package
+    (inherit rust-capnp-rpc-0.14)
     (name "rust-capnp-rpc")
     (version "0.13.1")
     (source
@@ -9949,21 +10444,13 @@ messages.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "17p0y0yk68pzsnpmaklhiqrrlrrv0ld8nhbg4qflmgibshi8b69p"))))
-    (build-system cargo-build-system)
-    (native-inputs
-     (list capnproto))
     (arguments
      `(#:cargo-inputs
        (("rust-capnp" ,rust-capnp-0.13)
         ("rust-capnp-futures" ,rust-capnp-futures-0.13)
         ("rust-futures" ,rust-futures-0.3))
        #:cargo-development-inputs
-       (("rust-capnpc" ,rust-capnpc-0.13))))
-    (home-page "https://github.com/capnproto/capnproto-rust")
-    (synopsis "Cap'n Proto remote procedure call protocol implementation")
-    (description "This package provides an implementation of the Cap'n Proto
-remote procedure call protocol")
-    (license license:expat)))
+       (("rust-capnpc" ,rust-capnpc-0.13))))))
 
 (define-public rust-capnpc-0.13
   (package
@@ -10031,10 +10518,35 @@ capabilities.")
         ("rust-error-chain" ,rust-error-chain-0.12)
         ("rust-libc" ,rust-libc-0.2))))))
 
-(define-public rust-cargo-0.68
+(define-public rust-carapace-spec-clap-0.1
+  (package
+    (name "rust-carapace-spec-clap")
+    (version "0.1.12")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "carapace-spec-clap" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1pb140siiqbljpvpck5hldmfyadi3db3s8xhcqnf9ff2ln3bs9zf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-clap" ,rust-clap-4)
+        ("rust-clap-complete" ,rust-clap-complete-4)
+        ("rust-indexmap" ,rust-indexmap-2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-yaml" ,rust-serde-yaml-0.9))
+       #:cargo-development-inputs (("rust-snapbox" ,rust-snapbox-0.4))))
+    (home-page "https://github.com/rsteube/carapace-spec-clap")
+    (synopsis "spec generation for clap-rs/clap")
+    (description "This package provides spec generation for clap-rs/clap.")
+    (license license:expat)))
+
+(define-public rust-cargo-0.69
   (package
     (name "rust-cargo")
-    (version "0.68.0")
+    (version "0.69.1")
     (source
      (origin
        (method url-fetch)
@@ -10043,7 +10555,12 @@ capabilities.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0kgj3kh3lkdviz2y2apmkkh1yy7n88aj6gfb96l0gm1w2xq80pnz"))))
+         "0m2dki3hx81vifhy2abp3j5079y3nja52arm60xp6lv24jwimkrf"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* "Cargo.toml"
+                  (("=([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)" _ version)
+                   (string-append "^" version)))))))
     (build-system cargo-build-system)
     (arguments
      `(;; The test suite is disabled as the internal 'cargo-test-macro' and
@@ -10087,6 +10604,7 @@ capabilities.")
         ("rust-opener" ,rust-opener-0.5)
         ("rust-openssl" ,rust-openssl-0.10)
         ("rust-os-info" ,rust-os-info-3)
+        ("rust-pasetors" ,rust-pasetors-0.6)
         ("rust-pathdiff" ,rust-pathdiff-0.2)
         ("rust-percent-encoding" ,rust-percent-encoding-2)
         ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)
@@ -10103,6 +10621,7 @@ capabilities.")
         ("rust-tar" ,rust-tar-0.4)
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-termcolor" ,rust-termcolor-1)
+        ("rust-time" ,rust-time-0.3)
         ("rust-toml-edit" ,rust-toml-edit-0.15)
         ("rust-unicode-width" ,rust-unicode-width-0.1)
         ("rust-unicode-xid" ,rust-unicode-xid-0.2)
@@ -10122,10 +10641,49 @@ capabilities.")
 the library crate of Cargo.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-cargo-config2-0.1
+  (package
+    (name "rust-cargo-config2")
+    (version "0.1.8")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cargo-config2" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1vxbyjd2zm75k5jx3hgqi9h5fj3j37ahrpyl1davsz5zzk1j5mj1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f          ; Not all files included.
+       #:cargo-inputs
+       (("rust-cfg-expr" ,rust-cfg-expr-0.15)
+        ("rust-home" ,rust-home-0.5)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-shell-escape" ,rust-shell-escape-0.1)
+        ("rust-toml" ,rust-toml-0.7))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-build-context" ,rust-build-context-0.1)
+        ("rust-clap" ,rust-clap-4)
+        ("rust-duct" ,rust-duct-0.13)
+        ("rust-fs-err" ,rust-fs-err-2)
+        ("rust-lexopt" ,rust-lexopt-0.3)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-toml" ,rust-toml-0.7)
+        ("rust-walkdir" ,rust-walkdir-2))))
+    (home-page "https://github.com/taiki-e/cargo-config2")
+    (synopsis "Load and resolve Cargo configuration")
+    (description "Load and resolve Cargo configuration.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-cargo-metadata-0.15
   (package
     (name "rust-cargo-metadata")
-    (version "0.15.0")
+    (version "0.15.5")
     (source
      (origin
        (method url-fetch)
@@ -10134,24 +10692,18 @@ the library crate of Cargo.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0dpcddizs4zhbvbsv3kxx9p0qppidxh05jz7dlf45f5rsm9pbfrs"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           ;; Allow older versions of the serde crates.
-           (substitute* "Cargo.toml"
-             (("1.0.136") "1.0.133")
-             (("1.0.79") "1.0.74"))))))
+         "1lsmvfznc6vlizxvjm5rvi8m6iyj0ldjhbh80h6bymdp08vl969g"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f              ; Not all tests included.
        #:cargo-inputs
        (("rust-camino" ,rust-camino-1)
         ("rust-cargo-platform" ,rust-cargo-platform-0.1)
-        ("rust-derive-builder" ,rust-derive-builder-0.11)
+        ("rust-derive-builder" ,rust-derive-builder-0.12)
         ("rust-semver" ,rust-semver-1)
         ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1))))
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1))))
     (home-page "https://github.com/oli-obk/cargo_metadata")
     (synopsis "Structured access to the output of `cargo metadata`")
     (description
@@ -10328,6 +10880,26 @@ optional dependency graph analysis.")
         ("rust-toml" ,rust-toml-0.5)
         ("rust-url" ,rust-url-2))))))
 
+(define-public rust-cargo-options-0.6
+  (package
+    (name "rust-cargo-options")
+    (version "0.6.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cargo-options" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0m99dz9vpsplf4s955dvfnfrcvdkm7cifwymriyam11bdfm8v3lv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-clap" ,rust-clap-4))
+       #:cargo-development-inputs (("rust-trycmd" ,rust-trycmd-0.14))))
+    (home-page "https://github.com/messense/cargo-options")
+    (synopsis "Reusable common Cargo command line options")
+    (description "Reusable common Cargo command line options.")
+    (license license:expat)))
+
 (define-public rust-cargo-platform-0.1
   (package
     (name "rust-cargo-platform")
@@ -10477,6 +11049,29 @@ box''.")
        #:cargo-development-inputs
        (("rust-quickcheck" ,rust-quickcheck-0.9))))))
 
+(define-public rust-cast5-0.11
+  (package
+    (name "rust-cast5")
+    (version "0.11.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cast5" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "04crg8dj6lxbp3lmdc3filsahxcyvccvhm0gx40g1k5i7mkpvc16"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cipher" ,rust-cipher-0.4))
+       #:cargo-development-inputs
+       (("rust-cipher" ,rust-cipher-0.4)
+        ("rust-hex-literal" ,rust-hex-literal-0.3))))
+    (home-page "https://github.com/RustCrypto/block-ciphers")
+    (synopsis "CAST5 block cipher")
+    (description "CAST5 block cipher")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-castaway-0.2
   (package
     (name "rust-castaway")
@@ -10501,6 +11096,30 @@ box''.")
 types that works on stable Rust.")
     (license license:expat)))
 
+(define-public rust-cbc-0.1
+  (package
+    (name "rust-cbc")
+    (version "0.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cbc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "19l9y9ccv1ffg6876hshd123f2f8v7zbkc4nkckqycxf8fajmd96"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cipher" ,rust-cipher-0.4))
+       #:cargo-development-inputs
+       (("rust-aes" ,rust-aes-0.8)
+        ("rust-cipher" ,rust-cipher-0.4)
+        ("rust-hex-literal" ,rust-hex-literal-0.3))))
+    (home-page "https://github.com/RustCrypto/block-modes")
+    (synopsis "Cipher Block Chaining (CBC) block cipher mode of operation")
+    (description "Cipher Block Chaining (CBC) block cipher mode of operation.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-cblas-sys-0.1
   (package
     (name "rust-cblas-sys")
@@ -10653,6 +11272,30 @@ that need to represent UTF-16 data as 8-bit characters.")
        #:cargo-development-inputs
        (("rust-clang-sys" ,rust-clang-sys-0.11))))))
 
+(define-public rust-cfb-mode-0.8
+  (package
+    (name "rust-cfb-mode")
+    (version "0.8.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cfb-mode" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0c6kd34jk4p52vr0qgn9slj6zdgmc42gfcqr6mqhmy37g138v2vk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cipher" ,rust-cipher-0.4))
+       #:cargo-development-inputs
+       (("rust-aes" ,rust-aes-0.8)
+        ("rust-cipher" ,rust-cipher-0.4)
+        ("rust-hex-literal" ,rust-hex-literal-0.3))))
+    (home-page "https://github.com/RustCrypto/block-modes")
+    (synopsis "Cipher Feedback (CFB) block cipher mode of operation")
+    (description "Cipher Feedback (CFB) block cipher mode of operation")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-cfg-aliases-0.1
   (package
     (name "rust-cfg-aliases")
@@ -10673,17 +11316,17 @@ that need to represent UTF-16 data as 8-bit characters.")
 winded @code{#[cfg()]} checks.")
     (license license:expat)))
 
-(define-public rust-cfg-expr-0.10
+(define-public rust-cfg-expr-0.15
   (package
     (name "rust-cfg-expr")
-    (version "0.10.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cfg-expr" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1nw50j1sl6q96067399r1c6ppwp483q6vvmqdsnv493cv7sarb0a"))))
+    (version "0.15.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cfg-expr" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0744z7sky6kgchfk2ilchb16bjyz7nk8p8zfn3p953y2xir00p11"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -10698,6 +11341,25 @@ winded @code{#[cfg()]} checks.")
 expressions.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-cfg-expr-0.10
+  (package
+    (inherit rust-cfg-expr-0.15)
+    (name "rust-cfg-expr")
+    (version "0.10.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cfg-expr" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1nw50j1sl6q96067399r1c6ppwp483q6vvmqdsnv493cv7sarb0a"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-smallvec" ,rust-smallvec-1)
+        ("rust-target-lexicon" ,rust-target-lexicon-0.12))
+       #:cargo-development-inputs
+       (("rust-similar-asserts" ,rust-similar-asserts-1))))))
+
 (define-public rust-cfg-expr-0.8
   (package
     (inherit rust-cfg-expr-0.10)
@@ -10958,21 +11620,24 @@ clauses.")
 (define-public rust-charset-0.1
   (package
     (name "rust-charset")
-    (version "0.1.2")
+    (version "0.1.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "charset" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0wzwnck82maqa03hvpprpd1zvnzmzxpkqna4pxnf4g8wvxj6whjg"))))
+        (base32 "0iidr9d5a0jghkaj0888skm3c6368ff07nxmzwmwr8hj3afhgs8q"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-base64" ,rust-base64-0.10)
+     `(#:cargo-inputs
+       (("rust-base64" ,rust-base64-0.13)
         ("rust-encoding-rs" ,rust-encoding-rs-0.8)
-        ("rust-serde" ,rust-serde-1))))
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
     (home-page "https://docs.rs/charset/")
     (synopsis "Thunderbird-compatible character encoding decoding for email")
     (description
@@ -11052,23 +11717,25 @@ Python arrow.humanize.")
 (define-public rust-chrono-tz-0.6
   (package
     (name "rust-chrono-tz")
-    (version "0.6.0")
+    (version "0.6.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "chrono-tz" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "12qcpjqva4fpj5kdcksbfhsc8dkbdhyi2z56p8dwf9bxc0f1rh34"))))
+        (base32 "1pmv434fhw9pwiqc12pvgaiskrq4v1dh1f238gfsg48r301r5hr9"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-chrono-tz-build" ,rust-chrono-tz-build-0.0.2)
-        ("rust-phf" ,rust-phf-0.10)
+        ("rust-chrono-tz-build" ,rust-chrono-tz-build-0.0.3)
+        ("rust-phf" ,rust-phf-0.11)
         ("rust-serde" ,rust-serde-1)
-        ("rust-uncased" ,rust-uncased-0.9))))
+        ("rust-uncased" ,rust-uncased-0.9))
+       #:cargo-development-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-serde-test" ,rust-serde-test-1))))
     (home-page "https://github.com/chronotope/chrono-tz")
     (synopsis "TimeZone implementations for rust-chrono from the IANA database")
     (description
@@ -11095,24 +11762,23 @@ for @code{rust-chrono}.")
         ("rust-parse-zoneinfo" ,rust-parse-zoneinfo-0.3)
         ("rust-serde" ,rust-serde-1))))))
 
-(define-public rust-chrono-tz-build-0.0.2
+(define-public rust-chrono-tz-build-0.0.3
   (package
     (name "rust-chrono-tz-build")
-    (version "0.0.2")
+    (version "0.0.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "chrono-tz-build" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0schy3z03psvmc6734hgkx52cdb3zvixgzhvhr0mzxmj7x4qs1fv"))))
+        (base32 "031s51dd2vbxdhz7fxk1jpbbvr800w57an14bsq3fd5khwx9ql3g"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-parse-zoneinfo" ,rust-parse-zoneinfo-0.3)
-        ("rust-phf" ,rust-phf-0.10)
-        ("rust-phf-codegen" ,rust-phf-codegen-0.10)
+        ("rust-phf" ,rust-phf-0.11)
+        ("rust-phf-codegen" ,rust-phf-codegen-0.11)
         ("rust-regex" ,rust-regex-1)
         ("rust-uncased" ,rust-uncased-0.9))))
     (home-page "https://github.com/chronotope/chrono-tz")
@@ -11122,6 +11788,32 @@ for @code{rust-chrono}.")
 chrono-tz Rust crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-chumsky-0.9
+  (package
+    (name "rust-chumsky")
+    (version "0.9.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "chumsky" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "179llm5hybq5fr21mi681dq5f51j98laqmwh56kvadk2p4l045r3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-hashbrown" ,rust-hashbrown-0.12)
+        ("rust-stacker" ,rust-stacker-0.1))
+       #:cargo-development-inputs
+       (("rust-ariadne" ,rust-ariadne-0.1)
+        ("rust-pom" ,rust-pom-3))))
+    (home-page "https://github.com/zesterer/chumsky")
+    (synopsis "Parser library for humans with powerful error recovery")
+    (description
+     "This package provides a parser library for humans with powerful error
+recovery.")
+    (license license:expat)))
+
 (define-public rust-chunked-transfer-1
   (package
     (name "rust-chunked-transfer")
@@ -11326,7 +12018,7 @@ usage.")
 (define-public rust-cipher-0.4
   (package
     (name "rust-cipher")
-    (version "0.4.3")
+    (version "0.4.4")
     (source
       (origin
         (method url-fetch)
@@ -11334,7 +12026,7 @@ usage.")
         (file-name
          (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "17mmmqaalirdx7bpdhrgzp1sd392zm08mjrr24cjr57pz1q351yi"))))
+         (base32 "1b9x9agg67xq5nq879z66ni4l08m6m3hqcshk37d4is4ysd3ngvp"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -11450,31 +12142,9 @@ traits.")
          (base32
           "1hjr333izzhs6bic84qwnyzy5xzmvasib8f3zkzj4ln3a97c1xyp"))))))
 
-(define-public rust-clang-sys-0.22
-  (package
-    (inherit rust-clang-sys-0.26)
-    (name "rust-clang-sys")
-    (version "0.22.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "clang-sys" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0f65dw1ydnzq4wrv894fql78n4ikb53jjp53xck0s4hb64s1m6lk"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-clippy" ,rust-clippy-0.0)
-        ("rust-glob" ,rust-glob-0.2)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-libloading" ,rust-libloading-0.5))))))
-
 (define-public rust-clang-sys-0.11
   (package
-    (inherit rust-clang-sys-0.22)
+    (inherit rust-clang-sys-0.26)
     (name "rust-clang-sys")
     (version "0.11.1")
     (source
@@ -11496,6 +12166,85 @@ traits.")
         ("rust-libc" ,rust-libc-0.2)
         ("rust-libloading" ,rust-libloading-0.3))))))
 
+(define-public rust-clap-complete-command-0.5
+  (package
+    (name "rust-clap-complete-command")
+    (version "0.5.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "clap-complete-command" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0gcsj6ls8y0jpjp5172gdqwx5zj6gm4wdgrqysglr3d73qvrad0q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-carapace-spec-clap" ,rust-carapace-spec-clap-0.1)
+        ("rust-clap" ,rust-clap-4)
+        ("rust-clap-complete" ,rust-clap-complete-4)
+        ("rust-clap-complete-fig" ,rust-clap-complete-fig-4)
+        ("rust-clap-complete-nushell" ,rust-clap-complete-nushell-0.1))
+       #:cargo-development-inputs (("rust-clap" ,rust-clap-4))))
+    (home-page "https://github.com/nihaals/clap-complete-command")
+    (synopsis
+     "Reduces boilerplate for adding a shell completion command to Clap")
+    (description "This package reduces boilerplate for adding a shell completion
+command to Clap.")
+    (license license:expat)))
+
+(define-public rust-clap-complete-fig-4
+  (package
+    (name "rust-clap-complete-fig")
+    (version "4.3.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "clap-complete-fig" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "17yfrdxy555fv56y0n69r4kgd2iwpq4mgz6k5rn5lc2i1b9y3zlr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-clap" ,rust-clap-4)
+        ("rust-clap-complete" ,rust-clap-complete-4))
+       #:cargo-development-inputs
+       (("rust-clap" ,rust-clap-4)
+        ("rust-snapbox" ,rust-snapbox-0.4))))
+    (home-page "https://github.com/clap-rs/clap/tree/master/clap_complete_fig")
+    (synopsis "Generator library used with clap for Fig completion scripts")
+    (description
+     "This package provides a generator library used with clap for Fig
+completion scripts.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-clap-complete-nushell-0.1
+  (package
+    (name "rust-clap-complete-nushell")
+    (version "0.1.10")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "clap-complete-nushell" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0b15s7d9xpqjr1fpj8lmcv6nhgbhxvm0rzbh3cavv0xawvsl3yn7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-clap" ,rust-clap-4)
+        ("rust-clap-complete" ,rust-clap-complete-4))
+       #:cargo-development-inputs (("rust-snapbox" ,rust-snapbox-0.4))))
+    (home-page
+     "https://github.com/clap-rs/clap/tree/master/clap_complete_nushell")
+    (synopsis
+     "Generator library used with clap for Nushell completion scripts")
+    (description
+     "This package provides a generator library used with clap for Nushell
+completion scripts.")
+    (license license:expat)))
+
 (define-public rust-clap-conf-0.1
   (package
     (name "rust-clap-conf")
@@ -11529,22 +12278,21 @@ how to behave across the three main input sources")
 (define-public rust-clap-derive-4
   (package
     (name "rust-clap-derive")
-    (version "4.1.0")
+    (version "4.3.12")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "clap_derive" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1s4c4005xsdw5zlq8z5h02mgjcsqgcd1ydxg6iird49fcxyjfjk8"))))
+        (base32 "0l50j37jwbzfl29bd2a1ib7z1jpch4b9868himrgwpgwb1bvpaal"))))
     (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs
            `(("rust-heck" ,rust-heck-0.4)
-             ("rust-proc-macro-error" ,rust-proc-macro-error-1)
              ("rust-proc-macro2" ,rust-proc-macro2-1)
              ("rust-quote" ,rust-quote-1)
-             ("rust-syn" ,rust-syn-1))))
+             ("rust-syn" ,rust-syn-2))))
     (home-page "https://clap.rs/")
     (synopsis "Procedural macro crate for Clap")
     (description
@@ -11576,33 +12324,20 @@ how to behave across the three main input sources")
 (define-public rust-clap-4
   (package
     (name "rust-clap")
-    (version "4.1.6")
+    (version "4.3.19")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "clap" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1qzmsg3j2rch16gbh753hsdgvfv6q4vc2xdxgnl66kadsj40a2zc"))))
+        (base32 "0ba5mbnkfr5v92yrr00f194w8k2rwyi9ckjcy1bqm5gz1fi09lsz"))))
     (build-system cargo-build-system)
     (arguments
-     (list #:cargo-test-flags
-           '(list "--release" "--"
-                  ;; Some of the doc tests fail.
-                  "--skip=builder::range::ValueRange::new"
-                  "--skip=builder::value_parser::value_parser")
-           #:cargo-inputs
-           `(("rust-backtrace" ,rust-backtrace-0.3)
-             ("rust-bitflags" ,rust-bitflags-1)
+     (list #:cargo-inputs
+           `(("rust-clap-builder" ,rust-clap-builder-4)
              ("rust-clap-derive" ,rust-clap-derive-4)
-             ("rust-clap-lex" ,rust-clap-lex-0.3)
-             ("rust-is-terminal" ,rust-is-terminal-0.4)
-             ("rust-once-cell" ,rust-once-cell-1)
-             ("rust-strsim" ,rust-strsim-0.10)
-             ("rust-termcolor" ,rust-termcolor-1)
-             ("rust-terminal-size" ,rust-terminal-size-0.2)
-             ("rust-unicase" ,rust-unicase-2)
-             ("rust-unicode-width" ,rust-unicode-width-0.1))
+             ("rust-once-cell" ,rust-once-cell-1))
            #:cargo-development-inputs
            `(("rust-humantime" ,rust-humantime-2)
              ("rust-rustversion" ,rust-rustversion-1)
@@ -11694,23 +12429,67 @@ Command Line Argument Parser.")
         ("rust-version-sync" ,rust-version-sync-0.8))))
     (license license:expat)))
 
+(define-public rust-clap-builder-4
+  (package
+    (name "rust-clap-builder")
+    (version "4.3.19")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "clap-builder" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1qg9xrshy9h5cmavg4zfc1gzjkcwq2p97qyg6lm6dr8zizqa7ih1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       (list "--release" "--"
+             ;; Some of the doc tests fail.
+             "--skip=builder::range::ValueRange::new"
+             "--skip=builder::value_parser::value_parser")
+       #:cargo-inputs
+       (("rust-anstream" ,rust-anstream-0.3)
+        ("rust-anstyle" ,rust-anstyle-1)
+        ("rust-backtrace" ,rust-backtrace-0.3)
+        ("rust-clap-lex" ,rust-clap-lex-0.5)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-strsim" ,rust-strsim-0.10)
+        ("rust-terminal-size" ,rust-terminal-size-0.2)
+        ("rust-unicase" ,rust-unicase-2)
+        ("rust-unicode-width" ,rust-unicode-width-0.1))
+       #:cargo-development-inputs
+       (("rust-color-print" ,rust-color-print-0.3)
+        ("rust-humantime" ,rust-humantime-2)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-shlex" ,rust-shlex-1)
+        ("rust-snapbox" ,rust-snapbox-0.4)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-trycmd" ,rust-trycmd-0.14)
+        ("rust-unic-emoji-char" ,rust-unic-emoji-char-0.9))))
+    (home-page "https://github.com/clap-rs/clap")
+    (synopsis "Full-featured Command Line Argument Parser")
+    (description
+     "This package provides a simple to use, efficient, and full-featured
+Command Line Argument Parser.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-clap-complete-4
   (package
     (name "rust-clap-complete")
-    (version "4.1.2")
+    (version "4.3.2")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "clap-complete" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "1zinf9gdr0fh1aff71nwqf51w856sbsbgq0dqpmmbhplggl5n4mx"))))
+               (base32 "1khpx0fxmjh46s8354nn507ba4s9kfksiia6ambh9a419hrl7i2z"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-clap" ,rust-clap-4)
-        ("rust-clap-lex" ,rust-clap-lex-0.3)
+        ("rust-clap-lex" ,rust-clap-lex-0.5)
         ("rust-is-executable" ,rust-is-executable-1)
-        ("rust-os-str-bytes" ,rust-os-str-bytes-6)
         ("rust-pathdiff" ,rust-pathdiff-0.2)
         ("rust-shlex" ,rust-shlex-1)
         ("rust-unicode-xid" ,rust-unicode-xid-0.2))
@@ -11782,20 +12561,18 @@ for programs written with Clap.")
 with Clap to generate Fig completion scripts.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-clap-lex-0.3
+(define-public rust-clap-lex-0.5
   (package
     (name "rust-clap-lex")
-    (version "0.3.0")
+    (version "0.5.0")
     (source (origin
               (method url-fetch)
-              (uri (crate-uri "clap_lex" version))
+              (uri (crate-uri "clap-lex" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1a4dzbnlxiamfsn0pnkhn7n9bdfjh66j9fxm6mmr7d227vvrhh8d"))))
+                "06vcvpvp65qggc5agbirzqk2di00gxg6vazzc3qlwzkw70qxm9id"))))
     (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-6))))
     (home-page "https://github.com/clap-rs/clap/tree/master/clap_lex")
     (synopsis "Command line parser for Clap")
     (description
@@ -11805,6 +12582,21 @@ stream of tokens.")
     ;; The user can choose either license.
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-clap-lex-0.3
+  (package
+    (inherit rust-clap-lex-0.5)
+    (name "rust-clap-lex")
+    (version "0.3.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "clap_lex" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ip688faib67iqqy96i0qss77virr42sib1afj63a7yb99x6ngq3"))))
+    (arguments
+     `(#:cargo-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-6))))))
+
 (define-public rust-clap-lex-0.2
   (package
     (inherit rust-clap-lex-0.3)
@@ -11821,6 +12613,30 @@ stream of tokens.")
     (arguments
      (list #:cargo-inputs `(("rust-os-str-bytes" ,rust-os-str-bytes-6))))))
 
+(define-public rust-clap-mangen-0.2
+  (package
+    (name "rust-clap-mangen")
+    (version "0.2.11")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "clap-mangen" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0cbp5cnh25qnd6l6mqs3v6ky524vxyyf7assfzg8ba83v48xkjvb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-clap" ,rust-clap-4)
+        ("rust-roff" ,rust-roff-0.2))
+       #:cargo-development-inputs
+       (("rust-clap" ,rust-clap-4)
+        ("rust-snapbox" ,rust-snapbox-0.4))))
+    (home-page "https://github.com/clap-rs/clap/tree/master/clap_mangen")
+    (synopsis "Manpage generator for clap")
+    (description "This package provides a manpage generator for clap.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-clearscreen-1
   (package
     (name "rust-clearscreen")
@@ -12121,6 +12937,36 @@ contains all syscalls and related types.")
            license:asl2.0
            license:zlib))))
 
+(define-public rust-cmac-0.7
+  (package
+    (name "rust-cmac")
+    (version "0.7.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cmac" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1an1vcala24grlyhvk71ikxk2kmgcbal9kgrzzpjcl9z7i74ahw5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cipher" ,rust-cipher-0.4)
+        ("rust-dbl" ,rust-dbl-0.3)
+        ("rust-digest" ,rust-digest-0.10))
+       #:cargo-development-inputs
+       (("rust-aes" ,rust-aes-0.8)
+        ("rust-des" ,rust-des-0.8)
+        ("rust-digest" ,rust-digest-0.10)
+        ("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-kuznyechik" ,rust-kuznyechik-0.8)
+        ("rust-magma" ,rust-magma-0.8))))
+    (home-page "https://github.com/RustCrypto/MACs")
+    (synopsis "Generic implementation of Cipher-based Message Authentication Code")
+    (description "This package provides a pure Rust implementation of the
+Cipher-based Message Authentication Code.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-cmake-0.1
   (package
     (name "rust-cmake")
@@ -12288,6 +13134,29 @@ CMAKE environmental variable is set.")
      "This package provides bindings to Cocoa Foundation for macOS.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-codegenrs-2
+  (package
+    (name "rust-codegenrs")
+    (version "2.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "codegenrs" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1mld8n8r4ns433gxs2jbndrzqjrxv7v0pwc66pf9a2v2mrgvbv6p"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-clap" ,rust-clap-3)
+        ("rust-derive-more" ,rust-derive-more-0.99)
+        ("rust-difference" ,rust-difference-2)
+        ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3))))
+    (home-page "https://github.com/crate-ci/codegenrs")
+    (synopsis "Moving code-gen our of build.rs")
+    (description "Moving code-gen our of build.rs")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-codepage-0.1
   (package
     (name "rust-codepage")
@@ -12400,6 +13269,52 @@ diagnostics easy and relatively painless for everyone!")
 sets of intervals.")
     (license license:expat)))
 
+(define-public rust-color-print-0.3
+  (package
+    (name "rust-color-print")
+    (version "0.3.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "color-print" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1l26nrk0w21kzh7hs15wfqs7lm80xbngwl46jra8ar6q9r8fd9gj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-color-print-proc-macro" ,rust-color-print-proc-macro-0.3)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-terminfo" ,rust-terminfo-0.7))))
+    (home-page "https://gitlab.com/yolenoyer/color-print")
+    (synopsis "Colorize and stylize strings at compile-time")
+    (description
+     "Colorize and stylize strings at compile-time, by using an HTML-like syntax.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-color-print-proc-macro-0.3
+  (package
+    (name "rust-color-print-proc-macro")
+    (version "0.3.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "color-print-proc-macro" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0jsijb8b1hiyrmz6hpgcn8544w7ijp00prsfycgjsgfp6yjyl6ym"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-nom" ,rust-nom-7)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page "https://gitlab.com/yolenoyer/color-print")
+    (synopsis "Implementation for the package color-print")
+    (description "Implementation for the package color-print")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-color-quant-1
   (package
     (name "rust-color-quant")
@@ -12421,6 +13336,23 @@ sets of intervals.")
 colors.")
     (license license:expat)))
 
+(define-public rust-colorchoice-1
+  (package
+    (name "rust-colorchoice")
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "colorchoice" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1ix7w85kwvyybwi2jdkl3yva2r2bvdcc3ka2grjfzfgrapqimgxc"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/rust-cli/anstyle")
+    (synopsis "Global override of color control")
+    (description "Global override of color control")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-colored-2
   (package
     (name "rust-colored")
@@ -13032,8 +13964,37 @@ capabilities, for example to find out about its colored console abilities.")
        (sha256
         (base32 "1isbqpyiwblp0rglnaqzai5hav23095s82mwgi09v3xcck4rq5dd"))))))
 
+(define-public rust-concurrent-queue-2
+  (package
+    (name "rust-concurrent-queue")
+    (version "2.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "concurrent-queue" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0z0bnpgcblhrms6gph7x78yplj3qmlr5mvl38v9641zsxiqngv32"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+        ("rust-loom" ,rust-loom-0.5)
+        ("rust-portable-atomic" ,rust-portable-atomic-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-easy-parallel" ,rust-easy-parallel-3)
+        ("rust-fastrand" ,rust-fastrand-1))))
+    (home-page "https://github.com/smol-rs/concurrent-queue")
+    (synopsis "Concurrent multi-producer multi-consumer queue")
+    (description
+     "This package provides a concurrent multi-producer multi-consumer
+queue.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-concurrent-queue-1
   (package
+    (inherit rust-concurrent-queue-2)
     (name "rust-concurrent-queue")
     (version "1.2.2")
     (source
@@ -13043,19 +14004,12 @@ capabilities, for example to find out about its colored console abilities.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "18w6hblcjjk9d0my3657ra1zdj79gwfjmzvc0b3985g01dahgv9h"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-cache-padded" ,rust-cache-padded-1))
        #:cargo-development-inputs
        (("rust-easy-parallel" ,rust-easy-parallel-3)
-        ("rust-fastrand" ,rust-fastrand-1))))
-    (home-page "https://github.com/stjepang/concurrent-queue")
-    (synopsis "Concurrent multi-producer multi-consumer queue")
-    (description
-     "This package provides a concurrent multi-producer multi-consumer
-queue.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-fastrand" ,rust-fastrand-1))))))
 
 (define-public rust-config-0.11
   (package
@@ -13137,20 +14091,23 @@ applications.")
 configuration files.")
     (license license:bsd-2)))
 
-(define-public rust-configparser-2
+(define-public rust-configparser-3
   (package
     (name "rust-configparser")
-    (version "2.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "configparser" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1qdaggalm3js86s2i11pjjcndrrvpk0pw1lfvmv7v25z3y66sqg2"))))
+    (version "3.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "configparser" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ypq3phwrlx2c7agdj1rlivkhsk9k795jb30j58azvw7lp8xjn2l"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
-    (home-page "https://github.com/mexili/configparser-rs")
+    (arguments
+     `(#:cargo-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-indexmap" ,rust-indexmap-1))))
+    (home-page "https://github.com/QEDK/configparser-rs")
     (synopsis "Simple parsing utility for INI and ini-style syntax")
     (description
      "This package provides a simple configuration parsing utility with no
@@ -13158,6 +14115,20 @@ dependencies that allows you to parse INI and ini-style syntax.  You can use
 this to write Rust programs which can be customized by end users easily.")
     (license (list license:expat license:lgpl3+))))
 
+(define-public rust-configparser-2
+  (package
+    (inherit rust-configparser-3)
+    (name "rust-configparser")
+    (version "2.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "configparser" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13zcjw2jlcc73fd1lcjmb2vzh3ckankin490m24xa96i2vj1w87p"))))
+    (arguments `())))
+
 (define-public rust-console-0.15
   (package
     (name "rust-console")
@@ -13412,17 +14383,18 @@ const functions with conditional compilations.")
 (define-public rust-const-oid-0.9
   (package
     (name "rust-const-oid")
-    (version "0.9.1")
+    (version "0.9.2")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "const-oid" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0fyxvwnl3x6bxhy08a3g4ryf8mky6wnhwd6ll4g6mjxgfnk1ihyf"))))
+                "04xr993r37hd3kcwzll34kpihxrxj7yhr7fawgir8gs80wyby3sj"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t))
+     `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1))
+       #:cargo-development-inputs (("rust-hex-literal" ,rust-hex-literal-0.3))))
     (home-page "https://github.com/RustCrypto/formats/tree/master/const-oid")
     (synopsis "Implementation of the ISO/IEC Object Identifier (OID)")
     (description
@@ -13511,8 +14483,31 @@ generation.")
      "This package provides a sha1 implementation for use in const contexts.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-constant-time-eq-0.2
+  (package
+    (name "rust-constant-time-eq")
+    (version "0.2.5")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "constant-time-eq" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0sy7bs12dfa2d5hw7759b0mvjqcs85giajg4qyg39xq8a1s8wh8k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4))))
+    (home-page "https://github.com/cesarb/constant_time_eq")
+    (synopsis
+     "Compares two equal-sized byte strings in constant time")
+    (description
+     "This package compares two equal-sized byte strings in constant time.
+It is inspired by the Linux kernel's @code{crypto_memneq}.")
+    (license (list license:cc0 license:expat-0 license:asl2.0))))
+
 (define-public rust-constant-time-eq-0.1
   (package
+    (inherit rust-constant-time-eq-0.2)
     (name "rust-constant-time-eq")
     (version "0.1.5")
     (source
@@ -13523,13 +14518,7 @@ generation.")
        (sha256
         (base32
          "1g3vp04qzmk6cpzrd19yci6a95m7ap6wy7wkwgiy2pjklklrfl14"))))
-    (build-system cargo-build-system)
     (home-page "https://github.com/cesarb/constant_time_eq")
-    (synopsis
-     "Compares two equal-sized byte strings in constant time")
-    (description
-     "This package compares two equal-sized byte strings in constant time.
-It is inspired by the Linux kernel's @code{crypto_memneq}.")
     (license license:cc0)))
 
 (define-public rust-content-inspector-0.2
@@ -13607,22 +14596,22 @@ semantics than those provided by @code{as} or @code{From}/@code{Into}.")
     (description "Convert strings into any case.")
     (license license:expat)))
 
-(define-public rust-cookie-0.16
+(define-public rust-cookie-0.17
   (package
     (name "rust-cookie")
-    (version "0.16.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cookie" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1yriqbf77iigrnp2gmf6m1r296bndv051dc1qc39w3bis1bwsng8"))))
+    (version "0.17.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cookie" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "096c52jg9iq4lfcps2psncswv33fc30mmnaa2sbzzcfcw71kgyvy"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-aes-gcm" ,rust-aes-gcm-0.10)
-        ("rust-base64" ,rust-base64-0.20)
+        ("rust-base64" ,rust-base64-0.21)
         ("rust-hkdf" ,rust-hkdf-0.12)
         ("rust-hmac" ,rust-hmac-0.12)
         ("rust-percent-encoding" ,rust-percent-encoding-2)
@@ -13640,6 +14629,31 @@ It supports signed and private (encrypted + signed) jars.")
     ;; The user can choose either license.
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-cookie-0.16
+  (package
+    (inherit rust-cookie-0.17)
+    (name "rust-cookie")
+    (version "0.16.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "cookie" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yriqbf77iigrnp2gmf6m1r296bndv051dc1qc39w3bis1bwsng8"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-aes-gcm" ,rust-aes-gcm-0.10)
+        ("rust-base64" ,rust-base64-0.20)
+        ("rust-hkdf" ,rust-hkdf-0.12)
+        ("rust-hmac" ,rust-hmac-0.12)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-subtle" ,rust-subtle-2)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-version-check" ,rust-version-check-0.9))))))
+
 (define-public rust-cookie-0.15
   (package
     (inherit rust-cookie-0.16)
@@ -13734,6 +14748,29 @@ It supports signed and private (encrypted + signed) jars.")
 similar to the nom parser combinators library.")
     (license license:expat)))
 
+(define-public rust-coolor-0.5
+  (package
+    (name "rust-coolor")
+    (version "0.5.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "coolor" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "11pvplrm51xjr0mmhwrjaif6vd7p2xpmdbwd0rbx2kr4iq4c4smd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-crossterm" ,rust-crossterm-0.25))
+       #:cargo-development-inputs
+       (("rust-crossterm" ,rust-crossterm-0.25)
+        ("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/Canop/coolor")
+    (synopsis "conversion between color formats")
+    (description "conversion between color formats")
+    (license license:expat)))
+
 (define-public rust-copyless-0.1
   (package
     (name "rust-copyless")
@@ -13871,19 +14908,47 @@ in @code{no_std}.  Alloc support is optional.")
        #:cargo-development-inputs
        (("rust-version-check" ,rust-version-check-0.9))))))
 
+(define-public rust-cookie-store-0.19
+  (package
+    (name "rust-cookie-store")
+    (version "0.19.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cookie-store" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "19vy19rvp3a68sgxkrv6bxxlrr2ggqp0176yqb3zhmi0g4sqz8fm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cookie" ,rust-cookie-0.16)
+        ("rust-idna" ,rust-idna-0.3)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-publicsuffix" ,rust-publicsuffix-2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-url" ,rust-url-2))))
+    (home-page "https://github.com/pfernie/cookie_store")
+    (synopsis "Cookie storage and retrieval")
+    (description "This package implements cookie storage and retrieval.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-cookie-store-0.16
   (package
+    (inherit rust-cookie-store-0.19)
     (name "rust-cookie-store")
     (version "0.16.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "cookie-store" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1kfrmxx9mi55dgbj8qgd8qbahvi1yjqwk05v0jm5y7zld6inljrf"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-cookie" ,rust-cookie-0.16)
@@ -13894,11 +14959,7 @@ in @code{no_std}.  Alloc support is optional.")
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-time" ,rust-time-0.3)
-        ("rust-url" ,rust-url-2))))
-    (home-page "https://github.com/pfernie/cookie_store")
-    (synopsis "Cookie storage and retrieval")
-    (description "This package implements cookie storage and retrieval.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-url" ,rust-url-2))))))
 
 (define-public rust-cookie-store-0.15
   (package
@@ -14221,29 +15282,51 @@ intrinsics.")
      "This package provides a counts the number of live instances of types.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-cpp-demangle-0.4
+  (package
+    (name "rust-cpp-demangle")
+    (version "0.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cpp-demangle" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1ikd484ja34z3mbc1r1zj3y6ymxv3sc5y1n7wrr63xn7vy5zjxic"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-afl" ,rust-afl-0.12)
+        ("rust-cfg-if" ,rust-cfg-if-1))
+       #:cargo-development-inputs
+       (("rust-clap" ,rust-clap-4)
+        ("rust-diff" ,rust-diff-0.1))))
+    (home-page "https://github.com/gimli-rs/cpp_demangle")
+    (synopsis "Demangle C++ symbols")
+    (description
+     "This package provides a crate for demangling C++ symbols.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-cpp-demangle-0.3
   (package
+    (inherit rust-cpp-demangle-0.4)
     (name "rust-cpp-demangle")
-    (version "0.3.2")
+    (version "0.3.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "cpp_demangle" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "142knq32bpa2hbp4z0bldjd1x869664l0ff2gdrqx7pryv59x4a4"))))
+        (base32 "0zwvaqfawsfbnzmlhk9d8zngs4v3p5k9r9m2pxq8sygy7zpvgqg5"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-afl" ,rust-afl-0.8)
-        ("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-glob" ,rust-glob-0.3))))
-    (home-page "https://github.com/gimli-rs/cpp_demangle")
-    (synopsis "Demangle C++ symbols")
-    (description
-     "This package provides a crate for demangling C++ symbols.")
-    (license (list license:asl2.0 license:expat))))
+     `(#:cargo-inputs
+       (("rust-afl" ,rust-afl-0.12)
+        ("rust-cfg-if" ,rust-cfg-if-1))
+       #:cargo-development-inputs
+       (("rust-clap" ,rust-clap-4)
+        ("rust-diff" ,rust-diff-0.1))))))
 
 (define-public rust-cpufeatures-0.2
   (package
@@ -14448,7 +15531,7 @@ mile, ...).")
 (define-public rust-crates-io-0.35
   (package
     (name "rust-crates-io")
-    (version "0.35.0")
+    (version "0.35.1")
     (source
      (origin
        (method url-fetch)
@@ -14457,7 +15540,7 @@ mile, ...).")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0zlp8zdkd0qr1ik64wik8bavdm75y54xxp6d7mqvxvv8ssq97144"))))
+         "0bkypzxwchlff8nb6iy3a060lbph6hvhxsxj98k0f0m6gl3vdpz2"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
@@ -15277,14 +16360,14 @@ rasterizing glyphs, using native font engines whenever possible.")
   (package
     (inherit rust-crossfont-0.5)
     (name "rust-crossfont")
-    (version "0.3.1")
+    (version "0.3.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "crossfont" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "079431wkjc18zj3038djai83z6fna0x7r1hxpxjhhi50jdz9dh5n"))))
+        (base32 "0lc2a6q9c4p35hpiwddhnx4f21l48xixjywmlvjbf5v49id6k68j"))))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -15338,6 +16421,37 @@ rasterizing glyphs, using native font engines whenever possible.")
 terminals.")
     (license license:expat)))
 
+(define-public rust-crossterm-0.23
+  (package
+    (inherit rust-crossterm-0.25)
+    (name "rust-crossterm")
+    (version "0.23.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "crossterm" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "05ygjddfp70961ij7cbvrrwz88r09hghdpcqbf50z4c1yyj2w452"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-crossterm-winapi" ,rust-crossterm-winapi-0.9)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-mio" ,rust-mio-0.8)
+        ("rust-parking-lot" ,rust-parking-lot-0.12)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-signal-hook" ,rust-signal-hook-0.3)
+        ("rust-signal-hook-mio" ,rust-signal-hook-mio-0.2)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-futures-timer" ,rust-futures-timer-3)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-tokio" ,rust-tokio-1))))))
+
 (define-public rust-crossterm-0.20
   (package
     (inherit rust-crossterm-0.25)
@@ -15487,6 +16601,31 @@ number ``crunching``.")
      "@code{roxmltree} represents an XML 1.0 document as a read-only tree.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rtoolbox-0.0.1
+  (package
+    (name "rust-rtoolbox")
+    (version "0.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rtoolbox" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0jjjngwn1fa39kschc8zb4hynp4b0jdind7z225cph7m2k2j4kh3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "")
+    (synopsis "Utility functions for other crates")
+    (description
+     "This package provides utility functions for other crates with no
+backwards compatibility guarantees.")
+    (license license:asl2.0)))
+
 (define-public rust-rt-format-0.3
   (package
     (name "rust-rt-format")
@@ -15552,8 +16691,49 @@ character.")
     (arguments
      `(#:cargo-inputs (("rust-nom" ,rust-nom-6))))))
 
+(define-public rust-crypto-bigint-0.5
+  (package
+    (name "rust-crypto-bigint")
+    (version "0.5.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "crypto-bigint" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "05gy7sqkxg65bj1wrgq1pbh8iwn1kmfysvzx1g22p4gx3972yk6g"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-der" ,rust-der-0.7)
+        ("rust-generic-array" ,rust-generic-array-0.14)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-rlp" ,rust-rlp-0.5)
+        ("rust-serdect" ,rust-serdect-0.2)
+        ("rust-subtle" ,rust-subtle-2)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-criterion" ,rust-criterion-0.4)
+        ("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
+        ("rust-num-integer" ,rust-num-integer-0.1)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-rand-chacha" ,rust-rand-chacha-0.3)
+        ("rust-rand-core" ,rust-rand-core-0.6))))
+    (home-page "https://github.com/RustCrypto/crypto-bigint")
+    (synopsis "Big integer library designed for use in cryptography")
+    (description
+     "This crate is a pure Rust implementation of a big integer library which
+has been designed from the ground-up for use in cryptographic applications.
+Provides constant-time, no_std-friendly implementations of modern formulas
+using const generics.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-crypto-bigint-0.2
   (package
+    (inherit rust-crypto-bigint-0.5)
     (name "rust-crypto-bigint")
     (version "0.2.11")
     (source
@@ -15563,7 +16743,6 @@ character.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "00qckh65nzb7s7vd60wylw6alxf9g37xh31lirb1qw0l8fxx6fzq"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -15571,15 +16750,7 @@ character.")
         ("rust-rand-core" ,rust-rand-core-0.6)
         ("rust-rlp" ,rust-rlp-0.5)
         ("rust-subtle" ,rust-subtle-2)
-        ("rust-zeroize" ,rust-zeroize-1))))
-    (home-page "https://github.com/RustCrypto/crypto-bigint")
-    (synopsis "Big integer library designed for use in cryptography")
-    (description
-     "This crate is a pure Rust implementation of a big integer library which
-has been designed from the ground-up for use in cryptographic applications.
-Provides constant-time, no_std-friendly implementations of modern formulas
-using const generics.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-zeroize" ,rust-zeroize-1))))))
 
 (define-public rust-crypto-common-0.1
   (package
@@ -16033,29 +17204,6 @@ processors.")
      "Bare bones CSV parsing with no_std support.")
     (license (list license:unlicense license:expat))))
 
-(define-public rust-csv-index-0.1
-  (package
-    (name "rust-csv-index")
-    (version "0.1.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "csv-index" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "01048y84y0bakqm0x4y1svjv6lzc753b9q598xp7xgcqrdgi6x7j"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-byteorder" ,rust-byteorder-1)
-        ("rust-csv" ,rust-csv-1))))
-    (home-page "https://github.com/BurntSushi/rust-csv")
-    (synopsis "On-disk CSV indexing data structures")
-    (description
-     "A collection of data structures for indexing CSV data, with a focus on
-data structures that can be easily serialized to and deserialized from disk.")
-    (license (list license:unlicense license:expat))))
-
 (define-public rust-cstr-core-0.2
   (package
     (name "rust-cstr-core")
@@ -16079,6 +17227,26 @@ data structures that can be easily serialized to and deserialized from disk.")
      "This crates implements CStr and CString for no_std environments.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-ct-codecs-1
+  (package
+    (name "rust-ct-codecs")
+    (version "1.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ct-codecs" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1pvmrkk95jadmhhd5mn88mq2dfnq0yng8mk3pfd5l6dq0i2fpdzk"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/jedisct1/rust-ct-codecs")
+    (synopsis
+     "Constant-time hex and base64 codecs from libsodium reimplemented in Rust")
+    (description
+     "This package provides constant-time hex and base64 codecs from libsodium
+reimplemented in Rust")
+    (license license:expat)))
+
 (define-public rust-ct-logs-0.8
   (package
     (name "rust-ct-logs")
@@ -16119,40 +17287,33 @@ use with sct crate.")
     (arguments
      `(#:cargo-inputs (("rust-sct" ,rust-sct-0.6))))))
 
-(define-public rust-ct-logs-0.6
-  (package
-    (inherit rust-ct-logs-0.7)
-    (name "rust-ct-logs")
-    (version "0.6.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "ct-logs" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "04wiwiv4ghni3x2vni3z711mlz0ndqvh04vmdkbw3nr7zbsqcdjd"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-sct" ,rust-sct-0.6))))))
-
-(define-public rust-ct-logs-0.3
+(define-public rust-ctor-0.2
   (package
-    (inherit rust-ct-logs-0.7)
-    (name "rust-ct-logs")
-    (version "0.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "ct-logs" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1f0885ws3p49xh6dfgnhh7zjw9h4rhs9ljs8i9cnkhifzz98784f"))))
+    (name "rust-ctor")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ctor" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "06rhrw85py0gkk7g99qk124mk6d5isq95nn3abc84fyf7zv5ch6x"))))
+    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-sct" ,rust-sct-0.3))))))
+       (("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs
+       (("rust-libc-print" ,rust-libc-print-0.1))))
+    (home-page "https://github.com/mmastrac/rust-ctor")
+    (synopsis "__attribute__((constructor)) for Rust")
+    (description
+     "This package provides an @code{__attribute__((constructor))} for Rust.")
+    (license (list license:asl2.0 license:expat))))
 
 (define-public rust-ctor-0.1
   (package
+    (inherit rust-ctor-0.2)
     (name "rust-ctor")
     (version "0.1.26")
     (source
@@ -16162,18 +17323,12 @@ use with sct crate.")
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32 "15m0wqhv12p25xkxz5dxvg23r7a6bkh7p8zi1cdhgswjhdl028vd"))))
-    (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs
            `(("rust-syn" ,rust-syn-1)
              ("rust-quote" ,rust-quote-1))
            #:cargo-development-inputs
-           `(("rust-libc-print" ,rust-libc-print-0.1))))
-    (home-page "https://github.com/mmastrac/rust-ctor")
-    (synopsis "__attribute__((constructor)) for Rust")
-    (description
-     "This package provides an @code{__attribute__((constructor))} for Rust.")
-    (license (list license:asl2.0 license:expat))))
+           `(("rust-libc-print" ,rust-libc-print-0.1))))))
 
 (define-public rust-ctr-0.9
   (package
@@ -16322,7 +17477,7 @@ requests.")
 (define-public rust-curl-sys-0.4
   (package
     (name "rust-curl-sys")
-    (version "0.4.61+curl-8.0.1")
+    (version "0.4.63+curl-8.1.2")
     (source
       (origin
         (method url-fetch)
@@ -16330,7 +17485,7 @@ requests.")
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0yfv88w17434s5mbrcphsnvpvx0103127ndkqlxnzbj1yl85rl0l"))
+          "1p3inybj3yb8wwnccg8jwfwsqg0fiybh9837mpia28k00kvzxc5f"))
         (modules '((guix build utils)))
         (snippet
          '(begin (delete-file-recursively "curl")))))
@@ -16391,6 +17546,39 @@ requests.")
 ristretto255 and Curve25519.")
     (license license:bsd-3)))
 
+(define-public rust-curve25519-dalek-ng-4
+  (package
+    (name "rust-curve25519-dalek-ng")
+    (version "4.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "curve25519-dalek-ng" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1j6y6dsqdfp26ifyygibsrm1a8f9f7870i4053xlczil95r9nd8w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-digest" ,rust-digest-0.9)
+        ("rust-packed-simd-2" ,rust-packed-simd-2-0.3)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-subtle-ng" ,rust-subtle-ng-2)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-sha2" ,rust-sha2-0.9))))
+    (home-page "https://github.com/zkcrypto/curve25519-dalek-ng")
+    (synopsis "Implementation of group operations on ristretto255 and Curve25519")
+    (description
+     "This package provides a pure-Rust implementation of group operations on
+ristretto255 and Curve25519.")
+    (license license:bsd-3)))
+
 (define-public rust-custom-derive-0.1
   (package
     (name "rust-custom-derive")
@@ -16416,6 +17604,25 @@ ristretto255 and Curve25519.")
 attributes.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-cvt-0.1
+  (package
+    (name "rust-cvt")
+    (version "0.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cvt" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1wdwg2rbjl86bcrymscl34pw31kyv1ada19jazpkjbdzgzvrpbnj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1))))
+    (home-page "https://github.com/marmistrz/cvt")
+    (synopsis "Expose the cvt function from Rust libstd")
+    (description "Expose the cvt function from Rust libstd.")
+    (license license:asl2.0)))
+
 (define-public rust-cxx-1
   (package
     (name "rust-cxx")
@@ -17121,7 +18328,7 @@ for Rust.")
 (define-public rust-data-encoding-2
   (package
     (name "rust-data-encoding")
-    (version "2.3.1")
+    (version "2.4.0")
     (source
       (origin
         (method url-fetch)
@@ -17129,7 +18336,7 @@ for Rust.")
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "027rcrwdschrkdr2n9d24gnh03vl41qmvhjqn9vn6z1njy2n0flr"))))
+          "023k3dk8422jgbj7k72g63x51h1mhv91dhw1j4h205vzh6fnrrn2"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/ia0/data-encoding")
     (synopsis "Efficient and customizable data-encoding functions")
@@ -17671,8 +18878,67 @@ strings.")
     (description "Demo of proc-macro-hack.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-der-0.7
+  (package
+    (name "rust-der")
+    (version "0.7.5")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "der" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "06f2clallhpjc51s3dc7mpcw5ms3jak727qc5yrfg3ncrpzqvr85"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-const-oid" ,rust-const-oid-0.9)
+        ("rust-der-derive" ,rust-der-derive-0.7)
+        ("rust-flagset" ,rust-flagset-0.4)
+        ("rust-pem-rfc7468" ,rust-pem-rfc7468-0.7)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-proptest" ,rust-proptest-1))))
+    (home-page "https://github.com/RustCrypto/formats/tree/master/der")
+    (synopsis
+     "Implementation of the Distinguished Encoding Rules (DER)")
+    (description
+     "This package provides a pure Rust embedded-friendly implementation of
+the Distinguished Encoding Rules (DER) for Abstract Syntax Notation One
+(ASN.1) as described in ITU X.690 with full support for heapless no_std
+targets")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-der-0.6
+  (package
+    (inherit rust-der-0.7)
+    (name "rust-der")
+    (version "0.6.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "der" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1pnl3y52m1s6srxpfrfbazf6qilzq8fgksk5dv79nxaybjk6g97i"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-const-oid" ,rust-const-oid-0.9)
+        ("rust-der-derive" ,rust-der-derive-0.6)
+        ("rust-flagset" ,rust-flagset-0.4)
+        ("rust-pem-rfc7468" ,rust-pem-rfc7468-0.6)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-proptest" ,rust-proptest-1))))))
+
 (define-public rust-der-0.4
   (package
+    (inherit rust-der-0.7)
     (name "rust-der")
     (version "0.4.5")
     (source
@@ -17682,26 +18948,62 @@ strings.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1x4k0jln8va1657cghl40l6p7hyvr1ixz71v9cd6imwmgp51rdvr"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build?
        #t                               ; FIXME
        #:cargo-inputs
        (("rust-const-oid" ,rust-const-oid-0.6)
         ("rust-crypto-bigint" ,rust-crypto-bigint-0.2)
-        ("rust-der-derive" ,rust-der-derive-0.4))))
-    (home-page "https://github.com/RustCrypto/formats/tree/master/der")
+        ("rust-der-derive" ,rust-der-derive-0.4))))))
+
+(define-public rust-der-derive-0.7
+  (package
+    (name "rust-der-derive")
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "der-derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0cmyza28s52wfb67ymydjmvsc4m3sfp98dv9vprx6ibmdfx94iqi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro-error" ,rust-proc-macro-error-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/RustCrypto/formats/tree/master/der/derive")
     (synopsis
-     "Implementation of the Distinguished Encoding Rules (DER)")
+      "Custom derive support for the `der` crate's `Choice` and `Sequence` traits")
     (description
-     "This package provides a pure Rust embedded-friendly implementation of
-the Distinguished Encoding Rules (DER) for Abstract Syntax Notation One
-(ASN.1) as described in ITU X.690 with full support for heapless no_std
-targets")
+      "This package provides a custom derive support for the `der` crate's
+`Choice` and `Sequence` traits.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-der-derive-0.6
+  (package
+    (inherit rust-der-derive-0.7)
+    (name "rust-der-derive")
+    (version "0.6.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "der-derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1fg3dv4cjjwd4a6dh62ch2gb477s1pvwh5s8wbg567rsbgdivxwf"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro-error" ,rust-proc-macro-error-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-der-derive-0.4
   (package
+    (inherit rust-der-derive-0.7)
     (name "rust-der-derive")
     (version "0.4.1")
     (source
@@ -17711,7 +19013,6 @@ targets")
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
           (base32 "0snv85yfy9iln05qsgbhwr1159gd0jfrgzj5dkrnricdc0y3pvca"))))
-    (build-system cargo-build-system)
     (arguments
       `(#:skip-build?
         #t                              ; FIXME
@@ -17719,14 +19020,7 @@ targets")
         (("rust-proc-macro2" ,rust-proc-macro2-1)
          ("rust-quote" ,rust-quote-1)
          ("rust-syn" ,rust-syn-1)
-         ("rust-synstructure" ,rust-synstructure-0.12))))
-    (home-page "https://github.com/RustCrypto/formats/tree/master/der/derive")
-    (synopsis
-      "Custom derive support for the `der` crate's `Choice` and `Sequence` traits")
-    (description
-      "This package provides a custom derive support for the `der` crate's
-`Choice` and `Sequence` traits.")
-    (license (list license:asl2.0 license:expat))))
+         ("rust-synstructure" ,rust-synstructure-0.12))))))
 
 (define-public rust-der-oid-macro-0.5
   (package
@@ -17754,8 +19048,41 @@ targets")
      "This crate provides a macro to encode DER oids at compile time.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-der-parser-8
+  (package
+    (name "rust-der-parser")
+    (version "8.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "der-parser" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "07mnz9y395zyxwj7nam2dbzkqdngfraxp2i7y2714dxmpbxpdmnv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-asn1-rs" ,rust-asn1-rs-0.5)
+        ("rust-cookie-factory" ,rust-cookie-factory-0.3)
+        ("rust-displaydoc" ,rust-displaydoc-0.2)
+        ("rust-nom" ,rust-nom-7)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-rusticata-macros" ,rust-rusticata-macros-4))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-test-case" ,rust-test-case-3))))
+    (home-page "https://github.com/rusticata/der-parser")
+    (synopsis "BER/DER parser written in pure Rust")
+    (description "This crate provides a parser for Basic Encoding Rules (BER
+[X.690]) and Distinguished Encoding Rules(DER [X.690]), implemented with the
+@code{nom} parser combinator framework.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-der-parser-6
   (package
+    (inherit rust-der-parser-8)
     (name "rust-der-parser")
     (version "6.0.0")
     (source
@@ -17765,7 +19092,6 @@ targets")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0gn465dncghmj52k8dlkl71wkmlz5zc6jfjgj9ra2knf22ryy1wq"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -17779,28 +19105,29 @@ targets")
        #:cargo-development-inputs
        (("rust-hex-literal" ,rust-hex-literal-0.3)
         ("rust-pretty-assertions" ,rust-pretty-assertions-0.7)
-        ("rust-test-case" ,rust-test-case-1))))
-    (home-page "https://github.com/rusticata/der-parser")
-    (synopsis "BER/DER parser written in pure Rust")
-    (description "This crate provides a parser for Basic Encoding Rules (BER
-[X.690]) and Distinguished Encoding Rules(DER [X.690]), implemented with the
-@code{nom} parser combinator framework.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-test-case" ,rust-test-case-1))))))
 
 (define-public rust-derivative-2
   (package
     (name "rust-derivative")
-    (version "2.1.1")
+    (version "2.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "derivative" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "03rqx8j9q5nlrpr7w8cwwrvw916pr0ahzs3y8yln18cx6mh2nn6b"))))
+        (base32 "02vpb81wisk2zh1d5f44szzxamzinqgq2k8ydrfjj2wwkrgdvhzw"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "Cargo.toml"
+             (("version = \"([[:digit:]]+(\\.[[:digit:]]+)*), <.*\"" _ version)
+              (string-append "version = \"^" version "\"")))))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:tests? #f      ; Tests expect a very narrow range for trybuild.
+       #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))
@@ -17849,8 +19176,36 @@ Instead, enable the @code{derive} feature of the @code{arbitrary} crate.")
        (sha256
         (base32 "1rp0z4k0j5ip0bx6dssg97l4q6bakhf6lm5h1lpr3p3kwjsi585i"))))))
 
+(define-public rust-derive-builder-0.12
+  (package
+    (name "rust-derive-builder")
+    (version "0.12.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "derive-builder" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1y4p569zcvpmly5s5hmjp9h83drxvdp6kj6bb61h225mhj3pfrwd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-derive-builder-macro" ,rust-derive-builder-macro-0.12))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://github.com/colin-kiegel/rust-derive-builder")
+    (synopsis "Builder pattern for arbitrary structs")
+    (description "Rust macro to automatically implement the builder pattern
+for arbitrary structs.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-derive-builder-0.11
   (package
+    (inherit rust-derive-builder-0.12)
     (name "rust-derive-builder")
     (version "0.11.2")
     (source
@@ -17860,16 +19215,10 @@ Instead, enable the @code{derive} feature of the @code{arbitrary} crate.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "18q4jx8zvg2pkx2d1nmlklx8m48bwrghyg8rdg1irdwkw5xxyynh"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-derive-builder-macro" ,rust-derive-builder-macro-0.11))))
-    (home-page "https://github.com/colin-kiegel/rust-derive-builder")
-    (synopsis "Builder pattern for arbitrary structs")
-    (description "Rust macro to automatically implement the builder pattern
-for arbitrary structs.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-derive-builder-macro" ,rust-derive-builder-macro-0.11))))))
 
 (define-public rust-derive-builder-0.10
   (package
@@ -17941,8 +19290,35 @@ for arbitrary structs.")
          ("rust-skeptic" ,rust-skeptic-0.13)
          ("rust-syn" ,rust-syn-0.15))))))
 
+(define-public rust-derive-builder-core-0.12
+  (package
+    (name "rust-derive-builder-core")
+    (version "0.12.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "derive-builder-core" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "03vvmw3mfg370swq0dh2h5kcjjb8va2m4asqgp9wfyy4l08xq6y1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-darling" ,rust-darling-0.14)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-0.6))))
+    (home-page "https://github.com/colin-kiegel/rust-derive-builder")
+    (synopsis "Internal helper library for @code{rust-derive-builder}")
+    (description
+     "Internal helper library for @code{rust-derive-builder}.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-derive-builder-core-0.11
   (package
+    (inherit rust-derive-builder-core-0.12)
     (name "rust-derive-builder-core")
     (version "0.11.2")
     (source
@@ -17952,19 +19328,13 @@ for arbitrary structs.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1i5gmf5lglbg7agj1khc6k9swf1clfs5fg6w0icw1w91m77x948z"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-darling" ,rust-darling-0.14)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/colin-kiegel/rust-derive-builder")
-    (synopsis "Internal helper library for @code{rust-derive-builder}")
-    (description
-     "Internal helper library for @code{rust-derive-builder}.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-derive-builder-core-0.10
   (package
@@ -18031,22 +19401,21 @@ for arbitrary structs.")
          ("rust-quote" ,rust-quote-0.6)
          ("rust-syn" ,rust-syn-0.15))))))
 
-(define-public rust-derive-builder-macro-0.11
+(define-public rust-derive-builder-macro-0.12
   (package
     (name "rust-derive-builder-macro")
-    (version "0.11.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "derive_builder_macro" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0s6xfgsybd9wbk39hbgqjcn7d1l36a33q6v7d0x5y17d5fvi80wg"))))
+    (version "0.12.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "derive-builder-macro" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "17p71qzh7x1q2yxzz3xrg73zw3xl0h479b7ybyjm0s1rg9fa7kgb"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-derive-builder-core" ,rust-derive-builder-core-0.11)
+       (("rust-derive-builder-core" ,rust-derive-builder-core-0.12)
         ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/colin-kiegel/rust-derive-builder")
     (synopsis
@@ -18056,6 +19425,22 @@ for arbitrary structs.")
 pattern for arbitrary structs.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-derive-builder-macro-0.11
+  (package
+    (inherit rust-derive-builder-macro-0.12)
+    (name "rust-derive-builder-macro")
+    (version "0.11.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "derive_builder_macro" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0s6xfgsybd9wbk39hbgqjcn7d1l36a33q6v7d0x5y17d5fvi80wg"))))
+    (arguments
+     `(#:cargo-inputs (("rust-derive-builder-core" ,rust-derive-builder-core-0.11)
+                       ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-derive-builder-macro-0.10
   (package
     (inherit rust-derive-builder-macro-0.11)
@@ -18199,8 +19584,30 @@ traits for both structs and enums.")
 structs and enums.")
   (license license:expat)))
 
+(define-public rust-des-0.8
+  (package
+    (name "rust-des")
+    (version "0.8.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "des" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "07kshslxanmg0g6007scvglfhg6mli2a8qzhx4kxx4z9ik781pgz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cipher" ,rust-cipher-0.4))
+       #:cargo-development-inputs (("rust-cipher" ,rust-cipher-0.4))))
+    (home-page "https://github.com/RustCrypto/block-ciphers")
+    (synopsis "DES and Triple DES block ciphers implementation")
+    (description "This package provides DES and Triple DES (3DES, TDES) block
+ciphers implementations.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-des-0.7
   (package
+    (inherit rust-des-0.8)
     (name "rust-des")
     (version "0.7.0")
     (source
@@ -18212,19 +19619,13 @@ structs and enums.")
         (sha256
          (base32
           "0pbsfkkwfqnd4nsv3ik4z09h248f57y7bj2j1l134i2mzd4xshdc"))))
-    (build-system cargo-build-system)
     (arguments
       `(#:skip-build?
         #t
         #:cargo-inputs
         (("rust-byteorder" ,rust-byteorder-1)
          ("rust-cipher" ,rust-cipher-0.3)
-         ("rust-opaque-debug" ,rust-opaque-debug-0.3))))
-    (home-page "https://github.com/RustCrypto/block-ciphers")
-    (synopsis "DES and Triple DES block ciphers implementation")
-    (description "This package provides DES and Triple DES (3DES, TDES) block
-ciphers implementations.")
-    (license (list license:expat license:asl2.0))))
+         ("rust-opaque-debug" ,rust-opaque-debug-0.3))))))
 
 (define-public rust-des-0.6
   (package
@@ -18270,14 +19671,14 @@ intelligently transliterating them.  It supports Emoji and Chinese.")
 (define-public rust-devise-0.2
   (package
     (name "rust-devise")
-    (version "0.2.0")
+    (version "0.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "devise" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1lryvr39ia3rfswfnwn2zynsv2r8kj6gqqf0akcs0prws2i4pq3l"))))
+        (base32 "09p52f54givb0g9l7clj11z755vldk8758y2lwm5mp3sa156qwfx"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -18294,14 +19695,14 @@ procedural macros.")
 (define-public rust-devise-codegen-0.2
   (package
     (name "rust-devise-codegen")
-    (version "0.2.0")
+    (version "0.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "devise_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1msmq0h19l03n9qmkxxi1a5h8904i8m623kdvjzak4ya51wynv06"))))
+        (base32 "0lxbixni2v6snx2mkgi0kyq5dv8v6c5s57b6wc47q4hqs6884yza"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -18312,20 +19713,20 @@ procedural macros.")
     (synopsis "Library for devising derives and other procedural macros")
     (description
      "This package provides a library for devising derives and other
-procedural macros")
+procedural macros.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-devise-core-0.2
   (package
     (name "rust-devise-core")
-    (version "0.2.0")
+    (version "0.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "devise_core" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "11v4z5kljmpiyif3mmfnm3rl1lsqygjlfy2wll7frqxm4adwahfg"))))
+        (base32 "0wr3jdzzibpafz73hcca83wnzdgjinvm7axmxnyfkbasbnfkw1fi"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -18368,6 +19769,30 @@ procedural macros.")
 example.")
     (license license:bsd-3)))
 
+(define-public rust-dialoguer-0.10
+  (package
+    (name "rust-dialoguer")
+    (version "0.10.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "dialoguer" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "11rgzrhi677w9gf1r3ip2x361svdkjkr2m5dsfca9fcljacg5ijr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-console" ,rust-console-0.15)
+        ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3)
+        ("rust-shell-words" ,rust-shell-words-1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://github.com/mitsuhiko/dialoguer")
+    (synopsis "Command line prompting library")
+    (description "This package provides a command line prompting library.")
+    (license license:expat)))
+
 (define-public rust-diesel-1
   (package
     (name "rust-diesel")
@@ -18400,7 +19825,7 @@ example.")
         ("rust-num-traits" ,rust-num-traits-0.2)
         ("rust-pq-sys" ,rust-pq-sys-0.4)
         ("rust-quickcheck" ,rust-quickcheck-0.4)
-        ("rust-r2d2" ,rust-r2d2)
+        ("rust-r2d2" ,rust-r2d2-0.8)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-time" ,rust-time-0.1)
         ("rust-url" ,rust-url-1)
@@ -18788,8 +20213,30 @@ platform-specific standard locations of directories for config, cache and
 other data.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-dirs-5
+  (package
+    (name "rust-dirs")
+    (version "5.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "dirs" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0992xk5vx75b2x91nw9ssb51mpl8x73j9rxmpi96cryn0ffmmi24"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-dirs-sys" ,rust-dirs-sys-0.4))))
+    (home-page "https://github.com/soc/dirs-rs")
+    (synopsis "Abstractions for standard locations for various platforms")
+    (description
+     "This package is a tiny low-level library that provides platform-specific
+standard locations of directories for config, cache and other data.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-dirs-4
   (package
+    (inherit rust-dirs-5)
     (name "rust-dirs")
     (version "4.0.0")
     (source
@@ -18799,16 +20246,9 @@ other data.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0n8020zl4f0frfnzvgb9agvk4a14i1kjz4daqnxkgslndwmaffna"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-dirs-sys" ,rust-dirs-sys-0.3))))
-    (home-page "https://github.com/soc/dirs-rs")
-    (synopsis "Abstractions for standard locations for various platforms")
-    (description
-     "This package is a tiny low-level library that provides platform-specific
-standard locations of directories for config, cache and other data.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-dirs-sys" ,rust-dirs-sys-0.3))))))
 
 (define-public rust-dirs-3
   (package
@@ -18909,8 +20349,35 @@ other data.")
     (home-page "https://github.com/xdg-rs/dirs")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-dirs-sys-0.4
+  (package
+    (name "rust-dirs-sys")
+    (version "0.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "dirs-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "071jy0pvaad9lsa6mzawxrh7cmr7hsmsdxwzm7jzldfkrfjha3sj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-option-ext" ,rust-option-ext-0.2)
+        ("rust-redox-users" ,rust-redox-users-0.4)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))))
+    (home-page "https://github.com/dirs-dev/dirs-sys-rs")
+    (synopsis
+     "System-level helper functions for the dirs and directories crates")
+    (description
+     "This package provides system-level helper functions for the @code{dirs}
+and @code{directories} crates.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-dirs-sys-0.3
   (package
+    (inherit rust-dirs-sys-0.4)
     (name "rust-dirs-sys")
     (version "0.3.6")
     (source
@@ -18921,7 +20388,6 @@ other data.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "102pbpcrfhvhfyfnyvmvvwpl6mfvynh170f6ima6fyinxls6bn03"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
@@ -18929,14 +20395,7 @@ other data.")
         ("rust-winapi" ,rust-winapi-0.3))))
     (inputs
      (list rust-cfg-if-0.1 rust-libc-0.2 rust-redox-users-0.3
-           rust-winapi-0.3))
-    (home-page "https://github.com/soc/dirs-sys-rs")
-    (synopsis
-     "System-level helper functions for the dirs and directories crates")
-    (description
-     "This package provides system-level helper functions for the @code{dirs}
-and @code{directories} crates.")
-    (license (list license:asl2.0 license:expat))))
+           rust-winapi-0.3))))
 
 (define-public rust-dirs-sys-next-0.1
   (package
@@ -19015,6 +20474,38 @@ Central Dispatch.")
          "019nzy993hxaiazcdnayx3csv2iki34i535asw11ki96hakkrs84"))))
     (arguments '(#:tests? #f))))  ; Tests only run on Mac.
 
+(define-public rust-displaydoc-0.2
+  (package
+    (name "rust-displaydoc")
+    (version "0.2.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "displaydoc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0p8pyg10csc782qlwx3znr6qx46ni96m1qh597kmyrf6s3s8axa8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-0.6)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://github.com/yaahc/displaydoc")
+    (synopsis
+     "Derive macro for implementing the display Trait via a doc comment")
+    (description
+     "This package provides a derive macro for implementing the display Trait
+via a doc comment and string interpolation.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-dissimilar-1
   (package
     (name "rust-dissimilar")
@@ -19158,7 +20649,7 @@ not support network, only raw protocol parser.")
 (define-public rust-doc-comment-0.3
   (package
     (name "rust-doc-comment")
-    (version "0.3.1")
+    (version "0.3.3")
     (source
       (origin
         (method url-fetch)
@@ -19166,9 +20657,8 @@ not support network, only raw protocol parser.")
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "15rsqxgarfpb1yim9sbp9yfgj7p2dq6v51c6bq1a62paii9ylgcj"))))
+          "043sprsf3wl926zmck1bm7gw0jq50mb76lkpk49vasfr6ax1p97y"))))
     (build-system cargo-build-system)
-    (arguments '(#:skip-build? #t))
     (home-page "https://github.com/GuillaumeGomez/doc-comment")
     (synopsis "Macro to generate doc comments")
     (description "This package provides a way to generate doc comments
@@ -19392,6 +20882,24 @@ non-persistent vector.")
 for graphs.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-dot-writer-0.1
+  (package
+    (name "rust-dot-writer")
+    (version "0.1.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "dot-writer" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0yjv36hr3klzq4bpzkkqp64s8479ssabr7zkdxn4163ybsyi26rx"))))
+    (build-system cargo-build-system)
+    (home-page "https://bitbucket.org/DrGabble/dot-writer")
+    (synopsis "Library for writing the Graphviz DOT graph language")
+    (description
+     "This package provides a library for writing the Graphviz DOT graph language.")
+    (license license:expat)))
+
 (define-public rust-dotenv-0.15
   (package
     (name "rust-dotenv")
@@ -19552,23 +21060,23 @@ floating-point primitives to an @code{io::Write}.")
 (define-public rust-dtparse-1
   (package
     (name "rust-dtparse")
-    (version "1.2.0")
+    (version "1.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "dtparse" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1xh9hasfffnfyv8q9pwr31g63rigfx114qz6xw05wdkzpmfnq9qk"))))
+        (base32 "1awhyy58c28fhr5nvvfpikdzraihichkz3w1mzdg7smyffldi4w2"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-chrono" ,rust-chrono-0.4)
-        ("rust-chrono-tz" ,rust-chrono-tz-0.5)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-num-traits" ,rust-num-traits-0.2)
-        ("rust-rust-decimal" ,rust-rust-decimal-0.10))))
+        ("rust-rust-decimal" ,rust-rust-decimal-1))
+       #:cargo-development-inputs
+       (("rust-base64" ,rust-base64-0.13))))
     (home-page "https://github.com/bspeice/dtparse.git")
     (synopsis "Dateutil-compatible timestamp parser for Rust")
     (description
@@ -19634,16 +21142,15 @@ Rust.")
 (define-public rust-dunce-1
   (package
     (name "rust-dunce")
-    (version "1.0.1")
+    (version "1.0.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "dunce" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1d7f7wg83i1by16rxc1fdipi872nvkzjnmzaaggh2h8cgi51qr5j"))))
+        (base32 "0fqcbwfclldbknmawi69l6zyncaiqzxkpbybcb2cc7jmlxnqrkjn"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
     (home-page "https://gitlab.com/kornelski/dunce")
     (synopsis "Normalize Windows paths to the most compatible format")
     (description
@@ -19652,7 +21159,7 @@ whenever possible, but leaves UNC paths as-is when they can't be unambiguously
 expressed in a simpler way.  This allows legacy programs to access all paths
 they can possibly access, and doesn't break any paths for UNC-aware
 programs.")
-    (license license:cc0)))
+    (license (list license:cc0 license:expat-0 license:asl2.0))))
 
 (define-public rust-dyn-clone-1
   (package
@@ -19724,14 +21231,14 @@ easy.")
 (define-public rust-easy-parallel-3
   (package
     (name "rust-easy-parallel")
-    (version "3.1.0")
+    (version "3.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "easy-parallel" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1x28z540fc4g8fqm1sbpqbpdfbi40mkas4xr57s3yn0jjbbszm0x"))))
+        (base32 "00g0fvbjkdbqm6z5xcx3b1wzi8rlrhqb840ybavgijhg74iljq64"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/stjepang/easy-parallel")
     (synopsis "Run closures in parallel")
@@ -19764,6 +21271,97 @@ from the main thread.")
 easy.")
     (license (list license:unlicense license:zlib))))
 
+(define-public rust-eax-0.5
+  (package
+    (name "rust-eax")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "eax" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0a5cpzk577f1lw3wkk20iqvavnbdr5yzjrcglvbvk0ivj2yzlm4r"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-aead" ,rust-aead-0.5)
+        ("rust-cipher" ,rust-cipher-0.4)
+        ("rust-cmac" ,rust-cmac-0.7)
+        ("rust-ctr" ,rust-ctr-0.9)
+        ("rust-subtle" ,rust-subtle-2))
+       #:cargo-development-inputs
+       (("rust-aead" ,rust-aead-0.5)
+        ("rust-aes" ,rust-aes-0.8))))
+    (home-page "https://github.com/RustCrypto/AEADs")
+    (synopsis "Pure Rust implementation of the EAX Authenticated Encryption with
+Associated Data (AEAD)")
+    (description
+     "Pure Rust implementation of the EAX Authenticated Encryption with Associated
+Data (AEAD) Cipher with optional architecture-specific hardware acceleration
+This scheme is only based on a block cipher.  It uses counter mode (CTR) for
+encryption and CBC mode for generating a OMAC/CMAC/CBCMAC (all names for the
+same thing).")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-ecb-0.1
+  (package
+    (name "rust-ecb")
+    (version "0.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ecb" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "18l1frsqg84c9ymn6shp0k51q7j6l95cpg3vw8g3a159h6x89z8p"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cipher" ,rust-cipher-0.4))
+       #:cargo-development-inputs
+       (("rust-aes" ,rust-aes-0.8)
+        ("rust-cipher" ,rust-cipher-0.4)
+        ("rust-hex-literal" ,rust-hex-literal-0.3))))
+    (home-page "https://github.com/magic-akari/ecb")
+    (synopsis "Electronic Codebook (ECB) block cipher mode of operation")
+    (description "Electronic Codebook (ECB) block cipher mode of operation")
+    (license license:expat)))
+
+(define-public rust-ecdsa-0.16
+  (package
+    (name "rust-ecdsa")
+    (version "0.16.6")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ecdsa" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1zapr75j8w1b7bdnijppb94f2jrk2qdrhv8i4fqc0c4agd9mv3m4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-der" ,rust-der-0.7)
+        ("rust-digest" ,rust-digest-0.10)
+        ("rust-elliptic-curve" ,rust-elliptic-curve-0.13)
+        ("rust-rfc6979" ,rust-rfc6979-0.4)
+        ("rust-serdect" ,rust-serdect-0.2)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-signature" ,rust-signature-2))
+       #:cargo-development-inputs
+       (("rust-elliptic-curve" ,rust-elliptic-curve-0.13)
+        ("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-sha2" ,rust-sha2-0.10))))
+    (home-page "https://github.com/RustCrypto/signatures/tree/master/ecdsa")
+    (synopsis "Pure Rust implementation of the ECDSA algorithm")
+    (description
+     "This package provides a pure Rust implementation of the @dfn{Elliptic
+Curve Digital Signature Algorithm} (ECDSA) as specified in FIPS 186-4 (Digital
+Signature Standard), providing RFC6979 deterministic signatures as well as
+support for added entropy.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-ecies-ed25519-0.5
   (package
     (name "rust-ecies-ed25519")
@@ -19800,21 +21398,28 @@ easy.")
 (define-public rust-ed25519-1
   (package
     (name "rust-ed25519")
-    (version "1.0.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "ed25519" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "1vxn7x1xinbv1cl31015m0fw08jwkphylxrll17animv9i9nmiip"))))
+    (version "1.5.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ed25519" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1rzydm5wd8szkddx3g55w4vm86y1ika8qp8qwckada5vf1fg7kwi"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-serde" ,rust-serde-1)
-         ("rust-signature" ,rust-signature-1))))
-    (home-page "")
+     `(#:cargo-inputs
+       (("rust-pkcs8" ,rust-pkcs8-0.9)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+        ("rust-signature" ,rust-signature-1)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-ed25519-dalek" ,rust-ed25519-dalek-1)
+        ("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-rand-core" ,rust-rand-core-0.5))))
+    (home-page "https://github.com/RustCrypto/signatures/tree/master/ed25519")
     (synopsis "Edwards Digital Signature Algorithm (EdDSA) over Curve25519")
     (description
       "EdDSA over Curve25519 is specified in RFC 8032.  This package contains
@@ -19828,6 +21433,33 @@ be plugged in, enabling support for using different Ed25519 implementations,
 including HSMs or Cloud KMS services.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-ed25519-compact-2
+  (package
+    (name "rust-ed25519-compact")
+    (version "2.0.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ed25519-compact" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0k4y7bjl5g0l871iav4zj35qx047n0a4qsvhr28p6434hhp3hgba"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ct-codecs" ,rust-ct-codecs-1)
+        ("rust-ed25519" ,rust-ed25519-1)
+        ("rust-getrandom" ,rust-getrandom-0.2))
+       #:cargo-development-inputs
+       (("rust-ct-codecs" ,rust-ct-codecs-1)
+        ("rust-getrandom" ,rust-getrandom-0.2))))
+    (home-page "https://github.com/jedisct1/rust-ed25519-compact")
+    (synopsis "Wasm-friendly Ed25519 implementation")
+    (description
+     "This package provides a small, self-contained, wasm-friendly Ed25519
+implementation.")
+    (license license:expat)))
+
 (define-public rust-ed25519-dalek-1
   (package
     (name "rust-ed25519-dalek")
@@ -19947,6 +21579,50 @@ signing, and verification in pure Rust.")
      "This package provides a pure-Rust library for parsing ELF files.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-elliptic-curve-0.13
+  (package
+    (name "rust-elliptic-curve")
+    (version "0.13.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "elliptic-curve" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1rqn7yq9rgfs7r0dcj4phxf9hqmw2alfxa0lciamsbkz6sm1xivm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-base16ct" ,rust-base16ct-0.2)
+        ("rust-base64ct" ,rust-base64ct-1)
+        ("rust-crypto-bigint" ,rust-crypto-bigint-0.5)
+        ("rust-digest" ,rust-digest-0.10)
+        ("rust-ff" ,rust-ff-0.13)
+        ("rust-generic-array" ,rust-generic-array-0.14)
+        ("rust-group" ,rust-group-0.13)
+        ("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-hkdf" ,rust-hkdf-0.12)
+        ("rust-pem-rfc7468" ,rust-pem-rfc7468-0.7)
+        ("rust-pkcs8" ,rust-pkcs8-0.10)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-sec1" ,rust-sec1-0.7)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serdect" ,rust-serdect-0.2)
+        ("rust-subtle" ,rust-subtle-2)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-sha3" ,rust-sha3-0.10))))
+    (home-page
+     "https://github.com/RustCrypto/traits/tree/master/elliptic-curve")
+    (synopsis "General purpose Elliptic Curve Cryptography (ECC) support")
+    (description
+     "This package provides general purpose @dfn{Elliptic Curve Cryptography}
+(ECC) support, including types and traits for representing various elliptic
+curve forms, scalars, points, and public/secret keys composed thereof.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-emacs-0.18
   (package
     (name "rust-emacs")
@@ -20761,6 +22437,71 @@ implement enum_primitive.")
 convert enum to u8 slice ref.")
     (license license:bsd-3)))
 
+(define-public rust-enumber-0.3
+  (package
+    (name "rust-enumber")
+    (version "0.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "enumber" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "06gd26x1fpxphkzlxnkmyjc7zalrr2vw88lz4yg23x6q62dv8dgs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/kinnison/enumber/")
+    (synopsis "Provide useful impls on numerical enums")
+    (description "Provide useful impls on numerical enums")
+    (license license:bsd-3)))
+
+(define-public rust-enumflags2-0.7
+  (package
+    (name "rust-enumflags2")
+    (version "0.7.7")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "enumflags2" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1lhvq084ylw3nvhgv1zyagavkj392zamydh5v6y352zn1l4zahf0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-enumflags2-derive" ,rust-enumflags2-derive-0.7)
+        ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/meithecatte/enumflags2")
+    (synopsis "Enum-based bit flags")
+    (description "This package provides enum-based bit flags.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-enumflags2-derive-0.7
+  (package
+    (name "rust-enumflags2-derive")
+    (version "0.7.7")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "enumflags2-derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0iapq76azgkqxby4v117a3jssa9rz7n18vla4i09grc3gngiz6jy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/meithecatte/enumflags2")
+    (synopsis "Internal crate for enumflags2")
+    (description
+     "This package provides internal implementations for enumflags2.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-enumset-1
   (package
     (name "rust-enumset")
@@ -21082,8 +22823,33 @@ deserialized from environment variables.")
      "Type-erased Serialize and Serializer traits.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-errno-0.3
+  (package
+    (name "rust-errno")
+    (version "0.3.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "errno" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0fp7qy6fwagrnmi45msqnl01vksqwdb2qbbv60n9cz7rf0xfrksb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-errno-dragonfly" ,rust-errno-dragonfly-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))))
+    (home-page "https://github.com/lambda-fairy/rust-errno")
+    (synopsis "Cross-platform interface to the @code{errno} variable")
+    (description
+     "This package provides a cross-platform interface to the
+@code{errno} variable.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-errno-0.2
   (package
+    (inherit rust-errno-0.3)
     (name "rust-errno")
     (version "0.2.8")
     (source
@@ -21094,19 +22860,12 @@ deserialized from environment variables.")
        (sha256
         (base32
          "18cnqgk8r6lq1n5cfy3bryiyz9zkqr10dxj49sa3fkzfamih8fgn"))))
-    (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t
            #:cargo-inputs
            `(("rust-errno-dragonfly" ,rust-errno-dragonfly-0.1)
              ("rust-libc" ,rust-libc-0.2)
-             ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/lambda-fairy/rust-errno")
-    (synopsis "Cross-platform interface to the @code{errno} variable")
-    (description
-     "This package provides a cross-platform interface to the
-@code{errno} variable.")
-    (license (list license:asl2.0 license:expat))))
+             ("rust-winapi" ,rust-winapi-0.3))))))
 
 (define-public rust-errno-dragonfly-0.1
   (package
@@ -21381,14 +23140,14 @@ ecosystem.")
 (define-public rust-event-listener-2
   (package
     (name "rust-event-listener")
-    (version "2.5.1")
+    (version "2.5.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "event-listener" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0ndyp41pb2cx7gxijqh4ymnc47nyrvhvir7rvjlw6x09ayb10lzp"))))
+        (base32 "1q4w3pndc518crld6zsqvvpy9lkzwahp2zgza9kbzmmqh9gif1h2"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
@@ -21933,6 +23692,27 @@ floats.")
      "This package provides a simple and fast random number generator.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-fat-macho-0.4
+  (package
+    (name "rust-fat-macho")
+    (version "0.4.7")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "fat-macho" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ywr3xqi884i12d5mfidbma1hrd4rxj9f8jw7p4bignagmy13yk3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-goblin" ,rust-goblin-0.7)
+        ("rust-llvm-bitcode" ,rust-llvm-bitcode-0.1))))
+    (home-page "https://github.com/messense/fat-macho-rs.git")
+    (synopsis "Mach-O Fat Binary Reader and Writer")
+    (description "This package provides a Mach-O Fat Binary Reader and Writer.")
+    (license license:expat)))
+
 (define-public rust-fd-lock-3
   (package
     (name "rust-fd-lock")
@@ -22128,6 +23908,48 @@ Atom, RSS 2.0, RSS 1.0, RSS 0.x and JSON Feed")
     ;; No copyright headers in the source code.  LICENSE indicates gpl3.
     (license license:gpl3)))
 
+(define-public rust-fehler-1
+  (package
+    (name "rust-fehler")
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "fehler" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0d9nk0nimhrqhlwsm42kmg6bwhfqscnfddj70xawsa50kgj9ywnm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-fehler-macros" ,rust-fehler-macros-1))))
+    (home-page "https://github.com/withoutboats/fehler")
+    (synopsis "Library for error-handling syntax in Rust")
+    (description
+     "This package provides a library for error-handling syntax in Rust.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-fehler-macros-1
+  (package
+    (name "rust-fehler-macros")
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "fehler-macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1y808jbwbngji40zny0b0dvxsw9a76g6fl1c5qigmfsy0jqsrdfc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/withoutboats/fehler")
+    (synopsis "Macros for fehler")
+    (description "This package provides macros for the fehler crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-femme-2
   (package
     (name "rust-femme")
@@ -22255,6 +24077,64 @@ Atom, RSS 2.0, RSS 1.0, RSS 0.x and JSON Feed")
     ;; No copyright headers in the source code.  LICENSE indicates gpl3.
     (license license:gpl3)))
 
+(define-public rust-ff-0.13
+  (package
+    (name "rust-ff")
+    (version "0.13.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ff" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0jcl8yhcs5kbfxfpnrhpkkvnk7s666vly6sgawg3nri9nx215m6y"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitvec" ,rust-bitvec-1)
+        ("rust-byteorder" ,rust-byteorder-1)
+        ("rust-ff-derive" ,rust-ff-derive-0.13)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-subtle" ,rust-subtle-2))
+       #:cargo-development-inputs
+       (("rust-blake2b-simd" ,rust-blake2b-simd-1)
+        ("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/zkcrypto/ff")
+    (synopsis "Library for building and interfacing with finite fields")
+    (description "This package provides a rust library for building and
+interfacing with finite fields.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-ff-derive-0.13
+  (package
+    (name "rust-ff-derive")
+    (version "0.13.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ff-derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0jnq13qqmnvgh1xmjzdgynwgbbkf64qibqf5a5hjiva5pq24gxg9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-addchain" ,rust-addchain-0.2)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-num-bigint" ,rust-num-bigint-0.3)
+        ("rust-num-integer" ,rust-num-integer-0.1)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/zkcrypto/ff")
+    (synopsis
+     "Procedural macro library used to build custom prime field implementations")
+    (description
+     "This package provides a procedural macro library used to build custom
+prime field implementations in rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-fiat-crypto-0.1
   (package
     (name "rust-fiat-crypto")
@@ -22273,6 +24153,23 @@ Atom, RSS 2.0, RSS 1.0, RSS 0.x and JSON Feed")
 @code{fiat-crypto} libraries.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-file-diff-1
+  (package
+    (name "rust-file-diff")
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "file-diff" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "19a34rvbqg3b2my6ykax5n1qi2ahwbjacn9y2ji3h9gkp04ak9ri"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/ethanpailes/file_diff-rs")
+    (synopsis "Atomic utility for diffing files in testing")
+    (description "An atomic utility for diffing files in testing.")
+    (license license:bsd-3)))
+
 (define-public rust-filesize-0.2
   (package
     (name "rust-filesize")
@@ -22490,6 +24387,54 @@ custom fixed-size hash types.")
          (base32
           "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46"))))))
 
+(define-public rust-flagset-0.4
+  (package
+    (name "rust-flagset")
+    (version "0.4.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "flagset" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "16alqal1jyg1pibd72drdq2ax5cb1fs09f54ghpw043qg75579nd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serde-repr" ,rust-serde-repr-0.1))))
+    (home-page "https://github.com/enarx/flagset")
+    (synopsis
+     "Data types and a macro for generating enumeration-based bit flags")
+    (description "This package provides data types and a macro for generating
+enumeration-based bit flags in rust.")
+    (license license:asl2.0)))
+
+(define-public rust-flaky-test-0.1
+  (package
+    (name "rust-flaky-test")
+    (version "0.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "flaky-test" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "14yvm0knhcx0xfwlykir2v198x5bpwf333yrdl2mmkv8n5gdx727"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/denoland/flaky_test")
+    (synopsis "Atttribute macro for running a flaky test multiple times")
+    (description "This package provides an atttribute macro for running a flaky
+test multiple times.")
+    (license license:expat)))
+
 (define-public rust-flame-0.2
   (package
     (name "rust-flame")
@@ -22516,8 +24461,32 @@ custom fixed-size hash types.")
     (description "A profiling and flamegraph library.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-flamer-0.4
+  (package
+    (name "rust-flamer")
+    (version "0.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "flamer" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1avszq3fn4ix7p6wjfdkli6fjyxccks1qhzja92a6kpxakd35drn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-flame" ,rust-flame-0.2)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/llogiq/flamer")
+    (synopsis "Macro to insert @code{flame::start_guard(_)}")
+    (description
+     "A procedural macro to insert @code{flame::start_guard(_)} calls.")
+    (license license:asl2.0)))
+
 (define-public rust-flamer-0.3
   (package
+    (inherit rust-flamer-0.4)
     (name "rust-flamer")
     (version "0.3.0")
     (source
@@ -22529,18 +24498,12 @@ custom fixed-size hash types.")
        (sha256
         (base32
          "1b2d7jx80f3p7hqpgdi7wksaiq18k9w23p0cs2sxf7jbx2jx3bgj"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; Uses features not available in stable Rust release
        #:cargo-inputs
        (("rust-flame" ,rust-flame-0.2)
         ("rust-quote" ,rust-quote-0.6)
-        ("rust-syn" ,rust-syn-0.15))))
-    (home-page "https://github.com/llogiq/flamer")
-    (synopsis "Macro to insert @code{flame::start_guard(_)}")
-    (description
-     "A procedural macro to insert @code{flame::start_guard(_)} calls.")
-    (license license:asl2.0)))
+        ("rust-syn" ,rust-syn-0.15))))))
 
 (define-public rust-flatbuffers-2
   (package
@@ -23040,14 +25003,14 @@ implementation that is more efficient for smaller hash keys.")
 (define-public rust-form-urlencoded-1
   (package
     (name "rust-form-urlencoded")
-    (version "1.1.0")
+    (version "1.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "form_urlencoded" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1y3bwavygjzv7b0yqsjqk33yi6wz25b7q2aaq9h54vqmc7qq9hx9"))))
+        (base32 "0ljn0kz23nr9yf3432k656k178nh4jqryfji9b0jw343dz7w2ax6"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -23179,6 +25142,41 @@ values to other threads.")
 duplication.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-fs-at-0.1
+  (package
+    (name "rust-fs-at")
+    (version "0.1.6")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "fs-at" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "02mvd85zjs0pxpykvkbqlwkii5f768z8xm0fqbqzv1s41yrbl105"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-aligned" ,rust-aligned-0.4)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-cvt" ,rust-cvt-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-nix" ,rust-nix-0.26)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-smart-default" ,rust-smart-default-0.7)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-fs-set-times" ,rust-fs-set-times-0.19)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-test-log" ,rust-test-log-0.2))))
+    (home-page "https://github.com/rbtcollins/fs_at.git")
+    (synopsis "Implementation of 'at' functions for various platforms")
+    (description "This package provides an implementation of at functions for
+various platforms.")
+    (license license:asl2.0)))
+
 (define-public rust-fs-err-2
   (package
     (name "rust-fs-err")
@@ -23206,16 +25204,17 @@ more helpful error messages.")
 (define-public rust-fs-extra-1
   (package
     (name "rust-fs-extra")
-    (version "1.2.0")
+    (version "1.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "fs_extra" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "151k6dr35mhq5d8pc8krhw55ajhkyiv0pm14s7zzlc5bc9fp28i0"))))
+        (base32 "075i25z70j2mz9r7i9p9r521y8xdj81q7skslyb7zhqnnw33fw22"))))
     (build-system cargo-build-system)
-    (arguments '(#:skip-build? #t))
+    (arguments
+     `(#:tests? #f))        ; panicked at 'assertion failed: `(left == right)`
     (home-page "https://github.com/webdesus/fs_extra")
     (synopsis "Extra file system methods")
     (description "Expanding opportunities standard library @code{std::fs} and
@@ -23223,6 +25222,28 @@ more helpful error messages.")
 process and much more.")
     (license license:expat)))
 
+(define-public rust-fs-set-times-0.19
+  (package
+    (name "rust-fs-set-times")
+    (version "0.19.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "fs-set-times" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0qc822hifnwvrfd706wnx5xhajqfsc4kn2lmalfda4x02pqx0cvq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-io-lifetimes" ,rust-io-lifetimes-1)
+        ("rust-rustix" ,rust-rustix-0.37)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))))
+    (home-page "https://github.com/bytecodealliance/fs-set-times")
+    (synopsis "Set filesystem timestamps")
+    (description "Set filesystem timestamps")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-fs-utils-1
   (package
     (name "rust-fs-utils")
@@ -23594,7 +25615,7 @@ stabilized, and eventually removed.  This library reïnstates these traits.")
 (define-public rust-futures-0.3
   (package
     (name "rust-futures")
-    (version "0.3.26")
+    (version "0.3.28")
     (source
      (origin
        (method url-fetch)
@@ -23603,10 +25624,10 @@ stabilized, and eventually removed.  This library reïnstates these traits.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "115z5bqihd2jq75s8n7jxy4k83kpv67vhic4snch6d7h1wmpkqhk"))))
+         "0h7c1xvxk751c7xlnph6fh3rb77z4lig4qif7f8q79db2az2ld13"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f
        #:cargo-inputs
        (("rust-futures-channel" ,rust-futures-channel-0.3)
         ("rust-futures-core" ,rust-futures-core-0.3)
@@ -23614,7 +25635,13 @@ stabilized, and eventually removed.  This library reïnstates these traits.")
         ("rust-futures-io" ,rust-futures-io-0.3)
         ("rust-futures-sink" ,rust-futures-sink-0.3)
         ("rust-futures-task" ,rust-futures-task-0.3)
-        ("rust-futures-util" ,rust-futures-util-0.3))))
+        ("rust-futures-util" ,rust-futures-util-0.3))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-pin-project" ,rust-pin-project-1)
+        ("rust-pin-utils" ,rust-pin-utils-0.1)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-tokio" ,rust-tokio-0.1))))
     (home-page "https://rust-lang.github.io/futures-rs")
     (synopsis "Rust implementation of futures and streams")
     (description
@@ -23646,7 +25673,7 @@ featuring zero allocations, composability, and iterator-like interfaces.")
 (define-public rust-futures-channel-0.3
   (package
     (name "rust-futures-channel")
-    (version "0.3.26")
+    (version "0.3.28")
     (source
      (origin
        (method url-fetch)
@@ -23655,10 +25682,10 @@ featuring zero allocations, composability, and iterator-like interfaces.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1xadcvj4hi6278hq6i0vnrsa231fyiylh2n03rx7d2ch79k1flrf"))))
+         "1wmm9wm5zjigxz61qkscmxp7c30zp08dy63spjz5pch9gva1hmcm"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f
        #:cargo-inputs
        (("rust-futures-core" ,rust-futures-core-0.3)
         ("rust-futures-sink" ,rust-futures-sink-0.3))))
@@ -23697,7 +25724,7 @@ featuring zero allocations, composability, and iterator-like interfaces.")
 (define-public rust-futures-core-0.3
   (package
     (name "rust-futures-core")
-    (version "0.3.26")
+    (version "0.3.28")
     (source
      (origin
        (method url-fetch)
@@ -23706,10 +25733,10 @@ featuring zero allocations, composability, and iterator-like interfaces.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "02467z5mv0219hkrgmpvsb3h7vb8pg31s1j901h7vxg11x6zz47c"))))
+         "137fdxy5amg9zkpa1kqnj7bnha6b94fmddz59w973x96gqxmijjb"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f
        #:cargo-inputs
        (("rust-portable-atomic" ,rust-portable-atomic-1))))
     (home-page "https://rust-lang.github.io/futures-rs")
@@ -23767,7 +25794,7 @@ the computation on the threads themselves.")
 (define-public rust-futures-executor-0.3
   (package
     (name "rust-futures-executor")
-    (version "0.3.26")
+    (version "0.3.28")
     (source
      (origin
        (method url-fetch)
@@ -23776,7 +25803,7 @@ the computation on the threads themselves.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "03mm37yv235i2ifjfaacw5cl8cmiyirj8ap3d64fr5xblqshmpp8"))))
+         "1q468di96knnla72xdvswic1ir2qkrf5czsdigc5n4l86a1fxv6c"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -23852,7 +25879,7 @@ intrusive collections.")
 (define-public rust-futures-io-0.3
   (package
     (name "rust-futures-io")
-    (version "0.3.26")
+    (version "0.3.28")
     (source
      (origin
        (method url-fetch)
@@ -23861,9 +25888,8 @@ intrusive collections.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0cc5s3qdgls25rlm3zpdf9fdk6gwmfp0fiiph39b5bmjdwdkgf5z"))))
+         "0r4rhkdhq1my4fahlhz59barqa511bylq813w3w4gvbidq4p9zsg"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
     (home-page "https://rust-lang.github.io/futures-rs")
     (synopsis
      "@code{AsyncRead} and @code{AsyncWrite} traits for the @code{futures-rs}
@@ -23921,14 +25947,14 @@ for the @code{futures-rs} library.")
 (define-public rust-futures-lite-1
   (package
     (name "rust-futures-lite")
-    (version "1.11.3")
+    (version "1.13.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "futures-lite" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1ywmyvpy4f348jri8rxhpj59a7bvy12pspm59x5207fys061sj5l"))))
+        (base32 "1kkbqhaib68nzmys2dc8j9fl2bwzf2s91jfk13lb2q3nwhfdbaa9"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -23974,21 +26000,20 @@ and removes almost all unsafe code from it.")
 (define-public rust-futures-macro-0.3
   (package
     (name "rust-futures-macro")
-    (version "0.3.26")
+    (version "0.3.28")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "futures-macro" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0w3ahy69varlfw57rb2pag7jwngy771vvzmcag7mlfx3gpw3m9wm"))))
+        (base32 "0wpfsqxwqk5k569xl0jzz4zxy85x695mndf7y9jn66q6jid59jl9"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
+        ("rust-syn" ,rust-syn-2))))
     (home-page "https://rust-lang.github.io/futures-rs")
     (synopsis "@code{futures-rs} procedural macro implementations")
     (description
@@ -23996,6 +26021,27 @@ and removes almost all unsafe code from it.")
 implementations.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-futures-micro-0.5
+  (package
+    (name "rust-futures-micro")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "futures-micro" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "09n8d1qnpk6mjpnv338wkbgyppvd4aygfddwlwb8pmlk6m5jcq5l"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f          ; Uses unstable features.
+       #:cargo-inputs (("rust-pin-project-lite" ,rust-pin-project-lite-0.2))
+       #:cargo-development-inputs (("rust-futures-lite" ,rust-futures-lite-0.1))))
+    (home-page "https://github.com/irrustible/futures-micro")
+    (synopsis "Minimal, no_std compatible async prelude")
+    (description "Minimal, no_std compatible async prelude.")
+    (license license:asl2.0)))
+
 (define-public rust-futures-preview-0.3
   (package
     (name "rust-futures-preview")
@@ -24060,7 +26106,7 @@ different @code{Future}s at once and handling the first one to complete.")
 (define-public rust-futures-sink-0.3
   (package
     (name "rust-futures-sink")
-    (version "0.3.26")
+    (version "0.3.28")
     (source
      (origin
        (method url-fetch)
@@ -24069,9 +26115,8 @@ different @code{Future}s at once and handling the first one to complete.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0r43djzf0caz89c724ishpzxy59y6nw7ykfvh1nd9kz8nc5q447k"))))
+         "0vkv4frf4c6gm1ag9imjz8d0xvpnn22lkylsls0rffx147zf8fzl"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
     (home-page "https://rust-lang.github.io/futures-rs")
     (synopsis "Asynchronous @code{Sink} trait for the @code{futures-rs} library")
     (description "This package provides the asynchronous @code{Sink} trait for
@@ -24105,17 +26150,16 @@ futures-rs library.")
 (define-public rust-futures-task-0.3
   (package
     (name "rust-futures-task")
-    (version "0.3.26")
+    (version "0.3.28")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "futures-task" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0rk3jg6lri1rrn03ns89cmw8lircbaf2i2d4mr10zc8hyqdrmxyw"))))
+        (base32 "0ravgihyarbplj32zp60asirfnaalw2wfsa0afhnl3kcpqrd3lvn"))))
     (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t))
+    (arguments `(#:tests? #f))
     (home-page "https://rust-lang.github.io/futures-rs")
     (synopsis "Tools for working with tasks")
     (description "This package provides tools for working with tasks.")
@@ -24124,7 +26168,7 @@ futures-rs library.")
 (define-public rust-futures-test-0.3
   (package
     (name "rust-futures-test")
-    (version "0.3.26")
+    (version "0.3.28")
     (source
      (origin
        (method url-fetch)
@@ -24132,7 +26176,7 @@ futures-rs library.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0pbdzvbmzrnc67bpp7hbh7l5mavqifpgk2vhaprr0vlr6qrpcyi4"))))
+         "0j83960iv317xj8bfq5jay4s1yqdjidfcb1lz8js793h91s2gbw4"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f          ; Doc tests fail.
@@ -24231,7 +26275,7 @@ timeouts and delays with futures.")
 (define-public rust-futures-util-0.3
   (package
     (name "rust-futures-util")
-    (version "0.3.26")
+    (version "0.3.28")
     (source
      (origin
        (method url-fetch)
@@ -24239,10 +26283,10 @@ timeouts and delays with futures.")
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1lbvdf6hq62yczd87glm6ih8h5qkagsl7xdiwhmqvwzymkins7cw"))))
+        (base32 "0cwmls9369w6q6hwlbm10q0plr6hmg8w28fpqvv4rmbjnx01xc16"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f          ; Doc tests fail.
        #:cargo-inputs
        (("rust-futures" ,rust-futures-0.1)
         ("rust-futures-channel" ,rust-futures-channel-0.3)
@@ -24255,7 +26299,8 @@ timeouts and delays with futures.")
         ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
         ("rust-pin-utils" ,rust-pin-utils-0.1)
         ("rust-slab" ,rust-slab-0.4)
-        ("rust-tokio-io" ,rust-tokio-io-0.1))))
+        ("rust-tokio-io" ,rust-tokio-io-0.1))
+       #:cargo-development-inputs (("rust-tokio" ,rust-tokio-0.1))))
     (home-page "https://rust-lang.github.io/futures-rs")
     (synopsis
      "Common utilities and extension traits for the @code{futures-rs} library")
@@ -24534,7 +26579,7 @@ Rust.")
 (define-public rust-generic-array-0.14
   (package
     (name "rust-generic-array")
-    (version "0.14.4")
+    (version "0.14.7")
     (source
       (origin
         (method url-fetch)
@@ -24543,13 +26588,15 @@ Rust.")
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "05qqwm9v5asbil9z28wjkmpfvs1c5c99n8n9gwxis3d3r3n6c52h"))))
+          "16lyyrzrljfq424c3n8kfwkqihlimmsg5nhshbbp48np3yjrqr45"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:tests? #f      ; Doc tests fail
+       #:cargo-inputs
        (("rust-serde" ,rust-serde-1)
         ("rust-typenum" ,rust-typenum-1)
-        ("rust-version-check" ,rust-version-check-0.9))
+        ("rust-version-check" ,rust-version-check-0.9)
+        ("rust-zeroize" ,rust-zeroize-1))
        #:cargo-development-inputs
        (("rust-bincode" ,rust-bincode-1)
         ("rust-serde-json" ,rust-serde-json-1))))
@@ -25131,17 +27178,17 @@ permitted in ordinary Rust.")
     ;; Either license can be chosen at the users option.
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-gimli-0.26
+(define-public rust-gimli-0.27
   (package
     (name "rust-gimli")
-    (version "0.26.2")
+    (version "0.27.2")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "gimli" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0pafbk64rznibgnvfidhm1pqxd14a5s9m50yvsgnbv38b8n0w0r2"))))
+                "1d5v6jjchf4872jynjsg5ni4vankm1341bas8qindygb6g9962md"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -25152,11 +27199,13 @@ permitted in ordinary Rust.")
         ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
         ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))
        #:cargo-development-inputs
-       (("rust-byteorder" ,rust-byteorder-0.5)
-        ("rust-crossbeam" ,rust-crossbeam-0.8)
+       (("rust-crossbeam" ,rust-crossbeam-0.8)
         ("rust-getopts" ,rust-getopts-0.2)
         ("rust-memmap2" ,rust-memmap2-0.5)
-        ("rust-object" ,rust-object-0.29)
+        ("rust-num-cpus" ,rust-num-cpus-1)
+        ("rust-object" ,rust-object-0.30)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-regex" ,rust-regex-1)
         ("rust-test-assembler" ,rust-test-assembler-0.1)
         ("rust-typed-arena" ,rust-typed-arena-2))))
     (home-page "https://github.com/gimli-rs/gimli")
@@ -25164,7 +27213,90 @@ permitted in ordinary Rust.")
     (description
      "This package provides a library for reading and writing the DWARF
 debugging format.")
-    (license (list license:asl2.0 license:expat))))
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-gimli-0.26
+  (package
+    (inherit rust-gimli-0.27)
+    (name "rust-gimli")
+    (version "0.26.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "gimli" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0pafbk64rznibgnvfidhm1pqxd14a5s9m50yvsgnbv38b8n0w0r2"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-fallible-iterator" ,rust-fallible-iterator-0.2)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+        ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))
+       #:cargo-development-inputs
+       (("rust-byteorder" ,rust-byteorder-0.5)
+        ("rust-crossbeam" ,rust-crossbeam-0.8)
+        ("rust-getopts" ,rust-getopts-0.2)
+        ("rust-memmap2" ,rust-memmap2-0.5)
+        ("rust-object" ,rust-object-0.29)
+        ("rust-test-assembler" ,rust-test-assembler-0.1)
+        ("rust-typed-arena" ,rust-typed-arena-2))))))
+
+(define-public rust-git-testament-0.2
+  (package
+    (name "rust-git-testament")
+    (version "0.2.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "git-testament" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1c9l10wpyz39vhb5cijvbym6gmpmw3y3nb35l2hg6w42h1ygaswq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Not all files included.
+       #:cargo-inputs
+       (("rust-git-testament-derive" ,rust-git-testament-derive-0.1)
+        ("rust-no-std-compat" ,rust-no-std-compat-0.4))
+       #:cargo-development-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/kinnison/git-testament/")
+    (synopsis "Record git working tree status when compiling your crate")
+    (description "Record git working tree status when compiling your crate")
+    (license license:bsd-3)))
+
+(define-public rust-git-testament-derive-0.1
+  (package
+    (name "rust-git-testament-derive")
+    (version "0.1.14")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "git-testament-derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1rlais0i47mgsmp3r5jcqry2agjfyg5s9paj6mgvfykchssjsy2a"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-log" ,rust-log-0.4)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1)
+        ("rust-time" ,rust-time-0.3))
+       #:cargo-development-inputs
+       (("rust-git-testament" ,rust-git-testament-0.2))))
+    (home-page "https://github.com/kinnison/git-testament/")
+    (synopsis "Record git working tree status when compiling your crate")
+    (description
+     "This package provides an inner procedural macro for git-testament.")
+    (license license:bsd-3)))
 
 (define-public rust-git-version-0.3
   (package
@@ -25742,7 +27874,7 @@ shell style patterns.")
 (define-public rust-globset-0.4
   (package
     (name "rust-globset")
-    (version "0.4.7")
+    (version "0.4.12")
     (source
      (origin
        (method url-fetch)
@@ -25750,12 +27882,12 @@ shell style patterns.")
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1ca96s29s7aqpkm04z4babyk8xqn1w7slpdrlldgnkz6l2gipz7h"))))
+        (base32 "01phmxrkr9d7lhh84b6nylgjb3r21ssfddxvm23ihz3hw3cbpa5c"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-aho-corasick" ,rust-aho-corasick-0.7)
-        ("rust-bstr" ,rust-bstr-0.2)
+       (("rust-aho-corasick" ,rust-aho-corasick-1)
+        ("rust-bstr" ,rust-bstr-1)
         ("rust-fnv" ,rust-fnv-1)
         ("rust-log" ,rust-log-0.4)
         ("rust-regex" ,rust-regex-1)
@@ -25872,32 +28004,68 @@ timers.")
 libraries GMP, MPFR, and MPC.")
     (license license:lgpl3+)))
 
-(define-public rust-goblin-0.2
+(define-public rust-goblin-0.7
   (package
     (name "rust-goblin")
-    (version "0.2.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "goblin" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1j38fkqadbsjxawr3wnj9m0qaihcwp6pmfakmhsar881509y7mfx"))))
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "goblin" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0d11fk9bdxzf228xpr8v6d6a01dib00khjg5bldk9kf2d51inz7j"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f          ; Not all files included.
        #:cargo-inputs
-       (("rust-scroll" ,rust-scroll-0.10)
+       (("rust-log" ,rust-log-0.4)
         ("rust-plain" ,rust-plain-0.2)
-        ("rust-log" ,rust-log-0.4))))
+        ("rust-scroll" ,rust-scroll-0.11))))
     (home-page "https://github.com/m4b/goblin")
     (synopsis "ELF, Mach-o, and PE binary parsing and loading crate")
     (description "This package provides an ELF, Mach-o, and PE binary parsing
 and loading crate.")
     (license license:expat)))
 
+(define-public rust-goblin-0.6
+  (package
+    (inherit rust-goblin-0.7)
+    (name "rust-goblin")
+    (version "0.6.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "goblin" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0s7zs27b192virbp88y2fgq8p6nb8blkn7byqyl4cv7bm3j4ssqd"))))
+    (arguments
+     `(#:tests? #f          ; Not all files included.
+       #:cargo-inputs
+       (("rust-log" ,rust-log-0.4)
+        ("rust-plain" ,rust-plain-0.2)
+        ("rust-scroll" ,rust-scroll-0.11))))))
+
+(define-public rust-goblin-0.2
+  (package
+    (inherit rust-goblin-0.6)
+    (name "rust-goblin")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "goblin" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1j38fkqadbsjxawr3wnj9m0qaihcwp6pmfakmhsar881509y7mfx"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-scroll" ,rust-scroll-0.10)
+        ("rust-plain" ,rust-plain-0.2)
+        ("rust-log" ,rust-log-0.4))))))
+
 (define-public rust-greetd-ipc-0.8
   (package
     (name "rust-greetd-ipc")
@@ -26134,6 +28302,31 @@ provides standard printing of search results, similar to grep itself.")
      "Fast line oriented regex searching as a library.")
     (license (list license:unlicense license:expat))))
 
+(define-public rust-group-0.13
+  (package
+    (name "rust-group")
+    (version "0.13.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "group" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0qqs2p5vqnv3zvq9mfjkmw3qlvgqb0c3cm6p33srkh7pc9sfzygh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ff" ,rust-ff-0.13)
+        ("rust-memuse" ,rust-memuse-0.2)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)
+        ("rust-subtle" ,rust-subtle-2))))
+    (home-page "https://github.com/zkcrypto/group")
+    (synopsis "Elliptic curve group traits and utilities")
+    (description "Elliptic curve group traits and utilities.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-groupable-0.2
   (package
     (name "rust-groupable")
@@ -26535,8 +28728,81 @@ already-hashed or hash-like data.")
 @code{#[derive(Hash32)]}.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-hashbrown-0.14
+  (package
+    (name "rust-hashbrown")
+    (version "0.14.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "hashbrown" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0yj3nf0w30pf30w503kgaw4sbjnh62l5cbmc7dd0mnczzywh2qic"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (substitute* "Cargo.toml"
+                    (("=([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)" _ version)
+                     (string-append "^" version)))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ahash" ,rust-ahash-0.8)
+        ("rust-allocator-api2" ,rust-allocator-api2-0.2)
+        ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rkyv" ,rust-rkyv-0.7)
+        ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-bumpalo" ,rust-bumpalo-3)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-fnv" ,rust-fnv-1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rkyv" ,rust-rkyv-0.7)
+        ("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://github.com/rust-lang/hashbrown")
+    (synopsis "Rust port of Google's SwissTable hash map")
+    (description
+     "This package provides a Rust port of Google's SwissTable hash map.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-hashbrown-0.13
+  (package
+    (inherit rust-hashbrown-0.14)
+    (name "rust-hashbrown")
+    (version "0.13.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "hashbrown" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "03ji3n19j4b6mf2wlla81vsixcmlivglp6hgk79d1pcxfcrw38s3"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ahash" ,rust-ahash-0.8)
+        ("rust-bumpalo" ,rust-bumpalo-3)
+        ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-fnv" ,rust-fnv-1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-serde-test" ,rust-serde-test-1))))))
+
 (define-public rust-hashbrown-0.12
   (package
+    (inherit rust-hashbrown-0.13)
     (name "rust-hashbrown")
     (version "0.12.3")
     (source (origin
@@ -26553,7 +28819,6 @@ already-hashed or hash-like data.")
                '(substitute* "Cargo.toml"
                   (("\\[package\\]" m)
                    (string-append "cargo-features = [\"edition2021\"]\n" m))))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-ahash" ,rust-ahash-0.7)
@@ -26569,12 +28834,7 @@ already-hashed or hash-like data.")
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-rand" ,rust-rand-0.8)
         ("rust-rayon" ,rust-rayon-1)
-        ("rust-serde-test" ,rust-serde-test-1))))
-    (home-page "https://github.com/rust-lang/hashbrown")
-    (synopsis "Rust port of Google's SwissTable hash map")
-    (description
-     "This package provides a Rust port of Google's SwissTable hash map")
-    (license (list license:expat license:asl2.0))))
+        ("rust-serde-test" ,rust-serde-test-1))))))
 
 (define-public rust-hashbrown-0.11
   (package
@@ -26780,8 +29040,34 @@ hash map.")
         ("rust-rustc-hash" ,rust-rustc-hash-1)
         ("rust-serde-test" ,rust-serde-test-1))))))
 
+(define-public rust-hashlink-0.8
+  (package
+    (name "rust-hashlink")
+    (version "0.8.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "hashlink" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1ap6ar5jlqq6ln7d9r2j5079mbx0zg8643xacqyjwkqw96ws2q87"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-hashbrown" ,rust-hashbrown-0.13)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-rustc-hash" ,rust-rustc-hash-1)
+        ("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://github.com/kyren/hashlink")
+    (synopsis "HashMap-like containers with user controllable order")
+    (description "This package provides HashMap-like containers that hold
+their key-value pairs in a user controllable order.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-hashlink-0.7
   (package
+    (inherit rust-hashlink-0.8)
     (name "rust-hashlink")
     (version "0.7.0")
     (source
@@ -26791,19 +29077,13 @@ hash map.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1kzs54xq1g41zph39cfdfchiafij99382zw5fk6zq7xwkh9a6jbj"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-hashbrown" ,rust-hashbrown-0.11)
         ("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
-       (("rust-serde-test" ,rust-serde-test-1))))
-    (home-page "https://crates.io/crates/hashlink")
-    (synopsis "HashMap-like containers with user controllable order")
-    (description "This package provides HashMap-like containers that hold
-their key-value pairs in a user controllable order.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-serde-test" ,rust-serde-test-1))))))
 
 (define-public rust-hdrhistogram-6
   (package
@@ -27107,22 +29387,21 @@ consistent, and reasonably well performing.")
        #:cargo-inputs
        (("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))))
 
-(define-public rust-hermit-abi-0.2
+(define-public rust-hermit-abi-0.3
   (package
     (name "rust-hermit-abi")
-    (version "0.2.6")
+    (version "0.3.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "hermit-abi" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1iz439yz9qzk3rh9pqx2rz5c4107v3qbd7bppfsbzb1mzr02clgf"))))
+                "11j2v3q58kmi5mhjvh6hfrb7il2yzg7gmdf5lpwnwwv6qj04im7y"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
-        ("rust-libc" ,rust-libc-0.2)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
         ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
     (home-page "https://github.com/hermitcore/rusty-hermit")
@@ -27133,11 +29412,30 @@ It is used to build the target x86_64-unknown-hermit.")
     ;; The user can choose either license.
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-hermit-abi-0.2
+  (package
+    (inherit rust-hermit-abi-0.3)
+    (name "rust-hermit-abi")
+    (version "0.2.6")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "hermit-abi" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1iz439yz9qzk3rh9pqx2rz5c4107v3qbd7bppfsbzb1mzr02clgf"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))))
+
 (define-public rust-hermit-abi-0.1
   (package
     (inherit rust-hermit-abi-0.2)
     (name "rust-hermit-abi")
-    (version "0.1.10")
+    (version "0.1.20")
     (source
       (origin
         (method url-fetch)
@@ -27146,13 +29444,12 @@ It is used to build the target x86_64-unknown-hermit.")
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0blmmzik5cs79ivq70s9gal8ypgzj50wnl2hwsaam46gjjbz2p3j"))))
+          "1ypkwpf5r7m0jqdn2wfa0070i412kn9snvi1hg52w1yfvc40k8y7"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-        (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
-         ("rust-libc" ,rust-libc-0.2)
-         ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))))
+     `(#:cargo-inputs
+       (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))))
 
 (define-public rust-hex-0.4
   (package
@@ -27203,10 +29500,31 @@ hexadecimal representation.")
        (sha256
         (base32 "1ajkw40qzn2ygnqjj9w584f6l31wi318258n84pn2hax8la2i8nn"))))))
 
+(define-public rust-hex-literal-0.4
+  (package
+    (name "rust-hex-literal")
+    (version "0.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "hex-literal" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0iny5inkixsdr41pm2vkqh3fl66752z5j5c0cdxw16yl9ryjdqkg"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/RustCrypto/utils")
+    (synopsis
+     "Convert hexadecimal string to byte array at compile time")
+    (description
+     "Procedural macro for converting hexadecimal string to byte array at
+compile time.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-hex-literal-0.3
   (package
+    (inherit rust-hex-literal-0.4)
     (name "rust-hex-literal")
-    (version "0.3.3")
+    (version "0.3.4")
     (source
      (origin
        (method url-fetch)
@@ -27215,15 +29533,7 @@ hexadecimal representation.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0nzljsyz9rwhh4vi0xs9ya4l5g0ka754wgpy97r1j3v42c75kr11"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/RustCrypto/utils")
-    (synopsis
-     "Convert hexadecimal string to byte array at compile time")
-    (description
-     "Procedural macro for converting hexadecimal string to byte array at
-compile time.")
-    (license (list license:asl2.0 license:expat))))
+         "1q54yvyy0zls9bdrx15hk6yj304npndy9v4crn1h1vd95sfv5gby"))))))
 
 (define-public rust-hex-literal-0.2
   (package
@@ -27624,32 +29934,59 @@ Hash-based Message Authentication Code algorithm} for SHA1.")
        (("rust-libc" ,rust-libc-0.2)
         ("rust-winutil" ,rust-winutil-0.1))))))
 
+(define-public rust-html5ever-0.26
+  (package
+    (name "rust-html5ever")
+    (version "0.26.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "html5ever" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1dx3lhfwngi21wa79cpjv5rd4wn5vmklr50wrwbryidq92mqr9my"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-log" ,rust-log-0.4)
+        ("rust-mac" ,rust-mac-0.1)
+        ("rust-markup5ever" ,rust-markup5ever-0.11)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-typed-arena" ,rust-typed-arena-1))))
+    (home-page "https://github.com/servo/html5ever")
+    (synopsis "High-performance browser-grade HTML5 parser")
+    (description
+     "This package provides a high-performance browser-grade HTML5 parser.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-html5ever-0.25
   (package
+    (inherit rust-html5ever-0.26)
     (name "rust-html5ever")
-    (version "0.25.1")
+    (version "0.25.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "html5ever" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0szdpwr6l3p21flf01pdlpj6fkpqisqf34lvs918449n3a5g7z5a"))))
+        (base32 "0j1iw2yy3fglr5rxqfrghmhksxzpcfp8ps753qazqkaxisq3zhg5"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-log" ,rust-log-0.4)
         ("rust-mac" ,rust-mac-0.1)
         ("rust-markup5ever" ,rust-markup5ever-0.10)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/servo/html5ever")
-    (synopsis "High-performance browser-grade HTML5 parser")
-    (description
-     "This package provides a high-performance browser-grade HTML5 parser.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-typed-arena" ,rust-typed-arena-1))))))
 
 (define-public rust-html5ever-0.24
   (package
@@ -27726,14 +30063,14 @@ Hash-based Message Authentication Code algorithm} for SHA1.")
 (define-public rust-html-escape-0.2
   (package
     (name "rust-html-escape")
-    (version "0.2.12")
+    (version "0.2.13")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "html-escape" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "01f2v3c6j2rk5h2lhdbh62j07cm1fvzqw4vplj2sms83jpx5qc8m"))))
+                "0xml3hswv0205fbm5iq7dqiwjkr6d245xkfppwi7wqjdfr4x86kd"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -27750,22 +30087,24 @@ characters in HTML, decoding and unescaping HTML entities as well.")
 (define-public rust-hts-sys-2
   (package
     (name "rust-hts-sys")
-    (version "2.0.2")
+    (version "2.0.3")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "hts-sys" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1qn1qz2xa69x2dj1fbh91avm9943rbcykr37zs68pb2bdy847i3j"))
+                "1sy4wfk64f1i81m0brhrs4cm6qkb099zv62gr0k6js6k0v24zfhd"))
               (modules '((guix build utils)))
               (snippet
                '(substitute* "Cargo.toml"
                   ;; Do not use zlib-ng; just use zlib.
-                  (("features = \\[\"zlib-ng\", \"static\"\\]") "")
-                  ;; No static libraries please.
-                  (("\"static-curl\", \"static-ssl\",") "")
-                  ((", \"static\"") "")
+                  (("\"zlib-ng\",") "")
+                  (("\"static\",") "")
+                  ;; No static libraries please in curl-sys.
+                  (("\"static-curl\",") "")
+                  (("\"static-ssl\",") "\"ssl\",")
+                  ;; No static lzma.
                   (("\\[\"static\"\\]") "[]")))))
     (build-system cargo-build-system)
     (arguments
@@ -27776,7 +30115,7 @@ characters in HTML, decoding and unescaping HTML entities as well.")
         ("rust-curl-sys" ,rust-curl-sys-0.4)
         ("rust-fs-utils" ,rust-fs-utils-1)
         ("rust-glob" ,rust-glob-0.3)
-        ("rust-libdeflate-sys" ,rust-libdeflate-sys-0.5)
+        ("rust-libdeflate-sys" ,rust-libdeflate-sys-0.7)
         ("rust-libz-sys" ,rust-libz-sys-1)
         ("rust-lzma-sys" ,rust-lzma-sys-0.1)
         ("rust-openssl-sys" ,rust-openssl-sys-0.9))))
@@ -28132,10 +30471,31 @@ HTTP request or response body.")
      "This package provides a Humantime serialization timestamp format.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-humansize-2
+  (package
+    (name "rust-humansize")
+    (version "2.1.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "humansize" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1msxd1akb3dydsa8qs461sds9krwnn31szvqgaq93p4x0ad1rdbc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-libm" ,rust-libm-0.2))))
+    (home-page "https://github.com/LeopoldArkham/humansize")
+    (synopsis "Represent file sizes in a human-readable format")
+    (description "This package provides a configurable crate to easily
+represent file sizes in a human-readable format.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-humansize-1
   (package
+    (inherit rust-humansize-2)
     (name "rust-humansize")
-    (version "1.1.0")
+    (version "1.1.1")
     (source
      (origin
        (method url-fetch)
@@ -28143,13 +30503,7 @@ HTTP request or response body.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0piadmwjah1jv6q288im4za9szlgalzjyq2811w35i6gg9ib5jmn"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/LeopoldArkham/humansize")
-    (synopsis "Represent file sizes in a human-readable format")
-    (description "This package provides a configurable crate to easily
-represent file sizes in a human-readable format.")
-    (license (list license:expat license:asl2.0))))
+         "09nh6xyssghjajvip9crd79i4a40nw8r4bdwwg3dg5l7rfb6ja82"))))))
 
 (define-public rust-humantime-2
   (package
@@ -28474,32 +30828,6 @@ SystemTime}}.")
        #:cargo-development-inputs
        (("rust-tokio" ,rust-tokio-0.2))))))
 
-(define-public rust-hyper-rustls-0.17
-  (package
-    (inherit rust-hyper-rustls-0.21)
-    (name "rust-hyper-rustls")
-    (version "0.17.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "hyper-rustls" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0li9xkzmqd40dbjbl9g0nbf2ka9y0q538ififyd30zsavz3qb7bi"))))
-    (arguments
-     `(#:cargo-test-flags '("--release" "--" "--skip=server" "--skip=client"
-                            "--skip=custom_ca_store")
-       #:cargo-inputs
-       (("rust-bytes" ,rust-bytes-0.4)
-        ("rust-ct-logs" ,rust-ct-logs-0.6)
-        ("rust-futures" ,rust-futures-0.1)
-        ("rust-hyper" ,rust-hyper-0.12)
-        ("rust-rustls" ,rust-rustls-0.16)
-        ("rust-tokio-io" ,rust-tokio-io-0.1)
-        ("rust-tokio-rustls" ,rust-tokio-rustls-0.10)
-        ("rust-webpki" ,rust-webpki-0.21)
-        ("rust-webpki-roots" ,rust-webpki-roots-0.17))))))
-
 (define-public rust-hyper-sync-rustls-0.3
   (package
     (name "rust-hyper-sync-rustls")
@@ -28709,6 +31037,26 @@ with hyper.")
      "This package provides the IANA time zone for the current system.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-idea-0.5
+  (package
+    (name "rust-idea")
+    (version "0.5.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "idea" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0xv4hd9mgrwgzfl7cc5nlwyahm9yni5z9dwb3c1z5mqr8h05fm87"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cipher" ,rust-cipher-0.4))
+       #:cargo-development-inputs (("rust-cipher" ,rust-cipher-0.4))))
+    (home-page "https://github.com/RustCrypto/block-ciphers")
+    (synopsis "IDEA block cipher")
+    (description "IDEA block cipher")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-ident-case-1
   (package
     (name "rust-ident-case")
@@ -28729,8 +31077,36 @@ with hyper.")
      "Utility for applying case rules to Rust identifiers.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-idna-0.4
+  (package
+    (name "rust-idna")
+    (version "0.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "idna" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0z4i1dhqk83bbv230pp1c31dqdlnscvqxvc85n40ihgvgfqdc83x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-unicode-bidi" ,rust-unicode-bidi-0.3)
+        ("rust-unicode-normalization" ,rust-unicode-normalization-0.1))
+       #:cargo-development-inputs
+       (("rust-assert-matches" ,rust-assert-matches-1)
+        ("rust-bencher" ,rust-bencher-0.1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-tester" ,rust-tester-0.9))))
+    (home-page "https://github.com/servo/rust-url/")
+    (synopsis "Internationalizing Domain Names in Applications and Punycode")
+    (description
+     "IDNA (Internationalizing Domain Names in Applications) and Punycode.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-idna-0.3
   (package
+    (inherit rust-idna-0.4)
     (name "rust-idna")
     (version "0.3.0")
     (source
@@ -28740,7 +31116,6 @@ with hyper.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1rh9f9jls0jy3g8rh2bfpjhvvhh4q80348jc4jr2s844133xykg1"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-unicode-bidi" ,rust-unicode-bidi-0.3)
@@ -28749,12 +31124,7 @@ with hyper.")
        (("rust-assert-matches" ,rust-assert-matches-1)
         ("rust-bencher" ,rust-bencher-0.1)
         ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-tester" ,rust-tester-0.9))))
-    (home-page "https://github.com/servo/rust-url/")
-    (synopsis "Internationalizing Domain Names in Applications and Punycode")
-    (description
-     "IDNA (Internationalizing Domain Names in Applications) and Punycode.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-tester" ,rust-tester-0.9))))))
 
 (define-public rust-idna-0.2
   (package
@@ -28856,7 +31226,7 @@ on both POSIX and Microsoft Windows hosts.")
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-cc", rust-cc-1)
+       (("rust-cc" ,rust-cc-1)
         ("rust-libc" ,rust-libc-0.2))))
     (home-page "https://github.com/messense/if-addrs")
     (synopsis "Retrieve the IP addresses for all network interfaces")
@@ -28886,19 +31256,18 @@ let} expressions.")
 (define-public rust-ignore-0.4
   (package
     (name "rust-ignore")
-    (version "0.4.18")
+    (version "0.4.20")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "ignore" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "07bmnv96msggqb040z6xqp1p7s8ys0f97b731hp6mybkjc9ingvi"))))
+        (base32 "14kl9fv83klbnjxdv0y8lpwlj3gkypxf3vbrmm29m2jkmcyqgryv"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
-        ("rust-globset" ,rust-globset-0.4)
+       (("rust-globset" ,rust-globset-0.4)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-log" ,rust-log-0.4)
         ("rust-memchr" ,rust-memchr-2)
@@ -29194,23 +31563,26 @@ crate.")
 that efficiently appends and removes common indentation after every newline.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-indexmap-1
+(define-public rust-indexmap-2
   (package
     (name "rust-indexmap")
-    (version "1.9.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "indexmap" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "16dkr2h5p379jcr8rnb420396yvzid2myirc2w70zcf43yffg18q"))))
+    (version "2.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "indexmap" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0pdnbvv6gnyxx2li8mks8p00fya3ynmhx3n6infpcy8a4gi7yiym"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-equivalent" ,rust-equivalent-1)
+        ("rust-hashbrown" ,rust-hashbrown-0.14)
         ("rust-quickcheck" ,rust-quickcheck-1)
-        ("rust-rustc-rayon" ,rust-rustc-rayon-0.4)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rustc-rayon" ,rust-rustc-rayon-0.5)
         ("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
        (("rust-fnv" ,rust-fnv-1)
@@ -29232,24 +31604,26 @@ removals, and it allows lookup of its elements by either hash table key
 or numerical index.  A corresponding hash set type is also provided.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-indexmap-1.8
+(define-public rust-indexmap-1
   (package
-    (inherit rust-indexmap-1)
+    (inherit rust-indexmap-2)
     (name "rust-indexmap")
-    (version "1.8.2")
+    (version "1.9.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "indexmap" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0nnaw0whv3xysrpjrz69bsibbscd81rwx63s6f4kbajv1ia2s0g6"))))
+        (base32 "16dxmy7yvk51wvnih3a3im6fp5lmx0wx76i03n06wyak6cwhw1xx"))))
     (arguments
      `(#:cargo-inputs
-       (("rust-autocfg" ,rust-autocfg-1)
-        ("rust-hashbrown" ,rust-hashbrown-0.11)
+       (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-autocfg" ,rust-autocfg-1)
+        ("rust-hashbrown" ,rust-hashbrown-0.12)
+        ("rust-quickcheck" ,rust-quickcheck-1)
         ("rust-rayon" ,rust-rayon-1)
-        ("rust-rustc-rayon" ,rust-rustc-rayon-0.4)
+        ("rust-rustc-rayon" ,rust-rustc-rayon-0.5)
         ("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
        (("rust-fnv" ,rust-fnv-1)
@@ -29260,48 +31634,50 @@ or numerical index.  A corresponding hash set type is also provided.")
         ("rust-rand" ,rust-rand-0.8)
         ("rust-serde-derive" ,rust-serde-derive-1))))))
 
-(define-public rust-indexmap-1.7
+(define-public rust-indexmap-1.8
   (package
     (inherit rust-indexmap-1)
     (name "rust-indexmap")
-    (version "1.7.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "indexmap" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "19b2zwfajhsfcgny0clv8y4jppy704znfhv8nv2dw9a18l2kcqxw"))))
+    (version "1.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "indexmap" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0nnaw0whv3xysrpjrz69bsibbscd81rwx63s6f4kbajv1ia2s0g6"))))
     (arguments
      `(#:cargo-inputs
        (("rust-autocfg" ,rust-autocfg-1)
         ("rust-hashbrown" ,rust-hashbrown-0.11)
         ("rust-rayon" ,rust-rayon-1)
+        ("rust-rustc-rayon" ,rust-rustc-rayon-0.4)
         ("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
        (("rust-fnv" ,rust-fnv-1)
         ("rust-fxhash" ,rust-fxhash-0.2)
-        ("rust-itertools" ,rust-itertools-0.9)
+        ("rust-itertools" ,rust-itertools-0.10)
         ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-quickcheck" ,rust-quickcheck-0.9)
-        ("rust-rand" ,rust-rand-0.7)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-rand" ,rust-rand-0.8)
         ("rust-serde-derive" ,rust-serde-derive-1))))))
 
-(define-public rust-indexmap-1.6
+(define-public rust-indexmap-1.7
   (package
     (inherit rust-indexmap-1)
     (name "rust-indexmap")
-    (version "1.6.2")
+    (version "1.7.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "indexmap" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "1wxfh55zlrlpdxfcvvvj6wwc46f23cnb0j9q71190yl9pyh4aj42"))))
+               (base32
+                "19b2zwfajhsfcgny0clv8y4jppy704znfhv8nv2dw9a18l2kcqxw"))))
     (arguments
      `(#:cargo-inputs
        (("rust-autocfg" ,rust-autocfg-1)
-        ("rust-hashbrown" ,rust-hashbrown-0.9)
+        ("rust-hashbrown" ,rust-hashbrown-0.11)
         ("rust-rayon" ,rust-rayon-1)
         ("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
@@ -29375,14 +31751,14 @@ Rust.")
 (define-public rust-indoc-2
   (package
     (name "rust-indoc")
-    (version "2.0.1")
+    (version "2.0.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "indoc" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "142nzc474x1xgdzk057yv1yfrgxsk5a9zybbcwwrzp5ih65v8b4z"))))
+        (base32 "19xv7xcwln384m5m3p93hva9vv3yicjgsa69z1vrhakyq90dw73n"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
@@ -29547,22 +31923,20 @@ deordinalize, demodulize, foreign key, and pluralize/singularize are supported
 as both traits and pure functions acting on String types.")
     (license license:bsd-2)))
 
-(define-public rust-inotify-0.9
+(define-public rust-inotify-0.10
   (package
     (name "rust-inotify")
-    (version "0.9.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "inotify" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1cs3xlkq3fnfca3mimvifazp01ayscinm07v38ifw0xin5f4fcdh"))))
+    (version "0.10.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "inotify" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1k2m6a95827yspax1icmwiz4szr7c01w3dnn2b2bil4hfvcnilgx"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-futures-core" ,rust-futures-core-0.3)
         ("rust-inotify-sys" ,rust-inotify-sys-0.1)
@@ -29570,14 +31944,41 @@ as both traits and pure functions acting on String types.")
         ("rust-tokio" ,rust-tokio-1))
        #:cargo-development-inputs
        (("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-maplit" ,rust-maplit-1)
+        ("rust-rand" ,rust-rand-0.8)
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-tokio" ,rust-tokio-1))))
-    (home-page "https://github.com/inotify-rs/inotify")
+    (home-page "https://github.com/hannobraun/inotify")
     (synopsis "Idiomatic wrapper for inotify")
     (description "This package provides an idiomatic wrapper for inotify
 written in Rust.")
     (license license:isc)))
 
+(define-public rust-inotify-0.9
+  (package
+    (inherit rust-inotify-0.10)
+    (name "rust-inotify")
+    (version "0.9.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "inotify" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1cs3xlkq3fnfca3mimvifazp01ayscinm07v38ifw0xin5f4fcdh"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-inotify-sys" ,rust-inotify-sys-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs
+       (("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-tokio" ,rust-tokio-1))))))
+
 (define-public rust-inotify-0.8
   (package
     (inherit rust-inotify-0.9)
@@ -29928,23 +32329,20 @@ bytestring representations.")
      "Simple procedural macro attribute for repetitive tests.")
     (license license:expat)))
 
-(define-public rust-inventory-0.2
+(define-public rust-inventory-0.3
   (package
     (name "rust-inventory")
-    (version "0.2.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "inventory" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "06h9xw67wx18rank4yyz93iq89j0fk6fbazryfvf5ach1dp4qd44"))))
+    (version "0.3.8")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "inventory" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1yd0qljqk29vkgpgac1vnigs44li8sd029jbrlrj8xg2w2hqg2n3"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-ctor" ,rust-ctor-0.1)
-        ("rust-ghost" ,rust-ghost-0.1))
-       #:cargo-development-inputs
+     `(#:cargo-development-inputs
        (("rust-rustversion" ,rust-rustversion-1)
         ("rust-trybuild" ,rust-trybuild-1))))
     (home-page "https://github.com/dtolnay/inventory")
@@ -29953,9 +32351,28 @@ bytestring representations.")
      "This package provides a way to set up a plugin registry into which
 plugins can be registered from any source file linked into your program.
 There does not need to be a central list of all the plugins.")
-    ;; Either license can be chosen at the users option.
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-inventory-0.2
+  (package
+    (inherit rust-inventory-0.3)
+    (name "rust-inventory")
+    (version "0.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "inventory" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "06h9xw67wx18rank4yyz93iq89j0fk6fbazryfvf5ach1dp4qd44"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ctor" ,rust-ctor-0.1)
+        ("rust-ghost" ,rust-ghost-0.1))
+       #:cargo-development-inputs
+       (("rust-rustversion" ,rust-rustversion-1)
+        ("rust-trybuild" ,rust-trybuild-1))))))
+
 (define-public rust-inventory-0.1
   (package
     (inherit rust-inventory-0.2)
@@ -30005,24 +32422,25 @@ versions < 0.2.")
 (define-public rust-io-lifetimes-1
   (package
     (name "rust-io-lifetimes")
-    (version "1.0.3")
+    (version "1.0.10")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "io-lifetimes" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0g76f1c4w3cgyl6qn3kfmi7srphrmjhx3a0rl4qks4ib4n9jl4a6"))))
+                "08625nsz0lgbd7c9lly6b6l45viqpsnj9jbsixd9mrz7596wfrlw"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1)
                        ("rust-fs-err" ,rust-fs-err-2)
+                       ("rust-hermit-abi" ,rust-hermit-abi-0.3)
                        ("rust-libc" ,rust-libc-0.2)
                        ("rust-mio" ,rust-mio-0.8)
                        ("rust-os-pipe" ,rust-os-pipe-1)
                        ("rust-socket2" ,rust-socket2-0.4)
                        ("rust-tokio" ,rust-tokio-1)
-                       ("rust-windows-sys" ,rust-windows-sys-0.42))))
+                       ("rust-windows-sys" ,rust-windows-sys-0.48))))
     (home-page "https://github.com/sunfishcode/io-lifetimes")
     (synopsis "Low-level I/O ownership and borrowing library")
     (description
@@ -30122,6 +32540,25 @@ network configuration for Windows.")
         ("rust-winapi" ,rust-winapi-0.3)
         ("rust-winreg" ,rust-winreg-0.6))))))
 
+(define-public rust-is-ci-1
+  (package
+    (name "rust-is-ci")
+    (version "1.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "is-ci" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1ywra2z56x6d4pc02zq24a4x7gvpixynh9524icbpchbf9ydwv31"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/zkat/is_ci")
+    (synopsis "Lightweight CI environment checker")
+    (description
+     "Super lightweight CI environment checker.  Just tells you if you're in CI
+or not without much fuss.")
+    (license license:isc)))
+
 (define-public rust-is-macro-0.1
   (package
     (name "rust-is-macro")
@@ -30209,7 +32646,7 @@ that integrates with Rust idioms.")
 (define-public rust-ipnet-2
   (package
     (name "rust-ipnet")
-    (version "2.3.0")
+    (version "2.7.2")
     (source
      (origin
        (method url-fetch)
@@ -30217,11 +32654,12 @@ that integrates with Rust idioms.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0db147nh8jnxr23yxa7hwqn7dcjivdqi3aq4mgf2zgkqqqa2zgj7"))))
+         "0zxmnidy5qha1i384fzjfxcsi0qvkbcp730h26q4z3dg54hyxdhj"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-serde" ,rust-serde-1))
+       (("rust-schemars" ,rust-schemars-0.8)
+        ("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
        (("rust-serde-test" ,rust-serde-test-1))))
     (home-page "https://github.com/krisprice/ipnet")
@@ -30341,21 +32779,25 @@ whether or not a given path points to an executable file.")
 (define-public rust-is-terminal-0.4
   (package
     (name "rust-is-terminal")
-    (version "0.4.1")
+    (version "0.4.7")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "is-terminal" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0c2322dg9s35h87ln33w6qsjlgplhzza89rwmkvac4r9ikvhjxlj"))))
+                "07xyfla3f2jjb666s72la5jvl9zq7mixbqkjvyfi5j018rhr7kxd"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-hermit-abi" ,rust-hermit-abi-0.2)
+       (("rust-hermit-abi" ,rust-hermit-abi-0.3)
         ("rust-io-lifetimes" ,rust-io-lifetimes-1)
-        ("rust-rustix" ,rust-rustix-0.36)
-        ("rust-windows-sys" ,rust-windows-sys-0.42))))
+        ("rust-rustix" ,rust-rustix-0.37)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs
+       (("rust-atty" ,rust-atty-0.2)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/sunfishcode/is-terminal")
     (synopsis "Test whether a given stream is a terminal")
     (description
@@ -30560,15 +33002,17 @@ and functions.")
 (define-public rust-itoa-1
   (package
     (name "rust-itoa")
-    (version "1.0.1")
+    (version "1.0.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "itoa" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0d8wr2qf5b25a04xf10rz9r0pdbjdgb0zaw3xvf8k2sqcz1qzaqs"))))
+        (base32 "19jc2sa3wvdc29zhgbwf3bayikq4rq18n20dbyg9ahd4hbsxjfj5"))))
     (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-no-panic" ,rust-no-panic-0.1))))
     (home-page "https://github.com/dtolnay/itoa")
     (synopsis "Fast functions for printing integer primitives")
     (description "This crate provides fast functions for printing integer
@@ -31008,7 +33452,7 @@ the jni-bindgen code generator for binding to JVM APIs from Rust.")
 (define-public rust-jobserver-0.1
   (package
     (name "rust-jobserver")
-    (version "0.1.24")
+    (version "0.1.26")
     (source
      (origin
        (method url-fetch)
@@ -31017,7 +33461,7 @@ the jni-bindgen code generator for binding to JVM APIs from Rust.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1yn1vxbbqv7dqir6qbfcj8h8ddjf89m5mhvm36h13xx7k5raf9dg"))))
+         "1hkprvh1zp5s3qwjjwwhw7rcpivczcbf6q60rcxr0m8158hzsv4k"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -31025,7 +33469,7 @@ the jni-bindgen code generator for binding to JVM APIs from Rust.")
        #:cargo-development-inputs
        (("rust-futures" ,rust-futures-0.1)
         ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-tempdir" ,rust-tempdir-0.3)
+        ("rust-tempfile" ,rust-tempfile-3)
         ("rust-tokio-core" ,rust-tokio-core-0.1)
         ("rust-tokio-process" ,rust-tokio-process-0.2))))
     (home-page "https://github.com/alexcrichton/jobserver-rs")
@@ -31143,8 +33587,27 @@ like Node.js and browsers, built on @code{#[wasm_bindgen]} using the
 wasm-bindgen crate.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-json-0.12
+  (package
+    (name "rust-json")
+    (version "0.12.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "json" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1z9vybaaz3xq95bwmyln2ijmn4dmzj61xlz06jsc9dnzmxg2i3h7"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/maciejhirsz/json-rust")
+    (synopsis "JSON implementation in Rust")
+    (description "This crate provides a JSON implementation in Rust, reducing
+friction with idiomatic Rust structs to ease interopability.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-json-0.11
   (package
+    (inherit rust-json-0.12)
     (name "rust-json")
     (version "0.11.15")
     (source
@@ -31155,14 +33618,7 @@ wasm-bindgen crate.")
         (sha256
          (base32
           "1rg9jxf6bpbwis3ixd5ak8rp37him7n4z8awz4ssrxl6hyplbhlj"))))
-    (build-system cargo-build-system)
-    (arguments '(#:skip-build? #t))
-    (home-page "https://github.com/maciejhirsz/json-rust")
-    (synopsis "JSON implementation in Rust")
-    (description "This crate provides a JSON implementation in Rust, reducing
-friction with idiomatic Rust structs to ease interopability.")
-    (license (list license:asl2.0
-                   license:expat))))
+    (arguments '(#:skip-build? #t))))
 
 (define-public rust-juliex-0.3
   (package
@@ -31264,20 +33720,23 @@ debugging.")
 (define-public rust-keccak-0.1
   (package
     (name "rust-keccak")
-    (version "0.1.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "keccak" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "19ybbvxrdk9yy65rk7f5ad0hcxszkjwph68yzkj3954lnir1bhk7"))))
+    (version "0.1.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "keccak" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0h7rcvwvf20g4k8cx2brnrqvah6jwzs84w09vrj4743dczc5wvcg"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
-    (home-page "https://crates.io/crates/keccak")
+    (arguments
+     `(#:cargo-inputs (("rust-cpufeatures" ,rust-cpufeatures-0.2))))
+    (home-page "https://github.com/RustCrypto/sponges/tree/master/keccak")
     (synopsis "Keccak-f sponge function for Rust")
-    (description "This package provides a keccak-f sponge function")
-    (license license:cc0)))
+    (description
+     "Pure Rust implementation of the Keccak sponge function including the
+keccak-f and keccak-p variants.")
+    (license (list license:asl2.0 license:expat))))
 
 (define-public rust-kernel32-sys-0.2
   (package
@@ -31303,6 +33762,39 @@ debugging.")
 kernel32.")
     (license license:expat)))
 
+(define-public rust-keyring-2
+  (package
+    (name "rust-keyring")
+    (version "2.0.5")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "keyring" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "14i4qxz6kpy1ijkx1gwig494f3bq54kwxldjf459w508plls2jcm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Tests need a TTY.
+       #:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-linux-keyutils" ,rust-linux-keyutils-0.2)
+        ("rust-secret-service" ,rust-secret-service-3)
+        ("rust-security-framework" ,rust-security-framework-2)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-clap" ,rust-clap-4)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rpassword" ,rust-rpassword-7)
+        ("rust-whoami" ,rust-whoami-1))))
+    (home-page "https://github.com/hwchen/keyring-rs")
+    (synopsis "Cross-platform library for managing passwords/credentials")
+    (description "This package provides a cross-platform library for managing
+passwords/credentials.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-khronos-api-3
   (package
     (name "rust-khronos-api")
@@ -31756,6 +34248,28 @@ requires non-const function calls to be computed.")
      `(#:cargo-inputs
        (("rust-clippy" ,rust-clippy-0.0))))))
 
+(define-public rust-lddtree-0.3
+  (package
+    (name "rust-lddtree")
+    (version "0.3.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "lddtree" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "15f24jcglphqdjxmzafp8fnzslczzr6q1rls36akmb9hd32gwnrg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-fs-err" ,rust-fs-err-2)
+        ("rust-glob" ,rust-glob-0.3)
+        ("rust-goblin" ,rust-goblin-0.7))))
+    (home-page "https://github.com/messense/lddtree-rs")
+    (synopsis "Read the ELF dependency tree")
+    (description "Read the ELF dependency tree.")
+    (license license:expat)))
+
 (define-public rust-lebe-0.5
   (package
     (name "rust-lebe")
@@ -31799,7 +34313,7 @@ requires non-const function calls to be computed.")
         ("rust-log" ,rust-log-0.4)
         ("rust-native-tls" ,rust-native-tls-0.2)
         ("rust-nom" ,rust-nom-4)
-        ("rust-r2d2" ,rust-r2d2)
+        ("rust-r2d2" ,rust-r2d2-0.8)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-json" ,rust-serde-json-1))))
@@ -32023,14 +34537,14 @@ parser in Rust.")
 (define-public rust-libc-0.2
   (package
     (name "rust-libc")
-    (version "0.2.137")
+    (version "0.2.144")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "libc" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "12dz2lk4a7lm03k079n2rkm1l6cpdhvy6nrngbfprzrv19icqzzw"))))
+        (base32 "1qfzrwhncsradwvdzd8vsj4mc31fh0rb5rvny3884rwa48fcq01b"))))
     (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs
@@ -32052,14 +34566,14 @@ values of all the exported APIs match the platform that libc is compiled for.")
 (define-public rust-libc-print-0.1
   (package
     (name "rust-libc-print")
-    (version "0.1.13")
+    (version "0.1.21")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "libc-print" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0cjvz622b9bmf32q3mzmxv9ddxfdla6z2v647v8f3qx7lci9kmji"))))
+        (base32 "04bcx06gb04v0csgyzsvd1v9wvmv26xwbipmpcblgfnrigasbkh6"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
@@ -32116,22 +34630,20 @@ exposed as non-streaming buffer operations.  It contains bindings for raw
 deflate, zlib, and gzip data.")
     (license license:asl2.0)))
 
-(define-public rust-libdeflate-sys-0.5
+(define-public rust-libdeflate-sys-0.7
   (package
     (inherit rust-libdeflate-sys-0.11)
     (name "rust-libdeflate-sys")
-    (version "0.5.0")
+    (version "0.7.5")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "libdeflate-sys" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "07ychzvz9xrqs92frs3zpny0l8jp3sndzqpl7zhv6kdqhzx9xqr1"))))
+                "0a5pkrxa7zcb0nab2j48dn6j8d8g1pjvz196c308wrax6dpazkjc"))))
     (arguments
-     `(#:cargo-inputs
-       (("rust-cc" ,rust-cc-1))))
-    (home-page "https://github.com/adamkewley/libdeflater")))
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1))))))
 
 (define-public rust-libdeflater-0.11
   (package
@@ -32856,30 +35368,51 @@ suite of tools for the rapid, accurate and memory-frugal processing
 single-cell and single-nucleus sequencing data.")
     (license license:bsd-3)))
 
+(define-public rust-libsqlite3-sys-0.26
+  (package
+    (name "rust-libsqlite3-sys")
+    (version "0.26.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "libsqlite3-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "09j3v5nhgvjdyskgwajhg9g6v3b2ij0lxiz8qqav2cxic7zjxhmg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bindgen" ,rust-bindgen-0.64)
+        ("rust-cc" ,rust-cc-1)
+        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-vcpkg" ,rust-vcpkg-0.2))))
+    (inputs
+     (list sqlite))
+    (home-page "https://github.com/rusqlite/rusqlite")
+    (synopsis "Native bindings to the libsqlite3 library")
+    (description "Native bindings to the libsqlite3 library")
+    (license license:expat)))
+
 (define-public rust-libsqlite3-sys-0.23
   (package
+    (inherit rust-libsqlite3-sys-0.26)
     (name "rust-libsqlite3-sys")
-    (version "0.23.1")
+    (version "0.23.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "libsqlite3-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1wm91qnsz729vfl3n1rhaq2ip2v4zzxbsawb975vlh4v8h68bmdb"))))
-    (build-system cargo-build-system)
+        (base32 "0n6b4mlpw9l74cl5mahnpaanyjsgpmz5y517kmnk6v09fiygrjnj"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-bindgen" ,rust-bindgen-0.59)
         ("rust-cc" ,rust-cc-1)
         ("rust-openssl-sys" ,rust-openssl-sys-0.9)
         ("rust-pkg-config" ,rust-pkg-config-0.3)
-        ("rust-vcpkg" ,rust-vcpkg-0.2))))
-    (home-page "https://github.com/rusqlite/rusqlite")
-    (synopsis "Native bindings to the libsqlite3 library")
-    (description "Native bindings to the libsqlite3 library")
-    (license license:expat)))
+        ("rust-vcpkg" ,rust-vcpkg-0.2))))))
 
 (define-public rust-libsqlite3-sys-0.22
   (package
@@ -33050,6 +35583,25 @@ high-performance zlib library.")
     (description "This package provides an object pool manager in Rust.")
     (license license:expat)))
 
+(define-public rust-line-col-0.2
+  (package
+    (name "rust-line-col")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "line-col" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1nvqjxn2kkxkph3qdlkc5xq1m2ygla4l0saga778sp2vp3vcsscy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))
+    (home-page "https://github.com/TheBerkin/line-col-rs")
+    (synopsis "Convert string slice indices into line/column numbers")
+    (description "Convert string slice indices into line/column numbers")
+    (license license:expat)))
+
 (define-public rust-line-wrap-0.1
   (package
     (name "rust-line-wrap")
@@ -33232,25 +35784,52 @@ in plain text.  It is smart about where a link ends, such as with trailing
 punctuation.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-linux-raw-sys-0.1
+(define-public rust-linux-keyutils-0.2
+  (package
+    (name "rust-linux-keyutils")
+    (version "0.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "linux-keyutils" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0jxq2bsrr80diyh8h4a0ls6yaljhyvj6ha2qmfshn7fxyrkvn9rz"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-libc" ,rust-libc-0.2))
+       #:cargo-development-inputs
+       (("rust-clap" ,rust-clap-3)
+        ("rust-zeroize" ,rust-zeroize-1))))
+    (home-page "https://github.com/landhb/linux-keyutils")
+    (synopsis "Rust interface to the Linux key-management facility")
+    (description
+     "This package provides a rust interface to the Linux key-management
+facility.  Provides a safe interface around the raw system calls allowing
+user-space programs to perform key manipulation.")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-linux-raw-sys-0.3
   (package
     (name "rust-linux-raw-sys")
-    (version "0.1.3")
+    (version "0.3.7")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "linux-raw-sys" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0zxlp1c4h7kkc4ldgcj5cn7dzynvlksg8y0s9czn2v1sjvc0i7wg"))))
+                "17s7qr5h82blrxy29014zzhr30jcxcjc8r16v2p31rzcfal7xsgc"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-development-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-static-assertions" ,rust-static-assertions-1))
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
-        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))
+       #:cargo-development-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-static-assertions" ,rust-static-assertions-1))))
     (home-page "https://github.com/sunfishcode/linux-raw-sys")
     (synopsis "Generated bindings for Linux APIs")
     (description
@@ -33260,6 +35839,26 @@ Linux userspace APIs.")
     ;; LLVM exception.  See COPYRIGHT in the repository.
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-linux-raw-sys-0.1
+  (package
+    (inherit rust-linux-raw-sys-0.3)
+    (name "rust-linux-raw-sys")
+    (version "0.1.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "linux-raw-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0zxlp1c4h7kkc4ldgcj5cn7dzynvlksg8y0s9czn2v1sjvc0i7wg"))))
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-static-assertions" ,rust-static-assertions-1))
+       #:cargo-inputs
+       (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))))
+
 (define-public rust-linux-raw-sys-0.0.46
   (package
     (inherit rust-linux-raw-sys-0.1)
@@ -33405,6 +36004,25 @@ language representing fixed values).  Particularly useful for proc macros, but
 can also be used outside of a proc-macro context.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-llvm-bitcode-0.1
+  (package
+    (name "rust-llvm-bitcode")
+    (version "0.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "llvm-bitcode" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1fskb2nzddg8m038kh2lm91gb5yg0l4j3rcnv44kz7f37kcxz5cb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-num-enum" ,rust-num-enum-0.5))))
+    (home-page "https://github.com/messense/llvm-bitcode-rs.git")
+    (synopsis "LLVM Bitcode parser in Rust")
+    (description "This package provides an LLVM Bitcode parser in Rust.")
+    (license license:expat)))
+
 (define-public rust-locale-0.2
   (package
     (name "rust-locale")
@@ -34035,7 +36653,7 @@ server (LSP).")
 (define-public rust-lzma-sys-0.1
   (package
     (name "rust-lzma-sys")
-    (version "0.1.17")
+    (version "0.1.20")
     (source
      (origin
        (method url-fetch)
@@ -34043,10 +36661,10 @@ server (LSP).")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "06fnjsx5cj2w6rsqb12x30nl9lnj0xv4hv78z4x1vlfsxp1vgd5x"))
+         "09sxp20waxyglgn3cjz8qjkspb3ryz2fwx4rigkwvrk46ymh9njz"))
        (modules '((guix build utils)))
        (snippet
-        '(begin (delete-file-recursively "xz-5.2") #t))))
+        '(begin (delete-file-recursively "xz-5.2")))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -34293,30 +36911,50 @@ algorithms.  It supports CBC block cipher mode, PKCS5 padding and 64, 128,
      "This package provides a simple library for maildir manipulation.")
     (license license:bsd-0)))
 
-(define-public rust-mailparse-0.13
+(define-public rust-mailparse-0.14
   (package
     (name "rust-mailparse")
-    (version "0.13.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "mailparse" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1qacyzfl3wsl745b92w9gj0mjg43rcwg99l96rmg8l1sq5pm4vy0"))))
+    (version "0.14.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "mailparse" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1al0yb9wgy26ihd0gm4x1dk9rsv23wrmp2qw1lk4f04cbw7mfmkb"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f          ; Doc tests fail.
        #:cargo-inputs
-       (("rust-base64" ,rust-base64-0.13)
-        ("rust-charset" ,rust-charset-0.1)
-        ("rust-quoted-printable" ,rust-quoted-printable-0.4))))
-    (home-page "https://github.com/staktrace/mailparse")
+       (("rust-charset" ,rust-charset-0.1)
+        ("rust-data-encoding" ,rust-data-encoding-2)
+        ("rust-quoted-printable" ,rust-quoted-printable-0.4))
+       #:cargo-development-inputs (("rust-ouroboros" ,rust-ouroboros-0.14))))
+    (home-page "https://github.com/staktrace/mailparse/blob/master/README.md")
     (synopsis "Simple parser for MIME e-mail messages")
     (description
      "This package provides a simple parser for MIME e-mail messages.")
     (license license:bsd-0)))
 
+(define-public rust-mailparse-0.13
+  (package
+    (inherit rust-mailparse-0.14)
+    (name "rust-mailparse")
+    (version "0.13.5")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "mailparse" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1qacyzfl3wsl745b92w9gj0mjg43rcwg99l96rmg8l1sq5pm4vy0"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-base64" ,rust-base64-0.13)
+        ("rust-charset" ,rust-charset-0.1)
+        ("rust-quoted-printable" ,rust-quoted-printable-0.4))))))
+
 (define-public rust-malloc-buf-0.0
  (package
    (name "rust-malloc-buf")
@@ -34406,8 +37044,35 @@ template engine for Rust.")
      "This package provides a fast, type-safe template engine for Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-markup5ever-0.11
+  (package
+    (name "rust-markup5ever")
+    (version "0.11.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "markup5ever" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "05mhzsp6lfxla1fgd0ac283b405s6kyj27wj5r6d7wq42jxjj9ks"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-log" ,rust-log-0.4)
+        ("rust-phf" ,rust-phf-0.10)
+        ("rust-phf-codegen" ,rust-phf-codegen-0.10)
+        ("rust-string-cache" ,rust-string-cache-0.8)
+        ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5)
+        ("rust-tendril" ,rust-tendril-0.4))))
+    (home-page "https://github.com/servo/html5ever")
+    (synopsis "Common code for xml5ever and html5ever")
+    (description
+     "Common code for xml5ever and html5ever.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-markup5ever-0.10
   (package
+    (inherit rust-markup5ever-0.11)
     (name "rust-markup5ever")
     (version "0.10.1")
     (source
@@ -34419,7 +37084,6 @@ template engine for Rust.")
         (sha256
          (base32
           "1zf8iq2czd6kz99fjs3pgf5c17lfz75ds31khkfiqbc50gxl0kx2"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-log" ,rust-log-0.4)
@@ -34427,12 +37091,7 @@ template engine for Rust.")
         ("rust-phf-codegen" ,rust-phf-codegen-0.8)
         ("rust-string-cache" ,rust-string-cache-0.8)
         ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5)
-        ("rust-tendril" ,rust-tendril-0.4))))
-    (home-page "https://github.com/servo/html5ever")
-    (synopsis "Common code for xml5ever and html5ever")
-    (description
-     "Common code for xml5ever and html5ever.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-tendril" ,rust-tendril-0.4))))))
 
 (define-public rust-markup5ever-0.9
   (package
@@ -34475,30 +37134,27 @@ template engine for Rust.")
         (base32
          "08ayl9aqjnmf7ly1ipy6dk3wjvyfn4w51l40jzh1fh984ykldbzi"))))))
 
-(define-public rust-markup5ever-rcdom-0.1
+(define-public rust-markup5ever-rcdom-0.2
   (package
     (name "rust-markup5ever-rcdom")
-    (version "0.1.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "markup5ever-rcdom" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0axf6vrms8579lvhbjaj0v7bhs8xb7s26d4sam2g3m6qpi1xl5gh"))))
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "markup5ever-rcdom" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1hir73wmvl0i5mfplfjg0qvxxmsn8qp5xmjkdkp813hgfpb1slmr"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-html5ever" ,rust-html5ever-0.25)
-         ("rust-markup5ever" ,rust-markup5ever-0.10)
-         ("rust-tendril" ,rust-tendril-0.4)
-         ("rust-xml5ever" ,rust-xml5ever-0.16))
-        #:cargo-development-inputs
-        (("rust-rustc-test" ,rust-rustc-test-0.3)
-         ("rust-serde-json" ,rust-serde-json-1))))
+     `(#:cargo-inputs
+       (("rust-html5ever" ,rust-html5ever-0.26)
+        ("rust-markup5ever" ,rust-markup5ever-0.11)
+        ("rust-tendril" ,rust-tendril-0.4)
+        ("rust-xml5ever" ,rust-xml5ever-0.17))
+       #:cargo-development-inputs
+       (("rust-rustc-test" ,rust-rustc-test-0.3)
+        ("rust-serde-json" ,rust-serde-json-1))))
     (home-page "https://github.com/servo/html5ever")
     (synopsis
      "Basic, unsupported DOM structure for use by tests in html5ever/xml5ever")
@@ -34507,6 +37163,30 @@ template engine for Rust.")
 in html5ever/xml5ever")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-markup5ever-rcdom-0.1
+  (package
+    (inherit rust-markup5ever-rcdom-0.2)
+    (name "rust-markup5ever-rcdom")
+    (version "0.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "markup5ever-rcdom" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0axf6vrms8579lvhbjaj0v7bhs8xb7s26d4sam2g3m6qpi1xl5gh"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-html5ever" ,rust-html5ever-0.25)
+        ("rust-markup5ever" ,rust-markup5ever-0.10)
+        ("rust-tendril" ,rust-tendril-0.4)
+        ("rust-xml5ever" ,rust-xml5ever-0.16))
+       #:cargo-development-inputs
+       (("rust-rustc-test" ,rust-rustc-test-0.3)
+        ("rust-serde-json" ,rust-serde-json-1))))))
+
 (define-public rust-match-cfg-0.1
   (package
     (name "rust-match-cfg")
@@ -35175,8 +37855,69 @@ file IO.")
        (sha256
         (base32 "0nmymqy9q62x577ydja0ysfyir7h5qa0n5fwcnvchfhhlsi0rdyr"))))))
 
+(define-public rust-memo-map-0.3
+  (package
+    (name "rust-memo-map")
+    (version "0.3.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "memo-map" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0h0c80ilf74872nfn1dx65zdj60cxcczrbks113l9kk0jp07dhmf"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/mitsuhiko/memo-map")
+    (synopsis "Synchronized map for memoization")
+    (description "This package provides a crate implementing a synchronized map
+for memoization.")
+    (license license:asl2.0)))
+
+(define-public rust-memoffset-0.9
+  (package
+    (name "rust-memoffset")
+    (version "0.9.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "memoffset" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0v20ihhdzkfw1jx00a7zjpk2dcp5qjq6lz302nyqamd9c4f4nqss"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-autocfg" ,rust-autocfg-1))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3))))
+    (home-page "https://github.com/Gilnaa/memoffset")
+    (synopsis "C-like offset_of functionality for Rust structs")
+    (description
+     "This package provides C-like @code{offset_of} functionality
+for Rust structs.")
+    (license license:expat)))
+
+(define-public rust-memoffset-0.8
+  (package
+    (inherit rust-memoffset-0.9)
+    (name "rust-memoffset")
+    (version "0.8.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "memoffset" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1qcdic88dhgw76pafgndpz04pig8il4advq978mxdxdwrydp276n"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-autocfg" ,rust-autocfg-1))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3))))))
+
 (define-public rust-memoffset-0.7
   (package
+    (inherit rust-memoffset-0.8)
     (name "rust-memoffset")
     (version "0.7.1")
     (source
@@ -35186,18 +37927,11 @@ file IO.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1x2zv8hv9c9bvgmhsjvr9bymqwyxvgbca12cm8xkhpyy5k1r7s2x"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-autocfg" ,rust-autocfg-1))
        #:cargo-development-inputs
-       (("rust-doc-comment" ,rust-doc-comment-0.3))))
-    (home-page "https://github.com/Gilnaa/memoffset")
-    (synopsis "C-like offset_of functionality for Rust structs")
-    (description
-     "This package provides C-like @code{offset_of} functionality
-for Rust structs.")
-    (license license:expat)))
+       (("rust-doc-comment" ,rust-doc-comment-0.3))))))
 
 (define-public rust-memoffset-0.6
   (package
@@ -35279,6 +38013,25 @@ for Rust structs.")
        (sha256
         (base32 "13ir50j549gdz94pds1i7ljnk14d66q5x91s11hncm1pih7jif8c"))))))
 
+(define-public rust-memuse-0.2
+  (package
+    (name "rust-memuse")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "memuse" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "06kgsfv8fnhqbwnq3q841ndfq5wkanz5jpykldpfmrdc6na8ci91"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-nonempty" ,rust-nonempty-0.7))))
+    (home-page "https://github.com/str4d/memuse")
+    (synopsis "Traits for measuring dynamic memory usage of types")
+    (description "Traits for measuring dynamic memory usage of types.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-merge-derive-0.1
   (package
     (name "rust-merge-derive")
@@ -35349,50 +38102,6 @@ proofs.  It automates the Fiat-Shamir transform, so that by using Merlin,
 non-interactive protocols can be implemented as if they were interactive.")
     (license license:expat)))
 
-(define-public rust-mesalink-1
-  (package
-    (name "rust-mesalink")
-    (version "1.1.0-cratesio")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "mesalink" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "02lp27j5vxdc95bf5g983yr660cm6vljikk0yqry4j6cjvfnyq85"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-test-flags
-       '("--release"
-         "--"
-         "--skip=libssl::ssl::tests::early_data_to_mesalink_io"
-         "--skip=libssl::ssl::tests::get_ssl_fd"
-         "--skip=libssl::ssl::tests::ssl_on_nonblocking_socket")
-       #:cargo-inputs
-       (("rust-base64" ,rust-base64-0.10)
-        ("rust-bitflags" ,rust-bitflags-1)
-        ("rust-enum-to-u8-slice-derive" ,rust-enum-to-u8-slice-derive-0.1)
-        ("rust-env-logger" ,rust-env-logger-0.6)
-        ("rust-jemallocator" ,rust-jemallocator-0.3)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-parking-lot" ,rust-parking-lot-0.9)
-        ("rust-ring" ,rust-ring-0.16)
-        ("rust-rustls" ,rust-rustls-0.16)
-        ("rust-sct" ,rust-sct-0.6)
-        ("rust-untrusted" ,rust-untrusted-0.7)
-        ("rust-walkdir" ,rust-walkdir-2)
-        ("rust-webpki" ,rust-webpki-0.21)
-        ("rust-webpki-roots" ,rust-webpki-roots-0.17))
-       #:cargo-development-inputs
-       (("rust-cfg-if" ,rust-cfg-if-1))))
-    (home-page "https://github.com/mesalock-linux/mesalink")
-    (synopsis "Memory-safe and OpenSSL-compatible TLS library")
-    (description
-     "MesaLink is a memory-safe and OpenSSL-compatible TLS library
-based on Rustls and Ring.")
-    (license license:bsd-3)))
-
 (define-public rust-metadeps-1
   (package
     (name "rust-metadeps")
@@ -35832,6 +38541,58 @@ file's MIME type by its extension.")
     ;; No copyright headers in the source code.  LICENSE indicates gpl3.
     (license license:gpl3)))
 
+(define-public rust-minijinja-0.34
+  (package
+    (name "rust-minijinja")
+    (version "0.34.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "minijinja" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1gf14x3rvixw1pqwbdj95nx5wxcrkkdpmg2k7spxdjkxm35r3akm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-aho-corasick" ,rust-aho-corasick-1)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-memo-map" ,rust-memo-map-0.3)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-self-cell" ,rust-self-cell-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-unicode-ident" ,rust-unicode-ident-1)
+        ("rust-v-htmlescape" ,rust-v-htmlescape-0.15))
+       #:cargo-development-inputs
+       (("rust-insta" ,rust-insta-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-similar-asserts" ,rust-similar-asserts-1))))
+    (home-page "https://github.com/mitsuhiko/minijinja")
+    (synopsis "Template engine for Rust")
+    (description "This package provides a template engine for Rust.")
+    (license license:asl2.0)))
+
+(define-public rust-minimad-0.9
+  (package
+    (name "rust-minimad")
+    (version "0.9.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "minimad" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0d2qnjwdrb3ngb0sayzj2b56pjb75ajqiaz4iw7zfs4537q3jxi7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1))))
+    (home-page "https://github.com/Canop/minimad")
+    (synopsis "Light markdown parser")
+    (description "Light markdown parser.")
+    (license license:expat)))
+
 (define-public rust-minimal-lexical-0.2
   (package
     (name "rust-minimal-lexical")
@@ -35933,31 +38694,6 @@ streaming API for miniz_oxide.")
     (arguments
      `(#:cargo-inputs (("rust-adler32" ,rust-adler32-1))))))
 
-(define-public rust-miniz-sys-0.1
-  (package
-    (name "rust-miniz-sys")
-    (version "0.1.12")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "miniz-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "00l2r4anm8g35x0js2zfdnwfbrih9m43vphdpb77c5ga3kjkm7hy"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ;; Build dependencies:
-        ("rust-cc" ,rust-cc-1))))
-    (home-page "https://github.com/alexcrichton/flate2-rs")
-    (synopsis "Bindings to the miniz.c library")
-    (description
-     "This package provides bindings to the @code{miniz.c} library.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-mint-0.5
   (package
     (name "rust-mint")
@@ -35984,21 +38720,21 @@ streaming API for miniz_oxide.")
 (define-public rust-mio-0.8
   (package
     (name "rust-mio")
-    (version "0.8.5")
+    (version "0.8.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "mio" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1pjqn6jvmqkgyykf2z5danqka1rfs3il7w4d0qin8yi062y35mz5"))))
+        (base32 "1ygx5chq81k3vk2bx722xwcwf2qydmm337jsnijgzd7mxx39m7av"))))
     (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs
            `(("rust-libc" ,rust-libc-0.2)
              ("rust-log" ,rust-log-0.4)
              ("rust-wasi" ,rust-wasi-0.11)
-             ("rust-windows-sys" ,rust-windows-sys-0.42))
+             ("rust-windows-sys" ,rust-windows-sys-0.45))
            #:cargo-development-inputs
            `(("rust-env-logger" ,rust-env-logger-0.8)
              ("rust-rand" ,rust-rand-0.8))))
@@ -36242,7 +38978,7 @@ IOCP and Async I/O abstractions.")
   (package
     (inherit rust-miow-0.3)
     (name "rust-miow")
-    (version "0.2.1")
+    (version "0.2.2")
     (source
       (origin
         (method url-fetch)
@@ -36250,7 +38986,7 @@ IOCP and Async I/O abstractions.")
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "06g9b8sqlh5gxakwqq4rrib07afwanfnxgxajrldwcgk3hxjy7wc"))))
+          "0kcl8rnv0bhiarcdakik670w8fnxzlxhi1ys7152sck68510in7b"))))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -36366,32 +39102,6 @@ IOCP and Async I/O abstractions.")
 select the mock struct at compile time.  Used with the Mockall crate.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-model-0.1
-  (package
-    (name "rust-model")
-    (version "0.1.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "model" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0kx6hy5i1fn2qs4x6hpng9jixpm68g83vm24z8bqqscr317yinb6"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-permutohedron" ,rust-permutohedron-0.2)
-        ("rust-proptest" ,rust-proptest-0.9))))
-    (home-page "https://github.com/spacejam/model")
-    (synopsis "Model-based testing for data structures")
-    (description
-     "Model-based testing for data structures, with linearizability
-checking.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-modifier-0.1
   (package
     (name "rust-modifier")
@@ -36609,7 +39319,7 @@ library.")
 (define-public rust-mysqlclient-sys-0.2
   (package
     (name "rust-mysqlclient-sys")
-    (version "0.2.4")
+    (version "0.2.5")
     (source
      (origin
        (method url-fetch)
@@ -36617,7 +39327,7 @@ library.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "11ggkcbfnmp81amc9g0j98dk17fnmqcp9smgm9w401286kckg5ky"))))
+         "16wndr59cbpc2wgli45zfgi0hi837pbrsh1aqh2k0ads50akh6zn"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -37274,19 +39984,20 @@ library.")
 (define-public rust-ndarray-0.15
   (package
     (name "rust-ndarray")
-    (version "0.15.3")
+    (version "0.15.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "ndarray" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1jd845r1ihybq02iz85b1xcnvxr7l2qs06dabgk278v086b59s08"))))
+        (base32 "0cpsm28hyk8qfjs4g9649dprv3hm53z12qqwyyjqbi3yjr72vcdd"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-approx" ,rust-approx-0.4)
+        ("rust-approx" ,rust-approx-0.5)
         ("rust-cblas-sys" ,rust-cblas-sys-0.1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-matrixmultiply" ,rust-matrixmultiply-0.3)
@@ -37300,7 +40011,7 @@ library.")
        (("rust-approx" ,rust-approx-0.4)
         ("rust-defmac" ,rust-defmac-0.2)
         ("rust-itertools" ,rust-itertools-0.10)
-        ("rust-quickcheck" ,rust-quickcheck-0.9))))
+        ("rust-quickcheck" ,rust-quickcheck-1))))
     (home-page "https://github.com/rust-ndarray/ndarray")
     (synopsis "N-dimensional container for general elements and for numerics")
     (description "@code{ndarray} implements an n-dimensional container for
@@ -37719,7 +40430,7 @@ in Rust that can compile to WebAssembly.")
 (define-public rust-net2-0.2
   (package
     (name "rust-net2")
-    (version "0.2.33")
+    (version "0.2.38")
     (source
       (origin
         (method url-fetch)
@@ -37727,11 +40438,10 @@ in Rust that can compile to WebAssembly.")
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "126g3fgfxp06zimc1l9iyxnn9cif1hjsg7sd81nlls5nnyghsma2"))))
+          "0cf66y4415qc1i9sr0rrn9my5f1pgxzf3xllwsr309fdrycxzl3l"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-0.1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-winapi" ,rust-winapi-0.3))))
@@ -37746,29 +40456,26 @@ types as proposed in RFC 1158.")
 (define-public rust-nettle-7
   (package
     (name "rust-nettle")
-    (version "7.0.3")
+    (version "7.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "nettle" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1qlsq3szglkw7s089h5qh9xa787qyvkdj5cgxm4qj30fazwr0hx0"))))
+        (base32 "0dk36l90p79c3xgmrzp8489h8dfaal0jzaid1n8n3cg7xbrwrzdr"))))
     (build-system cargo-build-system)
     (native-inputs
      (list pkg-config))
     (inputs
      (list clang gmp nettle))
     (arguments
-     `(#:skip-build? #t ;; provides nothing, has no tests
-       #:cargo-inputs
-       (("rust-getrandom" ,rust-getrandom-0.1)
+     `(#:cargo-inputs
+       (("rust-getrandom" ,rust-getrandom-0.2)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-nettle-sys" ,rust-nettle-sys-2)
-        ("rust-thiserror" ,rust-thiserror-1))
-       #:cargo-development-inputs
-       (("rust-bindgen" ,rust-bindgen-0.51)
-        ("rust-pkg-config" ,rust-pkg-config-0.3))))
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-typenum" ,rust-typenum-1))))
     (home-page "https://gitlab.com/sequoia-pgp/nettle-rs")
   (synopsis "Rust bindings for the Nettle cryptographic library")
   (description "This package provides Rust bindings for the Nettle
@@ -37787,20 +40494,25 @@ cryptographic library.")
         (string-append (package-name rust-nettle-7) "-" version ".tar.gz"))
        (sha256
         (base32 "0zfplqdf3mag8r7lc124hl24vri8yg711jmm8gl1mpwnlhass2n4"))
-       (patches (search-patches "rust-nettle-disable-vendor.patch"))))))
+       (patches (search-patches "rust-nettle-disable-vendor.patch"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-failure" ,rust-failure-0.1)
+        ("rust-getrandom" ,rust-getrandom-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-nettle-sys" ,rust-nettle-sys-2))))))
 
 (define-public rust-nettle-sys-2
   (package
     (name "rust-nettle-sys")
-    (version "2.0.4")
+    (version "2.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "nettle-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1yq1w6dlcmg89x529i7s20j29afdhgim7qnsa7978fszzwrr6qmq"))
-       (patches (search-patches "rust-nettle-sys-disable-vendor.patch"))))
+        (base32 "0wwa7pmxdz7yl9jwybml2kmrj3i87jcn0h0cdc5xl0lhgcs1rs5m"))))
     (build-system cargo-build-system)
     (native-inputs
      (list clang pkg-config))
@@ -37808,8 +40520,12 @@ cryptographic library.")
      (list nettle))
     (arguments
      `(#:cargo-inputs
-       (("rust-bindgen" ,rust-bindgen-0.51)
-        ("rust-pkg-config" ,rust-pkg-config-0.3))))
+       (("rust-bindgen" ,rust-bindgen-0.63)
+        ("rust-cc" ,rust-cc-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-vcpkg" ,rust-vcpkg-0.2))))
     (home-page "https://gitlab.com/sequoia-pgp/nettle-sys")
     (synopsis "Low-level Rust bindings for the Nettle cryptographic library")
     (description "This package provides low-level Rust bindings for the Nettle
@@ -38215,24 +40931,36 @@ while still providing platform specific APIs.")
   (package
     (inherit rust-nix-0.23)
     (name "rust-nix")
-    (version "0.22.1")
+    (version "0.22.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "nix" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0cahgzxhdwsaa8491n6cn8gadgfsxk5razyfw4xr3k34f5n5smg7"))))
+        (base32 "1bsgc8vjq07a1wg9vz819bva3dvn58an4r87h80dxrfqkqanz4g4"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* "Cargo.toml"
+                  ((">= 1\\.1\\.0, < 1\\.3\\.0") ">= 1.1.0"))))))
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f      ; Tests hang forever.
        #:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1.2)
+       (("rust-bitflags" ,rust-bitflags-1)
         ("rust-cc" ,rust-cc-1)
         ("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-memoffset" ,rust-memoffset-0.6))))
+        ("rust-memoffset" ,rust-memoffset-0.6))
+       #:cargo-development-inputs
+       (("rust-assert-impl" ,rust-assert-impl-0.1)
+        ("rust-caps" ,rust-caps-0.5)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-semver" ,rust-semver-1)
+        ("rust-sysctl" ,rust-sysctl-0.1)
+        ("rust-tempfile" ,rust-tempfile-3))))
     (inputs
-     (list rust-bitflags-1.2 rust-cc-1 rust-cfg-if-1 rust-libc-0.2
+     (list rust-bitflags-1 rust-cc-1 rust-cfg-if-1 rust-libc-0.2
            rust-memoffset-0.6))))
 
 (define-public rust-nix-0.21
@@ -38493,6 +41221,31 @@ environment variable is set.")
 prove a function can't ever panic.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-no-std-compat-0.4
+  (package
+    (name "rust-no-std-compat")
+    (version "0.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "no-std-compat" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "132vrf710zsdp40yp1z3kgc2ss8pi0z4gmihsz3y7hl4dpd56f5r"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-hashbrown" ,rust-hashbrown-0.8)
+        ("rust-spin" ,rust-spin-0.5))
+       #:cargo-development-inputs
+       (("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://gitlab.com/jD91mZM2/no-std-compat")
+    (synopsis "No_std compatibility layer")
+    (description
+     "This package provides a @code{#![no_std]} compatibility layer that will
+make porting your crate to no_std *easy*.")
+    (license license:expat)))
+
 (define-public rust-no-std-net-0.5
   (package
     (name "rust-no-std-net")
@@ -38808,6 +41561,26 @@ combinators library (fork for proposals for v8)")
     (description "This package provides custom derive nom parsers from structs.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-nonempty-0.7
+  (package
+    (name "rust-nonempty")
+    (version "0.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "nonempty" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1xynyd2mgjfc4lcishd6xky7cmkxgy4d7rawxfx6wpiq37kr3rg9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/cloudhead/nonempty")
+    (synopsis "Correct by construction non-empty vector")
+    (description "Correct by construction non-empty vector.")
+    (license license:expat)))
+
 (define-public rust-noop-proc-macro-0.3
   (package
     (name "rust-noop-proc-macro")
@@ -38865,8 +41638,37 @@ with all line endings.")
         (base32
          "1a1knz9j1w5a1pl2q6whmjphm3z6p64r5njnam7syp5rx8wil2if"))))))
 
+(define-public rust-normpath-1
+  (package
+    (name "rust-normpath")
+    (version "1.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "normpath" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1xcpznc827hwn3rjrckyv574ddmz68r0gpvfbmpih9ijd45ccq7c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-print-bytes" ,rust-print-bytes-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-uniquote" ,rust-uniquote-3)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-windows-sys" ,rust-windows-sys-0.48))))
+    (home-page "https://github.com/dylni/normpath")
+    (synopsis "More reliable path manipulation")
+    (description "This package provides more reliable path manipulation in rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-normpath-0.3
   (package
+    (inherit rust-normpath-1)
     (name "rust-normpath")
     (version "0.3.2")
     (source (origin
@@ -38875,7 +41677,6 @@ with all line endings.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32 "1bxwffmqqhic8rfb711009w9hsprrpm5jca2q0y8igqgrglzbah4"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-print-bytes" ,rust-print-bytes-0.4)
@@ -38885,11 +41686,7 @@ with all line endings.")
        (("rust-bincode" ,rust-bincode-1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-rustversion" ,rust-rustversion-1)
-        ("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://github.com/dylni/normpath")
-    (synopsis "More reliable path manipulation")
-    (description "This package provides more reliable path manipulation in rust.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-notify-5
   (package
@@ -38997,8 +41794,28 @@ notification library.")
      "This crate provides a Rust interface and bindings for Notmuch.")
     (license license:gpl3+)))
 
+(define-public rust-ntapi-0.4
+  (package
+    (name "rust-ntapi")
+    (version "0.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ntapi" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1r38zhbwdvkis2mzs6671cm1p6djgsl49i7bwxzrvhwicdf8k8z8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/MSxDOS/ntapi")
+    (synopsis "FFI bindings for Native API")
+    (description "FFI bindings for Native API")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-ntapi-0.3
   (package
+    (inherit rust-ntapi-0.4)
     (name "rust-ntapi")
     (version "0.3.6")
     (source
@@ -39008,17 +41825,36 @@ notification library.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0i5daj9sr8wyi5jkpwpybln2jqpn59z0mqfc0dpdidipwh1bjsrz"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-winapi" ,rust-winapi-0.3))))))
+
+(define-public rust-ntest-0.9
+  (package
+    (name "rust-ntest")
+    (version "0.9.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ntest" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "04pmi0y7rzpkngv7lqw48c2831bn15lg8nkgj9z30i9xnz9cd3ns"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "")
-    (synopsis "FFI bindings for Native API")
-    (description "FFI bindings for Native API")
-    (license (list license:asl2.0 license:expat))))
+       (("rust-ntest-test-cases" ,rust-ntest-test-cases-0.9)
+        ("rust-ntest-timeout" ,rust-ntest-timeout-0.9))
+       #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/becheran/ntest")
+    (synopsis "Testing framework for Rust")
+    (description "This package provides a testing framework for Rust which
+enhances the built-in library with some useful features.")
+    (license license:expat)))
 
 (define-public rust-ntest-0.8
   (package
+    (inherit rust-ntest-0.9)
     (name "rust-ntest")
     (version "0.8.1")
     (source
@@ -39029,31 +41865,25 @@ notification library.")
        (sha256
         (base32
          "1yyih3b0bcr9gj11m9xj330as2sjihblkmb2bmv10lp38q5m0rg8"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-ntest-proc-macro-helper" ,rust-ntest-proc-macro-helper-0.8)
         ("rust-ntest-test-cases" ,rust-ntest-test-cases-0.8)
         ("rust-ntest-timeout" ,rust-ntest-timeout-0.8))
        #:cargo-development-inputs
-       (("rust-tokio" ,rust-tokio-1))))
-    (home-page "https://github.com/becheran/ntest")
-    (synopsis "Testing framework for Rust")
-    (description "This package provides a testing framework for Rust which
-enhances the built-in library with some useful features.")
-    (license license:expat)))
+       (("rust-tokio" ,rust-tokio-1))))))
 
-(define-public rust-ntest-test-cases-0.8
+(define-public rust-ntest-test-cases-0.9
   (package
     (name "rust-ntest-test-cases")
-    (version "0.8.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "ntest_test_cases" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "03ip2dpi7fd2wyz99yd17w302nci3b05slbl3rr6dfs2683ayz3g"))))
+    (version "0.9.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ntest-test-cases" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "08ifw9zhm1l93wh24k8zrk25sj3k9vpw29sfwq4lsvwwf6z36zdy"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -39065,41 +41895,39 @@ enhances the built-in library with some useful features.")
     (description "This package provides test cases for ntest framework.")
     (license license:expat)))
 
-(define-public rust-ntest-test-cases-0.3
+(define-public rust-ntest-test-cases-0.8
   (package
-    (inherit rust-ntest-test-cases-0.8)
+    (inherit rust-ntest-test-cases-0.9)
     (name "rust-ntest-test-cases")
-    (version "0.3.4")
+    (version "0.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "ntest_test_cases" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0b67m368599b2zgwx19psqz6n3m9m5532h1257x6vz1pym3gd2na"))))
+        (base32 "03ip2dpi7fd2wyz99yd17w302nci3b05slbl3rr6dfs2683ayz3g"))))
     (arguments
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
-(define-public rust-ntest-timeout-0.8
+(define-public rust-ntest-timeout-0.9
   (package
     (name "rust-ntest-timeout")
-    (version "0.8.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "ntest_timeout" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "01vcdlz9xj471z5knk2qynm7adz3p614glf6n0pgn161qynym9mw"))))
+    (version "0.9.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ntest-timeout" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1948a5ps329acg8fy2c2dyjgc8f96l0gin271cpl0yjq420lcsq6"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-ntest-proc-macro-helper" ,rust-ntest-proc-macro-helper-0.8)
-        ("rust-proc-macro-crate" ,rust-proc-macro-crate-1)
+       (("rust-proc-macro-crate" ,rust-proc-macro-crate-1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))
@@ -39109,25 +41937,25 @@ enhances the built-in library with some useful features.")
 framework.")
     (license license:expat)))
 
-(define-public rust-ntest-timeout-0.3
+(define-public rust-ntest-timeout-0.8
   (package
-    (inherit rust-ntest-timeout-0.8)
+    (inherit rust-ntest-timeout-0.9)
     (name "rust-ntest-timeout")
-    (version "0.3.3")
+    (version "0.8.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "ntest_timeout" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0klryn3rgjxnq3cv6j8bwcsr0b7zw3x216h63144v22aja18p0g0"))))
+        (base32 "01vcdlz9xj471z5knk2qynm7adz3p614glf6n0pgn161qynym9mw"))))
     (arguments
      `(#:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
+       (("rust-ntest-proc-macro-helper" ,rust-ntest-proc-macro-helper-0.8)
+        ("rust-proc-macro-crate" ,rust-proc-macro-crate-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1)
-        ("rust-timebomb" ,rust-timebomb-0.1))))))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-ntest-proc-macro-helper-0.8
   (package
@@ -39146,6 +41974,31 @@ framework.")
 macros used in ntest.")
     (license license:expat)))
 
+(define-public rust-ntex-bytes-0.1
+  (package
+    (name "rust-ntex-bytes")
+    (version "0.1.19")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ntex-bytes" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0kpj93rkm9xknhkk31n21d7dwdx0y4jwc1y3nvnh1kx2l8p7razm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; Cut off the dependency tree of ntex here.
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-simdutf8" ,rust-simdutf8-0.1))))
+    (home-page "https://github.com/ntex-rs")
+    (synopsis "Types and traits for working with bytes (bytes crate fork)")
+    (description "Types and traits for working with bytes (bytes crate fork)")
+    (license license:expat)))
+
 (define-public rust-nu-ansi-term-0.46
   (package
     (name "rust-nu-ansi-term")
@@ -39372,8 +42225,46 @@ more.")
        #:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.4))))))
 
+(define-public rust-num-bigint-dig-0.8
+  (package
+    (name "rust-num-bigint-dig")
+    (version "0.8.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "num-bigint-dig" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "01b9lnqkjgwr1fv8jlw8w8y8pf70h2h9panq969r0pxw793ck693"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-byteorder" ,rust-byteorder-1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libm" ,rust-libm-0.2)
+        ("rust-num-integer" ,rust-num-integer-0.1)
+        ("rust-num-iter" ,rust-num-iter-0.1)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-smallvec" ,rust-smallvec-1)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.8)
+        ("rust-rand-chacha" ,rust-rand-chacha-0.3)
+        ("rust-rand-isaac" ,rust-rand-isaac-0.3)
+        ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)
+        ("rust-serde-test" ,rust-serde-test-1))))
+    (home-page "https://github.com/dignifiedquire/num-bigint")
+    (synopsis "Big integer implementation for Rust")
+    (description "This package provides a big integer implementation for
+Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-num-bigint-dig-0.7
   (package
+    (inherit rust-num-bigint-dig-0.8)
     (name "rust-num-bigint-dig")
     (version "0.7.0")
     (source
@@ -39383,7 +42274,6 @@ more.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1004mmipvc7pvaf3kf13i1nqh3vxf789bj72d8wl51y185aywis5"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-autocfg" ,rust-autocfg-0.1)
@@ -39402,12 +42292,7 @@ more.")
         ("rust-rand-chacha" ,rust-rand-chacha-0.3)
         ("rust-rand-isaac" ,rust-rand-isaac-0.3)
         ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)
-        ("rust-serde-test" ,rust-serde-test-1))))
-    (home-page "https://github.com/dignifiedquire/num-bigint")
-    (synopsis "Big integer implementation for Rust")
-    (description "This package provides a big integer implementation for
-Rust.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-serde-test" ,rust-serde-test-1))))))
 
 (define-public rust-num-complex-0.4
   (package
@@ -39671,29 +42556,33 @@ primitives and enums easier.")
 (define-public rust-num-format-0.4
   (package
     (name "rust-num-format")
-    (version "0.4.0")
+    (version "0.4.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "num-format" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0r94i9lhr15hk32494v9my31r0829w29yyp7iql98a1cf9wl3zms"))))
+        (base32 "1hvjmib117jspyixfr76f900mhz5zfn71dnyqg9iywb339vxjlm6"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-arrayvec" ,rust-arrayvec-0.4)
-        ("rust-cfg-if" ,rust-cfg-if-0.1)
+     `(#:cargo-inputs
+       (("rust-arrayvec" ,rust-arrayvec-0.7)
+        ("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-encoding-rs" ,rust-encoding-rs-0.8)
-        ("rust-itoa" ,rust-itoa-0.4)
+        ("rust-itoa" ,rust-itoa-1)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-num-bigint" ,rust-num-bigint-0.2)
-        ("rust-num-format-windows" ,rust-num-format-windows-0.3)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
+        ("rust-num-format-windows" ,rust-num-format-windows-0.4)
         ("rust-serde" ,rust-serde-1)
-        ("rust-widestring" ,rust-widestring-0.4)
-        ("rust-winapi" ,rust-winapi-0.3))))
+        ("rust-widestring" ,rust-widestring-1)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-serde-json" ,rust-serde-json-1))))
     (home-page "https://github.com/bcmyers/num-format")
     (synopsis "Produce string-representations of numbers")
     (description
@@ -39701,22 +42590,20 @@ primitives and enums easier.")
 of numbers, formatted according to international standards.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-num-format-windows-0.3
+(define-public rust-num-format-windows-0.4
   (package
     (name "rust-num-format-windows")
-    (version "0.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "num-format-windows" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1sy5jxrbhv6s28c51ibzi34s8qcjm8b21nf7biray7v1qi89h5sf"))))
+    (version "0.4.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "num-format-windows" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1yic2lcv3gngyshzmnqjhaq1z736j8jgghhn3n8yph95fbv0f7lv"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bindgen" ,rust-bindgen-0.47))))
+     `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.63))))
     (home-page "https://github.com/bcmyers/num-format/num-format-windows")
     (synopsis "Helper crate for @code{num-format}")
     (description
@@ -40273,25 +43160,28 @@ representation and parsing.")
     (description "This package provides procedural macros for the objc2 project.")
     (license license:expat)))
 
-(define-public rust-object-0.29
+(define-public rust-object-0.30
   (package
     (name "rust-object")
-    (version "0.29.0")
+    (version "0.30.3")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "object" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0lzblxwxcih7j4z2cfx9094caax97hlfm9n0y5hlavda6cn8n591"))))
+                "0fdl7qjsz1j9kl3j7f4656fswzrqpyj2kgaizhknmjrx7mfjd1pa"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:cargo-test-flags
+       '("--release" "--"
+         ;; Not all files are included
+         "--skip=read::coff::coff_extended_relocations")
        #:cargo-inputs
        (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
         ("rust-crc32fast" ,rust-crc32fast-1)
         ("rust-flate2" ,rust-flate2-1)
-        ("rust-hashbrown" ,rust-hashbrown-0.12)
+        ("rust-hashbrown" ,rust-hashbrown-0.13)
         ("rust-indexmap" ,rust-indexmap-1)
         ("rust-memchr" ,rust-memchr-2)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
@@ -40304,6 +43194,31 @@ representation and parsing.")
 file formats.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-object-0.29
+  (package
+    (inherit rust-object-0.30)
+    (name "rust-object")
+    (version "0.29.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "object" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0lzblxwxcih7j4z2cfx9094caax97hlfm9n0y5hlavda6cn8n591"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-crc32fast" ,rust-crc32fast-1)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-hashbrown" ,rust-hashbrown-0.12)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-memchr" ,rust-memchr-2)
+        ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+        ("rust-wasmparser" ,rust-wasmparser-0.57))))))
+
 (define-public rust-object-0.28
   (package
     (inherit rust-object-0.29)
@@ -40368,37 +43283,6 @@ file formats.")
         ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
         ("rust-wasmparser" ,rust-wasmparser-0.57))))))
 
-(define-public rust-object-0.24
-  (package
-    (inherit rust-object-0.28)
-    (name "rust-object")
-    (version "0.24.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "object" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0w21hp41mixzaavsdpjylbylh44z2b5d2wbnf5ipkvkjq38ksnqs"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-compiler-builtins"
-         ,rust-compiler-builtins-0.1)
-        ("rust-crc32fast" ,rust-crc32fast-1)
-        ("rust-flate2" ,rust-flate2-1)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-rustc-std-workspace-alloc"
-         ,rust-rustc-std-workspace-alloc-1)
-        ("rust-rustc-std-workspace-core"
-         ,rust-rustc-std-workspace-core-1)
-        ("rust-wasmparser" ,rust-wasmparser-0.57))
-       #:cargo-development-inputs
-       (("rust-memmap" ,rust-memmap-0.7))))))
-
 (define-public rust-odds-0.3
   (package
     (name "rust-odds")
@@ -40457,24 +43341,20 @@ Things in odds may move to more appropriate crates if we find them.")
         ("rust-memchr" ,rust-memchr-2)
         ("rust-quickcheck" ,rust-quickcheck-0.4))))))
 
-(define-public rust-oid-registry-0.2
+(define-public rust-oid-registry-0.6
   (package
     (name "rust-oid-registry")
-    (version "0.2.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "oid-registry" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "058qip5j5y0i95ckmw67mp73372rq16ci0lcczyq9irv76r4qmgy"))))
+    (version "0.6.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "oid-registry" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1zwvjp3ad6gzn8g8w2hcn9a2xdap0lkzckhlnwp6rabbzdpz7vcv"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-der-parser" ,rust-der-parser-6))))
+     `(#:cargo-inputs (("rust-asn1-rs" ,rust-asn1-rs-0.5))))
     (home-page "https://github.com/rusticata/oid-registry")
     (synopsis "Object Identifier (OID) database")
     (description "This crate is a helper crate, containing a database of
@@ -40482,6 +43362,22 @@ OID objects.  These objects are intended for use when manipulating ASN.1
 grammars and BER/DER encodings, for example.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-oid-registry-0.2
+  (package
+    (inherit rust-oid-registry-0.6)
+    (name "rust-oid-registry")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "oid-registry" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "058qip5j5y0i95ckmw67mp73372rq16ci0lcczyq9irv76r4qmgy"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-der-parser" ,rust-der-parser-6))))))
+
 (define-public rust-onig-6
   (package
     (name "rust-onig")
@@ -40538,7 +43434,7 @@ other crates to create safe wrappers around Oniguruma.")
 (define-public rust-once-cell-1
   (package
     (name "rust-once-cell")
-    (version "1.17.1")
+    (version "1.18.0")
     (source
      (origin
        (method url-fetch)
@@ -40546,7 +43442,7 @@ other crates to create safe wrappers around Oniguruma.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1lrsy9c5ikf2iwxr4iwgd3rlq9mg8alh0np1g8abnvp1k4151rdp"))))
+         "0vapcd5ambwck95wyz3ymlim35jirgnqn9a0qmi19msymv95v2yx"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -40555,8 +43451,6 @@ other crates to create safe wrappers around Oniguruma.")
         ("rust-parking-lot-core" ,rust-parking-lot-core-0.9))
        #:cargo-development-inputs
        (("rust-critical-section" ,rust-critical-section-1)
-        ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
-        ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-regex" ,rust-regex-1))))
     (home-page "https://github.com/matklad/once_cell")
     (synopsis "Single assignment cells and lazy values")
@@ -40688,6 +43582,35 @@ the system.")
 the default program configured on the system.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-openpgp-cert-d-0.1
+  (package
+    (name "rust-openpgp-cert-d")
+    (version "0.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "openpgp-cert-d" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "10sqs3k1cd2yrnbyqrpq0qfslzg3qq7jalspkkqxm9828lp2manc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Not all files included.
+       #:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-dirs" ,rust-dirs-4)
+        ("rust-fd-lock" ,rust-fd-lock-3)
+        ("rust-sha1collisiondetection" ,rust-sha1collisiondetection-0.2)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-assert-fs" ,rust-assert-fs-1)
+        ("rust-predicates" ,rust-predicates-2))))
+    (home-page "https://gitlab.com/sequoia-pgp/pgp-cert-d")
+    (synopsis "Shared OpenPGP Certificate Directory")
+    (description "Shared OpenPGP Certificate Directory")
+    (license license:expat)))
+
 (define-public rust-openssl-macros-0.1
   (package
     (name "rust-openssl-macros")
@@ -40715,14 +43638,14 @@ crate.")
 (define-public rust-openssl-0.10
   (package
     (name "rust-openssl")
-    (version "0.10.49")
+    (version "0.10.52")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "openssl" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0cssygqbgdim10y7qrgz0rj5k839jqiv2n9ccw1lx8ipp1m10bsd"))))
+                "0mldyz9w6d5bf3004m7kyjry7944m0pkkifzbywgg06z0935gf01"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -40825,21 +43748,20 @@ system for OpenSSL.")
 (define-public rust-openssl-sys-0.9
   (package
     (name "rust-openssl-sys")
-    (version "0.9.84")
+    (version "0.9.87")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "openssl-sys" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "1ym0vcfnyp8bf8lidz8w0yx0n6pva37nvdww0c22kn62kp7fl81s"))
+         (base32 "0znc0q7a2gi2pmkscv0d6wzpfd64mgmy3w4lmrvrv05jcj9ga5wf"))
         (patches (search-patches "rust-openssl-sys-no-vendor.patch"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
         ;; Build dependencies:
-        ("rust-autocfg" ,rust-autocfg-1)
         ("rust-bindgen" ,rust-bindgen-0.64)
         ("rust-cc" ,rust-cc-1)
         ("rust-pkg-config" ,rust-pkg-config-0.3)
@@ -40941,6 +43863,23 @@ system for OpenSSL.")
     (description "This package provides an OPML parser for Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-option-ext-0.2
+  (package
+    (name "rust-option-ext")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "option-ext" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0zbf7cx8ib99frnlanpyikm1bx8qn8x602sw1n7bg6p9x94lyx04"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/soc/option-ext")
+    (synopsis "Extends `Option` with additional operations")
+    (description "Extends `Option` with additional operations")
+    (license license:mpl2.0)))
+
 (define-public rust-option-set-0.1
   (package
     (name "rust-option-set")
@@ -41109,6 +44048,31 @@ PartialOrd types, like floats.")
 insertion order across all keys and values.")
     (license license:expat)))
 
+(define-public rust-ordered-stream-0.1
+  (package
+    (name "rust-ordered-stream")
+    (version "0.1.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ordered-stream" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "140c0h0ap30mcfhdk2xy1q9iqyb450wh11dglshh2y6vmjyj82in"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2))
+       #:cargo-development-inputs
+       (("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3))))
+    (home-page "https://github.com/danieldg/ordered-stream")
+    (synopsis "Streams that are ordered relative to external events")
+    (description "This package provides streams that are ordered relative to
+external events in Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-ordermap-0.3
   (package
     (name "rust-ordermap")
@@ -41142,6 +44106,40 @@ iteration.  NOTE: This crate was renamed to @code{indexmap}.  Please use it
 under its new name.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-orion-0.17
+  (package
+    (name "rust-orion")
+    (version "0.17.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "orion" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ri0b0vyd9vqwlzlcv0q4i7r9pga23q7nnnvd5z4zycjc9v4mryb"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ct-codecs" ,rust-ct-codecs-1)
+        ("rust-fiat-crypto" ,rust-fiat-crypto-0.1)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-subtle" ,rust-subtle-2)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-hex" ,rust-hex-0.4)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-quickcheck-macros" ,rust-quickcheck-macros-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/orion-rs/orion")
+    (synopsis "Pure-Rust crypto")
+    (description
+     "Orion is a cryptography library written in pure Rust.  It aims to provide
+easy and usable crypto while trying to minimize the use of unsafe code.")
+    (license license:expat)))
+
 (define-public rust-os-info-3
   (package
     (name "rust-os-info")
@@ -41171,19 +44169,19 @@ under its new name.")
 (define-public rust-os-pipe-1
   (package
     (name "rust-os-pipe")
-    (version "1.1.2")
+    (version "1.1.4")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "os-pipe" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "0fa640v9bi1qcq3jgq1p76lphi4fwj4a9msrmfrq87n1z3qm58n6"))))
+         (base32 "0xy1igr1jfd9ijhr4sccvl8mzp0jic7njdmr56lsk3220ym5ks0a"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
-        ("rust-windows-sys" ,rust-windows-sys-0.42))))
+        ("rust-windows-sys" ,rust-windows-sys-0.48))))
     (native-inputs
      (list python-minimal-wrapper))     ; For the tests.
     (home-page "https://github.com/oconnor663/os_pipe.rs")
@@ -41249,27 +44247,27 @@ under its new name.")
 (define-public rust-os-str-bytes-6
   (package
     (name "rust-os-str-bytes")
-    (version "6.0.0")
+    (version "6.5.0")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "os-str-bytes" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "0r5z5xds2wzzqlqjaw96dpjsz5nqyzc1rflm4mh09aa32qyl88lf"))))
+         (base32 "0rz2711gl575ng6vm9a97q42wqnf4wk1165wn221jb8gn17z9vff"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-memchr" ,rust-memchr-2)
-        ("rust-print-bytes" ,rust-print-bytes-0.5)
+        ("rust-print-bytes" ,rust-print-bytes-1)
         ("rust-uniquote" ,rust-uniquote-3))
        #:cargo-development-inputs
-       (("rust-getrandom" ,rust-getrandom-0.2))))
+       (("rust-fastrand" ,rust-fastrand-1))))
     (home-page "https://github.com/dylni/os_str_bytes")
     (synopsis
      "Traits for converting between byte sequences and platform-native strings")
     (description
-     "This package provides a traits for converting between byte sequences and
+     "This package provides a trait for converting between byte sequences and
 platform-native strings.")
     (license (list license:expat license:asl2.0))))
 
@@ -41312,18 +44310,17 @@ platform-native strings.")
 (define-public rust-ouroboros-macro-0.15
   (package
     (name "rust-ouroboros-macro")
-    (version "0.15.2")
+    (version "0.15.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "ouroboros_macro" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "01lgyj5nxgr6r1l0m20pp4ilz3m14clsqg2j28hic2rrlsjafjkk"))))
+        (base32 "1dsn37vds4qpkzscmwaw17dv3m5m7a7j9qby8dsac19ks3622zaz"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-inflector" ,rust-inflector-0.11)
         ("rust-proc-macro-error" ,rust-proc-macro-error-1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
@@ -41351,20 +44348,19 @@ platform-native strings.")
 (define-public rust-ouroboros-0.15
   (package
     (name "rust-ouroboros")
-    (version "0.15.2")
+    (version "0.15.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "ouroboros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1qhd9cvc4hwdbr37da1jh0k0742slchixlxn4wxgc7g3l63yl9bl"))))
+        (base32 "1nvjra9dana2g6kxv3397qrgpyw6lknzya6lzs1s1llbap8qndg1"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-aliasable" ,rust-aliasable-0.1)
-        ("rust-ouroboros-macro" ,rust-ouroboros-macro-0.15)
-        ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))
+        ("rust-ouroboros-macro" ,rust-ouroboros-macro-0.15))))
     (home-page "https://github.com/joshua-maros/ouroboros")
     (synopsis "Self-referential struct generation")
     (description
@@ -41454,6 +44450,25 @@ platform-native strings.")
      "This package provides a ttf-parser plus support for owned data.")
     (license license:asl2.0)))
 
+(define-public rust-owo-colors-3
+  (package
+    (name "rust-owo-colors")
+    (version "3.6.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "owo-colors" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0943lynkwz1glq3w7m9anv73lnrhd8yabs09krbh49g1wz4lxp39"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-supports-color" ,rust-supports-color-2))))
+    (home-page "https://github.com/jam1garner/owo-colors")
+    (synopsis "Zero-allocation terminal colors that'll make people go owo")
+    (description "Zero-allocation terminal colors that'll make people go owo")
+    (license license:expat)))
+
 (define-public rust-owned-ttf-parser-0.6
   (package
     (name "rust-owned-ttf-parser")
@@ -41500,10 +44515,83 @@ owner with them.  This can sometimes be useful because Rust borrowing rules
 normally prevent moving a type that has been borrowed from.")
     (license license:expat)))
 
+(define-public rust-p256-0.13
+  (package
+    (name "rust-p256")
+    (version "0.13.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "p256" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0jyd3c3k239ybs59ixpnl7dqkmm072fr1js8kh7ldx58bzc3m1n9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ecdsa" ,rust-ecdsa-0.16)
+        ("rust-elliptic-curve" ,rust-elliptic-curve-0.13)
+        ("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-primeorder" ,rust-primeorder-0.13)
+        ("rust-serdect" ,rust-serdect-0.2)
+        ("rust-sha2" ,rust-sha2-0.10))
+       #:cargo-development-inputs
+       (("rust-blobby" ,rust-blobby-0.3)
+        ("rust-criterion" ,rust-criterion-0.4)
+        ("rust-ecdsa" ,rust-ecdsa-0.16)
+        ("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-primeorder" ,rust-primeorder-0.13)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-rand-core" ,rust-rand-core-0.6))))
+    (home-page
+     "https://github.com/RustCrypto/elliptic-curves/tree/master/p256")
+    (synopsis "Pure Rust implementation of the NIST P-256")
+    (description
+     "This package provides a pure Rust implementation of the NIST P-256 (a.k.a.
+secp256r1, prime256v1) elliptic curve as defined in SP 800-186, with support for
+ECDH, ECDSA signing/verification, and general purpose curve arithmetic.")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-p384-0.13
+  (package
+    (name "rust-p384")
+    (version "0.13.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "p384" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "02cjlxdvxwvhmnckqnydqpvrwhf5raj67q300d66m7y6pi8nyy3h"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ecdsa" ,rust-ecdsa-0.16)
+        ("rust-elliptic-curve" ,rust-elliptic-curve-0.13)
+        ("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-primeorder" ,rust-primeorder-0.13)
+        ("rust-serdect" ,rust-serdect-0.2)
+        ("rust-sha2" ,rust-sha2-0.10))
+       #:cargo-development-inputs
+       (("rust-blobby" ,rust-blobby-0.3)
+        ("rust-criterion" ,rust-criterion-0.4)
+        ("rust-ecdsa" ,rust-ecdsa-0.16)
+        ("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-rand-core" ,rust-rand-core-0.6))))
+    (home-page
+     "https://github.com/RustCrypto/elliptic-curves/tree/master/p384")
+    (synopsis "Pure Rust implementation of the NIST P-384 elliptic curve")
+    (description
+     "This package provides a pure Rust implementation of the NIST P-384 (a.k.a.
+secp384r1) elliptic curve as defined in SP 800-186 with support for ECDH, ECDSA
+signing/verification, and general purpose curve arithmetic support.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-packed-simd-0.3
   (package
     (name "rust-packed-simd")
-    (version "0.3.3")
+    (version "0.3.8")
     (source
      (origin
        (method url-fetch)
@@ -41512,19 +44600,25 @@ normally prevent moving a type that has been borrowed from.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0822wqf6kzw4ig9ykndg348w2bxkhs3x64brzsvdxh2a1pyajpm8"))))
+         "17xih19yr6izg1d065d2ax29axs7bmywnxa3qps0l6d3bd4nbybc"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* "Cargo.toml"
+                  (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                   (string-append "\"^" version)))))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-0.1)
+       (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-core-arch" ,rust-core-arch-0.1)
+        ("rust-libm" ,rust-libm-0.1)
         ("rust-sleef-sys" ,rust-sleef-sys-0.1))
        #:cargo-development-inputs
-       (("rust-arrayvec" ,rust-arrayvec-0.4)
+       (("rust-arrayvec" ,rust-arrayvec-0.5)
         ("rust-paste" ,rust-paste-0.1)
         ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
-        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2))))
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
     (home-page "https://github.com/rust-lang/packed_simd")
     (synopsis "Portable Packed SIMD vectors")
     (description "Portable Packed SIMD vectors.")
@@ -41679,25 +44773,6 @@ memory page size.")
      "This package pipes your Rust output through an external pager.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-pager-0.15
-  (package
-    (inherit rust-pager-0.16)
-    (name "rust-pager")
-    (version "0.15.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pager" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0a35mg68s0p63ya2k5hsg620c4llkjw2fx1sfi0laz4pz8myv75n"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-errno" ,rust-errno-0.2)
-        ("rust-libc" ,rust-libc-0.2))))))
-
 (define-public rust-pam-sys-0.5
   (package
     (name "rust-pam-sys")
@@ -42101,14 +45176,14 @@ synchronization primitives.")
 (define-public rust-parking-lot-core-0.9
   (package
     (name "rust-parking-lot-core")
-    (version "0.9.6")
+    (version "0.9.7")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "parking_lot_core" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1grkf6s7zgl5blgw941g98z5csfjbrxavprspc8396aw9f0zh7ms"))))
+                "08cm5gg3a4jmr683x9dgih8vj66yn772kjvc8y1m0flyz6wwnsch"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -42119,7 +45194,7 @@ synchronization primitives.")
         ("rust-redox-syscall" ,rust-redox-syscall-0.2)
         ("rust-smallvec" ,rust-smallvec-1)
         ("rust-thread-id" ,rust-thread-id-4)
-        ("rust-windows-sys" ,rust-windows-sys-0.42))))
+        ("rust-windows-sys" ,rust-windows-sys-0.45))))
     (home-page "https://github.com/Amanieu/parking_lot")
     (synopsis "API for creating custom synchronization primitives")
     (description "This package provides an advanced API for creating custom
@@ -42308,36 +45383,6 @@ synchronization primitives.")
      "This crate provides an Apache Parquet implementation in Rust.")
     (license license:asl2.0)))
 
-(define-public rust-parquet-4
-  (package
-    (inherit rust-parquet-5)
-    (name "rust-parquet")
-    (version "4.4.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "parquet" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0m3aqmaa79wka7adijl3zqkfjf1iwm2y58v0g16askv73pj48l16"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-arrow" ,rust-arrow-4)
-        ("rust-base64" ,rust-base64-0.13)
-        ("rust-brotli" ,rust-brotli-3)
-        ("rust-byteorder" ,rust-byteorder-1)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-flate2" ,rust-flate2-1)
-        ("rust-lz4" ,rust-lz4-1)
-        ("rust-num-bigint" ,rust-num-bigint-0.4)
-        ("rust-parquet-format" ,rust-parquet-format-2)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-snap" ,rust-snap-1)
-        ("rust-thrift" ,rust-thrift-0.13)
-        ("rust-zstd" ,rust-zstd-0.8))))))
-
 (define-public rust-parquet-format-2
   (package
     (name "rust-parquet-format")
@@ -42468,8 +45513,40 @@ parallelism and safety in mind.")
      "This package parses zoneinfo files from the IANA database.")
     (license license:expat)))
 
+(define-public rust-partial-io-0.5
+  (package
+    (name "rust-partial-io")
+    (version "0.5.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "partial-io" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "05hfdlbqwfkwmkws797b6nrlpaszxg50avfs161v8n4zchicz5dg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-futures" ,rust-futures-0.3)
+        ("rust-pin-project" ,rust-pin-project-1)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs
+       (("rust-itertools" ,rust-itertools-0.10)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/sunshowers-code/partial-io")
+    (synopsis "Helpers to test partial, interrupted and would-block I/O operations")
+    (description "This package provides helpers to test partial, interrupted
+and would-block I/O operations.")
+    (license license:expat)))
+
 (define-public rust-partial-io-0.3
   (package
+    (inherit rust-partial-io-0.5)
     (name "rust-partial-io")
     (version "0.3.1")
     (source
@@ -42480,7 +45557,6 @@ parallelism and safety in mind.")
        (sha256
         (base32
          "0b9a2bvqmaj2r4rkbshjsg8zzvp23b67qfvj2y6jwjckrn6zhb38"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-futures" ,rust-futures-0.1)
@@ -42489,12 +45565,7 @@ parallelism and safety in mind.")
        #:cargo-development-inputs
        (("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-quickcheck" ,rust-quickcheck-0.6)
-        ("rust-tokio-core" ,rust-tokio-core-0.1))))
-    (home-page "https://github.com/facebookincubator/rust-partial-io")
-    (synopsis "Helpers to test partial, interrupted and would-block I/O operations")
-    (description "This package provides helpers to test partial, interrupted
-and would-block I/O operations.")
-    (license license:expat)))
+        ("rust-tokio-core" ,rust-tokio-core-0.1))))))
 
 (define-public rust-partial-io-0.2
   (package
@@ -42521,17 +45592,53 @@ and would-block I/O operations.")
         ("rust-tokio-core" ,rust-tokio-core-0.1))))
     (license license:bsd-3)))
 
-(define-public rust-password-hash-0.4
+(define-public rust-pasetors-0.6
+  (package
+    (name "rust-pasetors")
+    (version "0.6.6")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pasetors" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0sgag8mxix45inzmvkcp2nahmnd5gdi62wdh5v7dxhaxp0rzcjw2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-ct-codecs" ,rust-ct-codecs-1)
+        ("rust-ed25519-compact" ,rust-ed25519-compact-2)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-orion" ,rust-orion-0.17)
+        ("rust-p384" ,rust-p384-0.13)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-subtle" ,rust-subtle-2)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-hex" ,rust-hex-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/brycx/pasetors")
+    (synopsis "PASETO: Platform-Agnostic Security Tokens (in Rust)")
+    (description "PASETO: Platform-Agnostic Security Tokens (in Rust)")
+    (license license:expat)))
+
+(define-public rust-password-hash-0.5
   (package
     (name "rust-password-hash")
-    (version "0.4.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "password-hash" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "003p2hssyrcaxyq9fs8x2wx5di8ny9byaakskrf352pfm963fxkn"))))
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "password-hash" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ri1mim11zk0a9s40zdi288dfqvmdiryc7lw8vl46b59ifa08vrl"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -42548,6 +45655,24 @@ the PHC string format (a well-defined subset of the Modular Crypt
 Format (MCF).")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-password-hash-0.4
+  (package
+    (inherit rust-password-hash-0.5)
+    (name "rust-password-hash")
+    (version "0.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "password-hash" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "003p2hssyrcaxyq9fs8x2wx5di8ny9byaakskrf352pfm963fxkn"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-base64ct" ,rust-base64ct-1)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-subtle" ,rust-subtle-2))))))
+
 (define-public rust-password-hash-0.3
   (package
     (inherit rust-password-hash-0.4)
@@ -42636,14 +45761,14 @@ Format (MCF).")
 (define-public rust-path-abs-0.5
   (package
     (name "rust-path-abs")
-    (version "0.5.0")
+    (version "0.5.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "path_abs" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "131qi5j201caraqz9rwbzk4mybd9bcrryrhf63lr9gz0xmnqwszb"))))
+        (base32 "1hrkjrk9w2mhgzwl84gl2lmajs7yagdrcpxnjf51vh1a6kv05vq5"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -42653,6 +45778,7 @@ Format (MCF).")
         ("rust-stfu8" ,rust-stfu8-0.2))
        #:cargo-development-inputs
        (("rust-pretty-assertions" ,rust-pretty-assertions-0.4)
+        ("rust-regex" ,rust-regex-0.2)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-tempdir" ,rust-tempdir-0.3))))
     (home-page "https://github.com/vitiral/path_abs")
@@ -42704,8 +45830,43 @@ relative path from a provided base directory path to the provided
 path.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-pbkdf2-0.12
+  (package
+    (name "rust-pbkdf2")
+    (version "0.12.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pbkdf2" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0cbcfkb9qh5czbm88gw3aii4y5m84wig6s5d7fzrhxb0d1d0pjph"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-digest" ,rust-digest-0.10)
+        ("rust-hmac" ,rust-hmac-0.12)
+        ("rust-password-hash" ,rust-password-hash-0.5)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-sha1" ,rust-sha1-0.10)
+        ("rust-sha2" ,rust-sha2-0.10))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-hmac" ,rust-hmac-0.12)
+        ("rust-sha1" ,rust-sha1-0.10)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-streebog" ,rust-streebog-0.10))))
+    (home-page
+     "https://github.com/RustCrypto/password-hashes/tree/master/pbkdf2")
+    (synopsis "Generic implementation of PBKDF2")
+    (description "This package contains a collection of password hashing
+algorithms, otherwise known as password-based key derivation functions, written
+in pure Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-pbkdf2-0.11
   (package
+    (inherit rust-pbkdf2-0.12)
     (name "rust-pbkdf2")
     (version "0.11.0")
     (source
@@ -42715,7 +45876,6 @@ path.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "05q9wqjvfrs4dvw03yn3bvcs4zghz0a7ycfa53pz2k2fqhp6k843"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-digest" ,rust-digest-0.10)
@@ -42730,12 +45890,7 @@ path.")
         ("rust-sha-1" ,rust-sha-1-0.10)
         ("rust-sha2" ,rust-sha2-0.10)
         ("rust-streebog" ,rust-streebog-0.10))))
-    (home-page "https://github.com/RustCrypto/password-hashing")
-    (synopsis "Generic implementation of PBKDF2")
-    (description "This package contains a collection of password hashing
-algorithms, otherwise known as password-based key derivation functions, written
-in pure Rust.")
-    (license (list license:expat license:asl2.0))))
+    (home-page "https://github.com/RustCrypto/password-hashing")))
 
 (define-public rust-pbkdf2-0.10
   (package
@@ -42981,14 +46136,14 @@ pdqsort.")
 (define-public rust-pear-0.1
   (package
     (name "rust-pear")
-    (version "0.1.4")
+    (version "0.1.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pear" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "12mb00ick6y1slbxk6r4i8qxdbq8km3bs4pygjv94xwnvc9g482k"))))
+        (base32 "02lnp8c414z5ds0lskd4zxlalrjljzpkg8g6kizszij4h52sgprj"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -43002,14 +46157,14 @@ pdqsort.")
 (define-public rust-pear-codegen-0.1
   (package
     (name "rust-pear-codegen")
-    (version "0.1.4")
+    (version "0.1.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "pear_codegen" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1jk8jxkgjd3pymldkckg2ligkpy4nnskgcj8qf3yzlf3zlvcihdz"))))
+        (base32 "19lcpkfspizd4ywwvca6rxgc311m070k3ndvwa9vrbw1snjqna60"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -43141,32 +46296,52 @@ procedural macros for rust-peg.  To use rust-peg, see the peg package.")
 runtime support for rust-peg grammars.  To use rust-peg, see the peg crate.")
     (license license:expat)))
 
-(define-public rust-pem-1
+(define-public rust-pem-2
   (package
     (name "rust-pem")
-    (version "1.1.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "pem" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "1f184b7vs5kgwglfsy9adqqy7625jsq8jj1lsxah9abn78kmr0x8"))))
+    (version "2.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pem" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "06j4vmzkfg5jh9ykc5bdvydishqkbb4sf64fa528wg6zbi0zw4vb"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:cargo-inputs
-        (("rust-base64" ,rust-base64-0.13)
-         ("rust-serde" ,rust-serde-1))
-        #:cargo-development-inputs
-        (("rust-criterion" ,rust-criterion-0.3)
-         ("rust-serde-json" ,rust-serde-json-1))))
-    (home-page "https://github.com/jcreekmore/pem-rs")
+     `(#:cargo-inputs
+       (("rust-base64" ,rust-base64-0.21)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/jcreekmore/pem-rs.git")
     (synopsis "Parse and encode PEM-encoded data")
     (description
      "This package provides a Rust library for parsing and encoding
 PEM-encoded data.")
     (license license:expat)))
 
+(define-public rust-pem-1
+  (package
+    (inherit rust-pem-2)
+    (name "rust-pem")
+    (version "1.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pem" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1f184b7vs5kgwglfsy9adqqy7625jsq8jj1lsxah9abn78kmr0x8"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-base64" ,rust-base64-0.13)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-serde-json" ,rust-serde-json-1))))))
+
 (define-public rust-pem-0.8
   (package
     (inherit rust-pem-1)
@@ -43187,8 +46362,49 @@ PEM-encoded data.")
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3))))))
 
+(define-public rust-pem-rfc7468-0.7
+  (package
+    (name "rust-pem-rfc7468")
+    (version "0.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pem-rfc7468" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "04l4852scl4zdva31c1z6jafbak0ni5pi0j38ml108zwzjdrrcw8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-base64ct" ,rust-base64ct-1))))
+    (home-page "https://github.com/RustCrypto/formats/tree/master/pem-rfc7468")
+    (synopsis
+     "PEM Encoding implementing a subset of Privacy-Enhanced Mail encoding")
+    (description
+     "This package provides PEM Encoding (RFC 7468) for PKIX, PKCS, and CMS
+Structures, implementing a strict subset of the original Privacy-Enhanced Mail
+encoding intended specifically for use with cryptographic keys, certificates,
+and other messages.  It provides a no_std-friendly, constant-time
+implementation suitable for use with cryptographic private keys.")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-pem-rfc7468-0.6
+  (package
+    (inherit rust-pem-rfc7468-0.7)
+    (name "rust-pem-rfc7468")
+    (version "0.6.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pem-rfc7468" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1b5d8rvc4lgwxhs72m99fnrg0wq7bqh4x4wq0c7501ci7a1mkl94"))))
+    (arguments
+     `(#:cargo-inputs (("rust-base64ct" ,rust-base64ct-1))))))
+
 (define-public rust-pem-rfc7468-0.2
   (package
+    (inherit rust-pem-rfc7468-0.7)
     (name "rust-pem-rfc7468")
     (version "0.2.4")
     (source
@@ -43198,25 +46414,84 @@ PEM-encoded data.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1m1c9jypydzabg4yscplmvff7pdcc8gg4cqg081hnlf03hxkmsc4"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-       #:cargo-inputs (("rust-base64ct" ,rust-base64ct-1))))
-    (home-page "https://github.com/RustCrypto/formats/tree/master/pem-rfc7468")
+       #:cargo-inputs (("rust-base64ct" ,rust-base64ct-1))))))
+
+(define-public rust-pep440-rs-0.3
+  (package
+    (name "rust-pep440-rs")
+    (version "0.3.9")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pep440-rs" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0l3nyvfz8qq62dvilwfbzgdqxyz9kbf006s0gpx2qhhi79lia7gy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-pyo3" ,rust-pyo3-0.18)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-unicode-width" ,rust-unicode-width-0.1))
+       #:cargo-development-inputs (("rust-indoc" ,rust-indoc-2))))
+    (home-page "https://github.com/konstin/pep440-rs")
     (synopsis
-     "PEM Encoding implementing a subset of Privacy-Enhanced Mail encoding")
+     "Library for python version numbers and specifiers, implementing PEP 440")
     (description
-     "This package provides PEM Encoding (RFC 7468) for PKIX, PKCS, and CMS
-Structures, implementing a strict subset of the original Privacy-Enhanced Mail
-encoding intended specifically for use with cryptographic keys, certificates,
-and other messages.  It provides a no_std-friendly, constant-time
-implementation suitable for use with cryptographic private keys.")
-    (license (list license:asl2.0 license:expat))))
+     "This package provides a library for python version numbers and specifiers,
+implementing PEP 440.")
+    (license (list license:asl2.0 license:bsd-2))))
+
+;; Should be the same rust-pyo3 version as cargo-input rust-pep440-rs.
+(define-public rust-pep508-rs-0.2
+  (package
+    (name "rust-pep508-rs")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pep508-rs" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1qjkhh89xhjwhpjz2ppk5lp3mdm464gqx8sh9iyjpjk1p1xkswf0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-pep440-rs" ,rust-pep440-rs-0.3)
+        ("rust-pyo3" ,rust-pyo3-0.18)
+        ("rust-pyo3-log" ,rust-pyo3-log-0.8)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-toml" ,rust-toml-0.7)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-unicode-width" ,rust-unicode-width-0.1)
+        ("rust-url" ,rust-url-2))
+       #:cargo-development-inputs
+       (("rust-indoc" ,rust-indoc-2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-testing-logger" ,rust-testing-logger-0.1))))
+    (home-page "https://github.com/konstin/pep508_rs")
+    (synopsis
+     "Library for python dependency specifiers, better known as PEP 508")
+    (description
+     "This package provides a library for python dependency specifiers, better
+known as PEP 508.")
+    (license (list license:asl2.0 license:bsd-2))))
 
 (define-public rust-percent-encoding-2
   (package
     (name "rust-percent-encoding")
-    (version "2.2.0")
+    (version "2.3.0")
     (source
      (origin
        (method url-fetch)
@@ -43224,7 +46499,7 @@ implementation suitable for use with cryptographic private keys.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "13nrpp6r1f4k14viksga3094krcrxgv4b42kqbriy63k7ln5g327"))))
+         "152slflmparkh27hprw62sph8rv77wckzhwl2dhqk6bf563lfalv"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/servo/rust-url/")
     (synopsis "Percent encoding and decoding")
@@ -43345,7 +46620,7 @@ algorithm.")
 (define-public rust-pest-2
   (package
     (name "rust-pest")
-    (version "2.5.3")
+    (version "2.6.0")
     (source
      (origin
        (method url-fetch)
@@ -43354,13 +46629,11 @@ algorithm.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "02n3b2hv9ciysybs9qzxza25gp8493dd7r8b57kfkxwi9nhb8ms2"))))
+         "0w3vaad35km41g2liasf0sfkgfhj190rn7mc9q9hf18zn2zq93p6"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bytecount" ,rust-bytecount-0.6)
-        ("rust-memchr" ,rust-memchr-2)
+     `(#:cargo-inputs
+       (("rust-memchr" ,rust-memchr-2)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-thiserror" ,rust-thiserror-1)
@@ -43373,7 +46646,7 @@ algorithm.")
 (define-public rust-pest-derive-2
   (package
     (name "rust-pest-derive")
-    (version "2.5.3")
+    (version "2.6.0")
     (source
      (origin
        (method url-fetch)
@@ -43382,11 +46655,10 @@ algorithm.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "19m0wd2lcg6d2halnlfcgl0mfpgjy5a29q875vk6bp8c7cwxl714"))))
+         "1yzv982pypxrr2zwhd08xv40plr474p155i26aj2anl63k3x8ybb"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-pest" ,rust-pest-2)
         ("rust-pest-generator" ,rust-pest-generator-2))))
     (home-page "https://pest.rs/")
@@ -43397,7 +46669,7 @@ algorithm.")
 (define-public rust-pest-generator-2
   (package
     (name "rust-pest-generator")
-    (version "2.5.3")
+    (version "2.6.0")
     (source
      (origin
        (method url-fetch)
@@ -43406,11 +46678,10 @@ algorithm.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0z52iw9g9jcg8v7d56s9m49cbl1k5wsxax1wjl1666f8v0s3dda6"))))
+         "0zh7igibnn9d4skgx3vjy4q6nya2hjhw7vf8xd8vhdv40zqmnhvc"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-pest" ,rust-pest-2)
         ("rust-pest-meta" ,rust-pest-meta-2)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
@@ -43424,7 +46695,7 @@ algorithm.")
 (define-public rust-pest-meta-2
   (package
     (name "rust-pest-meta")
-    (version "2.5.3")
+    (version "2.6.0")
     (source
      (origin
        (method url-fetch)
@@ -43433,10 +46704,10 @@ algorithm.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0lbskklh77xnyk1yr8c387l80s37s30lrfv636s7hild58rz3x0f"))))
+         "04ala2f51zxninvajvvqk5gq80qxyp2v6cpfv3zkj7mpiqplankl"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f          ; Not all test files included.
        #:cargo-inputs
        (("rust-once-cell" ,rust-once-cell-1)
         ("rust-pest" ,rust-pest-2)
@@ -43534,8 +46805,33 @@ and graph algorithms.")
                (("fn dot\\(\\) \\{" all)
                 (string-append "#[ignore] " all))))))))))
 
+(define-public rust-phf-0.11
+  (package
+    (name "rust-phf")
+    (version "0.11.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "phf" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1354fbpb52cp9gs5mlkaygc5qhdx6r07rfv3xy482m4kvqsnb34j"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f          ; Doc tests fail.
+       #:cargo-inputs
+       (("rust-phf-macros" ,rust-phf-macros-0.11)
+        ("rust-phf-shared" ,rust-phf-shared-0.11)
+        ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/rust-phf/rust-phf")
+    (synopsis "Runtime support for perfect hash function data structures")
+    (description "This package provides runtime support for perfect hash
+function data structures.")
+    (license license:expat)))
+
 (define-public rust-phf-0.10
   (package
+    (inherit rust-phf-0.11)
     (name "rust-phf")
     (version "0.10.1")
     (source
@@ -43545,19 +46841,32 @@ and graph algorithms.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0naj8n5nasv5hj5ldlva3cl6y3sv7zp3kfgqylhbrg55v3mg3fzs"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f          ; Doc tests fail.
        #:cargo-inputs
        (("rust-phf-macros" ,rust-phf-macros-0.10)
         ("rust-phf-shared" ,rust-phf-shared-0.10)
         ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)
-        ("rust-serde" ,rust-serde-1))))
-    (home-page "https://github.com/sfackler/rust-phf")
-    (synopsis "Runtime support for perfect hash function data structures")
-    (description "This package provides runtime support for perfect hash
-function data structures.")
-    (license license:expat)))
+        ("rust-serde" ,rust-serde-1))))))
+
+(define-public rust-phf-0.9
+  (package
+    (inherit rust-phf-0.10)
+    (name "rust-phf")
+    (version "0.9.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "phf" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0sk9arhiv4hkg3hbmbxnpjvr0bffhyz7kpb2pn86mn6ia4c566xj"))))
+    (arguments
+     `(#:tests? #f          ; Doc tests fail.
+       #:cargo-inputs
+       (("rust-phf-macros" ,rust-phf-macros-0.9)
+        ("rust-phf-shared" ,rust-phf-shared-0.9)
+        ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5))))))
 
 (define-public rust-phf-0.8
   (package
@@ -43605,8 +46914,30 @@ function data structures.")
      "Runtime support for perfect hash function data structures.")
     (license license:expat)))
 
+(define-public rust-phf-codegen-0.11
+  (package
+    (name "rust-phf-codegen")
+    (version "0.11.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "phf-codegen" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0w274bcqbz499vpvd7isb252bc5mxmj9kagapn5mkjp3qn8chsm5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-phf-generator" ,rust-phf-generator-0.11)
+        ("rust-phf-shared" ,rust-phf-shared-0.11))))
+    (home-page "https://github.com/rust-phf/rust-phf")
+    (synopsis "Codegen library for PHF types")
+    (description "Codegen library for PHF types.")
+    (license license:expat)))
+
 (define-public rust-phf-codegen-0.10
   (package
+    (inherit rust-phf-codegen-0.11)
     (name "rust-phf-codegen")
     (version "0.10.0")
     (source
@@ -43616,16 +46947,28 @@ function data structures.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1k8kdad9wk2d5972k6jmjki2xpdy2ky4zd19rv7ybm2dpjlc7cag"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-phf-generator" ,rust-phf-generator-0.10)
-        ("rust-phf-shared" ,rust-phf-shared-0.10))))
-    (home-page "https://github.com/sfackler/rust-phf")
-    (synopsis "Codegen library for PHF types")
-    (description "Codegen library for PHF types.")
-    (license license:expat)))
+        ("rust-phf-shared" ,rust-phf-shared-0.10))))))
+
+(define-public rust-phf-codegen-0.9
+  (package
+    (inherit rust-phf-codegen-0.10)
+    (name "rust-phf-codegen")
+    (version "0.9.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "phf-codegen" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1q4r7mqisvzjz5fzfnr16nb5bxrj6xv32qnq1ds75xql783md31z"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-phf-generator" ,rust-phf-generator-0.9)
+        ("rust-phf-shared" ,rust-phf-shared-0.9))))))
 
 (define-public rust-phf-codegen-0.8
   (package
@@ -43671,8 +47014,38 @@ function data structures.")
     (description "Codegen library for PHF types.")
     (license license:expat)))
 
+(define-public rust-phf-generator-0.11
+  (package
+    (name "rust-phf-generator")
+    (version "0.11.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "phf-generator" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1gsgy5k45y937qnwp58dc05d63lwlfm3imqr1zslb8qgb2a1q65i"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin (substitute* "Cargo.toml"
+                         (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                          (string-append "\"^" version)))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-phf-shared" ,rust-phf-shared-0.11)
+        ("rust-rand" ,rust-rand-0.8))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3))))
+    (home-page "https://github.com/rust-phf/rust-phf")
+    (synopsis "PHF generation logic")
+    (description "PHF generation logic.")
+    (license license:expat)))
+
 (define-public rust-phf-generator-0.10
   (package
+    (inherit rust-phf-generator-0.11)
     (name "rust-phf-generator")
     (version "0.10.0")
     (source
@@ -43682,17 +47055,38 @@ function data structures.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1mlq6hlajsvlsx6rhw49g9ricsm017lrxmgmmbk85sxm7f4qaljx"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-criterion" ,rust-criterion-0.3)
         ("rust-phf-shared" ,rust-phf-shared-0.10)
-        ("rust-rand" ,rust-rand-0.8))))
-    (home-page "https://github.com/sfackler/rust-phf")
-    (synopsis "PHF generation logic")
-    (description "PHF generation logic.")
-    (license license:expat)))
+        ("rust-rand" ,rust-rand-0.8))))))
+
+(define-public rust-phf-generator-0.9
+  (package
+    (inherit rust-phf-generator-0.10)
+    (name "rust-phf-generator")
+    (version "0.9.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "phf-generator" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "10ih96kaxnkn1yxk3ghpzgm09nc0rn69fd52kv68003fv4h34gyl"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin (substitute* "Cargo.toml"
+                         (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                          (string-append "\"^" version)))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-phf-shared" ,rust-phf-shared-0.9)
+        ("rust-rand" ,rust-rand-0.8))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3))))))
 
 (define-public rust-phf-generator-0.8
   (package
@@ -43738,8 +47132,35 @@ function data structures.")
     (description "PHF generation logic")
     (license license:expat)))
 
+(define-public rust-phf-macros-0.11
+  (package
+    (name "rust-phf-macros")
+    (version "0.11.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "phf-macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0rncvjimjri2vancig85icbk8h03a5s3z4cyasd70s37y72wvalj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-phf-generator" ,rust-phf-generator-0.11)
+        ("rust-phf-shared" ,rust-phf-shared-0.11)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1)
+        ("rust-unicase" ,rust-unicase-2))))
+    (home-page "https://github.com/rust-phf/rust-phf")
+    (synopsis "Macros to generate types in the phf crate")
+    (description
+     "This package contains macros to generate types in the phf crate.")
+    (license license:expat)))
+
 (define-public rust-phf-macros-0.10
   (package
+    (inherit rust-phf-macros-0.11)
     (name "rust-phf-macros")
     (version "0.10.0")
     (source
@@ -43749,7 +47170,6 @@ function data structures.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1q5ljwvb10dx188i6jxzckqfimjw5pm2p4kkvmhg2q6m9lcg7zaq"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -43759,12 +47179,33 @@ function data structures.")
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1)
-        ("rust-unicase" ,rust-unicase-2))))
-    (home-page "https://github.com/sfackler/rust-phf")
-    (synopsis "Macros to generate types in the phf crate")
-    (description
-     "This package contains macros to generate types in the phf crate.")
-    (license license:expat)))
+        ("rust-unicase" ,rust-unicase-2))))))
+
+(define-public rust-phf-macros-0.9
+  (package
+    (inherit rust-phf-macros-0.10)
+    (name "rust-phf-macros")
+    (version "0.9.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "phf-macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1rpc0jy5sfrk3ir87k2q0kk44a45nsrbwc131jmsi6f8hi3fqi7g"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-phf-generator" ,rust-phf-generator-0.9)
+        ("rust-phf-shared" ,rust-phf-shared-0.9)
+        ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1)
+        ("rust-unicase" ,rust-unicase-2))
+       #:cargo-development-inputs
+       (("rust-phf" ,rust-phf-0.9)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-unicase" ,rust-unicase-2))))))
 
 (define-public rust-phf-macros-0.8
   (package
@@ -43822,8 +47263,32 @@ function data structures.")
      "Macros to generate types in the phf crate.")
     (license license:expat)))
 
+(define-public rust-phf-shared-0.11
+  (package
+    (name "rust-phf-shared")
+    (version "0.11.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "phf-shared" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0xp6krf3cd411rz9rbk7p6xprlz786a215039j6jlxvbh9pmzyz1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-siphasher" ,rust-siphasher-0.3)
+        ("rust-uncased" ,rust-uncased-0.9)
+        ("rust-unicase" ,rust-unicase-2))))
+    (home-page "https://github.com/rust-phf/rust-phf")
+    (synopsis "Support code shared by PHF libraries")
+    (description
+     "This package provides support code shared by PHF libraries.")
+    (license license:expat)))
+
 (define-public rust-phf-shared-0.10
   (package
+    (inherit rust-phf-shared-0.11)
     (name "rust-phf-shared")
     (version "0.10.0")
     (source
@@ -43833,18 +47298,30 @@ function data structures.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "15n02nc8yqpd8hbxngblar2g53p3nllc93d8s8ih3p5cf7bnlydn"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-siphasher" ,rust-siphasher-0.3)
         ("rust-uncased" ,rust-uncased-0.9)
-        ("rust-unicase" ,rust-unicase-2))))
-    (home-page "https://github.com/sfackler/rust-phf")
-    (synopsis "Support code shared by PHF libraries")
-    (description
-     "This package provides support code shared by PHF libraries.")
-    (license license:expat)))
+        ("rust-unicase" ,rust-unicase-2))))))
+
+(define-public rust-phf-shared-0.9
+  (package
+    (inherit rust-phf-shared-0.10)
+    (name "rust-phf-shared")
+    (version "0.9.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "phf-shared" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1ng0hi2byifqah6bcdy3zcpbwq8jxgl4laz65gq40dp3dm11i0x6"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-siphasher" ,rust-siphasher-0.3)
+        ("rust-uncased" ,rust-uncased-0.9)
+        ("rust-unicase" ,rust-unicase-2))))))
 
 (define-public rust-phf-shared-0.8
   (package
@@ -43890,6 +47367,27 @@ function data structures.")
      "Support code shared by PHF libraries.")
     (license license:expat)))
 
+(define-public rust-pikchr-0.1
+  (package
+    (name "rust-pikchr")
+    (version "0.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pikchr" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1lm6924k84jdwsyjf029r2xwz23dmm19mryb51jaj9q29f9n001w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cc" ,rust-cc-1)
+        ("rust-libc" ,rust-libc-0.2))))
+    (home-page "https://github.com/kinnison/pikchr")
+    (synopsis "PIC-like diagramming language to SVG converter")
+    (description "PIC-like diagramming language to SVG converter")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-pin-project-1
   (package
     (name "rust-pin-project")
@@ -43916,6 +47414,29 @@ function data structures.")
      "This package provides a crate for safe and ergonomic pin-projection.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-ping-0.4
+  (package
+    (name "rust-ping")
+    (version "0.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ping" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0h8iyphd5c6k609635ja813isyplnzrlz8hgp0pfrb2v39xahw33"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f          ; Tests require network access.
+       #:cargo-inputs
+       (("rust-rand" ,rust-rand-0.8)
+        ("rust-socket2" ,rust-socket2-0.4)
+        ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/aisk/ping")
+    (synopsis "ICMP library for Rust")
+    (description "This package provides an ICMP library for Rust.")
+    (license license:expat)))
+
 (define-public rust-pin-project-0.4
   (package
     (inherit rust-pin-project-1)
@@ -43943,24 +47464,6 @@ function data structures.")
         ("rust-toml" ,rust-toml-0.5)
         ("rust-trybuild" ,rust-trybuild-1))))))
 
-(define-public rust-pin-project-auxiliary-macro-0.0
-  (package
-    (name "rust-pin-project-auxiliary-macro")
-    (version "0.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pin-project-auxiliary-macro" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1fk48gab989xxmw466yp4mvqwfkkx9ckqzmjlfyk2hnzavqwvkxj"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/taiki-e/pin-project")
-    (synopsis "Internal test tool of the pin-project crate")
-    (description
-     "This package is an internal test tool of the @code{pin-project} crate.")
-    (license (list license:asl2.0 license:expat))))
-
 (define-public rust-pin-project-internal-1
   (package
     (name "rust-pin-project-internal")
@@ -44124,8 +47627,38 @@ along with strong support for variations and the core header tables.")
      "This crate provides async pipes, channels, mutexes, and more.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-pkcs1-0.7
+  (package
+    (name "rust-pkcs1")
+    (version "0.7.5")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pkcs1" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0zz4mil3nchnxljdfs2k5ab1cjqn7kq5lqp62n9qfix01zqvkzy8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-der" ,rust-der-0.7)
+        ("rust-pkcs8" ,rust-pkcs8-0.10)
+        ("rust-spki" ,rust-spki-0.7))
+       #:cargo-development-inputs
+       (("rust-const-oid" ,rust-const-oid-0.9)
+        ("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/RustCrypto/formats/tree/master/pkcs1")
+    (synopsis "Implementation of Public-Key Cryptography Standards (PKCS) #1")
+    (description
+     "This package provides a pure Rust implementation of Public-Key
+Cryptography Standards (PKCS) #1: RSA Cryptography Specifications Version 2.2
+(RFC 8017).")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-pkcs1-0.2
   (package
+    (inherit rust-pkcs1-0.7)
     (name "rust-pkcs1")
     (version "0.2.4")
     (source
@@ -44135,23 +47668,76 @@ along with strong support for variations and the core header tables.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0b2f1a0lf5h53zrjvcqbxzjhh89gcfa1myhf6z7w10ypg61fwsqi"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-der" ,rust-der-0.4)
         ("rust-pem-rfc7468" ,rust-pem-rfc7468-0.2)
-        ("rust-zeroize" ,rust-zeroize-1))))
-    (home-page "https://github.com/RustCrypto/formats/tree/master/pkcs1")
-    (synopsis "Implementation of Public-Key Cryptography Standards (PKCS) #1")
+        ("rust-zeroize" ,rust-zeroize-1))))))
+
+(define-public rust-pkcs5-0.7
+  (package
+    (name "rust-pkcs5")
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pkcs5" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "19k9igzay529fqj90qdkgnvmvwp65wzw73h2vn3sigqq3b4y4iz8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-aes" ,rust-aes-0.8)
+        ("rust-cbc" ,rust-cbc-0.1)
+        ("rust-der" ,rust-der-0.7)
+        ("rust-des" ,rust-des-0.8)
+        ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+        ("rust-scrypt" ,rust-scrypt-0.11)
+        ("rust-sha1" ,rust-sha1-0.10)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-spki" ,rust-spki-0.7))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.3))))
+    (home-page "https://github.com/RustCrypto/formats/tree/master/pkcs5")
+    (synopsis "Implementation of Public-Key Cryptography Standards (PKCS) #5")
     (description
-     "This package provides a pure Rust implementation of Public-Key
-Cryptography Standards (PKCS) #1: RSA Cryptography Specifications Version 2.2
-(RFC 8017)")
+     "This package is a pure Rust implementation of Public-Key Cryptography
+Standards (PKCS) #5: Password-Based Cryptography Specification Version
+2.1 (RFC 8018).")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-pkcs5-0.5
+  (package
+    (inherit rust-pkcs5-0.7)
+    (name "rust-pkcs5")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pkcs5" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0x81m285ijqi0fqkgym6a6ax02mfzdx87zfvqgrjsc2w3wn8c3fi"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-aes" ,rust-aes-0.8)
+        ("rust-cbc" ,rust-cbc-0.1)
+        ("rust-der" ,rust-der-0.6)
+        ("rust-des" ,rust-des-0.8)
+        ("rust-hmac" ,rust-hmac-0.12)
+        ("rust-pbkdf2" ,rust-pbkdf2-0.11)
+        ("rust-scrypt" ,rust-scrypt-0.10)
+        ("rust-sha1" ,rust-sha1-0.10)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-spki" ,rust-spki-0.6))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.3))))))
+
 (define-public rust-pkcs5-0.3
   (package
+    (inherit rust-pkcs5-0.7)
     (name "rust-pkcs5")
     (version "0.3.2")
     (source
@@ -44161,7 +47747,6 @@ Cryptography Standards (PKCS) #1: RSA Cryptography Specifications Version 2.2
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1m3xrrwwbn9883bylgjzssfh3w1lbl7fhkb3ndz721rf27pca8sl"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -44174,17 +47759,64 @@ Cryptography Standards (PKCS) #1: RSA Cryptography Specifications Version 2.2
         ("rust-scrypt" ,rust-scrypt-0.8)
         ("rust-sha-1" ,rust-sha-1-0.9)
         ("rust-sha2" ,rust-sha2-0.9)
-        ("rust-spki" ,rust-spki-0.4))))
-    (home-page "https://github.com/RustCrypto/formats/tree/master/pkcs5")
-    (synopsis "Implementation of Public-Key Cryptography Standards (PKCS) #5")
+        ("rust-spki" ,rust-spki-0.4))))))
+
+(define-public rust-pkcs8-0.10
+  (package
+    (name "rust-pkcs8")
+    (version "0.10.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pkcs8" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1dx7w21gvn07azszgqd3ryjhyphsrjrmq5mmz1fbxkj5g0vv4l7r"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-der" ,rust-der-0.7)
+        ("rust-pkcs5" ,rust-pkcs5-0.7)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-spki" ,rust-spki-0.7)
+        ("rust-subtle" ,rust-subtle-2))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/RustCrypto/formats/tree/master/pkcs8")
+    (synopsis "Implementation of Public-Key Cryptography Standards (PKCS) #8")
     (description
      "This package is a pure Rust implementation of Public-Key Cryptography
-Standards (PKCS) #5: Password-Based Cryptography Specification Version
-2.1 (RFC 8018).")
+Standards (PKCS) #8: Private-Key Information Syntax Specification (RFC 5208),
+with additional support for PKCS#8v2 asymmetric key packages (RFC 5958).")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-pkcs8-0.9
+  (package
+    (inherit rust-pkcs8-0.10)
+    (name "rust-pkcs8")
+    (version "0.9.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pkcs8" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1fm4sigvcd0zpzg9jcp862a8p272kk08b9lgcs1dm1az19cjrjly"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-der" ,rust-der-0.6)
+        ("rust-pkcs5" ,rust-pkcs5-0.5)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-spki" ,rust-spki-0.6)
+        ("rust-subtle" ,rust-subtle-2))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-pkcs8-0.7
   (package
+    (inherit rust-pkcs8-0.10)
     (name "rust-pkcs8")
     (version "0.7.6")
     (source
@@ -44194,7 +47826,6 @@ Standards (PKCS) #5: Password-Based Cryptography Specification Version
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0iq46p6fa2b8xy6pj52zpmdy8ya3fg31dj4rc19x1fi69nvgjgpf"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -44204,14 +47835,7 @@ Standards (PKCS) #5: Password-Based Cryptography Specification Version
         ("rust-pkcs5" ,rust-pkcs5-0.3)
         ("rust-rand-core" ,rust-rand-core-0.6)
         ("rust-spki" ,rust-spki-0.4)
-        ("rust-zeroize" ,rust-zeroize-1))))
-    (home-page "https://github.com/RustCrypto/formats/tree/master/pkcs8")
-    (synopsis "Implementation of Public-Key Cryptography Standards (PKCS) #8")
-    (description
-     "This package is a pure Rust implementation of Public-Key Cryptography
-Standards (PKCS) #8: Private-Key Information Syntax Specification (RFC 5208),
-with additional support for PKCS#8v2 asymmetric key packages (RFC 5958).")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-zeroize" ,rust-zeroize-1))))))
 
 (define-public rust-pkg-config-0.3
   (package
@@ -44292,6 +47916,30 @@ network packet formats.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-platform-info-2
+  (package
+    (name "rust-platform-info")
+    (version "2.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "platform-info" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "03rhwsfhdr3sb6fxr0bmf7xav745m132y6vg05jzcfz5c149q9fn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs (("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/uutils/platform-info")
+    (synopsis "Cross-platform interface to get info about a system")
+    (description
+     "This package provides a simple cross-platform interface to get info about
+a system.")
+    (license license:expat)))
+
 (define-public rust-pledge-0.4
   (package
     (name "rust-pledge")
@@ -44550,63 +48198,6 @@ applications.")
      "This crate provides Arrow interfaces for Polars DataFrame library.")
     (license license:expat)))
 
-(define-public rust-polars-arrow-0.16
-  (package
-    (inherit rust-polars-arrow-0.17)
-    (name "rust-polars-arrow")
-    (version "0.16.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "polars-arrow" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0pwx7nsayn526r9gw16yzqq3r6mn6ivcdxzsj8737whk04qy3ssb"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-arrow2" ,rust-arrow2-0.5)
-        ("rust-num" ,rust-num-0.4)
-        ("rust-thiserror" ,rust-thiserror-1))))))
-
-(define-public rust-polars-arrow-0.15
-  (package
-    (inherit rust-polars-arrow-0.16)
-    (name "rust-polars-arrow")
-    (version "0.15.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "polars-arrow" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0d8ir9dajywfqg6ck557vbvzsdmndc1ipn9mgrqi15yini1qmw2z"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-arrow" ,rust-arrow-5)
-        ("rust-num" ,rust-num-0.4)
-        ("rust-thiserror" ,rust-thiserror-1))))))
-
-(define-public rust-polars-arrow-0.14
-  (package
-    (inherit rust-polars-arrow-0.15)
-    (name "rust-polars-arrow")
-    (version "0.14.8")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "polars-arrow" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1wk6qfj821w6qqs35n9f0zhp9n7mffxzah12nqk1xlpv2ci2ahsr"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-arrow" ,rust-arrow-4)
-        ("rust-num" ,rust-num-0.4)
-        ("rust-thiserror" ,rust-thiserror-1))))))
-
 (define-public rust-polars-core-0.17
   (package
     (name "rust-polars-core")
@@ -44651,83 +48242,6 @@ applications.")
      "This crate provides the core of the Polars DataFrame library.")
     (license license:expat)))
 
-(define-public rust-polars-core-0.16
-  (package
-    (inherit rust-polars-core-0.17)
-    (name "rust-polars-core")
-    (version "0.16.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "polars-core" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0knhxc2b0k5jpvm7fxm64b5hjdyqgxjjyi6cnsiy5sya3mj3v9cd"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-ahash" ,rust-ahash-0.7)
-        ("rust-anyhow" ,rust-anyhow-1)
-        ("rust-arrow2" ,rust-arrow2-0.5)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-comfy-table" ,rust-comfy-table-1)
-        ("rust-hashbrown" ,rust-hashbrown-0.11)
-        ("rust-itertools" ,rust-itertools-0.10)
-        ("rust-jsonpath-lib" ,rust-jsonpath-lib-0.3)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-ndarray" ,rust-ndarray-0.15)
-        ("rust-num" ,rust-num-0.4)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-polars-arrow" ,rust-polars-arrow-0.16)
-        ("rust-prettytable-rs" ,rust-prettytable-rs-0.8)
-        ("rust-rand" ,rust-rand-0.7)
-        ("rust-rand-distr" ,rust-rand-distr-0.3)
-        ("rust-rayon" ,rust-rayon-1)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-thiserror" ,rust-thiserror-1)
-        ("rust-unsafe-unwrap" ,rust-unsafe-unwrap-0.1))))))
-
-(define-public rust-polars-core-0.15
-  (package
-    (inherit rust-polars-core-0.16)
-    (name "rust-polars-core")
-    (version "0.15.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "polars-core" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0vzyyqg0s6h3k77z7nkmqrrgnp7nbi7sh5nmlw1ggrlml9ps0aa9"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-ahash" ,rust-ahash-0.7)
-        ("rust-anyhow" ,rust-anyhow-1)
-        ("rust-arrow" ,rust-arrow-5)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-comfy-table" ,rust-comfy-table-1)
-        ("rust-hashbrown" ,rust-hashbrown-0.11)
-        ("rust-itertools" ,rust-itertools-0.10)
-        ("rust-jsonpath-lib" ,rust-jsonpath-lib-0.3)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-ndarray" ,rust-ndarray-0.15)
-        ("rust-num" ,rust-num-0.4)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-parquet" ,rust-parquet-5)
-        ("rust-polars-arrow" ,rust-polars-arrow-0.15)
-        ("rust-prettytable-rs" ,rust-prettytable-rs-0.8)
-        ("rust-rand" ,rust-rand-0.7)
-        ("rust-rand-distr" ,rust-rand-distr-0.3)
-        ("rust-rayon" ,rust-rayon-1)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-thiserror" ,rust-thiserror-1)
-        ("rust-unsafe-unwrap" ,rust-unsafe-unwrap-0.1))))))
-
 (define-public rust-polars-io-0.17
   (package
     (name "rust-polars-io")
@@ -44766,38 +48280,6 @@ applications.")
      "This crate provides IO related logic for the Polars DataFrame library.")
     (license license:expat)))
 
-(define-public rust-polars-io-0.16
-  (package
-    (inherit rust-polars-io-0.17)
-    (name "rust-polars-io")
-    (version "0.16.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "polars-io" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0yqpjk0ymqpjq6f0mnm9hhw9xmjradx6vqzg5n54qvl6v3s3p3kh"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-ahash" ,rust-ahash-0.7)
-        ("rust-anyhow" ,rust-anyhow-1)
-        ("rust-arrow2" ,rust-arrow2-0.5)
-        ("rust-csv-core" ,rust-csv-core-0.1)
-        ("rust-dirs" ,rust-dirs-3)
-        ("rust-flate2" ,rust-flate2-1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-lexical" ,rust-lexical-6)
-        ("rust-memmap2" ,rust-memmap2-0.2)
-        ("rust-num" ,rust-num-0.4)
-        ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-polars-arrow" ,rust-polars-arrow-0.16)
-        ("rust-polars-core" ,rust-polars-core-0.16)
-        ("rust-rayon" ,rust-rayon-1)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-simdutf8" ,rust-simdutf8-0.1))))))
-
 (define-public rust-polars-lazy-0.17
   (package
     (name "rust-polars-lazy")
@@ -45036,34 +48518,6 @@ overloading without macros in Rust.")
      "This package provides a native, synchronous PostgreSQL client.")
     (license license:expat)))
 
-(define-public rust-postgres-0.15
-  (package
-    (inherit rust-postgres-0.19)
-    (name "rust-postgres")
-    (version "0.15.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "postgres" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1id6jb56jack7kxivpp3rnjjmkmymmxqadf0h0smgbsixy8dwp8i"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bytes" ,rust-bytes-0.4)
-        ("rust-fallible-iterator" ,rust-fallible-iterator-0.1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-native-tls" ,rust-native-tls-0.1)
-        ("rust-openssl" ,rust-openssl-0.9)
-        ("rust-postgres-protocol" ,rust-postgres-protocol-0.3)
-        ("rust-postgres-shared" ,rust-postgres-shared-0.4)
-        ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
-        ("rust-schannel" ,rust-schannel-0.1)
-        ("rust-security-framework" ,rust-security-framework-0.1)
-        ("rust-socket2" ,rust-socket2-0.3))))))
-
 (define-public rust-postgres-derive-0.4
   (package
     (name "rust-postgres-derive")
@@ -45120,68 +48574,6 @@ overloading without macros in Rust.")
      "This package provides low level Postgres protocol APIs.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-postgres-protocol-0.3
-  (package
-    (inherit rust-postgres-protocol-0.6)
-    (name "rust-postgres-protocol")
-    (version "0.3.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "postgres-protocol" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "04kkznbhwspfn0hdja3jsv37l6g5gz7a625z8yra325zamjfd1r4"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-base64" ,rust-base64-0.6)
-        ("rust-byteorder" ,rust-byteorder-1)
-        ("rust-bytes" ,rust-bytes-0.4)
-        ("rust-fallible-iterator" ,rust-fallible-iterator-0.1)
-        ("rust-generic-array" ,rust-generic-array-0.9)
-        ("rust-hmac" ,rust-hmac-0.5)
-        ("rust-md5" ,rust-md5-0.3)
-        ("rust-memchr" ,rust-memchr-1)
-        ("rust-rand" ,rust-rand-0.3)
-        ("rust-sha2" ,rust-sha2-0.7)
-        ("rust-stringprep" ,rust-stringprep-0.1))))))
-
-(define-public rust-postgres-shared-0.4
-  (package
-    (name "rust-postgres-shared")
-    (version "0.4.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "postgres-shared" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0vzk1njkqkd2xxz34jnax29z4179ni4j3f534i6416q2w2rkbb7z"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-bit-vec" ,rust-bit-vec-0.4)
-        ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-eui48" ,rust-eui48-0.3)
-        ("rust-fallible-iterator" ,rust-fallible-iterator-0.1)
-        ("rust-geo" ,rust-geo-0.4)
-        ("rust-hex" ,rust-hex-0.2)
-        ("rust-phf" ,rust-phf-0.7)
-        ("rust-postgres-protocol" ,rust-postgres-protocol-0.3)
-        ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-time" ,rust-time-0.1)
-        ("rust-uuid" ,rust-uuid-0.5))))
-    (home-page "https://github.com/sfackler/rust-postgres")
-    (synopsis
-     "Internal crate used by @code{postgres} and @code{postgres-tokio}")
-    (description
-     "This is an internal crate used by @code{postgres} and
-@code{postgres-tokio}.")
-    (license license:expat)))
-
 (define-public rust-postgres-types-0.2
   (package
     (name "rust-postgres-types")
@@ -45590,27 +48982,6 @@ replacements, adding colorful diffs.")
        (("rust-ansi-term" ,rust-ansi-term-0.9)
         ("rust-difference" ,rust-difference-1))))))
 
-(define-public rust-pretty-assertions-0.2
-  (package
-    (name "rust-pretty-assertions")
-    (version "0.2.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pretty-assertions" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1b3nv70i16737w3qkk1q5vqswwnb19znz8r9v2kcg1qyhh3h0l8x"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-difference" ,rust-difference-1))))
-    (home-page "https://github.com/colin-kiegel/rust-pretty-assertions")
-    (synopsis "Colorful diffs for `assert_eq!` and `assert_ne!`")
-    (description "Overwrite `assert_eq!` and `assert_ne!` with drop-in
-replacements, adding colorful diffs.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-pretty-env-logger-0.4
   (package
     (name "rust-pretty-env-logger")
@@ -45704,8 +49075,59 @@ replacements, adding colorful diffs.")
 formatted tables in terminal.")
     (license license:bsd-3)))
 
+(define-public rust-primeorder-0.13
+  (package
+    (name "rust-primeorder")
+    (version "0.13.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "primeorder" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1ddz0d0fzzcpdlsj6c6989va8ykf702g3zmf7dszfa0y6rski3fg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-elliptic-curve" ,rust-elliptic-curve-0.13)
+        ("rust-serdect" ,rust-serdect-0.2))))
+    (home-page
+     "https://github.com/RustCrypto/elliptic-curves/tree/master/primeorder")
+    (synopsis
+     "Rust implementation of addition formulas for prime order elliptic curves")
+    (description
+     "This package contains a pure Rust implementation of complete addition
+formulas for prime order elliptic curves (Renes-Costello-Batina 2015).  It
+provides a generic over field elements and curve equation coefficients.")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-print-bytes-1
+  (package
+    (name "rust-print-bytes")
+    (version "1.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "print-bytes" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0a1pc0bs0f3mgy86mazdy81k6iaj8s23ly49mcka4in2pj27lzxl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Not all files included.
+       #:cargo-inputs
+       (("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs
+       (("rust-os-str-bytes" ,rust-os-str-bytes-6))))
+    (home-page "https://github.com/dylni/print_bytes")
+    (synopsis "Print bytes as losslessly as possible")
+    (description "This package contains a Rust library to print bytes as
+losslessly as possible.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-print-bytes-0.5
   (package
+    (inherit rust-print-bytes-1)
     (name "rust-print-bytes")
     (version "0.5.0")
     (source
@@ -45715,17 +49137,11 @@ formatted tables in terminal.")
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32 "0d4i9y3jx1chi6w97a8rgdbwm9g3cppr53rw53zl6fcaq31qx0b6"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-winapi" ,rust-winapi-0.3))
        #:cargo-development-inputs
-       (("rust-os-str-bytes" ,rust-os-str-bytes-4))))
-    (home-page "https://github.com/dylni/print_bytes")
-    (synopsis "Print bytes as losslessly as possible")
-    (description "This package contains a Rust library to print bytes as
-losslessly as possible.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-os-str-bytes" ,rust-os-str-bytes-4))))))
 
 (define-public rust-print-bytes-0.4
   (package
@@ -45946,7 +49362,7 @@ in your code.")
 (define-public rust-proc-macro2-1
   (package
     (name "rust-proc-macro2")
-    (version "1.0.52")
+    (version "1.0.64")
     (source
      (origin
        (method url-fetch)
@@ -45954,7 +49370,7 @@ in your code.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0922fkhi689x134yh6l97lnpwgarhbv0vnv3vpnkpk1nx3lil3hx"))))
+         "1nm7qw54jn9n0g1ygkw4f63vj90m241yih6ph3g6zx7irdi3p03q"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags '("--lib")
@@ -46136,14 +49552,14 @@ property-based testing and fuzzing.")
 (define-public rust-proptest-1
   (package
     (name "rust-proptest")
-    (version "1.0.0")
+    (version "1.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "proptest" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1rdhjnf0xma5rmsq04d31n2vq1pgbm42pjc6jn3jsj8qgz09q38y"))))
+        (base32 "0w5s3wwchd3i6m15lsbsk3r3y25d1gwn13m6a185ks8w06cbiw99"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -46159,7 +49575,8 @@ property-based testing and fuzzing.")
         ("rust-regex-syntax" ,rust-regex-syntax-0.6)
         ("rust-rusty-fork" ,rust-rusty-fork-0.3)
         ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-x86" ,rust-x86-0.33))
+        ("rust-unarray" ,rust-unarray-0.1)
+        ("rust-x86" ,rust-x86-0.52))
        #:cargo-development-inputs
        (("rust-regex" ,rust-regex-1))))
     (home-page "https://altsysrq.github.io/proptest-book/proptest/index.html")
@@ -46229,68 +49646,9 @@ including most strategies and the testing framework itself.")
        #:cargo-development-inputs
        (("rust-regex" ,rust-regex-1))))))
 
-(define-public rust-proptest-0.8
-  (package
-    (inherit rust-proptest-0.9)
-    (name "rust-proptest")
-    (version "0.8.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "proptest" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "07qrxwsd72wr1cqs0b5b159lnagjffp0l4s4zriz8jak8w20cvcj"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f      ; 1 doc test fails
-       #:cargo-inputs
-       (("rust-bit-set" ,rust-bit-set-0.5)
-        ("rust-bitflags" ,rust-bitflags-1)
-        ("rust-byteorder" ,rust-byteorder-1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-num-traits" ,rust-num-traits-0.2)
-        ("rust-quick-error" ,rust-quick-error-1)
-        ("rust-rand" ,rust-rand-0.5)
-        ("rust-regex-syntax" ,rust-regex-syntax-0.6)
-        ("rust-rusty-fork" ,rust-rusty-fork-0.2)
-        ("rust-tempfile" ,rust-tempfile-3))
-       #:cargo-development-inputs
-       (("rust-regex" ,rust-regex-1))))))
-
-(define-public rust-proptest-0.7
-  (package
-    (inherit rust-proptest-0.9)
-    (name "rust-proptest")
-    (version "0.7.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "proptest" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "13giz85f7jkjc8miplzj4zh3fr704c1y1cg0dh218iw2dfkpbwi7"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-bit-set" ,rust-bit-set-0.5)
-        ("rust-bitflags" ,rust-bitflags-1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-num-traits" ,rust-num-traits-0.2)
-        ("rust-quick-error" ,rust-quick-error-1)
-        ("rust-rand" ,rust-rand-0.4)
-        ("rust-regex-syntax" ,rust-regex-syntax-0.4)
-        ("rust-rusty-fork" ,rust-rusty-fork-0.2)
-        ("rust-tempfile" ,rust-tempfile-3))
-       #:cargo-development-inputs
-       (("rust-regex" ,rust-regex-0.2))))))
-
 (define-public rust-proptest-0.3
   (package
-    (inherit rust-proptest-0.7)
+    (inherit rust-proptest-0.9)
     (name "rust-proptest")
     (version "0.3.4")
     (source
@@ -46523,7 +49881,7 @@ name.")
 (define-public rust-psl-types-2
   (package
     (name "rust-psl-types")
-    (version "2.0.7")
+    (version "2.0.11")
     (source
      (origin
        (method url-fetch)
@@ -46531,9 +49889,8 @@ name.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0kqssn9wgqpl1m26ynv7cvxanfhyjvssi2a3jc2nzpbw7q3ricv6"))))
+         "1b3cz1q07iy744a39smykra2j83nv8vmni6la37wnx3ax17jkjrk"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
     (home-page "https://github.com/addr-rs/psl-types")
     (synopsis "Common types for the public suffix implementation crates")
     (description "This package provides common types for the public suffix
@@ -46649,7 +50006,7 @@ configuration file and/or environment variables.")
 (define-public rust-publicsuffix-2
   (package
     (name "rust-publicsuffix")
-    (version "2.1.1")
+    (version "2.2.3")
     (source
      (origin
        (method url-fetch)
@@ -46657,16 +50014,17 @@ configuration file and/or environment variables.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1q9kbcqh9pa06p3kq7d3ksbnqjhs88v5wk5qg89wrgkbmpnp4a99"))))
+         "0mvls29klp6xk16n8114sr1llhahy6fy8qi9kbwzf6mflnyw3a4n"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-byteorder" ,rust-byteorder-1)
-        ("rust-hashbrown" ,rust-hashbrown-0.11)
-        ("rust-idna" ,rust-idna-0.2)
+     `(#:cargo-inputs
+       (("rust-hashbrown" ,rust-hashbrown-0.12)
+        ("rust-idna" ,rust-idna-0.3)
         ("rust-psl-types" ,rust-psl-types-2)
-        ("rust-unicase" ,rust-unicase-2))))
+        ("rust-unicase" ,rust-unicase-2))
+       #:cargo-development-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-rspec" ,rust-rspec-1))))
     (home-page "https://github.com/rushmorem/publicsuffix")
     (synopsis "Domain name parsing and email address validation")
     (description "This package provides robust domain name parsing and RFC
@@ -46696,8 +50054,43 @@ compliant email address validation.")
         ("rust-regex" ,rust-regex-1)
         ("rust-url" ,rust-url-2))))))
 
+(define-public rust-pulldown-cmark-0.9
+  (package
+    (name "rust-pulldown-cmark")
+    (version "0.9.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pulldown-cmark" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "166rhmwk42ffirrzhv7lmsh9f3my6xv1ggmb66fgzv57y3qs58bp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-getopts" ,rust-getopts-0.2)
+        ("rust-memchr" ,rust-memchr-2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-unicase" ,rust-unicase-2))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-html5ever" ,rust-html5ever-0.26)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-markup5ever-rcdom" ,rust-markup5ever-rcdom-0.2)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-tendril" ,rust-tendril-0.4))))
+    (home-page "https://github.com/raphlinus/pulldown-cmark")
+    (synopsis "Pull parser for CommonMark")
+    (description
+     "This package provides a pull parser for CommonMark.")
+    (license license:expat)))
+
 (define-public rust-pulldown-cmark-0.8
   (package
+    (inherit rust-pulldown-cmark-0.9)
     (name "rust-pulldown-cmark")
     (version "0.8.0")
     (source
@@ -46709,7 +50102,6 @@ compliant email address validation.")
         (sha256
           (base32
             "1y6wh446g6vravvj70zsadzswyl2b4pyln9ib76m697jjljf1bgz"))))
-    (build-system cargo-build-system)
     (arguments
       `(#:skip-build? #t
         #:cargo-inputs
@@ -46724,12 +50116,7 @@ compliant email address validation.")
          ("rust-markup5ever-rcdom"
           ,rust-markup5ever-rcdom-0.1)
          ("rust-regex" ,rust-regex-1)
-         ("rust-tendril" ,rust-tendril-0.4))))
-    (home-page "https://github.com/raphlinus/pulldown-cmark")
-    (synopsis "Pull parser for CommonMark")
-    (description
-     "This package provides a pull parser for CommonMark.")
-    (license license:expat)))
+         ("rust-tendril" ,rust-tendril-0.4))))))
 
 (define-public rust-pulldown-cmark-0.4
   (package
@@ -46902,17 +50289,17 @@ they were parsed from")
 @code{LC_COLLATE} and @code{LC_CTYPE} are not yet supported.")
     (license license:expat)))
 
-(define-public rust-pyo3-build-config-0.18
+(define-public rust-pyo3-build-config-0.19
   (package
     (name "rust-pyo3-build-config")
-    (version "0.18.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pyo3-build-config" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0zb7sz2w59ba0ipmy7saigyyr9v6pkrzqb8r5gagmp87bncryhvm"))))
+    (version "0.19.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3-build-config" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1c4n6dvv79p5mb558nz1cb0ifgxbhw9gjs0j1ff0l61w1d7v4kam"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -46927,6 +50314,24 @@ they were parsed from")
 ecosystem.")
     (license license:asl2.0)))
 
+(define-public rust-pyo3-build-config-0.18
+  (package
+    (inherit rust-pyo3-build-config-0.19)
+    (name "rust-pyo3-build-config")
+    (version "0.18.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pyo3-build-config" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "18vrn0hcf18bqjis9xq5nwijpgbfjc6r292906jn3fv1mksldfcw"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-once-cell" ,rust-once-cell-1)
+        ("rust-python3-dll-a" ,rust-python3-dll-a-0.2)
+        ("rust-target-lexicon" ,rust-target-lexicon-0.12))))))
+
 (define-public rust-pyo3-build-config-0.16
   (package
     (name "rust-pyo3-build-config")
@@ -46968,23 +50373,23 @@ ecosystem.")
      `(#:cargo-inputs
        (("rust-once-cell" ,rust-once-cell-1))))))
 
-(define-public rust-pyo3-ffi-0.16
+(define-public rust-pyo3-ffi-0.19
   (package
     (name "rust-pyo3-ffi")
-    (version "0.16.5")
+    (version "0.19.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "pyo3-ffi" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0avls4q393nmzhb124zg6kp5lj6xzy2f6qx564qa7b614xqs0xf2"))))
+                "193hg837vk0c9b4fxxx4bp2vjm4n4m0sx59ivba0lq78b63xwblj"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
-        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16))))
+        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.19))))
+    (native-inputs (list python))
     (home-page "https://github.com/pyo3/pyo3")
     (synopsis "Python API bindings for the PyO3 ecosystem")
     (description
@@ -46993,54 +50398,126 @@ ecosystem.")
 
 (define-public rust-pyo3-ffi-0.18
   (package
+    (inherit rust-pyo3-ffi-0.19)
     (name "rust-pyo3-ffi")
-    (version "0.18.1")
+    (version "0.18.3")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "pyo3-ffi" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1r8fmkfad60wdidsj4h5w16h0n2avn5bcy9nh92gy5vsq2jjd5c3"))))
-    (build-system cargo-build-system)
+                "0p7n9zs9ifrzcnna0lwyhwscyhw45q4x288x5bm1c6c26x9pqkgx"))))
     (arguments
-     `(;; The doctests fail with this error: `core::slice::<impl
-       ;; [T]>::as_mut_ptr` is not yet stable as a const fn
-       #:tests? #false
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.18))))))
+
+(define-public rust-pyo3-ffi-0.16
+  (package
+    (inherit rust-pyo3-ffi-0.19)
+    (name "rust-pyo3-ffi")
+    (version "0.16.5")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3-ffi" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0avls4q393nmzhb124zg6kp5lj6xzy2f6qx564qa7b614xqs0xf2"))))
+    (arguments
+     `(#:skip-build? #t
        #:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
-        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.18))))
-    (native-inputs (list python))
+        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16))))))
+
+(define-public rust-pyo3-log-0.8
+  (package
+    (name "rust-pyo3-log")
+    (version "0.8.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3-log" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0i0lwnzp0gizijidcddas3888zrzqpa60pmqs3bmibkbb99zcky9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-arc-swap" ,rust-arc-swap-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-pyo3" ,rust-pyo3-0.16))
+       #:cargo-development-inputs
+       (("rust-pyo3" ,rust-pyo3-0.16)
+        ("rust-syn" ,rust-syn-1))))
+    (inputs (list python))
+    (home-page "https://github.com/vorner/pyo3-log")
+    (synopsis "Logging bridge from pyo3 native extension to python")
+    (description "This package provides a logging bridge from pyo3 native
+extension to python.")
+    (license (list license:asl2.0 license:expat))))
+
+(define-public rust-pyo3-macros-backend-0.19
+  (package
+    (name "rust-pyo3-macros-backend")
+    (version "0.19.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3-macros-backend" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "12zs1vx0h4hainb0lpnw8knd9i9l0g2rdzdnrmb1bnv0n75qrdz0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/pyo3/pyo3")
-    (synopsis "Python API bindings for the PyO3 ecosystem")
+    (synopsis "Code generation for PyO3")
     (description
-     "This crate provides Rust FFI declarations for Python 3.")
+     "This package provides code generation backends for PyO3.")
     (license license:asl2.0)))
 
+(define-public rust-pyo3-macros-backend-0.18
+  (package
+    (inherit rust-pyo3-macros-backend-0.19)
+    (name "rust-pyo3-macros-backend")
+    (version "0.18.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3-macros-backend" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "062rxf7cj1dn82yiaws3dmxw5qq9ssccq92jgdc210y4lh4gznlp"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-pyo3-macros-backend-0.16
   (package
+    (inherit rust-pyo3-macros-backend-0.19)
     (name "rust-pyo3-macros-backend")
     (version "0.16.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pyo3-macros-backend" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1bvzvdx2a6hhliny12n2vy7v7gbsgzanxjckjr1cbxbkizss1gak"))))
-    (build-system cargo-build-system)
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3-macros-backend" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1bvzvdx2a6hhliny12n2vy7v7gbsgzanxjckjr1cbxbkizss1gak"))))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/pyo3/pyo3")
-    (synopsis "Code generation for PyO3")
-    (description
-     "This package provides code generation backends for PyO3.")
-    (license license:asl2.0)))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-pyo3-macros-backend-0.15
   (package
@@ -47062,30 +50539,49 @@ ecosystem.")
         ("rust-syn" ,rust-syn-1))))
     (native-inputs (list python))))
 
-(define-public rust-pyo3-macros-0.16
+(define-public rust-pyo3-macros-0.19
   (package
     (name "rust-pyo3-macros")
-    (version "0.16.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "pyo3-macros" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "1xwh7sl4n73746q80n5m5afd261zg0kxcqfnlr89ik7vbd4c8kr8"))))
+    (version "0.19.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3-macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "18n57jpi3292jhzmg5bjr1343zl93gmvxz21m1j5jdfxl73awp4a"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.16)
-         ("rust-quote" ,rust-quote-1)
-         ("rust-syn" ,rust-syn-1))))
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.19)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/pyo3/pyo3")
     (synopsis "Proc macros for PyO3")
     (description
      "This package provides compiler macros for use with PyO3.")
     (license license:asl2.0)))
 
+(define-public rust-pyo3-macros-0.18
+  (package
+    (inherit rust-pyo3-macros-0.19)
+    (name "rust-pyo3-macros")
+    (version "0.18.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3-macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "13b454p012l1487lbfqkr952qifsl88arldv4m5mmz5kv9arrlx9"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.18)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-pyo3-macros-backend-0.13
   (package
     (inherit rust-pyo3-macros-backend-0.15)
@@ -47105,6 +50601,25 @@ ecosystem.")
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-pyo3-macros-0.16
+  (package
+    (inherit rust-pyo3-macros-0.19)
+    (name "rust-pyo3-macros")
+    (version "0.16.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "pyo3-macros" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "1xwh7sl4n73746q80n5m5afd261zg0kxcqfnlr89ik7vbd4c8kr8"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.16)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-pyo3-macros-0.15
   (package
     (inherit rust-pyo3-macros-0.16)
@@ -47124,8 +50639,112 @@ ecosystem.")
         ("rust-syn" ,rust-syn-1))))
     (native-inputs (list python))))
 
+(define-public rust-pyo3-0.19
+  (package
+    (name "rust-pyo3")
+    (version "0.19.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0nca4p22jxwcg5dvg907j9m9618bvi8lmb20vvy4nsrhbzh8mf7z"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-eyre" ,rust-eyre-0.6)
+        ("rust-hashbrown" ,rust-hashbrown-0.12)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-indoc" ,rust-indoc-1)
+        ("rust-inventory" ,rust-inventory-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-memoffset" ,rust-memoffset-0.9)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
+        ("rust-num-complex" ,rust-num-complex-0.4)
+        ("rust-parking-lot" ,rust-parking-lot-0.12)
+        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.19)
+        ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.19)
+        ("rust-pyo3-macros" ,rust-pyo3-macros-0.19)
+        ("rust-rust-decimal" ,rust-rust-decimal-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-unindent" ,rust-unindent-0.1))
+       #:cargo-development-inputs
+       (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-proptest" ,rust-proptest-0.10)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rust-decimal" ,rust-rust-decimal-1)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-send-wrapper" ,rust-send-wrapper-0.6)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-widestring" ,rust-widestring-0.5))))
+    (inputs (list python))
+    (home-page "https://github.com/pyo3/pyo3")
+    (synopsis "Rust bindings for the Python interpreter")
+    (description
+     "This package provides Rust bindings for Python, including tools for
+creating native Python extension modules.  Running and interacting with
+Python code from a Rust binary is also supported.")
+    (license license:asl2.0)))
+
+(define-public rust-pyo3-0.18
+  (package
+    (inherit rust-pyo3-0.19)
+    (name "rust-pyo3")
+    (version "0.18.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyo3" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "02914yszvcg7qzh1kkrhiz8qqi0p9pbzi1cpmbyk9fii6xdsrcg3"))))
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=test_compile_errors")
+       #:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-eyre" ,rust-eyre-0.6)
+        ("rust-hashbrown" ,rust-hashbrown-0.12)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-indoc" ,rust-indoc-1)
+        ("rust-inventory" ,rust-inventory-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-memoffset" ,rust-memoffset-0.8)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
+        ("rust-num-complex" ,rust-num-complex-0.4)
+        ("rust-parking-lot" ,rust-parking-lot-0.12)
+        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.18)
+        ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.18)
+        ("rust-pyo3-macros" ,rust-pyo3-macros-0.18)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-unindent" ,rust-unindent-0.1))
+       #:cargo-development-inputs
+       (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-proptest" ,rust-proptest-0.10)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-send-wrapper" ,rust-send-wrapper-0.6)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ("rust-widestring" ,rust-widestring-0.5))))))
+
 (define-public rust-pyo3-0.16
   (package
+    (inherit rust-pyo3-0.19)
     (name "rust-pyo3")
     (version "0.16.5")
     (source
@@ -47135,7 +50754,6 @@ ecosystem.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1p5kjsj3jdw2gnahdjrzljmi93w3nxdp11qq8x3i80b0a3l04qqy"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-anyhow" ,rust-anyhow-1)
@@ -47167,15 +50785,7 @@ ecosystem.")
         ("rust-trybuild" ,rust-trybuild-1)
         ("rust-widestring" ,rust-widestring-0.5))
        ;; FIXME: fails to initialize Python interpreter.
-       #:tests? #f))
-    (inputs (list python))
-    (home-page "https://github.com/pyo3/pyo3")
-    (synopsis "Rust bindings for the Python interpreter")
-    (description
-     "This package provides Rust bindings for Python, including tools for
-creating native Python extension modules.  Running and interacting with
-Python code from a Rust binary is also supported.")
-    (license license:asl2.0)))
+       #:tests? #f))))
 
 (define-public rust-pyo3-macros-0.13
   (package
@@ -47282,6 +50892,61 @@ Python code from a Rust binary is also supported.")
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-trybuild" ,rust-trybuild-1))))))
 
+(define-public rust-pyproject-toml-0.6
+  (package
+    (name "rust-pyproject-toml")
+    (version "0.6.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "pyproject-toml" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0pywp6ml15jlv9yxfjcvrs3fgd3xnq8fc6a2wcbw9q9iknmgwygf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-indexmap" ,rust-indexmap-1)
+        ("rust-pep440-rs" ,rust-pep440-rs-0.3)
+        ("rust-pep508-rs" ,rust-pep508-rs-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-toml" ,rust-toml-0.7))))
+    (home-page "https://github.com/PyO3/pyproject-toml-rs.git")
+    (synopsis "pyproject.toml parser in Rust")
+    (description "This package provides a pyproject.toml parser in Rust.")
+    (license license:expat)))
+
+(define-public rust-python-pkginfo-0.5
+  (package
+    (name "rust-python-pkginfo")
+    (version "0.5.6")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "python-pkginfo" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "03hvc5h10vicfjql9dw46w0xcwq2gjm9sfbfmr13rglz1z68hfg2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bzip2" ,rust-bzip2-0.4)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-fs-err" ,rust-fs-err-2)
+        ("rust-mailparse" ,rust-mailparse-0.14)
+        ("rust-rfc2047-decoder" ,rust-rfc2047-decoder-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-tar" ,rust-tar-0.4)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-xz" ,rust-xz-0.1)
+        ("rust-zip" ,rust-zip-0.6))
+       #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/PyO3/python-pkginfo-rs")
+    (synopsis "Parse Python package metadata from sdist and bdists")
+    (description
+     "Parse Python package metadata from sdist and bdists and etc.")
+    (license license:expat)))
+
 (define-public rust-python3-dll-a-0.2
   (package
     (name "rust-python3-dll-a")
@@ -47351,85 +51016,6 @@ for MinGW-w64 and MSVC (cross-)compile targets.")
      "This package provides a collection of approximate quantile algorithms.")
     (license license:expat)))
 
-(define-public rust-quasi-0.32
-  (package
-    (name "rust-quasi")
-    (version "0.32.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "quasi" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1csqqgz3aw85q570ywmhb34r3sqgi1sprf8xadfwzlfnai45ri0q"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-clippy" ,rust-clippy-0.0)
-        ("rust-syntex-errors" ,rust-syntex-errors-0.58)
-        ("rust-syntex-syntax" ,rust-syntex-syntax-0.58))))
-    (home-page "https://github.com/serde-rs/quasi")
-    (synopsis "Quasi-quoting macro system")
-    (description
-     "This package provides a quasi-quoting macro system.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-quasi-codegen-0.32
-  (package
-    (name "rust-quasi-codegen")
-    (version "0.32.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "quasi_codegen" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1m3nwzn5ip8y86cyfk6hdnbhiinsk2faag7l0cc4q11wl9gy5fai"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-aster" ,rust-aster-0.41)
-        ("rust-clippy" ,rust-clippy-0.0)
-        ("rust-syntex" ,rust-syntex-0.58)
-        ("rust-syntex-errors" ,rust-syntex-errors-0.58)
-        ("rust-syntex-syntax" ,rust-syntex-syntax-0.58))))
-    (home-page "https://github.com/serde-rs/quasi")
-    (synopsis "Quasi-quoting macro system")
-    (description "This package provides a quasi-quoting macro system.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-quasi-macros-0.32
-  (package
-    (name "rust-quasi-macros")
-    (version "0.32.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "quasi_macros" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1p825s96wa9xcc01pm5f4nlb01nx0pah50qnwkbncrw1q9xwiki9"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-clippy" ,rust-clippy-0.0)
-        ("rust-quasi-codegen" ,rust-quasi-codegen-0.32))
-       #:cargo-development-inputs
-       (("rust-aster" ,rust-aster-0.41)
-        ("rust-quasi" ,rust-quasi-0.32))))
-    (home-page "https://github.com/serde-rs/quasi")
-    (synopsis "Quasi-quoting macro system")
-    (description "This package provides a quasi-quoting macro system.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-quick-error-2
   (package
     (name "rust-quick-error")
@@ -47464,8 +51050,42 @@ to write.")
          (base32
           "1q6za3v78hsspisc197bg3g7rpc989qycy8ypr8ap8igv10ikl51"))))))
 
+(define-public rust-quick-xml-0.27
+  (package
+    (name "rust-quick-xml")
+    (version "0.27.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "quick-xml" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hacs71afvppq6d7x6b8d4liv0rcqhsf9mrcyrb8lxnxazq57h7z"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-document-features" ,rust-document-features-0.2)
+        ("rust-encoding-rs" ,rust-encoding-rs-0.8)
+        ("rust-memchr" ,rust-memchr-2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-value" ,rust-serde-value-0.7)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-test" ,rust-tokio-test-0.4))))
+    (home-page "https://github.com/tafia/quick-xml")
+    (synopsis "High performance xml reader and writer")
+    (description
+     "This package provides a high performance XML reader and writer.")
+    (license license:expat)))
+
 (define-public rust-quick-xml-0.22
   (package
+    (inherit rust-quick-xml-0.27)
     (name "rust-quick-xml")
     (version "0.22.0")
     (source
@@ -47475,7 +51095,6 @@ to write.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0ssk30ymrd1724g36qjnnql225i6p31jm09cb46sval2hd6g2cw5"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -47485,12 +51104,7 @@ to write.")
        #:cargo-development-inputs
        (("rust-regex" ,rust-regex-1)
         ("rust-serde" ,rust-serde-1)
-        ("rust-serde-value" ,rust-serde-value-0.7))))
-    (home-page "https://github.com/tafia/quick-xml")
-    (synopsis "High performance XML reader and writer")
-    (description
-     "This package provides a high performance XML reader and writer.")
-    (license license:expat)))
+        ("rust-serde-value" ,rust-serde-value-0.7))))))
 
 (define-public rust-quick-xml-0.21
   (package
@@ -47954,14 +51568,14 @@ transport protocol in Rust.")
 (define-public rust-quote-1
   (package
     (name "rust-quote")
-    (version "1.0.25")
+    (version "1.0.29")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "quote" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "117y035vad1a67md2r9fk9663i5cvbax1ykc998f3hr9hwhfh22k"))))
+                "019ij5fwp56ydww6zr46dhmzsf078qkdq9vz6mw1cri7mgl1ac2p"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -48027,16 +51641,15 @@ transport protocol in Rust.")
 (define-public rust-quoted-printable-0.4
   (package
     (name "rust-quoted-printable")
-    (version "0.4.3")
+    (version "0.4.8")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "quoted_printable" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1ig9b5nr2i2f72smsjkkx8pwpxp9vz2090dhi7n4jdlj15mjaf0j"))))
+        (base32 "0jcyi10gh2xzjvxls8r58gwc9yavw3iighkgnb1jwrjij8hncf2s"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
     (home-page "https://github.com/staktrace/quoted-printable")
     (synopsis "Simple encoder/decoder for quoted-printable data")
     (description
@@ -48044,10 +51657,10 @@ transport protocol in Rust.")
 data.")
     (license license:bsd-0)))
 
-(define-public rust-r2d2
+(define-public rust-r2d2-0.8
   (package
     (name "rust-r2d2")
-    (version "0.8.9")
+    (version "0.8.10")
     (source
      (origin
        (method url-fetch)
@@ -48055,12 +51668,12 @@ data.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0vxjgh83bss63mkx308p16iwl33s80c781p422f3r5w0p315np2l"))))
+         "14qw32y4m564xb1f5ya8ii7dwqyknvk8bsx2r0lljlmn7zxqbpji"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-log" ,rust-log-0.4)
-        ("rust-parking-lot" ,rust-parking-lot-0.11)
+        ("rust-parking-lot" ,rust-parking-lot-0.12)
         ("rust-scheduled-thread-pool" ,rust-scheduled-thread-pool-0.2))))
     (home-page "https://github.com/sfackler/r2d2")
     (synopsis "Generic connection pool")
@@ -49083,8 +52696,43 @@ random generic types.")
     (license
      (list license:zlib license:asl2.0 license:expat))))
 
+(define-public rust-raw-cpuid-10
+  (package
+    (name "rust-raw-cpuid")
+    (version "10.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "raw-cpuid" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ckkg47m8wbdinqg4z4dx7ipi3d7fjxdnrwzikx70x46rdwpcabc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-clap" ,rust-clap-3)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-termimad" ,rust-termimad-0.20))
+       #:cargo-development-inputs
+       (("rust-core-affinity" ,rust-core-affinity-0.5)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-phf" ,rust-phf-0.11)
+        ("rust-rustversion" ,rust-rustversion-1))))
+    (home-page "https://github.com/gz/rust-cpuid")
+    (synopsis "Library to parse the x86 CPUID instruction, written in Rust")
+    (description
+     "This package provides a library to parse the x86 CPUID instruction,
+written in Rust with no external dependencies.  The implementation closely
+resembles the Intel CPUID manual description.  The library does only depend on
+libcore.")
+    (license license:expat)))
+
 (define-public rust-raw-cpuid-8
   (package
+    (inherit rust-raw-cpuid-10)
     (name "rust-raw-cpuid")
     (version "8.1.2")
     (source
@@ -49094,7 +52742,6 @@ random generic types.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0wry932lx7gqyxn7w54mg61b7hiwywyir754jhfxiws3pnfpvpqz"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
@@ -49105,15 +52752,7 @@ random generic types.")
        #:cargo-development-inputs
        (("rust-core-affinity" ,rust-core-affinity-0.5)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-rustversion" ,rust-rustversion-0.1))))
-    (home-page "https://github.com/gz/rust-cpuid")
-    (synopsis "Library to parse the x86 CPUID instruction, written in Rust")
-    (description
-     "This package provides a library to parse the x86 CPUID instruction,
-written in Rust with no external dependencies.  The implementation closely
-resembles the Intel CPUID manual description.  The library does only depend on
-libcore.")
-    (license license:expat)))
+        ("rust-rustversion" ,rust-rustversion-0.1))))))
 
 (define-public rust-rawpointer-0.2
   (package
@@ -49283,8 +52922,51 @@ Rust.")
     (description "This package provides core APIs for Rayon.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-rcgen-0.11
+  (package
+    (name "rust-rcgen")
+    (version "0.11.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rcgen" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0xl91nlp4ld00gl01pfv00a3agaip980wwc7r6184kfd1p0gnm29"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Don't use a vendored botan.
+                  (substitute* "Cargo.toml"
+                    ((".*vendored.*") ""))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-pem" ,rust-pem-2)
+        ("rust-ring" ,rust-ring-0.16)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-x509-parser" ,rust-x509-parser-0.15)
+        ("rust-yasna" ,rust-yasna-0.5)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-botan" ,rust-botan-0.10)
+        ("rust-openssl" ,rust-openssl-0.10)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rsa" ,rust-rsa-0.9)
+        ("rust-webpki" ,rust-webpki-0.22)
+        ("rust-x509-parser" ,rust-x509-parser-0.15))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list botan openssl perl))
+    (home-page "https://github.com/est31/rcgen")
+    (synopsis "Rust X.509 certificate generator")
+    (description "Rust X.509 certificate generator")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rcgen-0.8
   (package
+    (inherit rust-rcgen-0.11)
     (name "rust-rcgen")
     (version "0.8.14")
     (source (origin
@@ -49299,7 +52981,6 @@ Rust.")
                   ;; Don't use a vendored botan.
                   (substitute* "Cargo.toml"
                     ((".*vendored.*") ""))))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-chrono" ,rust-chrono-0.4)
@@ -49314,15 +52995,7 @@ Rust.")
         ("rust-rand" ,rust-rand-0.8)
         ("rust-rsa" ,rust-rsa-0.5)
         ("rust-webpki" ,rust-webpki-0.22)
-        ("rust-x509-parser" ,rust-x509-parser-0.12))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list botan openssl))
-    (home-page "https://github.com/est31/rcgen")
-    (synopsis "Rust X.509 certificate generator")
-    (description "Rust X.509 certificate generator")
-    (license (list license:expat license:asl2.0))))
+        ("rust-x509-parser" ,rust-x509-parser-0.12))))))
 
 (define-public rust-rctree-0.4
   (package
@@ -49557,7 +53230,7 @@ initial value.")
 (define-public rust-ref-cast-1
   (package
     (name "rust-ref-cast")
-    (version "1.0.2")
+    (version "1.0.18")
     (source
      (origin
        (method url-fetch)
@@ -49566,13 +53239,15 @@ initial value.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "08r6qz7228k55nlyl5v7ykdzxrasnawgzmb1jrbfbnkx2s3ifp3l"))))
+         "0sxzy3f0zmclsmi1z17n16xbjbp99d5c6nh7592yy6f3fya82h8n"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:tests? #f          ; Doesn't always interact well with the test crate.
+       #:cargo-inputs
        (("rust-ref-cast-impl" ,rust-ref-cast-impl-1))
        #:cargo-development-inputs
-       (("rust-rustversion" ,rust-rustversion-1)
+       (("rust-ref-cast-test-suite" ,rust-ref-cast-test-suite-0.0.0)
+        ("rust-rustversion" ,rust-rustversion-1)
         ("rust-trybuild" ,rust-trybuild-1))))
     (home-page "https://github.com/dtolnay/ref-cast")
     (synopsis "Safely cast &T to &U")
@@ -49609,7 +53284,7 @@ initial value.")
 (define-public rust-ref-cast-impl-1
   (package
     (name "rust-ref-cast-impl")
-    (version "1.0.2")
+    (version "1.0.18")
     (source
      (origin
        (method url-fetch)
@@ -49618,13 +53293,14 @@ initial value.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0i1i3an8si070aqg2mvz6yqc6y2pl9zhd6dd2piz17l7mdsv88bx"))))
+         "05kjg9g9akzb0yns255a5zvdkbwk0wa9kp1cf8k6h25nv7d57gv8"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
+        ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs (("rust-ref-cast" ,rust-ref-cast-1))))
     (home-page "https://github.com/dtolnay/ref-cast")
     (synopsis "Derive implementation for @code{ref_cast::RefCast}")
     (description
@@ -49646,6 +53322,24 @@ initial value.")
         (base32
          "0av43xxjlinfqklb67rpj217cmaxfjsf8151gs0hbs4hnr5664ck"))))))
 
+(define-public rust-ref-cast-test-suite-0.0.0
+  (package
+    (name "rust-ref-cast-test-suite")
+    (version "0.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ref-cast-test-suite" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0cx15bhs8zq99qidrhjmjhc5krlfclcaq0y5c68pq48vlds72idl"))))
+    (build-system cargo-build-system)
+    (arguments (list #:skip-build? #t))
+    (home-page "https://github.com/dtolnay/ref-cast")
+    (synopsis "Test suite of the ref-cast crate")
+    (description "Test suite of the ref-cast crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-refpool-0.4
   (package
     (name "rust-refpool")
@@ -49673,24 +53367,28 @@ memory to speed up reallocation.")
 (define-public rust-regex-1
   (package
     (name "rust-regex")
-    (version "1.7.1")
+    (version "1.9.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "regex" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0czp6hxg02lm02hvlhp9xjkd65cjcagw119crnaznwd5idsabaj8"))))
+        (base32 "0xdmrvs8fy7yw2bdk76mjbhzqibms7g4ljg468jwzxr0qa7ydsmj"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-aho-corasick" ,rust-aho-corasick-0.7)
+       (("rust-aho-corasick" ,rust-aho-corasick-1)
         ("rust-memchr" ,rust-memchr-2)
-        ("rust-regex-syntax" ,rust-regex-syntax-0.6))
+        ("rust-regex-automata" ,rust-regex-automata-0.3)
+        ("rust-regex-syntax" ,rust-regex-syntax-0.7))
        #:cargo-development-inputs
-       (("rust-lazy-static" ,rust-lazy-static-1)
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-env-logger" ,rust-env-logger-0.9)
+        ("rust-once-cell" ,rust-once-cell-1)
         ("rust-quickcheck" ,rust-quickcheck-1)
-        ("rust-rand" ,rust-rand-0.8))))
+        ("rust-regex-test" ,rust-regex-test-0.1))))
     (home-page "https://github.com/rust-lang/regex")
     (synopsis "Regular expressions for Rust")
     (description
@@ -49754,20 +53452,50 @@ uses finite automata and guarantees linear time matching on all inputs.")
         ("rust-quickcheck" ,rust-quickcheck-0.2)
         ("rust-rand" ,rust-rand-0.3))))))
 
+(define-public rust-regex-automata-0.3
+  (package
+    (name "rust-regex-automata")
+    (version "0.3.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "regex-automata" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "041kj8fnyh3hv8sqmqq1am6agb1ckjxj6swjfcp8qih7vl84qd9r"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f          ; Not all files included.
+       #:cargo-inputs
+       (("rust-aho-corasick" ,rust-aho-corasick-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-memchr" ,rust-memchr-2)
+        ("rust-regex-syntax" ,rust-regex-syntax-0.7))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-bstr" ,rust-bstr-1)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-env-logger" ,rust-env-logger-0.9)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-regex-test" ,rust-regex-test-0.1))))
+    (home-page "https://github.com/rust-lang/regex/tree/master/regex-automata")
+    (synopsis "Automata construction and matching using regular expressions")
+    (description
+     "Automata construction and matching using regular expressions.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-regex-automata-0.1
   (package
+    (inherit rust-regex-automata-0.3)
     (name "rust-regex-automata")
     (version "0.1.9")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "regex-automata" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1r3aqa9c0s9sfrmd2w0mli16ldjzbar0rzb1x7srfjkasrqys7df"))))
-    (build-system cargo-build-system)
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "regex-automata" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1r3aqa9c0s9sfrmd2w0mli16ldjzbar0rzb1x7srfjkasrqys7df"))))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -49781,16 +53509,30 @@ uses finite automata and guarantees linear time matching on all inputs.")
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-bytes" ,rust-serde-bytes-0.11)
         ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-toml" ,rust-toml-0.5)))) ; 0.4
-    (home-page "https://github.com/BurntSushi/regex-automata")
-    (synopsis
-     "Automata construction and matching using regular expressions")
-    (description
-     "Automata construction and matching using regular expressions.")
-    (license (list license:expat license:unlicense))))
+        ("rust-toml" ,rust-toml-0.5)))))) ; 0.4
+
+(define-public rust-regex-syntax-0.7
+  (package
+    (name "rust-regex-syntax")
+    (version "0.7.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "regex-syntax" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1qjczlc2w92kamn9ipjdr5pjql0jnccahpi9l3r6wp0rnsjr5sp5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1))))
+    (home-page "https://github.com/rust-lang/regex/tree/master/regex-syntax")
+    (synopsis "Regular expression parser")
+    (description "This package provides a regular expression parser.")
+    (license (list license:expat license:asl2.0))))
 
 (define-public rust-regex-syntax-0.6
   (package
+    (inherit rust-regex-syntax-0.7)
     (name "rust-regex-syntax")
     (version "0.6.27")
     (source
@@ -49800,12 +53542,7 @@ uses finite automata and guarantees linear time matching on all inputs.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0i32nnvyzzkvz1rqp2qyfxrp2170859z8ck37jd63c8irrrppy53"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/rust-lang/regex")
-    (synopsis "Regular expression parser")
-    (description
-     "This package provides a regular expression parser.")
-    (license (list license:expat license:asl2.0))))
+    (arguments '())))
 
 (define-public rust-regex-syntax-0.5
   (package
@@ -49863,6 +53600,31 @@ uses finite automata and guarantees linear time matching on all inputs.")
        (("rust-quickcheck" ,rust-quickcheck-0.2)
         ("rust-rand" ,rust-rand-0.3))))))
 
+(define-public rust-regex-test-0.1
+  (package
+    (name "rust-regex-test")
+    (version "0.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "regex-test" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "012nj2qjkxlv5zmnk53hc5a95kdsz8ss469s0a6fp5xdqbpi9f8l"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-bstr" ,rust-bstr-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-toml" ,rust-toml-0.7))))
+    (home-page "https://github.com/rust-lang/regex/tree/master/regex-test")
+    (synopsis "Infrastructure for testing regexes")
+    (description
+     "Infrastructure for testing regexes.  You probably don't want to use this
+crate unless you're working on a regex implementation.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-region-3
   (package
     (name "rust-region")
@@ -49933,8 +53695,48 @@ uses finite automata and guarantees linear time matching on all inputs.")
     (description "This package provides portable, relative paths for Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-remove-dir-all-0.8
+  (package
+    (name "rust-remove-dir-all")
+    (version "0.8.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "remove-dir-all" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ay0mi06ak1n5gw3yjgp0hvzl59nj31ahxpdqvczw5qrvkx5r293"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-aligned" ,rust-aligned-0.4)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-clap" ,rust-clap-4)
+        ("rust-cvt" ,rust-cvt-0.1)
+        ("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-fs-at" ,rust-fs-at-0.1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-normpath" ,rust-normpath-1)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-windows-sys" ,rust-windows-sys-0.45))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-test-log" ,rust-test-log-0.2))))
+    (home-page "https://github.com/XAMPPRocky/remove_dir_all.git")
+    (synopsis "Implementation of remove_dir_all for Windows")
+    (description
+     "This package provides a safe, reliable implementation of
+@code{remove_dir_all} for Windows")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-remove-dir-all-0.5
   (package
+    (inherit rust-remove-dir-all-0.8)
     (name "rust-remove-dir-all")
     (version "0.5.3")
     (source
@@ -49945,19 +53747,11 @@ uses finite automata and guarantees linear time matching on all inputs.")
         (sha256
          (base32
           "1rzqbsgkmr053bxxl04vmvsd1njyz0nxvly97aip6aa2cmb15k9s"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-winapi" ,rust-winapi-0.3))
        #:cargo-development-inputs
-       (("rust-doc-comment" ,rust-doc-comment-0.3))))
-    (home-page "https://github.com/XAMPPRocky/remove_dir_all")
-    (synopsis "Implementation of remove_dir_all for Windows")
-    (description
-     "This package provides a safe, reliable implementation of
-@code{remove_dir_all} for Windows")
-    (license (list license:asl2.0
-                   license:expat))))
+       (("rust-doc-comment" ,rust-doc-comment-0.3))))))
 
 (define-public rust-rend-0.3
   (package
@@ -50263,6 +54057,59 @@ Rust.")
 functionality as retain but gives mutable borrow to the predicate.")
     (license license:expat)))
 
+(define-public rust-rfc2047-decoder-0.2
+  (package
+    (name "rust-rfc2047-decoder")
+    (version "0.2.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rfc2047-decoder" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0bpc2k7dp3nxc3pnsvz6zd3vc58j8q29nzibn4q3wz49a974pz31"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-base64" ,rust-base64-0.21)
+        ("rust-charset" ,rust-charset-0.1)
+        ("rust-chumsky" ,rust-chumsky-0.9)
+        ("rust-memchr" ,rust-memchr-2)
+        ("rust-quoted-printable" ,rust-quoted-printable-0.4)
+        ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://github.com/soywod/rfc2047-decoder")
+    (synopsis "Rust library for decoding RFC 2047 MIME Message Headers")
+    (description "This package provides a rust library for decoding RFC 2047
+MIME Message Headers.")
+    (license license:expat)))
+
+(define-public rust-rfc6979-0.4
+  (package
+    (name "rust-rfc6979")
+    (version "0.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rfc6979" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1chw95jgcfrysyzsq6a10b1j5qb7bagkx8h0wda4lv25in02mpgq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-hmac" ,rust-hmac-0.12)
+        ("rust-subtle" ,rust-subtle-2))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-sha2" ,rust-sha2-0.10))))
+    (home-page "https://github.com/RustCrypto/signatures/tree/master/rfc6979")
+    (synopsis "Pure Rust implementation of RFC6979")
+    (description
+     "This package provides a pure Rust implementation of RFC6979: Deterministic
+Usage of the @dfn{Digital Signature Algorithm} (DSA) and @dfn{Elliptic Curve
+Digital Signature Algorithm} (ECDSA).")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-ring-0.16
   (package
     (name "rust-ring")
@@ -50274,18 +54121,24 @@ functionality as retain but gives mutable borrow to the predicate.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1z682xp7v38ayq9g9nkbhhfpj6ygralmlx7wdmsfv8rnw99cylrh"))
+       (patches (search-patches "rust-ring-0.16-missing-files.patch"
+                                "rust-ring-0.16-test-files.patch"))
        (modules '((guix build utils)))
        (snippet
         '(begin
            (delete-file-recursively "pregenerated")
+           ;; Regenerating the curve25519_tables requires python2 and clang-format.
+           ;; Luckily we've added the script back in the patch.
+           ;; Rust doesn't provide a clear way to regenerate files located in
+           ;; source directories, so for now we don't remove the file here.
+           ;(delete-file "crypto/curve25519/curve25519_tables.h")
            ;; Pretend this isn't a relase tarball.
            (with-output-to-file ".git"
              (lambda _
                 (format #t "")))))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #false                  ;missing file
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
         ("rust-once-cell" ,rust-once-cell-1)
         ("rust-spin" ,rust-spin-0.5)
@@ -50296,9 +54149,17 @@ functionality as retain but gives mutable borrow to the predicate.")
         ("rust-cc" ,rust-cc-1))
        #:cargo-development-inputs
        (("rust-libc" ,rust-libc-0.2)
-        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'generate-curve25519-tables
+           (lambda _
+             (with-directory-excursion "crypto/curve25519"
+               (with-output-to-file "curve25519_tables.h"
+                 (lambda _
+                   (invoke "python" "make_curve25519_tables.py")))))))))
     (native-inputs
-     (list perl))
+     (list clang perl python-2))
     (home-page "https://github.com/briansmith/ring")
     (synopsis "Safe, fast, small crypto using Rust")
     (description "This package provided safe, fast, small crypto using Rust.")
@@ -50397,6 +54258,29 @@ functionality as retain but gives mutable borrow to the predicate.")
                  (lambda _
                    (invoke "python" "make_curve25519_tables.py")))))))))))
 
+(define-public rust-ripemd-0.1
+  (package
+    (name "rust-ripemd")
+    (version "0.1.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ripemd" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "17xh5yl9wjjj2v18rh3m8ajlmdjg1yj13l6r9rj3mnbss4i444mx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-digest" ,rust-digest-0.10))
+       #:cargo-development-inputs
+       (("rust-digest" ,rust-digest-0.10)
+        ("rust-hex-literal" ,rust-hex-literal-0.2))))
+    (home-page "https://github.com/RustCrypto/hashes")
+    (synopsis "Pure Rust implementation of the RIPEMD hash functions")
+    (description "Pure Rust implementation of the RIPEMD hash functions")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-riscv-0.7
   (package
     (name "rust-riscv")
@@ -50564,6 +54448,30 @@ MessagePack format.")
     (description "This crate provides Serde bindings for RMP.")
     (license license:expat)))
 
+(define-public rust-roadmap-0.5
+  (package
+    (name "rust-roadmap")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "roadmap" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0d0j88wn59sfxwh2k4f609w56n6bmcgf54m0jk9rwc3vci5f8ad1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-yaml" ,rust-serde-yaml-0.8)
+        ("rust-textwrap" ,rust-textwrap-0.15)
+        ("rust-thiserror" ,rust-thiserror-1))))
+    (home-page "https://gitlab.com/larswirzenius/roadmap")
+    (synopsis "Model a project roadmap as a directed acyclic graph")
+    (description "Model a project roadmap as a directed acyclic graph.")
+    (license license:expat-0)))
+
 (define-public rust-rocket-0.4
   (package
     (name "rust-rocket")
@@ -50662,6 +54570,27 @@ and speed.")
 responses, and headers for the Rocket web framework.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-roff-0.2
+  (package
+    (name "rust-roff")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "roff" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "05j324x84xkgp848smhnknnlpl70833xb9lalqg4n2ga6k8dhcxq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-duct" ,rust-duct-0.13)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1))))
+    (home-page "https://github.com/rust-cli/roff-rs")
+    (synopsis "ROFF (man page format) generation library")
+    (description "ROFF (man page format) generation library.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-romio-0.3
   (package
     (name "rust-romio")
@@ -50847,8 +54776,57 @@ can handle huge texts and memory-incoherent edits with ease.")
      "This package provides a library for generic lossless syntax trees.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rsa-0.9
+  (package
+    (name "rust-rsa")
+    (version "0.9.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rsa" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1a762gzj9xl14n8gmclsz8kcwp958nd1k05nnhqsdh93gns3pd3a"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-const-oid" ,rust-const-oid-0.9)
+        ("rust-digest" ,rust-digest-0.10)
+        ("rust-num-bigint-dig" ,rust-num-bigint-dig-0.8)
+        ("rust-num-integer" ,rust-num-integer-0.1)
+        ("rust-num-iter" ,rust-num-iter-0.1)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-pkcs1" ,rust-pkcs1-0.7)
+        ("rust-pkcs8" ,rust-pkcs8-0.10)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-sha1" ,rust-sha1-0.10)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-signature" ,rust-signature-2)
+        ("rust-spki" ,rust-spki-0.7)
+        ("rust-subtle" ,rust-subtle-2)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-base64ct" ,rust-base64ct-1)
+        ("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rand-chacha" ,rust-rand-chacha-0.3)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)
+        ("rust-serde-test" ,rust-serde-test-1)
+        ("rust-sha1" ,rust-sha1-0.10)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-sha3" ,rust-sha3-0.10))))
+    (home-page "https://github.com/RustCrypto/RSA")
+    (synopsis "Pure Rust RSA implementation")
+    (description "This package provides a pure Rust RSA implementation.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rsa-0.5
   (package
+    (inherit rust-rsa-0.9)
     (name "rust-rsa")
     (version "0.5.0")
     (source
@@ -50858,7 +54836,6 @@ can handle huge texts and memory-incoherent edits with ease.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "039676a4mj0875phdi7vc0bd37hv84dh0dql6fmk8dl2w81jcp70"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-byteorder" ,rust-byteorder-1)
@@ -50889,11 +54866,7 @@ can handle huge texts and memory-incoherent edits with ease.")
            (lambda _
              (substitute*
                  "Cargo.toml"
-               (("version = \">=1, <1.5\"") "version = \"^1\"")))))))
-    (home-page "https://github.com/RustCrypto/RSA")
-    (synopsis "Pure Rust RSA implementation")
-    (description "This package provides a pure Rust RSA implementation.")
-    (license (list license:expat license:asl2.0))))
+               (("version = \">=1, <1.5\"") "version = \"^1\"")))))))))
 
 (define-public rust-rspec-1
   (package
@@ -51173,28 +55146,64 @@ scenario you want to test.")
 floating-point, and complex numbers based on GMP, MPFR and MPC.")
     (license license:lgpl3+)))
 
+(define-public rust-rpassword-7
+  (package
+    (name "rust-rpassword")
+    (version "7.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rpassword" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "08l3jbjwpsj6awm4lacm2bcj3cn9jhy4j6q21n68k49lmdiwyy36"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-rtoolbox" ,rust-rtoolbox-0.0.1)
+        ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/conradkleinespel/rpassword")
+    (synopsis "Read passwords in Rust console applications")
+    (description "This package provides a crate for reading passwords in
+console applications.")
+    (license license:asl2.0)))
+
+(define-public rust-rpassword-6
+  (package
+    (inherit rust-rpassword-7)
+    (name "rust-rpassword")
+    (version "6.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rpassword" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0mnrpxvai78mn9wqkqx8wp1gd280jjhn29ixd1dm84l6i2hrkw1b"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-winapi" ,rust-winapi-0.3))))))
+
 (define-public rust-rpassword-5
   (package
+    (inherit rust-rpassword-6)
     (name "rust-rpassword")
-    (version "5.0.0")
+    (version "5.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rpassword" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1j96nc3dmqhxwb4ql50r5xjs0imwr2x6mrj02mj9i7grq1zj6mfp"))))
-    (build-system cargo-build-system)
+        (base32 "1yry1kmgjcb4qd5wak91203493x42ak3dz9hy1c0r9kyib7kdjgz"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
-        ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/conradkleinespel/rpassword")
-    (synopsis "Read passwords in Rust console applications")
-    (description "This package provides a crate for reading passwords in
-console applications.")
-  (license license:asl2.0)))
+        ("rust-winapi" ,rust-winapi-0.3))))))
 
 (define-public rust-rpassword-4
   (package
@@ -51314,8 +55323,49 @@ please consider using @code{async-std} or @code{tokio}.")
     (description "This package provides traits to implement custom Runtimes.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-rusqlite-0.29
+  (package
+    (name "rust-rusqlite")
+    (version "0.29.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rusqlite" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1wj12rmwa8g0bfhsk307fl84k0xcw8ji872xx3k447apdl1rv6sl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-2)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-csv" ,rust-csv-1)
+        ("rust-fallible-iterator" ,rust-fallible-iterator-0.2)
+        ("rust-fallible-streaming-iterator" ,rust-fallible-streaming-iterator-0.1)
+        ("rust-hashlink" ,rust-hashlink-0.8)
+        ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.26)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-smallvec" ,rust-smallvec-1)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-url" ,rust-url-2)
+        ("rust-uuid" ,rust-uuid-1))
+       #:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher-0.1)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-unicase" ,rust-unicase-2)
+        ("rust-uuid" ,rust-uuid-1))))
+    (inputs (list sqlite))
+    (home-page "https://github.com/rusqlite/rusqlite")
+    (synopsis "Wrapper for SQLite")
+    (description "This crate provides a wrapper for SQLite.")
+    (license license:expat)))
+
 (define-public rust-rusqlite-0.26
   (package
+    (inherit rust-rusqlite-0.29)
     (name "rust-rusqlite")
     (version "0.26.1")
     (source
@@ -51325,7 +55375,6 @@ please consider using @code{async-std} or @code{tokio}.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "19sh4nnw1i7a6wacqllz20qpqpdj96jsg3dzaq61cwmd3ywv10la"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -51344,11 +55393,7 @@ please consider using @code{async-std} or @code{tokio}.")
         ("rust-smallvec" ,rust-smallvec-1)
         ("rust-time" ,rust-time-0.3)
         ("rust-url" ,rust-url-2)
-        ("rust-uuid" ,rust-uuid-0.8))))
-    (home-page "https://github.com/rusqlite/rusqlite")
-    (synopsis "Wrapper for SQLite")
-    (description "This crate provides a wrapper for SQLite.")
-    (license license:expat)))
+        ("rust-uuid" ,rust-uuid-0.8))))))
 
 (define-public rust-rust-htslib-0.38
   (package
@@ -51479,7 +55524,7 @@ hashing function.")
 (define-public rust-rust-decimal-1
   (package
     (name "rust-rust-decimal")
-    (version "1.14.3")
+    (version "1.17.0")
     (source
       (origin
         (method url-fetch)
@@ -51488,7 +55533,7 @@ hashing function.")
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "10k58hf367626d4akl7ifyk5qwqphfs5x6z1yay22pkyc6w7q4h1"))))
+          "1s3k05vpq9ba8mj1wx1fj52kdbq1n8y88zvkrbf0wh0zdbwpadrm"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f          ; not all test files included.
@@ -51506,6 +55551,7 @@ hashing function.")
        #:cargo-development-inputs
        (("rust-bincode" ,rust-bincode-1)
         ("rust-bytes" ,rust-bytes-1)
+        ("rust-criterion" ,rust-criterion-0.3)
         ("rust-csv" ,rust-csv-1)
         ("rust-futures" ,rust-futures-0.3)
         ("rust-serde-derive" ,rust-serde-derive-1)
@@ -51518,27 +55564,6 @@ hashing function.")
 suitable for financial calculations.")
     (license license:expat)))
 
-(define-public rust-rust-decimal-0.10
-  (package
-    (inherit rust-rust-decimal-1)
-    (name "rust-rust-decimal")
-    (version "0.10.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rust_decimal" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1h80xz88f07ifb4i0mfh9j9p67afiy4xm6xswkk9gnf1spirag59"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-byteorder" ,rust-byteorder-1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-num" ,rust-num-0.2)
-        ("rust-postgres" ,rust-postgres-0.15)
-        ("rust-serde" ,rust-serde-1))))))
-
 (define-public rust-rust-embed-5
   (package
     (name "rust-rust-embed")
@@ -51643,6 +55668,23 @@ the file-system during development.")
      "This package provides a library for parsing @file{.eml} files.")
     (license license:asl2.0)))
 
+(define-public rust-equivalent-1
+  (package
+    (name "rust-equivalent")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "equivalent" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1malmx5f4lkfvqasz319lq6gb3ddg19yzf9s8cykfsgzdmyq0hsl"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/cuviper/equivalent")
+    (synopsis "Traits for key comparison in maps")
+    (description "Traits for key comparison in maps.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-rust-hawktracer-0.7
   (package
     (name "rust-rust-hawktracer")
@@ -51813,57 +55855,6 @@ the file-system during development.")
 library.")
     (license license:expat)))
 
-(define-public rust-rustc-ap-graphviz-654
-  (package
-    (name "rust-rustc-ap-graphviz")
-    (version "654.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rustc-ap-graphviz" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1z8rs3k9zcd1i2clrnzgvfaq1q05m02wjcyy3d9zk9qln03vp43l"))))
-    (build-system cargo-build-system)
-    (home-page "https://github.com/alexcrichton/rustc-auto-publish")
-    (synopsis
-     "Automatically published versions of the graphviz crate used in rustc")
-    (description
-     "Use the graphviz library used in the Rust compiler with this crate.
-It is automatically published using the compiler repository at
-@url{https://www.github.com/rust-lang/rust}")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-rustc-ap-rustc-index-654
-  (package
-    (name "rust-rustc-ap-rustc-index")
-    (version "654.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rustc-ap-rustc_index" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0qqnvdn3zbwrn884ziw0nrmi1wqmr9yp8js7whw6y8nzdhz0q8ij"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-rustc-ap-serialize" ,rust-rustc-ap-serialize-654)
-        ("rust-smallvec" ,rust-smallvec-1))))
-    (home-page  "https://github.com/alexcrichton/rustc-auto-publish")
-    (synopsis
-     "Automatically published version of the types of indexes in rustc")
-    (description
-     "Use the types of index used in the Rust compiler with this crate.
-It is automatically published using the compiler repository at
-@url{https://www.github.com/rust-lang/rust}")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-rustc-ap-rustc-lexer-725
   (package
     (name "rust-rustc-ap-rustc-lexer")
@@ -51892,34 +55883,6 @@ It is automatically published using the compiler repository at
 @url{https://www.github.com/rust-lang/rust}.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-rustc-ap-serialize-654
-  (package
-    (name "rust-rustc-ap-serialize")
-    (version "654.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rustc-ap-serialize" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1vwfa3q4f9k0nfryr53jnwmf8vhaq7ijbgw8449nx467dr98yvkm"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-indexmap" ,rust-indexmap-1)
-        ("rust-smallvec" ,rust-smallvec-1))))
-    (home-page "https://github.com/alexcrichton/rustc-auto-publish")
-    (synopsis
-     "Automatically published versions of the serialize crate used in rustc")
-    (description
-     "Use the serialize library used in the Rust compiler with this crate.
-It is automatically published using the compiler repository at
-@url{https://www.github.com/rust-lang/rust}")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-rustc-demangle-0.1
   (package
     (name "rust-rustc-demangle")
@@ -51985,30 +55948,27 @@ It is automatically published using the compiler repository at
 hex conversion traits.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-rustc-rayon-0.4
+(define-public rust-rustc-rayon-0.5
   (package
     (name "rust-rustc-rayon")
-    (version "0.4.0")
+    (version "0.5.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "rustc-rayon" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0ykjr1i56jmi8ykkcr7x555wnxki1vsi703mz6n2x7k0naqg0y8s"))))
+                "040p2am25g3isnpsixrcrjrv70yz2lzkbq8gpv76xjipi3fam0gb"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f                      ;XXX can not find rayon?
-       #:cargo-inputs
-       (("rust-autocfg" ,rust-autocfg-1)
-        ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7)
-        ("rust-either" ,rust-either-1)
-        ("rust-rustc-rayon-core" ,rust-rustc-rayon-core-0.4))
+     `(#:cargo-inputs
+       (("rust-either" ,rust-either-1)
+        ("rust-rustc-rayon-core" ,rust-rustc-rayon-core-0.5))
        #:cargo-development-inputs
-       (("rust-docopt" ,rust-docopt-1))))
+       (("rust-rand" ,rust-rand-0.8)
+        ("rust-rand-xorshift" ,rust-rand-xorshift-0.3))))
     (home-page "https://github.com/rust-lang/rustc-rayon")
-    (synopsis
-     "Simple work-stealing parallelism for Rust - fork for rustc")
+    (synopsis "Simple work-stealing parallelism for Rust - fork for rustc")
     (description
      "Rustc-rayon is a fork of the Rayon crate.  It adds a few \"in progress\"
 features that rustc is using, mostly around deadlock detection.  These features
@@ -52017,25 +55977,51 @@ way into rayon proper at some point.  In general, if you are not rustc, you
 should be using the real rayon crate, not rustc-rayon.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-rustc-rayon-core-0.4
+(define-public rust-rustc-rayon-0.4
+  (package
+    (inherit rust-rustc-rayon-0.5)
+    (name "rust-rustc-rayon")
+    (version "0.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rustc-rayon" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ykjr1i56jmi8ykkcr7x555wnxki1vsi703mz6n2x7k0naqg0y8s"))))
+    (arguments
+     `(#:tests? #f                      ;XXX can not find rayon?
+       #:cargo-inputs
+       (("rust-autocfg" ,rust-autocfg-1)
+        ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7)
+        ("rust-either" ,rust-either-1)
+        ("rust-rustc-rayon-core" ,rust-rustc-rayon-core-0.4))
+       #:cargo-development-inputs
+       (("rust-docopt" ,rust-docopt-1))))))
+
+(define-public rust-rustc-rayon-core-0.5
   (package
     (name "rust-rustc-rayon-core")
-    (version "0.4.1")
+    (version "0.5.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "rustc-rayon-core" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0c4cf58056ya3282c24bnyq39cwm1rd1m96lymfbb6yvl12929h2"))))
+                "0zqbr87x58j2g9rgm2lc0254b6yqabb41jvddw99qd8fy2m8srk7"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f   ;XXX cannot find rayon_core?
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
         ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8)
         ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
-        ("rust-num-cpus" ,rust-num-cpus-1))))
+        ("rust-num-cpus" ,rust-num-cpus-1))
+       #:cargo-development-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)
+        ("rust-scoped-tls" ,rust-scoped-tls-1))))
     (home-page "https://github.com/rust-lang/rustc-rayon")
     (synopsis "Core APIs for Rayon - fork for rustc")
     (description
@@ -52045,33 +56031,25 @@ Rayon-core represents the \"core, stable\" APIs of Rayon: join, scope, and so
 forth, as well as the ability to create custom thread-pools with ThreadPool.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-rustc-rayon-core-0.3
+(define-public rust-rustc-rayon-core-0.4
   (package
-    (inherit rust-rustc-rayon-core-0.4)
+    (inherit rust-rustc-rayon-core-0.5)
     (name "rust-rustc-rayon-core")
-    (version "0.3.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "rustc-rayon-core" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1cwc50mcclzfmhmi87953fjk6cc9ppmchn9mlwzfllq03y1jf97a"))))
+    (version "0.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rustc-rayon-core" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0c4cf58056ya3282c24bnyq39cwm1rd1m96lymfbb6yvl12929h2"))))
     (arguments
-     `(#:tests? #f
+     `(#:tests? #f   ;XXX cannot find rayon_core?
        #:cargo-inputs
-       (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7)
-        ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.1)
-        ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-num-cpus" ,rust-num-cpus-1))
-       #:cargo-development-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-rand" ,rust-rand-0.6)
-        ("rust-rand-xorshift" ,rust-rand-xorshift-0.1)
-        ("rust-scoped-tls" ,rust-scoped-tls-1))))))
+       (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
+        ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8)
+        ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+        ("rust-num-cpus" ,rust-num-cpus-1))))))
 
 (define-public rust-rustc-serialize-0.3
   (package
@@ -52376,41 +56354,42 @@ rustc compiler.")
         `(("rust-failure" ,rust-failure-0.1)
           ,@(alist-delete "rust-anyhow" cargo-inputs)))))))
 
-(define-public rust-rustix-0.36
+(define-public rust-rustix-0.37
   (package
     (name "rust-rustix")
-    (version "0.36.4")
+    (version "0.37.19")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "rustix" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "08vwnvf76nkgb2bbxf8cn51c43x6sc9k462khrwbb2z0g19fi4yb"))))
+                "0gb12rp992bh2h5msqcbpdsx6h1gslsb0zpp5hdnyxj2hnfp5y5c"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-development-inputs
-       (("rust-criterion" ,rust-criterion-0.4)
-        ("rust-ctor" ,rust-ctor-0.1)
-        ("rust-errno" ,rust-errno-0.2)
-        ("rust-flate2" ,rust-flate2-1)
-        ("rust-io-lifetimes" ,rust-io-lifetimes-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-memoffset" ,rust-memoffset-0.7)
-        ("rust-serial-test" ,rust-serial-test-0.6))
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-cc" ,rust-cc-1)
         ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
-        ("rust-errno" ,rust-errno-0.2)
+        ("rust-errno" ,rust-errno-0.3)
         ("rust-io-lifetimes" ,rust-io-lifetimes-1)
         ("rust-itoa" ,rust-itoa-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-linux-raw-sys" ,rust-linux-raw-sys-0.1)
+        ("rust-linux-raw-sys" ,rust-linux-raw-sys-0.3)
         ("rust-once-cell" ,rust-once-cell-1)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
         ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
-        ("rust-windows-sys" ,rust-windows-sys-0.42))))
+        ("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-ctor" ,rust-ctor-0.2)
+        ("rust-errno" ,rust-errno-0.3)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-io-lifetimes" ,rust-io-lifetimes-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-memoffset" ,rust-memoffset-0.8)
+        ("rust-serial-test" ,rust-serial-test-0.6)
+        ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/bytecodealliance/rustix")
     (synopsis "Safe Rust bindings to POSIX syscalls")
     (description
@@ -52418,6 +56397,43 @@ rustc compiler.")
     ;; Apache 2.0, Apache 2.0 with LLVM exception, or Expat.
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-rustix-0.36
+  (package
+    (inherit rust-rustix-0.37)
+    (name "rust-rustix")
+    (version "0.36.13")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rustix" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0n6ng6kdcz65ax5s17xavkjqs5a6gwcp9acc9r8blfp91d9gjf1s"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-cc" ,rust-cc-1)
+        ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-errno" ,rust-errno-0.3)
+        ("rust-io-lifetimes" ,rust-io-lifetimes-1)
+        ("rust-itoa" ,rust-itoa-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-linux-raw-sys" ,rust-linux-raw-sys-0.1)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+        ("rust-windows-sys" ,rust-windows-sys-0.45))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-ctor" ,rust-ctor-0.1)
+        ("rust-errno" ,rust-errno-0.3)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-io-lifetimes" ,rust-io-lifetimes-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-memoffset" ,rust-memoffset-0.7)
+        ("rust-serial-test" ,rust-serial-test-0.6)
+        ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-rustix-0.35
   (package
     (inherit rust-rustix-0.36)
@@ -52456,19 +56472,51 @@ rustc compiler.")
              ("rust-serial-test" ,rust-serial-test-0.6)
              ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-rustls-0.21
+  (package
+    (name "rust-rustls")
+    (version "0.21.6")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rustls" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1fvc3n5h6354yi2yxrvq7yfdak0y6jga5sbcbhzv7h7wzkgys7qx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f          ; Not all files included.
+       #:cargo-inputs
+       (("rust-log" ,rust-log-0.4)
+        ("rust-ring" ,rust-ring-0.16)
+        ("rust-rustls-webpki" ,rust-rustls-webpki-0.101)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-sct" ,rust-sct-0.7))
+       #:cargo-development-inputs
+       (("rust-base64" ,rust-base64-0.21)
+        ("rust-bencher" ,rust-bencher-0.1)
+        ("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
+        ("rust-webpki-roots" ,rust-webpki-roots-0.25))))
+    (native-inputs (list perl))
+    (home-page "https://github.com/rustls/rustls")
+    (synopsis "Modern TLS library written in Rust")
+    (description
+     "This package provides a modern TLS library written in Rust.")
+    (license (list license:asl2.0 license:isc license:expat))))
+
 (define-public rust-rustls-0.20
   (package
+    (inherit rust-rustls-0.21)
     (name "rust-rustls")
     (version "0.20.8")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rustls" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0bqfymq5bjs1jxg1iw2nn4ab3kzz2lrk8a1vx3s98lhp9p3qzxzz"))))
-    (build-system cargo-build-system)
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rustls" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "0bqfymq5bjs1jxg1iw2nn4ab3kzz2lrk8a1vx3s98lhp9p3qzxzz"))))
     (arguments
      `(#:tests? #f          ; Not all files included.
        #:cargo-inputs
@@ -52483,14 +56531,7 @@ rustc compiler.")
         ("rust-env-logger" ,rust-env-logger-0.9)
         ("rust-log" ,rust-log-0.4)
         ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
-        ("rust-webpki-roots" ,rust-webpki-roots-0.22))))
-    (native-inputs (list perl))
-    (home-page "https://github.com/rustls/rustls")
-    (synopsis "Modern TLS library written in Rust")
-    (description
-     "This package provides a modern TLS library written in Rust.")
-    (license
-     (list license:asl2.0 license:isc license:expat))))
+        ("rust-webpki-roots" ,rust-webpki-roots-0.22))))))
 
 (define-public rust-rustls-0.19
   (package
@@ -52649,39 +56690,6 @@ rustc compiler.")
         ("rust-untrusted" ,rust-untrusted-0.6)
         ("rust-webpki" ,rust-webpki-0.18))))))
 
-(define-public rust-rustls-0.12
-  (package
-    (inherit rust-rustls-0.16)
-    (name "rust-rustls")
-    (version "0.12.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rustls" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1k8b8cc0pjkv5cxdgs43jif7nslzsxair9b2sifgvjag7a4f8wmb"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f ;; 1/45 tests fails due to some missing file
-       #:cargo-inputs
-       (("rust-base64" ,rust-base64-0.9)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-ring" ,rust-ring-0.13)
-        ("rust-sct" ,rust-sct-0.3)
-        ("rust-untrusted" ,rust-untrusted-0.6)
-        ("rust-webpki" ,rust-webpki-0.18))
-       #:cargo-development-inputs
-       (("rust-ct-logs" ,rust-ct-logs-0.3)
-        ("rust-docopt" ,rust-docopt-0.8)
-        ("rust-env-logger" ,rust-env-logger-0.4)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-mio" ,rust-mio-0.6)
-        ("rust-regex" ,rust-regex-0.2)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-derive" ,rust-serde-derive-1)
-        ("rust-webpki-roots" ,rust-webpki-roots-0.14))))))
-
 (define-public rust-rustls-ffi-0.8
   (package
     (name "rust-rustls-ffi")
@@ -52796,14 +56804,14 @@ native certificate store.")
 (define-public rust-rustls-pemfile-1
   (package
     (name "rust-rustls-pemfile")
-    (version "1.0.2")
+    (version "1.0.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rustls-pemfile" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16x5jhja8z0j5hcrlaqqz5qnyg9qgv8qqffwbdil6fl0b1nvb56i"))))
+        (base32 "1cplx6hgkr32nq31p3613b2sj7csrrq3zp6znx9vc1qx9c4qff9d"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -52834,6 +56842,56 @@ PEM-encodings commonly used to store keys and certificates at rest.")
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3))))))
 
+(define-public rust-rustls-webpki-0.101
+  (package
+    (name "rust-rustls-webpki")
+    (version "0.101.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rustls-webpki" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ngs6y42k47jr14kka9w92hwyjsq3gm0j45nf8gsg05dfgyj4dsi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Not all files included.
+       #:cargo-inputs
+       (("rust-ring" ,rust-ring-0.16)
+        ("rust-untrusted" ,rust-untrusted-0.7))
+       #:cargo-development-inputs
+       (("rust-base64" ,rust-base64-0.21)
+        ("rust-bencher" ,rust-bencher-0.1)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-rcgen" ,rust-rcgen-0.11)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (native-inputs
+     (list perl))
+    (home-page "https://github.com/rustls/webpki")
+    (synopsis "Web PKI X.509 Certificate Verification")
+    (description "Web PKI X.509 Certificate Verification.")
+    (license license:isc)))
+
+(define-public rust-rustls-webpki-0.100
+  (package
+    (inherit rust-rustls-webpki-0.101)
+    (name "rust-rustls-webpki")
+    (version "0.100.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "rustls-webpki" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0sxlgpcczd1wihmnbgv5qz00jim32dap5wzq2rwcm39xxpapq86n"))))
+    (arguments
+     `(#:tests? #f      ; Not all files included.
+       #:cargo-inputs
+       (("rust-ring" ,rust-ring-0.16)
+        ("rust-untrusted" ,rust-untrusted-0.7))
+       #:cargo-development-inputs (("rust-base64" ,rust-base64-0.13))))))
+
 (define-public rust-rusttype-0.9
   (package
     (name "rust-rusttype")
@@ -52923,7 +56981,7 @@ font rendering.")
 (define-public rust-rustversion-1
   (package
     (name "rust-rustversion")
-    (version "1.0.9")
+    (version "1.0.13")
     (source
      (origin
        (method url-fetch)
@@ -52932,7 +56990,7 @@ font rendering.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1a6nlrrnfbacn5pzg3m3311anhngcxs8kbvsbynh71ngni47wiwp"))))
+         "0pxx0mxigrvzsbpkw54wjyx4jfm85bcss60dcpwk2b53c6dvscfw"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
@@ -53151,36 +57209,6 @@ sub-processes using a fork-like interface.")
         ("rust-rustyline-derive" ,rust-rustyline-derive-0.3)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
-(define-public rust-rustyline-5
-  (package
-    (inherit rust-rustyline-6)
-    (name "rust-rustyline")
-    (version "5.0.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rustyline" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0dd6hwm3rqj8d17gf38ffs1lh3b8dqw45j5kxnvazmm80abv2g52"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-0.1)
-        ("rust-dirs" ,rust-dirs-2)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-memchr" ,rust-memchr-2)
-        ("rust-nix" ,rust-nix-0.14)
-        ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
-        ("rust-unicode-width" ,rust-unicode-width-0.1)
-        ("rust-utf8parse" ,rust-utf8parse-0.1)
-        ("rust-winapi" ,rust-winapi-0.3))
-       #:cargo-development-inputs
-       (("rust-assert-matches" ,rust-assert-matches-1)
-        ("rust-env-logger" ,rust-env-logger-0.7)
-        ("rust-rustyline-derive" ,rust-rustyline-derive-0.2)
-        ("rust-tempdir" ,rust-tempdir-0.3))))))
-
 (define-public rust-rustyline-derive-0.3
   (package
     (name "rust-rustyline-derive")
@@ -53204,32 +57232,17 @@ sub-processes using a fork-like interface.")
     (description "This package provides Rustyline macros implementation in Rust.")
     (license license:expat)))
 
-(define-public rust-rustyline-derive-0.2
-  (package
-    (inherit rust-rustyline-derive-0.3)
-    (name "rust-rustyline-derive")
-    (version "0.2.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "rustyline-derive" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1n3iw9kaq70dw1rvvma0gjwydbj0f2mvvqvrva69f5cl6yv1dnd0"))))))
-
 (define-public rust-rkyv-0.7
   (package
     (name "rust-rkyv")
-    (version "0.7.40")
+    (version "0.7.42")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "rkyv" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1hsd81bkm1rvh3kl66fhnadji4h88w2pgf0yrp4cnqdav52is3y3"))))
+                "0n2wzwnghkr2ny16c08f5szbkljfqrp3s8fnnb096f011ciwh002"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -53275,14 +57288,14 @@ sub-processes using a fork-like interface.")
 (define-public rust-rkyv-derive-0.7
   (package
     (name "rust-rkyv-derive")
-    (version "0.7.39")
+    (version "0.7.42")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "rkyv_derive" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1i1lmir3lm8zj8k1an7j2rchv1admqhysh6r6bfkcgmmi3fdmbkf"))))
+                "07alynj16yqlyprlwqd8av157rrywvid2dm7swbhl8swbf8npq5j"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
@@ -53414,8 +57427,33 @@ quickly convert floating point numbers to decimal strings.")
      "This package provides a procedural macros for the salsa crate.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-salsa20-0.10
+  (package
+    (name "rust-salsa20")
+    (version "0.10.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "salsa20" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "04w211x17xzny53f83p8f7cj7k2hi8zck282q5aajwqzydd2z8lp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cipher" ,rust-cipher-0.4))
+       #:cargo-development-inputs
+       (("rust-cipher" ,rust-cipher-0.4)
+        ("rust-hex-literal" ,rust-hex-literal-0.3))))
+    (home-page "https://github.com/RustCrypto/stream-ciphers")
+    (synopsis "Salsa20 Stream Cipher")
+    (description "Salsa20 is a collection of stream cipher algorithms written
+in pure Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-salsa20-0.9
   (package
+    (inherit rust-salsa20-0.10)
     (name "rust-salsa20")
     (version "0.9.0")
     (source
@@ -53425,17 +57463,11 @@ quickly convert floating point numbers to decimal strings.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "11i646kpgimimqiq8hyi0b7ngp588f7nl9xsc317d9kdcxgvn3qc"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-cipher" ,rust-cipher-0.3)
-        ("rust-zeroize" ,rust-zeroize-1))))
-    (home-page "https://github.com/RustCrypto/stream-ciphers")
-    (synopsis "Salsa20 Stream Cipher")
-    (description "Salsa20 is a collection of stream cipher algorithms written
-in pure Rust.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-zeroize" ,rust-zeroize-1))))))
 
 (define-public rust-salsa-0.17
   (package
@@ -54033,8 +58065,59 @@ shareable by multiple crates in a build graph and erased by @code{cargo
 clean}.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-scrypt-0.11
+  (package
+    (name "rust-scrypt")
+    (version "0.11.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "scrypt" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "07zxfaqpns9jn0mnxm7wj3ksqsinyfpirkav1f7kc2bchs2s65h5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-password-hash" ,rust-password-hash-0.5)
+        ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+        ("rust-salsa20" ,rust-salsa20-0.10)
+        ("rust-sha2" ,rust-sha2-0.10))
+       #:cargo-development-inputs
+       (("rust-password-hash" ,rust-password-hash-0.5))))
+    (home-page
+     "https://github.com/RustCrypto/password-hashes/tree/master/scrypt")
+    (synopsis "Scrypt password-based key derivation function")
+    (description
+     "This package provides a Scrypt password-based key derivation
+function.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-scrypt-0.10
+  (package
+    (inherit rust-scrypt-0.11)
+    (name "rust-scrypt")
+    (version "0.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "scrypt" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0pglmppcl8mdzfxdv2x9dsjrwxhc1bm9zvxjibnlv59jnv9297lz"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-hmac" ,rust-hmac-0.12)
+        ("rust-password-hash" ,rust-password-hash-0.4)
+        ("rust-pbkdf2" ,rust-pbkdf2-0.11)
+        ("rust-salsa20" ,rust-salsa20-0.10)
+        ("rust-sha2" ,rust-sha2-0.10))
+       #:cargo-development-inputs
+       (("rust-password-hash" ,rust-password-hash-0.4))))))
+
 (define-public rust-scrypt-0.8
   (package
+    (inherit rust-scrypt-0.11)
     (name "rust-scrypt")
     (version "0.8.1")
     (source
@@ -54044,7 +58127,6 @@ clean}.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "09fkz5sc7qx97dyi1nkv69z36diggd2c9mja33cxpsqicdy6sgg7"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -54052,13 +58134,7 @@ clean}.")
         ("rust-password-hash" ,rust-password-hash-0.3)
         ("rust-pbkdf2" ,rust-pbkdf2-0.10)
         ("rust-salsa20" ,rust-salsa20-0.9)
-        ("rust-sha2" ,rust-sha2-0.10))))
-    (home-page "https://github.com/RustCrypto/password-hashes")
-    (synopsis "Scrypt password-based key derivation function")
-    (description
-     "This package provides a Scrypt password-based key derivation
-function.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-sha2" ,rust-sha2-0.10))))))
 
 (define-public rust-scrypt-0.5
   (package
@@ -54108,8 +58184,34 @@ function.")
         ("rust-sha2" ,rust-sha2-0.9)
         ("rust-subtle" ,rust-subtle-2))))))
 
+(define-public rust-scroll-0.11
+  (package
+    (name "rust-scroll")
+    (version "0.11.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "scroll" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1nhrhpzf95pxbcjjy222blwf8rl3adws6vsqax0yzyxsa6snbi84"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-scroll-derive" ,rust-scroll-derive-0.11))
+       #:cargo-development-inputs
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-rayon" ,rust-rayon-1))))
+    (home-page "https://github.com/m4b/scroll")
+    (synopsis "Endian-aware Read/Write traits for byte buffers")
+    (description
+     "This package provides a suite of powerful, extensible, generic,
+endian-aware Read/Write traits for byte buffers.")
+    (license license:expat)))
+
 (define-public rust-scroll-0.10
   (package
+    (inherit rust-scroll-0.11)
     (name "rust-scroll")
     (version "0.10.2")
     (source
@@ -54121,19 +58223,12 @@ function.")
         (sha256
          (base32
           "1v61drdig30qfx2xh8bn7qdk2xgqbmmhwyrznjl0gf1h915qv8px"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-scroll-derive" ,rust-scroll-derive-0.10))
        #:cargo-development-inputs
        (("rust-byteorder" ,rust-byteorder-1)
-        ("rust-rayon" ,rust-rayon-1))))
-    (home-page "https://github.com/m4b/scroll")
-    (synopsis "Endian-aware Read/Write traits for byte buffers")
-    (description
-     "This package provides a suite of powerful, extensible, generic,
-endian-aware Read/Write traits for byte buffers.")
-    (license license:expat)))
+        ("rust-rayon" ,rust-rayon-1))))))
 
 (define-public rust-scroll-0.9
   (package
@@ -54164,8 +58259,34 @@ endian-aware Read/Write traits for byte buffers.")
 endian-aware Read/Write traits for byte buffers.")
     (license license:expat)))
 
+(define-public rust-scroll-derive-0.11
+  (package
+    (name "rust-scroll-derive")
+    (version "0.11.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "scroll-derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1bi5ljnzksvqhic6j7i2a2ap41s78xr0gifkgjxdxlj63pw4kc8x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs (("rust-scroll" ,rust-scroll-0.11))))
+    (home-page "https://github.com/m4b/scroll")
+    (synopsis "Pread and Pwrite traits from the scroll crate")
+    (description
+     "This package provides a macros 1.1 derive implementation for Pread and
+Pwrite traits from the scroll crate.")
+    (license license:expat)))
+
 (define-public rust-scroll-derive-0.10
   (package
+    (inherit rust-scroll-derive-0.11)
     (name "rust-scroll-derive")
     (version "0.10.1")
     (source
@@ -54177,19 +58298,12 @@ endian-aware Read/Write traits for byte buffers.")
         (sha256
          (base32
           "0a7f0xybi27p1njs4bqmxh9zyb2dqal4dbvgnhjjix4zkgm4wn7q"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-syn" ,rust-syn-1)
-        ("rust-quote" ,rust-quote-1))))
-    (home-page "https://github.com/m4b/scroll")
-    (synopsis "Pread and Pwrite traits from the scroll crate")
-    (description
-     "This package provides a macros 1.1 derive implementation for Pread and
-Pwrite traits from the scroll crate.")
-    (license license:expat)))
+        ("rust-quote" ,rust-quote-1))))))
 
 (define-public rust-scroll-derive-0.9
   (package
@@ -54307,26 +58421,6 @@ Pwrite traits from the scroll crate.")
        (("rust-ring" ,rust-ring-0.13)
         ("rust-untrusted" ,rust-untrusted-0.6))))))
 
-(define-public rust-sct-0.3
-  (package
-    (inherit rust-sct-0.6)
-    (name "rust-sct")
-    (version "0.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "sct" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0z090j3lvy0lqbhmpswm4vb2n4i8dqswy0l93abdx9biipnhlm5l"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-ring" ,rust-ring-0.13)
-        ("rust-untrusted" ,rust-untrusted-0.6))
-       #:cargo-development-inputs
-       (("rust-cc" ,rust-cc-1))))))
-
 (define-public rust-sctk-adwaita-0.5
   (package
     (name "rust-sctk-adwaita")
@@ -54395,6 +58489,39 @@ proven statistical guarantees.")
 statistical guarantees.")
     (license license:expat)))
 
+(define-public rust-sec1-0.7
+  (package
+    (name "rust-sec1")
+    (version "0.7.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "sec1" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0vh4pvdfnghbjglh6k74vs93jj337jpli28bbyqr0srxh67c9bph"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-base16ct" ,rust-base16ct-0.2)
+        ("rust-der" ,rust-der-0.7)
+        ("rust-generic-array" ,rust-generic-array-0.14)
+        ("rust-pkcs8" ,rust-pkcs8-0.10)
+        ("rust-serdect" ,rust-serdect-0.2)
+        ("rust-subtle" ,rust-subtle-2)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/RustCrypto/formats/tree/master/sec1")
+    (synopsis
+     "Rust implementation of SEC1: Elliptic Curve Cryptography encoding formats")
+    (description
+     "This package procides a pure Rust implementation of SEC1: Elliptic Curve
+Cryptography encoding formats including ASN.1 DER-serialized private keys as
+well as the Elliptic-Curve-Point-to-Octet-String encoding.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-seccomp-sys-0.1
   (package
     (name "rust-seccomp-sys")
@@ -54417,6 +58544,41 @@ statistical guarantees.")
     (description "This package provides low-level bindings to libseccomp.")
     (license license:lgpl2.1)))
 
+(define-public rust-secret-service-3
+  (package
+    (name "rust-secret-service")
+    (version "3.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "secret-service" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "15cddmlbbmahlzq9ib39i1yy7x83cvrxjxrgz0v3bh189nnsb8ax"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; Build needs to decide on a crypto backend.
+       #:cargo-inputs
+       (("rust-aes" ,rust-aes-0.7)
+        ("rust-block-modes" ,rust-block-modes-0.8)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-generic-array" ,rust-generic-array-0.14)
+        ("rust-hkdf" ,rust-hkdf-0.12)
+        ("rust-num" ,rust-num-0.4)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-openssl" ,rust-openssl-0.10)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-zbus" ,rust-zbus-3))
+       #:cargo-development-inputs
+       (("rust-test-with" ,rust-test-with-0.8)
+        ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/hwchen/secret-service-rs.git")
+    (synopsis "Library to interface with Secret Service API")
+    (description "Library to interface with Secret Service API.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-section-testing-0.0
   (package
     (name "rust-section-testing")
@@ -54496,14 +58658,14 @@ SECG elliptic curve group secp256k1 and related utilities.")
 (define-public rust-security-framework-2
   (package
     (name "rust-security-framework")
-    (version "2.0.0")
+    (version "2.9.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "security-framework" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0scc4vj2mw9k6qpxp26zx8gnqnmw79nwayja91x030457hp9qxf1"))))
+        (base32 "1pplxk15s5yxvi2m1sz5xfmjibp96cscdcl432w9jzbk0frlzdh5"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f                      ;missing files
@@ -54512,10 +58674,15 @@ SECG elliptic curve group secp256k1 and related utilities.")
         ("rust-core-foundation" ,rust-core-foundation-0.9)
         ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8)
         ("rust-libc" ,rust-libc-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
         ("rust-security-framework-sys" ,rust-security-framework-sys-2))
        #:cargo-development-inputs
-       (("rust-hex" ,rust-hex-0.4)
-        ("rust-tempdir" ,rust-tempdir-0.3))))
+       (("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-hex" ,rust-hex-0.4)
+        ("rust-tempdir" ,rust-tempdir-0.3)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-x509-parser" ,rust-x509-parser-0.15))))
     (home-page "https://lib.rs/crates/security_framework")
     (synopsis "@code{Security.framework} bindings for macOS and iOS")
     (description "This package provides @code{Security.framework} bindings for
@@ -54627,14 +58794,14 @@ macOS and iOS.")
 (define-public rust-security-framework-sys-2
   (package
     (name "rust-security-framework-sys")
-    (version "2.0.0")
+    (version "2.9.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "security-framework-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "12v7wpf7cbc92xza4lf3w12411wzrkkvlbjgrhrid9yj4rg9v6zr"))))
+        (base32 "0yhciwlsy9dh0ps1gw3197kvyqx1bvc4knrhiznhid6kax196cp9"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -54780,32 +58947,32 @@ macOS and iOS.")
        #:cargo-development-inputs
        (("rust-phf-codegen" ,rust-phf-codegen-0.8))))))
 
-(define-public rust-selectors-0.21
+(define-public rust-self-cell-1
   (package
-    (inherit rust-selectors-0.22)
-    (name "rust-selectors")
-    (version "0.21.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "selectors" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "11icfj8ix8fqjsnw3dqw83bmhd5qdhxzq2klb486akyypq0b31hv"))))
-   (arguments
-    `(#:cargo-inputs
-      (("rust-bitflags" ,rust-bitflags-1)
-       ("rust-cssparser" ,rust-cssparser-0.25)
-       ("rust-fxhash" ,rust-fxhash-0.2)
-       ("rust-log" ,rust-log-0.4)
-       ("rust-matches" ,rust-matches-0.1)
-       ("rust-phf" ,rust-phf-0.7)
-       ("rust-precomputed-hash" ,rust-precomputed-hash-0.1)
-       ("rust-servo-arc" ,rust-servo-arc-0.1)
-       ("rust-smallvec" ,rust-smallvec-0.6)
-       ("rust-thin-slice" ,rust-thin-slice-0.1))))))
+    (name "rust-self-cell")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "self-cell" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1djgfccbfhj2zv7xmqc2nxwn41g1swyrxg1d488pirj3am8rwc2c"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin (substitute* "Cargo.toml"
+                         (("=([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)" _ version)
+                          (string-append "^" version)))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-rustversion" ,rust-rustversion-1))
+       #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1))))
+    (home-page "https://github.com/Voultapher/self_cell")
+    (synopsis "Self-referential structs in stable Rust")
+    (description
+     "This package provides safe-to-use proc-macro-free self-referential structs
+in stable Rust.")
+    (license license:asl2.0)))
 
 (define-public rust-semver-1
   (package
@@ -54990,19 +59157,23 @@ Semantic Versioning.")
          (base32
           "18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq"))))))
 
-(define-public rust-send-wrapper-0.5
+(define-public rust-send-wrapper-0.6
   (package
     (name "rust-send-wrapper")
-    (version "0.5.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "send_wrapper" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1mwbg1nv36d5kdjb0iwmprz24km0m8ck08dn59gdngqdc77hl34k"))))
+    (version "0.6.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "send-wrapper" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0wrxzsh9fzgkkkms621ydnz8mj30ilyq299a8cf65jn1y72hw2yd"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
+    (arguments
+     `(#:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3))
+       #:cargo-development-inputs
+       (("rust-futures-executor" ,rust-futures-executor-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3))))
     (home-page "https://github.com/thk1/send_wrapper")
     (synopsis "Wrapper moving around non-@code{Send} types between threads")
     (description
@@ -55013,6 +59184,20 @@ also have to make sure that the wrapper is dropped from within the original
 thread.  If any of these constraints is violated, a panic occurs.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-send-wrapper-0.5
+  (package
+    (inherit rust-send-wrapper-0.6)
+    (name "rust-send-wrapper")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "send_wrapper" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mwbg1nv36d5kdjb0iwmprz24km0m8ck08dn59gdngqdc77hl34k"))))
+    (arguments `(#:skip-build? #t))))
+
 (define-public rust-send-wrapper-0.4
   (package
     (inherit rust-send-wrapper-0.5)
@@ -55100,7 +59285,7 @@ fragment of code.")
 (define-public rust-serde-1
   (package
     (name "rust-serde")
-    (version "1.0.160")
+    (version "1.0.171")
     (source
      (origin
        (method url-fetch)
@@ -55108,7 +59293,7 @@ fragment of code.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0v11q6pjdjivw24cv98zv9dkdx50d6h9748lgvdbrqxwr1q3fbxv"))))
+         "1a9lvibgi42mhmgafp747mvshsq6ybx6rzcjqh398rfp9wg7vqih"))))
     (build-system cargo-build-system)
     (arguments
      ;; XXX: three test failures, e.g.:
@@ -55167,6 +59352,32 @@ fragment of code.")
        (("rust-clippy" ,rust-clippy-0.0))
        #:tests? #f))))
 
+(define-public rust-serde-aux-4
+  (package
+    (name "rust-serde-aux")
+    (version "4.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "serde-aux" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0fdf1hdv85ghlfcil6ynl3npbbparmlx3ynn3c0wz7bgxfvy3py3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; Cut the dependency graph.
+       #:cargo-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1))
+       ;#:cargo-development-inputs
+       ;(("rust-serde-qs" ,rust-serde-qs-0.10))
+       ))
+    (home-page "https://github.com/vityafx/serde-aux")
+    (synopsis "Serde crate's auxiliary library")
+    (description "This package provides a serde crate's auxiliary library.")
+    (license license:expat)))
+
 (define-public rust-serde-big-array-0.4
   (package
     (name "rust-serde-big-array")
@@ -55255,7 +59466,7 @@ fragment of code.")
 (define-public rust-serde-bytes-0.11
   (package
     (name "rust-serde-bytes")
-    (version "0.11.8")
+    (version "0.11.11")
     (source
      (origin
        (method url-fetch)
@@ -55263,7 +59474,7 @@ fragment of code.")
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "06a8lv3x1zm1ynzq6xri4k46zklnzh62i6y47w4rjvxkypzwb3bi"))))
+        (base32 "0yj2kj2hcphabzrydpa4dndfm9clh8cy6iv4fc4dw2ijwm7vw5js"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -55316,37 +59527,6 @@ fragment of code.")
     (description "CBOR support for serde.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-serde-codegen-0.4
-  (package
-    (name "rust-serde-codegen")
-    (version "0.4.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "serde_codegen" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0167ghvqs0n8qin8fjx2ihn3gx92m55685qpv4nzihw48h4rq0vq"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-aster" ,rust-aster-0.41)
-        ("rust-quasi" ,rust-quasi-0.32)
-        ("rust-quasi-macros" ,rust-quasi-macros-0.32)
-        ("rust-syntex" ,rust-syntex-0.58)
-        ("rust-syntex-syntax" ,rust-syntex-syntax-0.58))
-       #:cargo-development-inputs
-       (("rust-quasi-codegen" ,rust-quasi-codegen-0.32)
-        ("rust-syntex" ,rust-syntex-0.58))))
-    (home-page "https://serde.rs")
-    (synopsis "Macros for the serde framework")
-    (description "This package provides macros to auto-generate implementations
-for the serde framework.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-serde-codegen-internals-0.14
   (package
     (name "rust-serde-codegen-internals")
@@ -55479,7 +59659,7 @@ TOML/JSON/MessagePack strings and serializable values.")
 (define-public rust-serde-derive-1
   (package
     (name "rust-serde-derive")
-    (version "1.0.160")
+    (version "1.0.171")
     (source
      (origin
        (method url-fetch)
@@ -55487,7 +59667,7 @@ TOML/JSON/MessagePack strings and serializable values.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1pvpiml328jhsz5h3pdc7x7wcyaagab6l5hb2q07wjfqcdy0j6i9"))))
+         "10j6s97fk7fgjiqhhrx6a44rqxr7v3w985i3avx4d36i7dh9961q"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -55584,18 +59764,18 @@ data.  This crate provides a wrapper that works with any existing Serde
 (define-public rust-serde-json-1
   (package
     (name "rust-serde-json")
-    (version "1.0.96")
+    (version "1.0.102")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "serde-json" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1waj3qwpa610vmksnzcmkll6vaw7nf7v3ckj4v0wlfs0a153jz85"))))
+        (base32 "1vfzj76zdn8yh5l08yzr6lf95whic3vrlkh6nq4266s8bncjl1mm"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-indexmap" ,rust-indexmap-1)
+       (("rust-indexmap" ,rust-indexmap-2)
         ("rust-itoa" ,rust-itoa-1)
         ("rust-ryu" ,rust-ryu-1)
         ("rust-serde" ,rust-serde-1))
@@ -55640,6 +59820,31 @@ data.  This crate provides a wrapper that works with any existing Serde
        #:cargo-development-inputs
        (("rust-serde-derive" ,rust-serde-derive-0.9))))))
 
+(define-public rust-serde-json-core-0.5
+  (package
+    (name "rust-serde-json-core")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "serde-json-core" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1w2g6ylmxbj9fbz4f86i0nnyk2mbv7qbksx0mbimxx17wj7krv2q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-heapless" ,rust-heapless-0.7)
+        ("rust-ryu" ,rust-ryu-1)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-serde-derive" ,rust-serde-derive-1))))
+    (home-page "https://github.com/rust-embedded-community/serde-json-core")
+    (synopsis "serde-json for no_std programs")
+    (description "This package provides @code{serde-json} for @code{no_std}
+programs in rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-serde-path-to-error-0.1
   (package
     (name "rust-serde-path-to-error")
@@ -55756,7 +59961,7 @@ serializing Rust structures.")
 (define-public rust-serde-stacker-0.1
   (package
     (name "rust-serde-stacker")
-    (version "0.1.7")
+    (version "0.1.9")
     (source
      (origin
        (method url-fetch)
@@ -55765,7 +59970,7 @@ serializing Rust structures.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1zgwd22cswfsjsxmnpf97nw5fzyv0s6mif5blbb948q7qgskvxrm"))))
+         "13kz9x2f1bhv6n997ydkykkhz479ki25wm6jxmr5rfsj1dxh2njp"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -55783,7 +59988,7 @@ by dynamically growing the stack.")
 (define-public rust-serde-test-1
   (package
     (name "rust-serde-test")
-    (version "1.0.160")
+    (version "1.0.171")
     (source
      (origin
        (method url-fetch)
@@ -55792,11 +59997,10 @@ by dynamically growing the stack.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1s3mcs9b3qw59lc6w2d1bkpklh2fjclvy5iszkvmhcljwc0ab59w"))))
+         "0fjsdcxx1ig10qf73dqwgyy7ksjwmmi3657aaybyqj8l9qphlj5n"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f                  ; Requires a newer rust
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
        (("rust-serde" ,rust-serde-1)
@@ -55953,8 +60157,62 @@ for later processing.")
 (compatible with 0.9+)")
     (license license:expat)))
 
+(define-public rust-serde-xml-rs-0.4
+  (package
+    (inherit rust-serde-xml-rs-0.5)
+    (name "rust-serde-xml-rs")
+    (version "0.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "serde-xml-rs" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1ykx1xkfd59gf0ijnp93xhpd457xy4zi8xv2hrr0ikvcd6h1pgzh"))))
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--" "--skip=test_doctype_fail")
+       #:cargo-inputs
+       (("rust-log" ,rust-log-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-xml-rs" ,rust-xml-rs-0.8))
+       #:cargo-development-inputs
+       (("rust-docmatic" ,rust-docmatic-0.1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-simple-logger" ,rust-simple-logger-1))))))
+
+(define-public rust-serde-yaml-0.9
+  (package
+    (name "rust-serde-yaml")
+    (version "0.9.21")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "serde-yaml" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1714w6f5b2g4svha9r96cirz05mc0d9xfaxkcrabzqvxxkiq9mnr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-indexmap" ,rust-indexmap-1)
+        ("rust-itoa" ,rust-itoa-1)
+        ("rust-ryu" ,rust-ryu-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-unsafe-libyaml" ,rust-unsafe-libyaml-0.2))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-indoc" ,rust-indoc-2)
+        ("rust-serde-derive" ,rust-serde-derive-1))))
+    (home-page "https://github.com/dtolnay/serde-yaml")
+    (synopsis "YAML support for Serde")
+    (description "This package provides YAML support for Serde.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-serde-yaml-0.8
   (package
+    (inherit rust-serde-yaml-0.9)
     (name "rust-serde-yaml")
     (version "0.8.26")
     (source
@@ -55964,7 +60222,6 @@ for later processing.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "06y7gxy312mink8nsnmci9cw0ykpgsdcxmayg0snmdbnnwrp92jp"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-indexmap" ,rust-indexmap-1)
@@ -55974,11 +60231,41 @@ for later processing.")
        #:cargo-development-inputs
        (("rust-anyhow" ,rust-anyhow-1)
         ("rust-indoc" ,rust-indoc-1)
-        ("rust-serde-derive" ,rust-serde-derive-1))))
-    (home-page "https://github.com/dtolnay/serde-yaml")
-    (synopsis "YAML support for Serde")
-    (description "This package provides YAML support for Serde.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-serde-derive" ,rust-serde-derive-1))))))
+
+(define-public rust-serdect-0.2
+  (package
+    (name "rust-serdect")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "serdect" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0xw1b6acw6nd0jchzyxzr97f0s4shbcqh92iyjwln0cskshi8kx8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-base16ct" ,rust-base16ct-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-ciborium" ,rust-ciborium-0.2)
+        ("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json-core" ,rust-serde-json-core-0.5)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-toml" ,rust-toml-0.7))))
+    (home-page "https://github.com/RustCrypto/formats/tree/master/serdect")
+    (synopsis
+     "Constant-time serde serializer/deserializer helpers")
+    (description
+     "This package provides constant-time serde serializer/deserializer helpers
+for data that potentially contains secrets (e.g. cryptographic keys).")
+    (license (list license:asl2.0 license:expat))))
 
 (define-public rust-serial-test-0.6
   (package
@@ -56240,7 +60527,7 @@ functionality and without weak references.")
 (define-public rust-sha-1-0.10
   (package
     (name "rust-sha-1")
-    (version "0.10.0")
+    (version "0.10.5")
     (source
      (origin
        (method url-fetch)
@@ -56249,15 +60536,18 @@ functionality and without weak references.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "03zag8zk4qlv40n2yryddapv5yxkam3hdr7n53d8qrzr2gali3q2"))))
+         "1jr2a7pi67s8nxm4m09df9nnzsdlpif5hnk29hl8xk55fx975y2y"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f      ; use of undeclared crate or module `sha1`
        #:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-cpufeatures" ,rust-cpufeatures-0.2)
         ("rust-digest" ,rust-digest-0.10)
-        ("rust-sha1-asm" ,rust-sha1-asm-0.5))))
+        ("rust-sha1-asm" ,rust-sha1-asm-0.5))
+       #:cargo-development-inputs
+       (("rust-digest" ,rust-digest-0.10)
+        ("rust-hex-literal" ,rust-hex-literal-0.2))))
     (home-page "https://github.com/RustCrypto/hashes")
     (synopsis "SHA-1 hash function")
     (description "This crate provides a SHA-1 hash function.")
@@ -56486,14 +60776,14 @@ code is translated from C to Rust using c2rust.")
 (define-public rust-sha2-0.10
   (package
     (name "rust-sha2")
-    (version "0.10.1")
+    (version "0.10.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "sha2" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1v60pzdr3pp6y2sgg1v1nwv4169rb6psk44jmnnq51y5d60vvhwr"))))
+        (base32 "1h5xrrv2y06kr1gsz4pwrm3lsp206nm2gjxgbf21wfrfzsavgrl2"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -56616,8 +60906,34 @@ functions core functionality.")
        (sha256
         (base32 "0y4n8r4362y2fa6p2j0dgny4zfi194gdf01l6j850n9vf8ha3kwj"))))))
 
+(define-public rust-sha3-0.10
+  (package
+    (name "rust-sha3")
+    (version "0.10.8")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "sha3" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0q5s3qlwnk8d5j34jya98j1v2p3009wdmnqdza3yydwgi8kjv1vm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-digest" ,rust-digest-0.10)
+        ("rust-keccak" ,rust-keccak-0.1))
+       #:cargo-development-inputs
+       (("rust-digest" ,rust-digest-0.10)
+        ("rust-hex-literal" ,rust-hex-literal-0.2))))
+    (home-page "https://github.com/RustCrypto/hashes")
+    (synopsis "SHA-3 (Keccak) hash function")
+    (description "This package provides a pure Rust implementation of the SHA-3
+(Keccak) hash function.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-sha3-0.9
   (package
+    (inherit rust-sha3-0.10)
     (name "rust-sha3")
     (version "0.9.1")
     (source
@@ -56627,7 +60943,6 @@ functions core functionality.")
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32 "02d85wpvz75a0n7r2da15ikqjwzamhii11qy9gqf6pafgm0rj4gq"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-block-buffer" ,rust-block-buffer-0.9)
@@ -56636,12 +60951,7 @@ functions core functionality.")
         ("rust-opaque-debug" ,rust-opaque-debug-0.3))
        #:cargo-development-inputs
        (("rust-digest" ,rust-digest-0.9)
-        ("rust-hex-literal" ,rust-hex-literal-0.2))))
-    (home-page "https://github.com/RustCrypto/hashes")
-    (synopsis "SHA-3 (Keccak) hash function")
-    (description "This package provides a pure Rust implementation of the SHA-3
-(Keccak) hash function.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-hex-literal" ,rust-hex-literal-0.2))))))
 
 (define-public rust-shadow-rs-0.8
   (package
@@ -56672,7 +60982,7 @@ exactly where a binary came from and how it was built.")
 (define-public rust-sharded-slab-0.1
   (package
     (name "rust-sharded-slab")
-    (version "0.1.0")
+    (version "0.1.4")
     (source
      (origin
        (method url-fetch)
@@ -56680,16 +60990,17 @@ exactly where a binary came from and how it was built.")
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "09r1i2adjkm4flsj4l0j7x79gdyxz0hvivxdh2d8j5jfj6z22jbv"))))
+        (base32 "0cbb8kgwsyr3zzhsv8jrs3y1j3vsw4jxil42lfq31ikhdy0bl3wh"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-loom" ,rust-loom-0.3))
+        ("rust-loom" ,rust-loom-0.5))
        #:cargo-development-inputs
-       (("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-criterion" ,rust-criterion-0.3)
-        ("rust-proptest" ,rust-proptest-0.9))))
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-loom" ,rust-loom-0.5)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-slab" ,rust-slab-0.4))))
     (home-page "https://github.com/hawkw/sharded-slab")
     (synopsis "Lock-free concurrent slab")
     (description "This package provides a lock-free concurrent slab.")
@@ -56766,7 +61077,7 @@ exactly where a binary came from and how it was built.")
 (define-public rust-shell-escape-0.1
   (package
     (name "rust-shell-escape")
-    (version "0.1.4")
+    (version "0.1.5")
     (source
      (origin
        (method url-fetch)
@@ -56775,7 +61086,7 @@ exactly where a binary came from and how it was built.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1fgs1iyx3b124b7njjmhfn9q5ipmhxrafavh8mxbfl9a9zk162hp"))))
+         "0kqq83dk0r1fqj4cfzddpxrni2hpz5i1y607g366c4m9iyhngfs5"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/sfackler/shell-escape")
     (synopsis
@@ -56787,14 +61098,14 @@ exactly where a binary came from and how it was built.")
 (define-public rust-shell-words-1
   (package
     (name "rust-shell-words")
-    (version "1.0.0")
+    (version "1.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "shell-words" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0x5hw7ch98sp6b99ihxjs5vw5dmwg4yvy4yxzr59394xr4w3kymn"))))
+        (base32 "1plgwx8r0h5ismbbp6cp03740wmzgzhip85k5hxqrrkaddkql614"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/tmiasko/shell-words")
     (synopsis "Process command line according to parsing rules of UNIX shell")
@@ -57001,8 +61312,37 @@ words, like Python's shlex.")
        (("rust-signal-hook" ,rust-signal-hook-0.1)
         ("rust-version-sync" ,rust-version-sync-0.8))))))
 
+(define-public rust-signature-2
+  (package
+    (name "rust-signature")
+    (version "2.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "signature" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "00457czdia5gvll3a1vzf2ffsdpgcz2dz0h56z7zk28nsbp8h5sy"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-digest" ,rust-digest-0.10)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-signature-derive" ,rust-signature-derive-2))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-sha2" ,rust-sha2-0.10))))
+    (home-page "https://github.com/RustCrypto/traits/tree/master/signature")
+    (synopsis
+     "Traits for cryptographic signature algorithms (e.g. ECDSA, Ed25519)")
+    (description
+     "This package contains traits which provide generic, object-safe APIs
+for generating and verifying digital signatures.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-signature-1
   (package
+    (inherit rust-signature-2)
     (name "rust-signature")
     (version "1.5.0")
     (source
@@ -57012,23 +61352,43 @@ words, like Python's shlex.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1r4x94n6ibdd1f85cwmvi29jvyyf1l379n9yybb7jlg9lv0wcm7h"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-digest" ,rust-digest-0.10)
         ("rust-rand-core" ,rust-rand-core-0.6)
-        ("rust-signature-derive" ,rust-signature-derive-1))))
-    (home-page "")
-    (synopsis "Traits for cryptographic signature algorithms (e.g. ECDSA,
-Ed25519)")
-    (description
-     "This package contains traits which provide generic, object-safe APIs
-for generating and verifying digital signatures.")
+        ("rust-signature-derive" ,rust-signature-derive-1))))))
+
+(define-public rust-signature-derive-2
+  (package
+    (name "rust-signature-derive")
+    (version "2.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "signature-derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1z0mjjg3fpj08kc3nkax4lczgp7sfzbcm8q2qgim865510wkgpxc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))))
+    (home-page
+     "https://github.com/RustCrypto/traits/tree/master/signature/derive")
+    (synopsis "Custom derive support for the 'signature' crate")
+    (description "This package provides proc macros used by the signature
+crate.
+
+It's not intended to be used directly.  See the signature crate's documentation
+for additional details.")
     (license (list license:asl2.0 license:expat))))
 
 (define-public rust-signature-derive-1
   (package
+    (inherit rust-signature-derive-2)
     (name "rust-signature-derive")
     (version "1.0.0-pre.4")
     (source
@@ -57038,22 +61398,13 @@ for generating and verifying digital signatures.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0p1x0wv6grrgdn226m9rsqpcnpfwkpji7rjpalkbk1ynv0xpvf57"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1)
-        ("rust-synstructure" ,rust-synstructure-0.12))))
-    (home-page "signature_derive")
-    (synopsis "Custom derive support for the 'signature' crate")
-    (description "This package provides proc macros used by the signature
-crate.
-
-It's not intended to be used directly.  See the signature crate's documentation
-for additional details.")
-    (license (list license:asl2.0 license:expat))))
+        ("rust-synstructure" ,rust-synstructure-0.12))))))
 
 (define-public rust-simba-0.6
   (package
@@ -57726,16 +62077,39 @@ implementations.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1881q2yc17j2m1yvh01447c93ws1mspnrj3k2nbvwbvcm8z81kkv"))))
+         "1881q2yc17j2m1yvh01447c93ws1mspnrj3k2nbvwbvcm8z81kkv"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "src/lib.rs"
+             ;; __m64 is x86 only, not x86 or x86_64 as in the code.
+             ;; See: https://github.com/gnzlbg/sleef-sys/issues/27
+             (("__m64") "// __m64"))
+           (delete-file "Cargo.toml")
+           (rename-file "Cargo.toml.orig" "Cargo.toml")
+           (substitute* "Cargo.toml"
+             ;; Dependabot says the dependencies can be updated.
+             (("cfg-if = \"\\^0.1\"") "cfg-if = \"^1.0\"")
+             (("env_logger = \"0.6\"") "env_logger = \"0.9\"")
+             (("bindgen = \"\\^0.46\"") "bindgen = \"^0.59\""))))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-0.1)
+     `(#:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-bindgen" ,rust-bindgen-0.46)
+        ("rust-bindgen" ,rust-bindgen-0.59)
         ("rust-cmake" ,rust-cmake-0.1)
-        ("rust-env-logger" ,rust-env-logger-0.6))))
+        ("rust-env-logger" ,rust-env-logger-0.9))
+       #:phases
+       (modify-phases %standard-phases
+         ;; This makes it easier to test the package.
+         (add-after 'unpack 'enable-unstable-features
+           (lambda _
+             (setenv "RUSTC_BOOTSTRAP" "1"))))))
+    (inputs
+     (list clang))
+    (native-inputs
+     (list cmake-minimal))
     (home-page "https://github.com/gnzlbg/sleef-sys")
     (synopsis
      "Rust FFI bindings to the SLEEF Vectorized Math Library")
@@ -58119,8 +62493,33 @@ stack.")
        #:cargo-development-inputs
        (("rust-bincode" ,rust-bincode-1))))))
 
+(define-public rust-smart-default-0.7
+  (package
+    (name "rust-smart-default")
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "smart-default" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1hgzs1250559bpayxmn46gzas5ycqn39wkf4srjgqh4461k1ic0f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/idanarye/rust-smart-default")
+    (synopsis "Custom-derive macro for Default with more control on the fields")
+    (description
+     "This package provides a custom-derive macro for Default with more
+control on the fields.")
+    (license license:expat)))
+
 (define-public rust-smart-default-0.6
   (package
+    (inherit rust-smart-default-0.7)
     (name "rust-smart-default")
     (version "0.6.0")
     (source
@@ -58130,19 +62529,12 @@ stack.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1xnvxz9wilj4d5b8kg4wbs0yk48wm41fnwkmn3p6wi9rafhmjdhk"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/idanarye/rust-smart-default")
-    (synopsis "Custom-derive macro for Default with more control on the fields")
-    (description
-     "This package provides a custom-derive macro for Default with more
-control on the fields.")
-    (license license:expat)))
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-smartstring-1
   (package
@@ -58410,15 +62802,17 @@ algorithm.  Includes streaming compression and decompression.")
 (define-public rust-snapbox-macros-0.3
   (package
     (name "rust-snapbox-macros")
-    (version "0.3.1")
+    (version "0.3.4")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "snapbox-macros" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0dkk7b5l9g8q7fswqj0686jqafkdl8apv1ay8r275cry430napj8"))))
+                "0cfaq1vwy90g3csmmzm773kk0i91422r3432x4myishfkzghkbza"))))
     (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-anstream" ,rust-anstream-0.3))))
     (home-page "https://github.com/assert-rs/trycmd/tree/main/crates/snapbox")
     (synopsis "Snapshot testing toolbox")
     (description
@@ -58450,18 +62844,20 @@ It is also flexible enough to build your own test harness like @code{trycmd}.")
 (define-public rust-snapbox-0.4
   (package
     (name "rust-snapbox")
-    (version "0.4.7")
+    (version "0.4.11")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "snapbox" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0gk2ggk4k3vq65yp53akvklg756b8w7bfj21sk7rjcbix270vhh9"))))
+                "0d9q8968hqkq64bain73shj3iqc28pch8c2fj6dghiw30xicvg7n"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-backtrace" ,rust-backtrace-0.3)
+       (("rust-anstream" ,rust-anstream-0.3)
+        ("rust-anstyle" ,rust-anstyle-1)
+        ("rust-backtrace" ,rust-backtrace-0.3)
         ("rust-concolor" ,rust-concolor-0.0.11)
         ("rust-content-inspector" ,rust-content-inspector-0.2)
         ("rust-document-features" ,rust-document-features-0.2)
@@ -58469,6 +62865,7 @@ It is also flexible enough to build your own test harness like @code{trycmd}.")
         ("rust-escargot" ,rust-escargot-0.5)
         ("rust-filetime" ,rust-filetime-0.2)
         ("rust-ignore" ,rust-ignore-0.4)
+        ("rust-libc" ,rust-libc-0.2)
         ("rust-libtest-mimic" ,rust-libtest-mimic-0.6)
         ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3)
         ("rust-os-pipe" ,rust-os-pipe-1)
@@ -58478,8 +62875,7 @@ It is also flexible enough to build your own test harness like @code{trycmd}.")
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-wait-timeout" ,rust-wait-timeout-0.2)
         ("rust-walkdir" ,rust-walkdir-2)
-        ("rust-windows-sys" ,rust-windows-sys-0.45)
-        ("rust-yansi" ,rust-yansi-0.5))))
+        ("rust-windows-sys" ,rust-windows-sys-0.45))))
     (home-page "https://github.com/assert-rs/trycmd/tree/main/crates/snapbox")
     (synopsis "Snapshot testing toolbox")
     (description
@@ -58935,19 +63331,27 @@ and spirv-std-macros.")
 SPIR-V.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-spki-0.4
+(define-public rust-spki-0.7
   (package
     (name "rust-spki")
-    (version "0.4.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "spki" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0ckgkcg6db5y94dqhmyikgn8yrsah6pyf4j197hv1c51bp0s00aw"))))
+    (version "0.7.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "spki" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0jhq00sv4w3psdi6li3vjjmspc6z2d9b1wc1srbljircy1p9j7lx"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t #:cargo-inputs (("rust-der" ,rust-der-0.4))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-base64ct" ,rust-base64ct-1)
+        ("rust-der" ,rust-der-0.7)
+        ("rust-sha2" ,rust-sha2-0.10))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/RustCrypto/formats/tree/master/spki")
     (synopsis
      "X.509 Subject Public Key Info (RFC5280) describing public keys")
@@ -58957,6 +63361,41 @@ describing public keys as well as their associated AlgorithmIdentifiers (i.e.
 OIDs)")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-spki-0.6
+  (package
+    (inherit rust-spki-0.7)
+    (name "rust-spki")
+    (version "0.6.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "spki" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ar1ldkl7svp8l3gfw2hyiiph7n2nqynjnjgdv1pscvsmjxh5kv7"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-base64ct" ,rust-base64ct-1)
+        ("rust-der" ,rust-der-0.6)
+        ("rust-sha2" ,rust-sha2-0.10))
+       #:cargo-development-inputs
+       (("rust-hex-literal" ,rust-hex-literal-0.3)
+        ("rust-tempfile" ,rust-tempfile-3))))))
+
+(define-public rust-spki-0.4
+  (package
+    (inherit rust-spki-0.7)
+    (name "rust-spki")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "spki" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ckgkcg6db5y94dqhmyikgn8yrsah6pyf4j197hv1c51bp0s00aw"))))
+    (arguments `(#:skip-build? #t #:cargo-inputs (("rust-der" ,rust-der-0.4))))))
+
 (define-public rust-spmc-0.3
   (package
     (name "rust-spmc")
@@ -59234,7 +63673,7 @@ to the same address.")
 (define-public rust-stacker-0.1
   (package
     (name "rust-stacker")
-    (version "0.1.6")
+    (version "0.1.15")
     (source
       (origin
         (method url-fetch)
@@ -59242,16 +63681,15 @@ to the same address.")
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "12igajfgqz96c7vcwi91xdfsphawik6g36ndlglqih0a7bqw8vyr"))))
+          "1klz4mk1iqn3jixhnls6ia4ql4fpinnfjibxabpx6pqmh12bv1n8"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-0.1)
+       (("rust-cc" ,rust-cc-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-psm" ,rust-psm-0.1)
-        ("rust-winapi" ,rust-winapi-0.3))
-       #:cargo-development-inputs
-       (("rust-cc" ,rust-cc-1))))
+        ("rust-winapi" ,rust-winapi-0.3))))
     (home-page "https://github.com/rust-lang/stacker")
     (synopsis "Manual segmented stacks for Rust")
     (description
@@ -59281,8 +63719,33 @@ deeply recursive algorithms that may accidentally blow the stack.")
     (description "New standard library, old compiler.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-state-0.5
+  (package
+    (name "rust-state")
+    (version "0.5.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "state" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0fzji31ijbkimbzdy4dln9mp5xp7lm1a0dnqxv4n10hywphnds6v"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-loom" ,rust-loom-0.5))
+       #:cargo-development-inputs
+       (("rust-static-assertions" ,rust-static-assertions-1))))
+    (home-page "https://github.com/SergioBenitez/state")
+    (synopsis "Library for safe global and thread-local state management")
+    (description
+     "This package provides a library for safe global and thread-local state
+management.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-state-0.4
   (package
+    (inherit rust-state-0.5)
     (name "rust-state")
     (version "0.4.2")
     (source
@@ -59292,17 +63755,10 @@ deeply recursive algorithms that may accidentally blow the stack.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "10v4k9bgjryc9m40c8nnhyrby2ngkhpx841p3k4halgxlp8af59h"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-lazy-static" ,rust-lazy-static-1))))
-    (home-page "https://github.com/SergioBenitez/state")
-    (synopsis "Library for safe global and thread-local state management")
-    (description
-     "This package provides a library for safe global and thread-local state
-management.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-lazy-static" ,rust-lazy-static-1))))))
 
 (define-public rust-static-assertions-1
   (package
@@ -60636,6 +65092,144 @@ easier in Rust.")
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-subplot-0.7
+  (package
+    (name "rust-subplot")
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "subplot" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1la2vsjlxarld2w7farzlbmiy2hvascmd8bhi29ssm816m571jc8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       (list "--release" "--"
+             ;; These rely on java
+             "--skip=diagrams::PlantumlMarkup"
+             "--skip=diagrams::DotMarkup")
+       #:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-base64" ,rust-base64-0.21)
+        ("rust-clap" ,rust-clap-4)
+        ("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-file-diff" ,rust-file-diff-1)
+        ("rust-git-testament" ,rust-git-testament-0.2)
+        ("rust-html-escape" ,rust-html-escape-0.2)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-line-col" ,rust-line-col-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-pikchr" ,rust-pikchr-0.1)
+        ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-roadmap" ,rust-roadmap-0.5)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-aux" ,rust-serde-aux-4)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serde-yaml" ,rust-serde-yaml-0.9)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-tempfile-fast" ,rust-tempfile-fast-0.3)
+        ("rust-tera" ,rust-tera-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-walkdir" ,rust-walkdir-2))))
+    (home-page "https://subplot.tech/")
+    (synopsis "Tools for automated acceptance tests")
+    (description
+     "This package provides tools for specifying, documenting, and implementing
+automated acceptance tests for systems and software.")
+    (license license:expat-0)))
+
+(define-public rust-subplot-build-0.7
+  (package
+    (name "rust-subplot-build")
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "subplot-build" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1p38kq7fmg6gpwqmkymn68f2qiaw7k35s7i4k0ifs6g5c0d70xfw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-subplot" ,rust-subplot-0.7)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-tracing" ,rust-tracing-0.1))))
+    (home-page "https://subplot.tech/")
+    (synopsis "Library for using Subplot code generation")
+    (description
+     "This package provides a library for using Subplot code generation from
+another project's @code{build.rs} module.")
+    (license license:expat-0)))
+
+(define-public rust-subplotlib-0.7
+  (package
+    (name "rust-subplotlib")
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "subplotlib" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0cbsrsk9pkyhs3fqzmxgf19x2bhr22pic5wqwvphv3sk4nc1ysiw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Not all files included.
+       #:cargo-inputs
+       (("rust-base64" ,rust-base64-0.21)
+        ("rust-fehler" ,rust-fehler-1)
+        ("rust-filetime" ,rust-filetime-0.2)
+        ("rust-fs2" ,rust-fs2-0.4)
+        ("rust-glob" ,rust-glob-0.3)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-remove-dir-all" ,rust-remove-dir-all-0.8)
+        ("rust-shell-words" ,rust-shell-words-1)
+        ("rust-state" ,rust-state-0.5)
+        ("rust-subplot-build" ,rust-subplot-build-0.7)
+        ("rust-subplotlib-derive" ,rust-subplotlib-derive-0.7)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-unescape" ,rust-unescape-0.1))
+       #:cargo-development-inputs
+       (("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://subplot.tech/")
+    (synopsis "Utility functions and types for @code{subplot codegen}")
+    (description
+     "Utility functions and types for @code{subplot codegen} generated Rust
+based test suites.  Relies on @code{subplotlib-derive} for associated macros.")
+    (license license:expat-0)))
+
+(define-public rust-subplotlib-derive-0.7
+  (package
+    (name "rust-subplotlib-derive")
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "subplotlib-derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "11x93kzj6x5x44irkbiz1vyns9ivr7skixyd318sxa021xas16ci"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-fehler" ,rust-fehler-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-2))))
+    (home-page "https://subplot.tech/")
+    (synopsis "macros for constructing subplotlib based test suites")
+    (description
+     "This package provides macros for constructing subplotlib based test
+suites, typically generated by @code{subplot codegen}.")
+    (license license:expat-0)))
+
 (define-public rust-subprocess-0.2
   (package
     (name "rust-subprocess")
@@ -60702,6 +65296,27 @@ cryptographic implementations.")
         (base32
          "1vm80mxbwfj334izwm8x8l65v1xl9hr0kwrg36r1rq565fkaarrd"))))))
 
+(define-public rust-subtle-ng-2
+  (package
+    (name "rust-subtle-ng")
+    (version "2.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "subtle-ng" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hj1wp8xl64bjhbvlfffmllqy7wdw2b505f32gn3qqic4vmpcikk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-rand" ,rust-rand-0.7))))
+    (home-page "https://dalek.rs/")
+    (synopsis "Pure-Rust for constant-time cryptographic implementations")
+    (description
+     "This package provides pure-Rust traits and utilities for constant-time
+cryptographic implementations.")
+    (license license:bsd-3)))
+
 (define-public rust-surf-2
   (package
     (name "rust-surf")
@@ -60757,6 +65372,29 @@ alike.  It's completely modular, and built directly for @code{async/await}.")
 values without proliferating generics.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-supports-color-2
+  (package
+    (name "rust-supports-color")
+    (version "2.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "supports-color" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0m5kayz225f23k5jyjin82sfkrqhfdq3j72ianafkazz9cbyfl29"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; panicked at 'assertion failed: `(left == right)`
+       #:cargo-inputs
+       (("rust-is-terminal" ,rust-is-terminal-0.4)
+        ("rust-is-ci" ,rust-is-ci-1))))
+    (home-page "https://github.com/zkat/supports-color")
+    (synopsis "Detects whether a terminal supports color")
+    (description
+     "Detects whether a terminal supports color, and gives details about that support.")
+    (license license:asl2.0)))
+
 (define-public rust-sval-1
   (package
     (name "rust-sval")
@@ -60992,14 +65630,14 @@ interface")
 (define-public rust-syn-2
   (package
     (name "rust-syn")
-    (version "2.0.5")
+    (version "2.0.25")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "syn" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "12iqdd7j7hfsp4584bph1318n47z7x79ddgvl63j30i6db3x3hl9"))))
+                "1qjswb3cifay6x9l0qjpm9c42ikacpxybr9ny4npw9kl1j6grqqm"))))
     (build-system cargo-build-system)
     (arguments
      ;; Tests fail to compile
@@ -61021,10 +65659,17 @@ interface")
        #:cargo-development-inputs
        (("rust-anyhow" ,rust-anyhow-1)
         ("rust-automod" ,rust-automod-1)
+        ("rust-flate2" ,rust-flate2-1)
         ("rust-insta" ,rust-insta-1)
+        ("rust-rayon" ,rust-rayon-1)
         ("rust-ref-cast" ,rust-ref-cast-1)
+        ("rust-regex" ,rust-regex-1)
         ("rust-reqwest" ,rust-reqwest-0.11)
-        ("rust-tar" ,rust-tar-0.4))))
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-syn-test-suite" ,rust-syn-test-suite-0.0.0)
+        ("rust-tar" ,rust-tar-0.4)
+        ("rust-termcolor" ,rust-termcolor-1)
+        ("rust-walkdir" ,rust-walkdir-2))))
     (inputs (list openssl))
     (native-inputs (list pkg-config))
     (home-page "https://github.com/dtolnay/syn")
@@ -61193,48 +65838,39 @@ a syntax tree of Rust source code.")
         ("rust-tempdir" ,rust-tempdir-0.3)
         ("rust-walkdir" ,rust-walkdir-1))))))
 
-(define-public rust-syn-mid-0.5
+(define-public rust-syn-test-suite-0.0.0
   (package
-    (name "rust-syn-mid")
-    (version "0.5.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "syn-mid" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "12ikg5jfklixq0wsgfl7sdzjqlxgq50ygklxy4f972hjdjgm7qvv"))))
+    (name "rust-syn-test-suite")
+    (version "0.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "syn-test-suite" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "15yz9q7rgxaplv0zbnanzyv1la4gmg47yq5wlkcwv3cck4qlncdm"))))
     (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-syn" ,rust-syn-1)
-        ("rust-quote" ,rust-quote-1))))
-    (home-page "https://github.com/taiki-e/syn-mid")
-    (synopsis
-     "Provide the features between \"full\" and \"derive\" of syn")
-    (description
-     "This package provides the features between \"full\" and \"derive\" of syn.")
-    (license (list license:asl2.0 license:expat))))
+    (arguments (list #:skip-build? #t))
+    (home-page "https://github.com/dtolnay/syn")
+    (synopsis "Test suite of the syn crate")
+    (description "Test suite of the syn crate.")
+    (license (list license:expat license:asl2.0))))
 
 (define-public rust-synchronoise-1
   (package
     (name "rust-synchronoise")
-    (version "1.0.0")
+    (version "1.0.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "synchronoise" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1szasv8xl6z3gxfq8h8wllw2mq53d71nn29achxsnfcxzh7fs5yp"))))
+                "1wnylkdf84520ks7a70fnwds2wibxmnkgqzz3j6ww9n61wwh3g1x"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-crossbeam-queue" ,rust-crossbeam-queue-0.1))))
+       (("rust-crossbeam-queue" ,rust-crossbeam-queue-0.3))))
     (home-page "https://github.com/QuietMisdreavus/synchronoise")
     (synopsis "Synchronization primitives")
     (description
@@ -61374,32 +66010,6 @@ standard library.")
 intelligence using Sublime Text's grammars.")
     (license license:expat)))
 
-(define-public rust-syntex-0.58
- (package
-   (name "rust-syntex")
-   (version "0.58.1")
-   (source
-    (origin
-      (method url-fetch)
-      (uri (crate-uri "syntex" version))
-      (file-name
-       (string-append name "-" version ".tar.gz"))
-      (sha256
-       (base32
-        "03lgd36cxhc6gzaab0wqvckbhml00s6s73lk34ymf6cklymf7xd8"))))
-   (build-system cargo-build-system)
-   (arguments
-    `(#:skip-build? #t
-      #:cargo-inputs
-      (("rust-syntex-errors" ,rust-syntex-errors-0.58)
-       ("rust-syntex-syntax" ,rust-syntex-syntax-0.58))))
-   (home-page "https://github.com/erickt/rust-syntex")
-   (synopsis "Compile time syntax extension expansion")
-   (description
-    "This package provides a library that enables compile time
-syntax extension expansion.")
-   (license (list license:expat license:asl2.0))))
-
 (define-public rust-syntex-errors-0.58
   (package
     (name "rust-syntex-errors")
@@ -61606,8 +66216,46 @@ no_std compatible by default, only relying on alloc.")
         ("rust-errno" ,rust-errno-0.2)
         ("rust-libc" ,rust-libc-0.2))))))
 
+(define-public rust-sysinfo-0.27
+  (package
+    (name "rust-sysinfo")
+    (version "0.27.8")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "sysinfo" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0cqy39g76298pqfr8jv30j6cxl9bpnd7c2smfxl5s2na1w2yj0m9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       (list "--release" "--"
+             ;; These files aren't available in the build environment.
+             "--skip=test::check_system_info"
+             "--skip=test::check_uid_gid"
+             "--skip=test_networks"
+             "--skip=test_wait_non_child"
+             "--skip=test_process_disk_usage")
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-ntapi" ,rust-ntapi-0.4)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/GuillaumeGomez/sysinfo")
+    (synopsis "System handler to interact with processes")
+    (description
+     "This package is a library to get system information such as processes,
+processors, disks, components and networks.")
+    (license license:expat)))
+
 (define-public rust-sysinfo-0.15
   (package
+    (inherit rust-sysinfo-0.27)
     (name "rust-sysinfo")
     (version "0.15.11")
     (source (origin
@@ -61617,7 +66265,6 @@ no_std compatible by default, only relying on alloc.")
               (sha256
                (base32
                 "0n713rhayp28z8j4pviqcg4blcp1yfvniwa1ipinp75hyv7lq0nx"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs (("rust-cc" ,rust-cc-1)
@@ -61628,13 +66275,7 @@ no_std compatible by default, only relying on alloc.")
                        ("rust-ntapi" ,rust-ntapi-0.3)
                        ("rust-once-cell" ,rust-once-cell-1)
                        ("rust-rayon" ,rust-rayon-1)
-                       ("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/GuillaumeGomez/sysinfo")
-    (synopsis "System handler to interact with processes")
-    (description
-     "This package is a library to get system information such as processes,
-processors, disks, components and networks.")
-    (license license:expat)))
+                       ("rust-winapi" ,rust-winapi-0.3))))))
 
 (define-public rust-sysinfo-0.23
   (package
@@ -61842,26 +66483,6 @@ provides both a library for wrapping Rust @code{Writer}s and a small program
 that exposes the same functionality at the command line.")
     (license (list license:unlicense license:expat))))
 
-(define-public rust-take-0.1
-  (package
-    (name "rust-take")
-    (version "0.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "take" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1i8p579k9kq21k7pcm4yzbc12xpshl39jfa5c1j6pxf1ia6qcmxi"))))
-    (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
-    (home-page "https://github.com/carllerche/take")
-    (synopsis "Simple container utility for Rust")
-    (description
-     "This package provides a cell allowing the inner value to be consumed
-without a mutable reference.")
-    (license (list license:expat license:asl2.0))))
-
 (define-public rust-take-mut-0.2
   (package
     (name "rust-take-mut")
@@ -61993,17 +66614,19 @@ memory all at once.")
 (define-public rust-target-lexicon-0.12
   (package
     (name "rust-target-lexicon")
-    (version "0.12.4")
+    (version "0.12.9")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "target-lexicon" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1hfk4v8gbhczr6jwsy1ja6yg4npkvznym6b7r4fbgjc0fw428960"))))
+        (base32 "180iwqwvdk586b1b27anfddq5zbfckisgi3yjhdzaqbsfp5pg3nz"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
-    (home-page "https://github.com/CraneStation/target-lexicon")
+    (arguments
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/bytecodealliance/target-lexicon")
     (synopsis "Targeting utilities for compilers and related tools")
     (description
      "This package provides targeting utilities for compilers and related
@@ -62755,24 +67378,24 @@ deleting all contents when it's dropped.")
 (define-public rust-tempfile-3
   (package
     (name "rust-tempfile")
-    (version "3.3.0")
+    (version "3.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tempfile" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1r3rdp66f7w075mz6blh244syr3h0lbm07ippn7xrbgfxbs1xnsw"))))
+        (base32 "163rp254r3x7i5hisagrpxid2166pq94jvk511dpkmc1yf2fryxr"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-fastrand" ,rust-fastrand-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-redox-syscall" ,rust-redox-syscall-0.2)
-        ("rust-remove-dir-all" ,rust-remove-dir-all-0.5)
-        ("rust-winapi" ,rust-winapi-0.3))))
+        ("rust-redox-syscall" ,rust-redox-syscall-0.3)
+        ("rust-rustix" ,rust-rustix-0.37)
+        ("rust-windows-sys" ,rust-windows-sys-0.45))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3))))
     (home-page "https://stebalien.com/projects/tempfile-rs")
     (synopsis "Library for managing temporary files and directories")
     (description
@@ -62781,6 +67404,29 @@ directories.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-tempfile-fast-0.3
+  (package
+    (name "rust-tempfile-fast")
+    (version "0.3.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "tempfile-fast" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1xksx1l1019k9q0az9mhqsgb14w0vm88yax30iq6178s3d9yhjx7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/FauxFaux/tempfile-fast-rs")
+    (synopsis "Support for Linux-specific tempfile extensions")
+    (description
+     "This package provides support for Linux-specific tempfile extensions.")
+    (license license:expat)))
+
 (define-public rust-tendril-0.4
   (package
     (name "rust-tendril")
@@ -62813,22 +67459,33 @@ directories.")
 (define-public rust-tera-1
   (package
     (name "rust-tera")
-    (version "1.15.0")
+    (version "1.18.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tera" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "13dmx1qfn66v55l54gddp89mi82ghszwml9jyv75phhmnqqwijnk"))))
+        (base32 "1h3hgixby1vsfgk83ww09aq25p74jhqf48b7ql1jmwh22dsnb9lm"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* "Cargo.toml"
+                  (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                   (string-append "\"^" version)))))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:cargo-test-flags
+       (list "--release" "--"
+             ;; Not all files included.
+             "--skip=tera::tests::full_reload_with_glob"
+             "--skip=tera::tests::full_reload_with_glob_after_extending"
+             "--skip=tera::tests::can_load_from_glob_with_patterns"
+             "--skip=tera::tests::can_load_from_glob")
        #:cargo-inputs
        (("rust-chrono" ,rust-chrono-0.4)
         ("rust-chrono-tz" ,rust-chrono-tz-0.6)
         ("rust-globwalk" ,rust-globwalk-0.8)
-        ("rust-humansize" ,rust-humansize-1)
+        ("rust-humansize" ,rust-humansize-2)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-percent-encoding" ,rust-percent-encoding-2)
         ("rust-pest" ,rust-pest-2)
@@ -62838,7 +67495,11 @@ directories.")
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-slug" ,rust-slug-0.1)
-        ("rust-unic-segment" ,rust-unic-segment-0.9))))
+        ("rust-unic-segment" ,rust-unic-segment-0.9))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://tera.netlify.com/")
     (synopsis "Template engine based on Jinja2/Django templates")
     (description
@@ -63073,6 +67734,37 @@ writing colored text to a terminal.")
        #:cargo-inputs
        (("rust-wincolor" ,rust-wincolor-0.1))))))
 
+(define-public rust-termimad-0.20
+  (package
+    (name "rust-termimad")
+    (version "0.20.6")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "termimad" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "11qj19k1bry9pf78r515sgamnjia8s3irqyc4vr1qq0ppjs49ayg"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin (substitute* "Cargo.toml"
+                         (("=([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)" _ version)
+                          (string-append "^" version)))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; Cut the dependency graph
+       #:cargo-inputs
+       (("rust-coolor" ,rust-coolor-0.5)
+        ("rust-crossbeam" ,rust-crossbeam-0.8)
+        ("rust-crossterm" ,rust-crossterm-0.23)
+        ("rust-minimad" ,rust-minimad-0.9)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-unicode-width" ,rust-unicode-width-0.1))))
+    (home-page "https://github.com/Canop/termimad")
+    (synopsis "Markdown Renderer for the Terminal")
+    (description "Markdown Renderer for the Terminal.")
+    (license license:expat)))
+
 (define-public rust-terminal-size-0.2
   (package
     (name "rust-terminal-size")
@@ -63235,8 +67927,40 @@ return values to @code{std::io::Result} to indicate success or failure.")
 streams.")
     (license license:expat)))
 
+(define-public rust-test-case-3
+  (package
+    (name "rust-test-case")
+    (version "3.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "test-case" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1pr53g4x6gykfj4hvffivyd0aa0hj9pbfr87y8908sskvrxnw79a"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f          ; Not all test files included.
+       #:cargo-inputs
+       (("rust-regex" ,rust-regex-1)
+        ("rust-test-case-macros" ,rust-test-case-macros-3))
+       #:cargo-development-inputs
+       (("rust-insta" ,rust-insta-1)
+        ("rust-itertools" ,rust-itertools-0.10)
+        ("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/frondeus/test-case")
+    (synopsis "Procedural macro attribute for parametrized test cases")
+    (description
+     "This crate provides @code{#[test_case]} procedural macro attribute that
+generates multiple parametrized tests using one body with different input
+parameters.  A test is generated for each data set passed in test_case
+attribute.  Under the hood, all test cases that share same body are grouped
+into mod, giving clear and readable test results.")
+    (license license:expat)))
+
 (define-public rust-test-case-2
   (package
+    (inherit rust-test-case-3)
     (name "rust-test-case")
     (version "2.2.2")
     (source (origin
@@ -63250,7 +67974,6 @@ streams.")
                '(begin (substitute* "Cargo.toml"
                          (("=([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)" _ version)
                           (string-append "^" version)))))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f              ; Not all files included.
        #:cargo-inputs
@@ -63263,16 +67986,7 @@ streams.")
         ("rust-linked-hash-map" ,rust-linked-hash-map-0.5)
         ("rust-once-cell" ,rust-once-cell-1)
         ("rust-regex" ,rust-regex-1)
-        ("rust-serde-yaml" ,rust-serde-yaml-0.8))))
-    (home-page "https://github.com/frondeus/test-case")
-    (synopsis "Procedural macro attribute for parametrized test cases")
-    (description
-     "This crate provides @code{#[test_case]} procedural macro attribute that
-generates multiple parametrized tests using one body with different input
-parameters.  A test is generated for each data set passed in test_case
-attribute.  Under the hood, all test cases that share same body are grouped
-into mod, giving clear and readable test results.")
-    (license license:expat)))
+        ("rust-serde-yaml" ,rust-serde-yaml-0.8))))))
 
 (define-public rust-test-case-1
   (package
@@ -63297,16 +68011,17 @@ into mod, giving clear and readable test results.")
        (("rust-insta" ,rust-insta-0.12)
         ("rust-lazy-static" ,rust-lazy-static-1))))))
 
-(define-public rust-test-case-macros-2
+(define-public rust-test-case-core-3
   (package
-    (name "rust-test-case-macros")
-    (version "2.2.2")
+    (name "rust-test-case-core")
+    (version "3.1.0")
     (source (origin
               (method url-fetch)
-              (uri (crate-uri "test-case-macros" version))
+              (uri (crate-uri "test-case-core" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "09jvbfvz48v6ya3i25gp3lbr6ym1fz7qyp3l6bcdslwkw7v7nnz4"))))
+               (base32
+                "1vhckjjw4w1kaanhgy6bw8kdr8ligr68bz5nfbvr8xz2s7ar80yi"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -63316,12 +68031,57 @@ into mod, giving clear and readable test results.")
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))
     (home-page "https://github.com/frondeus/test-case")
+    (synopsis "Core functionality for the test-case crate")
+    (description
+     "This package provides core functionality for parsing #[test_case(...)]
+procedural macro attribute for generating parametrized test cases easily")
+    (license license:expat)))
+
+(define-public rust-test-case-macros-3
+  (package
+    (name "rust-test-case-macros")
+    (version "3.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "test-case-macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "014l5wafp069d251c62flwyai8nv75vpjlmib2xc2m3a3i5s9fgf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro-error" ,rust-proc-macro-error-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1)
+        ("rust-test-case-core" ,rust-test-case-core-3))))
+    (home-page "https://github.com/frondeus/test-case")
     (synopsis "Macros for the test-case crate")
     (description
      "This package provides #[test_case(...)] procedural macro attribute for
 generating parametrized test cases easily.")
     (license license:expat)))
 
+(define-public rust-test-case-macros-2
+  (package
+    (inherit rust-test-case-macros-3)
+    (name "rust-test-case-macros")
+    (version "2.2.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "test-case-macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "09jvbfvz48v6ya3i25gp3lbr6ym1fz7qyp3l6bcdslwkw7v7nnz4"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-proc-macro-error" ,rust-proc-macro-error-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-test-cert-gen-0.7
   (package
     (name "rust-test-cert-gen")
@@ -63373,6 +68133,37 @@ one body with different resource input parameters.  A test is generated for
 each resource matching the specific resource location pattern.")
     (license license:asl2.0)))
 
+(define-public rust-test-log-0.2
+  (package
+    (name "rust-test-log")
+    (version "0.2.11")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "test-log" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "03pmvrg6lc2qgnby9w2fhn1vzqysbl643p7jy14a0s7bz9aciw1q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.9)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-futures" ,rust-tracing-futures-0.2)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+    (home-page "https://github.com/d-e-s-o/test-log")
+    (synopsis "Replacement of the #[test] attribute that initializes logging")
+    (description
+     "This package provides a replacement of the #[test] attribute that initializes
+logging and/or tracing infrastructure before running tests.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-test-strategy-0.2
   (package
     (name "rust-test-strategy")
@@ -63401,6 +68192,42 @@ each resource matching the specific resource location pattern.")
 strategies in proptest.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-test-with-0.8
+  (package
+    (name "rust-test-with")
+    (version "0.8.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "test-with" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1vaqbyixd8li4jb9akvrbc6yfm0kl435byggg0kghrdl32hpn6ay"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-byte-unit" ,rust-byte-unit-4)
+        ("rust-num-cpus" ,rust-num-cpus-1)
+        ("rust-ping" ,rust-ping-0.4)
+        ("rust-proc-macro-error" ,rust-proc-macro-error-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-reqwest" ,rust-reqwest-0.11)
+        ("rust-syn" ,rust-syn-1)
+        ("rust-sysinfo" ,rust-sysinfo-0.27)
+        ("rust-users" ,rust-users-0.11))
+       #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list openssl))
+    (home-page "https://github.com/yanganto/test-with")
+    (synopsis "Run test with conditions")
+    (description
+     "This package provides a lib to help you run test with conditions in Rust.")
+    (license license:expat)))
+
 (define-public rust-tester-0.9
   (package
     (name "rust-tester")
@@ -63452,6 +68279,25 @@ unstable language features.")
         ("rust-libc" ,rust-libc-0.2)
         ("rust-term" ,rust-term-0.4))))))
 
+(define-public rust-testing-logger-0.1
+  (package
+    (name "rust-testing-logger")
+    (version "0.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "testing-logger" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "087pi7y9iisspafyzblj41qvrw95dfb6px7pavlkmls5rckvg4kd"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-log" ,rust-log-0.4))))
+    (home-page "https://github.com/brucechapman/rust_testing_logger")
+    (synopsis "Supports writing tests to verify `log` crate calls")
+    (description "Supports writing tests to verify `log` crate calls.")
+    (license license:bsd-3)))
+
 (define-public rust-text-size-1
   (package
     (name "rust-text-size")
@@ -63714,20 +68560,21 @@ different for every thread.")
 (define-public rust-thread-local-1
   (package
     (name "rust-thread-local")
-    (version "1.1.3")
+    (version "1.1.7")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "thread_local" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1gccp3grndpi6dyhzylz4hkqnkzc1xyri98n0xwwhnn90i7d4640"))))
+        (base32 "0lp19jdgvp5m4l60cgxdnl00yw1hlqy8gcywg9bddwng9h36zp9z"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-once-cell" ,rust-once-cell-1))))
+     `(#:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-once-cell" ,rust-once-cell-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4))))
     (home-page "https://github.com/Amanieu/thread_local-rs")
     (synopsis "Per-object thread-local storage")
     (description "Per-object thread-local storage.")
@@ -64888,11 +69735,10 @@ the current thread.")
     (description "This package provides future execution primitives.")
     (license license:expat)))
 
-;; Cyclic dependency with rust-tokio.
 (define-public rust-tokio-executor-0.1
   (package
     (name "rust-tokio-executor")
-    (version "0.1.7")
+    (version "0.1.10")
     (source
      (origin
        (method url-fetch)
@@ -64901,12 +69747,11 @@ the current thread.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0pjmgpg58k3hf5q9w6xjljsv8xy66lf734qnfwsc0g3pq3349sl3"))))
+         "0w8n78d2vixs1vghqc4wy9w0d1h6qkli51c1yzhzbns88n7inbgv"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)
+     `(#:cargo-inputs
+       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)
         ("rust-futures" ,rust-futures-0.1))
        #:cargo-development-inputs
        (("rust-tokio" ,rust-tokio-0.1))))
@@ -65311,7 +70156,7 @@ in Rust.")
 (define-public rust-tokio-process-0.2
   (package
     (name "rust-tokio-process")
-    (version "0.2.4")
+    (version "0.2.5")
     (source
      (origin
        (method url-fetch)
@@ -65320,11 +70165,10 @@ in Rust.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1s6vi5n5iax4ksx3bzpfdhfbngj49mvq5n40np1d4aycp3qnxgdg"))))
+         "0hvygspal1v62kamkjxqygzr8cwnakccziivbnzaw7537zs90b9q"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-crossbeam-queue" ,rust-crossbeam-queue-0.1)
         ("rust-futures" ,rust-futures-0.1)
         ("rust-lazy-static" ,rust-lazy-static-1)
@@ -65351,7 +70195,7 @@ futures.")
 (define-public rust-tokio-reactor-0.1
   (package
     (name "rust-tokio-reactor")
-    (version "0.1.9")
+    (version "0.1.12")
     (source
      (origin
        (method url-fetch)
@@ -65360,17 +70204,22 @@ futures.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1khip64cn63xvayq1db68kxcnhgw3cb449a4n2lbw4p1qzx6pwba"))))
+         "0l8klnd41q55f3ialzz0lb7s5bfwa38nh86sa9vai2xsqh75kg09"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* "Cargo.toml"
+                  (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                   (string-append "\"^" version)))))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)
+       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)
         ("rust-futures" ,rust-futures-0.1)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-log" ,rust-log-0.4)
         ("rust-mio" ,rust-mio-0.6)
         ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-parking-lot" ,rust-parking-lot-0.7)
+        ("rust-parking-lot" ,rust-parking-lot-0.9)
         ("rust-slab" ,rust-slab-0.4)
         ("rust-tokio-executor" ,rust-tokio-executor-0.1)
         ("rust-tokio-io" ,rust-tokio-io-0.1)
@@ -65525,31 +70374,6 @@ Rustls.")
         ("rust-webpki-roots" ,rust-webpki-roots-0.18))))
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-tokio-rustls-0.10
-  (package
-    (inherit rust-tokio-rustls-0.12)
-    (name "rust-tokio-rustls")
-    (version "0.10.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "tokio-rustls" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0xh6gxilm7waj55rxfgqmvl8abynzr3ang57qvbap400k67z0z1d"))))
-    (arguments
-     `(#:cargo-test-flags '("--release" "--" "--skip=test_badssl")
-       #:cargo-inputs
-       (("rust-bytes" ,rust-bytes-0.4)
-        ("rust-futures" ,rust-futures-0.1)
-        ("rust-iovec" ,rust-iovec-0.1)
-        ("rust-rustls" ,rust-rustls-0.16)
-        ("rust-tokio-io" ,rust-tokio-io-0.1)
-        ("rust-webpki" ,rust-webpki-0.21))
-       #:cargo-development-inputs
-       (("rust-tokio" ,rust-tokio-0.1)
-        ("rust-webpki-roots" ,rust-webpki-roots-0.17))))))
-
 (define-public rust-tokio-rustls-0.9
   (package
     (inherit rust-tokio-rustls-0.12)
@@ -65667,25 +70491,26 @@ Rust.")
 (define-public rust-tokio-stream-0.1
   (package
     (name "rust-tokio-stream")
-    (version "0.1.0")
+    (version "0.1.14")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tokio-stream" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0airchgn5zwzynchygdr8m7i4nizhfmifjz0iw6224sbnw9yjfrz"))))
+        (base32 "0hi8hcwavh5sdi1ivc9qc4yvyr32f153c212dpd7sb366y6rhz1r"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #false                  ;FIXME: unresolved import
+     `(#:tests? #false      ; unresolved import `tokio_test`
        #:cargo-inputs
        (("rust-async-stream" ,rust-async-stream-0.3)
-        ("rust-futures-core" ,rust-futures-core-0.3)
         ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
-        ("rust-tokio" ,rust-tokio-1))
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-util" ,rust-tokio-util-0.7))
        #:cargo-development-inputs
-       (("rust-futures" ,rust-futures-0.3)
-        ("rust-proptest" ,rust-proptest-0.10)
+       (("rust-async-stream" ,rust-async-stream-0.3)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-parking-lot" ,rust-parking-lot-0.12)
         ("rust-tokio" ,rust-tokio-1))))
     (home-page "https://tokio.rs")
     (synopsis "Utilities to work with @code{Stream} and @code{tokio}")
@@ -65746,14 +70571,14 @@ Rust.")
 (define-public rust-tokio-test-0.4
   (package
     (name "rust-tokio-test")
-    (version "0.4.0")
+    (version "0.4.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tokio-test" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1gwrqdwlfih6ib66wxc7yaaq7a9mlsmnxj2ahag3zc2rdxgj0zbw"))))
+        (base32 "1qv3h6y0c87i22p3q6sqvq2a1y5lzim9abbzs4q6a5jymqkl6isk"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -65848,7 +70673,7 @@ futures-based code.")
 (define-public rust-tokio-threadpool-0.1
   (package
     (name "rust-tokio-threadpool")
-    (version "0.1.14")
+    (version "0.1.18")
     (source
      (origin
        (method url-fetch)
@@ -65857,23 +70682,23 @@ futures-based code.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1wkj3wixicsqvllm8w74b24knw6mdn00zslm8l9fm1p81gr8lmbj"))))
+         "12azq8jm71b7hdm72pxrgqm2879bn6b0fcdl1s7i2k3qh5jhnwnz"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7)
-        ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.1)
-        ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)
-        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.2)
+        ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)
         ("rust-futures" ,rust-futures-0.1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-log" ,rust-log-0.4)
         ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-rand" ,rust-rand-0.6)
         ("rust-slab" ,rust-slab-0.4)
         ("rust-tokio-executor" ,rust-tokio-executor-0.1))
        #:cargo-development-inputs
-       (("rust-env-logger" ,rust-env-logger-0.5)
+       (("rust-env-logger" ,rust-env-logger-0.6)
         ("rust-futures-cpupool" ,rust-futures-cpupool-0.1)
+        ("rust-rand" ,rust-rand-0.7)
         ("rust-threadpool" ,rust-threadpool-1))))
     (home-page "https://github.com/tokio-rs/tokio")
     (synopsis
@@ -65886,7 +70711,7 @@ pool.")
 (define-public rust-tokio-timer-0.2
   (package
     (name "rust-tokio-timer")
-    (version "0.2.11")
+    (version "0.2.13")
     (source
      (origin
        (method url-fetch)
@@ -65895,17 +70720,16 @@ pool.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "03m68ainkdy3b5pf20rjyknhk2ppx35bjdc2yfj2bv80sl96h47j"))))
+         "15pjjj6daks3sii8p24a509b0dapl2kyk740nwfgz59w64nly14k"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)
+     `(#:cargo-inputs
+       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)
         ("rust-futures" ,rust-futures-0.1)
         ("rust-slab" ,rust-slab-0.4)
         ("rust-tokio-executor" ,rust-tokio-executor-0.1))
        #:cargo-development-inputs
-       (("rust-rand" ,rust-rand-0.4)
+       (("rust-rand" ,rust-rand-0.7)
         ("rust-tokio" ,rust-tokio-0.1)
         ("rust-tokio-mock-task" ,rust-tokio-mock-task-0.1))))
     (home-page "https://github.com/tokio-rs/tokio")
@@ -66250,6 +71074,38 @@ stream-based WebSocket implementation.")
         ("rust-tokio" ,rust-tokio-0.2)
         ("rust-tokio-test" ,rust-tokio-test-0.2))))))
 
+(define-public rust-tokio-vsock-0.3
+  (package
+    (name "rust-tokio-vsock")
+    (version "0.3.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "tokio-vsock" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1g1fhsibfdgsqayjr9gxkd5npgxh8rj36pcb9pi1c7ci51l5acwv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--" "--skip=test_vsock_server")
+       #:cargo-inputs
+       (("rust-bytes" ,rust-bytes-0.4)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tonic" ,rust-tonic-0.6)
+        ("rust-vsock" ,rust-vsock-0.2))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.8)
+        ("rust-sha2" ,rust-sha2-0.9)
+        ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/rust-vsock/tokio-vsock")
+    (synopsis "Asynchronous Virtio socket support for Rust")
+    (description
+     "This package provides asynchronous Virtio socket support for Rust.")
+    (license license:asl2.0)))
+
 (define-public rust-toml-0.7
   (package
     (name "rust-toml")
@@ -66591,17 +71447,17 @@ parser.")
 (define-public rust-tonic-0.6
   (package
     (name "rust-tonic")
-    (version "0.6.1")
+    (version "0.6.2")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "tonic" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32 "1yjsnfkkq3c7xcyxkid0zgpm8w774qqdny0im6fr0s1drxwkn814"))))
+          (base32 "02jxiy0n2mw2c1fchykj3m18wp986685bji26px0z9qhkmjg827z"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:skip-build? #t
+      `(#:tests? #f     ; unresolved import `crate::codec::compression`
         #:cargo-inputs
         (("rust-async-stream" ,rust-async-stream-0.3)
          ("rust-async-trait" ,rust-async-trait-0.1)
@@ -66629,7 +71485,15 @@ parser.")
          ("rust-tower-service" ,rust-tower-service-0.3)
          ("rust-tracing" ,rust-tracing-0.1)
          ("rust-tracing-futures" ,rust-tracing-futures-0.2)
-         ("rust-webpki-roots" ,rust-webpki-roots-0.21))))
+         ("rust-webpki-roots" ,rust-webpki-roots-0.21))
+        #:cargo-development-inputs
+        (("rust-bencher" ,rust-bencher-0.1)
+         ("rust-quickcheck" ,rust-quickcheck-1)
+         ("rust-quickcheck-macros" ,rust-quickcheck-macros-1)
+         ("rust-rand" ,rust-rand-0.8)
+         ("rust-static-assertions" ,rust-static-assertions-1)
+         ("rust-tokio" ,rust-tokio-1)
+         ("rust-tower" ,rust-tower-0.4))))
     (home-page "https://github.com/hyperium/tonic")
     (synopsis "gRPC over HTTP/2 implementation for Rust")
     (description
@@ -66802,27 +71666,26 @@ server @code{Service} tests.")
 (define-public rust-tracing-0.1
   (package
     (name "rust-tracing")
-    (version "0.1.36")
+    (version "0.1.38")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tracing" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "01s3qsm1jfz4h4l401lhy8j2yfds45kpb234l447v9k0pmkrbkig"))))
+        (base32 "0kc1mpsh00l2zd9wryf1jyzwvilmbjdg5dmnn240rx6k2flgd76g"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-cfg-if" ,rust-cfg-if-1)
-        ("rust-log" ,rust-log-0.4)
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-log" ,rust-log-0.4)
         ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
         ("rust-tracing-attributes" ,rust-tracing-attributes-0.1)
         ("rust-tracing-core" ,rust-tracing-core-0.1))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-futures" ,rust-futures-0.1)
+        ("rust-futures" ,rust-futures-0.3)
         ("rust-log" ,rust-log-0.4)
-        ("rust-tokio" ,rust-tokio-0.2)
         ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
     (home-page "https://tokio.rs")
     (synopsis "Application-level tracing for Rust")
@@ -66833,7 +71696,7 @@ programs to collect structured, event-based diagnostic information.")
 (define-public rust-tracing-attributes-0.1
   (package
     (name "rust-tracing-attributes")
-    (version "0.1.22")
+    (version "0.1.26")
     (source
      (origin
        (method url-fetch)
@@ -66841,19 +71704,21 @@ programs to collect structured, event-based diagnostic information.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1qjf90dvc9jiw78bjzb3iqzrhaybypg8nm0n0zhwi6smmy9miiqi"))))
+         "1ax44ldpbcb7dsvpljiv2krnx6xp0hs85zcyv8385sarc7sk2ksz"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:tests? #f
+       #:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))
+        ("rust-syn" ,rust-syn-2))
        #:cargo-development-inputs
        (("rust-async-trait" ,rust-async-trait-0.1)
-        ("rust-tokio-test" ,rust-tokio-test-0.3)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-tokio-test" ,rust-tokio-test-0.4)
         ("rust-tracing" ,rust-tracing-0.1)
-        ("rust-tracing-core" ,rust-tracing-core-0.1)
-        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-trybuild" ,rust-trybuild-1))))
     (home-page "https://tokio.rs")
     (synopsis "Automatically instrument functions")
     (description "This package provides procedural macro attributes for
@@ -66863,7 +71728,7 @@ automatically instrumenting functions.")
 (define-public rust-tracing-core-0.1
   (package
     (name "rust-tracing-core")
-    (version "0.1.29")
+    (version "0.1.31")
     (source
      (origin
        (method url-fetch)
@@ -66871,7 +71736,7 @@ automatically instrumenting functions.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1xr2dqar64fj4y43vy0xvaxs6n3xssd3z0jbf408lmbn60qa9vjs"))))
+         "16pp28izw9c41m7c55qsghlz07r9ark8lzd3x6ig3xhxg89vhm89"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -66918,7 +71783,7 @@ automatically instrumenting functions.")
 (define-public rust-tracing-log-0.1
   (package
     (name "rust-tracing-log")
-    (version "0.1.2")
+    (version "0.1.3")
     (source
      (origin
        (method url-fetch)
@@ -66927,16 +71792,19 @@ automatically instrumenting functions.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1qv1cwvdqrgvizkszbff4fvkw0m3nn5yz68r3yaw2hcflivk94m6"))))
+         "08prnkxq8yas6jvvjnvyx5v3hwblas5527wxxgbiw2yis8rsvpbq"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-env-logger" ,rust-env-logger-0.7)
+       (("rust-ahash" ,rust-ahash-0.7)
+        ("rust-env-logger" ,rust-env-logger-0.7)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-log" ,rust-log-0.4)
+        ("rust-lru" ,rust-lru-0.7)
         ("rust-tracing-core" ,rust-tracing-core-0.1))
        #:cargo-development-inputs
-       (("rust-tracing" ,rust-tracing-0.1))))
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-tracing" ,rust-tracing-0.1))))
     (home-page "https://tokio.rs")
     (synopsis
      "Provides compatibility between tracing the log crates")
@@ -66961,19 +71829,21 @@ with tracing (optional, enabled by the env-logger feature).
 (define-public rust-tracing-serde-0.1
   (package
     (name "rust-tracing-serde")
-    (version "0.1.2")
+    (version "0.1.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "tracing-serde" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "12xjirg0b3cparjdhkd9pksrmv33gz7rdm4gfkvgk15v3x2flrgv"))))
+        (base32 "1qfr0va69djvxqvjrx4vqq7p6myy414lx4w1f6amcn0hfwqj2sxw"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-serde" ,rust-serde-1)
-        ("rust-tracing-core" ,rust-tracing-core-0.1))
+        ("rust-tracing-core" ,rust-tracing-core-0.1)
+        ("rust-valuable" ,rust-valuable-0.1)
+        ("rust-valuable-serde" ,rust-valuable-serde-0.1))
        #:cargo-development-inputs
        (("rust-serde-json" ,rust-serde-json-1))))
     (home-page "https://tokio.rs")
@@ -66987,22 +71857,22 @@ with @code{serde}.")
 (define-public rust-tracing-subscriber-0.3
   (package
     (name "rust-tracing-subscriber")
-    (version "0.3.5")
+    (version "0.3.17")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "tracing-subscriber" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32 "157mz6q0ljpragrj4hsv5rchyabsbfc7r0sb0g5rik142jlbz0ax"))))
+          (base32 "0xvwfpmb943hdy4gzyn7a2azgigf30mfd1kx10gyh5gr6yy539ih"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:skip-build? #t
+      `(#:tests? #f     ; use of undeclared crate or module `tracing_mock`
         #:cargo-inputs
-        (("rust-ansi-term" ,rust-ansi-term-0.12)
-         ("rust-lazy-static" ,rust-lazy-static-1)
-         ("rust-matchers" ,rust-matchers-0.1)
-         ("rust-parking-lot" ,rust-parking-lot-0.11)
+        (("rust-matchers" ,rust-matchers-0.1)
+         ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.46)
+         ("rust-once-cell" ,rust-once-cell-1)
+         ("rust-parking-lot" ,rust-parking-lot-0.12)
          ("rust-regex" ,rust-regex-1)
          ("rust-serde" ,rust-serde-1)
          ("rust-serde-json" ,rust-serde-json-1)
@@ -67013,7 +71883,18 @@ with @code{serde}.")
          ("rust-tracing" ,rust-tracing-0.1)
          ("rust-tracing-core" ,rust-tracing-core-0.1)
          ("rust-tracing-log" ,rust-tracing-log-0.1)
-         ("rust-tracing-serde" ,rust-tracing-serde-0.1))))
+         ("rust-tracing-serde" ,rust-tracing-serde-0.1)
+         ("rust-valuable" ,rust-valuable-0.1)
+         ("rust-valuable-serde" ,rust-valuable-serde-0.1))
+        #:cargo-development-inputs
+        (("rust-criterion" ,rust-criterion-0.3)
+         ("rust-log" ,rust-log-0.4)
+         ("rust-regex" ,rust-regex-1)
+         ("rust-time" ,rust-time-0.3)
+         ("rust-tokio" ,rust-tokio-1)
+         ("rust-tracing" ,rust-tracing-0.1)
+         ("rust-tracing-futures" ,rust-tracing-futures-0.2)
+         ("rust-tracing-log" ,rust-tracing-log-0.1))))
     (home-page "https://tokio.rs")
     (synopsis "Implement and compose tracing subscribers")
     (description
@@ -67175,26 +72056,31 @@ be used directly.  See @code{rust-trackable} for more information.")
 (define-public rust-trash-2
   (package
     (name "rust-trash")
-    (version "2.0.2")
+    (version "2.1.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "trash" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1g3wjnr5qvgvvi144mlgf0mh80dybmy9zv2xyswpm55p5p5vdsyk"))))
+        (base32 "14ji8b84ghwkln01v90ahhl2jkxv2qxkm0afprzphf1ln41k6nqi"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-chrono" ,rust-chrono-0.4)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-log" ,rust-log-0.4)
         ("rust-objc" ,rust-objc-0.2)
+        ("rust-once-cell" ,rust-once-cell-1)
         ("rust-scopeguard" ,rust-scopeguard-1)
         ("rust-url" ,rust-url-2)
-        ("rust-windows" ,rust-windows-0.9)
-        ("rust-windows" ,rust-windows-0.9))))
+        ("rust-windows" ,rust-windows-0.9))
+       #:cargo-development-inputs
+       (("rust-chrono" ,rust-chrono-0.4)
+        ("rust-env-logger" ,rust-env-logger-0.9)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-serial-test" ,rust-serial-test-0.6))))
     (home-page "https://github.com/ArturKovacs/trash-rs")
     (synopsis "Library for moving files and folders to the recycle bin")
     (description
@@ -67288,6 +72174,58 @@ etc. distance calculations and string search.")
        (sha256
         (base32 "0v795l496crk3h6yff9zh1cjyrh5s9v23fbgccc4dpz25z70jav2"))))))
 
+(define-public rust-trust-dns-client-0.22
+  (package
+    (name "rust-trust-dns-client")
+    (version "0.22.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "trust-dns-client" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1znkfhzwikii6v9k98ccbn3krwic1xs3bknf6y0b7nx9wqr8qh3c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Tests require network access.
+       #:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-data-encoding" ,rust-data-encoding-2)
+        ("rust-futures-channel" ,rust-futures-channel-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-openssl" ,rust-openssl-0.10)
+        ("rust-radix-trie" ,rust-radix-trie-0.2)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-ring" ,rust-ring-0.16)
+        ("rust-rustls" ,rust-rustls-0.20)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.22)
+        ("rust-webpki" ,rust-webpki-0.22))
+       #:cargo-development-inputs
+       (("rust-futures" ,rust-futures-0.3)
+        ("rust-openssl" ,rust-openssl-0.10)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list openssl))
+    (home-page "https://trust-dns.org/")
+    (synopsis "DNS library with DNSSEC support")
+    (description
+     "Trust-DNS is a DNS library.  This is the Client library with DNSSEC
+support.  DNSSEC with NSEC validation for negative records, is complete.  The
+client supports dynamic DNS with SIG0 authenticated requests, implementing
+easy to use high level funtions.  Trust-DNS is based on the Tokio and Futures
+libraries, which means it should be easily integrated into other software that
+also use those libraries.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-trust-dns-https-0.20
   (package
     (name "rust-trust-dns-https")
@@ -68184,14 +73122,14 @@ the Trust-DNS client to use rustls for TLS.")
 (define-public rust-trybuild-1
   (package
     (name "rust-trybuild")
-    (version "1.0.77")
+    (version "1.0.81")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "trybuild" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "04rlcx55q7qbc17hv4znypwnm5n5d5ynbh5vsca8wk0nyakaakd4"))))
+        (base32 "0ab7ahdx563n6kbm14pm3qnxq4fp06pz42nh5ii4acvlzycnwdh4"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -68202,27 +73140,59 @@ the Trust-DNS client to use rustls for TLS.")
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-termcolor" ,rust-termcolor-1))))
+        ("rust-termcolor" ,rust-termcolor-1))
+       #:cargo-development-inputs (("rust-automod" ,rust-automod-1))))
     (home-page "https://github.com/dtolnay/trybuild")
     (synopsis "Test harness for ui tests of compiler diagnostics")
     (description
      "Test harness for ui tests of compiler diagnostics.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-trybuild2-1
+  (package
+    (name "rust-trybuild2")
+    (version "1.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "trybuild2" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0z5nv6skmzz4d74sbrsrd7smyhs76sh8dwz4pd1kbvjpzq2l3v8i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-basic-toml" ,rust-basic-toml-0.1)
+        ("rust-dissimilar" ,rust-dissimilar-1)
+        ("rust-glob" ,rust-glob-0.3)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-termcolor" ,rust-termcolor-1))
+       #:cargo-development-inputs (("rust-automod" ,rust-automod-1))))
+    (home-page "https://github.com/GuillaumeGomez/trybuild2")
+    (synopsis "Test harness for ui tests of compiler diagnostics")
+    (description
+     "This package provides a test harness for ui tests of compiler diagnostics
+(with support for inline tests).")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-trycmd-0.14
   (package
     (name "rust-trycmd")
-    (version "0.14.12")
+    (version "0.14.16")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "trycmd" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "10ag8s931glx0g1arj823dph27x77jc37nal733z7pal2g4dwiq3"))))
+               (base32 "13i5bmw4c8pansylgixfzknzm79g5n602rmi3qy1fax1d0cff999"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-escargot" ,rust-escargot-0.5)
+       (("rust-anstream" ,rust-anstream-0.3)
+        ("rust-escargot" ,rust-escargot-0.5)
         ("rust-glob" ,rust-glob-0.3)
         ("rust-humantime" ,rust-humantime-2)
         ("rust-humantime-serde" ,rust-humantime-serde-1)
@@ -68468,6 +73438,29 @@ design abstracts away all the internals of the WebSocket protocol but still
 makes them accessible for those who wants full control over the network.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-twofish-0.7
+  (package
+    (name "rust-twofish")
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "twofish" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "04w0ii2c0c9ws08aw6c7illh9zql22il9lbwjk1mgir30aiq73m7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cipher" ,rust-cipher-0.4))
+       #:cargo-development-inputs
+       (("rust-cipher" ,rust-cipher-0.4)
+        ("rust-hex-literal" ,rust-hex-literal-0.3))))
+    (home-page "https://github.com/RustCrypto/block-ciphers")
+    (synopsis "Twofish block cipher")
+    (description "Twofish block cipher")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-twoway-0.2
   (package
     (name "rust-twoway")
@@ -68748,8 +73741,30 @@ with the Unicode character database.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-uds-windows-1
+  (package
+    (name "rust-uds-windows")
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "uds-windows" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "03ckj6vnzvm4r5xd17dxyyqqqcfgs3xqj53hcswykk6k4i1n0rff"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-tempfile" ,rust-tempfile-3)
+        ("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/haraldh/rust_uds_windows")
+    (synopsis "Unix Domain Sockets for Windows")
+    (description "This library integrates Unix Domain Sockets on Windows.")
+    (license license:expat)))
+
 (define-public rust-uds-windows-0.1
   (package
+    (inherit rust-uds-windows-1)
     (name "rust-uds-windows")
     (version "0.1.5")
     (source
@@ -68759,17 +73774,12 @@ with the Unicode character database.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0mdv9xyrf8z8zr2py5drbilkncgrkg61axq6h7hcvgggklv9f14z"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-kernel32-sys" ,rust-kernel32-sys-0.2)
         ("rust-tempdir" ,rust-tempdir-0.3)
         ("rust-winapi" ,rust-winapi-0.2)
-        ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2))))
-    (home-page "https://github.com/haraldh/rust_uds_windows")
-    (synopsis "Unix Domain Sockets for Windows")
-    (description "This library integrates Unix Domain Sockets on Windows.")
-    (license license:expat)))
+        ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2))))))
 
 (define-public rust-ufmt-0.1
   (package
@@ -68887,6 +73897,27 @@ arithmetic.")
      "This package provides an utility to deal with Unix access mode.")
     (license license:expat)))
 
+(define-public rust-unarray-0.1
+  (package
+    (name "rust-unarray")
+    (version "0.1.4")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "unarray" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "154smf048k84prsdgh09nkm2n0w0336v84jd4zikyn6v6jrqbspa"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; use of undeclared crate or module `proptest`
+       #:cargo-development-inputs
+       (("rust-test-strategy" ,rust-test-strategy-0.2))))
+    (home-page "https://github.com/cameron1024/unarray")
+    (synopsis "Utilities for working with uninitialized arrays")
+    (description "Utilities for working with uninitialized arrays.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-uncased-0.9
   (package
     (name "rust-uncased")
@@ -68932,6 +73963,24 @@ arithmetic.")
      "Unchecked indexing wrapper using regular index syntax.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-unescape-0.1
+  (package
+    (name "rust-unescape")
+    (version "0.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "unescape" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0vlgws15n4kz8xq4igzr1f80nbiyr838k687hn6ly8a36an7vffc"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/saghm/unescape-rs")
+    (synopsis "Unescapes strings")
+    (description
+     "Unescapes strings with escape sequences written out as literal characters.")
+    (license license:expat)))
+
 (define-public rust-ungrammar-1
   (package
     (name "rust-ungrammar")
@@ -69168,7 +74217,7 @@ Unicode and Internationalization Crates (UNIC) project.")
 (define-public rust-unicode-bidi-0.3
   (package
     (name "rust-unicode-bidi")
-    (version "0.3.4")
+    (version "0.3.13")
     (source
      (origin
        (method url-fetch)
@@ -69177,14 +74226,13 @@ Unicode and Internationalization Crates (UNIC) project.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1malx8ljgm7v1gbaazkn7iicy5wj0bwcyadj3l727a38ch6bvwj9"))))
+         "0q0l7rdkiq54pan7a4ama39dgynaf1mnjj1nddrq1w1zayjqp24j"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f      ; Not all files included.
        #:cargo-inputs
        (("rust-flame" ,rust-flame-0.2)
-        ("rust-flamer" ,rust-flamer-0.3)
-        ("rust-matches" ,rust-matches-0.1)
+        ("rust-flamer" ,rust-flamer-0.4)
         ("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
        (("rust-serde-test" ,rust-serde-test-1))))
@@ -69216,14 +74264,14 @@ membership for characters in Rust.")
 (define-public rust-unicode-ident-1
   (package
     (name "rust-unicode-ident")
-    (version "1.0.3")
+    (version "1.0.8")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "unicode-ident" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1bqswc96ws8l6k7xx56dg521a3l5imi3mhlcz7rsi6a92mxb7xf4"))))
+                "1x4v4v95fv9gn5zbpm23sa9awjvmclap1wh1lmikmw9rna3llip5"))))
     (build-system cargo-build-system)
     ;; Most development inputs are competing implementations
     ;; for benchmarks.
@@ -69267,7 +74315,7 @@ breaking algorithm in Rust.")
 (define-public rust-unicode-normalization-0.1
   (package
     (name "rust-unicode-normalization")
-    (version "0.1.19")
+    (version "0.1.22")
     (source
      (origin
        (method url-fetch)
@@ -69275,7 +74323,7 @@ breaking algorithm in Rust.")
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1yabhmg8zlcksda3ajly9hpbzqgbhknxwch8dwkfkaa1569r0ifm"))))
+        (base32 "08d95g7b1irc578b2iyhzv4xhsa4pfvwsqxcl9lbcpabzkq16msw"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -69426,14 +74474,14 @@ whitespace from a string.")
 (define-public rust-uniquote-3
   (package
     (name "rust-uniquote")
-    (version "3.1.0")
+    (version "3.3.0")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "uniquote" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "1bkl0n41yvs415mqny4b434kr456ysnb3dhic1zrrzppwx95jvxa"))))
+         (base32 "037xznqcdvc3riy9498cfrzzdhj2591cz0dpiy0h9wxfnbp01aal"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/dylni/uniquote")
     (synopsis "Quote strings for clear display in output")
@@ -69567,6 +74615,30 @@ clear display in the output.")
      "Traits and implementations for unchecked downcasting.")
     (license license:expat)))
 
+;; This package was originally transpiled from libyaml, but has seen development
+;; since then, showing that it is in its editable form.
+(define-public rust-unsafe-libyaml-0.2
+  (package
+    (name "rust-unsafe-libyaml")
+    (version "0.2.8")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "unsafe-libyaml" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "19l0v20x83dvxbr68rqvs9hvawaqd929hia1nldfahlhamm80r8q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; use of undeclared crate or module `unsafe_libyaml_test_suite`
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1))))
+    (home-page "https://github.com/dtolnay/unsafe-libyaml")
+    (synopsis "Libyaml in rust")
+    (description "This package provides libyaml transpiled to rust by c2rust,
+with changes and updated applied to it.")
+    (license license:expat)))
+
 (define-public rust-unsafe-unwrap-0.1
   (package
     (name "rust-unsafe-unwrap")
@@ -69647,23 +74719,29 @@ comparable to calling @code{unwrap_err()}.")
 (define-public rust-ureq-2
   (package
     (name "rust-ureq")
-    (version "2.4.0")
+    (version "2.6.2")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "ureq" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1m8nzx683iph4zfpfg2xmkkbwmgf1i403lnbhxqk4gbsj8pzm6ck"))))
+                "0vf412wyfk1wpaknqiq2v7y5zy9djammgvgkmcx8zxhl2gfk32rk"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f ;tests fail
+     `(#:cargo-test-flags
+       (list "--release" "--"
+             ;; These tests want network access.
+             "--skip=test::range::read_range_rustls"
+             "--skip=tests::connect_http_google"
+             "--skip=tests::connect_https_google_rustls"
+             "--skip=tls_client_certificate"
+             "--skip=middleware::Middleware")
        #:cargo-inputs
        (("rust-base64" ,rust-base64-0.13)
         ("rust-brotli-decompressor" ,rust-brotli-decompressor-2)
-        ("rust-chunked-transfer" ,rust-chunked-transfer-1)
-        ("rust-cookie" ,rust-cookie-0.15)
-        ("rust-cookie-store" ,rust-cookie-store-0.15)
+        ("rust-cookie" ,rust-cookie-0.16)
+        ("rust-cookie-store" ,rust-cookie-store-0.19)
         ("rust-encoding-rs" ,rust-encoding-rs-0.8)
         ("rust-flate2" ,rust-flate2-1)
         ("rust-log" ,rust-log-0.4)
@@ -69678,10 +74756,11 @@ comparable to calling @code{unwrap_err()}.")
         ("rust-webpki" ,rust-webpki-0.22)
         ("rust-webpki-roots" ,rust-webpki-roots-0.22))
        #:cargo-development-inputs
-       (("rust-env-logger" ,rust-env-logger-0.9)
+       (("rust-env-logger" ,rust-env-logger-0.10)
         ("rust-rustls" ,rust-rustls-0.20)
-        ("rust-rustls-pemfile" ,rust-rustls-pemfile-0.2)
+        ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
         ("rust-serde" ,rust-serde-1))))
+    (native-inputs (list perl))
     (home-page "https://github.com/algesten/ureq")
     (synopsis "Simple, safe HTTP client")
     (description "This package provides minimal request library in Rust.")
@@ -69690,7 +74769,7 @@ comparable to calling @code{unwrap_err()}.")
 (define-public rust-url-2
   (package
     (name "rust-url")
-    (version "2.3.1")
+    (version "2.4.0")
     (source
      (origin
        (method url-fetch)
@@ -69699,12 +74778,12 @@ comparable to calling @code{unwrap_err()}.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0hs67jw257y0a7mj2p9wi0n61x8fc2vgwxg37y62nxkmmscwfs0d"))))
+         "1jw89ack5ldvajpzsvhq9sy12y2xqa2x0cbin62hl80r3s1zggsh"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-form-urlencoded" ,rust-form-urlencoded-1)
-        ("rust-idna" ,rust-idna-0.3)
+        ("rust-idna" ,rust-idna-0.4)
         ("rust-percent-encoding" ,rust-percent-encoding-2)
         ("rust-serde" ,rust-serde-1))
        #:cargo-development-inputs
@@ -69768,25 +74847,6 @@ comparable to calling @code{unwrap_err()}.")
 encoding.")
     (license license:expat)))
 
-(define-public rust-urlocator-0.1
- (package
-   (name "rust-urlocator")
-   (version "0.1.3")
-   (source
-    (origin
-      (method url-fetch)
-      (uri (crate-uri "urlocator" version))
-      (file-name
-       (string-append name "-" version ".tar.gz"))
-      (sha256
-       (base32
-        "0r5ig00np3svjpvb1gha3ni798cwj2w7rnlwrc8jrrw7bvlb2yri"))))
-   (build-system cargo-build-system)
-   (home-page "https://github.com/alacritty/urlocator")
-   (synopsis "Locate URLs in character streams")
-   (description "Locate URLs in character streams.")
-   (license (list license:expat license:asl2.0))))
-
 (define-public rust-user32-sys-0.2
   (package
     (name "rust-user32-sys")
@@ -69843,27 +74903,6 @@ See winapi for types and constants.")
 Unix users and groups.")
     (license license:expat)))
 
-(define-public rust-users-0.10
-  (package
-    (inherit rust-users-0.11)
-    (name "rust-users")
-    (version "0.10.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "users" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "11plda5r3dl8hs0sl0jskazam4ayv3a06vmhzk4l7914agljfhma"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-log" ,rust-log-0.4))
-       #:cargo-development-inputs
-       (("rust-env-logger" ,rust-env-logger-0.7))))))
-
 (define-public rust-utf-8-0.7
   (package
     (name "rust-utf-8")
@@ -69952,7 +74991,7 @@ first byte.")
 (define-public rust-utf8parse-0.2
   (package
     (name "rust-utf8parse")
-    (version "0.2.0")
+    (version "0.2.1")
     (source
      (origin
        (method url-fetch)
@@ -69961,9 +75000,9 @@ first byte.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0wjkvy22cxg023vkmvq2wwkgqyqam0d4pjld3m13blfg594lnvlk"))))
+         "02ip1a0az0qmc2786vxk2nqwsgcwf17d3a38fkf0q7hrmwh9c6vi"))))
     (build-system cargo-build-system)
-    (home-page "https://github.com/jwilm/vte")
+    (home-page "https://github.com/alacritty/vte")
     (synopsis "Table-driven UTF-8 parser")
     (description "This package provides a table-driven UTF-8 parser.")
     (license (list license:asl2.0 license:expat))))
@@ -69986,7 +75025,7 @@ first byte.")
 (define-public rust-uuid-1
   (package
     (name "rust-uuid")
-    (version "1.3.0")
+    (version "1.3.3")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "uuid" version))
@@ -69994,7 +75033,7 @@ first byte.")
                (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0ygxkj6bgfjkbhpdj1s0607zi9l8886pcw04lryd647f4r9q8x0n"))))
+                "1lpcqp1z0zy3l00yd418dpjlpih9la2swm62gwk1nia24kil8m1l"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
@@ -70006,7 +75045,7 @@ first byte.")
         ("rust-trybuild" ,rust-trybuild-1)
         ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
         ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
-        ("rust-windows-sys" ,rust-windows-sys-0.45))
+        ("rust-windows-sys" ,rust-windows-sys-0.48))
        #:cargo-inputs
        (("rust-arbitrary" ,rust-arbitrary-1)
         ("rust-atomic" ,rust-atomic-0.5)
@@ -70110,20 +75149,20 @@ first byte.")
 (define-public rust-uuid-macro-internal-1
   (package
     (name "rust-uuid-macro-internal")
-    (version "1.3.0")
+    (version "1.3.3")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "uuid-macro-internal" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1jbccm5pk216zrrf0ibd1j7m86lgmsyibs8d59ykhak5g2l01cy1"))))
+                "1nj53qzhk4xqw6rkz33q40rjs0mx9pdbjg11xvhydwiayicv8rrz"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
+        ("rust-syn" ,rust-syn-2))))
     (home-page "https://github.com/uuid-rs/uuid")
     (synopsis "@code{uuid!} macro implementation details")
     (description
@@ -70160,6 +75199,25 @@ first byte.")
 a part of rav1e.")
     (license license:bsd-2)))
 
+(define-public rust-v-htmlescape-0.15
+  (package
+    (name "rust-v-htmlescape")
+    (version "0.15.8")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "v-htmlescape" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "135inp4x7cc32k0hzrymlz1baf0rj0ah5h82nrpa9w0hqpxmg0jf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-buf-min" ,rust-buf-min-0.7))))
+    (home-page "https://github.com/botika/v_escape")
+    (synopsis "Simd optimized HTML escaping code")
+    (description "This package provides simd optimized HTML escaping code.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-valuable-derive-0.1
   (package
     (name "rust-valuable-derive")
@@ -70207,6 +75265,33 @@ crate.")
 un-typed structured data across trait-object boundaries.")
     (license license:expat)))
 
+(define-public rust-valuable-serde-0.1
+  (package
+    (name "rust-valuable-serde")
+    (version "0.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "valuable-serde" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "01q9ifpd1mk1ic2g8lagp35djzb8i7cm8skk4rkf5ayd63zwz1aj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-serde" ,rust-serde-1)
+        ("rust-valuable" ,rust-valuable-0.1))
+       #:cargo-development-inputs
+       (("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serde-test" ,rust-serde-test-1)
+        ("rust-valuable" ,rust-valuable-0.1))))
+    (home-page "https://github.com/tokio-rs/valuable")
+    (synopsis "`serde::Serialize` implementation for `Valuable` types")
+    (description "This package provides a @code{serde::Serialize} implementation
+for @code{Valuable} types.")
+    (license license:expat)))
+
 (define-public rust-value-bag-1
   (package
     (name "rust-value-bag")
@@ -70567,6 +75652,52 @@ updated when the crate version changes.")
 hardware registers.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-vsock-0.3
+  (package
+    (name "rust-vsock")
+    (version "0.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "vsock" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0mwwcjk2yd3fi5ryv5xhd7569bmcj0dlsmi4bh4jh6qypzq1v3jc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Tests not runnable from the build environment.
+       #:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-nix" ,rust-nix-0.24))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.8)
+        ("rust-sha2" ,rust-sha2-0.10))))
+    (home-page "https://github.com/rust-vsock/vsock-rs")
+    (synopsis "Virtio socket support for Rust")
+    (description "This package provdies virtio socket support for Rust.")
+    (license license:asl2.0)))
+
+(define-public rust-vsock-0.2
+  (package
+    (inherit rust-vsock-0.3)
+    (name "rust-vsock")
+    (version "0.2.6")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "vsock" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0cy1gpiahygfzxms4z170qj672c7n8cjvd8a9hkxzr9w5gp7a9p3"))))
+    (arguments
+     `(#:tests? #f      ; Tests not runnable from the build environment.
+       #:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-nix" ,rust-nix-0.23))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.8)
+        ("rust-sha2" ,rust-sha2-0.10))))))
+
 (define-public rust-vswhom-0.1
   (package
     (name "rust-vswhom")
@@ -71617,8 +76748,58 @@ Verification.")
                  (lambda _
                    (invoke "python" "make_curve25519_tables.py")))))))))))
 
+(define-public rust-webpki-roots-0.25
+  (package
+    (name "rust-webpki-roots")
+    (version "0.25.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "webpki-roots" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "15piy0vccppqb74li32gnn9l5a4ysxzwh8bp3qv6z8rhr2hyvin9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       (list "--release" "--"
+             ;; This test wants network access.
+             "--skip=generated_code_is_fresh")
+       #:cargo-development-inputs
+       (("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-reqwest" ,rust-reqwest-0.11)
+        ("rust-ring" ,rust-ring-0.16)
+        ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
+        ("rust-rustls-webpki" ,rust-rustls-webpki-0.101)
+        ("rust-tokio" ,rust-tokio-1))))
+    (native-inputs
+     (list perl pkg-config))
+    (inputs
+     (list openssl))
+    (home-page "https://github.com/rustls/webpki-roots")
+    (synopsis "Mozilla's CA root certificates for use with webpki")
+    (description "This package provides Mozilla's CA root certificates for use
+with webpki.")
+    (license license:mpl2.0)))
+
+(define-public rust-webpki-roots-0.23
+  (package
+    (inherit rust-webpki-roots-0.25)
+    (name "rust-webpki-roots")
+    (version "0.23.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "webpki-roots" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0f4k8nng542iilxbibh1nhrdf5wbyi9is4fr219zzrc6hgw5hc5h"))))
+    (arguments
+     `(#:cargo-inputs (("rust-rustls-webpki" ,rust-rustls-webpki-0.100))))))
+
 (define-public rust-webpki-roots-0.22
   (package
+    (inherit rust-webpki-roots-0.25)
     (name "rust-webpki-roots")
     (version "0.22.2")
     (source
@@ -71628,17 +76809,9 @@ Verification.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0jbll0ys9jakrvv3l1i216bbgj7jbxr7ad2dihw28xcm7s8fnb2m"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-webpki" ,rust-webpki-0.22))))
-    (native-inputs
-     (list perl))
-    (home-page "https://github.com/rustls/webpki-roots")
-    (synopsis "Mozilla's CA root certificates for use with webpki")
-    (description "This package provides Mozilla's CA root certificates for use
-with webpki.")
-    (license license:mpl2.0)))
+       (("rust-webpki" ,rust-webpki-0.22))))))
 
 (define-public rust-webpki-roots-0.21
   (package
@@ -71754,23 +76927,6 @@ with webpki.")
        (("rust-untrusted" ,rust-untrusted-0.6)
         ("rust-webpki" ,rust-webpki-0.18))))))
 
-(define-public rust-webpki-roots-0.14
-  (package
-    (inherit rust-webpki-roots-0.18)
-    (name "rust-webpki-roots")
-    (version "0.14.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "webpki-roots" version))
-      (file-name (string-append name "-" version ".tar.gz"))
-      (sha256
-       (base32 "05zw919077i3jadbvdsvl69wv2siijg2pjbykl6fyi7hmgb7bggd"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-untrusted" ,rust-untrusted-0.6)
-        ("rust-webpki" ,rust-webpki-0.18))))))
-
 (define-public rust-webview-sys-0.6
   (package
     (name "rust-webview-sys")
@@ -71968,25 +77124,41 @@ executable.")
        #:cargo-development-inputs
        (("rust-tempdir" ,rust-tempdir-0.3))))))
 
-(define-public rust-whoami-0.8
+(define-public rust-whoami-1
   (package
     (name "rust-whoami")
-    (version "0.8.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "whoami" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0z18m6w2q8a6rivd61sh3f00pdhyvxiwycs2j5088gvgdxb5bfqq"))))
+    (version "1.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "whoami" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0l6ca9pl92wmngsn1dh9ih716v216nmn2zvcn94k04x9p1b3gz12"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
-    (home-page "https://github.com/libcala/whoami")
+    (arguments
+     `(#:cargo-inputs
+       (("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-web-sys" ,rust-web-sys-0.3))))
+    (home-page "https://github.com/ardaku/whoami/blob/stable/CHANGELOG.md")
     (synopsis "Retrieve the current user and environment")
     (description
      "This package provides simple functions to retrieve the current user and
 environment.")
-    (license (list license:expat license:boost1.0))))
+    (license (list license:asl2.0 license:boost1.0 license:expat))))
+
+(define-public rust-whoami-0.8
+  (package
+    (inherit rust-whoami-1)
+    (name "rust-whoami")
+    (version "0.8.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "whoami" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "0z18m6w2q8a6rivd61sh3f00pdhyvxiwycs2j5088gvgdxb5bfqq"))))
+    (arguments `(#:skip-build? #t))))
 
 (define-public rust-wide-0.7
   (package
@@ -72052,8 +77224,31 @@ terms of allowing LLVM's auto-vectorizer to do its job.")
        (("rust-bytemuck" ,rust-bytemuck-1))))
     (license (list license:zlib))))
 
+(define-public rust-widestring-1
+  (package
+    (name "rust-widestring")
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "widestring" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1a11qxmqf8jhh0vbyb6cc614d9qdqsh01r5bqnivn5pc74gi8gv5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/starkat99/widestring-rs")
+    (synopsis "Wide string Rust FFI library")
+    (description
+     "A wide string Rust FFI library for converting to and from wide strings,
+such as those often used in Windows API or other FFI libraries.  Both UTF-16 and
+UTF-32 types are provided, including support for malformed encoding.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-widestring-0.5
   (package
+    (inherit rust-widestring-1)
     (name "rust-widestring")
     (version "0.5.1")
     (source
@@ -72064,18 +77259,9 @@ terms of allowing LLVM's auto-vectorizer to do its job.")
         (sha256
          (base32
           "10qrilijh1qzw362mvd4nsz3vv32dxx530vk41hkcx8hah22z20p"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
-       (("rust-winapi" ,rust-winapi-0.3))))
-    (home-page "https://github.com/starkat99/widestring-rs")
-    (synopsis "Wide string Rust FFI library")
-    (description
-     "A wide string Rust FFI library for converting to and from wide strings,
-such as those often used in Windows API or other FFI libraries.  Both UTF-16 and
-UTF-32 types are provided, including support for malformed encoding.")
-    (license (list license:asl2.0
-                   license:expat))))
+       (("rust-winapi" ,rust-winapi-0.3))))))
 
 (define-public rust-widestring-0.4
   (package
@@ -72097,18 +77283,18 @@ UTF-32 types are provided, including support for malformed encoding.")
 (define-public rust-wild-2
   (package
     (name "rust-wild")
-    (version "2.0.4")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wild" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0800hfmb099abwh7gqqbxhlvl7l3g5x681qsy0rm0x2lp2mr6mq3"))))
+        (base32 "0x0a65qrifm3q1gp7cy74qw69nr6zz5k8cqhb8pwbq3bb9l1dc85"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-glob" ,rust-glob-0.3))))
+     `(#:cargo-inputs (("rust-glob" ,rust-glob-0.3))
+       #:cargo-development-inputs (("rust-glob" ,rust-glob-0.3))))
     (home-page "https://lib.rs/crates/wild")
     (synopsis "Glob (wildcard) expanded command-line arguments")
     (description
@@ -72116,6 +77302,33 @@ UTF-32 types are provided, including support for malformed encoding.")
 command-line, uniformly on all platforms")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-win-crypto-ng-0.5
+  (package
+    (name "rust-win-crypto-ng")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "win-crypto-ng" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0faf5bd4d5kaf642yw91lh0n2bfwnz0l70bm85ysmj3dsj4hg9mf"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; Windows library
+       #:cargo-inputs
+       (("rust-cipher" ,rust-cipher-0.4)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-rand-core" ,rust-rand-core-0.5)
+        ("rust-winapi" ,rust-winapi-0.3)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-doc-comment" ,rust-doc-comment-0.3))))
+    (home-page "https://github.com/emgre/win-crypto-ng")
+    (synopsis "Safe bindings to Windows Cryptography API: Next Generation")
+    (description "Safe bindings to Windows Cryptography API: Next Generation")
+    (license license:bsd-3)))
+
 (define-public rust-winapi-0.3
   (package
     (name "rust-winapi")
@@ -72380,19 +77593,19 @@ if they were just another Rust module.")
         ("rust-windows-gen" ,rust-windows-gen-0.9)
         ("rust-windows-macros" ,rust-windows-macros-0.9))))))
 
-(define-public rust-windows-aarch64-gnullvm-0.42
+(define-public rust-windows-aarch64-gnullvm-0.48
   (package
     (name "rust-windows-aarch64-gnullvm")
-    (version "0.42.2")
+    (version "0.48.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows-aarch64-gnullvm" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1y4q0qmvl0lvp7syxvfykafvmwal5hrjb4fmv04bqs0bawc52yjr"))
+                "1g71yxi61c410pwzq05ld7si4p9hyx6lf5fkw21sinvr3cp5gbli"))
               (snippet
-               '(delete-file "lib/libwindows.a"))))
+               '(delete-file "lib/libwindows.0.48.0.a"))))
     (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t))
@@ -72402,19 +77615,36 @@ if they were just another Rust module.")
      "This package provides code gen support for the windows crate.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-windows-aarch64-msvc-0.42
+(define-public rust-windows-aarch64-gnullvm-0.42
   (package
-    (name "rust-windows-aarch64-msvc")
+    (inherit rust-windows-aarch64-gnullvm-0.48)
+    (name "rust-windows-aarch64-gnullvm")
     (version "0.42.2")
     (source (origin
               (method url-fetch)
+              (uri (crate-uri "windows-aarch64-gnullvm" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1y4q0qmvl0lvp7syxvfykafvmwal5hrjb4fmv04bqs0bawc52yjr"))
+              (snippet
+               '(delete-file "lib/libwindows.a"))))
+    (arguments
+     (list #:skip-build? #t))))
+
+(define-public rust-windows-aarch64-msvc-0.48
+  (package
+    (name "rust-windows-aarch64-msvc")
+    (version "0.48.0")
+    (source (origin
+              (method url-fetch)
               (uri (crate-uri "windows-aarch64-msvc" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0hsdikjl5sa1fva5qskpwlxzpc5q9l909fpl1w6yy1hglrj8i3p0"))
+                "1wvwipchhywcjaw73h998vzachf668fpqccbhrxzrz5xszh2gvxj"))
               (snippet
-               '(delete-file "lib/windows.lib"))))
+               '(delete-file "lib/windows.0.48.0.lib"))))
     (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t))
@@ -72424,6 +77654,23 @@ if they were just another Rust module.")
 crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-aarch64-msvc-0.42
+  (package
+    (inherit rust-windows-aarch64-msvc-0.48)
+    (name "rust-windows-aarch64-msvc")
+    (version "0.42.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-aarch64-msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hsdikjl5sa1fva5qskpwlxzpc5q9l909fpl1w6yy1hglrj8i3p0"))
+              (snippet
+               '(delete-file "lib/windows.lib"))))
+    (arguments
+     (list #:skip-build? #t))))
+
 (define-public rust-windows-aarch64-msvc-0.36
   (package
     (inherit rust-windows-aarch64-msvc-0.42)
@@ -72466,19 +77713,19 @@ crate.")
                (base32
                 "1hpk0n2z0jzzvwlvs98b75sa4q920953nqfc119rv19nwm0mlsaj"))))))
 
-(define-public rust-windows-i686-gnu-0.42
+(define-public rust-windows-i686-gnu-0.48
   (package
     (name "rust-windows-i686-gnu")
-    (version "0.42.2")
+    (version "0.48.0")
     (source (origin
               (method url-fetch)
-              (uri (crate-uri "windows_i686_gnu" version))
+              (uri (crate-uri "windows-i686-gnu" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0kx866dfrby88lqs9v1vgmrkk1z6af9lhaghh5maj7d4imyr47f6"))
+                "0hd2v9kp8fss0rzl83wzhw0s5z8q1b4875m6s1phv0yvlxi1jak2"))
               (snippet
-               '(delete-file "lib/libwindows.a"))))
+               '(delete-file "lib/libwindows.0.48.0.a"))))
     (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t))
@@ -72488,6 +77735,23 @@ crate.")
      "This package provides code gen support for the windows crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-i686-gnu-0.42
+  (package
+    (inherit rust-windows-i686-gnu-0.48)
+    (name "rust-windows-i686-gnu")
+    (version "0.42.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0kx866dfrby88lqs9v1vgmrkk1z6af9lhaghh5maj7d4imyr47f6"))
+              (snippet
+               '(delete-file "lib/libwindows.a"))))
+    (arguments
+     (list #:skip-build? #t))))
+
 (define-public rust-windows-i686-gnu-0.36
   (package
     (inherit rust-windows-i686-gnu-0.42)
@@ -72530,19 +77794,19 @@ crate.")
                (base32
                 "12hx7qpsjg9p7jggfcplqa3mf1mzr7k7s5ybzqwg1zmg4fn2aizm"))))))
 
-(define-public rust-windows-i686-msvc-0.42
+(define-public rust-windows-i686-msvc-0.48
   (package
     (name "rust-windows-i686-msvc")
-    (version "0.42.2")
+    (version "0.48.0")
     (source (origin
               (method url-fetch)
-              (uri (crate-uri "windows_i686_msvc" version))
+              (uri (crate-uri "windows-i686-msvc" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0q0h9m2aq1pygc199pa5jgc952qhcnf0zn688454i7v4xjv41n24"))
+                "004fkyqv3if178xx9ksqc4qqv8sz8n72mpczsr2vy8ffckiwchj5"))
               (snippet
-               '(delete-file "lib/windows.lib"))))
+               '(delete-file "lib/windows.0.48.0.lib"))))
     (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t))
@@ -72552,6 +77816,23 @@ crate.")
      "This package provides code gen support for the windows crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-i686-msvc-0.42
+  (package
+    (inherit rust-windows-i686-msvc-0.48)
+    (name "rust-windows-i686-msvc")
+    (version "0.42.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_i686_msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0q0h9m2aq1pygc199pa5jgc952qhcnf0zn688454i7v4xjv41n24"))
+              (snippet
+               '(delete-file "lib/windows.lib"))))
+    (arguments
+     (list #:skip-build? #t))))
+
 (define-public rust-windows-i686-msvc-0.36
   (package
     (inherit rust-windows-i686-msvc-0.42)
@@ -72665,21 +77946,21 @@ crate.")
 crate.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-windows-sys-0.45
+(define-public rust-windows-sys-0.48
   (package
     (name "rust-windows-sys")
-    (version "0.45.0")
+    (version "0.48.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows-sys" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "1l36bcqm4g89pknfp8r9rl1w4bn017q6a8qlx8viv0xjxzjkna3m"))))
+               (base32
+                "1aan23v5gs7gya1lc46hqn9mdh8yph3fhxmhxlw36pn6pqc28zb7"))))
     (build-system cargo-build-system)
     (arguments
-     (list #:skip-build? #t
-           #:cargo-inputs
-           `(("rust-windows-targets" ,rust-windows-targets-0.42))))
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-windows-targets" ,rust-windows-targets-0.48))))
     (home-page "https://github.com/microsoft/windows-rs")
     (synopsis "Rust for Windows")
     (description "The windows crate lets you call any Windows API past,
@@ -72688,6 +77969,22 @@ describing the API and right into your Rust package where you can call them as
 if they were just another Rust module.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-sys-0.45
+  (package
+    (inherit rust-windows-sys-0.48)
+    (name "rust-windows-sys")
+    (version "0.45.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1l36bcqm4g89pknfp8r9rl1w4bn017q6a8qlx8viv0xjxzjkna3m"))))
+    (arguments
+     (list #:skip-build? #t
+           #:cargo-inputs
+           `(("rust-windows-targets" ,rust-windows-targets-0.42))))))
+
 (define-public rust-windows-sys-0.42
   (package
     (inherit rust-windows-sys-0.45)
@@ -72792,8 +78089,36 @@ if they were just another Rust module.")
     (description "Macros for the windows crate")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-targets-0.48
+  (package
+    (name "rust-windows-targets")
+    (version "0.48.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-targets" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1mfzg94w0c8h4ya9sva7rra77f3iy1712af9b6bwg03wrpqbc7kv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-windows-aarch64-gnullvm" ,rust-windows-aarch64-gnullvm-0.48)
+        ("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.48)
+        ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.48)
+        ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.48)
+        ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.48)
+        ("rust-windows-x86-64-gnullvm" ,rust-windows-x86-64-gnullvm-0.48)
+        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.48))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-targets-0.42
   (package
+    (inherit rust-windows-targets-0.48)
     (name "rust-windows-targets")
     (version "0.42.2")
     (source (origin
@@ -72803,7 +78128,6 @@ if they were just another Rust module.")
               (sha256
                (base32
                 "0wfhnib2fisxlx8c507dbmh97kgij4r6kcxdi0f9nk6l1k080lcf"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-windows-aarch64-gnullvm" ,rust-windows-aarch64-gnullvm-0.42)
@@ -72812,12 +78136,7 @@ if they were just another Rust module.")
         ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.42)
         ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.42)
         ("rust-windows-x86-64-gnullvm" ,rust-windows-x86-64-gnullvm-0.42)
-        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.42))))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Code gen support for the windows crate")
-    (description
-     "This package provides code gen support for the windows crate.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.42))))))
 
 (define-public rust-windows-tokens-0.32
   (package
@@ -72839,19 +78158,19 @@ if they were just another Rust module.")
 windows crate.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-windows-x86-64-gnu-0.42
+(define-public rust-windows-x86-64-gnu-0.48
   (package
     (name "rust-windows-x86-64-gnu")
-    (version "0.42.2")
+    (version "0.48.0")
     (source (origin
               (method url-fetch)
-              (uri (crate-uri "windows_x86_64_gnu" version))
+              (uri (crate-uri "windows-x86_64-gnu" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0dnbf2xnp3xrvy8v9mgs3var4zq9v9yh9kv79035rdgyp2w15scd"))
+                "1cblz5m6a8q6ha09bz4lz233dnq5sw2hpra06k9cna3n3xk8laya"))
               (snippet
-               '(delete-file "lib/libwindows.a"))))
+               '(delete-file "lib/libwindows.0.48.0.a"))))
     (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t))
@@ -72861,6 +78180,23 @@ windows crate.")
      "This package provides code gen support for the windows crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-x86-64-gnu-0.42
+  (package
+    (inherit rust-windows-x86-64-gnu-0.48)
+    (name "rust-windows-x86-64-gnu")
+    (version "0.42.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows_x86_64_gnu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0dnbf2xnp3xrvy8v9mgs3var4zq9v9yh9kv79035rdgyp2w15scd"))
+              (snippet
+               '(delete-file "lib/libwindows.a"))))
+    (arguments
+     (list #:skip-build? #t))))
+
 (define-public rust-windows-x86-64-gnu-0.36
   (package
     (inherit rust-windows-x86-64-gnu-0.42)
@@ -72903,8 +78239,30 @@ windows crate.")
                (base32
                 "0m79bhdr54g4h4wh2q8wkjlkypb5wvl7xzhc2csiaqb5yl4z8cdw"))))))
 
+(define-public rust-windows-x86-64-gnullvm-0.48
+  (package
+    (name "rust-windows-x86-64-gnullvm")
+    (version "0.48.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-x86_64-gnullvm" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0lxryz3ysx0145bf3i38jkr7f9nxiym8p3syklp8f20yyk0xp5kq"))
+              (snippet
+               '(delete-file "lib/libwindows.0.48.0.a"))))
+    (build-system cargo-build-system)
+    (arguments (list #:skip-build? #t))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Code gen support for the windows crate")
+    (description
+     "This package provides code gen support for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-x86-64-gnullvm-0.42
   (package
+    (inherit rust-windows-x86-64-gnullvm-0.48)
     (name "rust-windows-x86-64-gnullvm")
     (version "0.42.2")
     (source (origin
@@ -72916,6 +78274,21 @@ windows crate.")
                 "18wl9r8qbsl475j39zvawlidp1bsbinliwfymr43fibdld31pm16"))
               (snippet
                '(delete-file "lib/libwindows.a"))))
+    (arguments (list #:skip-build? #t))))
+
+(define-public rust-windows-x86-64-msvc-0.48
+  (package
+    (name "rust-windows-x86-64-msvc")
+    (version "0.48.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "windows-x86_64-msvc" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "12ipr1knzj2rwjygyllfi5mkd0ihnbi3r61gag5n2jgyk5bmyl8s"))
+              (snippet
+               '(delete-file "lib/windows.0.48.0.lib"))))
     (build-system cargo-build-system)
     (arguments (list #:skip-build? #t))
     (home-page "https://github.com/microsoft/windows-rs")
@@ -72926,6 +78299,7 @@ windows crate.")
 
 (define-public rust-windows-x86-64-msvc-0.42
   (package
+    (inherit rust-windows-x86-64-msvc-0.48)
     (name "rust-windows-x86-64-msvc")
     (version "0.42.2")
     (source (origin
@@ -72937,13 +78311,7 @@ windows crate.")
                 "1w5r0q0yzx827d10dpjza2ww0j8iajqhmb54s735hhaj66imvv4s"))
               (snippet
                '(delete-file "lib/windows.lib"))))
-    (build-system cargo-build-system)
-    (arguments (list #:skip-build? #t))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Code gen support for the windows crate")
-    (description
-     "This package provides code gen support for the windows crate.")
-    (license (list license:expat license:asl2.0))))
+    (arguments (list #:skip-build? #t))))
 
 (define-public rust-windows-x86-64-msvc-0.36
   (package
@@ -73245,6 +78613,30 @@ serialization.")
      "Contains function definitions for the Windows API library ws2_32.")
     (license license:expat)))
 
+(define-public rust-wycheproof-0.5
+  (package
+    (name "rust-wycheproof")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "wycheproof" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "072rq77c9jp4ida3ag55hd4fn30q8zvi1k5adzvgf6cwyqcggbnc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-base64" ,rust-base64-0.13)
+        ("rust-hex" ,rust-hex-0.4)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/randombit/wycheproof-rs")
+    (synopsis "Wycheproof test vectors")
+    (description "Wycheproof test vectors")
+    (license license:asl2.0)))
+
 (define-public rust-wyhash-0.5
   (package
     (name "rust-wyhash")
@@ -73368,8 +78760,67 @@ Diffie-Hellman key exchange, with curve operations provided by
 @code{curve25519-dalek}.")
     (license license:bsd-3)))
 
+(define-public rust-x25519-dalek-ng-1
+  (package
+    (name "rust-x25519-dalek-ng")
+    (version "1.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "x25519-dalek-ng" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "09n35vgrryjy0m6ascfaykc8s0i517rzgj64qdq2jrlri7g78w5z"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-curve25519-dalek-ng" ,rust-curve25519-dalek-ng-4)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rand-core" ,rust-rand-core-0.6)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs
+       (("rust-bincode" ,rust-bincode-1)
+        ("rust-criterion" ,rust-criterion-0.3))))
+    (home-page "https://dalek.rs/")
+    (synopsis "Fork of x25519-dalek")
+    (description "This package provides a fork x25519-dalek, with an updated
+rand_core.")
+    (license license:bsd-3)))
+
+(define-public rust-x509-parser-0.15
+  (package
+    (name "rust-x509-parser")
+    (version "0.15.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "x509-parser" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0d7nshccpnybbh8mypirplf4bqxiy36bgh4rrd7jzng19bsw5c5s"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-asn1-rs" ,rust-asn1-rs-0.5)
+        ("rust-data-encoding" ,rust-data-encoding-2)
+        ("rust-der-parser" ,rust-der-parser-8)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-nom" ,rust-nom-7)
+        ("rust-oid-registry" ,rust-oid-registry-0.6)
+        ("rust-ring" ,rust-ring-0.16)
+        ("rust-rusticata-macros" ,rust-rusticata-macros-4)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-time" ,rust-time-0.3))))
+    (home-page "https://github.com/rusticata/x509-parser")
+    (synopsis "X.509 parser written in pure Rust")
+    (description "This crate provides a parser for the X.509 v3 format (RFC
+5280 certificates).")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-x509-parser-0.12
   (package
+    (inherit rust-x509-parser-0.15)
     (name "rust-x509-parser")
     (version "0.12.0")
     (source
@@ -73381,7 +78832,6 @@ Diffie-Hellman key exchange, with curve operations provided by
        (sha256
         (base32
          "1vanwazknxwd1kmlp443bpph9qyas021ayqk6iljxdscm0v0ijgz"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -73394,15 +78844,42 @@ Diffie-Hellman key exchange, with curve operations provided by
         ("rust-oid-registry" ,rust-oid-registry-0.2)
         ("rust-ring" ,rust-ring-0.16)
         ("rust-rusticata-macros" ,rust-rusticata-macros-4)
-        ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/rusticata/x509-parser")
-    (synopsis "X.509 parser written in pure Rust")
-    (description "This crate provides a parser for the X.509 v3 format (RFC
-5280 certificates).")
-    (license (list license:expat license:asl2.0))))
+        ("rust-thiserror" ,rust-thiserror-1))))))
+
+(define-public rust-x86-0.52
+  (package
+    (name "rust-x86")
+    (version "0.52.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "x86" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "11d3jip94x3dvcv0i0d5cxsgi1p2xyjrdhs550mas5vjg2bxp097"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; Remove some dependencies
+       #:cargo-inputs
+       (("rust-bit-field" ,rust-bit-field-0.10)
+        ("rust-bitflags" ,rust-bitflags-1)
+        ("rust-csv" ,rust-csv-1)
+        ("rust-phf" ,rust-phf-0.9)
+        ("rust-phf-codegen" ,rust-phf-codegen-0.9)
+        ("rust-raw-cpuid" ,rust-raw-cpuid-10)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/gz/rust-x86")
+    (synopsis "Library to program x86 (amd64) hardware")
+    (description
+     "This is a Library to program x86 (amd64) hardware.  It contains x86
+specific data structure descriptions, data-tables, as well as convenience
+function to call assembly instructions typically not exposed in higher level
+languages.")
+    (license license:expat)))
 
 (define-public rust-x86-0.33
   (package
+    (inherit rust-x86-0.52)
     (name "rust-x86")
     (version "0.33.0")
     (source
@@ -73417,7 +78894,6 @@ Diffie-Hellman key exchange, with curve operations provided by
         '(begin
            (substitute* "Cargo.toml"
              (("8\\.0") "8"))))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -73427,15 +78903,7 @@ Diffie-Hellman key exchange, with curve operations provided by
         ("rust-phf" ,rust-phf-0.7)
         ("rust-phf-codegen" ,rust-phf-codegen-0.7)
         ("rust-raw-cpuid" ,rust-raw-cpuid-8)
-        ("rust-serde-json" ,rust-serde-json-1))))
-    (home-page "https://github.com/gz/rust-x86")
-    (synopsis "Library to program x86 (amd64) hardware")
-    (description
-     "This is a Library to program x86 (amd64) hardware.  It contains x86
-specific data structure descriptions, data-tables, as well as convenience
-function to call assembly instructions typically not exposed in higher level
-languages.")
-    (license license:expat)))
+        ("rust-serde-json" ,rust-serde-json-1))))))
 
 (define-public rust-xattr-0.2
   (package
@@ -73550,16 +79018,24 @@ extended attributes.")
 (define-public rust-xdg-2
   (package
     (name "rust-xdg")
-    (version "2.4.1")
+    (version "2.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "xdg" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1xl81zfx5fsc5n06h77s0fvrslzhh2piabfz0c1lqk5xbkdq6i8c"))))
+        (base32 "1vkzfsy3n85qnn1076h9111jg3h7k9r99jqi8nnrq3kmbbdrg1b8"))))
     (build-system cargo-build-system)
-    (arguments `(#:cargo-inputs (("rust-dirs" ,rust-dirs-4))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-home" ,rust-home-0.5)
+        ("rust-serde" ,rust-serde-1))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'pre-check
+           (lambda _
+             (setenv "HOME" (getcwd)))))))
     (home-page "https://github.com/whitequark/rust-xdg")
     (synopsis "Store and retrieve files according to XDG specification")
     (description
@@ -73694,8 +79170,36 @@ including a line breaking iterator.")
     (description "An XML library in pure Rust.")
     (license license:expat)))
 
+(define-public rust-xml5ever-0.17
+  (package
+    (name "rust-xml5ever")
+    (version "0.17.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "xml5ever" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0l76v0c228c92sskiflpsy19c0bgc8q7flhlfanm32zrbb8f2d20"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-log" ,rust-log-0.4)
+        ("rust-mac" ,rust-mac-0.1)
+        ("rust-markup5ever" ,rust-markup5ever-0.11))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-rustc-test" ,rust-rustc-test-0.3))))
+    (home-page
+     "https://github.com/servo/html5ever/blob/master/xml5ever/README.md")
+    (synopsis "Push based streaming parser for xml")
+    (description
+     "Push based streaming parser for xml.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-xml5ever-0.16
   (package
+    (inherit rust-xml5ever-0.17)
     (name "rust-xml5ever")
     (version "0.16.2")
     (source
@@ -73707,7 +79211,6 @@ including a line breaking iterator.")
         (sha256
          (base32
           "0rfqys8yyigkzrqcrn5c6r10v42pwxahccyyzhc293px30w1cd4j"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-log" ,rust-log-0.4)
@@ -73716,13 +79219,7 @@ including a line breaking iterator.")
         ("rust-time" ,rust-time-0.1))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-rustc-test" ,rust-rustc-test-0.3))))
-    (home-page
-     "https://github.com/servo/html5ever/blob/master/xml5ever/README.md")
-    (synopsis "Push based streaming parser for xml")
-    (description
-     "Push based streaming parser for xml.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-rustc-test" ,rust-rustc-test-0.3))))))
 
 (define-public rust-xmlparser-0.13
   (package
@@ -73852,6 +79349,29 @@ file into an in-memory tree structure.")
 algorithm in Rust.")
     (license license:boost1.0)))
 
+(define-public rust-xz-0.1
+  (package
+    (name "rust-xz")
+    (version "0.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "xz" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0d6sq57g1969hjl5k7gzzdbyr60za9hk8qs9iqz26biazy87d21w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-xz2" ,rust-xz2-0.1))))
+    (native-inputs
+     (list pkg-config xz))
+    (home-page "https://github.com/alexcrichton/xz2-rs")
+    (synopsis "Alias of `xz2` crate")
+    (description
+     "Rust bindings to @code{liblzma} providing Read/Write streams as well as
+low-level in-memory encoding/decoding.  Alias of @code{xz2} crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-xz2-0.1
   (package
     (name "rust-xz2")
@@ -73943,8 +79463,32 @@ Read/Write streams as well as low-level in-memory encoding and decoding.")
 library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-yasna-0.5
+  (package
+    (name "rust-yasna")
+    (version "0.5.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "yasna" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1ka4ixrplnrfqyl1kymdj8cwpdp2k0kdr73b57hilcn1kiab6yz1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bit-vec" ,rust-bit-vec-0.6)
+        ("rust-num-bigint" ,rust-num-bigint-0.4)
+        ("rust-time" ,rust-time-0.3))
+       #:cargo-development-inputs (("rust-num-traits" ,rust-num-traits-0.2))))
+    (home-page "https://github.com/qnighy/yasna.rs")
+    (synopsis "ASN.1 library for Rust")
+    (description "ASN.1 library for Rust")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-yasna-0.4
   (package
+    (inherit rust-yasna-0.5)
     (name "rust-yasna")
     (version "0.4.0")
     (source (origin
@@ -73953,18 +79497,13 @@ library.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32 "0xgsvxqnycdakh6j3hg4dk3mylrpnba50w0d36vg5k311sfs4qp2"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bit-vec" ,rust-bit-vec-0.6)
         ("rust-chrono" ,rust-chrono-0.4)
         ("rust-num-bigint" ,rust-num-bigint-0.4))
        #:cargo-development-inputs
-       (("rust-num-traits" ,rust-num-traits-0.2))))
-    (home-page "https://github.com/qnighy/yasna.rs")
-    (synopsis "ASN.1 library for Rust")
-    (description "ASN.1 library for Rust")
-    (license (list license:expat license:asl2.0))))
+       (("rust-num-traits" ,rust-num-traits-0.2))))))
 
 (define-public rust-yeslogic-fontconfig-sys-3
   (package
@@ -74035,6 +79574,125 @@ for locating fonts.")
     (description "This package provides an implementation of zbase32.")
     (license license:lgpl3+)))
 
+(define-public rust-zbus-3
+  (package
+    (name "rust-zbus")
+    (version "3.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "zbus" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0pl5ri4lihzzxzxgvw1m0lpq90pnack0hi6gg48jsqyb1iy5i79p"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Not all files included.
+       #:cargo-inputs
+       (("rust-async-broadcast" ,rust-async-broadcast-0.5)
+        ("rust-async-executor" ,rust-async-executor-1)
+        ("rust-async-io" ,rust-async-io-1)
+        ("rust-async-lock" ,rust-async-lock-2)
+        ("rust-async-recursion" ,rust-async-recursion-1)
+        ("rust-async-task" ,rust-async-task-4)
+        ("rust-async-trait" ,rust-async-trait-0.1)
+        ("rust-byteorder" ,rust-byteorder-1)
+        ("rust-derivative" ,rust-derivative-2)
+        ("rust-dirs" ,rust-dirs-4)
+        ("rust-enumflags2" ,rust-enumflags2-0.7)
+        ("rust-event-listener" ,rust-event-listener-2)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-futures-sink" ,rust-futures-sink-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-hex" ,rust-hex-0.4)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-nix" ,rust-nix-0.25)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-ordered-stream" ,rust-ordered-stream-0.1)
+        ("rust-quick-xml" ,rust-quick-xml-0.27)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-xml-rs" ,rust-serde-xml-rs-0.4)
+        ("rust-serde-repr" ,rust-serde-repr-0.1)
+        ("rust-sha1" ,rust-sha1-0.10)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-vsock" ,rust-tokio-vsock-0.3)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-uds-windows" ,rust-uds-windows-1)
+        ("rust-vsock" ,rust-vsock-0.3)
+        ("rust-winapi" ,rust-winapi-0.3)
+        ("rust-zbus-macros" ,rust-zbus-macros-3)
+        ("rust-zbus-names" ,rust-zbus-names-2)
+        ("rust-zvariant" ,rust-zvariant-3))
+       #:cargo-development-inputs
+       (("rust-async-std" ,rust-async-std-1)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-ntest" ,rust-ntest-0.9)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-test-log" ,rust-test-log-0.2)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+    (home-page "https://github.com/dbus2/zbus/")
+    (synopsis "API for D-Bus communication")
+    (description "This package provides an API for D-Bus communication.")
+    (license license:expat)))
+
+(define-public rust-zbus-macros-3
+  (package
+    (name "rust-zbus-macros")
+    (version "3.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "zbus-macros" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1y4cw7x8hrpz9xd43spd0vzvfbm1991bik1yb2873py0j0p2ljb6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Tests need a running dbus instance.
+       #:cargo-inputs
+       (("rust-proc-macro-crate" ,rust-proc-macro-crate-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-async-io" ,rust-async-io-1)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://github.com/dbus2/zbus/")
+    (synopsis "proc-macros for zbus")
+    (description "This package provides proc-macros for zbus.")
+    (license license:expat)))
+
+(define-public rust-zbus-names-2
+  (package
+    (name "rust-zbus-names")
+    (version "2.6.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "zbus-names" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1adl0acl39flk4jnrv7axg29kpwm7cy15w2wf0yy59mxdmvvp07v"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-serde" ,rust-serde-1)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-zvariant" ,rust-zvariant-3))))
+    (home-page "https://github.com/dbus2/zbus/")
+    (synopsis "Collection of D-Bus bus names types")
+    (description "This package provides a collection of D-Bus bus names types.")
+    (license license:expat)))
+
 (define-public rust-zerocopy-0.6
   (package
     (name "rust-zerocopy")
@@ -74287,9 +79945,14 @@ implementation that works everywhere, even WASM!")
         (base32 "1r7xlmgnifhxbfyid8vkcnd5ip16gx9hf89d1l0lzrpc4q1rdk10"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f      ; Not all files included.
        #:cargo-inputs
-       (("rust-zstd-safe" ,rust-zstd-safe-5))))
+       (("rust-zstd-safe" ,rust-zstd-safe-5))
+       #:cargo-development-inputs
+       (("rust-clap" ,rust-clap-3)
+        ("rust-humansize" ,rust-humansize-1)
+        ("rust-partial-io" ,rust-partial-io-0.5)
+        ("rust-walkdir" ,rust-walkdir-2))))
     (home-page "https://github.com/gyscos/zstd-rs")
     (synopsis "Binding to the zstd compression library")
     (description
@@ -74300,7 +79963,7 @@ implementation that works everywhere, even WASM!")
   (package
     (inherit rust-zstd-0.11)
     (name "rust-zstd")
-    (version "0.9.0+zstd.1.5.0")
+    (version "0.9.3+zstd.1.5.2")
     (source
      (origin
        (method url-fetch)
@@ -74309,30 +79972,21 @@ implementation that works everywhere, even WASM!")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1k9caa048d8x9asksjaf62xkpv0m1wsmw94h29k3csybq9frlx07"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-zstd-safe" ,rust-zstd-safe-4))))))
-
-(define-public rust-zstd-0.8
-  (package
-    (inherit rust-zstd-0.9)
-    (name "rust-zstd")
-    (version "0.8.3+zstd.1.5.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "zstd" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1gy2rc3hmqpzfkh9f5d395lhwjk8qwpll3gb73bznn2agd60k9sy"))))
+         "15dsisk3g9ncbxzb6miwav35p2v98az6clh5qdab5jxn05l9qzrp"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* "Cargo.toml"
+                  (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                   (string-append "\"^" version)))))))
     (arguments
-     `(#:skip-build? #t
+     `(#:tests? #f      ; Not all files included.
        #:cargo-inputs
-       (("rust-futures" ,rust-futures-0.1)
-        ("rust-tokio-io" ,rust-tokio-io-0.1)
-        ("rust-zstd-safe" ,rust-zstd-safe-4))))))
+       (("rust-zstd-safe" ,rust-zstd-safe-4))
+       #:cargo-development-inputs
+       (("rust-clap" ,rust-clap-3)
+        ("rust-humansize" ,rust-humansize-1)
+        ("rust-partial-io" ,rust-partial-io-0.5)
+        ("rust-walkdir" ,rust-walkdir-2))))))
 
 (define-public rust-zstd-safe-5
   (package
@@ -74348,8 +80002,7 @@ implementation that works everywhere, even WASM!")
         (base32 "1nzl4q3xl68pq58g9xlym299bvjdii8cl7ix595ym7jgw22maahx"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
         ("rust-zstd-sys" ,rust-zstd-sys-2))))
     (home-page "https://github.com/gyscos/zstd-rs")
@@ -74363,7 +80016,7 @@ library.")
   (package
     (inherit rust-zstd-safe-5)
     (name "rust-zstd-safe")
-    (version "4.1.1+zstd.1.5.0")
+    (version "4.1.6+zstd.1.5.2")
     (source
      (origin
        (method url-fetch)
@@ -74371,36 +80024,19 @@ library.")
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0yghr94blhnfigzsynm2km3g93886z49612y7rh07c4kqpr90769"))))
+        (base32 "1fz97qn7galkwl31n28cil44nxfj81ryd33v2vb041r7pd8irdll"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-zstd-sys" ,rust-zstd-sys-1))))))
-
-(define-public rust-zstd-safe-3
-  (package
-    (inherit rust-zstd-safe-4)
-    (name "rust-zstd-safe")
-    (version "3.0.1+zstd.1.4.9")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "zstd-safe" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "133gassn5zy4vf0hhgsff3gxv1q3nc0bzi3qrqq7n4iqv6ycm1qk"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
         ("rust-zstd-sys" ,rust-zstd-sys-1))))))
 
 ;; TODO: Unbundle zstd.
+;; The 'legacy' feature, enabled by default, needs headers which aren't
+;; installed by default in zstd.
 (define-public rust-zstd-sys-2
   (package
     (name "rust-zstd-sys")
-    (version "2.0.7+zstd.1.5.4")
+    (version "2.0.8+zstd.1.5.5")
     (source
      (origin
        (method url-fetch)
@@ -74408,11 +80044,12 @@ library.")
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1xf7ng97h6h89bvisllj05vapkqcacn88y9bfm6jjmgyl8xrql4l"))))
+        (base32 "137c0wkxb04l0ig5df8a1ni94dl0g2ibz2q9dicg4bfk4ppfcmjm"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-bindgen" ,rust-bindgen-0.63)
+     `(#:install-source? #f     ; invalid inclusion of reserved file name
+       #:cargo-inputs
+       (("rust-bindgen" ,rust-bindgen-0.64)
         ("rust-cc" ,rust-cc-1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-pkg-config" ,rust-pkg-config-0.3))))
@@ -74427,7 +80064,7 @@ compression library.")
   (package
     (inherit rust-zstd-sys-2)
     (name "rust-zstd-sys")
-    (version "1.6.1+zstd.1.5.0")
+    (version "1.6.3+zstd.1.5.2")
     (source
      (origin
        (method url-fetch)
@@ -74435,10 +80072,11 @@ compression library.")
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0cra76lginz5k659rch7axg5nyms67yffygr3k7ic7a3lb3j0lb1"))))
+        (base32 "1a1f839k3mxh3qhjga1vd2sfxrsi41cqrnpyc5byfd6nr2jsyjgw"))))
     (arguments
-     `(#:cargo-inputs
-       (("rust-bindgen" ,rust-bindgen-0.58)
+     `(#:install-source? #f     ; invalid inclusion of reserved file name
+       #:cargo-inputs
+       (("rust-bindgen" ,rust-bindgen-0.59)
         ("rust-cc" ,rust-cc-1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-pkg-config" ,rust-pkg-config-0.3))))))
@@ -74469,6 +80107,99 @@ compression library.")
 in Pure Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-zvariant-3
+  (package
+    (name "rust-zvariant")
+    (version "3.15.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "zvariant" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "131kaczf10psc8clzlndcc52dym5vi4g22kqf0qwaq6rw2z93cj4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-arrayvec" ,rust-arrayvec-0.7)
+        ("rust-byteorder" ,rust-byteorder-1)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-enumflags2" ,rust-enumflags2-0.7)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+        ("rust-static-assertions" ,rust-static-assertions-1)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-url" ,rust-url-2)
+        ("rust-uuid" ,rust-uuid-1)
+        ("rust-zvariant-derive" ,rust-zvariant-derive-3))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-glib" ,rust-glib-0.17)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-serde-repr" ,rust-serde-repr-0.1))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list glib))
+    (home-page "https://github.com/dbus2/zbus/")
+    (synopsis "D-Bus & GVariant encoding & decoding")
+    (description "D-Bus & GVariant encoding & decoding")
+    (license license:expat)))
+
+(define-public rust-zvariant-derive-3
+  (package
+    (name "rust-zvariant-derive")
+    (version "3.15.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "zvariant-derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1kcfgpqshggr5v7dwldjggix79zcyj7fizw7dkh6w39iziyplkck"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Needs unstable features.
+       #:cargo-inputs
+       (("rust-proc-macro-crate" ,rust-proc-macro-crate-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1)
+        ("rust-zvariant-utils" ,rust-zvariant-utils-1))
+       #:cargo-development-inputs
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-enumflags2" ,rust-enumflags2-0.7)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-repr" ,rust-serde-repr-0.1))))
+    (home-page "https://github.com/dbus2/zbus/")
+    (synopsis "D-Bus & GVariant encoding & decoding")
+    (description "D-Bus & GVariant encoding & decoding")
+    (license license:expat)))
+
+(define-public rust-zvariant-utils-1
+  (package
+    (name "rust-zvariant-utils")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "zvariant-utils" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "00625h3240rixvfhq6yhws1d4bwf3vrf74v8s69b97aq27cg0d3j"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/dbus2/zbus/")
+    (synopsis "Utilities used internally by the zvariant crate")
+    (description "Various utilities used internally by the zvariant crate.")
+    (license license:expat)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f19771174b..3d41649f4d 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1850,8 +1850,8 @@ which uses SQL to describe changes.")
 
 (define-public sqlcrush
   ;; Unfortunately, there is no proper upstream release and may never be.
-  (let ((commit "b5f6868f189566a26eecc78d0f0659813c1aa98a")
-        (revision "1"))
+  (let ((commit "502a583e97a84efdeb48e59f1bfe403daa9681ee")
+        (revision "2"))
     (package
       (name "sqlcrush")
       (version (git-version "0.1.5" revision commit))
@@ -1863,7 +1863,7 @@ which uses SQL to describe changes.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0x3wy40r93p0jv3nbwj9a77wa4ff697d13r0wffmm7q9h3mzsww8"))))
+                  "0x2q4m9ryw68kifalnm3x4bv9v2xrc2ffsiap8m9wnw6lf1h05la"))))
       (build-system python-build-system)
       (inputs
        (list python-cryptography python-psycopg2 python-pymysql
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index afa11d3852..9d2e170cc0 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -530,6 +530,44 @@ which respectively make and check MS-DOS FAT file systems.")
 and a @command{fsck.vfat} compatibility symlink for use in an initrd.")
     (license (package-license dosfstools))))
 
+(define-public hdparm
+  (package
+    (name "hdparm")
+    (version "9.65")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/hdparm/hdparm/"
+                                  "hdparm-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0jssagggg52ssl9kg99m88afghj7bm1854vyf4p96q6h23wjjjfi"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list #:make-flags
+           #~(list (string-append "binprefix=" #$output)
+                   (string-append "manprefix=" #$output)
+                   (string-append "CC=" #$(cc-for-target))
+                   ;; Let Guix strip binaries and not break cross-compilation.
+                   "STRIP=true")
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure))     ; no configure script
+           #:tests? #f))                ; no test suite
+    (home-page "https://sourceforge.net/projects/hdparm/")
+    (synopsis "View and tune ATA disk drive parameters")
+    (description
+     "@command{hdparm} is a command-line utility to control ATA controllers and
+disk drives.  It can increase performance and/or reliability by careful tuning
+of hardware settings like power and acoustic management, DMA modes, and caching.
+It can also display detailed device information, or be used as a simple
+performance benchmarking tool.
+
+@command{hdparm} provides a command line interface to various Linux kernel
+interfaces provided by the SATA/ATA/SAS @code{libata} subsystem, and the older
+IDE driver subsystem.  Many external USB drive enclosures with SCSI-ATA Command
+Translation (@dfn{SAT}) are also supported.")
+    (license (license:non-copyleft "file://LICENSE.TXT"))))
+
 (define-public sdparm
   (package
     (name "sdparm")
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index f6c9283a29..327a29aa9e 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021-2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
@@ -421,7 +421,7 @@ display manager which supports different greeters.")
            bash-minimal                 ;for wrap-program
            gtk+
            guile-3.0
-           librsvg
+           (librsvg-for-system)
            libxklavier
            lightdm
            shared-mime-info))
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index fdd10a6611..d6bea61ca7 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
 ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
-;;; Copyright © 2018, 2022 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
@@ -91,8 +91,7 @@
   #:use-module (guix build-system copy)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
-  #:use-module (guix build-system meson)
-  #:use-module (guix build-system trivial))
+  #:use-module (guix build-system meson))
 
 (define-public cloudflare-cli
   (let ((commit "2d986d3ec1b0e3158c4bd40e8918947cb74aa392")
@@ -1067,72 +1066,6 @@ LuaJIT, both a resolver library and a daemon.")
                    license:cc0
                    license:lgpl2.0))))
 
-(define-public ddclient
-  (package
-    (name "ddclient")
-    (version "3.10.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/ddclient/ddclient")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0l87d72apwrg6ipc9gix5gv64d4hr1ykxmss8x4r8d8mgj6j8rf1"))
-       (modules '((guix build utils)))
-       (snippet
-        ;; XXX: erroneous version value, this is fixed in master
-        #~(begin
-            (substitute* "configure.ac"
-              (("3.10.0_2") #$version))))
-       (patches (search-patches "ddclient-skip-test.patch"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     (list autoconf automake libtool
-           perl-test-warnings perl-test-mockmodule))
-    (inputs
-     (list inetutils ; logger
-           net-tools
-           bash-minimal                           ;for 'wrap-program'
-           perl
-           perl-digest-sha1
-           perl-io-socket-ssl
-           perl-io-socket-inet6  ;; XXX: this is likely to be removed in a future ddclient release
-                                 ;; https://github.com/ddclient/ddclient/issues/461
-           perl-json))
-    (arguments
-     (list
-      #:configure-flags #~(list "--localstatedir=/var")
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'install
-            (lambda _
-              ;; XXX: Do not create /var
-              (invoke "make" "localstatedir=/tmp/discard" "install")))
-          (add-after 'wrap 'wrap-ddclient
-            (lambda* (#:key inputs #:allow-other-keys)
-              (wrap-program (string-append #$output "/bin/ddclient")
-                `("PERL5LIB" ":" prefix ,(string-split (getenv "PERL5LIB") #\:))
-                `("PATH" prefix ,(map (lambda (x)
-                                        (string-append (assoc-ref inputs x) "/bin"))
-                                      '("inetutils" "net-tools")))))))))
-    (native-search-paths
-     (list $SSL_CERT_DIR $SSL_CERT_FILE))
-    (home-page "https://ddclient.net/")
-    (synopsis "Address updating utility for dynamic DNS services")
-    (description "This package provides a client to update dynamic IP
-addresses with several dynamic DNS service providers, such as
-@uref{https://www.dyndns.com/account/login.html,DynDNS.com}.
-
-This makes it possible to use a fixed hostname (such as myhost.dyndns.org) to
-access a machine with a dynamic IP address.
-
-The client supports both dynamic and (near) static services, as well as MX
-record and alternative name management.  It caches the address, and only
-attempts the update when it has changed.")
-    (license license:gpl2+)))
-
 (define-public hnsd
    (package
      (name "hnsd")
diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm
index 0855e45084..4a8ff59ec9 100644
--- a/gnu/packages/dunst.scm
+++ b/gnu/packages/dunst.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015, 2017, 2018 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
@@ -69,7 +69,7 @@
            which))
     (inputs
      (list dbus
-           librsvg ; for svg support
+           (librsvg-for-system) ; for svg support
            glib
            cairo
            pango
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 6962547c75..16d4fcd6e3 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -454,7 +454,8 @@ designed to be used in a generic text renderer.")
               (sha256
                (base32
                 "0c0s4silpax74kwfz3dfmzn4lkv6jsyb800vfak166vii0hvbv3d"))
-              (patches (search-patches "fbreader-curl-7.62.patch"))))
+              (patches (search-patches "fbreader-curl-7.62.patch"
+                                       "fbreader-fix-icon.patch"))))
     (build-system gnu-build-system)
     (inputs
      `(("curl" ,curl)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 54380e7ebb..bb307cf7ab 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -116,7 +116,7 @@
                       ":" (or (getenv "CPATH") ""))))))))
     (inputs
      `(("gtk+" ,gtk+-2)
-       ("librsvg" ,librsvg)
+       ("librsvg" ,(librsvg-for-system))
        ("libxml2" ,libxml2)
        ("sdl-mixer" ,sdl-mixer)
        ("sqlite" ,sqlite)
@@ -876,7 +876,7 @@ endless.  For example:
     (inputs
      `(("font-andika" ,font-sil-andika)
        ("libpng" ,libpng)
-       ("librsvg" ,librsvg)
+       ("librsvg" ,(librsvg-for-system))
        ("libxml2" ,libxml2)
        ("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-net sdl-pango)))))
     (home-page "https://github.com/tux4kids/t4kcommon")
@@ -932,7 +932,7 @@ TuxMath and TuxType.")
     (native-inputs
      (list pkg-config))
     (inputs
-     `(("librsvg" ,librsvg)
+     `(("librsvg" ,(librsvg-for-system))
        ("libxml2" ,libxml2)
        ("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-net sdl-pango)))
        ("t4k-common" ,t4k-common)))
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 811728d170..3514ae5fbe 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -32405,6 +32405,29 @@ simple but powerful Org contents.")
 on the HTML back-end.")
       (license license:gpl3+))))
 
+(define-public emacs-ox-html-stable-ids
+  (package
+    (name "emacs-ox-html-stable-ids")
+    (version "0.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://codeberg.org/jkreeftmeijer/ox-html-stable-ids.el")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1slfc1hx6mgx6rb0h0hz7200dmpqr04sz8009r6cy7msp2b91hg7"))))
+    (build-system emacs-build-system)
+    (license license:gpl3)
+    (home-page "https://jeffkreeftmeijer.com/ox-html-stable-ids")
+    (synopsis "Stable IDs for ox-html.el")
+    (description
+     "Ox-html-stable-ids is an Org export extension package that generates
+ HTML with stable ID attributes instead of the random IDs Org's exporter uses
+by default.")))
+
 (define-public emacs-wc-mode
   (package
     (name "emacs-wc-mode")
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index d3bb794269..325013a627 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1460,19 +1460,20 @@ debugging them, and more.")
 (define-public ebusd
   (package
     (name "ebusd")
-    (version "3.4")
+    (version "23.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                      (url "https://github.com/john30/ebusd")
-                     (commit (string-append "v" version))))
+                     (commit version)))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0iva70bam7wdx60bpd3an9kxr28zxlvp3vprivgqshwwdhqa0hzp"))))
+                "1zqnxk6vgszlf410pypsjjliiy9wawy585fm7v25mka47i6iqafq"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
+     `(#:configure-flags '("--localstatedir=/var")
+       #:phases
        (modify-phases %standard-phases
          (add-after 'install 'install-config
            (lambda* (#:key inputs outputs #:allow-other-keys)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index e0f7199d2e..85f603dc06 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1089,7 +1089,7 @@ Emacs).")
 (define-public kicad
   (package
     (name "kicad")
-    (version "7.0.6")
+    (version "7.0.7")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1097,7 +1097,7 @@ Emacs).")
                     (commit version)))
               (sha256
                (base32
-                "1bifg73id0grn37a4n5wpq440z9xz14q0fvkva5vajx0xfd34llv"))
+                "1xbzf29rhqh6kl0vggdn2dblgp927096fc1lr3y4yw63b8n0qq50"))
               (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (arguments
@@ -1197,7 +1197,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0byvm25jw108h808g5zdjq14gx4xxd87pvlbczd07c3rx6nmzl08"))))
+                "00f51rcnki08x2jkyla5vmqx7nhck3cyz86wiy0qkmc8klb1a6ba"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags (list "-DBUILD_FORMATS=html")
@@ -1231,7 +1231,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0p60dvig7xx8svzsgp871r0aix2m95bmzg3snz372nmgnza2nnvf"))))
+                "1wr754m4ykidds3i14gqhvyrj3mbkchp2hkfnr0rjsdaqf4zmqdf"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f))                    ; no tests exist
@@ -1260,7 +1260,7 @@ libraries.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0fqnviaxsai0xwyq8xq5ks26j4vd390ns6h6lr0fx2ikv1ghaml5"))))
+                "0xnnivlqgcyaz9qay73p43jnvmvshp2b3fbh3569j7rmgi5pn8x0"))))
     (synopsis "Official KiCad footprint libraries")
     (description "This package contains the official KiCad footprint libraries.")))
 
@@ -1277,7 +1277,7 @@ libraries.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0dmssyhqd94d9wj8w7g7xjan560b2rwcs540sgl0rc77cw2jify8"))))
+                "141r5wd8s1bgyf77kvb9q14cpsiwwv4zmfzwbgcd42rflsk2lcbc"))))
     (synopsis "Official KiCad 3D model libraries")
     (description "This package contains the official KiCad 3D model libraries.")))
 
@@ -3223,7 +3223,7 @@ data structures and to operate on them.")
           gerbv
           glibmm
           gtkmm-2
-          librsvg))
+          (librsvg-for-system)))
    (native-inputs
     (list autoconf automake libtool pkg-config))
    (home-page "https://github.com/pcb2gcode/pcb2gcode")
@@ -4214,7 +4214,7 @@ form, numpad.
 (define-public rizin
   (package
     (name "rizin")
-    (version "0.5.2")
+    (version "0.6.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -4222,7 +4222,7 @@ form, numpad.
                     version "/rizin-src-v" version ".tar.xz"))
               (sha256
                (base32
-                "18zca3iwdif200wiivm065fs0a5g520q6380205cijca7ky81avi"))))
+                "14bcmjx64pgi9zj4zb7yppx69l1ykjwgf2q41s5672m7z354f1kn"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -4250,13 +4250,10 @@ form, numpad.
             (lambda _
               ;; Skip integration tests, which require prebuilt binaries at:
               ;; <https://github.com/rizinorg/rizin-testbins>.
-              ;; And 2 of them are failing, reported upstream:
-              ;; <https://github.com/rizinorg/rizin/issues/2905>.
               (substitute* "test/meson.build"
                 (("subdir\\('integration'\\)") ""))
               ;;; Skip failing tests.
               (substitute* "test/unit/meson.build"
-                (("'analysis_var',\n") "")
                 (("'bin_mach0',\n") "")
                 (("'hash',\n") "")))))))
     (native-inputs (list pkg-config))
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index d03c931458..dcf2695118 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -87,7 +87,7 @@ client.")
 (define-public fcitx5
   (package
     (name "fcitx5")
-    (version "5.0.23")
+    (version "5.1.0")
     (source
      (origin
        (method url-fetch)
@@ -95,13 +95,10 @@ client.")
              "https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
              version "_dict.tar.xz"))
        (sha256
-        (base32 "1w26v0a8qizv8flpkmg04b42kwym6ca1a1chng7j2j1xizjhiw0p"))))
-    (build-system cmake-build-system)
+        (base32 "1a1d3bcxddv3hsmffgf608arhamia17bq82q932sy5zl9j8s423y"))))
     (arguments
-     `(#:configure-flags
-       (list (string-append "-DCLDR_DIR="
-                            (assoc-ref %build-inputs "unicode-cldr-common")
-                            "/share/unicode/cldr"))))
+     (list #:configure-flags #~(list "-DUSE_SYSTEMD=OFF")))
+    (build-system cmake-build-system)
     (inputs
      `(("cairo" ,cairo)
        ("cairo-xcb" ,cairo-xcb)
@@ -115,16 +112,11 @@ client.")
        ("iso-codes" ,iso-codes)
        ("json-c" ,json-c)
        ("libevent" ,libevent)
-       ("libpthread-stubs" ,libpthread-stubs)
        ("libuuid" ,util-linux "lib")
-       ("libx11" ,libx11)
        ("libxcb" ,libxcb)
-       ("libxfixes" ,libxfixes)
-       ("libxinerama" ,libxinerama)
        ("libxkbcommon" ,libxkbcommon)
        ("libxkbfile" ,libxkbfile)
        ("pango" ,pango)
-       ("unicode-cldr-common" ,unicode-cldr-common)
        ("wayland" ,wayland)
        ("wayland-protocols" ,wayland-protocols)
        ("xcb-imdkit" ,xcb-imdkit)
@@ -172,14 +164,14 @@ client.")
 (define-public libime
   (package
     (name "libime")
-    (version "1.0.17")
+    (version "1.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-"
                            version "_dict.tar.xz"))
        (sha256
-        (base32 "00d191nghqkcxky5i2j5v8105ckhfh0bdjbkk8swyndjp35bn54f"))))
+        (base32 "0jqr9riwygr3c9qzs8hx46smhgys68bf6m70fmam819903a9gpf0"))))
     (build-system cmake-build-system)
     (inputs
      (list fcitx5 boost))
@@ -194,7 +186,7 @@ editors.")
 (define-public fcitx5-gtk
   (package
     (name "fcitx5-gtk")
-    (version "5.0.23")
+    (version "5.1.0")
     (source
      (origin
        (method url-fetch)
@@ -202,7 +194,7 @@ editors.")
                            "/fcitx5-gtk/fcitx5-gtk-"
                            version ".tar.xz"))
        (sha256
-        (base32 "0s08j8y7bxn9hjz9xkza2fal24r9az2p7js7v86nbjmvy7klq4md"))))
+        (base32 "0rc4iwqb7ydysm95qpncfd8kvyzk36cfxwg1h0cjn98v3fxjf8kw"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -312,7 +304,7 @@ IM module for GTK+3 applications.
 (define-public fcitx5-qt
   (package
     (name "fcitx5-qt")
-    (version "5.0.17")
+    (version "5.1.0")
     (source
      (origin
        (method url-fetch)
@@ -320,7 +312,7 @@ IM module for GTK+3 applications.
                            "/fcitx5-qt/fcitx5-qt-"
                            version ".tar.xz"))
        (sha256
-        (base32 "1x4iks052jn6dcwd1lv1i9cpwh3l3qnnd3phryfsg4kn4yhyfs22"))))
+        (base32 "02gnzwf0mlshmh1hw8c1866643qmdqazwjz339jq0c3ll61f8m7h"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
@@ -347,7 +339,7 @@ for Qt based application.")
 (define-public fcitx5-anthy
   (package
     (name "fcitx5-anthy")
-    (version "5.0.14")
+    (version "5.1.0")
     (source
      (origin
        (method url-fetch)
@@ -355,7 +347,7 @@ for Qt based application.")
                            "/fcitx5-anthy/fcitx5-anthy-"
                            version ".tar.xz"))
        (sha256
-        (base32 "1dx7ajygdy244lwyv3fv14b4wdg3csppxhk8p0g2zwjfvxq4v1qa"))))
+        (base32 "0hzk3v36ph6f2nnlqqyw08w3qakbcb71y572ff09cy5b20vb29dp"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f)) ;; no tests
@@ -371,7 +363,7 @@ the Anthy input method.")
 (define-public fcitx5-chinese-addons
   (package
     (name "fcitx5-chinese-addons")
-    (version "5.0.17")
+    (version "5.1.0")
     (source
      (origin
        (method url-fetch)
@@ -379,7 +371,7 @@ the Anthy input method.")
                            "/fcitx5-chinese-addons/fcitx5-chinese-addons-"
                            version "_dict.tar.xz"))
        (sha256
-        (base32 "0vilq49q02hrim0dg4z3rm6p3ma8v4smh0r5q5rrj6bkyf1apivx"))))
+        (base32 "1akf4qqvck7m93i0183ffb7jfsz0rq4f3bkf89vfxlqp4i7lfw5l"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
@@ -435,7 +427,7 @@ including input methods previous bundled inside Fcitx 4:
 (define-public fcitx5-configtool
   (package
     (name "fcitx5-configtool")
-    (version "5.0.17")
+    (version "5.1.0")
     (source
      (origin
        (method url-fetch)
@@ -443,7 +435,7 @@ including input methods previous bundled inside Fcitx 4:
              "https://download.fcitx-im.org/fcitx5"
              "/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz"))
        (sha256
-        (base32 "1mc6axvkv2i396v7hyqllpiv5rdnf8vvqg9bkb66ljni4dnikdpq"))))
+        (base32 "0xv5kckm6bsbavw0s2iqg128fv7j8sh49lpwc0acqrdmwj49x1pz"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
@@ -545,7 +537,7 @@ for Fcitx 5 with following color variants:
 (define-public fcitx5-rime
   (package
     (name "fcitx5-rime")
-    (version "5.0.16")
+    (version "5.1.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://download.fcitx-im.org/fcitx5"
@@ -553,7 +545,7 @@ for Fcitx 5 with following color variants:
                                   ".tar.xz"))
               (sha256
                (base32
-                "0d3qikdcm55p7qjfgiidx1a0zij3sv4s6j7vxxmxwyynjl5xjxjh"))))
+                "1h6vh5pkak8l528l2d2nw5gy6zqa2sy3ris3xzkakb8kmgyjd3da"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f ;no tests
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 90e00d7592..a500fdb708 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -1725,7 +1725,12 @@ Dropbox API v2.")
         (sha256
          (base32
           "1vzfhw3z2r0rb6s0qdzirh3pl7rv1z8xmxa0z5h7h1wqhpl05ai7"))
-        (patches (search-patches "dbxfs-remove-sentry-sdk.patch"))))
+        (patches (search-patches "dbxfs-remove-sentry-sdk.patch"))
+        (snippet
+         #~(begin (use-modules (guix build utils))
+                  ;; Don't check for package updates.
+                  (substitute* "dbxfs/main.py"
+                    (("if version") "if False"))))))
     (build-system python-build-system)
     (arguments
      '(#:tests? #f)) ; tests requires safefs
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 112ae5afeb..0a1c9bffb3 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015-2017, 2019, 2021-2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015, 2017, 2018, 2019, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
-;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2019, 2021-2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
 ;;; Copyright © 2017 Nikita <nikita@n0.is>
 ;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org>
@@ -101,6 +101,7 @@
   #:use-module (gnu packages ibus)
   #:use-module (gnu packages image)
   #:use-module (gnu packages kde-frameworks)
+  #:use-module (gnu packages kde)
   #:use-module (gnu packages language)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages libunwind)
@@ -338,7 +339,7 @@ tests.")
 (define-public malcontent
   (package
     (name "malcontent")
-    (version "0.8.0")
+    (version "0.11.1")
     (source
      (origin
        (method git-fetch)
@@ -347,7 +348,7 @@ tests.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0vnf0pk516fwwh41v96c29l2i7h1pnwhivlkbf53kkx1q35g7lb3"))))
+        (base32 "0g622ig5ffrzk9184xff3lardk7rnmkvj8y5g6h6s41bfh51b71m"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
@@ -358,25 +359,26 @@ tests.")
            (lambda _
              (substitute* "libmalcontent/tests/app-filter.c"
                (("g_test_add_func \\(\"/app-filter/appinfo\", test_app_filter_appinfo\\);")
-                 ""))
-             #t)))))
+                 "")))))))
     (native-inputs
-     `(("desktop-file-utils" ,desktop-file-utils)
-       ("gettext" ,gettext-minimal)
-       ("glib:bin" ,glib "bin")
-       ("gobject-introspection" ,gobject-introspection)
-       ("gtk+:bin" ,gtk+ "bin")
-       ("itstool" ,itstool)
-       ("libglib-testing" ,libglib-testing)
-       ("libxml2" ,libxml2)
-       ("pkg-config" ,pkg-config)))
+     (list desktop-file-utils
+           gettext-minimal
+           `(,glib "bin")
+           gobject-introspection
+           `(,gtk "bin")
+           itstool
+           libglib-testing
+           libxml2
+           pkg-config))
     (inputs
      (list accountsservice
+           appstream
            appstream-glib
            dbus
            flatpak
            glib
-           gtk+
+           gtk
+           libadwaita
            libostree
            linux-pam
            polkit))
@@ -643,7 +645,7 @@ the freedesktop.org XDG Base Directory specification.")
 (define-public elogind
   (package
     (name "elogind")
-    (version "246.10")
+    (version "252.9")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -652,25 +654,30 @@ the freedesktop.org XDG Base Directory specification.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "16045bhpwjq2nqgswln67ipg1zrz2djxlgkfngqng3jqpwagmnzq"))
-              (patches (search-patches
-                        "elogind-revert-polkit-detection.patch"))))
+                "049cfv97975x700s7lx4p9i22nv6v7j046iwkspxba7kr5qq7akw"))
+              (patches (search-patches "elogind-fix-rpath.patch"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
        ,#~(let* ((out #$output)
                  (sysconf (string-append out "/etc"))
                  (libexec (string-append out "/libexec/elogind"))
-                 (dbuspolicy (string-append out "/etc/dbus-1/system.d"))
+                 (dbus-data (string-append out "/share/dbus-1"))
+                 (dbuspolicy (string-append dbus-data "/system.d"))
+                 (dbussessionservice (string-append dbus-data "/services"))
+                 (dbussystemservice (string-append dbus-data
+                                                   "/system-services"))
+                 (dbusinterfaces (string-append dbus-data "/interfaces"))
+
                  #$@(if (not (target-riscv64?))
-                      #~((kexec-tools #$(this-package-input "kexec-tools")))
-                      #~())
+                        #~((kexec-tools #$(this-package-input "kexec-tools")))
+                        #~())
                  (shadow #$(this-package-input "shadow"))
                  (shepherd #$(this-package-input "shepherd"))
                  (halt-path (string-append shepherd "/sbin/halt"))
                  #$@(if (not (target-riscv64?))
-                      #~((kexec-path (string-append kexec-tools "/sbin/kexec")))
-                      #~())
+                        #~((kexec-path (string-append kexec-tools "/sbin/kexec")))
+                        #~())
                  (nologin-path (string-append shadow "/sbin/nologin"))
                  (poweroff-path (string-append shepherd "/sbin/shutdown"))
                  (reboot-path (string-append shepherd "/sbin/reboot")))
@@ -679,12 +686,15 @@ the freedesktop.org XDG Base Directory specification.")
              (string-append "-Dsysconfdir=" sysconf)
              (string-append "-Drootlibexecdir=" libexec)
              (string-append "-Ddbuspolicydir=" dbuspolicy)
+             (string-append "-Ddbussessionservicedir=" dbussessionservice)
+             (string-append "-Ddbussystemservicedir=" dbussystemservice)
+             (string-append "-Ddbus-interfaces-dir=" dbusinterfaces)
              (string-append "-Dc_link_args=-Wl,-rpath=" libexec)
              (string-append "-Dcpp_link_args=-Wl,-rpath=" libexec)
              (string-append "-Dhalt-path=" halt-path)
              #$@(if (not (target-riscv64?))
-                  #~((string-append "-Dkexec-path=" kexec-path))
-                  #~())
+                    #~((string-append "-Dkexec-path=" kexec-path))
+                    #~())
              (string-append "-Dpoweroff-path=" poweroff-path)
              (string-append "-Dreboot-path=" reboot-path)
              (string-append "-Dnologin-path=" nologin-path)
@@ -703,21 +713,28 @@ the freedesktop.org XDG Base Directory specification.")
            ;; XXX There is no run-time setting to set this per-process, only a
            ;; build-time, hard-coded list of global directories.
            (lambda _
-             (substitute* (list "src/login/elogind-dbus.c"
-                                "src/sleep/sleep.c")
+             (substitute* (list "src/login/logind-core.c"
+                                "src/login/logind-dbus.c"
+                                "src/sleep/sleep.c"
+                                "src/shared/sleep-config.c")
                (("PKGSYSCONFDIR") "\"/etc/elogind\""))))
          (add-after 'unpack 'adjust-tests
            (lambda _
-             ;; Skip the following test, which depends on users such as 'root'
-             ;; existing in the build environment.
-             (invoke "sed" "/src\\/test\\/test-user-util.c/,+2s/^/#/g"
-                     "-i" "src/test/meson.build")
+             ;; Skip the user-util tests, which depends on users such as
+             ;; 'root' existing in the build environment.
+             (substitute* "src/test/meson.build"
+               ((".*'test-user-util.c'.*") "")
+               ((".*'test-cgroup.c'.*") ""))
              ;; This test tries to copy some bytes from /usr/lib/os-release,
              ;; which does not exist in the build container.  Choose something
              ;; more likely to be available.
              (substitute* "src/test/test-copy.c"
                (("/usr/lib/os-release")
-                "/etc/passwd"))
+                "/etc/passwd")
+               ;; Skip the copy_holes test, which fails for unknown reasons
+               ;; (see: https://github.com/elogind/elogind/issues/261).
+               (("TEST_RET\\(copy_holes).*" all)
+                (string-append all "        return 77;\n")))
              ;; Use a shebang that works in the build container.
              (substitute* "src/test/test-exec-util.c"
                (("#!/bin/sh")
@@ -742,41 +759,37 @@ the freedesktop.org XDG Base Directory specification.")
              ;; loopback device, but that fails because /sys is unavailable.
              (substitute* "src/libelogind/sd-device/test-sd-device-thread.c"
                ((".*sd_device_new_from_syspath.*/sys/class/net/lo.*")
-                "return 77;"))
-             ;; Most of these tests require cgroups or an actual live
-             ;; logind system so that it can flicker the monitor, etc.
-             ;; Just skip it until a more narrow selection can be made.
-             (substitute* "src/libelogind/sd-login/test-login.c"
-               (("test_login\\(\\);")
                 "return 77;"))))
          (add-after 'unpack 'change-pid-file-path
            (lambda _
              (substitute* "src/login/elogind.c"
                (("\"/run/elogind.pid\"") "\"/run/systemd/elogind.pid\"")))))))
     (native-inputs
-     `(("docbook-xml" ,docbook-xml-4.5)
-       ("docbook-xml-4.2" ,docbook-xml-4.2)
-       ("docbook-xsl" ,docbook-xsl)
-       ("gettext" ,gettext-minimal)
-       ("gperf" ,gperf)
-       ("libxml2" ,libxml2)                     ;for XML_CATALOG_FILES
-       ("m4" ,m4)
-       ("pkg-config" ,pkg-config)
-       ("python" ,python)
-       ("xsltproc" ,libxslt)))
+     (list docbook-xml-4.5
+           docbook-xml-4.2
+           docbook-xsl
+           gettext-minimal
+           gperf
+           libxml2                      ;for XML_CATALOG_FILES
+           m4
+           pkg-config
+           python
+           python-jinja2
+           libxslt))
     (inputs
      (append
-       (if (not (target-riscv64?))
-         (list kexec-tools)
-         '())
-       (list linux-pam
-             libcap
-             shadow         ; for 'nologin'
-             shepherd       ; for 'halt' and 'reboot', invoked
-                            ; when pressing the power button
-             dbus
-             eudev
-             acl)))         ; to add individual users to ACLs on /dev nodes
+      (if (not (target-riscv64?))
+          (list kexec-tools)
+          '())
+      (list linux-pam
+            libcap
+            `(,util-linux "lib")        ;for 'libmount'
+            shadow                      ;for 'nologin'
+            shepherd                    ;for 'halt' and 'reboot', invoked
+                                        ;when pressing the power button
+            dbus
+            eudev
+            acl)))             ; to add individual users to ACLs on /dev nodes
     (home-page "https://github.com/elogind/elogind")
     (synopsis "User, seat, and session management service")
     (description "Elogind is the systemd project's \"logind\" service,
@@ -2891,14 +2904,14 @@ interfaces.")
 (define-public xdg-desktop-portal-kde
   (package
     (name "xdg-desktop-portal-kde")
-    (version "5.25.5")
+    (version "5.27.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version "/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0l3lmwihxyl65y0mkyg3afk1k6gc0ldjw2vg92g7yydbgmn39q7k"))))
+                "0wzp21l521d9z9mnfgiapzljqpg5qc5ghyzndpr8cz54c2bf9mdf"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules pkg-config))
     (inputs (list cups
@@ -2917,7 +2930,12 @@ interfaces.")
                   kiconthemes
                   qtdeclarative-5
                   qtwayland-5
-                  wayland))
+                  wayland
+                  kglobalaccel
+                  kguiaddons
+                  libxkbcommon
+                  kio-fuse
+                  wayland-protocols))
     (synopsis "Backend implementation for xdg-desktop-portal using Qt/KF5")
     (description "This package provides a backend implementation
 for xdg-desktop-portal that is using Qt/KF5.")
diff --git a/gnu/packages/fvwm.scm b/gnu/packages/fvwm.scm
index 872810c658..f7866ea870 100644
--- a/gnu/packages/fvwm.scm
+++ b/gnu/packages/fvwm.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Nikita <nikita@n0.is>
 ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
@@ -67,7 +67,7 @@
     (inputs
      (list fribidi
            libpng
-           librsvg
+           (librsvg-for-system)
            libxcursor
            libxext
            libxft
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index bf5c680042..453d742fb1 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -430,7 +430,7 @@ mouse and joystick control, and original music.")
      `(#:tests? #f                      ; no check target
        #:make-flags
        (list "CC=gcc"
-             "CFLAGS=-D_FILE_OFFSET_BITS=64"
+             "CFLAGS=-D_FILE_OFFSET_BITS=64 -fcommon"
              (string-append "PREFIX=" (assoc-ref %outputs "out")))
        #:phases
        (modify-phases %standard-phases
@@ -713,7 +713,8 @@ canyons and wait for the long I-shaped block to clear four rows at a time.")
      (list ncurses))
     (arguments
      `(#:tests? #f                      ;no tests
-       #:make-flags '("CC=gcc")
+       #:make-flags '("CC=gcc"
+                      "CFLAGS=-O2 -DHAVE_IPV6 -g -Wall -fcommon")
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)            ;no configure script
@@ -1160,7 +1161,7 @@ allows users to brew while offline.")
 (define-public corsix-th
   (package
     (name "corsix-th")
-    (version "0.66")
+    (version "0.67")
     (source
      (origin
        (method git-fetch)
@@ -1169,29 +1170,28 @@ allows users to brew while offline.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0sgsvhqgiq6v1v5am7ghja8blhlrj0y1arvq6xq1j5fwa7c59ihs"))))
+        (base32 "14996kbrwdrd0gpz19il2i4p650qdhjw8v8ka3aigk6pl4kda3sq"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'wrap-binary
-           (lambda _
-             ;; Set Lua module paths and default MIDI soundfont on startup.
-             (let* ((out (assoc-ref %outputs "out"))
-                    (fluid (assoc-ref %build-inputs "fluid-3"))
-                    (lua-version ,(version-major+minor (package-version lua)))
-                    (lua-cpath
-                     (map (lambda (lib)
-                            (string-append
-                             (assoc-ref %build-inputs (string-append "lua-" lib))
-                             "/lib/lua/" lua-version "/?.so"))
-                          '("filesystem" "lpeg"))))
-               (wrap-program (string-append out "/bin/corsix-th")
-                 `("LUA_CPATH" ";" = ,lua-cpath)
-                 `("SDL_SOUNDFONTS" ":" suffix
-                   (,(string-append fluid "/share/soundfonts/FluidR3Mono_GM.sf3")))))
-             #t)))
-       #:tests? #f)) ; TODO need busted package to run tests
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'wrap-binary
+            (lambda _
+              ;; Set Lua module paths and default MIDI soundfont on startup.
+              (let* ((fluid #$(this-package-input "fluid-3"))
+                     (lua-version #$(version-major+minor (package-version lua)))
+                     (lua-cpath
+                      (map (lambda (lib)
+                             (string-append
+                              (assoc-ref %build-inputs (string-append "lua-" lib))
+                              "/lib/lua/" lua-version "/?.so"))
+                           '("filesystem" "lpeg"))))
+                (wrap-program (string-append #$output "/bin/corsix-th")
+                  `("LUA_CPATH" ";" = ,lua-cpath)
+                  `("SDL_SOUNDFONTS" ":" suffix
+                    (,(string-append fluid "/share/soundfonts/FluidR3Mono_GM.sf3"))))))))
+      #:tests? #f)) ; TODO need busted package to run tests
     ;; Omit Lua-Socket dependency to disable automatic updates.
     (inputs
      (list ffmpeg
@@ -1542,7 +1542,7 @@ effects and music to make a completely free game.")
 (define-public freedroidrpg
   (package
     (name "freedroidrpg")
-    (version "1.0rc2")
+    (version "1.0")
     (source
      (origin
        (method url-fetch)
@@ -1553,7 +1553,7 @@ effects and music to make a completely free game.")
                              "freedroidRPG-" major+minor "/"
                              "freedroidRPG-" version ".tar.gz")))
        (sha256
-        (base32 "10jknaad2ph9j5bs4jxvpnl8rq5yjlq0nasv98f4mki2hh8yiczy"))))
+        (base32 "1kxvyg70r9x8q40kn5lr3h1q60d6jx9mkvxls4aflj22b45vg5br"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -1891,7 +1891,13 @@ built-in level editor.")
                                   version "_src.tar.gz"))
               (sha256
                (base32
-                "18vp2ygvn0s0jz8rm585jqf6hjqkam1ximq81k0r9hpmfj7wb88f"))))
+                "18vp2ygvn0s0jz8rm585jqf6hjqkam1ximq81k0r9hpmfj7wb88f"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Fix a missing include for std::map.
+               #~(substitute* "src/shared/impl/lua_func_wrapper.cpp"
+                   (("#include \"misc[.]hpp\"" x)
+                    (string-append "#include <map>\n" x))))))
     (build-system gnu-build-system)
     (arguments
      '(#:make-flags
@@ -2012,7 +2018,7 @@ such as chess or stockfish.")
 (define-public gnubg
   (package
     (name "gnubg")
-    (version "1.06.002")
+    (version "1.07.001")
     (source
      (origin
        (method url-fetch)
@@ -2020,10 +2026,10 @@ such as chess or stockfish.")
                            version "-sources.tar.gz"))
        (sha256
         (base32
-         "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf"))))
+         "07l2srlm05c99l4pppba8l54bnh000ns2rih5h8rzbcw84lrffbj"))))
     (build-system gnu-build-system)
     (inputs (list ;; XXX: Build with an older Pango for 'pango_font_get_hb_font' and
-                  ;; 'pango_coverage_get_type'.  Try removing this for versions > 1.06.002.
+                  ;; 'pango_coverage_get_type'.  Try removing this for versions > 1.07.001.
                   pango-1.42
                   glib
                   readline
@@ -2377,7 +2383,7 @@ Every puzzle has a complete solution, although there may be more than one.")
                 #t))))
    (build-system gnu-build-system)
    (arguments
-    '(#:configure-flags '("--disable-cpu-opt")
+    '(#:configure-flags '("--disable-cpu-opt" "CFLAGS=-fcommon")
       #:make-flags `(,(string-append "gamesdir="
                                      (assoc-ref %outputs "out") "/bin"))
       #:phases
@@ -3740,7 +3746,7 @@ object-oriented programming.")
                                (assoc-ref inputs "chess")
                                "/bin/gnuchessx"))))))))
     (inputs
-     (list alsa-utils chess gtk+-2 librsvg))
+     (list alsa-utils chess gtk+-2 (librsvg-for-system)))
     (native-inputs
      (list texinfo pkg-config))
     (home-page "https://www.gnu.org/software/xboard/")
@@ -5166,7 +5172,7 @@ are only two levels to play with, but they are very addictive.")
                (("\"beep\"")
                 (string-append "\"" (assoc-ref inputs "beep") "/bin/beep\"")))
              #t)))))
-    (inputs (list avahi beep gtk+ librsvg))
+    (inputs (list avahi beep gtk+ (librsvg-for-system)))
     (native-inputs (list intltool itstool libxml2 pkg-config))
     (synopsis "Board game inspired by The Settlers of Catan")
     (description "Pioneers is an emulation of the board game The Settlers of
@@ -5815,7 +5821,7 @@ safety of the Chromium vessel.")
        ("fribidi" ,fribidi)
        ("gettext" ,gettext-minimal)
        ("libpng" ,libpng)
-       ("librsvg" ,librsvg)
+       ("librsvg" ,(librsvg-for-system))
        ("libpaper" ,libpaper)
        ("netpbm" ,netpbm)
        ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-ttf sdl-image)))))
@@ -6509,7 +6515,7 @@ emerges from a sewer hole and pulls her below ground.")
 (define-public cdogs-sdl
   (package
     (name "cdogs-sdl")
-    (version "1.4.0")
+    (version "1.5.0")
     (source
      (origin
        (method git-fetch)
@@ -6518,13 +6524,21 @@ emerges from a sewer hole and pulls her below ground.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1505z8rli59i1ych4rzwbf4dvhv72icdj22n1xarb8xfyz0wyp3b"))))
+        (base32 "1i1akay3ad2bkiqa7vfkh3qyhiqax8ikp1v6lfjysvxg65wkqdvc"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags
-       (list (string-append "-DCDOGS_DATA_DIR="
-                            (assoc-ref %outputs "out")
-                            "/share/cdogs-sdl/"))))
+     (list
+      #:configure-flags
+      #~(list (string-append "-DCDOGS_DATA_DIR=" #$output
+                             "/share/cdogs-sdl/"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-install-directory
+            (lambda _
+              (substitute* "CMakeLists.txt"
+                (("set\\(DATA_INSTALL_DIR \".\"\\)")
+                 (string-append "set(DATA_INSTALL_DIR \""
+                                #$output "/share/cdogs-sdl\")"))))))))
     (native-inputs
      (list pkg-config))
     (inputs
@@ -7755,7 +7769,7 @@ Github or Gitlab.")
             (base32
              "1s86cd36rwkff329mb1ay1wi5qqyi35564ppgr3f4qqz9wj9vs2m"))))
        ("gettext" ,gettext-minimal)
-       ("librsvg" ,librsvg)
+       ("librsvg" ,(librsvg-for-system))
        ("po4a" ,po4a)
        ("python" ,python-wrapper)))
     (inputs
@@ -8243,7 +8257,8 @@ ncurses for text display.")
            physfs
            python
            python-pyyaml
-           (sdl-union (list sdl2 sdl2-image sdl2-mixer))
+           sdl2
+           sdl2-image
            suitesparse))
     (home-page "https://naev.org/")
     (synopsis "Game about space exploration, trade and combat")
diff --git a/gnu/packages/genealogy.scm b/gnu/packages/genealogy.scm
index b8bd4339b9..c1cd26a9c4 100644
--- a/gnu/packages/genealogy.scm
+++ b/gnu/packages/genealogy.scm
@@ -63,7 +63,7 @@
            gtk+
            gtkspell3
            graphviz
-           librsvg
+           (librsvg-for-system)
            osm-gps-map
            pango
            python-bsddb3
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index f5f59d1d99..dee2ea068c 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2434,7 +2434,7 @@ track your position right from your laptop.")
        ("gdal" ,gdal)
        ("proj" ,proj)
        ("qtbase" ,qtbase-5)
-       ("qtimageformats" ,qtimageformats)
+       ("qtimageformats" ,qtimageformats-5)
        ("qtlocation" ,qtlocation)
        ("qtsensors" ,qtsensors)
        ("zlib" ,zlib)))
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index f2e01e6a3f..1408cc4cb4 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -240,11 +240,13 @@ from Markdown files.")
     (version "0.69")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://github.com/mquinson/po4a/releases/download/v"
+              (uri (string-append "https://github.com/mquinson/po4a"
+                                  "/releases/download/v"
                                   version "/po4a-" version ".tar.gz"))
               (sha256
                (base32
-                "15llrfdp4ilbrxy65hmmxka86xj0mrbqfiyzv715wrk16vqszm3w"))))
+                "15llrfdp4ilbrxy65hmmxka86xj0mrbqfiyzv715wrk16vqszm3w"))
+              (patches (search-patches "po4a-partial-texinfo-menu-fix.patch"))))
     (build-system perl-build-system)
     (arguments
      (list
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index a0b85b15d1..f523706449 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1290,6 +1290,46 @@ Some codes examples can be find at:
     (home-page "https://dbus-cxx.github.io/")
     (license license:gpl3)))
 
+(define-public sdbus-c++
+  ;; Use the latest commit, which includes unreleased fixes to the pkg-config
+  ;; file.
+  (package
+    (name "sdbus-c++")
+    (version "1.3.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/Kistler-Group/sdbus-cpp")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "03maivi3nj4g5wcydk9ih703ivmqkc93yip47wlyjni6dhikzzsb"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      ;; Avoid the integration test, which requires a system bus.
+      #:test-target "sdbus-c++-unit-tests"
+      #:configure-flags #~(list "-DBUILD_CODE_GEN=ON"
+                                "-DBUILD_TESTS=ON"
+                                ;; Do not install tests.
+                                "-DTESTS_INSTALL_PATH=/tmp"
+                                "-DCMAKE_VERBOSE_MAKEFILE=ON")
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'do-not-install-tests
+                     (lambda _
+                       (substitute* "tests/CMakeLists.txt"
+                         (("/etc/dbus-1/system.d") "/tmp")))))))
+    (native-inputs (list googletest pkg-config))
+    (inputs (list expat))
+    (propagated-inputs (list elogind)) ;required by sdbus-c++.pc
+    (home-page "https://github.com/Kistler-Group/sdbus-cpp")
+    (synopsis "High-level C++ D-Bus library")
+    (description "@code{sdbus-c++} is a high-level C++ D-Bus library designed
+to provide easy-to-use yet powerful API in modern C++.  It adds another layer
+of abstraction on top of @code{sd-bus}, the C D-Bus implementation by systemd.")
+    (license license:lgpl2.1+)))
+
 (define-public appstream-glib
   (package
     (name "appstream-glib")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ffb28f8f82..4a2e867476 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -384,7 +384,6 @@ services.")
 (define-public libcloudproviders
   (package/inherit libcloudproviders-minimal
     (name "libcloudproviders")
-    (version "0.3.1")
     (outputs (cons "doc" (package-outputs libcloudproviders-minimal)))
     (arguments
      (substitute-keyword-arguments (package-arguments libcloudproviders-minimal)
@@ -567,7 +566,7 @@ in JavaScript.")
            vala))
     (inputs
      (list avahi
-           librsvg
+           (librsvg-for-system)
            libgee
            gst-plugins-base
            gtk+))
@@ -871,7 +870,7 @@ tomorrow, the rest of the week and for special occasions.")
            libjpeg-turbo
            libportal
            libpng
-           librsvg
+           (librsvg-for-system)
            python-pygobject
            rest
            tracker
@@ -2802,11 +2801,12 @@ and how they are displayed (View).")
            gettext-minimal
            `(,glib "bin")
            gobject-introspection
+           itstool
            pkg-config
            python))
     (inputs
      (list bash-minimal
-           librsvg
+           (librsvg-for-system)
            gsettings-desktop-schemas
            gtk+
            pango
@@ -4381,7 +4381,7 @@ engineering.")
            python))
     (inputs
      (list bash-minimal
-           librsvg
+           (librsvg-for-system)
            gsettings-desktop-schemas
            gtk+
            pango
@@ -5387,7 +5387,7 @@ once.")
      (list gtk+
            json-glib
            libgee
-           librsvg
+           (librsvg-for-system)
            qqwing))
     (home-page "https://wiki.gnome.org/Apps/Sudoku")
     (synopsis "Japanese logic game")
@@ -6085,7 +6085,7 @@ playlists in a variety of formats.")
        ("pkg-config" ,pkg-config)
        ("xmllint" ,libxml2)))
     (inputs
-     (list gtk+ guile-2.2 libcanberra librsvg))
+     (list gtk+ guile-2.2 libcanberra (librsvg-for-system)))
     (home-page "https://wiki.gnome.org/Apps/Aisleriot")
     (synopsis "Solitaire card games")
     (description
@@ -6672,7 +6672,7 @@ discovery protocols.")
            libxml2
            libsoup
            libpeas
-           librsvg
+           (librsvg-for-system)
            libhandy
            gnome-desktop
            gstreamer
@@ -9109,7 +9109,7 @@ devices using the GNOME desktop.")
            libgtop
            libnma
            libpwquality
-           librsvg                      ;for loading SVG files
+           (librsvg-for-system)             ;for loading SVG files
            libsecret
            libxml2
            libwacom
@@ -10987,7 +10987,7 @@ Bluefish supports many programming and markup languages.")
            gtk+
            gtkmm-3
            libhandy
-           librsvg
+           (librsvg-for-system)
            libxml2
            libwnck))
     (home-page "https://wiki.gnome.org/Apps/SystemMonitor")
@@ -11772,7 +11772,7 @@ functionality.")
        ("libheif" ,libheif)
        ("libjpeg" ,libjpeg-turbo)
        ("libraw" ,libraw)
-       ("librsvg" ,librsvg)
+       ("librsvg" ,(librsvg-for-system))
        ("libtiff" ,libtiff)
        ("libwebp" ,libwebp)))
     (home-page "https://wiki.gnome.org/Apps/Gthumb")
@@ -12157,7 +12157,7 @@ and a high score table.")
      `(("glib" ,glib)
        ("gtk+" ,gtk+)
        ("gtk+-2" ,gtk+-2)
-       ("librsvg" ,librsvg)
+       ("librsvg" ,(librsvg-for-system))
        ("libxml2" ,libxml2)))
     (home-page "https://gitlab.gnome.org/GNOME/gnome-themes-extra")
     (synopsis "GNOME Extra Themes")
@@ -12468,7 +12468,7 @@ to.")
        ("itstool" ,itstool)
        ("pkg-config" ,pkg-config)))
     (inputs
-     (list gtk+ librsvg libxml2))
+     (list gtk+ (librsvg-for-system) libxml2))
     (arguments
      `(#:configure-flags '("CFLAGS=-fcommon")))
     (home-page "https://glabels.org/")
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 8d92c60bf2..a5b8587a14 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -453,12 +453,13 @@ and every application benefits from this.")
                (symlink (string-append gpgme "/lib/libgpgme.la")
                         "src/libgpgme.la"))
              (chdir "lang/qt"))))))
+    (propagated-inputs (list gpgme))    ;required by QGpgmeConfig.cmake
     (native-inputs
      (modify-inputs (package-native-inputs gpgme)
        (prepend pkg-config)))
     (inputs
      (modify-inputs (package-inputs gpgme)
-       (prepend gpgme qtbase-5)))
+       (prepend qtbase-5)))
     (synopsis "Qt API bindings for gpgme")
     (description "QGpgme provides a very high level Qt API around GpgMEpp.
 
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index da49f23f1f..2a94bd51cc 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1397,7 +1397,7 @@ visual effects work for film.")
      `(("giflib" ,giflib)
        ("libjpeg" ,libjpeg-turbo)       ; required for the JPEG texture plugin.
        ("jasper" ,jasper)
-       ("librsvg" ,librsvg)
+       ("librsvg" ,(librsvg-for-system))
        ("libxrandr" ,libxrandr)
        ("ffmpeg" ,ffmpeg-4)
        ("mesa" ,mesa)))
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 075f424560..86886c025f 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -797,6 +797,9 @@ model to base your own plug-in on, here it is.")
                   ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790).
                   ((".*'elements/shm\\.c'.*") "")
 
+                  ;; The 'elements_curlhttpsrc' test sometimes times out.
+                  ((".*'elements/curlhttpsrc\\.c'.*") "")
+
                   ;; This test is flaky on at least some architectures.
                   ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
                   #$@(if (target-riscv64?)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index d90ff16794..4e7c80ac8d 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3046,7 +3046,7 @@ format is also supported.")
       (propagated-inputs
        (list guile-cairo guile-rsvg))
       (native-inputs
-       (list autoconf automake librsvg pkg-config texinfo))
+       (list autoconf automake (librsvg-for-system) pkg-config texinfo))
       (home-page "https://git.elephly.net/software/guile-picture-language.git")
       (synopsis "Picture language for Guile")
       (description
@@ -3844,7 +3844,7 @@ debugging code.")
 (define-public guile-png
   (package
     (name "guile-png")
-    (version "0.6.0")
+    (version "0.7.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -3853,7 +3853,7 @@ debugging code.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0i0q2h4kfp1mj5m3wnz2hk6z895001j38s5vkbhkdxf05cjvwkky"))))
+                "0nkim662lb48y8n5hik8rrj76600v2inwaxwnfpdny7h2j0yq1wm"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
@@ -5345,7 +5345,7 @@ GitLab instance.")
 (define-public guile-smc
   (package
     (name "guile-smc")
-    (version "0.6.1")
+    (version "0.6.2")
     (source
      (origin
        (method git-fetch)
@@ -5355,7 +5355,7 @@ GitLab instance.")
        (file-name (string-append name "-" version))
        (sha256
         (base32
-         "02729gkywzimmdlmnwzclvs3wl92f9mvp5dmcbp75kmwibxly288"))))
+         "11083lj048ab5zsdgwpkshxi8v5nfdr7kvmmslszbi7lq2pwfqig"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags '("GUILE_AUTO_COMPILE=0")     ;to prevent guild warnings
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index c3310ec2a3..f9ef44a6d9 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -349,7 +349,7 @@ Chinese pinyin input methods.")
 (define-public ibus-anthy
   (package
     (name "ibus-anthy")
-    (version "1.5.14")
+    (version "1.5.15")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -357,13 +357,13 @@ Chinese pinyin input methods.")
                     version "/ibus-anthy-" version ".tar.gz"))
               (sha256
                (base32
-                "16vd0k8wm13s38869jqs3dnwmjvywgn0snnpyi41m28binhlssf8"))
+                "12yrgqiq6mqc8jr49dgkk3d7mdnyqic4xs597biwjjkahgaydi2q"))
               (patches (search-patches "ibus-anthy-fix-tests.patch"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      (list
       ;; The test suite hangs (see:
-      ;; https://github.com/ibus/ibus-anthy/issues/28).
+      ;; https://github.com/ibus/ibus-anthy/pull/35).
       #:tests? #f
       #:configure-flags
       ;; Use absolute exec path in the anthy.xml.
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 965eca82b7..afeda4bc20 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -754,7 +754,7 @@ the OpenCV-Python library.")
            libgsf
            libjpeg-turbo
            libpng
-           librsvg
+           (librsvg-for-system)
            libtiff
            libxml2
            libwebp
@@ -906,7 +906,7 @@ including 2D color images.")
            libxml2
            libexif
            libjpeg-turbo ;required by vips.pc
-           librsvg
+           (librsvg-for-system)
            fftw
            libgsf
            imagemagick
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 70f3f37768..0ce3a27b01 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -730,7 +730,7 @@ Poppler-Qt5 binding, PDF documents.")
     (native-inputs
      (list qttools-5))
     (inputs
-     (list qtbase-5 qtimageformats qtsvg-5))
+     (list qtbase-5 qtimageformats-5 qtsvg-5))
     (home-page "https://interversehq.com/qview/")
     (synopsis "Convenient and minimal image viewer")
     (description "qView is a Qt image viewer designed with visually
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 3336e38852..75f9e3c691 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1432,6 +1432,7 @@ language bindings to VIGRA.")
   (package
     (name "libwebp")
     (version "1.2.4")
+    (replacement libwebp/fixed)
     (source
      (origin
        ;; No tarballs are provided for >0.6.1.
@@ -1470,6 +1471,22 @@ to PNG when lossy compression is acceptable for the red/green/blue color
 channels.")
     (license license:bsd-3)))
 
+(define libwebp/fixed
+  (package
+    (inherit libwebp)
+    (name "libwebp")
+    (version "1.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://chromium.googlesource.com/webm/libwebp")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1aas6gwy7kfcq34cil781kcsl286khh9grwcx7k4d2n1g7zcpl3m"))))))
+
 (define-public libmng
   (package
     (name "libmng")
@@ -2571,7 +2588,7 @@ GIF, TIFF, WEBP, BMP, PNG, XPM formats.")
        ("gettext" ,gettext-minimal)))
     (inputs
      (list gtk+
-           librsvg
+           (librsvg-for-system)
            hicolor-icon-theme
            libmypaint
            mypaint-brushes
diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm
index 37d833d146..d8dc3b3e36 100644
--- a/gnu/packages/instrumentation.scm
+++ b/gnu/packages/instrumentation.scm
@@ -341,14 +341,14 @@ many probes which instrument numerous interesting parts of Linux.")
 (define-public lttng-ust
   (package
     (name "lttng-ust")
-    (version "2.13.4")
+    (version "2.13.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://lttng.org/files/lttng-ust/"
                                   "lttng-ust-" version ".tar.bz2"))
               (sha256
                (base32
-                "165kz3zsklynkxdkcbkwhw7cccdgmgmld35h1cf9hvn5bpn853v9"))))
+                "1mffy0fmr8h8kfghjadxa7nhzfwxjh7h1k97kslpmb3kvnb4bq77"))))
     (build-system gnu-build-system)
     (inputs
      (list numactl))
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index f966724022..9fc0943db1 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2021 WinterHound <winterhound@yandex.com>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -39,6 +40,7 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
+  #:use-module (guix build-system guile)
   #:use-module (guix build-system haskell)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system python)
@@ -49,6 +51,7 @@
   #:use-module (gnu packages autogen)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages backup)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
@@ -66,6 +69,7 @@
   #:use-module (gnu packages golang)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages guile-xyz)
   #:use-module (gnu packages haskell-check)
   #:use-module (gnu packages haskell-crypto)
   #:use-module (gnu packages haskell-xyz)
@@ -260,14 +264,14 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.")
 (define-public weechat
   (package
     (name "weechat")
-    (version "4.0.2")
+    (version "4.0.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://weechat.org/files/src/weechat-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0g026j47140h8kqyh3l0367fq9194wdx8q7f4na0kj14s3h8wr0f"))))
+                "1xmnks152ixn0ycs0h6dzvir3vl1wkvxahg7hjdk785dnmwljpxf"))))
     (build-system cmake-build-system)
     (outputs '("out" "doc"))
     (native-inputs
@@ -480,14 +484,14 @@ highlighted.
 (define-public sic
   (package
     (name "sic")
-    (version "1.2")
+    (version "1.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://dl.suckless.org/tools/"
                                   name "-" version ".tar.gz"))
               (sha256
                (base32
-                "11aiavxp44yayibc58bvimi8mrxvbw1plbci8cnbl4syk42zj1xc"))))
+                "1lk57mrrqgky37bjsnp72s8libywzsrbbjq8bpmz4xdw7smqyirh"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; no tests
@@ -830,3 +834,80 @@ but can also be used independently as a logging bot.")
 server written in C++ for Unix-like operating systems.")
     (home-page "https://www.inspircd.org/")
     (license license:gpl2)))
+
+(define-public snuik
+  (package
+    (name "snuik")
+    (version "0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://dezyne.org/download/snuik/"
+                           name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1lm6mbgfjzjk3pvzp1y9wkdz9dr2qyl1c6ib1hqxrnvkmlciy5p5"))))
+    (native-inputs (list guile-3.0))
+    (inputs (list bash-minimal guile-3.0 guile-8sync))
+    (build-system guile-build-system)
+    (arguments
+     (list
+      #:not-compiled-file-regexp "(guix|guix/.*)[.]scm$"
+      #:modules '((srfi srfi-1)
+                  (ice-9 popen)
+                  (guix build guile-build-system)
+                  (guix build utils))
+      #:phases
+      #~(modify-phases %standard-phases
+          #$@(if (%current-target-system)
+                 #~()
+                 #~((add-after 'build 'check
+                      (lambda _
+                        (let* ((tests (find-files "test" "[.]scm$"))
+                               (guile #$(this-package-input "guile"))
+                               (guile (string-append guile "/bin/guile")))
+                          (fold (lambda (test result)
+                                  (and
+                                   result
+                                   (invoke guile "--no-auto-compile" test)))
+                                #t
+                                tests))))))
+          (add-after 'install 'install-script
+            (lambda _
+              (let* ((bash #$(this-package-input "bash-minimal"))
+                     (bash (string-append bash "/bin/bash"))
+                     (guile #$(this-package-input "guile"))
+                     (guile (string-append guile "/bin/guile"))
+                     (build-guile #$(this-package-native-input "guile"))
+                     (build-guile (string-append build-guile "/bin/guile"))
+                     (guile-8sync #$(this-package-input "guile-8sync"))
+                     (out #$output)
+                     (bin (string-append out "/bin"))
+                     (effective (read
+                                 (open-pipe* OPEN_READ
+                                             build-guile "-c"
+                                             "(write (effective-version))")))
+                     (path (list (string-append guile "/bin")))
+                     (scm-dir (string-append "/share/guile/site/" effective))
+                     (scm-path (list (string-append out scm-dir)
+                                     (string-append guile-8sync scm-dir)))
+                     (go-dir (string-append "/lib/guile/" effective
+                                            "/site-ccache/"))
+                     (go-path (list (string-append out go-dir)
+                                    (string-append guile-8sync go-dir))))
+                (mkdir-p "bin")
+                (copy-file "snuik.sh" "bin/snuik")
+                (substitute* "bin/snuik"
+                  (("@SHELL@") bash))
+                (chmod "snuik" #o755)
+                (install-file "bin/snuik" bin)
+                (wrap-script (string-append out "/bin/snuik")
+                  `("PATH" ":" prefix ,path)
+                  `("GUILE_AUTO_COMPILE" ":" = ("0"))
+                  `("GUILE_LOAD_PATH" ":" prefix ,scm-path)
+                  `("GUILE_LOAD_COMPILED_PATH" ":" prefix ,go-path))))))))
+    (home-page "https://gitlab.com/janneke/snuik")
+    (synopsis "IRC bot using Guile-8sync")
+    (description "@code{Snuik} is an IRC bot using the GNU 8sync (for
+now).  It has some basic functionality only, such as seen, tell, and
+what.")
+    (license license:gpl3+)))
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index b82c243126..ec7b5c041b 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2021 Alexandros Theodotou <alex@zrythm.org>
 ;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,6 +33,7 @@
   #:use-module (guix build-system python)
   #:use-module (guix build-system qt)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -48,6 +50,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages calendar)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages docbook)
@@ -77,6 +80,7 @@
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages polkit)
   #:use-module (gnu packages pulseaudio)
@@ -98,7 +102,7 @@
 (define-public extra-cmake-modules
   (package
     (name "extra-cmake-modules")
-    (version "5.104.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -107,7 +111,7 @@
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1nc5ynfz903jc87xawnww3pf1y73x9jvmxnbrj24nqv6vcgv57p4"))))
+                "0yj4xpzzz5q8140mqkl2s5zabfbks76a3rqfq3cc4d5x3b9an57z"))))
     (build-system cmake-build-system)
     (native-inputs
      ;; Add test dependency, except on armhf where building it is too
@@ -122,11 +126,13 @@
                     (not (null? (package-native-inputs this-package))))
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-lib-path
+          (add-after 'unpack 'fix-lib-and-libexec-path
             (lambda _
-              ;; Always install into /lib and not into /lib64.
               (substitute* "kde-modules/KDEInstallDirsCommon.cmake"
-                (("\"lib64\"") "\"lib\""))
+                ;; Always install into /lib and not into /lib64.
+                (("\"lib64\"") "\"lib\"")
+                ;; Install into /libexec and not into /lib/libexec.
+                (("LIBDIR \"libexec\"") "EXECROOTDIR \"libexec\""))
 
               ;; Determine the install path by the major version of Qt.
               ;; TODO: Base the following on values taken from Qt
@@ -182,7 +188,7 @@ common build settings used in software produced by the KDE community.")
 (define-public kquickcharts
   (package
     (name "kquickcharts")
-    (version "5.96.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/frameworks/"
@@ -190,7 +196,7 @@ common build settings used in software produced by the KDE community.")
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1sd9mfxk72xfa1kz77s7z312scfm0vwvvgmyi4pypb9cs7d9dq3j"))))
+                "1wdmgala480qjipzpq9v85vy1i3n0qgria0rgn26ibhm2wmvmrpw"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -292,7 +298,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
 (define-public attica
   (package
     (name "attica")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -301,16 +307,17 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0w1w6w2jia1q32jnn2dhyxmkq64ha1dcbsqj233v4f224rp3aknp"))))
+                "15didd7llqamp9wbvrynnf9cap2dqmwr51mz0pcjdk0iqs6ym4qq"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'disable-network-tests
-           (lambda _
-             ;; These tests require network access.
-             (substitute* "autotests/CMakeLists.txt"
-               ((".*providertest.cpp") "")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'disable-network-tests
+            (lambda _
+              ;; These tests require network access.
+              (substitute* "autotests/CMakeLists.txt"
+                ((".*providertest.cpp") "")))))))
     (native-inputs
      (list extra-cmake-modules))
     (inputs
@@ -332,7 +339,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/")
 (define-public bluez-qt
   (package
     (name "bluez-qt")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -341,7 +348,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0h2k2qiskn921cpni5rs7x5ahric6dlllwsrk77akpi4xcsrip2g"))))
+                "1yf2rbqp9997318ybnd8myvj26pzdkx55j6w86ibvn7hwgb77hhs"))))
     (build-system cmake-build-system)
     (native-inputs
      (list dbus extra-cmake-modules))
@@ -368,7 +375,7 @@ Bluetooth stack.  It is used by the KDE Bluetooth stack, BlueDevil.")
 (define-public breeze-icons
   (package
     (name "breeze-icons")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/frameworks/"
@@ -376,7 +383,7 @@ Bluetooth stack.  It is used by the KDE Bluetooth stack, BlueDevil.")
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0a3zvmhcfsnxv0jpyjny3sl769p99psadl1872v0qlkax47pvsjp"))))
+                "175g6352lv8gq6sn4pkl91b51njdliryb82x2wdjbvzlc3zhfrcy"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules
@@ -407,7 +414,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.")
 (define-public kapidox
   (package
     (name "kapidox")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -416,12 +423,12 @@ It is the default icon theme for the KDE Plasma 5 desktop.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1k2qk8ibv5dqdhkn2992n8rlmslpmngz83hxb7zrh3pkphdg8v2n"))))
+                "1xpapgzja66lwxagrynns2ycx4cdllld5b3xrxg67si3bjz9p70a"))))
     (build-system python-build-system)
     (arguments
-     `(#:tests? #f  ; has no test target
-       #:phases (modify-phases %standard-phases
-                  (delete 'sanity-check)))) ;its insane.
+     (list #:tests? #f ; test need network
+           #:phases #~(modify-phases %standard-phases
+                        (delete 'sanity-check)))) ;its insane.
     (propagated-inputs
      ;; kapidox is a python programm
      ;; TODO: check if doxygen has to be installed, the readme does not
@@ -447,7 +454,7 @@ documentation.")
 (define-public karchive
   (package
     (name "karchive")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/frameworks/"
@@ -455,7 +462,7 @@ documentation.")
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1ipj7j1iw6g56z0qppji38h6qwbs05piiqqbsw8hdbf96l6cdiq2"))))
+                "1rbmh0sfrgv7nkmmnf8zyd5x66g9bh6kj9ry2yzivqn73ralk44y"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -464,7 +471,7 @@ documentation.")
                             (when tests?
                               (invoke "ctest" "-E" "karchivetest")))))))
     (native-inputs
-     (list extra-cmake-modules pkg-config))
+     (list extra-cmake-modules pkg-config qttools-5))
     (inputs
      (list bzip2 qtbase-5 xz zlib `(,zstd "lib")))
     (home-page "https://community.kde.org/Frameworks")
@@ -484,7 +491,7 @@ GZip format, via a subclass of QIODevice.")
 (define-public kcalendarcore
   (package
     (name "kcalendarcore")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -493,22 +500,23 @@ GZip format, via a subclass of QIODevice.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "16kclspsjzld9n07z1i8li2pc91ihpqhbk46a4s92nsihs2dkayk"))))
+                "1wxlixz7624p7693lwxgdzyi30n9zgs0mgvwldp0q0llzpxqp5yv"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules perl tzdata-for-tests))
     (inputs
      (list libical qtbase-5))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'check-setup
-           (lambda* (#:key inputs #:allow-other-keys) ;;; XXX: failing test
-             (setenv "QT_QPA_PLATFORM" "offscreen")
-             (setenv "TZ" "Europe/Prague")
-             (setenv "TZDIR"
-                     (search-input-directory inputs
-                                             "share/zoneinfo")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'check-setup
+            (lambda* (#:key inputs #:allow-other-keys) ;;; XXX: failing test
+              (setenv "QT_QPA_PLATFORM" "offscreen")
+              (setenv "TZ" "Europe/Prague")
+              (setenv "TZDIR"
+                      (search-input-directory inputs
+                                              "share/zoneinfo")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Library for interfacing with calendars")
     (description "This library provides access to and handling of calendar
@@ -524,7 +532,7 @@ and the older vCalendar.")
 (define-public kcodecs
   (package
     (name "kcodecs")
-    (version "5.104.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -533,7 +541,7 @@ and the older vCalendar.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0swxj2kr37pnwdxsipfii8q02g58lvm9lsh4kflqgfjyhvv0kjby"))))
+                "12vav9ncxcf0vpmfp7wps91ax7azrwaxhqdq8z52vcyl0rvgy341"))))
     (build-system cmake-build-system)
     (native-inputs (list extra-cmake-modules gperf qttools-5))
     (inputs (list qtbase-5))
@@ -553,10 +561,36 @@ Internet).")
                    license:lgpl2.1 license:lgpl2.1+ license:expat
                    license:lgpl3+ license:mpl1.1))))
 
+(define-public kcolorpicker
+  (package
+    (name "kcolorpicker")
+    (version "0.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/ksnip/kColorPicker")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1aw41mj0hxin2h3cldiiv7ivq5qv97l0ww42yr7j8hmkzj7qq6ba"))))
+    (build-system qt-build-system)
+    (propagated-inputs (list qtbase-5))
+    (arguments
+     (list #:configure-flags #~'("-DBUILD_TESTS=ON")))
+    (home-page "https://github.com/ksnip/kColorPicker")
+    (synopsis "Color Picker with popup menu")
+    (description
+     "@code{KColorPicker} is a subclass of @code{QToolButton} with color popup
+menu which lets you select a color.  The popup features a color dialog button
+which can be used to add custom colors to the popup menu.")
+    (license license:lgpl3+)))
+
 (define-public kconfig
   (package
     (name "kconfig")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -565,7 +599,7 @@ Internet).")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "15m2bggfr682q68dym7nzmvz7q7pwarzijad1wj0r5cs62l3bkjy"))))
+                "0gq30f5yx3razkn12zq7224sivl76jikf7c4xdfc9fw1k54sxbjd"))))
     (build-system cmake-build-system)
     (native-inputs
      (list dbus extra-cmake-modules inetutils qttools-5
@@ -616,7 +650,7 @@ propagate their changes to their respective configuration files.")
 (define-public kcoreaddons
   (package
     (name "kcoreaddons")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -625,30 +659,31 @@ propagate their changes to their respective configuration files.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52"))))
+                "0l8f59ijmcjvrpgysvrw2nmh3jqlzhlqxmgrvybipxpywams3cy8"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules qttools-5 shared-mime-info))
-           ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam
+    ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam
     (inputs
      (list qtbase-5))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'blacklist-failing-test
-           (lambda _
-             ;; Blacklist failing tests.
-             (with-output-to-file "autotests/BLACKLIST"
-               (lambda _
-                 ;; FIXME: Make it pass.  Test failure caused by stout/stderr
-                 ;; being interleaved.
-                 (display "[test_channels]\n*\n")
-                 ;; FIXME
-                 (display "[test_inheritance]\n*\n")))))
-         (add-before 'check 'check-setup
-           (lambda _
-             (setenv "HOME" (getcwd))
-             (setenv "TMPDIR" (getcwd)))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'blacklist-failing-test
+            (lambda _
+              ;; Blacklist failing tests.
+              (with-output-to-file "autotests/BLACKLIST"
+                (lambda _
+                  ;; FIXME: Make it pass.  Test failure caused by stout/stderr
+                  ;; being interleaved.
+                  (display "[test_channels]\n*\n")
+                  ;; FIXME
+                  (display "[test_inheritance]\n*\n")))))
+          (add-before 'check 'check-setup
+            (lambda _
+              (setenv "HOME" (getcwd))
+              (setenv "TMPDIR" (getcwd)))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Qt addon library with a collection of non-GUI utilities")
     (description "KCoreAddons provides classes built on top of QtCore to
@@ -661,7 +696,7 @@ many more.")
 (define-public kdbusaddons
   (package
     (name "kdbusaddons")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -670,7 +705,7 @@ many more.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0fwdmlnci2xn5pi1ywgia3xka3zsh6gl6xpx1gvql7lczk1y490a"))))
+                "1siv9ndk0zr9yq6pwjs248zzsh4kgllfj1294jym80rxcb0z6g9r"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules dbus qttools-5))
@@ -679,21 +714,22 @@ many more.")
     ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons.
     (arguments
      (list #:phases
-       #~(modify-phases %standard-phases
-         (add-before 'configure 'patch-source
-          (lambda* (#:key inputs #:allow-other-keys)
-            ;; look for the kdeinit5 executable in kinit's store directory,
-            ;; instead of the current application's directory:
-            (substitute* "src/kdeinitinterface.cpp"
-              (("<< QCoreApplication::applicationDirPath..")
-               (string-append
-                "<< QString::fromUtf8(\"/" (dirname (search-input-file inputs
-                "bin/kdeinit5")) "\")" )))))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "DBUS_FATAL_WARNINGS" "0")
-               (invoke "dbus-launch" "ctest")))))))
+           #~(modify-phases %standard-phases
+               (add-before 'configure 'patch-source
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   ;; look for the kdeinit5 executable in kinit's store directory,
+                   ;; instead of the current application's directory:
+                   (substitute* "src/kdeinitinterface.cpp"
+                     (("<< QCoreApplication::applicationDirPath..")
+                      (string-append
+                       "<< QString::fromUtf8(\"/"
+                       (dirname (search-input-file inputs "bin/kdeinit5"))
+                       "\")" )))))
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (setenv "DBUS_FATAL_WARNINGS" "0")
+                     (invoke "dbus-launch" "ctest")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Convenience classes for DBus")
     (description "KDBusAddons provides convenience classes on top of QtDBus,
@@ -705,7 +741,7 @@ as well as an API to create KDED modules.")
 (define-public kdnssd
   (package
     (name "kdnssd")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -714,7 +750,7 @@ as well as an API to create KDED modules.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0wcjq0g1cdjz9npy31i4rqbx85a95f15w71aamhm8x82l8nysv4g"))))
+                "0pxlkwjjl2gzfjf9pd7j9m1nhc6jas0wd8994jgljgxc5dc94cn8"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules qttools-5))
@@ -760,7 +796,7 @@ replace the other outdated Graphviz tools.")
 (define-public kguiaddons
   (package
     (name "kguiaddons")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -769,7 +805,7 @@ replace the other outdated Graphviz tools.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "022qf858khdqklq117i223ihpw8mvdcbcfn8cwqmn2cv9qnfxnqj"))))
+                "01yfv2ybqi894g7d1fy584x0nbmqlm7vi0b998zc52233blh8j51"))))
     (build-system qt-build-system)
     ;; TODO: Build packages for the Python bindings.  Ideally this will be
     ;; done for all versions of python guix supports.  Requires python,
@@ -788,7 +824,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.")
 (define-public kholidays
   (package
     (name "kholidays")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -796,7 +832,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.")
                     (version-major+minor version) "/"
                     name "-" version ".tar.xz"))
        (sha256
-        (base32 "0ysw52wiyxrkprn0gis85nphpfl1wdb4439i66dfmg7s9nyqpzp0"))))
+        (base32 "03g484nm37vv8mnj4q6y6pdrhhiglni3s63gpxhc54zzhzxshpy5"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules qttools-5))
@@ -811,7 +847,7 @@ other special events for a geographical region.")
 (define-public ki18n
   (package
     (name "ki18n")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -820,7 +856,7 @@ other special events for a geographical region.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0b3r53v2ybhlyqpkjv98dv2w9q49yqqxk9qzbyc4mm7ypq4hvl47"))))
+                "0kpza0n900j8lf27d60ikl963616vcqnns8va6cg8y2lf2pmxvsr"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list gettext-minimal python))
@@ -829,13 +865,14 @@ other special events for a geographical region.")
     (inputs
      (list qtbase-5 qtdeclarative-5 qtscript iso-codes))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "HOME" (getcwd))
-               (invoke "ctest" "-E" "(kcountrytest|kcountrysubdivisiontest)")))))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (replace 'check
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (setenv "HOME"
+                                      (getcwd))
+                              (invoke "ctest" "-E"
+                               "(kcountrytest|kcountrysubdivisiontest)")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "KDE Gettext-based UI text internationalization")
     (description "KI18n provides functionality for internationalizing user
@@ -852,7 +889,7 @@ translation scripting.")
 (define-public kidletime
   (package
     (name "kidletime")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -861,7 +898,7 @@ translation scripting.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1jdbjkishqnlzz1qrzyg92xnlsl7w89dmrh0zhzaj9bnr5a3icck"))))
+                "0cqb33xyqxh507332c30ja5anq99zj250b4sl6r6bn1z6j7yfzx7"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config))
@@ -881,7 +918,7 @@ or user activity.")
   ;; plasma-framework which is tier 3.
   (package
     (name "kirigami")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -890,7 +927,7 @@ or user activity.")
                     "kirigami2-" version ".tar.xz"))
               (sha256
                (base32
-                "1l0ggwrprmg5n5y3gxv7h4593fg87d7naxkf30603kkavq0hgks6"))))
+                "0kbzqkvq169w9kl4z7l7zd21mgxqdsyv8ia2j6cwd3qqn4xd3nbp"))))
     (properties `((upstream-name . "kirigami2")))
     (build-system cmake-build-system)
     (native-inputs
@@ -916,7 +953,7 @@ of applications that follow the Kirigami Human Interface Guidelines.")
 (define-public kitemmodels
   (package
     (name "kitemmodels")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -925,7 +962,7 @@ of applications that follow the Kirigami Human Interface Guidelines.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1z9swjmll833jxy2ym63zzgi9vl8ld79mgypndqszsrd4mfsbs16"))))
+                "05dd1d1dxkbjrr6x73ndsrabzaa02m3cn1h4dmsgpydy1rkzbj9v"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -966,7 +1003,7 @@ model to observers
 (define-public kitemviews
   (package
     (name "kitemviews")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -975,7 +1012,7 @@ model to observers
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "176gqlinsvdgkbg7kr4qd97mnvcnbymrkcs9kg6hm75qzxcaj8dj"))))
+                "13dcy804lv6ws1gdfjczkbnlyig11ir4p2mi26ashbgrdfpywxv1"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules qttools-5))
@@ -991,7 +1028,7 @@ to flat and hierarchical lists.")
 (define-public kplotting
   (package
     (name "kplotting")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1000,7 +1037,7 @@ to flat and hierarchical lists.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0hnzyl1x6acv1psdgsa9prpvnm12j71x6w6wbs1b0fl9bv5zw222"))))
+                "1rnkwxxms2raqswgwm0i4xgjqpzkz7wl2kbdra2gqscfz7a23s4p"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules qttools-5))
@@ -1018,7 +1055,7 @@ pixel units.")
 (define-public ksyntaxhighlighting
   (package
     (name "ksyntaxhighlighting")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1027,7 +1064,7 @@ pixel units.")
                     "syntax-highlighting-" version ".tar.xz"))
               (sha256
                (base32
-                "092ilbhhs8xaqblc9w1xksapdzvqyazz8lj011wz4762p1nagiq2"))))
+                "1lri80bv4i50xsd2wgyv383sqkxpav3smgk9ql5dil2n8pl219ky"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules perl qttools-5
@@ -1061,14 +1098,14 @@ integration with a custom editor as well as a ready-to-use
 (define-public plasma-wayland-protocols
   (package
     (name "plasma-wayland-protocols")
-    (version "1.7.0")
+    (version "1.10.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/" name "/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1mps0pirffvnpnbcpi1l9fxxfx14n83f1p46zv3987d6ra2jckh8"))))
+                "1zin4ybw3ijy6imri7xky3gcvkjspkyas8qdvvk16im0r5kqi51i"))))
     (build-system cmake-build-system)
     (native-inputs (list extra-cmake-modules))
     (arguments '(#:tests? #f))          ;no tests
@@ -1085,17 +1122,16 @@ protocols used in KDE Plasma.")
 (define-public kwayland
   (package
     (name "kwayland")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "mirror://kde/stable/frameworks/"
                     (version-major+minor version) "/"
                     name "-" version ".tar.xz"))
-              (patches (search-patches "kwayland-skip-flaky-test.patch"))
               (sha256
                (base32
-                "0c0953gm63xhrqb7aspvf28wi7x31mrgaid23dw5gqphkbgis5qw"))))
+                "11xk1rzizmqb0haqkg24kdd54a3fdqrxr2kh056irbnksp9p8k03"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config))
@@ -1114,7 +1150,14 @@ protocols used in KDE Plasma.")
       #~(modify-phases %standard-phases
           (add-before 'check 'set-XDG_RUNTIME_DIR
             (lambda _
-              (setenv "XDG_RUNTIME_DIR" (getcwd)))))))
+              (setenv "XDG_RUNTIME_DIR" (getcwd))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "ctest" "-E"
+                        ;; XXX: maybe is upstream bug
+                        "(kwayland-testWaylandRegistry|\
+kwayland-testPlasmaShell|kwayland-testPlasmaWindowModel)")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Qt-style API to interact with the wayland client and server")
     (description "As the names suggest they implement a Client respectively a
@@ -1128,7 +1171,7 @@ represented by a QPoint or a QSize.")
 (define-public kwidgetsaddons
   (package
     (name "kwidgetsaddons")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1137,20 +1180,22 @@ represented by a QPoint or a QSize.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "117wki4w2bs1d2pjhi5qpb2b3qhhva6fq9gikba5fb6980kmdayr"))))
+                "1a7svxd0c5dzx5pqjddc38cybf21wrg1hfz91gkrlv9f7ai0k878"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules qttools-5 xorg-server-for-tests))
     (inputs
      (list qtbase-5))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache")
-               (invoke "ctest" "-E" "(ksqueezedtextlabelautotest|\
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache")
+                (invoke "ctest" "-E"
+                        "(ksqueezedtextlabelautotest|\
 kwidgetsaddons-kcolumnresizertest)")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Large set of desktop widgets")
@@ -1163,7 +1208,7 @@ configuration pages, message boxes, and password requests.")
 (define-public kwindowsystem
   (package
     (name "kwindowsystem")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1172,7 +1217,7 @@ configuration pages, message boxes, and password requests.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "02l7xmxcilmrxpkkid4m9srl0d8ymqgwpw5j80w3g57p0rahwjl1"))))
+                "0112cgy09qw069v1lzaz6rp84p128mq3xqp3xink398xhp3nrkqd"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules
@@ -1188,20 +1233,21 @@ configuration pages, message boxes, and password requests.")
            xcb-util-keysyms
            xcb-util-wm))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             ;; The test suite requires a running window anager
-             (when tests?
-               (setenv "XDG_RUNTIME_DIR" "/tmp")
-               (system "Xvfb :1 -ac -screen 0 640x480x24 &")
-               (setenv "DISPLAY" ":1")
-               (sleep 5) ;; Give Xvfb a few moments to get on it's feet
-               (system "openbox &")
-               (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
-               (setenv "DBUS_FATAL_WARNINGS" "0")
-               (invoke "dbus-launch" "ctest")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              ;; The test suite requires a running window anager
+              (when tests?
+                (setenv "XDG_RUNTIME_DIR" "/tmp")
+                (system "Xvfb :1 -ac -screen 0 640x480x24 &")
+                (setenv "DISPLAY" ":1")
+                (sleep 5) ;; Give Xvfb a few moments to get on it's feet
+                (system "openbox &")
+                (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
+                (setenv "DBUS_FATAL_WARNINGS" "0")
+                (invoke "dbus-launch" "ctest")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "KDE access to the windowing system")
     (description "KWindowSystem provides information about and allows
@@ -1219,7 +1265,7 @@ lower level classes for interaction with the X Windowing System.")
 (define-public modemmanager-qt
   (package
     (name "modemmanager-qt")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1228,7 +1274,7 @@ lower level classes for interaction with the X Windowing System.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0gk4jy3r1451a2dajhnz6lin4lfawc4qdlxp7n7m43ca4d89h13k"))))
+                "1rkz1m2dlfhny9zvy8axzgjxgh41cfnmpb52rwargmrsgplcx7rz"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules dbus pkg-config))
@@ -1238,13 +1284,12 @@ lower level classes for interaction with the X Windowing System.")
     (inputs
      (list qtbase-5))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "DBUS_FATAL_WARNINGS" "0")
-               (invoke "dbus-launch" "ctest")))))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (replace 'check
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (setenv "DBUS_FATAL_WARNINGS" "0")
+                              (invoke "dbus-launch" "ctest")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Qt wrapper for ModemManager DBus API")
     (description "ModemManagerQt provides access to all ModemManager features
@@ -1256,7 +1301,7 @@ messages.")
 (define-public networkmanager-qt
   (package
     (name "networkmanager-qt")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1265,7 +1310,7 @@ messages.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0s1h02v9k8nyl30mw7gayzvpb8bnzzp9crcfqpry7rf02rxv9idw"))))
+                "0y9h1n4hccdzk5rp2bq7dyq617yg5myq7dcwnpnp1aik40647vjf"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules dbus pkg-config))
@@ -1276,13 +1321,12 @@ messages.")
     (inputs
      (list qtbase-5))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "DBUS_FATAL_WARNINGS" "0")
-               (invoke "dbus-launch" "ctest")))))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (replace 'check
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (setenv "DBUS_FATAL_WARNINGS" "0")
+                              (invoke "dbus-launch" "ctest")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Qt wrapper for NetworkManager DBus API")
     (description "NetworkManagerQt provides access to all NetworkManager
@@ -1294,7 +1338,7 @@ which are used in DBus communication.")
 (define-public oxygen-icons
   (package
     (name "oxygen-icons")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1303,7 +1347,7 @@ which are used in DBus communication.")
                     name "5" "-" version ".tar.xz"))
               (sha256
                (base32
-                "03wk52hqrgj0r73nb4yiq7rnmdn4rrqzrj3cdzbg3flkw5r7wbbq"))))
+                "0w9zcgii9z91060cnqcalv8vnj03xrnjr5k6crx28szrpplqcvxd"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules fdupes))
@@ -1318,7 +1362,7 @@ which are used in DBus communication.")
 (define-public prison
   (package
     (name "prison")
-    (version "5.98.0")
+    (version "5.108.0")
     (source
      (origin
        (method url-fetch)
@@ -1326,7 +1370,7 @@ which are used in DBus communication.")
                            (version-major+minor version) "/"
                            name "-" version ".tar.xz"))
        (sha256
-        (base32 "1ppqm1f06q8fc1ncvzn9a133npmvlh1qxgvvbpwn6m0a8cr7ac6w"))))
+        (base32 "1pn62pd7jy589z9y5r00m8d5rcqvrbskyr4a2yyfs24xv21x8lw4"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1368,7 +1412,7 @@ libpulse.")
 (define-public qqc2-desktop-style
   (package
     (name "qqc2-desktop-style")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1377,7 +1421,7 @@ libpulse.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1af7izd4k220dzngf1nwgcw0bi7vl772lpjrqd9fp9rijh74dx7d"))))
+                "1icv871q0z2wh147j3bg9xqizp2cyrsrsrsgbyyscpa9x5nlpvw9"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config))
@@ -1403,7 +1447,7 @@ feel.")
 (define-public solid
   (package
     (name "solid")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1412,16 +1456,15 @@ feel.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "14bf2k40skhyhrmgyyscg7psm1a8klf4z696pimlwjjhnawjfr06"))))
+                "0m4i7csrz167nm6h4pcd0413x6jvnd39cx13k9ayga9my36ba2r8"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "DBUS_FATAL_WARNINGS" "0")
-               (invoke "dbus-launch" "ctest")))))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (replace 'check
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (setenv "DBUS_FATAL_WARNINGS" "0")
+                              (invoke "dbus-launch" "ctest")))))))
     (native-inputs
      (list bison dbus extra-cmake-modules flex qttools-5))
     (inputs
@@ -1437,7 +1480,7 @@ system.")
 (define-public sonnet
   (package
     (name "sonnet")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1446,7 +1489,7 @@ system.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0j4p91xx1scg3jmvq6km7bwfjz5ihafk76yf1byb6aqyw50h3bm3"))))
+                "00azygjvv0fw5agd28v3kqxc3qx1wa8j4afvn5y3ncarhb5ac7p1"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config qttools-5))
@@ -1466,7 +1509,7 @@ ASpell and HUNSPELL.")
 (define-public threadweaver
   (package
     (name "threadweaver")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1475,7 +1518,7 @@ ASpell and HUNSPELL.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1pwinpz5kscx64kc7dn4qf76m64kxzp92zjk8j2a2s1mx0s0vk2s"))))
+                "094nfqbhgg8yfri7fghn8dkjdf1k5iccshj0ns2b30snw87w8b29"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1487,6 +1530,27 @@ ASpell and HUNSPELL.")
 uses a job-based interface to queue tasks and execute them in an efficient way.")
     (license license:lgpl2.1+)))
 
+(define-public libkdcraw
+  (package
+    (name "libkdcraw")
+    (version "23.04.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/" version
+                           "/src/" name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0vwr44j77c1vffsppkzdasd0l8apzx7jn6llwhzb4bjp93arx18w"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list pkg-config extra-cmake-modules))
+    (inputs
+     (list libraw qtbase-5))
+    (home-page "https://invent.kde.org/graphics/libkdcraw")
+    (synopsis "C++ interface used to decode RAW picture files")
+    (description "Libkdcraw is a C++ interface around LibRaw library used to
+decode RAW picture files.")
+    (license (list license:gpl2+ license:bsd-3))))
 
 ;; Tier 2
 ;;
@@ -1496,7 +1560,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way."
 (define-public kactivities
   (package
     (name "kactivities")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1505,7 +1569,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way."
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0n7r88y1b8mph5al2xh8fbw5ckdzdmdzjipf205y20ib35bskd9i"))))
+                "0lqhfml91wh9376xr31ky8fl49yamfzz336bdjzj3i3ygqzyc7lh"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1541,7 +1605,7 @@ with other frameworks.")
 (define-public kauth
   (package
     (name "kauth")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1550,31 +1614,32 @@ with other frameworks.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0nzdvx2mibpq1cgzpll9ffjr46vch1qvriaywyqih0iybx6mx5z6"))))
+                "0xn0v1rzjsv1a856zcw9s9qkbfaq184663akc5rrapvvfcrm2vjz"))))
     (build-system cmake-build-system)
     (native-inputs
      (list dbus extra-cmake-modules qttools-5))
     (inputs
      (list kcoreaddons polkit-qt qtbase-5))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-cmake-install-directories
-           (lambda _
-             ;; Make packages using kauth put their policy files and helpers
-             ;; into their own prefix.
-             (substitute* "KF5AuthConfig.cmake.in"
-               (("@KAUTH_POLICY_FILES_INSTALL_DIR@")
-                "${KDE_INSTALL_DATADIR}/polkit-1/actions")
-               (("@KAUTH_HELPER_INSTALL_DIR@")
-                "${KDE_INSTALL_LIBEXECDIR}")
-               (("@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@")
-                "${KDE_INSTALL_LIBEXECDIR}"))))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "DBUS_FATAL_WARNINGS" "0")
-               (invoke "dbus-launch" "ctest")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-cmake-install-directories
+            (lambda _
+              ;; Make packages using kauth put their policy files and helpers
+              ;; into their own prefix.
+              (substitute* "KF5AuthConfig.cmake.in"
+                (("@KAUTH_POLICY_FILES_INSTALL_DIR@")
+                 "${KDE_INSTALL_DATADIR}/polkit-1/actions")
+                (("@KAUTH_HELPER_INSTALL_DIR@")
+                 "${KDE_INSTALL_LIBEXECDIR}")
+                (("@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@")
+                 "${KDE_INSTALL_LIBEXECDIR}"))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (setenv "DBUS_FATAL_WARNINGS" "0")
+                (invoke "dbus-launch" "ctest")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Execute actions as privileged user")
     (description "KAuth provides a convenient, system-integrated way to offload
@@ -1585,7 +1650,7 @@ utilities.")
 (define-public kcompletion
   (package
     (name "kcompletion")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1594,7 +1659,7 @@ utilities.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "191vid00zskvhl6dgj6yz9iyvwdcmg35l5gq68ggjr17cj59acsf"))))
+                "0fgz30fb6wp2jb7bii5wy6akdzjiqy73w5mnmv0hi15mj2jkpgdq"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules qttools-5))
@@ -1610,7 +1675,7 @@ integrated it into your application's other widgets.")
 (define-public kcontacts
   (package
     (name "kcontacts")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1621,30 +1686,24 @@ integrated it into your application's other widgets.")
                (search-patches "kcontacts-incorrect-country-name.patch"))
               (sha256
                (base32
-                "0g3lg1i9rg7hjw7xjx9228sy54dy35lgwghcjds5cawszl5yi106"))))
+                "15x6f05ngs3nmxpdi11bi4k4zpjnvx5cy3yxbdklls3f2wpq6jd4"))))
     (build-system cmake-build-system)
     (native-inputs
-     (list extra-cmake-modules xorg-server)) ; for the tests
+     (list extra-cmake-modules xorg-server-for-tests)) ; for the tests
     (inputs
      (list qtbase-5))
     (propagated-inputs
      (list ;; As required by KF5ContactsConfig.cmake.
-          iso-codes kcodecs kconfig kcoreaddons qtdeclarative-5 ki18n))
+      iso-codes kcodecs kconfig kcoreaddons qtdeclarative-5 ki18n))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             ;; The test suite requires a running X server.
-             ;; Xvfb doesn't have proper glx support and needs a pixeldepth
-             ;; of 24 bit to avoid "libGL error: failed to load driver: swrast"
-             ;;                    "Could not initialize GLX"
-             (when tests?
-               (setenv "HOME" (getcwd))
-               (system "Xvfb :1 -screen 0 640x480x24 &")
-               (setenv "DISPLAY" ":1")
-               (invoke "ctest" "-E"
-                "(kcontacts-birthdaytest|kcontacts-testroundtrip|kcontacts-addresstest)")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'check-setup
+            (lambda _
+              (setenv "HOME" (getcwd))
+              (system "Xvfb +extension GLX :1 -screen 0 640x480x24 &")
+              (setenv "DISPLAY" ":1"))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "API for contacts/address book data following the vCard standard")
     (description "This library provides a vCard data model, vCard
@@ -1656,7 +1715,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca.
 (define-public kcrash
   (package
     (name "kcrash")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1665,7 +1724,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca.
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "03ba3x9jgp15dxgwbjnv5s98f5di2z4ncp4hiv1qkyiibqqfx6kf"))))
+                "1990yfssxcmbpbq9pz2nv07fpnjih4q9ql2bz1nfnanrm858pi9y"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1680,7 +1739,7 @@ application crashes.")
 (define-public kdoctools
   (package
     (name "kdoctools")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1689,7 +1748,7 @@ application crashes.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0ygpjasdynsmb3c8rdwnc5jminl5f34cmqnihsig831xsq8z6chs"))))
+                "0zi3va3jn4jps9h9h94ivxkzxw7v5vqwxgikb321hnnjgxy4nzwr"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1704,28 +1763,30 @@ application crashes.")
            perl-uri
            qtbase-5))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'cmake-find-docbook
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* (find-files "cmake" "\\.cmake$")
-               (("CMAKE_SYSTEM_PREFIX_PATH")
-                "CMAKE_PREFIX_PATH"))
-             (substitute* "cmake/FindDocBookXML4.cmake"
-               (("^.*xml/docbook/schema/dtd.*$")
-                "xml/dtd/docbook\n"))
-             (substitute* "cmake/FindDocBookXSL.cmake"
-               (("^.*xml/docbook/stylesheet.*$")
-                (string-append "xml/xsl/docbook-xsl-"
-                               ,(package-version docbook-xsl) "\n")))))
-         (add-after 'install 'add-symlinks
-           ;; Some package(s) (e.g. kdelibs4support) refer to this locale by a
-           ;; different spelling.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((xsl (string-append (assoc-ref outputs "out")
-                                       "/share/kf5/kdoctools/customization/xsl/")))
-               (symlink (string-append xsl "pt_br.xml")
-                        (string-append xsl "pt-BR.xml"))))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'cmake-find-docbook
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* (find-files "cmake" "\\.cmake$")
+                (("CMAKE_SYSTEM_PREFIX_PATH")
+                 "CMAKE_PREFIX_PATH"))
+              (substitute* "cmake/FindDocBookXML4.cmake"
+                (("^.*xml/docbook/schema/dtd.*$")
+                 "xml/dtd/docbook\n"))
+              (substitute* "cmake/FindDocBookXSL.cmake"
+                (("^.*xml/docbook/stylesheet.*$")
+                 (string-append "xml/xsl/docbook-xsl-"
+                                #$(package-version docbook-xsl)
+                                "\n")))))
+          (add-after 'install 'add-symlinks
+            ;; Some package(s) (e.g. kdelibs4support) refer to this locale by a
+            ;; different spelling.
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((xsl (string-append (assoc-ref outputs "out")
+                                        "/share/kf5/kdoctools/customization/xsl/")))
+                (symlink (string-append xsl "pt_br.xml")
+                         (string-append xsl "pt-BR.xml"))))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Create documentation from DocBook")
     (description "Provides tools to generate documentation in various format
@@ -1735,7 +1796,7 @@ from DocBook files.")
 (define-public kfilemetadata
   (package
     (name "kfilemetadata")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1744,18 +1805,20 @@ from DocBook files.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1nsvslhs2kiff3r5ji8z931lh6srvjzzvwnv9cs0j74sr46c6rkn"))))
+                "0hhq8p6wpfbi33b604ls7q9309n6pm4aa4cgjwxrspn2q8yn6p7w"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               ;; FIXME: Test can't find audio/x-speex mimeinfo
-               ;; (but it can find audio/x-speex+ogg).
-               (invoke "ctest" "-E"
-			   "(usermetadatawritertest|embeddedimagedatatest|taglibextractortest)")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                ;; FIXME: Test can't find audio/x-speex mimeinfo
+                ;; (but it can find audio/x-speex+ogg).
+                (invoke "ctest" "-E"
+                        "(usermetadatawritertest|embeddedimagedatatest|\
+taglibextractortest)")))))))
     (native-inputs (list extra-cmake-modules pkg-config))
     (inputs
      (list attr
@@ -1782,10 +1845,47 @@ used by file indexers to retrieve the metadata.  This library can also be used
 by applications to write metadata.")
     (license (list license:lgpl2.0 license:lgpl2.1 license:lgpl3))))
 
+(define-public kimageannotator
+  (package
+    (name "kimageannotator")
+    (version "0.6.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ksnip/kImageAnnotator")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1gm85d1cnhf51ssj0gs2253fifl48r05d3q5s93jwk3jkq01inll"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:configure-flags #~'("-DBUILD_TESTS=ON")
+           #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda _
+                   ;; 1 test requires a running X server, it calls
+                   ;; 'XCloseDisplay'.
+                   (system "Xvfb :1 -screen 0 640x480x24 &")
+                   (setenv "DISPLAY" ":1")
+                   (invoke "ctest" "--test-dir" "tests"))))))
+    (native-inputs
+     (list qttools-5 xorg-server-for-tests))
+    (inputs
+     (list googletest qtsvg-5 kcolorpicker))
+    (propagated-inputs
+     (list qtbase-5))
+    (home-page "https://github.com/ksnip/kImageAnnotator")
+    (synopsis "Image annotating library")
+    (description "This library provides tools to annotate images.")
+    (license license:lgpl3+)))
+
 (define-public kimageformats
   (package
     (name "kimageformats")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1794,7 +1894,7 @@ by applications to write metadata.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0v4jr1lh2qjk453q8mpz94cd98k4kmjrykn8kxrd7zvrkaa4snfy"))))
+                "07myvknlvp28kn20l30x6q22fkva72qrfziryinxgsqlhgc3j87c"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config))
@@ -1803,29 +1903,31 @@ by applications to write metadata.")
            openexr-2 ; for OpenEXR high dynamic-range images
            qtbase-5))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         ;; This test fails regularly (also at KDE CI, see
-         ;; https://build.kde.org/job/Frameworks%20kimageformats%20kf5-qt5%20XenialQt5.7/6/testReport/)
-         ;; delete offending portion
-         (add-after 'unpack 'neuter-read-xcf-test
-           (lambda _
-             (delete-file "autotests/read/xcf/simple-rgba-gimp-2.8.10.png")
-             (delete-file "autotests/read/xcf/simple-rgba-gimp-2.8.10.xcf")))
-         (add-before 'check 'check-setup
-           (lambda _
-             ;; make Qt render "offscreen", required for tests
-             (setenv "QT_QPA_PLATFORM" "offscreen")
-             (setenv "QT_PLUGIN_PATH"
-                     (string-append (getcwd) "/bin:"
-                                    (getenv "QT_PLUGIN_PATH"))))))
-       ;; FIXME: The header files of ilmbase (propagated by openexr) are not
-       ;; found when included by the header files of openexr, and an explicit
-       ;; flag needs to be set.
-       #:configure-flags
-       (list (string-append "-DCMAKE_CXX_FLAGS=-I"
-                            (assoc-ref %build-inputs "ilmbase")
-                            "/include/OpenEXR"))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'check-setup
+            (lambda _
+              ;; make Qt render "offscreen", required for tests
+              (setenv "QT_QPA_PLATFORM" "offscreen")
+              (setenv "QT_PLUGIN_PATH"
+                      (string-append (getcwd) "/bin:"
+                                     (getenv "QT_PLUGIN_PATH")))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (setenv "HOME"
+                        (getcwd))
+                ;; FIXME: I guess kde's qt no this fail.
+                ;; see https://invent.kde.org/frameworks/kimageformats/-/jobs/1046283
+                (invoke "ctest" "-E" "kimageformats-read-psd")))))
+      ;; FIXME: The header files of ilmbase (propagated by openexr) are not
+      ;; found when included by the header files of openexr, and an explicit
+      ;; flag needs to be set.
+      #:configure-flags #~(list (string-append "-DCMAKE_CXX_FLAGS=-I"
+                                               (assoc-ref %build-inputs
+                                                          "ilmbase")
+                                               "/include/OpenEXR"))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Plugins to allow QImage to support extra file formats")
     (description "This framework provides additional image format plugins for
@@ -1837,7 +1939,7 @@ formats.")
 (define-public kjobwidgets
   (package
     (name "kjobwidgets")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1846,7 +1948,7 @@ formats.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0f87n5d3h2f9y1z2imfd0jj9108wbcxg7dg4k1c53zar2lrfx4wc"))))
+                "0vhv9gx8qq73hvalcyx4g8c1ji9qxb2rn5wp4mdl7n9pypd0gscq"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules qttools-5))
@@ -1861,7 +1963,7 @@ asynchronous jobs.")
 (define-public knotifications
   (package
     (name "knotifications")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1870,7 +1972,7 @@ asynchronous jobs.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "10whr3wjldaxdvbj6i250rqgsy2m1n606ja1yka571f1fz7laqcd"))))
+                "05qdmjjxj362zhwyk0vv83wfzsgjd4nxnvk2avhiscr2k46swn96"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules dbus pkg-config qttools-5))
@@ -1887,14 +1989,14 @@ asynchronous jobs.")
            qtspeech
            qtx11extras))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "HOME" (getcwd))
-               (setenv "DBUS_FATAL_WARNINGS" "0")
-               (invoke "dbus-launch" "ctest")))))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (replace 'check
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (setenv "HOME"
+                                      (getcwd))
+                              (setenv "DBUS_FATAL_WARNINGS" "0")
+                              (invoke "dbus-launch" "ctest")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Desktop notifications")
     (description "KNotification is used to notify the user of an event.  It
@@ -1904,7 +2006,7 @@ covers feedback and persistent events.")
 (define-public kpackage
   (package
     (name "kpackage")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1913,7 +2015,7 @@ covers feedback and persistent events.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1234jq9qqhq2z5afkkniz6w5s1ab9r4x9wamq3c9y08nzjq634py"))))
+                "18185xi48an6fi0dinzfcc50lzq8cb5dx16sikmavcnhmfvlvw1g"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1925,31 +2027,36 @@ covers feedback and persistent events.")
            ki18n
            qtbase-5))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda _
-             (substitute* "src/kpackage/package.cpp"
-               (("externalPaths.false.") "externalPaths(true)"))
-             ;; Make QDirIterator follow symlinks
-             (substitute* '("src/kpackage/packageloader.cpp")
-               (("^\\s*(const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories)(;)" _ a b)
-                (string-append a " | QDirIterator::FollowSymlinks" b))
-               (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b)
-                (string-append a " | QDirIterator::FollowSymlinks" b)))))
-         (add-after 'unpack 'patch-tests
-           (lambda _
-             ;; /bin/ls doesn't exist in the build-container use /etc/passwd
-             (substitute* "autotests/packagestructuretest.cpp"
-               (("(addDirectoryDefinition\\(\")bin(\".*\")bin(\".*\")bin\""
-                 _ a b c)
-                (string-append a "etc" b "etc" c "etc\""))
-               (("filePath\\(\"bin\", QStringLiteral\\(\"ls\"))")
-                "filePath(\"etc\", QStringLiteral(\"passwd\"))")
-               (("\"/bin/ls\"") "\"/etc/passwd\""))))
-         (add-before 'check 'check-setup
-           (lambda _
-             (setenv "HOME" (getcwd)))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda _
+              (substitute* "src/kpackage/package.cpp"
+                (("externalPaths.false.")
+                 "externalPaths(true)"))
+              ;; Make QDirIterator follow symlinks
+              (substitute* '("src/kpackage/packageloader.cpp")
+                (("^\\s*(const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories)(;)"
+                  _ a b)
+                 (string-append a " | QDirIterator::FollowSymlinks" b))
+                (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)"
+                  _ a b)
+                 (string-append a " | QDirIterator::FollowSymlinks" b)))))
+          (add-after 'unpack 'patch-tests
+            (lambda _
+              ;; /bin/ls doesn't exist in the build-container use /etc/passwd
+              (substitute* "autotests/packagestructuretest.cpp"
+                (("(addDirectoryDefinition\\(\")bin(\".*\")bin(\".*\")bin\""
+                  _ a b c)
+                 (string-append a "etc" b "etc" c "etc\""))
+                (("filePath\\(\"bin\", QStringLiteral\\(\"ls\"))")
+                 "filePath(\"etc\", QStringLiteral(\"passwd\"))")
+                (("\"/bin/ls\"")
+                 "\"/etc/passwd\""))))
+          (add-before 'check 'check-setup
+            (lambda _
+              (setenv "HOME" (getcwd)))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Installation and loading of additional content as packages")
     (description "The Package framework lets the user install and load packages
@@ -1960,7 +2067,7 @@ were traditional plugins.")
 (define-public kpty
   (package
     (name "kpty")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1969,7 +2076,7 @@ were traditional plugins.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0arxbdxldwnrcg5x1vpvkwdd4hayrpqvn08jz6r7zb4s9h1582ww"))))
+                "11k1jv2wazlxbz5y7l94zsykcq544k1zbb49ximbdh45r3p5hdgw"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1978,13 +2085,13 @@ were traditional plugins.")
            ;; TODO: utempter, for managing UTMP entries
            qtbase-5))
     (arguments
-     `(#:tests? #f ; FIXME: 1/1 tests fail.
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-tests
-           (lambda _
-             (substitute* "autotests/kptyprocesstest.cpp"
-               (("/bin/bash") (which "bash"))))))))
+     (list #:tests? #f ; FIXME: 1/1 tests fail.
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'patch-tests
+                          (lambda _
+                            (substitute* "autotests/kptyprocesstest.cpp"
+                              (("/bin/bash")
+                               (which "bash"))))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Interfacing with pseudo terminal devices")
     (description "This library provides primitives to interface with pseudo
@@ -1995,7 +2102,7 @@ and communicating with them using a pty.")
 (define-public kunitconversion
   (package
     (name "kunitconversion")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2004,7 +2111,7 @@ and communicating with them using a pty.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0lhyg1d1k25kqk94lzy8mb06p4c17limmcrzirnsnxjvhjrc6r05"))))
+                "1kwz5wx0s522mwb5gxjz6cxqdkzflcckmra9qikpjrzsngamrq3j"))))
     (build-system cmake-build-system)
     (arguments `(#:tests? #f)) ;; Requires network.
     (native-inputs
@@ -2022,7 +2129,7 @@ gallons).")
 (define-public syndication
   (package
     (name "syndication")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2031,7 +2138,7 @@ gallons).")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "04py880hxkvidydsqcyjbkq0wv9cp42d7svkdgf74fmzfyfrmrax"))))
+                "0q1yhziwxj2dllqyapkqnsskhvzsjm5iz2my4pn8n0lfm90rdf8h"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -2054,7 +2161,7 @@ between feed formats.")
 (define-public baloo
   (package
     (name "baloo")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2063,7 +2170,7 @@ between feed formats.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0x515lnvrzlnsv5i924q17mzi88k00krj90myad17s0g7p5pi1rw"))))
+                "1n65nhr45vl0banbdjxhjf6wk5ypdx06qygqzqjbd9xbv7djj883"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list kcoreaddons kfilemetadata))
@@ -2088,24 +2195,14 @@ between feed formats.")
            qtdeclarative-5
            solid))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-failing-test
-           (lambda _
-             ;; FIXME: kinotifytest broke in 5.70.0 with commit 73183acf00 and
-             ;; seems like an oversight.  Reverting the commit makes it pass,
-             ;; but causes other problems.  Since just the test file names are
-             ;; broken, disabling it should be safe.  Try enabling for > 5.70.0.
-             (substitute* "autotests/unit/file/CMakeLists.txt"
-               ;; The test only runs on GNU/Linux, piggy-back on the check.
-               (("CMAKE_SYSTEM_NAME MATCHES \"Linux\"" all)
-                (string-append all " AND NOT TRUE")))))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "DBUS_FATAL_WARNINGS" "0")
-               (setenv "HOME" (getcwd))
-               (invoke "dbus-launch" "ctest")))))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (replace 'check
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (setenv "DBUS_FATAL_WARNINGS" "0")
+                              (setenv "HOME"
+                                      (getcwd))
+                              (invoke "dbus-launch" "ctest")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "File searching and indexing")
     (description "Baloo provides file searching and indexing.  It does so by
@@ -2116,7 +2213,7 @@ maintaining an index of the contents of your files.")
 (define-public kactivities-stats
   (package
     (name "kactivities-stats")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2125,7 +2222,7 @@ maintaining an index of the contents of your files.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0zvw3km1wf91wl9xbjvawjia0847kbs3js4nbf3d0z87l5h6rbx8"))))
+                "03vpangw2zl2577vhcn0w1pp2hv3jgna79b18wv7i13s78v8k6ny"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -2142,7 +2239,7 @@ by which applications, and what documents have been linked to which activity.")
 (define-public kbookmarks
   (package
     (name "kbookmarks")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2151,7 +2248,7 @@ by which applications, and what documents have been linked to which activity.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1rpjqz2xnpb2wp2k3pjdclbkb0p96y48x6h8l056nr93alxyrqvi"))))
+                "1547i2x7mrryg4w6ij47f37savmp1jmq8wp2nhiij65cdnla3qbb"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list kwidgetsaddons))
@@ -2183,7 +2280,7 @@ using the XBEL format.")
 (define-public kcmutils
   (package
     (name "kcmutils")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2192,28 +2289,34 @@ using the XBEL format.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0jqkg4i16jnxricrhi1cbvv7gjjj7ry3z36mzh11h48ml7rl05qx"))))
+                "1zhs84wrd8fkgzxwf793c6yha5nsnid4id8vs4iy7gcyahyajchr"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list kconfigwidgets kservice))
     (native-inputs
      (list extra-cmake-modules))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda _
-             (substitute* "src/kpluginselector.cpp"
-               ;; make QDirIterator follow symlinks
-               (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b)
-                (string-append a " | QDirIterator::FollowSymlinks" b)))
-             (substitute* "src/kcmoduleloader.cpp"
-               ;; print plugin name when loading fails
-               (("^\\s*(qWarning\\(\\) << \"Error loading) (plugin:\")( << loader\\.errorString\\(\\);)" _ a b c)
-                (string-append a " KCM plugin\" << mod.service()->library() << \":\"" c)))))
-         (add-before 'check 'check-setup
-           (lambda _
-             (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda _
+              (substitute* "src/kpluginselector.cpp"
+                ;; make QDirIterator follow symlinks
+                (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)"
+                  _ a b)
+                 (string-append a
+                                " | QDirIterator::FollowSymlinks" b)))
+              (substitute* "src/kcmoduleloader.cpp"
+                ;; print plugin name when loading fails
+                (("^\\s*(qWarning\\(\\) << \"Error loading) (plugin:\")( << loader\\.errorString\\(\\);)"
+                  _ a b c)
+                 (string-append a
+                                " KCM plugin\" << mod.service()->library() << \":\""
+                                c)))))
+          (add-before 'check 'check-setup
+            (lambda _
+              (setenv "QT_QPA_PLATFORM" "offscreen"))))))
     (inputs
      (list kauth
            kcodecs
@@ -2238,7 +2341,7 @@ KCModules can be created with the KConfigWidgets framework.")
 (define-public kconfigwidgets
   (package
     (name "kconfigwidgets")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2247,7 +2350,7 @@ KCModules can be created with the KConfigWidgets framework.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "05bwldqc5k6dlzsxjby5565sch6i0mh7jg5cbyjz24xb1fpj0d7b"))))
+                "1raz1bxra0dvcwwzvhfmz1y0hvfrffpdymd116xyi5lnavyzdp46"))))
     (build-system qt-build-system)
     (propagated-inputs
      (list kauth kcodecs kconfig kwidgetsaddons))
@@ -2261,20 +2364,21 @@ KCModules can be created with the KConfigWidgets framework.")
            qtbase-5
            qttools-5))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda _
-             (substitute* "src/khelpclient.cpp"
-               ;; make QDirIterator follow symlinks
-               (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b)
-                (string-append a " | QDirIterator::FollowSymlinks" b)))
-             (substitute* "CMakeLists.txt"
-               (("5\\.90\\.0") "5.98.0"))))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "ctest" "-E" "kstandardactiontest")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda _
+              (substitute* "src/khelpclient.cpp"
+                ;; make QDirIterator follow symlinks
+                (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b)
+                 (string-append a " | QDirIterator::FollowSymlinks" b)))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (setenv "HOME"
+                        (getcwd))
+                (invoke "ctest" "-E" "kstandardactiontest")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Widgets for configuration dialogs")
     (description "KConfigWidgets provides easy-to-use classes to create
@@ -2286,7 +2390,7 @@ their settings.")
 (define-public kdeclarative
   (package
     (name "kdeclarative")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2295,7 +2399,7 @@ their settings.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0y5scmcnzhwvyb7x6fdb59xgdhghw8v9i3r05gx1x7g1gfsw0wh6"))))
+                "1kdg18a2xpgl6xkrk68nnbj57nwn8rv5yd5q5bfbfc8chibk9y4z"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list kconfig kpackage qtdeclarative-5))
@@ -2319,24 +2423,24 @@ their settings.")
            qtdeclarative-5
            solid))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'start-xorg-server
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; The test suite requires a running X server, setting
-             ;; QT_QPA_PLATFORM=offscreen does not suffice.
-             (system "Xvfb :1 -screen 0 640x480x24 &")
-             (setenv "DISPLAY" ":1")))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "HOME" (getcwd))
-               (setenv "XDG_RUNTIME_DIR" (getcwd))
-               (setenv "QT_QPA_PLATFORM" "offscreen")
-               (setenv "DBUS_FATAL_WARNINGS" "0")
-               (invoke "dbus-launch" "ctest"
-                       "-E" ; FIXME: test fails.
-                       "fullmodelaccesstest")))))))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'check 'start-xorg-server
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   ;; The test suite requires a running X server, setting
+                   ;; QT_QPA_PLATFORM=offscreen does not suffice.
+                   (system "Xvfb :1 -screen 0 640x480x24 &")
+                   (setenv "DISPLAY" ":1")))
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (setenv "HOME"
+                             (getcwd))
+                     (setenv "XDG_RUNTIME_DIR"
+                             (getcwd))
+                     (setenv "QT_QPA_PLATFORM" "offscreen")
+                     (setenv "DBUS_FATAL_WARNINGS" "0")
+                     (invoke "dbus-launch" "ctest")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Integration of QML and KDE work spaces")
     (description "KDeclarative provides integration of QML and KDE work spaces.
@@ -2349,7 +2453,7 @@ that offer bindings to some of the Frameworks.")
 (define-public kded
   (package
     (name "kded")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2358,7 +2462,7 @@ that offer bindings to some of the Frameworks.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1k8yxdnihfvvdjmw7lmd62vi5k1hpvjdcwd7njqxz6178iq7dd75"))))
+                "08aa3vjzr0mj4jahzqd2z7k8whavyyvcyhk67swqlpil9rmxm0s1"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -2381,7 +2485,7 @@ started on demand.")
 (define-public kdesignerplugin
   (package
     (name "kdesignerplugin")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2390,7 +2494,7 @@ started on demand.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "17b0javl6k5zcmx04aqzmh3qdgwvzhf62x603m4pg6xbl3zns67g"))))
+                "0ibd1sgyiawl7b25ag1qs80s0vai16ab1zmdrhx85gd1583vkyab"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools qttools-5))
@@ -2410,7 +2514,7 @@ ini-style description files.")
 (define-public kdesu
   (package
     (name "kdesu")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2419,7 +2523,7 @@ ini-style description files.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "15fbb7zifk4lhnlwvqhs9svzb80qwms03zbrjfnsc1n1wyyfk7v2"))))
+                "1rhygp1r6099zrmnfvl2ldpm6rsilcy2x3bcb580bvqd536ir2yh"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list kpty))
@@ -2437,7 +2541,7 @@ with su and ssh respectively.")
 (define-public kemoticons
   (package
     (name "kemoticons")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2446,7 +2550,7 @@ with su and ssh respectively.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0f3d0jmpnqkrjn95sbvjzda923rfdgrlxd4k58pmzd0bblxkcxh2"))))
+                "0p7q5s9mv7j0sy4mm513warzhqm44wiz4vxcp9kxbqcsw0awfad6"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list kservice))
@@ -2455,13 +2559,13 @@ with su and ssh respectively.")
     (inputs
      (list karchive kconfig kcoreaddons qtbase-5))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'check-setup
-           (lambda _
-             (setenv "HOME" (getcwd))
-             ;; make Qt render "offscreen", required for tests
-             (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-before 'check 'check-setup
+                          (lambda _
+                            (setenv "HOME"
+                                    (getcwd))
+                            ;; make Qt render "offscreen", required for tests
+                            (setenv "QT_QPA_PLATFORM" "offscreen"))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Convert text emoticons to graphical emoticons")
     (description "KEmoticons converts emoticons from text to a graphical
@@ -2473,7 +2577,7 @@ emoticons coming from different providers.")
 (define-public kglobalaccel
   (package
     (name "kglobalaccel")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2482,7 +2586,7 @@ emoticons coming from different providers.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1vr6k7lpxsxa6in60ld2wcdqfpaan5xgbmwm3xyr584x6pv737cl"))))
+                "0sf6v86pfhxva7n465p9pfidyzfjviam5kk8d6lrc23zjb559f3w"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config qttools-5))
@@ -2506,7 +2610,7 @@ window does not need focus for them to be activated.")
 (define-public kiconthemes
   (package
     (name "kiconthemes")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2515,7 +2619,7 @@ window does not need focus for them to be activated.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1qmld8xgabmwx2dh5395pll0a0jgirxhlbqv6aph76jg4lvynkqx"))))
+                "0r8lz4jkb1g46ll79pdv8bmig1ij8fp7k6cpcy9nhkkhq0ra7svk"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules qttools-5 shared-mime-info))
@@ -2553,7 +2657,7 @@ in applications using the KDE Frameworks.")
 (define-public kinit
   (package
     (name "kinit")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2562,7 +2666,7 @@ in applications using the KDE Frameworks.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "04654hz3yipnlhy5gz3bkh988fcfl1lv7608k4xa5qnbsxaqh141"))
+                "1i03gn0s01jg2ridlymxf34ib88rkf30yz27h38g9fzaijjr46fi"))
               ;; Use the store paths for other packages and dynamically loaded
               ;; libs
               (patches (search-patches "kinit-kdeinit-extra_libs.patch"))))
@@ -2622,7 +2726,7 @@ consumption.")
 (define-public kio
   (package
     (name "kio")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2631,7 +2735,7 @@ consumption.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0z1ikpa3an3qmd26h2v48kxxw1jph21i12x4nawvc4x1dp4vkm1d"))
+                "1v5bpj90s5pwdvdkzcfpfgsgym7pxb3r22m4r7w9piq6n9s4c122"))
               (patches (search-patches "kio-search-smbd-on-PATH.patch"))))
     (build-system cmake-build-system)
     (propagated-inputs
@@ -2713,6 +2817,7 @@ consumption.")
                                        "|commandlauncherjob_servicetest"
                                        "|kiowidgets-kdirmodeltest"
                                        "|kiowidgets-kurifiltertest-colon-separator"
+                                       "|kiofilewidgets-kfilewidgettest"
                                        "|kiowidgets-kurifiltertest-space-separator)")))))
           (add-after 'install 'add-symlinks
             ;; Some package(s) (e.g. bluedevil) refer to these service types by
@@ -2736,7 +2841,7 @@ KIO enabled infrastructure.")
 (define-public knewstuff
   (package
     (name "knewstuff")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2745,12 +2850,12 @@ KIO enabled infrastructure.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "09mxzpv0l1i5ml963gdnji8rskmi8b2f0hp4rn6ibkcj00z48fgy"))))
+                "1hlzkacybf35lnl92vk8xkapkq5pygy8fqngskvj9f4692k6562s"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list attica kservice kxmlgui))
     (native-inputs
-     (list extra-cmake-modules))
+     (list extra-cmake-modules qttools-5))
     (inputs
      (list karchive
            kauth
@@ -2790,7 +2895,7 @@ specification.")
 (define-public knotifyconfig
   (package
     (name "knotifyconfig")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2799,7 +2904,7 @@ specification.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1qlmgr5rifygp8zk8qfjwm6k72kfyj8x6hvqwy2a59lfi3wgbm07"))))
+                "1dby6ycqicsij9ngyk6ab7v14ybnsmxd51fkcy25k4c326w6yyca"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -2832,7 +2937,7 @@ notifications which can be embedded in your application.")
 (define-public kparts
   (package
     (name "kparts")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2841,7 +2946,7 @@ notifications which can be embedded in your application.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "01gcnywbzrgwlk4cws2rr139r95r201yfal1af3jkd7g2x499vgr"))))
+                "0fckq2dpdqkqyaig61fnjanw2y9j28fckx1zrywnvyzd8q6hs4db"))))
     (build-system qt-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
@@ -2882,7 +2987,7 @@ widgets with a user-interface defined in terms of actions.")
 (define-public kpeople
   (package
     (name "kpeople")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2891,7 +2996,7 @@ widgets with a user-interface defined in terms of actions.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0wxy8pxkbfqbb4i9v3q912shzck56bk6xra3blhwva82qm9rps0f"))))
+                "0k2jnyp05rnjb4j31w4xi95qwparkqvp1m9664gvygwp9xxlnf4k"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -2918,7 +3023,7 @@ to easily extend the contacts collection.")
 (define-public krunner
   (package
     (name "krunner")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2927,8 +3032,8 @@ to easily extend the contacts collection.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0kch839xw09h1lddqgdcfwniq6rza5wdyyzcx99hcasn7l60nhsj"))))
-    (build-system cmake-build-system)
+                "0yam10c31jzwsl4qzrrcr4caxk79jqg1fyrsavjzg14ahsknb5ih"))))
+    (build-system qt-build-system)
     (propagated-inputs
      (list plasma-framework))
     (native-inputs
@@ -2953,7 +3058,6 @@ to easily extend the contacts collection.")
            kwidgetsaddons
            kwindowsystem
            kxmlgui
-           qtbase-5
            qtdeclarative-5
            solid
            threadweaver))
@@ -2987,7 +3091,7 @@ typed.")
 (define-public kservice
   (package
     (name "kservice")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2996,7 +3100,7 @@ typed.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0lgwpcdkkbxwq84zp5aymrdwy0iacqxz5ckc89pymcm0bacyhl31"))))
+                "10dfnq3x9b30kbkpq1ifg6ywj8dmdqvd1szgrwf71077yzgsh9w2"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list kconfig kcoreaddons kdoctools))
@@ -3026,7 +3130,7 @@ typed.")
                (setenv "HOME" (getcwd))
                (setenv "QT_QPA_PLATFORM" "offscreen")
                ;; Disable failing tests.
-               (invoke "ctest" "-E" "(kautostarttest|ksycocatest)")))))))
+               (invoke "ctest" "-E" "(kautostarttest|ksycocatest|kapplicationtradertest)")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Plugin framework for desktop services")
     (description "KService provides a plugin framework for handling desktop
@@ -3038,7 +3142,7 @@ types or handled by application specific code.")
 (define-public ktexteditor
   (package
     (name "ktexteditor")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -3047,7 +3151,7 @@ types or handled by application specific code.")
                     "ktexteditor-" version ".tar.xz"))
               (sha256
                (base32
-                "1pazi9rz4v95g31s7d26yla8rcb0cgd08mlmdcasywsaxc8nn7vw"))))
+                "0raz9h9y7zfynvacg4grwj0sd4v6w2kwpjkirvjr14zmfjq92mif"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list kparts
@@ -3115,7 +3219,7 @@ library.")
 (define-public ktextwidgets
   (package
     (name "ktextwidgets")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -3124,7 +3228,7 @@ library.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "14ivmpng7x9rsk3x6kyd86jabzqxgjcdrma1im44wacnvisi4llk"))))
+                "1qz1ayrrqxarhx4h24ym2hm8gkjskgdi268jv16yvd33b122fv2c"))))
     (build-system qt-build-system)
     (propagated-inputs
      (list ki18n sonnet))
@@ -3153,7 +3257,7 @@ It supports rich text as well as plain text.")
 (define-public kwallet
   (package
     (name "kwallet")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -3162,7 +3266,7 @@ It supports rich text as well as plain text.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0kwxkxlk0xlxkjgpjpb40xfl2l9hnhpymb4lxw4zwlxjn81r6sab"))))
+                "1zx80h8mj3ijj1mm5m3396vwkfhpdm8qpb63rhg8szm9hwqhd5sq"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases
@@ -3204,7 +3308,7 @@ the passwords on KDE work spaces.")
 (define-public kxmlgui
   (package
     (name "kxmlgui")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -3213,7 +3317,7 @@ the passwords on KDE work spaces.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "08n5l3zgkh0fxaqwrfx5mk4j5wq9ylkpxd37751qcivpag7l0x45"))))
+                "0v6nzq86wvbalbqq3dp47vymp31ws098c8dq0g43f6g7q3xjfxa1"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list kconfig kconfigwidgets))
@@ -3242,8 +3346,7 @@ the passwords on KDE work spaces.")
              (when tests?
                (setenv "HOME" (getcwd))
                (setenv "QT_QPA_PLATFORM" "offscreen") ;; These tests fail
-               (invoke "ctest" "-E"
-			   "(ktoolbar_unittest|kxmlgui_unittest)")))))))
+               (invoke "ctest" "-E" "(ktoolbar_unittest|kxmlgui_unittest)")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Framework for managing menu and toolbar actions")
     (description "KXMLGUI provides a framework for managing menu and toolbar
@@ -3256,7 +3359,7 @@ descriptions for integrating actions from plugins.")
 (define-public kxmlrpcclient
   (package
     (name "kxmlrpcclient")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -3265,7 +3368,7 @@ descriptions for integrating actions from plugins.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "09apfrkgvvzv8zwxyjbi5qb145a9awirk02nx474bshgypfqslpb"))))
+                "0pf5c5ja1mwdlf9pmc2601frwskkzhksz0n8w4qcwmwbaxrbspv0"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list kio))
@@ -3299,7 +3402,7 @@ setUrl, setUserAgent and call.")
 (define-public plasma-framework
   (package
     (name "plasma-framework")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -3308,7 +3411,7 @@ setUrl, setUserAgent and call.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1bmwvk0pj0bnb8qhcl0bz82r63nls6h7lzzmkfkdwcwmjifmiqg4"))))
+                "131zxamyim4bpk006nmfw2zmcay5qnmm7lmy8rvcxn96vflrs6bb"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list kpackage kservice))
@@ -3348,17 +3451,20 @@ setUrl, setUserAgent and call.")
                   qtx11extras
                   solid))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "HOME" (getcwd))
-               (setenv "QT_QPA_PLATFORM" "offscreen") ;; These tests fail
-               (invoke "ctest" "-E" (string-append "(plasma-dialogstatetest"
-                                                   "|plasma-iconitemtest"
-                                                   "|plasma-themetest"
-                                                   "|dialognativetest)"))))))))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (setenv "HOME"
+                             (getcwd))
+                     (setenv "QT_QPA_PLATFORM" "offscreen") ;; These tests fail
+                     (invoke "ctest" "-E"
+                             (string-append "(plasma-dialogstatetest"
+                                            "|plasma-iconitemtest"
+                                            "|plasma-themetest"
+                                            "|iconitemhidpitest"
+                                            "|dialognativetest)"))))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Libraries, components and tools of Plasma workspaces")
     (description "The plasma framework provides QML components, libplasma and
@@ -3369,7 +3475,7 @@ script engines.")
 (define-public purpose
   (package
     (name "purpose")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -3378,7 +3484,7 @@ script engines.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0g9ykhsn9dl3y3qp4wm3r7bkdhpl9mcbg671wa26qx3ba8a2jynr"))))
+                "0gzgdycf96z0x61vs08dh46n9c2zc11zpjscfwzhrg2k9wsb90qd"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -3393,8 +3499,8 @@ script engines.")
            qtbase-5
            qtdeclarative-5))
     (arguments
-     `(#:tests? #f  ;; seem to require network; don't find QTQuick components
-       #:configure-flags '("-DBUILD_TESTING=OFF"))) ; not run anyway
+     (list #:tests? #f ;; seem to require network; don't find QTQuick components
+           #:configure-flags #~'("-DBUILD_TESTING=OFF"))) ; not run anyway
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Offers available actions for a specific purpose")
     (description "This framework offers the possibility to create integrate
@@ -3424,6 +3530,43 @@ need.")
 (define kinit-bootstrap
   ((package-input-rewriting `((,kdbusaddons . ,kdbusaddons-bootstrap))) kinit))
 
+(define-public ktextaddons
+  (package
+    (name "ktextaddons")
+    (version "1.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://kde/stable/" name "/" name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "0ds6506il3vmqhpzd1dqcpm19yd80ijibfncr9mlhq4kvj7vnjl9"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda _
+                   (setenv "HOME" (getcwd))
+                   ;; XXX: 6 tests failed due to:
+                   ;;   missing icons
+                   ;;   translators plugins not available during tests
+                   (invoke "ctest" "-E"
+                           "(grammalecteresultwidgettest|grammalecteconfigwidgettest||grammalecteresultjobtest|languagetoolconfigwidgettest|translator-translatorwidgettest|translator-translatorengineloadertest)"))))))
+    (native-inputs
+     (list extra-cmake-modules qttools-5))
+    (inputs
+     (list karchive kconfigwidgets kcoreaddons ki18n kxmlgui
+           qtbase-5 qtkeychain))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Various text handling addons")
+    (description "This library provides text addons (autocorrection, text to
+speak, grammar checking, text translator, emoticon support) for Qt
+applications.")
+    (license
+     (list license:lgpl2.0+ license:bsd-3 license:gpl2+ license:cc0))))
+
 
 ;; Tier 4
 ;;
@@ -3435,7 +3578,7 @@ need.")
 (define-public kde-frameworkintegration
   (package
     (name "kde-frameworkintegration")
-    (version "5.98.0")
+    (version "5.108.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -3444,7 +3587,7 @@ need.")
                     "frameworkintegration-" version ".tar.xz"))
               (sha256
                (base32
-                "1mrangjj8lhm4njpkhqna2zwnidkd9crs23gj6kdlwzmiknypi6q"))))
+                "09zba76xihqs2dpwm4gh7p36nj876ssa2gah55vl362wsj7xgf21"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config))
@@ -3489,7 +3632,7 @@ workspace.")
 (define-public kdelibs4support
   (package
     (name "kdelibs4support")
-    (version "5.98.0")
+    (version "5.108.0")
     (source
      (origin
        (method url-fetch)
@@ -3498,7 +3641,7 @@ workspace.")
              (version-major+minor version) "/portingAids/"
              name "-" version ".tar.xz"))
        (sha256
-        (base32 "0hyyrxic1rkw2jrr92rnmbk6bqkfrcnpc917vs7xyansk9799b8f"))))
+        (base32 "1pqpcn4i6zcli8a2yf7fda6rwr0vs55jd9bjl0fgallyd6wl8qkf"))))
     (build-system cmake-build-system)
     (native-inputs
      (list dbus
@@ -3605,7 +3748,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.")
 (define-public khtml
   (package
     (name "khtml")
-    (version "5.98.0")
+    (version "5.108.0")
     (source
      (origin
        (method url-fetch)
@@ -3614,7 +3757,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.")
              (version-major+minor version) "/portingAids/"
              name "-" version ".tar.xz"))
        (sha256
-        (base32 "0bflwrp6i2w6a3fq2m2df655495rpnsmqcm7w1f1dzfndc6yd9i5"))))
+        (base32 "0kasxgkxfibdj81a6iiv4ciqy5fd180lsk9sa1byd8y0bydd8kjv"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules perl))
@@ -3655,7 +3798,7 @@ technology and using KJS for JavaScript support.")
 (define-public kjs
   (package
     (name "kjs")
-    (version "5.98.0")
+    (version "5.108.0")
     (source
      (origin
        (method url-fetch)
@@ -3664,7 +3807,7 @@ technology and using KJS for JavaScript support.")
              (version-major+minor version) "/portingAids/"
              name "-" version ".tar.xz"))
        (sha256
-        (base32 "03is1a5b1sfh1nd011lchgir9nrywvax06ilg9y7z0vsn0ick7ik"))))
+        (base32 "0xwih1jrdkgymr29cqr2jbj7byf8kqnbapr7wc8s0jxm5cwj2fgh"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools perl pkg-config))
@@ -3684,7 +3827,7 @@ support.")
 (define-public kjsembed
   (package
     (name "kjsembed")
-    (version "5.98.0")
+    (version "5.108.0")
     (source
      (origin
        (method url-fetch)
@@ -3693,7 +3836,7 @@ support.")
              (version-major+minor version) "/portingAids/"
              name "-" version ".tar.xz"))
        (sha256
-        (base32 "0zb4vr0hp73lzc1gfnpq1grwmlpdvnp8awf3ydx4vqjh9n6jbaf2"))))
+        (base32 "1nfi9mfph3yjglafm8clw8d1z4f4h9b71j5z4l50qsds65yv9b9a"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools qttools-5))
@@ -3708,7 +3851,7 @@ QObjects, so you can script your applications.")
 (define-public kmediaplayer
   (package
     (name "kmediaplayer")
-    (version "5.98.0")
+    (version "5.108.0")
     (source
      (origin
        (method url-fetch)
@@ -3717,7 +3860,7 @@ QObjects, so you can script your applications.")
              (version-major+minor version) "/portingAids/"
              name "-" version ".tar.xz"))
        (sha256
-        (base32 "0wcv99xgg9pxijbjl4cmsgmpwb893ira6wd3ys5ihk2nakbvd09x"))))
+        (base32 "1vkx11736wq0idxrzmfg6s2lcrilgl7yh7a97la6c3qqj2aggi08"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools qttools-5))
@@ -3744,7 +3887,7 @@ KParts instead.")
 (define-public kross
   (package
     (name "kross")
-    (version "5.98.0")
+    (version "5.108.0")
     (source
      (origin
        (method url-fetch)
@@ -3753,7 +3896,7 @@ KParts instead.")
              (version-major+minor version) "/portingAids/"
              name "-" version ".tar.xz"))
        (sha256
-        (base32 "0yjn66r44jxlrm4vz1nf8s64kcw7lmarjpqz1mcgb1n4jc28hs60"))))
+        (base32 "0j459d9610aayvzb1d9m045c71dmkgqx5bsx3lv8x1wffk8064sd"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools qttools-5))
@@ -3786,7 +3929,7 @@ offers abstract functionality to deal with scripts.")
 (define-public kdav
   (package
     (name "kdav")
-    (version "5.98.0")
+    (version "5.108.0")
     (source
      (origin
        (method url-fetch)
@@ -3794,20 +3937,21 @@ offers abstract functionality to deal with scripts.")
                            (version-major+minor version) "/"
                            name "-" version ".tar.xz"))
        (sha256
-        (base32 "02474a3k7yqgnb1sbxbnm6l4cahn88y2631jvkq9xlmcx7xs2dzi"))))
+        (base32 "0knpyzdfa0m1pyakq32pw2hwbaq2dkqj87p3n6p86wlf2rn66vir"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
     (inputs
      (list kcoreaddons ki18n kio qtbase-5 qtxmlpatterns))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests? ;; Seems to require network.
-               (invoke "ctest" "-E"
-                       "(kdav-davcollectionsmultifetchjobtest|kdav-davitemfetchjob)")))))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (replace 'check
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                               ;; Seems to require network.
+                              (invoke "ctest" "-E"
+                                      "(kdav-davcollectionsmultifetchjobtest|\
+kdav-davitemfetchjob)")))))))
     (home-page "https://invent.kde.org/frameworks/kdav")
     (synopsis "DAV protocol implementation with KJobs")
     (description "This is a DAV protocol implementation with KJobs.  Calendars
diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm
index 9be889f6aa..dc3e81170c 100644
--- a/gnu/packages/kde-games.scm
+++ b/gnu/packages/kde-games.scm
@@ -27,6 +27,8 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system qt)
+  #:use-module (guix build-system trivial)
+  #:use-module (guix gexp)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gl)
@@ -37,19 +39,20 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages qt))
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages xiph))
 
 (define-public ktuberling
   (package
     (name "ktuberling")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/ktuberling-" version ".tar.xz"))
       (sha256
-       (base32 "19kyk7r7lkzwcvhhn1jjgrcdkq8gfmzgyrvvcbm4qkx7jd27v1ia"))))
+       (base32 "0zk7wijp425657s2j7xq7mhybgyddpam88ih8i0sbpcs0sliyz7k"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools perl))
@@ -91,14 +94,14 @@ This package is part of the KDE games module.")
 (define-public picmi
   (package
     (name "picmi")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/picmi-" version ".tar.xz"))
       (sha256
-       (base32 "0nn00sila4zn4r28dh84jvqqrrs31sh9vwd76nalm7y14xrxwn46"))))
+       (base32 "1x1iv6a840jwldfpx44wvh1vki1jz1hixzvzhdfx2mhw05v91fjx"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -127,14 +130,14 @@ This package is part of the KDE games module.")
 (define-public kolf
   (package
     (name "kolf")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kolf-" version ".tar.xz"))
        (sha256
-        (base32 "0mmmj9rxrbpf9clj49zgflrlic8qafzw2r2by5knhsn15mq59bd3"))))
+        (base32 "0wbdpclc6nimjzs2pqbzaxnqn516hci1yk1dgig0jgdy1jv2nyhv"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -174,15 +177,33 @@ This package is part of the KDE games module.")
 (define-public libkmahjongg
   (package
     (name "libkmahjongg")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/libkmahjongg-" version ".tar.xz"))
       (sha256
-       (base32 "1y123bygi4iil8qglv2fx81qnlqpjpx3s4fmq8sffkilcz875nw8"))))
+       (base32 "1a0c0q34h5yxwx76y6934ibn6hm1ip1hc2xvl11q1kaazq0alca3"))))
     (build-system qt-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-tileset-dir
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              ;; Add "$out/share" to XDG_DATA_DIRS so that the default tileset
+              ;; is always available.
+              (substitute* "src/kmahjonggtileset.cpp"
+                (("_inited = true;")
+                 (format #f "QByteArray x = qgetenv(\"XDG_DATA_DIRS\");
+if (!x.isEmpty()) {
+  QString datadirs = QString::fromLocal8Bit(x) + QLatin1String(\":~a\");
+  qputenv(\"XDG_DATA_DIRS\", datadirs.toLocal8Bit());
+}
+_inited = true;"
+                         (string-append
+                          (assoc-ref outputs "out") "/share")))))))))
     (native-inputs
      (list extra-cmake-modules))
     (inputs
@@ -205,14 +226,14 @@ other Mah Jongg like games.")
 (define-public kmahjongg
   (package
     (name "kmahjongg")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/kmahjongg-" version ".tar.xz"))
       (sha256
-       (base32 "0lvia7ghnp8wx2xndzipv8grdsdn3i96xlsy6wspna1k884x8ylw"))))
+       (base32 "1q2aq8y3c4a84rjvqk4gz6mlyflfnzw6im68p96wmcn98s5gsc22"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -244,14 +265,14 @@ This package is part of the KDE games module.")
 (define-public kshisen
   (package
     (name "kshisen")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/kshisen-" version ".tar.xz"))
       (sha256
-       (base32 "004qr0kmw0c6ahif1mf2f88a849ws3kap7p2ksvljmyyl38x2sbs"))))
+       (base32 "0bfk6nbwl35sfqxhf7cdv3n61ybi5962i2lvg7m1vlpp21q0diz8"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules
@@ -283,14 +304,14 @@ This package is part of the KDE games module.")
 (define-public kajongg
   (package
     (name "kajongg")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/kajongg-" version ".tar.xz"))
       (sha256
-       (base32 "15b2l0zsyzrir791w9sdf65kvn6528b8vxdrya3f425nvsxsx7ix"))))
+       (base32 "16v87x0qikfk9jpp8dfxnb7mnjzzi0qlkp5lbn2xypkfhqaz99fi"))))
     (build-system qt-build-system)
     (arguments
      `(#:phases
@@ -300,7 +321,15 @@ This package is part of the KDE games module.")
              (substitute* "src/mjresource.py"
                (("'share', 'kmahjongglib'" all)
                 (string-append "'" (assoc-ref inputs "libkmahjongg")
-                               "/share', 'kmahjongglib'")))))
+                               "/share', 'kmahjongglib'")))
+             (substitute* "src/sound.py"
+               (("oggBinary = 'ogg123'")
+                (format #f "oggBinary = '~a'"
+                        (search-input-file inputs "bin/ogg123"))))
+             (substitute* "src/common.py"
+               (("interpreterName = 'python3'")
+                (format #f "interpreterName = '~a'"
+                        (search-input-file inputs "bin/python3"))))))
          (add-after 'qt-wrap 'wrap
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
@@ -327,7 +356,8 @@ This package is part of the KDE games module.")
            python-qtpy
            python-zope-interface
            qtbase-5
-           qtsvg-5))
+           qtsvg-5
+           vorbis-tools))
     (home-page "https://apps.kde.org/kajongg/")
     (synopsis "Classical Mah Jongg game for 4 players")
     (description "Kajongg is the ancient Chinese board game for 4 players.
@@ -346,14 +376,14 @@ This package is part of the KDE games module.")
 (define-public kbreakout
   (package
     (name "kbreakout")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kbreakout-" version ".tar.xz"))
       (sha256
-       (base32 "1pvxxl7m46ihjkzaq261xfsynikyrbrr67d4vh5pxfj6pipzrgkp"))))
+       (base32 "08fq0s1c71ag6jzyxz6spc5ylmzpbqpyqi9lqjk0x7y7brkfk9fq"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -383,14 +413,14 @@ This package is part of the KDE games module.")
 (define-public kmines
   (package
     (name "kmines")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmines-" version ".tar.xz"))
       (sha256
-       (base32 "1w6bqlzhbm3vc09jyxfg8vgn0a2nknfz1shbsfamc36jsy2sr758"))))
+       (base32 "0x301dsppn0sav31ds5hpbfkbbisjg640ri13103s1jn0y2b90b9"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -420,14 +450,14 @@ This package is part of the KDE games module.")
 (define-public konquest
   (package
     (name "konquest")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/konquest-" version ".tar.xz"))
       (sha256
-       (base32 "1kylv730plii7grzccaclg5lkmgwhdgh2ya7h7lpnb8zaapy3kbr"))))
+       (base32 "0svzaibs8v1xd36ysj3wk7sxma26fl5pz6yp774jg0g9zi9rlkff"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -459,14 +489,14 @@ This package is part of the KDE games module.")
 (define-public kbounce
   (package
     (name "kbounce")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/kbounce-" version ".tar.xz"))
       (sha256
-       (base32 "187f0hz19xj17h5dzj0nw3r9zas3sppiswhgnzma9snl1w0rfzwh"))))
+       (base32 "06b0q4f4yn8m8gy7wgax54ldwnkgykr8yfr2h0ih8mfg3w8xsx7s"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -497,14 +527,14 @@ This package is part of the KDE games module.")
 (define-public kblocks
   (package
     (name "kblocks")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/kblocks-" version ".tar.xz"))
       (sha256
-       (base32 "18hdzkwv8lscm9xsi0d99pq219y0m9bqdqv3k15g7gz0sryxvyva"))))
+       (base32 "1z5f2zpnmfh05vlmjw85jj2d0sfxl5w1kg30ky6gmgmmfzj2sjzx"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -537,14 +567,14 @@ This package is part of the KDE games module.")
 (define-public ksudoku
   (package
     (name "ksudoku")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/ksudoku-" version ".tar.xz"))
       (sha256
-       (base32 "116dgc9hh6fq6x0w4rd4kjd2qy93hq6bmxwk5jmm21lqwrszr6hw"))))
+       (base32 "03hrwyvwzhxdbq7pp03c7lkz0dhv9yi6lcwvz3s63mn01wyq6iv3"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -597,14 +627,14 @@ This package is part of the KDE games module.")
 (define-public klines
   (package
     (name "klines")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/klines-" version ".tar.xz"))
       (sha256
-       (base32 "15z5gcncyr1i7xipnsvr2lvdi9wdqm8if3ylimksxhgr5dkvz9vz"))))
+       (base32 "1dny7wsj90c3vbgbrpxvxfy44j9ip3vdylc7889ckzbliivipxk4"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -640,14 +670,14 @@ This package is part of the KDE games module.")
 (define-public kgoldrunner
   (package
     (name "kgoldrunner")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kgoldrunner-" version ".tar.xz"))
       (sha256
-       (base32 "1ga0djplhgqbfrvq0m7ymd30lsi7kc23chaqmc0vy3g61y9274da"))))
+       (base32 "0acavby9lwbqbx577a3az9lcahchngcs15571va2ndnq1r16paxf"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -680,14 +710,14 @@ This package is part of the KDE games module.")
 (define-public kdiamond
   (package
     (name "kdiamond")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kdiamond-" version ".tar.xz"))
       (sha256
-       (base32 "1ca1hxzzvpwm3ms9m0xd7x4r011n7bjlsc4l333q0xjy5vwlrz3s"))))
+       (base32 "038lpp387m45zcy49rgmisiz5ajrvxwxnf424wllrjkihxy1siyn"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -718,14 +748,14 @@ This package is part of the KDE games module.")
 (define-public kfourinline
   (package
     (name "kfourinline")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kfourinline-" version ".tar.xz"))
       (sha256
-       (base32 "163aii9bala14bhc9j503xk86jcnmnn327fmx3c68ryp0s89rx97"))))
+       (base32 "0chfjp0k4ps5f6vy8nxqc2xlj4xql08llxnzsz6c2x611n69aszm"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -756,14 +786,14 @@ This package is part of the KDE games module.")
 (define-public kblackbox
   (package
     (name "kblackbox")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kblackbox-" version ".tar.xz"))
       (sha256
-       (base32 "0im7mb93yrbliavil5bcqymcq6a4sjq1pj52ysq8gqqwf7jrw1gx"))))
+       (base32 "0h7byd7g52yvmz3gxrzp2frs4iifm0r6lq8fjz2nxbl1rkw9ljbp"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -796,14 +826,14 @@ This package is part of the KDE games module.")
 (define-public knetwalk
   (package
     (name "knetwalk")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/knetwalk-" version ".tar.xz"))
       (sha256
-       (base32 "0w1bpx04yn7xsyf4h8ymw887ir9ifbwxynqllh8xn4chwd21ipgp"))))
+       (base32 "1xqqwsbm3f8bmid7afbnacxlg1hih644f0nw0i87pr746m1sskgz"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -837,14 +867,14 @@ This package is part of the KDE games module.")
 (define-public bomber
   (package
     (name "bomber")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/bomber-" version ".tar.xz"))
        (sha256
-        (base32 "0cxyp5c119r0bkqzx0mnbfdb2i1h0ra0kp30zx0nmvma1rxrrvgf"))))
+        (base32 "0qgixhmlkcjni5i9391hjg3sfc3ps24lmk9v8199lmnplrybklqj"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -878,14 +908,14 @@ This package is part of the KDE games module.")
 (define-public granatier
   (package
     (name "granatier")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/granatier-" version ".tar.xz"))
       (sha256
-       (base32 "1ylywj579j252hj6lz5ghvmiiqf9yb2lncqbypbibdr34irs5if9"))))
+       (base32 "1zyadmgnpgsx728gzd55qyijsm13pb9cxs1y4l4c4m9lnz4y183v"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -915,14 +945,14 @@ This package is part of the KDE games module.")
 (define-public ksirk
   (package
     (name "ksirk")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/ksirk-" version ".tar.xz"))
        (sha256
-        (base32 "0c1ls3i2jqcrmdy3zhb25ml9lhdy4gjdcvv4j5z8x5wig265qbwx"))))
+        (base32 "1sp5mhnf8r3fvifz0kw74436j5kwsmiw66myygb4rsggb8amh5x4"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -970,14 +1000,14 @@ This package is part of the KDE games module.")
 (define-public palapeli
   (package
     (name "palapeli")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/palapeli-" version ".tar.xz"))
        (sha256
-        (base32 "0bwi5y5mrf6h1vhyhs5sxwx8hdv0hkknpscpg5q54f6hw6cwf4qv"))))
+        (base32 "19xh03rhb48m4bbdmpga4aqij6agqg047ghl92p98z1phg5lxzrv"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1017,14 +1047,14 @@ This package is part of the KDE games module.")
 (define-public kiriki
   (package
     (name "kiriki")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kiriki-" version ".tar.xz"))
        (sha256
-        (base32 "1ijl4hjck4wvxplcjzqw9ahadnbvd8hk61qn04kbyz6mrp67xgrn"))))
+        (base32 "13lzpbhkp48r9m0bcrzfqacz9xvc89xavf3yn3ql50g3jjlkq41v"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1055,14 +1085,14 @@ This package is part of the KDE games module.")
 (define-public kigo
   (package
     (name "kigo")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kigo-" version ".tar.xz"))
        (sha256
-        (base32 "0wav6pmljbki2ipgzp82gb2j861b2bj1c2x4ydqn106aqcm0ci71"))))
+        (base32 "0qx9plrs588210rdgvb2bkm5yjw4pna9q7v38cb166nfgkh6gv63"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1101,14 +1131,14 @@ This package is part of the KDE games module.")
 (define-public kubrick
   (package
     (name "kubrick")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kubrick-" version ".tar.xz"))
        (sha256
-        (base32 "09hxrigckvpxw1ipzlhq5fb5hpzrb5h65b55m6di3nj6ys2x50v9"))))
+        (base32 "0nank1ga4c4xfsw0m1cqhjhyz2wpbsxplyyb9x3l2vpg92gj5dbs"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1142,14 +1172,14 @@ This package is part of the KDE games module.")
 (define-public lskat
   (package
     (name "lskat")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/lskat-" version ".tar.xz"))
        (sha256
-        (base32 "07pkrgn9pgwwcc903iqmdp49i26ijkkb795jbwyhdg3nqgck9ar9"))))
+        (base32 "1qphzc1r26qwc8sl5rjkw16ia3lsj7c2lg9fxnhk08k8mxncymxg"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1180,14 +1210,14 @@ This package is part of the KDE games module.")
 (define-public kapman
   (package
     (name "kapman")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kapman-" version ".tar.xz"))
       (sha256
-       (base32 "0clh3nyc3kan0hbbzzca3sd09nl2hd36y7f6g5pv2cp6i1m4757y"))))
+       (base32 "0ildsd7pig3lm9n616kw5mpl8hbwidsnbzdfifx8nnffslrr4bv7"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1219,14 +1249,14 @@ This package is part of the KDE games module.")
 (define-public kspaceduel
   (package
     (name "kspaceduel")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kspaceduel-" version ".tar.xz"))
        (sha256
-        (base32 "1yb7y1f5rcw4jacpf9vpzbragm2ywwb3mkjhq67x7x99q6r9iz55"))))
+        (base32 "1mpry73vvi332wxyw2wymh3lsrj2amblg50dym9ni1lj2af657ia"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1254,14 +1284,14 @@ This package is part of the KDE games module.")
 (define-public bovo
   (package
     (name "bovo")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/bovo-" version ".tar.xz"))
        (sha256
-        (base32 "1yz4x7fmllmp57yxfipqkldgf38haldah81d2qmc5jlahvy3j23p"))))
+        (base32 "1zds6d4rmcf4sa2sfhyp1i5n7s7cgslikvbra4pz2kpi0hmvihi1"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1290,14 +1320,14 @@ This package is part of the KDE games module.")
 (define-public killbots
   (package
     (name "killbots")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/killbots-" version ".tar.xz"))
        (sha256
-        (base32 "07ak86a4v0v8b0nny8n246j3lab5zr8sq0ra9k48cdy53xmq909j"))))
+        (base32 "0ygg2cmp7wqzw9nsn768vzgjs8i44k3skwcn2abg1jj5k64wp9cb"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1331,14 +1361,14 @@ This package is part of the KDE games module.")
 (define-public ksnakeduel
   (package
     (name "ksnakeduel")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/ksnakeduel-" version ".tar.xz"))
       (sha256
-       (base32 "0hi812hsjnyp1ds3wwv2wr58az6m2zsq97nywsncc0d3b5cxzsza"))))
+       (base32 "182z9664p0shyx4rbr1cn32mzlfzl80x96nwakvv1ss7sf7dp1x3"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1369,14 +1399,14 @@ This package is part of the KDE games module.")
 (define-public kollision
   (package
     (name "kollision")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kollision-" version ".tar.xz"))
       (sha256
-       (base32 "0ra83qmvzd4n6d7df2i8bh81y70lxa48i115x9h9ik52b2a48mxf"))))
+       (base32 "0g9nz3df8nibcwlrjlyw306dnrx58nlga2lljn7a9acpmvbp6qgi"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1406,14 +1436,14 @@ This package is part of the KDE games module.")
 (define-public knavalbattle
   (package
     (name "knavalbattle")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/knavalbattle-" version ".tar.xz"))
       (sha256
-       (base32 "0i7hf58b3gylld6d7q2aq5w6dksa32z5y1dcaj8nm1lpgcndmj0s"))))
+       (base32 "1brj2dvymgpf74vbsrs2m81lxxfxsly9pafd13g8rkzdx3hn1n0q"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1446,14 +1476,14 @@ This package is part of the KDE games module.")
 (define-public kreversi
   (package
     (name "kreversi")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kreversi-" version ".tar.xz"))
       (sha256
-       (base32 "0gyj0a6hj6jps5z97wdw0nwp0mvnib6v062bcy4dp3c14lhl9r4p"))))
+       (base32 "1mb1xrywk5p7ipjml1g2mjqfs7rlpa41if3yc7p9zcrkcasnbffv"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1488,14 +1518,14 @@ This package is part of the KDE games module.")
 (define-public ksquares
   (package
     (name "ksquares")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/ksquares-" version ".tar.xz"))
       (sha256
-       (base32 "05cz0d83570awnh0faam3y5fxzafzkxaj3wijka1vcbigxk350c5"))))
+       (base32 "0b3r99hfhm5r4jxkwiji0lww703r7dj60x2m55ginvdy7ixm46rm"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1524,14 +1554,14 @@ This package is part of the KDE games module.")
 (define-public kjumpingcube
   (package
     (name "kjumpingcube")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kjumpingcube-" version ".tar.xz"))
       (sha256
-       (base32 "0m9ajl9lq52yn498g0kvsbwa0xmihlqli7zw644c282ni934bwhn"))))
+       (base32 "09bh57vzjnn56dnhpp4szx72wyskc5g714vlyp6c27vr27xry8fi"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1557,3 +1587,56 @@ control of the board by capturing or adding to one square.
 
 This package is part of the KDE games module.")
     (license (list license:gpl2+ license:fdl1.2+))))
+
+(define-public kde-games
+  (package
+    (name "kde-games")
+    (version "23.04.3")
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments
+     (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     ;; TODO: kpat, klickety, katomic, knights.
+     (list bomber
+           bovo
+           granatier
+           kajongg
+           kapman
+           kblackbox
+           kblocks
+           kbounce
+           kbreakout
+           kdiamond
+           kfourinline
+           kgoldrunner
+           kigo
+           killbots
+           kiriki
+           kjumpingcube
+           klines
+           kmahjongg
+           kmines
+           knavalbattle
+           knetwalk
+           kolf
+           kollision
+           konquest
+           kreversi
+           kshisen
+           ksirk
+           ksnakeduel
+           kspaceduel
+           ksquares
+           ksudoku
+           ktuberling
+           kubrick
+           lskat
+           palapeli
+           picmi))
+    (home-page "https://apps.kde.org/categories/games/")
+    (synopsis "KDE Games")
+    (description "This metapackage includes a collection of games provided
+with the official release of KDE.")
+    (license
+     (list license:gpl2+ license:lgpl2.0+ license:gpl3+ license:fdl1.2+))))
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index 43af023831..4c519b93fd 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -52,7 +52,8 @@
   #:use-module (gnu packages vnc)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xiph)
-  #:use-module (gnu packages xml))
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg))
 
 (define-public choqok
   (package
@@ -114,17 +115,59 @@ Other notable features include:
 @end itemize")
     (license license:gpl3+)))
 
+(define-public falkon
+  (package
+    (name "falkon")
+    (version "23.04.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/" version
+                           "/src/falkon-" version ".tar.xz"))
+       (sha256
+        (base32
+         "11r1iwimdzabfah68gsvw6xi67cj539anqa6s1rg33agsi5y56d3"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "ctest" "-E"
+                             "(locationbartest|qmltabsapitest)")))))))
+    (native-inputs
+     (list extra-cmake-modules pkg-config qttools-5))
+    (inputs
+     (list karchive
+           ki18n
+           kio
+           kwallet
+           openssl
+           purpose
+           qtquickcontrols-5
+           qtsvg-5
+           qtwebengine-5
+           qtx11extras
+           qtwayland-5
+           xcb-util))
+    (home-page "https://www.falkon.org/")
+    (synopsis "Qt-based web browser for KDE")
+    (description
+     "Falkon is is a Qt-based web browser for  KDE.")
+    (license license:gpl3+)))
+
 (define-public kget
   (package
     (name "kget")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kget-" version ".tar.xz"))
        (sha256
-        (base32 "0rqznsyphnq0zi65wvrl9mwqm9268wgihkr104i87pp5kfiah5yp"))))
+        (base32 "1n9wnm1si4g4rv8zaqpr8m3c2aav0mj8i7z96m78dk1apippx77r"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools pkg-config))
@@ -183,14 +226,14 @@ This package is part of the KDE networking module.")
 (define-public konversation
   (package
     (name "konversation")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/konversation-" version ".tar.xz"))
        (sha256
-        (base32 "08b4vnm66hbbnvkkh1p0a82pd2aj4zy5a8indfv3fzczsfpx6gp0"))))
+        (base32 "1ip0jlz71fad5l0ppbc6w914hqk7h626s12ssbb9p1c2yvlr1j1v"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -255,14 +298,14 @@ Features are:
 (define-public kopete
   (package
     (name "kopete")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kopete-" version ".tar.xz"))
        (sha256
-        (base32 "0fc9m2xgsjmsypqllqb3cp1y2m28dqh48r1qg2xgkfyqa70dnvp9"))))
+        (base32 "1ps6g440p1dy2zwbj23f0mzw1d78r02aj88fy3i5sws9p9ra92gi"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools pkg-config))
@@ -332,14 +375,14 @@ This package is part of the KDE networking module.")
 (define-public krdc
   (package
     (name "krdc")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/krdc-" version ".tar.xz"))
        (sha256
-        (base32 "0bs8q3na924lnmra5608jwnn0dqczvh0f72nn43673ib3m1mddlr"))))
+        (base32 "0jva74n11fpm4ix4sbi0y1xnbly97lnap7dfj0bliw5s2d0sdjr0"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -377,14 +420,14 @@ This package is part of the KDE networking module.")
 (define-public ktorrent
   (package
     (name "ktorrent")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/ktorrent-" version ".tar.xz"))
        (sha256
-        (base32 "1h95hf4ki2xi2c9bzdg18p6d1757gzqknf6gn1ls6lwqy6p0pr4h"))))
+        (base32 "17q6ivnbh4zxqnbm1bdzz3hri1434sq2rs9y57lvn4bb2xdwn1z5"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -432,14 +475,14 @@ a full-featured client for BitTorrent.")
 (define-public libktorrent
   (package
     (name "libktorrent")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/"
                            version "/src/" name "-" version ".tar.xz"))
        (sha256
-        (base32 "098ac7b5wa7v6svqv4rx1w44j18pr22qgr236fj94r2kpl2nq79q"))))
+        (base32 "1m6gyk1bids7qr9wfh6gcfq73ac9j5b2bljvfvfsw9f1ky1cmwab"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index e3de6db432..cc12a72a59 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2022 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -57,14 +58,14 @@
 (define-public audiocd-kio
   (package
     (name "audiocd-kio")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/audiocd-kio-" version ".tar.xz"))
        (sha256
-        (base32 "0d6pbsh1fbhwwr2c4kf9b17dhzzx2jsmgamawcp4kn7pw9i7i8ql"))))
+        (base32 "0kl0j5qy54q88cbclwqj0rn8hj3gzjhzk7bimjgw5w0xy3cw6kql"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -96,14 +97,14 @@ This package is part of the KDE multimedia module.")
 (define-public dragon
   (package
     (name "dragon")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/dragon-" version ".tar.xz"))
        (sha256
-        (base32 "0284shnqwbh1953ym197qaqgjwrnva77zi55lvvykg5cq42x512s"))))
+        (base32 "0mliddp0nyxz91wzy8md0p0i45mlhffip4zqjl4db55x4p6wh4y8"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -154,14 +155,14 @@ This package is part of the KDE multimedia module.")
 (define-public elisa
   (package
     (name "elisa")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/elisa-" version ".tar.xz"))
        (sha256
-        (base32 "1v2h7ayyrv6f6hdkl78x1nrv5x0l6n8dh0xrfm5fnii4f694iik8"))))
+        (base32 "1ry4mhj7wc31xq9fip3amv8fj631m213zz0qg44h68q77sik4422"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config dbus kdoctools
@@ -227,14 +228,14 @@ its own database.  You can build and play your own playlist.")
 (define-public ffmpegthumbs
   (package
     (name "ffmpegthumbs")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/ffmpegthumbs-" version ".tar.xz"))
        (sha256
-        (base32 "1jl7l3n2lfg71kbzwjn5nrm3qlgilhnvs67iil162mnv52gf3c0v"))))
+        (base32 "02wvhjqqird55xcs4kkj0s7nam4vqh3khjz5f1mjqfnk62sj1plx"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config))
@@ -253,14 +254,14 @@ This package is part of the KDE multimedia module.")
 (define-public juk
   (package
     (name "juk")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/juk-" version ".tar.xz"))
        (sha256
-        (base32 "12pnbx17r1103w39gglybdzs8kcpwghy5lc4q9fqk89s1r7l3c7h"))))
+        (base32 "1q0r0iv4nn6jd0g8db54r7xdw7kdw1ja0z1ggxl1sy0k60m9c4q3"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -307,7 +308,7 @@ This package is part of the KDE multimedia module.")
 (define-public kid3
   (package
     (name "kid3")
-    (version "3.9.1")
+    (version "3.9.4")
     (source
      (origin
        (method git-fetch)
@@ -316,7 +317,7 @@ This package is part of the KDE multimedia module.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1rq0742rm3y5ps7878qd7xhhiizy6d6ls6hdjqa6z5sq077s5lz9"))))
+        (base32 "0j454nzwx0v7iwcixyjcx71shzh3ag4ydggs8d68alrfj9f4ajap"))))
     (build-system qt-build-system)
     (arguments
      (list
@@ -365,14 +366,14 @@ variety of formats.")
 (define-public k3b
   (package
     (name "k3b")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/k3b-" version ".tar.xz"))
        (sha256
-        (base32 "1bizk66ad2yq8xszjqvv2ghk069d0l6iczn5rlna1p3zigr43ysl"))))
+        (base32 "1kr1hw4pws87zzwyrwrg2ysdn11qf0qhwi1vc9b0k8jkjmmdplmb"))))
     (build-system qt-build-system)
     (arguments
      `(#:phases
@@ -519,14 +520,14 @@ autoloading of subtitle files for use while playing video.")
 (define-public kamoso
   (package
     (name "kamoso")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kamoso-" version ".tar.xz"))
        (sha256
-        (base32 "0br7dbnm2ypdl55pscp8wr0vwrgprycrxxj206b5r1l9ysx9aqip"))))
+        (base32 "1f06331qigf5wi6lgir5ij8h1fsdn54v32fyw2mgf0hg05xndrcl"))))
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
@@ -562,14 +563,14 @@ camera.  Use it to take pictures and make videos to share.")
 (define-public kmix
   (package
     (name "kmix")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmix-" version ".tar.xz"))
       (sha256
-       (base32 "0zc96l9mnn763pw54ki715sw3wm4z6rjdz2zzsjc6l5iwcqzwqq8"))))
+       (base32 "09pfsa6y1phm6z24da60s47gc18w4cvv7r8sxh5qfww7b0dnhixj"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools pkg-config))
@@ -677,14 +678,14 @@ Some features:
 (define-public kwave
   (package
     (name "kwave")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kwave-" version ".tar.xz"))
        (sha256
-        (base32 "0j6ck44lkfcnaa0rymv2aqvdcy0zbybbklm1s6mvbgdpfsh0rhkm"))))
+        (base32 "0s9w8jgwblljwfji2a19bqs3nx6sr2qzz35kwbi0ahwncy69k4jx"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules (librsvg-for-system) pkg-config kdoctools))
@@ -751,14 +752,14 @@ Its features include:
 (define-public libkcddb
   (package
     (name "libkcddb")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/libkcddb-" version ".tar.xz"))
        (sha256
-        (base32 "1js5r8hxqabnygmavfjvjbfy5c7978bmwm2rqlgsfyn17fkmf2y8"))))
+        (base32 "1s10g6m6c3h14gzxvp2s0v51jxzsrh23xfn7gl51a0r50srbbz52"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -767,6 +768,7 @@ Its features include:
            kconfig
            ki18n
            kio
+           kcmutils
            kwidgetsaddons
            libmusicbrainz
            qtbase-5))
@@ -781,14 +783,14 @@ Its features include:
 (define-public libkcompactdisc
   (package
     (name "libkcompactdisc")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/libkcompactdisc-" version ".tar.xz"))
        (sha256
-        (base32 "0fv9dbx74xs42iiw67bvjpxga0d126q2nfs8n4hiv3z2xda9n4ic"))))
+        (base32 "0gl21mhfz3vj89x0r8y79yiijcag1xfdnyfrjqzkx9i8yd2k45b1"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 6f3cbf2999..e95eac4e2f 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -29,6 +29,8 @@
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (gnu packages)
+  #:use-module (gnu packages aidc)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cyrus-sasl)
@@ -51,14 +53,14 @@
 (define-public akonadi
   (package
     (name "akonadi")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/akonadi-" version ".tar.xz"))
               (sha256
                (base32
-                "1yfy0b6kyiq82zkfkx9ldgjlbwg3lgg4di53fqjllmqhzaj1xy91"))
+                "0jpp91d5rlblq6r981wxizmsv512kc43lfk8y29bdky6j4idflrb"))
               (patches (search-patches "akonadi-paths.patch"
                                        "akonadi-timestamps.patch"
                                        "akonadi-not-relocatable.patch"))))
@@ -133,14 +135,14 @@ programs.")
 (define-public akonadi-calendar
   (package
     (name "akonadi-calendar")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/akonadi-calendar-" version ".tar.xz"))
        (sha256
-        (base32 "1xcnlkipy2rq0bsm811y9khw7dmsgkqxgw18b3lmy29xs7wcsiv5"))))
+        (base32 "166xm57jcy7d2dv2pfy4lllzic4giin31szxz7xq3a7ixsd6g7cs"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -180,14 +182,14 @@ collection and item views.")
 (define-public akonadi-contacts
   (package
     (name "akonadi-contacts")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/akonadi-contacts-" version ".tar.xz"))
        (sha256
-        (base32 "1mzlv124wa135xfbxl2ghl4n8pi1a6zd64195px1v90qnhjljw28"))))
+        (base32 "10vlzj56ps1pysf7g6i14v8wp2wkxh53055r2v4iq4cpq3mzayc6"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -235,14 +237,14 @@ to list and filter contacts.")
 (define-public akonadi-mime
   (package
     (name "akonadi-mime")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/akonadi-mime-" version ".tar.xz"))
        (sha256
-        (base32 "19wbfkvhkyzlz5r49y7rzbn4ay7rm8zyj7d4j3x9j79nprjr4zw0"))))
+        (base32 "1r33v2q49s7l90id4jqg0lar9p1j5k0cbnzsaqdksavzpzkcklh5"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules libxslt ;; xslt for generating interface descriptions
@@ -285,14 +287,14 @@ with emails through Akonadi easier.")
 (define-public akonadi-notes
   (package
     (name "akonadi-notes")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/akonadi-notes-" version ".tar.xz"))
        (sha256
-        (base32 "05sx7h1aw4mx93l4krv4574zpjf63vdrhaiwayqz11wrdpvdq7ww"))))
+        (base32 "0s5a414cdcz37srys2w3c2z5c63ha9ivsqj0srnfwwv0pxix266v"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -310,14 +312,14 @@ wrapping notes into KMime::Message objects.")
 (define-public akonadi-search
   (package
     (name "akonadi-search")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/akonadi-search-" version ".tar.xz"))
        (sha256
-        (base32 "06apb5lx7bs0lfvsnbf8kyxk7yyjrzb1f1wfckfsjaysf0xmdvfg"))))
+        (base32 "1hpclfcb7almvajscm2az36bw9rrhkp3ywb9h0j9h8ims2gm60m7"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules
@@ -365,14 +367,14 @@ Akonadi PIM data server.  It uses Xapian for indexing and querying.")
 (define-public itinerary
   (package
     (name "itinerary")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1w1gl4lz8gwf8cmxhsfyp4afiaq9anc8glrxay407bqp28andp3a"))))
+                "132x68wc4pallxgkvridfsimfq5m2g47fj9lcgz1kq4gdsidzf6i"))))
     (build-system qt-build-system)
     (arguments
      `(#:tests? #f)) ;Fails 20/27
@@ -382,6 +384,7 @@ Akonadi PIM data server.  It uses Xapian for indexing and querying.")
                   ki18n
                   kio
                   kirigami
+                  kirigami-addons
                   kitinerary
                   kitemmodels
                   kcoreaddons
@@ -419,14 +422,14 @@ information.")
 (define-public kincidenceeditor
   (package
     (name "kincidenceeditor")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/incidenceeditor-" version ".tar.xz"))
        (sha256
-        (base32 "1znbpqpxkbn79pzhcg5v77bqr345lcmy2h0a6d90rzdmnlh303ln"))))
+        (base32 "1pqfl7gqz7ibpns2gpwqpvzhsba7xj4ilhi4ax1vn3m086iyh3a0"))))
     (properties `((upstream-name . "incidenceeditor")))
     (build-system qt-build-system)
     (native-inputs
@@ -458,6 +461,7 @@ information.")
            kmime
            kpimcommon
            kpimtextedit
+           ktextaddons
            ktextwidgets
            kwallet
            libkdepim
@@ -480,14 +484,14 @@ information.")
 (define-public kaddressbook
   (package
     (name "kaddressbook")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kaddressbook-" version ".tar.xz"))
        (sha256
-        (base32 "177zgbpgignvglpvbis1q9d36pi1dvyckv3q2gcgd9425gpm0vmb"))))
+        (base32 "0zjbri91dh9vnwi6jqkbmyq667yzn8g4kw5v47qn8id2629zj6jq"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -516,6 +520,7 @@ information.")
            kparts
            kpimcommon
            kpimtextedit
+           ktextaddons
            ktextwidgets
            kxmlgui
            libkdepim
@@ -569,14 +574,14 @@ one of the APIs mentioned above.")
 (define-public kaccounts-integration
   (package
     (name "kaccounts-integration")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1q1d2a1qknfkgm63gji6ijji35d0b1jy1kvf10a7ac4l1z1fvnpl"))))
+                "1mn64xw5r2magy5y0qmg5r907jz1y8jar0qqkc6s1zjjr3s3knac"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list kcmutils
@@ -587,6 +592,7 @@ one of the APIs mentioned above.")
                   kwallet
                   kio
                   libaccounts-qt
+                  qcoro-qt5
                   signond))
     (home-page "https://invent.kde.org/network/kaccounts-integration")
     (synopsis "Online account management system")
@@ -594,10 +600,37 @@ one of the APIs mentioned above.")
 management system and its Plasma integration components.")
     (license license:lgpl2.0+)))
 
+(define-public kaccounts-providers
+  (package
+    (name "kaccounts-providers")
+    (version "23.04.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/release-service/"
+                                  version "/src/" name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1lrmj6r09ypnpl2s586i4rd3fk3760qlxyrhh91k43wkb8i6m8f0"))))
+    (build-system qt-build-system)
+    (native-inputs (list extra-cmake-modules intltool))
+    (inputs (list kaccounts-integration
+                  kcoreaddons
+                  kdeclarative
+                  ki18n
+                  kio
+                  libaccounts-qt
+                  qtwebengine-5
+                  signond))
+    (home-page "https://invent.kde.org/network/kaccounts-providers")
+    (synopsis "Online account providers for the KAccounts system")
+    (description "This package provides online account providers for the
+KAccounts system.")
+    (license license:lgpl2.0+)))
+
 (define-public kalendar
   (package
     (name "kalendar")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
@@ -605,7 +638,7 @@ management system and its Plasma integration components.")
                                   ".tar.xz"))
               (sha256
                (base32
-                "0slk9z7p1z5m2kbb8kq05afslxad8w5pjsajxawckcx0mlsd3apj"))))
+                "1w56glv8m1rlk86v78h69d21ydxb6i61g1dk6mcizjr5rvi4liy0"))))
     (build-system qt-build-system)
     (arguments
      (list #:tests? #f ;All 2 tests fail
@@ -627,12 +660,15 @@ management system and its Plasma integration components.")
     (inputs (list akonadi
                   akonadi-contacts
                   breeze-icons
+                  gpgme
                   grantlee
                   grantleetheme
                   kio
                   kirigami
+                  kirigami-addons
                   kdbusaddons
                   ki18n
+                  kimap
                   kcalendarcore
                   kcalendarsupport
                   kconfigwidgets
@@ -640,15 +676,22 @@ management system and its Plasma integration components.")
                   kcoreaddons
                   kcontacts
                   kitemmodels
+                  kmailcommon
+                  kmessagelib
                   kmime
                   kidentitymanagement
+                  kpimcommon
                   kpimtextedit
+                  ktextaddons
                   ktextwidgets
                   akonadi-calendar
+                  akonadi-mime
                   keventviews
                   kcalutils
                   kxmlgui
                   kiconthemes
+                  libkdepim
+                  libkleo
                   qtbase-5
                   qtdeclarative-5
                   qtquickcontrols2-5
@@ -656,7 +699,8 @@ management system and its Plasma integration components.")
                   qtquickcontrols-5
                   qtgraphicaleffects
                   qtlocation
-                  qqc2-desktop-style))
+                  qqc2-desktop-style
+                  qtwebengine-5))
     (home-page "https://apps.kde.org/kalendar/")
     (synopsis "Calendar application")
     (description
@@ -667,14 +711,14 @@ external services.")
 (define-public kcalendarsupport
   (package
     (name "kcalendarsupport")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/calendarsupport-" version ".tar.xz"))
        (sha256
-        (base32 "09fs15qckydmbs6idl5k1b6gyhjkygsa1r8frlysn1ahhfmxr33p"))))
+        (base32 "1zk6kv5nhcd7a5llzh31890xpqdg522ahjdgbwsm7pcp62y0nbsj"))))
     (properties `((upstream-name . "calendarsupport")))
     (build-system qt-build-system)
     (native-inputs
@@ -712,14 +756,14 @@ calendaring applications.")
 (define-public kcalutils
   (package
     (name "kcalutils")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kcalutils-" version ".tar.xz"))
        (sha256
-        (base32 "1y25csn37lp14ba18gqmw9ssimy4dqi55irx8c89p4p1lypjwfzq"))))
+        (base32 "1j7f5ai25zcxggw3dvky624asxim5bkd6a35rcdzkjhj1qwk3vll"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules libxml2)) ;; xmllint required for tests
@@ -750,14 +794,14 @@ functions for accessing calendar data using the kcalcore API.")
 (define-public kdepim-runtime
   (package
     (name "kdepim-runtime")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kdepim-runtime-" version ".tar.xz"))
        (sha256
-        (base32 "1g6bq27s7nf9rmrbl5kwycl4lzjpp3m088mji3p7qrrv01ywp4mn"))))
+        (base32 "1wvwibq6zzjlhh8yqrlqras0m8i01ynlwj9z6l3f0g0hyyz5nkw4"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules dbus kdoctools libxslt shared-mime-info))
@@ -845,14 +889,14 @@ package.")
 (define-public keventviews
   (package
     (name "keventviews")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/eventviews-" version ".tar.xz"))
        (sha256
-        (base32 "0bkidva045q85z4ymhj4m9ayfbsckjl4cl7nncl48yk2dmanfg51"))))
+        (base32 "1nh8a7jy0sjsyi41pxhxwjkq6fr4yy9rqgcjjbj01dnx1ykz3d7l"))))
     (properties `((upstream-name . "eventviews")))
     (build-system qt-build-system)
     (native-inputs
@@ -894,27 +938,32 @@ package.")
 (define-public kgpg
   (package
     (name "kgpg")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kgpg-" version ".tar.xz"))
        (sha256
-        (base32 "1xs0w6lxwq3hzs8r1cwmygcjilbgwa8zpjxwj6zz1wmbg04gqk36"))))
+        (base32 "1ihxw1s4sq7cp5pm6rddcmvqk0v5gfg4v38b6yg8hyjg655x63jz"))))
     (build-system qt-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "dbus-launch" "ctest" "-E" ;; FIXME: Failing tests.
-                       "(kgpg-import|kgpg-disable)")))))))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (setenv "HOME" (getcwd))
+                     (invoke "ctest")))))
+           ;; XXX: Tests could fail randomly with:
+           ;;   gpg: can't connect to the agent: IPC connect call failed
+           ;;   gpg process did not finish. Cannot generate a new key pair.
+           #:tests? #f))
     (native-inputs
-     (list extra-cmake-modules gnupg ;; TODO: Remove after gpgme uses fixed path
-           dbus ;; Remove after failing test passes
-           kdoctools))
+     (list extra-cmake-modules
+           gnupg ;; TODO: Remove after gpgme uses fixed path
+           kdoctools
+           pkg-config))
     (inputs
      (list akonadi
            akonadi-contacts
@@ -952,24 +1001,26 @@ cryptography to the contents of the clipboard.")
 (define-public khealthcertificate
   (package
     (name "khealthcertificate")
-    (version "22.09")
+    (version "23.01.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://kde/stable/plasma-mobile/"
-                                  (version-major+minor version)
+              (uri (string-append "mirror://kde/stable/plasma-mobile/" version
                                   "/khealthcertificate-" version ".tar.xz"))
               (sha256
                (base32
-                "16vkjpyxwx34pvdpnci0l6mx2bdjialiscjvbdx53xbsq9ff701k"))))
+                "193agd3jg029vcq1h5hdg3gw6zgqcmszl6ffcrid0ajbbiic4pbm"))))
     (build-system qt-build-system)
     (arguments
-     (list #:phases #~(modify-phases %standard-phases
-                        (replace 'check
-                          (lambda* (#:key tests? #:allow-other-keys)
-                            (when tests?
-                              (invoke "ctest" "-E"
-                               "(icaovdsparsertest|nlcoronacheckparsertest)")))))))
-    (native-inputs (list extra-cmake-modules pkg-config))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key inputs tests? #:allow-other-keys)
+                   (when tests?
+                     (setenv "TZDIR"
+                             (search-input-directory inputs "share/zoneinfo"))
+                     (invoke "ctest" "-E"
+                             "(icaovdsparsertest|eudgcparsertest)")))))))
+    (native-inputs (list extra-cmake-modules pkg-config tzdata-for-tests))
     (inputs (list karchive
                   kcodecs
                   ki18n
@@ -986,14 +1037,14 @@ test and recovery certificates.")
 (define-public kidentitymanagement
   (package
     (name "kidentitymanagement")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kidentitymanagement-" version ".tar.xz"))
        (sha256
-        (base32 "1h76c8k6lvf4dlh9awd4z71hkikm7x71760gljybd6fkygxpm992"))))
+        (base32 "03bfz0x35wiynla39iysxa5g3rckmy9nj2z1f439v9sblcqbvz3p"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1024,14 +1075,14 @@ test and recovery certificates.")
 (define-public kimap
   (package
     (name "kimap")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kimap-" version ".tar.xz"))
        (sha256
-        (base32 "1a3wwzwlp0zsj4brhs22sygfxh65slikapa4iipxjw78mkwhiq8h"))))
+        (base32 "08s2891f2cnf5f7q034lmqv3vnh3v61l7bsyssdx711jfbswg9ik"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1055,15 +1106,14 @@ easier to do so.")
 (define-public kitinerary
   (package
     (name "kitinerary")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
-              (uri (string-append
-                    "https://invent.kde.org/pim/kitinerary/-/archive/v"
-                    version "/kitinerary-v" version ".tar.gz"))
+              (uri (string-append "mirror://kde/stable/release-service/"
+                                  version "/src/kitinerary-" version ".tar.xz"))
               (sha256
                (base32
-                "1gpy5siaw9k4332ii6a87rq162dbmyfkqp1l1k8bmldg1755v3jz"))))
+                "0fcqix7hgmv7qcfxzmqy61kg7dqi5zas5vqfs7pfycgcxma0g869"))))
     (build-system qt-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -1089,7 +1139,8 @@ easier to do so.")
                   qtlocation
                   qtquickcontrols2-5
                   libxml2
-                  zlib))
+                  zlib
+                  zxing-cpp))
     (home-page "https://apps.kde.org/itinerary/")
     (synopsis
      "Data Model and Extraction System for Travel Reservation information")
@@ -1100,14 +1151,14 @@ model and itinerary extraction code.")
 (define-public kldap
   (package
     (name "kldap")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kldap-" version ".tar.xz"))
        (sha256
-        (base32 "0hqvf939d2sqb2frizw9pnhgpc8vi627882d30ssymw5p5nm58il"))))
+        (base32 "0hp5j02kwh91xf0n6zqzgam7g50r54hzbkli5i7c0rxdb1g28ihm"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1125,14 +1176,14 @@ protocol for querying and modifying directory services running over TCP/IP.")
 (define-public kleopatra
   (package
     (name "kleopatra")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kleopatra-" version ".tar.xz"))
        (sha256
-        (base32 "1vay6cdrx1l7qyg0rrc7z7rwv1jjpwksqzadka7rpshfqhf3r9y8"))))
+        (base32 "0lcl20yihsa8dq0s24akp5z0290vh9nxjjjdwqk88nz8vmsr29i0"))))
     (build-system qt-build-system)
     (native-inputs
      (list dbus extra-cmake-modules gnupg ;; TODO: Remove after gpgme uses fixed path
@@ -1179,14 +1230,14 @@ and retrieving certificates from LDAP servers.")
 (define-public kmail
   (package
     (name "kmail")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kmail-" version ".tar.xz"))
        (sha256
-        (base32 "1q7d2jazc6792dhwxb2zx66bghdnn43sw6lvdg44a7d9zgik1qzb"))))
+        (base32 "16gz0i7na1pkyly9jnvavyffkawxf5irr92rd50w68p01b82dhc6"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules dbus kdoctools))
@@ -1231,6 +1282,7 @@ and retrieving certificates from LDAP servers.")
            kpimtextedit
            kservice
            ksyntaxhighlighting
+           ktextaddons
            ktextwidgets
            kuserfeedback
            ktnef
@@ -1279,14 +1331,14 @@ manager from KDE.")
 (define-public kmailcommon
   (package
     (name "kmailcommon")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/mailcommon-" version ".tar.xz"))
        (sha256
-        (base32 "1lpnfcj2p58lhgcjg6ray5b9ygz7gpb8xh8qkakn4m7cpjhgcj5j"))))
+        (base32 "165a0qf6i2862dpsw4wvgnxi4wv7hnc9s63fsf9jp6kbwwfw9nqv"))))
     (properties `((upstream-name . "mailcommon")))
     (build-system qt-build-system)
     (native-inputs
@@ -1323,6 +1375,7 @@ manager from KDE.")
            kpimcommon
            kpimtextedit
            ksyntaxhighlighting
+           ktextaddons
            ktextwidgets
            kwallet
            kwidgetsaddons
@@ -1348,14 +1401,14 @@ dealing with email.")
 (define-public kmailimporter
   (package
     (name "kmailimporter")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/mailimporter-" version ".tar.xz"))
        (sha256
-        (base32 "1k7gwagcvhj733c48ayxwi1gf37y6w5g6n2b9fknhfs40kqpdri9"))))
+        (base32 "18shpxz7rg64g2mxdhdjhxhn893m0930v76cdnij339ycbcq5ypc"))))
     (properties `((upstream-name . "mailimporter")))
     (build-system qt-build-system)
     (native-inputs
@@ -1381,6 +1434,7 @@ dealing with email.")
            kmime
            kpimcommon
            kpimtextedit
+           ktextaddons
            ktextwidgets
            kxmlgui
            libkdepim
@@ -1395,14 +1449,14 @@ e-mail client programs into KMail and KDE PIM.")
 (define-public kmailtransport
   (package
     (name "kmailtransport")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kmailtransport-" version ".tar.xz"))
        (sha256
-        (base32 "0hhd1m1kfagyiwwfmsxhpin5c25dsiwbzg188khppn6fp2dh79dg"))))
+        (base32 "14vmm9vla8i477jq40z73lc4klx6mm03y2xnljvx1v4inm3cpw2c"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1437,14 +1491,14 @@ mail transport.")
 (define-public kmbox
   (package
     (name "kmbox")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kmbox-" version ".tar.xz"))
        (sha256
-        (base32 "0n49xqgyx40hml9554zvnycff26qki9fdy32awx9v9l8jbnrmm6p"))))
+        (base32 "05hdfjwp6ay2j16rxp55k3fywwf7kxiig4dv9fh51iysglmzzn76"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1459,14 +1513,14 @@ using a Qt/KMime C++ API.")
 (define-public kmessagelib
   (package
     (name "kmessagelib")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/messagelib-" version ".tar.xz"))
        (sha256
-        (base32 "0xq1a064g3h3igrqanfald9n21nnrsg16a4kmn9vn1k03qv1vlp2"))))
+        (base32 "0aqac0p46cwnr3qxjk0ivalfwjcgwy52s088wnk6ckp77m7r65is"))))
     (properties `((upstream-name . "messagelib")))
     (build-system qt-build-system)
     (native-inputs
@@ -1508,6 +1562,7 @@ using a Qt/KMime C++ API.")
            kpimtextedit
            kservice
            ksyntaxhighlighting
+           ktextaddons
            ktextwidgets
            kwallet
            kwidgetsaddons
@@ -1545,14 +1600,14 @@ kwebengineviewer.")
 (define-public kmime
   (package
     (name "kmime")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kmime-" version ".tar.xz"))
        (sha256
-        (base32 "1vz5gw33ncc5lx8fx2nnp8ayxpdhfjwwx226gwa94vhxxkfcnmh4"))))
+        (base32 "1i38g0s98d24882kxyjay965nz3d3fjhb3mv1p4sllm2lnffrq2d"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1580,14 +1635,14 @@ information in non-ASCII character sets.")
 (define-public knotes
   (package
     (name "knotes")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/knotes-" version ".tar.xz"))
        (sha256
-        (base32 "076rwgkwx67rn6z0mj0sj77h1jngcpbvrwka3ijg2309r9f2wg8h"))))
+        (base32 "0f2a9xy2w909y792hwwnmsqvxx91azn6f0j0xl2mlmav00a4w6za"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools libxslt))
@@ -1623,6 +1678,7 @@ information in non-ASCII character sets.")
            kparts
            kpimcommon
            kpimtextedit
+           ktextaddons
            ktextwidgets
            kwidgetsaddons
            kwindowsystem
@@ -1650,14 +1706,14 @@ Features:
 (define-public kontactinterface
   (package
     (name "kontactinterface")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kontactinterface-" version ".tar.xz"))
        (sha256
-        (base32 "0j7cck262j8z7m7fm55qa5i936x81ljn3cijrk5c5h881152h4fs"))))
+        (base32 "16fg24hz9vx912cffc94x5zx4jv3k72mbxgp5ck50lydypx6rfns"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1668,7 +1724,8 @@ Features:
            kparts
            kwindowsystem
            kxmlgui
-           qtbase-5))
+           qtbase-5
+           qtx11extras))
     (home-page "https://api.kde.org/kdepim/kontactinterface/html/index.html")
     (synopsis "Kontact interface library")
     (description "This library provides the glue necessary for
@@ -1678,17 +1735,17 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).")
 (define-public korganizer
   (package
     (name "korganizer")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/korganizer-" version ".tar.xz"))
        (sha256
-        (base32 "0pcyij50k96mrm9vkq0pzr7n0nrgy1d51zrcb3hly7fpl4gvkx4x"))))
+        (base32 "1vp1jsmna059vvfj7xaj9fhhhq0lz9k0pphczkfbwm3gy6nzcavz"))))
     (build-system qt-build-system)
     (native-inputs
-     (list extra-cmake-modules dbus qttools-5 kdoctools))
+     (list extra-cmake-modules dbus qttools-5 kdoctools tzdata-for-tests))
     (inputs
      (list akonadi
            akonadi-calendar
@@ -1730,6 +1787,7 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).")
            kpimcommon
            kpimtextedit
            kservice
+           ktextaddons
            kwallet
            kwidgetsaddons
            kwindowsystem
@@ -1739,19 +1797,13 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).")
            phonon
            qtbase-5))
     (arguments
-     `(#:phases
+     '(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'disable-failing-test
-           (lambda _
-             ;; FIXME: This test started failing after the 20.04 update
-             ;; seemingly due to DBus communication issues.
-             ;; See also 'akonadi-search' for a similar test failure.
-             (substitute* "src/autotests/CMakeLists.txt"
-               ((".*test_advanced\\(koeventpopupmenutest\\.cpp.*")
-                ""))))
          (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
+           (lambda* (#:key inputs tests? #:allow-other-keys)
              (when tests?
+               (setenv "TZDIR" (search-input-directory
+                                inputs "share/zoneinfo"))
                (invoke "dbus-launch" "ctest")))))))
     (home-page "https://apps.kde.org/korganizer/")
     (synopsis "Organizational assistant, providing calendars and other similar
@@ -1799,14 +1851,14 @@ Virtual Contact File}) files to the KPeople contact management library.")
 (define-public kpkpass
   (package
     (name "kpkpass")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kpkpass-" version ".tar.xz"))
               (sha256
                (base32
-                "09l6c7nsgfnffgkm0yzjhsfkm79fv9izasislrlzdvca5xninrgb"))))
+                "1l3k33yzfjzarc2rpf576ib86ifzrfmsvpcdmv060dy0k8lbm1k9"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list karchive qtbase-5 shared-mime-info))
@@ -1819,14 +1871,14 @@ pass files.")
 (define-public kpimcommon
   (package
     (name "kpimcommon")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/pimcommon-" version ".tar.xz"))
        (sha256
-        (base32 "00gxv1028xdp7ag44z9h6cpmlw55f3rk7i6msymga3pdq639c19y"))))
+        (base32 "1v2nv83h9p1ajbcwfdk8b7lrr84r8c855lysknzvzkpm5z012z3l"))))
     (properties `((upstream-name . "pimcommon")))
     (build-system qt-build-system)
     (native-inputs
@@ -1861,6 +1913,7 @@ pass files.")
            kmime
            knewstuff
            kpimtextedit
+           ktextaddons
            ktextwidgets
            kwallet
            kwidgetsaddons
@@ -1882,14 +1935,14 @@ pass files.")
 (define-public libgravatar
   (package
     (name "libgravatar")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/libgravatar-" version ".tar.xz"))
        (sha256
-        (base32 "1yhmxl2gqwrn5flr5qm56aqg6rgmqbgcr3pyb4d0vshdfksjr4rc"))))
+        (base32 "03zhnpb114y6a6vhiv9c1fiqsinjmk52j1k9w2r04ibxp35m3xj7"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list kconfig
@@ -1897,6 +1950,7 @@ pass files.")
                   kio
                   kpimcommon
                   kpimtextedit
+                  ktextaddons
                   ktextwidgets
                   kwidgetsaddons
                   qtbase-5))
@@ -1913,14 +1967,14 @@ unnecessary network operations.")
 (define-public kpimtextedit
   (package
     (name "kpimtextedit")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kpimtextedit-" version ".tar.xz"))
        (sha256
-        (base32 "1dxdlspqssxnvha202bgh9yaszs77cph5qd9wcbd45xj07dqgbw1"))))
+        (base32 "1rrs19bwl8qvasridysbbgsgdy9hyjlpi26hw77hli5ixkflj85b"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules qttools-5))
@@ -1954,14 +2008,14 @@ text in the text edit to all kinds of markup, like HTML or BBCODE.")
 (define-public ksmtp
   (package
     (name "ksmtp")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/ksmtp-" version ".tar.xz"))
        (sha256
-        (base32 "13ybnr39pim3r83p56wj98fwj0yk1rspd9g24a8d0qykmnbx57l3"))))
+        (base32 "0pz17vmn38n2xl35d9di1b9138dh54wgyal9hx412nh123w13h12"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1993,14 +2047,14 @@ standard protocols for e-mail transmission.")
 (define-public ktnef
   (package
     (name "ktnef")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/ktnef-" version ".tar.xz"))
        (sha256
-        (base32 "05rcs0m4dr4p4wxigcnhjmmp15nlf36ka85v8b8gd8630v61w6y6"))))
+        (base32 "00dkcmywjxzq5v2kp4klw50c3w74lmh16kbcwn8qd97kky3pd5ik"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -2025,14 +2079,14 @@ and allows one to view/extract message formatted text in Rich Text Format.")
 (define-public libkdepim
   (package
     (name "libkdepim")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/libkdepim-" version ".tar.xz"))
        (sha256
-        (base32 "07ihnps983x3sp74yq5glsq3h3jw4k80mnc4xxzm6ps2vgswah12"))))
+        (base32 "1i5c4qqd4ghlfjvxniy8sbfqh0fsrz4sadvh0n2d207s9rsl274v"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules qttools-5))
@@ -2072,14 +2126,14 @@ and allows one to view/extract message formatted text in Rich Text Format.")
 (define-public libkgapi
   (package
     (name "libkgapi")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/libkgapi-" version ".tar.xz"))
        (sha256
-        (base32 "065441mbl67wyp4nz03jdygkn5wmnmkj4fiql4mnq99k2v80y0ka"))))
+        (base32 "18jcrp7qi35zxzb4b7mn6519bjw47s7kwfahd6a50p40j17k09bs"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules qttools-5))
@@ -2107,14 +2161,14 @@ various Google services.")
 (define-public libkleo
   (package
     (name "libkleo")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/libkleo-" version ".tar.xz"))
        (sha256
-        (base32 "05ypgrwynm1hr32hj35faj3sxabi46x8slnbs3pxwz2f2z2ry58a"))))
+        (base32 "0l77n4dlbv9hclzvh69kdzji907if7yayxiasxnnjkzsvcm1af25"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools qttools-5))
@@ -2155,7 +2209,7 @@ KDE using certificate-based crypto.")
 (define-public libksieve
   (package
     (name "libksieve")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
@@ -2163,7 +2217,7 @@ KDE using certificate-based crypto.")
                            "/src/libksieve-" version ".tar.xz"))
        (sha256
         (base32
-		"1ia1gjx8x9ym3dml3y403kif50jhcsrqmhivn3j5yxf8abc3rnk6"))))
+		"066z33v30h568bmdcsl4v478p3xhiwsmq7pr7kziilrhy3a2m7p6"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -2183,6 +2237,7 @@ KDE using certificate-based crypto.")
            kpimcommon
            kpimtextedit
            ksyntaxhighlighting
+           ktextaddons
            ktextwidgets
            kwallet
            kwindowsystem
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 974c35e9cc..11586a6ce2 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2020, 2023 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;;
@@ -50,6 +50,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages ibus)
+  #:use-module (gnu packages icu4c)
   #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
@@ -69,6 +70,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages package-management) ; flatpak
+  #:use-module (gnu packages unicode)
   #:use-module (gnu packages video)
   #:use-module (gnu packages vpn)
   #:use-module (gnu packages vulkan)
@@ -76,22 +78,26 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
-  #:use-module (gnu packages web))
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages gps)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages opencl))
 
 (define-public bluedevil
   (package
     (name "bluedevil")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version "/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1dsah7rcx2brcd1d5x7bvhrixx5nvwp1fwq9b8k2zc038xzpx6ys"))))
+                "0ddzcarn06rvhbmvm9x737ba9ycxcvg030892nh6izgfrjlaxhfb"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules pkg-config qttools-5))
     (inputs (list kcoreaddons
+                  kcmutils
                   kwidgetsaddons
                   kdbusaddons
                   knotifications
@@ -112,14 +118,14 @@
 (define-public breeze
   (package
     (name "breeze")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version "/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0m3ggv5znzfcp25afgl7v5w7m27v5hdvv6jw9vrvwbqj8lzq1hlx"))))
+                "1wfclkg4d3wraz19kwpm87vwp9327s5y8n1a42qgrdh980qwzzdz"))))
     (build-system qt-build-system)
     ;; TODO: Warning at /gnu/store/…-kpackage-5.34.0/…/KF5PackageMacros.cmake:
     ;;   warnings during generation of metainfo for org.kde.breezedark.desktop:
@@ -159,7 +165,7 @@ the Plasma Desktop.  Breeze is the default theme for the KDE Plasma desktop.")
 (define-public breeze-gtk
   (package
     (name "breeze-gtk")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -167,7 +173,7 @@ the Plasma Desktop.  Breeze is the default theme for the KDE Plasma desktop.")
                                   "-" version ".tar.xz"))
               (sha256
                (base32
-                "0wj8qzy2104ggczxagxm45zwsvvpwd6jjnbv1893mhlr6f2zrbmh"))))
+                "1s2qv51qa867b0bf29b7j90yzqmn3s2dwblczsb79h2i1gnr8ci9"))))
     (build-system qt-build-system)
     (arguments
      '(#:tests? #f))                              ;no 'test' target
@@ -183,14 +189,14 @@ Breeze is the default theme for the KDE Plasma desktop.")
 (define-public calindori
   (package
     (name "calindori")
-    (version "22.09")
+    (version "23.01.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma-mobile/" version
                                   "/calindori-" version ".tar.xz"))
               (sha256
                (base32
-                "1pwgdqznp76mhk0ikzjhy3c67qgk91kgv69ygqwzlh5hwiw5sl4n"))))
+                "0jhrxsh6gd20qpq68n2lspfkgq3bam46j6m10jnm3zckb190pfhl"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list kconfig
@@ -215,7 +221,7 @@ Breeze is the default theme for the KDE Plasma desktop.")
 (define-public discover
   (package
     (name "discover")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -227,7 +233,7 @@ Breeze is the default theme for the KDE Plasma desktop.")
                                   ".tar.xz"))
               (sha256
                (base32
-                "01vdi66c7v60db25p0qi0q73wgqw6dy2kirbk34bvhld41gpxhhv"))))
+                "0025g1whq8z1s5915jhq83xsiz4klzqpayfzqkar8c6gni5s3v59"))))
     (build-system qt-build-system)
     (arguments
      (list #:phases
@@ -261,6 +267,7 @@ Breeze is the default theme for the KDE Plasma desktop.")
                   kcmutils
                   kidletime
                   packagekit-qt5
+                  purpose
                   qtdeclarative-5
                   qtgraphicaleffects
                   qtquickcontrols2-5))
@@ -281,7 +288,7 @@ games, and tools.")
 (define-public drkonqi
   (package
     (name "drkonqi")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -289,7 +296,7 @@ games, and tools.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0vw4bfld2jdiwm4g3008x8s1lq1ydf87ckb0fvyzsp11hq9nnnk7"))))
+                "1li1j85yvg2nj392rl1jmdqx3mzmrdj0lf72j37xd8r2bi0ic9z8"))))
     (build-system qt-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -313,7 +320,8 @@ games, and tools.")
                   kidletime
                   kwindowsystem
                   ksyntaxhighlighting
-                  qtdeclarative-5))
+                  qtdeclarative-5
+                  kuserfeedback))
     (synopsis "Crash handler for KDE software")
     (description "This package provides an automatic handler for crashed apps.")
     (home-page "https://invent.kde.org/plasma/drkonqi")
@@ -322,7 +330,7 @@ games, and tools.")
 (define-public kactivitymanagerd
   (package
     (name "kactivitymanagerd")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -330,7 +338,7 @@ games, and tools.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0hsllhqi46n25sr27crnad053ghk3hni2w496g6d2qfmi20l3g4n"))))
+                "1d7vz8gwqa7nhfn62dsqircm0qbp9ryass82k2891mqj0qrlbwid"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list boost
@@ -349,17 +357,56 @@ concept.")
     (home-page "https://invent.kde.org/plasma/kactivitymanagerd")
     (license (list license:gpl2 license:gpl3))))
 
+(define-public kde-gtk-config
+  (package
+    (name "kde-gtk-config")
+    (version "5.27.7")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/plasma/" version
+                                  "/kde-gtk-config-" version ".tar.xz"))
+              (sha256
+               (base32
+                "13qwj3gdfvs0l6k01n8hf25kzrsksi3qi0b1rzpshcj1ix31wamf"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'patch-gsettings-schemas-path
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (substitute* "cmake/modules/FindGSettingSchemas.cmake"
+                     (("\\$\\{PC_GLIB2_PREFIX\\}")
+                      (assoc-ref inputs "gsettings-desktop-schemas"))))))))
+    (native-inputs
+     (list extra-cmake-modules pkg-config qtsvg-5 sassc))
+    (inputs
+     (list gsettings-desktop-schemas
+           gtk+
+           kconfig
+           kconfigwidgets
+           kcoreaddons
+           kguiaddons
+           kdbusaddons
+           kdecoration
+           kwindowsystem
+           xsettingsd))
+    (home-page "https://invent.kde.org/plasma/kde-gtk-config")
+    (synopsis "Sync of KDE settings to GTK applications")
+    (description "This package provides tools to sync KDE settings to GTK
+applications.")
+    (license (list license:bsd-2 license:bsd-3 license:gpl2 license:gpl3))))
+
 (define-public kdecoration
   (package
     (name "kdecoration")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/kdecoration-" version ".tar.xz"))
               (sha256
                (base32
-                "1x3scszz5nfwqciwc3bv0r04wgqlxs0c9j1090zvn6mjjg2nsyb7"))))
+                "153j3w00zwj6gx9ndq46vkfwx3ayig80j0jsqbkajk8zsncs89pg"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -375,7 +422,7 @@ manager which re-parents a Client window to a window decoration frame.")
 (define-public kde-cli-tools
   (package
     (name "kde-cli-tools")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -383,10 +430,10 @@ manager which re-parents a Client window to a window decoration frame.")
               (patches (search-patches "kde-cli-tools-delay-mime-db.patch"))
               (sha256
                (base32
-                "0i1lnkyb2bdvbhnr2wsgjy2sjichzxxqkvn30ca85rj21cavk2z3"))))
+                "1br1i8ba4n7d2yl618ph4glsaasn3rxy4kjp48f12l9l2pk29nxa"))))
     (build-system qt-build-system)
     (arguments
-     (list #:tests? #f ;TODO: Failing sub-tests 3/7
+     (list #:tests? #f ;TODO: Failing 1 test
            #:phases
            #~(modify-phases %standard-phases
                (add-after 'unpack 'set-writable-location
@@ -397,7 +444,13 @@ GenericDataLocation.")
                       (string-append "\"" (getcwd) "/\"")))))
                (add-before 'check 'setup-env
                  (lambda* _
-                   (setenv "HOME" (getcwd)))))))
+                   (setenv "HOME" (getcwd))))
+               (add-after 'install 'symlink-kdesu
+                 (lambda _
+                   ;; XXX: nixpkgs say kdesu need kdeinit5 in PATH, but i can't
+                   ;; found in source, need check
+                   (symlink (string-append #$output "/libexec/kf5/kdesu")
+                            (string-append #$output "/bin/kdesu")))))))
     (native-inputs (list extra-cmake-modules pkg-config shared-mime-info))
     (inputs (list kconfig
                   kdesu
@@ -422,23 +475,27 @@ KDE Frameworks 5 to better interact with the system.")
 (define-public kdeplasma-addons
   (package
     (name "kdeplasma-addons")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1a5cq0jz69hlcr22wxi2p5mzxv5xcp88220irxmq0dhpk85kywlx"))))
+                "0l7g4lx6y10xfabfcgvh7zb7h08clj0g9yx8ajyg7rzwfa43visi"))))
     (build-system qt-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
                         (replace 'check
-                          (lambda* (#:key tests? #:allow-other-keys)
+                          (lambda* (#:key tests? inputs #:allow-other-keys)
+
                             (when tests?
+                              (setenv "TZDIR"
+                                      (search-input-directory
+                                       inputs "share/zoneinfo"))
                               (invoke "ctest" "-E"
-                               "(converterrunnertest|spellcheckrunnertest)")))))))
-    (native-inputs (list extra-cmake-modules))
+                                      "(converterrunnertest)")))))))
+    (native-inputs (list extra-cmake-modules tzdata-for-tests))
     (inputs (list karchive
                   kconfig
                   kcoreaddons
@@ -455,8 +512,8 @@ KDE Frameworks 5 to better interact with the system.")
                   plasma-framework
                   purpose
                   sonnet
+                  ;; qtwebengine-5 ; Optional for online dictionary
                   qtdeclarative-5))
-                 ;qtwebengine-5)) ;; Optional for online dictionary
     (synopsis "Add-ons to improve your Plasma experience")
     (description
      "This package provides multiple addons for the Plasma Desktop.")
@@ -466,7 +523,7 @@ KDE Frameworks 5 to better interact with the system.")
 (define-public kgamma
   (package
     (name "kgamma")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -474,7 +531,7 @@ KDE Frameworks 5 to better interact with the system.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1c305bs50km7bsn0phz7yj4x2168sxwsw9zxbpcgw4q3r53c0ywz"))))
+                "0v5fynydjha9wx9j59ysw8vxx2h2gm55q27gnnhgyv0wxva8hpnl"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list kauth
@@ -487,19 +544,20 @@ KDE Frameworks 5 to better interact with the system.")
     (description
      "This package provides a tool to adjust your monitor gamma settings.")
     (home-page "https://invent.kde.org/plasma/kgamma5")
+    (properties '((upstream-name . "kgamma5")))
     (license license:gpl2+)))
 
 (define-public khotkeys
   (package
     (name "khotkeys")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version "/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0c9i4vxiiv90dpzsd2hjwavks87cvwplkj63751z8mazax6r95as"))))
+                "1ipg71jz356jrngw7kqbjs7jplpnr8q3yz694rkhqklsqlfh91bd"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list kdbusaddons
@@ -523,23 +581,56 @@ are pressed.")
 (define-public kinfocenter
   (package
     (name "kinfocenter")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0zvki76yghkn158s7hb5g9drz7xaqxkmp2747404n2n0gmnmsdif"))))
+                "15hm828ifrrzsbkvknqwf0l3qxr45pdi49z823cw421z45r8ivkj"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
                         (add-after 'unpack 'fix-systemsettings-symlink
                           (lambda* (#:key inputs #:allow-other-keys)
-                            (substitute* "CMakeLists.txt"
-                              (("\\$\\{KDE_INSTALL_FULL_BINDIR\\}/systemsettings5")
-                               (search-input-file inputs
-                                                  "/bin/systemsettings5"))))))))
+                            (let ((replace (lambda (file cmd)
+                                             (substitute* file
+                                               (((string-append
+                                                  "\""
+                                                  cmd
+                                                  "\""))
+                                                (string-append
+                                                 "\""
+                                                 (search-input-file
+                                                  inputs
+                                                  (string-append "/bin/" cmd))
+                                                 "\""))))))
+                              (substitute* "CMakeLists.txt"
+                                (("\\$\\{KDE_INSTALL_FULL_BINDIR\\}/systemsettings5")
+                                 (search-input-file inputs
+                                                    "/bin/.systemsettings5-real")))
+                              (substitute* "Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in"
+                                (("@QtBinariesDir@/qdbus")
+                                 (search-input-file inputs "/bin/qdbus")))
+                              (substitute* "Modules/kwinsupportinfo/main.cpp"
+                                (("QLibraryInfo::location\\(QLibraryInfo::BinariesPath\\) \\+ QStringLiteral\\(\"/qdbus\"\\)")
+                                 (string-append "QStringLiteral(\"" (search-input-file inputs "/bin/qdbus") "\")")))
+
+                              (replace '("Modules/cpu/kcm_cpu.json"
+                                         "Modules/cpu/main.cpp") "lscpu")
+                              (replace '("Modules/opencl/kcm_opencl.json"
+                                         "Modules/opencl/main.cpp") "clinfo")
+                              (replace '("Modules/vulkan/kcm_vulkan.json"
+                                         "Modules/vulkan/main.cpp") "vulkaninfo")
+                              (replace '("Modules/glx/kcm_glx.json"
+                                         "Modules/glx/main.cpp") "glxinfo")
+                              (replace '("Modules/wayland/kcm_wayland.json"
+                                         "Modules/wayland/main.cpp") "wayland-info")
+                              (replace '("Modules/egl/kcm_egl.json"
+                                         "Modules/egl/main.cpp") "eglinfo")
+                              (replace '("Modules/xserver/kcm_xserver.json"
+                                         "Modules/xserver/main.cpp") "xdpyinfo")))))))
     (native-inputs (list aha extra-cmake-modules kdoctools pkg-config))
     ;; * vulkaninfo
     ;; Wayland KCM
@@ -566,7 +657,9 @@ are pressed.")
                   util-linux
                   vulkan-tools
                   wayland-utils
-                  xdpyinfo))
+                  xdpyinfo
+                  qttools-5
+                  clinfo))
     (propagated-inputs (list system-settings))
     (home-page "https://invent.kde.org/plasma/kinfocenter")
     (synopsis "View information about computer's hardware")
@@ -577,7 +670,7 @@ computer's hardware.")
 (define-public kmenuedit
   (package
     (name "kmenuedit")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -585,7 +678,7 @@ computer's hardware.")
                                   ".tar.xz"))
               (sha256
                (base32
-                "0z85w7w207dnsinsz8yg6s408pwfy3l7wjkcsjpyg8aj8s9x6nl7"))))
+                "0n60z44wbsjinrcrhs5cfnjs9szpsv2wzva2fiwwgh36j6zz5av7"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules kdoctools))
     (inputs (list ki18n
@@ -605,14 +698,14 @@ computer's hardware.")
 (define-public kongress
   (package
     (name "kongress")
-    (version "22.09")
+    (version "23.01.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma-mobile/" version
                                   "/kongress-" version ".tar.xz"))
               (sha256
                (base32
-                "0pjp2s774sgw2dklqib8alm1a9fkixy3s92i2v8v00znx08zf2jz"))))
+                "0yma1b44sjnvhsw31r5bndrpj2sjgwgchpzc8bf9380l6an9k4r5"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     ;; NOTE: Reporting bugs is linked to web browser, better not link it and let
@@ -640,10 +733,39 @@ computer's hardware.")
 the schedule and venue information.")
     (license license:gpl3+)))
 
+(define-public kpipewire
+  (package
+    (name "kpipewire")
+    (version "5.27.7")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/plasma/"
+                                  version "/" name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "10j7sa8vv530c388z5rzafkdr4sx3agjqczlnkh7412whyw77lha"))))
+    (build-system cmake-build-system)
+    (native-inputs (list extra-cmake-modules pkg-config))
+    (propagated-inputs (list libepoxy pipewire qtbase-5 qtdeclarative-5))
+    (inputs (list ffmpeg
+                  kcoreaddons
+                  ki18n
+                  kwayland
+                  plasma-wayland-protocols
+                  qtwayland-5
+                  wayland
+                  wayland-protocols))
+    (home-page "https://invent.kde.org/plasma/kpipewire")
+    (synopsis "Components relating to pipewire use in Plasma")
+    (description "This package offers a set of convenient classes to use
+PipeWire in Qt projects.")
+    ;; LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+    (license (list license:lgpl2.1 license:lgpl3))))
+
 (define-public kscreen
   (package
     (name "kscreen")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -651,7 +773,7 @@ the schedule and venue information.")
                                   ".tar.xz"))
               (sha256
                (base32
-                "0361202n0366jiyv61w06jikh2i4s1fzr6x3chmdykx4fgvbqj7s"))))
+                "03qa2qrwdjgb6va7akhwpdvzky608sq2lnwj3b1f310mn3hmbmrq"))))
     (build-system cmake-build-system)
     (arguments
      ;; TODO: All tests fail
@@ -667,6 +789,7 @@ the schedule and venue information.")
                   kcoreaddons
                   kcmutils
                   kxmlgui
+                  layer-shell-qt
                   libkscreen
                   libxi
                   plasma-wayland-protocols
@@ -684,14 +807,14 @@ KDE Plasma Workspaces.")
 (define-public ksshaskpass
   (package
     (name "ksshaskpass")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/ksshaskpass-" version ".tar.xz"))
               (sha256
                (base32
-                "0z8pp2mh4s98jh8jkf6r8v014gb6svapmp0m1npzw7zcmr6jvpn6"))))
+                "0vmydvj4c9c93y9wyyjs2hr9m0hygssk1asl4idbj7mcy6n7acg1"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -708,7 +831,7 @@ call it if it is not associated to a terminal.")
 (define-public ksystemstats
   (package
     (name "ksystemstats")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -716,7 +839,7 @@ call it if it is not associated to a terminal.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "07xm6gn2k3vsl1pkrd2n9w8w8b7jq26h3cpslqha4ipw0by2mlqa"))))
+                "1fx5b566xx32q7gxi8qnnx6vny7ip5r65zi2znnx3azmwsc8jgvw"))))
     (build-system qt-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -748,14 +871,14 @@ the running system.")
 (define-public latte-dock
   (package
     (name "latte-dock")
-    (version "0.10.8")
+    (version "0.10.9")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/latte-dock/"
                                   "latte-dock-" version ".tar.xz"))
               (sha256
                (base32
-                "0ali9i0y0y1c5mdaps5ybhk4nqvzzs5jq27wj8rg8xxqjyfvbah0"))))
+                "0zj818wpxdiqpzivvwrgbzj26lcmmv49zw8206v4shcms1afbl9j"))))
     (build-system cmake-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list qtbase-5
@@ -790,14 +913,14 @@ an elegant and intuitive experience for your tasks and plasmoids.")
 (define-public layer-shell-qt
   (package
     (name "layer-shell-qt")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/layer-shell-qt-" version ".tar.xz"))
               (sha256
                (base32
-                "1mvhklq7n9hhjing704jr3ybq58ixwr9fdg3phnqhmdnqc2q3w0l"))))
+                "08glqqh7jmqrli4n7j04lz3w3c6192w8p7ki51ksmwivnxylxi17"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config))
@@ -816,62 +939,59 @@ an elegant and intuitive experience for your tasks and plasmoids.")
 (define-public kscreenlocker
   (package
     (name "kscreenlocker")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/kscreenlocker-" version ".tar.xz"))
               (sha256
                (base32
-                "0mivx0l266310iy52qi94b6wi8w2a8nl7cjn5750x66dz81jl3yj"))))
+                "11y3ksd29p8hdn8chaf8vscnc7fbh8xkjdsbakrb056p1r8kn0f2"))))
     (build-system qt-build-system)
     (arguments
-     `(#:tests? #f ;; TODO: make tests pass
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'check-setup
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (system "Xvfb :1 -screen 0 640x480x24 &")
-             (setenv "DISPLAY" ":1")
-             #t))
-         (delete 'check)
-         ;; Tests use the installed library and require a DBus session.
-         (add-after 'install 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (if tests?
-                 (begin
-                   (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
-                   (invoke "dbus-launch" "ctest")))
-             #t)))))
-    (native-inputs
-     (list extra-cmake-modules pkg-config
-           ;; For tests.
-           dbus xorg-server-for-tests))
-    (inputs
-     (list kcmutils
-           kconfig
-           kcrash
-           kdeclarative
-           kglobalaccel
-           ki18n
-           kidletime
-           knotifications
-           ktextwidgets
-           kwayland
-           kwindowsystem
-           kxmlgui
-           layer-shell-qt
-           libseccomp ;for sandboxing the look'n'feel package
-           libxcursor ;missing in CMakeList.txt
-           libxi ;XInput, required for grabbing XInput2 devices
-           linux-pam
-           elogind ;optional loginctl support
-           qtbase-5
-           qtdeclarative-5
-           qtx11extras
-           solid
-           wayland
-           xcb-util-keysyms))
+     (list #:tests? #f ;TODO: make tests pass
+           #:phases #~(modify-phases %standard-phases
+                        (add-before 'check 'check-setup
+                          (lambda* (#:key inputs outputs #:allow-other-keys)
+                            (system "Xvfb :1 -screen 0 640x480x24 &")
+                            (setenv "DISPLAY" ":1")))
+                        (delete 'check)
+                        ;; Tests use the installed library and require a DBus session.
+                        (add-after 'install 'check
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (if tests?
+                                (begin
+                                  (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
+                                  (invoke "dbus-launch" "ctest"))))))))
+    (native-inputs (list extra-cmake-modules pkg-config
+                         ;; For tests.
+                         dbus xorg-server-for-tests))
+    (inputs (list kcmutils
+                  kconfig
+                  kcrash
+                  kdeclarative
+                  kglobalaccel
+                  ki18n
+                  kio
+                  kidletime
+                  knotifications
+                  ktextwidgets
+                  kwayland
+                  kwindowsystem
+                  kxmlgui
+                  layer-shell-qt
+                  libkscreen
+                  libseccomp ;for sandboxing the look'n'feel package
+                  libxcursor ;missing in CMakeList.txt
+                  libxi ;XInput, required for grabbing XInput2 devices
+                  linux-pam
+                  elogind ;optional loginctl support
+                  qtbase-5
+                  qtdeclarative-5
+                  qtx11extras
+                  solid
+                  wayland
+                  xcb-util-keysyms))
     (home-page "https://invent.kde.org/plasma/kscreenlocker")
     (synopsis "Screen locking library")
     (description
@@ -918,14 +1038,14 @@ installed.")
 (define-public libkscreen
   (package
     (name "libkscreen")
-    (version "5.25.5")
+    (version "5.27.7")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/plasma/" version "/"
                            name "-" version ".tar.xz"))
        (sha256
-        (base32 "17f2pbbkpmw3a32nsqlwd0x5xb71l6dzrh7ldwcqv46nvb54yhfa"))))
+        (base32 "1ary7qavz8vkzbvjx2mxv09h61hxa7i4f7rfgbykldbc83ripdc6"))))
     (build-system qt-build-system)
     (arguments
      '(#:phases
@@ -937,14 +1057,19 @@ installed.")
                (setenv "QT_QPA_PLATFORM" "offscreen")
                (setenv "WAYLAND_DISPLAY" "libkscreen-test-wayland-backend-0")
                (invoke "ctest" "-E"
-                "(kscreen-testscreenconfig|kscreen-testqscreenbackend|kscreen-testkwaylandbackend|kscreen-testkwaylandconfig|kscreen-testkwaylanddpms)")))))))
+                       (string-append "(kscreen-testedid"
+                                      "|kscreen-testqscreenbackend"
+                                      "|kscreen-testkwaylandbackend"
+                                      "|kscreen-testkwaylandconfig"
+                                      "|kscreen-testkwaylanddpms)"))))))))
     (native-inputs
      (list extra-cmake-modules
            pkg-config
+           qttools-5
            ;; For testing.
            dbus))
     (inputs
-     (list kwayland libxrandr plasma-wayland-protocols
+     (list kconfig kwayland libxrandr plasma-wayland-protocols
            qtbase-5 qtwayland-5 wayland qtx11extras))
     (home-page "https://community.kde.org/Solid/Projects/ScreenManagement")
     (synopsis "KDE's screen management software")
@@ -956,7 +1081,7 @@ basic needs and easy to configure for those who want special setups.")
 (define-public libksysguard
   (package
     (name "libksysguard")
-    (version "5.25.5")
+    (version "5.27.7")
     (source
      (origin
        (method url-fetch)
@@ -964,7 +1089,7 @@ basic needs and easy to configure for those who want special setups.")
                            "/libksysguard-" version ".tar.xz"))
        (patches (search-patches "libksysguard-qdiriterator-follow-symlinks.patch"))
        (sha256
-        (base32 "1gqsjsdkp25abqqp4f6cv6ih199q9ad7q1a4lkhjgsh4h8jq1856"))))
+        (base32 "066bjar4105bfyry6ni7nnikz66bqzy5nvssz6vm4np3aa996ak8"))))
     (native-inputs
      (list bash-minimal extra-cmake-modules pkg-config qttools-5))
     (inputs
@@ -1012,7 +1137,7 @@ with a ksysguardd daemon, which may also run on a remote system.")
 (define-public kwallet-pam
   (package
     (name "kwallet-pam")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -1020,7 +1145,7 @@ with a ksysguardd daemon, which may also run on a remote system.")
                                   ".tar.xz"))
               (sha256
                (base32
-                "14w803lc3s2c0f4mqzzdhpfy5qnlz7wv00pbrc3v4k3zv381ci8n"))))
+                "1ac0hqpzqivg40jq7pfr2s1zydl600a3nyzfv97wc20i9myzafrb"))))
     (build-system qt-build-system)
     (arguments
      (list #:tests? #f)) ;no tests
@@ -1032,59 +1157,10 @@ you login.")
     (home-page "https://invent.kde.org/plasma/kwallet-pam")
     (license (list license:lgpl2.1+))))
 
-(define-public kwayland-server
-  (package
-    (name "kwayland-server")
-    (version "5.24.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "mirror://kde/stable/plasma/" version
-                    "/" name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1wwgb1p177g6vvyf4l5jisigwvy5756ray1x355mlp7bi1pfs664"))))
-    (build-system qt-build-system)
-    (native-inputs
-     (list extra-cmake-modules pkg-config))
-    (inputs
-     (list plasma-wayland-protocols
-           qtbase-5
-           qtwayland-5
-           kwayland
-           wayland
-           wayland-protocols))
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-install-path
-           (lambda _
-             ;; Fixes errors including nonexistant /include/KF5
-             (substitute* "src/server/CMakeLists.txt"
-               (("KF5_INSTALL") "KDE_INSTALL"))))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "HOME" (getcwd))
-               (setenv "XDG_RUNTIME_DIR" (getcwd))
-               (setenv "QT_QPA_PLATFORM" "offscreen")
-               (invoke "ctest" "-E"
-                       ;; This test fails inconsistently.
-                       "kwayland-testDragAndDrop")))))))
-    (home-page "https://api.kde.org/kwayland-server/html/index.html")
-    (synopsis "KDE wayland server component")
-    (description
-     "KWayland is a Qt-style API to interact with the wayland-client and
-wayland-server API.")
-    ;; Most files are LGPL2.1 or LGPL3.0 only, at the users option.
-    (license (list license:lgpl2.1 license:lgpl3
-                   ;; src/server/drm_fourcc.h carries the MIT license.
-                   license:expat))))
-
 (define-public kwayland-integration
   (package
     (name "kwayland-integration")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -1092,7 +1168,7 @@ wayland-server API.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "10xl7yrj519b9s5vq0hqqfz3vvg1fdwggw96snzm44iwycqbgss8"))))
+                "1fvf64vx5m3h5v8h697ixkcifhva6a14wlz75kv6759ji9l9fy8y"))))
     (build-system qt-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -1129,14 +1205,14 @@ KDE Frameworks components.")
 (define-public kwin
   (package
     (name "kwin")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
-               (method url-fetch)
-               (uri (string-append "mirror://kde/stable/plasma/" version "/"
-                                   name "-" version ".tar.xz"))
-               (sha256
-                (base32
-                 "1dh7ydwxbb9r53p353d53gq7w9vmp7idvsr4s5ldxmah35436v2s"))))
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/plasma/" version "/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0bssp76lzqqlan5pfg6wjf4z9c6pl6p66ri8p82vqqw406x5bzyb"))))
     (build-system qt-build-system)
     (arguments
      (list
@@ -1167,9 +1243,14 @@ KDE Frameworks components.")
                   _ a Xwayland b)
                  (string-append a
                                 (which "Xwayland") b)))
+              ;; https://github.com/NixOS/nixpkgs/blob/6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
+              (substitute* "src/plugins/qpa/main.cpp"
+                (("(\\(QLatin1String\\(\"kwin_wayland\"\\)\\))" _ start)
+                 (string-append start " && !QCoreApplication::applicationFilePath()\
+.endsWith(QLatin1String(\".kwin_wayland-real\"))" )))
               (substitute* '("cmake/modules/Findhwdata.cmake")
                 (("/usr/share")
-                 (string-append #$hwdata:pnp "/share")))))
+                 (string-append #$(this-package-input "hwdata") "/share")))))
           (add-after 'install 'add-symlinks
             (lambda* (#:key outputs #:allow-other-keys)
               (let ((kst5 (string-append #$output
@@ -1193,20 +1274,21 @@ KDE Frameworks components.")
                 (setenv "DISPLAY" ":1")
                 (system "Xvfb :1 &")
                 (sleep 5)
-                (invoke "ctest" "-E"
+                (invoke "dbus-launch"
+                        "ctest"
+                        "-E"
                         (string-join
-                          (list "kwayland-testXdgDecoration"
-                                "kwin-testXkb"
-                                "kwin-testPointerInput"
-                                "kwin-testXdgShellWindow"
-                                "kwin-testXdgShellWindow-waylandonly"
-                                "kwin-testSceneOpenGLES"
-                                "kwin-testSceneOpenGLES-waylandonly"
-                                "kwin-testNightColor"
-                                "kwin-testNightColor-waylandonly"
-                                "kwin-testSceneQPainter"
-                                "kwin-testLibinputDevice")
-                          "|"))))))))
+                         (list "kwin-testXkb"
+                               "kwin-testPointerInput"
+                               "kwin-testXdgShellWindow"
+                               "kwin-testXdgShellWindow-waylandonly"
+                               "kwin-testSceneOpenGLES"
+                               "kwin-testSceneOpenGLES-waylandonly"
+                               "kwin-testNightColor"
+                               "kwin-testNightColor-waylandonly"
+                               "kwin-testScriptedEffects"
+                               "kwayland-testWaylandSurface")
+                         "|"))))))))
     (native-inputs (list extra-cmake-modules
                          dbus
                          kdoctools
@@ -1243,7 +1325,6 @@ KDE Frameworks components.")
                   kscreenlocker
                   ktextwidgets
                   kwayland
-                  kwayland-server
                   kwindowsystem
                   kxmlgui
                   libqaccessibilityclient
@@ -1285,7 +1366,7 @@ conjunction with the KDE Plasma Desktop.")
 (define-public kwrited
   (package
     (name "kwrited")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -1293,7 +1374,7 @@ conjunction with the KDE Plasma Desktop.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "03gw3czdgyf35n6x79x416rk6f7w1ayzmy5pb65v9733nx1j34mh"))))
+                "1a4g05ynblbz0j0lqclxf6628x6wcd3b52l0smic3rdvbis43v0n"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list kcoreaddons ki18n kpty knotifications))
@@ -1336,7 +1417,7 @@ and minimalistic.")
 (define-public milou
   (package
     (name "milou")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -1344,7 +1425,7 @@ and minimalistic.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0ijdbiq169sy47g0x22pj9x6abldpfxcnski4w1jh9hi9qz1rc25"))))
+                "0lq8m72nwink8x46m8qd5zdkadym1kc70ipnkb04b16mr7zhnsc1"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list kcoreaddons
@@ -1365,7 +1446,7 @@ on top of Baloo.")
 (define-public oxygen-sounds
   (package
     (name "oxygen-sounds")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -1373,7 +1454,7 @@ on top of Baloo.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "04rn3ccqszznknvblz2i8r406m32hk4d3yzma4vzq93jfk57hdf1"))))
+                "132jaabfpj8k6xk6f1732a0qgjz1mzyyk74b1mm7q7pyhpypr2gq"))))
     (build-system cmake-build-system)
     (native-inputs (list extra-cmake-modules))
     (home-page "https://community.kde.org/Frameworks")
@@ -1384,58 +1465,82 @@ on top of Baloo.")
 (define-public plasma
   (package
     (name "plasma")
-    (version "5.25.5")
+    (version "5.27.7")
     (source #f)
     (build-system trivial-build-system)
     (arguments
      (list #:builder #~(begin
                          (mkdir #$output))))
-    (propagated-inputs (list bluedevil
+    ;; TODO: cleanup, check what is no need
+    (propagated-inputs (list kdeclarative ;; require by sddm breeze theme
+
+                             baloo
+                             breeze-icons ; default mouse icon
                              breeze
                              breeze-gtk
-                             discover
                              drkonqi
-                             kactivitymanagerd
+                             kactivitymanagerd ; require this run dbus
                              kde-cli-tools
-                             ;; kde-gtk-config
                              kdecoration
                              kdeplasma-addons
                              kgamma
                              khotkeys
-                             kinfocenter
-                             kmenuedit
+                             ktexteditor
+
                              kscreen
-                             kscreenlocker
-                             ksshaskpass
+                             libkscreen
+
                              ksystemstats
                              kwallet-pam
-                             kwayland-integration
                              kwin
-                             kwrited
                              kinit
-                             layer-shell-qt
-                             libkscreen
+
                              libksysguard
                              milou
                              ;; oxygen
                              oxygen-sounds
+
+                             kde-gtk-config
+                             kdesu
+                             krunner
+                             kinfocenter
+                             kscreenlocker
+                             ksshaskpass
+                             discover
+                             kmenuedit
+                             plasma-welcome
                              plasma-browser-integration
                              plasma-desktop
                              plasma-disks
+                             polkit-kde-agent
+                             system-settings
+                             xdg-desktop-portal-kde
+                             ;; module cyclic referencing
+                             (module-ref
+                              (resolve-interface
+                               '(gnu packages kde-systemtools))
+                              'dolphin)
+                             (module-ref
+                              (resolve-interface
+                               '(gnu packages kde-systemtools))
+                              'konsole)
+                             (module-ref
+                              (resolve-interface
+                               '(gnu packages kde-systemtools))
+                              'spectacle)
+
+                             kwayland-integration
                              plasma-firewall
                              plasma-integration
                              plasma-nm
                              plasma-pa
                              plasma-systemmonitor
                              ;; plasma-thunderbolt ;; waiting for bolt
+
+                             kglobalaccel
                              plasma-vault
                              plasma-workspace
-                             plasma-workspace-wallpapers
-                             polkit-kde-agent
-                             powerdevil
-                             sddm
-                             system-settings
-                             xdg-desktop-portal-kde))
+                             powerdevil))
     (synopsis "The KDE Plasma desktop environment")
     (home-page "https://kde.org/plasma-desktop/")
     (description
@@ -1445,14 +1550,14 @@ on top of Baloo.")
 (define-public plasma-bigscreen
   (package
     (name "plasma-bigscreen")
-    (version "5.25.90")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://kde/unstable/plasma/" version
+              (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1445j8hzfvh2z91fa8nxrc0z576c67cq5fxcs19pmzpnjjli1ads"))))
+                "0b2w0d5w1s2jm7al1nqdc1qh9fmrj8fw93wjbb2bsa9fabz2i81b"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -1491,16 +1596,16 @@ is controllable via voice or TV remote.")
 (define-public plasmatube
   (package
     (name "plasmatube")
-    (version "22.09")
+    (version "23.01.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma-mobile/"
                                   version "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "00w9p5fcpv4s406lmcdcbrxf19sgkvf9yy8pfjmf1asvvvi8bpnk"))))
+                "06hwa1m6gaacjmcyssa63vw43cgx096x9aj87rv1z9k9qsv2qgfj"))))
     (build-system cmake-build-system)
-    (native-inputs (list extra-cmake-modules))
+    (native-inputs (list extra-cmake-modules pkg-config))
     (inputs
      (list kconfig
            kirigami
@@ -1510,6 +1615,7 @@ is controllable via voice or TV remote.")
            qtmultimedia-5
            qtquickcontrols2-5
            qtsvg-5
+           mpv
            youtube-dl))
     (home-page "https://apps.kde.org/plasmatube/")
     (synopsis "Kirigami YouTube video player")
@@ -1549,14 +1655,14 @@ active window on Plasma Desktop.")
 (define-public plasma-browser-integration
   (package
     (name "plasma-browser-integration")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "18pbn5ic5l3m8i1y99yprpwd4x4746aq3abqn1f2cq5h2683h2ia"))))
+                "0c30pdlhl452bjpdc7mwxl01hqabahyc0j1cc54liy0hla9vir9y"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules pkg-config))
     ;; TODO: Figure out how to integrate this package into web browsers
@@ -1587,14 +1693,14 @@ the KDE Plasma 5 desktop.")
 (define-public plasma-desktop
   (package
     (name "plasma-desktop")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "05s1pkwr4xmkghp8jrwcyrvjm83n68ngmk2694055xcfgi0pxicg"))))
+                "1njkjf3fhxfmwyviypxqzrn23klxiih82bazvd8y61cshqwai6i2"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules
                          dbus
@@ -1602,7 +1708,9 @@ the KDE Plasma 5 desktop.")
                          intltool
                          pkg-config
                          qtsvg-5
-                         qttools-5))
+                         qttools-5
+                         ;; require QtWaylandScanner
+                         qtwayland-5))
     (inputs (list packagekit-qt5
                   signon-plugin-oauth2
                   signond
@@ -1676,6 +1784,7 @@ the KDE Plasma 5 desktop.")
                   qqc2-desktop-style
                   qtbase-5
                   qtdeclarative-5
+                  qtquickcontrols-5
                   qtquickcontrols2-5
                   qtwayland
                   qtx11extras
@@ -1706,17 +1815,6 @@ the KDE Plasma 5 desktop.")
                       (string-append "\"" (search-input-directory
                                            inputs "/share/xml/iso-codes")
                                      "\"")))))
-               (add-after 'unpack 'patch-qml-import-path
-                 (lambda _
-                   (substitute*
-                       '("applets/pager/package/contents/ui/main.qml"
-                         "containments/desktop/package/contents/ui/FolderView.qml"
-                         "containments/desktop/package/contents/ui/main.qml"
-                         "containments/panel/contents/ui/main.qml")
-                     (("^import \"(utils|FolderTools|LayoutManager).js\" as "
-                       line mod)
-                      (string-append "import \"../code/" mod
-                                     ".js\" as ")))))
                (replace 'check
                  (lambda* (#:key tests? #:allow-other-keys)
                    (when tests?
@@ -1739,7 +1837,7 @@ activities effectively, without being distracting.")
 (define-public plasma-disks
   (package
     (name "plasma-disks")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -1747,7 +1845,7 @@ activities effectively, without being distracting.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0vci2cf8vx2lclypys9rmvjb8haakv6ksrvqm5j28pazbq2kskvl"))))
+                "0jwjv20ra1mhwl2cm7x2jz8pasmkc58fd57qxhzzf84l4sgbda9v"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list kcoreaddons
@@ -1768,7 +1866,7 @@ activities effectively, without being distracting.")
 (define-public plasma-firewall
   (package
     (name "plasma-firewall")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -1776,7 +1874,7 @@ activities effectively, without being distracting.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0k3pc0dcsjr2hhh4hr8vhsvaddn66s6imm8skrr02icxqvljs6jh"))))
+                "1n5ljkydhcx6qapwrshslq835zaf02gssp2zvzi3vwfy4asc7ind"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list iproute
@@ -1794,7 +1892,7 @@ activities effectively, without being distracting.")
 (define-public plasma-integration
   (package
     (name "plasma-integration")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -1802,7 +1900,7 @@ activities effectively, without being distracting.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1pab56cg2zi8fcaar53lhhh98iw7l07f5lkymkqhsh8a5crfc3yr"))))
+                "1ahzckvc69wk2rx73sl40h0in1y7ny0vm0i7lbrrcggv1v36dwp3"))))
     (build-system qt-build-system)
     (arguments
      (list #:tests? #f                  ;TODO: Failing tests
@@ -1844,14 +1942,14 @@ integration of Qt applications when running on a KDE Plasma workspace.")
 (define-public plasma-nano
   (package
     (name "plasma-nano")
-    (version "5.24.3")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
                                   version "/plasma-nano-" version ".tar.xz"))
               (sha256
                (base32
-                "13jxhfi3c3dhg7zdyfqnsii661h1am0w9dsv82dalqvwr1mw28l5"))))
+                "14wc76bxnwd0z51gz4zb88p5h9n2711ifr1wpx9lrj9r7y1llank"))))
     (build-system cmake-build-system)
     (native-inputs (list extra-cmake-modules pkg-config qttools))
     (inputs (list qtbase-5
@@ -1869,7 +1967,7 @@ integration of Qt applications when running on a KDE Plasma workspace.")
 (define-public plasma-nm
   (package
     (name "plasma-nm")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -1877,7 +1975,7 @@ integration of Qt applications when running on a KDE Plasma workspace.")
                                   ".tar.xz"))
               (sha256
                (base32
-                "036bx0qjrjanfxy8aiy6ab7rmm2h8l7wlkvlwhzw2hgl1w03xjps"))))
+                "1w9zclih2mh8gqwahsmbbm0nrg1b6gcr5w2w02szlw30iq8k92j8"))))
     (build-system qt-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -1890,6 +1988,7 @@ integration of Qt applications when running on a KDE Plasma workspace.")
     (inputs (list kconfigwidgets
                   kcompletion
                   kcoreaddons
+                  kcmutils
                   kdeclarative
                   kdbusaddons
                   kio
@@ -2004,7 +2103,7 @@ customizable platform for mobile devices.")
 (define-public plasma-pa
   (package
     (name "plasma-pa")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -2012,11 +2111,12 @@ customizable platform for mobile devices.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0g06pm1isnzx4hv6380rjpyr22s4j5iw9083s71vnl4npx28npvb"))))
+                "1vg28v5n648y94m6amcwmr0n7dw4a2kfx16kny7jb9bkmxrgnwsc"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules kdoctools pkg-config))
     (inputs (list glib
                   kcoreaddons
+                  kcmutils
                   kdeclarative
                   kglobalaccel
                   knotifications
@@ -2035,17 +2135,18 @@ PulseAudio.")
 (define-public plasma-pass
   (package
     (name "plasma-pass")
-    (version "1.2.0")
+    (version "1.2.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/" name "/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "107pd6cnkd46px83pm3q7vbw10g5pd0qsw77jmr0c774k4xv1w01"))))
+                "0x1yj9wsz2hb5333g645wjasxd83gd2phpwg80h24vfpqdhz62qj"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
-    (inputs (list ki18n kitemmodels kwindowsystem oath-toolkit qtdeclarative-5))
+    (inputs (list ki18n kitemmodels kwindowsystem oath-toolkit
+                  qgpgme qtdeclarative-5))
     (propagated-inputs (list plasma-framework))
     (home-page "https://invent.kde.org/plasma/plasma-pass")
     (synopsis "Plasma applet for the Pass password manager")
@@ -2157,14 +2258,14 @@ Desktop.")
 (define-public plasma-vault
   (package
     (name "plasma-vault")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "15nf4myl6sry0930m8qiixpr1i8bh1g58cy2gf304h029vr2fn5j"))))
+                "1p5m5rlamb50cbd1qlx81m003sv8vdijkpy5airmy1pf6xmvl6hq"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules pkg-config))
     (inputs (list kio
@@ -2181,20 +2282,20 @@ Desktop.")
     (home-page "https://invent.kde.org/plasma/plasma-vault")
     (synopsis "Plasma applet and services for creating encrypted vaults")
     (description "Provides Plasma applet and services for creating encrypted
-	vaults.")
+vaults.")
     (license (list license:gpl2 license:gpl3))))
 
 (define-public plasma-systemmonitor
   (package
     (name "plasma-systemmonitor")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version "/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0rs3avhpmfapzha8dkir9ny60ba2m92bbfv4avsd85vz5kggg29h"))))
+                "1qr8krc7d1hzxv0gx0ii0rxk9bm62rgh157mr8x785qqbd11nq8l"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list ki18n
@@ -2210,6 +2311,7 @@ Desktop.")
                   ksystemstats
                   kitemmodels
                   libksysguard
+                  qqc2-desktop-style
                   qtdeclarative-5
                   qtquickcontrols2-5))
     (synopsis "System sensors, process information and other system resources
@@ -2220,19 +2322,18 @@ sensors, process information and other system resources.")
     (license (list license:gpl2 license:gpl3))))
 
 (define-public plasma-welcome
-(let ((commit "dac7569078782a96f122782c15d34e51737d2b89") ; no tags
-      (revision "1"))
   (package
     (name "plasma-welcome")
-    (version (git-version "0.1-pre" revision commit))
-    (home-page "https://invent.kde.org/plasma/plasma-welcome")
+    (version  "5.27.7")
     (source (origin
-              (method git-fetch)
-              (uri (git-reference (url home-page) (commit commit)))
-              (file-name (git-file-name name version))
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/plasma/"
+                                  version "/plasma-welcome"
+                                  "-"
+                                  version ".tar.xz"))
               (sha256
                (base32
-                "1x7ra699r5a9kpa3isdnx6af4j6778kw2pmprnx4s8f1rwk2idhh"))))
+                "0nz1hxz5nvgl3sbm6k3a76s0l3fy3j38i4plly2zhp5xqdk0ks1x"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config))
@@ -2245,33 +2346,39 @@ sensors, process information and other system resources.")
            kirigami
            knotifications
            kservice
+           knewstuff
+           kaccounts-integration
+           signond
+           kuserfeedback
+           libaccounts-qt
            kwindowsystem
            networkmanager-qt
            plasma-framework
            qtdeclarative-5
            qtgraphicaleffects
            qtsvg-5
-           qtquickcontrols2-5
-           system-settings))
+           qtquickcontrols2-5))
     (synopsis "Plasma welcome screen")
     (description
      "This package provides a wizard for Plasma to configure settings.")
-    (license (list license:gpl2 license:gpl3)))))
+    (home-page "https://invent.kde.org/plasma/plasma-welcome")
+    (license (list license:gpl2 license:gpl3))))
 
 (define-public plasma-workspace
   (package
     (name "plasma-workspace")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0pxwg3i07sipfchn4qkmlr6kcgqbhj2s10xq69wi32x1fc13jx5x"))))
+                "0pyf5vc466mfgicxpp76igdz58lpa0n7x2cl2hhaq4zmrlfr8hh6"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules kdoctools pkg-config qtsvg-5
-                         qttools-5))
+                         qttools-5
+                         xorg-server-for-tests))
     (inputs (list appmenu-gtk-module
                   appstream-qt
                   baloo
@@ -2279,6 +2386,7 @@ sensors, process information and other system resources.")
                   breeze-icons
                   dbus
                   fontconfig
+                  icu4c
                   iso-codes
                   kactivities
                   kactivities-stats
@@ -2308,6 +2416,8 @@ sensors, process information and other system resources.")
                   kquickcharts
                   kpackage
                   kpeople
+                  kpipewire
+                  kquickcharts
                   krunner
                   kscreenlocker
                   ktexteditor
@@ -2338,6 +2448,7 @@ sensors, process information and other system resources.")
                   qtbase-5
                   qtdeclarative-5
                   qtquickcontrols2-5
+                  qttools-5
                   qtwayland-5
                   qtgraphicaleffects
                   qtx11extras
@@ -2349,13 +2460,25 @@ sensors, process information and other system resources.")
                   xrdb
                   xmessage
                   xsetroot
-                  zlib))
+                  polkit-qt
+                  ucd
+
+                  libxcursor
+                  libkexiv2
+                  gpsd
+                  zlib
+
+                  ;; qml dependency
+                  qtquickcontrols-5
+                  plasma-nm
+                  plasma-pa
+                  kscreen))
     (arguments
      (list #:phases
            #~(modify-phases %standard-phases
                (add-after 'unpack 'patch-wallpaper
                  (lambda* (#:key inputs #:allow-other-keys)
-                   (substitute* "sddm-theme/theme.conf.cmake"
+                   (substitute* "lookandfeel/sddm-theme/theme.conf.cmake"
                      (("background=..KDE_INSTALL_FULL_WALLPAPERDIR.")
                       (string-append "background="
                                      #$(this-package-input "breeze")
@@ -2365,7 +2488,8 @@ sensors, process information and other system resources.")
                    (let ((xmessage (search-input-file inputs "/bin/xmessage"))
                          (xsetroot (search-input-file inputs "/bin/xsetroot"))
                          (xrdb (search-input-file inputs "/bin/xrdb"))
-                         (kinit #$(this-package-input "kinit")))
+                         (kinit #$(this-package-input "kinit"))
+                         (qttools #$(this-package-input "qttools")))
                      (substitute* "startkde/startplasma.cpp"
                        (("xmessage") xmessage)
                        (("xsetroot") xsetroot))
@@ -2376,16 +2500,24 @@ sensors, process information and other system resources.")
                      (substitute* "startkde/plasma-session/startup.cpp"
                        (("CMAKE_INSTALL_FULL_LIBEXECDIR_KF5..")
                         (string-append "\"" kinit
-                                       "/lib/libexec/kf5")))
+                                       "/libexec/kf5")))
                      (substitute* (list
                                    "startkde/startplasma-wayland.cpp"
                                    "startkde/startplasma-x11.cpp")
                        (("kdeinit5_shutdown")
-                        (string-append kinit "/bin/kdeinit5_shutdown"))))))
+                        (string-append kinit "/bin/kdeinit5_shutdown")))
+                     ;; QT_INSTALL_BINS refers to qtbase, but qdbus is in
+                     ;; qttools.
+                     (substitute* "CMakeLists.txt"
+                       (("ecm_query_qt\\(QtBinariesDir QT_INSTALL_BINS\\)")
+                        (string-append "set(QtBinariesDir \"" qttools
+                                       "/bin\")"))))))
                (delete 'check)
                (add-after 'install 'check-after-install
                  (lambda* (#:key tests? #:allow-other-keys)
                    (when tests?
+                     (setenv "DISPLAY" ":1")
+                     (system "Xvfb +extension GLX :1 &")
                      (setenv "HOME" (getcwd))
                      (setenv "XDG_RUNTIME_DIR" (getcwd))
                      (setenv "XDG_CACHE_HOME" (getcwd))
@@ -2394,8 +2526,17 @@ sensors, process information and other system resources.")
                              (string-append #$output
                                             "/lib/qt5/plugins:"
                                             (getenv "QT_PLUGIN_PATH")))
-                     (invoke "ctest" "-E"
-                             "(appstreamtest|lookandfeel-kcmTest|tst_triangleFilter|systemtraymodeltest|testdesktop| screenpooltest)")))))))
+                     (setenv "QML2_IMPORT_PATH"
+                             (string-append #$output
+                                            "/lib/qt5/qml:"
+                                            (getenv "QML2_IMPORT_PATH")))
+                     (invoke "dbus-launch" "ctest"
+                             "--output-on-failure"
+                             "--rerun-failed"
+                             "-E"
+                             "(appstreamtest|tasksmodeltest|shelltest|\
+testimagefinder|systemtraymodeltest|testimagelistmodel|\
+testpackageimagelistmodel|testimageproxymodel|testslidemodel|testdesktop)")))))))
     (home-page "https://invent.kde.org/plasma/plasma-workspace")
     (synopsis "Plasma workspace components")
     (description
@@ -2406,14 +2547,14 @@ hardware management, and a high degree of customizability.")
 (define-public plasma-workspace-wallpapers
   (package
     (name "plasma-workspace-wallpapers")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0pdgg8h6zwyxf1pj241mg3hd94wh38bqxj68af5jfp10xrwkzcyr"))))
+                "181q0mmmp3dygzafgh4qq2pwi5w15vw6mwc21nkl98qf6z773ify"))))
     (build-system cmake-build-system)
     (native-inputs (list extra-cmake-modules))
     (home-page "https://community.kde.org/Frameworks")
@@ -2425,14 +2566,14 @@ hardware management, and a high degree of customizability.")
 (define-public polkit-kde-agent
   (package
     (name "polkit-kde-agent")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version "/"
                                   name "-1-" version ".tar.xz"))
               (sha256
                (base32
-                "1qb9nxlkgcv0c30l2vqgf9xs9d220q5pg7ikpb6zjzvj4wsvlvwd"))))
+                "0p6gnv59mnb5y6riiifyg98sk8zycchv8bkf7x1332qa7zqhcjcc"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list ki18n
@@ -2448,25 +2589,27 @@ hardware management, and a high degree of customizability.")
      "This package contains a daemon providing a Polkit authentication
 UI for Plasma")
     (home-page "https://invent.kde.org/plasma/polkit-kde-agent-1")
+    (properties '((upstream-name . "polkit-kde-agent-1")))
     (license license:gpl2+)))
 
 (define-public powerdevil
   (package
     (name "powerdevil")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0anisirn7z8aw442npdnk1csb5ghpzj2hx49gpw4l6ijk70b76pr"))))
+                "151qhpf5j33jk3jhhxsr4zaf0z3f8xlnw8inmzf2a8lficiq9060"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules qttools-5 pkg-config))
     (inputs (list bluez-qt
                   glib
                   kauth
                   kactivities
+                  kcmutils
                   kscreen
                   kidletime
                   kconfig
@@ -2497,14 +2640,14 @@ of a Plasma shell.")
 (define-public system-settings
   (package
     (name "system-settings")
-    (version "5.25.5")
+    (version "5.27.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/systemsettings-" version ".tar.xz"))
               (sha256
                (base32
-                "0n7mf6ygi8fgn1m6pk2fadnqj1h58mxqni3h19xbi373wfypq5fl"))))
+                "0vkcmb4sch97sq5xd8rj8z42qdcxy5ys758q6dl69kbv9hadl7bw"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list kauth
@@ -2529,8 +2672,22 @@ of a Plasma shell.")
                   knotifications
                   krunner
                   plasma-workspace
-                  qtdeclarative-5))
+                  qtdeclarative-5
+                  ;; qml's indirect dependency
+                  ;; XXX: make them propagated dependency runtime qml module
+                  qtquickcontrols-5
+                  qtquickcontrols2-5
+                  kirigami-addons
+                  qtgraphicaleffects
+                  kdeclarative
+                  kuserfeedback
+                  knewstuff
+                  plasma-pa
+                  bluez-qt
+                  kwin
+                  bluedevil))
     (synopsis "Control center to configure Plasma Desktop")
     (description "This package provides configuration UI for Plasma Desktop.")
     (home-page "https://invent.kde.org/plasma/systemsettings")
+    (properties '((upstream-name . "systemsettings")))
     (license license:gpl2+)))
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index 498dcbf0ed..56ce37fea8 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -25,31 +26,35 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
+  #:use-module (guix gexp)
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
+  #:use-module (gnu packages kde-plasma)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages search)
   #:use-module (gnu packages vnc)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages icu4c)
   #:use-module (gnu packages xorg))
 
 (define-public dolphin
   (package
     (name "dolphin")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/dolphin-" version ".tar.xz"))
        (sha256
-        (base32 "07ian9aai9mjygn6bgxanv8h16i83wf69nkl8c9qynwbz4fkwmwf"))))
+        (base32 "0bys24i2a3a65ahq5p3q1zr2px8jqip1gjn5m7rngq4hcddb1ji8"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools ruby ruby-test-unit))
@@ -77,6 +82,7 @@
            breeze-icons ;; default icon set
            phonon
            qtbase-5
+           qtx11extras
            solid))
     (arguments
      `(#:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen
@@ -99,14 +105,14 @@ The main features of Dolphin are:
 (define-public dolphin-plugins
   (package
     (name "dolphin-plugins")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/dolphin-plugins-" version ".tar.xz"))
        (sha256
-        (base32 "1ii1xrz22caxcgrr9ibzkh7nvw1h9d8xb5a2fadni0makk02qjif"))))
+        (base32 "0h1b559icj5g3xrx5697a9rncpdcmsjg774c6m36ild56bwc048v"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -128,14 +134,14 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.")
 (define-public khelpcenter
   (package
     (name "khelpcenter")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/khelpcenter-" version ".tar.xz"))
        (sha256
-        (base32 "0ga270imh1ssifj0w3434z9hgrmn0dqrschygywy1z2hcpyx991d"))))
+        (base32 "10rivj5c14v5hwk87z41gwk830sy35fz0jg1jpay43jzw0ss995y"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -160,17 +166,17 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.")
            qtbase-5
            xapian))
     (arguments
-     `(#:tests? #f  ;; 1/1 test fails
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'wrap-executable
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out")))
-               ;; Since qt-wrap selectors do not wrap for /share/kf5
-               ;; directories, we need this so khelpcenter can find html4.css.
-               (wrap-program (string-append out "/bin/khelpcenter")
-                 `("XDG_DATA_DIRS" suffix
-                   (,(string-append (assoc-ref inputs "khtml") "/share"))))))))))
+     (list #:tests? #f ;;1/1 test fails
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'install 'wrap-executable
+                          (lambda* (#:key inputs #:allow-other-keys)
+                            ;; Since qt-wrap selectors do not wrap for /share/kf5
+                            ;; directories, we need this so khelpcenter can find html4.css.
+                            (wrap-program (string-append #$output
+                                                         "/bin/khelpcenter")
+                              `("XDG_DATA_DIRS" suffix
+                                (,(string-append (assoc-ref inputs "khtml")
+                                                 "/share")))))))))
     (home-page "https://apps.kde.org/khelpcenter/")
     (synopsis "KDE documentation viewer")
     (description "KHelpCenter uses meta data files which describe the
@@ -187,14 +193,14 @@ document meta data file.")
 (define-public konsole
   (package
     (name "konsole")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/konsole-" version ".tar.xz"))
        (sha256
-        (base32 "19yrhjjbwq7kaip05ig8raqnh87k5dg57jck2zrsdrhq2f4nb3ql"))))
+        (base32 "1k68y1i3g3bsz1dz81jhkx1q2fb13rbm5ywh632bcyln0c6l0vz0"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools zlib))
@@ -224,7 +230,9 @@ document meta data file.")
            kxmlgui
            breeze-icons ;; default icon set
            qtbase-5
-           qtscript))
+           qtscript
+           qtmultimedia-5
+           icu4c))
     (arguments
      `(#:tests? #f)) ;; TODO: 2/15 tests fail even with HOME, offscreen, SHELL, debus
     (home-page "https://www.kde.org/")
@@ -241,14 +249,14 @@ This package is part of the KDE base applications module.")
 (define-public krfb
   (package
     (name "krfb")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/krfb-" version ".tar.xz"))
        (sha256
-        (base32 "09h05al7ivf9pzf2p6mnja1124746fawmr3vdk6rggjjw0p0wgn1"))))
+        (base32 "0qbrvf2wa3af1z1dpq3pqkngfbrfdgqfz8xs1qpdpyb7jxnphry7"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config kdoctools))
@@ -261,6 +269,7 @@ This package is part of the KDE base applications module.")
            kdnssd
            ki18n
            knotifications
+           kpipewire
            kwallet
            kwayland
            kwidgetsaddons
@@ -295,14 +304,14 @@ This package is part of the KDE networking module.")
 (define-public ksystemlog
   (package
     (name "ksystemlog")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/ksystemlog-" version ".tar.xz"))
        (sha256
-        (base32 "0x9j3m0kndbaxldsk2rh8zawz0nqqdpn1xf36m4zzymm3b034glv"))))
+        (base32 "15c1h1dlcgbx2adhjzry2zwia0alym7vc251zymyzhl2xjacvqlm"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -331,17 +340,70 @@ who want to quickly see problems occurring on their server.
 This package is part of the KDE administration module.")
     (license license:gpl2+)))
 
+(define-public spectacle
+  (package
+    (name "spectacle")
+    (version "23.04.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/" version
+                           "/src/spectacle-" version ".tar.xz"))
+       (sha256
+        (base32 "1fyklcvz0zndxabflkka75rham6768rp01as7m5dv0ic4lipkf9m"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "ctest" "-E"
+                             "filename_test")))))))
+    (native-inputs
+     (list extra-cmake-modules kdoctools))
+    (inputs
+     (list kconfig
+           kcoreaddons
+           kdbusaddons
+           kglobalaccel
+           kguiaddons
+           ki18n
+           kio
+           kirigami
+           knotifications
+           kpipewire
+           kwidgetsaddons
+           kwindowsystem
+           kxmlgui
+           libxcb
+           purpose
+           qtdeclarative-5
+           qtquickcontrols2-5
+           qtwayland-5
+           qtx11extras
+           wayland
+           wayland-protocols
+           plasma-wayland-protocols
+           xcb-util
+           xcb-util-cursor
+           xcb-util-image))
+    (home-page "https://apps.kde.org/spectacle/")
+    (synopsis "Screenshot capture utility for KDE")
+    (description "Spectacle is a screenshot taking utility for the KDE.")
+    (license license:gpl2+)))
+
 (define-public yakuake
   (package
     (name "yakuake")
-    (version "22.04.3")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/" version
                                   "/src/yakuake-" version ".tar.xz"))
               (sha256
                (base32
-                "0h5c8j65m6gylvwrj4sag4rlx92brbfllyrwpi7kwfjbwf7a5j1k"))))
+                "17ylm5z5lzjq5g4d48s0clpl3hg4rym9sc1p5hr0wfs9jx7197jy"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 5774fa9910..4e665da599 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -52,14 +52,14 @@
 (define-public ark
   (package
     (name "ark")
-    (version "22.04.3")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/" version
                                   "/src/ark-" version ".tar.xz"))
               (sha256
                (base32
-                "1wjy90qkkzafwcw8d4v9cyhmc3sgfipc1085hq2ghqhvrgdyzs00"))
+                "081swq9f87yxg4dxdl5i4hszhr0q4ph402in397zfa5vpyspzy41"))
               ;; The libarchive package in Guix does not support
               ;; xar; disable related tests.
               (patches (search-patches "ark-skip-xar-test.patch"))))
@@ -99,6 +99,7 @@
            kdbusaddons
            khtml
            ki18n
+           kiconthemes
            kio
            kitemmodels
            kparts
@@ -244,14 +245,14 @@ well as CD-ROM images.")
 (define-public filelight
   (package
     (name "filelight")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/filelight-" version ".tar.xz"))
               (sha256
                (base32
-                "1fqgmpq5dznbn5lalx1j6dyynhylijrcqw3x9hrwxcqwr275h9iw"))))
+                "1mwl1dkknvqw9hd5jsh4cdx1zd8f6rxca0vyq01wrx44q9p6dn1n"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list kirigami
@@ -303,47 +304,45 @@ your computer.")
       (license license:lgpl2.1+))))
 
 (define-public isoimagewriter
-  (let ((commit "bd1ef4f0ce179fa874b102689022ebda3e7b4c16")
-        (revision "1"))
-    (package
-      (name "isoimagewriter")
-      (version (git-version "0.8" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://invent.kde.org/utilities/isoimagewriter")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "0dha2y4kmyppi6c0g0hclp53fjj963vq27q7azznpl0bz6zb4042"))))
-      (build-system qt-build-system)
-      (native-inputs (list extra-cmake-modules))
-      (inputs (list kauth
-                    karchive
-                    kcoreaddons
-                    ki18n
-                    kiconthemes
-                    kcrash
-                    solid
-                    kwidgetsaddons))
-      (home-page "https://invent.kde.org/utilities/isoimagewriter")
-      (synopsis "Write hybrid ISO files onto USB disks")
-      (description
-       "This package provides a tool to write ISO files to USB disks.")
-      (license license:gpl3+))))
+  (package
+    (name "isoimagewriter")
+    (version "1.0.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://invent.kde.org/utilities/isoimagewriter")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1iphp2krgadc175570iiyaxbnjgpc1xilc71gkcbn5n0yd7qmkbv"))))
+    (build-system qt-build-system)
+    (native-inputs (list extra-cmake-modules))
+    (inputs (list kauth
+                  karchive
+                  kcoreaddons
+                  ki18n
+                  kiconthemes
+                  kcrash
+                  solid
+                  kwidgetsaddons))
+    (home-page "https://invent.kde.org/utilities/isoimagewriter")
+    (synopsis "Write hybrid ISO files onto USB disks")
+    (description
+     "This package provides a tool to write ISO files to USB disks.")
+    (license license:gpl3+)))
 
 (define-public kate
   (package
     (name "kate")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kate-" version ".tar.xz"))
        (sha256
-        (base32 "0dnlr1cld6lqanqv98bss66w2bi2y78vqb8jx26addn2r1w4ygkf"))))
+        (base32 "0yyhh21pvzsaz7swmghdchzsfk089axhqkjwjv1m8j4q3q3rhv86"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -369,16 +368,23 @@ your computer.")
            kxmlgui
            breeze-icons ;; default icon set
            qtbase-5
-           qtscript))
+           qtscript
+           qtx11extras))
     (arguments
-     `(#:tests? #f ;; 2/7 tests fail
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-tests
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; This test requires a 'bin' diretory under '/usr'.
+             (substitute* "addons/externaltools/autotests/externaltooltest.cpp"
+               (("QStringLiteral[(]\"/usr\"[)]")
+                (format #f "QStringLiteral(\"~a\")"
+                        (dirname (dirname (which "ls"))))))))
          (add-before 'check 'check-setup
            (lambda _
              ;; make Qt render "offscreen", required for tests
              (setenv "QT_QPA_PLATFORM" "offscreen")
-             (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache"))))))
+             (setenv "HOME" (getcwd)))))))
     (home-page "https://kate-editor.org/")
     (synopsis "Multi-document, multi-view text editor")
     (description "Kate is a powerful text editor that can open multiple files
@@ -402,7 +408,7 @@ Kate's features include:
 (define-public kdebugsettings
   (package
     (name "kdebugsettings")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
@@ -410,7 +416,7 @@ Kate's features include:
                                   ".tar.xz"))
               (sha256
                (base32
-                "0l9q7cmzc93zz2zc5ncq3q7q6jil6ai36n2vh70s2wsi8b0gsms8"))))
+                "02igg8ry1cxa83pdj6pgwzw7hpjwfrfk57d9ybgfvy2x08d5kvqz"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list kcoreaddons
@@ -419,7 +425,8 @@ Kate's features include:
                   ki18n
                   kwidgetsaddons
                   kitemviews
-                  kcompletion))
+                  kcompletion
+                  kxmlgui))
     (home-page "https://invent.kde.org/utilities/kdebugsettings")
     (synopsis "Choose which QLoggingCategory are displayed")
     (description
@@ -429,14 +436,14 @@ Kate's features include:
 (define-public kbackup
   (package
     (name "kbackup")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/kbackup-" version ".tar.xz"))
               (sha256
                (base32
-                "0c0zdk00j9qssjdb5dg5hwc5mx7h5kvriyszia2xizqjq2m53c3k"))))
+                "121w54ivmq8qnxc97g47i8vq4nkivypp84pqs9rs5bid4cpfvh9p"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list kguiaddons
@@ -447,6 +454,7 @@ Kate's features include:
                   kiconthemes
                   karchive
                   kwidgetsaddons
+                  libarchive
                   shared-mime-info))
     (home-page "https://apps.kde.org/kbackup/")
     (synopsis "Backup program with an easy-to-use interface")
@@ -464,14 +472,14 @@ drive, USB stick, etc
 (define-public kcalc
   (package
     (name "kcalc")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/kcalc-" version ".tar.xz"))
               (sha256
                (base32
-                "01rn6qy40q4b90i5mysrygkqh5fzq885dgcd11l6r8s59ijjcjlk"))))
+                "04mqicwqn6h99jgh1zl0wsgk1rdkswzxaq8b8yz5hq654dsyq6y1"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules kdoctools))
     (inputs (list gmp
@@ -493,7 +501,7 @@ drive, USB stick, etc
 (define-public kcharselect
   (package
     (name "kcharselect")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
@@ -501,7 +509,7 @@ drive, USB stick, etc
                                   ".tar.xz"))
               (sha256
                (base32
-                "1gs9jkq76dkhjgjqpl5dcsx0l2qi6i0pk122y1qmwgyd6f8af35b"))))
+                "05z80j8bwrj1zfpy376gsx30bv7bxsa3lyvrqsz197w1g8vp5gix"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules))
     (inputs (list kbookmarks kcoreaddons kcrash ki18n kwidgetsaddons kxmlgui))
@@ -517,14 +525,14 @@ characters.")
 (define-public kdialog
   (package
     (name "kdialog")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/kdialog-" version ".tar.xz"))
               (sha256
                (base32
-                "1lqzhfn5g16qr6ada9i0i3kshna1zxp1y20ylwmmsa82bgmyblhx"))))
+                "042az7d9ngar6xp7gv3xcmlns9hpbvs39dkymanqgc0riwa1mvsx"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules kdoctools))
     (inputs (list ktextwidgets
@@ -573,15 +581,14 @@ conversions between European currencies.")
 (define-public keysmith
   (package
     (name "keysmith")
-    (version "22.09")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://kde/stable/plasma-mobile/"
-                                  (version-major+minor version) "/keysmith-"
-                                  version ".tar.xz"))
+              (uri (string-append "mirror://kde/stable/release-service/"
+                                  version "/src/keysmith-" version ".tar.xz"))
               (sha256
                (base32
-                "0w3vvmp9rn6ahly2fm9n6f4glfr7d84bfvj33mrs5pn7n99h7jgy"))))
+                "1rfp516adliyc57nx4ha1rp8v2z340ygsvblh5sqmsdsg2ivjklj"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules pkg-config))
     (inputs (list kdbusaddons
@@ -603,14 +610,14 @@ with support for QR scanning.")
 (define-public kfind
   (package
     (name "kfind")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/kfind-" version ".tar.xz"))
               (sha256
                (base32
-                "0py6ygnj7qxbwrldf2a3hqc1cqd5yvyfi1l0nji0hwn8lvidnjhc"))))
+                "03g9cn0wp3f2n9zwzbc5sbcria4hcp2ls77fbxyj3wkady3m50if"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules kdoctools))
     (inputs (list karchive
@@ -680,16 +687,16 @@ with support for QR scanning.")
 (define-public kontrast
   (package
     (name "kontrast")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/kontrast-" version ".tar.xz"))
               (sha256
                (base32
-                "03y3y5p29zx4nmqi7hp3abxq2n2bgwbz2knhn9vhl3im3ghp7lmp"))))
+                "08qwvc2b5bj3012lvwxainbw7d34mkbwwznj3661ydsnfjyxxs92"))))
     (build-system qt-build-system)
-    (native-inputs (list extra-cmake-modules))
+    (native-inputs (list extra-cmake-modules kdoctools))
     (inputs (list kirigami
                   ki18n
                   kcoreaddons
@@ -776,14 +783,14 @@ the computer and 3D Printers.")
 (define-public kmag
   (package
     (name "kmag")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmag-" version ".tar.xz"))
       (sha256
-       (base32 "08jwv2wnb67vjgz5pv1nn6rwl9ldj8dfd74l6va9vz4x5pk7d859"))))
+       (base32 "13ar37yv3gk5451cdqrgbm91jm50qw4559sx25fv95g2i9wa7z74"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -806,14 +813,14 @@ artists to web-designers to people with low vision.")
 (define-public kmousetool
   (package
     (name "kmousetool")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kmousetool-" version ".tar.xz"))
        (sha256
-        (base32 "13pvdhhf3fdkaiyjp0ijqm5qdffabyw7qq2051l1nqv6i7w6lgwx"))))
+        (base32 "1prh9xdzwx0mx93g9cbjy55hxwcci90hvrv2ckj4dqdnv5fv4h21"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -844,14 +851,14 @@ whom pressing buttons hurts.")
 (define-public kmouth
   (package
     (name "kmouth")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/kmouth-" version ".tar.xz"))
        (sha256
-        (base32 "0lzaw7qqvpqzfz4nb2lk8l06c4yxacfg5982yk33g5q0j7r19bpy"))))
+        (base32 "0qyzq4cvcsacb7hr6n79i3rzyjr0m3c8lrf8fwbzdivswpk8wss3"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -883,14 +890,14 @@ sentences to be re-spoken.")
 (define-public kronometer
   (package
     (name "kronometer")
-    (version "2.2.3")
+    (version "2.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/kronometer/" version
                            "/src/kronometer-" version ".tar.xz"))
        (sha256
-        (base32 "05hs8729a3aqjpwmn2xdf2sriacrll4sj4ax3lm4s1ravj09n9bm"))))
+        (base32 "0xn4z9y2yl57a5skwp4cjsn1456kiwnwvhrddc0qsihgdyif3fbm"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -916,15 +923,24 @@ to save the times and resume them later.")
 (define-public krusader
   (package
     (name "krusader")
-    (version "2.7.2")
+    (version "2.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/krusader/" version
                            "/krusader-" version ".tar.xz"))
        (sha256
-        (base32 "02b1jz5a7cjr13v6c7fczrhs1xmg1krnva5fxk8x2bf4nd1rm8s1"))))
+        (base32 "16n2y861ka8jhackf7hd9b0b0argifc1p0a114dvrc0qjddg0k4f"))))
     (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'patch-compat.h
+                 (lambda _
+                   ;; Those fallbacks for pre KF-5.91 cause missing includes.
+                   (substitute* "app/compat.h"
+                     (("#  include <kcompletion_version\\.h>") "")
+                     (("#  include <karchive_version\\.h>") "")))))))
     (native-inputs
      (list extra-cmake-modules kdoctools))
     (inputs
@@ -993,14 +1009,14 @@ either be created or generated from a image.")
 (define-public okteta
   (package
     (name "okteta")
-    (version "0.26.9")
+    (version "0.26.12")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/okteta/" version
                            "/src/okteta-" version ".tar.xz"))
        (sha256
-        (base32 "1yszs3w78dqdr5d8djf6gp4abzc5lcms859imqcq50wl9r6lr18n"))))
+        (base32 "18bj8gd9kvdk85ypykl668safiyqn5qskgrsb214wxxaprl6phj9"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools qttools-5 shared-mime-info))
@@ -1052,14 +1068,14 @@ redone.")
 (define-public print-manager
   (package
     (name "print-manager")
-    (version "22.08.0")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/print-manager-" version ".tar.xz"))
        (sha256
-        (base32 "1abwj1ccm70adzx07ykqjlb4f6y55k2rv1j861dl0822187vl799"))))
+        (base32 "1fnbkx2xk3pr3cwcji1xbswcf5b7h8r4kag8i3lv28cnjw3ahs52"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1199,14 +1215,14 @@ Features:
 (define-public sweeper
   (package
     (name "sweeper")
-    (version "22.04.3")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/sweeper-" version ".tar.xz"))
        (sha256
-        (base32 "0kda4a5d9a11am2y6f91bx8v3nb8mw9qh671nskvgkx46x1pww21"))))
+        (base32 "19b382cgdcd4qh4ppdmbhsacvcc9nlbs7spcg8ii02bdpx6qw9b7"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 8ad24931b2..17cbc73295 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -48,6 +48,7 @@
   #:use-module (gnu packages apr)
   #:use-module (gnu packages astronomy)
   #:use-module (gnu packages audio)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
@@ -59,6 +60,7 @@
   #:use-module (gnu packages djvu)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages graphics)
   #:use-module (gnu packages ebook)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
@@ -70,6 +72,7 @@
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gperf)
   #:use-module (gnu packages gps)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages image)
@@ -77,10 +80,13 @@
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-pim)
   #:use-module (gnu packages kde-plasma)
+  #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages markup)
   #:use-module (gnu packages maths)
+  #:use-module (gnu packages mp3)
+  #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages photo)
@@ -89,6 +95,8 @@
   #:use-module (gnu packages protobuf)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages samba)
+  #:use-module (gnu packages ssh)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages version-control)
@@ -100,14 +108,14 @@
 (define-public baloo-widgets
   (package
     (name "baloo-widgets")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/baloo-widgets-" version ".tar.xz"))
        (sha256
-        (base32 "02p4v8g4syk908mg7f0l5fpqn7ddsxqji1n8jqghsdkkdsvry7mn"))))
+        (base32 "01k8kmzr2vgd567v4js080cnyl2i43zh6zz25ml76z77lywlfzz6"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -124,14 +132,14 @@ This package contains GUI widgets for baloo.")
 (define-public grantleetheme
   (package
     (name "grantleetheme")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/grantleetheme-" version ".tar.xz"))
        (sha256
-        (base32 "01ls16x6ngi43lcwffav9qig3afakrs04v4wvyfb8lm7sd65hgf9"))))
+        (base32 "01kkj3y6xhc792jaxnkglkwvlqx9ckn5yhlfrpqff5hlf5x9vn4w"))))
     (build-system qt-build-system)
     (arguments `(#:tests? #f))  ; unexpected error in the test suite.
     (native-inputs
@@ -152,14 +160,14 @@ This package contains GUI widgets for baloo.")
 (define-public akregator
   (package
     (name "akregator")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/akregator-" version ".tar.xz"))
        (sha256
-        (base32 "01rgyl2hwjprq4z5yjc99j6jk9vrhjy608ha72j470pw6g47ac5s"))))
+        (base32 "0g916453zip8i5g61pf8ib68fiqfbmr1i1lhbnwmsv1cryx035w9"))))
     (build-system qt-build-system)
     (arguments
      `(#:phases
@@ -197,6 +205,7 @@ This package contains GUI widgets for baloo.")
            kpimcommon
            kpimtextedit
            kquickcharts
+           ktextaddons
            ktexteditor
            kuserfeedback
            libkdepim
@@ -218,6 +227,62 @@ It comes with a fast search, advanced archiving functionality and an internal
 browser for easy news reading.")
     (license license:gpl2+)))
 
+(define-public gwenview
+  (package
+    (name "gwenview")
+    (version "23.04.3")
+    (source
+     (origin
+        (method url-fetch)
+        (uri (string-append "mirror://kde/stable/release-service/" version
+                            "/src/gwenview-" version ".tar.xz"))
+        (sha256
+         (base32 "0vijsq4174p4asdjq47bzdp2xkfn8hpg7b4dgp3yvapfxwjgp148"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "ctest" "-E"
+                             "(placetreemodeltest|historymodeltest|contextmanagertest|urlutilstest)")))))))
+    (native-inputs
+     (list extra-cmake-modules kdoctools pkg-config))
+    (inputs
+     (list baloo
+           cfitsio
+           exiv2
+           kactivities
+           kcolorpicker
+           kguiaddons
+           kiconthemes
+           kimageannotator
+           kio
+           kitemmodels
+           knotifications
+           kparts
+           lcms
+           libjpeg-turbo
+           libkdcraw
+           libpng
+           libtiff
+           phonon
+           purpose
+           qtimageformats
+           qtsvg-5
+           qtwayland-5
+           qtx11extras
+           wayland
+           wayland-protocols
+           zlib))
+    (home-page "https://userbase.kde.org/Gwenview")
+    (synopsis "Image viewer for KDE")
+    (description
+     "Gwenview is an image viewer for KDE.  It also provides image editing and
+annotating features.")
+    (license license:gpl2+)))
+
 (define-public kdenlive
   (package
     (name "kdenlive")
@@ -305,14 +370,14 @@ projects.")
 (define-public kdevelop
   (package
     (name "kdevelop")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "mirror://kde/stable/release-service/" version
                             "/src/kdevelop-" version ".tar.xz"))
         (sha256
-         (base32 "14a80z4sahxyzssrz605zp7ah5xdjbc22ccv0vwcnhr5lzr76v31"))))
+         (base32 "0m1q5nhx7wd4b8850ikw7dk6zka57gapf78wawjv2h1hijxcyf4v"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config shared-mime-info qttools-5))
@@ -371,14 +436,16 @@ projects.")
        ;; heaptrack_gui
        ;; meson
     (arguments
-     `(#:tests? #f  ;; there are some issues with the test suite
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'add-include-path
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "cmake/modules/FindClang.cmake"
-               (("^\\s*PATHS \"\\$\\{CLANG_LIBRARY_DIRS\\}\"" line)
-                (string-append line " " (assoc-ref inputs "clang") "/lib"))))))))
+     (list #:tests? #f ;; there are some issues with the test suite
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'configure 'add-include-path
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (substitute* "plugins/clang/Locate_CLANG_BUILTIN_DIR.cmake"
+                     (("\"\\$[{]CLANG_INCLUDE_DIRS[}]\"" line)
+                      (string-append
+                       line " \""
+                       (assoc-ref inputs "clang") "/lib\""))))))))
     (home-page "https://kdevelop.org")
     (synopsis "IDE for C, C++, Python, Javascript and PHP")
     (description "The KDevelop IDE provides semantic syntax highlighting, as
@@ -391,7 +458,7 @@ software (Git, Subversion, Mercurial, CVS and Bazaar).")
 (define-public kdevelop-pg-qt
   (package
     (name "kdevelop-pg-qt")
-    (version "2.2.1")
+    (version "2.2.2")
     (source
      (origin
        (method git-fetch)
@@ -400,7 +467,7 @@ software (Git, Subversion, Mercurial, CVS and Bazaar).")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "3kfab4p717acbdkcdi41d98vwch7v431gb2qi6s38hmclsf8bf8g"))))
+        (base32 "0kdi12phrl5afv41dy856g2vv3bp0a1b1vwp90h08wbqsfyy1zlm"))))
     (native-inputs
      (list extra-cmake-modules))
     (inputs
@@ -444,7 +511,7 @@ illustrate project schedules.")
 (define-public kio-extras
   (package
     (name "kio-extras")
-    (version "22.08.0")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
@@ -452,7 +519,7 @@ illustrate project schedules.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0gzna2ps2qd2js28c97kjpcbah7zz8n4s4932faggc2nz5z5wnyn"))))
+                "1ygxfq62idpgf1dlic1245y5gf0fnkrpbqxd230xmxi7a35za8qd"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -461,22 +528,40 @@ illustrate project schedules.")
                             (when tests?
                               (setenv "HOME" (getcwd))
                               (setenv "TMPDIR" (getcwd))
-                              (invoke "ctest" "-E" "testkioarchive")))))))
-    (native-inputs (list extra-cmake-modules dbus kdoctools qttools-5))
-    (inputs (list karchive
+                              (invoke "ctest" "-E" "(thumbnailtest|testkioarchive)")))))))
+    (native-inputs (list extra-cmake-modules dbus kdoctools pkg-config qttools-5))
+    ;; TODO: libappimage, kdsoap-ws-discovery-client
+    (inputs (list gperf
+                  imath
+                  kactivities
+                  kactivities-stats
+                  karchive
+                  kbookmarks
                   kconfig
                   kconfigwidgets
                   kcoreaddons
+                  kdnssd
                   kdbusaddons
+                  kdsoap
+                  kguiaddons
                   ki18n
-                  kdnssd
                   kio
-                  solid
-                  kbookmarks
-                  kguiaddons
                   ksyntaxhighlighting
+                  libimobiledevice
+                  libkexiv2
+                  libmtp
+                  libplist
+                  libssh
+                  libtirpc
+                  openexr
+                  phonon
                   qtbase-5
-                  qtsvg-5))
+                  qtsvg-5
+                  samba
+                  shared-mime-info
+                  solid
+                  taglib
+                  zlib))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Additional components to increase the functionality of KIO")
     (description
@@ -516,7 +601,7 @@ the functionality of the KDE resource and network access abstractions.")
 (define-public kirigami-addons
   (package
     (name "kirigami-addons")
-    (version "0.8.0")
+    (version "0.10.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -525,7 +610,7 @@ the functionality of the KDE resource and network access abstractions.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1bi6sc1fpycxj1ydd08gkbw1x1pi2ab6p9bk4175hm0mb0rykdir"))))
+                "154yzhy6nva4d39lnsh7i40vvrj146263j07kfkd1g1w4qy381y3"))))
     (build-system qt-build-system)
     (arguments
      (list #:tests? #f)) ; failing test
@@ -564,6 +649,58 @@ and desktop experiences.")
 expression library, that is used in Krita.")
     (license license:gpl3+)))
 
+(define-public kcolorchooser
+  (package
+    (name "kcolorchooser")
+    (version "23.04.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/" version
+                           "/src/kcolorchooser-" version ".tar.xz"))
+       (sha256
+        (base32
+         "1ripvn2li74rwngicay9c78j0slia1rpsi1f43rbb36p9af02lwq"))))
+    (build-system qt-build-system)
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs
+     (list kcoreaddons
+           ki18n
+           kxmlgui))
+    (home-page "https://apps.kde.org/de/kcolorchooser/")
+    (synopsis "Color selector utility")
+    (description "KColorChooser is a utility to select a color.")
+    (license license:expat)))
+
+(define-public kolourpaint
+  (package
+    (name "kolourpaint")
+    (version "23.04.3")
+    (source
+     (origin
+        (method url-fetch)
+        (uri (string-append "mirror://kde/stable/release-service/" version
+                            "/src/kolourpaint-" version ".tar.xz"))
+        (sha256
+         (base32 "1ab9v6ksb185f6jfhhk578qazhmy8hx6s8vjr9xyh7k3jilayj9v"))))
+    (build-system qt-build-system)
+    (native-inputs
+     (list extra-cmake-modules kdoctools))
+    (inputs
+     (list kguiaddons
+           ki18n
+           kio
+           kjobwidgets
+           ktextwidgets
+           kwidgetsaddons
+           kxmlgui))
+    (home-page "http://kolourpaint.org/")
+    (synopsis "Paint program for KDE")
+    (description "KolourPaint is a paint program for KDE.  It is useful for
+painting, image manipulating and icon editing.")
+    (license (list license:lgpl2.0+ license:bsd-2))))
+
 (define-public krita
   (package
     (name "krita")
@@ -714,14 +851,14 @@ accessibility clients such as screen readers.")
 (define-public libkomparediff2
   (package
     (name "libkomparediff2")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "mirror://kde/stable/release-service/" version
                             "/src/libkomparediff2-" version ".tar.xz"))
         (sha256
-         (base32 "0hjxxhfv0ds05l821avq787sfdy0afr595xx266c20x8fxgm6kv9"))))
+         (base32 "1zkiyyrbfbr1i7zyhhayf53daaarzc8a2xz0iqjy9za7rawnmgbv"))))
     (native-inputs
      (list extra-cmake-modules pkg-config))
     (inputs
@@ -745,14 +882,14 @@ used in KDE development tools Kompare and KDevelop.")
 (define-public qca
   (package
     (name "qca")
-    (version "2.3.4")
+    (version "2.3.7")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "mirror://kde/stable/qca/" version
                             "/qca-" version ".tar.xz"))
         (sha256
-         (base32 "1i7m5y3dfwij9cyjp72ya5zd2skgp7mfmrmf7bvrbzg3ly0mhsbb"))))
+         (base32 "0hrzmzvzsgzn4nvplgg2wmxaql7fjvi3rcqgwgimnzb8ahxk9qpy"))))
     (build-system cmake-build-system)
     (native-inputs
      (list pkg-config))
@@ -766,26 +903,110 @@ including SSL/TLS, X.509 certificates, SASL, OpenPGP, S/MIME CMS, and smart
 cards.")
     (license license:lgpl2.1+)))
 
+(define-public kommit
+  (package
+    (name "kommit")
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/"
+                                  name "/" name "-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "0vp9d1x01na28p6smbd6spx14bjnzilr2bjsd380h1d17b9cm3hy"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "ctest" "-E"
+                             "(difftest|clonedialogtest|overlaytest)")))))))
+    (native-inputs
+     (list extra-cmake-modules kdoctools))
+    (inputs
+     (list kconfigwidgets
+           kcoreaddons
+           kcrash
+           kdbusaddons
+           ki18n
+           kxmlgui
+           kio
+           ktextwidgets
+           ktexteditor
+           ksyntaxhighlighting))
+    (home-page "https://apps.kde.org/kommit/")
+    (synopsis "Git client for KDE")
+    (description
+     "Kommit is a git client for KDE.")
+    (license license:gpl3+)))
+
+(define-public kompare
+  (package
+    (name "kompare")
+    (version "23.04.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/release-service/" version
+                                  "/src/kompare-" version ".tar.xz"))
+              (sha256
+               (base32
+                "058rr0n5r9czxqs6ixacx0bm8hglwjmhfpf5xf1zr0fjgcirlrwy"))))
+    (build-system qt-build-system)
+    (native-inputs
+     (list extra-cmake-modules kdoctools))
+    (inputs
+     (list libkomparediff2
+           kcodecs
+           kconfig
+           kcoreaddons
+           kiconthemes
+           kjobwidgets
+           kparts
+           ktexteditor
+           kwidgetsaddons))
+    (home-page "https://apps.kde.org/kompare/")
+    (synopsis "Graphical file differences tool")
+    (description
+     "Kompare is a program to view the differences between files.  Features
+include:
+@itemize
+@item comparison of files or directories via a graphical interface,
+@item bezier-based connection widget letting you see both source and destination,
+@item graphical viewing of patch files in normal, context, unified and diff
+ formats,
+@item interactive application of differences,
+@item network transparency,
+@item ability to view plain-text diff output in embedded viewer,
+@item navigation of multiple-file diffs with dockable navigation tree,
+@item graphical interface for commonly used diff command line options,
+@item switch source and destination
+@item and diff statistics.
+@end itemize")
+    (license license:gpl3+)))
+
 (define-public kopeninghours
   (package
     (name "kopeninghours")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "03hslgx4zgg7gsnz2xhx4wnchvqfc5n8c6ihgwz3972fkxsjfdvq"))))
+                "14m4wl79b4qad42l1capz59pslfcrm25jshyhmcqzhqb0wzwkav9"))))
     (build-system cmake-build-system)
     (arguments
-     (list #:phases '(modify-phases %standard-phases
-                       (replace 'check
-                         (lambda* (#:key tests? #:allow-other-keys)
-                           (when tests?
-                             (setenv "QT_QPA_PLATFORM" "offscreen")
-                             (invoke "ctest" "-E"
-                                     "(evaluatetest|iterationtest)")))))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (replace 'check
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (setenv "QT_QPA_PLATFORM" "offscreen")
+                              (invoke "ctest" "-E"
+                                      "(evaluatetest|iterationtest)")))))))
     (native-inputs (list bison extra-cmake-modules flex))
     (inputs (list boost
                   kholidays
@@ -803,14 +1024,14 @@ opening hours expressions.")
 (define-public kosmindoormap
   (package
     (name "kosmindoormap")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "042axwxa1497snr8f0m6a61gl9ypdkvllnhnlw4h5ffah7yl5n3s"))))
+                "1winrgc3698wjpil0hblw7bgbgaxgjh6h3dsl1kwc77w14f6vql3"))))
     (build-system cmake-build-system)
     (native-inputs (list bison extra-cmake-modules flex))
     (inputs (list ki18n
@@ -829,7 +1050,7 @@ multi-floor indoor maps.")
 (define-public kpmcore
   (package
     (name "kpmcore")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -837,7 +1058,7 @@ multi-floor indoor maps.")
                     "/src/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1y28dnmbnkkjar4kl033fkmcnazgczc3pgdac2q1ry2hjzkcbnpa"))))
+                "0cz0pz84sxa7lvkq8v25775z7x7g6pz9sq7c90pfv8h9qsz8q1l9"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config))
@@ -851,14 +1072,14 @@ multi-floor indoor maps.")
            qca
            `(,util-linux "lib")))
     (arguments
-     `(#:tests? #f ;; 4/6 tests fail do to no plugin instance
-	   #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-cmake-install-directories
-           (lambda _
-             (substitute* "src/util/CMakeLists.txt"
-               (("DESTINATION \\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}")
-                "DESTINATION share/polkit-1/actions")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-cmake-install-directories
+            (lambda _
+              (substitute* "src/util/CMakeLists.txt"
+                (("DESTINATION \\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}")
+                 "DESTINATION share/polkit-1/actions")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Library for managing partitions")
     (description "Library for managing partitions.")
@@ -867,27 +1088,35 @@ multi-floor indoor maps.")
 (define-public kpublictransport
   (package
     (name "kpublictransport")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
-              (uri (string-append
-                    "mirror://kde/stable/release-service/" version
-                    "/src/kpublictransport-" version ".tar.xz"))
+              (uri (string-append "mirror://kde/stable/release-service/"
+                                  version "/src/kpublictransport-" version
+                                  ".tar.xz"))
               (sha256
                (base32
-                "0z7zyyiq4815m74s6p841k1c4pxbrss7hnkag8kr5qa3q4264kg9"))))
+                "04fa9ismgkhskpmjf6b8gvra2z0jpsigz79b93m1snxm4046xihb"))))
     (build-system qt-build-system)
     (arguments
-     (list #:phases '(modify-phases %standard-phases
-                       (replace 'check
-                         (lambda* (#:key tests? #:allow-other-keys)
-                           (when tests?
-                             (setenv "QT_QPA_PLATFORM" "offscreen")
-                             (invoke "ctest" "-E"
-                              "(mergeutiltest|departuretest|journeytest|networkconfigtest|locationhistorymodeltest|navitiaparsertest|otpparsertest|ivvassparsertest|cachetest)")))))))
-    (native-inputs (list extra-cmake-modules pkg-config))
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-before 'check 'check-setup
+                          (lambda* (#:key inputs #:allow-other-keys)
+                            (setenv "QT_QPA_PLATFORM" "offscreen")
+                            (setenv "HOME" ".")
+                            (setenv "TZ" "Europe/Prague")
+                            (setenv "TZDIR"
+                                    (search-input-directory inputs
+                                                            "share/zoneinfo")))))))
+    (native-inputs (list extra-cmake-modules pkg-config tzdata-for-tests))
     ;; TODO: clipper and osmctools are not detected
-    (inputs (list clipper osmctools protobuf qtdeclarative-5 zlib))
+    (inputs (list clipper
+                  osmctools
+                  protobuf
+                  qtdeclarative-5
+                  zlib
+                  networkmanager-qt
+                  ki18n))
     (home-page "https://api.kde.org/kdepim/kpublictransport/html/index.html")
     (synopsis "Library for accessing realtime public transport data")
     (description
@@ -924,29 +1153,30 @@ different notification systems.")
 (define-public kdeconnect
   (package
     (name "kdeconnect")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "mirror://kde/stable/release-service/"
-                            version "/src/kdeconnect-kde-"
-                            version ".tar.xz"))
-        (sha256
-         (base32
-          "1yzx49gcm7x2wdk53iznyjz09y2a6mrrhh68xilbcsafyiw3l3zr"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/"
+                           version "/src/kdeconnect-kde-"
+                           version ".tar.xz"))
+       (sha256
+        (base32
+         "1gcmqqj752h3lmcpvc7cm6k6bpb158ha7i5ysp0kqvf8cmpi5ydz"))))
     (build-system qt-build-system)
     (arguments
-     `(#:configure-flags '("-DBUILD_TESTING=ON"
-                           "-DKDE_INSTALL_LIBEXECDIR=libexec"
-                           ;; So kdeconnect.so isn't installed to lib/plugins
-                           "-DPLUGIN_INSTALL_DIR=lib/qt5/plugins")
-       #:tests? #f)) ; tests fail hard in our build environment
+     (list #:configure-flags #~'("-DBUILD_TESTING=ON"
+                                 "-DKDE_INSTALL_LIBEXECDIR=libexec"
+                                 ;; So kdeconnect.so isn't installed to lib/plugins
+                                 "-DPLUGIN_INSTALL_DIR=lib/qt5/plugins")
+           #:tests? #f)) ; tests fail hard in our build environment
     (native-inputs
      (list extra-cmake-modules
            kdoctools
            libxtst
            pkg-config
-           python-wrapper))
+           python-wrapper
+           wayland-protocols))
     (inputs
      (list kcmutils
            kconfigwidgets
@@ -974,7 +1204,9 @@ different notification systems.")
            qtquickcontrols2-5
            qtx11extras
            qtwayland-5
-           wayland))
+           wayland
+           modemmanager-qt
+           libxkbcommon))
     (home-page "https://community.kde.org/KDEConnect")
     (synopsis "Enable your devices to communicate with each other")
     (description "KDE Connect is a project that enables all your devices to
@@ -1072,14 +1304,14 @@ to perform data analysis.")
 (define-public kdf
   (package
     (name "kdf")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/kdf-" version ".tar.xz"))
               (sha256
                (base32
-                "0p7iqld2phc74pmhyb8bqqg9clnc7l2rh6hd0i6jcsp266cgg205"))))
+                "11ndcbfkq5fhb1lfij0mmm43fw49sh0z3nw644sll0smcwic76aa"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1105,14 +1337,14 @@ unmount drives and view them in a file manager.")
 (define-public ktimer
   (package
     (name "ktimer")
-    (version "20.12.0")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/" version
                                   "/src/ktimer-" version ".tar.xz"))
               (sha256
                (base32
-                "12fz5v5ky03h18jl75fnq1zagjq8qzi1s1q7phjz5d1rbhwc57ls"))))
+                "1n5az5cgb0q28lz5f7afqjlfga32q232g836nkl1sfq8n5whj5z5"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules
@@ -1132,14 +1364,14 @@ timers for each task can be started, stopped, changed, or looped.")
 (define-public kcachegrind
   (package
     (name "kcachegrind")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/" version
                                   "/src/kcachegrind-" version ".tar.xz"))
               (sha256
                (base32
-                "05wcnfqs0fdfhfpagn0pqky0l7014nblv8r9fv1khy4g5mdlm4hs"))))
+                "175bag1mfidp7bdsjb3zinib76jy8h881rqxgmkn90gmv4fqy62b"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules perl python qttools-5 kdoctools))
@@ -1166,14 +1398,14 @@ Python, PHP, and Perl.")
 (define-public libkdegames
   (package
     (name "libkdegames")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/libkdegames-" version ".tar.xz"))
       (sha256
-       (base32 "1aihbha073fw2bxmdk4l768716kvrlyjd72x2nfx0vvr0ngc5wx9"))))
+       (base32 "1sicpfsrkxn5d0fdy71h7033rpkb94r5hjvv5ab7qbmzb1qa4awq"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1212,7 +1444,7 @@ Python, PHP, and Perl.")
 (define-public marble-qt
   (package
     (name "marble-qt")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method git-fetch)
@@ -1222,16 +1454,16 @@ Python, PHP, and Perl.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-		"0pn0mjh5cg7mgjj82bsj8zikzdyq2fmzckdcav2y0msxwi859crl"))))
+         "02qv2mfga4jm5br9dr8g6kcqr93q2ssq06m383kh83lkvickxzc9"))))
     (build-system qt-build-system)
     (arguments
      ;; FIXME: libmarblewidget-qt5.so.28 not found.  Also enable the
      ;; corresponding configure flag to build tests.
-     `(#:tests? #f
-       #:configure-flags
-       (list "-DBUILD_MARBLE_TOOLS=YES" ; file conversion tools
-             "-DBUILD_TOUCH=YES"
-             "-DBUILD_MARBLE_TESTS=FALSE")))
+     (list #:tests? #f
+           #:configure-flags
+           #~(list "-DBUILD_MARBLE_TOOLS=YES" ; file conversion tools
+                   "-DBUILD_TOUCH=YES"
+                   "-DBUILD_MARBLE_TESTS=FALSE")))
     (native-inputs
      (list extra-cmake-modules kdoctools qttools-5))
     ;; One optional dependency missing: libwlocate.
@@ -1269,24 +1501,42 @@ creating routes by drag and drop and more.")
 (define-public okular
   (package
     (name "okular")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/" name "-" version ".tar.xz"))
        (sha256
-        (base32 "0f98kfsb6sirpym27j2wwz4qr4p5vl4pbnckxd3gmgyfpz8mszln"))))
+        (base32 "1vgcqkq6mzd270hzabmdqqv105iv6kr6ah2h18b15al2n9rmg0bi"))))
     (build-system qt-build-system)
-    ;; The tests fail because they can't find the proper mimetype plugins:
-    ;; "org.kde.okular.core: No plugin for mimetype '"image/jpeg"'."
-    ;; The built program seems to work okay, so we skip the tests for now.
     (arguments
-     `(#:tests? #f
-       #:configure-flags
-       (list "-DBUILD_TESTING=OFF")))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'check)
+          ;; use installed data to check.
+          (add-after 'install 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "ctest"
+                        "--output-on-failure"
+                        "--rerun-failed"
+                        "-E"
+                        "(mainshelltest|parttest|chmgeneratortest)"))))
+          (add-before 'check 'check-setup
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((share (string-append (assoc-ref outputs "out") "/share")))
+                (setenv "QT_QPA_PLATFORM" "offscreen")
+                (setenv "HOME" ".")
+                (setenv "XDG_DATA_DIRS"
+                        (string-append
+                         share ":" (getenv "XDG_DATA_DIRS")))
+                (invoke "update-desktop-database" "-v" share)))))))
     (native-inputs
-     (list extra-cmake-modules kdoctools pkg-config))
+     (list extra-cmake-modules kdoctools pkg-config
+           ;; for test
+           desktop-file-utils))
     (inputs
      (list ebook-tools
            breeze-icons
@@ -1324,7 +1574,8 @@ creating routes by drag and drop and more.")
            qtwayland-5
            threadweaver
            kcrash
-           kjs))
+           kjs
+           qtx11extras))
     (home-page "https://apps.kde.org/okular/")
     (synopsis "Document viewer")
     (description
@@ -1335,7 +1586,7 @@ a variety of formats, including PDF, PostScript, DejaVu, and EPub.")
 (define-public poxml
   (package
     (name "poxml")
-    (version "22.08.1")
+    (version "23.04.3")
     (source (origin
               (method url-fetch)
               (uri
@@ -1343,7 +1594,7 @@ a variety of formats, including PDF, PostScript, DejaVu, and EPub.")
                               "/src/poxml-" version ".tar.xz"))
               (sha256
                (base32
-                "13jp5g5la3kq9i3qybdvwfl4vgqz3hxf64qzmh7kl71ykas7s5vi"))))
+                "11rqd7hhsy6f8qi0529cmy381bhskji6wf4fij7yjksmrsdvfw6d"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
@@ -1360,14 +1611,14 @@ PO template files.")
 (define-public kdegraphics-mobipocket
   (package
     (name "kdegraphics-mobipocket")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/" name "-" version ".tar.xz"))
        (sha256
-        (base32 "1kxvzgmq83hml10pc4j66r59dsar7h92w2i0cs1nhar781mz666n"))))
+        (base32 "13hn6dh5d4vsblvg6wyyvbmcyl0yyqr8srilik86wilp58qbsrdv"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
@@ -1382,14 +1633,14 @@ Mobipocket e-books in Dolphin and other KDE apps.")
 (define-public libkexiv2
   (package
     (name "libkexiv2")
-    (version "22.08.1")
+    (version "23.04.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://kde/stable/release-service/" version
                            "/src/" name "-" version ".tar.xz"))
        (sha256
-        (base32 "0iwpy79ppv4bbsqrszp9kmghgjvkl13gdpnafsbikh4wy1ch4cv9"))))
+        (base32 "16cb7cab4pyarwwn2byyvanwlakcgq5h203hkysp44flszq515cl"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 175cdc8d5e..faf3114b84 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -181,7 +181,7 @@
            m17n-lib
            qtbase-5
            librime
-           librsvg
+           (librsvg-for-system)
            wayland
            wayland-protocols
            libx11
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 686eb40587..10babc8f7e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -113,6 +113,7 @@
   #:use-module (gnu packages databases)
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages dbm)
+  #:use-module (gnu packages disk)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
@@ -487,7 +488,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 ;; The current "stable" kernels. That is, the most recently released major
 ;; versions that are still supported upstream.
 
-(define-public linux-libre-6.4-version "6.4.10")
+(define-public linux-libre-6.4-version "6.4.11")
 (define-public linux-libre-6.4-gnu-revision "gnu")
 (define deblob-scripts-6.4
   (linux-libre-deblob-scripts
@@ -497,7 +498,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "1rwm09anyn4py1g877f9vh6ya86y2hfvlqx51bpa53dci5k0b0ds")))
 (define-public linux-libre-6.4-pristine-source
   (let ((version linux-libre-6.4-version)
-        (hash (base32 "0fgjym6y0zj7wz1byqhxmv3pc3wq412vm1dxbj4gv23pm6r3y2wq")))
+        (hash (base32 "0609lhgc42j9id2vvdpv8n7djabp46p2mridf9s0sg3x16snhssl")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.4)))
@@ -505,7 +506,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 ;; The "longterm" kernels — the older releases with long-term upstream support.
 ;; Here are the support timelines:
 ;; <https://www.kernel.org/category/releases.html>
-(define-public linux-libre-6.1-version "6.1.45")
+(define-public linux-libre-6.1-version "6.1.46")
 (define-public linux-libre-6.1-gnu-revision "gnu")
 (define deblob-scripts-6.1
   (linux-libre-deblob-scripts
@@ -515,12 +516,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "1c73516nbhnz0cxjz38b5794dxygb8sznv9idiibw7ablmjbhd11")))
 (define-public linux-libre-6.1-pristine-source
   (let ((version linux-libre-6.1-version)
-        (hash (base32 "14piy4cwv18a0yqp4gkrvr51z4zccyhab29n9ybxinkxdqwl68xx")))
+        (hash (base32 "15m228bllks2p8gpsmvplx08yxzp7bij9fnmnafqszylrk7ppxpm")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.1)))
 
-(define-public linux-libre-5.15-version "5.15.126")
+(define-public linux-libre-5.15-version "5.15.127")
 (define-public linux-libre-5.15-gnu-revision "gnu")
 (define deblob-scripts-5.15
   (linux-libre-deblob-scripts
@@ -530,12 +531,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "1c3lm0j401lv2lk39dmr4mlf5ic173snm7cc0cckl6czyvxr5ysy")))
 (define-public linux-libre-5.15-pristine-source
   (let ((version linux-libre-5.15-version)
-        (hash (base32 "0vzdncrvwqxzjkpgf3gjxvl8iwz92szfyzc33cayx28ghjwsmx5d")))
+        (hash (base32 "09lgj9hs1cjxg84hb7avras4rlsx18igr69mx433l9hv6issbl5d")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.15)))
 
-(define-public linux-libre-5.10-version "5.10.190")
+(define-public linux-libre-5.10-version "5.10.191")
 (define-public linux-libre-5.10-gnu-revision "gnu1")
 (define deblob-scripts-5.10
   (linux-libre-deblob-scripts
@@ -545,12 +546,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "0nnp46mn32yk436swd2qh34igmzinfgkwvbzp3lqyy45f06hbc2j")))
 (define-public linux-libre-5.10-pristine-source
   (let ((version linux-libre-5.10-version)
-        (hash (base32 "15zmz9pg91gph2dhigjf1z3w6gkv1kwslki5dpzhgzs03pq3swi9")))
+        (hash (base32 "1hk2x5dgvfq9v6161v25wz5qpzgyvqbx34xbm7ww8z4ish76cm6b")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.10)))
 
-(define-public linux-libre-5.4-version "5.4.253")
+(define-public linux-libre-5.4-version "5.4.254")
 (define-public linux-libre-5.4-gnu-revision "gnu1")
 (define deblob-scripts-5.4
   (linux-libre-deblob-scripts
@@ -560,12 +561,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "0sw67b2pk3lng4y67diqqnhxaggnp3nbkx8dxc5fs27rinfxr4m1")))
 (define-public linux-libre-5.4-pristine-source
   (let ((version linux-libre-5.4-version)
-        (hash (base32 "1rr6mnkbw6gwdm9bqjhf4z2xqr458fn2qdv5b4mgm65a15gvmchz")))
+        (hash (base32 "1iyrm2xql15ifhy2b939ywrrc44yd41b79sjjim4vqxmc6lqsq2i")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.4)))
 
-(define-public linux-libre-4.19-version "4.19.291")
+(define-public linux-libre-4.19-version "4.19.292")
 (define-public linux-libre-4.19-gnu-revision "gnu1")
 (define deblob-scripts-4.19
   (linux-libre-deblob-scripts
@@ -575,12 +576,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "1425mhkfxn18vxn05bb4h3li7x1jl7l1hf1zi8xhnqv3wa31h9wl")))
 (define-public linux-libre-4.19-pristine-source
   (let ((version linux-libre-4.19-version)
-        (hash (base32 "0cxmq8mrkw179jb8sqvad3dskllwn579g2lxcjn21jyqsf85nwz6")))
+        (hash (base32 "0dr12v4jqmzxcqdghqqjny5zp3g4dx9lxqrl9d4fxz23s79ji5rl")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.19)))
 
-(define-public linux-libre-4.14-version "4.14.322")
+(define-public linux-libre-4.14-version "4.14.323")
 (define-public linux-libre-4.14-gnu-revision "gnu1")
 (define deblob-scripts-4.14
   (linux-libre-deblob-scripts
@@ -590,7 +591,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "1faagsj4i31z2bp83hflx3q9vrddjnn37a3ah2b47iaplva7z1nd")))
 (define-public linux-libre-4.14-pristine-source
   (let ((version linux-libre-4.14-version)
-        (hash (base32 "1r71g5p0cnbi0nixv91nyhv24dqmvh49rqb2lnbhsdq81fqm8ssm")))
+        (hash (base32 "1g2fh0mn1sv0kq2hh3pynmx2fjai7hdwhf4fnaspl7j5n88902kg")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.14)))
@@ -3121,27 +3122,6 @@ early boot when entropy may be low, especially in virtualised environments.")
     (license (list license:bsd-3        ; or
                    license:gpl2+))))
 
-(define-public lsscsi
-  (package
-    (name "lsscsi")
-    (version "0.32")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append
-                   "http://sg.danny.cz/scsi/lsscsi-" version ".tar.xz"))
-             (sha256
-              (base32
-               "0jp458m2b3wckr18qkln69i01152qlwz33zm49103lq8fgx0n6d4"))))
-    (build-system gnu-build-system)
-    (synopsis "Lists information about SCSI or NVMe devices in Linux")
-    (home-page "https://sg.danny.cz/scsi/lsscsi.html")
-    (description
-     "@command{lsscsi} lists SCSI logical units or SCSI targets.  It can
-also list NVMe namespaces or controllers and show the relationship between a
-device's primary node name, its SCSI generic (sg) node name and its kernel
-name.")
-    (license license:gpl2)))
-
 (define-public ebtables
   (package
     (name "ebtables")
@@ -5023,6 +5003,7 @@ in a digital read-out.")
            elfutils
            libiberty                 ;used alongside BDF for symbol demangling
            libunwind                 ;better stack walking
+           libtraceevent
            numactl                   ;for 'perf bench numa mem'
            ;; Documentation.
            libxml2                                ;for $XML_CATALOG_FILES
@@ -5148,44 +5129,6 @@ existing Docker images.  Singularity requires kernel support for container
 isolation or root privileges.")
     (license license:bsd-3)))
 
-(define-public hdparm
-  (package
-    (name "hdparm")
-    (version "9.65")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/hdparm/hdparm/"
-                                  "hdparm-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0jssagggg52ssl9kg99m88afghj7bm1854vyf4p96q6h23wjjjfi"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list #:make-flags
-           #~(list (string-append "binprefix=" #$output)
-                   (string-append "manprefix=" #$output)
-                   (string-append "CC=" #$(cc-for-target))
-                   ;; Let Guix strip binaries and not break cross-compilation.
-                   "STRIP=true")
-           #:phases
-           #~(modify-phases %standard-phases
-               (delete 'configure))     ; no configure script
-           #:tests? #f))                ; no test suite
-    (home-page "https://sourceforge.net/projects/hdparm/")
-    (synopsis "View and tune ATA disk drive parameters")
-    (description
-     "@command{hdparm} is a command-line utility to control ATA controllers and
-disk drives.  It can increase performance and/or reliability by careful tuning
-of hardware settings like power and acoustic management, DMA modes, and caching.
-It can also display detailed device information, or be used as a simple
-performance benchmarking tool.
-
-@command{hdparm} provides a command line interface to various Linux kernel
-interfaces provided by the SATA/ATA/SAS @code{libata} subsystem, and the older
-IDE driver subsystem.  Many external USB drive enclosures with SCSI-ATA Command
-Translation (@dfn{SAT}) are also supported.")
-    (license (license:non-copyleft "file://LICENSE.TXT"))))
-
 (define-public libnvme
   (package
     (name "libnvme")
@@ -10145,7 +10088,7 @@ with the value and the symbolic name.")
 (define-public tp-smapi-module
   (package
     (name "tp-smapi-module")
-    (version "0.43")
+    (version "0.44")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -10154,7 +10097,7 @@ with the value and the symbolic name.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1rjb0njckczc2mj05cagvj0lkyvmyk6bw7wkiinv81lw8m90g77g"))))
+                "0kzbks07bh5jbi1n311zp9cbp1xxyzi7nys8wq1k0k5ig81h9w6k"))))
     (build-system linux-module-build-system)
     (arguments
      `(#:tests? #f))                    ;there are none.
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index e1428d8131..d62122f408 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -38,6 +38,7 @@
 ;;; Copyright © 2022 Trevor Richards <trev@trevdev.ca>
 ;;; Copyright © 2022, 2023 Artyom Bologov <mail@aartaka.me>
 ;;; Copyright © 2023 Roman Scherer <roman@burningswell.com>
+;;; Copyright © 2023 ykonai <mail@ykonai.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5486,25 +5487,25 @@ client and server.")
   (sbcl-package->cl-source-package sbcl-trivial-arguments))
 
 (define-public sbcl-trivial-clipboard
-  (let ((commit "13b53720306c0e6a13eccf4674d28ee5361127ae"))
+  (let ((commit "6ddf8d5dff8f5c2102af7cd1a1751cbe6408377b")
+        (revision "6"))
     (package
       (name "sbcl-trivial-clipboard")
-      (version (git-version "0.0.0.0" "5" commit))
+      (version (git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/snmsts/trivial-clipboard")
                (commit commit)))
-         (file-name (git-file-name "trivial-clipboard" version))
+         (file-name (git-file-name "cl-trivial-clipboard" version))
          (sha256
-          (base32
-           "0l198m1gg2ixc43lqjq1ffd80s1sjxhqf1w83qqa1cn51rra2jp8"))))
+          (base32 "04qmm69zyx8rs23pfhgzgxn0j108byv3b7skfdv0h01a76wlhplz"))))
       (build-system asdf-build-system/sbcl)
       (inputs
        ;; Pick xsel instead of xclip because its closure size is slightly
        ;; smaller.
-       (list xsel))
+       (list wl-clipboard xsel))
       (native-inputs
        (list sbcl-fiveam))
       (arguments
@@ -5514,7 +5515,15 @@ client and server.")
              (lambda* (#:key inputs #:allow-other-keys)
                (substitute* "src/text.lisp"
                  (("\"xsel\"")
-                  (string-append "\"" (assoc-ref inputs "xsel") "/bin/xsel\""))))))))
+                  (string-append "\"" (assoc-ref inputs "xsel") "/bin/xsel\""))
+                 (("\"wl-copy\"")
+                  (string-append "\""
+                                 (assoc-ref inputs "wl-clipboard")
+                                 "/bin/wl-copy\""))
+                 (("\"wl-paste\"")
+                  (string-append "\""
+                                 (assoc-ref inputs "wl-clipboard")
+                                 "/bin/wl-paste\""))))))))
       (home-page "https://github.com/snmsts/trivial-clipboard")
       (synopsis "Access system clipboard in Common Lisp")
       (description
@@ -9556,8 +9565,8 @@ function.")
   (sbcl-package->cl-source-package sbcl-specialization-store))
 
 (define-public sbcl-cl-gobject-introspection
-  (let ((commit "d0136c8d9ade2560123af1fc55bbf70d2e3db539")
-        (revision "1"))
+  (let ((commit "c4fef07d01cec7c830ce84ef150ed8e4da5959c4")
+        (revision "2"))
     (package
       (name "sbcl-cl-gobject-introspection")
       (version (git-version "0.3" revision commit))
@@ -9568,18 +9577,17 @@ function.")
          (uri (git-reference
                (url home-page)
                (commit commit)))
-         (file-name (git-file-name name version))
+         (file-name (git-file-name "cl-gobject-introspection" version))
          (sha256
-          (base32
-           "0dz0r73pq7yhz2iq2jnkq977awx2zws2qfxdcy33329sys1ii32p"))))
+          (base32 "18n4wg93sf6cjmpcpr47bg2rd8mbm9ml9lykmjsxgvsf3nwr5vnw"))))
       (build-system asdf-build-system/sbcl)
       (inputs
-       `(("alexandria" ,sbcl-alexandria)
-         ("cffi" ,sbcl-cffi)
-         ("iterate" ,sbcl-iterate)
-         ("trivial-garbage" ,sbcl-trivial-garbage)
-         ("glib" ,glib)
-         ("gobject-introspection" ,gobject-introspection)))
+       (list glib
+             gobject-introspection
+             sbcl-alexandria
+             sbcl-cffi
+             sbcl-iterate
+             sbcl-trivial-garbage))
       (native-inputs
        (list sbcl-fiveam))
       (arguments
@@ -9608,6 +9616,113 @@ of C+GObject libraries without the need of writing dedicated bindings.")
 (define-public ecl-cl-gobject-introspection
   (sbcl-package->ecl-package sbcl-cl-gobject-introspection))
 
+(define-public sbcl-cl-gobject-introspection-wrapper
+  (let ((commit "2d197cba7e7d734ac8a2e181e5e709e5b218bada")
+        (revision "1"))
+    (package
+      (name "sbcl-cl-gobject-introspection-wrapper")
+      (version (git-version "1.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/bohonghuang/cl-gobject-introspection-wrapper")
+               (commit commit)))
+         (file-name (git-file-name "cl-gobject-introspection-wrapper" version))
+         (sha256
+          (base32 "05np2zs5806ib6qfz7d6knyaz6llxgwvjqavl1fsz5hcga40296s"))))
+      (build-system asdf-build-system/sbcl)
+      (inputs
+       (list sbcl-alexandria
+             sbcl-cl-gobject-introspection
+             sbcl-cl-ppcre))
+      (home-page
+       "https://github.com/bohonghuang/cl-gobject-introspection-wrapper")
+      (synopsis
+       "Wrap and call GObject Introspection FFI function in Common Lisp")
+      (description
+       "This library converts the elements from GObject Introspection into
+Common Lisp-style definitions, based on cl-gobject-introspection.")
+      (license license:lgpl3+))))
+
+(define-public cl-gobject-introspection-wrapper
+  (sbcl-package->cl-source-package sbcl-cl-gobject-introspection-wrapper))
+
+(define-public ecl-cl-gobject-introspection-wrapper
+  (sbcl-package->ecl-package sbcl-cl-gobject-introspection-wrapper))
+
+(define-public sbcl-cl-glib
+  (let ((commit "9e52827cce1cbb3962536b6a5e628febab593f57")
+        (revision "1"))
+    (package
+      (name "sbcl-cl-glib")
+      (version (git-version "1.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/bohonghuang/cl-glib")
+               (commit commit)))
+         (file-name (git-file-name "cl-glib" version))
+         (sha256
+          (base32 "0dxa493zdp1p93cahhpp3yaggn3j3kkn90mdw99g4ld7scmiglp4" ))))
+      (build-system asdf-build-system/sbcl)
+      (arguments
+       '(#:asd-systems '("cl-gio" "cl-glib" "cl-gobject")))
+      (inputs
+       (list glib
+             gobject-introspection
+             sbcl-bordeaux-threads
+             sbcl-cl-gobject-introspection-wrapper))
+      (home-page "https://github.com/bohonghuang/cl-glib")
+      (synopsis "Glib, GIO and Gobject bindings for Common Lisp")
+      (description "This library provides Glib, GIO and Gobject bindings for
+Common Lisp via Gobject Introspection.")
+      (license license:lgpl3+))))
+
+(define-public cl-glib
+  (sbcl-package->cl-source-package sbcl-cl-glib))
+
+(define-public ecl-cl-glib
+  (sbcl-package->ecl-package sbcl-cl-glib))
+
+(define-public sbcl-cl-gtk4
+  (let ((commit "d116905e7b68508d03681a50b3b24d63e7b111e4")
+        (revision "1"))
+    (package
+      (name "sbcl-cl-gtk4")
+      (version (git-version "1.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/bohonghuang/cl-gtk4")
+               (commit commit)))
+         (file-name (git-file-name "cl-gtk4" version))
+         (sha256
+          (base32 "0mprmmvbagnflvhynn51l42nbwr08rld99ls0c48m5lpjn0ja4zc"))))
+      (build-system asdf-build-system/sbcl)
+      (arguments
+       '(#:asd-systems '("cl-gtk4" "cl-gdk4")))
+      ;; propagate because it at least requires the typelib files at runtime
+      (propagated-inputs (list gtk))
+      (inputs
+       (list gobject-introspection
+             sbcl-cl-glib
+             sbcl-cl-gobject-introspection-wrapper))
+      (home-page "https://github.com/bohonghuang/cl-gtk4")
+      (synopsis "GTK4 bindings for Common Lisp")
+      (description
+       "This library provides GTK4 bindings for Common Lisp via Gobject
+Introspection, in the cl-gtk4 ASDF system.")
+      (license license:lgpl3))))
+
+(define-public cl-gtk4
+  (sbcl-package->cl-source-package sbcl-cl-gtk4))
+
+(define-public ecl-cl-gtk4
+  (sbcl-package->ecl-package sbcl-cl-gtk4))
+
 (define-public sbcl-cl-slug
   (let ((commit "ffb229d10f0d3f7f54e706791725225e200bf749")
         (revision "1"))
@@ -25708,10 +25823,10 @@ change since last write.
            (package-inputs sbcl-nfiles)))))
 
 (define-public sbcl-nasdf
-  (let ((commit "73c89680ace25929c2a1ccc0809db99e9edffa07"))
+  (let ((commit "dd9fb2df7174464b54561b2a2f3c3e00fdd5d4f7"))
     (package
       (name "sbcl-nasdf")
-      (version "0.1.6")
+      (version "0.1.7")
       (source
        (origin
          (method git-fetch)
@@ -25720,20 +25835,19 @@ change since last write.
                (commit commit)))
          (file-name (git-file-name "cl-ntemplate" version))
          (sha256
-          (base32
-           "193wwcp84pyyv33pkkm41s7ca2limpcqqi41hxd1pm5il5r9q9h7"))))
+          (base32 "1q8ky8hz8xrr37h7yyc6ysvrcwlsp1i6r2x44c060drspgjbqj70"))))
       (build-system asdf-build-system/sbcl)
       (arguments
        `(#:phases
          (modify-phases %standard-phases
            (add-after 'unpack 'cd-sdl
              (lambda _
-               (chdir "nasdf")
-               #t)))))
+               (chdir "nasdf"))))))
       (home-page "https://github.com/atlas-engineer/ntemplate")
       (synopsis "ASDF helpers for system setup, testing and installation")
       (description
-       "NASDF is an ASDF extension providing utilities to ease system setup, testing and installation.
+       "NASDF is an ASDF extension providing utilities to ease system setup,
+testing and installation.
 
 @itemize
 @item Simple way to fetch Git submodules and “do the right thing” for
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 63a4bd5455..405f8511cb 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -1190,7 +1190,7 @@ enabled.")
 (define-public fennel
   (package
     (name "fennel")
-    (version "1.3.0")
+    (version "1.3.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1199,7 +1199,7 @@ enabled.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1g22y0bpw1ads6bmsr946fw1m5xxvlvb1hdym3f3k3fziislwwhd"))))
+                "12zm3rd0vvkqazv1cv5bhwk6igsj18im2qakqw7cf4a20rc9wpmx"))))
     (build-system gnu-build-system)
     (arguments
      (list #:make-flags #~(list (string-append "PREFIX="
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index d7b806e7e0..f0ae01614e 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015, 2022 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Nikita <nikita@n0.is>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018, 2019 Meiyo Peng <meiyo@riseup.net>
@@ -909,7 +909,7 @@ image viewer.")
     (inputs
      (list imlib2
            libsm
-           librsvg
+           (librsvg-for-system)
            libxft
            libxml2
            openbox
@@ -1078,7 +1078,7 @@ like @command{tar} and @command{zip}.")
     (license license:gpl2+)))
 
 (define-public lxqt-connman-applet
-  ;; since the main developers didn't release any version yet,  their 
+  ;; since the main developers didn't release any version yet,  their
   ;; latest commit on `master` branch at the moment used for this version.
   (let ((commit "db1618d58fd3439142c4e44b24cba0dbb68b7141")
         (revision "0"))
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index f931626cd6..c32180615b 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -408,7 +408,7 @@ Performance is achieved by using the LLVM JIT compiler.")
   (deprecated-package "guile-aiscm-next" guile-aiscm))
 
 (define-public llama-cpp
-  (let ((commit "3cd8dde0d1357b7f11bdd25c45d5bf5e97e284a0")
+  (let ((commit "f31b5397143009d682db90fd2a6cde83f1ef00eb")
         (revision "0"))
     (package
       (name "llama-cpp")
@@ -421,7 +421,7 @@ Performance is achieved by using the LLVM JIT compiler.")
                (commit (string-append "master-" (string-take commit 7)))))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0i7c92cxqs31xklrn688978kk29agivgxjgvsb45wzm65gc6hm5c"))))
+          (base32 "0ys6n53n032zq1ll9f3vgxk8sw0qq7x3fi7awsyy13adzp3hn08p"))))
       (build-system cmake-build-system)
       (arguments
        (list
@@ -449,18 +449,13 @@ Performance is achieved by using the LLVM JIT compiler.")
                       (chmod (string-append bin script) #o555)))
                   (mkdir-p bin)
                   (make-script "convert-pth-to-ggml")
-                  (make-script "convert-gptq-to-ggml")
-                  (make-script "quantize.py")
-                  (substitute* (string-append bin "quantize.py")
-                    (("os\\.getcwd\\(\\), quantize_script_binary")
-                     (string-append "\"" bin "\", quantize_script_binary"))))))
+                  (make-script "convert-lora-to-ggml")
+                  (make-script "convert"))))
             (add-after 'install-python-scripts 'wrap-python-scripts
               (assoc-ref python:%standard-phases 'wrap))
             (replace 'install
               (lambda _
-                (let ((bin (string-append #$output "/bin/")))
-                  (install-file "bin/quantize" bin)
-                  (copy-file "bin/main" (string-append bin "llama"))))))))
+                (copy-file "bin/main" (string-append #$output "/bin/llama")))))))
       (inputs (list python))
       (propagated-inputs
        (list python-numpy python-pytorch python-sentencepiece))
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index fb1ba35d21..75dc60744a 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -70,9 +70,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages mail)
-  #:use-module (guix gexp)
-  #:use-module (guix utils)
-  #:use-module (gnu packages)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages aspell)
   #:use-module (gnu packages autotools)
@@ -98,6 +96,7 @@
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages enchant)
   #:use-module (gnu packages file)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
@@ -105,15 +104,14 @@
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages glib)
-  #:use-module (gnu packages golang)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages golang)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages gsasl)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages guile-xyz)
-  #:use-module (gnu packages flex)
   #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages kerberos)
@@ -134,8 +132,8 @@
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages ninja)
-  #:use-module (gnu packages openldap)
   #:use-module (gnu packages onc-rpc)
+  #:use-module (gnu packages openldap)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
@@ -150,15 +148,15 @@
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages ragel)
-  #:use-module (gnu packages regex)
   #:use-module (gnu packages rdf)
   #:use-module (gnu packages readline)
+  #:use-module (gnu packages regex)
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages rust-apps)
-  #:use-module (gnu packages search)
-  #:use-module (gnu packages serialization)
   #:use-module (gnu packages samba)
   #:use-module (gnu packages screen)
+  #:use-module (gnu packages search)
+  #:use-module (gnu packages serialization)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tcl)
@@ -170,29 +168,30 @@
   #:use-module (gnu packages web)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xdisorg)
-  #:use-module (gnu packages xorg)
   #:use-module (gnu packages xml)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix deprecation)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix svn-download)
-  #:use-module (guix utils)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system emacs)
   #:use-module (guix build-system glib-or-gtk)
-  #:use-module (guix build-system go)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system guile)
-  #:use-module (guix build-system emacs)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
-  #:use-module (guix build-system python)
   #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
-  #:use-module (srfi srfi-1)
-  #:use-module (ice-9 match))
+  #:use-module (guix deprecation)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix svn-download)
+  #:use-module (guix utils)
+  #:use-module (guix utils)
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-1))
 
 (define-public abook
   (package
@@ -4552,7 +4551,7 @@ on RFC 3501 and original @code{imaplib} module.")
 (define-public rspamd
   (package
     (name "rspamd")
-    (version "3.5")
+    (version "3.6")
     (source
      (origin
        (method git-fetch)
@@ -4560,24 +4559,24 @@ on RFC 3501 and original @code{imaplib} module.")
              (url "https://github.com/rspamd/rspamd")
              (commit version)))
        (sha256
-        (base32 "1d45vhs66r6ig5mvmx52i7c2b638y2zc7wgv3lx0pq7dqgjxxsyz"))
+        (base32 "1ra18c3wczbdqrg9p69k04smjskjkdpxcfff9ff4yi7pmqjaxr8s"))
        (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (arguments
      '(#:configure-flags '("-DENABLE_LUAJIT=ON"
                            "-DLOCAL_CONFDIR=/etc/rspamd")))
     (inputs
-     (list openssl
+     (list file
            glib
-           ragel
-           luajit
-           sqlite
-           file
            icu4c
+           libsodium
+           luajit
+           openssl
            pcre2
-           zlib
            perl
-           libsodium))
+           ragel
+           sqlite
+           zlib))
     (native-inputs
      (list pkg-config))
     (synopsis "Spam filtering system")
diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm
index 0aa88d3518..c1237b2a55 100644
--- a/gnu/packages/mastodon.scm
+++ b/gnu/packages/mastodon.scm
@@ -87,7 +87,7 @@ Features include:
 (define-public tuba
   (package
     (name "tuba")
-    (version "0.3.2")
+    (version "0.4.1")
     (source
      (origin
        (method git-fetch)
@@ -96,7 +96,7 @@ Features include:
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1xhyz6wi17g4m76lr6qc75q4xnnw7c3dh3d04dg8m5gzk6j0y89x"))))
+        (base32 "0v2ihp1dkp13jklp3kysv4blflhx3w0hwcyink4mb7hwsaqy0xnm"))))
     (build-system meson-build-system)
     (arguments
       (list
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 420f1894f3..d43f616e38 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1552,26 +1552,6 @@ extremely large and complex data collections.")
         (base32 "14gih7kmjx4h3lc7pg4fwcl28hf1qqkf2x7rljpxqvzkjrqbxi00"))
        (patches (search-patches "hdf5-config-date.patch"))))))
 
-(define-public hdf5-1.12
-  (package
-    (inherit hdf5-1.8)
-    (version "1.12.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (list (string-append "https://support.hdfgroup.org/ftp/HDF5/releases/"
-                                 "hdf5-" (version-major+minor version)
-                                 "/hdf5-" version "/src/hdf5-"
-                                 version ".tar.bz2")
-                  (string-append "https://support.hdfgroup.org/ftp/HDF5/"
-                                 "current"
-                                 (apply string-append
-                                        (take (string-split version #\.) 2))
-                                 "/src/hdf5-" version ".tar.bz2")))
-       (sha256
-        (base32 "1zlawdzb0gsvcxif14fwr5ap2gk4b6j02wirr2hcx8hkcbivp20s"))
-       (patches (search-patches "hdf5-config-date.patch"))))))
-
 (define-public hdf5-1.14
   (package
     (inherit hdf5-1.8)
@@ -2599,78 +2579,81 @@ fixed point (16.16) format.")
       (license license:expat))))
 
 (define-public libflame
-  (package
-    (name "libflame")
-    (version "5.2.0")
-    (outputs '("out" "static"))
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/flame/libflame")
-               (commit version)))
-        (file-name (git-file-name name version))
-        (sha256
-         (base32
-          "1n6lf0wvpp77lxqlr721h2jbfbzigphdp19wq8ajiccilcksh7ay"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list #:configure-flags
-           ;; Sensible defaults: https://github.com/flame/libflame/issues/28
-           #~(list "--enable-dynamic-build"
-                   "--enable-max-arg-list-hack"
-                   "--enable-lapack2flame"
-                   "--enable-verbose-make-output"
-                   "--enable-multithreading=pthreads" ; Openblas isn't built with openmp.
-                   #$@(if (target-x86?)
-                          #~("--enable-vector-intrinsics=sse")
-                          #~())
-                   "--enable-supermatrix"
-                   "--enable-memory-alignment=16"
-                   "--enable-ldim-alignment")
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'patch-/usr/bin/env-bash
-                 (lambda _
-                   (substitute* "build/config.mk.in"
-                     (("/usr/bin/env bash")
-                      (which "bash")))))
-               (replace 'check
-                 (lambda* (#:key tests? #:allow-other-keys)
-                   (substitute* "test/Makefile"
-                     (("LIBBLAS .*")
-                      "LIBBLAS = -lblas\n")
-                     (("LIBLAPACK .*")
-                      "LIBLAPACK = -llapack\n"))
-                   (when tests?
-                     (with-directory-excursion "test"
-                       (mkdir "obj")
-                       (invoke "make")
-                       (invoke "./test_libflame.x")))))
-               (add-after 'install 'install-static
-                 (lambda* (#:key outputs #:allow-other-keys)
-                   (let ((out (assoc-ref outputs "out"))
-                         (static (assoc-ref outputs "static")))
-                     (mkdir-p (string-append static "/lib"))
-                     (rename-file (string-append out
-                                                 "/lib/libflame.a")
-                                  (string-append static
-                                                 "/lib/libflame.a"))
-                     (install-file (string-append out
-                                                  "/include/FLAME.h")
-                                   (string-append static "/include"))))))))
-    (inputs (list gfortran))
-    (native-inputs (list lapack perl python-wrapper))
-    (home-page "https://github.com/flame/libflame")
-    (synopsis "High-performance library for @acronym{DLA, dense linear algebra} computations")
-    (description "@code{libflame} is a portable library for dense matrix
+  ;; The latest release (5.2.0) dates back to 2019.  Use a newer one, which
+  ;; among other things provides extra LAPACK symbols, such as 'dgemlq_'
+  ;; (needed by LAPACKe).
+  (let ((commit "70c19e770ead0ae846c59b59216deb16d236b40c")
+        (revision "0"))
+    (package
+      (name "libflame")
+      (version (git-version "5.2.0" revision commit))
+      (outputs '("out" "static"))
+      (home-page "https://github.com/flame/libflame")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference (url home-page) (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0rk8ln5p4yybsws6p60w0vkxbqp53jddv90brlgf60mk6lv51sxl"))))
+      (build-system gnu-build-system)
+      (arguments
+       (list #:configure-flags
+             ;; Sensible defaults: https://github.com/flame/libflame/issues/28
+             #~(list "--enable-dynamic-build"
+                     "--enable-max-arg-list-hack"
+                     "--enable-lapack2flame"
+                     "--enable-verbose-make-output"
+                     "--enable-multithreading=pthreads" ; Openblas isn't built with openmp.
+                     #$@(if (target-x86?)
+                            #~("--enable-vector-intrinsics=sse")
+                            #~())
+                     "--enable-supermatrix"
+                     "--enable-memory-alignment=16"
+                     "--enable-ldim-alignment")
+             #:make-flags #~(list "FC=gfortran -fPIC")
+             #:phases
+             #~(modify-phases %standard-phases
+                 (add-after 'unpack 'patch-/usr/bin/env-bash
+                   (lambda _
+                     (substitute* "build/config.mk.in"
+                       (("/usr/bin/env bash")
+                        (which "bash")))))
+                 (replace 'check
+                   (lambda* (#:key tests? #:allow-other-keys)
+                     (substitute* "test/Makefile"
+                       (("LIBBLAS .*")
+                        "LIBBLAS = -lblas\n")
+                       (("LIBLAPACK .*")
+                        "LIBLAPACK = -llapack\n"))
+                     (when tests?
+                       (with-directory-excursion "test"
+                         (mkdir "obj")
+                         (invoke "make")
+                         (invoke "./test_libflame.x")))))
+                 (add-after 'install 'install-static
+                   (lambda* (#:key outputs #:allow-other-keys)
+                     (let ((out (assoc-ref outputs "out"))
+                           (static (assoc-ref outputs "static")))
+                       (mkdir-p (string-append static "/lib"))
+                       (rename-file (string-append out
+                                                   "/lib/libflame.a")
+                                    (string-append static
+                                                   "/lib/libflame.a"))
+                       (install-file (string-append out
+                                                    "/include/FLAME.h")
+                                     (string-append static "/include"))))))))
+      (inputs (list gfortran))
+      (native-inputs (list lapack perl python-wrapper))
+      (synopsis "High-performance library for @acronym{DLA, dense linear algebra} computations")
+      (description "@code{libflame} is a portable library for dense matrix
 computations, providing much of the functionality present in LAPACK, developed
 by current and former members of the @acronym{SHPC, Science of High-Performance
 Computing} group in the @url{https://www.ices.utexas.edu/, Institute for
 Computational Engineering and Sciences} at The University of Texas at Austin.
 @code{libflame} includes a compatibility layer, @code{lapack2flame}, which
 includes a complete LAPACK implementation.")
-    (license license:bsd-3)))
+      (license license:bsd-3))))
 
 (define-public scasp
   (let ((commit "89a427aa04ec6346425a40111c99b310901ffe51")
@@ -6555,17 +6538,15 @@ reduction.")
 (define-public mcrl2
   (package
     (name "mcrl2")
-    (version "202206.0")
+    (version "202206.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "https://www.mcrl2.org/download/release/mcrl2-"
                     version ".tar.gz"))
-              (patches (search-patches "mcrl2-fix-1687.patch"
-                                       "mcrl2-fix-counterexample.patch"))
               (sha256
                (base32
-                "0alpck09pbvwk4axqmrvcjmsabsn20yayq5b3apq284n0hcbf01q"))))
+                "1rbfyw47bi31qla1sa4fd1npryb5kbdr0vijmdc2gg1zhpqfv0ia"))))
     (inputs
      (list boost glu mesa qtbase-5))
     (build-system cmake-build-system)
@@ -8456,15 +8437,15 @@ computation is supported via MPI.")
 (define-public scilab
   (package
     (name "scilab")
-    (version "5.5.0")
+    (version "5.5.2")
     (source
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://oos.eu-west-2.outscale.com/scilab-releases/"
+        (string-append "https://www.scilab.org/download/"
                        version "/scilab-" version "-src.tar.gz"))
        (sha256
-        (base32 "1hx57aji5d78brwqcf8a34i1hasm3h4nw46xjg7cgxj09s8yz5kq"))))
+        (base32 "0phg9pn24yw98hbh475ik84dnikf1225b2knh7qbhdbdx6fm2d57"))))
     (build-system gnu-build-system)
     (native-inputs (list pkg-config gfortran))
     (inputs (list libxml2
@@ -8548,6 +8529,10 @@ computation is supported via MPI.")
                                   "__threadSignal InterpReady;" "\n"
                                   "__threadSignalLock InterpReadyLock;"
                                   "\n")))
+                ;; Fix CPP compilation errors.
+                (substitute* "modules/output_stream/src/cpp/diary_manager.cpp"
+                  (("if \\(array_size > 0\\)")
+                   "if (*array_size > 0)"))
                 ;; Set SCIHOME to /tmp before macros compilation.
                 (setenv "SCIHOME" "/tmp"))))))
     (home-page "https://scilab.org")
diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm
index 141295ed90..994f89f524 100644
--- a/gnu/packages/mc.scm
+++ b/gnu/packages/mc.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
-;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018–2021, 2023 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,6 +21,7 @@
 
 (define-module (gnu packages mc)
   #:use-module (gnu packages aspell)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages glib)
@@ -32,69 +33,82 @@
   #:use-module (gnu packages)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix licenses)
   #:use-module (guix packages))
 
 (define-public mc
   (package
     (name "mc")
-    (version "4.8.29")
+    (version "4.8.30")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "https://ftp.osuosl.org/pub/midnightcommander/mc-"
                           version ".tar.xz"))
       (sha256
-       (base32 "1m0aai4paxpcf3lw1dd94zyxc7wd0ysmfwpibg50q62q9yws7n01"))))
+       (base32 "1py7jm620lsas7rcv5j69608gdshmp25d9gx958hr5sb2jr3rg2y"))))
     (build-system gnu-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list "--with-screen=ncurses"
+              "--enable-aspell"
+              "--disable-configure-args" ; don't keep superfluous references
+              (string-append "PERL_FOR_BUILD=" ; to build .hlp files
+                             #$(this-package-native-input "perl") "/bin/perl")
+              (string-append "PERL="    ; for run-time helpers, mainly VFS
+                             #$(this-package-input "perl") "/bin/perl"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'patch-source-shebangs 'patch-file-names
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; The following commands are all invoked at run time.
+              (substitute*
+                  (list "lib/utilunix.c"
+                        "src/filemanager/ext.c"
+                        "src/usermenu.c"
+                        "src/vfs/fish/fish.c"
+                        ;; This file hard-codes other shells, but they're never
+                        ;; tried after mc's first choice (bash) is found.
+                        "lib/shell.c")
+                (("/bin/(ba|)sh" file)
+                 (search-input-file inputs file)))
+              (substitute* "src/filemanager/ext.c"
+                ;; Look up in $PATH at run time, rather than hard-coding now.
+                (("/bin/(rm)" command)
+                 command))
+              (substitute* "misc/mcedit.menu.in"
+                ;; These are script templates.  Don't embed store file names.
+                (("#! /bin/([[:alnum:]]*)" _ file)
+                 (string-append "#!/usr/bin/env " file)))
+
+              ;; The following commands are all invoked at build time.
+              (substitute* "tests/src/vfs/extfs/helpers-list/Makefile.in"
+                (("/bin/sh")
+                 (which "sh")))))
+          (add-before 'check 'fix-tests
+            (lambda _
+              ;; Don't expect a UID or GID of ‘0’ in the build environment.
+              (with-directory-excursion "tests/src/vfs/extfs/helpers-list/data"
+                (substitute* (list "rpm.custom.output"
+                                   "rpm.glib.output")
+                  (("      0        0") "<<uid>>  <<gid>>")))
+              ;; XXX ERROR:mc_realpath.c:99:realpath_test: assertion failed
+              ;; (resolved_path == data->expected_string): ("" == "/usr/bin")
+              (substitute* "tests/lib/mc_realpath.c"
+                (("/usr/bin") "/")
+                (("usr/bin") "/")))))))
     (native-inputs (list perl pkg-config))
     (inputs (list aspell
+                  bash-minimal
                   check
                   glib
                   gpm
                   libssh2
                   ncurses
+                  perl
                   unzip))
-    (arguments
-     `(#:configure-flags
-       '("--with-screen=ncurses" "--enable-aspell")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'patch-source-shebangs 'patch-FHS-file-names
-           (lambda _
-             ;; Patch files to refer to executables in the store or $PATH.
-             (substitute* "misc/mcedit.menu.in"
-               (("#! /bin/sh") (string-append "#!" (which "sh")))
-               (("/bin/bash") (which "bash")))
-             (substitute* "misc/ext.d/misc.sh.in"
-               (("/bin/cat") "cat"))
-             (substitute* (list "lib/utilunix.c"
-                                "src/usermenu.c"
-                                "src/vfs/fish/fish.c"
-                                "tests/src/vfs/extfs/helpers-list/Makefile.in")
-               (("/bin/sh") (which "sh")))
-             (substitute* "src/filemanager/ext.c"
-               (("/bin/rm") "rm")
-               (("/bin/sh") (which "sh")))
-
-             ;; There are other /bin/<shell>s hard-coded in this file, but they
-             ;; are never tried after bash (mc's first choice) is found.
-             (substitute* "lib/shell.c"
-               (("/bin/bash") (which "bash")))
-             #t))
-         (add-before 'check 'fix-tests
-           (lambda _
-             ;; Don't expect a UID or GID of ‘0’ in the build environment.
-             (with-directory-excursion "tests/src/vfs/extfs/helpers-list/data"
-               (substitute* (list "rpm.custom.output"
-                                  "rpm.glib.output")
-                 (("      0        0") "<<uid>>  <<gid>>")))
-             ;; XXX ERROR:mc_realpath.c:99:realpath_test: assertion failed
-             ;; (resolved_path == data->expected_string): ("" == "/usr/bin")
-             (substitute* "tests/lib/mc_realpath.c"
-               (("/usr/bin") "/")
-               (("usr/bin") "/"))
-             #t)))))
     (home-page "https://www.midnight-commander.org")
     (properties
       `((release-monitoring-url . "https://ftp.osuosl.org/pub/midnightcommander/")))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 00d8d29017..0b23ca8012 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1372,7 +1372,7 @@ Encryption to Gajim.")
            at-spi2-core
            bash-minimal
            cairo
-           librsvg
+           (librsvg-for-system)
            glib
            glib-networking
            gpgme
diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm
index 2b0b45457e..4eeefe1490 100644
--- a/gnu/packages/mingw.scm
+++ b/gnu/packages/mingw.scm
@@ -46,7 +46,7 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
     (package
       (name (string-append "mingw-w64" "-" machine
                            (if with-winpthreads? "-winpthreads" "")))
-      (version "11.0.0")
+      (version "11.0.1")
       (source
        (origin
          (method url-fetch)
@@ -54,7 +54,7 @@ specified, recurse and return a mingw-w64 with support for winpthreads."
                "mirror://sourceforge/mingw-w64/mingw-w64/"
                "mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
          (sha256
-          (base32 "0pycbxlqh8gj2zp3k531p0r4m7ay6f4nhs9sq9620c6q7dis23mx"))
+          (base32 "047f4m37kxf7g8qj23qplrzfd9cirfkkv8d175sfv2zfd7hbqriz"))
          (patches
           (search-patches "mingw-w64-6.0.0-gcc.patch"
                           "mingw-w64-dlltool-temp-prefix.patch"
@@ -144,7 +144,7 @@ several new APIs such as DirectX and DDK, and 64-bit support.")
 (define-public mingw-w64-tools
   (package
     (name "mingw-w64-tools")
-    (version "11.0.0")
+    (version "11.0.1")
     (source
      (origin
        (method url-fetch)
@@ -152,7 +152,7 @@ several new APIs such as DirectX and DDK, and 64-bit support.")
              "mirror://sourceforge/mingw-w64/mingw-w64/"
              "mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
        (sha256
-        (base32 "0pycbxlqh8gj2zp3k531p0r4m7ay6f4nhs9sq9620c6q7dis23mx"))))
+        (base32 "047f4m37kxf7g8qj23qplrzfd9cirfkkv8d175sfv2zfd7hbqriz"))))
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((guix build gnu-build-system)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index a399c1eab1..624febaa2a 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -615,7 +615,7 @@ mpdevil loads all tags and covers on demand.")
 (define-public mympd
   (package
     (name "mympd")
-    (version "11.0.2")
+    (version "11.0.4")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -624,7 +624,7 @@ mpdevil loads all tags and covers on demand.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0n6dyy6znzicm5v9mkcghm3lwi6zwysnpr0drvacqprr0r5l596a"))))
+                "0ki9az71x35548mnl5assb0hgli3bvrbzv0fb5dfli4q5i1z8fmq"))))
     (build-system cmake-build-system)
     (arguments
      (list
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 24da2574b6..8681bb1c10 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2015-2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
-;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2019, 2021-2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2018, 2021 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016, 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
 ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
@@ -752,7 +752,7 @@ many input formats and provides a customisable Vi-style user interface.")
            gtk+
            gtksourceview-3
            guile-2.0
-           librsvg
+           (librsvg-for-system)
            libsndfile
            libxml2
            lilypond
@@ -7223,7 +7223,7 @@ streaming audio server.")
            gtksourceview-4 ; undo, redo, multiline text fields
            hicolor-icon-theme
            keybinder-3.0 ; keybindings outside of GNOME
-           librsvg
+           (librsvg-for-system)
            libsoup-minimal-2
            python
            python-cheetah
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 82987d5f9c..04461fec2d 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -14,7 +14,7 @@
 ;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2017, 2020, 2021 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2017-2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017-2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2017, 2019 Gábor Boskovits <boskovits@gmail.com>
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
@@ -959,7 +959,7 @@ systems with no further dependencies.")
     (inputs
      (list bluez
            dbus
-           librsvg
+           (librsvg-for-system)
            glib
            gtk+
            iproute
@@ -4615,6 +4615,42 @@ that vnStat won't actually be sniffing any traffic and also ensures light use
 of system resources regardless of network traffic rate.")
    (license license:gpl2+)))
 
+(define-public dnstracer
+  (package
+    (name "dnstracer")
+    (version "1.10")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.mavetju.org/download/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "089bmrjnmsga2n0r4xgw4bwbf41xdqsnmabjxhw8lngg2pns1kb4"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list #:tests? #f                  ;no test suite
+           #:make-flags #~(list (string-append "PREFIX=" #$output)
+                                (string-append "CC=" #$(cc-for-target)))
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'patch-makefile
+                          (lambda _
+                            (substitute* "Makefile"
+                              (("\\$\\{PREFIX}/man")
+                               "${PREFIX}/share/man")
+                              (("^install:.*" all)
+                               (string-append
+                                all
+                                "\tinstall -d ${BINPREFIX}\n"
+                                "\tinstall -d ${MANPREFIX}\n")))))
+                        (delete 'configure))))
+    (native-inputs (list perl))         ;for pod2man
+    (home-page "http://www.mavetju.org/unix/dnstracer.php")
+    (synopsis "Trace a chain of DNS servers to the source")
+    (description "@command{dnstracer} determines where a given Domain Name
+Server (DNS) gets its information from, and follows the chain of DNS servers
+back to the servers which know the data.")
+    (license license:bsd-2)))
+
 (define-public dropwatch
   (package
     (name "dropwatch")
diff --git a/gnu/packages/noweb.scm b/gnu/packages/noweb.scm
index d218d8cc68..762db02fc2 100644
--- a/gnu/packages/noweb.scm
+++ b/gnu/packages/noweb.scm
@@ -18,6 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages noweb)
+  #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
@@ -27,7 +28,7 @@
 (define-public noweb
   (package
     (name "noweb")
-    (version "2.12")
+    (version "2.13")
     (source
      (origin
        (method git-fetch)
@@ -37,63 +38,62 @@
                                                      "_")))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"))))
+        (base32 "0fwngh7zl9mrjz966pskhi4zvk26j6vsm85x99df9194nv51drq8"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'bind-early
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin")))
-               (substitute* (list "src/lib/nwmtime"
-                                  "src/shell/htmltoc")
-                 (("exec perl ")
-                  (format #f "exec ~a " (which "perl"))))
-               (substitute* "src/shell/noweb"
-                 ((" cpif ")
-                  (format #f " ~a/cpif " bin)))
-               #t)))
-         (add-before 'install 'pre-install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (mkdir-p (string-append out "/share/texmf/tex/latex"))
-               #t)))
-         (add-after 'install 'post-install
-           (lambda* (#:key outputs inputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out"))
-                   (cu  (assoc-ref inputs "coreutils"))
-                   (du  (assoc-ref inputs "diffutils")))
-               (with-directory-excursion out
-                 (for-each (lambda (prog)
-                             (substitute* prog
-                               (("nawk") (which "awk"))))
-                           (append (map (lambda (x)
-                                          (string-append "bin/" x))
-                                        '("noweb" "nountangle"
-                                          "noroots" "noroff"
-                                          "noindex"))
-                                   (map (lambda (x)
-                                          (string-append "lib/" x))
-                                        '("btdefn" "emptydefn" "noidx"
-                                          "pipedocs" "toascii" "tohtml"
-                                          "toroff" "totex" "unmarkup"))))
-                 (substitute* "bin/cpif"
-                   (("^PATH=.*$")
-                    (string-append "PATH=" cu "/bin:" du "/bin\n"))))
-               #t)))
-         (replace 'configure
-           (lambda _
-             ;; Jump in the source.
-             (chdir "src")
-             #t)))
-       #:make-flags (let ((out (assoc-ref %outputs "out")))
-                      (list (string-append "BIN=" out "/bin")
-                            (string-append "LIB=" out "/lib")
-                            (string-append "MAN=" out "/share/man")
-                            (string-append "TEXINPUTS=" out
-                                           "/share/texmf/tex/latex")))
-       #:tests? #f))                              ; no tests
+     (list
+      #:make-flags
+      #~(list (string-append "BIN=" #$output "/bin")
+              (string-append "LIB=" #$output "/lib")
+              (string-append "MAN=" #$output "/share/man")
+              (string-append "TEXINPUTS=" #$output
+                             "/share/texmf/tex/latex"))
+      #:modules
+      '((guix build gnu-build-system)
+        (guix build utils)
+        (srfi srfi-26))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'enter-source-directory
+            (lambda _
+              (chdir "src")))
+          (add-after 'enter-source-directory 'bind-early
+            (lambda _
+              (substitute* (list "lib/nwmtime"
+                                 "shell/htmltoc")
+                (("exec perl ")
+                 (string-append "exec " (which "perl") " ")))
+              (substitute* "shell/noweb"
+                ((" cpif ")
+                 (string-append " " #$output "/bin/cpif ")))))
+          (delete 'configure)           ; no configure script
+          (add-before 'install 'create-latex-directory
+            (lambda _
+              (mkdir-p (string-append #$output "/share/texmf/tex/latex"))))
+          (add-after 'install 'refer-to-inputs
+            (lambda* (#:key inputs #:allow-other-keys)
+              (with-directory-excursion #$output
+                (for-each (lambda (program)
+                            (substitute* program
+                              (("nawk")
+                               (search-input-file inputs "bin/awk"))))
+                          (append (map (cut string-append "bin/" <>)
+                                       '("noweb" "nountangle"
+                                         "noroots" "noroff"
+                                         "noindex"))
+                                  (map (cut string-append "lib/" <>)
+                                       '("btdefn" "emptydefn" "noidx"
+                                         "pipedocs" "toascii" "tohtml"
+                                         "toroff" "totex" "unmarkup"))))
+                (substitute* "bin/cpif"
+                  (("^PATH=.*$")
+                   (string-append "PATH="
+                                  (dirname (search-input-file
+                                            inputs"bin/basename")) ":"
+                                  (dirname (search-input-file
+                                            inputs "bin/cmp"))
+                                  "\n")))))))
+      #:tests? #f))                              ; no tests
     (inputs
      (list perl))
     (home-page "https://www.cs.tufts.edu/~nr/noweb/")
diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm
index 4ab8ab6631..3b56580842 100644
--- a/gnu/packages/ntp.scm
+++ b/gnu/packages/ntp.scm
@@ -47,38 +47,41 @@
 (define-public chrony
   (package
     (name "chrony")
-    (version "4.3")
+    (version "4.4")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://download.tuxfamily.org/chrony/"
                            "chrony-" version ".tar.gz"))
        (sha256
-        (base32 "0148bgzymdigkjs66fihrqw98g1yf6vgy40nlajqkw35m24sh3cx"))))
+        (base32 "123h2a9rpc6wbvnysvhl5pmckvynzrnqay7l00i18azrvbk0gyza"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:modules ((srfi srfi-26)
-                  (guix build utils)
-                  (guix build gnu-build-system))
-       #:configure-flags
-       (list "--enable-scfilter"
-             "--with-sendmail=sendmail"
-             "--with-user=chrony")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'stay-inside-out
-           ;; Simply setting CHRONYVARDIR to something nonsensical at install
-           ;; time would result in nonsense file names in man pages.
-           (lambda _
-             (substitute* "Makefile.in"
-               (("mkdir -p \\$\\(DESTDIR\\)\\$\\(CHRONYVARDIR\\)") ":"))))
-         (add-after 'install 'install-more-documentation
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (doc (string-append out "/share/doc/" ,name "-" ,version)))
-               (for-each (cut install-file <> doc)
-                         (list "README" "FAQ"))
-               (copy-recursively "examples" (string-append doc "/examples"))))))))
+     (list
+      #:modules
+      '((srfi srfi-26)
+        (guix build utils)
+        (guix build gnu-build-system))
+      #:configure-flags
+      #~(list "--enable-scfilter"
+              "--with-sendmail=sendmail"
+              "--with-user=chrony")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'stay-inside-out
+            ;; Simply setting CHRONYVARDIR to something nonsensical at install
+            ;; time would result in nonsense file names in man pages.
+            (lambda _
+              (substitute* "Makefile.in"
+                (("mkdir -p \\$\\(DESTDIR\\)\\$\\(CHRONYVARDIR\\)") ":"))))
+          (add-after 'install 'install-more-documentation
+            (lambda _
+              (let* ((doc (string-append #$output "/share/doc/"
+                                         #$name "-" #$version)))
+                (for-each (cut install-file <> doc)
+                          (list "README" "FAQ"))
+                (copy-recursively "examples"
+                                  (string-append doc "/examples"))))))))
     (native-inputs
      (list pkg-config))
     (inputs
diff --git a/gnu/packages/openbox.scm b/gnu/packages/openbox.scm
index 2dac9ec644..38afb9d9a0 100644
--- a/gnu/packages/openbox.scm
+++ b/gnu/packages/openbox.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Nikita <nikita@n0.is>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
@@ -102,7 +102,7 @@ implementations.")
        ("openbox" ,openbox)
        ("startup-notification" ,startup-notification)
        ("libsm" ,libsm)
-       ("librsvg" ,librsvg)
+       ("librsvg" ,(librsvg-for-system))
        ("libxft" ,libxft)))
     (native-inputs
      `(("gettext" ,gettext-minimal)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 17eba3da20..791b2d7df6 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -174,8 +174,8 @@
   ;; Note: the 'update-guix-package.scm' script expects this definition to
   ;; start precisely like this.
   (let ((version "1.4.0")
-        (commit "44bbfc24e4bcc48d0e3343cd3d83452721af8c36")
-        (revision 7))
+        (commit "4dfdd822102690b5687acf28365ab707b68d9476")
+        (revision 10))
     (package
       (name "guix")
 
@@ -191,7 +191,7 @@
                       (commit commit)))
                 (sha256
                  (base32
-                  "08gq04pphapr3i0gzdilp8l87rpxlh2p768qrn1fw92fmw727xf7"))
+                  "1p21gz2lr7iqvma1m83k2r04w201rzvk31d5kfn2qkr9l0gds4cx"))
                 (file-name (string-append "guix-" version "-checkout"))))
       (build-system gnu-build-system)
       (arguments
@@ -263,6 +263,46 @@ $(prefix)/etc/openrc\n")))
                               (substitute* "tests/gexp.scm"
                                 (("2\\.0") "3.0")))))
                         '())
+                    ,@(if (system-hurd?)
+                          `((add-after 'unpack 'disable-tests/hurd
+                              (lambda _
+                                (substitute* "Makefile.am"
+                                  (("tests/derivations.scm") "")
+                                  (("tests/grafts.scm") "")
+                                  (("tests/graph.scm") "")
+                                  (("tests/lint.scm") "")
+                                  (("tests/nar.scm") "")
+                                  (("tests/offload.scm") "")
+                                  (("tests/pack.scm") "")
+                                  (("tests/packages.scm") "")
+                                  (("tests/processes.scm") "")
+                                  (("tests/publish.scm") "")
+                                  (("tests/pypi.scm") "")
+                                  (("tests/size.scm") "")
+                                  (("tests/store.scm") "")
+                                  (("tests/substitute.scm") "")
+                                  (("tests/syscalls.scm") "")
+                                  (("tests/union.scm") "")
+                                  (("tests/guix-build.sh") "")
+                                  (("tests/guix-build-branch.sh") "")
+                                  (("tests/guix-hash.sh") "")
+                                  (("tests/guix-locate.sh") "")
+                                  (("tests/guix-pack.sh") "")
+                                  (("tests/guix-pack-relocatable.sh") "")
+                                  (("tests/guix-package-aliases.sh") "")
+                                  (("tests/guix-package-net.sh") "")
+                                  (("tests/guix-home.sh") "")
+                                  (("tests/guix-archive.sh") "")
+                                  (("tests/guix-environment.sh") "")
+                                  (("tests/guix-package.sh") "")
+                                  (("tests/guix-refresh.sh") "")
+                                  (("tests/guix-shell.sh") "")
+                                  (("tests/guix-shell-export-manifest.sh") "")
+                                  (("tests/guix-system.sh") "")
+                                  (("tests/guix-graph.sh") "")
+                                  (("tests/guix-gc.sh") "")
+                                  (("tests/guix-daemon.sh") "")))))
+                        '())
                     (add-before 'build 'use-host-compressors
                       (lambda* (#:key inputs target #:allow-other-keys)
                         (when target
diff --git a/gnu/packages/patches/akonadi-not-relocatable.patch b/gnu/packages/patches/akonadi-not-relocatable.patch
index bd4cbee79f..04c2a36b5f 100644
--- a/gnu/packages/patches/akonadi-not-relocatable.patch
+++ b/gnu/packages/patches/akonadi-not-relocatable.patch
@@ -22,10 +22,10 @@ index 4e8cc81..63161b7 100644
  )
 
  install(FILES
-diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
+diff --git a/KPimAkonadiConfig.cmake.in b/KPimAkonadiConfig.cmake.in
 index bcf7320..1574319 100644
---- a/KF5AkonadiConfig.cmake.in
-+++ b/KF5AkonadiConfig.cmake.in
+--- a/KPimAkonadiConfig.cmake.in
++++ b/KPimAkonadiConfig.cmake.in
 @@ -1,10 +1,10 @@
  @PACKAGE_INIT@
 
diff --git a/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch b/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch
index b08ca5eac0..7743863cf8 100644
--- a/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch
+++ b/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch
@@ -4,13 +4,11 @@ locating the bloomberg-bde-tools CMake modules.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1,8 +1,6 @@
- cmake_minimum_required(VERSION 3.15)
+@@ -14,6 +14,7 @@ else()
+     if (NOT CMAKE_MODULE_PATH)
+         message(FATAL "Please specify path to BDE cmake modules.")
+     endif()
++    string(REPLACE ":" "cmake/;" CMAKE_MODULE_PATH "$ENV{CMAKE_PREFIX_PATH}cmake/")
  
--if (NOT CMAKE_MODULE_PATH)
--    message(FATAL "Please specify path to BDE cmake modules.")
--endif()
-+string(REPLACE ":" "cmake/;" CMAKE_MODULE_PATH "$ENV{CMAKE_PREFIX_PATH}cmake/")
- 
- get_filename_component(repoName ${CMAKE_CURRENT_LIST_DIR} NAME)
+     include(bde_workspace)
  
diff --git a/gnu/packages/patches/ddclient-skip-test.patch b/gnu/packages/patches/ddclient-skip-test.patch
deleted file mode 100644
index 28d748997b..0000000000
--- a/gnu/packages/patches/ddclient-skip-test.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e5657802025f238b39581534f3b4d408565c8943 Mon Sep 17 00:00:00 2001
-From: Bruno Victal <mirai@makinata.eu>
-Date: Sun, 5 Feb 2023 21:05:00 +0000
-Subject: [PATCH] Disable sandbox incompatible tests.
-
-See: https://github.com/ddclient/ddclient/issues/465
----
- t/get_ip_from_if.pl | 21 ---------------------
- 1 file changed, 21 deletions(-)
-
-diff --git a/t/get_ip_from_if.pl b/t/get_ip_from_if.pl
-index 6f08e5d..d78c3d0 100644
---- a/t/get_ip_from_if.pl
-+++ b/t/get_ip_from_if.pl
-@@ -39,25 +39,4 @@ subtest "get_ip_from_interface tests" => sub {
-     }
- };
- 
--subtest "Get default interface and IP for test system" => sub {
--    my $interface = ddclient::get_default_interface(4);
--    if ($interface) {
--        isnt($interface, "lo", "Check for loopback 'lo'");
--        isnt($interface, "lo0", "Check for loopback 'lo0'");
--        my $ip1 = ddclient::get_ip_from_interface("default", 4);
--        my $ip2 = ddclient::get_ip_from_interface($interface, 4);
--        is($ip1, $ip2, "Check IPv4 from default interface");
--        ok(ddclient::is_ipv4($ip1), "Valid IPv4 from get_ip_from_interface($interface)");
--    }
--    $interface = ddclient::get_default_interface(6);
--    if ($interface) {
--        isnt($interface, "lo", "Check for loopback 'lo'");
--        isnt($interface, "lo0", "Check for loopback 'lo0'");
--        my $ip1 = ddclient::get_ip_from_interface("default", 6);
--        my $ip2 = ddclient::get_ip_from_interface($interface, 6);
--        is($ip1, $ip2, "Check IPv6 from default interface");
--        ok(ddclient::is_ipv6($ip1), "Valid IPv6 from get_ip_from_interface($interface)");
--    }
--};
--
- done_testing();
--- 
-2.38.1
-
diff --git a/gnu/packages/patches/elogind-fix-rpath.patch b/gnu/packages/patches/elogind-fix-rpath.patch
new file mode 100644
index 0000000000..2a76cc467f
--- /dev/null
+++ b/gnu/packages/patches/elogind-fix-rpath.patch
@@ -0,0 +1,60 @@
+Retrieved from https://github.com/elogind/elogind/issues/258
+
+From: Mark Hindley <mark@hindley.org.uk>
+Date: Wed, 24 May 2023 10:39:41 +0100
+Subject: Fixup_executable_rpath
+
+./meson.build sets
+
+ install_rpath : rootlibexecdir
+
+however src/shared/meson.build sets
+
+libshared = shared_library(
+          [snip]
+        install_dir : rootpkglibdir
+        )
+---
+ meson.build | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 694a2fd..a575f69 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2903,7 +2903,7 @@ executable('elogind',
+                 dependencies : [threads,
+                                 libacl,
+                                 libudev],
+-                install_rpath : rootlibexecdir,
++                install_rpath : rootpkglibdir,
+                 install : true,
+                 install_dir : rootlibexecdir)
+ 
+@@ -2913,7 +2913,7 @@ exe = executable('loginctl',
+                         link_with : [libshared],
+                         dependencies : [threads,
+                                         libudev],
+-                        install_rpath : rootlibexecdir,
++                        install_rpath : rootpkglibdir,
+                         install : true,
+                         install_dir : rootbindir)
+ public_programs += [exe]
+@@ -2923,7 +2923,7 @@ exe = executable('elogind-inhibit',
+                         include_directories : includes,
+                         link_with : [libshared],
+                         dependencies : [threads],
+-                        install_rpath : rootlibexecdir,
++                        install_rpath : rootpkglibdir,
+                         install : true,
+                         install_dir : rootbindir)
+ public_programs += [exe]
+@@ -4283,7 +4283,7 @@ executable('elogind-uaccess-command',
+                         libshared],
+            dependencies: [libacl,
+                           libudev],
+-           install_rpath : rootlibexecdir,
++           install_rpath : rootpkglibdir,
+            install : true,
+            install_dir : rootlibexecdir)
+ #endif // 0
diff --git a/gnu/packages/patches/elogind-revert-polkit-detection.patch b/gnu/packages/patches/elogind-revert-polkit-detection.patch
deleted file mode 100644
index 43dd1684b6..0000000000
--- a/gnu/packages/patches/elogind-revert-polkit-detection.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 715ce0a6459e418f92e74c7ce52df3244c18f383 Mon Sep 17 00:00:00 2001
-From: Sven Eden <sven.eden@prydeworx.com>
-Date: Mon, 8 Mar 2021 08:40:08 +0100
-Subject: [PATCH] Revert "Disable polkit support if libpolkit is not installed"
-
-This reverts commit 1194dec4f8f2d1b8bd14e1625f34418ecfce817e.
-
-Removing polkit support with -Dpolkit=auto when libpolkit is not
-installed, removes the whole interface. This makes it impossible to
-add polkit support as a runtime dependency.
-
-Bug: #167
-Closes: #206
-Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
----
- meson.build | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 2dd05db3c..f38551f55 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1157,15 +1157,6 @@ if want_polkit != 'false' and not skip_deps
-                 message('Old polkit detected, will install pkla files')
-                 install_polkit_pkla = true
-         endif
--#if 1 /// Disable polkit completely if libpolkit is not there. See elogind issue #167
--        if not libpolkit.found()
--                if want_polkit != 'auto'
--                        error('Polkit requested but libpolkit was not found.')
--                endif
--                install_polkit = false
--                want_polkit    = false
--        endif
--#endif // 1
- endif
- conf.set10('ENABLE_POLKIT', install_polkit)
- 
--- 
-2.33.1
-
diff --git a/gnu/packages/patches/fbreader-fix-icon.patch b/gnu/packages/patches/fbreader-fix-icon.patch
new file mode 100644
index 0000000000..635abf6a43
--- /dev/null
+++ b/gnu/packages/patches/fbreader-fix-icon.patch
@@ -0,0 +1,29 @@
+Author: Danny Milosavljevic <dannym+a@scratchpost.org>
+Date: 2023-08-15
+
+--- orig/jswba9mn9nh43l7g4w2qslmr7i3q64vy-fbreader-0.99.6-checkout/fbreader/desktop/desktop	2023-08-14 23:56:03.092567740 +0200
++++ jswba9mn9nh43l7g4w2qslmr7i3q64vy-fbreader-0.99.6-checkout/fbreader/desktop/desktop	2023-08-14 23:56:59.936213278 +0200
+@@ -25,5 +25,5 @@
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Icon=FBReader.png
++Icon=FBReader
+ Categories=Office;Viewer;Literature;
+--- orig/jswba9mn9nh43l7g4w2qslmr7i3q64vy-fbreader-0.99.6-checkout/fbreader/desktop/Makefile	2023-08-14 23:56:03.092567740 +0200
++++ jswba9mn9nh43l7g4w2qslmr7i3q64vy-fbreader-0.99.6-checkout/fbreader/desktop/Makefile	2023-08-15 00:23:19.046691430 +0200
+@@ -10,6 +10,14 @@
+ 	@install -m 0644 desktop $(DESTDIR)/usr/share/applications/$(TARGET).desktop
+ 	@install -d $(DESTDIR)$(IMAGEDIR)
+ 	@install -m 0644 ../data/icons/application/$(TARGET_ARCH).png $(DESTDIR)$(IMAGEDIR)/FBReader.png
++	@install -d $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps
++	@install -m 0644 ../data/icons/application/16x16.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/FBReader.png
++	@install -d $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps
++	@install -m 0644 ../data/icons/application/32x32.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/FBReader.png
++	@install -d $(DESTDIR)$(SHAREDIR)/icons/hicolor/48x48/apps
++	@install -m 0644 ../data/icons/application/48x48.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/48x48/apps/FBReader.png
++	@install -d $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps
++	@install -m 0644 ../data/icons/application/64x64.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/FBReader.png
+ 	@install -m 0644 ../data/default/config.desktop.xml $(SHARE_FBREADER)/default/config.xml
+ 	@install -m 0644 ../data/default/keymap.desktop.xml $(SHARE_FBREADER)/default/keymap.xml
+ 	@install -m 0644 ../data/default/styles.desktop.xml $(SHARE_FBREADER)/default/styles.xml
diff --git a/gnu/packages/patches/fluxbox-1.3.7-gcc.patch b/gnu/packages/patches/fluxbox-1.3.7-gcc.patch
new file mode 100644
index 0000000000..0c805251ac
--- /dev/null
+++ b/gnu/packages/patches/fluxbox-1.3.7-gcc.patch
@@ -0,0 +1,16 @@
+Author: Danny Milosavljevic <dannym@scratchpost.org>
+Date: 2023-06-12
+License: expat
+
+diff -ur orig/fluxbox-1.3.7/util/fluxbox-remote.cc fluxbox-1.3.7/util/fluxbox-remote.cc
+--- orig/fluxbox-1.3.7/util/fluxbox-remote.cc	1970-01-01 01:00:01.000000000 +0100
++++ fluxbox-1.3.7/util/fluxbox-remote.cc	2023-05-01 01:11:52.225547895 +0200
+@@ -73,7 +73,7 @@
+     if (strcmp(cmd, "result") == 0) {
+         XTextProperty text_prop;
+         if (XGetTextProperty(disp, root, &text_prop, atom_result) != 0
+-            && text_prop.value > 0
++            && text_prop.value != NULL
+             && text_prop.nitems > 0) {
+ 
+             printf("%s", text_prop.value);
diff --git a/gnu/packages/patches/grantlee-fix-i586-precision.patch b/gnu/packages/patches/grantlee-fix-i586-precision.patch
new file mode 100644
index 0000000000..f3d4384b5b
--- /dev/null
+++ b/gnu/packages/patches/grantlee-fix-i586-precision.patch
@@ -0,0 +1,40 @@
+From 13094b78a790786030a468453c2b3ead4c7fd9cf Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Sun, 13 Nov 2022 14:01:21 +0100
+Subject: [PATCH] Fix formatting of some larger file sizes on 32bit x86
+
+With the x87 FPU available, GCC uses long double precision for some variables.
+Due to the function call passing a double, some comparisons break down.
+That resulted in "1.00 YB" being printed as "1000.00 ZB" instead.
+
+Fixes #85
+---
+ templates/lib/util.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/templates/lib/util.cpp b/templates/lib/util.cpp
+index 504674a7..a0381c59 100644
+--- a/templates/lib/util.cpp
++++ b/templates/lib/util.cpp
+@@ -23,6 +23,7 @@
+ #include "metaenumvariable_p.h"
+ #include "metatype.h"
+
++#include <cfloat>
+ #include <QtCore/QStringList>
+
+ QString Grantlee::unescapeStringLiteral(const QString &input)
+@@ -212,7 +213,13 @@ std::pair<qreal, QString> Grantlee::calcFileSize(qreal size, int unitSystem,
+   bool found = false;
+   int count = 0;
+   const qreal baseVal = (_unitSystem == 10) ? 1000.0F : 1024.0F;
++#if FLT_EVAL_METHOD == 2
++  // Avoid that this is treated as long double, as the increased
++  // precision breaks the comparison below.
++  volatile qreal current = 1.0F;
++#else
+   qreal current = 1.0F;
++#endif
+   int units = decimalUnits.size();
+   while (!found && (count < units)) {
+     current *= baseVal;
diff --git a/gnu/packages/patches/highlight-gui-data-dir.patch b/gnu/packages/patches/highlight-gui-data-dir.patch
new file mode 100644
index 0000000000..33f40d309c
--- /dev/null
+++ b/gnu/packages/patches/highlight-gui-data-dir.patch
@@ -0,0 +1,51 @@
+This patch distinguishes between the data directory path for GUI and the one
+for non-GUI by allowing to set the former path.
+
+highlight package has two outputs: out and gui.  Both outputs have files which
+will be in the same directory /share/highlight/ without this patch (see also
+install and install-gui tasks in makefile).  In the gui's data directory,
+there are GUI specific files in /share/highlight/gui-files/{l10n,ext}/.
+
+diff --git a/src/gui-qt/main.cpp b/src/gui-qt/main.cpp
+index 4700dc1..3567745 100644
+--- a/src/gui-qt/main.cpp
++++ b/src/gui-qt/main.cpp
+@@ -47,8 +47,8 @@ int main(int argc, char *argv[])
+ {
+     QApplication app(argc, argv);
+     QTranslator translator;
+-#ifdef DATA_DIR
+-    translator.load(QString("%1/gui_files/l10n/highlight_%2").arg(DATA_DIR).arg(QLocale::system().name()));
++#ifdef GUI_DATA_DIR
++    translator.load(QString("%1/gui_files/l10n/highlight_%2").arg(GUI_DATA_DIR).arg(QLocale::system().name()));
+ #else
+     translator.load(QString("%1/gui_files/l10n/highlight_%2").arg(QDir::currentPath()).arg(QLocale::system().name()));
+ #endif
+diff --git a/src/gui-qt/mainwindow.cpp b/src/gui-qt/mainwindow.cpp
+index 3a21ad2..f060431 100644
+--- a/src/gui-qt/mainwindow.cpp
++++ b/src/gui-qt/mainwindow.cpp
+@@ -2131,8 +2131,8 @@ QString MainWindow::getDistFileFilterPath(){
+ #ifdef Q_OS_OSX
+     return QCoreApplication::applicationDirPath()+"/../Resources/gui_files/ext/fileopenfilter.conf";
+ #else
+-    #ifdef DATA_DIR
+-    return QString(DATA_DIR) + "/gui_files/ext/fileopenfilter.conf";
++    #ifdef GUI_DATA_DIR
++    return QString(GUI_DATA_DIR) + "/gui_files/ext/fileopenfilter.conf";
+     #else
+     return QDir::currentPath()+"/gui_files/ext/fileopenfilter.conf";
+     #endif
+diff --git a/src/makefile b/src/makefile
+index b1d7988..2963105 100644
+--- a/src/makefile
++++ b/src/makefile
+@@ -118,7 +118,7 @@ gui-qt: highlight-gui
+ 
+ highlight-gui: libhighlight.a ${GUI_OBJECTS}
+ 	cd gui-qt && \
+-	${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \
++	${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" GUI_DATA_DIR=\\\"${GUI_DATA_DIR}\\\" ' && \
+ 	$(MAKE)
+ 
+ $(OBJECTFILES) : makefile
diff --git a/gnu/packages/patches/ibus-anthy-fix-tests.patch b/gnu/packages/patches/ibus-anthy-fix-tests.patch
index 6934358980..c8b2b4211e 100644
--- a/gnu/packages/patches/ibus-anthy-fix-tests.patch
+++ b/gnu/packages/patches/ibus-anthy-fix-tests.patch
@@ -1,17 +1,14 @@
 Submitted upstream: https://github.com/ibus/ibus-anthy/pull/35
 
 diff --git a/tests/test-build.sh b/tests/test-build.sh
-index e83b78f..a0efe32 100755
+index e83b78f..bbfa7e1 100755
 --- a/tests/test-build.sh
 +++ b/tests/test-build.sh
-@@ -63,26 +63,27 @@ parse_args()
+@@ -63,26 +63,33 @@ parse_args()
      done;
  }
  
 +maybe_install_pycotap() {
-+    # Check if pycotap is already available.
-+    python3 -m pycotap >/dev/null && return 0
-+
 +    # Red Hat specific hint.
 +    if test -f /etc/redhat-release ; then
 +        if ! rpm -q --quiet python3-pycotap; then
@@ -19,6 +16,15 @@ index e83b78f..a0efe32 100755
 +            exit -1
 +        fi
 +    fi;
++
++    # Check if pycotap is already available.
++    if ! python3 -m pycotap >/dev/null; then
++        echo "pycotap not found; installing via pip"
++        if ! pip install pycotap --user; then
++            echo "failed to install pycotap"
++            exit -1
++        fi
++    fi
 +}
 +
  init_environment()
diff --git a/gnu/packages/patches/kwayland-skip-flaky-test.patch b/gnu/packages/patches/kwayland-skip-flaky-test.patch
deleted file mode 100644
index 592ab3cc77..0000000000
--- a/gnu/packages/patches/kwayland-skip-flaky-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This test fails in the Guix CI for unknown and difficult to debug reasons.
-
-diff --git a/autotests/client/test_plasma_window_model.cpp b/autotests/client/test_plasma_window_model.cpp
---- a/autotests/client/test_plasma_window_model.cpp
-+++ b/autotests/client/test_plasma_window_model.cpp
-@@ -545,6 +545,7 @@ void PlasmaWindowModelTest::testPid()
- 
- void PlasmaWindowModelTest::testVirtualDesktops()
- {
-+    QSKIP("This test fails on the Guix CI (FIXME)");
-     auto model = m_pw->createWindowModel();
-     QVERIFY(model);
-     QSignalSpy rowInsertedSpy(model, &PlasmaWindowModel::rowsInserted);
diff --git a/gnu/packages/patches/maturin-no-cross-compile.patch b/gnu/packages/patches/maturin-no-cross-compile.patch
new file mode 100644
index 0000000000..7394d0854e
--- /dev/null
+++ b/gnu/packages/patches/maturin-no-cross-compile.patch
@@ -0,0 +1,55 @@
+Remove dependencies on xwin and zig.  We're not offering cross-compilation
+options using these crates.
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 6cbdca3..22ea5ef 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -76,16 +76,6 @@ version = "0.1.4"
+ [dependencies.cargo-options]
+ version = "0.6.0"
+ 
+-[dependencies.cargo-xwin]
+-version = "0.14.3"
+-optional = true
+-default-features = false
+-
+-[dependencies.cargo-zigbuild]
+-version = "0.16.10"
+-optional = true
+-default-features = false
+-
+ [dependencies.cargo_metadata]
+ version = "0.15.3"
+ 
+@@ -310,8 +300,6 @@ version = "4.3.0"
+ [features]
+ cli-completion = ["dep:clap_complete_command"]
+ cross-compile = [
+-    "zig",
+-    "xwin",
+ ]
+ default = [
+     "full",
+@@ -330,7 +318,6 @@ log = ["tracing-subscriber"]
+ native-tls = [
+     "dep:native-tls",
+     "ureq?/native-tls",
+-    "cargo-xwin?/native-tls",
+     "dep:rustls-pemfile",
+ ]
+ password-storage = [
+@@ -340,7 +327,6 @@ password-storage = [
+ rustls = [
+     "dep:rustls",
+     "ureq?/tls",
+-    "cargo-xwin?/rustls-tls",
+     "dep:rustls-pemfile",
+ ]
+ scaffolding = [
+@@ -358,5 +344,3 @@ upload = [
+     "wild",
+     "dep:dirs",
+ ]
+-xwin = ["cargo-xwin"]
+-zig = ["cargo-zigbuild"]
diff --git a/gnu/packages/patches/mcrl2-fix-1687.patch b/gnu/packages/patches/mcrl2-fix-1687.patch
deleted file mode 100644
index 449ecbf638..0000000000
--- a/gnu/packages/patches/mcrl2-fix-1687.patch
+++ /dev/null
@@ -1,337 +0,0 @@
-Taken from upstream:
-    https://github.com/mCRL2org/mCRL2/commit/f38998be5198236bc5bf5a957b0e132d6d6d8bee
-
-Fixes bug in ltsconvert:
-    https://listserver.tue.nl/pipermail/mcrl2-users/2022-June/000395.html
-
-From f38998be5198236bc5bf5a957b0e132d6d6d8bee Mon Sep 17 00:00:00 2001
-From: Jan Friso Groote <J.F.Groote@tue.nl>
-Date: Tue, 28 Jun 2022 12:27:47 +0200
-Subject: [PATCH] Solved bug report #1687
-
-Hidden actions were not properly recognized in ltsconvert. Multiactions
-that were partly hidden compared with the default action label, and had
-to be compared with a tau-action. This caused multiple tau-actions to be
-listed in the list of actions of an lts, and this caused other tools to
-go astray.
-
-The code to rename actions has completely be rewritten.
-
-This should solve #1687.
-
-A test have been added.
----
- libraries/lts/include/mcrl2/lts/lts.h   | 95 ++++++++++++++++++++++---
- libraries/lts/test/lts_test.cpp         | 61 ++++++++--------
- tools/release/ltsconvert/ltsconvert.cpp |  3 +-
- 3 files changed, 116 insertions(+), 43 deletions(-)
-
-diff --git a/libraries/lts/include/mcrl2/lts/lts.h b/libraries/lts/include/mcrl2/lts/lts.h
-index 095031e7c..8562eb900 100644
---- a/libraries/lts/include/mcrl2/lts/lts.h
-+++ b/libraries/lts/include/mcrl2/lts/lts.h
-@@ -25,6 +25,7 @@
- #include <algorithm>
- #include <cassert>
- #include <set>
-+#include <map>
- #include "mcrl2/lts/transition.h"
- #include "mcrl2/lts/lts_type.h"
- 
-@@ -482,40 +483,112 @@ class lts: public LTS_BASE
-         return;
-       }
- 
-+      std::map<labels_size_type, labels_size_type> action_rename_map;
-       for (labels_size_type i=0; i< num_action_labels(); ++i)
-       {
-         ACTION_LABEL_T a=action_label(i);
-         a.hide_actions(tau_actions);
--        if (a==ACTION_LABEL_T())  
-+        if (a==ACTION_LABEL_T::tau_action())  
-         {
--          m_hidden_label_set.insert(i);
-+          if (i!=const_tau_label_index)
-+          {
-+            m_hidden_label_set.insert(i);
-+          }
-         }
-         else if (a!=action_label(i))
-         {
--          set_action_label(i,a);  
-+          /* In this the action_label i is changed by the tau_actions but not renamed to tau.
-+             We check whether a maps onto another action label index. If yes, it is added to 
-+             the rename map, and we explicitly rename transition labels with this label afterwards.
-+             If no, we rename the action label.
-+          */
-+          bool found=false;
-+          for (labels_size_type j=0; !found && j< num_action_labels(); ++j)
-+          {
-+            if (a==action_label(j))
-+            { 
-+              if (i!=j)
-+              {
-+                action_rename_map[i]=j;
-+              }
-+              found=true;
-+            }
-+          }
-+          if (!found) // a!=action_label(j) for any j, then rename action_label(i) to a. 
-+          { 
-+            set_action_label(i,a);
-+          }
-+        }
-+      }
-+
-+      if (action_rename_map.size()>0)    // Check whether there are action labels that must be renamed, and
-+      {
-+        for(transition& t: m_transitions)
-+        {
-+          auto i = action_rename_map.find(t.label());
-+          if (i!=action_rename_map.end())
-+          { 
-+            t=transition(t.from(),i->second,t.to());
-+          }
-         }
-       }
-     }
- 
--    /** \brief Apply the recorded actions that are renamed to internal actions to the lts. 
--     *  \details After hiding actions, it checks whether action labels are
--     *           equal and merges actions with the same labels in the lts.
-+    /** \brief Rename the hidden actions in the lts. 
-+     *  \details Multiactions can be partially renamed. I.e. a|b becomes a if b is hidden.
-+     *           In such a case the new action a is mapped onto an existing action a; if such
-+     *           a label a does not exist, the action a|b is renamed to a. 
-      *  \param[in] tau_actions Vector with strings indicating which actions must be
-      *       transformed to tau's */
--    void apply_hidden_actions(void)
-+    void apply_hidden_actions(const std::vector<std::string>& tau_actions)
-     {
--      if (m_hidden_label_set.size()>0)    // Check whether there is something to rename.
-+      if (tau_actions.size()==0)
-+      { 
-+        return;
-+      }
-+      
-+      std::map<labels_size_type, labels_size_type> action_rename_map;
-+      for (labels_size_type i=0; i< num_action_labels(); ++i)
-+      {
-+        ACTION_LABEL_T a=action_label(i);
-+        a.hide_actions(tau_actions);
-+#ifndef NDEBUG
-+        ACTION_LABEL_T b=a;
-+        b.hide_actions(tau_actions);
-+        assert(a==b); // hide_actions applied twice yields the same result as applying it once.
-+#endif
-+        bool found=false;
-+        for (labels_size_type j=0; !found && j< num_action_labels(); ++j)
-+        {
-+          if (a==action_label(j))
-+          { 
-+            if (i!=j)
-+            {
-+              action_rename_map[i]=j;
-+            }
-+            found=true;
-+          }
-+        }
-+        if (!found) // a!=action_label(j) for any j, then rename action_label(i) to a. 
-+        { 
-+          set_action_label(i,a);
-+        }
-+      }
-+    
-+
-+      if (action_rename_map.size()>0)    // Check whether there is something to rename.
-       {
-         for(transition& t: m_transitions)
-         {
--          if (m_hidden_label_set.count(t.label()))
-+          auto i = action_rename_map.find(t.label());
-+          if (i!=action_rename_map.end())
-           { 
--            t=transition(t.from(),tau_label_index(),t.to());
-+            t=transition(t.from(),i->second,t.to());
-           }
-         }
--        m_hidden_label_set.clear();       // Empty the hidden label set. 
-       }
-     }
-+
-     /** \brief Checks whether this LTS has state values associated with its states.
-      * \retval true if the LTS has state information;
-      * \retval false otherwise.
-diff --git a/libraries/lts/test/lts_test.cpp b/libraries/lts/test/lts_test.cpp
-index 5840393d9..ad69f6275 100644
---- a/libraries/lts/test/lts_test.cpp
-+++ b/libraries/lts/test/lts_test.cpp
-@@ -149,7 +149,7 @@ static void reduce_lts_in_various_ways(const std::string& test_description,
-   BOOST_CHECK(is_deterministic(l));
- }
- 
--static void reduce_simple_loop()
-+BOOST_AUTO_TEST_CASE(reduce_simple_loop)
- {
-   std::string SIMPLE_AUT =
-     "des (0,2,2)\n"
-@@ -173,7 +173,7 @@ static void reduce_simple_loop()
-   reduce_lts_in_various_ways("Simple loop", SIMPLE_AUT, expected);
- }
- 
--static void reduce_simple_loop_with_tau()
-+BOOST_AUTO_TEST_CASE(reduce_simple_loop_with_tau)
- {
-   std::string SIMPLE_AUT =
-     "des (0,2,2)\n"
-@@ -200,7 +200,7 @@ static void reduce_simple_loop_with_tau()
- /* The example below was encountered by David Jansen. The problem is that
-  * for branching bisimulations the tau may supersede the b, not leading to the
-  * necessary splitting into two equivalence classes. */
--static void tricky_example_for_branching_bisimulation()
-+BOOST_AUTO_TEST_CASE(tricky_example_for_branching_bisimulation)
- {
-   std::string TRICKY_BB =
-     "des (0,3,2)\n"
-@@ -226,7 +226,7 @@ static void tricky_example_for_branching_bisimulation()
- }
- 
- 
--static void reduce_abp()
-+BOOST_AUTO_TEST_CASE(reduce_abp)
- {
-   std::string ABP_AUT =
-     "des (0,92,74)\n"
-@@ -342,7 +342,7 @@ static void reduce_abp()
- 
- // Peterson's protocol has the interesting property that the number of states modulo branching bisimulation
- // differs from the number of states modulo weak bisimulation, as observed by Rob van Glabbeek.
--static void reduce_peterson()
-+BOOST_AUTO_TEST_CASE(reduce_peterson)
- {
-   std::string PETERSON_AUT =
-     "des (0,59,35)\n"
-@@ -423,7 +423,7 @@ static void reduce_peterson()
-   reduce_lts_in_various_ways("Peterson protocol", PETERSON_AUT, expected);
- }
- 
--static void test_reachability()
-+BOOST_AUTO_TEST_CASE(test_reachability)
- {
-   std::string REACH =
-     "des (0,4,5)       \n"
-@@ -449,7 +449,7 @@ static void test_reachability()
- 
- // The example below caused failures in the GW mlogn branching bisimulation
- // algorithm when cleaning the code up.
--static void failing_test_groote_wijs_algorithm()
-+BOOST_AUTO_TEST_CASE(failing_test_groote_wijs_algorithm)
- {
-   std::string GWLTS =
-     "des(0,29,10)\n"
-@@ -511,7 +511,7 @@ static void failing_test_groote_wijs_algorithm()
- // It has not been implemented fully. The problem is that it is difficult to
- // prescribe the order in which refinements have to be done.
- 
--static void counterexample_jk_1(std::size_t k)
-+void counterexample_jk_1(std::size_t k)
- {
-     // numbering scheme of states:
-     // states 0..k-1 are the blue squares
-@@ -571,7 +571,7 @@ static void counterexample_jk_1(std::size_t k)
- 
- // In the meantime, the bug is corrected:  this is why the first part of the
- // algorithm now follows a much simpler line than previously.
--static void counterexample_postprocessing()
-+BOOST_AUTO_TEST_CASE(counterexample_postprocessing)
- {
-   std::string POSTPROCESS_AUT =
-     "des(0,33,13)\n"
-@@ -634,7 +634,7 @@ static void counterexample_postprocessing()
-   test_lts("postprocessing problem (branching bisimulation signature [Blom/Orzan 2003])",l,expected_label_count, expected_state_count, expected_transition_count);
- }
- 
--static void regression_delete_old_bb_slice()
-+BOOST_AUTO_TEST_CASE(regression_delete_old_bb_slice)
- {
-   std::string POSTPROCESS_AUT =
-     "des(0,163,100)\n"
-@@ -824,7 +824,7 @@ static void regression_delete_old_bb_slice()
-   test_lts("regression test for GJKW bug (branching bisimulation signature [Blom/Orzan 2003])",l,expected_label_count, expected_state_count, expected_transition_count);
- }
- 
--void is_deterministic_test1()
-+BOOST_AUTO_TEST_CASE(is_deterministic_test1)
- {
-   std::string automaton =
-     "des(0,2,2)\n"
-@@ -837,7 +837,7 @@ void is_deterministic_test1()
-   BOOST_CHECK(is_deterministic(l_det));
- }
- 
--void is_deterministic_test2()
-+BOOST_AUTO_TEST_CASE(is_deterministic_test2)
- {
-   std::string automaton =
-     "des(0,2,2)\n"
-@@ -850,24 +850,25 @@ void is_deterministic_test2()
-   BOOST_CHECK(!is_deterministic(l_det));
- }
- 
--void test_is_deterministic()
-+BOOST_AUTO_TEST_CASE(hide_actions1)
- {
--  is_deterministic_test1();
--  is_deterministic_test2();
--}
-+  std::string automaton =
-+     "des (0,4,3)\n"
-+     "(0,\"<state>\",1)\n"
-+     "(1,\"return|hello\",2)\n"
-+     "(1,\"return\",2)\n"
-+     "(2,\"world\",1)\n";
-+
-+  std::istringstream is(automaton);
-+  lts::lts_aut_t l;
-+  l.load(is);
-+  std::vector<std::string>hidden_actions(1,"hello");
-+  l.apply_hidden_actions(hidden_actions);
-+  reduce(l,lts::lts_eq_bisim);
-+  std::size_t expected_label_count = 5;
-+  std::size_t expected_state_count = 3;
-+  std::size_t expected_transition_count = 3;
-+  test_lts("regression test for GJKW bug (branching bisimulation [Jansen/Groote/Keiren/Wijs 2019])",l,expected_label_count, expected_state_count, expected_transition_count);
-+
- 
--BOOST_AUTO_TEST_CASE(test_main)
--{
--  reduce_simple_loop();
--  reduce_simple_loop_with_tau();
--  tricky_example_for_branching_bisimulation();
--  reduce_abp();
--  reduce_peterson();
--  test_reachability();
--  test_is_deterministic();
--  failing_test_groote_wijs_algorithm();
--  counterexample_jk_1(3);
--  counterexample_postprocessing();
--  regression_delete_old_bb_slice();
--  // TODO: Add groote wijs branching bisimulation and add weak bisimulation tests. For the last Peterson is a good candidate.
- }
-diff --git a/tools/release/ltsconvert/ltsconvert.cpp b/tools/release/ltsconvert/ltsconvert.cpp
-index 231deabe2..5645d31d1 100644
---- a/tools/release/ltsconvert/ltsconvert.cpp
-+++ b/tools/release/ltsconvert/ltsconvert.cpp
-@@ -123,8 +123,7 @@ class ltsconvert_tool : public input_output_tool
- 
-       LTS_TYPE l;
-       l.load(tool_options.infilename);
--      l.record_hidden_actions(tool_options.tau_actions);
--      l.apply_hidden_actions();
-+      l.apply_hidden_actions(tool_options.tau_actions);
- 
-       if (tool_options.check_reach)
-       {
--- 
-2.35.1
-
diff --git a/gnu/packages/patches/mcrl2-fix-counterexample.patch b/gnu/packages/patches/mcrl2-fix-counterexample.patch
deleted file mode 100644
index abf541f50c..0000000000
--- a/gnu/packages/patches/mcrl2-fix-counterexample.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Taken from upstream:
-    https://github.com/mCRL2org/mCRL2/commit/435421429dde9dcc5956e8a978597111a3947ec1
-
-Fixes bug in ltscompare:
-    https://listserver.tue.nl/pipermail/mcrl2-users/2022-June/000396.html
-
-From 435421429dde9dcc5956e8a978597111a3947ec1 Mon Sep 17 00:00:00 2001
-From: Maurice Laveaux <m.laveaux@tue.nl>
-Date: Wed, 29 Jun 2022 10:27:58 +0200
-Subject: [PATCH] Write counterexample's structured output trace on single
- line.
-
----
- libraries/lts/include/mcrl2/lts/detail/counter_example.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libraries/lts/include/mcrl2/lts/detail/counter_example.h b/libraries/lts/include/mcrl2/lts/detail/counter_example.h
-index c339cfde4..ca3967768 100644
---- a/libraries/lts/include/mcrl2/lts/detail/counter_example.h
-+++ b/libraries/lts/include/mcrl2/lts/detail/counter_example.h
-@@ -139,7 +139,7 @@ class counter_example_constructor
-       if (m_structured_output)
-       {
-         std::cout << m_name << ": ";
--        result.save("", mcrl2::lts::trace::tfPlain);   // Write to stdout. 
-+        result.save("", mcrl2::lts::trace::tfLine);   // Write to stdout.
-       }
-       else
-       {
--- 
-2.35.1
-
diff --git a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch b/gnu/packages/patches/mingw-w64-reproducible-gendef.patch
index ee676af7a0..8dbea54ce9 100644
--- a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch
+++ b/gnu/packages/patches/mingw-w64-reproducible-gendef.patch
@@ -4,12 +4,12 @@ https://salsa.debian.org/mingw-w64-team/mingw-w64.git
 
 Invoke the following in the aforementioned repo to see the original patch:
 
-  $ git show 4974e2c:debian/patches/reproducible-gendef.patch
+  $ git show 9a33f50:debian/patches/reproducible-build.patch
 
-Description: Drop __DATE__ from gendef
+Description: Drop __DATE__ from gendef and genlib
 Author: Stephen Kitt <skitt@debian.org>
 
-This allows gendef to be built reproducibly.
+This allows gendef and genlib to be built reproducibly.
 
 --- a/mingw-w64-tools/gendef/src/gendef.c
 +++ b/mingw-w64-tools/gendef/src/gendef.c
@@ -21,3 +21,13 @@ This allows gendef to be built reproducibly.
    fprintf (stderr, "\nReport bugs to <mingw-w64-public@lists.sourceforge.net>\n");
    exit (0);
  }
+--- a/mingw-w64-tools/genlib/src/genlib.c
++++ b/mingw-w64-tools/genlib/src/genlib.c
+@@ -123,7 +123,6 @@
+ "Usage example:\n"
+ "  By default, the output file is named after the DLL counterpart\n"
+ "  genlib mydef.def    Produces libmydll.a\n"
+-"\nBuilt on " __DATE__ "\n"
+ "\nReport bugs to <martellmalone@gmail.com>\n"
+ ;
+
diff --git a/gnu/packages/patches/openssh-hurd.patch b/gnu/packages/patches/openssh-hurd.patch
deleted file mode 100644
index 1ad09a7ee6..0000000000
--- a/gnu/packages/patches/openssh-hurd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
-Not upstreamed.
-
-From 1ddae040d67e9a4ebcc3e1b95af1bff12c0f086b Mon Sep 17 00:00:00 2001
-From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
-Date: Tue, 7 Apr 2020 17:41:05 +0200
-Subject: [PATCH] Build fix for the Hurd.
-
-* gss-serv.c (ssh_gssapi_acquire_cred): Use HOST_NAME_MAX instead of
-MAXHOSTNAMELEN.
----
- gss-serv.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gss-serv.c b/gss-serv.c
-index 1d47870e7..22081c6f1 100644
---- a/gss-serv.c
-+++ b/gss-serv.c
-@@ -107,7 +107,7 @@ ssh_gssapi_acquire_cred(Gssctxt *ctx)
- 		gss_create_empty_oid_set(&status, &oidset);
- 		gss_add_oid_set_member(&status, ctx->oid, &oidset);
- 
--		if (gethostname(lname, MAXHOSTNAMELEN)) {
-+		if (gethostname(lname, HOST_NAME_MAX)) {
- 			gss_release_oid_set(&status, &oidset);
- 			return (-1);
- 		}
--- 
-2.26.0
-
diff --git a/gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch b/gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch
new file mode 100644
index 0000000000..8a075fa74c
--- /dev/null
+++ b/gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch
@@ -0,0 +1,242 @@
+Submitted upstream: https://github.com/mquinson/po4a/pull/437
+
+From 43db5c0b14ec2a8ba44d338bce024df87256457b Mon Sep 17 00:00:00 2001
+From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
+Date: Thu, 27 Jul 2023 17:44:49 -0400
+Subject: [PATCH] lib: Texinfo: Translate partial menu node names.
+
+Fixes <https://issues.guix.gnu.org/64881>.
+
+* lib/Locale/Po4a/Texinfo.pm (translate_buffer_menuentry): Refine
+regexp, so that it matches menu entries lacking a description.
+Only call 'translate_buffer' on the description if it was provided.
+* t/fmt/texinfo/partialmenus.trans: New file.
+* t/fmt/texinfo/partialmenus.texi: Likewise.
+* t/fmt/texinfo/partialmenus.pot: Likewise.
+* t/fmt/texinfo/partialmenus.po: Likewise.
+* t/fmt/texinfo/partialmenus.norm: Likewise.
+* t/fmt-texinfo.t: Register the new 'partialmenus' test.
+---
+ lib/Locale/Po4a/Texinfo.pm       |  7 +++---
+ t/fmt-texinfo.t                  |  2 +-
+ t/fmt/texinfo/partialmenus.norm  | 21 +++++++++++++++++
+ t/fmt/texinfo/partialmenus.po    | 40 ++++++++++++++++++++++++++++++++
+ t/fmt/texinfo/partialmenus.pot   | 40 ++++++++++++++++++++++++++++++++
+ t/fmt/texinfo/partialmenus.texi  | 14 +++++++++++
+ t/fmt/texinfo/partialmenus.trans | 21 +++++++++++++++++
+ 7 files changed, 141 insertions(+), 4 deletions(-)
+ create mode 100644 t/fmt/texinfo/partialmenus.norm
+ create mode 100644 t/fmt/texinfo/partialmenus.po
+ create mode 100644 t/fmt/texinfo/partialmenus.pot
+ create mode 100644 t/fmt/texinfo/partialmenus.texi
+ create mode 100644 t/fmt/texinfo/partialmenus.trans
+
+diff --git a/lib/Locale/Po4a/Texinfo.pm b/lib/Locale/Po4a/Texinfo.pm
+index b4750699..1c3a4bae 100644
+--- a/lib/Locale/Po4a/Texinfo.pm
++++ b/lib/Locale/Po4a/Texinfo.pm
+@@ -336,7 +336,7 @@ sub translate_buffer_menuentry {
+ 
+     my $translated_buffer = "";
+ 
+-    if (   $buffer =~ m/^(.*?)(::)\s+(.*)$/s
++    if (   $buffer =~ m/^(.*?)(::)(?:\s+(.*))?$/s
+         or $buffer =~ m/^(.*?: .*?)(\.)\s+(.*)$/s )
+     {
+         my ( $name, $sep, $description ) = ( $1, $2, $3 );
+@@ -347,8 +347,9 @@ sub translate_buffer_menuentry {
+             $translated_buffer .= ' ' x ( $menu_sep_width - 1 - $l );
+             $l = $menu_sep_width - 1;
+         }
+-        ( $t, @e ) = $self->translate_buffer( $description, $no_wrap, @env );
+-
++        if ($description) {
++            ( $t, @e ) = $self->translate_buffer( $description, $no_wrap, @env );
++        }
+         # Replace newlines with space for proper wrapping
+         # See https://github.com/mquinson/po4a/issues/122
+         $t =~ s/\n/ /sg;
+diff --git a/t/fmt-texinfo.t b/t/fmt-texinfo.t
+index 4b067e43..d9ed5df3 100644
+--- a/t/fmt-texinfo.t
++++ b/t/fmt-texinfo.t
+@@ -10,7 +10,7 @@ use Testhelper;
+ 
+ my @tests;
+ 
+-for my $test (qw(longmenu comments tindex)) {
++for my $test (qw(longmenu partialmenus comments tindex)) {
+     push @tests,
+       {
+         'format' => 'texinfo',
+diff --git a/t/fmt/texinfo/partialmenus.norm b/t/fmt/texinfo/partialmenus.norm
+new file mode 100644
+index 00000000..99240682
+--- /dev/null
++++ b/t/fmt/texinfo/partialmenus.norm
+@@ -0,0 +1,21 @@
++\input texinfo
++@c ===========================================================================
++@c
++@c This file was generated with po4a. Translate the source file.
++@c
++@c ===========================================================================
++
++
++@c These menus do not contain a description, which used to cause a
++@c Texinfo menu entry to not be translated.
++@menu
++* A menu entry without any description::  A menu entry without any 
++                                            description
++* Optional menu name: The menu node::  Optional menu name: The menu node
++@end menu
++
++@node A menu entry without any description
++@chapter A menu entry without any description
++
++@node The menu node
++@chapter Optional menu name
+diff --git a/t/fmt/texinfo/partialmenus.po b/t/fmt/texinfo/partialmenus.po
+new file mode 100644
+index 00000000..31a14443
+--- /dev/null
++++ b/t/fmt/texinfo/partialmenus.po
+@@ -0,0 +1,40 @@
++# SOME DESCRIPTIVE TITLE
++# Copyright (C) YEAR Free Software Foundation, Inc.
++# This file is distributed under the same license as the PACKAGE package.
++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
++#
++#, fuzzy
++msgid ""
++msgstr ""
++"Project-Id-Version: PACKAGE VERSION\n"
++"POT-Creation-Date: 2023-07-27 17:29-0400\n"
++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"Language-Team: LANGUAGE <LL@li.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. type: chapter
++#: partialmenus.texi:8 partialmenus.texi:10 partialmenus.texi:11
++#, no-wrap
++msgid "A menu entry without any description"
++msgstr "A MENU ENTRY WITHOUT ANY DESCRIPTION"
++
++#. type: menuentry
++#: partialmenus.texi:8
++msgid "Optional menu name: The menu node"
++msgstr "OPTIONAL MENU NAME: THE MENU NODE"
++
++#. type: node
++#: partialmenus.texi:13
++#, no-wrap
++msgid "The menu node"
++msgstr "THE MENU NODE"
++
++#. type: chapter
++#: partialmenus.texi:14
++#, no-wrap
++msgid "Optional menu name"
++msgstr "OPTIONAL MENU NAME"
+diff --git a/t/fmt/texinfo/partialmenus.pot b/t/fmt/texinfo/partialmenus.pot
+new file mode 100644
+index 00000000..0379f805
+--- /dev/null
++++ b/t/fmt/texinfo/partialmenus.pot
+@@ -0,0 +1,40 @@
++# SOME DESCRIPTIVE TITLE
++# Copyright (C) YEAR Free Software Foundation, Inc.
++# This file is distributed under the same license as the PACKAGE package.
++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
++#
++#, fuzzy
++msgid ""
++msgstr ""
++"Project-Id-Version: PACKAGE VERSION\n"
++"POT-Creation-Date: 2023-08-16 09:47-0400\n"
++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"Language-Team: LANGUAGE <LL@li.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#. type: chapter
++#: partialmenus.texi:8 partialmenus.texi:10 partialmenus.texi:11
++#, no-wrap
++msgid "A menu entry without any description"
++msgstr ""
++
++#. type: menuentry
++#: partialmenus.texi:8
++msgid "Optional menu name: The menu node"
++msgstr ""
++
++#. type: node
++#: partialmenus.texi:13
++#, no-wrap
++msgid "The menu node"
++msgstr ""
++
++#. type: chapter
++#: partialmenus.texi:14
++#, no-wrap
++msgid "Optional menu name"
++msgstr ""
+diff --git a/t/fmt/texinfo/partialmenus.texi b/t/fmt/texinfo/partialmenus.texi
+new file mode 100644
+index 00000000..f8663a2b
+--- /dev/null
++++ b/t/fmt/texinfo/partialmenus.texi
+@@ -0,0 +1,14 @@
++\input texinfo
++
++@c These menus do not contain a description, which used to cause a
++@c Texinfo menu entry to not be translated.
++@menu
++* A menu entry without any description::
++* Optional menu name: The menu node::
++@end menu
++
++@node A menu entry without any description
++@chapter A menu entry without any description
++
++@node The menu node
++@chapter Optional menu name
+diff --git a/t/fmt/texinfo/partialmenus.trans b/t/fmt/texinfo/partialmenus.trans
+new file mode 100644
+index 00000000..0ef742a1
+--- /dev/null
++++ b/t/fmt/texinfo/partialmenus.trans
+@@ -0,0 +1,21 @@
++\input texinfo
++@c ===========================================================================
++@c
++@c This file was generated with po4a. Translate the source file.
++@c
++@c ===========================================================================
++
++
++@c These menus do not contain a description, which used to cause a
++@c Texinfo menu entry to not be translated.
++@menu
++* A MENU ENTRY WITHOUT ANY DESCRIPTION::  A MENU ENTRY WITHOUT ANY 
++                                            DESCRIPTION
++* OPTIONAL MENU NAME: THE MENU NODE::  OPTIONAL MENU NAME: THE MENU NODE
++@end menu
++
++@node A MENU ENTRY WITHOUT ANY DESCRIPTION
++@chapter A MENU ENTRY WITHOUT ANY DESCRIPTION
++
++@node THE MENU NODE
++@chapter OPTIONAL MENU NAME
+
+base-commit: 5b1cd768afdf4e9445812c5d43428495a0fde3c6
+-- 
+2.41.0
+
diff --git a/gnu/packages/patches/python-shiboken-2-compat.patch b/gnu/packages/patches/python-shiboken-2-compat.patch
deleted file mode 100644
index 48aa74173b..0000000000
--- a/gnu/packages/patches/python-shiboken-2-compat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backport a fix from 5.15.9, mentioned in [1].
-
-[1] https://bugreports.qt.io/browse/PYSIDE-2176
-
---- pyside-setup-opensource-src-5.15.8/sources/shiboken2/libshiboken/pep384impl.cpp	2023-04-24 11:05:48.770934499 +0200
-+++ pyside-setup-opensource-src-5.15.8/sources/shiboken2/libshiboken/pep384impl.cpp	2023-04-24 11:04:51.566943936 +0200
-@@ -751,7 +751,7 @@
- #endif // IS_PY2
-     Shiboken::AutoDecRef privateobj(PyObject_GetAttr(
-         reinterpret_cast<PyObject *>(Py_TYPE(self)), Shiboken::PyMagicName::name()));
--#ifndef Py_LIMITED_API
-+#ifdef IS_PY2
-     return _Py_Mangle(privateobj, name);
- #else
-     // PYSIDE-1436: _Py_Mangle is no longer exposed; implement it always.
diff --git a/gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch
new file mode 100644
index 0000000000..2f1cf0dd4e
--- /dev/null
+++ b/gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch
@@ -0,0 +1,16 @@
+Retrieved from
+https://github.com/NixOS/nixpkgs/raw/master/pkgs/development/libraries/qt-5/5.15/qtdeclarative-default-disable-qmlcache.patch
+
+diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
+index 1d66e75..827567a 100644
+--- a/src/qml/qml/qqmltypeloader.cpp
++++ b/src/qml/qml/qqmltypeloader.cpp
+@@ -727,7 +727,7 @@ bool QQmlTypeLoader::Blob::isDebugging() const
+ 
+ bool QQmlTypeLoader::Blob::diskCacheEnabled() const
+ {
+-    return (!disableDiskCache() && !isDebugging()) || forceDiskCache();
++    return forceDiskCache();
+ }
+ 
+ bool QQmlTypeLoader::Blob::qmldirDataAvailable(const QQmlRefPointer<QQmlQmldirData> &data, QList<QQmlError> *errors)
diff --git a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch
new file mode 100644
index 0000000000..5f06ec53b4
--- /dev/null
+++ b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch
@@ -0,0 +1,16 @@
+Retrieved from
+https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch
+
+diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
+index 852cde9e..165f1b57 100644
+--- a/src/qml/jsruntime/qv4engine.cpp
++++ b/src/qml/jsruntime/qv4engine.cpp
+@@ -2093,7 +2093,7 @@ void ExecutionEngine::registerModule(const QString &_name, const QJSValue &modul
+ 
+ bool ExecutionEngine::diskCacheEnabled() const
+ {
+-    return (!disableDiskCache() && !debugger()) || forceDiskCache();
++    return forceDiskCache();
+ }
+ 
+ void ExecutionEngine::callInContext(QV4::Function *function, QObject *self,
diff --git a/gnu/packages/patches/qtwayland-gcc-11.patch b/gnu/packages/patches/qtwayland-gcc-11.patch
deleted file mode 100644
index 06983ff2f3..0000000000
--- a/gnu/packages/patches/qtwayland-gcc-11.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Add missing import for newer libstdc++.
-
-Taken from upstream:
-
-  https://github.com/qt/qtwayland/commit/1aa6ec2c778504d96543f6cdc2b9199a7b066fc1
-
-diff --git a/tests/auto/client/shared/corecompositor.cpp b/tests/auto/client/shared/corecompositor.cpp
-index 5c6c83baa..fa9b7662a 100644
---- a/tests/auto/client/shared/corecompositor.cpp
-+++ b/tests/auto/client/shared/corecompositor.cpp
-@@ -27,6 +27,7 @@
- ****************************************************************************/
- 
- #include "corecompositor.h"
-+#include <thread>
- 
- namespace MockCompositor {
- 
diff --git a/gnu/packages/patches/rust-nettle-sys-disable-vendor.patch b/gnu/packages/patches/rust-nettle-sys-disable-vendor.patch
deleted file mode 100644
index ae5ef5ebe0..0000000000
--- a/gnu/packages/patches/rust-nettle-sys-disable-vendor.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Subject: nettle-sys: clear out "vendored" feature cruft from build.rs
-From: Daniel Kahn Gillmor's avatarDaniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-https://salsa.debian.org/rust-team/debcargo-conf/-/commit/0c71150ad26bb66a8396dcdab055181af232ddc5
-https://sources.debian.org/src/rust-nettle-sys/2.0.4-3/debian/patches/disable-vendor.diff/
---- a/Cargo.toml	2019-10-23 13:08:07.000000000 -0400
-+++ b/Cargo.toml	2019-10-23 14:08:46.644064014 -0400
-@@ -29,12 +29,9 @@
- version = "0.51.1"
- default-features = false
- 
--[build-dependencies.nettle-src]
--version = "3.5.1-0"
--optional = true
--
- [build-dependencies.pkg-config]
- version = "0.3"
- 
- [features]
- vendored = ["nettle-src"]
-+nettle-src = []
-diff --git a/build.rs b/build.rs
-index 44f7af3..ede4b2f 100644
---- a/build.rs
-+++ b/build.rs
-@@ -1,7 +1,5 @@
- extern crate bindgen;
- extern crate pkg_config;
--#[cfg(feature = "vendored")]
--extern crate nettle_src;
- 
- use std::env;
- use std::fs;
-@@ -36,14 +34,6 @@ fn main() {
-     println!("cargo:rerun-if-env-changed=NETTLE_STATIC");
-     println!("cargo:rerun-if-env-changed={}", NETTLE_PREGENERATED_BINDINGS);
- 
--    #[cfg(feature = "vendored")]
--    {
--        let artifacts = nettle_src::Build::new().build();
--        println!("cargo:vendored=1");
--        env::set_var("PKG_CONFIG_PATH",
--                     artifacts.lib_dir().join("pkgconfig"));
--    }
--
-     let nettle = pkg_config::probe_library("nettle hogweed").unwrap();
- 
-     let mode = match env::var_os("NETTLE_STATIC") {
diff --git a/gnu/packages/patches/rust-ring-0.16-missing-files.patch b/gnu/packages/patches/rust-ring-0.16-missing-files.patch
new file mode 100644
index 0000000000..fa2f94a801
--- /dev/null
+++ b/gnu/packages/patches/rust-ring-0.16-missing-files.patch
@@ -0,0 +1,2293 @@
+These 4 files exist in the git repository for rust-ring, and are from
+the same commit where 0.16.20 is taken from. They were not added to the
+include list in Cargo.toml, so they were not added to the tarball.
+
+---
+ crypto/curve25519/make_curve25519_tables.py   | 222 +++++
+ crypto/fipsmodule/aes/asm/vpaes-armv7.pl      | 896 ++++++++++++++++++
+ crypto/fipsmodule/aes/asm/vpaes-armv8.pl      | 837 ++++++++++++++++
+ .../fipsmodule/modes/asm/ghash-neon-armv8.pl  | 294 ++++++
+ 4 files changed, 2249 insertions(+)
+ create mode 100755 crypto/curve25519/make_curve25519_tables.py
+ create mode 100644 crypto/fipsmodule/aes/asm/vpaes-armv7.pl
+ create mode 100755 crypto/fipsmodule/aes/asm/vpaes-armv8.pl
+ create mode 100644 crypto/fipsmodule/modes/asm/ghash-neon-armv8.pl
+
+diff --git a/crypto/curve25519/make_curve25519_tables.py b/crypto/curve25519/make_curve25519_tables.py
+new file mode 100755
+index 0000000..50dee2a
+--- /dev/null
++++ b/crypto/curve25519/make_curve25519_tables.py
+@@ -0,0 +1,222 @@
++#!/usr/bin/env python
++# coding=utf-8
++# Copyright (c) 2020, Google Inc.
++#
++# Permission to use, copy, modify, and/or distribute this software for any
++# purpose with or without fee is hereby granted, provided that the above
++# copyright notice and this permission notice appear in all copies.
++#
++# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
++# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
++# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
++# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++
++import StringIO
++import subprocess
++
++# Base field Z_p
++p = 2**255 - 19
++
++def modp_inv(x):
++    return pow(x, p-2, p)
++
++# Square root of -1
++modp_sqrt_m1 = pow(2, (p-1) // 4, p)
++
++# Compute corresponding x-coordinate, with low bit corresponding to
++# sign, or return None on failure
++def recover_x(y, sign):
++    if y >= p:
++        return None
++    x2 = (y*y-1) * modp_inv(d*y*y+1)
++    if x2 == 0:
++        if sign:
++            return None
++        else:
++            return 0
++
++    # Compute square root of x2
++    x = pow(x2, (p+3) // 8, p)
++    if (x*x - x2) % p != 0:
++        x = x * modp_sqrt_m1 % p
++    if (x*x - x2) % p != 0:
++        return None
++
++    if (x & 1) != sign:
++        x = p - x
++    return x
++
++# Curve constant
++d = -121665 * modp_inv(121666) % p
++
++# Base point
++g_y = 4 * modp_inv(5) % p
++g_x = recover_x(g_y, 0)
++
++# Points are represented as affine tuples (x, y).
++
++def point_add(P, Q):
++    x1, y1 = P
++    x2, y2 = Q
++    x3 = ((x1*y2 + y1*x2) * modp_inv(1 + d*x1*x2*y1*y2)) % p
++    y3 = ((y1*y2 + x1*x2) * modp_inv(1 - d*x1*x2*y1*y2)) % p
++    return (x3, y3)
++
++# Computes Q = s * P
++def point_mul(s, P):
++    Q = (0, 1)  # Neutral element
++    while s > 0:
++        if s & 1:
++            Q = point_add(Q, P)
++        P = point_add(P, P)
++        s >>= 1
++    return Q
++
++def to_bytes(x):
++    ret = bytearray(32)
++    for i in range(len(ret)):
++        ret[i] = x % 256
++        x >>= 8
++    assert x == 0
++    return ret
++
++def to_ge_precomp(P):
++    # typedef struct {
++    #   fe_loose yplusx;
++    #   fe_loose yminusx;
++    #   fe_loose xy2d;
++    # } ge_precomp;
++    x, y = P
++    return ((y + x) % p, (y - x) % p, (x * y * 2 * d) % p)
++
++def to_base_25_5(x):
++    limbs = (26, 25, 26, 25, 26, 25, 26, 25, 26, 25)
++    ret = []
++    for l in limbs:
++        ret.append(x & ((1<<l) - 1))
++        x >>= l
++    assert x == 0
++    return ret
++
++def to_base_51(x):
++    ret = []
++    for _ in range(5):
++        ret.append(x & ((1<<51) - 1))
++        x >>= 51
++    assert x == 0
++    return ret
++
++def to_literal(x):
++    ret = "{{\n#if defined(BORINGSSL_CURVE25519_64BIT)\n"
++    ret += ", ".join(map(str, to_base_51(x)))
++    ret += "\n#else\n"
++    ret += ", ".join(map(str, to_base_25_5(x)))
++    ret += "\n#endif\n}}"
++    return ret
++
++def main():
++    d2 = (2 * d) % p
++
++    small_precomp = bytearray()
++    for i in range(1, 16):
++        s = (i&1) | ((i&2) << (64-1)) | ((i&4) << (128-2)) | ((i&8) << (192-3))
++        P = point_mul(s, (g_x, g_y))
++        small_precomp += to_bytes(P[0])
++        small_precomp += to_bytes(P[1])
++
++    large_precomp = []
++    for i in range(32):
++        large_precomp.append([])
++        for j in range(8):
++            P = point_mul((j + 1) << (i * 8), (g_x, g_y))
++            large_precomp[-1].append(to_ge_precomp(P))
++
++    bi_precomp = []
++    for i in range(8):
++        P = point_mul(2*i + 1, (g_x, g_y))
++        bi_precomp.append(to_ge_precomp(P))
++
++
++    buf = StringIO.StringIO()
++    buf.write("""/* Copyright (c) 2020, Google Inc.
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
++ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
++ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
++
++// This file is generated from
++//    ./make_curve25519_tables.py > curve25519_tables.h
++
++
++static const fe d = """)
++    buf.write(to_literal(d))
++    buf.write(""";
++
++static const fe sqrtm1 = """)
++    buf.write(to_literal(modp_sqrt_m1))
++    buf.write(""";
++
++static const fe d2 = """)
++    buf.write(to_literal(d2))
++    buf.write(""";
++
++#if defined(OPENSSL_SMALL)
++
++// This block of code replaces the standard base-point table with a much smaller
++// one. The standard table is 30,720 bytes while this one is just 960.
++//
++// This table contains 15 pairs of group elements, (x, y), where each field
++// element is serialised with |fe_tobytes|. If |i| is the index of the group
++// element then consider i+1 as a four-bit number: (i₀, i₁, i₂, i₃) (where i₀
++// is the most significant bit). The value of the group element is then:
++// (i₀×2^192 + i₁×2^128 + i₂×2^64 + i₃)G, where G is the generator.
++static const uint8_t k25519SmallPrecomp[15 * 2 * 32] = {""")
++    for i, b in enumerate(small_precomp):
++        buf.write("0x%02x, " % b)
++    buf.write("""
++};
++
++#else
++
++// k25519Precomp[i][j] = (j+1)*256^i*B
++static const ge_precomp k25519Precomp[32][8] = {
++""")
++    for child in large_precomp:
++        buf.write("{\n")
++        for val in child:
++            buf.write("{\n")
++            for term in val:
++                buf.write(to_literal(term) + ",\n")
++            buf.write("},\n")
++        buf.write("},\n")
++    buf.write("""};
++
++#endif  // OPENSSL_SMALL
++
++// Bi[i] = (2*i+1)*B
++static const ge_precomp Bi[8] = {
++""")
++    for val in bi_precomp:
++        buf.write("{\n")
++        for term in val:
++                buf.write(to_literal(term) + ",\n")
++        buf.write("},\n")
++    buf.write("""};
++""")
++
++    proc = subprocess.Popen(["clang-format"], stdin=subprocess.PIPE)
++    proc.communicate(buf.getvalue())
++
++if __name__ == "__main__":
++    main()
+diff --git a/crypto/fipsmodule/aes/asm/vpaes-armv7.pl b/crypto/fipsmodule/aes/asm/vpaes-armv7.pl
+new file mode 100644
+index 0000000..d36a97a
+--- /dev/null
++++ b/crypto/fipsmodule/aes/asm/vpaes-armv7.pl
+@@ -0,0 +1,896 @@
++#! /usr/bin/env perl
++# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
++#
++# Licensed under the OpenSSL license (the "License").  You may not use
++# this file except in compliance with the License.  You can obtain a copy
++# in the file LICENSE in the source distribution or at
++# https://www.openssl.org/source/license.html
++
++
++######################################################################
++## Constant-time SSSE3 AES core implementation.
++## version 0.1
++##
++## By Mike Hamburg (Stanford University), 2009
++## Public domain.
++##
++## For details see http://shiftleft.org/papers/vector_aes/ and
++## http://crypto.stanford.edu/vpaes/.
++##
++######################################################################
++# Adapted from the original x86_64 version and <appro@openssl.org>'s ARMv8
++# version.
++#
++# armv7, aarch64, and x86_64 differ in several ways:
++#
++# * x86_64 SSSE3 instructions are two-address (destination operand is also a
++#   source), while NEON is three-address (destination operand is separate from
++#   two sources).
++#
++# * aarch64 has 32 SIMD registers available, while x86_64 and armv7 have 16.
++#
++# * x86_64 instructions can take memory references, while ARM is a load/store
++#   architecture. This means we sometimes need a spare register.
++#
++# * aarch64 and x86_64 have 128-bit byte shuffle instructions (tbl and pshufb),
++#   while armv7 only has a 64-bit byte shuffle (vtbl).
++#
++# This means this armv7 version must be a mix of both aarch64 and x86_64
++# implementations. armv7 and aarch64 have analogous SIMD instructions, so we
++# base the instructions on aarch64. However, we cannot use aarch64's register
++# allocation. x86_64's register count matches, but x86_64 is two-address.
++# vpaes-armv8.pl already accounts for this in the comments, which use
++# three-address AVX instructions instead of the original SSSE3 ones. We base
++# register usage on these comments, which are preserved in this file.
++#
++# This means we do not use separate input and output registers as in aarch64 and
++# cannot pin as many constants in the preheat functions. However, the load/store
++# architecture means we must still deviate from x86_64 in places.
++#
++# Next, we account for the byte shuffle instructions. vtbl takes 64-bit source
++# and destination and 128-bit table. Fortunately, armv7 also allows addressing
++# upper and lower halves of each 128-bit register. The lower half of q{N} is
++# d{2*N}. The upper half is d{2*N+1}. Instead of the following non-existent
++# instruction,
++#
++#     vtbl.8 q0, q1, q2   @ Index each of q2's 16 bytes into q1. Store in q0.
++#
++# we write:
++#
++#     vtbl.8 d0, q1, d4   @ Index each of d4's 8 bytes into q1. Store in d0.
++#     vtbl.8 d1, q1, d5   @ Index each of d5's 8 bytes into q1. Store in d1.
++#
++# For readability, we write d0 and d1 as q0#lo and q0#hi, respectively and
++# post-process before outputting. (This is adapted from ghash-armv4.pl.) Note,
++# however, that destination (q0) and table (q1) registers may no longer match.
++# We adjust the register usage from x86_64 to avoid this. (Unfortunately, the
++# two-address pshufb always matched these operands, so this is common.)
++#
++# This file also runs against the limit of ARMv7's ADR pseudo-instruction. ADR
++# expands to an ADD or SUB of the pc register to find an address. That immediate
++# must fit in ARM's encoding scheme: 8 bits of constant and 4 bits of rotation.
++# This means larger values must be more aligned.
++#
++# ARM additionally has two encodings, ARM and Thumb mode. Our assembly files may
++# use either encoding (do we actually need to support this?). In ARM mode, the
++# distances get large enough to require 16-byte alignment. Moving constants
++# closer to their use resolves most of this, but common constants in
++# _vpaes_consts are used by the whole file. Affected ADR instructions must be
++# placed at 8 mod 16 (the pc register is 8 ahead). Instructions with this
++# constraint have been commented.
++#
++# For details on ARM's immediate value encoding scheme, see
++# https://alisdair.mcdiarmid.org/arm-immediate-value-encoding/
++#
++# Finally, a summary of armv7 and aarch64 SIMD syntax differences:
++#
++# * armv7 prefixes SIMD instructions with 'v', while aarch64 does not.
++#
++# * armv7 SIMD registers are named like q0 (and d0 for the half-width ones).
++#   aarch64 names registers like v0, and denotes half-width operations in an
++#   instruction suffix (see below).
++#
++# * aarch64 embeds size and lane information in register suffixes. v0.16b is
++#   16 bytes, v0.8h is eight u16s, v0.4s is four u32s, and v0.2d is two u64s.
++#   armv7 embeds the total size in the register name (see above) and the size of
++#   each element in an instruction suffix, which may look like vmov.i8,
++#   vshr.u8, or vtbl.8, depending on instruction.
++
++use strict;
++
++my $flavour = shift;
++my $output;
++while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {}
++
++$0 =~ m/(.*[\/\\])[^\/\\]+$/;
++my $dir=$1;
++my $xlate;
++( $xlate="${dir}arm-xlate.pl" and -f $xlate ) or
++( $xlate="${dir}../../../perlasm/arm-xlate.pl" and -f $xlate) or
++die "can't locate arm-xlate.pl";
++
++open OUT,"| \"$^X\" $xlate $flavour $output";
++*STDOUT=*OUT;
++
++my $code = "";
++
++$code.=<<___;
++.syntax	unified
++
++.arch	armv7-a
++.fpu	neon
++
++#if defined(__thumb2__)
++.thumb
++#else
++.code	32
++#endif
++
++.text
++
++.type	_vpaes_consts,%object
++.align	7	@ totally strategic alignment
++_vpaes_consts:
++.Lk_mc_forward:	@ mc_forward
++	.quad	0x0407060500030201, 0x0C0F0E0D080B0A09
++	.quad	0x080B0A0904070605, 0x000302010C0F0E0D
++	.quad	0x0C0F0E0D080B0A09, 0x0407060500030201
++	.quad	0x000302010C0F0E0D, 0x080B0A0904070605
++.Lk_mc_backward:@ mc_backward
++	.quad	0x0605040702010003, 0x0E0D0C0F0A09080B
++	.quad	0x020100030E0D0C0F, 0x0A09080B06050407
++	.quad	0x0E0D0C0F0A09080B, 0x0605040702010003
++	.quad	0x0A09080B06050407, 0x020100030E0D0C0F
++.Lk_sr:		@ sr
++	.quad	0x0706050403020100, 0x0F0E0D0C0B0A0908
++	.quad	0x030E09040F0A0500, 0x0B06010C07020D08
++	.quad	0x0F060D040B020900, 0x070E050C030A0108
++	.quad	0x0B0E0104070A0D00, 0x0306090C0F020508
++
++@
++@ "Hot" constants
++@
++.Lk_inv:	@ inv, inva
++	.quad	0x0E05060F0D080180, 0x040703090A0B0C02
++	.quad	0x01040A060F0B0780, 0x030D0E0C02050809
++.Lk_ipt:	@ input transform (lo, hi)
++	.quad	0xC2B2E8985A2A7000, 0xCABAE09052227808
++	.quad	0x4C01307D317C4D00, 0xCD80B1FCB0FDCC81
++.Lk_sbo:	@ sbou, sbot
++	.quad	0xD0D26D176FBDC700, 0x15AABF7AC502A878
++	.quad	0xCFE474A55FBB6A00, 0x8E1E90D1412B35FA
++.Lk_sb1:	@ sb1u, sb1t
++	.quad	0x3618D415FAE22300, 0x3BF7CCC10D2ED9EF
++	.quad	0xB19BE18FCB503E00, 0xA5DF7A6E142AF544
++.Lk_sb2:	@ sb2u, sb2t
++	.quad	0x69EB88400AE12900, 0xC2A163C8AB82234A
++	.quad	0xE27A93C60B712400, 0x5EB7E955BC982FCD
++
++.asciz  "Vector Permutation AES for ARMv7 NEON, Mike Hamburg (Stanford University)"
++.size	_vpaes_consts,.-_vpaes_consts
++.align	6
++___
++
++{
++my ($inp,$out,$key) = map("r$_", (0..2));
++
++my ($invlo,$invhi) = map("q$_", (10..11));
++my ($sb1u,$sb1t,$sb2u,$sb2t) = map("q$_", (12..15));
++
++$code.=<<___;
++@@
++@@  _aes_preheat
++@@
++@@  Fills q9-q15 as specified below.
++@@
++.type	_vpaes_preheat,%function
++.align	4
++_vpaes_preheat:
++	adr	r10, .Lk_inv
++	vmov.i8	q9, #0x0f		@ .Lk_s0F
++	vld1.64	{q10,q11}, [r10]!	@ .Lk_inv
++	add	r10, r10, #64		@ Skip .Lk_ipt, .Lk_sbo
++	vld1.64	{q12,q13}, [r10]!	@ .Lk_sb1
++	vld1.64	{q14,q15}, [r10]	@ .Lk_sb2
++	bx	lr
++
++@@
++@@  _aes_encrypt_core
++@@
++@@  AES-encrypt q0.
++@@
++@@  Inputs:
++@@     q0 = input
++@@     q9-q15 as in _vpaes_preheat
++@@    [$key] = scheduled keys
++@@
++@@  Output in q0
++@@  Clobbers  q1-q5, r8-r11
++@@  Preserves q6-q8 so you get some local vectors
++@@
++@@
++.type	_vpaes_encrypt_core,%function
++.align 4
++_vpaes_encrypt_core:
++	mov	r9, $key
++	ldr	r8, [$key,#240]		@ pull rounds
++	adr	r11, .Lk_ipt
++	@ vmovdqa	.Lk_ipt(%rip),	%xmm2	# iptlo
++	@ vmovdqa	.Lk_ipt+16(%rip), %xmm3	# ipthi
++	vld1.64	{q2, q3}, [r11]
++	adr	r11, .Lk_mc_forward+16
++	vld1.64	{q5}, [r9]!		@ vmovdqu	(%r9),	%xmm5		# round0 key
++	vand	q1, q0, q9		@ vpand	%xmm9,	%xmm0,	%xmm1
++	vshr.u8	q0, q0, #4		@ vpsrlb	\$4,	%xmm0,	%xmm0
++	vtbl.8	q1#lo, {q2}, q1#lo	@ vpshufb	%xmm1,	%xmm2,	%xmm1
++	vtbl.8	q1#hi, {q2}, q1#hi
++	vtbl.8	q2#lo, {q3}, q0#lo	@ vpshufb	%xmm0,	%xmm3,	%xmm2
++	vtbl.8	q2#hi, {q3}, q0#hi
++	veor	q0, q1, q5		@ vpxor	%xmm5,	%xmm1,	%xmm0
++	veor	q0, q0, q2		@ vpxor	%xmm2,	%xmm0,	%xmm0
++
++	@ .Lenc_entry ends with a bnz instruction which is normally paired with
++	@ subs in .Lenc_loop.
++	tst	r8, r8
++	b	.Lenc_entry
++
++.align 4
++.Lenc_loop:
++	@ middle of middle round
++	add	r10, r11, #0x40
++	vtbl.8	q4#lo, {$sb1t}, q2#lo	@ vpshufb	%xmm2,	%xmm13,	%xmm4	# 4 = sb1u
++	vtbl.8	q4#hi, {$sb1t}, q2#hi
++	vld1.64	{q1}, [r11]!		@ vmovdqa	-0x40(%r11,%r10), %xmm1	# .Lk_mc_forward[]
++	vtbl.8	q0#lo, {$sb1u}, q3#lo	@ vpshufb	%xmm3,	%xmm12,	%xmm0	# 0 = sb1t
++	vtbl.8	q0#hi, {$sb1u}, q3#hi
++	veor	q4, q4, q5		@ vpxor		%xmm5,	%xmm4,	%xmm4	# 4 = sb1u + k
++	vtbl.8	q5#lo, {$sb2t}, q2#lo	@ vpshufb	%xmm2,	%xmm15,	%xmm5	# 4 = sb2u
++	vtbl.8	q5#hi, {$sb2t}, q2#hi
++	veor	q0, q0, q4		@ vpxor		%xmm4,	%xmm0,	%xmm0	# 0 = A
++	vtbl.8	q2#lo, {$sb2u}, q3#lo	@ vpshufb	%xmm3,	%xmm14,	%xmm2	# 2 = sb2t
++	vtbl.8	q2#hi, {$sb2u}, q3#hi
++	vld1.64	{q4}, [r10]		@ vmovdqa	(%r11,%r10), %xmm4	# .Lk_mc_backward[]
++	vtbl.8	q3#lo, {q0}, q1#lo	@ vpshufb	%xmm1,	%xmm0,	%xmm3	# 0 = B
++	vtbl.8	q3#hi, {q0}, q1#hi
++	veor	q2, q2, q5		@ vpxor		%xmm5,	%xmm2,	%xmm2	# 2 = 2A
++	@ Write to q5 instead of q0, so the table and destination registers do
++	@ not overlap.
++	vtbl.8	q5#lo, {q0}, q4#lo	@ vpshufb	%xmm4,	%xmm0,	%xmm0	# 3 = D
++	vtbl.8	q5#hi, {q0}, q4#hi
++	veor	q3, q3, q2		@ vpxor		%xmm2,	%xmm3,	%xmm3	# 0 = 2A+B
++	vtbl.8	q4#lo, {q3}, q1#lo	@ vpshufb	%xmm1,	%xmm3,	%xmm4	# 0 = 2B+C
++	vtbl.8	q4#hi, {q3}, q1#hi
++	@ Here we restore the original q0/q5 usage.
++	veor	q0, q5, q3		@ vpxor		%xmm3,	%xmm0,	%xmm0	# 3 = 2A+B+D
++	and	r11, r11, #~(1<<6)	@ and		\$0x30,	%r11		# ... mod 4
++	veor	q0, q0, q4		@ vpxor		%xmm4,	%xmm0, %xmm0	# 0 = 2A+3B+C+D
++	subs	r8, r8, #1		@ nr--
++
++.Lenc_entry:
++	@ top of round
++	vand	q1, q0, q9		@ vpand		%xmm0,	%xmm9,	%xmm1   # 0 = k
++	vshr.u8	q0, q0, #4		@ vpsrlb	\$4,	%xmm0,	%xmm0	# 1 = i
++	vtbl.8	q5#lo, {$invhi}, q1#lo	@ vpshufb	%xmm1,	%xmm11,	%xmm5	# 2 = a/k
++	vtbl.8	q5#hi, {$invhi}, q1#hi
++	veor	q1, q1, q0		@ vpxor		%xmm0,	%xmm1,	%xmm1	# 0 = j
++	vtbl.8	q3#lo, {$invlo}, q0#lo	@ vpshufb	%xmm0, 	%xmm10,	%xmm3  	# 3 = 1/i
++	vtbl.8	q3#hi, {$invlo}, q0#hi
++	vtbl.8	q4#lo, {$invlo}, q1#lo	@ vpshufb	%xmm1, 	%xmm10,	%xmm4  	# 4 = 1/j
++	vtbl.8	q4#hi, {$invlo}, q1#hi
++	veor	q3, q3, q5		@ vpxor		%xmm5,	%xmm3,	%xmm3	# 3 = iak = 1/i + a/k
++	veor	q4, q4, q5		@ vpxor		%xmm5,	%xmm4,	%xmm4  	# 4 = jak = 1/j + a/k
++	vtbl.8	q2#lo, {$invlo}, q3#lo	@ vpshufb	%xmm3,	%xmm10,	%xmm2  	# 2 = 1/iak
++	vtbl.8	q2#hi, {$invlo}, q3#hi
++	vtbl.8	q3#lo, {$invlo}, q4#lo	@ vpshufb	%xmm4,	%xmm10,	%xmm3	# 3 = 1/jak
++	vtbl.8	q3#hi, {$invlo}, q4#hi
++	veor	q2, q2, q1		@ vpxor		%xmm1,	%xmm2,	%xmm2  	# 2 = io
++	veor	q3, q3, q0		@ vpxor		%xmm0,	%xmm3,	%xmm3	# 3 = jo
++	vld1.64	{q5}, [r9]!		@ vmovdqu	(%r9),	%xmm5
++	bne	.Lenc_loop
++
++	@ middle of last round
++	add	r10, r11, #0x80
++
++	adr	r11, .Lk_sbo
++	@ Read to q1 instead of q4, so the vtbl.8 instruction below does not
++	@ overlap table and destination registers.
++	vld1.64 {q1}, [r11]!		@ vmovdqa	-0x60(%r10), %xmm4	# 3 : sbou
++	vld1.64 {q0}, [r11]		@ vmovdqa	-0x50(%r10), %xmm0	# 0 : sbot	.Lk_sbo+16
++	vtbl.8	q4#lo, {q1}, q2#lo	@ vpshufb	%xmm2,	%xmm4,	%xmm4	# 4 = sbou
++	vtbl.8	q4#hi, {q1}, q2#hi
++	vld1.64	{q1}, [r10]		@ vmovdqa	0x40(%r11,%r10), %xmm1	# .Lk_sr[]
++	@ Write to q2 instead of q0 below, to avoid overlapping table and
++	@ destination registers.
++	vtbl.8	q2#lo, {q0}, q3#lo	@ vpshufb	%xmm3,	%xmm0,	%xmm0	# 0 = sb1t
++	vtbl.8	q2#hi, {q0}, q3#hi
++	veor	q4, q4, q5		@ vpxor	%xmm5,	%xmm4,	%xmm4	# 4 = sb1u + k
++	veor	q2, q2, q4		@ vpxor	%xmm4,	%xmm0,	%xmm0	# 0 = A
++	@ Here we restore the original q0/q2 usage.
++	vtbl.8	q0#lo, {q2}, q1#lo	@ vpshufb	%xmm1,	%xmm0,	%xmm0
++	vtbl.8	q0#hi, {q2}, q1#hi
++	bx	lr
++.size	_vpaes_encrypt_core,.-_vpaes_encrypt_core
++
++.globl	GFp_vpaes_encrypt
++.type	GFp_vpaes_encrypt,%function
++.align	4
++GFp_vpaes_encrypt:
++	@ _vpaes_encrypt_core uses r8-r11. Round up to r7-r11 to maintain stack
++	@ alignment.
++	stmdb	sp!, {r7-r11,lr}
++	@ _vpaes_encrypt_core uses q4-q5 (d8-d11), which are callee-saved.
++	vstmdb	sp!, {d8-d11}
++
++	vld1.64	{q0}, [$inp]
++	bl	_vpaes_preheat
++	bl	_vpaes_encrypt_core
++	vst1.64	{q0}, [$out]
++
++	vldmia	sp!, {d8-d11}
++	ldmia	sp!, {r7-r11, pc}	@ return
++.size	GFp_vpaes_encrypt,.-GFp_vpaes_encrypt
++___
++}
++{
++my ($inp,$bits,$out,$dir)=("r0","r1","r2","r3");
++my ($rcon,$s0F,$invlo,$invhi,$s63) = map("q$_",(8..12));
++
++$code.=<<___;
++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
++@@                                                    @@
++@@                  AES key schedule                  @@
++@@                                                    @@
++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
++
++@ This function diverges from both x86_64 and armv7 in which constants are
++@ pinned. x86_64 has a common preheat function for all operations. aarch64
++@ separates them because it has enough registers to pin nearly all constants.
++@ armv7 does not have enough registers, but needing explicit loads and stores
++@ also complicates using x86_64's register allocation directly.
++@
++@ We pin some constants for convenience and leave q14 and q15 free to load
++@ others on demand.
++
++@
++@  Key schedule constants
++@
++.type	_vpaes_key_consts,%object
++.align	4
++_vpaes_key_consts:
++.Lk_rcon:	@ rcon
++	.quad	0x1F8391B9AF9DEEB6, 0x702A98084D7C7D81
++
++.Lk_opt:	@ output transform
++	.quad	0xFF9F4929D6B66000, 0xF7974121DEBE6808
++	.quad	0x01EDBD5150BCEC00, 0xE10D5DB1B05C0CE0
++.Lk_deskew:	@ deskew tables: inverts the sbox's "skew"
++	.quad	0x07E4A34047A4E300, 0x1DFEB95A5DBEF91A
++	.quad	0x5F36B5DC83EA6900, 0x2841C2ABF49D1E77
++.size	_vpaes_key_consts,.-_vpaes_key_consts
++
++.type	_vpaes_key_preheat,%function
++.align	4
++_vpaes_key_preheat:
++	adr	r11, .Lk_rcon
++	vmov.i8	$s63, #0x5b			@ .Lk_s63
++	adr	r10, .Lk_inv			@ Must be aligned to 8 mod 16.
++	vmov.i8	$s0F, #0x0f			@ .Lk_s0F
++	vld1.64	{$invlo,$invhi}, [r10]		@ .Lk_inv
++	vld1.64	{$rcon}, [r11]			@ .Lk_rcon
++	bx	lr
++.size	_vpaes_key_preheat,.-_vpaes_key_preheat
++
++.type	_vpaes_schedule_core,%function
++.align	4
++_vpaes_schedule_core:
++	@ We only need to save lr, but ARM requires an 8-byte stack alignment,
++	@ so save an extra register.
++	stmdb	sp!, {r3,lr}
++
++	bl	_vpaes_key_preheat	@ load the tables
++
++	adr	r11, .Lk_ipt		@ Must be aligned to 8 mod 16.
++	vld1.64	{q0}, [$inp]!		@ vmovdqu	(%rdi),	%xmm0		# load key (unaligned)
++
++	@ input transform
++	@ Use q4 here rather than q3 so .Lschedule_am_decrypting does not
++	@ overlap table and destination.
++	vmov	q4, q0			@ vmovdqa	%xmm0,	%xmm3
++	bl	_vpaes_schedule_transform
++	adr	r10, .Lk_sr		@ Must be aligned to 8 mod 16.
++	vmov	q7, q0			@ vmovdqa	%xmm0,	%xmm7
++
++	add	r8, r8, r10
++
++	@ encrypting, output zeroth round key after transform
++	vst1.64	{q0}, [$out]		@ vmovdqu	%xmm0,	(%rdx)
++
++	@ *ring*: Decryption removed.
++
++.Lschedule_go:
++	cmp	$bits, #192		@ cmp	\$192,	%esi
++	bhi	.Lschedule_256
++	@ 128: fall though
++
++@@
++@@  .schedule_128
++@@
++@@  128-bit specific part of key schedule.
++@@
++@@  This schedule is really simple, because all its parts
++@@  are accomplished by the subroutines.
++@@
++.Lschedule_128:
++	mov	$inp, #10		@ mov	\$10, %esi
++
++.Loop_schedule_128:
++	bl 	_vpaes_schedule_round
++	subs	$inp, $inp, #1		@ dec	%esi
++	beq 	.Lschedule_mangle_last
++	bl	_vpaes_schedule_mangle	@ write output
++	b 	.Loop_schedule_128
++
++@@
++@@  .aes_schedule_256
++@@
++@@  256-bit specific part of key schedule.
++@@
++@@  The structure here is very similar to the 128-bit
++@@  schedule, but with an additional "low side" in
++@@  q6.  The low side's rounds are the same as the
++@@  high side's, except no rcon and no rotation.
++@@
++.align	4
++.Lschedule_256:
++	vld1.64	{q0}, [$inp]			@ vmovdqu	16(%rdi),%xmm0		# load key part 2 (unaligned)
++	bl	_vpaes_schedule_transform	@ input transform
++	mov	$inp, #7			@ mov	\$7, %esi
++
++.Loop_schedule_256:
++	bl	_vpaes_schedule_mangle		@ output low result
++	vmov	q6, q0				@ vmovdqa	%xmm0,	%xmm6		# save cur_lo in xmm6
++
++	@ high round
++	bl	_vpaes_schedule_round
++	subs	$inp, $inp, #1			@ dec	%esi
++	beq 	.Lschedule_mangle_last
++	bl	_vpaes_schedule_mangle
++
++	@ low round. swap xmm7 and xmm6
++	vdup.32	q0, q0#hi[1]		@ vpshufd	\$0xFF,	%xmm0,	%xmm0
++	vmov.i8	q4, #0
++	vmov	q5, q7			@ vmovdqa	%xmm7,	%xmm5
++	vmov	q7, q6			@ vmovdqa	%xmm6,	%xmm7
++	bl	_vpaes_schedule_low_round
++	vmov	q7, q5			@ vmovdqa	%xmm5,	%xmm7
++
++	b	.Loop_schedule_256
++
++@@
++@@  .aes_schedule_mangle_last
++@@
++@@  Mangler for last round of key schedule
++@@  Mangles q0
++@@    when encrypting, outputs out(q0) ^ 63
++@@    when decrypting, outputs unskew(q0)
++@@
++@@  Always called right before return... jumps to cleanup and exits
++@@
++.align	4
++.Lschedule_mangle_last:
++	@ schedule last round key from xmm0
++	adr	r11, .Lk_deskew			@ lea	.Lk_deskew(%rip),%r11	# prepare to deskew
++
++	@ encrypting
++	vld1.64	{q1}, [r8]		@ vmovdqa	(%r8,%r10),%xmm1
++	adr	r11, .Lk_opt		@ lea		.Lk_opt(%rip),	%r11		# prepare to output transform
++	add	$out, $out, #32		@ add		\$32,	%rdx
++	vmov	q2, q0
++	vtbl.8	q0#lo, {q2}, q1#lo	@ vpshufb	%xmm1,	%xmm0,	%xmm0		# output permute
++	vtbl.8	q0#hi, {q2}, q1#hi
++
++.Lschedule_mangle_last_dec:
++	sub	$out, $out, #16			@ add	\$-16,	%rdx
++	veor	q0, q0, $s63			@ vpxor	.Lk_s63(%rip),	%xmm0,	%xmm0
++	bl	_vpaes_schedule_transform	@ output transform
++	vst1.64	{q0}, [$out]			@ vmovdqu	%xmm0,	(%rdx)		# save last key
++
++	@ cleanup
++	veor	q0, q0, q0		@ vpxor	%xmm0,	%xmm0,	%xmm0
++	veor	q1, q1, q1		@ vpxor	%xmm1,	%xmm1,	%xmm1
++	veor	q2, q2, q2		@ vpxor	%xmm2,	%xmm2,	%xmm2
++	veor	q3, q3, q3		@ vpxor	%xmm3,	%xmm3,	%xmm3
++	veor	q4, q4, q4		@ vpxor	%xmm4,	%xmm4,	%xmm4
++	veor	q5, q5, q5		@ vpxor	%xmm5,	%xmm5,	%xmm5
++	veor	q6, q6, q6		@ vpxor	%xmm6,	%xmm6,	%xmm6
++	veor	q7, q7, q7		@ vpxor	%xmm7,	%xmm7,	%xmm7
++	ldmia	sp!, {r3,pc}		@ return
++.size	_vpaes_schedule_core,.-_vpaes_schedule_core
++
++@@
++@@  .aes_schedule_round
++@@
++@@  Runs one main round of the key schedule on q0, q7
++@@
++@@  Specifically, runs subbytes on the high dword of q0
++@@  then rotates it by one byte and xors into the low dword of
++@@  q7.
++@@
++@@  Adds rcon from low byte of q8, then rotates q8 for
++@@  next rcon.
++@@
++@@  Smears the dwords of q7 by xoring the low into the
++@@  second low, result into third, result into highest.
++@@
++@@  Returns results in q7 = q0.
++@@  Clobbers q1-q4, r11.
++@@
++.type	_vpaes_schedule_round,%function
++.align	4
++_vpaes_schedule_round:
++	@ extract rcon from xmm8
++	vmov.i8	q4, #0				@ vpxor		%xmm4,	%xmm4,	%xmm4
++	vext.8	q1, $rcon, q4, #15		@ vpalignr	\$15,	%xmm8,	%xmm4,	%xmm1
++	vext.8	$rcon, $rcon, $rcon, #15	@ vpalignr	\$15,	%xmm8,	%xmm8,	%xmm8
++	veor	q7, q7, q1			@ vpxor		%xmm1,	%xmm7,	%xmm7
++
++	@ rotate
++	vdup.32	q0, q0#hi[1]			@ vpshufd	\$0xFF,	%xmm0,	%xmm0
++	vext.8	q0, q0, q0, #1			@ vpalignr	\$1,	%xmm0,	%xmm0,	%xmm0
++
++	@ fall through...
++
++	@ low round: same as high round, but no rotation and no rcon.
++_vpaes_schedule_low_round:
++	@ The x86_64 version pins .Lk_sb1 in %xmm13 and .Lk_sb1+16 in %xmm12.
++	@ We pin other values in _vpaes_key_preheat, so load them now.
++	adr	r11, .Lk_sb1
++	vld1.64	{q14,q15}, [r11]
++
++	@ smear xmm7
++	vext.8	q1, q4, q7, #12			@ vpslldq	\$4,	%xmm7,	%xmm1
++	veor	q7, q7, q1			@ vpxor	%xmm1,	%xmm7,	%xmm7
++	vext.8	q4, q4, q7, #8			@ vpslldq	\$8,	%xmm7,	%xmm4
++
++	@ subbytes
++	vand	q1, q0, $s0F			@ vpand		%xmm9,	%xmm0,	%xmm1		# 0 = k
++	vshr.u8	q0, q0, #4			@ vpsrlb	\$4,	%xmm0,	%xmm0		# 1 = i
++	 veor	q7, q7, q4			@ vpxor		%xmm4,	%xmm7,	%xmm7
++	vtbl.8	q2#lo, {$invhi}, q1#lo		@ vpshufb	%xmm1,	%xmm11,	%xmm2		# 2 = a/k
++	vtbl.8	q2#hi, {$invhi}, q1#hi
++	veor	q1, q1, q0			@ vpxor		%xmm0,	%xmm1,	%xmm1		# 0 = j
++	vtbl.8	q3#lo, {$invlo}, q0#lo		@ vpshufb	%xmm0, 	%xmm10,	%xmm3		# 3 = 1/i
++	vtbl.8	q3#hi, {$invlo}, q0#hi
++	veor	q3, q3, q2			@ vpxor		%xmm2,	%xmm3,	%xmm3		# 3 = iak = 1/i + a/k
++	vtbl.8	q4#lo, {$invlo}, q1#lo		@ vpshufb	%xmm1,	%xmm10,	%xmm4		# 4 = 1/j
++	vtbl.8	q4#hi, {$invlo}, q1#hi
++	 veor	q7, q7, $s63			@ vpxor		.Lk_s63(%rip),	%xmm7,	%xmm7
++	vtbl.8	q3#lo, {$invlo}, q3#lo		@ vpshufb	%xmm3,	%xmm10,	%xmm3		# 2 = 1/iak
++	vtbl.8	q3#hi, {$invlo}, q3#hi
++	veor	q4, q4, q2			@ vpxor		%xmm2,	%xmm4,	%xmm4		# 4 = jak = 1/j + a/k
++	vtbl.8	q2#lo, {$invlo}, q4#lo		@ vpshufb	%xmm4,	%xmm10,	%xmm2		# 3 = 1/jak
++	vtbl.8	q2#hi, {$invlo}, q4#hi
++	veor	q3, q3, q1			@ vpxor		%xmm1,	%xmm3,	%xmm3		# 2 = io
++	veor	q2, q2, q0			@ vpxor		%xmm0,	%xmm2,	%xmm2		# 3 = jo
++	vtbl.8	q4#lo, {q15}, q3#lo		@ vpshufb	%xmm3,	%xmm13,	%xmm4		# 4 = sbou
++	vtbl.8	q4#hi, {q15}, q3#hi
++	vtbl.8	q1#lo, {q14}, q2#lo		@ vpshufb	%xmm2,	%xmm12,	%xmm1		# 0 = sb1t
++	vtbl.8	q1#hi, {q14}, q2#hi
++	veor	q1, q1, q4			@ vpxor		%xmm4,	%xmm1,	%xmm1		# 0 = sbox output
++
++	@ add in smeared stuff
++	veor	q0, q1, q7			@ vpxor	%xmm7,	%xmm1,	%xmm0
++	veor	q7, q1, q7			@ vmovdqa	%xmm0,	%xmm7
++	bx	lr
++.size	_vpaes_schedule_round,.-_vpaes_schedule_round
++
++@@
++@@  .aes_schedule_transform
++@@
++@@  Linear-transform q0 according to tables at [r11]
++@@
++@@  Requires that q9 = 0x0F0F... as in preheat
++@@  Output in q0
++@@  Clobbers q1, q2, q14, q15
++@@
++.type	_vpaes_schedule_transform,%function
++.align	4
++_vpaes_schedule_transform:
++	vld1.64	{q14,q15}, [r11]	@ vmovdqa	(%r11),	%xmm2 	# lo
++					@ vmovdqa	16(%r11),	%xmm1 # hi
++	vand	q1, q0, $s0F		@ vpand	%xmm9,	%xmm0,	%xmm1
++	vshr.u8	q0, q0, #4		@ vpsrlb	\$4,	%xmm0,	%xmm0
++	vtbl.8	q2#lo, {q14}, q1#lo	@ vpshufb	%xmm1,	%xmm2,	%xmm2
++	vtbl.8	q2#hi, {q14}, q1#hi
++	vtbl.8	q0#lo, {q15}, q0#lo	@ vpshufb	%xmm0,	%xmm1,	%xmm0
++	vtbl.8	q0#hi, {q15}, q0#hi
++	veor	q0, q0, q2		@ vpxor	%xmm2,	%xmm0,	%xmm0
++	bx	lr
++.size	_vpaes_schedule_transform,.-_vpaes_schedule_transform
++
++@@
++@@  .aes_schedule_mangle
++@@
++@@  Mangles q0 from (basis-transformed) standard version
++@@  to our version.
++@@
++@@  On encrypt,
++@@    xor with 0x63
++@@    multiply by circulant 0,1,1,1
++@@    apply shiftrows transform
++@@
++@@  On decrypt,
++@@    xor with 0x63
++@@    multiply by "inverse mixcolumns" circulant E,B,D,9
++@@    deskew
++@@    apply shiftrows transform
++@@
++@@
++@@  Writes out to [r2], and increments or decrements it
++@@  Keeps track of round number mod 4 in r8
++@@  Preserves q0
++@@  Clobbers q1-q5
++@@
++.type	_vpaes_schedule_mangle,%function
++.align	4
++_vpaes_schedule_mangle:
++	tst	$dir, $dir
++	vmov	q4, q0			@ vmovdqa	%xmm0,	%xmm4	# save xmm0 for later
++	adr	r11, .Lk_mc_forward	@ Must be aligned to 8 mod 16.
++	vld1.64	{q5}, [r11]		@ vmovdqa	.Lk_mc_forward(%rip),%xmm5
++
++	@ encrypting
++	@ Write to q2 so we do not overlap table and destination below.
++	veor	q2, q0, $s63		@ vpxor		.Lk_s63(%rip),	%xmm0,	%xmm4
++	add	$out, $out, #16		@ add		\$16,	%rdx
++	vtbl.8	q4#lo, {q2}, q5#lo	@ vpshufb	%xmm5,	%xmm4,	%xmm4
++	vtbl.8	q4#hi, {q2}, q5#hi
++	vtbl.8	q1#lo, {q4}, q5#lo	@ vpshufb	%xmm5,	%xmm4,	%xmm1
++	vtbl.8	q1#hi, {q4}, q5#hi
++	vtbl.8	q3#lo, {q1}, q5#lo	@ vpshufb	%xmm5,	%xmm1,	%xmm3
++	vtbl.8	q3#hi, {q1}, q5#hi
++	veor	q4, q4, q1		@ vpxor		%xmm1,	%xmm4,	%xmm4
++	vld1.64	{q1}, [r8]		@ vmovdqa	(%r8,%r10),	%xmm1
++	veor	q3, q3, q4		@ vpxor		%xmm4,	%xmm3,	%xmm3
++
++.Lschedule_mangle_both:
++	@ Write to q2 so table and destination do not overlap.
++	vtbl.8	q2#lo, {q3}, q1#lo	@ vpshufb	%xmm1,	%xmm3,	%xmm3
++	vtbl.8	q2#hi, {q3}, q1#hi
++	add	r8, r8, #64-16		@ add	\$-16,	%r8
++	and	r8, r8, #~(1<<6)	@ and	\$0x30,	%r8
++	vst1.64	{q2}, [$out]		@ vmovdqu	%xmm3,	(%rdx)
++	bx	lr
++.size	_vpaes_schedule_mangle,.-_vpaes_schedule_mangle
++
++.globl	GFp_vpaes_set_encrypt_key
++.type	GFp_vpaes_set_encrypt_key,%function
++.align	4
++GFp_vpaes_set_encrypt_key:
++	stmdb	sp!, {r7-r11, lr}
++	vstmdb	sp!, {d8-d15}
++
++	lsr	r9, $bits, #5		@ shr	\$5,%eax
++	add	r9, r9, #5		@ \$5,%eax
++	str	r9, [$out,#240]		@ mov	%eax,240(%rdx)	# AES_KEY->rounds = nbits/32+5;
++
++	mov	$dir, #0		@ mov	\$0,%ecx
++	mov	r8, #0x30		@ mov	\$0x30,%r8d
++	bl	_vpaes_schedule_core
++	eor	r0, r0, r0
++
++	vldmia	sp!, {d8-d15}
++	ldmia	sp!, {r7-r11, pc}	@ return
++.size	GFp_vpaes_set_encrypt_key,.-GFp_vpaes_set_encrypt_key
++___
++}
++
++{
++my ($out, $inp) = map("r$_", (0..1));
++my ($s0F, $s63, $s63_raw, $mc_forward) = map("q$_", (9..12));
++
++$code .= <<___;
++
++@ Additional constants for converting to bsaes.
++.type	_vpaes_convert_consts,%object
++.align	4
++_vpaes_convert_consts:
++@ .Lk_opt_then_skew applies skew(opt(x)) XOR 0x63, where skew is the linear
++@ transform in the AES S-box. 0x63 is incorporated into the low half of the
++@ table. This was computed with the following script:
++@
++@   def u64s_to_u128(x, y):
++@       return x | (y << 64)
++@   def u128_to_u64s(w):
++@       return w & ((1<<64)-1), w >> 64
++@   def get_byte(w, i):
++@       return (w >> (i*8)) & 0xff
++@   def apply_table(table, b):
++@       lo = b & 0xf
++@       hi = b >> 4
++@       return get_byte(table[0], lo) ^ get_byte(table[1], hi)
++@   def opt(b):
++@       table = [
++@           u64s_to_u128(0xFF9F4929D6B66000, 0xF7974121DEBE6808),
++@           u64s_to_u128(0x01EDBD5150BCEC00, 0xE10D5DB1B05C0CE0),
++@       ]
++@       return apply_table(table, b)
++@   def rot_byte(b, n):
++@       return 0xff & ((b << n) | (b >> (8-n)))
++@   def skew(x):
++@       return (x ^ rot_byte(x, 1) ^ rot_byte(x, 2) ^ rot_byte(x, 3) ^
++@               rot_byte(x, 4))
++@   table = [0, 0]
++@   for i in range(16):
++@       table[0] |= (skew(opt(i)) ^ 0x63) << (i*8)
++@       table[1] |= skew(opt(i<<4)) << (i*8)
++@   print("\t.quad\t0x%016x, 0x%016x" % u128_to_u64s(table[0]))
++@   print("\t.quad\t0x%016x, 0x%016x" % u128_to_u64s(table[1]))
++.Lk_opt_then_skew:
++	.quad	0x9cb8436798bc4763, 0x6440bb9f6044bf9b
++	.quad	0x1f30062936192f00, 0xb49bad829db284ab
++
++@ void GFp_vpaes_encrypt_key_to_bsaes(AES_KEY *bsaes, const AES_KEY *vpaes);
++.globl	GFp_vpaes_encrypt_key_to_bsaes
++.type	GFp_vpaes_encrypt_key_to_bsaes,%function
++.align	4
++GFp_vpaes_encrypt_key_to_bsaes:
++	stmdb	sp!, {r11, lr}
++
++	@ See _vpaes_schedule_core for the key schedule logic. In particular,
++	@ _vpaes_schedule_transform(.Lk_ipt) (section 2.2 of the paper),
++	@ _vpaes_schedule_mangle (section 4.3), and .Lschedule_mangle_last
++	@ contain the transformations not in the bsaes representation. This
++	@ function inverts those transforms.
++	@
++	@ Note also that bsaes-armv7.pl expects aes-armv4.pl's key
++	@ representation, which does not match the other aes_nohw_*
++	@ implementations. The ARM aes_nohw_* stores each 32-bit word
++	@ byteswapped, as a convenience for (unsupported) big-endian ARM, at the
++	@ cost of extra REV and VREV32 operations in little-endian ARM.
++
++	vmov.i8	$s0F, #0x0f		@ Required by _vpaes_schedule_transform
++	adr	r2, .Lk_mc_forward	@ Must be aligned to 8 mod 16.
++	add	r3, r2, 0x90		@ .Lk_sr+0x10-.Lk_mc_forward = 0x90 (Apple's toolchain doesn't support the expression)
++
++	vld1.64	{$mc_forward}, [r2]
++	vmov.i8	$s63, #0x5b		@ .Lk_s63 from vpaes-x86_64
++	adr	r11, .Lk_opt		@ Must be aligned to 8 mod 16.
++	vmov.i8	$s63_raw, #0x63		@ .LK_s63 without .Lk_ipt applied
++
++	@ vpaes stores one fewer round count than bsaes, but the number of keys
++	@ is the same.
++	ldr	r2, [$inp,#240]
++	add	r2, r2, #1
++	str	r2, [$out,#240]
++
++	@ The first key is transformed with _vpaes_schedule_transform(.Lk_ipt).
++	@ Invert this with .Lk_opt.
++	vld1.64	{q0}, [$inp]!
++	bl	_vpaes_schedule_transform
++	vrev32.8	q0, q0
++	vst1.64	{q0}, [$out]!
++
++	@ The middle keys have _vpaes_schedule_transform(.Lk_ipt) applied,
++	@ followed by _vpaes_schedule_mangle. _vpaes_schedule_mangle XORs 0x63,
++	@ multiplies by the circulant 0,1,1,1, then applies ShiftRows.
++.Loop_enc_key_to_bsaes:
++	vld1.64	{q0}, [$inp]!
++
++	@ Invert the ShiftRows step (see .Lschedule_mangle_both). Note we cycle
++	@ r3 in the opposite direction and start at .Lk_sr+0x10 instead of 0x30.
++	@ We use r3 rather than r8 to avoid a callee-saved register.
++	vld1.64	{q1}, [r3]
++	vtbl.8  q2#lo, {q0}, q1#lo
++	vtbl.8  q2#hi, {q0}, q1#hi
++	add	r3, r3, #16
++	and	r3, r3, #~(1<<6)
++	vmov	q0, q2
++
++	@ Handle the last key differently.
++	subs	r2, r2, #1
++	beq	.Loop_enc_key_to_bsaes_last
++
++	@ Multiply by the circulant. This is its own inverse.
++	vtbl.8	q1#lo, {q0}, $mc_forward#lo
++	vtbl.8	q1#hi, {q0}, $mc_forward#hi
++	vmov	q0, q1
++	vtbl.8	q2#lo, {q1}, $mc_forward#lo
++	vtbl.8	q2#hi, {q1}, $mc_forward#hi
++	veor	q0, q0, q2
++	vtbl.8	q1#lo, {q2}, $mc_forward#lo
++	vtbl.8	q1#hi, {q2}, $mc_forward#hi
++	veor	q0, q0, q1
++
++	@ XOR and finish.
++	veor	q0, q0, $s63
++	bl	_vpaes_schedule_transform
++	vrev32.8	q0, q0
++	vst1.64	{q0}, [$out]!
++	b	.Loop_enc_key_to_bsaes
++
++.Loop_enc_key_to_bsaes_last:
++	@ The final key does not have a basis transform (note
++	@ .Lschedule_mangle_last inverts the original transform). It only XORs
++	@ 0x63 and applies ShiftRows. The latter was already inverted in the
++	@ loop. Note that, because we act on the original representation, we use
++	@ $s63_raw, not $s63.
++	veor	q0, q0, $s63_raw
++	vrev32.8	q0, q0
++	vst1.64	{q0}, [$out]
++
++	@ Wipe registers which contained key material.
++	veor	q0, q0, q0
++	veor	q1, q1, q1
++	veor	q2, q2, q2
++
++	ldmia	sp!, {r11, pc}	@ return
++.size	GFp_vpaes_encrypt_key_to_bsaes,.-GFp_vpaes_encrypt_key_to_bsaes
++___
++}
++
++{
++# Register-passed parameters.
++my ($inp, $out, $len, $key) = map("r$_", 0..3);
++# Temporaries. _vpaes_encrypt_core already uses r8..r11, so overlap $ivec and
++# $tmp. $ctr is r7 because it must be preserved across calls.
++my ($ctr, $ivec, $tmp) = map("r$_", 7..9);
++
++# void vpaes_ctr32_encrypt_blocks(const uint8_t *in, uint8_t *out, size_t len,
++#                                 const AES_KEY *key, const uint8_t ivec[16]);
++$code .= <<___;
++.globl	GFp_vpaes_ctr32_encrypt_blocks
++.type	GFp_vpaes_ctr32_encrypt_blocks,%function
++.align	4
++GFp_vpaes_ctr32_encrypt_blocks:
++	mov	ip, sp
++	stmdb	sp!, {r7-r11, lr}
++	@ This function uses q4-q7 (d8-d15), which are callee-saved.
++	vstmdb	sp!, {d8-d15}
++
++	cmp	$len, #0
++	@ $ivec is passed on the stack.
++	ldr	$ivec, [ip]
++	beq	.Lctr32_done
++
++	@ _vpaes_encrypt_core expects the key in r2, so swap $len and $key.
++	mov	$tmp, $key
++	mov	$key, $len
++	mov	$len, $tmp
++___
++my ($len, $key) = ($key, $len);
++$code .= <<___;
++
++	@ Load the IV and counter portion.
++	ldr	$ctr, [$ivec, #12]
++	vld1.8	{q7}, [$ivec]
++
++	bl	_vpaes_preheat
++	rev	$ctr, $ctr		@ The counter is big-endian.
++
++.Lctr32_loop:
++	vmov	q0, q7
++	vld1.8	{q6}, [$inp]!		@ Load input ahead of time
++	bl	_vpaes_encrypt_core
++	veor	q0, q0, q6		@ XOR input and result
++	vst1.8	{q0}, [$out]!
++	subs	$len, $len, #1
++	@ Update the counter.
++	add	$ctr, $ctr, #1
++	rev	$tmp, $ctr
++	vmov.32	q7#hi[1], $tmp
++	bne	.Lctr32_loop
++
++.Lctr32_done:
++	vldmia	sp!, {d8-d15}
++	ldmia	sp!, {r7-r11, pc}	@ return
++.size	GFp_vpaes_ctr32_encrypt_blocks,.-GFp_vpaes_ctr32_encrypt_blocks
++___
++}
++
++foreach (split("\n",$code)) {
++	s/\bq([0-9]+)#(lo|hi)/sprintf "d%d",2*$1+($2 eq "hi")/geo;
++	print $_,"\n";
++}
++
++close STDOUT;
+diff --git a/crypto/fipsmodule/aes/asm/vpaes-armv8.pl b/crypto/fipsmodule/aes/asm/vpaes-armv8.pl
+new file mode 100755
+index 0000000..b31bbb8
+--- /dev/null
++++ b/crypto/fipsmodule/aes/asm/vpaes-armv8.pl
+@@ -0,0 +1,837 @@
++#! /usr/bin/env perl
++# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
++#
++# Licensed under the OpenSSL license (the "License").  You may not use
++# this file except in compliance with the License.  You can obtain a copy
++# in the file LICENSE in the source distribution or at
++# https://www.openssl.org/source/license.html
++
++
++######################################################################
++## Constant-time SSSE3 AES core implementation.
++## version 0.1
++##
++## By Mike Hamburg (Stanford University), 2009
++## Public domain.
++##
++## For details see http://shiftleft.org/papers/vector_aes/ and
++## http://crypto.stanford.edu/vpaes/.
++##
++######################################################################
++# ARMv8 NEON adaptation by <appro@openssl.org>
++#
++# Reason for undertaken effort is that there is at least one popular
++# SoC based on Cortex-A53 that doesn't have crypto extensions.
++#
++#                   CBC enc     ECB enc/dec(*)   [bit-sliced enc/dec]
++# Cortex-A53        21.5        18.1/20.6        [17.5/19.8         ]
++# Cortex-A57        36.0(**)    20.4/24.9(**)    [14.4/16.6         ]
++# X-Gene            45.9(**)    45.8/57.7(**)    [33.1/37.6(**)     ]
++# Denver(***)       16.6(**)    15.1/17.8(**)    [8.80/9.93         ]
++# Apple A7(***)     22.7(**)    10.9/14.3        [8.45/10.0         ]
++# Mongoose(***)     26.3(**)    21.0/25.0(**)    [13.3/16.8         ]
++#
++# (*)	ECB denotes approximate result for parallelizable modes
++#	such as CBC decrypt, CTR, etc.;
++# (**)	these results are worse than scalar compiler-generated
++#	code, but it's constant-time and therefore preferred;
++# (***)	presented for reference/comparison purposes;
++
++$flavour = shift;
++while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {}
++
++$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
++( $xlate="${dir}arm-xlate.pl" and -f $xlate ) or
++( $xlate="${dir}../../../perlasm/arm-xlate.pl" and -f $xlate) or
++die "can't locate arm-xlate.pl";
++
++open OUT,"| \"$^X\" $xlate $flavour $output";
++*STDOUT=*OUT;
++
++$code.=<<___;
++#include <GFp/arm_arch.h>
++
++.section	.rodata
++
++.type	_vpaes_consts,%object
++.align	7	// totally strategic alignment
++_vpaes_consts:
++.Lk_mc_forward:	// mc_forward
++	.quad	0x0407060500030201, 0x0C0F0E0D080B0A09
++	.quad	0x080B0A0904070605, 0x000302010C0F0E0D
++	.quad	0x0C0F0E0D080B0A09, 0x0407060500030201
++	.quad	0x000302010C0F0E0D, 0x080B0A0904070605
++.Lk_mc_backward:// mc_backward
++	.quad	0x0605040702010003, 0x0E0D0C0F0A09080B
++	.quad	0x020100030E0D0C0F, 0x0A09080B06050407
++	.quad	0x0E0D0C0F0A09080B, 0x0605040702010003
++	.quad	0x0A09080B06050407, 0x020100030E0D0C0F
++.Lk_sr:		// sr
++	.quad	0x0706050403020100, 0x0F0E0D0C0B0A0908
++	.quad	0x030E09040F0A0500, 0x0B06010C07020D08
++	.quad	0x0F060D040B020900, 0x070E050C030A0108
++	.quad	0x0B0E0104070A0D00, 0x0306090C0F020508
++
++//
++// "Hot" constants
++//
++.Lk_inv:	// inv, inva
++	.quad	0x0E05060F0D080180, 0x040703090A0B0C02
++	.quad	0x01040A060F0B0780, 0x030D0E0C02050809
++.Lk_ipt:	// input transform (lo, hi)
++	.quad	0xC2B2E8985A2A7000, 0xCABAE09052227808
++	.quad	0x4C01307D317C4D00, 0xCD80B1FCB0FDCC81
++.Lk_sbo:	// sbou, sbot
++	.quad	0xD0D26D176FBDC700, 0x15AABF7AC502A878
++	.quad	0xCFE474A55FBB6A00, 0x8E1E90D1412B35FA
++.Lk_sb1:	// sb1u, sb1t
++	.quad	0x3618D415FAE22300, 0x3BF7CCC10D2ED9EF
++	.quad	0xB19BE18FCB503E00, 0xA5DF7A6E142AF544
++.Lk_sb2:	// sb2u, sb2t
++	.quad	0x69EB88400AE12900, 0xC2A163C8AB82234A
++	.quad	0xE27A93C60B712400, 0x5EB7E955BC982FCD
++
++//
++//  Key schedule constants
++//
++.Lk_dksd:	// decryption key schedule: invskew x*D
++	.quad	0xFEB91A5DA3E44700, 0x0740E3A45A1DBEF9
++	.quad	0x41C277F4B5368300, 0x5FDC69EAAB289D1E
++.Lk_dksb:	// decryption key schedule: invskew x*B
++	.quad	0x9A4FCA1F8550D500, 0x03D653861CC94C99
++	.quad	0x115BEDA7B6FC4A00, 0xD993256F7E3482C8
++.Lk_dkse:	// decryption key schedule: invskew x*E + 0x63
++	.quad	0xD5031CCA1FC9D600, 0x53859A4C994F5086
++	.quad	0xA23196054FDC7BE8, 0xCD5EF96A20B31487
++.Lk_dks9:	// decryption key schedule: invskew x*9
++	.quad	0xB6116FC87ED9A700, 0x4AED933482255BFC
++	.quad	0x4576516227143300, 0x8BB89FACE9DAFDCE
++
++.Lk_rcon:	// rcon
++	.quad	0x1F8391B9AF9DEEB6, 0x702A98084D7C7D81
++
++.Lk_opt:	// output transform
++	.quad	0xFF9F4929D6B66000, 0xF7974121DEBE6808
++	.quad	0x01EDBD5150BCEC00, 0xE10D5DB1B05C0CE0
++.Lk_deskew:	// deskew tables: inverts the sbox's "skew"
++	.quad	0x07E4A34047A4E300, 0x1DFEB95A5DBEF91A
++	.quad	0x5F36B5DC83EA6900, 0x2841C2ABF49D1E77
++
++.asciz  "Vector Permutation AES for ARMv8, Mike Hamburg (Stanford University)"
++.size	_vpaes_consts,.-_vpaes_consts
++.align	6
++
++.text
++___
++
++{
++my ($inp,$out,$key) = map("x$_",(0..2));
++
++my ($invlo,$invhi,$iptlo,$ipthi,$sbou,$sbot) = map("v$_.16b",(18..23));
++my ($sb1u,$sb1t,$sb2u,$sb2t) = map("v$_.16b",(24..27));
++my ($sb9u,$sb9t,$sbdu,$sbdt,$sbbu,$sbbt,$sbeu,$sbet)=map("v$_.16b",(24..31));
++
++$code.=<<___;
++##
++##  _aes_preheat
++##
++##  Fills register %r10 -> .aes_consts (so you can -fPIC)
++##  and %xmm9-%xmm15 as specified below.
++##
++.type	_vpaes_encrypt_preheat,%function
++.align	4
++_vpaes_encrypt_preheat:
++	adrp	x10, :pg_hi21:.Lk_inv
++	add	x10, x10, :lo12:.Lk_inv
++	movi	v17.16b, #0x0f
++	ld1	{v18.2d-v19.2d}, [x10],#32	// .Lk_inv
++	ld1	{v20.2d-v23.2d}, [x10],#64	// .Lk_ipt, .Lk_sbo
++	ld1	{v24.2d-v27.2d}, [x10]		// .Lk_sb1, .Lk_sb2
++	ret
++.size	_vpaes_encrypt_preheat,.-_vpaes_encrypt_preheat
++
++##
++##  _aes_encrypt_core
++##
++##  AES-encrypt %xmm0.
++##
++##  Inputs:
++##     %xmm0 = input
++##     %xmm9-%xmm15 as in _vpaes_preheat
++##    (%rdx) = scheduled keys
++##
++##  Output in %xmm0
++##  Clobbers  %xmm1-%xmm5, %r9, %r10, %r11, %rax
++##  Preserves %xmm6 - %xmm8 so you get some local vectors
++##
++##
++.type	_vpaes_encrypt_core,%function
++.align 4
++_vpaes_encrypt_core:
++	mov	x9, $key
++	ldr	w8, [$key,#240]			// pull rounds
++	adrp	x11, :pg_hi21:.Lk_mc_forward+16
++	add	x11, x11, :lo12:.Lk_mc_forward+16
++						// vmovdqa	.Lk_ipt(%rip),	%xmm2	# iptlo
++	ld1	{v16.2d}, [x9], #16		// vmovdqu	(%r9),	%xmm5		# round0 key
++	and	v1.16b, v7.16b, v17.16b		// vpand	%xmm9,	%xmm0,	%xmm1
++	ushr	v0.16b, v7.16b, #4		// vpsrlb	\$4,	%xmm0,	%xmm0
++	tbl	v1.16b, {$iptlo}, v1.16b	// vpshufb	%xmm1,	%xmm2,	%xmm1
++						// vmovdqa	.Lk_ipt+16(%rip), %xmm3	# ipthi
++	tbl	v2.16b, {$ipthi}, v0.16b	// vpshufb	%xmm0,	%xmm3,	%xmm2
++	eor	v0.16b, v1.16b, v16.16b		// vpxor	%xmm5,	%xmm1,	%xmm0
++	eor	v0.16b, v0.16b, v2.16b		// vpxor	%xmm2,	%xmm0,	%xmm0
++	b	.Lenc_entry
++
++.align 4
++.Lenc_loop:
++	// middle of middle round
++	add	x10, x11, #0x40
++	tbl	v4.16b, {$sb1t}, v2.16b		// vpshufb	%xmm2,	%xmm13,	%xmm4	# 4 = sb1u
++	ld1	{v1.2d}, [x11], #16		// vmovdqa	-0x40(%r11,%r10), %xmm1	# .Lk_mc_forward[]
++	tbl	v0.16b, {$sb1u}, v3.16b		// vpshufb	%xmm3,	%xmm12,	%xmm0	# 0 = sb1t
++	eor	v4.16b, v4.16b, v16.16b		// vpxor	%xmm5,	%xmm4,	%xmm4	# 4 = sb1u + k
++	tbl	v5.16b,	{$sb2t}, v2.16b		// vpshufb	%xmm2,	%xmm15,	%xmm5	# 4 = sb2u
++	eor	v0.16b, v0.16b, v4.16b		// vpxor	%xmm4,	%xmm0,	%xmm0	# 0 = A
++	tbl	v2.16b, {$sb2u}, v3.16b		// vpshufb	%xmm3,	%xmm14,	%xmm2	# 2 = sb2t
++	ld1	{v4.2d}, [x10]			// vmovdqa	(%r11,%r10), %xmm4	# .Lk_mc_backward[]
++	tbl	v3.16b, {v0.16b}, v1.16b	// vpshufb	%xmm1,	%xmm0,	%xmm3	# 0 = B
++	eor	v2.16b, v2.16b, v5.16b		// vpxor	%xmm5,	%xmm2,	%xmm2	# 2 = 2A
++	tbl	v0.16b, {v0.16b}, v4.16b	// vpshufb	%xmm4,	%xmm0,	%xmm0	# 3 = D
++	eor	v3.16b, v3.16b, v2.16b		// vpxor	%xmm2,	%xmm3,	%xmm3	# 0 = 2A+B
++	tbl	v4.16b, {v3.16b}, v1.16b	// vpshufb	%xmm1,	%xmm3,	%xmm4	# 0 = 2B+C
++	eor	v0.16b, v0.16b, v3.16b		// vpxor	%xmm3,	%xmm0,	%xmm0	# 3 = 2A+B+D
++	and	x11, x11, #~(1<<6)		// and		\$0x30,	%r11		# ... mod 4
++	eor	v0.16b, v0.16b, v4.16b		// vpxor	%xmm4,	%xmm0, %xmm0	# 0 = 2A+3B+C+D
++	sub	w8, w8, #1			// nr--
++
++.Lenc_entry:
++	// top of round
++	and	v1.16b, v0.16b, v17.16b		// vpand	%xmm0,	%xmm9,	%xmm1   # 0 = k
++	ushr	v0.16b, v0.16b, #4		// vpsrlb	\$4,	%xmm0,	%xmm0	# 1 = i
++	tbl	v5.16b, {$invhi}, v1.16b	// vpshufb	%xmm1,	%xmm11,	%xmm5	# 2 = a/k
++	eor	v1.16b, v1.16b, v0.16b		// vpxor	%xmm0,	%xmm1,	%xmm1	# 0 = j
++	tbl	v3.16b, {$invlo}, v0.16b	// vpshufb	%xmm0, 	%xmm10,	%xmm3  	# 3 = 1/i
++	tbl	v4.16b, {$invlo}, v1.16b	// vpshufb	%xmm1, 	%xmm10,	%xmm4  	# 4 = 1/j
++	eor	v3.16b, v3.16b, v5.16b		// vpxor	%xmm5,	%xmm3,	%xmm3	# 3 = iak = 1/i + a/k
++	eor	v4.16b, v4.16b, v5.16b		// vpxor	%xmm5,	%xmm4,	%xmm4  	# 4 = jak = 1/j + a/k
++	tbl	v2.16b, {$invlo}, v3.16b	// vpshufb	%xmm3,	%xmm10,	%xmm2  	# 2 = 1/iak
++	tbl	v3.16b, {$invlo}, v4.16b	// vpshufb	%xmm4,	%xmm10,	%xmm3	# 3 = 1/jak
++	eor	v2.16b, v2.16b, v1.16b		// vpxor	%xmm1,	%xmm2,	%xmm2  	# 2 = io
++	eor	v3.16b, v3.16b, v0.16b		// vpxor	%xmm0,	%xmm3,	%xmm3	# 3 = jo
++	ld1	{v16.2d}, [x9],#16		// vmovdqu	(%r9),	%xmm5
++	cbnz	w8, .Lenc_loop
++
++	// middle of last round
++	add	x10, x11, #0x80
++						// vmovdqa	-0x60(%r10), %xmm4	# 3 : sbou	.Lk_sbo
++						// vmovdqa	-0x50(%r10), %xmm0	# 0 : sbot	.Lk_sbo+16
++	tbl	v4.16b, {$sbou}, v2.16b		// vpshufb	%xmm2,	%xmm4,	%xmm4	# 4 = sbou
++	ld1	{v1.2d}, [x10]			// vmovdqa	0x40(%r11,%r10), %xmm1	# .Lk_sr[]
++	tbl	v0.16b, {$sbot}, v3.16b		// vpshufb	%xmm3,	%xmm0,	%xmm0	# 0 = sb1t
++	eor	v4.16b, v4.16b, v16.16b		// vpxor	%xmm5,	%xmm4,	%xmm4	# 4 = sb1u + k
++	eor	v0.16b, v0.16b, v4.16b		// vpxor	%xmm4,	%xmm0,	%xmm0	# 0 = A
++	tbl	v0.16b, {v0.16b}, v1.16b	// vpshufb	%xmm1,	%xmm0,	%xmm0
++	ret
++.size	_vpaes_encrypt_core,.-_vpaes_encrypt_core
++
++.globl	GFp_vpaes_encrypt
++.type	GFp_vpaes_encrypt,%function
++.align	4
++GFp_vpaes_encrypt:
++	AARCH64_SIGN_LINK_REGISTER
++	stp	x29,x30,[sp,#-16]!
++	add	x29,sp,#0
++
++	ld1	{v7.16b}, [$inp]
++	bl	_vpaes_encrypt_preheat
++	bl	_vpaes_encrypt_core
++	st1	{v0.16b}, [$out]
++
++	ldp	x29,x30,[sp],#16
++	AARCH64_VALIDATE_LINK_REGISTER
++	ret
++.size	GFp_vpaes_encrypt,.-GFp_vpaes_encrypt
++
++.type	_vpaes_encrypt_2x,%function
++.align 4
++_vpaes_encrypt_2x:
++	mov	x9, $key
++	ldr	w8, [$key,#240]			// pull rounds
++	adrp	x11, :pg_hi21:.Lk_mc_forward+16
++	add	x11, x11, :lo12:.Lk_mc_forward+16
++						// vmovdqa	.Lk_ipt(%rip),	%xmm2	# iptlo
++	ld1	{v16.2d}, [x9], #16		// vmovdqu	(%r9),	%xmm5		# round0 key
++	and	v1.16b,  v14.16b,  v17.16b	// vpand	%xmm9,	%xmm0,	%xmm1
++	ushr	v0.16b,  v14.16b,  #4		// vpsrlb	\$4,	%xmm0,	%xmm0
++	 and	v9.16b,  v15.16b,  v17.16b
++	 ushr	v8.16b,  v15.16b,  #4
++	tbl	v1.16b,  {$iptlo}, v1.16b	// vpshufb	%xmm1,	%xmm2,	%xmm1
++	 tbl	v9.16b,  {$iptlo}, v9.16b
++						// vmovdqa	.Lk_ipt+16(%rip), %xmm3	# ipthi
++	tbl	v2.16b,  {$ipthi}, v0.16b	// vpshufb	%xmm0,	%xmm3,	%xmm2
++	 tbl	v10.16b, {$ipthi}, v8.16b
++	eor	v0.16b,  v1.16b,   v16.16b	// vpxor	%xmm5,	%xmm1,	%xmm0
++	 eor	v8.16b,  v9.16b,   v16.16b
++	eor	v0.16b,  v0.16b,   v2.16b	// vpxor	%xmm2,	%xmm0,	%xmm0
++	 eor	v8.16b,  v8.16b,   v10.16b
++	b	.Lenc_2x_entry
++
++.align 4
++.Lenc_2x_loop:
++	// middle of middle round
++	add	x10, x11, #0x40
++	tbl	v4.16b,  {$sb1t}, v2.16b	// vpshufb	%xmm2,	%xmm13,	%xmm4	# 4 = sb1u
++	 tbl	v12.16b, {$sb1t}, v10.16b
++	ld1	{v1.2d}, [x11], #16		// vmovdqa	-0x40(%r11,%r10), %xmm1	# .Lk_mc_forward[]
++	tbl	v0.16b,  {$sb1u}, v3.16b	// vpshufb	%xmm3,	%xmm12,	%xmm0	# 0 = sb1t
++	 tbl	v8.16b,  {$sb1u}, v11.16b
++	eor	v4.16b,  v4.16b,  v16.16b	// vpxor	%xmm5,	%xmm4,	%xmm4	# 4 = sb1u + k
++	 eor	v12.16b, v12.16b, v16.16b
++	tbl	v5.16b,	 {$sb2t}, v2.16b	// vpshufb	%xmm2,	%xmm15,	%xmm5	# 4 = sb2u
++	 tbl	v13.16b, {$sb2t}, v10.16b
++	eor	v0.16b,  v0.16b,  v4.16b	// vpxor	%xmm4,	%xmm0,	%xmm0	# 0 = A
++	 eor	v8.16b,  v8.16b,  v12.16b
++	tbl	v2.16b,  {$sb2u}, v3.16b	// vpshufb	%xmm3,	%xmm14,	%xmm2	# 2 = sb2t
++	 tbl	v10.16b, {$sb2u}, v11.16b
++	ld1	{v4.2d}, [x10]			// vmovdqa	(%r11,%r10), %xmm4	# .Lk_mc_backward[]
++	tbl	v3.16b,  {v0.16b}, v1.16b	// vpshufb	%xmm1,	%xmm0,	%xmm3	# 0 = B
++	 tbl	v11.16b, {v8.16b}, v1.16b
++	eor	v2.16b,  v2.16b,  v5.16b	// vpxor	%xmm5,	%xmm2,	%xmm2	# 2 = 2A
++	 eor	v10.16b, v10.16b, v13.16b
++	tbl	v0.16b,  {v0.16b}, v4.16b	// vpshufb	%xmm4,	%xmm0,	%xmm0	# 3 = D
++	 tbl	v8.16b,  {v8.16b}, v4.16b
++	eor	v3.16b,  v3.16b,  v2.16b	// vpxor	%xmm2,	%xmm3,	%xmm3	# 0 = 2A+B
++	 eor	v11.16b, v11.16b, v10.16b
++	tbl	v4.16b,  {v3.16b}, v1.16b	// vpshufb	%xmm1,	%xmm3,	%xmm4	# 0 = 2B+C
++	 tbl	v12.16b, {v11.16b},v1.16b
++	eor	v0.16b,  v0.16b,  v3.16b	// vpxor	%xmm3,	%xmm0,	%xmm0	# 3 = 2A+B+D
++	 eor	v8.16b,  v8.16b,  v11.16b
++	and	x11, x11, #~(1<<6)		// and		\$0x30,	%r11		# ... mod 4
++	eor	v0.16b,  v0.16b,  v4.16b	// vpxor	%xmm4,	%xmm0, %xmm0	# 0 = 2A+3B+C+D
++	 eor	v8.16b,  v8.16b,  v12.16b
++	sub	w8, w8, #1			// nr--
++
++.Lenc_2x_entry:
++	// top of round
++	and	v1.16b,  v0.16b, v17.16b	// vpand	%xmm0,	%xmm9,	%xmm1   # 0 = k
++	ushr	v0.16b,  v0.16b, #4		// vpsrlb	\$4,	%xmm0,	%xmm0	# 1 = i
++	 and	v9.16b,  v8.16b, v17.16b
++	 ushr	v8.16b,  v8.16b, #4
++	tbl	v5.16b,  {$invhi},v1.16b	// vpshufb	%xmm1,	%xmm11,	%xmm5	# 2 = a/k
++	 tbl	v13.16b, {$invhi},v9.16b
++	eor	v1.16b,  v1.16b,  v0.16b	// vpxor	%xmm0,	%xmm1,	%xmm1	# 0 = j
++	 eor	v9.16b,  v9.16b,  v8.16b
++	tbl	v3.16b,  {$invlo},v0.16b	// vpshufb	%xmm0, 	%xmm10,	%xmm3  	# 3 = 1/i
++	 tbl	v11.16b, {$invlo},v8.16b
++	tbl	v4.16b,  {$invlo},v1.16b	// vpshufb	%xmm1, 	%xmm10,	%xmm4  	# 4 = 1/j
++	 tbl	v12.16b, {$invlo},v9.16b
++	eor	v3.16b,  v3.16b,  v5.16b	// vpxor	%xmm5,	%xmm3,	%xmm3	# 3 = iak = 1/i + a/k
++	 eor	v11.16b, v11.16b, v13.16b
++	eor	v4.16b,  v4.16b,  v5.16b	// vpxor	%xmm5,	%xmm4,	%xmm4  	# 4 = jak = 1/j + a/k
++	 eor	v12.16b, v12.16b, v13.16b
++	tbl	v2.16b,  {$invlo},v3.16b	// vpshufb	%xmm3,	%xmm10,	%xmm2  	# 2 = 1/iak
++	 tbl	v10.16b, {$invlo},v11.16b
++	tbl	v3.16b,  {$invlo},v4.16b	// vpshufb	%xmm4,	%xmm10,	%xmm3	# 3 = 1/jak
++	 tbl	v11.16b, {$invlo},v12.16b
++	eor	v2.16b,  v2.16b,  v1.16b	// vpxor	%xmm1,	%xmm2,	%xmm2  	# 2 = io
++	 eor	v10.16b, v10.16b, v9.16b
++	eor	v3.16b,  v3.16b,  v0.16b	// vpxor	%xmm0,	%xmm3,	%xmm3	# 3 = jo
++	 eor	v11.16b, v11.16b, v8.16b
++	ld1	{v16.2d}, [x9],#16		// vmovdqu	(%r9),	%xmm5
++	cbnz	w8, .Lenc_2x_loop
++
++	// middle of last round
++	add	x10, x11, #0x80
++						// vmovdqa	-0x60(%r10), %xmm4	# 3 : sbou	.Lk_sbo
++						// vmovdqa	-0x50(%r10), %xmm0	# 0 : sbot	.Lk_sbo+16
++	tbl	v4.16b,  {$sbou}, v2.16b	// vpshufb	%xmm2,	%xmm4,	%xmm4	# 4 = sbou
++	 tbl	v12.16b, {$sbou}, v10.16b
++	ld1	{v1.2d}, [x10]			// vmovdqa	0x40(%r11,%r10), %xmm1	# .Lk_sr[]
++	tbl	v0.16b,  {$sbot}, v3.16b	// vpshufb	%xmm3,	%xmm0,	%xmm0	# 0 = sb1t
++	 tbl	v8.16b,  {$sbot}, v11.16b
++	eor	v4.16b,  v4.16b,  v16.16b	// vpxor	%xmm5,	%xmm4,	%xmm4	# 4 = sb1u + k
++	 eor	v12.16b, v12.16b, v16.16b
++	eor	v0.16b,  v0.16b,  v4.16b	// vpxor	%xmm4,	%xmm0,	%xmm0	# 0 = A
++	 eor	v8.16b,  v8.16b,  v12.16b
++	tbl	v0.16b,  {v0.16b},v1.16b	// vpshufb	%xmm1,	%xmm0,	%xmm0
++	 tbl	v1.16b,  {v8.16b},v1.16b
++	ret
++.size	_vpaes_encrypt_2x,.-_vpaes_encrypt_2x
++___
++}
++{
++my ($inp,$bits,$out,$dir)=("x0","w1","x2","w3");
++my ($invlo,$invhi,$iptlo,$ipthi,$rcon) = map("v$_.16b",(18..21,8));
++
++$code.=<<___;
++########################################################
++##                                                    ##
++##                  AES key schedule                  ##
++##                                                    ##
++########################################################
++.type	_vpaes_key_preheat,%function
++.align	4
++_vpaes_key_preheat:
++	adrp	x10, :pg_hi21:.Lk_inv
++	add	x10, x10, :lo12:.Lk_inv
++	movi	v16.16b, #0x5b			// .Lk_s63
++	adrp	x11, :pg_hi21:.Lk_sb1
++	add	x11, x11, :lo12:.Lk_sb1
++	movi	v17.16b, #0x0f			// .Lk_s0F
++	ld1	{v18.2d-v21.2d}, [x10]		// .Lk_inv, .Lk_ipt
++	adrp	x10, :pg_hi21:.Lk_dksd
++	add	x10, x10, :lo12:.Lk_dksd
++	ld1	{v22.2d-v23.2d}, [x11]		// .Lk_sb1
++	adrp	x11, :pg_hi21:.Lk_mc_forward
++	add	x11, x11, :lo12:.Lk_mc_forward
++	ld1	{v24.2d-v27.2d}, [x10],#64	// .Lk_dksd, .Lk_dksb
++	ld1	{v28.2d-v31.2d}, [x10],#64	// .Lk_dkse, .Lk_dks9
++	ld1	{v8.2d}, [x10]			// .Lk_rcon
++	ld1	{v9.2d}, [x11]			// .Lk_mc_forward[0]
++	ret
++.size	_vpaes_key_preheat,.-_vpaes_key_preheat
++
++.type	_vpaes_schedule_core,%function
++.align	4
++_vpaes_schedule_core:
++	AARCH64_SIGN_LINK_REGISTER
++	stp	x29, x30, [sp,#-16]!
++	add	x29,sp,#0
++
++	bl	_vpaes_key_preheat		// load the tables
++
++	ld1	{v0.16b}, [$inp],#16		// vmovdqu	(%rdi),	%xmm0		# load key (unaligned)
++
++	// input transform
++	mov	v3.16b, v0.16b			// vmovdqa	%xmm0,	%xmm3
++	bl	_vpaes_schedule_transform
++	mov	v7.16b, v0.16b			// vmovdqa	%xmm0,	%xmm7
++
++	adrp	x10, :pg_hi21:.Lk_sr		// lea	.Lk_sr(%rip),%r10
++	add	x10, x10, :lo12:.Lk_sr
++
++	add	x8, x8, x10
++
++	// encrypting, output zeroth round key after transform
++	st1	{v0.2d}, [$out]			// vmovdqu	%xmm0,	(%rdx)
++
++	cmp	$bits, #192			// cmp	\$192,	%esi
++	b.hi	.Lschedule_256
++	b.eq	.Lschedule_192
++	// 128: fall though
++
++##
++##  .schedule_128
++##
++##  128-bit specific part of key schedule.
++##
++##  This schedule is really simple, because all its parts
++##  are accomplished by the subroutines.
++##
++.Lschedule_128:
++	mov	$inp, #10			// mov	\$10, %esi
++
++.Loop_schedule_128:
++	sub	$inp, $inp, #1			// dec	%esi
++	bl 	_vpaes_schedule_round
++	cbz 	$inp, .Lschedule_mangle_last
++	bl	_vpaes_schedule_mangle		// write output
++	b 	.Loop_schedule_128
++
++##
++##  .aes_schedule_192
++##
++##  192-bit specific part of key schedule.
++##
++##  The main body of this schedule is the same as the 128-bit
++##  schedule, but with more smearing.  The long, high side is
++##  stored in %xmm7 as before, and the short, low side is in
++##  the high bits of %xmm6.
++##
++##  This schedule is somewhat nastier, however, because each
++##  round produces 192 bits of key material, or 1.5 round keys.
++##  Therefore, on each cycle we do 2 rounds and produce 3 round
++##  keys.
++##
++.align	4
++.Lschedule_192:
++	sub	$inp, $inp, #8
++	ld1	{v0.16b}, [$inp]		// vmovdqu	8(%rdi),%xmm0		# load key part 2 (very unaligned)
++	bl	_vpaes_schedule_transform	// input transform
++	mov	v6.16b, v0.16b			// vmovdqa	%xmm0,	%xmm6		# save short part
++	eor	v4.16b, v4.16b, v4.16b		// vpxor	%xmm4,	%xmm4, %xmm4	# clear 4
++	ins	v6.d[0], v4.d[0]		// vmovhlps	%xmm4,	%xmm6,	%xmm6		# clobber low side with zeros
++	mov	$inp, #4			// mov	\$4,	%esi
++
++.Loop_schedule_192:
++	sub	$inp, $inp, #1			// dec	%esi
++	bl	_vpaes_schedule_round
++	ext	v0.16b, v6.16b, v0.16b, #8	// vpalignr	\$8,%xmm6,%xmm0,%xmm0
++	bl	_vpaes_schedule_mangle		// save key n
++	bl	_vpaes_schedule_192_smear
++	bl	_vpaes_schedule_mangle		// save key n+1
++	bl	_vpaes_schedule_round
++	cbz 	$inp, .Lschedule_mangle_last
++	bl	_vpaes_schedule_mangle		// save key n+2
++	bl	_vpaes_schedule_192_smear
++	b	.Loop_schedule_192
++
++##
++##  .aes_schedule_256
++##
++##  256-bit specific part of key schedule.
++##
++##  The structure here is very similar to the 128-bit
++##  schedule, but with an additional "low side" in
++##  %xmm6.  The low side's rounds are the same as the
++##  high side's, except no rcon and no rotation.
++##
++.align	4
++.Lschedule_256:
++	ld1	{v0.16b}, [$inp]		// vmovdqu	16(%rdi),%xmm0		# load key part 2 (unaligned)
++	bl	_vpaes_schedule_transform	// input transform
++	mov	$inp, #7			// mov	\$7, %esi
++
++.Loop_schedule_256:
++	sub	$inp, $inp, #1			// dec	%esi
++	bl	_vpaes_schedule_mangle		// output low result
++	mov	v6.16b, v0.16b			// vmovdqa	%xmm0,	%xmm6		# save cur_lo in xmm6
++
++	// high round
++	bl	_vpaes_schedule_round
++	cbz 	$inp, .Lschedule_mangle_last
++	bl	_vpaes_schedule_mangle
++
++	// low round. swap xmm7 and xmm6
++	dup	v0.4s, v0.s[3]			// vpshufd	\$0xFF,	%xmm0,	%xmm0
++	movi	v4.16b, #0
++	mov	v5.16b, v7.16b			// vmovdqa	%xmm7,	%xmm5
++	mov	v7.16b, v6.16b			// vmovdqa	%xmm6,	%xmm7
++	bl	_vpaes_schedule_low_round
++	mov	v7.16b, v5.16b			// vmovdqa	%xmm5,	%xmm7
++
++	b	.Loop_schedule_256
++
++##
++##  .aes_schedule_mangle_last
++##
++##  Mangler for last round of key schedule
++##  Mangles %xmm0
++##    when encrypting, outputs out(%xmm0) ^ 63
++##    when decrypting, outputs unskew(%xmm0)
++##
++##  Always called right before return... jumps to cleanup and exits
++##
++.align	4
++.Lschedule_mangle_last:
++	// schedule last round key from xmm0
++	adrp	x11, :pg_hi21:.Lk_deskew	// lea	.Lk_deskew(%rip),%r11	# prepare to deskew
++	add	x11, x11, :lo12:.Lk_deskew
++
++	cbnz	$dir, .Lschedule_mangle_last_dec
++
++	// encrypting
++	ld1	{v1.2d}, [x8]			// vmovdqa	(%r8,%r10),%xmm1
++	adrp	x11, :pg_hi21:.Lk_opt		// lea	.Lk_opt(%rip),	%r11		# prepare to output transform
++	add	x11, x11, :lo12:.Lk_opt
++	add	$out, $out, #32			// add	\$32,	%rdx
++	tbl	v0.16b, {v0.16b}, v1.16b	// vpshufb	%xmm1,	%xmm0,	%xmm0		# output permute
++
++.Lschedule_mangle_last_dec:
++	ld1	{v20.2d-v21.2d}, [x11]		// reload constants
++	sub	$out, $out, #16			// add	\$-16,	%rdx
++	eor	v0.16b, v0.16b, v16.16b		// vpxor	.Lk_s63(%rip),	%xmm0,	%xmm0
++	bl	_vpaes_schedule_transform	// output transform
++	st1	{v0.2d}, [$out]			// vmovdqu	%xmm0,	(%rdx)		# save last key
++
++	// cleanup
++	eor	v0.16b, v0.16b, v0.16b		// vpxor	%xmm0,	%xmm0,	%xmm0
++	eor	v1.16b, v1.16b, v1.16b		// vpxor	%xmm1,	%xmm1,	%xmm1
++	eor	v2.16b, v2.16b, v2.16b		// vpxor	%xmm2,	%xmm2,	%xmm2
++	eor	v3.16b, v3.16b, v3.16b		// vpxor	%xmm3,	%xmm3,	%xmm3
++	eor	v4.16b, v4.16b, v4.16b		// vpxor	%xmm4,	%xmm4,	%xmm4
++	eor	v5.16b, v5.16b, v5.16b		// vpxor	%xmm5,	%xmm5,	%xmm5
++	eor	v6.16b, v6.16b, v6.16b		// vpxor	%xmm6,	%xmm6,	%xmm6
++	eor	v7.16b, v7.16b, v7.16b		// vpxor	%xmm7,	%xmm7,	%xmm7
++	ldp	x29, x30, [sp],#16
++	AARCH64_VALIDATE_LINK_REGISTER
++	ret
++.size	_vpaes_schedule_core,.-_vpaes_schedule_core
++
++##
++##  .aes_schedule_192_smear
++##
++##  Smear the short, low side in the 192-bit key schedule.
++##
++##  Inputs:
++##    %xmm7: high side, b  a  x  y
++##    %xmm6:  low side, d  c  0  0
++##    %xmm13: 0
++##
++##  Outputs:
++##    %xmm6: b+c+d  b+c  0  0
++##    %xmm0: b+c+d  b+c  b  a
++##
++.type	_vpaes_schedule_192_smear,%function
++.align	4
++_vpaes_schedule_192_smear:
++	movi	v1.16b, #0
++	dup	v0.4s, v7.s[3]
++	ins	v1.s[3], v6.s[2]	// vpshufd	\$0x80,	%xmm6,	%xmm1	# d c 0 0 -> c 0 0 0
++	ins	v0.s[0], v7.s[2]	// vpshufd	\$0xFE,	%xmm7,	%xmm0	# b a _ _ -> b b b a
++	eor	v6.16b, v6.16b, v1.16b	// vpxor	%xmm1,	%xmm6,	%xmm6	# -> c+d c 0 0
++	eor	v1.16b, v1.16b, v1.16b	// vpxor	%xmm1,	%xmm1,	%xmm1
++	eor	v6.16b, v6.16b, v0.16b	// vpxor	%xmm0,	%xmm6,	%xmm6	# -> b+c+d b+c b a
++	mov	v0.16b, v6.16b		// vmovdqa	%xmm6,	%xmm0
++	ins	v6.d[0], v1.d[0]	// vmovhlps	%xmm1,	%xmm6,	%xmm6	# clobber low side with zeros
++	ret
++.size	_vpaes_schedule_192_smear,.-_vpaes_schedule_192_smear
++
++##
++##  .aes_schedule_round
++##
++##  Runs one main round of the key schedule on %xmm0, %xmm7
++##
++##  Specifically, runs subbytes on the high dword of %xmm0
++##  then rotates it by one byte and xors into the low dword of
++##  %xmm7.
++##
++##  Adds rcon from low byte of %xmm8, then rotates %xmm8 for
++##  next rcon.
++##
++##  Smears the dwords of %xmm7 by xoring the low into the
++##  second low, result into third, result into highest.
++##
++##  Returns results in %xmm7 = %xmm0.
++##  Clobbers %xmm1-%xmm4, %r11.
++##
++.type	_vpaes_schedule_round,%function
++.align	4
++_vpaes_schedule_round:
++	// extract rcon from xmm8
++	movi	v4.16b, #0			// vpxor	%xmm4,	%xmm4,	%xmm4
++	ext	v1.16b, $rcon, v4.16b, #15	// vpalignr	\$15,	%xmm8,	%xmm4,	%xmm1
++	ext	$rcon, $rcon, $rcon, #15	// vpalignr	\$15,	%xmm8,	%xmm8,	%xmm8
++	eor	v7.16b, v7.16b, v1.16b		// vpxor	%xmm1,	%xmm7,	%xmm7
++
++	// rotate
++	dup	v0.4s, v0.s[3]			// vpshufd	\$0xFF,	%xmm0,	%xmm0
++	ext	v0.16b, v0.16b, v0.16b, #1	// vpalignr	\$1,	%xmm0,	%xmm0,	%xmm0
++
++	// fall through...
++
++	// low round: same as high round, but no rotation and no rcon.
++_vpaes_schedule_low_round:
++	// smear xmm7
++	ext	v1.16b, v4.16b, v7.16b, #12	// vpslldq	\$4,	%xmm7,	%xmm1
++	eor	v7.16b, v7.16b, v1.16b		// vpxor	%xmm1,	%xmm7,	%xmm7
++	ext	v4.16b, v4.16b, v7.16b, #8	// vpslldq	\$8,	%xmm7,	%xmm4
++
++	// subbytes
++	and	v1.16b, v0.16b, v17.16b		// vpand	%xmm9,	%xmm0,	%xmm1		# 0 = k
++	ushr	v0.16b, v0.16b, #4		// vpsrlb	\$4,	%xmm0,	%xmm0		# 1 = i
++	 eor	v7.16b, v7.16b, v4.16b		// vpxor	%xmm4,	%xmm7,	%xmm7
++	tbl	v2.16b, {$invhi}, v1.16b	// vpshufb	%xmm1,	%xmm11,	%xmm2		# 2 = a/k
++	eor	v1.16b, v1.16b, v0.16b		// vpxor	%xmm0,	%xmm1,	%xmm1		# 0 = j
++	tbl	v3.16b, {$invlo}, v0.16b	// vpshufb	%xmm0, 	%xmm10,	%xmm3		# 3 = 1/i
++	eor	v3.16b, v3.16b, v2.16b		// vpxor	%xmm2,	%xmm3,	%xmm3		# 3 = iak = 1/i + a/k
++	tbl	v4.16b, {$invlo}, v1.16b	// vpshufb	%xmm1,	%xmm10,	%xmm4		# 4 = 1/j
++	 eor	v7.16b, v7.16b, v16.16b		// vpxor	.Lk_s63(%rip),	%xmm7,	%xmm7
++	tbl	v3.16b, {$invlo}, v3.16b	// vpshufb	%xmm3,	%xmm10,	%xmm3		# 2 = 1/iak
++	eor	v4.16b, v4.16b, v2.16b		// vpxor	%xmm2,	%xmm4,	%xmm4		# 4 = jak = 1/j + a/k
++	tbl	v2.16b, {$invlo}, v4.16b	// vpshufb	%xmm4,	%xmm10,	%xmm2		# 3 = 1/jak
++	eor	v3.16b, v3.16b, v1.16b		// vpxor	%xmm1,	%xmm3,	%xmm3		# 2 = io
++	eor	v2.16b, v2.16b, v0.16b		// vpxor	%xmm0,	%xmm2,	%xmm2		# 3 = jo
++	tbl	v4.16b, {v23.16b}, v3.16b	// vpshufb	%xmm3,	%xmm13,	%xmm4		# 4 = sbou
++	tbl	v1.16b, {v22.16b}, v2.16b	// vpshufb	%xmm2,	%xmm12,	%xmm1		# 0 = sb1t
++	eor	v1.16b, v1.16b, v4.16b		// vpxor	%xmm4,	%xmm1,	%xmm1		# 0 = sbox output
++
++	// add in smeared stuff
++	eor	v0.16b, v1.16b, v7.16b		// vpxor	%xmm7,	%xmm1,	%xmm0
++	eor	v7.16b, v1.16b, v7.16b		// vmovdqa	%xmm0,	%xmm7
++	ret
++.size	_vpaes_schedule_round,.-_vpaes_schedule_round
++
++##
++##  .aes_schedule_transform
++##
++##  Linear-transform %xmm0 according to tables at (%r11)
++##
++##  Requires that %xmm9 = 0x0F0F... as in preheat
++##  Output in %xmm0
++##  Clobbers %xmm1, %xmm2
++##
++.type	_vpaes_schedule_transform,%function
++.align	4
++_vpaes_schedule_transform:
++	and	v1.16b, v0.16b, v17.16b		// vpand	%xmm9,	%xmm0,	%xmm1
++	ushr	v0.16b, v0.16b, #4		// vpsrlb	\$4,	%xmm0,	%xmm0
++						// vmovdqa	(%r11),	%xmm2 	# lo
++	tbl	v2.16b, {$iptlo}, v1.16b	// vpshufb	%xmm1,	%xmm2,	%xmm2
++						// vmovdqa	16(%r11),	%xmm1 # hi
++	tbl	v0.16b, {$ipthi}, v0.16b	// vpshufb	%xmm0,	%xmm1,	%xmm0
++	eor	v0.16b, v0.16b, v2.16b		// vpxor	%xmm2,	%xmm0,	%xmm0
++	ret
++.size	_vpaes_schedule_transform,.-_vpaes_schedule_transform
++
++##
++##  .aes_schedule_mangle
++##
++##  Mangle xmm0 from (basis-transformed) standard version
++##  to our version.
++##
++##  On encrypt,
++##    xor with 0x63
++##    multiply by circulant 0,1,1,1
++##    apply shiftrows transform
++##
++##  On decrypt,
++##    xor with 0x63
++##    multiply by "inverse mixcolumns" circulant E,B,D,9
++##    deskew
++##    apply shiftrows transform
++##
++##
++##  Writes out to (%rdx), and increments or decrements it
++##  Keeps track of round number mod 4 in %r8
++##  Preserves xmm0
++##  Clobbers xmm1-xmm5
++##
++.type	_vpaes_schedule_mangle,%function
++.align	4
++_vpaes_schedule_mangle:
++	mov	v4.16b, v0.16b			// vmovdqa	%xmm0,	%xmm4	# save xmm0 for later
++						// vmovdqa	.Lk_mc_forward(%rip),%xmm5
++
++	// encrypting
++	eor	v4.16b, v0.16b, v16.16b		// vpxor	.Lk_s63(%rip),	%xmm0,	%xmm4
++	add	$out, $out, #16			// add	\$16,	%rdx
++	tbl	v4.16b, {v4.16b}, v9.16b	// vpshufb	%xmm5,	%xmm4,	%xmm4
++	tbl	v1.16b, {v4.16b}, v9.16b	// vpshufb	%xmm5,	%xmm4,	%xmm1
++	tbl	v3.16b, {v1.16b}, v9.16b	// vpshufb	%xmm5,	%xmm1,	%xmm3
++	eor	v4.16b, v4.16b, v1.16b		// vpxor	%xmm1,	%xmm4,	%xmm4
++	ld1	{v1.2d}, [x8]			// vmovdqa	(%r8,%r10),	%xmm1
++	eor	v3.16b, v3.16b, v4.16b		// vpxor	%xmm4,	%xmm3,	%xmm3
++
++.Lschedule_mangle_both:
++	tbl	v3.16b, {v3.16b}, v1.16b	// vpshufb	%xmm1,	%xmm3,	%xmm3
++	add	x8, x8, #64-16			// add	\$-16,	%r8
++	and	x8, x8, #~(1<<6)		// and	\$0x30,	%r8
++	st1	{v3.2d}, [$out]			// vmovdqu	%xmm3,	(%rdx)
++	ret
++.size	_vpaes_schedule_mangle,.-_vpaes_schedule_mangle
++
++.globl	GFp_vpaes_set_encrypt_key
++.type	GFp_vpaes_set_encrypt_key,%function
++.align	4
++GFp_vpaes_set_encrypt_key:
++	AARCH64_SIGN_LINK_REGISTER
++	stp	x29,x30,[sp,#-16]!
++	add	x29,sp,#0
++	stp	d8,d9,[sp,#-16]!	// ABI spec says so
++
++	lsr	w9, $bits, #5		// shr	\$5,%eax
++	add	w9, w9, #5		// \$5,%eax
++	str	w9, [$out,#240]		// mov	%eax,240(%rdx)	# AES_KEY->rounds = nbits/32+5;
++
++	mov	$dir, #0		// mov	\$0,%ecx
++	mov	x8, #0x30		// mov	\$0x30,%r8d
++	bl	_vpaes_schedule_core
++	eor	x0, x0, x0
++
++	ldp	d8,d9,[sp],#16
++	ldp	x29,x30,[sp],#16
++	AARCH64_VALIDATE_LINK_REGISTER
++	ret
++.size	GFp_vpaes_set_encrypt_key,.-GFp_vpaes_set_encrypt_key
++___
++}
++{
++my ($inp,$out,$len,$key,$ivec) = map("x$_",(0..4));
++my ($ctr, $ctr_tmp) = ("w6", "w7");
++
++# void GFp_vpaes_ctr32_encrypt_blocks(const uint8_t *in, uint8_t *out, size_t len,
++#                                     const AES_KEY *key, const uint8_t ivec[16]);
++$code.=<<___;
++.globl	GFp_vpaes_ctr32_encrypt_blocks
++.type	GFp_vpaes_ctr32_encrypt_blocks,%function
++.align	4
++GFp_vpaes_ctr32_encrypt_blocks:
++	AARCH64_SIGN_LINK_REGISTER
++	stp	x29,x30,[sp,#-16]!
++	add	x29,sp,#0
++	stp	d8,d9,[sp,#-16]!	// ABI spec says so
++	stp	d10,d11,[sp,#-16]!
++	stp	d12,d13,[sp,#-16]!
++	stp	d14,d15,[sp,#-16]!
++
++	cbz	$len, .Lctr32_done
++
++	// Note, unlike the other functions, $len here is measured in blocks,
++	// not bytes.
++	mov	x17, $len
++	mov	x2,  $key
++
++	// Load the IV and counter portion.
++	ldr	$ctr, [$ivec, #12]
++	ld1	{v7.16b}, [$ivec]
++
++	bl	_vpaes_encrypt_preheat
++	tst	x17, #1
++	rev	$ctr, $ctr		// The counter is big-endian.
++	b.eq	.Lctr32_prep_loop
++
++	// Handle one block so the remaining block count is even for
++	// _vpaes_encrypt_2x.
++	ld1	{v6.16b}, [$inp], #16	// Load input ahead of time
++	bl	_vpaes_encrypt_core
++	eor	v0.16b, v0.16b, v6.16b	// XOR input and result
++	st1	{v0.16b}, [$out], #16
++	subs	x17, x17, #1
++	// Update the counter.
++	add	$ctr, $ctr, #1
++	rev	$ctr_tmp, $ctr
++	mov	v7.s[3], $ctr_tmp
++	b.ls	.Lctr32_done
++
++.Lctr32_prep_loop:
++	// _vpaes_encrypt_core takes its input from v7, while _vpaes_encrypt_2x
++	// uses v14 and v15.
++	mov	v15.16b, v7.16b
++	mov	v14.16b, v7.16b
++	add	$ctr, $ctr, #1
++	rev	$ctr_tmp, $ctr
++	mov	v15.s[3], $ctr_tmp
++
++.Lctr32_loop:
++	ld1	{v6.16b,v7.16b}, [$inp], #32	// Load input ahead of time
++	bl	_vpaes_encrypt_2x
++	eor	v0.16b, v0.16b, v6.16b		// XOR input and result
++	eor	v1.16b, v1.16b, v7.16b		// XOR input and result (#2)
++	st1	{v0.16b,v1.16b}, [$out], #32
++	subs	x17, x17, #2
++	// Update the counter.
++	add	$ctr_tmp, $ctr, #1
++	add	$ctr, $ctr, #2
++	rev	$ctr_tmp, $ctr_tmp
++	mov	v14.s[3], $ctr_tmp
++	rev	$ctr_tmp, $ctr
++	mov	v15.s[3], $ctr_tmp
++	b.hi	.Lctr32_loop
++
++.Lctr32_done:
++	ldp	d14,d15,[sp],#16
++	ldp	d12,d13,[sp],#16
++	ldp	d10,d11,[sp],#16
++	ldp	d8,d9,[sp],#16
++	ldp	x29,x30,[sp],#16
++	AARCH64_VALIDATE_LINK_REGISTER
++	ret
++.size	GFp_vpaes_ctr32_encrypt_blocks,.-GFp_vpaes_ctr32_encrypt_blocks
++___
++}
++
++print $code;
++
++close STDOUT or die "error closing STDOUT";
+diff --git a/crypto/fipsmodule/modes/asm/ghash-neon-armv8.pl b/crypto/fipsmodule/modes/asm/ghash-neon-armv8.pl
+new file mode 100644
+index 0000000..7e52ad6
+--- /dev/null
++++ b/crypto/fipsmodule/modes/asm/ghash-neon-armv8.pl
+@@ -0,0 +1,294 @@
++#! /usr/bin/env perl
++# Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved.
++#
++# Licensed under the OpenSSL license (the "License").  You may not use
++# this file except in compliance with the License.  You can obtain a copy
++# in the file LICENSE in the source distribution or at
++# https://www.openssl.org/source/license.html
++
++# ====================================================================
++# Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
++# project. The module is, however, dual licensed under OpenSSL and
++# CRYPTOGAMS licenses depending on where you obtain it. For further
++# details see http://www.openssl.org/~appro/cryptogams/.
++# ====================================================================
++
++# This file was adapted to AArch64 from the 32-bit version in ghash-armv4.pl. It
++# implements the multiplication algorithm described in:
++#
++# Câmara, D.; Gouvêa, C. P. L.; López, J. & Dahab, R.: Fast Software
++# Polynomial Multiplication on ARM Processors using the NEON Engine.
++#
++# http://conradoplg.cryptoland.net/files/2010/12/mocrysen13.pdf
++#
++# The main distinction to keep in mind between 32-bit NEON and AArch64 SIMD is
++# AArch64 cannot compute over the upper halves of SIMD registers. In 32-bit
++# NEON, the low and high halves of the 128-bit register q0 are accessible as
++# 64-bit registers d0 and d1, respectively. In AArch64, dN is the lower half of
++# vN. Where the 32-bit version would use the upper half, this file must keep
++# halves in separate registers.
++#
++# The other distinction is in syntax. 32-bit NEON embeds lane information in the
++# instruction name, while AArch64 uses suffixes on the registers. For instance,
++# left-shifting 64-bit lanes of a SIMD register in 32-bit would be written:
++#
++#     vshl.i64 q0, q0, #1
++#
++# in 64-bit, it would be written:
++#
++#     shl v0.2d, v0.2d, #1
++#
++# See Programmer's Guide for ARMv8-A, section 7 for details.
++# http://infocenter.arm.com/help/topic/com.arm.doc.den0024a/DEN0024A_v8_architecture_PG.pdf
++#
++# Finally, note the 8-bit and 64-bit polynomial multipliers in AArch64 differ
++# only by suffix. pmull vR.8h, vA.8b, vB.8b multiplies eight 8-bit polynomials
++# and is always available. pmull vR.1q, vA.1d, vB.1d multiplies a 64-bit
++# polynomial and is conditioned on the PMULL extension. This file emulates the
++# latter with the former.
++
++use strict;
++
++my $flavour = shift;
++my $output;
++if ($flavour=~/\w[\w\-]*\.\w+$/) { $output=$flavour; undef $flavour; }
++else { while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {} }
++
++if ($flavour && $flavour ne "void") {
++    $0 =~ m/(.*[\/\\])[^\/\\]+$/;
++    my $dir = $1;
++    my $xlate;
++    ( $xlate="${dir}arm-xlate.pl" and -f $xlate ) or
++    ( $xlate="${dir}../../../perlasm/arm-xlate.pl" and -f $xlate) or
++    die "can't locate arm-xlate.pl";
++
++    open OUT,"| \"$^X\" $xlate $flavour $output";
++    *STDOUT=*OUT;
++} else {
++    open OUT,">$output";
++    *STDOUT=*OUT;
++}
++
++my ($Xi, $Htbl, $inp, $len) = map("x$_", (0..3));	# argument block
++my ($Xl, $Xm, $Xh, $INlo, $INhi) = map("v$_", (0..4));
++my ($Hlo, $Hhi, $Hhl) = map("v$_", (5..7));
++# d8-d15 are callee-saved, so avoid v8-v15. AArch64 SIMD has plenty of registers
++# to spare.
++my ($t0, $t1, $t2, $t3) = map("v$_", (16..19));
++my ($t0l_t1l, $t0h_t1h, $t2l_t3l, $t2h_t3h) = map("v$_", (20..23));
++my ($k48_k32, $k16_k0) = map("v$_", (24..25));
++
++my $code = "";
++
++# clmul64x64 emits code which emulates pmull $r.1q, $a.1d, $b.1d. $r, $a, and $b
++# must be distinct from $t* and $k*. $t* are clobbered by the emitted code.
++sub clmul64x64 {
++my ($r, $a, $b) = @_;
++$code .= <<___;
++	ext	$t0.8b, $a.8b, $a.8b, #1	// A1
++	pmull	$t0.8h, $t0.8b, $b.8b		// F = A1*B
++	ext	$r.8b, $b.8b, $b.8b, #1		// B1
++	pmull	$r.8h, $a.8b, $r.8b		// E = A*B1
++	ext	$t1.8b, $a.8b, $a.8b, #2	// A2
++	pmull	$t1.8h, $t1.8b, $b.8b		// H = A2*B
++	ext	$t3.8b, $b.8b, $b.8b, #2	// B2
++	pmull	$t3.8h, $a.8b, $t3.8b		// G = A*B2
++	ext	$t2.8b, $a.8b, $a.8b, #3	// A3
++	eor	$t0.16b, $t0.16b, $r.16b	// L = E + F
++	pmull	$t2.8h, $t2.8b, $b.8b		// J = A3*B
++	ext	$r.8b, $b.8b, $b.8b, #3		// B3
++	eor	$t1.16b, $t1.16b, $t3.16b	// M = G + H
++	pmull	$r.8h, $a.8b, $r.8b		// I = A*B3
++
++	// Here we diverge from the 32-bit version. It computes the following
++	// (instructions reordered for clarity):
++	//
++	//     veor	\$t0#lo, \$t0#lo, \$t0#hi	@ t0 = P0 + P1 (L)
++	//     vand	\$t0#hi, \$t0#hi, \$k48
++	//     veor	\$t0#lo, \$t0#lo, \$t0#hi
++	//
++	//     veor	\$t1#lo, \$t1#lo, \$t1#hi	@ t1 = P2 + P3 (M)
++	//     vand	\$t1#hi, \$t1#hi, \$k32
++	//     veor	\$t1#lo, \$t1#lo, \$t1#hi
++	//
++	//     veor	\$t2#lo, \$t2#lo, \$t2#hi	@ t2 = P4 + P5 (N)
++	//     vand	\$t2#hi, \$t2#hi, \$k16
++	//     veor	\$t2#lo, \$t2#lo, \$t2#hi
++	//
++	//     veor	\$t3#lo, \$t3#lo, \$t3#hi	@ t3 = P6 + P7 (K)
++	//     vmov.i64	\$t3#hi, #0
++	//
++	// \$kN is a mask with the bottom N bits set. AArch64 cannot compute on
++	// upper halves of SIMD registers, so we must split each half into
++	// separate registers. To compensate, we pair computations up and
++	// parallelize.
++
++	ext	$t3.8b, $b.8b, $b.8b, #4	// B4
++	eor	$t2.16b, $t2.16b, $r.16b	// N = I + J
++	pmull	$t3.8h, $a.8b, $t3.8b		// K = A*B4
++
++	// This can probably be scheduled more efficiently. For now, we just
++	// pair up independent instructions.
++	zip1	$t0l_t1l.2d, $t0.2d, $t1.2d
++	zip1	$t2l_t3l.2d, $t2.2d, $t3.2d
++	zip2	$t0h_t1h.2d, $t0.2d, $t1.2d
++	zip2	$t2h_t3h.2d, $t2.2d, $t3.2d
++	eor	$t0l_t1l.16b, $t0l_t1l.16b, $t0h_t1h.16b
++	eor	$t2l_t3l.16b, $t2l_t3l.16b, $t2h_t3h.16b
++	and	$t0h_t1h.16b, $t0h_t1h.16b, $k48_k32.16b
++	and	$t2h_t3h.16b, $t2h_t3h.16b, $k16_k0.16b
++	eor	$t0l_t1l.16b, $t0l_t1l.16b, $t0h_t1h.16b
++	eor	$t2l_t3l.16b, $t2l_t3l.16b, $t2h_t3h.16b
++	zip1	$t0.2d, $t0l_t1l.2d, $t0h_t1h.2d
++	zip1	$t2.2d, $t2l_t3l.2d, $t2h_t3h.2d
++	zip2	$t1.2d, $t0l_t1l.2d, $t0h_t1h.2d
++	zip2	$t3.2d, $t2l_t3l.2d, $t2h_t3h.2d
++
++	ext	$t0.16b, $t0.16b, $t0.16b, #15	// t0 = t0 << 8
++	ext	$t1.16b, $t1.16b, $t1.16b, #14	// t1 = t1 << 16
++	pmull	$r.8h, $a.8b, $b.8b		// D = A*B
++	ext	$t3.16b, $t3.16b, $t3.16b, #12	// t3 = t3 << 32
++	ext	$t2.16b, $t2.16b, $t2.16b, #13	// t2 = t2 << 24
++	eor	$t0.16b, $t0.16b, $t1.16b
++	eor	$t2.16b, $t2.16b, $t3.16b
++	eor	$r.16b, $r.16b, $t0.16b
++	eor	$r.16b, $r.16b, $t2.16b
++___
++}
++
++$code .= <<___;
++#include <GFp/arm_arch.h>
++
++.text
++
++.global	GFp_gcm_init_neon
++.type	GFp_gcm_init_neon,%function
++.align	4
++GFp_gcm_init_neon:
++	AARCH64_VALID_CALL_TARGET
++	// This function is adapted from gcm_init_v8. xC2 is t3.
++	ld1	{$t1.2d}, [x1]			// load H
++	movi	$t3.16b, #0xe1
++	shl	$t3.2d, $t3.2d, #57		// 0xc2.0
++	ext	$INlo.16b, $t1.16b, $t1.16b, #8
++	ushr	$t2.2d, $t3.2d, #63
++	dup	$t1.4s, $t1.s[1]
++	ext	$t0.16b, $t2.16b, $t3.16b, #8	// t0=0xc2....01
++	ushr	$t2.2d, $INlo.2d, #63
++	sshr	$t1.4s, $t1.4s, #31		// broadcast carry bit
++	and	$t2.16b, $t2.16b, $t0.16b
++	shl	$INlo.2d, $INlo.2d, #1
++	ext	$t2.16b, $t2.16b, $t2.16b, #8
++	and	$t0.16b, $t0.16b, $t1.16b
++	orr	$INlo.16b, $INlo.16b, $t2.16b	// H<<<=1
++	eor	$Hlo.16b, $INlo.16b, $t0.16b	// twisted H
++	st1	{$Hlo.2d}, [x0]			// store Htable[0]
++	ret
++.size	GFp_gcm_init_neon,.-GFp_gcm_init_neon
++
++.global	GFp_gcm_gmult_neon
++.type	GFp_gcm_gmult_neon,%function
++.align	4
++GFp_gcm_gmult_neon:
++	AARCH64_VALID_CALL_TARGET
++	ld1	{$INlo.16b}, [$Xi]		// load Xi
++	ld1	{$Hlo.1d}, [$Htbl], #8		// load twisted H
++	ld1	{$Hhi.1d}, [$Htbl]
++	adrp	x9, :pg_hi21:.Lmasks		// load constants
++	add	x9, x9, :lo12:.Lmasks
++	ld1	{$k48_k32.2d, $k16_k0.2d}, [x9]
++	rev64	$INlo.16b, $INlo.16b		// byteswap Xi
++	ext	$INlo.16b, $INlo.16b, $INlo.16b, #8
++	eor	$Hhl.8b, $Hlo.8b, $Hhi.8b	// Karatsuba pre-processing
++
++	mov	$len, #16
++	b	.Lgmult_neon
++.size	GFp_gcm_gmult_neon,.-GFp_gcm_gmult_neon
++
++.global	GFp_gcm_ghash_neon
++.type	GFp_gcm_ghash_neon,%function
++.align	4
++GFp_gcm_ghash_neon:
++	AARCH64_VALID_CALL_TARGET
++	ld1	{$Xl.16b}, [$Xi]		// load Xi
++	ld1	{$Hlo.1d}, [$Htbl], #8		// load twisted H
++	ld1	{$Hhi.1d}, [$Htbl]
++	adrp	x9, :pg_hi21:.Lmasks		// load constants
++	add	x9, x9, :lo12:.Lmasks
++	ld1	{$k48_k32.2d, $k16_k0.2d}, [x9]
++	rev64	$Xl.16b, $Xl.16b		// byteswap Xi
++	ext	$Xl.16b, $Xl.16b, $Xl.16b, #8
++	eor	$Hhl.8b, $Hlo.8b, $Hhi.8b	// Karatsuba pre-processing
++
++.Loop_neon:
++	ld1	{$INlo.16b}, [$inp], #16	// load inp
++	rev64	$INlo.16b, $INlo.16b		// byteswap inp
++	ext	$INlo.16b, $INlo.16b, $INlo.16b, #8
++	eor	$INlo.16b, $INlo.16b, $Xl.16b	// inp ^= Xi
++
++.Lgmult_neon:
++	// Split the input into $INlo and $INhi. (The upper halves are unused,
++	// so it is okay to leave them alone.)
++	ins	$INhi.d[0], $INlo.d[1]
++___
++&clmul64x64	($Xl, $Hlo, $INlo);		# H.lo·Xi.lo
++$code .= <<___;
++	eor	$INlo.8b, $INlo.8b, $INhi.8b	// Karatsuba pre-processing
++___
++&clmul64x64	($Xm, $Hhl, $INlo);		# (H.lo+H.hi)·(Xi.lo+Xi.hi)
++&clmul64x64	($Xh, $Hhi, $INhi);		# H.hi·Xi.hi
++$code .= <<___;
++	ext	$t0.16b, $Xl.16b, $Xh.16b, #8
++	eor	$Xm.16b, $Xm.16b, $Xl.16b	// Karatsuba post-processing
++	eor	$Xm.16b, $Xm.16b, $Xh.16b
++	eor	$Xm.16b, $Xm.16b, $t0.16b	// Xm overlaps Xh.lo and Xl.hi
++	ins	$Xl.d[1], $Xm.d[0]		// Xh|Xl - 256-bit result
++	// This is a no-op due to the ins instruction below.
++	// ins	$Xh.d[0], $Xm.d[1]
++
++	// equivalent of reduction_avx from ghash-x86_64.pl
++	shl	$t1.2d, $Xl.2d, #57		// 1st phase
++	shl	$t2.2d, $Xl.2d, #62
++	eor	$t2.16b, $t2.16b, $t1.16b	//
++	shl	$t1.2d, $Xl.2d, #63
++	eor	$t2.16b, $t2.16b, $t1.16b	//
++	// Note Xm contains {Xl.d[1], Xh.d[0]}.
++	eor	$t2.16b, $t2.16b, $Xm.16b
++	ins	$Xl.d[1], $t2.d[0]		// Xl.d[1] ^= t2.d[0]
++	ins	$Xh.d[0], $t2.d[1]		// Xh.d[0] ^= t2.d[1]
++
++	ushr	$t2.2d, $Xl.2d, #1		// 2nd phase
++	eor	$Xh.16b, $Xh.16b,$Xl.16b
++	eor	$Xl.16b, $Xl.16b,$t2.16b	//
++	ushr	$t2.2d, $t2.2d, #6
++	ushr	$Xl.2d, $Xl.2d, #1		//
++	eor	$Xl.16b, $Xl.16b, $Xh.16b	//
++	eor	$Xl.16b, $Xl.16b, $t2.16b	//
++
++	subs	$len, $len, #16
++	bne	.Loop_neon
++
++	rev64	$Xl.16b, $Xl.16b		// byteswap Xi and write
++	ext	$Xl.16b, $Xl.16b, $Xl.16b, #8
++	st1	{$Xl.16b}, [$Xi]
++
++	ret
++.size	GFp_gcm_ghash_neon,.-GFp_gcm_ghash_neon
++
++.section	.rodata
++.align	4
++.Lmasks:
++.quad	0x0000ffffffffffff	// k48
++.quad	0x00000000ffffffff	// k32
++.quad	0x000000000000ffff	// k16
++.quad	0x0000000000000000	// k0
++.asciz  "GHASH for ARMv8, derived from ARMv4 version by <appro\@openssl.org>"
++.align  2
++___
++
++foreach (split("\n",$code)) {
++	s/\`([^\`]*)\`/eval $1/geo;
++
++	print $_,"\n";
++}
++close STDOUT or die "error closing STDOUT"; # enforce flush
+-- 
+Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
+GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
+Confidentiality cannot be guaranteed on emails sent or received unencrypted
+
diff --git a/gnu/packages/patches/rust-ring-0.16-test-files.patch b/gnu/packages/patches/rust-ring-0.16-test-files.patch
new file mode 100644
index 0000000000..dbe5c0f4ee
--- /dev/null
+++ b/gnu/packages/patches/rust-ring-0.16-test-files.patch
@@ -0,0 +1,54 @@
+This file exists in the upstream repository at the commit which
+corresponds to the ring-0.16.20 release, but was excluded from the
+release tarball.
+
+---
+ tests/ed25519_verify_tests.txt | 34 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 34 insertions(+)
+ create mode 100644 tests/ed25519_verify_tests.txt
+
+diff --git a/tests/ed25519_verify_tests.txt b/tests/ed25519_verify_tests.txt
+new file mode 100644
+index 0000000..74c94b3
+--- /dev/null
++++ b/tests/ed25519_verify_tests.txt
+@@ -0,0 +1,34 @@
++# BoringSSL TEST(Ed25519Test Malleability)
++
++# Control; S is in range.
++MESSAGE = 54657374
++SIG = 7c38e026f29e14aabd059a0f2db8b0cd783040609a8be684db12f82a27774ab07a9155711ecfaf7f99f277bad0c6ae7e39d4eef676573336a5c51eb6f946b30d
++PUB = 7d4d0e7f6153a69b6242b522abbee685fda4420f8834b108c3bdae369ef549fa
++Result = P
++
++# Same as above, but with the order L added to S so it is out of range.
++# BoringSSL commit 472ba2c2dd52d06a657a63b7fbf02732a6649d21
++MESSAGE = 54657374
++SIG = 7c38e026f29e14aabd059a0f2db8b0cd783040609a8be684db12f82a27774ab067654bce3832c2d76f8f6f5dafc08d9339d4eef676573336a5c51eb6f946b31d
++PUB = 7d4d0e7f6153a69b6242b522abbee685fda4420f8834b108c3bdae369ef549fa
++Result = F
++
++
++# BoringSSL commit 3094902fcdc2db2cc832fa854b9a6a8be383926c
++MESSAGE = 124e583f8b8eca58bb29c271b41d36986bbc45541f8e51f9cb0133eca447601e
++SIG = dac119d6ca87fc59ae611c157048f4d4fc932a149dbe20ec6effd1436abf83ea05c7df0fef06147241259113909bc71bd3c53ba4464ffcad3c0968f2ffffff0f
++PUB = 100fdf47fb94f1536a4f7c3fda27383fa03375a8f527c537e6f1703c47f94f86
++Result = P
++
++# Control. Same key as above; same message and signature as below, except S is in range.
++PUB = 100fdf47fb94f1536a4f7c3fda27383fa03375a8f527c537e6f1703c47f94f86
++MESSAGE = 6a0bc2b0057cedfc0fa2e3f7f7d39279b30f454a69dfd1117c758d86b19d85e0
++SIG = 0971f86d2c9c78582524a103cb9cf949522ae528f8054dc20107d999be673ff4f58ac9d20ec563133cabc6230b1db8625f8446639ede46ad4df4053000000000
++Result = P
++
++# Same key as above, but S is out of range.
++# BoringSSL commit 472ba2c2dd52d06a657a63b7fbf02732a6649d21
++PUB = 100fdf47fb94f1536a4f7c3fda27383fa03375a8f527c537e6f1703c47f94f86
++MESSAGE = 6a0bc2b0057cedfc0fa2e3f7f7d39279b30f454a69dfd1117c758d86b19d85e0
++SIG = 0971f86d2c9c78582524a103cb9cf949522ae528f8054dc20107d999be673ff4e25ebf2f2928766b1248bec6e91697775f8446639ede46ad4df4053000000010
++Result = F
+-- 
+Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
+GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
+Confidentiality cannot be guaranteed on emails sent or received unencrypted
+
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 7291c42278..e270bdf27f 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -1040,7 +1040,7 @@ using a stylus.")
     (inputs
      (list alsa-lib
            gtk+
-           librsvg
+           (librsvg-for-system)
            libsndfile
            libxml2
            libzip
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 6c77d569c3..b290e2b29a 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2014, 2015, 2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015, 2017 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016-2019, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
@@ -543,7 +543,7 @@ photographic equipment.")
            libjpeg-turbo
            libomp
            libpng
-           librsvg
+           (librsvg-for-system)
            libsecret                    ;optional, for storing passwords
            libsoup-minimal-2
            libtiff
@@ -567,7 +567,8 @@ developer.  It manages your digital negatives in a database, lets you view
 them through a zoomable lighttable and enables you to develop raw images
 and enhance them.")
     ;; See src/is_supported_platform.h for supported platforms.
-    (supported-systems '("x86_64-linux" "aarch64-linux" "powerpc64le-linux"))
+    (supported-systems '("x86_64-linux" "aarch64-linux" "powerpc64le-linux"
+                         "riscv64-linux"))
     (properties
      '((release-monitoring-url . "https://github.com/darktable-org/darktable/releases")))
     (license (list license:gpl3+        ;Darktable itself
@@ -617,7 +618,7 @@ such as Batch image processing.")
 (define-public entangle
   (package
     (name "entangle")
-    (version "3.0")
+    (version "3.0")    ; delete the 'build-with-meson-0.60 phase when updating
     (source
      (origin
        (method git-fetch)
@@ -629,34 +630,39 @@ such as Batch image processing.")
         (base32 "1pdmgxjdb3xlcqsaz7l8qzj5f7g7nwzhsrgid8929bm36d49cgc7"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'skip-gtk-update-icon-cache
-           ;; Don't create 'icon-theme.cache'.
-           (lambda _
-             (substitute* "meson_post_install.py"
-               (("gtk-update-icon-cache") "true"))
-             #t))
-         (add-after 'install 'wrap-gi-python
-           ;; Make GTK find files needed by plugins.
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out               (assoc-ref outputs "out"))
-                   (gi-typelib-path   (getenv "GI_TYPELIB_PATH"))
-                   (python-path       (getenv "GUIX_PYTHONPATH")))
-               (wrap-program (string-append out "/bin/entangle")
-                 `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
-                 `("GUIX_PYTHONPATH" ":" prefix (,python-path))))
-             #t)))))
+     (list
+      #:glib-or-gtk? #t
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'build-with-meson-0.60
+            ;; Work around ‘ERROR: Function does not take positional arguments.’.
+            (lambda _
+              (substitute* "src/meson.build"
+                (("^i18n\\.merge_file.*" match)
+                 (string-append match "  data_dirs:")))))
+          (add-after 'unpack 'skip-gtk-update-icon-cache
+            ;; Don't create 'icon-theme.cache'.
+            (lambda _
+              (substitute* "meson_post_install.py"
+                (("gtk-update-icon-cache") "true"))))
+          (add-after 'install 'wrap-gi-python
+            ;; Make GTK find files needed by plugins.
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH"))
+                    (python-path     (getenv "GUIX_PYTHONPATH")))
+                (wrap-program (string-append #$output "/bin/entangle")
+                  `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
+                  `("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))
     (native-inputs
-     `(("cmake" ,cmake)
-       ("gettext" ,gettext-minimal)
-       ("glib:bin" ,glib "bin")
-       ("gobject-introspection" ,gobject-introspection)
-       ("gtk-doc" ,gtk-doc)
-       ("perl" ,perl)
-       ("pkg-config" ,pkg-config)
-       ("xmllint" ,libxml2)))
+     (list cmake
+           gettext-minimal
+           `(,glib "bin")
+           gobject-introspection
+           gtk-doc
+           itstool
+           libxml2
+           perl
+           pkg-config))
     (inputs
      (list gdk-pixbuf
            gexiv2
@@ -791,7 +797,7 @@ a complete panorama and stitch any series of overlapping pictures.")
            libiptcdata
            libjpeg-turbo
            libpng
-           librsvg
+           (librsvg-for-system)
            libsigc++
            libtiff
            zlib))
diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm
index b15b646416..6292fb05e2 100644
--- a/gnu/packages/pkg-config.scm
+++ b/gnu/packages/pkg-config.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -171,14 +172,14 @@ exec ~a \"$@\""
 (define-public pkgconf
   (package
     (name "pkgconf")
-    (version "1.9.3")
+    (version "2.0.2")
     (source (origin
               (method url-fetch)
               (uri (string-append  "https://distfiles.dereferenced.org/"
                                    name "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "17b9cl2s99pzgblaj0yg49k3m0by5x78vwg4879vckymhys5bcsz"))))
+                "00a4cv1f8cxsb4jhpgxxrwrl92b1zdsirqn0gqvva7i5izpjanpa"))))
     (build-system gnu-build-system)
     (arguments (list #:tests? #f))      ;TODO: package kyua
     (home-page "http://pkgconf.org/")
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index 89e5de6278..5d15b160f3 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2022 Zhu Zihao  <all_but_last@163.com>
 ;;; Copyright © 2022, 2023 Maxim Cournoyer  <maxim.cournoyer@gmail.com>
+;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -51,7 +52,8 @@
   #:use-module (gnu packages lua)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages swig))
+  #:use-module (gnu packages swig)
+  #:use-module (gnu packages qt))
 
 (define-public a2ps
   (package
@@ -350,55 +352,96 @@ seen in a terminal.")
 (define-public highlight
   (package
     (name "highlight")
-    (version "3.62")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "http://www.andre-simon.de/zip/highlight-"
-                           version ".tar.bz2"))
-       (sha256
-        (base32 "088di7qxd6b2r22qljllhnly0r9a0lfnwnfqswjn23s09awjbl6p"))))
+    (version "4.7")
+    (outputs (list "out" "gui"))
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.andre-simon.de/zip/highlight-"
+                                  version ".tar.bz2"))
+              (sha256
+               (base32
+                "1cl21qpgy92w1x53vrn1bgq84mkh6fgayc9k38mz4xmz2yw01nv1"))
+              (patches (search-patches "highlight-gui-data-dir.patch"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f                      ; no tests
-       #:make-flags
-       (let ((confdir (string-append %output "/share/highlight/config/")))
-         (list (string-append "PREFIX=" %output)
-               (string-append "HL_CONFIG_DIR=" confdir)
-               (string-append "conf_dir=" confdir)))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)            ; no configure script
-         (add-after 'unpack 'fix-search-for-lua
-           (lambda _
-             (substitute* "src/makefile"
-               (("(LUA_PKG_NAME=).*" _ assignment)
-                (string-append assignment "lua-" ,(version-major+minor
-                                                   (package-version lua))
-                               "\n")))
-             (substitute* "extras/swig/makefile"
-               (("lua") (string-append "lua-" ,(version-major+minor
-                                                (package-version lua)))))
-             #t))
-         (add-after 'install 'install-perl-bindings
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((perldir (string-append (assoc-ref outputs "out")
-                                            "/lib/perl5/site_perl/"
-                                            ,(package-version perl)))
-                    (autodir (string-append perldir "/auto/highlight")))
-               (with-directory-excursion "extras/swig"
-                 (invoke "make" "perl")
-                 (invoke "perl" "-I" "." "testmod.pl")
-                 (install-file "highlight.pm" perldir)
-                 (install-file "highlight.so" autodir))
-               #t))))))
-    (inputs
-     (list lua boost perl))
-    (native-inputs
-     (list pkg-config swig))
+     (list #:tests? #f ;no tests
+           #:make-flags #~(let ((confdir (string-append %output
+                                          "/share/highlight/config/")))
+                            (list (string-append "PREFIX=" %output)
+                                  (string-append "HL_CONFIG_DIR=" confdir)
+                                  (string-append "conf_dir=" confdir)))
+           #:phases #~(modify-phases %standard-phases
+                        (delete 'configure) ;no configure script
+                        (add-after 'unpack 'fix-search-for-lua
+                          (lambda _
+                            (let ((ver #$(version-major+minor (package-version
+                                                               lua))))
+                              (substitute* "src/makefile"
+                                (("(LUA_PKG_NAME=).*" _ assignment)
+                                 (string-append assignment "lua-" ver "\n")))
+                              (substitute* "src/gui-qt/highlight.pro"
+                                (("(PKGCONFIG \\+= lua)" _ assignment)
+                                 (string-append assignment "-" ver)))
+                              (substitute* "extras/swig/makefile"
+                                (("lua")
+                                 (string-append "lua-" ver))))))
+                        (add-after 'build 'build-gui
+                          (lambda* (#:key inputs outputs #:allow-other-keys)
+                            (let* ((out (assoc-ref outputs "out"))
+                                   (data (string-append out
+                                                        "/share/highlight/"))
+                                   (conf (string-append out "/etc/highlight/"))
+                                   (doc (string-append out
+                                         "/share/doc/highlight/"))
+                                   (gui (assoc-ref outputs "gui"))
+                                   (gui-data (string-append gui
+                                              "/share/highlight/")))
+                              ;; modified version of gui task in makefile
+                              (invoke "make"
+                                      "-C"
+                                      "./src"
+                                      "-f"
+                                      "./makefile"
+                                      (string-append "HL_DATA_DIR=" data)
+                                      (string-append "HL_CONFIG_DIR=" conf)
+                                      (string-append "HL_DOC_DIR=" doc)
+                                      (string-append "GUI_DATA_DIR=" gui-data)
+                                      "gui-qt"))))
+                        (replace 'install
+                          (lambda* (#:key outputs #:allow-other-keys)
+                            (let ((out (assoc-ref outputs "out")))
+                              (invoke "make" "install"
+                                      (string-append "PREFIX=" out)))))
+                        (add-after 'install 'install-perl-bindings
+                          (lambda* (#:key outputs #:allow-other-keys)
+                            (let* ((out (assoc-ref outputs "out"))
+                                   (data (string-append out
+                                                        "/share/highlight/"))
+                                   (conf (string-append out "/etc/highlight/"))
+                                   (perldir (string-append out
+                                             "/lib/perl5/site_perl/"
+                                             #$(package-version perl)))
+                                   (autodir (string-append perldir
+                                                           "/auto/highlight")))
+                              (with-directory-excursion "extras/swig"
+                                (invoke "make" "perl"
+                                        (string-append "hl_data_dir=" data)
+                                        (string-append "hl_conf_dir=" conf))
+                                (invoke "perl" "-I" "." "testmod.pl")
+                                (install-file "highlight.pm" perldir)
+                                (install-file "highlight.so" autodir)))))
+                        (add-after 'install 'install-gui
+                          (lambda* (#:key outputs #:allow-other-keys)
+                            (let ((gui (assoc-ref outputs "gui")))
+                              (mkdir-p (string-append gui "/bin"))
+                              (invoke "make" "install-gui"
+                                      (string-append "PREFIX=" gui))))))))
+    (inputs (list lua boost perl qtbase-5))
+    (native-inputs (list pkg-config swig))
     (home-page "http://www.andre-simon.de/doku/highlight/en/highlight.php")
     (synopsis "Convert code to documents with syntax highlighting")
-    (description "Highlight converts source code to HTML, XHTML, RTF, LaTeX,
+    (description
+     "Highlight converts source code to HTML, XHTML, RTF, LaTeX,
 TeX, SVG, BBCode and terminal escape sequences with colored syntax
 highlighting.  Language definitions and color themes are customizable.")
     (license gpl3+)))
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 44babe5c8c..e6483996fd 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -476,14 +476,14 @@ is used by the Requests library to verify HTTPS requests.")
 (define-public python-cryptography-vectors
   (package
     (name "python-cryptography-vectors")
-    (version "40.0.1")
+    (version "40.0.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cryptography_vectors" version))
        (sha256
         (base32
-         "0hd0ppss5xg0kzf36q8cdaxh1xw8ry4k7jkianlf832xbdmp0q44"))))
+         "16hcprw919f2rl3jipsy2996bnsz170inway3lishqi30xwqf6x8"))))
     (build-system python-build-system)
     (home-page "https://github.com/pyca/cryptography")
     (synopsis "Test vectors for the cryptography package")
@@ -495,14 +495,14 @@ is used by the Requests library to verify HTTPS requests.")
 (define-public python-cryptography
   (package
     (name "python-cryptography")
-    (version "40.0.1")
+    (version "40.0.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cryptography" version))
        (sha256
         (base32
-         "0wilrilfcyl78caxcpna2k3aya6qamppwv4j35262pz9n7wg40r8"))))
+         "16awbsm13vdksm98dybwvmpy2y1l636bq7g0s93scksrp0r0sg63"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -557,11 +557,6 @@ ciphers, message digests and key derivation functions.")
                   (guix build utils)
                   (srfi srfi-1)
                   (ice-9 match))
-      ;; XXX: Building the test objects appear to fail due to a missing link
-      ;; directive to Python's shared library (e.g.: "ld:
-      ;; cryptography_rust.c950d742-cgu.11:(.text._ZN3...+0x57): undefined
-      ;; reference to `PyLong_FromLong'").
-      #:tests? #f
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'chdir
@@ -579,12 +574,18 @@ ciphers, message digests and key derivation functions.")
               (apply (assoc-ref %standard-phases 'configure)
                      (append args
                              (list #:inputs (alist-delete "source" inputs))))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                ;; As seen in tox.ini
+                (invoke "cargo" "test" "--no-default-features"))))
           (add-after 'install 'install-shared-library
             (lambda _
               (install-file "target/release/libcryptography_rust.so"
                             (string-append #$output "/lib")))))
       #:cargo-inputs
       `(("rust-asn1-0.13" ,rust-asn1-0.13)
+        ("rust-cc" ,rust-cc-1)
         ("rust-chrono-0.4" ,rust-chrono-0.4)
         ("rust-foreign-types-shared-0.1" ,rust-foreign-types-shared-0.1)
         ("rust-once-cell-1" ,rust-once-cell-1)
@@ -592,9 +593,7 @@ ciphers, message digests and key derivation functions.")
         ("rust-openssl-sys-0.9" ,rust-openssl-sys-0.9)
         ("rust-ouroboros-0.15" ,rust-ouroboros-0.15)
         ("rust-pem-1" ,rust-pem-1)
-        ("rust-pyo3-0.15" ,rust-pyo3-0.15))
-      #:cargo-development-inputs
-      `(("rust-cc" ,rust-cc-1))))
+        ("rust-pyo3-0.15" ,rust-pyo3-0.15))))
     (native-inputs (list pkg-config python python-cffi))
     ;; XXX: Adding rust-openssl-sys-0.9 is needed because #:cargo-inputs
     ;; doesn't honor propagated-inputs.
@@ -736,7 +735,7 @@ ECB and OFB).")
 (define-public python-asn1crypto
   (package
     (name "python-asn1crypto")
-    (version "1.4.0")
+    (version "1.5.1")
     (source
      (origin
        (method git-fetch)
@@ -746,18 +745,20 @@ ECB and OFB).")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "19abibn6jw20mzi1ln4n9jjvpdka8ygm4m439hplyrdfqbvgm01r"))))
+         "1qsg06qrqnzixmrm65ibg503y2gffd675h1si4jgh92s315w1jrk"))))
     (build-system python-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
                   (replace 'check
-                    (lambda _
-                      (invoke "python" "run.py" "tests"))))))
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "python" "run.py" "tests")))))))
     (home-page "https://github.com/wbond/asn1crypto")
     (synopsis "ASN.1 parser and serializer in Python")
-    (description "asn1crypto is an ASN.1 parser and serializer with definitions
-for private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7,
-PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.")
+    (description
+     "@code{asn1crypto} is an ASN.1 parser and serializer with definitions for
+private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8,
+PKCS#12, PKCS#5, X.509 and TSP.")
     (license license:expat)))
 
 (define-public python-pynacl
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 17c9563cfd..4c38636af5 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5008,7 +5008,7 @@ for URL parsing and changing.")
 (define-public python-canvasapi
   (package
     (name "python-canvasapi")
-    (version "2.2.0")
+    (version "3.2.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -5017,9 +5017,9 @@ for URL parsing and changing.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0i13wrq2czcaz3h98pvnsl237104v611y9636jf32b1nn76sbp0p"))))
-    (build-system python-build-system)
-    (propagated-inputs (list python-pytz python-requests))
+                "1vbd3ndhmxi8scxgxs6sc7r0rdaliqd80384n06nyb3haqz25inm"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs (list python-arrow python-pytz python-requests))
     (native-inputs (list python-requests-mock))
     (home-page "https://github.com/ucfopen/canvasapi")
     (synopsis "API wrapper for the Canvas LMS")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b8e8097c7b..385426671e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -139,6 +139,7 @@
 ;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
 ;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net>
 ;;; Copyright © 2023 Ontje Lünsdorf <ontje.luensdorf@dlr.de>
+;;; Copyright © 2023 Parnikkapore <poomklao@yahoo.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -8940,6 +8941,53 @@ converting, and viewing many of the proprietary file formats used to store
 experimental data and metadata at the Laboratory for Fluorescence Dynamics.")
     (license license:bsd-3)))
 
+(define-public python-ffmpeg-python
+  ;; The latest release (0.2.0) is old and its test suite crashs on Python 3.10.
+  (let ((commit "df129c7ba30aaa9ffffb81a48f53aa7253b0b4e6") (revision "0"))
+    (package
+      (name "python-ffmpeg-python")
+      (version (git-version "0.2.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/kkroening/ffmpeg-python.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1zj4ac37n4igfj21zy405mdlvbpv6jyb12wfpszf8zkhhj2qby4c"))))
+      (build-system python-build-system)
+      (arguments
+       (list
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'hardcode-ffmpeg
+              (lambda* (#:key inputs #:allow-other-keys)
+                (define ffmpeg (search-input-file inputs "bin/ffmpeg"))
+                (substitute* "ffmpeg/_run.py"
+                  (("cmd='ffmpeg'")
+                   (string-append "cmd='" ffmpeg "'")))
+                (substitute* "ffmpeg/tests/test_ffmpeg.py"
+                  (("out_file.compile\\(\\) == \\['ffmpeg'")
+                   (string-append "out_file.compile() == ['" ffmpeg "'")))))
+            ;; Some tests fail with ffmpeg 5+
+            (replace 'check
+              (lambda* (#:key tests? #:allow-other-keys)
+                (when tests?
+                  (invoke "pytest" "-vv"
+                          "-k" "not test_pipe and not test__probe")))))))
+      (inputs (list ffmpeg))
+      (propagated-inputs (list python-future))
+      (native-inputs (list python-future python-numpy python-pytest
+                           python-pytest-mock python-pytest-runner))
+      (home-page "https://github.com/kkroening/ffmpeg-python")
+      (synopsis "Python bindings for FFmpeg with complex filtering support")
+      (description
+       "ffmpeg-python allows you to write FFmpeg filtergraphs in familiar
+Python terms, taking care of running ffmpeg with the correct command-line
+arguments.  It handles arbitrarily large (directed-acyclic) signal graphs.")
+      (license license:asl2.0))))
+
 (define-public python-imageio-ffmpeg
   (package
    (name "python-imageio-ffmpeg")
@@ -14197,13 +14245,13 @@ implementations of ASN.1-based codecs and protocols.")
 (define-public python-asn1tools
   (package
     (name "python-asn1tools")
-    (version "0.158.0")
+    (version "0.166.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "asn1tools" version))
        (sha256
-        (base32 "1k88a1azmyvp2ab6qcf2i40dig5abhyn7cmlyhmwwh8kr3syvma0"))))
+        (base32 "1hragm8dsm10rlyz67xslj01bycprlnimdmq1i2acns6kl6difpn"))))
     (build-system python-build-system)
     (propagated-inputs
      (list python-bitstruct python-diskcache python-prompt-toolkit
@@ -23251,17 +23299,15 @@ Git.")
 (define-public python-setuptools-rust
   (package
     (name "python-setuptools-rust")
-    (version "1.1.2")
+    (version "1.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "setuptools-rust" version))
        (sha256
-        (base32 "1lb57qx1azklgzmalflq960agvwci4bwddw0zvlc9zy00fsvkbd0"))))
-    (build-system python-build-system)
+        (base32 "0qi274r0fcnvxa8vs8vyhcknnzhq8pd0ig5zk1wmjc63x96p6vn8"))))
+    (build-system pyproject-build-system)
     (arguments '(#:tests? #f))          ;no tests
-    (native-inputs
-     (list python-setuptools-scm))
     (propagated-inputs
      (list python-semantic-version python-typing-extensions))
     (home-page "https://github.com/PyO3/setuptools-rust")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1184a85938..b7e394d663 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -28,6 +28,7 @@
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2022 Yash Tiwari <yasht@mailbox.org>
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -124,9 +125,33 @@
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xml)
+  #:use-module (ice-9 match)
   #:use-module (srfi srfi-1))
 
-(define %qt-version "5.15.8")
+(define-public qcoro-qt5
+  (package
+    (name "qcoro-qt5")
+    (version "0.9.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/danvratil/qcoro")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0pk5ybk6zv7m0wnkl6m3m8sjybmfk6wcn22mmgj942hrc3yrdzci"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "-DUSE_QT_VERSION=5")))
+    (native-inputs (list dbus))         ;for tests
+    (inputs (list qtbase-5 qtdeclarative-5 qtwebsockets-5))
+    (home-page "https://qcoro.dvratil.cz/")
+    (synopsis "C++ Coroutine Library for Qt5")
+    (description "QCoro is a C++ library that provide set of tools to make use
+of C++20 coroutines in connection with certain asynchronous Qt actions.")
+    (license license:expat)))
 
 (define-public qite
   (let ((commit "75fb3b6bbd5c6a5a8fc35e08a6efbfb588ed546a")
@@ -285,7 +310,7 @@ applications on Wayland.")
 (define-public grantlee
   (package
     (name "grantlee")
-    (version "5.2.0")
+    (version "5.3.1")
     (source
       (origin
         (method git-fetch)
@@ -294,7 +319,8 @@ applications on Wayland.")
               (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
-         (base32 "02dyqxjyxiqxrlz5g7v9ly8f095vs3iha39l75q6s8axs36y01lq"))))
+         (base32 "1ipnkdi8wgv519mvwa5zxlz20wipbypyfixjv2qdfd9vl1pznwvs"))
+        (patches (search-patches "grantlee-fix-i586-precision.patch"))))
     (native-inputs
      ;; Optional: lcov and cccc, both are for code coverage
      (list doxygen))
@@ -302,12 +328,11 @@ applications on Wayland.")
      (list qtbase-5 qtdeclarative-5 qtscript))
     (build-system cmake-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'check-setup
-           (lambda _
-             ;; make Qt render "offscreen", required for tests
-             (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-before 'check 'check-setup
+                          (lambda _
+                            ;; make Qt render "offscreen", required for tests
+                            (setenv "QT_QPA_PLATFORM" "offscreen"))))))
     (home-page "https://github.com/steveire/grantlee")
     (synopsis "Libraries for text templating with Qt")
     (description "Grantlee Templates can be used for theming and generation of
@@ -315,38 +340,29 @@ other text such as code.  The syntax uses the syntax of the Django template
 system, and the core design of Django is reused in Grantlee.")
     (license license:lgpl2.1+)))
 
-(define (qt-urls component version)
-  "Return a list of URLs for VERSION of the Qt5 COMPONENT."
+(define (qt-url component version)
+  "Return a mirror URL for the Qt5 COMPONENT at VERSION."
   ;; We can't use a mirror:// scheme because these URLs are not exact copies:
   ;; the layout differs between them.
-  (list (string-append "https://download.qt.io/official_releases/qt/"
-                       (version-major+minor version) "/" version
-                       "/submodules/" component "-everywhere-opensource-src-"
-                       version ".tar.xz")
-        (string-append "https://download.qt.io/official_releases/qt/"
-                       (version-major+minor version) "/" version
-                       "/submodules/" component "-everywhere-src-"
-                       version ".tar.xz")
-        (string-append "https://download.qt.io/archive/qt/"
-                       (version-major+minor version) "/" version
-                       "/submodules/" component "-everywhere-opensource-src-"
-                       version ".tar.xz")
-        (let ((directory (string-append "qt5" (string-drop component 2))))
-          (string-append "http://sources.buildroot.net/" directory "/"
-                         component "-everywhere-opensource-src-" version ".tar.xz"))
-        (string-append "https://distfiles.macports.org/qt5/"
-                       component "-everywhere-opensource-src-" version ".tar.xz")))
+  (let ((x (match (version-major version)
+             ("5" "-everywhere-opensource-src-")
+             ;; Version 6 and later dropped 'opensource' from the archive
+             ;; names.
+             (_ "-everywhere-src-"))))
+    (string-append "mirror://qt/qt/"
+                   (version-major+minor version) "/" version
+                   "/submodules/" component x version ".tar.xz")))
 
 (define-public qtbase-5
   (package
     (name "qtbase")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "175ynjndpzsw69vnsq4swykn9f48568ww9b4z3yw7azkqwk13cdz"))
+                "1fcg3kx5akvj0kqxd99h5lv3kv4pw2cj0makmpvhpw90inqnrl60"))
               ;; Use TZDIR to avoid depending on package "tzdata".
               (patches (search-patches "qtbase-use-TZDIR.patch"
                                        "qtbase-moc-ignore-gcc-macro.patch"
@@ -591,15 +607,16 @@ developers using C++ or QML, a CSS & JavaScript like language.")
     (license (list license:lgpl2.1 license:lgpl3))))
 
 (define-public qtbase
-  (package/inherit qtbase-5
+  (package
+    (inherit qtbase-5)
     (name "qtbase")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (inherit (package-source qtbase-5))
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "19m9r8sf9mvyrwipn44if3nhding4ljys2mwf04b7dkhz16vlabr"))
+                "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"))
               (modules '((guix build utils)))
               (snippet
                ;; corelib uses bundled harfbuzz, md4, md5, sha3
@@ -752,6 +769,18 @@ developers using C++ or QML, a CSS & JavaScript like language.")
                      (list
                       ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE".
                       "tst_moc"
+
+                      ;; The 'tst_qdate' test fails because the current time
+                      ;; is reported as an invalid date (see:
+                      ;; https://bugreports.qt.io/browse/QTBUG-116017).
+                      "tst_qdate"
+
+                      ;; The qgraphicsview and qopenglwidget tests fail with a
+                      ;; segfault for unknown reasons (see:
+                      ;; https://bugreports.qt.io/browse/QTBUG-116018).
+                      "tst_qgraphicsview"
+                      "tst_qopenglwidget"
+
                       ;; The 'test_rcc' test fails on a comparison:
                       ;; <<<<<< actual
                       ;; 0x0,0x0,0x0,0x0,0x0,0x0,0x3,0xe8,
@@ -863,8 +892,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")
                              (search-input-file
                               outputs
                               (string-append "lib/qt6/mkspecs/features/" file)))
-                           '("device_config.prf" "moc.prf" "qt_build_config.prf"
-                             "qt_config.prf"))
+                           '("device_config.prf" "moc.prf" "qt_config.prf"))
                     (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata)
                     (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)))))))))
     (native-inputs
@@ -873,8 +901,16 @@ developers using C++ or QML, a CSS & JavaScript like language.")
                 xvfb-run)))
     (inputs
      (modify-inputs (package-inputs qtbase-5)
-       (prepend bash-minimal coreutils-minimal libxcb md4c)
-       (replace "postgresql" postgresql))) ;use latest postgresql
+       (prepend at-spi2-core
+                bash-minimal
+                coreutils-minimal
+                md4c
+                libice
+                libsm
+                libxcb
+                libxext
+                xcb-util-cursor
+                `(,zstd "lib"))))
     (native-search-paths
      (list (search-path-specification
             (variable "QMAKEPATH")
@@ -896,13 +932,13 @@ developers using C++ or QML, a CSS & JavaScript like language.")
   (package
     (inherit qtbase-5)
     (name "qt3d")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "18hbv4l9w0czaxcch6af9130fgs4sf400xp0pfzl81c78fwrkfsb"))))
+                "0pwcjm0xxa4f3sg634bv2n61jmn852yr0y6qjvyp8dcvic90cp12"))))
     (propagated-inputs `())
     (native-inputs (list perl))
     (inputs (list mesa qtbase-5 vulkan-headers zlib))
@@ -958,13 +994,13 @@ HostData=lib/qt5"
 (define-public qt5compat
   (package
     (name "qt5compat")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1k30hnwnlbay1hnkdavgf6plsdzrryzcqd2qz8x11r477w7sr8wi"))))
+                "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -988,13 +1024,13 @@ came with the @{qtgraphicaleffects} Qt 5 package.")
   (package
     (inherit qtbase-5)
     (name "qtsvg")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "0qnmcvp5jap4qq9w7xak66g6fsb48q1lg02rn4lycvnhgwzblbww"))))
+                "1s2a00vqq0njwmd34pas7gmmlb9cjjq5dra1s1wpfxlabf1y64yg"))))
     (propagated-inputs `())
     (native-inputs (list perl))
     (inputs
@@ -1056,13 +1092,13 @@ HostData=lib/qt5
 (define-public qtsvg
   (package
     (name "qtsvg")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "14i3f23k9k0731akpwa6zzhw5m3c0m2l5r7irvim4h4faah445ac"))))
+                "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1084,20 +1120,21 @@ HostData=lib/qt5
     (home-page (package-home-page qtbase))
     (license (package-license qtbase))))
 
-(define-public qtimageformats
-  (package (inherit qtsvg-5)
+(define-public qtimageformats-5
+  (package
+    (inherit qtsvg-5)
     (name "qtimageformats")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
-             (method url-fetch)
-             (uri (qt-urls name version))
-             (sha256
-              (base32
-               "0c6fq9zcw5hbkiny56wx2fbm123x14l7habydv6zhvnhn3rhwi31"))
-             (modules '((guix build utils)))
-             (snippet
-              '(begin
-                 (delete-file-recursively "src/3rdparty")))))
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "1cniah8v8y514i68bmwgfi3xn3hzgpywcdnzrv789mk7qi48l92g"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (delete-file-recursively "src/3rdparty")))))
     (native-inputs `())
     (inputs
      (list jasper
@@ -1111,16 +1148,50 @@ HostData=lib/qt5
     (description "The QtImageFormats module contains plugins for adding
 support for MNG, TGA, TIFF and WBMP image formats.")))
 
+(define-public qtimageformats
+  (package
+    (name "qtimageformats")
+    (version "6.5.2")
+    (source (origin
+              (inherit (package-source qtimageformats-5))
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'set-display
+            (lambda _
+              ;; Make Qt render "offscreen", required for tests.
+              (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+    (inputs
+     (list jasper
+           libmng
+           libtiff
+           libwebp
+           mesa
+           qtbase
+           zlib))
+    (synopsis "Additional Image Format plugins for Qt")
+    (description "The QtImageFormats module contains plugins for adding
+support for MNG, TGA, TIFF and WBMP image formats.")
+    (home-page (package-home-page qtbase))
+    (license (package-license qtbase))))
+
 (define-public qtx11extras
   (package (inherit qtsvg-5)
     (name "qtx11extras")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
              (method url-fetch)
-             (uri (qt-urls name version))
+             (uri (qt-url name version))
              (sha256
               (base32
-               "1gzmf0y2byzrgfbing7xk3cwlbk1cyjlhqjbfh8n37y09gg65maf"))))
+               "1x489lw3nx28p9cggdrr9n0l49w9y1mcpni9x91sic6wpyfx3p6p"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@@ -1180,13 +1251,13 @@ XLSX document format.")
 (define-public qtxmlpatterns
   (package (inherit qtsvg-5)
     (name "qtxmlpatterns")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
              (method url-fetch)
-             (uri (qt-urls name version))
+             (uri (qt-url name version))
              (sha256
               (base32
-               "1inf7ar32a557faqpwdsmafhz1p6k8hywpw3wbsdjlj74dkgdq35"))))
+               "03fss4lssi48d8gdj8inkj4qgmyzxbn7r4bm58ckbh5vl9rpamq3"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
@@ -1209,13 +1280,14 @@ xmlpatternsvalidator.")))
   (package
     (inherit qtsvg-5)
     (name "qtdeclarative")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2"))))
+                "1x1xsdlxwpdxzrapk5q0adjwh48c6awd8nj4j51ig6y49hy4r6r3"))
+              (patches (search-patches "qtdeclarative-5-disable-qmlcache.patch"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)             ;TODO: Enable the tests
@@ -1254,14 +1326,15 @@ with JavaScript and C++.")))
 (define-public qtdeclarative
   (package
     (name "qtdeclarative")
-    (version "6.3.2")
+    (version "6.5.2")
     ;; TODO: Package 'masm' and unbundle from sources.
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq"))))
+                "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk"))
+              (patches (search-patches "qtdeclarative-disable-qmlcache.patch"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1358,7 +1431,20 @@ with JavaScript and C++.")))
                     ;; waiting for a killed process, which becomes a zombie in
                     ;; the build container (perhaps solved after
                     ;; fixing/applying #30948).
-                    "tst_qqmlpreview") "|")
+                    "tst_qqmlpreview"
+
+                    ;; These tests fail starting with 6.5.2 (see:
+                    ;; https://bugreports.qt.io/browse/QTBUG-116019).  They
+                    ;; appear to fail because of attempting to load QML from
+                    ;; elsewhere than from QML2_IMPORT_PATH.
+                    "cmake_test_common_import_path"
+                    "tst_qqmlcomponent"
+                    "tst_qmllint"
+                    "tst_qmldomitem"
+                    "tst_dom_all"
+                    "tst_qmlls"
+                    "tst_qmllscompletions"
+                    ) "|")
                   ")")))))
           (add-after 'install 'delete-installed-tests
             (lambda _
@@ -1371,9 +1457,13 @@ with JavaScript and C++.")))
            qtshadertools
            vulkan-headers))
     (inputs
-     (list libxkbcommon
+     (list at-spi2-core
+           libxkbcommon
            mesa
-           qtbase))
+           qtbase
+           qtimageformats
+           qtlanguageserver
+           qtsvg))
     (home-page (package-home-page qtbase))
     (synopsis "Qt QML module (Quick 2)")
     (description "The Qt QML module provides a framework for developing
@@ -1387,13 +1477,13 @@ integrate QML code with JavaScript and C++.")
   (package
     (inherit qtsvg-5)
     (name "qtconnectivity")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1j6qgkg77ycwcjxnhh38i9np1z8pjsqrzvfk3zsyq07f6k563fnc"))))
+                "1sdrw67djfr8qi5wx3qhg8asq2c6f3v3mal3sms7dp7a2l1irnrz"))))
     (native-inputs
      (list perl pkg-config qtdeclarative-5))
     (inputs
@@ -1405,13 +1495,13 @@ with Bluetooth and NFC.")))
 (define-public qtwebsockets-5
   (package (inherit qtsvg-5)
     (name "qtwebsockets")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
              (method url-fetch)
-             (uri (qt-urls name version))
+             (uri (qt-url name version))
              (sha256
               (base32
-               "12h520lpj2pljgkyq36p1509mw4pxgb76n30d32kg52crjsk34pa"))))
+               "12nryr99cixwxc1mnb12sys7bp4xnm39nzq1mf2lajswkvdn559b"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@@ -1428,13 +1518,13 @@ consume data received from the server, or both.")))
 (define-public qtwebsockets
   (package
     (name "qtwebsockets")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1smbvidaybphvsmaap9v1pbkibwmng11hb925g0ww4ghwzpxkb8q"))))
+                "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1468,13 +1558,13 @@ consume data received from the server, or both.")
   (package
     (inherit qtsvg-5)
     (name "qtsensors")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1fdpgbikvxjacyipcyac0czqhv96pvc75dl9cyafslws8m53fm56"))))
+                "00gzb7xcifi3ib5adi7s6h5wvc6v4f48nwb4g1pm0zq9sv22lg6d"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:parallel-tests? _ #f) #f)    ; can lead to race condition
@@ -1482,9 +1572,11 @@ consume data received from the server, or both.")
         `(modify-phases ,phases
            (add-after 'unpack 'fix-tests
              (lambda _
-               (substitute* "tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp"
+               (substitute* "tests/auto/qsensorgestures_gestures\
+/tst_sensorgestures_gestures.cpp"
                  (("2000") "5000")      ;lengthen test timeout
-                 (("QTest::newRow(\"twist\") << \"twist\"") "")))))))) ;failing test
+                 ;; This test fails.
+                 (("QTest::newRow(\"twist\") << \"twist\"") ""))))))))
     (native-inputs
      (list perl qtdeclarative-5))
     (inputs (list qtbase-5))
@@ -1497,13 +1589,13 @@ recognition API for devices.")))
   (package
     (inherit qtsvg-5)
     (name "qtmultimedia")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1fz0ffpckvbg6qfhab2rrzfnvh4mlalqxcn0kbkd21mi44apjirk"))
+                "1di99ysjrgklx2jpsl0g0lqr9jh4l4p4a3hpi452qny6isyy01hi"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -1520,7 +1612,8 @@ recognition API for devices.")))
              (lambda* (#:key outputs #:allow-other-keys)
                (let ((out (assoc-ref outputs "out")))
                  (invoke "qmake" "QT_BUILD_PARTS = libs tools tests"
-                         (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," out "/lib -Wl,-rpath,")
+                         (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath,"
+                                        out "/lib -Wl,-rpath,")
                          (string-append "PREFIX=" out)))))))
        ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
     (native-inputs
@@ -1541,15 +1634,15 @@ set of plugins for interacting with pulseaudio and GStreamer.")))
 (define-public qtshadertools
   (package
     (name "qtshadertools")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               ;; Note: the source bundles *patched* glslang and SPIRV-Cross
               ;; sources.
               (sha256
                (base32
-                "1bmkrpk414clx8pnyrdslqlsnfmsdldmwrdcqzz6rwi8ymk2ggpn"))))
+                "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1570,13 +1663,13 @@ Vulkan, OpenGL and other main graphic APIs.")
 (define-public qtmultimedia
   (package
     (name "qtmultimedia")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "0hqwq0ad6z8c5kyyvbaddj00mciijn2ns2r60jc3mqh98nm2js3z"))
+                "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -1636,16 +1729,15 @@ set of plugins for interacting with pulseaudio and GStreamer.")
   (package
     (inherit qtsvg-5)
     (name "qtwayland")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
-              (patches (search-patches "qtwayland-gcc-11.patch"
-                                       "qtwayland-dont-recreate-callbacks.patch"
+              (uri (qt-url name version))
+              (patches (search-patches "qtwayland-dont-recreate-callbacks.patch"
                                        "qtwayland-cleanup-callbacks.patch"))
               (sha256
                (base32
-                "0aa5jcvvap6qca6imdkhs1mhv5bnaxn466mmpl7x78jx1za7n3ps"))))
+                "1w9nclz1lfg5haq3m6ihils0kl2n1pqagdyh71ry1m281w8gvly8"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
@@ -1685,13 +1777,13 @@ compositor libraries.")))
 (define-public qtwayland
   (package
     (name "qtwayland")
-    (version "6.3.2")
+    (version "6.5.2")
     (source
      (origin
        (method url-fetch)
-       (uri (qt-urls name version))
+       (uri (qt-url name version))
        (sha256
-        (base32 "0rwiirkibgpvx05pg2842j4dcq9ckxmcqxhaf50xx2i55z64ll83"))))
+        (base32 "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
@@ -1705,7 +1797,7 @@ compositor libraries.")))
                      (((string-append
                         "QVERIFY\\(!cursorSurface\\(\\)->"
                         "m_waitingFrameCallbacks\\.empty\\(\\)\\);")) "")
-                     (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);") ""))))
+                     (("QTRY_COMPARE\\(bufferSpy\\.size\\(\\), 1\\);") ""))))
                (add-before 'check 'set-test-environment
                  (lambda _
                    ;; Do not fail just because /etc/machine-id is missing.
@@ -1736,13 +1828,13 @@ compositor libraries.")
   (package
     (inherit qtsvg-5)
     (name "qtserialport")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "04i8pdyml1sw4dkk9vyw2xy5bz3fp6f90fws7ag5y8iizfgs5v2v"))))
+                "1zk8y20bqibpvsxi1mqg1ry37xq55yw3m0isij4j9pc58lm4wvzw"))))
     (native-inputs (list perl))
     (inputs (list qtbase-5 eudev))
     (arguments
@@ -1767,13 +1859,13 @@ interacting with serial ports from within Qt.")))
   (package
     (inherit qtsvg-5)
     (name "qtserialbus")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "0ws3pjbp4g8f49k8q0qa5hgyisbyk3m7kl8pwzkfws048glvz570"))))
+                "1i7zc5nlp9by0sr6qlls89zqm84sdxl1h4mr30dbxwsvvrqkmhf9"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases '%standard-phases)
@@ -1794,13 +1886,13 @@ and others.")))
 (define-public qtwebchannel-5
   (package (inherit qtsvg-5)
     (name "qtwebchannel")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
              (method url-fetch)
-             (uri (qt-urls name version))
+             (uri (qt-url name version))
              (sha256
               (base32
-               "1pfmy6fqis47awjb590r63y13vvsfm0fq70an3ylsknhyq3firgn"))))
+               "1rgziqprq0xvd57jfvd7ddkcddj3645ldn3xbq3n6w058bw04mz2"))))
     (native-inputs (list perl qtdeclarative-5 qtwebsockets-5))
     (inputs (list qtbase-5))
     (synopsis "Web communication library for Qt")
@@ -1812,13 +1904,13 @@ popular web engines, Qt WebKit 2 and Qt WebEngine.")))
 (define-public qtwebchannel
   (package
     (name "qtwebchannel")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "0gqm09yqdq27kgb02idx5ycj14k5mjhh10ddp9jfs8lblimlgfni"))))
+                "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1850,13 +1942,13 @@ application).")
   (package
     (inherit qtsvg-5)
     (name "qtwebglplugin")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1gvzhgfn55kdp5g11fg5yja5xb6wghx5sfc8vfp8zzpxnak7pbn1"))))
+                "12kcvq5y5rpivxrn0p43gdkk3yysdi7bk904jgd3wk67gl0bda8r"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
@@ -1869,7 +1961,7 @@ application).")
     (inputs (list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib))
     (synopsis "QPA plugin for running applications via a browser using
 streamed WebGL commands")
-    (description "Qt back end that uses WebGL for rendering. It allows Qt
+    (description "Qt back end that uses WebGL for rendering.  It allows Qt
 applications (with some limitations) to run in a web browser that supports
 WebGL.  WebGL is a JavaScript API for rendering 2D and 3D graphics within any
 compatible web browser without the use of plug-ins.  The API is similar to
@@ -1879,13 +1971,13 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
   (package
     (inherit qtsvg-5)
     (name "qtwebview")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1b03dzlff840n2i53r105c7sv91ivwzxn7ldpgnhiyrhr897i9kj"))))
+                "00446917v1djh18lqsk1q5bhgfsfyz06q4zvna96xalwvl3ccn14"))))
     (native-inputs (list perl))
     (inputs (list qtbase-5 qtdeclarative-5))
     (synopsis "Display web content in a QML application")
@@ -1893,17 +1985,41 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
 application without necessarily including a full web browser stack by using
 native APIs where it makes sense.")))
 
+(define-public qtlanguageserver
+  (package
+    (name "qtlanguageserver")
+    (version "6.5.2")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-after 'install 'delete-installed-tests
+                          (lambda _
+                            (delete-file-recursively
+                             (string-append #$output "/tests")))))))
+    (inputs (list qtbase))
+    (home-page (package-home-page qtbase))
+    (synopsis "Implementation of the Language Server Protocol for Qt")
+    (description "This package provides an implementation of the Language
+Server Protocol (LSP) for Qt.")
+    (license (package-license qtbase))))
+
 (define-public qtlocation
   (package
     (inherit qtsvg-5)
     (name "qtlocation")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "0r16qxy0pfpwvna4gpz67jk3qv3qizfd659kc9iwdh8bhz7lpjrw"))))
+                "0cvcpf0grwqnk6jxhrwm9xxm3dyc6lqvmb1np7fvkhkzjimx45l8"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)             ; TODO: Enable the tests
@@ -1921,13 +2037,13 @@ positioning and geolocation plugins.")))
 (define-public qtlottie
   (package
     (name "qtlottie")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1c092hmf114r8jfdhkhxnn3vywj93mg33whzav47gr9mbza44icq"))))
+                "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1954,13 +2070,13 @@ plugin for Adobe After Effects.")
   (package
     (inherit qtsvg-5)
     (name "qttools")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1i79fwsn799x3n3jidp3f4gz9d5vi9gg6p8g8lbswb832gggigm3"))))
+                "1bkx2sc5hyldarc7w76ymv7dlcna3ib9r2kp67jdqcf856bnrx36"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
@@ -1974,13 +2090,13 @@ that helps in Qt development.")))
 (define-public qttools
   (package
     (name "qttools")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1lmfk5bhgg4daxkqrhmx4iyln7pyiz40c9cp6plyp35nz8ppvc75"))))
+                "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2014,13 +2130,13 @@ that helps in Qt development.")
 (define-public qttranslations
   (package
     (name "qttranslations")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1h66n9cx4g65c9wrgp32h9gm3r47gyh1nrcn3ivbfbvngfawqxpg"))))
+                "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k"))))
     (build-system cmake-build-system)
     (arguments (list #:tests? #f))
     (native-inputs (list qtbase qttools))
@@ -2036,13 +2152,13 @@ the Qt community.")
   (package
     (inherit qtsvg-5)
     (name "qtscript")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "0rjj1pn0fwdq0qz0nzisxza671ywfrq5cv6iplywfyflh7q4dmcs"))
+                "0fvhjsn41f6gx7bmvifxl61fdk6mg9lc6wgnwsfz2kyx0r2wsbb4"))
               (patches (search-patches "qtscript-disable-tests.patch"))))
     (native-inputs (list perl qttools-5))
     (inputs (list qtbase-5))
@@ -2055,13 +2171,13 @@ ECMAScript and Qt.")))
   (package
     (inherit qtsvg-5)
     (name "qtquickcontrols")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "0yp47bpkfckms76vw0hrwnzchy8iak23ih6w9pnwrnjkmbc65drc"))))
+                "1szgm7d8d2lllq19iyf4ggif933bprgsgmp4wzyg0mwq21rnwsm0"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
@@ -2075,13 +2191,13 @@ can be used to build complete interfaces in Qt Quick.")))
   (package
     (inherit qtsvg-5)
     (name "qtquickcontrols2")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "058dkj6272za47vnz3mxsmwsj85gxf6g0ski645fphk8s3jp2bk5"))))
+                "13pw0ah7ydkl27pvqwdjw8rc3cxgag7jr0a12g1iw0z9zs94r5cp"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
@@ -2092,23 +2208,17 @@ module that provides platform integration: native dialogs, menus and menu bars,
 and tray icons.  It falls back to Qt Widgets when a native implementation is
 not available.")))
 
-(define-public qtquickcontrols2
-  ;; qtquickcontrols2 still exist, but was merged into qtdeclarative.
-  ;; Unfortunately that hasn't been well communicated at all (see:
-  ;; https://bugreports.qt.io/browse/QTBUG-79454).
-  (deprecated-package "qtquickcontrols2" qtdeclarative))
-
 (define-public qtgraphicaleffects
   (package
     (inherit qtsvg-5)
     (name "qtgraphicaleffects")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "0wypji8i19kjq18qd92z8kkd3fj2n0d5hgh6xiza96833afvibj9"))))
+                "01f0glgc74595llfdfmapc3hqw3lqj8lcdmabm0mmnplnabb2b5b"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
@@ -2125,13 +2235,13 @@ coloring, and many more.")))
   (package
     (inherit qtsvg-5)
     (name "qtgamepad")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "0vgxprgk7lak209wsg2ljzfkpwgjzscpbxmj5fyvvwm2pbnpspvk"))))
+                "0xkaib238x1lj6agf4gywgy69826zpxqlda361wlchwasyrbw238"))))
     (native-inputs (list perl pkg-config))
     (inputs
      (list fontconfig
@@ -2151,13 +2261,13 @@ and mobile applications targeting TV-like form factors.")))
   (package
     (inherit qtsvg-5)
     (name "qtscxml")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "17j6npvgr8q3lyrqmvfh1n47mkhfzk18r998hcjm2w75xj46km1n"))
+                "10lxvdxdkxr2vldhqdp4bk38r7q9j0jy54lrqw9whnyj3y5wgzzi"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -2178,13 +2288,13 @@ also contains functionality to support data models and executable content.")))
 (define-public qtpositioning
   (package
     (name "qtpositioning")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "0zh45lf164nzwl1hh96qm64nyw9wzzrnm5s7sx761glz54q6l5xz"))))
+                "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2209,13 +2319,13 @@ information and perform area based monitoring.")
   (package
     (inherit qtsvg-5)
     (name "qtpurchasing")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "0bjky5ncg9yhz4a63g3jl1r5pa6i09f6g8wgzs591mhybrbmhcw8"))))
+                "0gzxzcr9x45nd90481hdbj5shvaax00qjr1kx3lkcp13187pyacb"))))
     (inputs (list qtbase-5 qtdeclarative-5))
     (synopsis "Qt Purchasing module")
     (description "The Qt Purchasing module provides and in-app API for
@@ -2225,13 +2335,13 @@ purchasing goods and services.")))
   (package
     (inherit qtsvg-5)
     (name "qtcharts")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1q11ank69l9qw3iks2svr0g2g6pzng9v8p87dpsmjs988f4ysmll"))))
+                "0ax1qab1ibibk2bbwmlmsni7j4y821jzvcvrr63iz6pcw94vwx6h"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
@@ -2245,44 +2355,44 @@ purchasing goods and services.")))
     (synopsis "Qt Charts module")
     (description "The Qt Charts module provides a set of easy to use chart
 components.  It uses the Qt Graphics View Framework, therefore charts can be
-easily integrated to modern user interfaces.  Qt Charts can be used as QWidgets,
-QGraphicsWidget, or QML types. Users can easily create impressive graphs by
-selecting one of the charts themes.")
+easily integrated to modern user interfaces.  Qt Charts can be used as
+QWidgets, QGraphicsWidget, or QML types.  Users can easily create impressive
+graphs by selecting one of the charts themes.")
     (license license:gpl3)))
 
 (define-public qtdatavis3d
   (package
     (inherit qtsvg-5)
     (name "qtdatavis3d")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1mr2kdshahxrkjs9wlgpr59jbqvyvlax16rlnca4iq00w3v5hrdh"))))
+                "1lhy6l0hlm8mc21k7bwzkgnj6nn6x1f0h2imk8wqjjcvb5g605g5"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs (list qtbase-5 qtdeclarative-5))
     (synopsis "Qt Data Visualization module")
     (description "The Qt Data Visualization module provides a way to visualize
-data in 3D as bar, scatter, and surface graphs. It is especially useful for
+data in 3D as bar, scatter, and surface graphs.  It is especially useful for
 visualizing depth maps and large quantities of rapidly changing data, such as
-data received from multiple sensors. The look and feel of graphs can be
+data received from multiple sensors.  The look and feel of graphs can be
 customized by using themes or by adding custom items and labels to them.")
     (license license:gpl3)))
 
 (define-public qtnetworkauth-5
   (package (inherit qtsvg-5)
     (name "qtnetworkauth")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
              (method url-fetch)
-             (uri (qt-urls name version))
+             (uri (qt-url name version))
              (sha256
               (base32
-               "0fsmpjwkzzy3281shld7gs1gj217smb1f8ai63gdvnkp0jb2fhc5"))))
+               "0qf9dqh7rlbyi3fl7610zb86yqxwaq5m3zvwp2c8w1sa0m8jcili"))))
     (inputs (list qtbase-5))
     (synopsis "Qt Network Authorization module")
     (description "The Qt Network Authorization module provides an
@@ -2291,13 +2401,13 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
 (define-public qtnetworkauth
   (package
     (name "qtnetworkauth")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "0mjnz87splyxq7jwydi5ws2aqb6j7czscrkns193w425x0dgy94l"))))
+                "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f"))))
     (build-system cmake-build-system)
     (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")))
     (native-inputs (list perl))
@@ -2311,13 +2421,13 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")
 (define-public qtremoteobjects
   (package
     (name "qtremoteobjects")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "099b3vchi458i4fci9kfwan871jplqlk5l8q78mfnh33g80qnasi"))))
+                "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2349,13 +2459,13 @@ processes or computers.")
   (package
     (inherit qtsvg-5)
     (name "qtspeech")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (qt-urls name version))
+              (uri (qt-url name version))
               (sha256
                (base32
-                "1q56lyj7s05sx52j5z6gcs000mni4c7mb7qyq4lfval7c06hw5p6"))))
+                "1qscnqxnm9yvfa0i6xnz04xrhlxf08v3xkas8ng790camr34pwwa"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@@ -2370,6 +2480,45 @@ the end-user is driving and cannot attend the incoming messages on the phone.
 In such a scenario, the messaging application can read out the incoming
 message.")))
 
+(define-public qtvirtualkeyboard-5
+  (package
+    (inherit qtsvg-5)
+    (name "qtvirtualkeyboard")
+    (version "5.15.10")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "1a1xnk1kmq1k8r1rsa29fq7m3vy2f0fqhy8k46q3ssn32skzlwa5"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
+       ((#:tests? _ #f) #f) ; TODO: pass 2 fail test
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-before 'check 'set-display
+             (lambda _
+               ;; Make Qt render "offscreen", required for tests.
+               (setenv "QT_QPA_PLATFORM" "offscreen")
+               (setenv "DISPLAY" ":1")
+               (system "Xvfb +extension GLX :1 &")))
+           (delete 'check)               ;move after the install phase
+           (add-after 'install 'check
+             (assoc-ref %standard-phases 'check))
+           (add-before 'check 'prepare-for-tests
+             (lambda* (#:key outputs #:allow-other-keys)
+               (setenv "QML2_IMPORT_PATH"
+                       (string-append (assoc-ref outputs "out")
+                                      "/lib/qt5/qml:"
+                                      (getenv "QML2_IMPORT_PATH")))))))))
+    (native-inputs (list perl xorg-server-for-tests))
+    (inputs (list qtbase-5 qtdeclarative-5))
+    (propagated-inputs (list qtquickcontrols-5 qtsvg-5))
+    (synopsis "QtQuick virtual keyboard")
+    (description "The Qt Speech module provides a virtual keyboard framework
+that consists of a C++ backend supporting custom input methods as well as a UI
+frontend implemented in QML.")))
+
 (define-public qtspell
   (package
     (name "qtspell")
@@ -2457,14 +2606,14 @@ using the Enchant spell-checking library.")
   (package
     (inherit qtsvg-5)
     (name "qtwebengine")
-    (version %qt-version)
+    (version "5.15.10")
     (source
      (origin
        (method url-fetch)
-       (uri (qt-urls name version))
+       (uri (qt-url name version))
        (sha256
         (base32
-         "1qv15g5anhlfsdwnjxy21vc3zxxm8149vysi774l93iab6mxqmjg"))
+         "1rz6vbmr1aydmixayazmpsy7v2naq25l72q1gmvrhf9yf69584q8"))
        (modules '((ice-9 ftw)
                   (ice-9 match)
                   (srfi srfi-1)
@@ -2557,7 +2706,7 @@ using the Enchant spell-checking library.")
                      "third_party/nasm"
                      "third_party/node"
                      "third_party/one_euro_filter"
-                     "third_party/openh264/src/codec/api/svc"
+                     "third_party/openh264"
                      "third_party/opus"
                      "third_party/ots"
                      "third_party/pdfium"
@@ -2785,14 +2934,14 @@ and binaries removed, and adds modular support for using system libraries.")
 (define-public qtwebengine
   (package
     (name "qtwebengine")
-    (version "6.3.2")
+    (version "6.5.2")
     (source
      (origin
        (method url-fetch)
-       (uri (qt-urls name version))
+       (uri (qt-url name version))
        (sha256
         (base32
-         "09j4w9ax8242d1yx3hmic7jcwidwdrn8sp7k89hj4l0n8mzkkd35"))
+         "17qxf3asyxq6kcqqvml170n7rnzih3nr4srp9r5v80pmas5l7jg7"))
        (modules '((ice-9 ftw)
                   (ice-9 match)
                   (srfi srfi-1)
@@ -2800,13 +2949,19 @@ and binaries removed, and adds modular support for using system libraries.")
                   (guix build utils)))
        (snippet
         #~(begin
-           (let ((preserved-third-party-files
+            ;; Note: Anything under a 'third_party/' directory that needs to
+            ;; be preserved must be explicitly added below, otherwise it gets
+            ;; removed by the 'remove-third-party-files' code snippet included
+            ;; below.  It is useful to refer to the list used by
+            ;; ungoogled-chromium when upgrading, but not all of the items
+            ;; present in it will need to be reported here, as Qt already
+            ;; removes components its build doesn't use.
+            (let ((preserved-third-party-files
                   '("base/third_party/double_conversion"
                     "base/third_party/cityhash"
                     "base/third_party/cityhash_v103"
                     "base/third_party/dynamic_annotations"
                     "base/third_party/icu"
-                    "base/third_party/libevent"
                     "base/third_party/nspr"
                     "base/third_party/superfasthash"
                     "base/third_party/symbolize"
@@ -2821,6 +2976,7 @@ and binaries removed, and adds modular support for using system libraries.")
                     "third_party/angle/src/common/third_party/base"
                     "third_party/angle/src/common/third_party/smhasher"
                     "third_party/angle/src/common/third_party/xxhash"
+                    "third_party/angle/src/third_party/libXNVCtrl" ;Expat
                     "third_party/angle/src/third_party/trace_event"
                     "third_party/angle/src/third_party/volk"
                     "third_party/axe-core"
@@ -2843,27 +2999,36 @@ and binaries removed, and adds modular support for using system libraries.")
                     "third_party/ced"
                     "third_party/cld_3"
                     "third_party/closure_compiler"
+                    "third_party/cpuinfo" ;BSD-2
                     "third_party/crashpad"
                     "third_party/crashpad/crashpad/third_party/lss"
                     "third_party/crashpad/crashpad/third_party/zlib"
                     "third_party/crc32c"
                     "third_party/dav1d"
                     "third_party/dawn"
-                    "third_party/dawn/third_party/tint"
+                    "third_party/dawn/third_party/gn/webgpu-cts"
+                    "third_party/dawn/third_party/khronos"
                     "third_party/devtools-frontend"
                     "third_party/devtools-frontend/src/front_end/third_party/i18n"
                     "third_party/devtools-frontend/src/front_end/third_party/acorn"
                     "third_party/devtools-frontend/src/front_end/third_party/acorn-loose"
+                    "third_party/devtools-frontend/src/front_end/third_party/\
+additional_readme_paths.json"
                     "third_party/devtools-frontend/src/front_end/third_party/axe-core"
                     "third_party/devtools-frontend/src/front_end/third_party/chromium"
                     "third_party/devtools-frontend/src/front_end/third_party/codemirror"
+                    "third_party/devtools-frontend/src/front_end/third_party/codemirror.next"
                     "third_party/devtools-frontend/src/front_end/third_party/diff"
+                    "third_party/devtools-frontend/src/front_end/third_party/i18n"
                     "third_party/devtools-frontend/src/front_end/third_party/intl-messageformat"
                     "third_party/devtools-frontend/src/front_end/third_party/lighthouse"
                     "third_party/devtools-frontend/src/front_end/third_party/lit-html"
                     "third_party/devtools-frontend/src/front_end/third_party/marked"
+                    "third_party/devtools-frontend/src/front_end/third_party/puppeteer"
                     "third_party/devtools-frontend/src/front_end/third_party/wasmparser"
                     "third_party/devtools-frontend/src/third_party/typescript"
+                    "third_party/distributed_point_functions"
+                    "third_party/dom_distiller_js"
                     "third_party/emoji-segmenter"
                     "third_party/fdlibm"
                     "third_party/ffmpeg/libavcodec/avcodec.h"
@@ -2875,7 +3040,11 @@ and binaries removed, and adds modular support for using system libraries.")
                     "third_party/ffmpeg/libavutil/log.h"
                     "third_party/ffmpeg/libavutil/mathematics.h"
                     "third_party/ffmpeg/libavutil/opt.h"
+                    "third_party/fft2d"
+                    "third_party/flatbuffers"
                     "third_party/freetype"
+                    "third_party/gemmlowp" ;ASL2.0
+                    "third_party/google_input_tools" ;ASL2.0
                     "third_party/googletest"
                     "third_party/harfbuzz-ng"
                     "third_party/highway"
@@ -2883,6 +3052,7 @@ and binaries removed, and adds modular support for using system libraries.")
                     "third_party/iccjpeg"
                     "third_party/icu" ;TODO: make pdfium use system version
                     "third_party/inspector_protocol"
+                    "third_party/ipcz" ;BSD-3
                     "third_party/jinja2"
                     "third_party/jsoncpp"
                     "third_party/jstemplate"
@@ -2891,42 +3061,45 @@ and binaries removed, and adds modular support for using system libraries.")
                     "third_party/libaddressinput"
                     "third_party/libaom"
                     "third_party/libaom/source/libaom/third_party/fastfeat"
+                    "third_party/libaom/source/libaom/third_party/SVT-AV1" ;BSD-3
                     "third_party/libaom/source/libaom/third_party/vector"
                     "third_party/libaom/source/libaom/third_party/x86inc"
                     "third_party/libavif"
+                    "third_party/libevent"
                     "third_party/libgav1"
-                    "third_party/libgifcodec"
                     "third_party/libjingle_xmpp"
                     "third_party/libjpeg_turbo"
                     "third_party/libjxl"
                     "third_party/libpng" ;TODO: make pdfium use system version
+                    "third_party/libsecret" ;LGPL2.1+
                     "third_party/libsrtp"
                     "third_party/libsync"
                     "third_party/libudev"
                     "third_party/liburlpattern"
                     "third_party/libvpx"
                     "third_party/libwebm"
-                    "third_party/libwebp/src/webp/decode.h"
-                    "third_party/libwebp/src/webp/demux.h"
-                    "third_party/libwebp/src/webp/encode.h"
-                    "third_party/libwebp/src/webp/format_constants.h"
-                    "third_party/libwebp/src/webp/mux.h"
-                    "third_party/libwebp/src/webp/mux_types.h"
-                    "third_party/libwebp/src/webp/types.h"
+                    "third_party/libwebp"
                     "third_party/libx11"
                     "third_party/libxcb-keysyms"
-                    "third_party/libxml/chromium"
+                    "third_party/libxml"
                     "third_party/libyuv"
+                    "third_party/libzip" ;BSD-3
                     "third_party/lottie"
                     "third_party/lss"
                     "third_party/mako"
                     "third_party/markupsafe"
                     "third_party/mesa_headers"
                     "third_party/metrics_proto"
+                    "third_party/minigbm" ;BSD-3
                     "third_party/modp_b64"
                     "third_party/nasm"
+                    "third_party/nearby" ;ASL2.0
                     "third_party/node"
+                    "third_party/omnibox_proto" ;BSD-3
                     "third_party/one_euro_filter"
+                    "third_party/openscreen" ;BSD-3
+                    "third_party/openscreen/src/third_party/tinycbor" ;Expat
+                    "third_party/openscreen/src/third_party/mozilla" ;MPL1.1/GPL2+/LGPL2.1+, BSD-3
                     "third_party/openh264"
                     "third_party/opus/src/include/opus.h"
                     "third_party/opus/src/include/opus_custom.h"
@@ -2940,31 +3113,46 @@ and binaries removed, and adds modular support for using system libraries.")
                     "third_party/pdfium/third_party/bigint"
                     "third_party/pdfium/third_party/freetype"
                     "third_party/pdfium/third_party/lcms"
-                    "third_party/pdfium/third_party/libopenjpeg20"
+                    "third_party/pdfium/third_party/libopenjpeg"
                     "third_party/pdfium/third_party/libpng16"
                     "third_party/pdfium/third_party/libtiff"
                     "third_party/pdfium/third_party/skia_shared"
+                    "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
                     "third_party/perfetto"
                     "third_party/perfetto/protos/third_party/chromium"
                     "third_party/pffft"
                     "third_party/ply"
                     "third_party/polymer"
+                    "third_party/private_membership" ;ASL2.0
+                    "third_party/private-join-and-compute" ;ASL2.0
                     "third_party/protobuf"
-                    "third_party/protobuf/third_party/six"
+                    "third_party/pthreadpool" ;BSD-2
                     "third_party/pyjson5"
+                    "third_party/qcms" ;Expat
                     "third_party/re2"
                     "third_party/rnnoise"
+                    "third_party/ruy" ;ASL2.0
+                    "third_party/s2cellid" ;ASL2.0
+                    "third_party/securemessage" ;ASL2.0
+                    "third_party/shell-encryption" ;ASL2.0
                     "third_party/skia"
-                    "third_party/skia/include/third_party/skcms/skcms.h"
                     "third_party/skia/include/third_party/vulkan"
-                    "third_party/skia/third_party/skcms"
+                    "third_party/skia/modules/skcms"
                     "third_party/skia/third_party/vulkanmemoryallocator"
                     "third_party/smhasher"
                     "third_party/snappy"
                     "third_party/speech-dispatcher"
                     "third_party/sqlite"
+                    "third_party/swiftshader" ;ASL2.0
+                    "third_party/swiftshader/third_party/llvm-10.0" ;ASL2.0, with LLVM exception
+                    "third_party/swiftshader/third_party/marl" ;ASL2.0
+                    "third_party/swiftshader/third_party/SPIRV-Headers" ;X11-style
+                    "third_party/swiftshader/third_party/SPIRV-Tools" ;ASL2.0
+                    "third_party/tensorflow-text" ;ASL2.0
+                    "third_party/tflite" ;ASL2.0
+                    "third_party/ukey2" ;ASL2.0
                     "third_party/usb_ids"
-                    "third_party/usrsctp"
+                    "third_party/utf" ;Expat
                     "third_party/vulkan-deps/glslang"
                     "third_party/vulkan-deps/spirv-headers"
                     "third_party/vulkan-deps/spirv-tools"
@@ -2988,13 +3176,15 @@ and binaries removed, and adds modular support for using system libraries.")
                     "third_party/woff2"
                     "third_party/wuffs"
                     "third_party/x11proto"
+                    "third_party/xnnpack" ;BSD-3
                     "third_party/zlib" ;TODO: make pdfium use system version
+                    "third_party/zxcvbn-cpp" ;Expat
                     "url/third_party/mozilla"
+                    "v8/src/third_party/siphash"
                     "v8/src/third_party/utf8-decoder"
                     "v8/src/third_party/valgrind"
-                    "v8/src/third_party/siphash"
-                    "v8/third_party/v8/builtins"
-                    "v8/third_party/inspector_protocol")))
+                    "v8/third_party/inspector_protocol"
+                    "v8/third_party/v8/builtins")))
 
              (with-directory-excursion "src/3rdparty"
                (delete-file-recursively "ninja")
@@ -3035,15 +3225,8 @@ linux/libcurl_wrapper.h"
       ;; some build time and resources.
       #:tests? #f
       #:configure-flags
-      ;; Use the CMake ninja generator, otherwise the build fails (see:
-      ;; https://bugreports.qt.io/browse/QTBUG-96897).
+      ;; Use the CMake ninja generator, otherwise the build fails.
       #~(list "-GNinja"
-              ;; Manually add the NSS library prefix to the linker
-              ;; search path, otherwise it fails to be linked (see:
-              ;; https://bugreports.qt.io/browse/QTBUG-105053).
-              (string-append "-DCMAKE_SHARED_LINKER_FLAGS=-L"
-                             (search-input-directory %build-inputs "lib/nss"))
-
               ;; The PDF renderer plugin fails to build with errors such as
               ;; "src/3rdparty/chromium/components/pdf
               ;; /renderer/pdf_accessibility_tree.cc:1373:39:
@@ -3099,10 +3282,7 @@ linux/libcurl_wrapper.h"
               (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc"
                 (("libudev.so.1")
                  (search-input-file inputs "lib/libudev.so.1")))
-              ;; Patch the location of the X11 keywoard layouts, otherwise
-              ;; webengine *crashes* at run time when the default directory,
-              ;; '/usr/share/X11/xkb' is empty (see:
-              ;; https://bugreports.qt.io/browse/QTBUG-105124).
+              ;; Patch the location of the X11 keywoard layouts.
               (substitute* "src/3rdparty/chromium/ui/events/ozone/layout/xkb\
 /xkb_keyboard_layout_engine.cc"
                 (("/usr/share/X11/xkb")
@@ -3256,7 +3436,7 @@ instances.")
             ;; installation prefix.
             (lambda _
               (invoke "make" "sub-src-install_subtargets"))))))
-    (inputs (list python qtdeclarative qtquickcontrols2 qtsvg))
+    (inputs (list python qtdeclarative qtsvg))
     (home-page "https://thp.io/2011/pyotherside/")
     (synopsis "Qt plugin providing access to a Python 3 interpreter from QML")
     (description "Pyotherside is a Qt plugin providing access to a Python 3
@@ -3999,17 +4179,15 @@ color-related widgets.")
 (define-public python-shiboken-2
   (package
     (name "python-shiboken-2")
-    (version %qt-version)
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://download.qt.io/official_releases"
-                                  "/QtForPython/pyside2/PySide2-" version
-                                  "-src/pyside-setup-opensource-src-"
+              (uri (string-append "mirror://qt/QtForPython/pyside2/PySide2-"
+                                  version "-src/pyside-setup-opensource-src-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0pbbdypwkn3vrgy8ww207fl8pqq4jv80bck9qz5v9dfyr0166hr3"))
-              (patches (search-patches "python-shiboken-2-compat.patch"))))
+                "0fnkx8ax2lkin3bpqbz4zbdrdin2ixb4d6s3c0xghh9sc79r3xia"))))
     (build-system cmake-build-system)
     (inputs
      (list clang-toolchain
@@ -4072,16 +4250,15 @@ color-related widgets.")
   (package
     (inherit python-shiboken-2)
     (name "python-shiboken-6")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://download.qt.io/official_releases"
-                                  "/QtForPython/pyside6/PySide6-" version
-                                  "-src/pyside-setup-opensource-src-"
+              (uri (string-append "mirror://qt/QtForPython/pyside6/PySide6-"
+                                  version "-src/pyside-setup-everywhere-src-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "14k8lm0h45jy6cinfwh1r503pdsslw6sq0ay3f74hil9krc7k6fi"))))
+                "1a0v9mjlcjbffm4lf5cfg45hvqai9654p95ygj5cjhfd9z8z3nwh"))))
     (build-system cmake-build-system)
     (inputs
      (modify-inputs (package-inputs python-shiboken-2)
@@ -4707,11 +4884,11 @@ including @i{fix-its} for automatic refactoring.")
 (define-public qt-creator
   (package
     (name "qt-creator")
-    (version "9.0.0")
+    (version "11.0.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
-                    "https://download.qt.io/official_releases/qtcreator/"
+                    "mirror://qt/qtcreator/"
                     (version-major+minor version) "/" version
                     "/qt-creator-opensource-src-" version ".tar.gz"))
               (modules '((guix build utils)))
@@ -4721,7 +4898,6 @@ including @i{fix-its} for automatic refactoring.")
                            ;; Remove bundled libraries, where supported.
                            ;; TODO: package and unbundle litehtml
                            '("src/libs/3rdparty/yaml-cpp"
-                             "src/shared/qbs/src/shared/qtscript/src/3rdparty"
                              "tests/unit/unittest/3rdparty"
                              ;; Marketplace recommends nonfree extensions;
                              ;; remove it.
@@ -4732,7 +4908,7 @@ including @i{fix-its} for automatic refactoring.")
                             ((".*marketplace/marketplace.qbs.*") ""))))
               (sha256
                (base32
-                "1adyxs0cnqx14gwzkvh909c52449ia6y87n1r4qf6wwydhch43cs"))))
+                "0j90dv9micqsvj4r7iqd11szixr0mlpna4w5s2lnyqckjs6a0mm6"))))
     (build-system qt-build-system)
     (arguments
      (list
@@ -4748,25 +4924,17 @@ including @i{fix-its} for automatic refactoring.")
                              #$output "/lib/qtcreator"))
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-tests-build
-            (lambda _
-              ;; Add a missing link directive (see:
-              ;; https://bugreports.qt.io/browse/QTCREATORBUG-28434).
-              (substitute* "src/libs/tracing/CMakeLists.txt"
-                (("DEPENDS Utils Qt5::Qml Qt5::Quick")
-                 "DEPENDS Utils Qt5::Quick")
-                (("PUBLIC_DEPENDS Qt5::Widgets")
-                 "PUBLIC_DEPENDS Qt5::Widgets Qt5::Qml"))))
           (add-after 'unpack 'patch-paths
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* '("src/libs/utils/commandline.cpp"
                              "src/libs/utils/deviceshell.cpp")
                 (("/bin/sh")
                  (search-input-file inputs "bin/sh")))
-              (substitute* "src/libs/utils/qtcprocess.cpp"
+              (substitute* "src/libs/utils/process.cpp"
                 (("/usr/bin/env")
                  (search-input-file inputs "bin/env")))
-              (substitute* "tests/auto/utils/qtcprocess/tst_qtcprocess.cpp"
+              (substitute* '("tests/auto/utils/process/tst_process.cpp"
+                             "tests/auto/utils/commandline/tst_commandline.cpp")
                 (("/bin/sh")
                  (which "sh")))))
           (add-before 'build 'build-doc
@@ -4779,7 +4947,6 @@ including @i{fix-its} for automatic refactoring.")
               (invoke "cmake" "--install" "." "--prefix" #$output
                       "--component=html_docs")))
           (replace 'check
-            ;; Loosely based on .github/workflows/build_cmake.yml.
             (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
               (when tests?
                 (invoke "xvfb-run"      ;for the 'renderpass' tests
@@ -4787,7 +4954,20 @@ including @i{fix-its} for automatic refactoring.")
                                          (number->string (parallel-job-count))
                                          "1")
                         "--label-exclude" "exclude_from_precheck"
-                        "--exclude-regex" "tst_perfdata"))))
+                        "-E"
+                        (string-append
+                         "("
+                         (string-join
+                          (list
+                           ;; The performance data tests require external
+                           ;; data.
+                           "tst_perfdata"
+                           ;; This test relies on counting processes, counts
+                           ;; only 0 of them instead of 5 for unknown reasons
+                           ;; (see:
+                           ;; https://bugreports.qt.io/browse/QTCREATORBUG-29495).
+                           "tst_process") "|")
+                         ")")))))
           (add-after 'qt-wrap 'wrap-bin
             ;; Make a few well-integrated tools readily available.
             (lambda* (#:key inputs outputs #:allow-other-keys)
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 8c29969712..a291282325 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -41,6 +41,7 @@
 
 (define-module (gnu packages rust-apps)
   #:use-module (guix build-system cargo)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix deprecation)
   #:use-module (guix download)
   #:use-module (guix gexp)
@@ -74,6 +75,8 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages rust)
   #:use-module (gnu packages tls)
@@ -520,6 +523,11 @@ also knows about symlinks, extended attributes, and Git.")
                (setenv "CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS" "1")
                (setenv "JEMALLOC_OVERRIDE"
                        (string-append jemalloc "/lib/libjemalloc.so")))))
+         (add-after 'unpack 'adjust-feature-flags
+           (lambda _
+             ;; unstable-grouped was stablized in rust-clap 4.2.0
+             (substitute* "Cargo.toml"
+               ((".*unstable-grouped.*") ""))))
          (add-after 'install 'install-extra
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
@@ -729,6 +737,168 @@ replacement for i3status, written in pure Rust.  It provides a way to display
 bar.  It is also compatible with sway.")
     (license license:gpl3)))
 
+(define-public maturin
+  (package
+    (name "maturin")
+    (version "1.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "maturin" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0asdljd396kdsvnx9kbsr5s0x6w73b59kdpx732333dhm13qgn03"))
+              (patches (search-patches "maturin-no-cross-compile.patch"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:modules ((guix build cargo-build-system)
+                  ((guix build pyproject-build-system) #:prefix py:)
+                  (guix build utils))
+       #:imported-modules ((guix build cargo-build-system)
+                           (guix build cargo-utils)
+                           ,@%pyproject-build-system-modules)
+       #:install-source? #f
+       #:cargo-test-flags
+       '("--release" "--"
+         ;; Not all files are included.
+         "--skip=build_options::test::test_find_bridge_bin"
+         "--skip=build_options::test::test_find_bridge_cffi"
+         "--skip=build_options::test::test_find_bridge_pyo3"
+         "--skip=build_options::test::test_find_bridge_pyo3_abi3"
+         "--skip=build_options::test::test_find_bridge_pyo3_feature"
+         "--skip=metadata::test::test_implicit_readme"
+         "--skip=metadata::test::test_merge_metadata_from_pyproject_dynamic_license_test"
+         "--skip=metadata::test::test_merge_metadata_from_pyproject_toml"
+         "--skip=metadata::test::test_merge_metadata_from_pyproject_toml_with_customized_python_source_dir"
+         "--skip=pyproject_toml::tests::test_warn_missing_maturin_version")
+       #:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-base64" ,rust-base64-0.21)
+        ("rust-bytesize" ,rust-bytesize-1)
+        ("rust-cargo-config2" ,rust-cargo-config2-0.1)
+        ("rust-cargo-options" ,rust-cargo-options-0.6)
+        ;("rust-cargo-xwin" ,rust-cargo-xwin-0.14)
+        ;("rust-cargo-zigbuild" ,rust-cargo-zigbuild-0.16)
+        ("rust-cargo-metadata" ,rust-cargo-metadata-0.15)
+        ("rust-cbindgen" ,rust-cbindgen-0.24)
+        ("rust-cc" ,rust-cc-1)
+        ("rust-clap" ,rust-clap-4)
+        ("rust-clap-complete-command" ,rust-clap-complete-command-0.5)
+        ("rust-configparser" ,rust-configparser-3)
+        ("rust-console" ,rust-console-0.15)
+        ("rust-dialoguer" ,rust-dialoguer-0.10)
+        ("rust-dirs" ,rust-dirs-5)
+        ("rust-dunce" ,rust-dunce-1)
+        ("rust-fat-macho" ,rust-fat-macho-0.4)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-fs-err" ,rust-fs-err-2)
+        ("rust-glob" ,rust-glob-0.3)
+        ("rust-goblin" ,rust-goblin-0.6)
+        ("rust-ignore" ,rust-ignore-0.4)
+        ("rust-indexmap" ,rust-indexmap-1)
+        ("rust-itertools" ,rust-itertools-0.10)
+        ("rust-keyring" ,rust-keyring-2)
+        ("rust-lddtree" ,rust-lddtree-0.3)
+        ("rust-minijinja" ,rust-minijinja-0.34)
+        ("rust-multipart" ,rust-multipart-0.18)
+        ("rust-native-tls" ,rust-native-tls-0.2)
+        ("rust-normpath" ,rust-normpath-1)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-pep440-rs" ,rust-pep440-rs-0.3)
+        ("rust-pep508-rs" ,rust-pep508-rs-0.2)
+        ("rust-platform-info" ,rust-platform-info-2)
+        ("rust-pyproject-toml" ,rust-pyproject-toml-0.6)
+        ("rust-python-pkginfo" ,rust-python-pkginfo-0.5)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-rustc-version" ,rust-rustc-version-0.4)
+        ("rust-rustls" ,rust-rustls-0.20)
+        ("rust-rustls-pemfile" ,rust-rustls-pemfile-1)
+        ("rust-same-file" ,rust-same-file-1)
+        ("rust-semver" ,rust-semver-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-tar" ,rust-tar-0.4)
+        ("rust-target-lexicon" ,rust-target-lexicon-0.12)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-textwrap" ,rust-textwrap-0.16)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-toml" ,rust-toml-0.7)
+        ("rust-toml-edit" ,rust-toml-edit-0.19)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+        ("rust-ureq" ,rust-ureq-2)
+        ("rust-url" ,rust-url-2)
+        ("rust-wild" ,rust-wild-2)
+        ("rust-zip" ,rust-zip-0.6))
+       #:cargo-development-inputs
+       (("rust-indoc" ,rust-indoc-2)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-time" ,rust-time-0.3)
+        ("rust-trycmd" ,rust-trycmd-0.14)
+        ("rust-which" ,rust-which-4))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'build 'build-python-module
+           (lambda _
+             ;; Match the features from the cargo-build-system and Cargo.toml.
+             (setenv "MATURIN_SETUP_ARGS" "--features=default")
+             ((assoc-ref py:%standard-phases 'build))))
+
+         ;; We can't use the pyproject install phase because maturin is a
+         ;; binary, not a python script.
+         (add-after 'install 'install-python-module
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (wheel (car (find-files "dist" "\\.whl$")))
+                   (site-dir (py:site-packages inputs outputs))
+                   (pyversion
+                     (string-append "python"
+                                    (py:python-version
+                                      (assoc-ref inputs "python-wrapper")))))
+               (invoke "python" "-m" "zipfile" "-e" wheel site-dir)
+               (mkdir-p (string-append out "/bin"))
+               (for-each delete-file
+                         (find-files (string-append out "/lib/" pyversion)
+                                     "^maturin$")))))
+         (add-after 'install 'install-completions
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (share (string-append out "/share"))
+                    (maturin (string-append out "/bin/maturin")))
+               ;; TODO? fig, nushell, powershell
+               (mkdir-p (string-append share "/bash-completion/completions"))
+               (with-output-to-file
+                 (string-append share "/bash-completion/completions/maturin")
+                 (lambda _ (invoke maturin "completions" "bash")))
+               (mkdir-p (string-append share "/fish/vendor_completions.d"))
+               (with-output-to-file
+                 (string-append share "/fish/vendor_completions.d/maturin.fish")
+                 (lambda _ (invoke maturin "completions" "fish")))
+               (mkdir-p (string-append share "/zsh/site-functions"))
+               (with-output-to-file
+                 (string-append share "/zsh/site-functions/_maturin")
+                 (lambda _ (invoke maturin "completions" "zsh")))
+               (mkdir-p (string-append share "/elvish/lib"))
+               (with-output-to-file
+                 (string-append share "/elvish/lib/maturin")
+                 (lambda _ (invoke maturin "completions" "elvish")))))))))
+    (propagated-inputs
+     (list python-tomli))
+    (native-inputs
+     (list perl
+           python-wheel
+           python-wrapper
+           python-setuptools-rust))
+    (home-page "https://github.com/pyo3/maturin")
+    (synopsis "Build and publish crates and python packages")
+    (description
+     "Build and publish crates with @code{pyo3}, @code{rust-cpython} and
+@code{cffi} bindings as well as rust binaries as python packages.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public ripgrep
   (package
     (name "ripgrep")
@@ -1099,19 +1269,6 @@ rebase.")
               (base32
                "006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav"))))))
 
-(define-public rust-cbindgen-0.20
-  (package
-    (inherit rust-cbindgen-0.24)
-    (name "rust-cbindgen")
-    (version "0.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "cbindgen" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1p67vvjkxh07yfizfkvm6bjlv2bywrnl57hshcsz9h2x2qxrgqsi"))))))
-
 (define-public rust-cbindgen-0.19
   (package
     (inherit rust-cbindgen)
@@ -1144,36 +1301,6 @@ rebase.")
     (native-inputs
      (list python-cython))))
 
-(define-public rust-cbindgen-0.17
-  (package
-    (inherit rust-cbindgen)
-    (name "rust-cbindgen")
-    (version "0.17.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "cbindgen" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1f40hxj6h7wqmsj8dzxjm3m421hjqpz2m5zxasbn8kgnr6scykvl"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-clap" ,rust-clap-2)
-        ("rust-heck" ,rust-heck-0.3)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-syn" ,rust-syn-1)
-        ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-toml" ,rust-toml-0.5))
-       #:cargo-development-inputs
-       (("rust-serial-test" ,rust-serial-test-0.5))))
-    (native-inputs
-     (list python-cython))))
-
 (define-public rust-cbindgen-0.16
   (package
     (inherit rust-cbindgen)
@@ -1203,63 +1330,6 @@ rebase.")
        #:cargo-development-inputs
        (("rust-serial-test" ,rust-serial-test-0.5))))))
 
-(define-public rust-cbindgen-0.15
-  (package
-    (inherit rust-cbindgen)
-    (name "rust-cbindgen")
-    (version "0.15.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "cbindgen" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0dgf49zij9rxnf0lv4k5gcmx1mxcz16czkk6q63anz0xp8ds3xhx"))))
-    (arguments
-     `(#:tests? #false                  ;missing files
-       #:cargo-inputs
-       (("rust-clap" ,rust-clap-2)
-        ("rust-heck" ,rust-heck-0.3)
-        ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-syn" ,rust-syn-1)
-        ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-toml" ,rust-toml-0.5))))))
-
-(define-public rust-cbindgen-0.14
-  (package
-    (inherit rust-cbindgen)
-    (name "rust-cbindgen")
-    (version "0.14.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "cbindgen" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1ppwqbzydxlg9a24lynzfk60xrvqw4k31mpz1wrk6lbf88zf8nxi"))))))
-
-(define-public rust-cbindgen-0.12
-  (package
-    (inherit rust-cbindgen)
-    (name "rust-cbindgen")
-    (version "0.12.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "cbindgen" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "13jzbmjz1bmmfr0i80hw6ar484mgabx3hbpb2ynhk0ddqi0yr58m"))))))
-
 (define-public sniffglue
   (package
     (name "sniffglue")
@@ -1869,7 +1939,7 @@ support for Rust.")
 (define-public rust-cargo-c
   (package
     (name "rust-cargo-c")
-    (version "0.9.16+cargo-0.68")
+    (version "0.9.18+cargo-0.69")
     (source
       (origin
         (method url-fetch)
@@ -1878,12 +1948,12 @@ support for Rust.")
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0k2sw67dx06b45qpvckbhz00kn2ingd89y53pwlzky72hnzv075v"))))
+          "191d0813g4m2g1c1h8ykgrfp00blkbds6pg3zl044iyxaclng29h"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-anyhow" ,rust-anyhow-1)
-        ("rust-cargo" ,rust-cargo-0.68)
+        ("rust-cargo" ,rust-cargo-0.69)
         ("rust-cargo-util" ,rust-cargo-util-0.2)
         ("rust-cbindgen" ,rust-cbindgen-0.24)
         ("rust-cc" ,rust-cc-1)
@@ -1896,7 +1966,7 @@ support for Rust.")
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-toml" ,rust-toml-0.6))))
+        ("rust-toml" ,rust-toml-0.7))))
     (native-inputs
      (list pkg-config))
     (inputs
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 8e106a9927..4ee5ded5de 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -705,7 +705,7 @@ safety and thread safety guarantees.")
   (rust-bootstrapped-package
    rust-1.67 "1.68.2" "15ifyd5jj8rd979dkakp887hgmhndr68pqaqvd2hqkfdywirqcwk"))
 
-;;; Note: Only the latest versions of Rust are supported and tested.  The
+;;; Note: Only the latest version of Rust is supported and tested.  The
 ;;; intermediate rusts are built for bootstrapping purposes and should not
 ;;; be relied upon.  This is to ease maintenance and reduce the time
 ;;; required to build the full Rust bootstrap chain.
@@ -713,7 +713,7 @@ safety and thread safety guarantees.")
 ;;; Here we take the latest included Rust, make it public, and re-enable tests
 ;;; and extra components such as rustfmt.
 (define-public rust
-  (let ((base-rust rust-1.67))
+  (let ((base-rust rust-1.68))
     (package
       (inherit base-rust)
       (outputs (cons "rustfmt" (package-outputs base-rust)))
@@ -807,7 +807,7 @@ safety and thread safety guarantees.")
                ;; We skip the test since it's drastically unlikely Guix's
                ;; packaging will introduce a bug here.
                (lambda _
-                 (delete-file "src/test/ui/parser/shebang/sneaky-attrib.rs")))
+                 (delete-file "tests/ui/parser/shebang/sneaky-attrib.rs")))
              (add-after 'unpack 'patch-process-tests
                (lambda* (#:key inputs #:allow-other-keys)
                  (let ((bash (assoc-ref inputs "bash")))
@@ -831,6 +831,17 @@ safety and thread safety guarantees.")
                                 ((file) file))
                    (("fn ctrl_c_kills_everyone")
                     "#[ignore]\nfn ctrl_c_kills_everyone"))))
+             (add-after 'unpack 'adjust-rpath-values
+               ;; This adds %output:out to rpath, allowing us to install utilities in
+               ;; different outputs while reusing the shared libraries.
+               (lambda* (#:key outputs #:allow-other-keys)
+                 (let ((out (assoc-ref outputs "out")))
+                   (substitute* "src/bootstrap/builder.rs"
+                      ((" = rpath.*" all)
+                       (string-append all
+                                      "                "
+                                      "rustflags.arg(\"-Clink-args=-Wl,-rpath="
+                                      out "/lib\");\n"))))))
              (add-after 'configure 'add-gdb-to-config
                (lambda* (#:key inputs #:allow-other-keys)
                  (let ((gdb (assoc-ref inputs "gdb")))
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index a4f43001ca..c0e2e3ab48 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -21,7 +21,7 @@
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
 ;;; Copyright © 2022 Robby Zambito <contact@robbyzambito.me>
 ;;; Copyright © 2023 Andrew Whatson <whatson@tailcall.au>
-;;; Copyright © 2023 Juliana Sims <jtsims@protonmail.com>
+;;; Copyright © 2023 Juliana Sims <juli@incana.org>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index 8f2aa51c53..7c16ee239a 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -43,14 +43,14 @@
 (define-public screen
   (package
     (name "screen")
-    (version "4.9.0")
+    (version "4.9.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/screen/screen-"
                                  version ".tar.gz"))
              (patches (search-patches "screen-hurd-path-max.patch"))
              (sha256
-              (base32 "1x1hqy4h47i7hk85f779lkwkm7gkq8h8mxwd0znkh5adpf0m4czr"))))
+              (base32 "0sdc0ms6qxm4gbx0caw7pwghj5aw1h8syvxdhkac0w95qkiz7ki6"))))
     (build-system gnu-build-system)
     (native-inputs
      (list autoconf automake texinfo))
diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm
index 6e52e3aaa5..08ccedb500 100644
--- a/gnu/packages/scsi.scm
+++ b/gnu/packages/scsi.scm
@@ -19,8 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages scsi)
-  #:use-module ((guix licenses)
-                #:select (gpl2+ bsd-2 bsd-3 lgpl2.1+))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -70,7 +69,7 @@ used in C and C++ programs to interact with SCSI devices.")
     ;;   "3 clause" to the newer "2 clause" version on 20180119. To save space
     ;;   various source code files refer to a file called "BSD_LICENSE" [...]."
     ;; Some files (like sg_compare_and_write.c) retain their 3-clause headers!
-    (license (list gpl2+ bsd-2 bsd-3))))
+    (license (list license:gpl2+ license:bsd-2 license:bsd-3))))
 
 (define-public libiscsi
   (package
@@ -97,6 +96,27 @@ synchronous layer is also provided for ease of use for simpler applications.")
     (license (list
               ;; For the src, examples and test-tool directories, except
               ;; src/ld_iscsi.c.
-              gpl2+
+              license:gpl2+
               ;; For the lib and include directories.
-              lgpl2.1+))))
+              license:lgpl2.1+))))
+
+(define-public lsscsi
+  (package
+    (name "lsscsi")
+    (version "0.32")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                   "http://sg.danny.cz/scsi/lsscsi-" version ".tar.xz"))
+             (sha256
+              (base32
+               "0jp458m2b3wckr18qkln69i01152qlwz33zm49103lq8fgx0n6d4"))))
+    (build-system gnu-build-system)
+    (synopsis "Lists information about SCSI or NVMe devices in Linux")
+    (home-page "https://sg.danny.cz/scsi/lsscsi.html")
+    (description
+     "@command{lsscsi} lists SCSI logical units or SCSI targets.  It can
+also list NVMe namespaces or controllers and show the relationship between a
+device's primary node name, its SCSI generic (sg) node name and its kernel
+name.")
+    (license license:gpl2)))
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 86ec1c033b..11aa5e1602 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -46,7 +46,6 @@
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages fcitx)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages glib)
@@ -146,7 +145,6 @@ joystick, and graphics hardware.")
      (modify-inputs (package-inputs sdl)
        (append dbus
                eudev                    ;for discovering input devices
-               fcitx                    ;helps with CJK input
                glib
                ibus-minimal
                libxkbcommon
diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm
index f2dee7dc64..6d6733c055 100644
--- a/gnu/packages/sequoia.scm
+++ b/gnu/packages/sequoia.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019, 2020, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,49 +21,43 @@
   #:use-module (guix build-system cargo)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
-  #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)  ; glibc
-  #:use-module (gnu packages check) ;; python-pytest
   #:use-module (gnu packages crates-io)
-  #:use-module (gnu packages libffi) ;; python-cffi
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)  ;python-setuptools
-  #:use-module (gnu packages rust)
+  #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tls))
 
-(define-public rust-sequoia-autocrypt-0.23
+(define-public rust-sequoia-autocrypt-0.25
   (package
     (name "rust-sequoia-autocrypt")
-    (version "0.23.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "sequoia-autocrypt" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "0skj0dv15341v470g6w5pggsl0iy27qb8h24rr8k6rq7vxdjxl7g"))))
+    (version "0.25.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "sequoia-autocrypt" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0796mn8kwrpfc8qzliwyyy62mrg2w0j6ax8929jwrkibvwy2axi2"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-base64" ,rust-base64-0.13)
-         ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-other-crypto-features
-           (lambda _
-             (substitute* "Cargo.toml"
-               (("^crypto-cng =" line) (string-append "# " line))
-               (("^crypto-rust =" line) (string-append "# " line))))))))
+     `(#:features '("sequoia-openpgp/crypto-nettle")
+       #:cargo-inputs
+       (("rust-base64" ,rust-base64-0.13)
+        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))
+       #:cargo-development-inputs
+       (("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))))
+    (native-inputs
+     (list clang pkg-config))
+    (inputs
+     (list gmp nettle))
     (home-page "https://sequoia-pgp.org/")
     (synopsis "Deal with Autocrypt encoded data")
     (description "This crate implements low-level functionality like encoding
@@ -71,91 +65,136 @@ and decoding of Autocrypt headers and setup messages.  Note: Autocrypt is more
 than just headers; it requires tight integration with the MUA.")
     (license license:lgpl2.0+)))
 
-(define-public rust-sequoia-ipc-0.26
+(define-public rust-sequoia-cert-store-0.3
+  (package
+    (name "rust-sequoia-cert-store")
+    (version "0.3.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "sequoia-cert-store" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0gmkqn2f23i2xwjwmnaj3dx9l4ir74dyylkw1qsxawxd95i8dk02"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:features '("sequoia-openpgp/crypto-nettle")
+       #:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-crossbeam" ,rust-crossbeam-0.8)
+        ("rust-dirs" ,rust-dirs-5)
+        ("rust-num-cpus" ,rust-num-cpus-1)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-openpgp-cert-d" ,rust-openpgp-cert-d-0.1)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rusqlite" ,rust-rusqlite-0.29)
+        ("rust-sequoia-net" ,rust-sequoia-net-0.27)
+        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+        ("rust-smallvec" ,rust-smallvec-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs
+       (("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (native-inputs
+     (list clang pkg-config))
+    (inputs
+     (list gmp nettle openssl sqlite))
+    (home-page "https://sequoia-pgp.org/")
+    (synopsis "Certificate database interface")
+    (description "This package provides a certificate database interface.")
+    (license license:lgpl2.0+)))
+
+(define-public rust-sequoia-ipc-0.30
   (package
     (name "rust-sequoia-ipc")
-    (version "0.26.0")
+    (version "0.30.1")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "sequoia-ipc" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32 "0xyhz55g1igzjw46f667kqmbbk7pgqy2zf5p13zspr6bwv39s1yk"))))
+          (base32 "1fgqjwaw9rz74y394i3n2a6y2vvy0214daamzswn5ahidhycm3x3"))))
     (build-system cargo-build-system)
     (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-anyhow" ,rust-anyhow-1)
-         ("rust-buffered-reader" ,rust-buffered-reader-1)
-         ("rust-capnp-rpc" ,rust-capnp-rpc-0.13)
-         ("rust-ctor" ,rust-ctor-0.1)
-         ("rust-dirs" ,rust-dirs-2)
-         ("rust-fs2" ,rust-fs2-0.4)
-         ("rust-futures" ,rust-futures-0.3)
-         ("rust-lalrpop" ,rust-lalrpop-0.19)
-         ("rust-lalrpop-util" ,rust-lalrpop-util-0.19)
-         ("rust-lazy-static" ,rust-lazy-static-1)
-         ("rust-libc" ,rust-libc-0.2)
-         ("rust-memsec" ,rust-memsec-0.6)
-         ("rust-rand" ,rust-rand-0.7)
-         ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
-         ("rust-socket2" ,rust-socket2-0.3)
-         ("rust-tempfile" ,rust-tempfile-3)
-         ("rust-thiserror" ,rust-thiserror-1)
-         ("rust-tokio" ,rust-tokio-0.2)
-         ("rust-tokio-util" ,rust-tokio-util-0.3)
-         ("rust-winapi" ,rust-winapi-0.3))
-        #:cargo-development-inputs
-        (("rust-clap" ,rust-clap-2)
-         ("rust-quickcheck" ,rust-quickcheck-0.9))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-other-crypto-features
-           (lambda _
-             (substitute* "Cargo.toml"
-               (("^crypto-cng =" line) (string-append "# " line))
-               (("^crypto-rust =" line) (string-append "# " line))))))))
+     `(#:features '("sequoia-openpgp/crypto-nettle")
+       #:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-buffered-reader" ,rust-buffered-reader-1)
+        ("rust-capnp-rpc" ,rust-capnp-rpc-0.14)
+        ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+        ("rust-ctor" ,rust-ctor-0.1)
+        ("rust-dirs" ,rust-dirs-4)
+        ("rust-fs2" ,rust-fs2-0.4)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-lalrpop" ,rust-lalrpop-0.19)
+        ("rust-lalrpop-util" ,rust-lalrpop-util-0.19)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-memsec" ,rust-memsec-0.6)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+        ("rust-socket2" ,rust-socket2-0.4)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-tokio-util" ,rust-tokio-util-0.7)
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-clap" ,rust-clap-3)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+        ("rust-tokio" ,rust-tokio-1))))
+    (native-inputs
+     (list clang pkg-config))
+    (inputs
+     (list nettle))
     (home-page "https://sequoia-pgp.org/")
     (synopsis "Interprocess communication infrastructure for Sequoia")
     (description "Interprocess communication infrastructure for Sequoia")
     (license license:lgpl2.0+)))
 
-(define-public rust-sequoia-net-0.23
+(define-public rust-sequoia-net-0.27
   (package
     (name "rust-sequoia-net")
-    (version "0.23.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "sequoia-net" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32 "05gv053zqnb00mrai5hva3i4909hn77bnh4z1g4b29cw5qb52cbl"))))
+    (version "0.27.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "sequoia-net" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0gyk5765hi3s05l64a744f9a4vynfisja92l51az9dpqgfkiw3wn"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
+     `(#:features '("sequoia-openpgp/crypto-nettle")
        #:cargo-inputs
        (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-base64" ,rust-base64-0.13)
         ("rust-futures-util" ,rust-futures-util-0.3)
         ("rust-http" ,rust-http-0.2)
-        ("rust-hyper" ,rust-hyper-0.13)
-        ("rust-hyper-tls" ,rust-hyper-tls-0.4)
+        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-hyper-tls" ,rust-hyper-tls-0.5)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-native-tls" ,rust-native-tls-0.2)
         ("rust-percent-encoding" ,rust-percent-encoding-2)
         ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1)
+        ("rust-trust-dns-client" ,rust-trust-dns-client-0.22)
+        ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.22)
         ("rust-url" ,rust-url-2)
         ("rust-zbase32" ,rust-zbase32-0.1))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-other-crypto-features
-           (lambda _
-             (substitute* "Cargo.toml"
-               (("^crypto-cng =" line) (string-append "# " line))
-               (("^crypto-rust =" line) (string-append "# " line))))))))
+       #:cargo-development-inputs
+       (("rust-hyper" ,rust-hyper-0.14)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))))
+    (native-inputs
+     (list clang pkg-config))
+    (inputs
+     (list gmp nettle openssl))
     (home-page "https://sequoia-pgp.org/")
     (synopsis "Discover and publish OpenPGP certificates over the network")
     (description "This package provides a crate to access keyservers using the
@@ -165,75 +204,86 @@ HKP protocol, and searching and publishing Web Key Directories.")
 (define-public rust-sequoia-openpgp-1
   (package
     (name "rust-sequoia-openpgp")
-    (version "1.6.0")
+    (version "1.16.0")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "sequoia-openpgp" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "1mdprsijszkg2j6jk1iq7q1z9yikq598y12m5zbv94fs37xlx3qm"))
-        (modules '((guix build utils)))
-        (snippet
-         ;; Remove dependencies on rust-crypto and win32-cng
-         '(let* ((other-crypto-pkgs
-                  (list ;; rust-crypto
-                   "aes" "block-modes" "block-padding" "blowfish" "cast5"
-                   "cipher" "des" "digest" "eax" "ed25519-dalek"
-                   "generic-array" "idea" "md-5" "num-bigint-dig" "rand"
-                   "ripemd160" "rsa" "sha-1" "sha2" "twofish" "typenum"
-                   "x25519-dalek" "p256" "rand_core" "rand_core" "ecdsa"
-                   ;; win32-cng
-                   "eax" "winapi" "win-crypto-ng" "ed25519-dalek"
-                   "num-bigint-dig"))
-                 (pkgs-pattern (pk (string-join
-                                    (list "^\\[dependencies\\.("
-                                          (string-join other-crypto-pkgs "|")
-                                          ")\\]")
-                                    ""))))
-            (substitute* "Cargo.toml"
-              ((pkgs-pattern line name) (string-append "[off." name "]"))
-              (("^crypto-cng =" line) (string-append "# " line))
-              (("^crypto-rust =" line) (string-append "# " line))
-              (("^\\[(target\\.\"cfg\\(windows\\))" line name)
-               (string-append "[off." name)))))))
+         (base32 "1z0xl7hnm1p51pyhwdqyzcnl2dhzfjnvssz7hi15ps1hk4zzzvrh"))))
     (build-system cargo-build-system)
     (native-inputs
      (list clang pkg-config))
     (inputs
      (list gmp nettle))
     (arguments
-     `(#:skip-build? #t
+     `(#:features '("crypto-nettle")
+       #:cargo-test-flags
+       (list "--release" "--"
+             ;; TODO: Figure out how this test is supposed to fail.
+             "--skip=parse::test::panic_on_short_zip")
        #:cargo-inputs
-       (("rust-anyhow" ,rust-anyhow-1)
-        ("rust-backtrace" ,rust-backtrace-0.3)
-        ("rust-base64" ,rust-base64-0.13)
+       (("rust-aes" ,rust-aes-0.8)
+        ("rust-anyhow" ,rust-anyhow-1)
+        ("rust-base64" ,rust-base64-0.21)
+        ("rust-block-padding" ,rust-block-padding-0.3)
+        ("rust-blowfish" ,rust-blowfish-0.9)
+        ("rust-botan" ,rust-botan-0.10)
         ("rust-buffered-reader" ,rust-buffered-reader-1)
         ("rust-bzip2" ,rust-bzip2-0.4)
+        ("rust-cast5" ,rust-cast5-0.11)
+        ("rust-cfb-mode" ,rust-cfb-mode-0.8)
         ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-cipher" ,rust-cipher-0.4)
+        ("rust-des" ,rust-des-0.8)
+        ("rust-digest" ,rust-digest-0.10)
         ("rust-dyn-clone" ,rust-dyn-clone-1)
+        ("rust-eax" ,rust-eax-0.5)
+        ("rust-ecb" ,rust-ecb-0.1)
+        ("rust-ecdsa" ,rust-ecdsa-0.16)
+        ("rust-ed25519" ,rust-ed25519-1)
+        ("rust-ed25519-dalek" ,rust-ed25519-dalek-1)
         ("rust-flate2" ,rust-flate2-1)
-        ("rust-idna" ,rust-idna-0.2)
-        ("rust-itertools" ,rust-itertools-0.10)
+        ("rust-generic-array" ,rust-generic-array-0.14)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-idea" ,rust-idea-0.5)
+        ("rust-idna" ,rust-idna-0.3)
         ("rust-lalrpop" ,rust-lalrpop-0.19)
         ("rust-lalrpop-util" ,rust-lalrpop-util-0.19)
-        ("rust-lazy-static" ,rust-lazy-static-1)  ;; 1.4.0
-        ("rust-libc" ,rust-libc-0.2)  ;; 0.2.66
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-md-5" ,rust-md-5-0.10)
         ("rust-memsec" ,rust-memsec-0.6)
         ("rust-nettle" ,rust-nettle-7)
-        ("rust-plotters" ,rust-plotters-0.3)
+        ("rust-num-bigint-dig" ,rust-num-bigint-dig-0.8)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-openssl" ,rust-openssl-0.10)
+        ("rust-openssl-sys" ,rust-openssl-sys-0.9)
+        ("rust-p256" ,rust-p256-0.13)
+        ("rust-rand" ,rust-rand-0.7)
+        ("rust-rand" ,rust-rand-0.7)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rand-core" ,rust-rand-core-0.6)
         ("rust-regex" ,rust-regex-1)
         ("rust-regex-syntax" ,rust-regex-syntax-0.6)
+        ("rust-ripemd" ,rust-ripemd-0.1)
+        ("rust-rsa" ,rust-rsa-0.9)
+        ("rust-sha-1" ,rust-sha-1-0.10)
         ("rust-sha1collisiondetection" ,rust-sha1collisiondetection-0.2)
+        ("rust-sha2" ,rust-sha2-0.10)
         ("rust-thiserror" ,rust-thiserror-1)
-        ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)
+        ("rust-twofish" ,rust-twofish-0.7)
+        ("rust-typenum" ,rust-typenum-1)
+        ("rust-win-crypto-ng" ,rust-win-crypto-ng-0.5)
+        ("rust-winapi" ,rust-winapi-0.3)
+        ("rust-x25519-dalek-ng" ,rust-x25519-dalek-ng-1)
         ("rust-xxhash-rust" ,rust-xxhash-rust-0.8))
        #:cargo-development-inputs
-       ;; keep the development-inputs to allow running tests easily
-       (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-quickcheck" ,rust-quickcheck-0.9)
-        ("rust-rand" ,rust-rand-0.7)
-        ("rust-rpassword" ,rust-rpassword-5))))
+       (("rust-criterion" ,rust-criterion-0.4)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rpassword" ,rust-rpassword-6))))
     (home-page "https://sequoia-pgp.org/")
     (synopsis "OpenPGP data types and associated machinery")
     (description "This crate aims to provide a complete implementation of
@@ -281,6 +331,40 @@ This Guix package is built to use the nettle cryptographic library.")
         ("rust-sequoia-rfc2822" ,rust-sequoia-rfc2822-0.9)
         ("rust-time" ,rust-time-0.1))))))
 
+(define-public rust-sequoia-policy-config-0.6
+  (package
+    (name "rust-sequoia-policy-config")
+    (version "0.6.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "sequoia-policy-config" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0x42h22kng4dsbfr0a6zdf2j9bcq14r0yr6xdw6rrggj139lazbm"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:features '("sequoia-openpgp/crypto-nettle")
+       #:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-toml" ,rust-toml-0.5))
+       #:cargo-development-inputs
+       (("rust-assert-cmd" ,rust-assert-cmd-2)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))))
+    (native-inputs
+     (list clang pkg-config))
+    (inputs
+     (list gmp nettle))
+    (home-page "https://sequoia-pgp.org/")
+    (synopsis "Configure Sequoia using a configuration file")
+    (description "Configure Sequoia using a configuration file.")
+    (license license:lgpl2.0+)))
+
 (define-public rust-sequoia-rfc2822-0.9
   (package
     (name "rust-sequoia-rfc2822")
@@ -309,48 +393,103 @@ Although the above appear simple to parse, RFC 2822's whitespace and comment
 rules are rather complex.  This crate implements the whole grammar." )
     (license license:gpl3)))
 
+(define-public rust-sequoia-wot-0.8
+  (package
+    (name "rust-sequoia-wot")
+    (version "0.8.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "sequoia-wot" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0rcp7ndjpdd4dkryhkkhakc8axbj93c1gr9qxxksdvrik803alfg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:features '("sequoia-openpgp/crypto-nettle")
+       #:cargo-test-flags
+       (list "--release" "--"
+             ;; Not all files included.
+             "--skip=gpg_trust_roots")
+       #:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("rust-clap" ,rust-clap-4)
+        ("rust-clap-complete" ,rust-clap-complete-4)
+        ("rust-clap-mangen" ,rust-clap-mangen-0.2)
+        ("rust-crossbeam" ,rust-crossbeam-0.8)
+        ("rust-dot-writer" ,rust-dot-writer-0.1)
+        ("rust-enumber" ,rust-enumber-0.3)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-num-cpus" ,rust-num-cpus-1)
+        ("rust-openpgp-cert-d" ,rust-openpgp-cert-d-0.1)
+        ("rust-sequoia-cert-store" ,rust-sequoia-cert-store-0.3)
+        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+        ("rust-sequoia-policy-config" ,rust-sequoia-policy-config-0.6)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-tokio" ,rust-tokio-1))
+       #:cargo-development-inputs
+       (("rust-assert-cmd" ,rust-assert-cmd-2)
+        ("rust-predicates" ,rust-predicates-2)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (inputs
+     (list nettle openssl sqlite))
+    (native-inputs
+     (list clang pkg-config))
+    (home-page "https://sequoia-pgp.org/")
+    (synopsis "Implementation of OpenPGP's web of trust")
+    (description "An implementation of OpenPGP's web of trust.")
+    (license license:lgpl2.0+)))
+
 (define-public sequoia-sq
   (package
     (name "sequoia-sq")
-    (version "0.25.0")
+    (version "0.30.0")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "sequoia-sq" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32 "0j26vpp98i7zwwhqsvwj0zknj4s0s0ilfqpynj1vgd5laanhyr0d"))))
+          (base32 "0l3mlhvh93b8s1853gyzzfh1dznjdhbsbyxxcm3bbyxmkyr74wkd"))))
     (build-system cargo-build-system)
     (inputs
-     (list nettle openssl))
+     (list nettle openssl sqlite))
     (native-inputs
      (list clang pkg-config))
     (arguments
-     `(#:tests? #f  ;; tests require data-files not provided in the package
+     `(#:tests? #f  ; `(dyn std::fmt::Display + 'static)` cannot be sent between threads safely
        #:install-source? #f
        #:cargo-inputs
        (("rust-anyhow" ,rust-anyhow-1)
         ("rust-buffered-reader" ,rust-buffered-reader-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-itertools" ,rust-itertools-0.9)
-        ("rust-rpassword" ,rust-rpassword-5)
-        ("rust-sequoia-autocrypt" ,rust-sequoia-autocrypt-0.23)
-        ("rust-sequoia-net" ,rust-sequoia-net-0.23)
+        ("rust-clap" ,rust-clap-4)
+        ("rust-clap-complete" ,rust-clap-complete-4)
+        ("rust-clap-mangen" ,rust-clap-mangen-0.2)
+        ("rust-dirs" ,rust-dirs-5)
+        ("rust-dot-writer" ,rust-dot-writer-0.1)
+        ("rust-itertools" ,rust-itertools-0.10)
+        ("rust-rpassword" ,rust-rpassword-6)
+        ("rust-sequoia-autocrypt" ,rust-sequoia-autocrypt-0.25)
+        ("rust-sequoia-cert-store" ,rust-sequoia-cert-store-0.3)
+        ("rust-sequoia-net" ,rust-sequoia-net-0.27)
         ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+        ("rust-sequoia-wot" ,rust-sequoia-wot-0.8)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-subplot-build" ,rust-subplot-build-0.7)
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-term-size" ,rust-term-size-0.3)
-        ("rust-tokio" ,rust-tokio-0.2))
+        ("rust-tokio" ,rust-tokio-1))
        #:cargo-development-inputs
-       (("rust-assert-cli" ,rust-assert-cli-0.6))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-other-crypto-features
-           (lambda _
-             (substitute* "Cargo.toml"
-               (("^crypto-cng =" line) (string-append "# " line))
-               (("^crypto-rust =" line) (string-append "# " line))))))))
+       (("rust-assert-cmd" ,rust-assert-cmd-2)
+        ("rust-fehler" ,rust-fehler-1)
+        ("rust-predicates" ,rust-predicates-2)
+        ("rust-subplotlib" ,rust-subplotlib-0.7))))
     (home-page "https://sequoia-pgp.org/")
     (synopsis "Command-line frontend for Sequoia OpenPGP")
     (description "This package provides the command-line frontend for Sequoia
@@ -362,37 +501,28 @@ This Guix package is built to use the nettle cryptographic library.")
 (define-public sequoia-sqv
   (package
     (name "sequoia-sqv")
-    (version "1.0.0")
+    (version "1.1.0")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "sequoia-sqv" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32 "0nrfjn64fm038x5dssipf7jxi27z741m5n5a7zsa9768zab1hr9d"))))
+          (base32 "0vzqahx7dk1wh2vp7lbzjgah8v7fqpvdf0dq0dydi9695ffm99lc"))))
     (build-system cargo-build-system)
     (inputs
      (list nettle openssl))
     (native-inputs
      (list clang pkg-config))
     (arguments
-     `(#:tests? #f  ;; tests require data-files not provided in the package
-       #:install-source? #f
+     `(#:install-source? #f
        #:cargo-inputs
        (("rust-anyhow" ,rust-anyhow-1)
         ("rust-chrono" ,rust-chrono-0.4)
         ("rust-clap" ,rust-clap-2)
-        ("rust-clap" ,rust-clap-2)
         ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))
        #:cargo-development-inputs
-       (("rust-assert-cli" ,rust-assert-cli-0.6))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-other-crypto-features
-           (lambda _
-             (substitute* "Cargo.toml"
-               (("^crypto-cng =" line) (string-append "# " line))
-               (("^crypto-rust =" line) (string-append "# " line))))))))
+       (("rust-assert-cli" ,rust-assert-cli-0.6))))
     (home-page "https://sequoia-pgp.org/")
     (synopsis "Simple OpenPGP signature verification program")
     (description "@code{sqv} verifies detached OpenPGP signatures.  It is a
@@ -402,150 +532,75 @@ constraints on the signature into account.
 This Guix package is built to use the nettle cryptographic library.")
     (license license:lgpl2.0+)))
 
-(define (sequoia-package-origin version)
-  (origin
-    (method git-fetch)
-    (uri (git-reference
-          (url "https://gitlab.com/sequoia-pgp/sequoia.git")
-          (commit (string-append "openpgp/v" version))))
-    (sha256
-     (base32 "1cq1xgvllbpii5hfl3wlia2ayznpvhv8lq8g8ygwxga86ijg98lq"))
-    (file-name (git-file-name "sequoia" version))
-    (patches (search-patches "libsequoia-remove-store.patch"
-                             "libsequoia-fix-ffi-Makefile.patch"))))
-
-(define-public libsequoia
+(define-public sequoia-wot
   (package
-    (name "libsequoia")
-    (version "0.22.0")
-    (source (sequoia-package-origin "1.6.0"))
-    (build-system cargo-build-system)
-    (outputs '("out" "python"))
-    (native-inputs
-     (list clang pkg-config python-pytest python-pytest-runner
-           python-wrapper))
-    (inputs
-     (list gmp nettle openssl python python-cffi))
+    (inherit rust-sequoia-wot-0.8)
+    (name "sequoia-wot")
     (arguments
-     (list
-      #:tests? #f ;; TODO make python tests find the shared object file
-      #:cargo-inputs
-      `(("rust-anyhow" ,rust-anyhow-1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-memsec" ,rust-memsec-0.6)
-        ("rust-native-tls" ,rust-native-tls-0.2)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)  ;; for ffi-macros
-        ("rust-quote" ,rust-quote-1)  ;; for ffi-macros
-        ("rust-sequoia-ipc" ,rust-sequoia-ipc-0.26)
-        ("rust-sequoia-net" ,rust-sequoia-net-0.23)
-        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
-        ("rust-sha2" ,rust-sha2-0.8)  ;; for ffi-macros
-        ("rust-tokio" ,rust-tokio-1))
-      #:cargo-development-inputs
-      `(("rust-filetime" ,rust-filetime-0.2))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'configure 'set-PREFIX
-            (lambda _
-              (setenv "PREFIX" #$output)))
-          (replace 'build
-            (lambda _
-              (invoke "make" "-C" "openpgp-ffi" "build-release")
-              (invoke "make" "-C" "ffi" "build-release")))
-          (delete 'package)  ;; cargo can't package a multi-crate workspace
-          (replace 'check
-            (lambda* (#:key tests?  #:allow-other-keys)
-              (when tests?
-                (begin
-                  (invoke "make" "-C" "openpgp-ffi" "check")
-                  (invoke "make" "-C" "ffi" "check")))))
-          (replace 'install
-            (lambda _
-              (invoke "make" "-C" "openpgp-ffi" "install")
-              (invoke "make" "-C" "ffi" "install")))
-          (add-after 'configure 'fix-build-environment
-            (lambda _
-              (delete-file "Cargo.toml")
-              (symlink "../.cargo" "openpgp-ffi/.cargo")
-              (symlink "../.cargo" "ffi/.cargo")
-              (for-each delete-file-recursively
-                       (find-files "guix-vendor" "^sequoia-[0-9]+\\.*"
-                                   #:directories? #t))))
-          (add-after 'unpack 'fix-for-python-output
-            (lambda _
-              (substitute* "ffi/lang/python/Makefile"
-                ;; adjust prefix for python package
-                (("PREFIX\\s*\\??=.*")
-                (string-append "PREFIX = " (pk #$output:python) "\n"))
-                ;; fix rpath to include the main package
-                (("\\WLDFLAGS=" text)
-                 (string-append text "'-Wl,-rpath=" #$output "/lib '"))
-                ;; make setuptools install into the prefix, see
-                ;; guix/build/python-build-system.scm for explanation
-               (("\\ssetup.py\\s+install\\s")
-                " setup.py install --root=/ --single-version-externally-managed "))))
-          (add-after 'unpack 'fix-Makefiles
-            (lambda _
-              (substitute* '("openpgp-ffi/Makefile")
-                (("^check-headers: force-build") "check-headers:"))))
-          (add-after 'unpack 'remove-other-crypto-features
-           (lambda _
-             (substitute* '("openpgp-ffi/Cargo.toml" "ffi/Cargo.toml")
-               (("^crypto-cng =" line) (string-append "# " line))
-               (("^crypto-rust =" line) (string-append "# " line)))))
-          (add-after 'unpack 'fix-missing-feature
-            (lambda _
-              (substitute* '("ffi/Cargo.toml")
-               (("^(tokio = .* features = \\[)" line)
-                (string-append line "\"net\", ")))))
-          (add-after 'unpack 'unbundle-crates
-            (lambda _
-              (substitute* '("openpgp-ffi/Cargo.toml" "ffi/Cargo.toml")
-                (("path = \"\\.\\./(openpgp|store|net|ipc)\",") "")))))))
-    (home-page "https://sequoia-pgp.org")
-    (synopsis "C/FFI interfaces for Sequoia-PGP")
-    (description "This package provides a C and FFI interface to both the
-low-level and a high-level API of Sequoia-PGP.
+     (substitute-keyword-arguments (package-arguments rust-sequoia-wot-0.8)
+       ((#:install-source? _ #t) #f)
+       ((#:phases phases '%standard-phases)
+        `(modify-phases ,phases
+           (add-after 'install 'install-more
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out   (assoc-ref outputs "out"))
+                      (share (string-append out "/share"))
+                      (man1  (string-append share "/man/man1")))
+                 (for-each (lambda (file)
+                             (install-file file man1))
+                           (find-files "target/release" "\\.1$"))
+                 ;; TODO: Install _sq-wot.ps1, sq-wot.elv
+                 (mkdir-p (string-append out "/etc/bash_completion.d"))
+                 (mkdir-p (string-append share "/fish/vendor_completions.d"))
+                 (copy-file (car (find-files "target/release" "sq-wot.bash"))
+                            (string-append out "/etc/bash_completion.d/sq-wot"))
+                 (copy-file (car (find-files "target/release" "sq-wot.fish"))
+                            (string-append
+                              share "/fish/vendor_completions.d/sq-wot.fish"))
+                 (install-file (car (find-files "target/release" "_sq-wot"))
+                               (string-append
+                                 share "/zsh/site-functions")))))))))
+    (description "An implementation of OpenPGP's web of trust.
 
-Use with caution: This is an \"unofficial\" package, which are not officially
-released, but part of the Sequoia-PGP v1.6.0 archive.  So this package might
-even go away.")
-    (license license:lgpl2.0+)))
+This Guix package is built to use the nettle cryptographic library.")))
+
+;;
 
 (define-public sequoia
   (package
     (name "sequoia")
-    (version "1.6.0")
+    (version "1.16.0")
     (source #f)
     (build-system trivial-build-system)
-    (outputs '("out" "python"))
-    (inputs
-     (list glibc ;; for ldconfig in make-dynamic-linker-cache
-           libsequoia
-           `(,libsequoia "python")
-           sequoia-sq
-           sequoia-sqv))
     (arguments
      (list
-      #:modules '((guix build utils) (guix build gnu-build-system)
-                  (guix build gremlin) (guix elf))
+      #:modules '((guix build utils)
+                  (guix build union)
+                  (guix build gnu-build-system)
+                  (guix build gremlin)
+                  (guix elf))
       #:builder
       #~(begin
-          (use-modules (guix build utils) (guix build gnu-build-system))
+          (use-modules (guix build utils)
+                       (guix build union)
+                       (guix build gnu-build-system)
+                       (ice-9 match))
           (let ((make-dynamic-linker-cache
                  (assoc-ref %standard-phases 'make-dynamic-linker-cache))
                 (ld.so.cache
                  (string-append #$output "/etc/ld.so.cache")))
-            (copy-recursively #$libsequoia #$output)
-            (copy-recursively #$sequoia-sq #$output)
+            (match %build-inputs
+                   (((names . directories) ...)
+                    (union-build #$output directories)))
             (delete-file ld.so.cache)
-            (copy-recursively #$sequoia-sqv #$output)
-            (delete-file ld.so.cache)
-            (copy-recursively #$libsequoia:python #$output:python)
-           (setenv "PATH"
-                   (string-append (getenv "PATH") ":" #$glibc "/sbin"))
-           (make-dynamic-linker-cache #:outputs %outputs)))))
+            (setenv "PATH"
+                    (string-append (getenv "PATH") ":" #$glibc "/sbin"))
+            (make-dynamic-linker-cache #:outputs %outputs)))))
+    (inputs
+     (list ;glibc ;; for ldconfig in make-dynamic-linker-cache
+           sequoia-sq
+           sequoia-sqv
+           sequoia-wot))
     (home-page "https://sequoia-pgp.org")
     (synopsis "New OpenPGP implementation (meta-package)")
     (description "Sequoia is a new OpenPGP implementation, written in Rust,
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 81fbfd87a1..3a5d5ef59b 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -198,16 +198,15 @@ a server that supports the SSH-2 protocol.")
 (define-public openssh
   (package
    (name "openssh")
-   (version "9.3p2")
-   (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://openbsd/OpenSSH/portable/"
-                                 "openssh-" version ".tar.gz"))
-             (patches (search-patches "openssh-hurd.patch"
-                                      "openssh-trust-guix-store-directory.patch"))
-             (sha256
-              (base32
-               "1s3nqv57r3l7avsdkzwd575dvxra8h19xpqczl0z3cvcgwabw3i0"))))
+   (version "9.4p1")
+   (source
+    (origin
+      (method url-fetch)
+      (uri (string-append "mirror://openbsd/OpenSSH/portable/"
+                          "openssh-" version ".tar.gz"))
+      (patches (search-patches "openssh-trust-guix-store-directory.patch"))
+      (sha256
+       (base32 "11bahrik5qi337m954g5479f63cxnxdch076ng7668fvi28gs21n"))))
    (build-system gnu-build-system)
    (arguments
     (list
diff --git a/gnu/packages/stalonetray.scm b/gnu/packages/stalonetray.scm
deleted file mode 100644
index 65732313fe..0000000000
--- a/gnu/packages/stalonetray.scm
+++ /dev/null
@@ -1,49 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Raimon Grau <raimonster@gmail.com>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages stalonetray)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module ((guix licenses) #:select (gpl2+))
-  #:use-module (gnu packages xorg))
-
-(define-public stalonetray
-  (package
-    (name "stalonetray")
-    (version "0.8.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri
-        (string-append "mirror://sourceforge/stalonetray/stalonetray/stalonetray-"
-                       version "/stalonetray-" version ".tar.bz2"))
-       (sha256
-        (base32
-         "0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n"))))
-    (inputs (list libx11))
-    (build-system gnu-build-system)
-    (home-page "https://stalonetray.sourceforge.net")
-    (synopsis "Standalone freedesktop.org and KDE systray implementation")
-    (description
-     "Stalonetray is a stand-alone freedesktop.org and KDE system
-tray (notification area) for X Window System/X11 (e.g. X.Org or XFree86).  It
-has full XEMBED support and minimal dependencies: an X11 lib only.  Stalonetray
-works with virtually any EWMH-compliant window manager.")
-    (license gpl2+)))
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index dd54100ce6..414395251b 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -46,7 +46,7 @@
 (define-public syncthing
   (package
     (name "syncthing")
-    (version "1.23.4")
+    (version "1.23.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/syncthing/syncthing"
@@ -54,83 +54,72 @@
                                   "/syncthing-source-v" version ".tar.gz"))
               (sha256
                (base32
-                "1yi9adlp30myizlmv7a118cwrm6w1qfv09b0z7x1b7n4i8pqi8h6"))))
+                "03myinspq61aiis29mq0xjigj5rh5jd8m0d9xakf43vi7pqgwjbc"))))
     (build-system go-build-system)
     ;; The primary Syncthing executable goes to "out", while the auxiliary
     ;; server programs and utility tools go to "utils".  This reduces the size
     ;; of "out" by ~144 MiB.
     (outputs '("out" "utils"))
     (arguments
-     `(#:modules ((srfi srfi-26) ; for cut
-                  (guix build utils)
-                  (guix build go-build-system))
-       #:go ,go-1.19
-       #:import-path "github.com/syncthing/syncthing"
-       ;; We don't need to install the source code for end-user applications.
-       #:install-source? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'increase-test-timeout
-           (lambda _
-             (substitute* "src/github.com/syncthing/syncthing/build.go"
-               (("120s") "999s"))
-             #t))
+     (list #:modules '((srfi srfi-26) ; for cut
+                       (guix build utils)
+                       (guix build go-build-system))
+           #:go go-1.19
+           #:import-path "github.com/syncthing/syncthing"
+           ;; We don't need to install the source code for end-user applications.
+           #:install-source? #f
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'build 'increase-test-timeout
+                 (lambda _
+                   (substitute* "src/github.com/syncthing/syncthing/build.go"
+                     (("120s") "999s"))))
 
-         (replace 'build
-           (lambda _
-             (with-directory-excursion "src/github.com/syncthing/syncthing"
-               ;; XXX The only way to build Syncthing without its automatic
-               ;; updater and to build the utilities is to "build all" and then
-               ;; "build syncthing" again with -no-upgrade.
-               ;; https://github.com/syncthing/syncthing/issues/6118
-               (invoke "go" "run" "build.go")
-               (delete-file "bin/syncthing")
-               (invoke "go" "run" "build.go" "-no-upgrade" "build" "syncthing"))))
+               (replace 'build
+                 (lambda _
+                   (with-directory-excursion "src/github.com/syncthing/syncthing"
+                     ;; XXX The only way to build Syncthing without its automatic
+                     ;; updater and to build the utilities is to "build all" and then
+                     ;; "build syncthing" again with -no-upgrade.
+                     ;; https://github.com/syncthing/syncthing/issues/6118
+                     (invoke "go" "run" "build.go")
+                     (delete-file "bin/syncthing")
+                     (invoke "go" "run" "build.go" "-no-upgrade" "build" "syncthing"))))
 
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (with-directory-excursion "src/github.com/syncthing/syncthing"
-                 (invoke "go" "run" "build.go" "test")))
-             #t))
+             (replace 'check
+               (lambda* (#:key tests? #:allow-other-keys)
+                 (when tests?
+                   (with-directory-excursion "src/github.com/syncthing/syncthing"
+                     (invoke "go" "run" "build.go" "test")))))
 
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out"))
-                   (utils (assoc-ref outputs "utils")))
-               (with-directory-excursion "src/github.com/syncthing/syncthing/bin"
-                 (install-file "../syncthing" (string-append out "/bin"))
-                 (for-each (cut install-file <> (string-append utils "/bin/"))
-                           '("stcompdirs" "stcrashreceiver"
-                             "stdisco" "stdiscosrv" "stevents" "stfileinfo"
-                             "stfinddevice" "stfindignored" "stgenfiles"
-                             "strelaypoolsrv" "strelaysrv" "stsigtool"
-                             "stvanity" "stwatchfile" "uraggregate" "ursrv"))
-                 #t))))
+             (replace 'install
+               (lambda _
+                 (with-directory-excursion "src/github.com/syncthing/syncthing/bin"
+                   (install-file "../syncthing" (string-append #$output "/bin"))
+                   (for-each (cut install-file <> (string-append #$output:utils "/bin/"))
+                             '("stcompdirs" "stcrashreceiver"
+                               "stdisco" "stdiscosrv" "stevents" "stfileinfo"
+                               "stfinddevice" "stfindignored" "stgenfiles"
+                               "strelaypoolsrv" "strelaysrv" "stsigtool"
+                               "stvanity" "stwatchfile" "uraggregate" "ursrv")))))
 
          (add-after 'install 'install-docs
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (utils (assoc-ref outputs "utils"))
-                    (man "/share/man")
-                    (man-section (string-append man "/man"))
-                    (src "src/github.com/syncthing/syncthing/man/"))
+           (lambda _
+             (let ((man (string-append #$output "/share/man"))
+                   (man:utils (string-append #$output:utils "/share/man")))
                ;; Install all the man pages to "out".
                (for-each
-                 (lambda (file)
-                   (install-file file
-                                 (string-append out man-section
-                                                (string-take-right file 1))))
-                 (find-files src "\\.[1-9]"))
+                (lambda (file)
+                  (install-file file
+                                (string-append man "/man" (string-take-right file 1))))
+                (find-files "src/github.com/syncthing/syncthing/man" "\\.[1-9]"))
                ;; Copy all the man pages to "utils"
-               (copy-recursively (string-append out man)
-                                 (string-append utils man))
+               (copy-recursively man man:utils)
                ;; Delete extraneous man pages from "out" and "utils",
                ;; respectively.
-               (delete-file (string-append out man "/man1/stdiscosrv.1"))
-               (delete-file (string-append out man "/man1/strelaysrv.1"))
-               (delete-file (string-append utils man "/man1/syncthing.1"))
-             #t))))))
+               (delete-file (string-append man "/man1/stdiscosrv.1"))
+               (delete-file (string-append man "/man1/strelaysrv.1"))
+               (delete-file (string-append man:utils  "/man1/syncthing.1"))))))))
     (synopsis "Decentralized continuous file system synchronization")
     (description "Syncthing is a peer-to-peer file synchronization tool that
 supports a wide variety of computing platforms.  It uses the Block Exchange
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 68c7fce26c..ac00d396b5 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -224,22 +224,21 @@ cards.")
 (define-public newsboat
   (package
     (name "newsboat")
-    (version "2.31")
+    (version "2.32")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://newsboat.org/releases/" version
                            "/newsboat-" version ".tar.xz"))
        (sha256
-        (base32 "1nn1akjc3l29gcr0n6g7y39qvmbw8vf5sfmnxd794sgmbki7vbsb"))))
+        (base32 "1rp67fqsnsknlhlq75vgdjg9rggx8j7wbmixvps967m2f92m2qsv"))))
     (build-system cargo-build-system)
     (native-inputs
      `(("gettext" ,gettext-minimal)
        ("openssl" ,openssl)
        ("pkg-config" ,pkg-config)
        ;; For building documentation.
-       ,@(if (member (%current-system)
-                     (package-transitive-supported-systems ruby-asciidoctor))
+       ,@(if (supported-package? ruby-asciidoctor)
            `(("asciidoctor" ,ruby-asciidoctor))
            `())))
     (inputs
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index aa5c303603..dffc6b8ff4 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -517,7 +517,7 @@ Telegram project, for its use in telegram desktop client.")
            qrcodegen-cpp
            qtbase-5
            qtdeclarative-5
-           qtimageformats
+           qtimageformats-5
            qtsvg-5
            qtwayland-5
            range-v3
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 081ef19af1..c59b1a6588 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
+;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us@ieee.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1339,50 +1340,54 @@ while also supporting native scrolling and @command{tmux} control mode
   (deprecated-package "wterm" foot))
 
 (define-public tilix
-  (package
-    (name "tilix")
-    (version "1.9.5")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/gnunn1/tilix")
-               (commit version)))
-        (file-name (git-file-name name version))
-       (sha256
-        (base32 "1ij3ix6yhi8hicxvglrxjyyv8bch9birrgsr8ml6jfh3hvk4pxdh"))))
-    (build-system meson-build-system)
-    (arguments
-     `(#:glib-or-gtk? #t
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'set-env-variables
-           (lambda _
-             (setenv "CC" ,(cc-for-target))))
-         (add-after 'unpack 'skip-gtk-update-icon-cache
-           (lambda _
-             (substitute* "meson_post_install.py"
-               (("gtk-update-icon-cache") (which "true"))
-               (("update-desktop-database") (which "true"))))))))
-    (inputs
-     (list dbus
-           dconf
-           gsettings-desktop-schemas
-           gtk+
-           gtkd
-           ldc
-           libsecret
-           libunwind
-           vte))
-    (native-inputs
-     (list appstream
-           gettext-minimal
-           (list glib "bin")
-           ldc
-           pkg-config))
-    (home-page "https://gnunn1.github.io/tilix-web/")
-    (synopsis "Tiling terminal emulator")
-    (description "Tilix is a tiling terminal emulator following the
+  (let ((commit "8726e9e9426e6b05c8cadfe7fe5205e8cbc910e3")
+        (revision "0"))
+    (package
+      (name "tilix")
+      ;; No release in over a year so include commits that fix glibc related
+      ;; build issues.
+      (version (git-version "1.9.5" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/gnunn1/tilix")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0vbjfk6zn9r56nxhlgy77szv7ai061ds53hsz9zba0v9kyzzcdml"))))
+      (build-system meson-build-system)
+      (arguments
+       `(#:glib-or-gtk? #t
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'set-env-variables
+             (lambda _
+               (setenv "CC" ,(cc-for-target))))
+           (add-after 'unpack 'skip-gtk-update-icon-cache
+             (lambda _
+               (substitute* "meson_post_install.py"
+                 (("gtk-update-icon-cache") (which "true"))
+                 (("update-desktop-database") (which "true"))))))))
+      (inputs
+       (list dbus
+             dconf
+             gsettings-desktop-schemas
+             gtk+
+             gtkd
+             ldc
+             libsecret
+             libunwind
+             vte))
+      (native-inputs
+       (list appstream
+             gettext-minimal
+             (list glib "bin")
+             ldc
+             pkg-config))
+      (home-page "https://gnunn1.github.io/tilix-web/")
+      (synopsis "Tiling terminal emulator")
+      (description "Tilix is a tiling terminal emulator following the
 Gnome Human Interface Guidelines.  Its features include:
 @enumerate
 @item Layout terminals in any fashion by splitting them horizontally or
@@ -1394,7 +1399,7 @@ windows.
 terminal are replicated to the others.
 @item Supports notifications when processes are completed out of view.
 @end enumerate")
-    (license license:mpl2.0)))
+    (license license:mpl2.0))))
 
 (define-public tio
   (package
@@ -1428,7 +1433,7 @@ basic input/output.")
        ;; it does not contain "extra" directory with completions, icon, etc.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jwilm/alacritty")
+             (url "https://github.com/alacritty/alacritty")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1515,6 +1520,10 @@ basic input/output.")
                (mkdir-p man)
                (copy-file "extra/alacritty.man"
                           (string-append man "/alacritty.1"))
+               ;; Install example configuration.
+               (install-file "alacritty.yml"
+                             (string-append share "/doc/alacritty-"
+                                            ,(package-version this-package) "/example"))
                ;; Install desktop file.
                (install-file "extra/linux/Alacritty.desktop"
                              (string-append share "/applications"))
@@ -1561,7 +1570,7 @@ basic input/output.")
      (list (search-path-specification
             (variable "TERMINFO_DIRS")
             (files '("share/terminfo")))))
-    (home-page "https://github.com/alacritty/alacritty")
+    (home-page "https://alacritty.org/")
     (synopsis "GPU-accelerated terminal emulator")
     (description
      "Alacritty is a GPU-accelerated terminal emulator with a strong focus on
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8a564714ab..2f557120bb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -1053,6 +1053,81 @@ variant.  It adds XeTeX, MetaPost, and some recommended packages to
 @code{scheme-basic}.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-scheme-tetex
+  (package
+    (name "texlive-scheme-tetex")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-acronym
+           texlive-amslatex-primer
+           texlive-bbm
+           texlive-bbm-macros
+           texlive-bbold
+           texlive-bibtex8
+           texlive-cmbright
+           texlive-collection-basic
+           texlive-collection-context
+           texlive-collection-fontsrecommended
+           texlive-collection-fontutils
+           texlive-collection-formatsextra
+           texlive-collection-langcjk
+           texlive-collection-langcyrillic
+           texlive-collection-langczechslovak
+           texlive-collection-langenglish
+           texlive-collection-langeuropean
+           texlive-collection-langfrench
+           texlive-collection-langgerman
+           texlive-collection-langgreek
+           texlive-collection-langitalian
+           texlive-collection-langother
+           texlive-collection-langpolish
+           texlive-collection-langportuguese
+           texlive-collection-langspanish
+           texlive-collection-latex
+           texlive-collection-latexrecommended
+           texlive-collection-mathscience
+           texlive-collection-metapost
+           texlive-collection-pictures
+           texlive-collection-plaingeneric
+           texlive-collection-pstricks
+           texlive-ctie
+           texlive-cweb
+           texlive-detex
+           texlive-dtl
+           texlive-dvi2tty
+           texlive-dvicopy
+           texlive-dvidvi
+           texlive-dviljk
+           texlive-eplain
+           texlive-eulervm
+           texlive-gentle
+           texlive-lshort-english
+           texlive-mltex
+           texlive-multirow
+           texlive-nomencl
+           texlive-patgen
+           texlive-pst-pdf
+           texlive-rsfs
+           texlive-seetexk
+           texlive-siunits
+           texlive-subfigure
+           texlive-supertabular
+           texlive-tamethebeast
+           texlive-tds
+           texlive-tex-refs
+           texlive-tie
+           texlive-web
+           texlive-xpdfopen))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "teTeX scheme (more than medium, but nowhere near full)")
+    (description
+     "Larger than medium, this TeX Live scheme is nearly equivalent to the
+teTeX distribution that was maintained by Thomas Esser.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 ;; This package must be located before any package adding it to its native
 ;; inputs.
 (define-public texlive-updmap.cfg
@@ -1172,6 +1247,235 @@ TGA. Accepted output formats are: EPS, PCL5, PDF, PDF1, PBM, PGM, PPM, PS,
 markedEPS, markedPS, PNG, XWD, BMP, TIFF, JPEG, GIF, XPM.")
     (license license:gpl3+)))
 
+(define-public texlive-aaai-named
+  (package
+    (name "texlive-aaai-named")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/aaai-named/")
+             (base32
+              "1xs2iki0v1mh0kbqjxnv9r24bcfmgj6myfw7h368h8g0s1n8d5v6")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/aaai-named")
+    (synopsis "BibTeX style for AAAI")
+    (description
+     "This package provides a BibTeX style derived from the standard master,
+presumably for use with the @code{aaai} package.")
+    (license license:knuth)))
+
+(define-public texlive-aalok
+  (package
+    (name "texlive-aalok")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/aalok/" "source/latex/aalok/"
+                   "tex/latex/aalok/")
+             (base32
+              "0vpvqv60p5v3frdqa5r8k9k4zxk0icma5blw9dr6jhqfzf6lc3jy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/aalok")
+    (synopsis "LaTeX class file for the Marathi journal @emph{Aalok}")
+    (description
+     "This package provides the class file for typesetting @emph{Aalok},
+a Marathi journal, with LaTeX.")
+    (license (list license:gpl3+
+                   ;; Aalok (आलोक) copyleft license v1.0+.
+                   (license:fsf-free "file://doc/latex/aalok/README.txt")
+                   license:fdl1.3+))))
+
+(define-public texlive-aastex
+  (package
+    (name "texlive-aastex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/aastex/" "doc/latex/aastex/"
+                   "tex/latex/aastex/")
+             (base32
+              "07kbrv0vhlpdaxqkiwn2q4psldn5p2x5mmpaw70g6pgcbhk7r74h")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/aastex")
+    (synopsis "Macros for manuscript preparation for AAS journals")
+    (description
+     "The bundle provides a document class for preparing papers for
+@acronym{AAS, American Astronomical Society} publications.  Authors who wish
+to submit papers to AAS journals are strongly urged to use this class in
+preference to any of the alternatives available.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-abc
+  (package
+    (name "texlive-abc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/abc/" "source/latex/abc/"
+                   "tex/latex/abc/")
+             (base32
+              "1vywrv35h65gkxipc7d26k32r04fk61kfkkk9bj3zsmxsw1v3r8d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/abc")
+    (synopsis "Support ABC music notation in LaTeX")
+    (description
+     "The abc package lets you include lines of music written in the ABC Plus
+language.  The package will then employ the @code{\\write18} facility to
+convert your notation to PostScript (using the established utility
+@command{abcm2ps}) and hence to the format needed for inclusion in your
+document.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-abnt
+  (package
+    (name "texlive-abnt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/abnt/" "tex/latex/abnt/")
+             (base32
+              "1zjsvp6ng6vf87mmnv18q435h6p3ygs512pk0m05yd8gyrmhmrxr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/abnt")
+    (synopsis "Typesetting academic works according to ABNT rules")
+    (description
+     "The ABNT package provides a clean and practical implementation of the
+@acronym{ABNT, Associacao Brasileira de Normas Tecnicas} rules for academic
+texts.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-abntex2
+  (package
+    (name "texlive-abntex2")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/abntex2/" "bibtex/bst/abntex2/"
+                   "doc/latex/abntex2/" "tex/latex/abntex2/")
+             (base32
+              "07752n6s2nl4h8j1wg7hjx2wisn505asb1r1i38z7qjbzg7lwqq5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/abntex2")
+    (synopsis
+     "Typeset technical and scientific Brazilian documents based on ABNT rules")
+    (description
+     "The bundle provides support for typesetting technical and scientific
+Brazilian documents (like academic thesis, articles, reports, research project
+and others) based on the @acronym{ABNT, Associacao Brasileira de Normas
+Tecnicas} rules.  It replaces the old @code{abntex}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-abntexto
+  (package
+    (name "texlive-abntexto")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/abntexto/" "tex/latex/abntexto/")
+             (base32
+              "1c560h2555hx1pcq70yg9qdgqp1bkxidabp53fd0gyvb141s3d79")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/abntexto")
+    (synopsis "LaTeX class for formatting academic papers in ABNT standards")
+    (description
+     "This is a LaTeX class created for Brazilian students to facilitate the
+use of standards from the @acronym{ABNT, Associacao Brasileira de Normas
+Tecnicas} in academic works like TCCs, dissertations, theses.")
+    (license license:public-domain)))
+
+(define-public texlive-aboensis
+  (package
+    (name "texlive-aboensis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/aboensis/"
+                   "fonts/opentype/public/aboensis/"
+                   "tex/latex/aboensis/")
+             (base32
+              "14333k6bkfywdka3h2a2yd2nw0521q0lwl3x38612j7cb82izyi3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/aboensis")
+    (synopsis "Late medieval OpenType cursive font")
+    (description
+     "The package contains the OpenType medieval cursive font Aboensis and
+a style file to use it in XeLaTeX documents.  The font is based on @emph{Codex
+Aboensis}, that is a law book written in Sweden in the 1430s.  Since medieval
+cursive is very difficult to read for modern people, the font is not suitable
+for use as an ordinary book font, but is intended for emulating late medieval
+manuscripts.
+
+The font contains two sets of initials: lombardic and cursive to go with the
+basic alphabet, and there is support for writing two-colored initials and
+capitals.  There are also a large number of abbreviation sigla that can be
+accessed as ligature substitutions.  The style file contains macros that help
+to use the extended features of the font such as initials and two-colored
+capitals.  There are also macros to help achieve even pages with consistent
+line spacing.")
+    (license
+     (list license:silofl1.1
+           license:lppl1.3c
+           license:cc-by4.0
+           license:public-domain))))
+
+(define-public texlive-academicons
+  (package
+    (name "texlive-academicons")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/academicons/"
+                   "fonts/truetype/public/academicons/"
+                   "tex/latex/academicons/")
+             (base32
+              "1gxgj0ppyrf6pj9qvhk02ybwf68yzlh2110r41iwsai5by2iczhm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/academicons")
+    (synopsis "Font containing high quality icons of online academic profiles")
+    (description
+     "The @code{academicons} package provides access in (La)TeX to 124 high
+quality icons of online academic profiles included in the free Academicons
+font.  This package requires either the Xe(La)TeX or Lua(La)TeX engine to load
+the Academicons font from the system.  The @code{academicons} package provides
+the generic @code{\\aiicon} command to access icons, which takes as mandatory
+argument the name of the desired icon.  It also provides individual direct
+commands for each specific icon.")
+    (license (list license:lppl1.3c license:silofl1.1))))
+
+(define-public texlive-accanthis
+  (package
+    (name "texlive-accanthis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/accanthis/"
+                   "fonts/enc/dvips/accanthis/"
+                   "fonts/map/dvips/accanthis/"
+                   "fonts/opentype/arkandis/accanthis/"
+                   "fonts/tfm/arkandis/accanthis/"
+                   "fonts/type1/arkandis/accanthis/"
+                   "fonts/vf/arkandis/accanthis/"
+                   "tex/latex/accanthis/")
+             (base32
+              "1xpy3bs8wwb6ncw4c8kc5vvddl77rmjwfjq66xw12sc8mgg9grmv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/accanthis")
+    (synopsis "Accanthis fonts, with LaTeX support")
+    (description
+     "Accanthis No.@: 3, designed by Hirwin Harendal, is suitable as an
+alternative to fonts such as Garamond, Galliard, Horley old style, Sabon, and
+Bembo.  The package provides support files for use with all LaTeX engines.")
+    (license (list license:gpl2+ license:lppl))))
+
 (define-public texlive-accents
   (package
     (name "texlive-accents")
@@ -1215,6 +1519,27 @@ works on TeX virtual fonts and @command{vpl2ovp} transforms a TeX font to an
 Omega one.")
     (license license:gpl3+)))
 
+(define-public texlive-accsupp
+  (package
+    (name "texlive-accsupp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/accsupp/" "source/latex/accsupp/"
+                   "tex/latex/accsupp/")
+             (base32
+              "10xdg3gk5madpb131lhc9x2sxzby4rvqycbfzb5kl2zkwr1qw5v7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/accsupp")
+    (synopsis "Better accessibility support for PDF files")
+    (description
+     "Since PDF 1.5 portions of a page can be marked for better accessibility
+support.  For example, replacement texts or expansions of abbreviations can be
+provided.  This package starts with providing a minimal low-level interface
+for programmers; its status is experimental.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-abbr
   (package
     (name "texlive-abbr")
@@ -1261,6 +1586,117 @@ adaptation for working with Babel.")
            license:knuth                ;bxabst
            license:public-domain))))    ;docmac
 
+(define-public texlive-acmconf
+  (package
+    (name "texlive-acmconf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/acmconf/" "source/latex/acmconf/"
+                   "tex/latex/acmconf/")
+             (base32
+              "0j30krvxzps7ka3xzv0qifrzxhxzkr3b3f9gska6najp1dvygs3a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/acmconf")
+    (synopsis "Class for ACM conference proceedings")
+    (description
+     "This class may be used to typeset articles to be published in the
+proceedings of @acronym{ACM, Association for Computing Machinery} conferences
+and workshops.  The layout produced by the @code{acmconf} class is based on
+the ACM's own specification.")
+    (license license:lppl)))
+
+(define-public texlive-active-conf
+  (package
+    (name "texlive-active-conf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/active-conf/"
+                   "source/latex/active-conf/"
+                   "tex/latex/active-conf/")
+             (base32
+              "12krmwspwkhcwk5q0qf2hldnsk44vd2jfssfdiwm97alicc3cpj1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/active-conf")
+    (synopsis "Class for typesetting ACTIVE conference papers")
+    (description
+     "Active-conf is a class for typesetting papers for the Active conference
+on noise and vibration control.  The class is based on @code{article} with
+more flexible front-matter, and can be customised for conferences in future
+years with a header file.")
+    (license license:lppl)))
+
+(define-public texlive-adfathesis
+  (package
+    (name "texlive-adfathesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/adfathesis/"
+                   "doc/latex/adfathesis/"
+                   "source/latex/adfathesis/"
+                   "tex/latex/adfathesis/")
+             (base32
+              "0zi91xc3sbdjvp87zgrb7g3l5hxqig33fchlhg2i8gjya9ij67p6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/adfathesis")
+    (synopsis "Australian Defence Force Academy thesis format")
+    (description "The package provides the Australian Defence Force Academy
+thesis format.  The bundle also includes a BibTeX style file.")
+    (license license:public-domain)))
+
+(define-public texlive-adforn
+  (package
+    (name "texlive-adforn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/adforn/"
+                   "fonts/afm/arkandis/adforn/"
+                   "fonts/enc/dvips/adforn/"
+                   "fonts/map/dvips/adforn/"
+                   "fonts/tfm/arkandis/adforn/"
+                   "fonts/type1/arkandis/adforn/"
+                   "tex/latex/adforn/")
+             (base32
+              "0dpdbqlc7p3mwm1bj1m5sbkwi5qjsvsfzfb0wnq4flvz1gc09245")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/adforn")
+    (synopsis "OrnementsADF font with TeX and LaTeX support")
+    (description
+     "The bundle provides the Ornements ADF font in PostScript Type 1 format
+with TeX and LaTeX support files.")
+    (license (list license:lppl license:gpl2+))))
+
+(define-public texlive-adfsymbols
+  (package
+    (name "texlive-adfsymbols")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/adfsymbols/"
+                   "fonts/afm/arkandis/adfsymbols/"
+                   "fonts/enc/dvips/adfsymbols/"
+                   "fonts/map/dvips/adfsymbols/"
+                   "fonts/tfm/arkandis/adfsymbols/"
+                   "fonts/type1/arkandis/adfsymbols/"
+                   "tex/latex/adfsymbols/")
+             (base32
+              "188is31d2zcd8kk339x4wvhhm98gbfkvq6pi25d9mva4vz3w1vf5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/adfsymbols")
+    (synopsis "SymbolsADF with TeX and LaTeX support")
+    (description
+     "The package provides Arkandis foundry's ArrowsADF and BulletsADF fonts
+in Adobe Type 1 format, together with TeX and LaTeX support files.")
+    (license (list license:lppl license:gpl2))))
+
 (define-public texlive-adhocfilelist
   (package
     (name "texlive-adhocfilelist")
@@ -1284,6 +1720,69 @@ adaptation for working with Babel.")
 controlling the searches that the package does.")
     (license license:lppl)))
 
+(define-public texlive-adtrees
+  (package
+    (name "texlive-adtrees")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/adtrees/" "tex/latex/adtrees/")
+             (base32
+              "0ypb609wvw3mvs7bf2mwa7r7v4frxjhfll8d1sqfry3dv3kr13pq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/adtrees")
+    (synopsis "Macros for drawing adpositional trees")
+    (description
+     "This package provides a means to write adpositional trees, a formalism
+devoted to representing natural language expressions.")
+    (license license:gpl3+)))
+
+(define-public texlive-adobemapping
+  (package
+    (name "texlive-adobemapping")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/cmap/adobemapping/")
+             (base32
+              "1yvf74mlmxmnq9m0wvda9xcna8xnn382bbrzizzjm5w7bk8c4g98")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/adobemapping")
+    (synopsis "Adobe CMap and PDF mapping files")
+    (description
+     "The package comprises the collection of CMap and PDF mapping files made
+available for distribution by Adobe.")
+    (license license:bsd-3)))
+
+(define-public texlive-aesupp
+  (package
+    (name "texlive-aesupp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/aesupp/"
+                   "fonts/enc/dvips/aesupp/"
+                   "fonts/map/dvips/aesupp/"
+                   "fonts/opentype/public/aesupp/"
+                   "fonts/tfm/public/aesupp/"
+                   "fonts/type1/public/aesupp/"
+                   "source/fonts/aesupp/"
+                   "tex/latex/aesupp/")
+             (base32
+              "1sx5802d1ib72i0ssjpr0c54pgq1s980wg3q1685pjniw68ns1vj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/aesupp")
+    (synopsis "Special support for the @samp{ae} character")
+    (description
+     "This package provides special support for the italic @samp{ae} character
+in some fonts, due to design flaws (in the author's opinion) regarding this
+character.  At the moment only the fonts TeX Gyre Bonum, TeX Gyre Schola, TeX
+Gyre Pagella, and the Latin Modern fonts are supported.  The other fonts in
+the TeX Gyre bundle do not need this support.")
+    (license (list license:gfl1.0 license:gpl3+))))
+
 (define-public texlive-afm2pl
   (package
     (name "texlive-afm2pl")
@@ -1307,6 +1806,141 @@ a @file{.tfm} (TeX Font Metric) file.  It normally preserves kerns and
 ligatures, but also offers additional control over them.")
     (license license:gpl2)))
 
+(define-public texlive-afparticle
+  (package
+    (name "texlive-afparticle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/afparticle/"
+                   "source/latex/afparticle/"
+                   "tex/latex/afparticle/")
+             (base32
+              "1g7dk32la2zlspdsw1pz15bf90jjycblgpg91m24bx70svdv67kv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/afparticle")
+    (synopsis "Typesetting articles for @emph{Archives of Forensic Psychology}")
+    (description
+     "This package provides a class for typesetting articles for the open
+access journal @emph{Archives of Forensic Psychology}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-afthesis
+  (package
+    (name "texlive-afthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/afthesis/" "doc/latex/afthesis/"
+                   "tex/latex/afthesis/")
+             (base32
+              "1db9fzs4rf1d86n2gcn0zs255nlwc8i1yl5n9qzsn6xf5as7zz1i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/afthesis")
+    (synopsis "Air Force Institute of Technology thesis class")
+    (description
+     "This is a LaTeX thesis and dissertation class for US Air Force Institute
+Of Technology.")
+    (license license:public-domain)))
+
+(define-public texlive-aguplus
+  (package
+    (name "texlive-aguplus")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/aguplus/" "doc/latex/aguplus/"
+                   "tex/latex/aguplus/")
+             (base32
+              "0qpi5r4y70cmxinr9y46rw6dfd337l5xhnqfvbkz27nw98j87fi3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/aguplus")
+    (synopsis "Styles for American Geophysical Union")
+    (description
+     "This bundle started as an extension to the @acronym{AGU, American
+Geophysical Union}'s own published styles, providing extra facilities and
+improved usability.  The AGU now publishes satisfactory LaTeX materials of its
+own; it is recommended to switch to the official distribution.")
+    (license license:lppl)))
+
+(define-public texlive-aiaa
+  (package
+    (name "texlive-aiaa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/aiaa/" "doc/latex/aiaa/"
+                   "source/latex/aiaa/" "tex/latex/aiaa/")
+             (base32
+              "0l6sp7q53nr1ppxaynfc0q3kf1hg5v22yxyvzjdg028rf1nvbhww")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/aiaa")
+    (synopsis "Typeset AIAA conference papers")
+    (description
+     "This package provides a bundle of LaTeX and BibTeX files and sample
+documents to aid those producing papers and journal articles according to the
+guidelines of the @acronym{AIAA, American Institute of Aeronautics and
+Astronautics}.")
+    (license license:lppl)))
+
+(define-public texlive-aichej
+  (package
+    (name "texlive-aichej")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/aichej/")
+             (base32
+              "1pr92pq3yjsrbax6ah01cqg7131fp2rkqqjnxwcrm4119z2ic0gf")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/aichej")
+    (synopsis "Bibliography style file for the AIChE Journal")
+    (description
+     "The style was generated using custom-bib, and implements the style of
+the American Institute of Chemical Engineers Journal (or @code{AIChE} Journal
+or @code{AIChE} J or @code{AIChEJ).}")
+    (license license:lppl)))
+
+(define-public texlive-ajl
+  (package
+    (name "texlive-ajl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/ajl/")
+             (base32
+              "1xkrvy06lw4ngj94zybs14ysal2pg7g71h864gq9bjw0zwq2yjzs")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ajl")
+    (synopsis "BibTeX style for AJL")
+    (description
+     "This package provides bibliographic style references in style of
+Australian Journal of Linguistics.")
+    (license license:lppl)))
+
+(define-public texlive-akshar
+  (package
+    (name "texlive-akshar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/akshar/" "source/latex/akshar/"
+                   "tex/latex/akshar/")
+             (base32
+              "17xiqalqpw64pgvmpsa41qf6y5fhg720rpbr57kv8ipvvm1fn3n5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/akshar")
+    (synopsis "Support for syllables in the Devanagari script")
+    (description
+     "This LaTeX3 package provides macros and interfaces to work with
+Devanagari characters and syllables in a more correct way.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-albatross
   (package
     (name "texlive-albatross")
@@ -1330,6 +1964,86 @@ ligatures, but also offers additional control over them.")
 a given (Unicode) glyph.  It relies on Fontconfig.")
     (license license:bsd-3)))
 
+(define-public texlive-alegreya
+  (package
+    (name "texlive-alegreya")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/alegreya/"
+                   "fonts/enc/dvips/alegreya/"
+                   "fonts/map/dvips/alegreya/"
+                   "fonts/opentype/huerta/alegreya/"
+                   "fonts/tfm/huerta/alegreya/"
+                   "fonts/type1/huerta/alegreya/"
+                   "fonts/vf/huerta/alegreya/"
+                   "tex/latex/alegreya/")
+             (base32
+              "1n09fq89nxw3jaglmvjfl7ysflqi0rh6mmp6q0zn57m72sza9rra")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/alegreya")
+    (synopsis "Alegreya fonts with LaTeX support")
+    (description
+     "Alegreya, designed by Juan Pablo del Peral, is a typeface originally
+intended for literature.  It conveys a dynamic and varied rhythm which
+facilitates the reading of long texts.  Bold, black, small caps and five
+number styles are available.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-aleph
+  (package
+    (name "texlive-aleph")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/aleph/base/" "doc/man/man1/aleph.1"
+                   "doc/man/man1/aleph.man1.pdf")
+             (base32
+              "0b7dihilh2v8qcp4m8fblyc10jc5i4fhpj3pspzinag0pk66b7nb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:create-formats #~(list "aleph")))
+    (propagated-inputs
+     (list texlive-cm
+           texlive-hyphen-base
+           texlive-knuth-lib
+           texlive-lambda
+           texlive-latex
+           texlive-plain))
+    (home-page "https://ctan.org/pkg/aleph")
+    (synopsis "Extended TeX")
+    (description
+     "This package provides a development of Omega, using most of the
+extensions of TeX, itself developed for e-TeX.")
+    (license license:gpl3+)))
+
+(define-public texlive-alfaslabone
+  (package
+    (name "texlive-alfaslabone")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/alfaslabone/"
+                   "fonts/enc/dvips/alfaslabone/"
+                   "fonts/map/dvips/alfaslabone/"
+                   "fonts/opentype/public/alfaslabone/"
+                   "fonts/tfm/public/alfaslabone/"
+                   "fonts/type1/public/alfaslabone/"
+                   "fonts/vf/public/alfaslabone/"
+                   "tex/latex/alfaslabone/")
+             (base32
+              "1wpn96dd1rca52dqwngvyyvnmvak32sjz2id6lcra2jnz5jhk01g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/alfaslabone")
+    (synopsis "Alfa Slab One font face with support for LaTeX and pdfLaTeX")
+    (description
+     "The @code{alfaslabone} package supports the Alfa Slab One font face for
+LaTeX.  There is only a Regular font face.  It's useful for book-chapter
+headlines.")
+    (license license:silofl1.1)))
+
 (define-public texlive-alg
   (package
     (name "texlive-alg")
@@ -1376,6 +2090,34 @@ standalone documents cumbersome to customize, and has arbitrary and
 inconsistent differences between the input syntax and the program text.")
     (license license:gpl3+)))
 
+(define-public texlive-algolrevived
+  (package
+    (name "texlive-algolrevived")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/algolrevived/"
+                   "fonts/enc/dvips/algolrevived/"
+                   "fonts/map/dvips/algolrevived/"
+                   "fonts/opentype/public/algolrevived/"
+                   "fonts/tfm/public/algolrevived/"
+                   "fonts/type1/public/algolrevived/"
+                   "fonts/vf/public/algolrevived/"
+                   "tex/latex/algolrevived/")
+             (base32
+              "0709ijp5jqajwdc9ryhjp4jky0pqynj9wj3rryxk9z6sm63pbq1k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/algolrevived")
+    (synopsis "Revival of Frutiger's Algol alphabet")
+    (description
+     "The package revives Frutiger's Algol alphabet, designed in 1963 for the
+code segments in an ALGOL manual.  It provides OpenType and Type 1, regular
+and medium weights, upright and slanted variations.  Albeit not monospaced,
+this font is good for listings if you don't need code to be aligned with
+specific columns.  It also makes a passable but limited text font.")
+    (license (list license:silofl1.1 license:lppl1.3c))))
+
 (define-public texlive-algorithm2e
   (package
     (name "texlive-algorithm2e")
@@ -1509,6 +2251,125 @@ text which spans over multiple lines.")
 math environments.")
     (license license:lppl1.3c)))
 
+(define-public texlive-alkalami
+  (package
+    (name "texlive-alkalami")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/alkalami/"
+                   "fonts/truetype/public/alkalami/")
+             (base32
+              "0979xhsjar0gwjp9yqp0kaf4gp4z715gr2kdb8dkqg8zzlkqhgzk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/alkalami")
+    (synopsis "Font for Arabic-based writing systems in Nigeria and Niger")
+    (description
+     "This font is designed for Arabic-based writing systems in the Kano
+region of Nigeria and Niger.")
+    (license license:silofl1.1)))
+
+(define-public texlive-allrunes
+  (package
+    (name "texlive-allrunes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/allrunes/"
+                   "fonts/map/dvips/allrunes/"
+                   "fonts/source/public/allrunes/"
+                   "fonts/type1/public/allrunes/"
+                   "source/fonts/allrunes/"
+                   "tex/latex/allrunes/")
+             (base32
+              "14a1qaa30s4dzmg4dlrjd3faa3bcrl2gdpp700i8pghj3pjk7gp4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/allrunes")
+    (synopsis "Fonts and LaTeX package for almost all runes")
+    (description
+     "This large collection of fonts (in Adobe Type 1 format), with the LaTeX
+package gives access to almost all runes ever used in Europe.  The bundle
+covers not only the main forms but also a lot of varieties.")
+    (license license:lppl)))
+
+(define-public texlive-almendra
+  (package
+    (name "texlive-almendra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/almendra/"
+                   "fonts/enc/dvips/almendra/"
+                   "fonts/map/dvips/almendra/"
+                   "fonts/tfm/public/almendra/"
+                   "fonts/truetype/public/almendra/"
+                   "fonts/type1/public/almendra/"
+                   "fonts/vf/public/almendra/"
+                   "tex/latex/almendra/")
+             (base32
+              "1mkj0cjpry0hdynlpf719haczm1csv0yvla6nhlgp3dq5k28hvp2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/almendra")
+    (synopsis "Almendra fonts with LaTeX support")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX, and LuaLaTeX support for
+the Almendra family of fonts, designed by Ana Sanfelippo.  Almendra is
+a typeface design based on calligraphy.  Its style is related to the Chancery
+and Gothic hands.  There are regular and bold weights with matching italics.
+There is also a regular-weight small-caps.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-almfixed
+  (package
+    (name "texlive-almfixed")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/almfixed/"
+                   "fonts/opentype/public/almfixed/"
+                   "fonts/truetype/public/almfixed/")
+             (base32
+              "1ihyldbdz89swj8lm75kb3n3nqqgzkydwlppsndfpib74pvp6s97")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/almfixed")
+    (synopsis "Extend TeX-Gyre Latin Modern to full Arabic Unicode support")
+    (description
+     "Arabic-Latin Modern Fixed is an extension of TeX-Gyre Latin Modern Mono
+10 Regular.  Every glyph and OpenType feature of the Latin Modern Mono has
+been retained, with minor improvements.  On the other hand, we have changed
+the vertical metrics of the font.
+
+The unique feature of Arabic-Latin Modern is its treatment of vowels and
+diacritics.  Each vowel and diacritic (ALM Fixed contains a total of 68 such
+glyphs) may now be edited horizontally within any text editor or processor.
+Editing complex Arabic texts will now be much easier to input and to
+proofread.")
+    (license license:gfl1.0)))
+
+(define-public texlive-alpha-persian
+  (package
+    (name "texlive-alpha-persian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/alpha-persian/"
+                   "doc/bibtex/alpha-persian/")
+             (base32
+              "15ynmgh3fp6s40c200kgr6v0q84bkzp9cv45yg90mr9d7mq72djv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/alpha-persian")
+    (synopsis "Persian version of @file{alpha.bst}")
+    (description
+     "The package provides a Persian version of the alpha BibTeX style and
+offers several enhancements.  It is compatible with the @code{hyperref},
+@code{url}, @code{natbib}, and @code{cite} packages.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-amscdx
   (package
     (name "texlive-amscdx")
@@ -1602,6 +2463,24 @@ create a bibliography.")
     ;; Use same license as `amsmath'.
     (license license:lppl1.3c)))
 
+(define-public texlive-amsldoc-vn
+  (package
+    (name "texlive-amsldoc-vn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/amsldoc-vn/")
+             (base32
+              "1iz0zjn1v7izwbsq0zb6cvpnkbvk0nxw1b24j7dzqwk3m9j43i6x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/amslatexdoc-vietnamese")
+    (synopsis "Vietnamese translation of AMSLaTeX documentation")
+    (description
+     "This is a Vietnamese translation of @code{amsldoc}, the users guide to
+@code{amsmath}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-amstex
   (package
     (name "texlive-amstex")
@@ -1658,6 +2537,34 @@ prepare submissions for the AMS.")
     ;; Use same license as `amscls'.
     (license license:lppl1.3c)))
 
+(define-public texlive-andika
+  (package
+    (name "texlive-andika")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/andika/"
+                   "fonts/enc/dvips/andika/"
+                   "fonts/map/dvips/andika/"
+                   "fonts/tfm/SIL/andika/"
+                   "fonts/truetype/SIL/andika/"
+                   "fonts/type1/SIL/andika/"
+                   "fonts/vf/SIL/andika/"
+                   "tex/latex/andika/")
+             (base32
+              "1gjahg3xwzwrj9cp6l0zmhfqxwzl4m89vvngmpq4ym0f6rg5pb4i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/andika")
+    (synopsis "Andika fonts with support for all LaTeX engines")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Andika family of fonts designed by SIL International especially for
+literacy use, taking into account the needs of beginning readers.  The focus
+is on clear, easy-to-perceive letterforms that will not be readily confused
+with one another.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-annee-scolaire
   (package
     (name "texlive-annee-scolaire")
@@ -1681,6 +2588,26 @@ of the academic year, a macro to be redefined to change the presentation of
 the years.")
     (license license:lppl1.3c)))
 
+(define-public texlive-annotate
+  (package
+    (name "texlive-annotate")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/annotate/")
+             (base32
+              "12q3xk08ycz57vsrcr2glk7y48w8sbc4n8lrqaicd46cxfd4jdqm")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/annotate")
+    (synopsis "Bibliography style with annotations")
+    (description
+     "The style is a derivative of the standard @code{alpha} style, which
+processes an entry's annotate field as part of the printed output.")
+    ;; There is no explicit license in the "annotate.bst" file, but it
+    ;; mentions being derived from "alpha.bst", which is released under
+    ;; Knuth's terms.  We therefore use the same license.
+    (license license:knuth)))
+
 (define-public texlive-annotate-equations
   (package
     (name "texlive-annotate-equations")
@@ -1701,6 +2628,59 @@ equations and add annotation labels using TikZ.  It should work with pdfLaTeX
 as well as LuaLaTeX.")
     (license license:expat)))
 
+(define-public texlive-anonymous-acm
+  (package
+    (name "texlive-anonymous-acm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/anonymous-acm/"
+                   "tex/latex/anonymous-acm/")
+             (base32
+              "05csmx485sjky64d2hwlb5f7mrkixhw1gn3nl7p7lng9sd8qh25k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/anonymous-acm")
+    (synopsis "Typeset anonymous versions for ACM articles")
+    (description
+     "Academics often need to submit anonymous versions of their papers for
+peer-review.  This often requires anonymization which at some future date
+needs to be reversed.  However de-anonymizing an anonymized paper can be
+laborious and error-prone.  This LaTeX package allows anonymization options to
+be specified at the time of writing for authors using @code{acmart.cls}, the
+official @acronym{ACM, Association of Computing Machinery} master
+@code{article} template.  Anonymization or deanonymization is carried out by
+simply changing one option and recompiling.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-anonymouspro
+  (package
+    (name "texlive-anonymouspro")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/anonymouspro/"
+                   "fonts/afm/public/anonymouspro/"
+                   "fonts/enc/dvips/anonymouspro/"
+                   "fonts/map/dvips/anonymouspro/"
+                   "fonts/tfm/public/anonymouspro/"
+                   "fonts/truetype/public/anonymouspro/"
+                   "fonts/type1/public/anonymouspro/"
+                   "fonts/vf/public/anonymouspro/"
+                   "source/fonts/anonymouspro/"
+                   "tex/latex/anonymouspro/")
+             (base32
+              "1qfhsbq3ab72k9d023pa70vs1807djijg84l888nwsf3ylfwg7mf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/anonymouspro")
+    (synopsis "Use AnonymousPro fonts with LaTeX")
+    (description
+     "The fonts are a monowidth set, designed for use by coders.  They appear
+as a set of four TrueType, or Adobe Type 1 font files, and LaTeX support is
+also provided.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-antanilipsum
   (package
     (name "texlive-antanilipsum")
@@ -1722,6 +2702,243 @@ mocking nonsense phrases from the movie series @emph{Amici Miei} (``My
 friends'', in English), directed by Mario Monicelli.")
     (license license:lppl1.3c)))
 
+(define-public texlive-antiqua
+  (package
+    (name "texlive-antiqua")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/antiqua/"
+                   "fonts/afm/urw/antiqua/"
+                   "fonts/map/dvips/antiqua/"
+                   "fonts/map/vtex/antiqua/"
+                   "fonts/tfm/urw/antiqua/"
+                   "fonts/type1/urw/antiqua/"
+                   "fonts/vf/urw/antiqua/"
+                   "tex/latex/antiqua/")
+             (base32
+              "0agnibj98zx2f2r40gqcfm2f1x06389wd2qrlf6b4pl8pgay42z2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/urw-antiqua")
+    (synopsis "URW Antiqua condensed font, for use with TeX")
+    (description
+     "The package contains a copy of the Type 1 font URW Antiqua 2051 Regular
+Condensed, with supporting files for use with (La)TeX.")
+    (license license:gpl3+)))
+
+(define-public texlive-antomega
+  (package
+    (name "texlive-antomega")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/omega/antomega/" "omega/ocp/antomega/"
+                   "omega/otp/antomega/"
+                   "source/lambda/antomega/"
+                   "tex/lambda/antomega/")
+             (base32
+              "02pfjm9y33mjggn9w2lrk1fxfz3m72xgbvyvrq2iri9yf0hk33pf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-build
+            ;; This phase is necessary because the build phase is reluctant to
+            ;; generate "hyphen.cfg" since there is another one among the
+            ;; inputs already.
+            (lambda _
+              (substitute* "source/lambda/antomega/antomega.ins"
+                (("\\\\generateFile\\{hyphen\\.cfg\\}\\{t\\}")
+                 "\\generateFile{hyphen.cfg}{f}")))))))
+    (propagated-inputs (list texlive-omega))
+    (home-page "https://ctan.org/pkg/antomega")
+    (synopsis "Alternative language support for Omega and Lambda")
+    (description
+     "This package provides a language support package for Omega and Lambda.
+This replaces the original Omega package for use with Lambda, and provides
+extra facilities (including Babel-like language switching, which eases porting
+of LaTeX documents to Lambda).")
+    (license license:lppl)))
+
+(define-public texlive-anufinalexam
+  (package
+    (name "texlive-anufinalexam")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/anufinalexam/")
+             (base32
+              "1v1k74vxidgxn5zzqz6v9zga468kcf7hwdrnvw44cd318221y396")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/anufinalexam")
+    (synopsis "LaTeX document shell for ANU final exam")
+    (description
+     "This LaTeX document shell is created for the standard formatting of
+final exams in the @acronym{ANU, Australian National University}.")
+    (license license:gpl3+)))
+
+(define-public texlive-anyfontsize
+  (package
+    (name "texlive-anyfontsize")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/anyfontsize/"
+                   "tex/latex/anyfontsize/")
+             (base32
+              "0wr4brhggmkb1rwzmcc2r5ygzqp6090z0bp3sfbarwvwz903wpdn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/anyfontsize")
+    (synopsis "Select any font size in LaTeX")
+    (description
+     "The package allows the to user select any font size , even those sizes
+that are not listed in the @file{.fd} file.  If such a size is requested,
+LaTeX will search for and select the nearest listed size; @code{anyfontsize}
+will then scale the font to the size actually requested.  Similar
+functionality is available for the CM family, for the EC family, or for either
+Computer Modern encoding; the present package generalises the facility.")
+    (license license:lppl)))
+
+(define-public texlive-aomart
+  (package
+    (name "texlive-aomart")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/aomart/" "doc/latex/aomart/"
+                   "source/latex/aomart/" "tex/latex/aomart/")
+             (base32
+              "0gdi54qi0m96pwwn59r9qjlkw0986z9ra57g1vf11h67zwmrgrv9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/aomart")
+    (synopsis "Typeset articles for the @emph{Annals of Mathematics}")
+    (description
+     "The package provides a class for typesetting articles for the
+@emph{Annals of Mathematics}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-apa
+  (package
+    (name "texlive-apa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/apa/" "tex/latex/apa/")
+             (base32
+              "0slrvw7awva4d2zf7a6qyvh85qhrp8ml4ncdzjfizr5xz4ki6gs2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/apa")
+    (synopsis "American Psychological Association format")
+    (description
+     "This package provides a LaTeX class to format text according to the
+@emph{American Psychological Association Publication Manual} (5th ed.)
+specifications for manuscripts or to the @acronym{APA, Americal Psychological
+Association} journal look found in journals like the @emph{Journal of
+Experimental Psychology} etc.  In addition, it provides regular LaTeX-like
+output with a few enhancements and APA-motivated changes.  Note that the
+@code{apa7} class (covering the 7th edition of the manual) and
+@code{apa6} (covering the 6th edition of the manual) are now commonly in use.
+Apacite, which used to work with this class, has been updated for use with
+@code{apa6}.")
+    (license license:lppl)))
+
+(define-public texlive-apa6e
+  (package
+    (name "texlive-apa6e")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/apa6e/" "source/latex/apa6e/"
+                   "tex/latex/apa6e/")
+             (base32
+              "1dksjpdywwvyj9mfhaghsrf935p061gsnx4lf5s6pkv5nxn2pbln")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/apa6e")
+    (synopsis "Format manuscripts to APA 6th edition guidelines")
+    (description
+     "This is a minimalist class file for formatting manuscripts in the style
+described in the @acronym{APA, American Psychological Association} 6th edition
+guidelines.  The @code{apa6} class provides better coverage of the
+requirements.")
+    (license license:bsd-2)))
+
+(define-public texlive-apa7
+  (package
+    (name "texlive-apa7")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/apa7/" "source/latex/apa7/"
+                   "tex/latex/apa7/")
+             (base32
+              "0kifjg61s16cn7zvmix2yqdz26spr7f9gsxkiv822qs3y337l6ry")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               ;; ".ins" file writes files to "./config" and "./build".
+               ;; Create these directories first to prevent an error.
+               (add-before 'build 'prepare-build
+                 (lambda _
+                   (for-each mkdir-p (list "build/config" "build/samples")))))))
+    (home-page "https://ctan.org/pkg/apa7")
+    (synopsis "Format documents in APA style (7th edition)")
+    (description
+     "This class formats documents in @acronym{APA, American Psychological
+Association} style (7th Edition).  It provides a full set of facilities in
+four different output modes (journal-like appearance, double-spaced
+manuscript, double-spaced student manuscript, LaTeX-like document).  The class
+can mask author identity for copies for use in masked peer review.  It is
+a development of the @code{apa6} class.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-apalike-ejor
+  (package
+    (name "texlive-apalike-ejor")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/apalike-ejor/"
+                   "doc/bibtex/apalike-ejor/")
+             (base32
+              "0qq7c81hqi46596zw322w1qd8z341zksi5720f9s75nj1hmjj12g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/apalike-ejor")
+    (synopsis
+     "BibTeX style file for the European Journal of Operational Research")
+    (description
+     "This package contains a BibTeX style file, @file{apalike-ejor.bst},
+made to follow the European Journal of Operational Research reference style
+guidelines.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-apalike2
+  (package
+    (name "texlive-apalike2")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/apalike2/")
+             (base32
+              "0mn84ahwjg8gvw5lifvcrnch11q79d4bgw3nmhrh4v8slwgip5l7")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/apalike2")
+    (synopsis "Bibliography style that approaches APA requirements")
+    (description
+     "This package is an adaptation of @code{apalike}, which is part of the
+base BibTeX distribution.")
+    (license license:knuth)))
+
 (define-public texlive-apnum
   (package
     (name "texlive-apnum")
@@ -1806,6 +3023,145 @@ the main text, and supports a separate bibliography for the appendix
 material.")
     (license license:lppl1.3+)))
 
+(define-public texlive-arabi
+  (package
+    (name "texlive-arabi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/arabi/"
+                   "fonts/afm/arabi/arabeyes/"
+                   "fonts/enc/dvips/arabi/"
+                   "fonts/map/dvips/arabi/"
+                   "fonts/tfm/arabi/arabeyes/"
+                   "fonts/tfm/arabi/farsiweb/"
+                   "fonts/type1/arabi/arabeyes/"
+                   "fonts/type1/arabi/farsiweb/"
+                   "tex/latex/arabi/")
+             (base32
+              "19js5lw5r51n97gnf7ggvnvdkaamd0aagx73hnpyfzgzj9nb8pjr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/arabi")
+    (synopsis "(La)TeX support for Arabic and Farsi, compliant with Babel")
+    (description
+     "The package provides an Arabic and Farsi script support for TeX without
+the need of any external pre-processor, and in a way that is compatible with
+Babel.  The bi-directional capability supposes that the user has a TeX engine
+that knows the four primitives @code{\\beginR}, @code{\\endR}, @code{\\beginL}
+and @code{\\endL}.  That is the case in both the TeX--XeT and e-TeX engines.
+
+Arabi will accept input in several 8-bit encodings, including UTF-8.  Arabi
+can make use of a wide variety of Arabic and Farsi fonts, and provides one of
+its own.  PDF files generated using Arabi may be searched, and text may be
+copied from them and pasted elsewhere.")
+    (license license:lppl)))
+
+(define-public texlive-arabi-add
+  (package
+    (name "texlive-arabi-add")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/arabi-add/"
+                   "tex/latex/arabi-add/")
+             (base32
+              "1lrr3vr9sv554bvad70rc32x0jgsam2jaflgxw0nid0629rmigdj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/arabi-add")
+    (synopsis
+     "Using @code{hyperref} and @code{bookmark} packages with Arabic and Farsi languages")
+    (description
+     "This package takes advantage of some of the possibilities that
+@code{hyperref} and @code{bookmark} packages offer when you create a table of
+contents for Arabic texts created by the @code{arabi} package.")
+    (license license:lppl1.3)))
+
+(define-public texlive-arabic-book
+  (package
+    (name "texlive-arabic-book")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/arabic-book/"
+                   "tex/xelatex/arabic-book/")
+             (base32
+              "070agzwpgdfvjqn2klxw2m1bavy0l9b9pqqikc7il3wx107m4ni1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/arabic-book")
+    (synopsis "Arabic @code{book} class")
+    (description
+     "This document class provides both Arabic and English support for TeX and
+LaTeX.  Input may be in ASCII transliteration or other encodings
+(including UTF-8), and output may be Arabic, Hebrew, or any of several
+languages that use the Arabic script, as can be specified by the Polyglossia
+package.  The Arabic font is presently available in any Arabic fonts style.
+In order to use Amiri font style, the user needs to install the amiri package.
+This document class runs with the XeTeX engine.  PDF files generated using
+this class can be searched, and text can be copied from them and pasted
+elsewhere.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-arabluatex
+  (package
+    (name "texlive-arabluatex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/arabluatex/"
+                   "source/lualatex/arabluatex/"
+                   "tex/lualatex/arabluatex/")
+             (base32
+              "1g1ai0inai3jniq49avfswyaysxlk1yp6n97l94pq8v3vszx0k8i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/arabluatex")
+    (synopsis "ArabTeX for LuaLaTeX")
+    (description
+     "This package provides for LuaLaTeX an ArabTeX-like interface to generate
+Arabic writing from an ascii transliteration.  It is particularly well-suited
+for complex documents such as technical documents or critical editions where
+a lot of left-to-right commands intertwine with Arabic writing.
+@code{arabluatex} is able to process any ArabTeX input notation.  Its output
+can be set in the same modes of vocalization as ArabTeX, or in different roman
+transliterations.  It further allows many typographical refinements.  It will
+eventually interact with some other packages yet to come to produce from
+@file{.tex} source files, in addition to printed books, TEI XML compliant
+critical editions and/or lexicons that can be searched, analyzed and
+correlated in various ways.")
+    (license (list license:gpl3+ license:cc-by-sa4.0))))
+
+(define-public texlive-arabtex
+  (package
+    (name "texlive-arabtex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/arabtex/"
+                   "fonts/map/dvips/arabtex/"
+                   "fonts/source/public/arabtex/"
+                   "fonts/tfm/public/arabtex/"
+                   "fonts/type1/public/arabtex/"
+                   "tex/latex/arabtex/")
+             (base32
+              "1z1iaj59lawilydp31d3zxbd5jbny4szpdnkbwl6lrnki4c0s51c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/arabtex")
+    (synopsis "Macros and fonts for typesetting Arabic")
+    (description
+     "ArabTeX is a package extending the capabilities of TeX and LaTeX to
+generate Arabic and Hebrew text.  Input may be in ASCII transliteration or
+other encodings (including UTF-8); output may be Arabic, Hebrew, or any of
+several languages that use the Arabic script.  ArabTeX consists of a TeX macro
+package and Arabic and Hebrew fonts (provided both in Metafont format and
+Adobe Type 1).  The Arabic font is presently only available in the Naskhi
+style.  ArabTeX will run with Plain TeX and also with LaTeX.")
+    (license license:lppl)))
+
 (define-public texlive-arara
   (package
     (name "texlive-arara")
@@ -1840,6 +3196,137 @@ on indirect resources, such as log file analysis.  Arara requires a Java
 virtual machine.")
     (license license:bsd-3)))
 
+(define-public texlive-aramaic-serto
+  (package
+    (name "texlive-aramaic-serto")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/aramaic-serto/"
+                   "fonts/afm/public/aramaic-serto/"
+                   "fonts/map/dvips/aramaic-serto/"
+                   "fonts/source/public/aramaic-serto/"
+                   "fonts/tfm/public/aramaic-serto/"
+                   "fonts/type1/public/aramaic-serto/"
+                   "tex/latex/aramaic-serto/")
+             (base32
+              "154bicknhsj8nypnyzr999wj34xli0kfpic9vym805abxbpwrmsw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/aramaic-serto")
+    (synopsis "Fonts and LaTeX for Syriac written in Serto")
+    (description
+     "This package enables (La)TeX users to typeset words or phrases (e-TeX
+extensions are needed) in Syriac (Aramaic) using the Serto-alphabet.  The
+package includes a preprocessor written in Python in order to deal with
+right-to-left typesetting for those who do not want to use e-LaTeX and to
+choose the correct letter depending on word context (initial/medial/final
+form).")
+    (license license:lppl1.3+)))
+
+(define-public texlive-archaeologie
+  (package
+    (name "texlive-archaeologie")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/archaeologie/"
+                   "doc/latex/archaeologie/"
+                   "source/latex/archaeologie/"
+                   "tex/latex/archaeologie/")
+             (base32
+              "0w8r9z0k0rxdgxa2p16rqyh7rm83sy0410p5lz5k23h805q5qsmy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/archaeologie")
+    (synopsis "Citation-style for the German Archaeological Institute")
+    (description
+     "This citation-style covers the citation and bibliography rules of the
+German Archaeological Institute (DAI).  Various options are available to
+change and adjust the outcome according to one's own preferences.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-archaic
+  (package
+    (name "texlive-archaic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/archaic/"
+                   "fonts/afm/public/archaic/"
+                   "fonts/map/dvips/archaic/"
+                   "fonts/source/public/archaic/"
+                   "fonts/tfm/public/archaic/"
+                   "fonts/type1/public/archaic/"
+                   "source/fonts/archaic/"
+                   "tex/latex/archaic/")
+             (base32
+              "0a6lp4w9b76q1w30a58205b1n7jf61n58ps2hdxrhpg9nxqwy1w0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/archaic")
+    (synopsis "Collection of archaic fonts")
+    (description
+     "The collection contains fonts to represent Aramaic, Cypriot,
+Etruscan, Greek of the 6th and 4th centuries BCE, Egyptian hieroglyphics,
+Linear A, Linear B, Nabatean old Persian, the Phaistos disc, Phoenician,
+proto-Semitic, runic, South Arabian Ugaritic and Viking scripts.  The bundle
+also includes a small font for use in phonetic transcription of the archaic
+writings.")
+    (license license:lppl)))
+
+(define-public texlive-archivo
+  (package
+    (name "texlive-archivo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/archivo/"
+                   "fonts/enc/dvips/archivo/"
+                   "fonts/map/dvips/archivo/"
+                   "fonts/opentype/public/archivo/"
+                   "fonts/tfm/public/archivo/"
+                   "fonts/type1/public/archivo/"
+                   "fonts/vf/public/archivo/"
+                   "tex/latex/archivo/")
+             (base32
+              "1wdvr7ch2ydj41yd0xniwppb5wh1m9w97d839fhmp21lgyhss0jl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/archivo")
+    (synopsis "Archivo font face with support for LaTeX and pdfLaTeX")
+    (description
+     "This package provides the Archivo family of fonts designed by
+Omnibus-Type, with support for LaTeX and pdfLaTeX.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-arimo
+  (package
+    (name "texlive-arimo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/arimo/"
+                   "fonts/enc/dvips/arimo/"
+                   "fonts/map/dvips/arimo/"
+                   "fonts/tfm/google/arimo/"
+                   "fonts/truetype/google/arimo/"
+                   "fonts/type1/google/arimo/"
+                   "fonts/vf/google/arimo/"
+                   "tex/latex/arimo/")
+             (base32
+              "06m23slsvcp0pm2ds2rxmgj0qrrvy8qknda4yjhvcz9almwb4syx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/arimo")
+    (synopsis "Arimo sans serif fonts with LaTeX support")
+    (description
+     "The Arimo family, designed by Steve Matteson, is a refreshing sans serif
+design which is metrically compatible with Arial.")
+    (license license:asl2.0)))
+
 (define-public texlive-armtex
   (package
     (name "texlive-armtex")
@@ -1889,6 +3376,201 @@ three extra questions (with their answers) that Michael Downes didn't manage
 to get onto CTAN.")
     (license license:lppl)))
 
+(define-public texlive-arphic
+  (package
+    (name "texlive-arphic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/arphic/"
+                   "dvips/arphic/"
+                   "fonts/afm/arphic/bkaiu/"
+                   "fonts/afm/arphic/bsmiu/"
+                   "fonts/afm/arphic/gbsnu/"
+                   "fonts/afm/arphic/gkaiu/"
+                   "fonts/map/dvips/arphic/"
+                   "fonts/tfm/arphic/bkaimp/"
+                   "fonts/tfm/arphic/bkaiu/"
+                   "fonts/tfm/arphic/bsmilp/"
+                   "fonts/tfm/arphic/bsmiu/"
+                   "fonts/tfm/arphic/gbsnlp/"
+                   "fonts/tfm/arphic/gbsnu/"
+                   "fonts/tfm/arphic/gkaimp/"
+                   "fonts/tfm/arphic/gkaiu/"
+                   "fonts/type1/arphic/bkaiu/"
+                   "fonts/type1/arphic/bsmiu/"
+                   "fonts/type1/arphic/gbsnu/"
+                   "fonts/type1/arphic/gkaiu/"
+                   "fonts/vf/arphic/bkaimp/"
+                   "fonts/vf/arphic/bsmilp/"
+                   "fonts/vf/arphic/gbsnlp/"
+                   "fonts/vf/arphic/gkaimp/")
+             (base32
+              "1sqsgw9xjgd3ss2q7hwnb3vv38sg7l9i8bvsy79m5hyg29wn973x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/arphic")
+    (synopsis "Arphic (Chinese) font packages")
+    (description
+     "These are font bundles for the Chinese Arphic fonts which work with the
+CJK package.  TrueType versions of these fonts for use with XeLaTeX and
+LuaLaTeX are provided by the @code{arphic-ttf} package.")
+    ;; The files are generated from `chinese-fonts-truetype', located in
+    ;; non-GNU FTP site, using the license below.
+    (license license:arphic-1999)))
+
+(define-public texlive-arphic-ttf
+  (package
+    (name "texlive-arphic-ttf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/arphic-ttf/"
+                   "fonts/truetype/public/arphic-ttf/")
+             (base32
+              "141hsz7lhqpbz3k10kl57bg21yslrb562alk1a6q129i56zb7jby")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/arphic-ttf")
+    (synopsis "TrueType version of Chinese Arphic fonts")
+    (description
+     "This package provides TrueType versions of the Chinese Arphic fonts for
+use with XeLaTeX and LuaLaTeX.  Type1 versions of these fonts, for use with
+pdfLaTeX and the @code{cjk} package, are provided by the @code{arphic}
+package.")
+    (license license:arphic-1999)))
+
+(define-public texlive-arsclassica
+  (package
+    (name "texlive-arsclassica")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/arsclassica/"
+                   "tex/latex/arsclassica/")
+             (base32
+              "0cxmp68na3ww565r7ixqbhsy2mp063wwq5p6gwvq5fdrk34ci2a5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/arsclassica")
+    (synopsis "Different view of the ClassicThesis package")
+    (description
+     "The package changes some typographical points of the ClassicThesis
+style.  It enables the user to reproduce the look of the guide @emph{The art
+of writing with LaTeX} (the web page is in Italian).")
+    (license license:lppl)))
+
+(define-public texlive-articleingud
+  (package
+    (name "texlive-articleingud")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/articleingud/"
+                   "source/latex/articleingud/"
+                   "tex/latex/articleingud/")
+             (base32
+              "1iprjpjr3yav8afmgirrfmdipxb1fmdwa3b0ss5y8l7wspijmmp8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/articleingud")
+    (synopsis "LaTeX class for articles published in INGENIERIA review")
+    (description
+     "The package provides a class for articles published in INGENIERIA
+review.  This class is derived from the standard LaTeX class @code{article}.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-arvo
+  (package
+    (name "texlive-arvo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/arvo/"
+                   "fonts/enc/dvips/arvo/"
+                   "fonts/map/dvips/arvo/"
+                   "fonts/tfm/public/arvo/"
+                   "fonts/truetype/public/arvo/"
+                   "fonts/vf/public/arvo/"
+                   "tex/latex/arvo/")
+             (base32
+              "1dc52n81wxz06vfbxzmfdp9j6a217v8yf8bczqlnx5vgzy8wlmi3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/arvo")
+    (synopsis "Arvo font face with support for LaTeX and pdfLaTeX")
+    (description
+     "This package provides the Arvo family of fonts, designed by Anton
+Koovit, with support for LaTeX and pdfLaTeX.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-asaetr
+  (package
+    (name "texlive-asaetr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/asaetr/" "doc/latex/asaetr/"
+                   "tex/latex/asaetr/")
+             (base32
+              "1yms34l9nx151vgjrjsa94801q0bgp2khjgk933iy1bpkmm7jf2d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/asaetr")
+    (synopsis "Transactions of the ASAE")
+    (description
+     "This package provides a class and BibTeX style for submissions to the
+@emph{Transactions of the American Society of Agricultural Engineers}.  Also
+included is the Metafont source of a slanted Computer Modern Caps and Small
+Caps font.")
+    (license license:public-domain)))
+
+(define-public texlive-asapsym
+  (package
+    (name "texlive-asapsym")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/asapsym/"
+                   "fonts/opentype/omnibus-type/asapsym/"
+                   "source/fonts/asapsym/"
+                   "tex/generic/asapsym/"
+                   "tex/latex/asapsym/"
+                   "tex/plain/asapsym/")
+             (base32
+              "038adcagkzy1bj5y9i5a4i5kbyr3wg7w0lfhbbg9z7glqmivilic")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/asapsym")
+    (synopsis "Using the ASAP Symbol font with LaTeX and Plain TeX")
+    (description
+     "The package provides macros (usable with LaTeX or Plain TeX) for using
+the ASAP Symbol font, which is also included.  The font is distributed in
+OpenType format, and makes extensive use of OpenType features.  Therefore, at
+this time, only XeTeX and LuaTeX are supported.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ascelike
+  (package
+    (name "texlive-ascelike")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/ascelike/" "doc/latex/ascelike/"
+                   "tex/latex/ascelike/")
+             (base32
+              "14n4z4agsnnvms51r142q0r5bv9yqp4gchrr7zvakkp2r3232dai")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ascelike")
+    (synopsis "Bibliography style for the ASCE")
+    (description
+     "This package provides a document class and bibliographic style that
+prepares documents in the style required by the @acronym{ASCE, American
+Society of Civil Engineers}.  These are unofficial files, not sanctioned by
+that organization.")
+    (license license:lppl)))
+
 (define-public texlive-ascii-chart
   (package
     (name "texlive-ascii-chart")
@@ -1907,6 +3589,397 @@ to get onto CTAN.")
 converted between Plain TeX and LaTeX by a simple editing action.")
     (license license:lppl1.3+)))
 
+(define-public texlive-ascii-font
+  (package
+    (name "texlive-ascii-font")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ascii-font/"
+                   "fonts/map/dvips/ascii-font/"
+                   "fonts/tfm/public/ascii-font/"
+                   "fonts/type1/public/ascii-font/"
+                   "source/fonts/ascii-font/"
+                   "tex/latex/ascii-font/")
+             (base32
+              "0cbzvbszxyv552z1274m3bf5k40xr8w12da17db0w2w02y47nyq5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ascii-font")
+    (synopsis "Use the ASCII font in LaTeX")
+    (description
+     "The package provides glyph and font access commands so that LaTeX users
+can use the ASCII glyphs in their documents.  The ASCII font is encoded
+according to the IBM PC Code Page 437 C0 Graphics.")
+    (license license:lppl)))
+
+(define-public texlive-ascmac
+  (package
+    (name "texlive-ascmac")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ascmac/"
+                   "fonts/map/dvips/ascmac/"
+                   "fonts/source/public/ascmac/"
+                   "fonts/tfm/public/ascmac/"
+                   "fonts/type1/public/ascmac/"
+                   "source/latex/ascmac/"
+                   "tex/latex/ascmac/")
+             (base32
+              "1d388nqyjipqsgd0pd4zrskaf3wddacg6rrmy3q1n8pvmna4gmz1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/ascmac")
+    (synopsis "Boxes and picture macros with Japanese vertical writing support")
+    (description
+     "The bundle provides boxes and picture macros with Japanese vertical
+writing support.  It uses only native picture macros and fonts for drawing
+boxes and is thus driver independent.")
+    (license license:bsd-3)))
+
+(define-public texlive-asmeconf
+  (package
+    (name "texlive-asmeconf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/asmeconf/" "doc/latex/asmeconf/"
+                   "tex/latex/asmeconf/")
+             (base32
+              "05wic7mb1flxdnl27lbhkjnbalnc8bqy4xj1w2rk5kzxmw525288")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/asmeconf")
+    (synopsis "LaTeX template for ASME conference papers")
+    (description
+     "The @code{asmeconf} class provides a LaTeX template for ASME conference
+papers, following ASME's guidelines for margins, fonts, headings, captions,
+and reference formats as of 2022.  This LaTeX template is intended to be used
+with the @file{asmeconf.bst} BibTeX style, for reference formatting, which is
+part of this distribution.  The code is compatible with pdfLaTeX or LuaLaTeX.
+
+This LaTeX template is not a publication of ASME.")
+    (license license:expat)))
+
+(define-public texlive-asmejour
+  (package
+    (name "texlive-asmejour")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/asmejour/" "doc/latex/asmejour/"
+                   "tex/latex/asmejour/")
+             (base32
+              "09zncjbvdrqkr8g131mx0m73km4d270sn9782knl5qj6gxh98940")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/asmejour")
+    (synopsis "Template for ASME journal papers")
+    (description
+     "The @code{asmejour} class provides a template to format preprints
+submitted to ASME journals.  The layout and reference formats closely follow
+the style that is currently being used for published papers.  The class is
+intended to be used with the @file{asmejour.bst} BibTeX style, which is part
+of this distribution. The class is compatible with pdfLaTeX or LuaLaTeX.
+
+This package is not a publication of ASME.")
+    (license license:expat)))
+
+(define-public texlive-aspectratio
+  (package
+    (name "texlive-aspectratio")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/aspectratio/"
+                   "fonts/map/dvips/aspectratio/"
+                   "fonts/source/public/aspectratio/"
+                   "fonts/tfm/public/aspectratio/"
+                   "fonts/type1/public/aspectratio/"
+                   "tex/latex/aspectratio/")
+             (base32
+              "1vm1aj4mm2rn2p032nakg16gmyzv43149h2v1l18dw72sayqqg2s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/aspectratio")
+    (synopsis "Capital @samp{A} and capital @samp{R} ligature for Aspect Ratio")
+    (description
+     "The package provides fonts (both as Adobe Type 1 format, and as Metafont
+source) for the AR symbol (for Aspect Ratio) used by aeronautical scientists
+and engineers.  Note that the package supersedes the package @code{ar}.")
+    (license license:lppl)))
+
+(define-public texlive-asternote
+  (package
+    (name "texlive-asternote")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/asternote/"
+                   "tex/latex/asternote/")
+             (base32
+              "1a53pmw237lm1yjx55qwq3fq6jq34vlw03w62vrq3ksw9346dg5r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/asternote")
+    (synopsis "Annotation symbols enclosed in square brackets with an asterisk")
+    (description
+     "This LaTeX package can output annotation symbols enclosed in square
+brackets and marked with an asterisk.")
+    (license license:expat)))
+
+(define-public texlive-astro
+  (package
+    (name "texlive-astro")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/astro/"
+                   "fonts/source/public/astro/"
+                   "fonts/tfm/public/astro/")
+             (base32
+              "1pdmn93wiarwplha6r59ap9nvhdm9ir4aa4az93w3b189g316g2c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/astro")
+    (synopsis "Astronomical (planetary) symbols")
+    (description
+     "Astrosym is a font containing astronomical symbols, including those used
+for the planets, four planetoids, the phases of the moon, the signs of the
+zodiac, and some additional symbols.  The font is distributed as Metafont
+source.")
+    (license license:lppl)))
+
+(define-public texlive-asymptote-by-example-zh-cn
+  (package
+    (name "texlive-asymptote-by-example-zh-cn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/asymptote-by-example-zh-cn/")
+             (base32
+              "0854pbh3rm21rzzbhai7xijzw26qawffj4wd3mrwbva1406106ff")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/asymptote-by-example-zh-cn")
+    (synopsis "Asymptote by example")
+    (description "This is an Asymptote tutorial written in Simplified
+Chinese.")
+    (license license:gpl3+)))
+
+(define-public texlive-asymptote-faq-zh-cn
+  (package
+    (name "texlive-asymptote-faq-zh-cn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/asymptote-faq-zh-cn/")
+             (base32
+              "0z09f5as68dz66dlj370xfx593bv50ihxx10zxmm9lk27ymr52hb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/asymptote-faq-zh-cn")
+    (synopsis "Asymptote FAQ (Chinese translation)")
+    (description "This is a Chinese translation of the Asymptote FAQ.")
+    (license license:lppl)))
+
+(define-public texlive-asymptote-manual-zh-cn
+  (package
+    (name "texlive-asymptote-manual-zh-cn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/asymptote-manual-zh-cn/")
+             (base32
+              "047l3bh8vvk185wkazyfw4dm6893xpa2ksn5vfc57r5rv4x16wmb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/asymptote-manual-zh-cn")
+    (synopsis "Chinese translation of the Asymptote manual")
+    (description
+     "This is an (incomplete, simplified) Chinese translation of the Asymptote
+manual.")
+    (license license:lgpl3+)))
+
+(define-public texlive-atkinson
+  (package
+    (name "texlive-atkinson")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/atkinson/"
+                   "fonts/enc/dvips/atkinson/"
+                   "fonts/map/dvips/atkinson/"
+                   "fonts/opentype/public/atkinson/"
+                   "fonts/tfm/public/atkinson/"
+                   "fonts/type1/public/atkinson/"
+                   "fonts/vf/public/atkinson/"
+                   "tex/latex/atkinson/")
+             (base32
+              "00wg21v7jiaw3qajdxp2jih5xjpv7h8d0n1d6zjnzkxzk0p8zcj0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/atkinson")
+    (synopsis "Support for the Atkinson Hyperlegible family of fonts")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Atkinson Hyperlegible family of fonts.  What makes it different from
+traditional typography design is that it focuses on letterform distinction to
+increase character recognition, ultimately improving readability.")
+    (license
+     (list license:lppl
+           (license:fsdg-compatible
+            "file://doc/Atkinson-Hyperlegible-Font-License-2020-1104.pdf")))))
+
+(define-public texlive-aucklandthesis
+  (package
+    (name "texlive-aucklandthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/aucklandthesis/"
+                   "tex/latex/aucklandthesis/")
+             (base32
+              "1bdm6crn17a0rrszx28r6bn8v9w6z4rwfz2r8avd5fc3byl5dix8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/aucklandthesis")
+    (synopsis "Memoir-based class for formatting University of Auckland theses")
+    (description
+     "This package provides a @code{memoir}-based class for formatting
+University of Auckland masters and doctors thesis dissertations in any
+discipline.  The title page does not handle short dissertations for
+diplomas.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-augie
+  (package
+    (name "texlive-augie")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/augie/"
+                   "fonts/afm/public/augie/"
+                   "fonts/map/dvips/augie/"
+                   "fonts/tfm/public/augie/"
+                   "fonts/type1/public/augie/"
+                   "fonts/vf/public/augie/"
+                   "tex/latex/augie/")
+             (base32
+              "1fvl04lcvi4vsx547gx349dbld4hf7k2j08adqlnszs23p95yj3f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/augie")
+    (synopsis "Calligraphic font for typesetting handwriting")
+    (description
+     "This package provides a calligraphic font for simulating American-style
+informal handwriting.  The font is distributed in Adobe Type 1 format.")
+    (license license:lppl)))
+
+(define-public texlive-auncial-new
+  (package
+    (name "texlive-auncial-new")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/auncial-new/"
+                   "fonts/afm/public/auncial-new/"
+                   "fonts/map/dvips/auncial-new/"
+                   "fonts/tfm/public/auncial-new/"
+                   "fonts/type1/public/auncial-new/"
+                   "source/fonts/auncial-new/"
+                   "tex/latex/auncial-new/")
+             (base32
+              "1644ank81l1qlijmld88k1qq3qk4x6an0qvyqz1da2dgwdhjap00")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/auncial-new")
+    (synopsis "Artificial Uncial font and LaTeX support macros")
+    (description
+     "The @code{auncial-new} bundle provides packages and fonts for a script
+based on the Artificial Uncial manuscript book-hand used between the 6th &
+10th century AD.  The script consists of minuscules and digits, with some
+appropriate period punctuation marks.  Both normal and bold versions are
+provided, and the font is distributed in Adobe Type 1 format.")
+    (license license:lppl)))
+
+(define-public texlive-aurical
+  (package
+    (name "texlive-aurical")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/aurical/"
+                   "fonts/afm/public/aurical/"
+                   "fonts/map/dvips/aurical/"
+                   "fonts/source/public/aurical/"
+                   "fonts/tfm/public/aurical/"
+                   "fonts/type1/public/aurical/"
+                   "tex/latex/aurical/")
+             (base32
+              "1jaqr4gdywnjn7hclinjyydndxsa1f2j7382ygl0jnj35kxz0pkr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/aurical")
+    (synopsis "Calligraphic fonts for use with LaTeX in T1 encoding")
+    (description
+     "The package that implements a set (AuriocusKalligraphicus) of three
+calligraphic fonts derived from the author's handwriting in Adobe Type
+1 Format, T1 encoding for use with LaTeX: Auriocus Kalligraphicus; Lukas
+Svatba; and Jana Skrivana.  Each font features old style digits
+and (machine-generated) boldface and slanted versions.  A variant of Lukas
+Svatba offers a long @samp{s}.")
+    (license license:lppl)))
+
+(define-public texlive-authordate
+  (package
+    (name "texlive-authordate")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/authordate/"
+                   "doc/bibtex/authordate/"
+                   "tex/latex/authordate/")
+             (base32
+              "0d3cd63b80vfd8vzbpn6dnhy47fpq5rxm95i52id2j6606gi1skf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/authordate")
+    (synopsis "Author/date style citation styles")
+    (description
+     "The bundle provides four BibTeX styles (@code{authordate1}, ...,
+@code{authordate4}), and a LaTeX package, for citation in author/date style.
+The BibTeX styles differ in how they format names and titles; one of them is
+necessary for the LaTeX package to work.")
+    (license license:knuth)))
+
+(define-public texlive-auto-pst-pdf
+  (package
+    (name "texlive-auto-pst-pdf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/auto-pst-pdf/"
+                   "source/latex/auto-pst-pdf/"
+                   "tex/latex/auto-pst-pdf/")
+             (base32
+              "1lpjwqd0rhdzz3kywl54pjlpj1qsj7kflj0336vj2zb20rxl0hqp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-ifplatform texlive-iftex texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/auto-pst-pdf")
+    (synopsis "Wrapper for @code{pst-pdf} (with some PSfrag features)")
+    (description
+     "The package uses @samp{--shell-escape} to execute @code{pst-pdf} when necessary.
+Wrappers are provided for various psfrag-related features so that Matlab
+figures via @code{laprint}, Mathematica figures via MathPSfrag, and regular
+PSfrag figures can all be input consistently and easily.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-autoaligne
   (package
     (name "texlive-autoaligne")
@@ -1949,6 +4022,34 @@ package tries to put breaks at adequate places.  It is suitable for
 computer-generated long formulae with many terms.")
     (license license:lppl1.3+)))
 
+(define-public texlive-autosp
+  (package
+    (name "texlive-autosp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/autosp/"
+                   "doc/man/man1/autosp.1"
+                   "doc/man/man1/autosp.man1.pdf"
+                   "doc/man/man1/tex2aspc.1"
+                   "doc/man/man1/tex2aspc.man1.pdf")
+             (base32
+              "16szmbffp9pwzv7zq3l4yvnsfk4m7w57wib7pqpgv1v5fzhlaahs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/autosp")
+    (synopsis
+     "Preprocessor generating note-spacing commands for MusiXTeX scores")
+    (description
+     "This program simplifies the creation of MusiXTeX scores by converting
+(non-standard) commands of the form @code{\\anotes ... \\en} into one or more
+conventional note-spacing commands, as determined by the note values
+themselves, with @code{\\sk} spacing commands inserted as necessary.  The
+coding for an entire measure can be entered one part at a time, without
+concern for note-spacing changes within the part or spacing requirements of
+other parts.")
+    (license license:gpl2+)))
+
 (define-public texlive-axodraw2
   (package
     (name "texlive-axodraw2")
@@ -2008,6 +4109,27 @@ the pdf code inserted in the output file.  The processing involves a run of
 @command{pdflatex}.")
     (license license:gpl3+)))
 
+(define-public texlive-b1encoding
+  (package
+    (name "texlive-b1encoding")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/b1encoding/"
+                   "fonts/enc/dvips/b1encoding/"
+                   "source/latex/b1encoding/"
+                   "tex/latex/b1encoding/")
+             (base32
+              "1lzsa0k5rr0n50d31dh4ghww329qjpg39w843zmh05z0jir6rg79")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/b1encoding")
+    (synopsis "LaTeX encoding tools for Bookhands fonts")
+    (description
+     "The package characterises and defines the author's B1 encoding for use
+with LaTeX when typesetting things using his Bookhands fonts.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-backnaur
   (package
     (name "texlive-backnaur")
@@ -2029,6 +4151,130 @@ formatted lists of productions, with numbers if required.  It can also print
 in-line BNF expressions using math mode.")
     (license license:lppl1.3c)))
 
+(define-public texlive-baekmuk
+  (package
+    (name "texlive-baekmuk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/baekmuk/"
+                   "fonts/truetype/public/baekmuk/")
+             (base32
+              "0nc6sfjbimh1g8zhcl58ag6kqskhwd3h0m68y7k2v3v5i9n5g5yr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/baekmuk")
+    (synopsis "Baekmuk Korean TrueType fonts")
+    (description
+     "This bundle consists of four Korean fonts: @file{batang.ttf} (serif),
+@file{dotum.ttf} (sans-serif), @file{gulim.ttf} (sans-serif rounded) and
+@file{hline.ttf} (headline).")
+    (license license:expat)))
+
+(define-public texlive-bagpipe
+  (package
+    (name "texlive-bagpipe")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/bagpipe/"
+                   "tex/generic/bagpipe/")
+             (base32
+              "0zybnikkj00hmlzfaaljcq1ml5vi6qfhl1hfrjq9vjc409vzzvka")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bagpipe")
+    (synopsis "Support for typesetting bagpipe music")
+    (description
+     "Typesetting bagpipe music in MusixTeX is needlessly tedious.  This
+package provides specialized and re-defined macros to simplify this task.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-bangla
+  (package
+    (name "texlive-bangla")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bangla/"
+                   "fonts/truetype/public/bangla/"
+                   "tex/latex/bangla/")
+             (base32
+              "0basibrsbns9s2ny6ny95hl6dj4rjf6q4z9bqn2kc9945akxg8af")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-charissil texlive-doulossil))
+    (home-page "https://ctan.org/pkg/bangla")
+    (synopsis "Comprehensive Bangla LaTeX package")
+    (description
+     "This package provides all the necessary LaTeX frontends for the Bangla
+language and comes with some fonts of its own.")
+    (license (list license:lppl1.3c license:silofl1.1))))
+
+(define-public texlive-bangorcsthesis
+  (package
+    (name "texlive-bangorcsthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bangorcsthesis/"
+                   "source/latex/bangorcsthesis/"
+                   "tex/latex/bangorcsthesis/")
+             (base32
+              "138h5q8060z7frb6krrzcx49pd0ifqh1lizi465gs6x7q7cdagz8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bangorcsthesis")
+    (synopsis "Typeset a thesis at Bangor University")
+    (description
+     "The class typesets thesis or dissertation documents for all
+levels (i.e., both undergraduate and graduate students may use the class).  It
+also provides macros designed to optimise the process of producing a thesis.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-bangorexam
+  (package
+    (name "texlive-bangorexam")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bangorexam/"
+                   "source/latex/bangorexam/"
+                   "tex/latex/bangorexam/")
+             (base32
+              "09pp88415mba65icf6cx4vqn3an54hrgkd8s677ndlf2ml7n0lhs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bangorexam")
+    (synopsis "Typeset an examination at Bangor University")
+    (description
+     "The package allows typesetting of Bangor Univesity's exam style.  It
+currently supports a standard A/B choice, A-only compulsory and n from m exam
+styles.  Marks are totalled and checked automatically.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-bangtex
+  (package
+    (name "texlive-bangtex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bangtex/"
+                   "fonts/source/public/bangtex/"
+                   "fonts/tfm/public/bangtex/"
+                   "tex/latex/bangtex/")
+             (base32
+              "1hmv27wpnwv70gipvfvxs1rwfjqbcy0lgn09hs2ah6ayqgr740im")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/bangtex")
+    (synopsis "Writing Bangla and Assamese with LaTeX")
+    (description
+     "The bundle provides class files for writing Bangla and Assamese with LaTeX,
+and Metafont sources for fonts.")
+    (license license:lppl)))
+
 (define-public texlive-barr
   (package
     (name "texlive-barr")
@@ -2047,6 +4293,115 @@ in-line BNF expressions using math mode.")
 of mathematical disciplines.")
     (license license:lppl1.3+)))
 
+(define-public texlive-bartel-chess-fonts
+  (package
+    (name "texlive-bartel-chess-fonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/bartel-chess-fonts/"
+                   "fonts/source/public/bartel-chess-fonts/"
+                   "fonts/tfm/public/bartel-chess-fonts/")
+             (base32
+              "1gg7g2gb5j0g0ig4190260zlpnyfmdzcqn7dsw5kp9p5pbn5hbhf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    ;; FIXME: Font metrics generation fails with "! Strange path (turning
+    ;; number is zero)." error.
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'generate-font-metrics))))
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/bartel-chess-fonts")
+    (synopsis "Set of fonts supporting chess diagrams")
+    (description "This package provides fonts supporting chess diagrams.")
+    (license license:gpl3+)))
+
+(define-public texlive-baskervald
+  (package
+    (name "texlive-baskervald")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/baskervald/"
+                   "fonts/afm/arkandis/baskervald/"
+                   "fonts/enc/dvips/baskervald/"
+                   "fonts/map/dvips/baskervald/"
+                   "fonts/tfm/arkandis/baskervald/"
+                   "fonts/type1/arkandis/baskervald/"
+                   "fonts/vf/arkandis/baskervald/"
+                   "source/fonts/baskervald/"
+                   "tex/latex/baskervald/")
+             (base32
+              "1alny6nsxm43mn84w16vp2whlhnmqkr7pfx8jsmgkz8bkxzh9pg9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/baskervaldadf")
+    (synopsis "Baskervald ADF fonts collection with TeX and LaTeX support")
+    (description
+     "Baskervald ADF is a serif family with lining figures designed as
+a substitute for Baskerville.  The family currently includes upright and
+italic or oblique shapes in each of regular, bold and heavy weights.  All
+fonts include the slashed zero and additional non-standard ligatures.")
+    (license license:lppl)))
+
+(define-public texlive-baskervaldx
+  (package
+    (name "texlive-baskervaldx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/baskervaldx/"
+                   "fonts/afm/public/baskervaldx/"
+                   "fonts/enc/dvips/baskervaldx/"
+                   "fonts/map/dvips/baskervaldx/"
+                   "fonts/opentype/public/baskervaldx/"
+                   "fonts/tfm/public/baskervaldx/"
+                   "fonts/type1/public/baskervaldx/"
+                   "fonts/vf/public/baskervaldx/"
+                   "tex/latex/baskervaldx/")
+             (base32
+              "1qszqzpy9bdqajd1h7cha0xm0kgy21q9yzsrrgwygchkz9zv6r66")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/baskervaldx")
+    (synopsis "Extension and modification of BaskervaldADF with LaTeX support")
+    (description
+     "This package extends and modifies the BaskervaldADF font (a Baskerville
+substitute) with more accented glyphs, with small caps and oldstyle figures in
+all shapes.  It includes OpenType and PostScript fonts, as well as LaTeX
+support files.")
+    (license (list license:gpl2+ license:lppl1.3+))))
+
+(define-public texlive-baskervillef
+  (package
+    (name "texlive-baskervillef")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/baskervillef/"
+                   "fonts/enc/dvips/baskervillef/"
+                   "fonts/map/dvips/baskervillef/"
+                   "fonts/opentype/public/baskervillef/"
+                   "fonts/tfm/public/baskervillef/"
+                   "fonts/type1/public/baskervillef/"
+                   "fonts/vf/public/baskervillef/"
+                   "tex/latex/baskervillef/")
+             (base32
+              "107lqn684kgr7fk3zh1lgi6q7hqz9gs18kkg3fbbrg9qjva1j4xv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/baskervillef")
+    (synopsis "Fry's Baskerville look-alike, with math support")
+    (description
+     "BaskervilleF is a fork from the Libre Baskerville fonts (Roman, Italic,
+Bold only).  Their fonts are optimized for web usage, while BaskervilleF is
+optimized for traditional TeX usage, normally destined for production of PDF
+files.  A bold italic style was added and mathematical support is offered as
+an option to @code{newtxmath}.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
 (define-public texlive-basque-book
   (package
     (name "texlive-basque-book")
@@ -2091,6 +4446,243 @@ Basque according to the correct forms ruled by The Basque Language Academy
 issues of numbers in Basque.")
     (license license:lppl1.2+)))
 
+(define-public texlive-bath-bst
+  (package
+    (name "texlive-bath-bst")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/bath-bst/"
+                   "doc/bibtex/bath-bst/"
+                   "source/bibtex/bath-bst/")
+             (base32
+              "06v5icy6537d69g5in7ps322wgnkf0imd93gnmh2y7fladsmvp06")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bath-bst")
+    (synopsis
+     "Harvard referencing style recommended by the University of Bath Library")
+    (description
+     "This package provides a BibTeX style to format reference lists in the
+Harvard style recommended by the University of Bath Library.  It should be
+used in conjunction with @code{natbib} for citations.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-bbding
+  (package
+    (name "texlive-bbding")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bbding/"
+                   "fonts/source/public/bbding/"
+                   "fonts/tfm/public/bbding/"
+                   "source/latex/bbding/" "tex/latex/bbding/")
+             (base32
+              "0l507nxnnh880h5kg8q0ww6sl93k441l0lsplr5ldrngxvx1vrsc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/bbding")
+    (synopsis "Symbol (dingbat) font and LaTeX macros for its use")
+    (description
+     "This package provides a symbol font (distributed as Metafont source)
+that contains many of the symbols of the Zapf dingbats set, together with an
+NFSS interface for using the font.  An Adobe Type 1 version of the fonts is
+available in the @code{niceframe} fonts bundle.")
+    (license license:lppl)))
+
+(define-public texlive-bbold-type1
+  (package
+    (name "texlive-bbold-type1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/bbold-type1/"
+                   "fonts/afm/public/bbold-type1/"
+                   "fonts/map/dvips/bbold-type1/"
+                   "fonts/type1/public/bbold-type1/")
+             (base32
+              "1flccfh58w977j9w62mcn7xzspmg68gb6h5nwh2mfbz7l0015fsz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bbold-type1")
+    (synopsis "Adobe Type 1 format version of the @code{bbold} font")
+    (description
+     "The files offer an Adobe Type 1 format version of the 5pt, 7pt and 10pt
+versions of the @code{bbold} fonts.")
+    ;; The README states: "You may freely use, modify and/or
+    ;; distribute this file".
+    (license (license:fsf-free "file:doc/fonts/bbold-type1/README"))))
+
+(define-public texlive-bboldx
+  (package
+    (name "texlive-bboldx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/bboldx/"
+                   "fonts/afm/public/bboldx/"
+                   "fonts/enc/dvips/bboldx/"
+                   "fonts/map/dvips/bboldx/"
+                   "fonts/tfm/public/bboldx/"
+                   "fonts/type1/public/bboldx/"
+                   "tex/latex/bboldx/")
+             (base32
+              "1r4s3yyah0iqwhzss52wjv3wml5r4bywp3fbanjzkv16f2pk51yb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bboldx")
+    (synopsis "Extend the @code{bbold} package with a Blackboard Bold alphabet")
+    (description
+     "This is an extension of @code{bbold} to a package with three weights,
+of which the original is considered as light and the additions as regular and
+bold.")
+    ;; The README states: "You may freely use, modify and/or
+    ;; distribute this file".
+    (license (license:fsf-free "file://doc/fonts/bboldx/README"))))
+
+(define-public texlive-bclogo
+  (package
+    (name "texlive-bclogo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bclogo/" "metapost/bclogo/"
+                   "tex/latex/bclogo/")
+             (base32
+              "1hdg99xkmdca23s7i63099r9jvgw2larv8aawjllj9mw18195jr9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bclogo")
+    (synopsis "Creating colourful boxes with logos")
+    (description
+     "The package facilitates the creation of colorful boxes with a title and logo.
+It may use either TikZ or PSTricks as graphics engine.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-beamer-fuberlin
+  (package
+    (name "texlive-beamer-fuberlin")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/beamer-fuberlin/"
+                   "tex/latex/beamer-fuberlin/")
+             (base32
+              "03zp6gpzilcfgrbz1lh8lpldvkf9g98f45fhsb72ikgjnka6211c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/beamer-fuberlin")
+    (synopsis "Beamer, using the style of FU Berlin")
+    (description
+     "The bundle provides a @code{beamer}-derived class and a theme style file
+for the corporate design of the Free University in Berlin.  Users may use the
+class itself (FUbeamer) or use the theme in the usual way with
+@code{\\usetheme@{BerlinFU@}}.")
+    (license license:lppl)))
+
+(define-public texlive-beamer-verona
+  (package
+    (name "texlive-beamer-verona")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/beamer-verona/"
+                   "tex/latex/beamer-verona/")
+             (base32
+              "0q79bdsc98a3y5h0yb3qwpsd0yyfyaxfjfhn4xkxf2qzyfp1mgd5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/beamer-verona")
+    (synopsis "Theme for the @code{beamer} class")
+    (description
+     "This package provides the Verona theme for the @code{beamer} class.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-beebe
+  (package
+    (name "texlive-beebe")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/beebe/" "tex/generic/beebe/")
+             (base32
+              "060v67ma1r6n9fmg4v4zl2pgxz6gmd4qrazyss9hwq6z4206pqc0")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblio")
+    (synopsis "Collection of bibliographies")
+    (description
+     "This package provides a collection of BibTeX bibliographies on
+TeX-related topics (including, for example, spell-checking and SGML).  Each
+includes a LaTeX wrapper file to typeset the bibliography.")
+    (license license:public-domain)))
+
+(define-public texlive-begingreek
+  (package
+    (name "texlive-begingreek")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/begingreek/"
+                   "source/latex/begingreek/"
+                   "tex/latex/begingreek/")
+             (base32
+              "1amzzc96pqxjicrgl4fnl2j7b65vvpxl32ckl308nbwfhd56fz6l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/begingreek")
+    (synopsis "Greek environment to be used with pdfLaTeX only")
+    (description
+     "This simple package defines a greek environment to be used with pdfLaTeX
+only, that accepts an optional Greek font family name to type its contents
+with.  A similar @code{\\greektxt} command does a similar action for shorter
+texts.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-beilstein
+  (package
+    (name "texlive-beilstein")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/beilstein/"
+                   "doc/latex/beilstein/"
+                   "source/latex/beilstein/"
+                   "tex/latex/beilstein/")
+             (base32
+              "0gr4fb0g3449jx6mbwfl2g00anss6xbj9xiak83hkc7797jzmg2b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/beilstein")
+    (synopsis
+     "Support for submissions to the @emph{Beilstein Journal of Nanotechnology}")
+    (description
+     "The package provides a LaTeX class file and a BibTeX style file in
+accordance with the requirements of submissions to the @emph{Beilstein Journal
+of Nanotechnology}.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-belleek
+  (package
+    (name "texlive-belleek")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/belleek/"
+                   "fonts/map/dvips/belleek/"
+                   "fonts/truetype/public/belleek/"
+                   "fonts/type1/public/belleek/"
+                   "source/latex/belleek/")
+             (base32
+              "12jigkk2xlnfllwaj6qsisgvl5b2kcwnv5j921cvm7gjn9x1i941")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/belleek")
+    (synopsis "Replacement for basic MathTime fonts")
+    (description "This package replaces the original MathTime fonts.")
+    (license license:public-domain)))
+
 (define-public texlive-begriff
   (package
     (name "texlive-begriff")
@@ -2109,6 +4701,236 @@ issues of numbers in Basque.")
 @emph{Begriffschrift}.")
     (license license:gpl3+)))
 
+(define-public texlive-bengali
+  (package
+    (name "texlive-bengali")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/bengali/"
+                   "fonts/source/public/bengali/"
+                   "fonts/tfm/public/bengali/"
+                   "source/latex/bengali/" "tex/latex/bengali/")
+             (base32
+              "077rs7rcx592g5m53hy73w6jd39qgb83z5sg2jbymjfwkk7y593h")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/bengali-pandey")
+    (synopsis "Support for the Bengali language")
+    (description
+     "The package is based on Velthuis transliteration scheme, with extensions
+to deal with the Bengali letters that are not in Devanagari.  The package also
+supports Assamese.")
+    (license license:lppl)))
+
+(define-public texlive-berenisadf
+  (package
+    (name "texlive-berenisadf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/berenisadf/"
+                   "fonts/afm/arkandis/berenisadf/"
+                   "fonts/enc/dvips/berenisadf/"
+                   "fonts/map/dvips/berenisadf/"
+                   "fonts/opentype/arkandis/berenisadf/"
+                   "fonts/tfm/arkandis/berenisadf/"
+                   "fonts/type1/arkandis/berenisadf/"
+                   "tex/latex/berenisadf/")
+             (base32
+              "11daizsls1zhwdfy78s2rjk76zwkziv33xrvrqbxybs2hdbg261d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/berenisadf")
+    (synopsis "Berenis ADF fonts and TeX/LaTeX support")
+    (description
+     "The bundle provides the BerenisADF Pro font collection, in OpenType and
+PostScript Type 1 formats, together with support files to use the fonts in
+TeXnANSI (LY1) and LaTeX standard T1 and TS1 encodings.")
+    ;; (La)TeX support is released under LPPL 1.3+ terms.  Fonts themselves
+    ;; use GPL 2+ with exceptions.
+    (license (list license:lppl1.3+ license:gpl2+))))
+
+(define-public texlive-besjournals
+  (package
+    (name "texlive-besjournals")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/besjournals/"
+                   "doc/bibtex/besjournals/")
+             (base32
+              "1mcc5xa56j17h6wv9b111qypw6ff4mg0skapa4wq79lb8p3l1cmv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/besjournals-bst")
+    (synopsis
+     "Bibliographies suitable for British Ecological Society journals")
+    (description
+     "The package provides a BibTeX style for use with journals published by
+the British Ecological Society.  The style was produced independently of the
+Society, and has no formal approval by the BES.")
+    (license license:lppl)))
+
+(define-public texlive-bestpapers
+  (package
+    (name "texlive-bestpapers")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/bestpapers/"
+                   "doc/bibtex/bestpapers/")
+             (base32
+              "0c0lp51z5z2707r1hig993gbx78v7zb84wmk3z9iyw08m3bbq34s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bestpapers")
+    (synopsis "A BibTeX package to produce lists of authors' best papers")
+    (description
+     "Many people preparing their resumes find the requirement ``please list
+five (or six, or ten) papers authored by you''.  The same requirement is often
+stated for reports prepared by professional teams.  The creation of such lists
+may be a cumbersome task.  Even more difficult is it to support such lists
+over the time, when new papers are added.  The BibTeX style
+@file{bestpapers.bst} is intended to facilitate this task.  It is based on the
+idea that it is easier to score than to sort: we can assign a score to a paper
+and then let the computer select the papers with highest scores.")
+    (license license:public-domain)))
+
+(define-public texlive-betababel
+  (package
+    (name "texlive-betababel")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/betababel/"
+                   "tex/latex/betababel/")
+             (base32
+              "1lck0wighndd3qrhcks6amc6gm5y50f6a61nfcz31j087r3a7liv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/betababel")
+    (synopsis "Insert ancient greek text coded in Beta Code")
+    (description
+     "The @code{betababel} package extends the Babel @samp{polutonikogreek}
+option to provide a simple way to insert ancient Greek texts with diacritical
+characters into your document using the commonly used Beta Code
+transliteration.")
+    (license license:lppl)))
+
+(define-public texlive-beuron
+  (package
+    (name "texlive-beuron")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/beuron/"
+                   "fonts/map/dvips/beuron/"
+                   "fonts/opentype/public/beuron/"
+                   "fonts/source/public/beuron/"
+                   "fonts/tfm/public/beuron/"
+                   "fonts/type1/public/beuron/"
+                   "tex/latex/beuron/")
+             (base32
+              "06hk60z0s2rdbj1iard10zxw7zvvm2xds755r4mqh0p70qhkpjzx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/beuron")
+    (synopsis "Script of the Beuronese art school")
+    (description
+     "This package provides the script used in the works of the Beuron art
+school for use with TeX and LaTeX.  It is a monumental script consisting of
+capital letters only.  The fonts are provided as Metafont sources, in the
+Type1 and in the OpenType format.  The package includes suitable font
+selection commands for use with LaTeX.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-bfh-ci
+  (package
+    (name "texlive-bfh-ci")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bfh-ci/" "tex/latex/bfh-ci/")
+             (base32
+              "198r2xwki70hij36l596p9jldpzc1acna97mlszbbim2w6xj3qy8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bfh-ci")
+    (synopsis "Corporate design for Bern University of Applied Sciences")
+    (description
+     "This bundle provides possibilities to use the corporate design of Bern
+University of Applied Sciences (BFH) with LaTeX.  To this end it contains
+classes as well as some helper packages and config files.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-bgteubner
+  (package
+    (name "texlive-bgteubner")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/bgteubner/"
+                   "doc/latex/bgteubner/"
+                   "makeindex/bgteubner/"
+                   "source/latex/bgteubner/"
+                   "tex/latex/bgteubner/")
+             (base32
+              "1plc42glcq2pxyns6lm6fygicjm8whrls1qlfw00fccsw9v1hgxv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-build
+            ;; This phase is necessary because the build phase is reluctant to
+            ;; generate "ltxdoc.cfg" since there is another one among the
+            ;; inputs already.
+            (lambda _
+              (substitute* "source/latex/bgteubner/hhsubfigure.ins"
+                (("\\\\generateFile\\{ltxdoc\\.cfg\\}\\{t\\}")
+                 "\\generateFile{ltxdoc.cfg}{f}")))))))
+    (home-page "https://ctan.org/pkg/bgteubner")
+    (synopsis "Class for producing books for the publisher Teubner Verlag")
+    (description
+     "The @code{bgteubner} document class has been programmed by order of the
+Teubner Verlag, Wiesbaden, Germany, to ensure that books of this publisher
+have a unique layout.  Unfortunately, most of the documentation is only
+available in German.  Since the document class is intended to generate
+a unique layout, many things (layout etc.) are fixed and cannot be altered by
+the user.")
+    (license license:lppl)))
+
+(define-public texlive-bguq
+  (package
+    (name "texlive-bguq")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/bguq/"
+                   "fonts/map/dvips/bguq/"
+                   "fonts/source/public/bguq/"
+                   "fonts/tfm/public/bguq/"
+                   "fonts/type1/public/bguq/"
+                   "source/fonts/bguq/"
+                   "tex/latex/bguq/")
+             (base32
+              "0d87ihzwq3lxhr28yaj1wpkvl4jgcfw8859g9mamrprkm7klm2rb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/bguq")
+    (synopsis "Improved quantifier stroke for Begriffsschrift packages")
+    (description
+     "The font contains a single character: the Begriffsschrift quantifier (in
+several sizes), as used to set the Begriffsschrift (concept notation) of
+Frege.  The font is not intended for end users; instead it is expected that it
+will be used by other packages which implement the Begriffsschrift.")
+    (license license:lppl)))
+
 (define-public texlive-bib-fr
   (package
     (name "texlive-bib-fr")
@@ -2127,6 +4949,1553 @@ issues of numbers in Basque.")
 files.")
     (license license:lppl)))
 
+(define-public texlive-bib2gls
+  (package
+    (name "texlive-bib2gls")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/bib2gls.1"
+                   "doc/man/man1/bib2gls.man1.pdf"
+                   "doc/man/man1/convertgls2bib.1"
+                   "doc/man/man1/convertgls2bib.man1.pdf"
+                   "doc/support/bib2gls/"
+                   "scripts/bib2gls/"
+                   "source/support/bib2gls/src/")
+             (base32
+              "11a3wvyg5anm9hkmlpb6yvls1bmhypyswj55q332ziac6hpi2wd5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "bib2gls.sh" "convertgls2bib.sh")))
+    (propagated-inputs (list texlive-glossaries-extra))
+    (home-page "https://ctan.org/pkg/bib2gls")
+    (synopsis
+     "Convert @file{.bib} files to @file{glossaries-extra.sty} resource files")
+    (description
+     "This Java command line application may be used to extract glossary
+information stored in a @file{.bib} file and convert it into glossary entry
+definition commands.  This application should be used with
+@file{glossaries-extra.sty}'s record package option.  It performs two
+functions in one: it selects entries according to records found in the
+@file{.aux} file (similar to BibTeX), and hierarchically sorts entries and
+collates location lists (similar to MakeIndex or Xindy).  The glossary entries
+can then be managed in a system such as JabRef, and only the entries that are
+actually required will be defined, reducing the resources required by TeX.
+
+The supplementary application @command{convertgls2bib} can be used to convert
+existing @file{.tex} files containing definitions (@code{\\newglossaryentry}
+etc.)#: to the @file{.bib} format required by @command{bib2gls}.")
+    (license license:gpl3+)))
+
+(define-public texlive-bibarts
+  (package
+    (name "texlive-bibarts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bibarts/" "source/latex/bibarts/"
+                   "tex/latex/bibarts/")
+             (base32
+              "18jms4i9y9ngzr5cf74j6xhxkas4yg7hm1yfgim6iakshhdhy964")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'build 'build-and-install'bibsort
+                 (lambda _
+                   (mkdir-p "build")
+                   (invoke "gcc" "-o" "build/bibsort"
+                           "source/latex/bibarts/bibsort.c")
+                   (install-file "build/bibsort"
+                                 (string-append #$output "/bin")))))))
+    (home-page "https://ctan.org/pkg/bibarts")
+    (synopsis "Arts-style bibliographical information")
+    (description
+     "@code{BibArts} is a LaTeX package to assist in making bibliographical
+features common in the arts and the humanities (history, political science,
+philosophy, etc.).  @file{bibarts.sty} provides commands for quotations,
+abbreviations, and especially for a formatted citation of literature,
+journals (periodicals), edited sources, and archive sources.
+
+It will also copy all citation information, abbreviations, and register key
+words into lists for an automatically generated appendix.  These lists may
+refer to page and footnote numbers. BibArts has nothing to do with BibTeX.
+The lists are created by @command{bibsort}.  This program creates the
+bibliography without using MakeIndex or BibTeX.")
+    (license license:gpl3+)))
+
+(define-public texlive-bibcop
+  (package
+    (name "texlive-bibcop")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/bibtex/bibcop/"
+                   "doc/man/man1/bibcop.1"
+                   "doc/man/man1/bibcop.man1.pdf"
+                   "scripts/bibcop/"
+                   "source/bibtex/bibcop/"
+                   "tex/latex/bibcop/")
+             (base32
+              "0w8n51ksff3b4nfx0ggnh00jhsdh1zg25hijxmpsq0z0wgazai9b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "bibcop.pl")))
+    (inputs (list perl))
+    (propagated-inputs (list texlive-iexec texlive-pgfopts))
+    (home-page "https://ctan.org/pkg/bibcop")
+    (synopsis "Style checker for .bib files")
+    (description
+     "This LaTeX package checks the quality of your @file{.bib} file and emits
+warning messages if any issues are found.  For this, the TeX processor must be
+run with the @samp{--shell-escape} option.  @command{bibcop} can also be used
+as a standalone command line tool.")
+    (license license:expat)))
+
+(define-public texlive-biber-ms
+  (package
+    (name "texlive-biber-ms")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/bibtex/biber-ms/"
+                   "source/bibtex/biber-ms/")
+             (base32
+              "10r9jgarrbvqrz9nkjfkzsy3niggg5w6sjr7zi7bqy8zhkwf3hsf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biber-ms")
+    (synopsis
+     "BibTeX replacement for users of BibLaTeX (multiscript version)")
+    (description
+     "This is the multiscript version of Biber.  It must be used with the
+multiscript version of @code{biblatex-ms}.")
+    (license license:artistic2.0)))
+
+(define-public texlive-bibexport
+  (package
+    (name "texlive-bibexport")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/bibexport/"
+                   "doc/bibtex/bibexport/" "scripts/bibexport/"
+                   "source/bibtex/bibexport/")
+             (base32
+              "161056627w1lazfpld3lyjwfrl8j8gc4b6dzml46bzwf7mk9ifln")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "bibexport.sh")))
+    (home-page "https://ctan.org/pkg/bibexport")
+    (synopsis "Extract a BibTeX file based on a @file{.aux} file")
+    (description
+     "This package provides a Bourne shell script that uses BibTeX to extract
+bibliography entries that are @code{\\cite}'d in a document.  It can also
+expand a BibTeX file, expanding the abbreviations (other than the built-in
+ones like month names) and following the cross-references.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-bibhtml
+  (package
+    (name "texlive-bibhtml")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/bibhtml/" "doc/bibtex/bibhtml/")
+             (base32
+              "0fjpipxc885hk9pvjf3f0wsp84lr1d7flvs5c56jmlvryvc6mv0w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bibhtml")
+    (synopsis "BibTeX support for HTML files")
+    (description
+     "Bibhtml consists of a Perl script and a set of BibTeX style files, which
+together allow you to output a bibliography as a collection of HTML files.
+The references in the text are linked directly to the corresponding
+bibliography entry, and if a URL is defined in the entry within the BibTeX
+database file, then the generated bibliography entry is linked to this.  The
+package provides three different style files derived from each of the standard
+@file{plain.bst} and @file{alpha.bst}, as well as two style files derived from
+@file{abbrv.bst} and unsrt.bst (i.e., eight in total).")
+    (license license:gpl3+)))
+
+(define-public texlive-biblatex-abnt
+  (package
+    (name "texlive-biblatex-abnt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-abnt/"
+                   "tex/latex/biblatex-abnt/")
+             (base32
+              "14j3yn8ijwaa547gzyw7ql8q871w5r9rprc6l1s5dhp7vz3kzk6z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-abnt")
+    (synopsis "BibLaTeX style for Brazil's ABNT rules")
+    (description
+     "This package offers a BibLaTeX style for Brazil's ABNT (Brazilian
+Association of Technical Norms) rules.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-ajc2020unofficial
+  (package
+    (name "texlive-biblatex-ajc2020unofficial")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-ajc2020unofficial/"
+                   "tex/latex/biblatex-ajc2020unofficial/")
+             (base32
+              "1ngh68a7ihhvpdfz09c087pfqnnpj3mnm8c4jmw8krq52b79fr87")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-ajc2020unofficial")
+    (synopsis "BibLaTeX style for the Australasian Journal of Combinatorics")
+    (description
+     "This is an unofficial BibLaTeX style for the Australasian Journal of
+Combinatorics.  Note that the journal (as for 01 March 2020) does not accept
+BibLaTeX, so you probably want to use @code{biblatex2bibitem}.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-anonymous
+  (package
+    (name "texlive-biblatex-anonymous")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-anonymous/"
+                   "tex/latex/biblatex-anonymous/")
+             (base32
+              "1q24xrr80i6xsq65gfvvi1s5qsp78g52qgn2nf2523gjnnzp4p7n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-anonymous")
+    (synopsis "Tool to manage anonymous work with BibLaTeX")
+    (description
+     "The package provides tools to help manage anonymous work with BibLaTeX.
+It will be useful, for example, in history or classical philology.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-apa6
+  (package
+    (name "texlive-biblatex-apa6")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-apa6/"
+                   "tex/latex/biblatex-apa6/")
+             (base32
+              "14xkqca4l4sb8jwlz6k28hmlya4m9474sv79icyzzq1v0vbqmgbq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-apa6")
+    (synopsis "BibLaTeX citation and reference style for APA 6th Edition")
+    (description
+     "This is a fairly complete BibLaTeX style (citations and references) for
+APA (American Psychological Association) 6th Edition conformant publications.
+It implements and automates most of the guidelines in the APA 6th edition
+style guide for citations and references.  An example document is also given
+which typesets every citation and reference example in the APA 6th edition
+style guide.  This is a legacy style for 6th Edition documents.  Please use
+the BibLaTeX-apa style package for the latest APA edition conformance.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-archaeology
+  (package
+    (name "texlive-biblatex-archaeology")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-archaeology/"
+                   "source/latex/biblatex-archaeology/"
+                   "tex/latex/biblatex-archaeology/")
+             (base32
+              "059mp6c1wgxkdjqrpwyx9yafw8dma75c3653rjc3sp66xx3akr8k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-archaeology")
+    (synopsis "Collection of BibLaTeX styles for German prehistory")
+    (description
+     "This package provides additional BibLaTeX styles for German humanities.
+Its core purpose is to enable the referencing rules of the Romano-Germanic
+Commission (@emph{Romisch-Germanische Kommission}), the department of
+prehistory of the German Archaeological Institute (@emph{Deutsches
+Archaologisches Institut}), since these are referenced by most guidelines in
+German prehistory and medieval archaeology and serve as a kind of template.
+@code{biblatex-archaeology} provides verbose, numeric and author date styles
+as well and adaptions to specific document types like exhibition and auction
+catalogues.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-arthistory-bonn
+  (package
+    (name "texlive-biblatex-arthistory-bonn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-arthistory-bonn/"
+                   "tex/latex/biblatex-arthistory-bonn/")
+             (base32
+              "0iwms7w1xqghdf3s0m91xzw4y7d20lvpv69ibl92cpjj5fggp0x8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-arthistory-bonn")
+    (synopsis "BibLaTeX citation style for art historians")
+    (description
+     "This citation style covers the citation and bibliography guidelines of
+the Kunsthistorisches Institut der Universitat Bonn for undergraduates.  It
+introduces bibliography entry types for catalogs and features a tabular
+bibliography, among other things.  Various options are available to change and
+adjust the outcome according to one's own preferences.  The style is
+compatible with English and German.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-bath
+  (package
+    (name "texlive-biblatex-bath")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-bath/"
+                   "source/latex/biblatex-bath/"
+                   "tex/latex/biblatex-bath/")
+             (base32
+              "1c640csqvq0f9fd5d7xx4apllbwvr4cmi2x38863wlrvlnxa9kd7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-bath")
+    (synopsis "Style recommended by the University of Bath Library")
+    (description
+     "This package provides a BibLaTeX style to format reference lists in the
+Harvard style recommended by the University of Bath Library.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-bookinarticle
+  (package
+    (name "texlive-biblatex-bookinarticle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-bookinarticle/"
+                   "tex/latex/biblatex-bookinarticle/")
+             (base32
+              "0mhj3adqlirylhjqj8y0m8pinmark07zqvx00zl9rrdpagj6q4y8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-bookinarticle")
+    (synopsis "Manage book edited in article")
+    (description
+     "This package provides three new BibLaTeX entry types --- @code{@@bookinarticle},
+@code{@@bookinincollection} and @code{@@bookinthesis} --- to refer to a modern
+edition of an old book, where this modern edition is provided in
+a @code{@@article}, @code{@@incollection} or in a @code{@@thesis}.  The
+package is now superseded by @code{biblatex-bookinother}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-bookinother
+  (package
+    (name "texlive-biblatex-bookinother")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-bookinother/"
+                   "tex/latex/biblatex-bookinother/")
+             (base32
+              "062ri08pwr5fh8v500dbgrc7nbxgi0jd864xfmvf601lwpwqn9c7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-bookinother")
+    (synopsis "Manage book edited in other entry type")
+    (description
+     "This package provides new BibLaTeX entry types and fields for book
+edited in other types, like for instance @code{@@bookinarticle}.  It offers
+more types than the older package @code{biblatex-bookinarticle}, which it
+supersedes.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-bwl
+  (package
+    (name "texlive-biblatex-bwl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-bwl/"
+                   "tex/latex/biblatex-bwl/")
+             (base32
+              "122qz05rc7c3pys6adg38xq0r123f4hspc3yyw8l2mzlpbbwm9y5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-bwl")
+    (synopsis "BibLaTeX citations for FU Berlin")
+    (description
+     "The bundle provides a set of BibLaTeX implementations of bibliography
+and citation styles for the Business Administration Department of the Free
+University of Berlin.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-caspervector
+  (package
+    (name "texlive-biblatex-caspervector")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-caspervector/"
+                   "tex/latex/biblatex-caspervector/")
+             (base32
+              "0drch06w3kp5ygc3jad70iixylgaivhxnnibglnih89yg4wq90y4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-caspervector")
+    (synopsis "Simple citation style for Chinese users")
+    (description
+     "The package provides a simple and easily extensible biblography/citation
+style for Chinese LaTeX users, using BibLaTeX.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-chem
+  (package
+    (name "texlive-biblatex-chem")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-chem/"
+                   "tex/latex/biblatex-chem/")
+             (base32
+              "0y4fgnykh5x48cnbgyhgj04iqz05mvnzqvjn84vbr3mqmwjrndbl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-chem")
+    (synopsis
+     "BibLaTeX implementations of chemistry-related bibliography styles")
+    (description
+     "The bundle offers a set of styles to allow chemists to use BibLaTeX.
+The package has complete styles for: all ACS journals; RSC journals using
+standard (Chem.@: Commun.) style; and Angewandte Chem.@: style, (thus covering
+a wide range of journals).")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-chicago
+  (package
+    (name "texlive-biblatex-chicago")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-chicago/"
+                   "tex/latex/biblatex-chicago/")
+             (base32
+              "00y8h4hvmz17bn46936xfi1cy0rsh5y33pyc1hrkrrldabq8rxys")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-chicago")
+    (synopsis "Chicago style files for BibLaTeX")
+    (description
+     "This is a BibLaTeX style that implements the Chicago author-date and
+notes with bibliography style specifications given in the @emph{Chicago Manual
+of Style}, 17th edition (with continuing support for the 16th edition, too).
+The style implements entry types for citing audio-visual materials, among many
+others.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-claves
+  (package
+    (name "texlive-biblatex-claves")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-claves/"
+                   "tex/latex/biblatex-claves/")
+             (base32
+              "08ydcv7qlbxaysh7jm3d4glrhp1fyd4fvvxc3jc4k50ga77ksqj0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-claves")
+    (synopsis "Tool to manage claves of old litterature with BibLaTeX")
+    (description
+     "When studying antic and medieval literature, we may find many different
+texts published with the same title, or, in contrary, the same text published
+with different titles.  To avoid confusion, scholars have published claves,
+which are books listing ancient texts, identifying them by an identifier ---
+a number or a string of text.  For example, for early Christianity, we have
+the Bibliotheca Hagiographica Graeca, the Clavis Apocryphorum Novi Testamenti
+and other claves.  It could be useful to print the identifier of a texts in
+one specific clavis, or in many claves.  The package allows us to create new
+field for different claves, and to present all these fields in a consistent
+way.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-cv
+  (package
+    (name "texlive-biblatex-cv")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-cv/"
+                   "tex/latex/biblatex-cv/")
+             (base32
+              "17m6lqnr35y6vcfrrhlhxjf55b85py9miksswhkipyiaj3kphhb8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-cv")
+    (synopsis "Create a CV from BibTeX files")
+    (description
+     "This package creates an academic curriculum vitae (CV) from a BibTeX
+@file{.bib} file.  The package makes use of BibLaTeX and Biber to
+automatically format, group, and sort the entries on a CV.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-dw
+  (package
+    (name "texlive-biblatex-dw")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-dw/"
+                   "tex/latex/biblatex-dw/bbx/"
+                   "tex/latex/biblatex-dw/cbx/"
+                   "tex/latex/biblatex-dw/lbx/")
+             (base32
+              "1vw008djg535hdwbmk5dqvaw0v6cm3lqmlvk8sfzybpqffw1crlr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-dw")
+    (synopsis "Humanities styles for BibLaTeX")
+    (description
+     "This package provides a small collection of styles for the BibLaTeX
+package.  It was designed for citations in the humanities and offers some
+features that are not provided by the standard BibLaTeX styles.  The styles
+are dependent on BibLaTeX and cannot be used without it.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-enc
+  (package
+    (name "texlive-biblatex-enc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-enc/"
+                   "tex/latex/biblatex-enc/")
+             (base32
+              "0k9sais0dknydcdy1a7fkkrb5grqap3q2jn8qk36x658nkjjb9ln")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-enc")
+    (synopsis "BibLaTeX style for the Ecole nationale des chartes (Paris)")
+    (description
+     "This package provides a citation and bibliography style for use with
+BibLaTeX.  It conforms to the bibliographic standards used at the Ecole
+nationale des chartes (Paris), and may be suitable for a more general use in
+historical and philological works.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-ext
+  (package
+    (name "texlive-biblatex-ext")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-ext/"
+                   "tex/latex/biblatex-ext/")
+             (base32
+              "09adm378m9laxxb9bs6lqhfprrq0d3l1c627fxp1vcnxqqwd99xc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-ext")
+    (synopsis "Extended BibLaTeX standard styles")
+    (description
+     "The BibLaTeX-ext bundle provides styles that slightly extend the
+standard styles that ship with BibLaTeX.  The styles offered in this bundle
+provide a simple interface to change some of the stylistic decisions made in
+the standard styles.  At the same time they stay as close to their standard
+counterparts as possible, so that most customisation methods can be applied
+here as well.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-fiwi
+  (package
+    (name "texlive-biblatex-fiwi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-fiwi/"
+                   "tex/latex/biblatex-fiwi/")
+             (base32
+              "080m1xj1g8v6aavp2i0hipjk3iikjqd2i36by2fiq0ys5vl5vhnq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-fiwi")
+    (synopsis "BibLaTeX styles for use in German humanities")
+    (description
+     "The package provides a collection of styles for BibLaTeX.  It was
+designed for citations in German Humanities, especially film studies, and
+offers some features that are not provided by the standard BibLaTeX styles.
+The style is highly optimized for documents written in German, and the main
+documentation is only available in German.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-gb7714-2015
+  (package
+    (name "texlive-biblatex-gb7714-2015")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-gb7714-2015/"
+                   "tex/latex/biblatex-gb7714-2015/")
+             (base32
+              "061gp5xwh2dkckb8dn9b7xhf76cqsq908dniwkp6hg531dzyn525")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-gb7714-2015")
+    (synopsis
+     "BibLaTeX implementation of the GBT7714-2015 bibliography style for
+Chinese users")
+    (description
+     "This package provides an implementation of the GBT7714-2015 bibliography
+style.  This implementation follows the GBT7714-2015 standard and can be used
+by simply loading BibLaTeX with the appropriate option.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-german-legal
+  (package
+    (name "texlive-biblatex-german-legal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-german-legal/"
+                   "tex/latex/biblatex-german-legal/")
+             (base32
+              "14njaba2gvz338f8z4w3vi1qyf7yxx3l9c9nla6ggrw4rnicjpzs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-german-legal")
+    (synopsis "Comprehensive citation style for German legal texts")
+    (description
+     "This package aims to provide citation styles (for footnotes and
+bibliographies) for German legal texts.  It is currently focused on citations
+in books (style german-legal-book), but may be extended to journal articles in
+the future.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-gost
+  (package
+    (name "texlive-biblatex-gost")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-gost/"
+                   "tex/latex/biblatex-gost/")
+             (base32
+              "0k4fdvhj8ki05arcimxlj3fm2216cijaj5jk5yy95754j3z6byj3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-gost")
+    (synopsis "BibLaTeX support for GOST standard bibliographies")
+    (description
+     "The package provides BibLaTeX support for Russian bibliography style
+GOST 7.0.5-2008")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-historian
+  (package
+    (name "texlive-biblatex-historian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-historian/"
+                   "tex/latex/biblatex-historian/")
+             (base32
+              "0y9jvjyji39ly5pf72qhnnlsrixaxjxdx529lyav8bhd2zz3c5s7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-historian")
+    (synopsis "BibLaTeX style based on the @emph{Turabian Manual}")
+    (description
+     "This package provides a BibLaTeX style, based on the @emph{Turabian
+Manual} (a version of Chicago).")
+    (license license:lppl)))
+
+(define-public texlive-biblatex-ieee
+  (package
+    (name "texlive-biblatex-ieee")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-ieee/"
+                   "tex/latex/biblatex-ieee/")
+             (base32
+              "0a3r2lvp4nr53gxpa40qa7zdgj2qpyygvcgcbprnvfxlqrk8lfm0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-ieee")
+    (synopsis "IEEE style files for BibLaTeX")
+    (description
+     "This is a BibLaTeX style that implements the bibliography style of the
+IEEE for BibLaTeX.  The implementation follows standard BibLaTeX conventions,
+and can be used simply by loading BibLaTeX with the appropriate @samp{ieee}
+option.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-ijsra
+  (package
+    (name "texlive-biblatex-ijsra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-ijsra/"
+                   "tex/latex/biblatex-ijsra/")
+             (base32
+              "0phgbrp47f6pgayws29acsacm7dcb5w3asvwswx5a2rg30wj2fln")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-ijsra")
+    (synopsis
+     "BibLaTeX style for the International Journal of Student Research in
+Archaeology")
+    (description
+     "This is the BibLaTeX style used for the journal International Journal of
+Student Research in Archaeology.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-iso690
+  (package
+    (name "texlive-biblatex-iso690")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-iso690/"
+                   "tex/latex/biblatex-iso690/")
+             (base32
+              "07h16m8n8lydph2n567fnx2hzdw15mwyrcgs30x8anv9qxh0z6jf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-iso690")
+    (synopsis "BibLaTeX style for ISO 690 standard")
+    (description
+     "The package provides a bibliography and citation style which conforms to
+the latest revision of the international standard ISO 690:2010.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-jura2
+  (package
+    (name "texlive-biblatex-jura2")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-jura2/"
+                   "tex/latex/biblatex-jura2/")
+             (base32
+              "1cnsmk46j98z7wk7qs6v9f5m42x124v2nxrnq8n1jcs1jd03q6ry")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-jura2")
+    (synopsis "Citation style for the German legal profession")
+    (description
+     "The package offers BibLaTeX support for citations in German legal texts.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-juradiss
+  (package
+    (name "texlive-biblatex-juradiss")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-juradiss/"
+                   "tex/latex/biblatex-juradiss/")
+             (base32
+              "13rwvj1ibhj0c46xr13wjyh68abkrvh2jcg2ccichh33crrxaql0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-juradiss")
+    (synopsis "BibLaTeX stylefiles for German law theses")
+    (description
+     "The package provides a custom citation-style for typesetting a German
+law thesis with LaTeX.")
+    (license license:lppl)))
+
+(define-public texlive-biblatex-license
+  (package
+    (name "texlive-biblatex-license")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-license/"
+                   "tex/latex/biblatex-license/")
+             (base32
+              "1xz6zms984v5r8hq01f7ap245lfhqj577rc9ww57ccv4kgvgicqd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-license")
+    (synopsis "Add license data to the bibliography")
+    (description
+     "This package is for adding license license:data to bibliography entries
+via BibLaTeX's built-in related mechanism.  It provides a new related type
+@code{license} and some bibmacros for typesetting these related entries.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-lncs
+  (package
+    (name "texlive-biblatex-lncs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-lncs/"
+                   "tex/latex/biblatex-lncs/")
+             (base32
+              "0fxhwvkgk3y2d1w6h2sldgzwbwng97bqqgny2slaajhk9wlbcs3k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-lncs")
+    (synopsis "BibLaTeX style for Springer Lecture Notes in Computer Science")
+    (description
+     "This is a BibLaTeX style for Springer Lecture Notes in Computer Science
+(LNCS).  It extends the standard BiBTeX model by an acronym entry.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-lni
+  (package
+    (name "texlive-biblatex-lni")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-lni/"
+                   "tex/latex/biblatex-lni/")
+             (base32
+              "1532swanj6p4pq7a4gqkmqjsdby20ls04ghkvdjg4066z1mizjp4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-lni")
+    (synopsis "LNI style for BibLaTeX")
+    (description
+     "BibLaTeX style for the Lecture Notes in Informatics, which is published
+by the Gesellschaft fur Informatik (GI e.V.).")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-luh-ipw
+  (package
+    (name "texlive-biblatex-luh-ipw")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-luh-ipw/"
+                   "tex/latex/biblatex-luh-ipw/bbx/"
+                   "tex/latex/biblatex-luh-ipw/cbx/"
+                   "tex/latex/biblatex-luh-ipw/lbx/")
+             (base32
+              "18fnq2xjwsp5lq7vywbgzppbijqn4xarqga0g1rpj89g9q0zjs30")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-luh-ipw")
+    (synopsis "BibLaTeX styles for social sciences")
+    (description
+     "The bundle is a small collection of styles for BibLaTeX.  It was
+designed for citations in the Humanities, following the guidelines of style of
+the institutes for the social sciences of the Leibniz University Hannover/LUH
+(especially the Institute of Political Science).")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-manuscripts-philology
+  (package
+    (name "texlive-biblatex-manuscripts-philology")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-manuscripts-philology/"
+                   "tex/latex/biblatex-manuscripts-philology/")
+             (base32
+              "1q0rqqh6gqs930bzay5cq5hghxk28xs2321y8h7awif0akq03rhm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-manuscripts-philology")
+    (synopsis "Manage classical manuscripts with BibLaTeX")
+    (description
+     "The package adds a new entry type: @code{@@manuscript} to manage
+manuscript in classical philology, for example to prepare a critical
+edition.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-mla
+  (package
+    (name "texlive-biblatex-mla")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-mla/"
+                   "tex/latex/biblatex-mla/")
+             (base32
+              "09qlx067vhc4aflx9rjdbyq99xh3nzwlxj81cxp07mm2mykhxf39")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-mla")
+    (synopsis "MLA style files for BibLaTeX")
+    (description
+     "The package provides BibLaTeX support for citations in the format
+specified by the MLA handbook.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-morenames
+  (package
+    (name "texlive-biblatex-morenames")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-morenames/"
+                   "tex/latex/biblatex-morenames/")
+             (base32
+              "1gwzxz1yqnq3q2fjrb4nf0370a90fbi6b20zvplj3lfiqmdkaiak")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-morenames")
+    (synopsis "New names for standard BibLaTeX entry type")
+    (description
+     "This package adds new fields of ``name'' type to the standard entry
+types of BibLaTeX.  For example, @samp{maineditor}, for a @code{@@collection},
+means the editor of @code{@@mvcollection}, and not the editor of the
+@code{@@collection}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-ms
+  (package
+    (name "texlive-biblatex-ms")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/biblatex-ms/biblatex/"
+                   "bibtex/bst/biblatex-ms/"
+                   "doc/latex/biblatex-ms/"
+                   "tex/latex/biblatex-ms/")
+             (base32
+              "00xib8xvxl78qzxs66qmfyp4jdkcs3qx4ray2nwv1fffhj69aw3n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-etoolbox texlive-kvoptions texlive-logreq
+                             texlive-pdftexcmds texlive-url))
+    (home-page "https://ctan.org/pkg/biblatex-ms")
+    (synopsis "Sophisticated bibliographies in LaTeX (multiscript version)")
+    (description
+     "This package is the multiscript' version of the BibLaTeX package
+intended to solve the issues faced by those wishing to create multilingual
+bibliographies.  It is intended to be backwards-compatible with the standard
+BibLaTeX package and includes significantly enhanced optional functionality.
+
+It requires the use of the multiscript version of Biber (biber-ms).")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-multiple-dm
+  (package
+    (name "texlive-biblatex-multiple-dm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-multiple-dm/"
+                   "tex/latex/biblatex-multiple-dm/")
+             (base32
+              "07dp3ppz8kma5gh0bs98jnk7gvqqcp4l1ag60941myjvfsyqplxv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-multiple-dm")
+    (synopsis "Load multiple datamodels in BibLaTeX")
+    (description
+     "The package adds the possibility to BibLaTeX to load data models from
+multiple sources.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-musuos
+  (package
+    (name "texlive-biblatex-musuos")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-musuos/"
+                   "tex/latex/biblatex-musuos/")
+             (base32
+              "0iqp02yk8b9s18k8v78q2y5g507fsh2zk68dj0yc77gwa6gsmrmh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-musuos")
+    (synopsis "BibLaTeX style for citations in @file{musuos.cls}")
+    (description
+     "The style is designed for use with the musuos class, but it should be
+usable with other classes, too.")
+    (license license:lppl)))
+
+(define-public texlive-biblatex-nature
+  (package
+    (name "texlive-biblatex-nature")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-nature/"
+                   "tex/latex/biblatex-nature/")
+             (base32
+              "1bpgcwpd8sw28dn7q8bkxpnpqb741216gaasvqdpah9kj53zfypg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-nature")
+    (synopsis "BibLaTeX support for @emph{Nature}")
+    (description
+     "The bundle offers styles that allow authors to use BibLaTeX when
+preparing papers for submission to the journal @emph{Nature}.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-nejm
+  (package
+    (name "texlive-biblatex-nejm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-nejm/"
+                   "source/latex/biblatex-nejm/"
+                   "tex/latex/biblatex-nejm/")
+             (base32
+              "1fa12hbzrqd7brz90zhn3lklbqvvn5sw5l3y8pnm5xx604dkdiiw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-nejm")
+    (synopsis "BibLaTeX style for the New England Journal of Medicine (NEJM)")
+    (description
+     "This is a BibLaTeX numeric style based on the design of the New England
+Journal of Medicine (NEJM).")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-nottsclassic
+  (package
+    (name "texlive-biblatex-nottsclassic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-nottsclassic/"
+                   "tex/latex/biblatex-nottsclassic/")
+             (base32
+              "13rvxykjyah5vn44sfagf1ggqhh1hd1qhz9m6jb87yhwz5snkrxh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-nottsclassic")
+    (synopsis "Citation style for the University of Nottingham")
+    (description
+     "This citation-style covers the citation and bibliography rules of the
+University of Nottingham.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-opcit-booktitle
+  (package
+    (name "texlive-biblatex-opcit-booktitle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-opcit-booktitle/"
+                   "tex/latex/biblatex-opcit-booktitle/")
+             (base32
+              "078fzk4i7sknaxkgn2lr54bcslqbjjsr1nb0z7y46v7kpg2lpcrf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-opcit-booktitle")
+    (synopsis "Use @samp{op.@: cit.}@: for the booktitle of a subentry")
+    (description
+     "The default citation styles use the @samp{op.@: cit.}@: form in order to
+have a shorter reference when a title has already been cited.  However, when
+you cite two entries which share the same booktitle but not the same title,
+the @samp{op.@: cit.}@: mechanism does not work.  This package fixes this.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-oxref
+  (package
+    (name "texlive-biblatex-oxref")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-oxref/"
+                   "source/latex/biblatex-oxref/"
+                   "tex/latex/biblatex-oxref/")
+             (base32
+              "0jzmb28h0s2nji23mkj5ich7z5kaifv3snj20rm0dpjk20a087h3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-oxref")
+    (synopsis "BibLaTeX styles inspired by the @emph{Oxford Guide to Style}")
+    (description
+     "This bundle provides four BibLaTeX styles that implement (many of) the
+stipulations and examples provided by the 2014 @emph{New Hart's Rules} and the
+2002 @emph{Oxford Guide to Style}:
+@itemize
+
+@item @code{oxnotes} is a style similar to the standard @code{verbose},
+intended for use with footnotes;
+
+@item @code{oxnum} is a style similar to the standard @code{numeric}, intended
+for use with numeric in-text citations;
+
+@item @code{oxalph} is a style similar to the standard @code{alphabetic},
+intended for use with alphabetic in-text citations;
+
+@item @code{oxyear} is a style similar to the standard @code{author-year},
+intended for use with parenthetical in-text citations.
+
+@end itemize
+
+The bundle provides support for a wide variety of content types, including
+manuscripts, audiovisual resources, social media and legal references.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-philosophy
+  (package
+    (name "texlive-biblatex-philosophy")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-philosophy/"
+                   "source/latex/biblatex-philosophy/"
+                   "tex/latex/biblatex-philosophy/")
+             (base32
+              "05fapyb6wwyv4mwjhgg3gasvqkwpwd6jxv095hird9011n6drrzm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-biblatex
+                  texlive-cochineal
+                  texlive-csquotes
+                  texlive-etoolbox
+                  texlive-fontaxes
+                  texlive-fontsize
+                  texlive-guitlogo
+                  texlive-hologo
+                  texlive-hypdoc
+                  texlive-inconsolata
+                  texlive-libertine
+                  texlive-listings
+                  texlive-ltxdockit
+                  texlive-manfnt
+                  texlive-mdframed
+                  texlive-metalogo
+                  texlive-microtype
+                  texlive-needspace
+                  texlive-newtx
+                  texlive-parskip
+                  texlive-pgf
+                  texlive-sectsty
+                  texlive-upquote
+                  texlive-xcolor
+                  texlive-xkeyval
+                  texlive-xstring
+                  texlive-zref))))
+    (home-page "https://ctan.org/pkg/biblatex-philosophy")
+    (synopsis "Styles for using BibLaTeX for work in philosophy")
+    (description
+     "The bundle offers two styles --- @code{philosophy-classic} and
+@code{philosophy-modern} --- that facilitate the production of two different
+kinds of bibliography, based on the author-year style, with options and
+features to manage the information about the translation of foreign texts or
+their reprints.  Though the package's default settings are based on the
+conventions used in Italian publications, these styles can be used with every
+language recognized by Babel, possibly with some simple redefinitions.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-phys
+  (package
+    (name "texlive-biblatex-phys")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-phys/"
+                   "tex/latex/biblatex-phys/")
+             (base32
+              "1q9l7ma3zpybx142adbiall4y5x4hc5kc536wpmiwkz29zi6w7ka")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-phys")
+    (synopsis
+     "BibLaTeX implementation of the AIP and APS bibliography style")
+    (description
+     "The package provides an implementation of the bibliography styles of
+both the AIP and the APS for BibLaTeX.  This implementation follows standard
+BibLaTeX conventions, and can be used simply by loading BibLaTeX with the
+appropriate option: @samp{\\usepackage[style=phys]@{biblatex@}}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-publist
+  (package
+    (name "texlive-biblatex-publist")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-publist/"
+                   "tex/latex/biblatex-publist/")
+             (base32
+              "0s43idph9n9klrxy34lnplrrwy3wy4z87iiif5l9japi1j51vz6c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-publist")
+    (synopsis "BibLaTeX bibliography support for publication lists")
+    (description
+     "The package provides a BibLaTeX bibliography style file (@file{.bbx})
+for publication lists.  The style file draws on BibLaTeX's @code{authoryear}
+style, but provides some extra features often desired for publication lists,
+such as the omission of the author's own name from author or editor data.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-readbbl
+  (package
+    (name "texlive-biblatex-readbbl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-readbbl/"
+                   "tex/latex/biblatex-readbbl/")
+             (base32
+              "0fr0p5c2v66vy86qx2m8i4p3p75d6qm506gv8xbfqckzyfzi9x6z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-readbbl")
+    (synopsis "Read a @file{.bbl} file created by biber")
+    (description
+     "This small package modifies the BibLaTeX macro which reads a @file{.bbl}
+file created by Biber.  It is thus possible to include a @file{.bbl} file into
+the main document with the @code{environment} and send it to a publisher who
+does not need to run the Biber program.  However, when the bibliography
+changes one has to create a new @file{.bbl} file.")
+    (license license:lppl)))
+
+(define-public texlive-biblatex-realauthor
+  (package
+    (name "texlive-biblatex-realauthor")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-realauthor/"
+                   "tex/latex/biblatex-realauthor/")
+             (base32
+              "1av0vd7lwg5yad75b9fbi09s4bcaqd8bdz43kzyj2r7cimj8dpl0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-realauthor")
+    (synopsis "Indicate the real author of a work")
+    (description
+     "This package allows to use a new field @code{realauthor}, which
+indicates the real author of a work, when published in a pseudepigraphic
+name.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-sbl
+  (package
+    (name "texlive-biblatex-sbl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-sbl/"
+                   "makeindex/biblatex-sbl/"
+                   "tex/latex/biblatex-sbl/")
+             (base32
+              "1b04lwzmsgapf2x1y83jdmzsc0h59dwy35lglxwvmlwlv8czpx9s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-sbl")
+    (synopsis "Society of Biblical Literature (SBL) style files for BibLaTeX")
+    (description
+     "The package provides BibLaTeX support for citations in the format
+specified by the second edition of the Society of Biblical Literature (SBL)
+Handbook of Style.  A style file for writing SBL student papers is also
+included.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-science
+  (package
+    (name "texlive-biblatex-science")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-science/"
+                   "tex/latex/biblatex-science/")
+             (base32
+              "0sw2bzhbgbfg5gajbm61x4243qrfna1ifbp9bl1swdmvw9g3hycd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-science")
+    (synopsis "BibLaTeX implementation of the @emph{Science} bibliography style")
+    (description
+     "The bundle offers styles that allow authors to use BibLaTeX when
+preparing papers for submission to the journal @emph{Science}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-shortfields
+  (package
+    (name "texlive-biblatex-shortfields")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-shortfields/"
+                   "tex/latex/biblatex-shortfields/")
+             (base32
+              "14s6ykbnb6b2i811rjn44chv8f73yhnnywczn78zwbij5z6jgcjv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-shortfields")
+    (synopsis "Use short forms of fields with BibLaTeX")
+    (description
+     "The BibLaTeX package provides @code{shortseries} and @code{shortjournal}
+field, but the default styles don't use them.  It also provides a mechanism to
+print the equivalence between short forms of fields and long
+fields (@code{\\printbiblist}), but this mechanism does not allow to mix
+between different type of short fields, for example, between short forms of
+journal title and short forms of series titles.
+
+This package provides a solution to these two problems.  If
+a @code{shortjournal} field is defined, it prints it instead of the
+@code{\\journal} field.  If a @code{shortseries} field is defined, it prints
+it instead of the @code{\\series} field.  It provides
+a @code{\\printbibshortfields} command to print a list of the sort forms of
+the fields.  This list also includes the claves defined with the
+@code{biblatex-claves} package.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-socialscienceshuberlin
+  (package
+    (name "texlive-biblatex-socialscienceshuberlin")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-socialscienceshuberlin/"
+                   "tex/latex/biblatex-socialscienceshuberlin/")
+             (base32
+              "1klcvjf8vz3bg0q7pmci6hhih52ph0z0hhkbv3iippyy33jhijrc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-socialscienceshuberlin")
+    (synopsis "BibLaTeX-style for the social sciences at HU Berlin")
+    (description
+     "This is a BibLaTeX style for the social sciences at the
+Humboldt-Universitat zu Berlin.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-software
+  (package
+    (name "texlive-biblatex-software")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-software/"
+                   "source/latex/biblatex-software/"
+                   "tex/latex/biblatex-software/")
+             (base32
+              "0dlinydsrlcw898ccynx76mdv9jsvr4ninsqv2aggmj3g9xripn0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-software")
+    (synopsis "BibLaTeX stylefiles for software products")
+    (description
+     "This package implements software entry types for BibLaTeX in the form of
+a bibliography style extension.  It requires the Biber backend.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-source-division
+  (package
+    (name "texlive-biblatex-source-division")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-source-division/"
+                   "tex/latex/biblatex-source-division/")
+             (base32
+              "07y25624fpmx9hfmyyga8wh5cmvl14lqbmflglpl60jqsy622mgi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-source-division")
+    (synopsis "References by division in classical sources")
+    (description
+     "The package enables the user to make reference to division marks (such
+as book, chapter, section), in the document being referenced, in addition to
+the page-based references that BibTeX-based citations have always had.  The
+citation is made in the same way as the LaTeX standard, but what's inside the
+square brackets may include the division specification.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-spbasic
+  (package
+    (name "texlive-biblatex-spbasic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-spbasic/"
+                   "tex/latex/biblatex-spbasic/")
+             (base32
+              "071d1iqy1scz3wncsfv1backp5b7ly28rn5k0wy67wwz1vxa0d17")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-spbasic")
+    (synopsis "BibLaTeX style emulating Springer's old @file{spbasic.bst}")
+    (description
+     "This package provides a bibliography and citation style for BibLaTeX and
+Biber for typesetting articles for Springer's journals.  It is the same as the
+old BibTeX style @file{spbasic.bst}.")
+    (license license:lppl)))
+
+(define-public texlive-biblatex-subseries
+  (package
+    (name "texlive-biblatex-subseries")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-subseries/"
+                   "tex/latex/biblatex-subseries/")
+             (base32
+              "09kqqccn8dlaydz1v2szllryaxrj0c36z63ynhrv9dvd1sk0vdhd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-subseries")
+    (synopsis "Manages subseries with BibLaTeX")
+    (description
+     "Some publishers organize book series with subseries.  In this case, two
+numbers are associated with one volume: the number inside the series and the
+number inside the subseries.  This package provides new fields to manage such
+system.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-swiss-legal
+  (package
+    (name "texlive-biblatex-swiss-legal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-swiss-legal/"
+                   "tex/latex/biblatex-swiss-legal/")
+             (base32
+              "1x4dy1vxrbx0xkw3vysvcds0s1jz9w1pwri5ypiidj517sdsnff4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-swiss-legal")
+    (synopsis
+     "Bibliography and citation styles following Swiss legal practice")
+    (description
+     "The package provides BibLaTeX bibliography and citation styles for
+documents written in accordance with Swiss legal citation standards in either
+French or German.  However, the package is at present outdated and does not
+work properly with newer versions of BibLaTeX.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-trad
+  (package
+    (name "texlive-biblatex-trad")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-trad/"
+                   "tex/latex/biblatex-trad/")
+             (base32
+              "19ma61dsdpsm52zm7wnkqccmx54g9gvh05d10c59q86ffv1dnlmx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-trad")
+    (synopsis "Traditional BibTeX styles with BibLaTeX")
+    (description
+     "The bundle provides implementations of the traditional BibTeX styles
+(@code{plain}, @code{abbrev}, @code{unsrt} and @code{alpha}) with BibLaTeX.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-true-citepages-omit
+  (package
+    (name "texlive-biblatex-true-citepages-omit")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-true-citepages-omit/"
+                   "tex/latex/biblatex-true-citepages-omit/")
+             (base32
+              "1mfkmn5g6r61mlyf3vx98q18a042yjkmh3drid9vs0kaj66di4n5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-true-citepages-omit")
+    (synopsis
+     "Correct some limitations of BibLaTeX @samp{citepages=omit} option")
+    (description
+     "This package deals with a limitation of the @samp{citepages=omit} option
+of the verbose family of BibLaTeX citestyles.  The option works when you
+@code{\\cite[xx]@{key@}}, but not when you @code{\\cite[\\pno~xx, some
+text]@{key@}}.  The package corrects this problem.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblatex-unified
+  (package
+    (name "texlive-biblatex-unified")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-unified/"
+                   "tex/latex/biblatex-unified/")
+             (base32
+              "0d9b20m10dlkii2zxj00xgascqarf8qv1vfz28v7hnm9vd54h3rw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-unified")
+    (synopsis "BibLaTeX unified stylesheet for linguistics journals")
+    (description
+     "BibLaTeX-unified is an opinionated BibLaTeX implementation of the
+Unified Stylesheet for Linguistics Journals.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-biblatex-vancouver
+  (package
+    (name "texlive-biblatex-vancouver")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex-vancouver/"
+                   "tex/latex/biblatex-vancouver/")
+             (base32
+              "1sji214mi5garp5h3if1fh1rvck573cxg61rgdlyy543883nrxv7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex-vancouver")
+    (synopsis "Vancouver style for BibLaTeX")
+    (description
+     "This package provides the Vancouver reference style for BibLaTeX.  It is
+based on the @code{numeric} style and requires Biber.")
+    (license license:gpl3+)))
+
+(define-public texlive-biblatex2bibitem
+  (package
+    (name "texlive-biblatex2bibitem")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblatex2bibitem/"
+                   "tex/latex/biblatex2bibitem/")
+             (base32
+              "1cd9b7vhmlx2clqr2gpwqs4hjga9mjqlxj7m74kq555rn5ppkyyn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblatex2bibitem")
+    (synopsis "Convert BibLaTeX-generated bibliography to bibitems")
+    (description
+     "Some journals accept the reference list only as @code{\\bibitems}.  If
+you use BibTeX, there is no problem: just paste the content of the @file{.bbl}
+file into your document.  However, there was no out-of-the-box way to do the
+same for BibLaTeX, and you had to struggle with searching appropriate
+@file{.bst} files, or formatting your reference list by hand, or something
+like that.  Using the workaround provided by this package solves the
+problem.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-bibleref
+  (package
+    (name "texlive-bibleref")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bibleref/"
+                   "source/latex/bibleref/"
+                   "tex/latex/bibleref/")
+             (base32
+              "1fgb6lljdsdvkbs4i7yvwvgjbpbc8vnki0wv3gdi9yq6s5j6lzv5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bibleref")
+    (synopsis "Format @emph{Bible} citations")
+    (description
+     "The bibleref package offers consistent formatting of references to parts
+of the Christian @emph{Bible}, in a number of well-defined formats.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-bibleref-french
   (package
     (name "texlive-bibleref-french")
@@ -2168,6 +6537,204 @@ complies with the @emph{Loccumer Richtlinien} (Locum guidelines).  In
 addition, the Vulgate (Latin Bible) is supported.")
     (license license:lppl1.3+)))
 
+(define-public texlive-bibleref-lds
+  (package
+    (name "texlive-bibleref-lds")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bibleref-lds/"
+                   "source/latex/bibleref-lds/"
+                   "tex/latex/bibleref-lds/")
+             (base32
+              "0wqmpzml3yyhzv7bx5wkfl2ni0qinz0kjzdanh6rx0bczp29dlfh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bibleref-lds")
+    (synopsis
+     "Bible references, including scriptures of the Church of Jesus Christ of
+Latter Day Saints")
+    (description
+     "The package extends the @code{bibleref-mouth} package to support
+references to the scriptures of The Church of Jesus Christ of Latter-day
+Saints (LDS).")
+    (license license:lppl1.3+)))
+
+(define-public texlive-bibleref-mouth
+  (package
+    (name "texlive-bibleref-mouth")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bibleref-mouth/"
+                   "source/latex/bibleref-mouth/"
+                   "tex/latex/bibleref-mouth/")
+             (base32
+              "0dakbx8rnjs9yjnn1xal9y0bmh165lqhbjj3bns974vkyb7nla4m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bibleref-mouth")
+    (synopsis "Consistent formatting of @emph{Bible} references")
+    (description
+     "The package allows @emph{Bible} references to be formatted in
+a consistent way.  It is similar to the @code{bibleref} package, except that
+the formatting macros are all purely expandable --- that is, they are all
+implemented in TeX's mouth.  This means that they can be used in any
+expandable context, such as an argument to a @code{\\url} command.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-bibleref-parse
+  (package
+    (name "texlive-bibleref-parse")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bibleref-parse/"
+                   "tex/latex/bibleref-parse/")
+             (base32
+              "01jhic1idgjgv9hsx5gih4230krfqm8pc3j7f4kn22w2jnw7fs68")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bibleref-parse")
+    (synopsis "Specify @emph{Bible} passages in human-readable format")
+    (description
+     "The package parses @emph{Bible} passages that are given in human
+readable format.  It accepts a wide variety of formats.  This allows for
+a simpler and more convenient interface to the functionality of the
+@code{bibleref} package.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-biblist
+  (package
+    (name "texlive-biblist")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/biblist/" "tex/latex/biblist/")
+             (base32
+              "1r7cd68yr8pnmqnr39qzp42kxqcx89cqzz81ig9y7qgicznji0i8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biblist")
+    (synopsis "Print a BibTeX database")
+    (description
+     "The package provides the means of listing an entire BibTeX database,
+avoiding the potentially large (macro) impact associated with
+@code{\\nocite@{*@}}.")
+    (license license:gpl3+)))
+
+(define-public texlive-bidihl
+  (package
+    (name "texlive-bidihl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/bidihl/" "tex/xelatex/bidihl/")
+             (base32
+              "021q2qhfl2ww95nbp63p3j7lv9wjj5s9wvn2sj5zyj1pcw75l8ir")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bidihl")
+    (synopsis "Experimental Bidi-aware text highlighting")
+    (description
+     "This package provides experimental Bidi-aware text highlighting.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-bibtexperllibs
+  (package
+    (name "texlive-bibtexperllibs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "scripts/bibtexperllibs/BibTeX/"
+                   "scripts/bibtexperllibs/LaTeX/"
+                   "source/support/bibtexperllibs/")
+             (base32
+              "1p99pg9rvkzi3rqm4kp43zf5sk28q7a2m8ikfckg10ybaws5d3zg")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bibtexperllibs")
+    (synopsis "BibTeX Perl Libraries")
+    (description
+     "This package provides BibTeX related Perl libraries.")
+    (license
+     (list license:artistic2.0
+           license:gpl1
+           license:public-domain))))
+
+(define-public texlive-bibtopic
+  (package
+    (name "texlive-bibtopic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bibtopic/"
+                   "source/latex/bibtopic/"
+                   "tex/latex/bibtopic/")
+             (base32
+              "1b4lhlw29y37c7pxmqvy4ahgb85bmxrgnr2jhzvdhzdm5y9md7a3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (home-page "https://ctan.org/pkg/bibtopic")
+    (synopsis "Include multiple bibliographies in a document")
+    (description
+     "The package allows the user to include several bibliographies covering
+different topics or bibliographic material into a document (e.g., one
+bibliography for primary literature and one for secondary literature).  The
+package provides commands to include either all references from a @file{.bib}
+file, only the references actually cited or those not cited in your document.
+The user has to construct a separate @file{.bib} file for each bibliographic
+topic, each of which will be processed separately by BibTeX.  If you want to
+have bibliographies specific to one part of a document, see the packages
+@code{bibunits} or @code{chapterbib}.")
+    (license license:gpl3+)))
+
+(define-public texlive-bibtopicprefix
+  (package
+    (name "texlive-bibtopicprefix")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bibtopicprefix/"
+                   "source/latex/bibtopicprefix/"
+                   "tex/latex/bibtopicprefix/")
+             (base32
+              "1fadq51adii1453v31xj7p328h4rvans1ynmxjcmnwhlj4hdjp5n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bibtopicprefix")
+    (synopsis "Prefix references to bibliographies produced by
+@code{bibtopic}")
+    (description
+     "The package permits users to apply prefixes (fixed strings) to
+references to entries in bibliographies produced by the @code{bibtopic}
+package.")
+    (license license:lppl)))
+
+(define-public texlive-bibunits
+  (package
+    (name "texlive-bibunits")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bibunits/"
+                   "source/latex/bibunits/"
+                   "tex/latex/bibunits/")
+             (base32
+              "0hlz277lskhcs5xr0qn2rram957himj67hkwqqsjjap8khf7fz6v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bibunits")
+    (synopsis "Multiple bibliographies in one document")
+    (description
+     "The package provide a mechanism to generate separate bibliographies for
+different units (chapters, sections or bibunit-environments) of a text.  The
+package separates the citations of each unit of text into a separate file to
+be processed by BibTeX.  The global bibliography section produced by LaTeX may
+also appear in the document and citations can be placed in both the local unit
+and the global bibliographies at the same time.")
+    (license license:lppl)))
+
 (define-public texlive-binomexp
   (package
     (name "texlive-binomexp")
@@ -2211,6 +6778,25 @@ settings for the way species names are typeset, but they can be customized.
 Different default styles are used in different situations.")
     (license license:gpl3+)))
 
+(define-public texlive-biolett-bst
+  (package
+    (name "texlive-biolett-bst")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/biolett-bst/"
+                   "doc/bibtex/biolett-bst/")
+             (base32
+              "1xfr79xw0ih61s5qapx2adiyjj0d149nslpmkd1fw29g1v4zrjd2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/biolett-bst")
+    (synopsis "BibTeX style for the journal @emph{Biology Letters}")
+    (description
+     "This package provides a BibTeX style (@file{.bst}) file for the journal
+@emph{Biology Letters} published by the Royal Society.")
+    (license license:lppl1.0+)))
+
 (define-public texlive-bitelist
   (package
     (name "texlive-bitelist")
@@ -2256,6 +6842,122 @@ retains outer braces.")
 used to describe hardware, data format or protocols.")
     (license license:lppl)))
 
+(define-public texlive-bitter
+  (package
+    (name "texlive-bitter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/bitter/"
+                   "fonts/enc/dvips/bitter/"
+                   "fonts/map/dvips/bitter/"
+                   "fonts/tfm/huerta/bitter/"
+                   "fonts/truetype/huerta/bitter/"
+                   "fonts/type1/huerta/bitter/"
+                   "fonts/vf/huerta/bitter/"
+                   "tex/latex/bitter/")
+             (base32
+              "07fb0dw1g1faz05naf53rinjrk0pngpfpcq4fxd1fy6580h7446f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bitter")
+    (synopsis "Bitter family of fonts with LaTeX support")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX, and LuaLaTeX support for
+the Bitter family of fonts.  Bitter is a contemporary slab-serif typeface for
+text.  There are regular and bold weights and an italic, but no bold italic.")
+    (license (list license:lppl license:silofl1.1))))
+
+(define-public texlive-bjfuthesis
+  (package
+    (name "texlive-bjfuthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bjfuthesis/"
+                   "tex/latex/bjfuthesis/")
+             (base32
+              "0qhb9kighs4ljmnn94qaihpllhwvmi76j3p8yylyjw2hzip102wr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bjfuthesis")
+    (synopsis "Thesis class for Beijing Forestry University")
+    (description
+     "This is a class file for producing dissertations and theses according to
+the @acronym{BJFU, Beijing Forestry University} guidelines for undergraduate
+theses and dissertations.")
+    (license license:gpl3)))
+
+(define-public texlive-blacklettert1
+  (package
+    (name "texlive-blacklettert1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/blacklettert1/"
+                   "fonts/tfm/public/blacklettert1/"
+                   "fonts/vf/public/blacklettert1/"
+                   "source/fonts/blacklettert1/"
+                   "tex/latex/blacklettert1/")
+             (base32
+              "0fvrz3rbcdgzrg3rg3nfvdb52zxn9vhsx0xd8rc6xryzrqaib7q0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/blacklettert1")
+    (synopsis "T1-encoded versions of Haralambous old German fonts")
+    (description
+     "This package contains virtual fonts that offer T1-alike encoded variants
+of old German fonts Gothic, Schwabacher and Fraktur (which are also available
+in Adobe type 1 format).  The package includes LaTeX macros to embed the fonts
+into the LaTeX font selection scheme.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-bmstu
+  (package
+    (name "texlive-bmstu")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bmstu/" "tex/latex/bmstu/")
+             (base32
+              "0ipdwd78b5w4v85nqlbxf8gi42mdz19r5mdjj3agwlgb0z6icjra")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bmstu")
+    (synopsis "LaTeX class for Bauman Moscow State Technical University")
+    (description
+     "The class defines commands and environments for creating reports and
+explanatory notes in Bauman Moscow State Technical University (Russia).")
+    (license
+     (list license:lppl1.3+
+           ;; File "bmstu-logo.pdf" is a logo of Bauman Moscow ;; State
+           ;; Technical University and complies with fair use (article 1274 of
+           ;; the Russian Civil Code).
+           (license:fsdg-compatible "file://doc/latex/bmstu/README.md")))))
+
+(define-public texlive-bmstu-iu8
+  (package
+    (name "texlive-bmstu-iu8")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bmstu-iu8/"
+                   "tex/latex/bmstu-iu8/")
+             (base32
+              "1nb3dfaw0m3w179z46d7fbvibkp15wf4ws3xbvws0gymwyi4nx1m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bmstu-iu8")
+    (synopsis "Class for IU8 reports")
+    (description
+     "This package consists of a class file and style files for writing
+reports at the IU8 department of IU faculty of @acronym{BMSTU, Bauman Moscow
+State Technical University}.  The class defines all headings, structure
+elements and other things in respect of Russian standard GOST 7.32-2017.  But
+there are correctives to be compatible with our local IU8 department
+requirements.")
+    (license license:expat)))
+
 (define-public texlive-bodeplot
   (package
     (name "texlive-bodeplot")
@@ -2308,6 +7010,35 @@ atoms up to the atomic number 112.  In addition, commands are provided to
 convert atomic numbers to element symbols or element names and vice versa.")
     (license license:lppl1.3+)))
 
+(define-public texlive-boisik
+  (package
+    (name "texlive-boisik")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/boisik/"
+                   "fonts/source/public/boisik/"
+                   "fonts/tfm/public/boisik/"
+                   "tex/latex/boisik/")
+             (base32
+              "1xg00nb28dgc8ch85n1mgj5n0cshkvyvgv98qawxn2xvx14vqw89")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     ;; FIXME: Font metrics generation fails for "bskmab10" font, with error:
+     ;; "! Strange path (turning number is zero)".
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'generate-font-metrics))))
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/boisik")
+    (synopsis "Font inspired by Baskerville design")
+    (description
+     "Boisik is a serif font set (inspired by the Baskerville typeface),
+written in Metafont.  The set comprises roman and italic text fonts and maths
+fonts.  LaTeX support is offered for use with OT1, IL2 and OM* encodings.")
+    (license license:gpl2)))
+
 (define-public texlive-boldtensors
   (package
     (name "texlive-boldtensors")
@@ -2329,6 +7060,60 @@ convert atomic numbers to element symbols or element names and vice versa.")
 characters.")
     (license license:gpl3+)))
 
+(define-public texlive-bookdb
+  (package
+    (name "texlive-bookdb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/bookdb/" "doc/bibtex/bookdb/")
+             (base32
+              "0df6bzmc90af3v4nzv6hp9padpc7h680vm2hy8wzb268z3ld268h")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bookdb")
+    (synopsis "BibTeX style file for cataloguing a home library")
+    (description
+     "This package provides an extended book entry for use in cataloguing
+a home library.  The extensions include fields for binding, category,
+collator, condition, copy, illustrations, introduction, location, pages, size,
+value, volumes.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-bookhands
+  (package
+    (name "texlive-bookhands")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/bookhands/"
+                   "fonts/afm/public/bookhands/"
+                   "fonts/map/dvips/bookhands/"
+                   "fonts/source/public/bookhands/"
+                   "fonts/tfm/public/bookhands/"
+                   "fonts/type1/public/bookhands/"
+                   "source/fonts/bookhands/"
+                   "tex/latex/bookhands/")
+             (base32
+              "0ssz80jwmd00x7d1x1xc6i61kbs30bc875bvakd5gymdw2kv7s3z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/bookhands")
+    (synopsis "Collection of book-hand fonts")
+    (description
+     "This is a set of book-hand (Metafont) fonts and packages covering
+manuscript scripts from the 1st century until Gutenberg and Caxton.  The
+included hands are: Square Capitals (1st century onwards); Roman
+Rustic (1st-6th centuries); Insular Minuscule (6th cenury onwards);
+Carolingian Minuscule (8th-12th centuries); Early Gothic (11th-12th
+centuries); Gothic Textura Quadrata (13th-15th centuries); Gothic Textura
+Prescisus vel sine pedibus (13th century onwards); Rotunda (13-15th
+centuries); Humanist Minuscule (14th century onwards); Uncial (3rd-6th
+centuries); Half Uncial (3rd-9th centuries); Artificial Uncial (6th-10th
+centuries); and Insular Majuscule (6th-9th centuries).")
+    (license license:lppl)))
+
 (define-public texlive-booktabs-de
   (package
     (name "texlive-booktabs-de")
@@ -2365,6 +7150,31 @@ documentation.")
 documentation.")
     (license license:lppl)))
 
+(define-public texlive-boondox
+  (package
+    (name "texlive-boondox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/boondox/"
+                   "fonts/map/dvips/boondox/"
+                   "fonts/tfm/public/boondox/"
+                   "fonts/type1/public/boondox/"
+                   "fonts/vf/public/boondox/"
+                   "tex/latex/boondox/")
+             (base32
+              "0rsid25qlsbj3z60h8n22m8l6gyk4nbr598c6z9azldpxn88dz91")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/boondox")
+    (synopsis "Mathematical alphabets derived from the STIX fonts")
+    (description
+     "The package contains a number of PostScript fonts derived from the STIX
+OpenType fonts that may be used in maths mode in regular and bold weights for
+Calligraphic, Fraktur and Double-struck alphabets.  Virtual fonts with metrics
+suitable for maths mode are provided, as are LaTeX support files.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-borceux
   (package
     (name "texlive-borceux")
@@ -2432,6 +7242,131 @@ those long IUPAC compound names, and some chemical idioms.  It also supports
 the labelling of compounds and reference to labelled compounds.")
     (license license:lppl)))
 
+(define-public texlive-br-lex
+  (package
+    (name "texlive-br-lex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/br-lex/" "tex/latex/br-lex/")
+             (base32
+              "154mjkywvyif57zvqbq5wxs84357148km2x0lqqdx6nanr3vwmxb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/br-lex")
+    (synopsis "Class for typesetting Brazilian legal texts")
+    (description
+     "This class implements rules to typeset Brazilian legal texts.  Its
+purpose is to be an easy-to-use implementation for the end-user.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-braille
+  (package
+    (name "texlive-braille")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/braille/" "tex/latex/braille/")
+             (base32
+              "021nxjz23gn8zjrrzxggjaqq3gv894c512x15kffywm8h5k0bzy5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/braille")
+    (synopsis "Support for Braille")
+    (description
+     "This package allows the user to produce Braille documents on paper for
+the blind without knowing Braille.  Python scripts @file{grade1.py} and
+@file{grade2.py} convert ordinary text to grade 1 and 2 Braille tags; then,
+the LaTeX package takes the tags and prints out corresponding Braille
+symbols.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-brandeis-dissertation
+  (package
+    (name "texlive-brandeis-dissertation")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/brandeis-dissertation/"
+                   "source/latex/brandeis-dissertation/"
+                   "tex/latex/brandeis-dissertation/")
+             (base32
+              "12w95gcrdvxx54a2vajz71flarm82wppl1rbrxg9vxkmp1b9yham")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/brandeis-dissertation")
+    (synopsis "Class for Brandeis University dissertations")
+    (description
+     "The class will enable the user to typeset a dissertation which adheres
+to the formatting guidelines of Brandeis University @acronym{GSAS, Graduate
+School of Arts and Sciences}.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-brandeis-problemset
+  (package
+    (name "texlive-brandeis-problemset")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/brandeis-problemset/"
+                   "tex/latex/brandeis-problemset/")
+             (base32
+              "172l1jmvacjg9j5fkyrmsrhsj5pyaaq8g9pfvkahcnhk3jfc3pnp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/brandeis-problemset")
+    (synopsis "Document class for COSI Problem sets at Brandeis University")
+    (description
+     "Brandeis University's computer science courses often assign problem sets
+which require fairly rigorous formatting.  This document class, which extends
+@code{article}, provides a simple way to typeset these problem sets in LaTeX.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-brandeis-thesis
+  (package
+    (name "texlive-brandeis-thesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/brandeis-thesis/"
+                   "source/latex/brandeis-thesis/"
+                   "tex/latex/brandeis-thesis/")
+             (base32
+              "0gipdbnlh4jllfyhdw0i7zcypmi63p4ssv7q08gn6w2alfmffr69")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/brandeis-thesis")
+    (synopsis "Class for Brandeis University M.A. theses")
+    (description
+     "@file{brandeis-thesis.cls} provides the structures and formatting
+information for an M.A.@: thesis for the Brandeis University Graduate School
+of Arts and Sciences.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-breakcites
+  (package
+    (name "texlive-breakcites")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/breakcites/"
+                   "tex/latex/breakcites/")
+             (base32
+              "12jiw135xi12k0f46zmza4jw141gq919c6q0ijv8xlic0wra4gyy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/breakcites")
+    (synopsis "Ensure that multiple citations may break at line end")
+    (description
+     "This packages makes a very minor change to the operation of the
+@code{\\cite} command so that multiple citations may break at line end.  Note
+that the change is not necessary in unmodified LaTeX; however, there remain
+packages that restore the undesirable behaviour of the command as provided in
+LaTeX 2.09.  Neither @code{cite} nor @code{natbib} make this mistake.")
+    ;; The file below states: "You may freely use, modify, and/or
+    ;; distribute this package without limitation."
+    (license (license:fsf-free "file://doc/latex/breakcites/README"))))
+
 (define-public texlive-bropd
   (package
     (name "texlive-bropd")
@@ -2455,6 +7390,90 @@ involving brackets and allow partial differentials to be expressed in an
 alternate form.")
     (license license:lppl1.3+)))
 
+(define-public texlive-brushscr
+  (package
+    (name "texlive-brushscr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/brushscr/"
+                   "dvips/brushscr/"
+                   "fonts/afm/public/brushscr/"
+                   "fonts/map/dvips/brushscr/"
+                   "fonts/tfm/public/brushscr/"
+                   "fonts/type1/public/brushscr/"
+                   "fonts/vf/public/brushscr/"
+                   "tex/latex/brushscr/")
+             (base32
+              "0kdikrlhbqfcnb42y5pz93l8wkzbrn7hx5gjf05vkchcxq24nj5x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/brushscr")
+    (synopsis "Handwriting script font")
+    (description
+     "The BrushScript font simulates hand-written characters; it is
+distributed in Adobe Type 1 format (but is available in italic shape only).
+The package includes the files needed by LaTeX in order to use that font.")
+    (license license:public-domain)))
+
+(define-public texlive-buctthesis
+  (package
+    (name "texlive-buctthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/buctthesis/"
+                   "source/xelatex/buctthesis/"
+                   "tex/xelatex/buctthesis/")
+             (base32
+              "0qy9wknd91cj8b5lpdah773xqn29k5i0vfycyhax8fxzy3ss6bri")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/buctthesis")
+    (synopsis "Beijing University of Chemical Technology thesis template")
+    (description
+     "This package provides a LaTeX class and template for Beijing University
+of Chemical Technology, supporting bachelor, master, and doctor theses.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-burmese
+  (package
+    (name "texlive-burmese")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/burmese/"
+                   "fonts/map/dvips/burmese/"
+                   "fonts/tfm/public/burmese/"
+                   "fonts/type1/public/burmese/"
+                   "source/fonts/burmese/"
+                   "tex/latex/burmese/")
+             (base32
+              "04d022k7bqc7092xhsda0h5ma18b24hkmn0b7mlblpd3zf4qhs79")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; The "birm.pl" script is located in the "source" part, and
+          ;; therefore will not appear in any output.  This phase forces its
+          ;; installation in "bin/" directory.
+          (add-after 'install 'install-script
+            (lambda _
+              (install-file "source/fonts/burmese/birm.pl"
+                            (string-append #$output "/bin")))))))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/burmese")
+    (synopsis "Basic support for writing Burmese")
+    (description
+     "This package provides basic support for writing Burmese.  The package
+provides a preprocessor (written in Perl), an Adobe Type 1 font, and LaTeX
+macros.")
+    ;; The package itself is under LPPL terms, but the preprocessor relies on
+    ;; Knuth's.
+    (license (list license:lppl license:knuth))))
+
 (define-public texlive-bussproofs-extra
   (package
     (name "texlive-bussproofs-extra")
@@ -2476,6 +7495,214 @@ alternate form.")
 entire (sub)deductions.")
     (license license:lppl1.3c)))
 
+(define-public texlive-bxbase
+  (package
+    (name "texlive-bxbase")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bxbase/" "tex/latex/bxbase/")
+             (base32
+              "19zhvwj55lihlj11mk322735z595al847wsg3p0s3a9zm17b0skk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bxbase")
+    (synopsis "BX bundle base components")
+    (description
+     "The main purpose of this bundle is to serve as an underlying library for
+other packages created by the same author.  However @code{bxbase} package
+contains a few user-level commands and is of some use by itself.")
+    (license license:expat)))
+
+(define-public texlive-bxcjkjatype
+  (package
+    (name "texlive-bxcjkjatype")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bxcjkjatype/"
+                   "tex/latex/bxcjkjatype/")
+             (base32
+              "1cnh1xdqcapahixzfxrrmadplkfrljh1vcdq7i3p4xdaclrbhzds")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bxcjkjatype")
+    (synopsis "Typeset Japanese with pdfLaTeX and CJK")
+    (description
+     "The package provides a working configuration of the CJK package,
+suitable for Japanese typesetting of moderate quality.  Moreover, it
+facilitates use of the CJK package for pLaTeX users, by providing commands
+that are similar to those used by the pLaTeX kernel and some other packages
+used with it.")
+    (license license:expat)))
+
+(define-public texlive-bxghost
+  (package
+    (name "texlive-bxghost")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bxghost/" "tex/latex/bxghost/")
+             (base32
+              "11hnnyd6h3r5fl9p23qj1zspwzgnamfah7xqj7l1prp6ygb322mn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bxghost")
+    (synopsis "Ghost insertion for proper @code{xkanjiskip}")
+    (description
+     "The package provides two commands to help authors for documents in
+Japanese to insert proper @code{xkanjiskips}.  It supports LuaTeX, XeTeX,
+pTeX, upTeX, and ApTeX (pTeX-ng).")
+    (license license:expat)))
+
+(define-public texlive-bxjaholiday
+  (package
+    (name "texlive-bxjaholiday")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bxjaholiday/"
+                   "tex/latex/bxjaholiday/")
+             (base32
+              "1n0h9g5lgaz00gn8wjai8w3pbg7bs02aaw7zi7h8l01i4lc8l1r1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bxjaholiday")
+    (synopsis "Support for Japanese holidays")
+    (description
+     "This LaTeX package provides a command to convert dates to names of
+Japanese holidays.  Another command, converting dates to the day of the week
+in Japanese, is available as a free gift.")
+    (license license:expat)))
+
+(define-public texlive-bxjalipsum
+  (package
+    (name "texlive-bxjalipsum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bxjalipsum/"
+                   "tex/latex/bxjalipsum/")
+             (base32
+              "1d71l9mrqc2lwzri5p97rfy0rdvj6jv2jpfm10grfpbwpln7big8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bxjalipsum")
+    (synopsis "Dummy text in Japanese")
+    (description
+     "This package enables users to print some Japanese text that can be used
+as dummy text.  It is a Japanese counterpart of the @code{lipsum} package.
+Since there is no well-known nonsense text like Lipsum in the Japanese
+language, the package uses some real text in public domain.")
+    (license license:expat)))
+
+(define-public texlive-bxjaprnind
+  (package
+    (name "texlive-bxjaprnind")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bxjaprnind/"
+                   "tex/latex/bxjaprnind/")
+             (base32
+              "0j2k06y63c7dgpcflrfrjy82g2746fnmpf8dk445lbqkbn1jypr5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bxjaprnind")
+    (synopsis "Adjust the position of parentheses at paragraph head")
+    (description
+     "In Japanese typesetting, opening parentheses placed at the beginning of
+paragraphs or lines are treated specially.  This package adjusts the position
+of parentheses accordingly.")
+    (license license:expat)))
+
+(define-public texlive-bxjatoucs
+  (package
+    (name "texlive-bxjatoucs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bxjatoucs/"
+                   "fonts/tfm/public/bxjatoucs/"
+                   "tex/latex/bxjatoucs/")
+             (base32
+              "1032lfp9qy4arzy06s5hkqlva7y182763wxfdql93yn68hcn85vd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bxjatoucs")
+    (synopsis "Convert Japanese character code to Unicode")
+    (description
+     "This package is meant for macro or package developers: it provides
+function-like macros that convert a character code value in one of several
+Japanese encodings to a Unicode value.  Supported source encodings are:
+ISO-2022-JP (jis), EUC-JP (euc), Shift_JIS (sjis), and the Adobe-Japan1 glyph
+set.")
+    (license license:expat)))
+
+(define-public texlive-bxjscls
+  (package
+    (name "texlive-bxjscls")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bxjscls/" "source/latex/bxjscls/"
+                   "tex/latex/bxjscls/")
+             (base32
+              "0bm9ab1j949v3ygnml8w0isx7yydq6jfq4ws3i0pf1rhs56m6rm0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bxjscls")
+    (synopsis "Japanese document class collection for all major engines")
+    (description
+     "This package provides an extended version of the Japanese document class
+collection provided by @code{jsclasses}.  While the original version supports
+only pLaTeX and upLaTeX, the extended version also supports pdfLaTeX, XeLaTeX
+and LuaLaTeX, with the aid of suitable packages that provide capability of
+Japanese typesetting.")
+    (license license:bsd-2)))
+
+(define-public texlive-bxorigcapt
+  (package
+    (name "texlive-bxorigcapt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bxorigcapt/"
+                   "tex/latex/bxorigcapt/")
+             (base32
+              "1gj61hjmyxsbfkrs1sh604b6dfl00kp39fcamlfzb8s197wsl9fv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bxorigcapt")
+    (synopsis "Retain the original caption names when using Babel")
+    (description
+     "This package forces the caption names declared by the document class in
+use to be used as the caption names for a specific language introduced by the
+Babel package.")
+    (license license:expat)))
+
+(define-public texlive-bxwareki
+  (package
+    (name "texlive-bxwareki")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bxwareki/" "tex/latex/bxwareki/")
+             (base32
+              "0qy1nsxi8ihhxdz5grp3nymsm2lfj5gf6wmky30fxizxya92ml2b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bxwareki")
+    (synopsis "Convert dates from Gregorian to Japanese calender")
+    (description
+     "This LaTeX package provides commands to convert from the Gregorian
+calendar to the Japanese rendering of the Japanese calendar.  You can choose
+whether the numbers are written in Western numerals or kanji numerals.  Note
+that the package only deals with dates in the year 1873 or later, where the
+Japanese calendar is really a Gregorian calendar with a different notation of
+years.")
+    (license license:expat)))
+
 (define-public texlive-bytefield
   (package
     (name "texlive-bytefield")
@@ -2517,6 +7744,48 @@ a packet or in memory.")
 in Python, C and Pascal.  Program source files may also be input.")
     (license license:public-domain)))
 
+(define-public texlive-c90
+  (package
+    (name "texlive-c90")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/enc/c90/" "fonts/enc/dvips/c90/"
+                   "source/fonts/enc/c90/")
+             (base32
+              "0g4rwimlqqzbbs8ar15nsf8qcr8bbyjacmklbgv4pmsls5ka9n3n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/c90")
+    (synopsis "C90 font encoding for Thai")
+    (description "This package provides C90 font encoding for Thai.")
+    (license license:gpl2+)))
+
+(define-public texlive-caladea
+  (package
+    (name "texlive-caladea")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/caladea/"
+                   "fonts/enc/dvips/caladea/"
+                   "fonts/map/dvips/caladea/"
+                   "fonts/tfm/huerta/caladea/"
+                   "fonts/truetype/huerta/caladea/"
+                   "fonts/type1/huerta/caladea/"
+                   "fonts/vf/huerta/caladea/"
+                   "tex/latex/caladea/")
+             (base32
+              "02pw132njvk23iwfwlfq5cbamqmgxap2h5pq23x3r8dbym1zpk9f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/caladea")
+    (synopsis "Support for the Caladea family of fonts")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Caladea family of fonts.")
+    (license (list license:asl2.0 license:lppl))))
+
 (define-public texlive-calculation
   (package
     (name "texlive-calculation")
@@ -2543,6 +7812,124 @@ at the side opposite to the equation numbers.  Calculations are allowed inside
 hints although numbering and commenting is then disabled.")
     (license license:lppl1.3+)))
 
+(define-public texlive-calligra
+  (package
+    (name "texlive-calligra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/calligra/"
+                   "fonts/source/public/calligra/"
+                   "fonts/tfm/public/calligra/")
+             (base32
+              "1h9w2qifsd0sjr2czy6zbyvgvdl72nd1sn2hmxv0jsmbcjqak1ib")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/calligra")
+    (synopsis "Calligraphic font")
+    (description
+     "This package provides a calligraphic font in the handwriting style.
+The font is supplied as Metafont source.  LaTeX support of the font is
+provided in the @code{calligra} package in the @code{fundus} bundle.")
+    (license license:expat)))
+
+(define-public texlive-calligra-type1
+  (package
+    (name "texlive-calligra-type1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/calligra-type1/"
+                   "fonts/afm/public/calligra-type1/"
+                   "fonts/map/dvips/calligra-type1/"
+                   "fonts/type1/public/calligra-type1/")
+             (base32
+              "1v6zwghf8q70lls3hmwj8gc0n6d4ffjf1xjvq1k6w71shiga8bqi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/calligra-type1")
+    (synopsis "Type 1 version of Calligra")
+    (description
+     "This is a Type 1 conversion of Peter Vanroose's Calligra handwriting
+font.")
+    (license license:expat)))
+
+(define-public texlive-cantarell
+  (package
+    (name "texlive-cantarell")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cantarell/"
+                   "fonts/enc/dvips/cantarell/"
+                   "fonts/map/dvips/cantarell/"
+                   "fonts/opentype/gnome/cantarell/"
+                   "fonts/tfm/gnome/cantarell/"
+                   "fonts/type1/gnome/cantarell/"
+                   "fonts/vf/gnome/cantarell/"
+                   "tex/latex/cantarell/")
+             (base32
+              "11cj8z6wyzq92x66alas88qgrs4ap0xgvf0yr7h62vg5ym3618c8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cantarell")
+    (synopsis "LaTeX support for the Cantarell font family")
+    (description
+     "Cantarell is a contemporary Humanist sans serif designed by Dave
+Crossland and Jakub Steiner.  The present package provides support for this
+font in LaTeX. It includes Type 1 versions of the fonts, converted for this
+package using FontForge from its sources, for full support with Dvips.")
+    (license (list license:silofl1.1 license:lppl1.3c))))
+
+(define-public texlive-carlito
+  (package
+    (name "texlive-carlito")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/carlito/"
+                   "fonts/enc/dvips/carlito/"
+                   "fonts/map/dvips/carlito/"
+                   "fonts/tfm/google/carlito/"
+                   "fonts/truetype/google/carlito/"
+                   "fonts/type1/google/carlito/"
+                   "fonts/vf/google/carlito/"
+                   "tex/latex/carlito/")
+             (base32
+              "14hk51bgwpn4wr843g7w8wjwmadq0ca86gviayhwsz4zax68jhx6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/carlito")
+    (synopsis "Support for Carlito sans-serif fonts")
+    (description
+     "The package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Carlito family of sans serif fonts, designed by Lukasz Dziedzic.")
+    (license license:silofl1.1)))
+
+(define-public texlive-carolmin-ps
+  (package
+    (name "texlive-carolmin-ps")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/carolmin-ps/"
+                   "fonts/afm/public/carolmin-ps/"
+                   "fonts/map/dvips/carolmin-ps/"
+                   "fonts/type1/public/carolmin-ps/")
+             (base32
+              "1867h17l0ms2schmbrsjm4gajfmckm2x7ny2ijd9vf232l7s1b53")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/carolmin-t1")
+    (synopsis "Adobe Type 1 format of Carolingian Minuscule fonts")
+    (description
+     "The bundle offers Adobe Type 1 format versions of Peter Wilson's
+Carolingian Minuscule font set (part of the @code{bookhands} collection).  The
+fonts in the bundle are ready-to-use replacements for the Metafont
+originals.")
+    (license license:lppl)))
+
 (define-public texlive-cartonaugh
   (package
     (name "texlive-cartonaugh")
@@ -2587,6 +7974,54 @@ constructions to present mathematical demonstrations with successive braces
 for the deductions.")
     (license license:lppl1.3+)))
 
+(define-public texlive-cascadia-code
+  (package
+    (name "texlive-cascadia-code")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cascadia-code/"
+                   "fonts/enc/dvips/cascadia-code/"
+                   "fonts/map/dvips/cascadia-code/"
+                   "fonts/opentype/public/cascadia-code/"
+                   "fonts/tfm/public/cascadia-code/"
+                   "fonts/type1/public/cascadia-code/"
+                   "fonts/vf/public/cascadia-code/"
+                   "tex/latex/cascadia-code/")
+             (base32
+              "1bcp2zw71aka47nc5wmi3196ypyr430ws1j63jnbzjaxnk2r63yw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cascadia-code")
+    (synopsis "Cascadia Code font with support for LaTeX and pdfLaTeX")
+    (description
+     "Cascadia Code is a monospaced font by Microsoft.  This package provides
+the Cascadia Code family of fonts with support for LaTeX and pdfLaTeX.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-cascadilla
+  (package
+    (name "texlive-cascadilla")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/cascadilla/"
+                   "doc/latex/cascadilla/"
+                   "tex/latex/cascadilla/")
+             (base32
+              "0sl29gxjhkakaz7r48wfbvcxngnxdyixmh5awxnlsmrajxgdzh9l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cascadilla")
+    (synopsis "Conform to the stylesheet of the Cascadilla Proceedings
+Project")
+    (description
+     "The class provides an extension of the standard LaTeX @code{article}
+class that may be used to typeset papers conforming to the stylesheet of the
+Cascadilla Proceedings Project, which is used by a number of linguistics
+conference proceedings.")
+    (license license:lppl)))
+
 (define-public texlive-catcodes
   (package
     (name "texlive-catcodes")
@@ -2683,6 +8118,136 @@ parameter value for style, another for a property).  User input to
 documents sharing the same notation.")
     (license license:lppl1.3c)))
 
+(define-public texlive-cell
+  (package
+    (name "texlive-cell")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/cell/" "doc/latex/cell/"
+                   "tex/latex/cell/")
+             (base32
+              "0x2dw80z0kzisbwnx2xrmsk0biqbanmydzygg9zdymhcx7w5rz52")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cell")
+    (synopsis "Bibliography style for Cell")
+    (description
+     "This is an APA-like style (cf.@: @file{apalike.bst} in the BibTeX
+distribution), developed from the same author's JMB style.  A supporting LaTeX
+package is also provided.")
+    (license license:public-domain)))
+
+(define-public texlive-cesenaexam
+  (package
+    (name "texlive-cesenaexam")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cesenaexam/"
+                   "source/latex/cesenaexam/"
+                   "tex/latex/cesenaexam/")
+             (base32
+              "05n61y7lqycnj22a80p5pa0ajr8c4zc5b73cc3c2x40w8yx85xcf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cesenaexam")
+    (synopsis "Class file to typeset exams")
+    (description
+     "This LaTeX document class has been designed to typeset exams.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-cfr-initials
+  (package
+    (name "texlive-cfr-initials")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cfr-initials/"
+                   "tex/latex/cfr-initials/")
+             (base32
+              "03isx6wck9q2nmn2gm6zmd1830d2v9bps5g1k9qw6y02wdac8az9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cfr-initials")
+    (synopsis "LaTeX packages for use of initials")
+    (description
+     "This is a set of 23 tiny packages designed to make it easier to use
+fonts from the initials package in LaTeX, e.g., with the @code{lettrine}
+package.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-cfr-lm
+  (package
+    (name "texlive-cfr-lm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cfr-lm/"
+                   "fonts/enc/dvips/cfr-lm/"
+                   "fonts/map/dvips/cfr-lm/"
+                   "fonts/tfm/public/cfr-lm/"
+                   "fonts/vf/public/cfr-lm/"
+                   "source/fonts/cfr-lm/"
+                   "tex/latex/cfr-lm/")
+             (base32
+              "06zsvbnpg93gw7m0nfsxc1hcqi6idgdc3xwwwy954fx13dpvrqfi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cfr-lm")
+    (synopsis "Enhanced support for the Latin Modern fonts")
+    (description
+     "The package supports a number of features of the Latin Modern fonts
+which are not easily accessible via the default (La)TeX support.  In
+particular, the package supports the use of the various styles of digits
+available, small-caps and upright italic shapes, and alternative weights and
+widths.  It also supports variable width typewriter and the @code{quotation}
+font.
+
+By default, the package uses proportional oldstyle digits and variable width
+typewriter but this can be changed by passing appropriate options to the
+package.  The package also supports using (for example) different styles of
+digits within a document so it is possible to use proportional oldstyle digits
+by default, say, but tabular lining digits within a particular table.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-chbibref
+  (package
+    (name "texlive-chbibref")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/chbibref/" "tex/latex/chbibref/")
+             (base32
+              "1k4cwy4z0kacikpvxkk3y68apw2x33sh06yccb1s894r1bn3c1qi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chbibref")
+    (synopsis "Change the Bibliography and References title")
+    (description
+     "This package defines a single command, @code{\\setbibref}, which sets
+whichever of @code{\\bibname} and @code{\\refname} is in use.")
+    (license license:lppl)))
+
+(define-public texlive-chem-journal
+  (package
+    (name "texlive-chem-journal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/chem-journal/")
+             (base32
+              "01s4sbmc4g96cmnbhx9a6bqjskkrr6saq91cly2pfy5gr256vmnq")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chem-journal")
+    (synopsis "Various BibTeX formats for journals in chemistry")
+    (description
+     "This package provides various BibTeX formats for journals in chemistry,
+including @emph{Reviews in Computational Chemistry}, @emph{Journal of Physical
+Chemistry}, @emph{Journal of Computational Chemistry}, and @emph{Physical
+Chemistry Chemical Physics}.")
+    (license license:gpl3+)))
+
 (define-public texlive-chemarrow
   (package
     (name "texlive-chemarrow")
@@ -2711,6 +8276,30 @@ in the font are designed to look more like those in chemistry text-books than
 do Knuth's originals.")
     (license license:public-domain)))
 
+(define-public texlive-chembst
+  (package
+    (name "texlive-chembst")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/chembst/" "doc/latex/chembst/"
+                   "source/latex/chembst/")
+             (base32
+              "026j8lv3kbxmbq6sc1n8rdrr47njgn5mn9im1mmppzk5bi7w6yzz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chembst")
+    (synopsis "Collection of BibTeX files for chemistry journals")
+    (description
+     "The package offers a collection of advanced BibTeX style files suitable
+for publications in chemistry journals.  Currently, style files for journals
+published by the American Chemical Society, Wiley-VCH and The Royal Society of
+Chemistry are available.  The style files support advanced features such as
+automatic formatting of errata or creating an appropriate entry for
+publications in @emph{Angewandte Chemie} where both English and German should
+be cited simultaneously.")
+    (license license:lppl)))
+
 (define-public texlive-chemcompounds
   (package
     (name "texlive-chemcompounds")
@@ -2962,6 +8551,312 @@ formatting chemistry documents according to the conventions of a number of
 leading journals.  It also provides some handy chemistry-related macros.")
     (license license:lppl1.3+)))
 
+(define-public texlive-cherokee
+  (package
+    (name "texlive-cherokee")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cherokee/"
+                   "fonts/source/public/cherokee/"
+                   "fonts/tfm/public/cherokee/"
+                   "tex/latex/cherokee/")
+             (base32
+              "0cganm5d4gnkkhandancyd915w2x9kskj9qg81y54jcfyjz8gp51")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/cherokee")
+    (synopsis "Font for the Cherokee script")
+    (description
+     "The Cherokee script was designed in 1821 by Segwoya.  The alphabet is
+essentially syllabic, only 6 characters (a e i o s u) correspond to Roman
+letters: the font encodes these to the corresponding roman letter.  The
+remaining 79 characters have been arbitrarily encoded in the range 38-122; the
+@code{cherokee} package provides commands that map each such syllable to the
+appropriate character.")
+    ;; "You may freely use, modify, and/or distribute this file, without
+    ;; limitation.  If you make significant additions or improvements,
+    ;; I request that you email me an updated version."
+    (license
+     (license:fsf-free "file://fonts/source/public/cherokee/cherokee.mf"))))
+
+(define-public texlive-chess
+  (package
+    (name "texlive-chess")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/chess/"
+                   "fonts/source/public/chess/"
+                   "fonts/tfm/public/chess/" "tex/latex/chess/")
+             (base32
+              "079naqw9bd5da3c2bsa0322kdjrfpwa35inrfznzgrfdk1w0irs7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/chess")
+    (synopsis "Fonts for typesetting chess boards")
+    (description
+     "This is the original, and somewhat dated, TeX chess font package.
+Potential users should consider @code{skak} (for alternative fonts, and
+notation support), @code{texmate} (for alternative notation support), or
+@code{chessfss} (for flexible font choices).")
+    (license license:public-domain)))
+
+(define-public texlive-chess-problem-diagrams
+  (package
+    (name "texlive-chess-problem-diagrams")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/chess-problem-diagrams/"
+                   "source/latex/chess-problem-diagrams/"
+                   "tex/latex/chess-problem-diagrams/")
+             (base32
+              "0m32dhwdfrgy1r3lq8j7hdaa79kniwwq3lanbkkn32dhybwa0b61")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chess-problem-diagrams")
+    (synopsis "Package for typesetting chess problem diagrams")
+    (description
+     "This package provides macros to typeset chess problem diagrams including
+fairy chess problems (mostly using rotated images of pieces) and other
+boards.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-chessboard
+  (package
+    (name "texlive-chessboard")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/chessboard/"
+                   "source/latex/chessboard/"
+                   "tex/latex/chessboard/")
+             (base32
+              "1nz66h6baz5m2jfzjzyccw0rcpkc6rfbq9cc759y875b47j8pkhx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chessboard")
+    (synopsis "Print chess boards")
+    (description
+     "This package offers commands to print chessboards.  It can print partial
+boards, hide pieces and fields, color the boards and put various marks on the
+board.  It has a lot of options to place pieces on the board.  Using exotic
+pieces (e.g., for fairy chess) is possible.")
+    (license license:lppl)))
+
+(define-public texlive-chessfss
+  (package
+    (name "texlive-chessfss")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/chessfss/"
+                   "fonts/enc/dvips/chessfss/"
+                   "source/latex/chessfss/"
+                   "tex/latex/chessfss/")
+             (base32
+              "1l51famz3zx9v4v0mdxwk51xhaidwgfplf268q2f1ipif9h6ma5d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chessfss")
+    (synopsis "Package to handle chess fonts")
+    (description
+     "This package offers commands to use and switch between chess fonts.
+It uses the LaTeX font selection scheme (nfss).  The package doesn't parse,
+format and print PGN input like e.g., the packages @code{skak} or
+@code{texmate}; the aim of the package is to offer writers of chess packages
+a bundle of commands for fonts, so that they don't have to implement all these
+commands for themselves.  A normal user can use the package to print
+e.g,. single chess symbols and simple diagrams.")
+    (license license:lppl)))
+
+(define-public texlive-chhaya
+  (package
+    (name "texlive-chhaya")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/chhaya/" "source/latex/chhaya/"
+                   "tex/latex/chhaya/")
+             (base32
+              "1if47icrsy56sjza170cxcpcczwfh9k8jl7j22gwwam4msa4d1if")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chhaya")
+    (synopsis "Linguistic glossing in Marathi language")
+    (description
+     "This package provides macros for linguistic glossing as per the rules
+given by Mumbai University.")
+    (license (list license:gpl3+
+                   ;; Aalok (आलोक) copyleft license v1.0+.
+                   (license:fsf-free "file://doc/latex/aalok/README.txt")
+                   license:fdl1.3+))))
+
+(define-public texlive-chicago
+  (package
+    (name "texlive-chicago")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/chicago/" "tex/latex/chicago/")
+             (base32
+              "0mwrphf2g7v5yc0qij76dkzalgm3fhcm8zs7akgaypyk98cvxw8k")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chicago")
+    (synopsis "Chicago bibliography style")
+    (description
+     "Chicago is a BibTeX style that follows the @samp{B} reference style of
+the 13th Edition of the Chicago manual of style; a LaTeX package is also
+provided.  The style was derived from the @code{newapa} style.")
+    (license license:knuth)))
+
+(define-public texlive-chicago-annote
+  (package
+    (name "texlive-chicago-annote")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/chicago-annote/"
+                   "doc/bibtex/chicago-annote/")
+             (base32
+              "16hqz4xf7mbnrnx8420ynykxr1l3slfvjq8d8s0mrw42v88965ni")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chicago-annote")
+    (synopsis "Chicago-based annotated BibTeX style")
+    (description
+     "This is a revision of chicagoa.bst, using the commonly-used annote field
+in place of the original's annotation.")
+    (license license:lppl)))
+
+(define-public texlive-chicagoa
+  (package
+    (name "texlive-chicagoa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/chicagoa/")
+             (base32
+              "1za4fqlpirbr3qs894abnlwmrhsqbahniyyimy1dxal0cp61cfil")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chicagoa")
+    (synopsis "Chicago bibliography style with annotations")
+    (description
+     "This is a modification of the author's @code{chicago} style, to support
+an annotation field in bibliographies.")
+    (license license:knuth)))
+
+(define-public texlive-chifoot
+  (package
+    (name "texlive-chifoot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/chifoot/" "tex/latex/chifoot/")
+             (base32
+              "07hxfiasfbnmvq367nnjg56n21wxdw0r6i7bl5l4gxa0j9jvmpf0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chifoot")
+    (synopsis "Chicago-style footnote formatting")
+    (description
+     "This package provides a very short snippet that sets the footnotes to be
+conformant with the Chicago style, so the footnotes at the bottom of the page
+are now marked with a full-sized number, rather than with a superscript
+number.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-chinesechess
+  (package
+    (name "texlive-chinesechess")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/chinesechess/"
+                   "tex/latex/chinesechess/")
+             (base32
+              "15sszrrv1viaa74i57a81xhybhjq2vaxb188wl728hjzm8d0n0wm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chinesechess")
+    (synopsis "Typeset Chinese chess with @code{l3draw}")
+    (description
+     "This LaTeX3 package based on @code{l3draw} provides macros and an
+environment for Chinese chess manual writing.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-chivo
+  (package
+    (name "texlive-chivo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/chivo/"
+                   "fonts/enc/dvips/chivo/"
+                   "fonts/map/dvips/chivo/"
+                   "fonts/opentype/public/chivo/"
+                   "fonts/tfm/public/chivo/"
+                   "fonts/type1/public/chivo/"
+                   "fonts/vf/public/chivo/"
+                   "source/fonts/chivo/"
+                   "tex/latex/chivo/")
+             (base32
+              "0dvcz42rw2y33amrjikgicy9r4c6m0c4cvv2h0sm7k5bympnj8w0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chivo")
+    (synopsis "Using the Chivo fonts with LaTeX")
+    (description
+     "This work provides the necessary files to use the Chivo fonts with
+LaTeX.  Chivo is a set of eight fonts provided by Hector Gatti and Omnibus
+Team.")
+    (license (list license:silofl1.1 license:lppl1.3c))))
+
+(define-public texlive-chordbars
+  (package
+    (name "texlive-chordbars")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/chordbars/"
+                   "tex/latex/chordbars/")
+             (base32
+              "0pyxnjalrmkan3mjir6w3g3xhgyzzbjkjhxz460p1nm8n5ng05xq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chordbars")
+    (synopsis "Print chord grids for pop/jazz tunes")
+    (description
+     "This Tikz-based music-related package is targeted at pop/jazz
+guitar/bass/piano musicians.  They usually need only the chords and the song
+structure.  This package produces rectangular song patterns with one square
+per bar, with the chord shown inside the square.  It also handles the song
+structure by showing the bar count and the repetitions of the patterns.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-chordbox
+  (package
+    (name "texlive-chordbox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/chordbox/" "tex/latex/chordbox/")
+             (base32
+              "01css8dnzss7s711ry2rs2fi3bw70s0lgj0cwwdicjgi331zbq70")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chordbox")
+    (synopsis "Draw chord diagrams")
+    (description
+     "This package provides two macros for drawing chord diagrams, as may be
+found for example in chord charts/books and educational materials.  They are
+composed as TikZ pictures and have several options to modify their
+appearance.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-chronosys
   (package
     (name "texlive-chronosys")
@@ -2981,6 +8876,498 @@ leading journals.  It also provides some handy chemistry-related macros.")
 Interfaces for Plain TeX, ConTeXt and LaTeX are provided.")
     (license license:lppl1.3+)))
 
+(define-public texlive-chs-physics-report
+  (package
+    (name "texlive-chs-physics-report")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/chs-physics-report/"
+                   "tex/latex/chs-physics-report/")
+             (base32
+              "195f66yffi96qkrxb044mcaycyds0mp3fg3c3lhz1mpvbz0calpl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chs-physics-report")
+    (synopsis "Physics lab reports for Carmel High School")
+    (description
+     "This package may optionally be used by students at Carmel High School in
+Indiana in the United States to write physics lab reports for FW physics
+courses.  As many students are beginners at LaTeX, it also attempts to
+simplify the report-writing process by offering macros for commonly used
+notation and by automatically formatting the documents for students who will
+only use TeX for mathematics and not typesetting.")
+    (license (list license:public-domain license:cc-by-sa3.0))))
+
+(define-public texlive-chscite
+  (package
+    (name "texlive-chscite")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/chscite/" "doc/latex/chscite/"
+                   "source/latex/chscite/" "tex/latex/chscite/")
+             (base32
+              "0q4mgvrbljbw7pmwjs4qcr91sfhbnbshhmygxqrkriyrfnqy6yfq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/chscite")
+    (synopsis "Bibliography style for Chalmers University of Technology")
+    (description
+     "The package, heavily based on the harvard package for Harvard-style
+citations, provides a citation suite for students at Chalmers University of
+Technology that follows given recommendations.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-churchslavonic
+  (package
+    (name "texlive-churchslavonic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/churchslavonic/"
+                   "tex/latex/churchslavonic/")
+             (base32
+              "1qyxyp0ckizrryvqyz8cz066g9vvz01ki6b50sm5hk44b6b4v3ri")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etoolbox
+           texlive-fonts-churchslavonic
+           texlive-hyphen-complete
+           texlive-oberdiek
+           texlive-xcolor))
+    (home-page "https://ctan.org/pkg/churchslavonic")
+    (synopsis "Typeset documents in Church Slavonic language using Unicode")
+    (description
+     "The package provides fonts, hyphenation patterns, and supporting macros
+to typeset Church Slavonic texts.")
+    (license license:expat)))
+
+(define-public texlive-cinzel
+  (package
+    (name "texlive-cinzel")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cinzel/"
+                   "fonts/enc/dvips/cinzel/"
+                   "fonts/map/dvips/cinzel/"
+                   "fonts/tfm/ndiscovered/cinzel/"
+                   "fonts/truetype/ndiscovered/cinzel/"
+                   "fonts/type1/ndiscovered/cinzel/"
+                   "fonts/vf/ndiscovered/cinzel/"
+                   "tex/latex/cinzel/")
+             (base32
+              "0qik1ji23w35350ajjxz5w39w1cy4lg582343nrhr9y8jl18kfap")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cinzel")
+    (synopsis "LaTeX support for Cinzel and Cinzel Decorative fonts")
+    (description
+     "Cinzel and Cinzel Decorative fonts, designed by Natanael Gama,
+find their inspiration in first century roman inscriptions, and are based on
+classical proportions.  Cinzel is all-caps (similar to Trajan and
+Michelangelo), but is available in three weights (Regular, Bold, Black).
+There are no italic fonts, but there are Decorative variants, which can be
+selected by the usual italic-selection commands in the package's LaTeX
+support.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-citation-style-language
+  (package
+    (name "texlive-citation-style-language")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/citation-style-language/"
+                   "doc/man/man1/citeproc-lua.1"
+                   "doc/man/man1/citeproc-lua.man1.pdf"
+                   "scripts/citation-style-language/"
+                   "tex/latex/citation-style-language/")
+             (base32
+              "13342c9kq5zy9a6kag81xfa38dydmimhcnb11jx7d8il6g0pd46w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "citeproc-lua.lua")))
+    (propagated-inputs
+     (list texlive-filehook
+           texlive-l3kernel
+           texlive-l3packages
+           texlive-lua-uca
+           texlive-lualibs
+           texlive-luatex
+           texlive-luaxml
+           texlive-url))
+    (home-page "https://ctan.org/pkg/citation-style-language")
+    (synopsis "Bibliography formatting with Citation Style Language")
+    (description
+     "The Citation Style Language (CSL) is an XML-based language that defines
+the formats of citations and bibliography.  There are currently thousands of
+styles in CSL including the most widely used APA, Chicago, Vancouver, etc.
+The citation-style-language package is aimed to provide another reference
+formatting method for LaTeX that utilizes the CSL styles.  It contains
+a citation processor implemented in pure Lua (@code{citeproc-lua}) which reads
+bibliographic metadata and performs sorting and formatting on both citations
+and bibliography according to the selected CSL style.  A LaTeX package
+(@file{citation-style-language.sty}) is provided to communicate with the
+processor.")
+    (license (list license:expat license:cc-by-sa3.0))))
+
+(define-public texlive-citeall
+  (package
+    (name "texlive-citeall")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/citeall/" "tex/latex/citeall/")
+             (base32
+              "0sap2kns1b51zj0dmy70q77rw7dnhdjqab0rmyvpp2hgq5yk3mhq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/citeall")
+    (synopsis "Cite all entries of a @file{.bbl} created with BibLaTeX")
+    (description
+     "This small package allows to cite all entries of
+a BibLaTeX (@file{.bbl}) file.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-citeref
+  (package
+    (name "texlive-citeref")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/citeref/" "tex/latex/citeref/")
+             (base32
+              "0k76msdfsf968cv3m1z8lcf6mlmy90gaaphrgkr7cs67pgyvq6jq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/citeref")
+    (synopsis "Add reference-page-list to bibliography-items")
+    (description
+     "The package adds reference-page-list to bibliography-items.  It does its
+job without using the indexing facilities, and needs no special
+@code{\\cite}-replacement package.")
+    (license license:bsd-4)))
+
+(define-public texlive-cje
+  (package
+    (name "texlive-cje")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/cje/" "doc/latex/cje/"
+                   "tex/latex/cje/")
+             (base32
+              "0mxd9z2myzj1pixv4rqib1l6ixj0lq0vy7izgl1gx7k5bwxq945m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cje")
+    (synopsis "LaTeX document class for CJE articles")
+    (description
+     "The @code{cje} article class allows authors to format their papers to
+@emph{Canadian Journal of Economics} style with minimum effort.  The class
+includes options for two other formats: @code{review} (double spaced, for use
+at the submission stage) and @code{proof} (used by the typesetters to prepare
+the proof authors will receive for approval).")
+    (license license:lppl1.3c)))
+
+(define-public texlive-cjhebrew
+  (package
+    (name "texlive-cjhebrew")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cjhebrew/"
+                   "fonts/afm/public/cjhebrew/"
+                   "fonts/enc/dvips/cjhebrew/"
+                   "fonts/map/dvips/cjhebrew/"
+                   "fonts/tfm/public/cjhebrew/"
+                   "fonts/type1/public/cjhebrew/"
+                   "fonts/vf/public/cjhebrew/"
+                   "tex/latex/cjhebrew/")
+             (base32
+              "00rf55ck8y1ny1v242sbhcfchnq7q5mlsmmqppgqspd892ymlxh0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cjhebrew")
+    (synopsis "Typeset Hebrew with LaTeX")
+    (description
+     "The @code{cjhebrew} package provides Adobe Type 1 fonts for Hebrew, and
+LaTeX macros to support their use.  Hebrew text can be vocalised, and a few
+accents are also available.  The package makes it easy to include Hebrew text
+in other-language documents.")
+    (license license:lppl)))
+
+(define-public texlive-cjk
+  (package
+    (name "texlive-cjk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cjk/"
+                   "source/latex/cjk/contrib/wadalab/"
+                   "source/latex/cjk/texinput/KS/HLaTeX/"
+                   "source/latex/cjk/utils/"
+                   "tex/latex/cjk/contrib/wadalab/"
+                   "tex/latex/cjk/texinput/"
+                   "tex/latex/cjk/utils/pyhyphen/")
+             (base32
+              "044r1mmszq3hjmlck87vmqp62j2z02bm7lda8wb17phs0grkws5z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-arphic
+           texlive-cns
+           texlive-garuda-c90
+           texlive-norasi-c90
+           texlive-uhc
+           texlive-wadalab))
+    (home-page "https://ctan.org/pkg/cjk")
+    (synopsis "CJK language support")
+    (description
+     "CJK is a macro package for LaTeX, providing simultaneous support for
+various Asian scripts in many encodings (including Unicode): Chinese (both
+traditional and simplified), Japanese, Korean and Thai.  A special add-on
+feature is an interface to the Emacs editor (@file{cjk-enc.el}) which gives
+simultaneous, easy-to-use support to a bunch of other scripts in addition to
+the above -- Cyrillic, Greek, Latin-based scripts, Russian and Vietnamese are
+supported.")
+    (license license:gpl2)))
+
+(define-public texlive-cjk-gs-integrate
+  (package
+    (name "texlive-cjk-gs-integrate")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cjk-gs-integrate/"
+                   "fonts/misc/cjk-gs-integrate/"
+                   "scripts/cjk-gs-integrate/"
+                   "source/fonts/cjk-gs-integrate/")
+             (base32
+              "0ml35bs1pr3kbdqnbclyy31ln8yigy609rsm9rc2y3j5ngmw2y8y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "cjk-gs-integrate.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/cjk-gs-integrate")
+    (synopsis "Tools to integrate CJK fonts into Ghostscript")
+    (description
+     "This script searches a list of directories for CJK fonts, and makes them
+available to an installed Ghostscript.  In the simplest case, with sufficient
+privileges, a run without arguments should result in a complete setup of
+Ghostscript.")
+    (license license:gpl3)))
+
+(define-public texlive-cjk-ko
+  (package
+    (name "texlive-cjk-ko")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cjk-ko/" "tex/latex/cjk-ko/")
+             (base32
+              "0z94rrbr56kybvxx37hpncc0rj4v4i44kyb9nc42nb7854y8zl0a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-cjk))
+    (home-page "https://ctan.org/pkg/cjk-ko")
+    (synopsis "Extension of the CJK package for Korean typesetting")
+    (description
+     "The package supports typesetting UTF-8-encoded modern Korean documents
+with the help of the LaTeX2e CJK package.  It provides some enhanced features
+focused on Korean typesetting culture, one of them being allowing line-break
+between Latin and CJK characters.")
+    (license (list license:gpl3+ license:lppl license:public-domain))))
+
+(define-public texlive-cjkpunct
+  (package
+    (name "texlive-cjkpunct")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cjkpunct/"
+                   "source/latex/cjkpunct/"
+                   "tex/latex/cjkpunct/")
+             (base32
+              "0l4jnawgcsq7lzsrky7259diswxm06mn9mvgxgw8j0za10kvv4vb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cjkpunct")
+    (synopsis "Adjust locations and kerning of CJK punctuation marks")
+    (description "The package serves as a companion package for CJK.  It
+adjust locations and kerning of CJK punctuation marks.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-cjkutils
+  (package
+    (name "texlive-cjkutils")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/bg5conv.1"
+                   "doc/man/man1/bg5conv.man1.pdf"
+                   "doc/man/man1/cef5conv.1"
+                   "doc/man/man1/cef5conv.man1.pdf"
+                   "doc/man/man1/cefconv.1"
+                   "doc/man/man1/cefconv.man1.pdf"
+                   "doc/man/man1/cefsconv.1"
+                   "doc/man/man1/cefsconv.man1.pdf"
+                   "doc/man/man1/extconv.1"
+                   "doc/man/man1/extconv.man1.pdf"
+                   "doc/man/man1/hbf2gf.1"
+                   "doc/man/man1/hbf2gf.man1.pdf"
+                   "doc/man/man1/sjisconv.1"
+                   "doc/man/man1/sjisconv.man1.pdf"
+                   "hbf2gf/")
+             (base32
+              "0by2g05xv5dndnd78jz9y73fyswqhfvcbzcw8rzhvpvd6inrcdq8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cjk")
+    (synopsis "CJK language support")
+    (description
+     "CJK is a macro package for LaTeX, providing simultaneous support for
+various Asian scripts in many encodings (including Unicode): Chinese (both
+traditional and simplified), Japanese, Korean and Thai.  A special add-on
+feature is an interface to the Emacs editor (cjk-enc.el) which gives
+simultaneous, easy-to-use support to a bunch of other scripts in addition to
+the above --- Cyrillic, Greek, Latin-based scripts, Russian and Vietnamese are
+supported.")
+    (license license:gpl2)))
+
+(define-public texlive-clara
+  (package
+    (name "texlive-clara")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/clara/"
+                   "fonts/enc/dvips/clara/"
+                   "fonts/map/dvips/clara/"
+                   "fonts/opentype/public/clara/"
+                   "fonts/tfm/public/clara/"
+                   "fonts/type1/public/clara/"
+                   "fonts/vf/public/clara/"
+                   "tex/latex/clara/")
+             (base32
+              "182iw362irf247frsy0dzrswnh1341jlwrlwhvx1hcrbrvhpbz42")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/clara")
+    (synopsis "Clara serif font family")
+    (description
+     "Clara is a type family created specially by Seamas O Brogain.  The
+family includes italic, bold, bold italic, and small capitals, while the
+character set includes (monotonic) Greek, Cyrillic, ogham, phonetic and
+mathematical ranges, scribal abbreviations and other specialist characters.
+The fonts also include some OpenType features (such as ligature substitution,
+small capitals, and old-style numerals) and variant forms for particular
+languages.")
+    (license (list license:silofl1.1 license:gpl2+))))
+
+(define-public texlive-classicthesis
+  (package
+    (name "texlive-classicthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/classicthesis/"
+                   "tex/latex/classicthesis/")
+             (base32
+              "0djx7vcrc1ksbgppdbwy31z5qd95flgsgqk6gpzpi3a5rc7h54nz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/classicthesis")
+    (synopsis "Classically styled thesis package")
+    (description
+     "This package provides an elegant layout designed in homage to
+Bringhurst's @emph{The Elements of Typographic Style}.  It makes use of
+a range of techniques to get the best results achievable using TeX.  Included
+in the bundle are templates to make thesis writing easier.")
+    (license license:gpl2+)))
+
+(define-public texlive-cleanthesis
+  (package
+    (name "texlive-cleanthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cleanthesis/"
+                   "tex/latex/cleanthesis/")
+             (base32
+              "11fv49w1nydm5fvkp1p2375ywdfd5yh8hayqfnr6wdidzdycpg85")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cleanthesis")
+    (synopsis "Clean LaTeX style for thesis documents")
+    (description
+     "The package offers a clean, simple, and elegant LaTeX style for thesis
+documents.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-clearsans
+  (package
+    (name "texlive-clearsans")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/clearsans/"
+                   "fonts/enc/dvips/clearsans/"
+                   "fonts/map/dvips/clearsans/"
+                   "fonts/tfm/intel/clearsans/"
+                   "fonts/truetype/intel/clearsans/"
+                   "fonts/type1/intel/clearsans/"
+                   "fonts/vf/intel/clearsans/"
+                   "tex/latex/clearsans/")
+             (base32
+              "1sf84xxvq9rxb3n5nsggfswvdagynnz6clazk86w4k2a5r0qf8yw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/clearsans")
+    (synopsis "Clear Sans fonts with LaTeX support")
+    (description
+     "Clear Sans was designed by Daniel Ratighan.  It is available in three
+weights (regular, medium, and bold) with corresponding italics, plus light and
+thin upright (without italics).
+
+It has minimized, unambiguous characters and slightly narrow proportions,
+making it ideal for UI design.  Its strong, recognizable forms avoid
+distracting ambiguity, making Clear Sans comfortable for reading short UI
+labels and long passages in both screen and print.  The fonts are available in
+both TrueType and Type 1 formats.")
+    (license (list license:asl2.0 license:lppl))))
+
+(define-public texlive-cleveref
+  (package
+    (name "texlive-cleveref")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cleveref/"
+                   "source/latex/cleveref/"
+                   "tex/latex/cleveref/")
+             (base32
+              "18r8g6ipn1ly60gnp0yi0m409gm8lssbpmka5813i4l45281fk43")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cleveref")
+    (synopsis "Intelligent cross-referencing")
+    (description
+     "The package enhances LaTeX's cross-referencing features, allowing the
+format of references to be determined automatically according to the type of
+reference.  The formats used may be customised in the preamble of a document;
+Babel support is available (though the choice of languages remains limited:
+currently Danish, Dutch, English, French, German, Italian, Norwegian, Russian,
+Spanish and Ukranian).
+
+The package also offers a means of referencing a list of references, each
+formatted according to its type.  In such lists, it can collapse sequences of
+numerically-consecutive labels to a reference range.")
+    (license license:lppl1.2+)))
+
 (define-public texlive-clrscode
   (package
     (name "texlive-clrscode")
@@ -3024,6 +9411,266 @@ the same way the package's author did when writing the book, and your output
 will look just like the pseudocode in the text.")
     (license license:lppl)))
 
+(define-public texlive-cm-mf-extra-bold
+  (package
+    (name "texlive-cm-mf-extra-bold")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/source/public/cm-mf-extra-bold/"
+                   "fonts/tfm/public/cm-mf-extra-bold/")
+             (base32
+              "1l1cm32z8wcpj0cl7czqkhnwil3ail7a2bbzn70dnswpj0ka8k9n")))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/cm-mf-extra-bold")
+    (synopsis "Extra Metafont files for CM")
+    (description
+     "The bundle provides bold versions of @code{cmcsc}, @code{cmex},
+@code{cmtex} and @code{cmtt} fonts (all parts of the standard Computer Modern
+font distribution), as Metafont base files.")
+    (license (list license:gpl3+ license:public-domain))))
+
+(define-public texlive-cm-unicode
+  (package
+    (name "texlive-cm-unicode")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cm-unicode/"
+                   "fonts/afm/public/cm-unicode/"
+                   "fonts/enc/dvips/cm-unicode/"
+                   "fonts/map/dvips/cm-unicode/"
+                   "fonts/opentype/public/cm-unicode/"
+                   "fonts/type1/public/cm-unicode/")
+             (base32
+              "15ysic6vah1wircybhpm9915mr1bbc8b2jalia86ajiqbxn2l9h0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cm-unicode")
+    (synopsis "Computer Modern Unicode font family")
+    (description
+     "This package provides Computer Modern Unicode fonts.  Some characters in
+several fonts are copied from Blue Sky Type 1 fonts released by AMS.
+Currently the fonts contain glyphs from Latin, Cyrillic, Greek code sets and
+IPA extensions.  This font set contains 33 fonts.  This archive contains AFM,
+PFB and OTF versions; the OTF version of the Computer Modern Unicode fonts
+works with TeX engines that directly support OpenType features, such as XeTeX
+and LuaTeX.")
+    (license license:silofl1.1)))
+
+(define-public texlive-cmathbb
+  (package
+    (name "texlive-cmathbb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cmathbb/"
+                   "fonts/enc/dvips/cmathbb/"
+                   "fonts/map/dvips/cmathbb/"
+                   "fonts/tfm/public/cmathbb/"
+                   "fonts/type1/public/cmathbb/"
+                   "fonts/vf/public/cmathbb/"
+                   "tex/latex/cmathbb/")
+             (base32
+              "1pmzsaskwcbyjihidy7hvz7s2cixhl7ccy0c9cbh2cm3md6gdrqh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cmathbb")
+    (synopsis "Computer modern mathematical blackboard bold font")
+    (description
+     "This font contains all digits and latin letters uppercase and lowercase
+for the Computer Modern font family in blackboard bold.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-cmll
+  (package
+    (name "texlive-cmll")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cmll/"
+                   "fonts/map/dvips/cmll/"
+                   "fonts/source/public/cmll/"
+                   "fonts/tfm/public/cmll/"
+                   "fonts/type1/public/cmll/"
+                   "source/latex/cmll/"
+                   "tex/latex/cmll/")
+             (base32
+              "13q5ar2zaf7h6f2mzgxxqzaraziwl6asicbnyq6anfv2ky38rd72")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (native-inputs (list texlive-euxm texlive-metafont))
+    (home-page "https://ctan.org/pkg/cmll")
+    (synopsis "Symbols for linear logic")
+    (description
+     "This is a very small font set that contain some symbols useful in linear
+logic, which are apparently not available elsewhere.  Variants are included
+for use with Computer Modern serif and sans-serif and with the AMS Euler
+series.  The font is provided both as Metafont source, and in Adobe Type
+1 format.  LaTeX support is provided.")
+    (license license:lppl)))
+
+(define-public texlive-cmpica
+  (package
+    (name "texlive-cmpica")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cmpica/"
+                   "fonts/source/public/cmpica/"
+                   "fonts/tfm/public/cmpica/")
+             (base32
+              "0gpj2i588h6d0b5cl4xaik9nyx7w1sd8wik5q4mgmzspbkdk5a04")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/cmpica")
+    (synopsis "Computer Modern Pica variant")
+    (description
+     "This is an approximate equivalent of the Xerox Pica typeface; the font
+is optimised for submitting fiction manuscripts to mainline publishers.  The
+font is a fixed-width one, rather less heavy than Computer Modern typewriter.
+Emphasis for bold-face comes from a wavy underline of each letter.  The two
+fonts are supplied as Metafont source.")
+    (license license:public-domain)))
+
+(define-public texlive-cmpj
+  (package
+    (name "texlive-cmpj")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/cmpj/" "doc/latex/cmpj/"
+                   "tex/latex/cmpj/")
+             (base32
+              "1drmil2vba85wa7ykrma452hwh7ggzsq33zrhch7rjnqaw7xihwv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cmpj")
+    (synopsis "Style for the journal @emph{Condensed Matter Physics}")
+    (description
+     "The package contains macros and some documentation for typesetting
+papers for submission to the @emph{Condensed Matter Physics} journal published
+by the Institute for Condensed Matter Physics of the National Academy of
+Sciences of Ukraine.")
+    (license license:lppl)))
+
+(define-public texlive-cmsrb
+  (package
+    (name "texlive-cmsrb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cmsrb/"
+                   "fonts/afm/public/cmsrb/"
+                   "fonts/enc/dvips/cmsrb/"
+                   "fonts/map/dvips/cmsrb/"
+                   "fonts/tfm/public/cmsrb/"
+                   "fonts/type1/public/cmsrb/"
+                   "fonts/vf/public/cmsrb/"
+                   "tex/latex/cmsrb/")
+             (base32
+              "0f6ylk8n881sl0njbz7yqy98pbk51s6m73zldcsz2w62qnghd1x0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cmsrb")
+    (synopsis "Computer Modern for Serbian and Macedonian")
+    (description
+     "This package provides provides Adobe Type 1 Computer Modern fonts for
+the Serbian and Macedonian languages.  Although the @code{cm-super} package
+provides great support for Cyrillic script in various languages, there remains
+a problem with italic variants of some letters for Serbian and Macedonian.
+This package includes the correct shapes for italic letters @code{\\cyrb},
+@code{\\cyrg}, @code{\\cyrd}, @code{\\cyrp}, and @code{\\cyrt}.  It also
+offers some improvements in letters and accents used in the Serbian language.
+Supported encodings are: T1, T2A, TS1, X2 and OT2.  The OT2 encoding is
+modified so that it is now easy to transcribe Latin text to Cyrillic.")
+    (license license:gpl3+)))
+
+(define-public texlive-cmtiup
+  (package
+    (name "texlive-cmtiup")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cmtiup/"
+                   "fonts/source/public/cmtiup/"
+                   "fonts/tfm/public/cmtiup/"
+                   "fonts/vf/public/cmtiup/"
+                   "tex/latex/cmtiup/")
+             (base32
+              "0cdm10aybgc8ifi11fahl3hb18blmibk08b4b5m8q88150ic563r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/cmtiup")
+    (synopsis "Upright punctuation with CM italic")
+    (description
+     "The @code{cmtiup} fonts address a problem with the appearance of
+punctuation in italic text in mathematical documents.  To achieve this, all
+punctuation characters are upright, and kerning between letters and
+punctuation is adjusted to allow for the italic correction.  The fonts are
+implemented as a set of @file{.vf} files; a package for support in LaTeX is
+provided.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-cmupint
+  (package
+    (name "texlive-cmupint")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cmupint/"
+                   "fonts/afm/public/cmupint/"
+                   "fonts/map/dvips/cmupint/"
+                   "fonts/source/public/cmupint/"
+                   "fonts/tfm/public/cmupint/"
+                   "fonts/type1/public/cmupint/"
+                   "tex/latex/cmupint/")
+             (base32
+              "1acgzx5b02900vzwvaq0j8w6x8jc1650kfhp992f3bcyd658aj62")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/cmupint")
+    (synopsis "Upright integral symbols for Computer Modern")
+    (description
+     "This package contains various upright integral symbols to match the
+Computer Modern font.")
+    (license license:lppl)))
+
+(define-public texlive-cochineal
+  (package
+    (name "texlive-cochineal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cochineal/"
+                   "fonts/afm/public/cochineal/"
+                   "fonts/enc/dvips/cochineal/"
+                   "fonts/map/dvips/cochineal/"
+                   "fonts/opentype/public/cochineal/"
+                   "fonts/tfm/public/cochineal/"
+                   "fonts/type1/public/cochineal/"
+                   "fonts/vf/public/cochineal/"
+                   "tex/latex/cochineal/")
+             (base32
+              "04kziysq9szhz3brwkqwnjmvy3m0wnb3mhp86h8l7qwgndzx9j8w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cochineal")
+    (synopsis "Cochineal fonts with LaTeX support")
+    (description
+     "Cochineal is a fork from the Crimson fonts (Roman, Italic, Bold,
+@code{BoldItalic} only), which contain roughly 4200 glyphs in the four styles
+mentioned above.  Cochineal adds more than 1500 glyphs in those styles so that
+it is possible to make a TeX support collection that contains essentially all
+glyphs in all styles.  The fonts are provided in OpenType and PostScript
+formats.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
 (define-public texlive-codeanatomy
   (package
     (name "texlive-codeanatomy")
@@ -3068,6 +9715,54 @@ quickly verifies the consistency of the fiscal code string, and can therefore
 be useful for lawyers and accountants that use fiscal codes very frequently.")
     (license license:lppl1.3+)))
 
+(define-public texlive-coelacanth
+  (package
+    (name "texlive-coelacanth")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/coelacanth/"
+                   "fonts/enc/dvips/coelacanth/"
+                   "fonts/map/dvips/coelacanth/"
+                   "fonts/opentype/public/coelacanth/"
+                   "fonts/tfm/public/coelacanth/"
+                   "fonts/type1/public/coelacanth/"
+                   "fonts/vf/public/coelacanth/"
+                   "tex/latex/coelacanth/")
+             (base32
+              "1cwk36rm1m2qaphwlpnw6rhmsmkvsdpzqs7sv1c39qcyq853q4yj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/coelacanth")
+    (synopsis "Coelacanth fonts with LaTeX support")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX, and LuaLaTeX support for
+Coelecanth fonts, designed by Ben Whitmore.  Coelacanth is inspired by the
+classic Centaur type design of Bruce Rogers, described by some as the most
+beautiful typeface ever designed.  It aims to be a professional quality type
+family for general book typesetting.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-collref
+  (package
+    (name "texlive-collref")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/collref/" "source/latex/collref/"
+                   "tex/latex/collref/")
+             (base32
+              "0gvla01fypbdqvjg0zziy4cl2s6z441pvn3s8b45dvz4hy1hkfji")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/collref")
+    (synopsis "Collect blocks of references into a single reference")
+    (description
+     "The package automatically collects multiple @code{\\bibitem} references,
+which always appear in the same sequence in @code{\\cite}, into a single
+@code{\\bibitem} block.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-colorsep
   (package
     (name "texlive-colorsep")
@@ -3084,6 +9779,58 @@ be useful for lawyers and accountants that use fiscal codes very frequently.")
      "This package provides support for colour separation when using Dvips.")
     (license license:public-domain)))
 
+(define-public texlive-comfortaa
+  (package
+    (name "texlive-comfortaa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/comfortaa/"
+                   "fonts/enc/dvips/comfortaa/"
+                   "fonts/map/dvips/comfortaa/"
+                   "fonts/tfm/aajohan/comfortaa/"
+                   "fonts/truetype/aajohan/comfortaa/"
+                   "fonts/type1/aajohan/comfortaa/"
+                   "fonts/vf/aajohan/comfortaa/"
+                   "tex/latex/comfortaa/")
+             (base32
+              "1ayh1f0f1a0qkngsk84zwzyx5kidb2n5wq2ksk0d7r68m8cbs981")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/comfortaa")
+    (synopsis "Sans serif font, with LaTeX support")
+    (description
+     "Comfortaa is a sans-serif font, comfortable in every aspect, designed by
+Johan Aakerlund.  This package provides support for this font in LaTeX, and
+includes both the TrueType fonts, and conversions to Adobe Type 1 format.")
+    (license (list license:silofl1.1 license:lppl1.3c))))
+
+(define-public texlive-comicneue
+  (package
+    (name "texlive-comicneue")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/comicneue/"
+                   "fonts/enc/dvips/comicneue/"
+                   "fonts/map/dvips/comicneue/"
+                   "fonts/opentype/rozynski/comicneue/"
+                   "fonts/tfm/rozynski/comicneue/"
+                   "fonts/type1/rozynski/comicneue/"
+                   "fonts/vf/rozynski/comicneue/"
+                   "tex/latex/comicneue/")
+             (base32
+              "0q9ckbypx5hn9004pgfyqnf1ddniqwq0fixps0acmifz8qspjih6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/comicneue")
+    (synopsis "Use Comic Neue with TeX(-alike) systems")
+    (description
+     "Comic Neue is a well-known redesign of the (in)famous Comic Sans font.
+The package provides the original OpenType font for XeTeX and LuaTeX users,
+and also has converted Type1 files for pdfTeX users.")
+    (license license:silofl1.1)))
+
 (define-public texlive-commath
   (package
     (name "texlive-commath")
@@ -3125,6 +9872,23 @@ domain and range, and function operation) and various reference commands.")
 easy to design, parse and tweak.")
     (license license:expat)))
 
+(define-public texlive-compactbib
+  (package
+    (name "texlive-compactbib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/latex/compactbib/")
+             (base32
+              "077l73vb0rcxy1n51r3wmcb7gma6nn3xrl543a67n96lpp5xvnnk")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/compactbib")
+    (synopsis "Multiple thebibliography environments")
+    (description
+     "This package allows a second bibliography, optionally with a different
+title, after the main bibliography.")
+    (license license:lppl)))
+
 (define-public texlive-compare
   (package
     (name "texlive-compare")
@@ -3210,6 +9974,50 @@ access the Concrete mathematics fonts, which were derived from Computer Modern
 math fonts using parameters from Concrete Roman text fonts.")
     (license license:lppl)))
 
+(define-public texlive-concmath-fonts
+  (package
+    (name "texlive-concmath-fonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/concmath-fonts/"
+                   "fonts/source/public/concmath-fonts/"
+                   "fonts/tfm/public/concmath-fonts/")
+             (base32
+              "09frgpcwpfkj9j9aaj5psb8kr12vgbr10plcvcipn0mjahdw9nnz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-amsfonts texlive-metafont))
+    (home-page "https://ctan.org/pkg/concmath-fonts")
+    (synopsis "Concrete mathematics fonts")
+    (description
+     "The fonts are derived from the Computer Modern Mathematics fonts and
+from Knuth's Concrete Roman fonts; they are distributed as Metafont source.
+LaTeX support is offered by the @code{concmath} package.")
+    (license license:lppl)))
+
+(define-public texlive-concmath-otf
+  (package
+    (name "texlive-concmath-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/concmath-otf/"
+                   "fonts/opentype/public/concmath-otf/"
+                   "tex/latex/concmath-otf/")
+             (base32
+              "00vs2c2lxdrqiwf4scni0yv4kz0mkigqv5kpsrak62j8vb7piv7b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/concmath-otf")
+    (synopsis "Concrete based OpenType Math font")
+    (description
+     "This package provides an OpenType version of the Concrete Math font
+created by Ulrik Vieth in Metafont.  @file{concmath-otf.sty} is a replacement
+for the original @file{concmath.sty} package to be used with LuaTeX or XeTeX
+engines.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
 (define-public texlive-concrete
   (package
     (name "texlive-concrete")
@@ -3236,6 +10044,28 @@ the fonts are available in the @code{ecc} bundle, and Adobe Type 1 versions of
 the @code{ecc} fonts are part of the @code{cm-super} bundle.")
     (license license:knuth)))
 
+(define-public texlive-confproc
+  (package
+    (name "texlive-confproc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/confproc/" "doc/latex/confproc/"
+                   "makeindex/confproc/"
+                   "source/latex/confproc/"
+                   "tex/latex/confproc/")
+             (base32
+              "1v3ppwxss1ans62j1pss8mcfjqmx708za7pmcm1wic7z7byc6xdb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (home-page "https://ctan.org/pkg/confproc")
+    (synopsis "Set of tools for generating conference proceedings")
+    (description
+     "The @code{confproc} collection comprises a class, a BibTeX style, and
+some scripts for generating conference proceedings.")
+    (license license:lppl)))
+
 (define-public texlive-conteq
   (package
     (name "texlive-conteq")
@@ -3256,6 +10086,104 @@ systems of continued equalities (or inequalities).  Several variant layouts of
 the equalities are provided, and the user may define their own.")
     (license license:lppl1.3+)))
 
+(define-public texlive-convbkmk
+  (package
+    (name "texlive-convbkmk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/convbkmk/" "scripts/convbkmk/")
+             (base32
+              "0w4fm4az1smrw002sqjkiiz94x01z6jkrb0mf9wb8qxdwrxriql9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "convbkmk.rb")))
+    (inputs (list ruby))
+    (home-page "https://ctan.org/pkg/convbkmk")
+    (synopsis
+     "Correct pLaTeX/upLaTeX bookmarks in PDF created with @code{hyperref}")
+    (description
+     "The package provides a small Ruby script that corrects bookmarks in PDF
+files created by pLaTeX or upLaTeX, using @code{hyperref}.")
+    (license license:expat)))
+
+(define-public texlive-cookingsymbols
+  (package
+    (name "texlive-cookingsymbols")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cookingsymbols/"
+                   "fonts/source/public/cookingsymbols/"
+                   "fonts/tfm/public/cookingsymbols/"
+                   "source/latex/cookingsymbols/"
+                   "tex/latex/cookingsymbols/")
+             (base32
+              "1cqz5hvb1vcf4mgk7i960kjdbg9cbxkik62riy6l2n1ld2cnl81x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/cookingsymbols")
+    (synopsis "Symbols for recipes")
+    (description
+     "The package provides 11 symbols for typesetting recipes: oven, gasstove,
+topheat, fanoven, gloves and dish symbol (among others).  The symbols are
+defined using Metafont.")
+    (license license:lppl)))
+
+
+(define-public texlive-cooperhewitt
+  (package
+    (name "texlive-cooperhewitt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cooperhewitt/"
+                   "fonts/enc/dvips/cooperhewitt/"
+                   "fonts/map/dvips/cooperhewitt/"
+                   "fonts/opentype/public/cooperhewitt/"
+                   "fonts/tfm/public/cooperhewitt/"
+                   "fonts/type1/public/cooperhewitt/"
+                   "fonts/vf/public/cooperhewitt/"
+                   "tex/latex/cooperhewitt/")
+             (base32
+              "1m81sxrwwsmzsan4iln2lsf16pijay7w9k29gjwlwikivvy21kj7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cooperhewitt")
+    (synopsis "Cooper Hewitt family of sans serif fonts")
+    (description
+     "Cooper Hewitt is a contemporary sans serif, with characters composed of
+modified-geometric curves and arches, by Chester Jenkins.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-cormorantgaramond
+  (package
+    (name "texlive-cormorantgaramond")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cormorantgaramond/"
+                   "fonts/enc/dvips/cormorantgaramond/"
+                   "fonts/map/dvips/cormorantgaramond/"
+                   "fonts/tfm/catharsis/cormorantgaramond/"
+                   "fonts/truetype/catharsis/cormorantgaramond/"
+                   "fonts/type1/catharsis/cormorantgaramond/"
+                   "fonts/vf/catharsis/cormorantgaramond/"
+                   "tex/latex/cormorantgaramond/")
+             (base32
+              "0sd4g4s3d3nk4wrav3szzbihdj6saznnzm6kiyr4qqqgi5ib3ami")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cormorantgaramond")
+    (synopsis "Cormorant Garamond family of fonts")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Cormorant Garamond family of fonts, designed by Christian Thalman.  The
+family includes light, regular, medium, semi-bold, and bold weights, with
+italics.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-correctmathalign
   (package
     (name "texlive-correctmathalign")
@@ -3275,6 +10203,216 @@ the equalities are provided, and the user may define their own.")
 mathematical environments.")
     (license license:bsd-2)))
 
+(define-public texlive-countriesofeurope
+  (package
+    (name "texlive-countriesofeurope")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/countriesofeurope/"
+                   "fonts/afm/public/countriesofeurope/"
+                   "fonts/enc/dvips/countriesofeurope/"
+                   "fonts/map/dvips/countriesofeurope/"
+                   "fonts/opentype/public/countriesofeurope/"
+                   "fonts/tfm/public/countriesofeurope/"
+                   "fonts/type1/public/countriesofeurope/"
+                   "tex/latex/countriesofeurope/")
+             (base32
+              "07q0hrrlvadcc3vcl97gsgp1pbkmfhy60zm8ib65qd79m81kyxs0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/countriesofeurope")
+    (synopsis "Font with the images of the countries of Europe")
+    (description
+     "The bundle provides a font CountriesOfEurope (in Adobe Type 1 format)
+and the necessary metrics, together with LaTeX macros for its use.  The font
+provides glyphs with a filled outline of the shape of each country; each glyph
+is at the same cartographic scale.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-courier-scaled
+  (package
+    (name "texlive-courier-scaled")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/courier-scaled/"
+                   "tex/latex/courier-scaled/")
+             (base32
+              "1d61afhvx9s70mg9d97m0zyzqfdlwbgljwgkv0z87khxy4z33wy6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/courier-scaled")
+    (synopsis "Provides a scaled Courier font")
+    (description
+     "This package sets the default typewriter font to Courier with a possible
+scale factor (in the same way as the @code{helvet} package for Helvetica works
+for sans serif).")
+    (license license:lppl1.2+)))
+
+(define-public texlive-courierten
+  (package
+    (name "texlive-courierten")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/courierten/"
+                   "fonts/enc/dvips/courierten/"
+                   "fonts/map/dvips/courierten/"
+                   "fonts/opentype/public/courierten/"
+                   "fonts/tfm/public/courierten/"
+                   "fonts/type1/public/courierten/"
+                   "fonts/vf/public/courierten/"
+                   "tex/latex/courierten/")
+             (base32
+              "0xfra9x03zjx7jsk48kj7mmjng3rs45ydj258c4s6inl91m7i9w0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/courierten")
+    (synopsis "Courier 10 Pitch BT with LaTeX support")
+    (description
+     "This is the font Courier 10 Pitch BT, with LaTeX support and an OpenType
+conversion as well.")
+    (license license:expat)))
+
+(define-public texlive-covington
+  (package
+    (name "texlive-covington")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/covington/"
+                   "tex/latex/covington/")
+             (base32
+              "0h47zgbiylnirwcjprh31q2n8g842qlhlddd733xn1zal3n5alsz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/covington")
+    (synopsis "LaTeX macros for Linguistics")
+    (description
+     "This package provides numerous minor LaTeX enhancements for linguistics,
+including multiple accents on the same letter, interline glosses (word-by-word
+translations), Discourse Representation Structures, and example numbering.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-cquthesis
+  (package
+    (name "texlive-cquthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/cquthesis/"
+                   "doc/latex/cquthesis/"
+                   "source/latex/cquthesis/"
+                   "tex/latex/cquthesis/")
+             (base32
+              "0591wd88zp4sgnv2avwqv8127c2g5zbhjr7y15xaahiy7s404hn2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cquthesis")
+    (synopsis "LaTeX thesis template for Chongqing University")
+    (description
+     "CQUThesis stands for Chongqing University thesis template for LaTeX,
+bearing the ability to support bachelor, master, doctor dissertations with
+grace and speed.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-create-theorem
+  (package
+    (name "texlive-create-theorem")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/create-theorem/"
+                   "tex/latex/create-theorem/")
+             (base32
+              "0pnb2n79qyipa2izj5v81rk973psvcmslkqxpivzm9gghrajkk9m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-crefthe))
+    (home-page "https://ctan.org/pkg/create-theorem")
+    (synopsis "Multilingual support for @code{theorem}-like environments")
+    (description
+     "This package provides commands for naming, initializing and configuring
+@code{theorem}-like environments.  These commands have key-value based
+interfaces and are especially useful in multilingual documents, allowing the
+easy declaration of @code{theorem}-like environments that can automatically
+adapt to the language settings.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-crefthe
+  (package
+    (name "texlive-crefthe")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/crefthe/" "tex/latex/crefthe/")
+             (base32
+              "0gmyg9m4rma0qfg50d6i1lpdl4g71cx61517xl09vzy08r988i5j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/crefthe")
+    (synopsis "Cross referencing with proper definite articles")
+    (description
+     "By default, when using @code{cleveref}'s @code{\\cref} to reference
+@code{theorem}-like environments, the names do not contain definite articles.
+In languages such as French, Italian, Portuguese, Spanish, etc., this results
+in incorrect grammar.  For this purpose, the current package offers
+@code{\\crefthe}, which handles the definite articles properly (especially for
+the article contractions in many European languages).")
+    (license license:lppl1.3c)))
+
+(define-public texlive-crimson
+  (package
+    (name "texlive-crimson")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/crimson/"
+                   "fonts/enc/dvips/crimson/"
+                   "fonts/map/dvips/crimson/"
+                   "fonts/opentype/kosch/crimson/"
+                   "fonts/tfm/kosch/crimson/"
+                   "fonts/type1/kosch/crimson/"
+                   "fonts/vf/kosch/crimson/"
+                   "tex/latex/crimson/")
+             (base32
+              "14zrb015cs5f5kdyjy987mx4jdvi7vr1830dvnnygvkpcacvc3mc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/crimson")
+    (synopsis "Crimson fonts with LaTeX support")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX, and LuaLaTeX support for
+the Crimson family of fonts, designed by Sebastian Kosch.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-crimsonpro
+  (package
+    (name "texlive-crimsonpro")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/crimsonpro/"
+                   "fonts/enc/dvips/crimsonpro/"
+                   "fonts/map/dvips/crimsonpro/"
+                   "fonts/tfm/public/crimsonpro/"
+                   "fonts/truetype/public/crimsonpro/"
+                   "fonts/type1/public/crimsonpro/"
+                   "fonts/vf/public/crimsonpro/"
+                   "tex/latex/crimsonpro/")
+             (base32
+              "1pzsdm4i32pgwf726q5waga8lr37xfj1qj417kkblw3q3fgb4jsd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/crimsonpro")
+    (synopsis "CrimsonPro fonts with LaTeX support")
+    (description
+     "The CrimsonPro fonts are designed by Jacques Le Bailly and derived
+from the Crimson Text fonts designed by Sebastian Kosch.  The family
+includes eight weights and italics for each weight.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-crossrefenum
   (package
     (name "texlive-crossrefenum")
@@ -3310,6 +10448,125 @@ with a wide array of formats.  For the moment, it works out of the box with
 ConTeXt and LaTeX.")
     (license (list license:gpl3+ license:fdl1.3+))))
 
+(define-public texlive-crossrefware
+  (package
+    (name "texlive-crossrefware")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/bbl2bib.1"
+                   "doc/man/man1/bbl2bib.man1.pdf"
+                   "doc/man/man1/bibdoiadd.1"
+                   "doc/man/man1/bibdoiadd.man1.pdf"
+                   "doc/man/man1/bibmradd.1"
+                   "doc/man/man1/bibmradd.man1.pdf"
+                   "doc/man/man1/biburl2doi.1"
+                   "doc/man/man1/biburl2doi.man1.pdf"
+                   "doc/man/man1/bibzbladd.1"
+                   "doc/man/man1/bibzbladd.man1.pdf"
+                   "doc/man/man1/ltx2crossrefxml.1"
+                   "doc/man/man1/ltx2crossrefxml.man1.pdf"
+                   "doc/support/crossrefware/"
+                   "scripts/crossrefware/"
+                   "tex/latex/crossrefware/")
+             (base32
+              "048405cg5q3fy5vd7xbri8cfgn0wrzc08sb3z30cv79kjwm1xj6w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts
+           #~(list "bbl2bib.pl"
+                   "bibdoiadd.pl"
+                   "bibmradd.pl"
+                   "biburl2doi.pl"
+                   "bibzbladd.pl"
+                   "ltx2crossrefxml.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/crossrefware")
+    (synopsis "Scripts for working with @url{crossref.org}")
+    (description
+     "This bundle contains the following scripts:
+@itemize
+
+@item @file{bibdoiadd.pl}: add DOI numbers to papers in a given @file{.bib}
+file,
+
+@item @file{bibzbladd.pl}: add Zbl numbers to papers in a given @file{.bib}
+file,
+
+@item @file{bibmradd.pl}: add MR numbers to papers in a given @file{.bib}
+file,
+
+@item @file{bbl2bib.pl}: convert @code{thebibliography} environment to
+a @file{.bib} file,
+
+@item @file{biburl2doi.pl}: convert URLs pointing to @url{doi.org} to DOIs,
+
+@item @file{ltx2crossrefxml.pl}: tool for the creation of XML files for
+submitting to @url{crossref.org}.
+
+@end itemize")
+    (license license:gpl3+)))
+
+(define-public texlive-crossword
+  (package
+    (name "texlive-crossword")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/crossword/"
+                   "source/latex/crossword/"
+                   "tex/latex/crossword/")
+             (base32
+              "1yxjhni6jw7j7wnz6g6d1bmri8afvqsj58bar0aqliyfhr55xzai")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/crossword")
+    (synopsis "Typeset crossword puzzles")
+    (description
+     "This is an extended grid-based puzzle package, designed to take all
+input (both grid and clues) from the same file.  The package can
+typeset grids with holes in them, and can deal with several sorts of
+puzzle:
+@itemize
+
+@item the classical puzzle contains numbers for the words and clues
+for the words to be filled in;
+
+@item the numbered puzzle contains numbers in each cell where
+identical numbers represent identical letters; the goal is to find out
+which number corresponds to which letter;
+
+@item the fill-in type of puzzle consists of a grid and a list of
+words; the goal is to place all words in the grid;
+
+@item Sudoku and Kakuro puzzles involve filling in grids of numbers
+according to their own rules; format may be block-separated, or
+separated by thick lines.
+
+@end itemize")
+    (license license:expat)))
+
+(define-public texlive-crosswrd
+  (package
+    (name "texlive-crosswrd")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/crosswrd/"
+                   "source/latex/crosswrd/"
+                   "tex/latex/crosswrd/")
+             (base32
+              "0yhsrfn49wj579ms3smd1z97rjqnsi1wrsgrjs570bllgf09bcir")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/crosswrd")
+    (synopsis "Macros for typesetting crossword puzzles")
+    (description
+     "The package provides a LaTeX method of typesetting crosswords, and
+assists the composer ensure that the grid all goes together properly.")
+    (license license:lppl)))
+
 (define-public texlive-cryptocode
   (package
     (name "texlive-cryptocode")
@@ -3335,6 +10592,29 @@ advantage terms but also flexible and powerful environments to layout
 game-based proofs or black-box reductions.")
     (license license:lppl1.3+)))
 
+(define-public texlive-cryst
+  (package
+    (name "texlive-cryst")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/cryst/" "fonts/afm/public/cryst/"
+                   "fonts/source/public/cryst/"
+                   "fonts/tfm/public/cryst/"
+                   "fonts/type1/public/cryst/")
+             (base32
+              "05lbldwghpdrmw0ffncs86k5pn04zi0shkk40ycca3kb0h3fa3h8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/cryst")
+    (synopsis "Font for graphical symbols used in crystallography")
+    (description
+     "This package provides the Cryst font, which contains graphical symbols
+used in crystallography.  It provided as an Adobe Type 1 font, and as Metafont
+source.")
+    (license license:lppl)))
+
 (define-public texlive-csassignments
   (package
     (name "texlive-csassignments")
@@ -3359,6 +10639,81 @@ for structuring exercises, aggregating points, and displaying a grading table,
 as well as several macros for easier math mode usage.")
     (license license:expat)))
 
+(define-public texlive-cuprum
+  (package
+    (name "texlive-cuprum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cuprum/"
+                   "fonts/map/dvips/cuprum/"
+                   "fonts/tfm/public/cuprum/"
+                   "fonts/truetype/public/cuprum/"
+                   "tex/latex/cuprum/")
+             (base32
+              "1wimmwjpx6dg41ncpjbrsxfv41ayppy87f1b8r38vyg0vw6vcsz5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cuprum")
+    (synopsis "Cuprum font family support for LaTeX")
+    (description
+     "This package provides support for the Cuprum font family.")
+    (license license:silofl1.1)))
+
+(define-public texlive-custom-bib
+  (package
+    (name "texlive-custom-bib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/custom-bib/"
+                   "source/latex/custom-bib/"
+                   "tex/latex/custom-bib/")
+             (base32
+              "1hzy0j9k55ygkzvgs3y2jz435267l3g4isqynr64978zhyqybqpd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               ;; The installation process requires ".mbs" files to be
+               ;; available when generating the package.  Extend TEXINPUTS to
+               ;; include their location.
+               (add-before 'build 'extend-texinputs
+                 (lambda _
+                   (setenv "TEXINPUTS"
+                           (string-append (getcwd)
+                                          "/tex/latex/custom-bib/:")))))))
+    (home-page "https://ctan.org/pkg/custom-bib")
+    (synopsis "Customised BibTeX styles")
+    (description
+     "This package generates customized BibTeX bibliography styles from
+a generic file using @code{docstrip} driven by parameters generated by a menu
+application.  It includes support for the Harvard style of citations.")
+    (license license:lppl)))
+
+(define-public texlive-customdice
+  (package
+    (name "texlive-customdice")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/customdice/"
+                   "source/latex/customdice/"
+                   "tex/latex/customdice/")
+             (base32
+              "0jwhvg13rla5pav0z4wns4s0x25myiqcinv592g6kqnbgwzj4q7g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/customdice")
+    (synopsis "Simple commands for drawing customisable dice")
+    (description
+     "The @code{customdice} package for LaTeX, LuaLaTeX and XeTeX that
+provides functionality for drawing dice.  The aim is to provide
+highly-customisable but simple-to-use commands, allowing: adding custom text
+to dice faces; control over colouring; control over sizing.")
+    (license license:cc-by-sa4.0)))
+
 (define-public texlive-cvss
   (package
     (name "texlive-cvss")
@@ -3398,6 +10753,139 @@ Environmental scores will be part of a future release.")
      "This package contains parts of CWEB that are no longer useful.")
     (license license:knuth)))
 
+(define-public texlive-dad
+  (package
+    (name "texlive-dad")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/dad/"
+                   "fonts/afm/public/dad/"
+                   "fonts/map/dvips/dad/"
+                   "fonts/ofm/public/dad/"
+                   "fonts/ovf/public/dad/"
+                   "fonts/tfm/public/dad/"
+                   "fonts/type1/public/dad/"
+                   "tex/lualatex/dad/")
+             (base32
+              "0mkfhdai5m1fwj9x0rkpklvcrp3synfxl67dp6cb0bfz3w8nmis0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dad")
+    (synopsis "Simple typesetting system for mixed Arabic/Latin documents")
+    (description
+     "This package allows simple typesetting in Arabic script, intended for
+mixed Arabic/Latin script usage in situations where heavy-duty solutions are
+discouraged.  The system operates with both Unicode and transliterated input,
+allowing the user to choose the most appropriate approach for every
+situation.")
+    (license license:lppl)))
+
+(define-public texlive-dancers
+  (package
+    (name "texlive-dancers")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/source/public/dancers/"
+                   "fonts/tfm/public/dancers/")
+             (base32
+              "0nni21f6y9gynx1lsymb3pmh6w761q21idq60fib90hvv9jjd85q")))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/dancers")
+    (synopsis "Font for Conan Doyle's @emph{The Dancing Men}")
+    (description
+     "The (Sherlock Holmes) book contains a code which uses dancing men as
+glyphs.  The alphabet as given is not complete, lacking @samp{f}, @samp{j},
+@samp{k}, @samp{q}, @samp{u}, @samp{w}, @samp{x} and @samp{z}, so those
+letters in the font are not due to Conan Doyle.
+
+The code required word endings to be marked by the dancing man representing
+the last letter to be holding a flag: these are coded as A-Z.  In some cases,
+the man has no arms, making it impossible for him to hold a flag.  In these
+cases, he is wearing a flag on his hat in the character.  The font is
+distributed as Metafont source.")
+    ;; "This font may be freely used, modified and distributed."
+    (license
+     (license:fsf-free "file://fonts/source/public/dancers/dancers.mf"))))
+
+(define-public texlive-dashrule
+  (package
+    (name "texlive-dashrule")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/dashrule/"
+                   "source/latex/dashrule/"
+                   "tex/latex/dashrule/")
+             (base32
+              "0glnb77dmhl9svgxpz1s8ivsbmr0cy1a0sz68vfx1plfkxfglbyl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dashrule")
+    (synopsis "Draw dashed rules")
+    (description
+     "The @code{dashrule} package makes it easy to draw a huge variety of
+dashed rules (i.e., lines) in LaTeX.  It provides a command,
+@code{\\hdashrule}, which draws horizontally dashed rules using the same
+syntax as @code{\\rule}, but with an additional parameter that specifies the
+pattern of dash segments and the space between those segments.  Those rules
+are fully compatible with every @code{LaTeX} back-end processor.")
+    (license license:lppl)))
+
+(define-public texlive-dantelogo
+  (package
+    (name "texlive-dantelogo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/dantelogo/"
+                   "fonts/enc/dvips/dantelogo/"
+                   "fonts/map/dvips/dantelogo/"
+                   "fonts/opentype/public/dantelogo/"
+                   "fonts/tfm/public/dantelogo/"
+                   "fonts/type1/public/dantelogo/"
+                   "fonts/vf/public/dantelogo/"
+                   "tex/latex/dantelogo/")
+             (base32
+              "19wz5qyr4bhd0dwp0y38ql87s3103yimg5b6r2mjz4mz0dsiyy1b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dantelogo")
+    (synopsis "Font for DANTE's logo")
+    (description
+     "The DANTE font for the logo of @url{https://www.dante.de, DANTE}, the
+German speaking TeX users group.  The font includes only the five characters
+@samp{d}, @samp{a}, @samp{n}, @samp{t}, and @samp{e}.  @file{dantelogo.sty}
+provides an interface for LuaLaTeX, XeLaTeX, and pdfLaTeX.")
+    (license license:lppl)))
+
+(define-public texlive-dccpaper
+  (package
+    (name "texlive-dccpaper")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/dccpaper/"
+                   "source/latex/dccpaper/"
+                   "tex/latex/dccpaper/")
+             (base32
+              "1hxn5lnxbcnwhyx9n275bml2bwy3gfkkkqg0s68skcxs843p55ad")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dccpaper")
+    (synopsis
+     "Typeset papers for the @emph{International Journal of Digital Curation}")
+    (description
+     "The LaTeX class @code{ijdc-v14} produces camera-ready papers and
+articles suitable for inclusion in the @emph{International Journal of Digital
+Curation}, with applicability from volume 14 onwards; a legacy class
+@code{ijdc-v9} is provided for papers and articles written for volumes 9-13.
+The similar @code{idcc} class can be used for submissions to the International
+Digital Curation Conference, beginning with the 2015 conference.")
+    (license (list license:lppl1.3c license:cc-by4.0))))
+
 (define-public texlive-decision-table
   (package
     (name "texlive-decision-table")
@@ -3426,6 +10914,25 @@ labels and captions to be added seamlessly.  It is also possible to place
 multiple DMN tables in one table/figure environment.")
     (license license:lppl1.3c)))
 
+(define-public texlive-dejavu-otf
+  (package
+    (name "texlive-dejavu-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/dejavu-otf/"
+                   "tex/latex/dejavu-otf/")
+             (base32
+              "0vn16rb816w7kdqkyqxr01w1qd654s1f3k368q0cj0ab1247q7q8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dejavu-otf")
+    (synopsis "Support for the TTF and OTF DejaVu fonts")
+    (description
+     "The @code{dejavu-otf} package supports the TTF fonts from the DejaVu
+project and the OpenType version of the TeXGyre Math.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-delim
   (package
     (name "texlive-delim")
@@ -3488,6 +10995,25 @@ default.")
 delimiters in math mode whose size can be adjusted conveniently.")
     (license license:lppl1.3+)))
 
+(define-public texlive-denisbdoc
+  (package
+    (name "texlive-denisbdoc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/denisbdoc/"
+                   "source/latex/denisbdoc/"
+                   "tex/latex/denisbdoc/")
+             (base32
+              "0vfz81kqym5jj79y5f1fysyjxlhlr0zws553zx2mklixrs54bl0c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/denisbdoc")
+    (synopsis "Personal dirty package for documenting packages")
+    (description
+     "This package provides a personal dirty package for documenting packages.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-derivative
   (package
     (name "texlive-derivative")
@@ -3517,6 +11043,146 @@ custom derivatives and differential operators.  The options follow
 a consistent naming scheme making them easy to use and understand.")
     (license license:lppl1.3+)))
 
+(define-public texlive-diadia
+  (package
+    (name "texlive-diadia")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/diadia/" "scripts/diadia/"
+                   "tex/latex/diadia/")
+             (base32
+              "1sjnjabgqsv6v45sffkkzm78fnx89vmk836dajsvck5pd5nvkzxv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "diadia.lua")))
+    (home-page "https://ctan.org/pkg/diadia")
+    (synopsis "Package to keep a diabetes diary")
+    (description
+     "The @code{diadia} package allows you to keep a diabetes diary.  Usually,
+this means keeping record of certain medical values like blood sugar, blood
+pressure, pulse or weight.  It might also include other medical,
+pharmaceutical or nutritional data (HbA1c, insulin doses, carbohydrate units).
+
+The @code{diadia} package supports all of this plus more --- simply by adding
+more columns to the data file!  It is able to evaluate the data file and
+typesets formatted tables and derived plots.  Furthermore, it supports
+medication charts and info boxes.")
+    (license license:lppl)))
+
+(define-public texlive-diagbox
+  (package
+    (name "texlive-diagbox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/diagbox/" "source/latex/diagbox/"
+                   "tex/latex/diagbox/")
+             (base32
+              "0zr7ih8jr56j727gf3l1q87rlrqn3zfz8cm7hs2q5l1f3y1gmcgh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/diagbox")
+    (synopsis "Table heads with diagonal lines")
+    (description
+     "The package's principal command, @code{\\diagbox}, takes two
+arguments (texts for the slash-separated parts of the box), and an optional
+argument with which the direction the slash will go, the box dimensions, etc.,
+may be controlled.  The package also provides @code{\\slashbox} and
+@code{\\backslashbox} commands for compatibility with the now removed slashbox
+package, which it supersedes.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-dice
+  (package
+    (name "texlive-dice")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/dice/"
+                   "fonts/source/public/dice/"
+                   "fonts/tfm/public/dice/")
+             (base32
+              "0ky33hg66d0x8bcjmdq4ilynpb25mm82x93wzwnz11y59nv4cvsl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/dice")
+    (synopsis "Font for die faces")
+    (description
+     "This package provides a Metafont font that can produce die faces in 2D
+or with various 3D effects.")
+    (license license:lppl)))
+
+(define-public texlive-dictsym
+  (package
+    (name "texlive-dictsym")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/dictsym/"
+                   "fonts/afm/public/dictsym/"
+                   "fonts/map/dvips/dictsym/"
+                   "fonts/tfm/public/dictsym/"
+                   "fonts/type1/public/dictsym/"
+                   "tex/latex/dictsym/")
+             (base32
+              "0wycv2i0pgmjs9al5zzxa8s5lj13sj6rlhga1271xypxpcyf3804")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dictsym")
+    (synopsis "DictSym font and macro package")
+    (description
+     "This directory contains the DictSym Type1 font designed by Georg
+Verweyen and all files required to use it with LaTeX.  The font provides
+a number of symbols commonly used in dictionaries.  The accompanying macro
+package makes the symbols accessible as LaTeX commands.")
+    (license license:lppl)))
+
+(define-public texlive-din1505
+  (package
+    (name "texlive-din1505")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/din1505/" "doc/latex/din1505/")
+             (base32
+              "0ggi58kra06k8r4drkhnlap9khvscpji78j8v92s3gzh8qmsjhp4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/din1505")
+    (synopsis "Bibliography styles for German texts")
+    (description
+     "This package provides a set of bibliography styles that conform to DIN
+1505, and match the original BibTeX standard set (@code{plain}, @code{unsrt},
+@code{alpha} and @code{abbrv}), together with a style @code{natdin} to work with
+@code{natbib}.")
+    (license license:knuth)))
+
+(define-public texlive-dingbat
+  (package
+    (name "texlive-dingbat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/dingbat/"
+                   "fonts/source/public/dingbat/"
+                   "fonts/tfm/public/dingbat/"
+                   "source/latex/dingbat/" "tex/latex/dingbat/")
+             (base32
+              "12vhykmz1xzvrdzp61qy0q69fnxjjvc9m8v8kras92v49f6m4z7a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/dingbat")
+    (synopsis "Two dingbat symbol fonts")
+    (description
+     "The package provides the fonts (@code{ark10} and @code{dingbat}),
+specified in Metafont; support macros are also provided for use in LaTeX.  An
+Adobe Type 1 version of the fonts is available in the @code{niceframe} fonts
+bundle.")
+    (license license:lppl)))
+
 (define-public texlive-diffcoeff
   (package
     (name "texlive-diffcoeff")
@@ -3625,6 +11291,91 @@ displaying one step in to the right.  The macros work equally well with Plain
 TeX and with LaTeX.")
     (license license:lppl)))
 
+(define-public texlive-disser
+  (package
+    (name "texlive-disser")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/disser/" "makeindex/disser/"
+                   "source/latex/disser/" "tex/latex/disser/")
+             (base32
+              "0sxvj4cka9xqzl2s3c465fm19lc1b8hyar1chjb51y42q4mx2bmg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/disser")
+    (synopsis "Class and templates for typesetting dissertations in Russian")
+    (description
+     "Disser comprises a document class and set of templates for typesetting
+dissertations in Russian.  One of its primary advantages is a simplicity of
+format specification for titlepage, headers and elements of automatically
+generated lists (table of contents, list of figures, etc).  Bibliography
+styles, that conform to the requirements of the Russian standard GOST
+R 7.0.11-2011, are provided.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-dithesis
+  (package
+    (name "texlive-dithesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/dithesis/" "tex/latex/dithesis/")
+             (base32
+              "1yz53jabca56k65pddhl68d3384k2f2jn4zrfkg2d4x8aa1dnvvx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dithesis")
+    (synopsis "Class for undergraduate theses at the University of Athens")
+    (description
+     "The class conforms to the requirements of the Department of Informatics
+and Telecommunications at the University of Athens regarding the preparation
+of undergraduate theses, as of Sep 1, 2011.  The class is designed for use
+with XeLaTeX.")
+    (license license:lppl)))
+
+(define-public texlive-dk-bib
+  (package
+    (name "texlive-dk-bib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/dk-bib/"
+                   "bibtex/bst/dk-bib/"
+                   "bibtex/csf/dk-bib/"
+                   "doc/latex/dk-bib/"
+                   "source/latex/dk-bib/"
+                   "tex/latex/dk-bib/")
+             (base32
+              "1bwmaja41mivsrcx3j9p0yplqccw62fd9wn6v1yx138kg0ayib1n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dk-bib")
+    (synopsis "Danish variants of standard BibTeX styles")
+    (description
+     "Dk-bib is a translation of the four standard BibTeX style files (@code{abbrv},
+@code{alpha}, @code{plain} and @code{unsrt}) and the @code{apalike} style file
+into Danish.  The files have been extended with URL, ISBN, ISSN, annote and
+printing fields which can be enabled through a LaTeX style file.  Dk-bib also
+comes with a couple of Danish sorting order files for BibTeX8.")
+    (license (list license:knuth license:gpl2+))))
+
+(define-public texlive-dnp
+  (package
+    (name "texlive-dnp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/sfd/dnp/")
+             (base32
+              "0jlvb0nps1ij4sgbg3clgbk34p80la1fhh9zihn9fhl9nrqk637r")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dnp")
+    (synopsis "Subfont numbers for DNP font encoding")
+    (description "This package provides subfont numbers for DNP font encoding.")
+    ;; This is part of the CJK package, use the same GPL license.
+    (license license:gpl2)))
+
 (define-public texlive-docbytex
   (package
     (name "texlive-docbytex")
@@ -3646,6 +11397,57 @@ programming languages.")
     ;; package without any limit".
     (license (license:fsf-free "file://doc/generic/docbytex/README"))))
 
+(define-public texlive-doipubmed
+  (package
+    (name "texlive-doipubmed")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/doipubmed/"
+                   "source/latex/doipubmed/"
+                   "tex/latex/doipubmed/")
+             (base32
+              "1432hh1pr5r6izfcqlbvl1lxpradidrwpfkvjr25ds1rlh240y66")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/doipubmed")
+    (synopsis "Special commands for use in bibliographies")
+    (description
+     "The package provides the commands @code{\\doi}, @code{\\pubmed} and
+@code{\\citeurl}.  These commands are primarily designed for use in
+bibliographies.  A @code{LaTeX2HTML} style file is also provided.")
+    (license license:lppl)))
+
+(define-public texlive-domitian
+  (package
+    (name "texlive-domitian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/domitian/"
+                   "fonts/enc/dvips/domitian/"
+                   "fonts/map/dvips/domitian/"
+                   "fonts/opentype/public/domitian/"
+                   "fonts/tfm/public/domitian/"
+                   "fonts/type1/public/domitian/"
+                   "fonts/vf/public/domitian/"
+                   "tex/latex/domitian/")
+             (base32
+              "10pg90kdwklz2rsbcafhcld4zdchmxzr6cszrajwrky8hfz67dkg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/domitian")
+    (synopsis "Drop-in replacement for Palatino")
+    (description
+     "The Domitian fonts are an OpenType font family, based on the Palatino
+design by Hermann Zapf (1918-2015), as implemented in Palladio.  Domitian is
+meant as a drop-in replacement for Adobe's version of Palatino.  It extends
+Palladio with small capitals, old-style figures and scientific inferiors.  The
+metrics have been adjusted to more closely match Adobe Palatino, and hinting
+has been improved.")
+    ;; Use any of the three licenses.
+    (license (list license:lppl1.3c license:silofl1.1 license:agpl3))))
+
 (define-public texlive-dosepsbin
   (package
     (name "texlive-dosepsbin")
@@ -3676,6 +11478,34 @@ package provides a Perl program that will extract any of the sections of such
 a file, in particular providing a text'-form EPS file for use with (La)TeX.")
     (license license:artistic2.0)))
 
+(define-public texlive-doublestroke
+  (package
+    (name "texlive-doublestroke")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/doublestroke/"
+                   "fonts/map/dvips/doublestroke/"
+                   "fonts/source/public/doublestroke/"
+                   "fonts/tfm/public/doublestroke/"
+                   "fonts/type1/public/doublestroke/"
+                   "tex/latex/doublestroke/")
+             (base32
+              "0v9g025l0qfw4zrjkm9yypcsramwl2di997jgnznxpxms0v6ib7c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/doublestroke")
+    (synopsis "Typeset mathematical double stroke symbols")
+    (description
+     "This package provides a font based on Computer Modern Roman useful for
+typesetting the mathematical symbols for the natural numbers, whole numbers,
+rational numbers, real numbers and complex numbers; coverage includes all
+Roman capital letters, @samp{1}, @samp{h} and @samp{k}.  The font is available
+both as Metafont source and in Adobe Type 1 format, and LaTeX macros for its
+use are provided.")
+    (license license:knuth)))
+
 (define-public texlive-dowith
   (package
     (name "texlive-dowith")
@@ -3698,6 +11528,61 @@ such lists.  Applications in mind belonged to LaTeX, but the package should
 work with other formats as well.")
     (license license:lppl1.3+)))
 
+(define-public texlive-dozenal
+  (package
+    (name "texlive-dozenal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/dozenal/"
+                   "fonts/afm/public/dozenal/"
+                   "fonts/map/dvips/dozenal/"
+                   "fonts/source/public/dozenal/"
+                   "fonts/tfm/public/dozenal/"
+                   "fonts/type1/public/dozenal/"
+                   "source/fonts/dozenal/"
+                   "tex/latex/dozenal/")
+             (base32
+              "0fhdcnpjpfxaqshddw6vxy0f8c1c3yn8p11aab8fkhnfg3pnllck")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/dozenal")
+    (synopsis "Typeset documents using base twelve numbering")
+    (description
+     "The package supports typesetting documents whose counters are
+represented in base twelve, also called @dfn{dozenal}.  It includes a macro
+for converting positive whole numbers to dozenal from decimal (base ten)
+representation.  The package also includes a few other macros and redefines
+all the standard counters to produce dozenal output.  Fonts, in Roman, italic,
+slanted, and boldface versions, provide ten and eleven.  The fonts were
+designed to blend well with the Computer Modern fonts, and are available both
+as Metafont source and in Adobe Type 1 format.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-dramatist
+  (package
+    (name "texlive-dramatist")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/dramatist/"
+                   "source/latex/dramatist/"
+                   "tex/latex/dramatist/")
+             (base32
+              "17x10jaa7f9rnqfrnvgw225n5ypqrmacbpsfpl5zdhx9abbjh793")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dramatist")
+    (synopsis "Typeset dramas, both in verse and in prose")
+    (description
+     "This package is intended for typesetting drama of any length.  It
+provides two environments for typesetting dialogues in prose or in verse; new
+document divisions corresponding to acts and scenes; macros that control the
+appearance of characters and stage directions; and automatic generation of
+a ``dramatis personae'' list.")
+    (license license:gpl3+)))
+
 (define-public texlive-drawmatrix
   (package
     (name "texlive-drawmatrix")
@@ -3759,6 +11644,210 @@ BibLaTeX package, a practical example of french thesis document, and
 documentation.  The class assumes use of Biber and BibLaTeX.")
     (license license:lppl1.3+)))
 
+(define-public texlive-drm
+  (package
+    (name "texlive-drm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/drm/"
+                   "fonts/afm/public/drm/"
+                   "fonts/map/dvips/drm/"
+                   "fonts/opentype/public/drm/"
+                   "fonts/source/public/drm/"
+                   "fonts/tfm/public/drm/"
+                   "fonts/type1/public/drm/"
+                   "source/fonts/drm/"
+                   "tex/latex/drm/")
+             (base32
+              "0fxmwakgy7inin85pjad5rdqg11flrw8mlsh86ga6ghqcw69zhwq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/drm")
+    (synopsis "Complete family of fonts written in Metafont")
+    (description
+     "The package provides access to the DRM (Don's Revised Modern) family of
+fonts, which includes a variety of optical sizes in Roman (in four weights),
+italic, and small caps, among other shapes, along with a set of symbols and
+ornaments.  It is intended to be a full-body text font, but its larger sizes
+can also be used for simple display purposes, and its significant body of
+symbols can stand on its own.  It comes complete with textual (old-style) and
+lining figures, and even has small-caps figures.  It also comes with
+extensible decorative rules to be used with ornaments from itself or other
+fonts, along with an extremely flexible ellipsis package.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-droid
+  (package
+    (name "texlive-droid")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/droid/"
+                   "fonts/enc/dvips/droid/"
+                   "fonts/map/dvips/droid/"
+                   "fonts/tfm/ascender/droid/droidsans/"
+                   "fonts/tfm/ascender/droid/droidsansmono/"
+                   "fonts/tfm/ascender/droid/droidserif/"
+                   "fonts/truetype/ascender/droid/droidsans/"
+                   "fonts/truetype/ascender/droid/droidsansmono/"
+                   "fonts/truetype/ascender/droid/droidserif/"
+                   "fonts/type1/ascender/droid/droidsans/"
+                   "fonts/type1/ascender/droid/droidsansmono/"
+                   "fonts/type1/ascender/droid/droidserif/"
+                   "fonts/vf/ascender/droid/droidsans/"
+                   "fonts/vf/ascender/droid/droidsansmono/"
+                   "fonts/vf/ascender/droid/droidserif/"
+                   "tex/latex/droid/")
+             (base32
+              "10lgw5yv0s48rwydycq6lxj5dfyna7iflnhz1zq42akg21n595vx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/droid")
+    (synopsis "LaTeX support for the Droid font families")
+    (description
+     "The Droid typeface family was designed by Steve Matteson.  The Droid
+family consists of Droid Serif, Droid Sans and Droid Sans Mono fonts.  The
+bundle includes the fonts in both TrueType and Adobe Type 1 formats.")
+    (license (list license:lppl1.3c license:asl2.0))))
+
+(define-public texlive-dsptricks
+  (package
+    (name "texlive-dsptricks")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/dsptricks/"
+                   "tex/latex/dsptricks/")
+             (base32
+              "03ykpbvmb95n6j5071c5hrja4x6x3cpdnmppj9gjjjh63ddv40m6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dsptricks")
+    (synopsis "Macros for Digital Signal Processing (DSP) plots")
+    (description
+     "The package provides a set of @code{LaTeX} macros (based on PSTricks)
+for plotting the kind of graphs and figures that are usually employed in
+digital signal processing publications.  DSPTricks provides facilities for
+standard discrete-time lollipop plots, continuous-time and frequency plots,
+and pole-zero plots.  The companion package
+DSPFunctions (@file{dspfunctions.sty}) provides macros for computing frequency
+responses and DFTs, while the package DSPBlocks (@file{dspblocks.sty})
+supports DSP block diagrams.")
+    (license license:lppl)))
+
+(define-public texlive-dsserif
+  (package
+    (name "texlive-dsserif")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/dsserif/"
+                   "fonts/afm/public/dsserif/"
+                   "fonts/map/dvips/dsserif/"
+                   "fonts/tfm/public/dsserif/"
+                   "fonts/type1/public/dsserif/"
+                   "source/fonts/dsserif/"
+                   "tex/latex/dsserif/")
+             (base32
+              "0dl8380lyv8r5kfrlhi5r4iwadb52m1397z68qwa65c5p2px1y3i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dsserif")
+    (synopsis "Double-struck serifed font for mathematical use")
+    (description
+     "DSSerif is a mathematical font package with double struck serifed
+digits, upper and lower case letters, in regular and bold weights.  The design
+was inspired by the STIX double struck fonts, which are sans serif, but
+starting from a Courier-like base.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
+(define-public texlive-duerer
+  (package
+    (name "texlive-duerer")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/duerer/"
+                   "fonts/source/public/duerer/"
+                   "fonts/tfm/public/duerer/")
+             (base32
+              "1x5s9qnmhhpj54l6cd0pzd9gmd0ipr95j60rcs73c66wwfjw0xki")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/duerer")
+    (synopsis "Computer Duerer fonts")
+    (description
+     "These fonts are designed for titling use, and consist of capital roman
+letters only.  Together with the normal set of base shapes, the family also
+offers an informal shape.  The distribution is as Metafont source.  LaTeX
+support is available in the @code{duerer-latex} bundle.")
+    (license license:public-domain)))
+
+(define-public texlive-duerer-latex
+  (package
+    (name "texlive-duerer-latex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/duerer-latex/"
+                   "tex/latex/duerer-latex/")
+             (base32
+              "17ni6hrcblkbzn1f8cn2mvrc01sjqmi8qi2dxy82z14llr23qmbh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/duerer-latex")
+    (synopsis "LaTeX support for the Duerer fonts")
+    (description
+     "This package provides LaTeX support for Hoenig's Computer Duerer fonts,
+using their standard fontname names.")
+    (license license:gpl3+)))
+
+(define-public texlive-dutchcal
+  (package
+    (name "texlive-dutchcal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/dutchcal/"
+                   "fonts/afm/public/dutchcal/"
+                   "fonts/map/dvips/dutchcal/"
+                   "fonts/tfm/public/dutchcal/"
+                   "fonts/type1/public/dutchcal/"
+                   "fonts/vf/public/dutchcal/"
+                   "tex/latex/dutchcal/")
+             (base32
+              "173c5k6q35ljbqdi00kplxss0n1aiss8nvigdv33mlkqpg7i74qg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dutchcal")
+    (synopsis "Reworking of ESSTIX13, adding a bold version")
+    (description
+     "This package reworks the mathematical calligraphic font ESSTIX13,
+adding a bold version.  LaTeX support files are included.")
+    (license license:lppl)))
+
+(define-public texlive-dvgloss
+  (package
+    (name "texlive-dvgloss")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/dvgloss/" "source/latex/dvgloss/"
+                   "tex/latex/dvgloss/")
+             (base32
+              "1fs5ghbyl3qhg1v0iljjqn723a93m4l7f873h3h81pcga75mng4s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/dvgloss")
+    (synopsis "Facilities for setting interlinear glossed text")
+    (description
+     "The package provides extensible macros for setting interlinear glossed
+text --- useful, for instance, for typing linguistics papers.")
+    (license license:lppl)))
+
 (define-public texlive-dyntree
   (package
     (name "texlive-dyntree")
@@ -3805,6 +11894,22 @@ Gaulle (now deceased), under a free licence.  It replaces the old full
 @code{frenchle} packages.")
     (license license:lppl1.3+)))
 
+(define-public texlive-ean
+  (package
+    (name "texlive-ean")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/ean/" "tex/generic/ean/")
+             (base32
+              "1zyxjpc0ggas43lpvl1l1mknqmd94q0cqgw6w2by29w3r8wafjh9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ean")
+    (synopsis "Macros for making EAN barcodes")
+    (description "This package provides EAN-8 and EAN-13 forms.")
+    (license license:gpl3+)))
+
 (define-public texlive-easing
   (package
     (name "texlive-easing")
@@ -3823,6 +11928,200 @@ Gaulle (now deceased), under a free licence.  It replaces the old full
 to the PGF mathematical engine.")
     (license license:lppl1.3+)))
 
+(define-public texlive-ebgaramond
+  (package
+    (name "texlive-ebgaramond")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ebgaramond/"
+                   "fonts/enc/dvips/ebgaramond/"
+                   "fonts/map/dvips/ebgaramond/"
+                   "fonts/opentype/public/ebgaramond/"
+                   "fonts/tfm/public/ebgaramond/"
+                   "fonts/type1/public/ebgaramond/"
+                   "fonts/vf/public/ebgaramond/"
+                   "tex/latex/ebgaramond/")
+             (base32
+              "1pa3zrlp9pr31mqir22nfz3rpvv63qnc85xi1bc8vw71pgfymdws")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ebgaramond")
+    (synopsis "LaTeX support for EBGaramond fonts")
+    (description
+     "EB Garamond is a revival by Georg Duffner of the 16th century fonts
+designed by Claude Garamond.  The LaTeX support package works for (pdf)LaTeX,
+XeLaTeX and LuaLaTeX users; configuration files for use with @code{microtype}
+are provided.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-ebgaramond-maths
+  (package
+    (name "texlive-ebgaramond-maths")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ebgaramond-maths/"
+                   "fonts/enc/dvips/ebgaramond-maths/"
+                   "fonts/map/dvips/ebgaramond-maths/"
+                   "fonts/tfm/public/ebgaramond-maths/"
+                   "tex/latex/ebgaramond-maths/")
+             (base32
+              "0rjrf360d7nsny4cxn5fa0gwpph28cx0v9mrr20sbx1vrv9aqvp9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ebgaramond-maths")
+    (synopsis "LaTeX support for EBGaramond fonts in mathematics")
+    (description
+     "This package provides some LaTeX support for the use of EBGaramond12 in
+mathematics.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ebook
+  (package
+    (name "texlive-ebook")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ebook/" "tex/latex/ebook/")
+             (base32
+              "1i9zixl8wiwmfrhrzwm2adgwm5kzqk5xaq5nq9bks9i2ayvmiij2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ebook")
+    (synopsis "Helps creating an ebook by providing an @code{ebook} class")
+    (description
+     "The package defines a command @code{\\ebook} that defines page layout,
+fonts, and font-sizes for documents to be rendered as PDF-ebooks on small
+ebook-readers.")
+    (license license:public-domain)))
+
+(define-public texlive-ebsthesis
+  (package
+    (name "texlive-ebsthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ebsthesis/"
+                   "source/latex/ebsthesis/"
+                   "tex/latex/ebsthesis/")
+             (base32
+              "0vmnkjnpg840rdgbim7gz2frzgr9dycmzqyj9kylicz5nvc4nk5x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ebsthesis")
+    (synopsis "Typesetting theses for economics")
+    (description
+     "The @code{ebsthesis} class and @code{ebstools} package facilitate the
+production of camera-ready manuscripts in conformance with the guidelines of
+Gabler Verlag and typographical rules established by the European Business
+School.")
+    (license license:lppl)))
+
+(define-public texlive-ecc
+  (package
+    (name "texlive-ecc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ecc/" "fonts/source/public/ecc/"
+                   "fonts/tfm/public/ecc/")
+             (base32
+              "06mznqh1k9ff8rpifxkphv3yk9ym6zcvz3x1ksk677n6fp5a5jkh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-ec texlive-metafont))
+    (home-page "https://ctan.org/pkg/ecc")
+    (synopsis "Sources for the European Concrete fonts")
+    (description
+     "The Metafont sources and TFM files of the European Concrete Fonts.
+This is the T1-encoded extension of Knuth's Concrete fonts, including also the
+corresponding text companion fonts.  Adobe Type 1 versions of the fonts are
+available as part of the @code{cm-super} font bundle.")
+    (license license:lppl)))
+
+(define-public texlive-ecltree
+  (package
+    (name "texlive-ecltree")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ecltree/" "tex/latex/ecltree/")
+             (base32
+              "0ki5zzpl8dkz7zwyccmsxfnfq7vl5vlx3gi1py64mgqxfxp0rivw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ecltree")
+    (synopsis "Trees using Epic and Eepic macros")
+    (description
+     "The package recursively draws trees: each subtree is defined in
+a @code{bundle} environment, with a set of leaves described by @code{\\chunk}
+macros.  A chunk may have a @code{bundle} environment inside it.")
+    (license license:lppl)))
+
+(define-public texlive-eco
+  (package
+    (name "texlive-eco")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/eco/" "fonts/tfm/public/eco/"
+                   "fonts/vf/public/eco/" "source/fonts/eco/"
+                   "tex/latex/eco/")
+             (base32
+              "0b2g3bmldad4vfx9qd3sakhayl9knijwn26xwysxrzc3rnfnz5w2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/eco")
+    (synopsis "Old style numerals using EC fonts")
+    (description
+     "This package provides a set of font metric files and virtual fonts for
+using the EC fonts with old-style numerals.  The style file @file{eco.sty} is
+sufficient to use the @code{eco} fonts but if you intend to use other font
+families as well, e.g., PostScript fonts, try @code{altfont}.")
+    (license license:gpl3+)))
+
+(define-public texlive-ecobiblatex
+  (package
+    (name "texlive-ecobiblatex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ecobiblatex/"
+                   "tex/latex/ecobiblatex/")
+             (base32
+              "09569x2dx1h6a63ji44ipkx0nvapc9mgkgrqvc552x62c97zcf21")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ecobiblatex")
+    (synopsis
+     "Global Ecology and Biogeography BibLaTeX styles for the Biber backend")
+    (description
+     "This bundle provides a set of styles for creating bibliographies using
+BibLaTeX in the style of the @emph{Global Ecology and Biogeography} journal.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-econ-bst
+  (package
+    (name "texlive-econ-bst")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/econ-bst/"
+                   "doc/bibtex/econ-bst/")
+             (base32
+              "0nflr827a88yd66bb0mfk86dby1253fxdfrjzx0b4k4zqdljhrbg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/econ-bst")
+    (synopsis "BibTeX style for economics papers")
+    (description
+     "This is a BibTeX style file for papers in economics.  It provides the
+following features: author-year type citation reference style used in
+economics papers highly customizable use of certified random order, as
+proposed by Ray Robson (2018)")
+    (license license:lppl1.3+)))
+
 (define-public texlive-econometrics
   (package
     (name "texlive-econometrics")
@@ -3846,6 +12145,413 @@ letters statistical distributions constants and symbols matrix operators and
 statistical operators.")
     (license license:lppl1.3+)))
 
+(define-public texlive-economic
+  (package
+    (name "texlive-economic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/economic/"
+                   "doc/bibtex/economic/" "tex/latex/economic/")
+             (base32
+              "1b530sy5bf7f6xa4bakm5agnzx0dckafxkqsy9gv2rk2803qsf6c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/economic")
+    (synopsis "BibTeX support for submitting to economics journals")
+    (description
+     "The bundle offers macros and BibTeX styles for the @emph{American
+Economic Review} (AER), the @emph{American Journal of Agricultural
+Economics} (AJAE), the @emph{Canadian Journal of Economics} (CJE), the
+@emph{European Review of Agricultural Economics} (ERAE), the
+@emph{International Economic Review} (IER) and @emph{Economica}.
+
+The macro sets are based on (and require) the @code{harvard} package, and all
+provide variations of author-date styles of presentation.")
+    (license license:lppl)))
+
+(define-public texlive-ecothesis
+  (package
+    (name "texlive-ecothesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ecothesis/")
+             (base32
+              "1avnq2y5l2bc2lkf2g16p2vh77dabv52jr6jrm4jfm1wdapc6fmq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ecothesis")
+    (synopsis "LaTeX thesis template for the Universidade Federal de Vicosa")
+    (description
+     "The package provides a LaTeX thesis template for the @acronym{UFV,
+Universidade Federal de Vicosa}, Brazil.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-eczar
+  (package
+    (name "texlive-eczar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/eczar/"
+                   "fonts/opentype/public/eczar/")
+             (base32
+              "1r7alay4g12gn7sr6d584y04qzi77qiialmsq1wfxay7a2h8c3rn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/eczar")
+    (synopsis "Font family supporting Devanagari and Latin script")
+    (description
+     "Eczar is a type family designed by Vaibhav Singh.  The fonts support
+over 45+3 languages in Latin and Devanagari scripts in 5 weights.")
+    (license license:silofl1.1)))
+
+(define-public texlive-edfnotes
+  (package
+    (name "texlive-edfnotes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/edfnotes/"
+                   "source/latex/edfnotes/"
+                   "tex/latex/edfnotes/")
+             (base32
+              "074db5fanasjzk7clj0l4ka3x1qpmvczwxix0l2v6sjjmyb4xfz4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/edfnotes")
+    (synopsis "Critical annotations to footnotes with @code{ednotes}")
+    (description
+     "The package modifies the annotation commands and label-test mechanism of
+the ednotes package so that critical notes appear on the pages and in the
+order that one would expect.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-edmac
+  (package
+    (name "texlive-edmac")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/edmac/" "source/latex/edmac/"
+                   "tex/generic/edmac/")
+             (base32
+              "1pflqzrzfyw725ypc6lcryzzbizk13j69h4875r6q4fs763kv3w1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/edmac")
+    (synopsis "Typeset critical editions")
+    (description
+     "This is the type example package for typesetting scholarly critical
+editions.")
+    (license license:gpl2)))
+
+(define-public texlive-egameps
+  (package
+    (name "texlive-egameps")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/egameps/" "tex/latex/egameps/")
+             (base32
+              "1wlki6y54czvvq7cvs7pvsvl1fhd8laaj5j52jv1v8w1msh5mlpr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/egameps")
+    (synopsis "LaTeX package for typesetting extensive games")
+    (description
+     "The style is intended to have enough features to draw any extensive game
+with relative ease.  The facilities of PSTricks are used for graphics.")
+    (license license:lppl)))
+
+(define-public texlive-eiad
+  (package
+    (name "texlive-eiad")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/eiad/"
+                   "fonts/source/public/eiad/"
+                   "fonts/tfm/public/eiad/" "tex/latex/eiad/")
+             (base32
+              "0il058v1x79w5faxyalysdmfsgbxc3a1nq8kraffawpqw6wjcrbj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont texlive-sauter))
+    (home-page "https://ctan.org/pkg/eiad")
+    (synopsis "Traditional style Irish fonts")
+    (description
+     "This package provides traditional style Irish fonts, in both lower and
+upper case 32 letters are defined (18 plain ones, 5 long vowels and
+9 aspirated consonants).  The ligature agus is also made available.  The
+remaining characters (digits, punctuation and accents) are inherited from the
+Computer Modern family of fonts.")
+    (license license:public-domain)))
+
+(define-public texlive-eiad-ltx
+  (package
+    (name "texlive-eiad-ltx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/eiad-ltx/"
+                   "fonts/source/public/eiad-ltx/"
+                   "source/latex/eiad-ltx/"
+                   "tex/latex/eiad-ltx/")
+             (base32
+              "0qqwzl345v6hn0gp46flvhhzacgv810qjn575bhigqq726zl4kz7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/eiad-ltx")
+    (synopsis "LaTeX support for the @code{eiad} font")
+    (description
+     "The package provides macros to support use of the @code{eiad} fonts in
+OT1 encoding.  Also offered are a couple of Metafont files described in the
+font package, but not provided there.")
+    (license license:lppl)))
+
+(define-public texlive-einfart
+  (package
+    (name "texlive-einfart")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/einfart/" "tex/latex/einfart/")
+             (base32
+              "11ibc51y76s1awp2flzfgkcbz26a6gr1dwl1d29jm4r9452acgnm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-minimalist))
+    (home-page "https://ctan.org/pkg/einfart")
+    (synopsis "Write your articles in a simple and clear way")
+    (description
+     "This package provides a LaTeX class for typesetting articles with a
+simple and clear design.  Currently, it has native support for Chinese
+(simplified and traditional), English, French, German, Italian, Japanese,
+Portuguese (European and Brazilian), Russian and Spanish typesetting.  It
+compiles with either XeLaTeX or LuaLaTeX.  This is part of the
+@code{minimalist} class series and depends on that package.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-ejpecp
+  (package
+    (name "texlive-ejpecp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ejpecp/" "source/latex/ejpecp/"
+                   "tex/latex/ejpecp/")
+             (base32
+              "083abggngg89nj4ra0a33j3s6wf0jba814lc4zp5sh64pc2x8h0j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ejpecp")
+    (synopsis "Class for EJP and ECP")
+    (description
+     "The class is designed for typesetting articles for the mathematical
+research periodicals @emph{Electronic Journal of Probability} (EJP) and
+@emph{Electronic Communications in Probability} (ECP).")
+    (license license:lppl1.2+)))
+
+(define-public texlive-ekaia
+  (package
+    (name "texlive-ekaia")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ekaia/" "source/latex/ekaia/"
+                   "tex/latex/ekaia/")
+             (base32
+              "1n6zinzcg3win9nn86ljf8fcwsxxn6dq1gjnnw1si8ca01zdyx45")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ekaia")
+    (synopsis
+     "Article format for the Basque Country Science and Technology Journal
+@emph{Ekaia}")
+    (description
+     "The package provides the article format for publishing the Basque
+Country Science and Technology Journal @emph{Ekaia} at the University of the
+Basque Country.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-ektype-tanka
+  (package
+    (name "texlive-ektype-tanka")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ektype-tanka/"
+                   "fonts/truetype/public/ektype-tanka/")
+             (base32
+              "05jyx7dgbi19n6g8f4a5f8lkalld2p7lrlrfy1pj961hx65zbj80")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ektype-tanka")
+    (synopsis "Devanagari fonts by EkType")
+    (description
+     "This package provides a collection of some Devanagari fonts by EkType:
+Mukta, Baloo, Modak, and Jaini.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-elbioimp
+  (package
+    (name "texlive-elbioimp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/elbioimp/"
+                   "source/latex/elbioimp/"
+                   "tex/latex/elbioimp/")
+             (base32
+              "1iwsahllfw975cs11llr0ghx80wf5kmw5zrbs4iqviai12ipnkd2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/elbioimp")
+    (synopsis
+     "LaTeX document class for the @emph{Journal of Electrical Bioimpedance}")
+    (description
+     "This package provides a document class for writing articles to the
+@emph{Journal of Electrical Bioimpedance}.")
+    (license license:lppl)))
+
+(define-public texlive-electrum
+  (package
+    (name "texlive-electrum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/electrum/"
+                   "fonts/afm/arkandis/electrum/"
+                   "fonts/enc/dvips/electrum/"
+                   "fonts/map/dvips/electrum/"
+                   "fonts/tfm/arkandis/electrum/"
+                   "fonts/type1/arkandis/electrum/"
+                   "fonts/vf/arkandis/electrum/"
+                   "source/fonts/electrum/"
+                   "tex/latex/electrum/")
+             (base32
+              "0k8yckfh7pw2p3gy2j4ss9l42dmdbdnb7nsliz0j05g7wkkcp05w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/electrumadf")
+    (synopsis "Electrum ADF fonts collection")
+    (description
+     "Electrum ADF is a slab-serif font featuring optical and italic
+small-caps; additional ligatures and an alternate @samp{Q}; lining, hanging,
+inferior and superior digits; and four weights.  The fonts are provided in
+Adobe Type 1 format and the support material enables use with LaTeX. Licence
+is mixed: LPPL for LaTeX support; GPL with font exception for the fonts.")
+    ;; LPPL for LaTeX support, GPL with font exception for the fonts.
+    (license (list license:lppl license:gpl2+))))
+
+(define-public texlive-eledform
+  (package
+    (name "texlive-eledform")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/eledform/"
+                   "source/latex/eledform/"
+                   "tex/latex/eledform/")
+             (base32
+              "1sslbwabzpvx314bfmr6gy1p8nrh89v5mnkgdcby9w42hnfqiw2n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/eledform")
+    (synopsis "Define textual variants")
+    (description
+     "The package provides commands to formalize textual variants in critical
+editions typeset using @code{eledmac}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-eledmac
+  (package
+    (name "texlive-eledmac")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/eledmac/" "source/latex/eledmac/"
+                   "tex/latex/eledmac/")
+             (base32
+              "1a4579g3rykcgbwjqbky260lx6x7mc41i6cqhi83anf3zilsii0r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/eledmac")
+    (synopsis "Typeset scholarly editions")
+    (description
+     "This package provides a package for typesetting scholarly critical editions,
+replacing the established @code{ledmac} package.  The package supports
+indexing by page and by line numbers, and simple @code{tabular}- and
+@code{array}-style environments.  The package is distributed with the related
+@code{eledpar} package.  The package is now superseded by @code{reledmac}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-els-cas-templates
+  (package
+    (name "texlive-els-cas-templates")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/els-cas-templates/"
+                   "doc/latex/els-cas-templates/"
+                   "tex/latex/els-cas-templates/")
+             (base32
+              "1drp6gykqn4yaxjsiamsn8v5zv7nhvlqiblfhqg85fq3yl4q1sqk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/els-cas-templates")
+    (synopsis "Elsevier updated LaTeX templates")
+    (description
+     "This bundle provides two class and corresponding template files for
+typesetting journal articles supposed to go through Elsevier's updated
+workflow.  One of the sets is meant for one-column, the other for two-column
+layout.  These are now accepted for submitting articles both in Elsevier's
+electronic submission system and elsewhere.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-elsarticle
+  (package
+    (name "texlive-elsarticle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/elsarticle/"
+                   "doc/latex/elsarticle/"
+                   "source/latex/elsarticle/"
+                   "tex/latex/elsarticle/")
+             (base32
+              "1616ql7yhf6fr66szgnpkxd2sz8vx22w25annf11i2zmr698k3aa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/elsarticle")
+    (synopsis "Class for articles for submission to Elsevier journals")
+    (description
+     "This class for typesetting journal articles is accepted for submitted
+articles both in Elsevier's electronic submission system and elsewhere.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-elteikthesis
+  (package
+    (name "texlive-elteikthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/elteikthesis/"
+                   "tex/latex/elteikthesis/")
+             (base32
+              "0brfkpg32vqm42cwp10vbjbk752jcfq5g65znl0z539xdynf1nnp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/elteikthesis")
+    (synopsis "Thesis template for Eotvos Lorand University (Informatics)")
+    (description
+     "This package provides a bachelor and master thesis template for the
+Eotvos Lorand University, Faculty of Informatics (Budapest, Hungary).  The
+template supports producing both Hungarian and English theses.")
+    (license license:expat)))
+
 (define-public texlive-eltex
   (package
     (name "texlive-eltex")
@@ -3866,6 +12572,30 @@ appropriate for drawing for school materials.  The circuit symbols accord to
 the various parts of the standard IEC 617.")
     (license license:lppl)))
 
+(define-public texlive-elvish
+  (package
+    (name "texlive-elvish")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/elvish/"
+                   "fonts/source/public/elvish/"
+                   "fonts/tfm/public/elvish/")
+             (base32
+              "1vmvkc97a7j93jhdp0wbz4mqvk5q2kxjy5dlklwl5jawggagm7r4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/elvish")
+    (synopsis "Fonts for typesetting Tolkien Elvish scripts")
+    (description
+     "The bundle provides fonts for Cirth and for Tengwar.  The Tengwar fonts
+are supported by macros in @file{teng.tex}, or by the (better documented)
+@code{tengtex} package.")
+    ;; "If you produce modifications that seem useful, you are asked to send
+    ;; them to me, so that they can be incorporated into the master files."
+    (license (license:non-copyleft "file://doc/fonts/elvish/README"))))
+
 (define-public texlive-emf
   (package
     (name "texlive-emf")
@@ -3886,6 +12616,36 @@ symbols but does not provide any fonts.  The fonts themselves must be acquired
 otherwise.")
     (license license:gpl3)))
 
+(define-public texlive-emisa
+  (package
+    (name "texlive-emisa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/emisa/" "source/latex/emisa/"
+                   "tex/latex/emisa/")
+             (base32
+              "02f8blixqqbn7k3h2sn59b9d8i2lxqnh2zwdk4gv7wyjr9l0sc1x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               ;; "emisa.ins" apparently wants to generate itself!  Fix that.
+               (add-after 'unpack 'fix-ins
+                 (lambda _
+                   (substitute* "source/latex/emisa/emisa.ins"
+                     (("\\\\file\\{\\\\jobname\\.ins\\}.*") "")))))))
+    (home-page "https://ctan.org/pkg/emisa")
+    (synopsis "LaTeX package for preparing manuscripts for the journal
+@emph{EMISA}")
+    (description
+     "The EMISA LaTeX package is provided for preparing manuscripts for
+submission to @acronym{EMISA, Enterprise Modelling and Information Systems
+Architectures}, and for preparing accepted submissions for publication as well
+as for typesetting the final document by the editorial office.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-endiagram
   (package
     (name "texlive-endiagram")
@@ -3972,6 +12732,100 @@ you use any special symbols inside your command.")
 @url{https://www.eolang.org, EO} programming language.")
     (license license:expat)))
 
+(define-public texlive-epigrafica
+  (package
+    (name "texlive-epigrafica")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/epigrafica/"
+                   "fonts/afm/public/epigrafica/"
+                   "fonts/enc/dvips/epigrafica/"
+                   "fonts/map/dvips/epigrafica/"
+                   "fonts/tfm/public/epigrafica/"
+                   "fonts/type1/public/epigrafica/"
+                   "fonts/vf/public/epigrafica/"
+                   "tex/latex/epigrafica/")
+             (base32
+              "1s18ykapm50xyvrw5ls9gzc3m8r6pnjaplryr7q469k69455fh6z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/epigrafica")
+    (synopsis "Greek and Latin font")
+    (description
+     "Epigrafica is a Greek and Latin font, forked from the development of the
+Cosmetica font, which is a similar design to Optima and includes Greek.")
+    (license license:gpl3+)))
+
+(define-public texlive-eplain
+  (package
+    (name "texlive-eplain")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/eplain/"
+                   "doc/info/eplain.info"
+                   "doc/man/man1/eplain.1"
+                   "doc/man/man1/eplain.man1.pdf"
+                   "source/eplain/"
+                   "tex/eplain/")
+             (base32
+              "00nmqhfckrf8ygw6i93d5xnf85i8a88ryadb5ml73w4rllwjxr72")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:create-formats #~(list "eplain")))
+    (propagated-inputs
+     (list texlive-atbegshi
+           texlive-atveryend
+           texlive-babel
+           texlive-cm
+           texlive-everyshi
+           texlive-firstaid
+           texlive-hyphen-complete
+           texlive-knuth-lib
+           texlive-l3backend
+           texlive-l3kernel
+           texlive-l3packages
+           texlive-latex
+           texlive-latex-fonts
+           texlive-pdftex
+           texlive-plain
+           texlive-tex-ini-files
+           texlive-unicode-data))
+    (home-page "https://ctan.org/pkg/eplain")
+    (synopsis "Extended plain TeX macros")
+    (description
+     "This package provides an extended version of the plain TeX format,
+adding support for bibliographies, tables of contents, enumerated lists,
+verbatim input of files, numbered equations, tables, two-column output,
+footnotes, hyperlinks in PDF output and commutative diagrams.  Eplain can also
+load some of the more useful LaTeX packages, notably @code{graphics},
+@code{graphicx} (an extended version of graphics), @code{color},
+@code{autopict} (a package instance of the LaTeX picture code), @code{psfrag},
+and @code{url}.")
+    (license license:gpl2+)))
+
+(define-public texlive-epsdice
+  (package
+    (name "texlive-epsdice")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/epsdice/" "source/latex/epsdice/"
+                   "tex/latex/epsdice/")
+             (base32
+              "09h3jqb44vl1jpb3hf6gbpfpbvfv6lvdvjmp4xpzhl1zs672wccj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/epsdice")
+    (synopsis "Scalable dice font")
+    (description
+     "The @code{epsdice} package defines a single command @code{\\epsdice}
+that takes a numeric argument (in the range 1-6), and selects a face image
+from a file that contains each of the 6 possible die faces.  The graphic file
+is provided in both Encapsulated PostScript and PDF formats.")
+    (license license:lppl)))
+
 (define-public texlive-epslatex-fr
   (package
     (name "texlive-epslatex-fr")
@@ -4052,6 +12906,222 @@ standard @code{amsmath} numbered equation environments to throw a warning
 whenever this occurs.")
     (license license:lppl1.3+)))
 
+(define-public texlive-erdc
+  (package
+    (name "texlive-erdc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/erdc/" "source/latex/erdc/"
+                   "tex/latex/erdc/")
+             (base32
+              "0sqq0zd89jx2l4n1hpas4c4y4p3mh1mbnfigjbal9xg2h5pijkv1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/erdc")
+    (synopsis "Style for reports by US Army Corps of Engineers")
+    (description
+     "This package provides a class for typesetting Technical Information
+Reports of the Engineer Research and Development Center, US Army Corps of
+Engineers.")
+    (license license:lppl)))
+
+(define-public texlive-erewhon
+  (package
+    (name "texlive-erewhon")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/erewhon/"
+                   "fonts/afm/public/erewhon/"
+                   "fonts/enc/dvips/erewhon/"
+                   "fonts/map/dvips/erewhon/"
+                   "fonts/opentype/public/erewhon/"
+                   "fonts/tfm/public/erewhon/"
+                   "fonts/type1/public/erewhon/"
+                   "fonts/vf/public/erewhon/"
+                   "tex/latex/erewhon/")
+             (base32
+              "02qhg27y24b533gnx90f8a1b7j06i369qswmpccq5a6gaaab8xcv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/erewhon")
+    (synopsis "Font package derived from Heuristica and Utopia")
+    (description
+     "Erewhon is based on the Heuristica package, which is based in turn on
+Utopia.  Erewhon adds a number of new features --- small caps in all styles
+rather than just regular, added figure styles (proportional, inferior,
+numerator, denominator) and superior letters.  The size is 6% smaller than
+Heuristica, matching that of UtopiaStd.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
+(define-public texlive-erewhon-math
+  (package
+    (name "texlive-erewhon-math")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/erewhon-math/"
+                   "fonts/opentype/public/erewhon-math/"
+                   "tex/latex/erewhon-math/")
+             (base32
+              "03p3aiw4ha3rkb6z4z2nwmwv18krkii989a8dvqgignbh9100ck8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/erewhon-math")
+    (synopsis "Utopia based OpenType math font")
+    (description
+     "Erewhon Math is an OpenType version of the Fourier Type1 fonts designed
+by Michel Bovani.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
+(define-public texlive-esrelation
+  (package
+    (name "texlive-esrelation")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/esrelation/"
+                   "fonts/map/dvips/esrelation/"
+                   "fonts/source/public/esrelation/"
+                   "fonts/tfm/public/esrelation/"
+                   "fonts/type1/public/esrelation/"
+                   "source/fonts/esrelation/"
+                   "tex/latex/esrelation/")
+             (base32
+              "168pjrn3pgyqb79nvwk4rykb214jj1fvygnlb18rx7nrnzdmagjw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/esrelation")
+    (synopsis "Symbol set for describing relations between ordered pairs")
+    (description
+     "This package provides an math symbol font, by Tauba Auerbach, for
+describing relations between ordered pairs, using Metafont.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-esstix
+  (package
+    (name "texlive-esstix")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/esstix/"
+                   "fonts/afm/esstix/"
+                   "fonts/map/dvips/esstix/"
+                   "fonts/tfm/public/esstix/"
+                   "fonts/type1/public/esstix/"
+                   "fonts/vf/public/esstix/"
+                   "tex/latex/esstix/")
+             (base32
+              "1wfl7q6yx7pflzy402ldx7p3zw3xgvgvilrdzv7pm0w937a3qkm9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/esstix")
+    (synopsis "PostScript versions of the ESSTIX, with macro support")
+    (description
+     "These fonts represent translation to PostScript Type 1 of the ESSTIX
+fonts.  ESSTIX seem to have been a precursor to the STIX project.  The
+accompanying virtual fonts with customized metrics and LaTeX support files
+allow their use as @code{calligraphic}, @code{fraktur} and
+@code{double-struck} (blackboard bold) in maths mode.")
+    (license license:silofl1.1)))
+
+(define-public texlive-estcpmm
+  (package
+    (name "texlive-estcpmm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/estcpmm/" "source/latex/estcpmm/"
+                   "tex/latex/estcpmm/")
+             (base32
+              "09fp8vidb9wzdsm05nira4p8dyjn75i1jhhwnr6k17pdrad1sqrj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/estcpmm")
+    (synopsis "Style for Munitions Management Project Reports")
+    (description
+     "This package provides a class which supports typesetting Cost and
+Performance Reports and Final Reports for Munitions Management Reports, US
+Environmental Security Technology Certification Program.")
+    (license license:lppl)))
+
+(define-public texlive-esvect
+  (package
+    (name "texlive-esvect")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/esvect/"
+                   "fonts/map/dvips/esvect/"
+                   "fonts/source/public/esvect/"
+                   "fonts/tfm/public/esvect/"
+                   "fonts/type1/public/esvect/"
+                   "source/latex/esvect/"
+                   "tex/latex/esvect/")
+             (base32
+              "15sr1rm86aamfy186v2zvvcjsw5rhcq6ph5ckpfn275vjp3fazrf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/esvect")
+    (synopsis "Vector arrows")
+    (description
+     "This package can be used to write vectors using an arrow which differs
+from the Computer Modern one.  You have the choice between several kinds of
+arrows.  The package consists of the relevant Metafont code and a package to
+use it.")
+    (license license:gpl3+)))
+
+(define-public texlive-etbb
+  (package
+    (name "texlive-etbb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/etbb/"
+                   "fonts/afm/public/etbb/"
+                   "fonts/enc/dvips/etbb/"
+                   "fonts/map/dvips/etbb/"
+                   "fonts/opentype/public/etbb/"
+                   "fonts/tfm/public/etbb/"
+                   "fonts/type1/public/etbb/"
+                   "fonts/vf/public/etbb/"
+                   "tex/latex/etbb/")
+             (base32
+              "1mbzbcj0dl6wzl3x8rq9nxsjf8i240zcz3gahhpy273yj42n8313")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/etbb")
+    (synopsis "Expansion of Edward Tufte's ET-Bembo family")
+    (description
+     "The Bembo-like font family, ETbb, expands ET-Bembo features to include
+a full set of figure styles, small caps in all styles, superior letters and
+figures, inferior figures, a new capital Sharp @samp{S} with small caps
+version, along with macros to activate these features in LaTeX.")
+    (license (list license:expat license:lppl1.3+))))
+
+(define-public texlive-etsvthor
+  (package
+    (name "texlive-etsvthor")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/etsvthor/" "tex/latex/etsvthor/")
+             (base32
+              "0lrvxr2lrfq1vkfkx7sjrm8fsxv8aalkpi0x0wmkdizc6n2wlhx4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/etsvthor")
+    (synopsis "Some useful abbreviations for members of e.t.s.v. Thor")
+    (description
+     "``e.t.s.v.  Thor'' stands for Elektrotechnische Studievereniging Thor,
+a study association of Electrical Engeering at the Eindhoven University of
+Technology.  This package provides abbreviations useful for creating meeting
+notes or other documents within the association.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-euclideangeometry
   (package
     (name "texlive-euclideangeometry")
@@ -4076,6 +13146,87 @@ ellipsograph.  This package extends the functionalities of the @code{curve2e}
 package.")
     (license license:lppl1.3c)))
 
+(define-public texlive-euler-math
+  (package
+    (name "texlive-euler-math")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/euler-math/"
+                   "fonts/opentype/public/euler-math/"
+                   "tex/latex/euler-math/")
+             (base32
+              "01vj4nqmac078176m3cj97lx4nnrs395208vxc6671c90fvirg1s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/euler-math")
+    (synopsis "OpenType version of Hermann Zapf's Euler maths font")
+    (description
+     "@file{Euler-Math.otf} is an OpenType version of Hermann Zapf's Euler
+maths font.  A style file @file{euler-math.sty} is provided as a replacement
+of the @code{eulervm} package for LuaLaTeX and XeLaTeX users.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
+(define-public texlive-euxm
+  (package
+    (name "texlive-euxm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/source/public/euxm/"
+                   "fonts/tfm/public/euxm/")
+             (base32
+              "10dqknqlqrga9m2lgd74zx5hk4qcbkfvlzjgr304p94w3k7pclqc")))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/euxm")
+    (synopsis "Extended Euler")
+    (description
+     "This package extends Euler font to include two additional characters
+needed for Concrete Math.")
+    (license license:knuth)))
+
+(define-public texlive-evangelion-jfm
+  (package
+    (name "texlive-evangelion-jfm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/evangelion-jfm/"
+                   "tex/luatex/evangelion-jfm/")
+             (base32
+              "1wr55p96v9x58l0bqcnrbs1q47pf5v0rj8pmclfv0jx9mzc3d5j7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/evangelion-jfm")
+    (synopsis "Japanese font metric supporting many advanced features")
+    (description
+     "This package provides a Japanese font metric supporting vertical and
+horizontal typesetting, linegap punctuations, extended fonts, and more
+interesting and helpful features using traditional and simplified Chinese or
+Japanese fonts under LuaTeX-ja.  It also makes full use of the priority
+feature, meeting the standards, and allows easy customisation.")
+    (license license:expat)))
+
+(define-public texlive-expex
+  (package
+    (name "texlive-expex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/expex/" "tex/generic/expex/")
+             (base32
+              "0is4cdpsqycaw8xzc6x1gkg4ldk8v6a1i52qmxw13q8k10qh6b95")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/expex")
+    (synopsis "Linguistic examples and glosses, with reference capabilities")
+    (description
+     "The package provides macros for typesetting linguistic examples and
+glosses, with a refined mechanism for referencing examples and parts of
+examples.  The package can be used with LaTeX or with Plain TeX.")
+    (license license:lppl)))
+
 (define-public texlive-expose-expl3-dunkerque-2019
   (package
     (name "texlive-expose-expl3-dunkerque-2019")
@@ -4161,6 +13312,30 @@ with or without VAT; different addresses for delivery and for billing are
 permitted.")
     (license license:cc-by-sa2.0)))
 
+(define-public texlive-facture-belge-simple-sans-tva
+  (package
+    (name "texlive-facture-belge-simple-sans-tva")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/facture-belge-simple-sans-tva/"
+                   "tex/xelatex/facture-belge-simple-sans-tva/")
+             (base32
+              "1zs2hcc5lhzvfkv83wym1rax58mryylq9b7i358ln0pklnm2gncx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/facture-belge-simple-sans-tva")
+    (synopsis "Simple Belgian invoice without VAT")
+    (description
+     "This package can be used to generate invoices for Belgian individuals
+who do not have a VAT number and who wish to do occasional work, or to carry
+out paid additional activities during their free time up to 6,000 euros per
+calendar year (amount indexed annually) without having to pay tax or social
+security contributions (see the website Activites complementaires).  The
+package can also generate expense reports.  All totals are calculated
+automatically, in the invoice and in the expense report.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-faktor
   (package
     (name "texlive-faktor")
@@ -4206,6 +13381,333 @@ the chapters.  Each chapter can consist of three sections: the lesson, the
 exercises and the activities.")
     (license license:lppl)))
 
+(define-public texlive-fbb
+  (package
+    (name "texlive-fbb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fbb/"
+                   "fonts/enc/dvips/fbb/"
+                   "fonts/map/dvips/fbb/"
+                   "fonts/opentype/public/fbb/"
+                   "fonts/tfm/public/fbb/"
+                   "fonts/type1/public/fbb/"
+                   "fonts/vf/public/fbb/"
+                   "tex/latex/fbb/")
+             (base32
+              "012zfxq6hdz9m4pn6dxqv3lsbr809r10mj795w96cijzrys4zww1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fbb")
+    (synopsis "Bembo-like font")
+    (description
+     "The package provides a Bembo-like font package based on Cardo but with
+many modifications, adding Bold Italic, small caps in all styles, six figure
+choices in all styles, updated kerning tables, added figure tables and
+corrected f-ligatures.  Both OpenType and Adobe Type 1 versions are provided;
+all necessary support files are provided.  The font works well with
+@code{newtxmath}'s @code{libertine} option.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
+(define-public texlive-fbithesis
+  (package
+    (name "texlive-fbithesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fbithesis/"
+                   "source/latex/fbithesis/"
+                   "tex/latex/fbithesis/")
+             (base32
+              "1650ilscm47x606piwx7a8z08lhkq87g8k0z40ii3ig0c3p9isgl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (home-page "https://ctan.org/pkg/fbithesis")
+    (synopsis "Computer Science thesis class for University of Dortmund")
+    (description
+     "At the department of computer science at the University of Dortmund
+there are cardboard cover pages for research or internal reports like master
+and phd theses.  The main function of this LaTeX2e document-class is
+a replacement for the @code{\\maketitle} command to typeset a title page that
+is adjusted to these cover pages.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-fbs
+  (package
+    (name "texlive-fbs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/fbs/")
+             (base32
+              "18h6n8azrnk2qabv30kpa8gmj2ljkvx0nqs8qb9r8dxxnhng78ch")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fbs")
+    (synopsis "BibTeX style for @emph{Frontiers in Bioscience}")
+    (description
+     "This package provides a BibTeX style file made with @code{custom}-bib to
+fit @emph{Frontiers in Bioscience} requirements.")
+    (license license:lppl)))
+
+(define-public texlive-fcavtex
+  (package
+    (name "texlive-fcavtex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/fcavtex/" "doc/latex/fcavtex/"
+                   "tex/latex/fcavtex/")
+             (base32
+              "0l87wlh9mzh0hysfw35mlx3asqw7lvwc55yiqr01jbmv1hwgfnl6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fcavtex")
+    (synopsis "Thesis class for the FCAV/UNESP, Brazil")
+    (description
+     "This package provides a class and a bibliography style for the
+@acronym{FCAV-UNESP, Faculdade de Ciencias Agrarias e Veterinarias de
+Jaboticabal UNESP} Brazilian university, written based on the institution
+rules for thesis publications.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-fcltxdoc
+  (package
+    (name "texlive-fcltxdoc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fcltxdoc/"
+                   "source/latex/fcltxdoc/"
+                   "tex/latex/fcltxdoc/")
+             (base32
+              "0qb0l622svj1bqs0p05mcf30f4xy432aa4qzk6w4rlckssdfiwva")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fcltxdoc")
+    (synopsis "Macros for use in the author's documentation")
+    (description
+     "The package is not advertised for public use, but is necessary for the
+support of others of the author's packages (which are compiled under the
+@code{ltxdoc} class).")
+    (license license:lppl1.3+)))
+
+(define-public texlive-fdsymbol
+  (package
+    (name "texlive-fdsymbol")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fdsymbol/"
+                   "doc/latex/fdsymbol/"
+                   "fonts/enc/dvips/fdsymbol/"
+                   "fonts/map/dvips/fdsymbol/"
+                   "fonts/opentype/public/fdsymbol/"
+                   "fonts/source/public/fdsymbol/"
+                   "fonts/tfm/public/fdsymbol/"
+                   "fonts/type1/public/fdsymbol/"
+                   "source/latex/fdsymbol/"
+                   "tex/latex/fdsymbol/")
+             (base32
+              "1qw2bmw48xppn9jj5m46l3lr1zja6nall0a3vvpcfjd66ai3hmca")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/fdsymbol")
+    (synopsis "Maths symbol font")
+    (description
+     "FdSymbol is a maths symbol font, designed as a companion to the Fedra
+family, but it might also fit other contemporary typefaces.")
+    (license license:silofl1.1)))
+
+(define-public texlive-fduthesis
+  (package
+    (name "texlive-fduthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fduthesis/"
+                   "source/latex/fduthesis/"
+                   "tex/latex/fduthesis/")
+             (base32
+              "1imgp79fa048nyvyjzfky1fzzmak4h4j7xa4168ak07qgr5gdq87")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fduthesis")
+    (synopsis "LaTeX thesis template for Fudan University")
+    (description
+     "This package is a LaTeX thesis template package for Fudan University.
+It can make it easy to write theses both in Chinese and English.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-fei
+  (package
+    (name "texlive-fei")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fei/" "source/latex/fei/"
+                   "tex/latex/fei/")
+             (base32
+              "13f2sn9pazq6ak37025wr20mi11069paw8hd7qlrcy10bn7bkbl7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fei")
+    (synopsis "Class for academic works at FEI University Center, Brazil")
+    (description
+     "@code{fei} is a class created by graduate students and LaTeX enthusiasts
+that allows students from FEI University Center to create their academic
+works, be it a monograph, masters dissertation or PhD thesis, under the
+typographic rules of the institution.  The class makes it possible to create
+a full academic work, supporting functionalities such as cover, title page,
+catalog entry, dedication, summary, lists of figures, tables, algorithms,
+acronyms and symbols, multiple authors, index, references, appendices and
+attachments.  @code{fei} is loosely based in the Brazilian National Standards
+Organization (@acronym{ABNT, Associacao Brasileira de Normas Tecnicas}).")
+    (license license:lppl1.3c)))
+
+(define-public texlive-fetamont
+  (package
+    (name "texlive-fetamont")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fetamont/"
+                   "fonts/afm/public/fetamont/"
+                   "fonts/map/dvips/fetamont/"
+                   "fonts/opentype/public/fetamont/"
+                   "fonts/source/public/fetamont/"
+                   "fonts/tfm/public/fetamont/"
+                   "fonts/type1/public/fetamont/"
+                   "metapost/fetamont/"
+                   "source/fonts/fetamont/"
+                   "tex/latex/fetamont/")
+             (base32
+              "0bs911vyn54i61vv3rhr0xcp6myap2s8ww6p1fd30ld1ha6nsrf6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    ;; FIXME: Generating font metrics require unpackaged "mf2outline.py"
+    ;; script.
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'generate-font-metrics))))
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/fetamont")
+    (synopsis "Extended version of Knuth's Logo typeface")
+    (description
+     "The @code{fetamont} typeface was designed in Metafont and extends the
+Logo fonts to complete the Type 1 encoding.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-feyn
+  (package
+    (name "texlive-feyn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/feyn/"
+                   "fonts/source/public/feyn/"
+                   "fonts/tfm/public/feyn/"
+                   "source/fonts/feyn/" "tex/latex/feyn/")
+             (base32
+              "0kd5xs1xffgplpapj6rjv4aaz7pfjfh8rspy2xrabbf03npkdqz5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont texlive-sauter))
+    (home-page "https://ctan.org/pkg/feyn")
+    (synopsis "Font for in-text Feynman diagrams")
+    (description
+     "Feyn may be used to produce relatively simple Feynman diagrams within
+equations in a LaTeX document.  While the @code{feynmf} package is good at
+drawing large diagrams for figures, the present package and its fonts allow
+diagrams within equations or text, at a matching size.  The fonts are
+distributed as Metafont source, and macros for their use are also provided.")
+    (license license:bsd-2)))
+
+(define-public texlive-fge
+  (package
+    (name "texlive-fge")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fge/"
+                   "fonts/map/dvips/fge/"
+                   "fonts/source/public/fge/"
+                   "fonts/tfm/public/fge/"
+                   "fonts/type1/public/fge/"
+                   "source/fonts/fge/"
+                   "tex/latex/fge/")
+             (base32
+              "00q9rf8jrb6jl5c10kn6axnlza6q02xan2gf88rd736v0wpi4936")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/fge")
+    (synopsis "Font for Frege's @emph{Grundgesetze der Arithmetik}")
+    (description
+     "The package provides fonts for Frege's @emph{Grundgesetze der
+Arithmetik}.  The fonts are provided as Metafont source and Adobe Type 1 (pfb)
+files.  A small LaTeX package (@code{fge}) is included.")
+    (license license:lppl)))
+
+(define-public texlive-figbas
+  (package
+    (name "texlive-figbas")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/figbas/"
+                   "fonts/afm/public/figbas/"
+                   "fonts/map/dvips/figbas/"
+                   "fonts/tfm/public/figbas/"
+                   "fonts/type1/public/figbas/")
+             (base32
+              "07dc19989sx968hbn3h2m1bbplp8zqh1yj9v92mcp54876rk8bbp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/figbas")
+    (synopsis "Mini-fonts for figured-bass notation in music")
+    (description
+     "This package consists of three mini-fonts (and associated metrics) of
+conventional ligatures for the figured-bass notations 2+, 4+, 5+, 6+ and 9+ in
+music manuscripts.  The fonts are usable with Computer Modern Roman and Sans,
+and Palatino/Palladio, respectively.")
+    (license license:lppl)))
+
+(define-public texlive-figbib
+  (package
+    (name "texlive-figbib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/figbib/" "doc/latex/figbib/"
+                   "tex/latex/figbib/")
+             (base32
+              "1wvglj3z86xjz1bi5931hxm9b2kn6r4j7391di26wmsyhdajs2yz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/figbib")
+    (synopsis "Organize figure databases with BibTeX")
+    (description
+     "FigBib lets you organize your figures in BibTeX databases.  Some FigBib
+features are:
+@itemize
+
+@item store and manage figures in a BibTeX database;
+
+@item Include figures in your LaTeX document with one short command;
+
+@item generate a list of figures containing more or other information than the
+figure captions;
+
+@item control with one switch where to output the figures, either as usual
+float objects or in a separate part at the end of your document.
+
+@end itemize")
+    (license license:lppl)))
+
 (define-public texlive-filecontentsdef
   (package
     (name "texlive-filecontentsdef")
@@ -4233,6 +13735,47 @@ the PDF as file attachment annotations (by using Scott Pakin's package
 @code{attachfile}).")
     (license license:lppl1.3+)))
 
+(define-public texlive-firamath
+  (package
+    (name "texlive-firamath")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/firamath/"
+                   "fonts/opentype/public/firamath/")
+             (base32
+              "0sc3ip9mvyqlbsj7vfcb1yaxlc32w18kqrqm051v5y2bbvp53s0p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/firamath")
+    (synopsis "Fira sans serif font with Unicode math support")
+    (description
+     "Fira Math is a sans-serif font with Unicode math support.  The design of
+this font is based on Fira Sans and FiraGO.  Fira Math is distributed in
+OpenType format and can be used with the @code{unicode-math} package under
+XeLaTeX or LuaLaTeX.  More support is offered by the @code{firamath-otf}
+package.")
+    (license license:silofl1.1)))
+
+(define-public texlive-firamath-otf
+  (package
+    (name "texlive-firamath-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/firamath-otf/"
+                   "tex/latex/firamath-otf/")
+             (base32
+              "1ai8qsxx6laxl12n2fivl08xywzf1y8rd2n839v8z5bjfsjznqk6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/firamath-otf")
+    (synopsis "Use OpenType math font Fira Math")
+    (description
+     "The package offers XeTeX and LuaTeX support for the sans serif OpenType
+Fira Math font.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-fixdif
   (package
     (name "texlive-fixdif")
@@ -4254,6 +13797,44 @@ with pdfTeX, XeTeX and LuaTeX, and can also be used with the
 @code{unicode-math} package.")
     (license license:lppl1.3c)))
 
+(define-public texlive-fixfoot
+  (package
+    (name "texlive-fixfoot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fixfoot/" "tex/latex/fixfoot/")
+             (base32
+              "1anyswchln7y7a6x72ay6hm3ck36byxk2ciia0w6y100iqcpq2sl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fixfoot")
+    (synopsis "Multiple use of the same footnote text")
+    (description
+     "This package provides a @code{\\DeclareFixedFootnote} command to provide
+a single command for a frequently-used footnote.  The package ensures that
+only one instance of the footnote text appears on each page (LaTeX needs to be
+run several times to achieve this).")
+    (license license:lppl)))
+
+(define-public texlive-fixjfm
+  (package
+    (name "texlive-fixjfm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/fixjfm/" "tex/generic/fixjfm/")
+             (base32
+              "0x3wf7v03jqczvxaslqw422bvccvna31jl5sgld6llvfh7b0ziyx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fixjfm")
+    (synopsis "Fix JFM (for *pTeX)")
+    (description
+     "This package fixes several bugs in the JFM format.  Both LaTeX and plain
+TeX are supported.")
+    (license license:knuth)))
+
 (define-public texlive-fixltxhyph
   (package
     (name "texlive-fixltxhyph")
@@ -4324,6 +13905,238 @@ and complex notation.  Further many macros and shortcuts are added, e.g., for
 spaces, operators, physics unit, etc.")
     (license license:lppl)))
 
+(define-public texlive-foekfont
+  (package
+    (name "texlive-foekfont")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/foekfont/"
+                   "fonts/map/dvips/foekfont/"
+                   "fonts/tfm/public/foekfont/"
+                   "fonts/type1/public/foekfont/"
+                   "tex/latex/foekfont/")
+             (base32
+              "01l6mj5dh52cdaqdkv74j8qw2pfd6w7x53n856vsjgdha4r8362y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/foekfont")
+    (synopsis "Title font of the @emph{Mads Fok} magazine")
+    (description
+     "The bundle provides the Foek font, an Adobe Type 1 font, and LaTeX
+support for its use.")
+    (license license:gpl3+)))
+
+(define-public texlive-fonetika
+  (package
+    (name "texlive-fonetika")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fonetika/"
+                   "fonts/afm/public/fonetika/"
+                   "fonts/map/dvips/fonetika/"
+                   "fonts/tfm/public/fonetika/"
+                   "fonts/truetype/public/fonetika/"
+                   "fonts/type1/public/fonetika/"
+                   "tex/latex/fonetika/")
+             (base32
+              "1d19a9v3innfq9602w8rd2ffn0yd52fz4wmdva6qnix0jgadc1ka")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fonetika")
+    (synopsis "Support for the Danish Dania phonetic system")
+    (description
+     "Fonetika Dania is a font bundle with a serif font and a sans serif font
+for the Danish phonetic system Dania.  Both fonts exist in regular and bold
+weights.  LaTeX support is provided.")
+    ;; The license is GPL3+, except for the fonts and metrics of the Fonetika
+    ;; Dania Iwonae, which are under GUST Font Nosource License.
+    (license (list license:gpl3+ license:gfl1.0))))
+
+(define-public texlive-fontawesome
+  (package
+    (name "texlive-fontawesome")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fontawesome/"
+                   "fonts/enc/dvips/fontawesome/"
+                   "fonts/map/dvips/fontawesome/"
+                   "fonts/opentype/public/fontawesome/"
+                   "fonts/tfm/public/fontawesome/"
+                   "fonts/type1/public/fontawesome/"
+                   "tex/latex/fontawesome/")
+             (base32
+              "0m3wl0jc00h8r4w3fa5vkf062hmaadb2rvf3x9lm4pb0c99ia5x9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fontawesome")
+    (synopsis "Font containing web-related icons")
+    (description
+     "The package offers access to the large number of web-related icons
+provided by the FontAwesome font.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-fontawesome5
+  (package
+    (name "texlive-fontawesome5")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fontawesome5/"
+                   "fonts/enc/dvips/fontawesome5/"
+                   "fonts/map/dvips/fontawesome5/"
+                   "fonts/opentype/public/fontawesome5/"
+                   "fonts/tfm/public/fontawesome5/"
+                   "fonts/type1/public/fontawesome5/"
+                   "tex/latex/fontawesome5/")
+             (base32
+              "17cfqa2jjg3lp0damwy8kfdihmchx55994rrc897kcdba865rrwg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fontawesome5")
+    (synopsis "Font Awesome 5 with LaTeX support")
+    (description
+     "This package provides LaTeX support for the included Font Awesome 5 icon
+set.")
+    (license (list license:silofl1.1 license:lppl1.3c))))
+
+(define-public texlive-fontmfizz
+  (package
+    (name "texlive-fontmfizz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fontmfizz/"
+                   "fonts/truetype/public/fontmfizz/"
+                   "tex/latex/fontmfizz/")
+             (base32
+              "1z0k7n1yyisv3igw77bj3r8hywyz55ciylb3fjx9dpdcrwv3kngd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fontmfizz")
+    (synopsis "Font Mfizz icons for use in LaTeX")
+    (description
+     "The MFizz font provides scalable vector icons representing programming
+languages, operating systems, software engineering, and technology.  It can be
+seen as an extension to FontAwesome.")
+    (license license:expat)))
+
+(define-public texlive-fontsize
+  (package
+    (name "texlive-fontsize")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fontsize/"
+                   "source/latex/fontsize/"
+                   "tex/latex/fontsize/")
+             (base32
+              "1y061r4hadb2c26dgch6lrjw6f4j87zj1gj5lgzgx0hyyz58snqy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:tex-format "latex"
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'fix-circular-dependency
+                 ;; Documentation doesn't build, and generates a circular
+                 ;; dependency with BIBLATEX-PHILOSOPHY package.  Since we're
+                 ;; not interested in re-building the whole documentation,
+                 ;; just skip that part.
+                 (lambda _
+                   (substitute* "source/latex/fontsize/fontsize.dtx"
+                     (("\\[style=philosophy-classic\\]") "")
+                     (("\\\\DocInput\\{fontsize\\.dtx\\}") "")))))))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-biblatex
+                  texlive-booktabs
+                  texlive-caption
+                  texlive-cochineal
+                  texlive-csquotes
+                  texlive-etoolbox
+                  texlive-fontaxes
+                  texlive-guitlogo
+                  texlive-hologo
+                  texlive-hypdoc
+                  texlive-inconsolata
+                  texlive-libertine
+                  texlive-listings
+                  texlive-ltxdockit
+                  texlive-manfnt
+                  texlive-mathalpha
+                  texlive-mdframed
+                  texlive-metalogo
+                  texlive-microtype
+                  texlive-needspace
+                  texlive-newtx
+                  texlive-parskip
+                  texlive-pgf
+                  texlive-sectsty
+                  texlive-siunitx
+                  texlive-tabu
+                  texlive-upquote
+                  texlive-xcolor
+                  texlive-xkeyval
+                  texlive-xstring
+                  texlive-zref))))
+    (home-page "https://ctan.org/pkg/fontsize")
+    (synopsis
+     "Small package to set arbitrary sizes for the main font of the document")
+    (description
+     "The package allows you to set arbitrary sizes for the main font of the
+document, through the @emph{fontsize=<size>} option.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-fonttable
+  (package
+    (name "texlive-fonttable")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/fonttable/"
+                   "source/latex/fonttable/"
+                   "tex/latex/fonttable/")
+             (base32
+              "1mb83zzx5wk92x6zz28k42wmi82hyd1h7fb3p9imjssn6qb73356")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fonttable")
+    (synopsis "Print font tables from a LaTeX document")
+    (description
+     "This is a package version of @file{nfssfont.tex}; it enables you to
+print a table of the characters of a font and/or some text (for demonstration
+or testing purposes), from within a document.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-footbib
+  (package
+    (name "texlive-footbib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/footbib/" "source/latex/footbib/"
+                   "tex/latex/footbib/")
+             (base32
+              "0kv8nh82b16bmhxh2291ahznhjgm5g4qskqwdba66w48wkhzr32j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/footbib")
+    (synopsis "Bibliographic references as footnotes")
+    (description
+     "The package makes bibliographic references appear as footnotes.  It
+defines a command @code{\\footcite} which is similar to the LaTeX
+@code{\\cite} command but the references cited in this way appear at the
+bottom of the pages.  This @code{foot} bibliography does not conflict with the
+standard one and both may exist simultaneously in a document.  The command
+@code{\\cite} may still be used to produce the standard bibliography.  The
+@code{foot} bibliography uses its own style and bibliographic database which
+may be specified independently of the standard one.  Any standard bibliography
+style may be used.")
+    (license license:lppl)))
+
 (define-public texlive-formal-grammar
   (package
     (name "texlive-formal-grammar")
@@ -4367,6 +14180,35 @@ and templates for an introductory LaTeX course (in French) prepared for
 Universite Laval, Quebec, Canada.")
     (license license:cc-by4.0)))
 
+(define-public texlive-forum
+  (package
+    (name "texlive-forum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/forum/"
+                   "fonts/enc/dvips/forum/"
+                   "fonts/map/dvips/forum/"
+                   "fonts/opentype/public/forum/"
+                   "fonts/tfm/public/forum/"
+                   "fonts/type1/public/forum/"
+                   "fonts/vf/public/forum/"
+                   "tex/latex/forum/")
+             (base32
+              "07sbzd2da3i5adlbgrrxd7igyailzjwxvr3pcwmb9wl9jry1gg9m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/forum")
+    (synopsis "Forum fonts with LaTeX support")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Forum font, designed by Denis Masharov.  Forum has antique, classic Roman
+proportions.  It can be used to set body texts and works well in titles and
+headlines too.  It is truly multilingual, with glyphs for Central and Eastern
+Europe, Baltics, Cyrillic and Asian Cyrillic communities.  There is currently
+just a regular weight and an artificially emboldened bold.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-fouridx
   (package
     (name "texlive-fouridx")
@@ -4389,6 +14231,95 @@ level, as appropriate.  The package provides an alternative to the use of the
 @code{\\sideset} command in the @code{amsmath} package.")
     (license license:lppl)))
 
+(define-public texlive-fouriernc
+  (package
+    (name "texlive-fouriernc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fouriernc/"
+                   "fonts/afm/public/fouriernc/"
+                   "fonts/tfm/public/fouriernc/"
+                   "fonts/vf/public/fouriernc/"
+                   "tex/latex/fouriernc/")
+             (base32
+              "1gg9l6zvyi98jg1w7z33pxsnmh7lqjcs2zakhj3pbv2q7ysxnppw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fouriernc")
+    (synopsis "Use New Century Schoolbook text with Fourier maths fonts")
+    (description
+     "This package provides a LaTeX mathematics font setup for use with New
+Century Schoolbook text.")
+    (license license:lppl)))
+
+(define-public texlive-francais-bst
+  (package
+    (name "texlive-francais-bst")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/francais-bst/"
+                   "doc/bibtex/francais-bst/"
+                   "tex/latex/francais-bst/")
+             (base32
+              "19dz9n5wy2phjzm4kk9axvk00akmj07ccw0avkq644z87ksgzqws")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/francais-bst")
+    (synopsis "Bibliographies conforming to French typographic standards")
+    (description
+     "The package provides bibliographies (in French) conforming to the rules
+in @emph{Guide de la communication ecrite} (Malo, M., Quebec Amerique, 1996).
+The BibTeX styles were generated using @code{custom-bib} and they are
+compatible with @code{natbib}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-frcursive
+  (package
+    (name "texlive-frcursive")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/frcursive/"
+                   "fonts/map/dvips/frcursive/"
+                   "fonts/source/public/frcursive/"
+                   "fonts/tfm/public/frcursive/"
+                   "fonts/type1/public/frcursive/"
+                   "tex/latex/frcursive/")
+             (base32
+              "04pqic407b0pfri5sydhbani0fxw0bxy3fl6x4isg2m2z73p4qqa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/frcursive")
+    (synopsis "French cursive hand fonts")
+    (description
+     "This package provides a hand-writing font in the style of the French
+academic running-hand.  The font was written in Metafont and has been
+converted to Adobe Type 1 format.  LaTeX support is provided.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-frederika2016
+  (package
+    (name "texlive-frederika2016")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/frederika2016/"
+                   "fonts/opentype/public/frederika2016/")
+             (base32
+              "10pvx4n4ahn8b251fzz8crg9pijpclan5w4b6jc7m7jjsykzw8xj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/frederika2016")
+    (synopsis "OpenType Greek calligraphy font")
+    (description
+     "Frederika2016 is an attempt to digitize Hermann Zapf's Frederika font.
+The font is the Greek companion of Virtuosa by the same designer.  This font
+is a calligraphy font and this is an initial release.")
+    (license license:silofl1.1)))
+
 (define-public texlive-frenchmath
   (package
     (name "texlive-frenchmath")
@@ -4420,6 +14351,30 @@ writing french operator names like @emph{pgcd}, @emph{ppcm}, @emph{Card},
 @end itemize")
     (license license:lppl1.3+)))
 
+(define-public texlive-frimurer
+  (package
+    (name "texlive-frimurer")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/frimurer/"
+                   "fonts/afm/public/frimurer/"
+                   "fonts/enc/dvips/frimurer/"
+                   "fonts/tfm/public/frimurer/"
+                   "fonts/type1/public/frimurer/"
+                   "source/fonts/frimurer/"
+                   "tex/latex/frimurer/")
+             (base32
+              "072mbcn6272rs1sw85xznk0f7psqh3dkz8y0hayn8y7a83vcrfgr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/frimurer")
+    (synopsis "Access to the @emph{frimurer} cipher for use with LaTeX")
+    (description
+     "This package provides access to the @emph{frimurer} cipher for use with
+LaTeX.")
+    (license license:gpl3)))
+
 (define-public texlive-frletter
   (package
     (name "texlive-frletter")
@@ -4485,6 +14440,28 @@ Its aim is to provide a French translation of terms and words used in
 algorithms to make it integrate seamlessly in a French written document.")
     (license license:lppl1.3c)))
 
+(define-public texlive-ftc-notebook
+  (package
+    (name "texlive-ftc-notebook")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ftc-notebook/"
+                   "tex/latex/ftc-notebook/")
+             (base32
+              "068fc2wisryvgr8zqmkiwnyrrh5rmmw5njl41rn70bvv9qdgh31y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ftc-notebook")
+    (synopsis "Typeset FIRST Tech Challenge (FTC) notebooks")
+    (description
+     "This LaTeX package will greatly simplify filling entries for your FIRST
+Tech Challenge (FTC) engineering or outreach notebook.  We developed this
+package to support most frequently used constructs encountered in an FTC
+notebook: meetings, tasks, decisions with pros and cons, tables, figures with
+explanations, team stories and bios, and more.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-functan
   (package
     (name "texlive-functan")
@@ -4507,6 +14484,146 @@ products and convergence with some object oriented flavor (it gives the
 possibility to override the standard behavior of norms, ...).")
     (license license:lppl)))
 
+(define-public texlive-gaceta
+  (package
+    (name "texlive-gaceta")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gaceta/" "tex/latex/gaceta/")
+             (base32
+              "17w2i3qmks9qpdwpx0hy0mjrl5xhrc8hmz9s0229xnhf6h12yb1r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gaceta")
+    (synopsis "Class to typeset @code{La Gaceta de la RSME}")
+    (description
+     "The class will typeset papers for @emph{La Gaceta de la Real Sociedad
+Matematica Espanola}.")
+    (license license:lppl)))
+
+(define-public texlive-gamebook
+  (package
+    (name "texlive-gamebook")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gamebook/"
+                   "source/latex/gamebook/"
+                   "tex/latex/gamebook/")
+             (base32
+              "0ksyr0hb1bfhc1lbbnzlj7ih8xw516djkn0lddnn07sb6hpzl8x4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gamebook")
+    (synopsis "Typeset gamebooks and other interactive novels")
+    (description
+     "This package provides the means in order to lay-out gamebooks with LaTeX.
+A simple gamebook example is included with the package, and acts as
+a tutorial.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-gamebooklib
+  (package
+    (name "texlive-gamebooklib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gamebooklib/"
+                   "source/latex/gamebooklib/"
+                   "tex/latex/gamebooklib/")
+             (base32
+              "1zw1l4a6wqrqpfmvxj404lf8z559hm7sgw8cwxn04g6pk72jycdl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gamebooklib")
+    (synopsis "Macros for setting numbered entries in shuffled order")
+    (description
+     "This package provides macros and environments to allow the user to
+typeset a series of cross-referenced, numbered entries, shuffled into random
+order, to produce an interactive novel or @dfn{gamebook}.  This allows entries
+to be written in natural order and shuffled automatically into a repeatable
+non-linear order.  Limited support is provided for footnotes to appear at the
+natural position: the end of each entry, or the end of each page, whichever is
+closest to the footnote mark.
+
+This is unrelated to the @code{gamebook} package which is more concerned with
+the formatting of entries rather than their order.  The two packages can be
+used together or separately.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-gammas
+  (package
+    (name "texlive-gammas")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/gammas/" "doc/latex/gammas/"
+                   "tex/latex/gammas/")
+             (base32
+              "0jj8lbwlydsih01d637zxpj97ncd44qmf7azgpzn77s8fi760p8n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gammas")
+    (synopsis "Template for the @emph{GAMM Archive for Students}")
+    (description
+     "This is the official document class for typesetting journal articles for
+@emph{GAMM Archive for Students}, the open-access online journal run by the
+@acronym{GAMM, Gesellschaft fur angewandte Mathematik und Mechanik} Juniors.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-garamond-libre
+  (package
+    (name "texlive-garamond-libre")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/garamond-libre/"
+                   "fonts/enc/dvips/garamond-libre/"
+                   "fonts/map/dvips/garamond-libre/"
+                   "fonts/opentype/public/garamond-libre/"
+                   "fonts/tfm/public/garamond-libre/"
+                   "fonts/type1/public/garamond-libre/"
+                   "fonts/vf/public/garamond-libre/"
+                   "tex/latex/garamond-libre/")
+             (base32
+              "0mmfxpdy2r5wd51b8f2l0qb7d6nncypzfs4bmimcm68s4l0rzsw4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/garamond-libre")
+    (synopsis "Garamond Libre font face")
+    (description
+     "Garamond Libre is an old-style font family.  It is a true Garamond,
+i.e., it is based off the designs of 16th-century French engraver Claude
+Garamond (also spelled Garamont).  The Roman design is Garamond's; the italics
+are from a design by Robert Granjon.  The upright Greek font is after a design
+by Firmin Didot; the italic Greek font is after a design by Alexander Wilson.
+The font family includes support for Latin, Greek (monotonic and polytonic)
+and Cyrillic scripts, as well as small capitals, old-style figures, superior
+and inferior figures, historical ligatures, Byzantine musical symbols, the IPA
+and swash capitals.")
+    (license (list license:expat license:lppl))))
+
+(define-public texlive-garamond-math
+  (package
+    (name "texlive-garamond-math")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/garamond-math/"
+                   "fonts/opentype/public/garamond-math/")
+             (base32
+              "1ay8qmcn8glzn0bpg4qqs3k6dr9h7lljal239qvxfvg1fzj76h4n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/garamond-math")
+    (synopsis "An OTF math font matching EB Garamond")
+    (description
+     "Garamond-Math is an OpenType math font matching EB Garamond (Octavio
+Pardo) and EB Garamond (Georg Mayr-Duffner).  Many mathematical symbols are
+derived from other fonts, others are made from scratch.")
+    (license license:silofl1.1)))
+
 (define-public texlive-gastex
   (package
     (name "texlive-gastex")
@@ -4526,6 +14643,71 @@ possibility to override the standard behavior of norms, ...).")
 nets, diagrams, etc., very easily, in the LaTeX @code{picture} environment.")
     (license license:lppl)))
 
+(define-public texlive-gb4e
+  (package
+    (name "texlive-gb4e")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gb4e/" "tex/latex/gb4e/")
+             (base32
+              "1pi6n59v8vrrm2qaff8z28kwb0xa6nykgrfi9r0lxc8f1d2r5k7f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gb4e")
+    (synopsis "Linguistic tools")
+    (description
+     "This package provides an environment for linguistic examples, tools for
+glosses, and various other goodies.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-gbt7714
+  (package
+    (name "texlive-gbt7714")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/gbt7714/" "doc/bibtex/gbt7714/"
+                   "source/bibtex/gbt7714/"
+                   "tex/latex/gbt7714/")
+             (base32
+              "0pmkbh0axh0qnc08fjn5g7pbw59n543siy4l9q3bihnyid11i5qp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-bibtex texlive-natbib texlive-url))
+    (home-page "https://ctan.org/pkg/gbt7714")
+    (synopsis "China's bibliography style standard GB/T 7714-2015 for BibTeX")
+    (description
+     "The package provides a BibTeX implementation for the Chinese national
+bibliography style standard GB/T 7714-2015.  It consists of two @file{.bst}
+files for numerical and author-year styles as well as a LaTeX package which
+provides the citation style defined in the standard.
+
+The package is compatible with @code{natbib} and supports language
+detection (Chinese and English) for each biblilography entry.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-gchords
+  (package
+    (name "texlive-gchords")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gchords/" "tex/latex/gchords/")
+             (base32
+              "0wchfk25v6rh5nffjyn8bypwjsqc9pi2rjrw3np65a0sxxc0sl1v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gchords")
+    (synopsis "Typeset guitar chords")
+    (description
+     "This package provides a LaTeX package for typesetting of guitar chord
+diagrams, including options for chord names, finger numbers and typesetting
+above lyrics.  The bundle also includes a TCL script (@file{chordbox.tcl})
+that provides a graphical application which creates LaTeX files that use
+@file{gchords.sty}.")
+    (license license:gpl3+)))
+
 (define-public texlive-gene-logic
   (package
     (name "texlive-gene-logic")
@@ -4546,6 +14728,327 @@ provides an environment like @code{eqnarray}, a @code{newtheorem}-like
 environment (NewTheorem), and several macros.")
     (license license:isc)))
 
+(define-public texlive-genealogy
+  (package
+    (name "texlive-genealogy")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/genealogy/"
+                   "fonts/source/public/genealogy/"
+                   "fonts/tfm/public/genealogy/")
+             (base32
+              "155ifff77s5cwjk1gkib7gcdx1mcrzzbca35mm8f9w5rzg1d5x7k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/genealogy")
+    (synopsis "Compilation of genealogy fonts")
+    (description
+     "This package provides a simple compilation of the genealogical symbols
+found in the @code{wasy} and @code{gen} fonts, adding the male and female
+symbols to Knuth's @code{gen} font, and so avoiding loading two fonts when you
+need only genealogical symbols.  The font is distributed as Metafont source.")
+    (license license:lppl)))
+
+(define-public texlive-geradwp
+  (package
+    (name "texlive-geradwp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/geradwp/" "source/latex/geradwp/"
+                   "tex/latex/geradwp/")
+             (base32
+              "1g2kh2wdlf6y8wvs7r1zl2ws8ysrjzsk1k0032jci8ik9kx9wlg9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/geradwp")
+    (synopsis "Document class for the @emph{Cahiers du GERAD} series")
+    (description
+     "This package provides the @code{geradwp} class, a class based on
+@code{article} and compatible with LaTeX.  With this class, researchers at
+GERAD will be able to write their working paper while complying to all the
+presentation standards required by the @emph{Cahiers du GERAD} series.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-geschichtsfrkl
+  (package
+    (name "texlive-geschichtsfrkl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/geschichtsfrkl/"
+                   "source/latex/geschichtsfrkl/"
+                   "tex/latex/geschichtsfrkl/")
+             (base32
+              "1mplym0rkfl8pxzw31m1p117pbfz1s59180bhbwi2wgj4225p4w7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/geschichtsfrkl")
+    (synopsis "BibLaTeX style for historians")
+    (description
+     "The package provides a BibLaTeX style, (mostly) meeting the requirements
+of the History Faculty of the University of Freiburg (Germany).")
+    (license license:lppl)))
+
+(define-public texlive-gfdl
+  (package
+    (name "texlive-gfdl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gfdl/" "source/latex/gfdl/"
+                   "tex/latex/gfdl/")
+             (base32
+              "1yiyhks3097sz686sar1jnkska669hp7v2sv1fm7n0d4j00zm816")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gfdl")
+    (synopsis "Support for using GFDL in LaTeX")
+    (description
+     "The @acronym{GFDL, GNU Free Documentation License} is a popular license
+used for programming manuals, documentations and various other textual works
+too, but using this license with LaTeX is not very convenient.  This package
+aims to help users in easily using the license without violating any rules of
+the license.  With a handful of commands, users can rest assured that their
+document will be perfectly licensed under GFDL.")
+    (license (list license:gpl3+ license:fdl1.3+))))
+
+(define-public texlive-gfsartemisia
+  (package
+    (name "texlive-gfsartemisia")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gfsartemisia/"
+                   "fonts/afm/public/gfsartemisia/"
+                   "fonts/enc/dvips/gfsartemisia/"
+                   "fonts/map/dvips/gfsartemisia/"
+                   "fonts/opentype/public/gfsartemisia/"
+                   "fonts/tfm/public/gfsartemisia/"
+                   "fonts/type1/public/gfsartemisia/"
+                   "fonts/vf/public/gfsartemisia/"
+                   "tex/latex/gfsartemisia/")
+             (base32
+              "09kk65sn5wj70dksrywszdbwg2gg9wzdy9m25xj09d8k7hdirayn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gfsartemisia")
+    (synopsis "Modern Greek font design")
+    (description
+     "GFS Artemisia is a relatively modern font, designed as a general purpose
+font in the same sense as Times is nowadays treated.  The font supports the
+Greek and Latin alphabets.  LaTeX support is provided, using the OT1, T1 and
+LGR encodings.")
+    (license (list license:silofl1.1 license:lppl1.0+))))
+
+(define-public texlive-gfsbodoni
+  (package
+    (name "texlive-gfsbodoni")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gfsbodoni/"
+                   "fonts/afm/public/gfsbodoni/"
+                   "fonts/enc/dvips/gfsbodoni/"
+                   "fonts/map/dvips/gfsbodoni/"
+                   "fonts/opentype/public/gfsbodoni/"
+                   "fonts/tfm/public/gfsbodoni/"
+                   "fonts/type1/public/gfsbodoni/"
+                   "fonts/vf/public/gfsbodoni/"
+                   "tex/latex/gfsbodoni/")
+             (base32
+              "0a4l6ijf7lqb8g7cz1fly3c73aq14pybr0cvpn86lsw3sg7cy9jk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gfsbodoni")
+    (synopsis "Greek and Latin font based on Bodoni")
+    (description
+     "Bodoni's Greek fonts in the 18th century broke, for the first time,
+with the Byzantine cursive tradition of Greek fonts.  GFS Bodoni resurrects
+his work for general use.  The font family supports both Greek and Latin
+letters.  LaTeX support of the fonts is provided, offering OT1, T1 and LGR
+encodings.  The fonts themselves are provided in Adobe Type 1 and OpenType
+formats.")
+    (license license:silofl1.1)))
+
+(define-public texlive-gfscomplutum
+  (package
+    (name "texlive-gfscomplutum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gfscomplutum/"
+                   "fonts/afm/public/gfscomplutum/"
+                   "fonts/enc/dvips/gfscomplutum/"
+                   "fonts/map/dvips/gfscomplutum/"
+                   "fonts/opentype/public/gfscomplutum/"
+                   "fonts/tfm/public/gfscomplutum/"
+                   "fonts/type1/public/gfscomplutum/"
+                   "fonts/vf/public/gfscomplutum/"
+                   "tex/latex/gfscomplutum/")
+             (base32
+              "018hpaijnky23brhqmqsq2zm7h5w4y42vdfawba62qlz5m1zijn1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gfscomplutum")
+    (synopsis "Greek font with a long history")
+    (description
+     "GFS Complutum derives from a minuscule-only font cut in the 16th
+century.  An unsatisfactory set of majuscules were added in the early 20th
+century, but its author died before he could complete the revival of the font.
+The Greek Font Society has released this version, which has a new set of
+majuscules.")
+    (license license:silofl1.1)))
+
+(define-public texlive-gfsdidot
+  (package
+    (name "texlive-gfsdidot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gfsdidot/"
+                   "fonts/afm/public/gfsdidot/"
+                   "fonts/enc/dvips/gfsdidot/"
+                   "fonts/map/dvips/gfsdidot/"
+                   "fonts/opentype/public/gfsdidot/"
+                   "fonts/tfm/public/gfsdidot/"
+                   "fonts/type1/public/gfsdidot/"
+                   "fonts/vf/public/gfsdidot/"
+                   "tex/latex/gfsdidot/")
+             (base32
+              "1cnl5m6g3c7brkx9jfwx6lw83ypl5a7cjqjj4hyf65q12m4250db")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gfsdidot")
+    (synopsis "Greek font based on Didot's work")
+    (description
+     "The design of Didot's 1805 Greek typeface was influenced by the
+neoclassical ideals of the late 18th century.  The font was brought to Greece
+at the time of the 1821 Greek Revolution, by Didot's son, and was very widely
+used.  The font supports the Greek alphabet, and is accompanied by a matching
+Latin alphabet based on Zapf's Palatino.  LaTeX support is provided, using the
+OT1, T1, TS1, and LGR encodings.")
+    (license license:silofl1.1)))
+
+(define-public texlive-gfsdidotclassic
+  (package
+    (name "texlive-gfsdidotclassic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gfsdidotclassic/"
+                   "fonts/opentype/public/gfsdidotclassic/")
+             (base32
+              "1cpsmgrq2x6ym9xb63msvm6pc4p2qyi2k40hmxmzhi979ch8gkaz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gfsdidotclassic")
+    (synopsis "Classic version of GFSDidot")
+    (description
+     "This is the classic version of GFSDidot provided for Unicode TeX
+engines.")
+    (license license:silofl1.1)))
+
+(define-public texlive-gfsneohellenic
+  (package
+    (name "texlive-gfsneohellenic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gfsneohellenic/"
+                   "fonts/afm/public/gfsneohellenic/"
+                   "fonts/enc/dvips/gfsneohellenic/"
+                   "fonts/map/dvips/gfsneohellenic/"
+                   "fonts/opentype/public/gfsneohellenic/"
+                   "fonts/tfm/public/gfsneohellenic/"
+                   "fonts/type1/public/gfsneohellenic/"
+                   "fonts/vf/public/gfsneohellenic/"
+                   "tex/latex/gfsneohellenic/")
+             (base32
+              "109zgqj63ffryy42zi64p6r37jmzj5ma3d8bgn7mz3gc2scr1bpc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gfsneohellenic")
+    (synopsis "Font in the Neo-Hellenic style")
+    (description
+     "The Neo-Hellenic style evolved in academic circles in the 19th and 20th
+century; the present font follows a cut commissioned from Monotype in 1927.
+The font supports both Greek and Latin characters, and has been adjusted to
+work well with the @code{cmbright} fonts for mathematics support.  LaTeX
+support of the fonts is provided, offering OT1, T1 and LGR encodings.")
+    (license license:silofl1.1)))
+
+(define-public texlive-gfsneohellenicmath
+  (package
+    (name "texlive-gfsneohellenicmath")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gfsneohellenicmath/"
+                   "fonts/opentype/public/gfsneohellenicmath/"
+                   "tex/latex/gfsneohellenicmath/")
+             (base32
+              "08yzv6qww3qvbg8bp4k8ibd46j1a41ysw4k8fi5nazchf3py7qb0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gfsneohellenicmath")
+    (synopsis "Math font in the Neo-Hellenic style")
+    (description
+     "The GFSNeohellenic font, a historic font first designed by Victor
+Scholderer, now has native support for Mathematics.  A useful application is
+in Beamer documents since this is a sans math font.")
+    (license license:silofl1.1)))
+
+(define-public texlive-gfssolomos
+  (package
+    (name "texlive-gfssolomos")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gfssolomos/"
+                   "fonts/afm/public/gfssolomos/"
+                   "fonts/enc/dvips/gfssolomos/"
+                   "fonts/map/dvips/gfssolomos/"
+                   "fonts/opentype/public/gfssolomos/"
+                   "fonts/tfm/public/gfssolomos/"
+                   "fonts/type1/public/gfssolomos/"
+                   "fonts/vf/public/gfssolomos/"
+                   "tex/latex/gfssolomos/")
+             (base32
+              "0zjbmnkfnaiq7pmpv0xhp5vag2dww70049knf759lf2s0ygnmaaa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gfssolomos")
+    (synopsis "Greek-alphabet font")
+    (description
+     "Solomos is a font which traces its descent from
+a calligraphically-inspired font of the mid-19th century.  LaTeX support, for
+use with the LGR encoding only, is provided.")
+    (license license:silofl1.1)))
+
+(define-public texlive-ghab
+  (package
+    (name "texlive-ghab")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ghab/"
+                   "fonts/source/public/ghab/"
+                   "tex/latex/ghab/")
+             (base32
+              "0jknnlcigk6aa48xqvxd67015fxjlmmp36p52c95xrii4lv3m0zk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ghab")
+    (synopsis "Typeset ghab boxes in LaTeX")
+    (description
+     "The package defines a command @code{\\darghab} that will typeset its
+argument in a box with a decorated frame.  The width of the box may be set
+using an optional argument.")
+    (license license:lppl)))
+
 (define-public texlive-ghsystem
   (package
     (name "texlive-ghsystem")
@@ -4565,6 +15068,54 @@ precautionary statements and pictograms in a straightforward way.  The
 statements are taken from EU regulation 1272/2008.")
     (license license:lppl1.3+)))
 
+(define-public texlive-gillcm
+  (package
+    (name "texlive-gillcm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gillcm/"
+                   "fonts/map/dvips/gillcm/"
+                   "fonts/tfm/public/gillcm/"
+                   "fonts/vf/public/gillcm/"
+                   "tex/latex/gillcm/")
+             (base32
+              "0cz6aqcq2fv6hb2yv2ymc3j6myb8y73gyqbyigabwc909fmh5qdm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gillcm")
+    (synopsis "Alternative unslanted italic Computer Modern fonts")
+    (description
+     "This is a demonstration of the use of virtual fonts for unusual effects:
+the package implements unslanted italic Computer Modern fonts.")
+    (license license:bsd-3)))
+
+(define-public texlive-gillius
+  (package
+    (name "texlive-gillius")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gillius/"
+                   "fonts/enc/dvips/gillius/"
+                   "fonts/map/dvips/gillius/"
+                   "fonts/opentype/arkandis/gillius/"
+                   "fonts/tfm/arkandis/gillius/"
+                   "fonts/type1/arkandis/gillius/"
+                   "fonts/vf/arkandis/gillius/"
+                   "tex/latex/gillius/")
+             (base32
+              "0f2jr70ab5qnmla1n7iwhiw9x9q5fdzw9lcgjzji8rdqlsgq1451")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gillius")
+    (synopsis "Gillius fonts with LaTeX support")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Gillius and Gillius No.@: 2 families of sans serif fonts and condensed
+versions of them, designed by Hirwen Harendal.")
+    (license (list license:gpl2+ license:lppl))))
+
 (define-public texlive-glosmathtools
   (package
     (name "texlive-glosmathtools")
@@ -4615,6 +15166,227 @@ package.  Its main features are:
 Polyglossia.")
     (license license:lppl1.3+)))
 
+(define-public texlive-glossaries
+  (package
+    (name "texlive-glossaries")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/glossaries/"
+                   "doc/man/man1/makeglossaries-lite.1"
+                   "doc/man/man1/makeglossaries-lite.man1.pdf"
+                   "doc/man/man1/makeglossaries.1"
+                   "doc/man/man1/makeglossaries.man1.pdf"
+                   "scripts/glossaries/"
+                   "source/latex/glossaries/"
+                   "tex/latex/glossaries/base/"
+                   "tex/latex/glossaries/expl/"
+                   "tex/latex/glossaries/rollback/"
+                   "tex/latex/glossaries/styles/"
+                   "tex/latex/glossaries/test-entries/")
+             (base32
+              "0k55k49sba80k51pjpb08zf9calnkchcxxsyajx8g3c33ah3j2i1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts #~(list "makeglossaries" "makeglossaries-lite.lua")))
+    (propagated-inputs
+     (list texlive-amsmath
+           texlive-datatool
+           texlive-etoolbox
+           texlive-mfirstuc
+           texlive-tracklang
+           texlive-xfor
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/glossaries")
+    (synopsis "Create glossaries and lists of acronyms")
+    (description
+     "The glossaries package supports acronyms and multiple glossaries, and has
+provision for operation in several languages (using the facilities of either
+Babel or Polyglossia).  New entries are defined to have a name and description
+(and optionally an associated symbol).  Support for multiple languages is
+offered, and plural forms of terms may be specified.  An additional package,
+@code{glossaries-accsupp}, can make use of the @code{accsupp} package
+mechanisms for accessibility support for PDF files containing glossaries.  The
+user may define new glossary styles, and preambles and postambles can be
+specified.  There is provision for loading a database of terms, but only terms
+used in the text will be added to the relevant glossary.
+
+The package uses an indexing program to provide the actual glossary; either
+MakeIndex or Xindy may serve this purpose, and a Perl script is provided to
+serve as interface.  The package supersedes @code{glossary} package (which is
+now obsolete).")
+    (license license:lppl1.3+)))
+
+(define-public texlive-glossaries-extra
+  (package
+    (name "texlive-glossaries-extra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/glossaries-extra/"
+                   "doc/latex/glossaries-extra/"
+                   "source/latex/glossaries-extra/"
+                   "tex/latex/glossaries-extra/")
+             (base32
+              "0s075syzxyz4mkdmq3y4xk38gb9ip19k0cdrlymmixd7jiawvlm8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/glossaries-extra")
+    (synopsis "Extension to the @code{glossaries} package")
+    (description
+     "This package provides improvements and extra features to the
+@code{glossaries} package.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-gmverse
+  (package
+    (name "texlive-gmverse")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gmverse/" "tex/latex/gmverse/")
+             (base32
+              "13vs1w9pfl4is5f5papwqqm83kmb17d4z7gv8nxkswnav9v5cl56")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gmverse")
+    (synopsis "Package for typesetting (short) poems")
+    (description
+     "This package provides a redefinition of the @code{verse} environment to
+make the @code{\\\\} command optional for line ends and to give it
+a possibility of optical centering and right-hanging alignment of lines broken
+because of length.")
+    (license license:lppl)))
+
+(define-public texlive-gnu-freefont
+  (package
+    (name "texlive-gnu-freefont")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gnu-freefont/"
+                   "fonts/opentype/public/gnu-freefont/"
+                   "fonts/truetype/public/gnu-freefont/"
+                   "source/fonts/gnu-freefont/")
+             (base32
+              "14bq8i7n6zhy8352pmhd5d9l4p152c6bgarz17wfp2p00kzs47aw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gnu-freefont")
+    (synopsis "Unicode font, with rather wide coverage")
+    (description
+     "The package provides a set of outline (i.e., OpenType} fonts covering as
+much as possible of the Unicode character set.  The set consists of three
+typefaces: one monospaced and two proportional (one with uniform and one with
+modulated stroke).")
+    (license license:gpl3)))
+
+(define-public texlive-go
+  (package
+    (name "texlive-go")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/go/" "fonts/source/public/go/"
+                   "fonts/tfm/public/go/" "source/fonts/go/"
+                   "tex/latex/go/")
+             (base32
+              "1cvxfz9m7fx62iiz00f7qlywrmwwnpk0xzlyv63c90ji9xzfawcv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/go")
+    (synopsis "Fonts and macros for typesetting go games")
+    (description
+     "The macros provide for nothing more complicated than the standard
+19x19 board; the fonts are written in Metafont.")
+    (license license:public-domain)))
+
+(define-public texlive-gofonts
+  (package
+    (name "texlive-gofonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gofonts/"
+                   "fonts/enc/dvips/gofonts/"
+                   "fonts/map/dvips/gofonts/"
+                   "fonts/tfm/bh/gofonts/"
+                   "fonts/truetype/bh/gofonts/"
+                   "fonts/type1/bh/gofonts/"
+                   "fonts/vf/bh/gofonts/"
+                   "tex/latex/gofonts/")
+             (base32
+              "07ysxm10xwg6cc781gdppidq1s87bqli4x6shkarjl29pxcncn61")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gofonts")
+    (synopsis "GoSans and GoMono fonts with LaTeX support")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the GoSans and GoMono families of fonts designed by the Bigelow & Holmes
+foundry.  GoSans is available in three weights: Regular, Medium, and
+Bold (with corresponding italics).  GoMono is available in regular and bold,
+with italics.")
+    (license (list license:bsd-3 license:lppl))))
+
+(define-public texlive-gost
+  (package
+    (name "texlive-gost")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/gost/" "bibtex/csf/gost/"
+                   "doc/bibtex/gost/" "source/bibtex/gost/")
+             (base32
+              "0rsqk4r1r741ggvpgg7g51knlaqrrdq9g8yiix66vx3n5v1arp26")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gost")
+    (synopsis "BibTeX styles to format according to GOST")
+    (description
+     "This package provides BibTeX styles to format bibliographies in English,
+Russian or Ukrainian according to GOST 7.0.5-2008 or GOST 7.1-2003.  Both
+8-bit and Unicode (UTF-8) versions of each @code{BibTeX} style, in each case
+offering a choice of sorted and unsorted.  Further, a set of three
+styles (which do not conform to current standards) are retained for backwards
+compatibility.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-gothic
+  (package
+    (name "texlive-gothic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gothic/"
+                   "fonts/source/public/gothic/"
+                   "fonts/tfm/public/gothic/"
+                   "source/fonts/gothic/")
+             (base32
+              "08hqp2a0ch67d38p2jca6cvx72vc6dagb04a9w6ff7dniqp6gps2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    ;; FIXME: Font metrics generation fails with "! Strange path (turning
+    ;; number is zero)." error.
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'generate-font-metrics))))
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/gothic")
+    (synopsis "Collection of old German-style fonts")
+    (description
+     "This package provides a collection of fonts that reproduce those used in
+old German printing and handwriting.  The set comprises Gothic, Schwabacher
+and Fraktur fonts, a pair of handwriting fonts, Sutterlin and Schwell, and
+a font containing decorative initials.  In addition, there are two re-encoding
+packages for Haralambous's fonts, providing T1, using virtual fonts, and OT1
+and T1, using Metafont.")
+    ;; This is a collection of packages, with various licenses.
+    (license (list license:lppl1.2+ license:lppl1.3c license:public-domain))))
+
 (define-public texlive-gotoh
   (package
     (name "texlive-gotoh")
@@ -4635,6 +15407,128 @@ The package also provides an interface to control various settings including
 algorithm parameters.")
     (license license:expat)))
 
+(define-public texlive-gradstudentresume
+  (package
+    (name "texlive-gradstudentresume")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gradstudentresume/"
+                   "tex/latex/gradstudentresume/")
+             (base32
+              "0jimvivx5vf1jy7yszvx2zbf13r0brqc0avz8lcx1rsqa3d7rjcn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gradstudentresume")
+    (synopsis "Generic template for graduate student resumes")
+    (description
+     "The package offers a template for graduate students writing an academic
+CV.  The goal is to create a flexible template that can be customized based on
+each specific individual's needs.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-grant
+  (package
+    (name "texlive-grant")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/grant/" "source/latex/grant/"
+                   "tex/latex/grant/")
+             (base32
+              "0cihhr3fqjbn2grkps5wl6aqx19s78vgklmriw2jqg27fqgv5q2p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/grant")
+    (synopsis "Classes for formatting federal grant proposals")
+    (description
+     "This package provides LaTeX classes for formatting federal grant
+proposals:
+@itemize
+@item grant: base class for formatting grant proposals;
+@item grant-arl: Army Research Laboratory;
+@item grant-darpa: Defense Advanced Research Projects Agency;
+@item grant-doe: Department of Energy;
+@item grant-nih: National Institutes of Health;
+@item grant-nrl: Naval Research Laboratory;
+@item grant-nsf: National Science Foundation;
+@item grant-onr: Office of Naval Research.
+@end itemize")
+    (license license:expat)))
+
+(define-public texlive-greenpoint
+  (package
+    (name "texlive-greenpoint")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/greenpoint/"
+                   "fonts/source/public/greenpoint/"
+                   "fonts/tfm/public/greenpoint/")
+             (base32
+              "1y5an7lgx975ppb8s1abx494s4m115k137f82hy08iwdx9l1plj5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/greenpoint")
+    (synopsis "Green Point logo")
+    (description
+     "This package provides a Metafont-implementation of the logo commonly
+known as @emph{Der Grune Punkt} (``The Green Point'').  In Austria, it can be
+found on nearly every bottle.  It should not be confused with the Recycle
+logo.")
+    (license license:gpl3+)))
+
+(define-public texlive-gregoriotex
+  (package
+    (name "texlive-gregoriotex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/gregoriotex/"
+                   "fonts/source/gregoriotex/"
+                   "fonts/truetype/public/gregoriotex/"
+                   "scripts/gregoriotex/"
+                   "source/luatex/gregoriotex/"
+                   "tex/lualatex/gregoriotex/"
+                   "tex/luatex/gregoriotex/")
+             (base32
+              "0lnpq6rfdb6dg543cmbsm817ziim6arxnzxzbn0wn8i8aw681idr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gregoriotex")
+    (synopsis "Engraving gregorian chant scores")
+    (description
+     "Gregorio is a software application for engraving gregorian chant scores
+on a computer.  Gregorio's main job is to convert a gabc file (simple text
+representation of a score) into a GregorioTeX file, which makes TeX able to
+create a PDF of your score.")
+    (license license:gpl3)))
+
+(define-public texlive-grotesq
+  (package
+    (name "texlive-grotesq")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/grotesq/"
+                   "fonts/afm/urw/grotesq/"
+                   "fonts/map/dvips/grotesq/"
+                   "fonts/tfm/urw/grotesq/"
+                   "fonts/type1/urw/grotesq/"
+                   "fonts/vf/urw/grotesq/"
+                   "tex/latex/grotesq/")
+             (base32
+              "12q0n6z442j725drp3919k2qk7kg9fas4cqz415a8lj1nmvg60i4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/urw-grotesq")
+    (synopsis "URW Grotesq font pack for LaTeX")
+    (description
+     "The directory contains a copy of the Type 1 font URW Grotesq 2031
+Bold, with supporting files for use with (La)TeX.")
+    (license license:gpl3+)))
+
 (define-public texlive-grundgesetze
   (package
     (name "texlive-grundgesetze")
@@ -4656,6 +15550,50 @@ concept-script in the style of his @emph{Grundgesetze der Arithmetik} (Basic
 Laws of Arithmetic).")
     (license license:gpl2)))
 
+(define-public texlive-gsemthesis
+  (package
+    (name "texlive-gsemthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gsemthesis/"
+                   "source/latex/gsemthesis/"
+                   "tex/latex/gsemthesis/")
+             (base32
+              "0wwd6pddxb91gj6jr6zc0xy0sr0s0mbdjzyw856w9ds0lp0k6cl9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gsemthesis")
+    (synopsis "Geneva School of Economics and Management PhD thesis format")
+    (description
+     "The class provides a PhD thesis template for the @acronym{GSEM,
+Geneva School of Economics and Management}, University of Geneva, Switzerland.
+The class provides utilities to easily set up the cover page, the front matter
+pages, the page headers, etc., conformant to the official guidelines of the
+GSEM Faculty for writing PhD dissertations.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-gtrcrd
+  (package
+    (name "texlive-gtrcrd")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gtrcrd/" "tex/latex/gtrcrd/")
+             (base32
+              "0ndnzkm84ynn3wcnfg6j6fcl87wmd3g9w5d17g1z6qp340asrkp9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gtrcrd")
+    (synopsis "Add chords to lyrics")
+    (description
+     "The package provides the means to specify guitar chords to be played
+with each part of the lyrics of a song.  The syntax of the macros reduces the
+chance of failing to provide a chord where one is needed, and the structure of
+the macros ensures that the chord specification appears immediately above the
+start of the lyric.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-gu
   (package
     (name "texlive-gu")
@@ -4677,6 +15615,30 @@ Afterwards all necessary dimensions are calculated and the scheme is drawn.
 Currently two steps of symmetry reduction are supported.")
     (license license:lppl)))
 
+(define-public texlive-gudea
+  (package
+    (name "texlive-gudea")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gudea/"
+                   "fonts/enc/dvips/gudea/"
+                   "fonts/map/dvips/gudea/"
+                   "fonts/tfm/public/gudea/"
+                   "fonts/type1/public/gudea/"
+                   "fonts/vf/public/gudea/"
+                   "tex/latex/gudea/")
+             (base32
+              "0kj53idgxyqwishg0vibhhrj443016z61c0jl7rx91a508vbwbn2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gudea")
+    (synopsis "Gudea font face with support for LaTeX and pdfLaTeX")
+    (description
+     "This package provides the Gudea family of fonts designed by Agustina
+Mingote, with support for LaTeX and pdfLaTeX.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-guide-to-latex
   (package
     (name "texlive-guide-to-latex")
@@ -4696,6 +15658,96 @@ Currently two steps of symmetry reduction are supported.")
 processed files, as well as solutions to the exercices.")
     (license license:lppl1.3c+)))
 
+(define-public texlive-guitar
+  (package
+    (name "texlive-guitar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/guitar/" "source/latex/guitar/"
+                   "tex/latex/guitar/")
+             (base32
+              "0rywmlz59mjm59n4607qk9fa62w1c9qv9iyyja8k9vb4pc9yijrc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/guitar")
+    (synopsis "Guitar chords and song texts")
+    (description
+     "This package provides (La)TeX macros for typesetting guitar chords over
+song texts.  Note that this package only places arbitrary TeX code over the
+lyrics.  To typeset the chords graphically (and not only by name), the author
+recommends use of an additional package such as @code{gchords}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-guitarchordschemes
+  (package
+    (name "texlive-guitarchordschemes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/guitarchordschemes/"
+                   "tex/latex/guitarchordschemes/")
+             (base32
+              "189xx0y549ss4ip8x2f1rpcqyad5njrni785sxmy2cghqbdcgzzn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/guitarchordschemes")
+    (synopsis "Guitar chord and scale tablatures")
+    (description
+     "This package provides two commands (@code{\\chordscheme} and
+@code{\\scales}).  With those commands it is possible to draw schematic
+diagrams of guitar chord tablatures and scale tablatures.  Both commands know
+a range of options that allow wide customization of the output.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-guitartabs
+  (package
+    (name "texlive-guitartabs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/guitartabs/"
+                   "tex/latex/guitartabs/")
+             (base32
+              "1hk5yl7za7mm6cpg9g4z5wnq4m2nwm41sq8w7m8ic38sr85n67zz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/guitartabs")
+    (synopsis "Class for drawing guitar tablatures easily")
+    (description
+     "This package provides is a simple LaTeX2e class that allows guitarists
+to create basic guitar tablatures using LaTeX.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-guitlogo
+  (package
+    (name "texlive-guitlogo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/guitlogo/"
+                   "source/latex/guitlogo/"
+                   "tex/latex/guitlogo/")
+             (base32
+              "0fwp3w5b51qs9jr9xq0hl0hsqbx7dkj7qgwjpay88sflycv3qpba")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/guitlogo")
+    (synopsis "Macros for typesetting the GuIT logo")
+    (description
+     "This package provides some commands useful to correctly write the logo
+of @emph{Gruppo Utilizzatori Italiani di TeX} (Italian TeX User Group), using
+the default document color or any other color the user may ever choose, in
+conformity with the logo's scheme as seen on the group's website
+@url{https://www.guitex.org}.  Likewise, commands are provided that simplify
+the writing of the GuIT acronym's complete expansion, of the addresses of the
+group's internet site and public forum, and the meeting GuITmeeting and the
+magazine @emph{Ars TeXnica}'s logo.  Optionally, using @code{hyperref}, the
+outputs of the above cited commands can become hyperlinks to the group's
+website @url{https://www.guitex.org}.  The Documentation is available in
+Italian only.")
+    (license license:lppl1.3a)))
+
 (define-public texlive-gustlib
   (package
     (name "texlive-gustlib")
@@ -4737,6 +15789,160 @@ programs are provided as sources, not installed in the @file{bin}
 directories.")
     (license license:public-domain)))
 
+(define-public texlive-gzt
+  (package
+    (name "texlive-gzt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gzt/" "source/latex/gzt/"
+                   "tex/latex/gzt/")
+             (base32
+              "0gyiy9vzr760mkvaabd3aj3rgz60b9dhc7m5a2rnhzz5sz4a2yv3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gzt")
+    (synopsis "Bundle of classes for @emph{La Gazette des Mathematiciens}")
+    (description
+     "This bundle provides two classes and BibLaTeX styles for the French
+journal @emph{La Gazette des Mathematiciens}: @code{gzt} for the complete
+issues of the journal, aimed at the Gazette's team, @code{gztarticle},
+intended for authors who wish to publish an article in the Gazette.  This
+class's goals are to faithfully reproduce the layout of the Gazette, thus
+enabling the authors to be able to work their document in actual conditions,
+and provide a number of tools (commands and environments) to facilitate the
+drafting of documents, in particular those containing mathematical formulas.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-h2020proposal
+  (package
+    (name "texlive-h2020proposal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/h2020proposal/"
+                   "tex/latex/h2020proposal/")
+             (base32
+              "0fq43vpq3ixj6fc99fbmj129487xxzcmz22gisqmn469bam5qxj5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/h2020proposal")
+    (synopsis "LaTeX class and template for EU H2020 RIA proposal")
+    (description
+     "This package consists of a class file as well as FET and ICT proposal
+templates for writing EU H2020 RIA proposals and generating automatically the
+many cross-referenced tables that are required.")
+    (license license:gpl3)))
+
+(define-public texlive-hacm
+  (package
+    (name "texlive-hacm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/hacm/"
+                   "fonts/map/dvips/hacm/"
+                   "fonts/tfm/public/hacm/"
+                   "fonts/type1/public/hacm/"
+                   "fonts/vf/public/hacm/"
+                   "tex/latex/hacm/")
+             (base32
+              "19n0mlb96ix4vlqaw95fgwah7mbn80l6jm1dim8sigagmhh3bimd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hacm")
+    (synopsis "Font support for the Arka language")
+    (description
+     "The package supports typesetting @emph{hacm}, the alphabet of the
+constructed language Arka.  The bundle provides nine official fonts, in Adobe
+Type 1 format.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-hagenberg-thesis
+  (package
+    (name "texlive-hagenberg-thesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hagenberg-thesis/"
+                   "tex/latex/hagenberg-thesis/")
+             (base32
+              "0dp2mrf4smpllrgszi0cx5w42lm144qs3jvr44h6k98ibsfxdv9h")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hagenberg-thesis")
+    (synopsis
+     "LaTeX classes, style files and example documents for academic
+manuscripts")
+    (description
+     "This package provides a collection of modern LaTeX classes, style files
+and example documents for authoring Bachelor, master or diploma theses and
+related academic manuscripts in English and German.  It includes comprehensive
+tutorials (in English and German) with detailed instructions and authoring
+guidelines.")
+    (license license:cc-by4.0)))
+
+(define-public texlive-hamnosys
+  (package
+    (name "texlive-hamnosys")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/hamnosys/"
+                   "fonts/truetype/public/hamnosys/"
+                   "source/fonts/hamnosys/"
+                   "tex/latex/hamnosys/")
+             (base32
+              "1iilp1npy23azk7gjb3m6g9p9f853lbpn9cvply90g2s9jdw0bd9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hamnosys")
+    (synopsis "Font for sign languages")
+    (description
+     "The Hamburg Notation System, HamNoSys for short, is a system for the
+phonetic transcription of signed languages.  This package makes HamNoSys
+available in XeLaTeX and LuaLaTeX.  The package provides a Unicode font for
+rendering HamNoSys symbols as well as three methods for entering them.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-hands
+  (package
+    (name "texlive-hands")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/source/public/hands/"
+                   "fonts/tfm/public/hands/")
+             (base32
+              "0x0vdn7hq6k7wr7yxn8pnkvjhjq3mfl781ijrs2mpvjqygqffzag")))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/hands")
+    (synopsis "Pointing hand font")
+    (description
+     "This package provides right- and left-pointing hands in both
+black-on-white and white-on-black realisation.  The font is distributed as
+Metafont source.")
+    (license license:public-domain)))
+
+(define-public texlive-hanoi
+  (package
+    (name "texlive-hanoi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/plain/hanoi/")
+             (base32
+              "09a7cv76naxzdach5507wdqnjp12amvlia7kw0jh224ydmkzfx9x")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hanoi")
+    (synopsis "Tower of Hanoi in TeX")
+    (description
+     "The Plain TeX program (typed in the shape of the towers of Hanoi) serves
+both as a game and as a TeX programming exercise.  As a game, it will solve
+the towers with (up to) 15 discs.")
+    (license license:public-domain)))
+
 (define-public texlive-happy4th
   (package
     (name "texlive-happy4th")
@@ -4755,6 +15961,167 @@ directories.")
 through it.")
     (license license:public-domain)))
 
+(define-public texlive-har2nat
+  (package
+    (name "texlive-har2nat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/har2nat/" "tex/latex/har2nat/")
+             (base32
+              "13akhwjx48lkch46pk2syzizham3rk81ihrzbwxsvapa1fw74dzg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/har2nat")
+    (synopsis "Replace the @code{harvard} package with @code{natbib}")
+    (description
+     "This small package allows a LaTeX document containing the citation
+commands provided by the @code{harvard} package to be compiled using the
+@code{natbib} package.")
+    (license license:lppl)))
+
+(define-public texlive-harmony
+  (package
+    (name "texlive-harmony")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/harmony/" "tex/latex/harmony/")
+             (base32
+              "0ky4aiv3zvykfwalf1md4lzjbr9pc14i93xsxdwl25jcsi2kvjk7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/harmony")
+    (synopsis "Typeset harmony symbols, etc., for musicology")
+    (description
+     "The package @file{harmony.sty} helps typesetting harmony symbols for
+musicology.")
+    (license license:lppl)))
+
+(define-public texlive-hanzibox
+  (package
+    (name "texlive-hanzibox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/hanzibox/"
+                   "source/xelatex/hanzibox/"
+                   "tex/xelatex/hanzibox/")
+             (base32
+              "1bgbybzz5h79i2l3mbjxm11x9nsxm366c6d2mha9j5qabjghakya")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-ctex))
+    (home-page "https://ctan.org/pkg/hanzibox")
+    (synopsis
+     "Boxed Chinese characters with Pinyin above and translation below")
+    (description
+     "This is a LaTeX package written to simplify the input of Chinese with
+Hanyu Pinyin and translation.  Hanyu Pinyin is placed above Chinese with the
+@code{xpinyin} package, and the translation is placed below.  The package can
+be used as a utility for learning to write and pronounce Chinese characters,
+for Chinese character learning plans, presentations, exercise booklets and
+other documentation work.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-harvard
+  (package
+    (name "texlive-harvard")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/harvard/" "bibtex/bst/harvard/"
+                   "doc/latex/harvard/" "source/latex/harvard/"
+                   "tex/latex/harvard/")
+             (base32
+              "1qcw1rrvcgcz26pwcmsfd7gs4bzlq1n4zws92xqsr5fi95pr8q7k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/harvard")
+    (synopsis "Harvard citation package for use with LaTeX")
+    (description
+     "This is a re-implementation, for LaTeX, of the original Harvard package.
+The bundle contains the LaTeX package, several BibTeX styles, and a Perl
+package for use with LaTeX2HTML.
+
+Harvard is an author-year citation style (all but the first author are
+suppressed in second and subsequent citations of the same entry); the package
+defines several variant styles: @file{apsr.bst} for the @emph{American
+Political Science Review}; @file{agsm.bst} for Australian government
+publications; @file{dcu.bst} from the Design Computing Unit of the University
+of Sydney; @file{kluwer.bst}, which aims at the format preferred in Kluwer
+publications; @file{nederlands.bst} which deals with sorting Dutch names with
+prefixes (such as van) according to Dutch rules, together with several styles
+whose authors offer no description of their behaviour.")
+    (license license:lppl)))
+
+(define-public texlive-harvmac
+  (package
+    (name "texlive-harvmac")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/harvmac/" "tex/plain/harvmac/")
+             (base32
+              "0bxa9vvkg79xk3nakdc5an2py6gwbv9ml66xmz1hp1llbg3562vf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/harvmac")
+    (synopsis "Macros for scientific articles")
+    (description "This package provides macros for scientific articles.")
+    (license license:cc-by3.0)))
+
+(define-public texlive-havannah
+  (package
+    (name "texlive-havannah")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/havannah/"
+                   "source/latex/havannah/"
+                   "tex/latex/havannah/")
+             (base32
+              "0kw71rr5jhn0gx89jynwxxgd6ddzpmr0wb5qnsh0drljmacq49ai")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/havannah")
+    (synopsis "Diagrams of board positions in the games of Havannah and Hex")
+    (description
+     "This package defines macros for typesetting diagrams of board positions
+in the games of Havannah and Hex.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-hecthese
+  (package
+    (name "texlive-hecthese")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hecthese/"
+                   "source/latex/hecthese/"
+                   "tex/latex/hecthese/")
+             (base32
+              "023yqg7g612c5jdla70m0afpk0249k07sbg3xba5l77pkjw6851c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hecthese")
+    (synopsis "Class for dissertations and theses at HEC Montreal")
+    (description
+     "This package provides the @code{hecthese} class, a class based on
+@code{memoir} and compatible with LaTeX.  Using this class, postgraduate
+students at HEC Montreal will be able to write their dissertation or thesis
+while complying with all the presentation standards required by the
+University.  This class is meant to be as flexible as possible; in particular,
+there are very few hard-coded features except those that take care of the
+document's layout.
+
+Dissertations and theses at HEC Montreal can be written on a per-chapter or
+per-article basis.  Documents that are written on a per-article basis require
+a bibliography for each of the included articles and a general bibliography
+for the entire document.  The @code{hecthese} class takes care of these
+requirements.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-helmholtz-ellis-ji-notation
   (package
     (name "texlive-helmholtz-ellis-ji-notation")
@@ -4805,6 +16172,96 @@ packages, and a selection of others that are useful in High Energy Physics
 papers, etc.")
     (license license:lppl)))
 
+(define-public texlive-hep-bibliography
+  (package
+    (name "texlive-hep-bibliography")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hep-bibliography/"
+                   "source/latex/hep-bibliography/"
+                   "tex/latex/hep-bibliography/")
+             (base32
+              "02jf5c920bq42g0z1gnapg1lv20ih2issim5yzf98rvjwh8c0ji9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hep-bibliography")
+    (synopsis "Acronym extension for glossaries")
+    (description
+     "The @code{hep-bibliography} package extends the BibLaTeX package with
+some functionality mostly useful for high energy physics.  In particular it
+makes full use of all BibTeX fields provided by Discover High-Energy
+Physics.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-hep-font
+  (package
+    (name "texlive-hep-font")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/hep-font/"
+                   "source/fonts/hep-font/"
+                   "tex/latex/hep-font/")
+             (base32
+              "0wf39qf896abj0ypgz0655pm055ywch3jlpnxd8pgaip6igbs5g9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hep-font")
+    (synopsis "Latin modern extended by Computer Modern")
+    (description
+     "The @code{hep-font} package loads standard font packages and extends the
+usual Latin Modern implementations by replacing missing fonts with Computer
+Modern counterparts.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-hep-math-font
+  (package
+    (name "texlive-hep-math-font")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/hep-math-font/"
+                   "source/fonts/hep-math-font/"
+                   "tex/latex/hep-math-font/")
+             (base32
+              "07lb2sxzdff9arpfksz186dvpgr6slfz637xinhf95npbylpyww3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hep-math-font")
+    (synopsis "Extended Greek and sans-serif math")
+    (description
+     "The @code{hep-math-font} package adjust the math fonts to be sans-serif
+if the document is sans-serif.  Additionally Greek letters are redefined to be
+always italic and upright in math and text mode respectively.  Some math font
+macros are adjusted to give more consistently the naively expected results.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-hep-paper
+  (package
+    (name "texlive-hep-paper")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hep-paper/"
+                   "source/latex/hep-paper/"
+                   "tex/latex/hep-paper/")
+             (base32
+              "05dx8vsyr8ylvfqs3s9krjrqml8qivwlwhga4ghbnd3nkkqkx95a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hep-paper")
+    (synopsis "Publications in @emph{High Energy Physics}")
+    (description
+     "This package aims to provide a single style file containing most
+configurations and macros necessary to write appealing publications in
+@emph{High Energy Physics}.  Instead of reinventing the wheel by introducing
+newly created macros, hep-paper preferably loads third party packages as long
+as they are light-weight enough.  For usual publications it suffices to load
+the @code{hep-paper} package, without optional arguments, in addition to the
+@code{article} class.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-hep-reference
   (package
     (name "texlive-hep-reference")
@@ -4934,6 +16391,423 @@ adds a collection of useful @acronym{HEP, High Energy Physics} units to the
 existing SIunits set.")
     (license license:lppl)))
 
+(define-public texlive-heros-otf
+  (package
+    (name "texlive-heros-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/heros-otf/"
+                   "tex/latex/heros-otf/")
+             (base32
+              "17ac8a8r5hvf76lifap070c4746jdhva9arcn1s0bqrs6kydfm56")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/heros-otf")
+    (synopsis "Using the OpenType fonts TeX Gyre Heros")
+    (description
+     "This package can only be used with LuaLaTeX or XeLaTeX.  It does the
+font setting for the OpenType font TeX Gyre Heros.  The condensed versions of
+the fonts are also supported.  The missing typefaces for slanted text are
+defined.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-heuristica
+  (package
+    (name "texlive-heuristica")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/heuristica/"
+                   "fonts/enc/dvips/heuristica/"
+                   "fonts/map/dvips/heuristica/"
+                   "fonts/opentype/public/heuristica/"
+                   "fonts/tfm/public/heuristica/"
+                   "fonts/type1/public/heuristica/"
+                   "fonts/vf/public/heuristica/"
+                   "tex/latex/heuristica/")
+             (base32
+              "0jl7mrhbm5z8dncin65qlpdrmkix5cff8h307h4gg5bzcjgsbb4a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/heuristica")
+    (synopsis "Fonts extending Utopia, with LaTeX support files")
+    (description
+     "The fonts extend the Utopia set with Cyrillic glyphs, additional figure
+styles, ligatures and Small Caps in Regular style only.  Macro support, and
+maths fonts that match the Utopia family, are provided by the Fourier and the
+Mathdesign font packages.")
+    (license license:silofl1.1)))
+
+(define-public texlive-hexboard
+  (package
+    (name "texlive-hexboard")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hexboard/"
+                   "source/latex/hexboard/"
+                   "tex/latex/hexboard/")
+             (base32
+              "04z0qhajbjn55mqax4kaw53h7s6g84iy1yh0pfhzj3ib7gd4cpw4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hexboard")
+    (synopsis "For drawing Hex boards and games")
+    (description
+     "@code{hexboard} is a package for LaTeX that should also work with LuaTeX
+and XeTeX, that provides functionality for drawing Hex boards and games.")
+    (license license:cc-by-sa4.0)))
+
+(define-public texlive-hexgame
+  (package
+    (name "texlive-hexgame")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hexgame/" "tex/latex/hexgame/")
+             (base32
+              "1qr9v7225k6xzykw3rdsxf2sa3b5asvmd767i88jwimmacwi2cp1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hexgame")
+    (synopsis "Provide an environment to draw a hexgame-board")
+    (description
+     "Hex is a mathematical game invented by the Danish mathematician Piet
+Hein and independently by the mathematician John Nash.  This package defines
+an environment that enables the user to draw such a game in a trivial way.")
+    (license license:lppl)))
+
+(define-public texlive-hfbright
+  (package
+    (name "texlive-hfbright")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/hfbright/"
+                   "fonts/afm/public/hfbright/"
+                   "fonts/enc/dvips/hfbright/"
+                   "fonts/map/dvips/hfbright/"
+                   "fonts/type1/public/hfbright/")
+             (base32
+              "1aw4h2law9q7sn2ppf3pxdazsk9kypss3chvca3741w8bzhxq5qr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hfbright")
+    (synopsis "@code{hfbright} fonts")
+    (description
+     "These are Adobe Type 1 versions of the OT1-encoded and maths parts of
+the Computer Modern Bright fonts.")
+    (license license:lppl)))
+
+(define-public texlive-hfoldsty
+  (package
+    (name "texlive-hfoldsty")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/hfoldsty/"
+                   "fonts/tfm/public/hfoldsty/"
+                   "fonts/vf/public/hfoldsty/"
+                   "source/fonts/hfoldsty/"
+                   "tex/latex/hfoldsty/")
+             (base32
+              "0skzw845i1b3lq76m4an4mpkm2w82hlpirnx4pckz3138nr1rlpf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hfoldsty")
+    (synopsis "Old style numerals with EC fonts")
+    (description
+     "The @code{hfoldsty} package provides virtual fonts for using old-style
+figures with the European Computer Modern fonts.  It does a similar job as the
+@code{eco} package but includes a couple of improvements, i.e., better kerning
+with guillemets, and support for character protruding using the
+@code{pdfcprot} package.")
+    (license license:gpl3+)))
+
+(define-public texlive-hfutexam
+  (package
+    (name "texlive-hfutexam")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hfutexam/" "tex/latex/hfutexam/")
+             (base32
+              "0r2048lpvj213m3a90sw93gcfdjja3w3vkrq3z171ravpl8l0bsm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hfutexam")
+    (synopsis "Exam class for Hefei University of Technology, China")
+    (description
+     "This package provides an exam class for Hefei University of
+Technology (China).")
+    (license license:lppl1.3c)))
+
+(define-public texlive-hfutthesis
+  (package
+    (name "texlive-hfutthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/hfutthesis/"
+                   "tex/xelatex/hfutthesis/")
+             (base32
+              "1i7ljf5521f9dynrcnim0m4jzz2qkvpsb4pjvxbj5c7pr85gc34r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hfutthesis")
+    (synopsis "LaTeX thesis template for Hefei University of Technology")
+    (description
+     "This project is based on the HFUT_Thesis LaTeX template of Hefei
+University of Technology compiled on the basis of @code{ustctug} and
+@code{ustcthesis}, in accordance with the latest version of @emph{Hefei
+University of Technology Graduate Dissertation Writing Specifications} and
+@emph{Hefei University of Technology Undergraduate Graduation Project (Thesis)
+Work Implementation Rules}.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-hithesis
+  (package
+    (name "texlive-hithesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/hithesis/"
+                   "doc/xelatex/hithesis/"
+                   "makeindex/hithesis/"
+                   "source/xelatex/hithesis/"
+                   "tex/xelatex/hithesis/")
+             (base32
+              "0w701f0ivf7k8jb2jiy5lhns4qiflyrslyiplm6aca67g2rcqgwn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               ;; "hithesis.ins" writes files to "./figures" Create these
+               ;; directories first to prevent an error.
+               (add-before 'build 'prepare-build
+                 (lambda _
+                   (mkdir-p "build/figures"))))))
+    (home-page "https://ctan.org/pkg/hithesis")
+    (synopsis "Harbin Institute of Technology thesis template")
+    (description
+     "@code{hithesis} is a LaTeX thesis template package for Harbin Institute
+of Technology supporting bachelor, master, doctor dissertations.")
+    (license license:lppl1.3a)))
+
+(define-public texlive-hindmadurai
+  (package
+    (name "texlive-hindmadurai")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/hindmadurai/"
+                   "fonts/enc/dvips/hindmadurai/"
+                   "fonts/map/dvips/hindmadurai/"
+                   "fonts/opentype/public/hindmadurai/"
+                   "fonts/tfm/public/hindmadurai/"
+                   "fonts/type1/public/hindmadurai/"
+                   "fonts/vf/public/hindmadurai/"
+                   "tex/latex/hindmadurai/")
+             (base32
+              "15bf8hka7f04l7zpkaav1azbailjv21w15iidbaxx9n2d4plf2kk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hindmadurai")
+    (synopsis "HindMadurai font face with support for LaTeX and pdfLaTeX")
+    (description
+     "This package provides the HindMadurai family of fonts designed by the
+Indian Type Foundry, with support for LaTeX and pdfLaTeX.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-historische-zeitschrift
+  (package
+    (name "texlive-historische-zeitschrift")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/historische-zeitschrift/"
+                   "tex/latex/historische-zeitschrift/")
+             (base32
+              "1w8zhk1darw39lrgs4i1p8zk78a1q7skc93ac8qczbrw5pln27k5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/historische-zeitschrift")
+    (synopsis "BibLaTeX style for the journal @emph{Historische Zeitschrift}")
+    (description
+     "The package provides citations according with the house style of the
+@emph{Historische Zeitschrift}, a German historical journal.")
+    (license license:lppl)))
+
+(define-public texlive-hitex
+  (package
+    (name "texlive-hitex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/hitex/base/"
+                   "doc/man/man1/hishrink.1"
+                   "doc/man/man1/hishrink.man1.pdf"
+                   "doc/man/man1/histretch.1"
+                   "doc/man/man1/histretch.man1.pdf"
+                   "doc/man/man1/hitex.1"
+                   "doc/man/man1/hitex.man1.pdf"
+                   "makeindex/hitex/"
+                   "tex/hitex/base/")
+             (base32
+              "19q0sd0mhsamns9i7gr85n2n0jjc6p2n2xcc7s9b65hz8zp0bdbk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:create-formats #~(list "hilatex" "hitex")))
+    (propagated-inputs
+     (list texlive-atbegshi
+           texlive-atveryend
+           texlive-babel
+           texlive-cm
+           texlive-etex
+           texlive-everyshi
+           texlive-firstaid
+           texlive-hyphen-base
+           texlive-knuth-lib
+           texlive-l3backend
+           texlive-l3kernel
+           texlive-l3packages
+           texlive-latex
+           texlive-latex-fonts
+           texlive-plain
+           texlive-tex-ini-files
+           texlive-unicode-data))
+    (home-page "https://ctan.org/pkg/hitex")
+    (synopsis "TeX extension writing HINT output for on-screen reading")
+    (description
+     "This package provides a TeX extension that generates HINT output.  The
+HINT file format is an alternative to the DVI and PDF formats which was
+designed specifically for on-screen reading of documents.  Especially on
+mobile devices, reading DVI or PDF documents can be cumbersome.  Mobile
+devices are available in a large variety of sizes but typically are not large
+enough to display documents formated for a4/letter-size paper.  To compensate
+for the limitations of a small screen, users are used to alternating between
+landscape (few long lines) and portrait (more short lines) mode.  The HINT
+format supports variable and varying screen sizes, leveraging the ability of
+TeX to format a document for nearly-arbitrary values of @code{\\hsize} and
+@code{\\vsize}.")
+    (license license:x11)))
+
+(define-public texlive-hitszbeamer
+  (package
+    (name "texlive-hitszbeamer")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/hitszbeamer/"
+                   "doc/latex/hitszbeamer/"
+                   "source/latex/hitszbeamer/"
+                   "tex/latex/hitszbeamer/")
+             (base32
+              "00c23sdhkvr79lzag8v1j5hyzf5iwmkr07xnz0s0n3haicbfzz44")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hitszbeamer")
+    (synopsis "Beamer theme for Harbin Institute of Technology, ShenZhen")
+    (description
+     ;; XXX: Cannot use @acronym and @comma here, because Guile Texinfo does
+     ;; not support this combination.
+     "This is a Beamer theme designed for HITSZ (Harbin Institute of
+Technology, ShenZhen).")
+    (license license:lppl1.3c)))
+
+(define-public texlive-hitszthesis
+  (package
+    (name "texlive-hitszthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/hitszthesis/"
+                   "doc/latex/hitszthesis/"
+                   "makeindex/hitszthesis/"
+                   "source/latex/hitszthesis/"
+                   "tex/latex/hitszthesis/")
+             (base32
+              "0m1wr3iq1nzcymvnamgna0iiqb3ndllflgawzjjv85aay9jszra0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hitszthesis")
+    (synopsis
+     "Dissertation template for Harbin Institute of Technology, ShenZhen")
+    (description
+     ;; XXX: Cannot use @acronym and @comma here, because Guile Texinfo does
+     ;; not support this combination.
+     "This package provides a dissertation template for HITSZ (Harbin
+Institute of Technology, ShenZhen), including bachelor, master and doctor
+dissertations.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-hmtrump
+  (package
+    (name "texlive-hmtrump")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/hmtrump/"
+                   "fonts/truetype/public/hmtrump/"
+                   "tex/lualatex/hmtrump/")
+             (base32
+              "03r1f784ipr2j38y2xy8agl94xwcmyv4pxd0l42iclmx08rczb9q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hmtrump")
+    (synopsis "Describe card games")
+    (description
+     "This package provides a font with LuaLaTeX support for describing
+card games.")
+    (license
+     (list (license:fsf-free
+            "doc/lualatex/hmtrump/nkd04_playing_cards_index/LICENSE")
+           license:cc-by-sa4.0))))
+
+(define-public texlive-hobete
+  (package
+    (name "texlive-hobete")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hobete/" "tex/latex/hobete/")
+             (base32
+              "1gccpxh3bfj4sbnag8rjrz8hyrx3107mwxpydl0bcdn8dxyjkfi2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hobete")
+    (synopsis "Unofficial Beamer theme for the University of Hohenheim")
+    (description
+     "The package provides a Beamer theme which features the Ci colors of the
+University of Hohenheim.  Please note that this is not an official theme, and
+that there will be no support for it from the University.")
+    (license license:lppl)))
+
+(define-public texlive-horoscop
+  (package
+    (name "texlive-horoscop")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/horoscop/"
+                   "source/latex/horoscop/"
+                   "tex/latex/horoscop/")
+             (base32
+              "08acv1sg37qzq3h14kxv62xhrzrv4psgpychshj3gmzvp4vz0jsn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/horoscop")
+    (synopsis "Generate astrological charts in LaTeX")
+    (description
+     "The @code{horoscop} package provides a unified interface for
+astrological font packages; typesetting with @code{pict2e} of standard wheel
+charts and some variations, in PostScript- and PDF-generating TeX engines; and
+access to external calculation software (Astrolog and Swiss Ephemeris) for
+computing object positions.")
+    (license license:public-domain)))
+
 (define-public texlive-hrlatex
   (package
     (name "texlive-hrlatex")
@@ -4955,6 +16829,27 @@ the graduation thesis at the University of Zagreb) and sample thesis documents
 are included.")
     (license license:lppl)))
 
+(define-public texlive-hu-berlin-bundle
+  (package
+    (name "texlive-hu-berlin-bundle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/hu-berlin-bundle/"
+                   "source/lualatex/hu-berlin-bundle/"
+                   "tex/lualatex/hu-berlin-bundle/")
+             (base32
+              "05cwh97w954gz8dr56a2n06s312gg8r0zy9zxj6hv86z019wiq85")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hu-berlin-bundle")
+    (synopsis "LaTeX classes for the Humboldt-Universitat zu Berlin")
+    (description
+     "This package provides files according to the corporate design of the
+Humboldt-Universitat zu Berlin.  This is not an official package by the
+university itself, and not officially approved by it.")
+    (license (list license:lppl1.3c license:gpl2 license:bsd-3))))
+
 (define-public texlive-huaz
   (package
     (name "texlive-huaz")
@@ -4999,6 +16894,72 @@ meaning bloke.)  With this package you can typeset 150 paragraphs of Lorum
 ipse.")
     (license license:lppl1.3+)))
 
+(define-public texlive-hustthesis
+  (package
+    (name "texlive-hustthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/hustthesis/"
+                   "doc/latex/hustthesis/"
+                   "source/latex/hustthesis/"
+                   "tex/latex/hustthesis/")
+             (base32
+              "12sacpq43wjkr0j0ziszw37achyc7cf0z5kajqdfb5d7ksas0j2n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hustthesis")
+    (synopsis "Unofficial thesis template for Huazhong University")
+    (description
+     "The package provides an unofficial thesis template in LaTeX for Huazhong
+University of Science and Technology.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-hvarabic
+  (package
+    (name "texlive-hvarabic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hvarabic/" "tex/latex/hvarabic/")
+             (base32
+              "0kjx2x3fnpqw6hybw7ifdlqad4mmbacba290qwlhhggpjrxsvp39")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hvarabic")
+    (synopsis "Macros for RTL typesetting")
+    (description
+     "This package provides some macros for right-to-left typesetting.  It
+uses by default the Arabic fonts Scheherazade and ALM fixed, the only
+monospaced Arabic font.  The package only works with LuaLaTeX or XeLaTeX.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-ibarra
+  (package
+    (name "texlive-ibarra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ibarra/"
+                   "fonts/enc/dvips/ibarra/"
+                   "fonts/map/dvips/ibarra/"
+                   "fonts/opentype/public/ibarra/"
+                   "fonts/tfm/public/ibarra/"
+                   "fonts/type1/public/ibarra/"
+                   "fonts/vf/public/ibarra/"
+                   "tex/latex/ibarra/")
+             (base32
+              "0gfvrb1dm2hw8j10l93xv0rrd7kar2009lycsvmw66m1a31c0yd9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ibarra")
+    (synopsis "LaTeX support for the Ibarra Real Nova family of fonts")
+    (description
+     "The Ibarra Real Nova is a revival of a typeface designed by Geronimo Gil
+for the publication of @emph{Don Quixote} for the Real Academia de la Lengua
+in 1780.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-ibrackets
   (package
     (name "texlive-ibrackets")
@@ -5020,6 +16981,114 @@ ipse.")
 when using for open intervals.")
     (license license:lppl1.3+)))
 
+(define-public texlive-icite
+  (package
+    (name "texlive-icite")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/icite/" "source/latex/icite/"
+                   "tex/latex/icite/")
+             (base32
+              "0a3gqnjbyn33ld3j66pfrrsv502zdrsag0glhar82fbba21qlj9w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/icite")
+    (synopsis "Indices locorum citatorum")
+    (description
+     "The package is designed to produce from BibTeX or BibLaTeX
+bibliographical databases the different indices of authors and works cited
+which are called indices locorum citatorum.  It relies on a specific
+@code{\\icite} command and can operate with either BibTeX or BibLaTeX.")
+    (license (list license:gpl3+ license:cc-by-sa4.0))))
+
+(define-public texlive-ietfbibs
+  (package
+    (name "texlive-ietfbibs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/bibtex/ietfbibs/")
+             (base32
+              "18ypa96z1gclq4amka28sv26pm7lycak68zf4b3sf1bx4ldnzmxq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ietfbibs")
+    (synopsis "Generate BibTeX entries for various IETF index files")
+    (description
+     "The package provides scripts to translate IETF index files to BibTeX
+files.")
+    (license license:expat)))
+
+(define-public texlive-ifsym
+  (package
+    (name "texlive-ifsym")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ifsym/"
+                   "fonts/source/public/ifsym/"
+                   "fonts/tfm/public/ifsym/" "tex/latex/ifsym/")
+             (base32
+              "07r16sgqc65wf8c8ijgmnmwq50yrlvjlmzbnk0czgnwqrbdz642g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/ifsym")
+    (synopsis "Collection of symbols")
+    (description
+     "This package provides a set of symbol fonts, written in Metafont, offering
+(respectively) clock-face symbols, geometrical symbols, weather symbols,
+mountaineering symbols, electronic circuit symbols and a set of miscellaneous
+symbols.  A LaTeX package is provided, that allows the user to load only those
+symbols needed in a document.")
+    (license license:lppl1.0+)))
+
+(define-public texlive-ijqc
+  (package
+    (name "texlive-ijqc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/ijqc/" "doc/bibtex/ijqc/")
+             (base32
+              "18sqc8k21l15zlplpaimdcg8g75z3lrlc0qcb6wx838980gn961r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ijqc")
+    (synopsis "BibTeX style file for the @emph{Intl. J. Quantum Chem}")
+    (description
+     "@file{ijqc.bst} is a BibTeX style file to support publication in Wiley's
+@emph{International Journal of Quantum Chemistry}.")
+    (license license:lppl)))
+
+(define-public texlive-imfellenglish
+  (package
+    (name "texlive-imfellenglish")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/imfellenglish/"
+                   "fonts/enc/dvips/imfellenglish/"
+                   "fonts/map/dvips/imfellenglish/"
+                   "fonts/opentype/iginomarini/imfellenglish/"
+                   "fonts/tfm/iginomarini/imfellenglish/"
+                   "fonts/type1/iginomarini/imfellenglish/"
+                   "fonts/vf/iginomarini/imfellenglish/"
+                   "tex/latex/imfellenglish/")
+             (base32
+              "0pw4nsw4pl1nf99j58sy37064712by6kqcb40xkrcl5d9czx45bh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/imfellenglish")
+    (synopsis "IM Fell English fonts with LaTeX support")
+    (description
+     "Igino Marini has implemented digital revivals of fonts bequeathed to
+Oxford University by Dr.@: John Fell, Bishop of Oxford and Dean of Christ
+Church in 1686.  This package provides the English family, consisting of
+Roman, Italic and Small-Cap fonts.")
+    (license license:silofl1.1)))
+
 (define-public texlive-impatient
   (package
     (name "texlive-impatient")
@@ -5037,6 +17106,24 @@ when using for open intervals.")
      "@emph{TeX for the Impatient} is a book on TeX, Plain TeX and Eplain.")
     (license license:fdl1.3+)))
 
+(define-public texlive-impatient-cn
+  (package
+    (name "texlive-impatient-cn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/impatient-cn/")
+             (base32
+              "1pc20pb0las3slam1d9hmqigipmr6r98wwif12m33mm750vmq65i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/impatient")
+    (synopsis "Chinese translation of @emph{TeX for the Impatient} book")
+    (description
+     "@emph{TeX for the Impatient} is a book (of around 350 pages) on TeX,
+Plain TeX and Eplain.  This is its Chinese translation.")
+    (license license:fdl1.3+)))
+
 (define-public texlive-impatient-fr
   (package
     (name "texlive-impatient-fr")
@@ -5075,6 +17162,25 @@ Plain TeX and Eplain.  This is its French translation.")
 French Imprimerie Nationale.")
     (license license:lppl1.3+)))
 
+(define-public texlive-imsproc
+  (package
+    (name "texlive-imsproc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/imsproc/"
+                   "tex/xelatex/imsproc/")
+             (base32
+              "1akzdc4nas4fkmlhm6xp97xw65vm5bif73jq2ki5if5kwssxc38z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/imsproc")
+    (synopsis "Typeset IMS conference proceedings")
+    (description
+     "The class typesets papers for IMS (Iranian Mathematical Society)
+conference proceedings.  The class uses the XePersian package.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-includernw
   (package
     (name "texlive-includernw")
@@ -5095,6 +17201,99 @@ French Imprimerie Nationale.")
 installed.")
     (license license:lppl1.3c)))
 
+(define-public texlive-initials
+  (package
+    (name "texlive-initials")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/initials/"
+                   "dvips/initials/"
+                   "fonts/afm/public/initials/"
+                   "fonts/map/dvips/initials/"
+                   "fonts/tfm/public/initials/"
+                   "fonts/type1/public/initials/"
+                   "tex/latex/initials/")
+             (base32
+              "0hbvk2qjrhcx2l8nkca1s5lj65k5xd2v2fnk4zjxjpwdcwxf09zp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/initials")
+    (synopsis "Adobe Type 1 decorative initial fonts")
+    (description
+     "This package provides Adobe Type 1 decorative initial fonts.  For each
+font, at least a @file{.pfb} and a @file{.tfm} file is provided, with an
+@file{.fd} file for use with LaTeX.")
+    (license license:lppl)))
+
+(define-public texlive-inlinebib
+  (package
+    (name "texlive-inlinebib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/inlinebib/"
+                   "doc/bibtex/inlinebib/"
+                   "tex/latex/inlinebib/")
+             (base32
+              "13kfygh2r8s038rnskxnj91h08k8xs6cln16vzsy1j59c82idvkb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/inlinebib")
+    (synopsis "Citations in footnotes")
+    (description
+     "This package provides a BibTeX style and a LaTeX package that allow for
+a full bibliography at the end of the document as well as citation details in
+footnotes.")
+    (license license:lppl)))
+
+(define-public texlive-install-latex-guide-zh-cn
+  (package
+    (name "texlive-install-latex-guide-zh-cn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/install-latex-guide-zh-cn/")
+             (base32
+              "1mb6d92c7llz5cpkir4d1wf0l2yvmskl0kxgch9r5zjmb67qflin")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/install-latex-guide-zh-cn")
+    (synopsis "Short introduction to LaTeX installation written in Chinese")
+    (description
+     "This package will introduce the operations related to installing TeX
+Live and mainly introducing command line operations, in Chinese.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-inter
+  (package
+    (name "texlive-inter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/inter/"
+                   "fonts/enc/dvips/inter/"
+                   "fonts/map/dvips/inter/"
+                   "fonts/opentype/public/inter/"
+                   "fonts/tfm/public/inter/"
+                   "fonts/type1/public/inter/"
+                   "fonts/vf/public/inter/"
+                   "tex/latex/inter/")
+             (base32
+              "1rvh2f066lkdbr8754r0a016k9imcjpia9wdi46x70d96wgcb5vm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/inter")
+    (synopsis "Inter font face with support for LaTeX, XeLaTeX, and LuaLaTeX")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Inter Sans family of fonts, designed by Rasmus Andersson.  Inter is
+a typeface specially designed for user interfaces with focus on high
+legibility of small-to-medium sized text on computer screens.  The family
+features a tall x-height to aid in readability of mixed-case and lower-case
+text.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-interval
   (package
     (name "texlive-interval")
@@ -5171,6 +17370,360 @@ Finally, an @emph{e} starts the exponent of the number.  For example,
 @samp{$21e6$} may be output as @samp{$26\\times10\\,^@{6@}$}.")
     (license license:gpl3+)))
 
+(define-public texlive-iopart-num
+  (package
+    (name "texlive-iopart-num")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/iopart-num/"
+                   "doc/bibtex/iopart-num/")
+             (base32
+              "1n30ncmg0djhpdfa9jl5mv188347xmqsv08vgf2v4ipx7czhjm7v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/iopart-num")
+    (synopsis "Numeric citation style for IOP journals")
+    (description
+     "This package provides a BibTeX style providing numeric citation in
+Harvard-like format.  Intended for use with Institute of Physics (IOP)
+journals, including @emph{Journal of Physics}.")
+    (license license:lppl)))
+
+(define-public texlive-ipaex
+  (package
+    (name "texlive-ipaex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ipaex/"
+                   "fonts/truetype/public/ipaex/")
+             (base32
+              "0zpvpdpry4ckgbs79hy0gv8cc98x9c0cizzdqzg2qkx8clp8y1bn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ipaex")
+    (synopsis "IPA (Japanese) fonts")
+    (description
+     "The fonts provide fixed-width glyphs for Kana and Kanji characters,
+proportional width glyphs for Western characters.")
+    (license license:ipa)))
+
+(define-public texlive-ipaex-type1
+  (package
+    (name "texlive-ipaex-type1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ipaex-type1/"
+                   "fonts/enc/dvips/ipaex-type1/"
+                   "fonts/map/dvips/ipaex-type1/"
+                   "fonts/tfm/public/ipaex-type1/"
+                   "fonts/type1/public/ipaex-type1/"
+                   "tex/latex/ipaex-type1/")
+             (base32
+              "123m8i8gvyq3cncn8s11qzk976ml89aqcyapx2zs6phg9h090bc8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ipaex-type1")
+    (synopsis "IPAex fonts converted to Type-1 format Unicode sub-fonts")
+    (description
+     "The package contains the IPAex Fonts converted into Unicode sub-fonts in
+Type 1 format, which is most suitable for use with the CJK package.")
+    (license license:ipa)))
+
+(define-public texlive-is-bst
+  (package
+    (name "texlive-is-bst")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/is-bst/" "doc/bibtex/is-bst/")
+             (base32
+              "0bdkk1s5nfqy95h9ia08h4kpij4khj1y5z6byxgn7fsvcxncl1cb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/is-bst")
+    (synopsis "Extended versions of standard BibTeX styles")
+    (description
+     "The bundle contains an extended version (@file{xbtxbst.doc}) of the
+source of the standard BibTeX styles, together with corresponding versions of
+the standard styles.  The styles offer support for CODEN, ISBN, ISSN, LCCN,
+and PRICE fields, extended PAGES fields, the PERIODICAL entry, and extended
+citation label suffixing.")
+    (license license:knuth)))
+
+(define-public texlive-icsv
+  (package
+    (name "texlive-icsv")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/icsv/" "source/latex/icsv/"
+                   "tex/latex/icsv/")
+             (base32
+              "133rbbq86qkd749bd20wdnjqddpwydm27ndh5yp2waimgij3cm8d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/icsv")
+    (synopsis "Class for typesetting articles for the ICSV conference")
+    (description
+     "This is an ad-hoc class for typesetting articles for the ICSV
+conference.")
+    (license license:lppl)))
+
+(define-public texlive-ieeeconf
+  (package
+    (name "texlive-ieeeconf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ieeeconf/"
+                   "source/latex/ieeeconf/"
+                   "tex/latex/ieeeconf/")
+             (base32
+              "1f7v199mc1dw2fhp30qdkx48dyzk5mqmbqr91c1jm235isgs4fam")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ieeeconf")
+    (synopsis "Macros for IEEE conference proceedings")
+    (description
+     "The IEEEconf class implements the formatting dictated by the IEEE
+Computer Society Press for conference proceedings.")
+    (license license:lppl)))
+
+(define-public texlive-ieeepes
+  (package
+    (name "texlive-ieeepes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/ieeepes/" "doc/latex/ieeepes/"
+                   "tex/latex/ieeepes/")
+             (base32
+              "12nvllxxswww9p9l1h3ygak3g4j8ngmypxcbbw2jwwa8kh43yiqi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ieeepes")
+    (synopsis "IEEE Power Engineering Society Transactions")
+    (description
+     "This package supports typesetting of transactions, as well as
+discussions and closures, for the IEEE Power Engineering Society Transactions
+journals.")
+    (license license:lppl)))
+
+(define-public texlive-ieeetran
+  (package
+    (name "texlive-ieeetran")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/ieeetran/"
+                   "bibtex/bst/ieeetran/" "doc/latex/ieeetran/"
+                   "tex/latex/ieeetran/")
+             (base32
+              "0j7vv8hp0ymzmclyrk23zmixcclhlm1g241y8dk3dl18zsj00f1c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ieeetran")
+    (synopsis "Document class for IEEE Transactions journals and conferences")
+    (description
+     "The class and its BibTeX style enable authors to produce
+officially-correct output for the @acronym{IEEE, Institute of Electrical and
+Electronics Engineers} transactions, journals and conferences.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ijmart
+  (package
+    (name "texlive-ijmart")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/ijmart/" "doc/latex/ijmart/"
+                   "source/latex/ijmart/" "tex/latex/ijmart/")
+             (base32
+              "18fpf0na5y1nxz0c7r43f560dp4r8yawx8vj8356vdmw6d5r15h0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ijmart")
+    (synopsis "LaTeX Class for the @emph{Israel Journal of Mathematics}")
+    (description
+     "The @emph{Israel Journal of Mathematics} is published by The Hebrew
+University Magnes Press.  This class provides LaTeX support for its authors
+and editors.  It strives to achieve the distinct look and feel of the journal,
+while having the interface similar to that of the @code{amsart} document
+class.  This will help authors already familiar with @code{amsart} to easily
+submit manuscripts for the @emph{Israel Journal of Mathematics} or to put the
+preprints in arXiv with minimal changes in the LaTeX source.")
+    (license license:lppl)))
+
+(define-public texlive-ijsra
+  (package
+    (name "texlive-ijsra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ijsra/" "tex/latex/ijsra/")
+             (base32
+              "0k6a92c6fhwafrw3m4fcj0dj29ip0zb28aiz861cx2mac92hyqgs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ijsra")
+    (synopsis
+     "LaTeX document class for the International Journal of Student Research
+in Archaeology")
+    (description
+     "This is a document class called ijsra which is used for the
+International Journal of Student Research in Archaeology.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-imac
+  (package
+    (name "texlive-imac")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/imac/" "doc/latex/imac/"
+                   "tex/latex/imac/")
+             (base32
+              "06sc9irv318fc5zgngwrcdwx84pnhyhwh59jiq9sb8iayy1yxldh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/imac")
+    (synopsis "International Modal Analysis Conference format")
+    (description
+     "This package provides a set of files for producing correctly formatted
+documents for the International Modal Analysis Conference.  The bundle
+provides a LaTeX package and a BibTeX style file.")
+    (license license:gpl3+)))
+
+(define-public texlive-imakeidx
+  (package
+    (name "texlive-imakeidx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/imakeidx/"
+                   "source/latex/imakeidx/"
+                   "tex/latex/imakeidx/")
+             (base32
+              "1s65kbzafx5q7519pbxjldb87flws0mgg76yxi7a5mgxrnkfy961")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/imakeidx")
+    (synopsis "Package for producing multiple indexes")
+    (description
+     "The package enables the user to produce and typeset one or more indexes
+simultaneously with a document.  The package is known to work in LaTeX
+documents processed with pdfLaTeX, XeLaTeX and LuaLaTeX.  If
+@command{makeindex} is used for processing the index entries, no particular
+setting up is needed.  When using Xindy or other programs, it is necessary to
+enable shell escape; shell escape is also needed if @command{splitindex} is
+used.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-imtekda
+  (package
+    (name "texlive-imtekda")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/imtekda/" "source/latex/imtekda/"
+                   "tex/latex/imtekda/")
+             (base32
+              "0pbv50c6g024dhyw8mpnnyafp18pvf0cqy7j1fvhrbqwf13bn37x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/imtekda")
+    (synopsis "IMTEK thesis class")
+    (description
+     "The class permits typesetting of diploma, bachelor's and master's theses
+for the @acronym{IMTEK, Institute of Microsystem Technology} at the University
+of Freiburg (Germany).  The class is based on the KOMA-Script class
+@code{scrbook}.")
+    (license license:lppl)))
+
+(define-public texlive-inkpaper
+  (package
+    (name "texlive-inkpaper")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/inkpaper/" "tex/latex/inkpaper/")
+             (base32
+              "0yybzasv4708cw139k2dcqgi85lm6ard4ra9j78hrcdbnpnkqmw0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/inkpaper")
+    (synopsis "Mathematical paper template")
+    (description
+     "InkPaper is designed to write mathematical papers, especially designed
+for mathematics students, ZJGS students, and magazine editors.")
+    (license license:gpl3)))
+
+(define-public texlive-iodhbwm
+  (package
+    (name "texlive-iodhbwm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/iodhbwm/" "tex/latex/iodhbwm/")
+             (base32
+              "10zqg2cyz7vcnsbgqajwlilakjzr23nhn49sqy82555zkqi27gsa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/iodhbwm")
+    (synopsis "Unofficial template of the DHBW Mannheim")
+    (description
+     "This package provides an unofficial template of the DHBW Mannheim for
+the creation of bachelor thesis, studies or project work with LaTeX.  The aim
+of the package is the quick creation of a basic framework without much
+effort.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-iscram
+  (package
+    (name "texlive-iscram")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/iscram/" "tex/latex/iscram/")
+             (base32
+              "13p0nr6cwkchykdllf0ii035yjq7hxczb1g7qc7l7jaywfszr5ph")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/iscram")
+    (synopsis "LaTeX class to publish article to ISCRAM conferences")
+    (description
+     "This is a LaTeX class to publish article to @acronym{ISCRAM,
+International Conference on Information Systems for Crisis Response and
+Management}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-isodate
+  (package
+    (name "texlive-isodate")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/isodate/" "source/latex/isodate/"
+                   "tex/latex/isodate/")
+             (base32
+              "0bha4qpa1hi5i4npr00wz4qvzzc4yw4qydjjmm8n878p8cfygvga")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/isodate")
+    (synopsis "Tune the output format of dates according to language")
+    (description
+     "This package provides ten output formats of the commands @code{\\today},
+@code{\\printdate}, @code{\\printdateTeX}, and @code{\\daterange} (partly
+language dependent).  The commands @code{\\printdate} and
+@code{\\printdateTeX} print any date.  The command @code{\\daterange} prints
+a date range and leaves out unnecessary year or month entries.  This package
+supports German (old and new rules), Austrian, US English, British English,
+French, Danish, Swedish, and Norwegian.")
+    (license license:lppl)))
+
 (define-public texlive-isomath
   (package
     (name "texlive-isomath")
@@ -5215,6 +17768,161 @@ digit form.  This package provides support for spelling out numbers in Italian
 words, both in cardinal and in ordinal form.")
     (license license:lppl)))
 
+(define-public texlive-jablantile
+  (package
+    (name "texlive-jablantile")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/jablantile/"
+                   "fonts/source/public/jablantile/")
+             (base32
+              "14cxmph6hhzvb06jdqr6d428p1kg3mvbgw2nk133ggrr2k3wjppg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jablantile")
+    (synopsis "Metafont version of tiles in the style of Slavik Jablan")
+    (description
+     "This is a Metafont font to implement the modular tiles described by
+Slavik Jablan. ")
+    (license license:public-domain)))
+
+(define-public texlive-jacow
+  (package
+    (name "texlive-jacow")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jacow/" "tex/latex/jacow/")
+             (base32
+              "0wdmk9zl3916hgj3f16dlfvrxxlr7ffmjih2nipgfz376ryvnbgf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jacow")
+    (synopsis
+     "Class for submissions to the proceedings of conferences on JACoW.org")
+    (description
+     "The @code{jacow} class is used for submissions to the proceedings of
+conferences on @acronym{JACoW, Joint Accelerator Conferences Website}, an
+international collaboration that publishes the proceedings of accelerator
+conferences held around the world.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-jamtimes
+  (package
+    (name "texlive-jamtimes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jamtimes/"
+                   "fonts/map/dvips/jamtimes/"
+                   "fonts/tfm/public/jamtimes/"
+                   "fonts/vf/public/jamtimes/"
+                   "tex/latex/jamtimes/")
+             (base32
+              "03ww7w963hgsxazlrabg4f0h35rd8jbr9ga11lrhqf66b6zvpyv1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jamtimes")
+    (synopsis "Expanded Times Roman fonts")
+    (description
+     "The package offers LaTeX support for the expanded Times Roman font,
+which has been used for many years in the @emph{Journal d'Analyse
+Mathematique}.  Mathematics support is based on the Belleek fonts.")
+    (license license:bsd-3)))
+
+(define-public texlive-jbact
+  (package
+    (name "texlive-jbact")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/jbact/")
+             (base32
+              "0z0x6jrxaayp3w441r1zwlqirvv23g0b8h9xgy6r3ppi71glzqvp")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jbact")
+    (synopsis "BibTeX style for biology journals")
+    (description
+     "The style is a development of @file{apalike.bst} in the BibTeX bundle.
+The style serves two journals --- if the user executes
+@samp{\\nocite@{TitlesOn@}}, the style serves for the @emph{Journal of
+Theoretical Biology}; otherwise it serves for the @emph{Journal of Molecular
+Biology}.")
+    (license license:knuth)))
+
+(define-public texlive-jeuxcartes
+  (package
+    (name "texlive-jeuxcartes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jeuxcartes/"
+                   "tex/latex/jeuxcartes/")
+             (base32
+              "0imwfdwpap755id1k3cqk2p71nqsddc7g8kp3cc8376j4nc34c8a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jeuxcartes")
+    (synopsis "Macros to insert playing cards")
+    (description
+     "This package provides macros to insert playing cards, single, or
+hand, or random-hand, Poker or French Tarot or Uno, from PNG files.")
+    (license
+     (list license:cc-by-sa4.0
+           license:expat
+           license:lgpl2.1
+           license:lppl1.3c
+           license:public-domain))))
+
+(define-public texlive-jfmutil
+  (package
+    (name "texlive-jfmutil")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/jfmutil/" "scripts/jfmutil/")
+             (base32
+              "1c23wak28a1kwgsk6bw1ifa794zywmqzm7a6w5g883nmbfmsq388")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "jfmutil.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/jfmutil")
+    (synopsis "Utility to process pTeX-extended TFM and VF")
+    (description
+     "This program provides functionality to process data files (JFM and VF) that
+form logical fonts used in (u)pTeX.  The functions currently available
+include:
+@itemize
+@item The mutual conversion between Japanese virtual fonts (pairs of VF and
+JFM) and files in the ZVP format, which is an original text format
+representing data in virtual fonts.  This function can be seen as
+a counterpart to the @code{vftovp} and @code{vptovf} programs.
+@item The mutual conversion between VF files alone and files in the ZVP0
+format, which is a subset of the ZVP format.
+@end itemize")
+    (license license:expat)))
+
+(define-public texlive-jigsaw
+  (package
+    (name "texlive-jigsaw")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jigsaw/" "tex/latex/jigsaw/")
+             (base32
+              "0qpbsff6saxv2qp4fzyqrprxjy2434ylm11snyc3d59imdmksq0b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jigsaw")
+    (synopsis "Draw jigsaw pieces with TikZ")
+    (description
+     "This is a small LaTeX package to draw jigsaw pieces with TikZ.  It is
+possible to draw individual pieces and adjust their shape, create tile
+patterns or automatically generate complete jigsaws.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-jkmath
   (package
     (name "texlive-jkmath")
@@ -5234,6 +17942,198 @@ macros for mathematical notation which make the code more readable or allow
 flexibility in typesetting material.")
     (license license:lppl)))
 
+(define-public texlive-jmb
+  (package
+    (name "texlive-jmb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/jmb/" "tex/latex/jmb/")
+             (base32
+              "1a5nz825jppq3pl1263w2sbm0a48kmmndppfpp7vi69n5j2248dy")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jmb")
+    (synopsis "BibTeX style for the @emph{Journal of Theoretical Biology}")
+    (description
+     "This BibTeX bibliography style is for the @emph{Journal of Molecular
+Biology} and @emph{Journal of Theoretical Biology}; the accompanying LaTeX
+package is a close relative of @code{apalike.sty} in the BibTeX distribution;
+it features author-date references.")
+    (license license:knuth)))
+
+(define-public texlive-jmlr
+  (package
+    (name "texlive-jmlr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jmlr/" "source/latex/jmlr/"
+                   "tex/latex/jmlr/")
+             (base32
+              "125zcy1363xlay5ss411x1rl7nyidbh5aygvcr8q8j3qp4yqajrn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jmlr")
+    (synopsis "Class files for the @emph{Journal of Machine Learning Research}")
+    (description
+     "The @code{jmlr} bundle provides a class for authors (@code{jmlr}) and
+a class for production editors (@code{jmlrbook}) for the @emph{Journal of
+Machine Learning Research}.  The @code{jmlrbook} class can be used to combine
+articles written using the @code{jmlr} class into a book.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-jneurosci
+  (package
+    (name "texlive-jneurosci")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/jneurosci/"
+                   "doc/latex/jneurosci/"
+                   "tex/latex/jneurosci/")
+             (base32
+              "1y010df0hxqsjb1q571z4s3vnz2q03l2n4lycg6z89b2yyvdplsv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jneurosci")
+    (synopsis "BibTeX style for the @emph{Journal of Neuroscience}")
+    (description
+     "This is a slightly modified version of the @code{namedplus} style, which
+fully conforms with the @emph{Journal of Neuroscience} citation style.  It
+should be characterised as an author-date citation style; a BibTeX style and
+a LaTeX package are provided.")
+    (license license:lppl)))
+
+(define-public texlive-jnuexam
+  (package
+    (name "texlive-jnuexam")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jnuexam/" "tex/latex/jnuexam/")
+             (base32
+              "1l6r5cnr5wcxf6hn6ih87544845vcbcd4g3ah8wjl8vaina2j49w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jnuexam")
+    (synopsis "Exam class for Jinan University")
+    (description
+     "The package provides an exam class for Jinan University (China).")
+    (license license:lppl1.3+)))
+
+(define-public texlive-josefin
+  (package
+    (name "texlive-josefin")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/josefin/"
+                   "fonts/enc/dvips/josefin/"
+                   "fonts/map/dvips/josefin/"
+                   "fonts/tfm/public/josefin/"
+                   "fonts/truetype/public/josefin/"
+                   "fonts/type1/public/josefin/"
+                   "fonts/vf/public/josefin/"
+                   "tex/latex/josefin/")
+             (base32
+              "1ja91mkcpgvdycqxlfa1xfay427b3d7akq8pcdwvgakzgf9bkb1s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/josefin")
+    (synopsis "Josefin fonts with LaTeX support")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Josefin Sans family of fonts, designed by Santiago Orozco.  Josefin Sans
+is available in seven weights, with corresponding italics.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-jourcl
+  (package
+    (name "texlive-jourcl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jourcl/" "tex/latex/jourcl/")
+             (base32
+              "1wbq0mjl6931267qiw0nrfqxa4blpddqyv27m3wggbpbrz9hvakb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jourcl")
+    (synopsis "Cover letter for journal submissions")
+    (description
+     "Paper submissions to journals are usually accompanied by a cover letter.
+This package provides a LaTeX class and a template for such a cover letter
+with the following main features:
+
+@itemize
+
+@item minimalistic design,
+
+@item custom image,
+
+@item pre-defined commands for journal name, author, date, etc.
+
+@item many macros contained in this package speed up the process of
+preparing the necessary ingredients for the cover letter;
+
+@item macros for recommending up to three reviewers and editors;
+
+@item ORCID logo and link to the submitting author's ORCID page;
+
+@item controls for adding a ``conflict of interest'' statement and declaration;
+
+@item custom greeting;
+
+@item predefined valedictions for different types of submissions.
+
+@end itemize")
+    (license license:cc-by-sa4.0)))
+
+(define-public texlive-jpsj
+  (package
+    (name "texlive-jpsj")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jpsj/" "tex/latex/jpsj/")
+             (base32
+              "0gvszj0igklm8b0p268j59ysfbahh03c6nbm6gpzkan3p4ijabdi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jpsj")
+    (synopsis
+     "Document class for @emph{Journal of the Physical Society of Japan}")
+    (description
+     "This package provides a document class for @emph{Journal of the Physical
+Society of Japan}.")
+    (license license:lppl)))
+
+(define-public texlive-junicode
+  (package
+    (name "texlive-junicode")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/junicode/"
+                   "fonts/enc/dvips/junicode/"
+                   "fonts/map/dvips/junicode/"
+                   "fonts/tfm/public/junicode/"
+                   "fonts/truetype/public/junicode/"
+                   "fonts/vf/public/junicode/"
+                   "tex/latex/junicode/")
+             (base32
+              "0i19bycw48mygvjm6ysawghj7wgb7md7gsvnrbhhfprmabl47j49")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/junicode")
+    (synopsis "TrueType font for medievalists")
+    (description
+     "Junicode is a TrueType font with many OpenType features for
+antiquarians (especially medievalists) based on typefaces used by the Oxford
+Press in the late 17th and early 18th centuries.  It works well with
+Xe(La)TeX.")
+    (license license:silofl1.1)))
+
 (define-public texlive-jupynotex
   (package
     (name "texlive-jupynotex")
@@ -5256,6 +18156,141 @@ Notebook format to proper LaTeX so it gets included seamlessly, supporting
 text, LaTeX, images, etc.")
     (license license:asl2.0)))
 
+(define-public texlive-jura
+  (package
+    (name "texlive-jura")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jura/" "source/latex/jura/"
+                   "tex/latex/jura/")
+             (base32
+              "1lxss00mymcxljzaqmwj9zpy9cpc71a0a4g6bqrzvgspj506jdp7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jura")
+    (synopsis "Document class for German legal texts")
+    (description
+     "This package implements the standard layout for German term papers in law
+(one-and-half linespacing, 7 cm margins, etc.).  It includes @code{alphanum}
+that permits alphanumeric section numbering (e.g., @samp{A. Introduction};
+@samp{III. International Law}).")
+    (license license:gpl3+)))
+
+(define-public texlive-juraabbrev
+  (package
+    (name "texlive-juraabbrev")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/juraabbrev/"
+                   "makeindex/juraabbrev/"
+                   "source/latex/juraabbrev/"
+                   "tex/latex/juraabbrev/")
+             (base32
+              "0xybpc9j3x0gvq8hs5hrbb6ivilmp8ayjp6bq8xd7gsy7awag5d7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/juraabbrev")
+    (synopsis "Abbreviations for typesetting (German) juridical documents")
+    (description
+     "This package should be helpful for people working on (German) law.  It
+helps you to handle abbreviations and creates a list of those (pre-defined)
+abbreviations that have actually been used in the document.")
+    (license license:gpl3+)))
+
+(define-public texlive-jurabib
+  (package
+    (name "texlive-jurabib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/jurabib/" "bibtex/bst/jurabib/"
+                   "doc/latex/jurabib/" "source/latex/jurabib/"
+                   "tex/latex/jurabib/")
+             (base32
+              "1z8n654n0f97qayql0111smpydwmdf6i22bg55i6nh5al2jcsbbb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jurabib")
+    (synopsis
+     "Extended BibTeX citation support for the humanities and legal texts")
+    (description
+     "This package enables automated citation with BibTeX for legal studies
+and the humanities.  In addition, the package provides commands for specifying
+editors in a commentary in a convenient way.  Simplified formatting of the
+citation as well as the bibliography entry is also provided.  It is possible
+to display the (short) title of a work only if an authors is cited with
+multiple works.  Giving a full citation in the text, conforming to the
+bibliography entry, is supported.  Several options are provided which might be
+of special interest for those outside legal studies--for instance, displaying
+multiple full citations.  In addition, the format of last names and first
+names of authors may be changed easily.  Cross references to other footnotes
+are possible.  Language dependent handling of bibliography entries is possible
+by the special language field.")
+    (license license:gpl3+)))
+
+(define-public texlive-juramisc
+  (package
+    (name "texlive-juramisc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/juramisc/" "tex/latex/juramisc/")
+             (base32
+              "0ka6gmlb0vlg0317ihjnlklvaajj4rrbi7c2iisngz69fgjm26iy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/juramisc")
+    (synopsis "Typesetting German juridical documents")
+    (description
+     "This package provides a collection of classes for typesetting court
+sentences, legal opinions, books and dissertations for German lawyers.
+A @code{jurabook} class is also provided, which may not yet be complete.")
+    (license license:lppl)))
+
+(define-public texlive-jurarsp
+  (package
+    (name "texlive-jurarsp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/jurarsp/" "doc/latex/jurarsp/"
+                   "source/latex/jurarsp/" "tex/latex/jurarsp/")
+             (base32
+              "03lwp5v6fmq2zhiwaf4qj52k44grzh119il4pdp2fvgl2q4a39sm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jurarsp")
+    (synopsis
+     "Citations of judgements and official documents in (German) juridical
+documents")
+    (description
+     "This package should be helpful for people working on (German) law.
+It (ab)uses BibTeX for citations of judgements and official documents.  For
+this purpose, a special BibTeX-style is provided.")
+    (license license:gpl3+)))
+
+(define-public texlive-jwjournal
+  (package
+    (name "texlive-jwjournal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jwjournal/"
+                   "tex/latex/jwjournal/")
+             (base32
+              "098mh60qf77x12f6mnlpsl80imx97673wx3vxcndfjdmpmr5k9gk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-einfart))
+    (home-page "https://ctan.org/pkg/jwjournal")
+    (synopsis "Personal class for writing journals")
+    (description
+     "This LaTeX document class enables the user to turn simple pure text
+entries into a colorful and nicely formatted journal.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-karnaugh
   (package
     (name "texlive-karnaugh")
@@ -5340,6 +18375,229 @@ document author needs.  So it can be a useful guide for beginners as well as
 a reference manual for advanced users.")
     (license license:cc-by-sa4.0)))
 
+(define-public texlive-kdgdocs
+  (package
+    (name "texlive-kdgdocs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/kdgdocs/" "source/latex/kdgdocs/"
+                   "tex/latex/kdgdocs/")
+             (base32
+              "1yjd6y3h8m08zwhnd0bg3153xapxxqy2i23i30fcvv5mj5pnnql8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/kdgdocs")
+    (synopsis "Document classes for Karel de Grote University College")
+    (description
+     "The bundle provides two classes for usage by @acronym{KdG, Karel de
+Grote} University College professors and master students: @code{kdgcoursetext}
+for writing course texts, and @code{kdgmasterthesis} for writing master's
+theses.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-kdpcover
+  (package
+    (name "texlive-kdpcover")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/kdpcover/"
+                   "source/latex/kdpcover/"
+                   "tex/latex/kdpcover/")
+             (base32
+              "116pzg0bdrj78vs2sq196jcwnv16b734kqnhfcg3fka4mf6jk2d1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-anyfontsize
+           texlive-geometry
+           texlive-graphics
+           texlive-microtype
+           texlive-pgf
+           texlive-setspace
+           texlive-textpos
+           texlive-tools
+           texlive-xcolor
+           texlive-xifthen
+           texlive-xkeyval))
+    (home-page "https://ctan.org/pkg/kdpcover")
+    (synopsis "Covers for books published by Kindle Direct Publishing")
+    (description
+     "The problem this class solves is the necessity to change the size of the
+cover PDF according to the number of pages in the book --- the bigger the
+book, the larger the spine of the book must be.  The provided class makes the
+necessary calculations on-the-fly, using the @code{qpdf} tool.")
+    (license license:expat)))
+
+(define-public texlive-kfupm-math-exam
+  (package
+    (name "texlive-kfupm-math-exam")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/kfupm-math-exam/"
+                   "source/latex/kfupm-math-exam/"
+                   "tex/latex/kfupm-math-exam/")
+             (base32
+              "1hgyasjhqpb1b9xnffzcwhsi8rr6wx929awn0sadx6rsabiamb16")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/kfupm-math-exam")
+    (synopsis
+     "LaTeX document style to produce homework, quiz and exam papers")
+    (description
+     "The package provides commands and environments that simplify and
+streamline the process of preparing homework, quiz and exam papers according
+to a preferred style.  The default style is based on the guidelines set by the
+department of mathematics at @acronym{KFUPM, King Fahd University of Petroleum
+and Minerals}.  It can be easily customized to fit any style for any
+institution.")
+    (license license:expat)))
+
+(define-public texlive-kixfont
+  (package
+    (name "texlive-kixfont")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/kixfont/"
+                   "fonts/source/public/kixfont/"
+                   "fonts/tfm/public/kixfont/")
+             (base32
+              "0w6fjsws26plm9p74c3qcvvgx5hhlabfbhpc046rb31183f7h0q5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/kixfont")
+    (synopsis "Font for KIX codes")
+    (description
+     "The KIX code is a barcode-like format used by the Dutch PTT to encode
+country codes, zip codes and street numbers in a machine-readable format.  If
+printed below the address line on bulk mailings, a discount can be obtained.
+The font is distributed in Metafont format, and covers the numbers and
+upper-case letters.")
+    (license license:public-domain)))
+
+(define-public texlive-kluwer
+  (package
+    (name "texlive-kluwer")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/kluwer/" "doc/latex/kluwer/"
+                   "source/latex/kluwer/" "tex/latex/kluwer/")
+             (base32
+              "14y95srzggd8kaiyjq0sz5amvmppl3rilhj9fr0vcjsy2g1ms52z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; The "kluwer.ins" file only generates "kluwer.cls".  To that
+          ;; effect, it needs data from files located in
+          ;; "tex/latex/kluwer/".  Bring them to build directory.
+          (add-before 'build 'bring-data-files
+            (lambda _
+              (for-each (lambda (f) (install-file f "build/"))
+                        (find-files "tex/latex/kluwer/" "\\.(clo|sty)$")))))))
+    (home-page "https://ctan.org/pkg/kluwer")
+    (synopsis "@emph{Kluwer} publication support")
+    (description
+     "This package provides a class file for @emph{Kluwer} journal
+submissions, and bibliography style for named references.  It also includes
+@file{klucite.sty}, which collapses bibliographic citations, and
+@file{klups.sty}, which attempts to select Times for text and MathTime for
+math instead of Computer Modern.  This package is most likely long obsolete,
+unfortunately.")
+    (license license:knuth)))
+
+(define-public texlive-kotex-oblivoir
+  (package
+    (name "texlive-kotex-oblivoir")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/kotex-oblivoir/"
+                   "tex/latex/kotex-oblivoir/")
+             (base32
+              "0hq22jdzcg516zx26mkijpnk5i8gdj30lhjldly8plwmfznhzwwa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-kotex-utf texlive-memoir))
+    (home-page "https://ctan.org/pkg/kotex-oblivoir")
+    (synopsis "LaTeX document class for typesetting Korean documents")
+    (description
+     "The class is based on @code{memoir}, and is adapted to typesetting
+Korean documents.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-kotex-plain
+  (package
+    (name "texlive-kotex-plain")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/kotex-plain/"
+                   "tex/plain/kotex-plain/")
+             (base32
+              "0r79cvm7iy1266yvrn60vwq9wjkgmzgfihbz9dqc84lif5q8kmnw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/kotex-plain")
+    (synopsis "Macros for typesetting Korean under Plain TeX")
+    (description
+     "The package provides macros for typesetting Hangul, the native alphabet
+of the Korean language, using Plain TeX.  Korean text should be encoded in
+UTF-8.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-kotex-utf
+  (package
+    (name "texlive-kotex-utf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/kotex-utf/"
+                   "tex/latex/kotex-utf/")
+             (base32
+              "1l3hlav7fihws2ly49fn994sc7mjcdwk3zp4xhkgvm0mqjbxzxzz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-cjk-ko))
+    (home-page "https://ctan.org/pkg/kotex-utf")
+    (synopsis "Typeset Hangul, coded in UTF-8")
+    (description
+     "The package typesets Hangul, which is the native alphabet of the Korean
+language; input Korean text should be encoded in UTF-8.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-kotex-utils
+  (package
+    (name "texlive-kotex-utils")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/kotex-utils/"
+                   "makeindex/kotex-utils/"
+                   "scripts/kotex-utils/")
+             (base32
+              "01qmr50fr3i2gzgjyj69jgj4czf62s22z58kja6hbqygczc1jba3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts
+           #~(list "jamo-normalize.pl" "komkindex.pl" "ttf2kotexfont.pl")))
+    (inputs (list perl))
+    (propagated-inputs (list texlive-kotex-utf))
+    (home-page "https://ctan.org/pkg/kotex-utils")
+    (synopsis "Utility scripts and support files for typesetting Korean")
+    (description
+     "The bundle provides scripts and support files for index generation in
+Korean language typesetting.")
+    (license license:lppl)))
+
 (define-public texlive-knuth-errata
   (package
     (name "texlive-knuth-errata")
@@ -5416,6 +18674,70 @@ system that Knuth created.  The central entry point is the index file, with
 links to the individual documents, either in HTML or in PDF format.")
     (license license:public-domain)))
 
+(define-public texlive-ksfh-nat
+  (package
+    (name "texlive-ksfh-nat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/ksfh_nat/")
+             (base32
+              "1qzn0n19lslf2qg8fvm844xx5k7s8a275a77z2ynbb0vs1w4prpw")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ksfh-nat")
+    (synopsis "BibTeX style for KSFH Munich")
+    (description
+     "The package supports bibliographies as standard for
+KSFH (@emph{Katholische Stiftungsfachhochschule}) Munich.  BibTeX entries in
+@code{article}, @code{book}, @code{inbook}, @code{incollection} and
+@code{misc} formats are supported.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ksp-thesis
+  (package
+    (name "texlive-ksp-thesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ksp-thesis/"
+                   "tex/latex/ksp-thesis/")
+             (base32
+              "03jklx2yym78b29y3s8fh91mfsn9p4w1cl7yisj3kyyawygzs6hp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ksp-thesis")
+    (synopsis
+     "LaTeX class for theses published with KIT Scientific Publishing")
+    (description
+     "This package provides a LaTeX class intended for authors who want to
+publish their thesis or other scientific work with @acronym{KSP, KIT
+Scientific Publishing}.  The class is based on the @code{scrbook} class of the
+KOMA-script bundle in combination with the ClassicThesis and ArsClassica
+packages.  It modifies some of the layout and style definitions of these
+packages in order to provide a document layout that should be compatible with
+the requirements by KSP.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ku-template
+  (package
+    (name "texlive-ku-template")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ku-template/"
+                   "tex/latex/ku-template/")
+             (base32
+              "1aa3rday97l1b7vca6sq1jwj81bqx6j7d0ijz0jr4vp3r27pxgs9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ku-template")
+    (synopsis "Copenhagen University or faculty logo for front page")
+    (description
+     "This package provides a comprehensive package for adding University of
+Copenhagen or faculty logo to your front page.  For use by student or staff at
+University of Copenhagen (Kobenhavns Universitet).")
+    (license license:expat)))
+
 (define-public texlive-kvmap
   (package
     (name "texlive-kvmap")
@@ -5438,6 +18760,77 @@ It provides a tabular-like input syntax and support for drawing bundles
 (implicants) around adjacent values.")
     (license license:lppl1.3c)))
 
+(define-public texlive-langsci
+  (package
+    (name "texlive-langsci")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/langsci/"
+                   "tex/xelatex/langsci/")
+             (base32
+              "1kz8gf5w7xrgld5jpf1csdy334ng89hp5lbkgmgaal4m31svw03z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/langsci")
+    (synopsis "Typeset books for publication with Language Science Press")
+    (description
+     "This package allows you to typeset monographs and edited volumes for
+publication with @url{https://www.langsci-press.org, Language Science Press}.
+It includes all necessary files for title pages, frontmatter, main content,
+list of references and indexes.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-langsci-avm
+  (package
+    (name "texlive-langsci-avm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/langsci-avm/"
+                   "source/latex/langsci-avm/"
+                   "tex/latex/langsci-avm/")
+             (base32
+              "1n53syf2slndgjbndjhd3cl8y6bl9j3xgb86z9r1mwvdcdls5674")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/langsci-avm")
+    (synopsis "Feature structures and attribute-value matrices (AVM)")
+    (description
+     "This package provides a package for typesetting feature structures,
+also known as attribute-value matrices (AVMs), for use in linguistics.  The
+package provides a minimal and easy to read syntax.  The package serves the
+same purpose as @code{avm} package, but shares no code base with that
+package.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-lato
+  (package
+    (name "texlive-lato")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/lato/"
+                   "fonts/enc/dvips/lato/"
+                   "fonts/map/dvips/lato/"
+                   "fonts/tfm/typoland/lato/"
+                   "fonts/truetype/typoland/lato/"
+                   "fonts/type1/typoland/lato/"
+                   "fonts/vf/typoland/lato/"
+                   "tex/latex/lato/")
+             (base32
+              "1ykwm108zh79dv96axl74izzhzvmbx74pcl46i99ix2qpicyvcf7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lato")
+    (synopsis "Lato font family and LaTeX support")
+    (description
+     "Lato is a sanserif typeface family designed by Lukasz Dziedzic.  This
+font, which includes five weights (hairline, light, regular, bold and black),
+is available as TrueType files.  The package provides support for this font in
+LaTeX.")
+    (license (list license:silofl1.1 license:lppl1.3c))))
+
 (define-public texlive-l2picfaq
   (package
     (name "texlive-l2picfaq")
@@ -5552,6 +18945,85 @@ practical guide to LaTeX2e by Mark Trettin.  It focuses on obsolete packages
 and commands.")
     (license license:public-domain)))
 
+(define-public texlive-labyrinth
+  (package
+    (name "texlive-labyrinth")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/labyrinth/"
+                   "tex/latex/labyrinth/")
+             (base32
+              "0i4w3dmfjq9vp6m82p4afplca0pdvk36g2h1yskmwbis07bykdgp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/labyrinth")
+    (synopsis "Draw labyrinths and solution paths")
+    (description
+     "The @code{labyrinth} package provides code and an environment for
+typesetting simple labyrinths with LaTeX, and generating an automatic or
+manual solution path.")
+    (license license:lppl)))
+
+(define-public texlive-lambda
+  (package
+    (name "texlive-lambda")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/lambda/base/" "tex/lambda/config/")
+             (base32
+              "1ajx5g5cd5s9jqr4b196689k7zmlxmhhksly88qps31s7lzaprvn")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lambda")
+    (synopsis "LaTeX for Omega and Aleph")
+    (description "This is LaTeX for Omega and Aleph.")
+    (license license:lppl1.0+)))
+
+(define-public texlive-langnames
+  (package
+    (name "texlive-langnames")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/langnames/"
+                   "source/latex/langnames/"
+                   "tex/latex/langnames/")
+             (base32
+              "0fi2xfy33d970g8wdnzasqdzgjcj7rkss9y7pzsp89z1hij3d1z2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/langnames")
+    (synopsis "Name languages and their genetic affiliations consistently")
+    (description
+     "This package attempts to make the typing of language names, codes, and
+families slightly easier by providing macros to access pre-defined
+language --- code --- family combinations from two important databases, as
+well as the possibility to create new combinations.  It may be particularly
+useful for large, collaborative projects as well as typologically minded ones
+with a variety of language examples.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-latex-notes-zh-cn
+  (package
+    (name "texlive-latex-notes-zh-cn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/latex-notes-zh-cn/")
+             (base32
+              "0w9rmd7b5fnfvix653n9vbnn1k8yxlaaak79ipvm8p53dx75xfxd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/latex-notes-zh-cn")
+    (synopsis "Chinese Introduction to TeX and LaTeX")
+    (description
+     "The document is an introduction to TeX and LaTeX, in Chinese.  It covers
+basic text typesetting, mathematics, graphics, tables, Chinese language &
+fonts, and some miscellaneous features (hyperlinks, long documents,
+bibliographies, indexes and page layout).")
+    (license license:lppl1.3+)))
+
 (define-public texlive-latex2e-help-texinfo-fr
   (package
     (name "texlive-latex2e-help-texinfo-fr")
@@ -5590,6 +19062,26 @@ and commands.")
 @code{latex2e-help-texinfo}.")
     (license license:public-domain)))
 
+(define-public texlive-latex4musicians
+  (package
+    (name "texlive-latex4musicians")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/latex4musicians/")
+             (base32
+              "1zvy2pa93kyn056d5n0irzdq5xmzki6d35zxacxfy19r0g9rwq6f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/latex4musicians")
+    (synopsis "Guide for combining LaTeX and music")
+    (description
+     "This guide, @emph{LaTeX for Musicians}, explains how to create LaTeX
+documents that include several kinds of music elements: music symbols, song
+lyrics, guitar chords diagrams, lead sheets, music excerpts, guitar
+tablatures, multi-page scores.")
+    (license license:fdl1.3+)))
+
 (define-public texlive-latexcheat-de
   (package
     (name "texlive-latexcheat-de")
@@ -5627,6 +19119,73 @@ standards using the KOMA script document classes.")
 cheat sheet (a reference sheet for writing scientific papers).")
     (license license:lppl)))
 
+(define-public texlive-latino-sine-flexione
+  (package
+    (name "texlive-latino-sine-flexione")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/latino-sine-flexione/"
+                   "tex/latex/latino-sine-flexione/")
+             (base32
+              "0py61xhgg73jlz6f9p7g9r06pn7m648d29068i4d97gqc20i2jvc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/latino-sine-flexione")
+    (synopsis "LaTeX support for documents written in Peano's Interlingua")
+    (description
+     "Latino sine Flexione (or Interlingua) is a language constructed by
+Giuseppe Peano at the beginning of the last century.  This simplified Latin is
+designed to be an instrument for international cooperation, especially in the
+academic sphere.  This package provides the necessary translations to use the
+language within a LaTeX document.  It also imports @code{fontenc} in order to
+be able to use ligatures and quotation marks.  Finally, it offers a text in
+Interlingua that can be used as a dummy text: @emph{Fundamento de
+intelligentia}.")
+    (license license:public-domain)))
+
+(define-public texlive-leadsheets
+  (package
+    (name "texlive-leadsheets")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/leadsheets/"
+                   "tex/latex/leadsheets/")
+             (base32
+              "12aly170pf10dw82i6rykiaxl9r5mmva7kvkhlywir4s6gx07gjc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/leadsheets")
+    (synopsis "Typesetting leadsheets and songbooks")
+    (description
+     "This LaTeX package offers support for typesetting simple leadsheets of
+songs, i.e., song lyrics and the corresponding chords.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ledmac
+  (package
+    (name "texlive-ledmac")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ledmac/" "source/latex/ledmac/"
+                   "tex/latex/ledmac/")
+             (base32
+              "03b23rkhdhvr0rbmp687p76mlq68crsfyh67frxbnh11vccmfgnc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ledmac")
+    (synopsis "Typeset scholarly editions")
+    (description
+     "This package provides a macro package for typesetting scholarly critical
+editions.  The @code{ledmac} package is a LaTeX port of the Plain TeX EDMAC
+macros.  It supports indexing by page and line number and simple
+@code{tabular}- and @code{array}-style environments.  The package is
+distributed with the related @code{ledpar} and @code{ledarab} packages.  The
+package is now superseded by @code{reledmac}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-letgut
   (package
     (name "texlive-letgut")
@@ -5679,6 +19238,362 @@ with the symbols.  While it is possible to set arrows over longer strings of
 symbols, the focus lies on single characters.")
     (license license:lppl1.3+)))
 
+(define-public texlive-lexend
+  (package
+    (name "texlive-lexend")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/lexend/"
+                   "fonts/truetype/public/lexend/"
+                   "tex/latex/lexend/")
+             (base32
+              "0jk9m3zb3xik463nwsjh003ly3xrrph7kam519b9lyqybyxb16xs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lexend")
+    (synopsis "Lexend fonts for XeLaTeX and LuaLaTeX")
+    (description
+     "The purpose of this package is pretty straightforward: the Lexend font
+collection has been designed by Dr.@: Bonnie Shaver-Troup and Thomas Jockin to
+make reading easier for everyone.")
+    (license (list license:lppl1.3c license:silofl1.1))))
+
+(define-public texlive-lexikon
+  (package
+    (name "texlive-lexikon")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lexikon/" "tex/latex/lexikon/")
+             (base32
+              "0x2h8w3cchzr2lvx5xqs1fn01y7b4lqkky85dard223w2r1dn22m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lexikon")
+    (synopsis "Macros for a two language dictionary")
+    (description "This package provides macros for a two language
+dictionary.")
+    (license license:lppl)))
+
+(define-public texlive-lexref
+  (package
+    (name "texlive-lexref")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lexref/" "tex/latex/lexref/")
+             (base32
+              "0562vjn0vvjsqfi2jqy1yp6mqi8nrs25yc9nr1zc950q421w0vrb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lexref")
+    (synopsis "Convenient and uniform references to legal provisions")
+    (description
+     "The package is aimed at continental lawyers (especially those in
+Switzerland and Germany), allowing the user to make references to legal
+provisions conveniently and uniformly.  The package also allows the user to
+add cited Acts to a nomenclature list (automatically), and to build specific
+indexes for each cited Act.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-lfb
+  (package
+    (name "texlive-lfb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/lfb/" "fonts/source/public/lfb/"
+                   "fonts/tfm/public/lfb/")
+             (base32
+              "1n0cf7igvhqnmdk8hjj1lahzr3iaiaqsq01pxkphg6myab127x71")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/lfb")
+    (synopsis "Greek font with normal and bold variants")
+    (description
+     "This is a Greek font written in Metafont, with inspiration from the
+Bodoni typefaces in old books.  It is stylistically a little more exotic than
+the standard textbook Greek fonts, particularly in glyphs like the lowercase
+rho and kappa.  It aims for a rather calligraphic feel, but seems to blend
+well with Computer Modern.  There is a ligature scheme which automatically
+inserts the breathings required for ancient texts, making the input text more
+readable than in some schemes.")
+    (license license:lppl)))
+
+(define-public texlive-libertinegc
+  (package
+    (name "texlive-libertinegc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/libertinegc/"
+                   "fonts/enc/dvips/libertinegc/"
+                   "fonts/map/dvips/libertinegc/"
+                   "fonts/tfm/public/libertinegc/"
+                   "tex/latex/libertinegc/")
+             (base32
+              "17712j1gb38l4c5b2br7db8ix36kc8kwfpa7d6ass32wz5jck656")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/libertinegc")
+    (synopsis "Libertine add-on to support Greek and Cyrillic")
+    (description
+     "The package provides LaTeX support files to access the Greek and
+Cyrillic glyphs in Linux Libertine.  It functions as an add-on to the
+@code{libertine} package, using filenames and macro names that are compatible
+with that package.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-libertinus
+  (package
+    (name "texlive-libertinus")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/libertinus/"
+                   "tex/latex/libertinus/")
+             (base32
+              "13m20jkrf0sp39f0ihc0fw7spzc3gys5xdc720r5gzdnbdqdvih4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/libertinus")
+    (synopsis
+     "Use the correct @code{libertinus} package according to current TeX
+engine")
+    (description
+     "This package is only a wrapper for the two packages @code{libertinus-type1}
+(pdfLaTeX) and @code{libertinus-otf} (LuaLaTeX and XeLaTeX).  The Libertinus
+fonts are similiar to Libertine and Biolinum, but come with math symbols.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-libertinus-fonts
+  (package
+    (name "texlive-libertinus-fonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/libertinus-fonts/"
+                   "fonts/opentype/public/libertinus-fonts/")
+             (base32
+              "1g4y3v7i8bs1677rj56v3kw5q3nkl9ksljmly4m7n42dlpggxiaj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/libertinus-fonts")
+    (synopsis "Libertinus font family")
+    (description
+     "This is a fork of the Linux Libertine and Linux Biolinum fonts that
+started as an OpenType math companion of the Libertine font family, but grown
+as a full fork.  The family consists of Libertinus Serif, Libertinus Sans,
+Libertinus Mono, and Libertinus Math, an OpenType math font for use in
+OpenType math-capable applications.")
+    (license license:silofl1.1)))
+
+(define-public texlive-libertinus-otf
+  (package
+    (name "texlive-libertinus-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/libertinus-otf/"
+                   "tex/latex/libertinus-otf/")
+             (base32
+              "0rd4jr67j9744fm18vps0brwsa9880jdq4vj4s7dl80aylp8djz4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/libertinus-otf")
+    (synopsis "Support for Libertinus OpenType")
+    (description
+     "This package offers LuaLaTeX and XeLaTeX support for the Libertinus
+OpenType fonts.  Missing fonts are defined via several font feature settings.
+The Libertinus fonts are similiar to Libertine and Biolinum, but come with
+math symbols.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-libertinus-type1
+  (package
+    (name "texlive-libertinus-type1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/libertinus-type1/"
+                   "fonts/enc/dvips/libertinus-type1/"
+                   "fonts/map/dvips/libertinus-type1/"
+                   "fonts/tfm/public/libertinus-type1/"
+                   "fonts/type1/public/libertinus-type1/"
+                   "fonts/vf/public/libertinus-type1/"
+                   "tex/latex/libertinus-type1/")
+             (base32
+              "1vzvli3sbyxdsqzb3qk03mbl0qg4q7ihipddd1n6bdbjriv67zz6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/libertinus-type1")
+    (synopsis "Support for using Libertinus fonts with LaTeX")
+    (description
+     "This package provides support for use of Libertinus fonts with
+traditional processing engines (LaTeX with Dvips or Dvipdfmx, or pdfLaTeX).")
+    (license (list license:gpl2 license:silofl1.1 license:lppl))))
+
+(define-public texlive-libertinust1math
+  (package
+    (name "texlive-libertinust1math")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/libertinust1math/"
+                   "fonts/afm/public/libertinust1math/"
+                   "fonts/enc/dvips/libertinust1math/"
+                   "fonts/map/dvips/libertinust1math/"
+                   "fonts/tfm/public/libertinust1math/"
+                   "fonts/type1/public/libertinust1math/"
+                   "fonts/vf/public/libertinust1math/"
+                   "tex/latex/libertinust1math/")
+             (base32
+              "0hjv2p2sj1wmxg727490m8jn08p1alc9gyfigvy0k65c5lghhs7s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/libertinust1math")
+    (synopsis "Type 1 font and LaTeX support for Libertinus Math")
+    (description
+     "The package provides a Type 1 version of Libertinus Math, with a number
+of additions and changes, plus LaTeX support files that allow it to serve as
+a math accompaniment to Libertine under LaTeX.  In addition, with option
+@code{sansmath}, it can function as a standalone math font with sans serif
+Roman and Greek letters.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-librebaskerville
+  (package
+    (name "texlive-librebaskerville")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/librebaskerville/"
+                   "fonts/enc/dvips/librebaskerville/"
+                   "fonts/map/dvips/librebaskerville/"
+                   "fonts/tfm/impallari/librebaskerville/"
+                   "fonts/truetype/impallari/librebaskerville/"
+                   "fonts/type1/impallari/librebaskerville/"
+                   "fonts/vf/impallari/librebaskerville/"
+                   "tex/latex/librebaskerville/")
+             (base32
+              "1rjac2w8q0m4a6qcdjphv3rgws19vbg65wv6gk1frl0d14bijqdy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/librebaskerville")
+    (synopsis "Libre Baskerville family of fonts with LaTeX support")
+    (description
+     "This package provides the Libre Baskerville family of fonts, designed by
+Pablo Impallari, for use with LaTeX, pdfLaTeX, XeLaTeX or LuaLaTeX.  It is
+primarily intended to be a web font but is also attractive as a text font.
+A BoldItalic variant has been artificially generated.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-librebodoni
+  (package
+    (name "texlive-librebodoni")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/librebodoni/"
+                   "fonts/enc/dvips/librebodoni/"
+                   "fonts/map/dvips/librebodoni/"
+                   "fonts/opentype/impallari/librebodoni/"
+                   "fonts/tfm/impallari/librebodoni/"
+                   "fonts/type1/impallari/librebodoni/"
+                   "fonts/vf/impallari/librebodoni/"
+                   "tex/latex/librebodoni/")
+             (base32
+              "1skyjmb0drrs6z8bhmdyx7q9wqz9vbyi6nkif5rj95kqxxwznkyz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/librebodoni")
+    (synopsis "Libre Bodoni fonts with LaTeX support")
+    (description
+     "The Libre Bodoni fonts are designed by Pablo Impallari and Rodrigo
+Fuenzalida, based on the 19th century Morris Fuller Benton's.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-librecaslon
+  (package
+    (name "texlive-librecaslon")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/librecaslon/"
+                   "fonts/enc/dvips/librecaslon/"
+                   "fonts/map/dvips/librecaslon/"
+                   "fonts/opentype/impallari/librecaslon/"
+                   "fonts/tfm/impallari/librecaslon/"
+                   "fonts/type1/impallari/librecaslon/"
+                   "fonts/vf/impallari/librecaslon/"
+                   "tex/latex/librecaslon/")
+             (base32
+              "16lmaa0rsrgrib00r8rsj9librkybq2zf1as11l3hiw5zcq3wj0w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/librecaslon")
+    (synopsis "Libre Caslon fonts, with LaTeX support")
+    (description
+     "The Libre Caslon fonts are designed by Pablo Impallari.  Although they
+have been designed for use as web fonts, they work well as conventional text
+fonts.  An artificially generated BoldItalic variant has been added.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-librefranklin
+  (package
+    (name "texlive-librefranklin")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/librefranklin/"
+                   "fonts/enc/dvips/librefranklin/"
+                   "fonts/map/dvips/librefranklin/"
+                   "fonts/opentype/impallari/librefranklin/"
+                   "fonts/tfm/impallari/librefranklin/"
+                   "fonts/type1/impallari/librefranklin/"
+                   "fonts/vf/impallari/librefranklin/"
+                   "tex/latex/librefranklin/")
+             (base32
+              "1vkc2sj7689zn2rxc03q2spvs10865jrnv37s9dgw35hifb69m5s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/librefranklin")
+    (synopsis "LaTeX support for the Libre-Franklin family of fonts")
+    (description
+     "Libre Franklin is an interpretation and expansion based on the 1912
+Morris Fuller Benton's classic, designed by Pablo Impallari, Rodrigo
+Fuenzalida and Nhung Nguyen.")
+    (license (list license:lppl license:silofl1.1))))
+
+(define-public texlive-libris
+  (package
+    (name "texlive-libris")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/libris/"
+                   "fonts/afm/arkandis/libris/"
+                   "fonts/enc/dvips/libris/"
+                   "fonts/map/dvips/libris/"
+                   "fonts/tfm/arkandis/libris/"
+                   "fonts/type1/arkandis/libris/"
+                   "fonts/vf/arkandis/libris/"
+                   "source/fonts/libris/"
+                   "tex/latex/libris/")
+             (base32
+              "0ky2b4knhfd51yz6ycsly6q5rz2fk4h3rhnxmcx3qnhnai6cf9fc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/libris")
+    (synopsis "Libris ADF fonts, with LaTeX support")
+    (description
+     "LibrisADF is a sans-serif family designed to mimic Lydian.  The bundle
+includes: fonts, in Adobe Type 1, TrueType and OpenType formats, and LaTeX
+support macros, for use with the Type 1 versions of the fonts.")
+    (license license:gpl3+)))
+
 (define-public texlive-lie-hasse
   (package
     (name "texlive-lie-hasse")
@@ -5699,6 +19614,198 @@ simple roots of any complex simple Lie algebra.  It uses the Dynkin diagrams
 package @code{dynkin-diagrams}.")
     (license license:lppl1.3c)))
 
+(define-public texlive-lilyglyphs
+  (package
+    (name "texlive-lilyglyphs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lilyglyphs/"
+                   "fonts/opentype/public/lilyglyphs/"
+                   "scripts/lilyglyphs/"
+                   "source/latex/lilyglyphs/fonts/"
+                   "source/latex/lilyglyphs/glyphimages/definitions/"
+                   "source/latex/lilyglyphs/glyphimages/generated_src/"
+                   "tex/latex/lilyglyphs/")
+             (base32
+              "1g5v2bq7ml9pnh2xlkzf6k9zh3azw7i96iapp8yajyxk8akj0ki2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts
+           #~(list "lily-glyph-commands.py"
+                   "lily-image-commands.py"
+                   "lily-rebuild-pdfs.py")))
+    (inputs (list python))
+    (home-page "https://ctan.org/pkg/lilyglyphs")
+    (synopsis "Access Lilypond fragments and glyphs, in LaTeX")
+    (description
+     "The package provides the means to include arbitrary elements of LilyPond
+notation, including symbols from Lilypond's Emmentaler font, in a LaTeX
+document.  The package uses OpenType fonts, and as a result must be compiled
+with LuaLaTeX or XeLaTeX.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-limecv
+  (package
+    (name "texlive-limecv")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/limecv/" "source/latex/limecv/"
+                   "tex/latex/limecv/")
+             (base32
+              "1bqqkbxzayb8wwlkj1vkf01lx78i7pq2kb9clrir0paxjm8xa6ja")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/limecv")
+    (synopsis "(Xe/Lua)LaTeX document class for curriculum vitae")
+    (description
+     "@code{limecv} is a LaTeX document class to write curriculum vitae.  It
+is designed with the following design rules: simple, elegant and clean.  To
+this end, it offers several environments and macros for convenience.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-lineara
+  (package
+    (name "texlive-lineara")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/lineara/"
+                   "fonts/afm/public/lineara/"
+                   "fonts/map/dvips/lineara/"
+                   "fonts/tfm/public/lineara/"
+                   "fonts/type1/public/lineara/"
+                   "source/fonts/lineara/"
+                   "tex/latex/lineara/")
+             (base32
+              "1k3frdshsc2cj1y61bcpz9fcs1rw1rkzh8fk3fzbaqyqmyka3yl7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lineara")
+    (synopsis "Linear A script fonts")
+    (description
+     "The @code{lineara} package provides a simple interface to two fonts
+which include all known symbols, simple and complex, of the Linear A script.
+This way one can easily replicate Linear A texts using modern typographic
+technology.")
+    (license license:lppl)))
+
+(define-public texlive-ling-macros
+  (package
+    (name "texlive-ling-macros")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ling-macros/"
+                   "tex/latex/ling-macros/")
+             (base32
+              "0q5l9h5xkd9gkpx2g5inzkcsssqvdicv05r8xvlmmx41mf1ikc88")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ling-macros")
+    (synopsis "Macros for typesetting formal linguistics")
+    (description
+     "This package contains macros for typesetting glosses and formal
+expressions.  It covers a range of subfields in formal linguistics.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-linguex
+  (package
+    (name "texlive-linguex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/linguex/" "tex/latex/linguex/")
+             (base32
+              "0w2rxvjljrl4b7s1dr7k2vk5nifq0zgmjlx68ajpsihjnzal7k8g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/linguex")
+    (synopsis "Format linguists' examples")
+    (description
+     "This bundle comprises two packages: the @code{linguex} package
+facilitates the formatting of linguist examples, automatically taking care of
+example numbering, indentations, indexed brackets, and the @samp{*} in
+grammaticality judgments.  The @code{ps-trees} package provides linguistic
+trees.")
+    (license license:lppl)))
+
+(define-public texlive-linguisticspro
+  (package
+    (name "texlive-linguisticspro")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/linguisticspro/"
+                   "fonts/enc/dvips/linguisticspro/"
+                   "fonts/map/dvips/linguisticspro/"
+                   "fonts/opentype/public/linguisticspro/"
+                   "fonts/tfm/public/linguisticspro/"
+                   "fonts/type1/public/linguisticspro/"
+                   "fonts/vf/public/linguisticspro/"
+                   "tex/latex/linguisticspro/")
+             (base32
+              "0yyclkwsa4ibsdc60mw22f2skq2wify9ic4lzvkjsaigvq28zj3y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/linguisticspro")
+    (synopsis "LinguisticsPro fonts with LaTeX support")
+    (description
+     "The package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the LinguisticsPro family of fonts.  This family is derived from the Utopia
+Nova font family, by Andreas Nolda.")
+    (license (list license:lppl license:silofl1.1))))
+
+(define-public texlive-lion-msc
+  (package
+    (name "texlive-lion-msc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/lion-msc/" "doc/latex/lion-msc/"
+                   "tex/latex/lion-msc/")
+             (base32
+              "1yj3xwbd4lb5vjkfqhwhy82pc9p59vffah6zmiqbgjaj10q1ihb5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lion-msc")
+    (synopsis
+     "LaTeX class for B.Sc.@: and M.Sc.@: reports at Leiden Institute of
+Physics (LION)")
+    (description
+     "This is a LaTeX class for B.Sc.@: and M.Sc.@: reports at Leiden
+Institute of Physics (LION).  The purpose of this class is twofold.  It
+creates a uniform layout of the student theses from our department.  More
+importantly, it contains several fields on the front-page that the user needs
+to fill that are used in the university administration (name, student number
+and name of supervisor).  Students are free to change the layout of the text
+but should leave the title page as it is.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-listbib
+  (package
+    (name "texlive-listbib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/listbib/" "doc/latex/listbib/"
+                   "scripts/listbib/" "source/latex/listbib/"
+                   "tex/latex/listbib/")
+             (base32
+              "1k4xwmv6lh1vaggimzmiqib8aai9dm0j586m0hds04485pvhv5ky")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "listbib")))
+    (home-page "https://ctan.org/pkg/listbib")
+    (synopsis "Lists contents of BibTeX files")
+    (description
+     "This package generates listings of bibliographic data bases in BibTeX
+format.  Included is a @file{listbib.bst}, which is better suited for this
+purpose than the standard styles.")
+    (license license:gpl3+)))
+
 (define-public texlive-lithuanian
   (package
     (name "texlive-lithuanian")
@@ -5729,6 +19836,122 @@ and @file{latin7.def}.
 @end itemize")
     (license license:lppl1.3c)))
 
+(define-public texlive-liturg
+  (package
+    (name "texlive-liturg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/liturg/" "source/latex/liturg/"
+                   "tex/latex/liturg/")
+             (base32
+              "1nmcz7zg27aasczdv3p6ilsmy66cbfjg9yri45d0pml7m7c56din")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    ;; The "liturg.ins" provided by the package does not generate anything.
+    ;; As a consequence, there's nothing to build.
+    (arguments (list #:build-targets #~'()))
+    (home-page "https://ctan.org/pkg/liturg")
+    (synopsis "Support for typesetting Catholic liturgical texts")
+    (description
+     "The packages offers simple macros for typesetting Catholic liturgical
+texts, particularly @code{Missal} and @code{Breviary} texts.  The package
+assumes availability of Latin typesetting packages.")
+    (license license:lppl)))
+
+(define-public texlive-llncs
+  (package
+    (name "texlive-llncs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/llncs/" "doc/latex/llncs/"
+                   "tex/latex/llncs/")
+             (base32
+              "0drz45rmjprwy2019nkd6l5kjpqshfajqhg0x6jf5y9w1zbs1qv5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/llncs")
+    (synopsis
+     "Document class and bibliography style for @acronym{LNCS, Lecture Notes
+in Computer Science}")
+    (description
+     "This is Springer's official macro package for typesetting contributions
+to be published in Springer's @acronym{LNCS, Lecture Notes in Computer
+Science} and its related proceedings series CCIS, LNBIP, LNICST, and IFIP
+AICT.")
+    (license license:cc-by4.0)))
+
+(define-public texlive-llncsconf
+  (package
+    (name "texlive-llncsconf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/llncsconf/"
+                   "tex/latex/llncsconf/")
+             (base32
+              "18z94lh90pzvbzfgxj27n2l12mfbcjd20vga16h8d2bln56lrfpm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/llncsconf")
+    (synopsis "LaTeX package extending Springer's @code{llncs} class")
+    (description
+     "The package extends Springer's @code{llncs} class for adding additional
+notes describing the status of the paper (submitted, accepted) as well as for
+creating author-archived versions that include the references to the official
+version hosted by Springer (as requested by the copyright transfer agreement
+for Springer's LNCS series).")
+    (license license:lppl1.3c)))
+
+(define-public texlive-lni
+  (package
+    (name "texlive-lni")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/lni/" "doc/latex/lni/"
+                   "source/latex/lni/" "tex/latex/lni/")
+             (base32
+              "0d23j9yc9q45j9l9vzpndpgsvl5d76mkhmfjjjjrqmgmqmf3fzn0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lni")
+    (synopsis "Official class for the @emph{Lecture Notes in Informatics}")
+    (description
+     "This is the official version of the class @code{lni} for submissions to
+the @emph{Lecture Notes in Informatics} published by the Gesellschaft fur
+Informatik.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-lobster2
+  (package
+    (name "texlive-lobster2")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/lobster2/"
+                   "fonts/enc/dvips/lobster2/"
+                   "fonts/map/dvips/lobster2/"
+                   "fonts/opentype/impallari/lobster2/"
+                   "fonts/tfm/impallari/lobster2/"
+                   "fonts/type1/impallari/lobster2/"
+                   "fonts/vf/impallari/lobster2/"
+                   "tex/latex/lobster2/")
+             (base32
+              "0jq6287n0c0qzcx6jch0d9k7axg119z2p2mw6i3s40jdyg67m3a4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lobster2")
+    (synopsis "Lobster Two fonts, with support for all LaTeX engines")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Lobster Two family of fonts, designed by Pablo Impallari.  This is
+a family of script fonts with many ligatures and terminal forms; for the best
+results, use XeLaTeX or LuaLaTeX.  There are two weights and italic variants
+for both.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-logicproof
   (package
     (name "texlive-logicproof")
@@ -5753,6 +19976,136 @@ proofs and boxes.  It creates proofs in a style similar to that used in
 @emph{Logic in Computer Science} by Huth and Ryan.")
     (license license:lppl1.3+)))
 
+(define-public texlive-logicpuzzle
+  (package
+    (name "texlive-logicpuzzle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/logicpuzzle/"
+                   "scripts/logicpuzzle/"
+                   "tex/latex/logicpuzzle/")
+             (base32
+              "1m2yrizdj76gywxkcfz90by2qwx8pq8akacj5qmsin095hnyskfh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/logicpuzzle")
+    (synopsis "Typeset (grid-based) logic puzzles")
+    (description
+     "The package allows the user to typeset various logic puzzles.  At the
+moment the following puzzles are supported:
+
+@itemize
+
+@item 2D-Sudoku (aka Magiequadrat, Diagon, ...),
+
+@item Battleship (aka Bimaru, Marinespiel, Batalla Naval, ...),
+
+@item Bokkusu (aka Kakurasu, Feldersummenratsel, ...),
+
+@item Bridges (akak Bruckenbau, Hashi, ...),
+
+@item Chaos Sudoku,
+
+@item Four Winds (aka Eminent Domain, Lichtstrahl, ...),
+
+@item Hakyuu (aka Seismic, Ripple Effect, ...),
+
+@item Hitori,
+
+@item Kakuro,
+
+@item Kendoku (aka Mathdoku, Calcudoku, Basic, MiniPlu, Ken Ken, Square
+Wisdom, Sukendo, Caldoku, ...),
+
+@item Killer Sudoku (aka Samunapure, Sum Number Place, Sumdoku, Gebietssummen,
+...),
+
+@item Laser Beam (aka Laserstrahl, ...),
+
+@item Magic Labyrinth (aka Magic Spiral, Magisches Labyrinth, ...),
+
+@item Magnets (aka Magnetplatte, Magnetfeld, ...),
+
+@item Masyu (aka Mashi, White or Black Pearls, ...),
+
+@item Minesweeper (aka Minensuche, ...),
+
+@item Nonogram (aka Griddlers, Hanjie, Tsunami, Logic Art, Logimage, ...),
+
+@item Number Link (aka Alphabet Link, Arukone, Buchstabenbund, ...),
+
+@item Resuko,
+
+@item Schatzsuche,
+
+@item Skyline (aka Skycrapers, Wolkenkratzer, Hochhauser, ...), including
+Skyline Sudoku and Skyline Sudou (N*N) variants,
+
+@item Slitherlink (aka Fences, Number Line, Dotty Dilemma, Sli-Lin, Takegaki,
+Great Wall of China, Loop the Loop, Rundweg, Gartenzaun, ...),
+
+@item Star Battle (aka Sternenschlacht, ...),
+
+@item Stars and Arrows (aka Sternenhimmel, ...),
+
+@item Sudoku,
+
+@item Sun and Moon (aka Sternenhaufen, Munraito, ...),
+
+@item Tents and Trees (aka Zeltlager, Zeltplatz, Camping, ...),
+
+@item and Tunnel.
+
+@end itemize")
+    (license license:lppl1.3+)))
+
+(define-public texlive-logix
+  (package
+    (name "texlive-logix")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/logix/"
+                   "fonts/opentype/public/logix/"
+                   "fonts/truetype/public/logix/"
+                   "tex/latex/logix/")
+             (base32
+              "19ak3zfqnx04rb5wcmzc5z3g8sp2wphi83lx9i58y41y3lp2z4kq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/logix")
+    (synopsis "Supplement to the Unicode math symbols")
+    (description
+     "The package provides a Unicode font with over 4,000 symbols to
+supplement the Unicode math symbols.  It is compatible with and
+complements the AMS STIX2 math fonts, but focuses on new symbols and
+symbol variants more suited to work in logic.")
+    (license (list license:silofl1.1 license:lppl1.3c))))
+
+(define-public texlive-lollipop
+  (package
+    (name "texlive-lollipop")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/otherformats/lollipop/" "tex/lollipop/")
+             (base32
+              "0xdldlnhsr2n8544j9vd6gllin8bfkpcbhlpmxlhrvjl5bdg0rjp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:create-formats #~(list "lollipop")))
+    (propagated-inputs (list texlive-cm texlive-hyphen-base))
+    (home-page "https://ctan.org/pkg/lollipop")
+    (synopsis "TeX made easy")
+    (description
+     "Lollipop is a macro package that functions as a toolbox for writing TeX
+macros.  Its main aim is to make macro writing so easy that implementing
+a fully new layout in TeX would become a matter of less than an hour for an
+average document.  The aim is that such a task could be accomplished by
+someone with only a very basic training in TeX programming.")
+    (license license:gpl3)))
+
 (define-public texlive-longdivision
   (package
     (name "texlive-longdivision")
@@ -5826,6 +20179,65 @@ from use of the package are in the format used in the textbook @emph{Language,
 Proof, and Logic} by Dave Barker-Plummer, Jon Barwise, and John Etchemendy.")
     (license license:lppl1.3+)))
 
+(define-public texlive-lps
+  (package
+    (name "texlive-lps")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lps/" "source/latex/lps/"
+                   "tex/latex/lps/")
+             (base32
+              "11jd8k1w2mk0xmwaxb1ps8pabxlzvs24z5hl74dwcim2xad7ahvj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lps")
+    (synopsis "Class for @emph{Logic and Philosophy of Science}")
+    (description
+     "The @emph{Logic and Philosophy of Science} journal is an online
+publication of the University of Trieste (Italy).  The class builds on the
+standard article class to offer a format that LaTeX authors may use when
+submitting to the journal.")
+    (license license:lppl)))
+
+(define-public texlive-lshort-bulgarian
+  (package
+    (name "texlive-lshort-bulgarian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lshort-bulgarian/")
+             (base32
+              "0qg23asq2i5mqhp9xblv5hm3qxmd5886d5x0gq1fkdbyy9gsawi3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lshort-bulgarian")
+    (synopsis
+     "Bulgarian translation of the @emph{Short Introduction to LaTeX2e}")
+    (description
+     "This package includes the source files, PostScript and PDF files of the
+Bulgarian translation of the @emph{Short Introduction to LaTeX2e}.")
+    (license license:public-domain)))
+
+(define-public texlive-lshort-chinese
+  (package
+    (name "texlive-lshort-chinese")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lshort-chinese/")
+             (base32
+              "0455mdpcv3yg4m5vrbdp47j7mcwi43mvsy2p9clp7794agaf2ir6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lshort-zh-cn")
+    (synopsis "Introduction to LaTeX, in Chinese")
+    (description
+     "This package provides a Chinese edition of the @emph{(Not so) short
+introduction to LaTeX2e}, with additional information of typesetting Chinese
+language.")
+    (license license:fdl1.3+)))
+
 (define-public texlive-lshort-czech
   (package
     (name "texlive-lshort-czech")
@@ -5970,10 +20382,81 @@ to LaTeX2e: LaTeX2e-Kurzbeschreibung}.")
     (home-page "https://ctan.org/pkg/lshort-italian")
     (synopsis "Introduction to LaTeX in Italian")
     (description
-     "This is the Italian translation of the @emph{(Not so} Short Introduction
+     "This is the Italian translation of the @emph{(Not so) Short Introduction
 to LaTeX2e.}")
     (license license:gpl3+)))
 
+(define-public texlive-lshort-japanese
+  (package
+    (name "texlive-lshort-japanese")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lshort-japanese/")
+             (base32
+              "0mfxig980jyzhay1i83d69p294hgbr92v3kk2a4z8ca3fwzy8w74")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lshort-japanese")
+    (synopsis "Japanese version of the @emph{Short Introduction to LaTeX2e}")
+    (description "This is the Japanese version of the @emph{(Not so) Short
+Introduction to LaTeX2e}.")
+    (license license:gpl3+)))
+
+(define-public texlive-lshort-korean
+  (package
+    (name "texlive-lshort-korean")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lshort-korean/")
+             (base32
+              "07660lrss97hswmis7rgc419h05mgrvsfrrwmnrwk5yn97flhhqd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lshort-korean")
+    (synopsis "Korean introduction to LaTeX")
+    (description
+     "This package provides a translation of Oetiker's original @emph{(Not so)
+short introduction to LaTeX2e}.")
+    (license license:fdl1.3+)))
+
+(define-public texlive-lshort-mongol
+  (package
+    (name "texlive-lshort-mongol")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lshort-mongol/")
+             (base32
+              "153k4dzia30fpx847wli7i5p407a808gmj3p7jifq5bpx479qg1g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lshort-mongol")
+    (synopsis "Short introduction to LaTeX, in Mongolian")
+    (description
+     "This package provides a translation of Oetiker's @emph{(Not so) short
+introduction to LaTeX2e}.")
+    (license license:lppl)))
+
+(define-public texlive-lshort-persian
+  (package
+    (name "texlive-lshort-persian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lshort-persian/")
+             (base32
+              "0b1b45nh2d3d3zv735dymgyllj6m8i57icbihjkl1im0nghrzklk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lshort-persian")
+    (synopsis "Persian (Farsi) introduction to LaTeX")
+    (description
+     "This package provides a Persian (Farsi) translation of Oetiker's
+@emph{(Not so) short introduction to LaTeX2e}.")
+    (license license:public-domain)))
+
 (define-public texlive-lshort-polish
   (package
     (name "texlive-lshort-polish")
@@ -6010,6 +20493,23 @@ to LaTeX2e}.")
 Introduction to LaTeX2e}.")
     (license license:public-domain)))
 
+(define-public texlive-lshort-russian
+  (package
+    (name "texlive-lshort-russian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lshort-russian/")
+             (base32
+              "02abh69xl43p56fcciyan4j0z4mqq2j7ynwazq1nywhz37d6zn7y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lshort-russian")
+    (synopsis "Russian introduction to LaTeX")
+    (description "This package provides the Russian version of the @emph{Short
+Introduction to LaTeX2e}.")
+    (license license:gpl3+)))
+
 (define-public texlive-lshort-slovak
   (package
     (name "texlive-lshort-slovak")
@@ -6064,6 +20564,23 @@ Short Introduction to LaTeX2e}.")
 Introduction to LaTeX2e}.")
     (license license:gpl3+)))
 
+(define-public texlive-lshort-thai
+  (package
+    (name "texlive-lshort-thai")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lshort-thai/")
+             (base32
+              "16r9gx902a342q2mj570y269yw97yaj6hrbqrk4h49ihm695z30i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lshort-thai")
+    (synopsis "Introduction to LaTeX in Thai")
+    (description
+     "This is the Thai translation of the @emph{Short Introduction to LaTeX2e}.")
+    (license license:public-domain)))
+
 (define-public texlive-lshort-turkish
   (package
     (name "texlive-lshort-turkish")
@@ -6082,6 +20599,42 @@ Introduction to LaTeX2e}.")
 short introduction to LaTeX2e}.")
     (license license:public-domain)))
 
+(define-public texlive-lshort-ukr
+  (package
+    (name "texlive-lshort-ukr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lshort-ukr/")
+             (base32
+              "1nsah1h3z3sy96a9x0mfdwby7pvvjwq7zxfv2s8nvsbvnn1al17s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lshort-ukr")
+    (synopsis "Ukrainian version of the LaTeX introduction")
+    (description
+     "This package provides the Ukrainian version of the @emph{Short
+Introduction to LaTeX2e}.")
+    (license license:gpl2+)))
+
+(define-public texlive-lshort-vietnamese
+  (package
+    (name "texlive-lshort-vietnamese")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lshort-vietnamese/")
+             (base32
+              "094lfry6cqvpk02c3acss6581mgb7j30fnja1b3qwzxmyxjdblwa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lshort-vietnamese")
+    (synopsis "Vietnamese version of the LaTeX introduction")
+    (description
+     "This is the Vietnamese version of the @emph{Short Introduction to
+LaTeX2e}.")
+    (license license:lppl)))
+
 (define-public texlive-lstbayes
   (package
     (name "texlive-lstbayes")
@@ -6102,6 +20655,143 @@ short introduction to LaTeX2e}.")
 several languages not included in that package: BUGS, JAGS, and Stan.")
     (license license:lppl1.3+)))
 
+(define-public texlive-ltb2bib
+  (package
+    (name "texlive-ltb2bib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ltb2bib/" "source/latex/ltb2bib/"
+                   "tex/latex/ltb2bib/")
+             (base32
+              "1wrm89bynjm4g4a1zpx38v6yd2l3b1gh13h4m5hknvla2lydljfg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ltb2bib")
+    (synopsis "Converts @code{amsrefs} bibliographical databases to BibTeX
+format")
+    (description
+     "This package implements a LaTeX command that converts an @code{amsrefs}
+bibliographical database (@file{.ltb}) to a BibTeX bibliographical database
+(@file{.bib}).  @code{ltb2bib} is the reverse of the @samp{amsxport} option in
+@code{amsrefs}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ltxdockit
+  (package
+    (name "texlive-ltxdockit")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ltxdockit/"
+                   "tex/latex/ltxdockit/")
+             (base32
+              "0n1c8g8kaaazg7kahfkckh86s29bi1p3sw9h8v7hl5zgg6mb3415")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ltxdockit")
+    (synopsis "Documentation support")
+    (description
+     "This bundle, consisting of a simple wrapper class and some packages,
+forms a small LaTeX and BibTeX documentation kit; the author uses it for some
+of his own packages.")
+    (license license:lppl)))
+
+(define-public texlive-luabibentry
+  (package
+    (name "texlive-luabibentry")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luabibentry/"
+                   "source/lualatex/luabibentry/"
+                   "tex/lualatex/luabibentry/")
+             (base32
+              "00f6sxkzmfznjbisicacxd546v8zizm1fz36s05iiyra04cawnw4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luabibentry")
+    (synopsis "Repeat BibTeX entries in a LuaLaTeX document body")
+    (description
+     "The package reimplements @code{bibentry}, for use in LuaLaTeX.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-lxfonts
+  (package
+    (name "texlive-lxfonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/lxfonts/"
+                   "fonts/map/dvips/lxfonts/"
+                   "fonts/source/public/lxfonts/"
+                   "fonts/tfm/public/lxfonts/"
+                   "fonts/type1/public/lxfonts/"
+                   "source/fonts/lxfonts/"
+                   "tex/latex/lxfonts/")
+             (base32
+              "1n7bznkcc1ma2k977306rjg1mlpcspc46xg14abnc2d4k2970bfg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-ec texlive-metafont))
+    (home-page "https://ctan.org/pkg/lxfonts")
+    (synopsis "Set of slide fonts based on CM")
+    (description
+     "The bundle contains the traditional slides fonts revised to be
+completely usable both as text fonts and mathematics fonts; they are fully
+integrate with the new operators, letters, symbols and extensible delimiter
+fonts, as well as with the AMS fonts, all redone with the same stylistic
+parameters.")
+    (license license:lppl)))
+
+(define-public texlive-lyluatex
+  (package
+    (name "texlive-lyluatex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/lyluatex/" "scripts/lyluatex/"
+                   "tex/luatex/lyluatex/")
+             (base32
+              "04w57pki09mzhaxv3s1f2m0bj1df5aqxygqgrihvkabc5x00is87")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lyluatex")
+    (synopsis
+     "Commands to include LilyPond scores within a (Lua)LaTeX document")
+    (description
+     "This package provides macros for the inclusion of LilyPond scores within
+LuaLaTeX.  It calls LilyPond to compile scores, then includes the produced
+files.")
+    (license license:expat)))
+
+(define-public texlive-m-tx
+  (package
+    (name "texlive-m-tx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/m-tx/"
+                   "doc/man/man1/prepmx.1"
+                   "doc/man/man1/prepmx.man1.pdf"
+                   "scripts/m-tx/"
+                   "tex/generic/m-tx/"
+                   "tex/latex/m-tx/")
+             (base32
+              "1sakzv7r6mybx0k7k0fi1qb789nf7lvbl0ns8s0hhc9fz37b0br5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "m-tx.lua")))
+    (home-page "https://ctan.org/pkg/m-tx")
+    (synopsis "Preprocessor for @command{pmx}")
+    (description
+     "M-Tx is a preprocessor to @command{pmx}, which is itself a preprocessor
+to MusixTeX, a music typesetting system.  The prime motivation to the
+development of M-Tx was to provide lyrics for music to be typeset.  In fact,
+@command{pmx} now provides a lyrics interface, but M-Tx continues in use by
+those who prefer its language.")
+    (license license:expat)))
+
 (define-public texlive-macros2e
   (package
     (name "texlive-macros2e")
@@ -6143,6 +20833,102 @@ classes, @code{fiche} and @code{cours}, useful to create short high school
 documents such as tests or lessons.  The documentation is in French.")
     (license license:gpl3+)))
 
+(define-public texlive-magra
+  (package
+    (name "texlive-magra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/magra/"
+                   "fonts/enc/dvips/magra/"
+                   "fonts/map/dvips/magra/"
+                   "fonts/tfm/public/magra/"
+                   "fonts/type1/public/magra/"
+                   "fonts/vf/public/magra/"
+                   "tex/latex/magra/")
+             (base32
+              "0bbybiv6v05886qydj1c7l2ja520j15jgz6jz4g8qa58ycrls4kl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/magra")
+    (synopsis "Magra font face with support for LaTeX and pdfLaTeX")
+    (description
+     "This package provides the Magra family of fonts designed by FontFuror,
+with support for LaTeX and pdfLaTeX.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-mahjong
+  (package
+    (name "texlive-mahjong")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mahjong/" "source/latex/mahjong/"
+                   "tex/latex/mahjong/")
+             (base32
+              "1nkj6kri9dpk3gkms4raldzkj3dhsf54vggivb6nh169s7a16m7q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mahjong")
+    (synopsis "Typeset mahjong tiles using MPSZ Notation")
+    (description
+     "The @code{mahjong} package provides a LaTeX interface for typesetting
+mahjong tiles using an extended version of MPSZ algebraic notation.  Its
+features include spaces, rotated, blank, and concealed tiles, as well as red
+fives.  The size of the mahjong tiles can be controlled using a package option
+and an optional argument of @code{\\mahjong}.  It is primarily aimed at
+Riichi (aka Japanese) Mahjong but can be used to typeset any style of
+mahjong.")
+    (license (list license:expat license:cc-by4.0))))
+
+(define-public texlive-marcellus
+  (package
+    (name "texlive-marcellus")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/marcellus/"
+                   "fonts/enc/dvips/marcellus/"
+                   "fonts/map/dvips/marcellus/"
+                   "fonts/tfm/public/marcellus/"
+                   "fonts/truetype/public/marcellus/"
+                   "fonts/type1/public/marcellus/"
+                   "fonts/vf/public/marcellus/"
+                   "tex/latex/marcellus/")
+             (base32
+              "1nnc0v15sjwzivy504lvrrfyzjhha7p42nwp0qqy7pwspb7cqsm5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/marcellus")
+    (synopsis "Marcellus fonts with LaTeX support")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Marcellus family of fonts, designed by Brian J. Bonislawsky.  Marcellus is
+a flared-serif family, inspired by classic Roman inscription letterforms.
+There is currently just a regular weight and small-caps.  The regular weight
+will be silently substituted for bold.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-margbib
+  (package
+    (name "texlive-margbib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/margbib/" "source/latex/margbib/"
+                   "tex/latex/margbib/")
+             (base32
+              "04aa9nfdxc475nyj4cl8gkj2grn7v3rkb3hwhbhff5nr88nx4aqq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (home-page "https://ctan.org/pkg/margbib")
+    (synopsis "Display bibitem tags in the margins")
+    (description
+     "The package redefines the @code{thebibliography} environment to place
+the citation key into the margin.")
+    (license license:gpl3+)))
+
 (define-public texlive-matapli
   (package
     (name "texlive-matapli")
@@ -6161,6 +20947,47 @@ documents such as tests or lessons.  The documentation is in French.")
 Mathématiques Appliquées et Industrielles (SMAI).")
     (license license:lppl1.3c)))
 
+(define-public texlive-matc3
+  (package
+    (name "texlive-matc3")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/matc3/" "source/latex/matc3/"
+                   "tex/latex/matc3/")
+             (base32
+              "1rmrkdcda87pjl1lvyvzky0vdhghx0j6z1vdi9fdz2122f2drmpm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/matc3")
+    (synopsis "Commands for Matematica C3 textbooks")
+    (description
+     "The package provides support for the Matematica C3 project to produce
+mathematical textbooks for use in Italian high schools.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-matc3mem
+  (package
+    (name "texlive-matc3mem")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/matc3mem/"
+                   "source/latex/matc3mem/"
+                   "tex/latex/matc3mem/")
+             (base32
+              "10igcyqzddl25gxasa9dxj2j49gqs9vi2g1ay0z6jyd5nfsp8ic0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/matc3mem")
+    (synopsis "Class for MatematicaC3 textbooks")
+    (description
+     "The class is a development of @code{memoir}, with
+additions (specifically, mathematical extensions) that provide support for
+writing the books for the Matematica C3 project to produce mathematical
+textbooks for use in Italian high schools.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-math-into-latex-4
   (package
     (name "texlive-math-into-latex-4")
@@ -6179,6 +21006,99 @@ Mathématiques Appliquées et Industrielles (SMAI).")
 4th edition.")
     (license license:public-domain)))
 
+(define-public texlive-mathabx
+  (package
+    (name "texlive-mathabx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/mathabx/"
+                   "fonts/source/public/mathabx/"
+                   "fonts/tfm/public/mathabx/"
+                   "tex/generic/mathabx/")
+             (base32
+              "0kj95jl89wh43b9mfqp05hpa5jqyxca7hp9pfk21js2dhysr7x18")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/mathabx")
+    (synopsis "Three series of mathematical symbols")
+    (description
+     "Mathabx is a set of three mathematical symbols font series.
+They are defined by Metafont code.  The package includes Plain TeX and LaTeX
+support macros.  A version of the fonts, in Adobe Type 1 format, is also
+available.")
+    (license license:lppl)))
+
+(define-public texlive-mathabx-type1
+  (package
+    (name "texlive-mathabx-type1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/mathabx-type1/"
+                   "fonts/map/dvips/mathabx-type1/"
+                   "fonts/type1/public/mathabx-type1/")
+             (base32
+              "1j9aiwxq512bnwjvah06rygd8m6b68dpfkynagad627sfyrblcaa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-mathabx))
+    (home-page "https://ctan.org/pkg/mathabx-type1")
+    (synopsis "Outline version of the @code{mathabx} fonts")
+    (description
+     "This is an Adobe Type 1 outline version of the @code{mathabx} fonts.")
+    (license license:lppl)))
+
+(define-public texlive-mathalpha
+  (package
+    (name "texlive-mathalpha")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mathalpha/"
+                   "tex/latex/mathalpha/")
+             (base32
+              "19wniyaba8cz4vk279ashg68bxq9178cvvz53cng2cn6i6rw32rv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mathalpha")
+    (synopsis "General package for loading maths alphabets in LaTeX")
+    (description
+     "Package @code{mathalfa} was renamed to @code{mathalpha}.  For backward
+compatibility the old name will continue to be recognized in LaTeX documents.
+The package provides means of loading maths alphabets (such as are normally
+addressed via macros @code{\\mathcal}, @code{\\mathbb}, @code{\\mathfrak} and
+@code{\\mathscr}).")
+    (license license:lppl1.3c)))
+
+(define-public texlive-mathastext
+  (package
+    (name "texlive-mathastext")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mathastext/"
+                   "source/latex/mathastext/"
+                   "tex/latex/mathastext/")
+             (base32
+              "1660w9yhgw9ihhy06f9zqgw9isvprrs2x9yikhbz7szphq3cfpfv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mathastext")
+    (synopsis "Use the text font in maths mode")
+    (description
+     "The package uses a text font (usually the document's text font) for the
+letters of the Latin alphabet needed when typesetting
+mathematics. (Optionally, other characters in the font may also be used).
+This facility makes possible (for a document with simple mathematics) a far
+wider choice of text font, with little worry that no specially designed
+accompanying maths fonts are available.  The package also offers a simple
+mechanism for using many different choices of (text hence, now, maths) font in
+the same document.  Of course, using one font for two purposes helps produce
+smaller PDF files.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-mathcommand
   (package
     (name "texlive-mathcommand")
@@ -6415,6 +21335,98 @@ representation of common vectors and tensors such as forces, velocities,
 moments of inertia, etc.")
     (license license:lppl1.3c)))
 
+(define-public texlive-maze
+  (package
+    (name "texlive-maze")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/maze/" "tex/latex/maze/")
+             (base32
+              "0dwsv62rpyll1cfh1qpz6msmypc1a61b1pb0a7lm89ks1cj42zmg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/maze")
+    (synopsis "Generate random mazes")
+    (description
+     "This package can generate random square mazes of a specified size.
+The mazes generated by this package are natural and their solution is not too
+obvious.  The output it based on the @code{picture} environment.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-mcmthesis
+  (package
+    (name "texlive-mcmthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mcmthesis/"
+                   "source/latex/mcmthesis/"
+                   "tex/latex/mcmthesis/")
+             (base32
+              "1hz4c2mjfk3169phgy39m2y15k7jybfd4k36f26m17k6c490qpfc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mcmthesis")
+    (synopsis "Template designed for MCM and ICM")
+    (description
+     "The package offers a template for @acronym{MCM, The Mathematical Contest
+in Modeling} and @acronym{ICM, The Interdisciplinary Contest in Modeling} for
+typesetting the submitted paper.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-mdputu
+  (package
+    (name "texlive-mdputu")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mdputu/"
+                   "fonts/tfm/public/mdputu/"
+                   "fonts/vf/public/mdputu/"
+                   "tex/latex/mdputu/")
+             (base32
+              "01baplnisdakypsrzcvz1hibqw2gq70hyk2dwgljhwcb14rcxylw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mdputu")
+    (synopsis "Upright digits in Adobe Utopia Italic")
+    (description
+     "The @emph{Annals of Mathematics} uses italics for theorems.  However,
+slanted digits and parentheses look disturbing when surrounded by (upright)
+mathematics.  This package provides virtual fonts with italics and upright
+digits and punctuation, as an extension to Mathdesign's Utopia bundle.")
+    (license license:bsd-3)))
+
+(define-public texlive-mdsymbol
+  (package
+    (name "texlive-mdsymbol")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/mdsymbol/"
+                   "doc/latex/mdsymbol/"
+                   "fonts/enc/dvips/mdsymbol/"
+                   "fonts/map/dvips/mdsymbol/"
+                   "fonts/opentype/public/mdsymbol/"
+                   "fonts/source/public/mdsymbol/"
+                   "fonts/tfm/public/mdsymbol/"
+                   "fonts/type1/public/mdsymbol/"
+                   "source/latex/mdsymbol/"
+                   "tex/latex/mdsymbol/")
+             (base32
+              "1ssvyqyh3k8q2snj8wk0xdbxgnafacsyj4iyh14hrxybknxxqh22")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/mdsymbol")
+    (synopsis "Symbol fonts to match Adobe Myriad Pro")
+    (description
+     "The package provides a font of mathematical symbols, MyriadPro.  The
+font is designed as a companion to Adobe Myriad Pro, but it might also fit
+well with other contemporary typefaces.")
+    (license license:silofl1.1)))
+
 (define-public texlive-mecaso
   (package
     (name "texlive-mecaso")
@@ -6516,6 +21528,75 @@ styles that ease the declaration of memory graphs.  It is intended for graphs
 that represent the memory of a computer program during its execution.")
     (license license:lppl1.3+)))
 
+(define-public texlive-mendex-doc
+  (package
+    (name "texlive-mendex-doc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/mendex-doc/"
+                   "makeindex/mendex-doc/"
+                   "source/latex/mendex-doc/")
+             (base32
+              "096b1v9zzl3qm189paaxz16z4a1xgcj7l2bhdgvl2wqshsz9lx4p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mendex-doc")
+    (synopsis "Documentation for Mendex index processor")
+    (description
+     "This package provides documentation for Mendex (Japanese index
+processor).")
+    (license license:bsd-3)))
+
+(define-public texlive-mentis
+  (package
+    (name "texlive-mentis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mentis/" "source/latex/mentis/"
+                   "tex/latex/mentis/")
+             (base32
+              "0js6gp93jzj6kzvwqycilp42zbwslxk6z77g2198gip2i4m1li0i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mentis")
+    (synopsis "Basis for books to be published by Mentis publishers")
+    (description
+     "This LaTeX class loads @code{scrbook} and provides changes necessary for
+publishing at Mentis publishers in Paderborn, Germany.  It is not an official
+Mentis class, but developed in close co-operation with Mentis.")
+    (license license:lppl)))
+
+(define-public texlive-merriweather
+  (package
+    (name "texlive-merriweather")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/merriweather/"
+                   "fonts/enc/dvips/merriweather/"
+                   "fonts/map/dvips/merriweather/"
+                   "fonts/opentype/sorkin/merriweather/"
+                   "fonts/tfm/sorkin/merriweather/"
+                   "fonts/type1/sorkin/merriweather/"
+                   "fonts/vf/sorkin/merriweather/"
+                   "tex/latex/merriweather/")
+             (base32
+              "1dgjw3ld1srv2irnhn6b592y9q9917y6w1x1kcqb4a7dv8s7wpzj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/merriweather")
+    (synopsis "Merriweather and MerriweatherSans fonts, with LaTeX support")
+    (description
+     "This package provides the Merriweather and MerriweatherSans families of
+fonts, designed by Eben Sorkin, with support for LaTeX, pdfLaTeX, XeLaTeX, and
+LuaLaTeX.  Merriweather features a very large x-height, slightly condensed
+letterforms, a mild diagonal stress, sturdy serifs and open forms.  The Sans
+family closely harmonizes with the weights and styles of the serif family.
+There are four weights and italics for each.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-messagepassing
   (package
     (name "texlive-messagepassing")
@@ -6579,6 +21660,26 @@ ranging from very simple (lines and circles) to rather intricate (uncommon
 geometric transformations, fractals, bitmap, etc).")
     (license license:gpl1+)))
 
+(define-public texlive-metrix
+  (package
+    (name "texlive-metrix")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/metrix/" "source/latex/metrix/"
+                   "tex/latex/metrix/")
+             (base32
+              "185w7pgil8zix0czvd69l5pv6pcjc0n4nfbllm5v5mzr31sc0k5j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/metrix")
+    (synopsis "Typeset metric marks for Latin text")
+    (description
+     "The package may be used to type the prosodics/metrics of (Latin) verse;
+it provides macros to typeset the symbols standing alone, and in combination
+with symbols, giving automatic alignment.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-mex
   (package
     (name "texlive-mex")
@@ -6690,6 +21791,32 @@ equation number if and only if the equation actually has a label, which
 reduces visual clutter.")
     (license license:public-domain)))
 
+(define-public texlive-miama
+  (package
+    (name "texlive-miama")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/miama/"
+                   "fonts/afm/public/miama/"
+                   "fonts/enc/dvips/miama/"
+                   "fonts/map/dvips/miama/"
+                   "fonts/opentype/public/miama/"
+                   "fonts/tfm/public/miama/"
+                   "fonts/type1/public/miama/"
+                   "source/fonts/miama/"
+                   "tex/latex/miama/")
+             (base32
+              "07a2i250himdjnphq39kq08ycl7mgi9v1w3cnsg1q2c7qwwizrkw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/miama")
+    (synopsis "Miama Nueva handwriting font with LaTeX support")
+    (description
+     "Miama Nueva is a handwriting and script font with over 1300 glyphs that
+supports Latin, Cyrillic, and Greek.  It comes complete with LaTeX support.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
 (define-public texlive-miller
   (package
     (name "texlive-miller")
@@ -6710,6 +21837,58 @@ with an easy syntax.  Minus signs are printed as bar above the corresponding
 number.")
     (license license:lppl)))
 
+(define-public texlive-minimalist
+  (package
+    (name "texlive-minimalist")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/minimalist/"
+                   "tex/latex/minimalist/")
+             (base32
+              "01j72iqf15jx3larxkmcvsviw1z9wba9vl5g0x6d1ch3jpg32xpg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-projlib))
+    (home-page "https://ctan.org/pkg/minimalist")
+    (synopsis "Write your articles or books in a simple and clear way")
+    (description
+     "This package offers you a LaTeX style file and two classes to typeset
+articles or books in a simple and clear way.  These classes currently have
+native support for English, French, German, Italian, Portuguese (European and
+Brazilian), and Spanish typesetting.  They compile with any major TeX engine.
+You may also wish to consider the packages @code{einfart} and
+@code{simplivre}, which are enhanced versions of the classes provided here.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-mintspirit
+  (package
+    (name "texlive-mintspirit")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/mintspirit/"
+                   "fonts/enc/dvips/mintspirit/"
+                   "fonts/map/dvips/mintspirit/"
+                   "fonts/opentype/arkandis/mintspirit/"
+                   "fonts/tfm/arkandis/mintspirit/"
+                   "fonts/type1/arkandis/mintspirit/"
+                   "fonts/vf/arkandis/mintspirit/"
+                   "tex/latex/mintspirit/")
+             (base32
+              "0rh8xjrxm996k2qkd42r27fz8ir8cg8bpy1fgbdbbjyd3a6xpic3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mintspirit")
+    (synopsis "LaTeX support for MintSpirit font families")
+    (description
+     "The package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the MintSpirit and MintSpiritNo2 families of fonts, designed by Hirwen
+Harendal.  MintSpirit was originally designed for use as a system font on
+a Linux Mint system.  The No.@: 2 variant provides more conventional shapes
+for some glyphs.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-mismath
   (package
     (name "texlive-mismath")
@@ -6733,6 +21912,415 @@ systems of equations and small matrices, @code{displaymath} in double columns
 for long calculations.")
     (license license:lppl1.3+)))
 
+(define-public texlive-missaali
+  (package
+    (name "texlive-missaali")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/missaali/"
+                   "fonts/opentype/public/missaali/"
+                   "tex/latex/missaali/")
+             (base32
+              "1wa6knx1s82q86rl2icd9nqlh5ppa3636f28ns6g1l5fag6wd283")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/missaali")
+    (synopsis "Late medieval OpenType Textura font")
+    (description
+     "This package contains the OpenType Textura font Missaali and a style
+file for using it with XeLaTeX.  Textura is a typeface based on the
+@emph{textus quadratus} form of the @emph{textualis formata} that late
+medieval scribes used for the most valuable manuscripts.  The font Missaali is
+based on Textura that German printer Bartholomew Ghotan used for printing
+missals and psalters in the 1480s.
+
+This font has two intended use cases: as a Gothic display font; and for
+emulating late-medieval manuscripts.  In addition to the basic Textura
+letters, the font contains a large number of abbreviation sigla as well as
+a set of Lombardic initials.  As modern typesetting algorithms are not
+intended for creating 15th century style layout, the package contains
+a XeLaTeX style file that makes it easier to achieve the classic incunabula
+look.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
+(define-public texlive-mlacls
+  (package
+    (name "texlive-mlacls")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mlacls/" "source/latex/mlacls/"
+                   "tex/latex/mlacls/")
+             (base32
+              "1g6kqsrvcvf8xmygb7rh18a1amqc83fp7fghvd17klsaslal83cd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mlacls")
+    (synopsis "LaTeX class for MLA papers")
+    (description
+     "In the United States, secondary and undergraduate students are generally
+expected to adhere to the format prescribed by the @acronym{MLA, Modern
+Language Association} for typewritten essays, research papers and writings.
+This package provides a simple, straightforward LaTeX class for composing
+papers almost perfectly adherent to the MLA style guide.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-mlmodern
+  (package
+    (name "texlive-mlmodern")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/mlmodern/"
+                   "fonts/map/dvips/mlmodern/"
+                   "fonts/tfm/public/mlmodern/"
+                   "fonts/type1/public/mlmodern/"
+                   "tex/latex/mlmodern/")
+             (base32
+              "0cw802x67yqh6zlkf89pdjlx0r5lmwdca5vcqxmv24c5gx2bc666")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mlmodern")
+    (synopsis
+     "Blacker Type 1 version of Computer Modern, with multilingual support")
+    (description
+     "MLModern is a text and math font family with (La)TeX support, based on
+the design of Donald Knuth's Computer Modern and the Latin Modern project.  It
+avoids the spindliness of most other Type 1 versions of Computer Modern.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-mltex
+  (package
+    (name "texlive-mltex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mltex/" "tex/latex/mltex/"
+                   "tex/mltex/config/")
+             (base32
+              "1ip0q5kqj6bg4jkginzljknbrd74ss4iky2gvlmf8nnrq06n89my")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:create-formats #~(list "mllatex" "mltex")))
+    (propagated-inputs
+     (list texlive-atbegshi
+           texlive-atveryend
+           texlive-babel
+           texlive-cm
+           texlive-everyshi
+           texlive-firstaid
+           texlive-hyphen-complete
+           texlive-knuth-lib
+           texlive-l3backend
+           texlive-l3kernel
+           texlive-l3packages
+           texlive-latex
+           texlive-latex-fonts
+           texlive-latexconfig
+           texlive-plain
+           texlive-tex-ini-files
+           texlive-unicode-data))
+    (home-page "https://ctan.org/pkg/mltex")
+    (synopsis "The MLTeX system")
+    (description
+     "MLTeX is a modification of TeX that allows the hyphenation of words with
+accented letters using ordinary Computer Modern (CM) fonts.  The system is
+distributed as a TeX change file.")
+    (license license:knuth)))
+
+(define-public texlive-mluexercise
+  (package
+    (name "texlive-mluexercise")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mluexercise/"
+                   "source/latex/mluexercise/"
+                   "tex/latex/mluexercise/")
+             (base32
+              "1zvnz3rm9dq8h00hlbzll5cvw4zlcy8xr8l6cfjg0winfnyznky8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:build-targets #~(list "mluexercice.dtx")))
+    (home-page "https://ctan.org/pkg/mluexercise")
+    (synopsis
+     "Exercises and homework at the Martin Luther University Halle-Wittenberg")
+    (description
+     "This package provides a template class for solving weekly exercises at
+the Institute for Computer Science of Martin Luther University
+Halle-Wittenberg.  The class can be used by all students --- especially first
+semesters --- to typeset their exercises with low effort in beautiful LaTeX.
+A bunch of handy macros are included that are used throughout many lectures
+during the bachelor's degree program.")
+    (license license:expat)))
+
+(define-public texlive-mnras
+  (package
+    (name "texlive-mnras")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/mnras/" "doc/latex/mnras/"
+                   "tex/latex/mnras/")
+             (base32
+              "1lw2y3vbg8ndvhy5p00blbfwp3bzw40kkrwzs289kphjq249bwnb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mnras")
+    (synopsis "Monthly Notices of the Royal Astronomical Society")
+    (description
+     "This package is used for preparing papers in the journal @emph{Monthly
+Notices of the Royal Astronomical Society}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-mnsymbol
+  (package
+    (name "texlive-mnsymbol")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mnsymbol/"
+                   "fonts/enc/dvips/mnsymbol/"
+                   "fonts/map/dvips/mnsymbol/"
+                   "fonts/map/vtex/mnsymbol/"
+                   "fonts/opentype/public/mnsymbol/"
+                   "fonts/source/public/mnsymbol/"
+                   "fonts/tfm/public/mnsymbol/"
+                   "fonts/type1/public/mnsymbol/"
+                   "source/latex/mnsymbol/"
+                   "tex/latex/mnsymbol/")
+             (base32
+              "164zspl0wcpmba9j0kl6wy8k46xaafjvwjp0dn82dzh73r85jdk2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/mnsymbol")
+    (synopsis "Mathematical symbol font for Adobe MinionPro")
+    (description
+     "MnSymbol is a symbol font family, designed to be used in conjunction
+with Adobe Minion Pro (via the MinionPro package).  Almost all of LaTeX and
+AMS mathematical symbols are provided; remaining coverage is available from
+the MinionPro font with the MinionPro package.  The fonts are available both
+as Metafont source and as Adobe Type 1 format, and a comprehensive support
+package is provided.")
+    (license license:public-domain)))
+
+(define-public texlive-modeles-factures-belges-assocs
+  (package
+    (name "texlive-modeles-factures-belges-assocs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/modeles-factures-belges-assocs/"
+                   "tex/latex/modeles-factures-belges-assocs/")
+             (base32
+              "1rj4r3qa5khgc54f1gz73zywrh61rdw76hlrk9jb6b08gz56wzdz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/modeles-factures-belges-assocs")
+    (synopsis "Generate invoices for Belgian non-profit organizations")
+    (description
+     "This package provides templates and a @file{.sty} file for generating
+invoices for Belgian non-profit organizations.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-montserrat
+  (package
+    (name "texlive-montserrat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/montserrat/"
+                   "fonts/enc/dvips/montserrat/"
+                   "fonts/map/dvips/montserrat/"
+                   "fonts/opentype/public/montserrat/"
+                   "fonts/tfm/public/montserrat/"
+                   "fonts/type1/public/montserrat/"
+                   "fonts/vf/public/montserrat/"
+                   "tex/latex/montserrat/")
+             (base32
+              "08aaypw8l30sb0rvv2s9jcw15k3909xam98z2c6vj2x5jyi9wzn7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/montserrat")
+    (synopsis "Montserrat sans serif, with LaTeX support files")
+    (description
+     "Montserrat is a geometric sans-serif typeface designed by Julieta
+Ulanovsky.  It is rather close in spirit to Gotham and Proxima Nova, but has
+its own individual appearance --- more informal, less extended, and more
+idiosyncratic.  It is provided in a total of nine different weights, each
+having eight figure styles and small caps in both upright and italic shapes.
+There are two quite different versions that don't fit into the usual LaTeX
+classifications.  The version having the appellation Alternates has letter
+shapes that are much more rounded than the default version, reflecting the
+signage in the neighborhood of Montserrat.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
+(define-public texlive-mparhack
+  (package
+    (name "texlive-mparhack")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mparhack/"
+                   "source/latex/mparhack/"
+                   "tex/latex/mparhack/")
+             (base32
+              "1ajlpri5bi62k9wsmic3j2xjkz1wzjc3n4fr04c5d667jsibpfmg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mparhack")
+    (synopsis "Work around a LaTeX bug in marginpars")
+    (description
+     "This package works around the LaTeX bug that marginpars will sometimes
+come out at the wrong margin.")
+    (license license:gpl2+)))
+
+(define-public texlive-mpfonts
+  (package
+    (name "texlive-mpfonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/mpfonts/"
+                   "fonts/map/dvips/mpfonts/"
+                   "fonts/type3/mpfonts/")
+             (base32
+              "1z6pdjwi14fq6y1s39gxyqlpg6p5j09psjv1cyp7xjwjffdikgaf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mpfonts")
+    (synopsis "Computer Modern Type 3 fonts converted using MetaPost")
+    (description
+     "The Computer Modern fonts are available in Type 1 format, but these
+renditions are somewhat thin and spindly, and produce much lighter results
+than the originals.  These fonts are conversions to Type 3 fonts, done
+entirely in MetaPost; they are vector fonts which are a direct conversion from
+the original Metafont files, so they are the design most authentic to the
+originals.  However, these fonts, because they are PostScript Type 3 fonts,
+are not suitable for on-screen reading, and should probably only be used for
+printing.")
+    (license (list license:knuth
+                   license:lppl1.2+
+                   license:silofl1.1
+                   license:public-domain))))
+
+(define-public texlive-mucproc
+  (package
+    (name "texlive-mucproc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mucproc/" "source/latex/mucproc/"
+                   "tex/latex/mucproc/")
+             (base32
+              "0l6xycas6asggpd4hd1b7x5x867nsx8aw2fkdd1ib8g98i5a8vhk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mucproc")
+    (synopsis "Conference proceedings for the German MuC-conference")
+    (description
+     "The @file{mucproc.cls} is a document class to support the formatting
+guidelines for submissions to the German Mensch und Computer conference.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-mugsthesis
+  (package
+    (name "texlive-mugsthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mugsthesis/"
+                   "source/latex/mugsthesis/"
+                   "tex/latex/mugsthesis/")
+             (base32
+              "0xf3zjwx6k2dg1hrz4nw6shn6xk3lvmjprg3psfrh3z38r1sp9nh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mugsthesis")
+    (synopsis
+     "Thesis class complying with Marquette University Graduate School
+requirements")
+    (description
+     "The bundle offers a thesis class, based on @code{memoir}, that complies
+with Marquette University Graduate School requirements.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-muling
+  (package
+    (name "texlive-muling")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/muling/" "source/latex/muling/"
+                   "tex/latex/muling/")
+             (base32
+              "0i4yvi1b12x8k2i2hi284b4zxwpxrzkfyqvw45m5f27qsr33h61x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/muling")
+    (synopsis
+     "MA thesis class for the Department of Linguistics, University of
+Mumbai")
+    (description
+     "This is a class file for writing MA thesis as required by the
+Department of Linguistics at the University of Mumbai.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-multibib
+  (package
+    (name "texlive-multibib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/multibib/" "doc/latex/multibib/"
+                   "makeindex/multibib/"
+                   "source/latex/multibib/"
+                   "tex/latex/multibib/")
+             (base32
+              "1m16vi9fj2yc49a6iqcccd7yay26i8zpyzzsgxywlrp4ijrx4hqc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/multibib")
+    (synopsis "Multiple bibliographies within one document")
+    (description
+     "The package the creation of references to multiple bibliographies within
+one document.  It thus provides complementary functionality to packages like
+@code{bibunits} and @code{chapterbib}, which allow the creation of one
+bibliography for multiple, but different parts of the document.  Multibib is
+compatible with @code{inlinebib}, @code{natbib}, and @code{koma-script}.")
+    (license license:lppl)))
+
+(define-public texlive-multibibliography
+  (package
+    (name "texlive-multibibliography")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/multibibliography/"
+                   "doc/latex/multibibliography/"
+                   "scripts/multibibliography/"
+                   "source/latex/multibibliography/"
+                   "tex/latex/multibibliography/")
+             (base32
+              "10281fv7xfqmdc08pyk9l9280crklsfqwf5cwd5ysbhdz1r0grcm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "multibibliography.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/multibibliography")
+    (synopsis
+     "Multiple versions of a bibliography, with different sort orders")
+    (description
+     "Conventional standards for bibliography styles impose a forced choice
+between index and name/year citations, and corresponding references.  The
+package avoids this choice, by providing alphabetic, sequenced, and even
+chronological orderings of references.  Inline citations, that integrate these
+heterogeneous styles, are also supported (and work with other bibliography
+packages).")
+    (license license:lppl1.3+)))
+
 (define-public texlive-multiobjective
   (package
     (name "texlive-multiobjective")
@@ -6754,6 +22342,297 @@ related to multiobjective optimisation, multiobjective evolutionary
 algorithms, multicriteria decision making and similar fields.")
     (license license:lppl)))
 
+(define-public texlive-munich
+  (package
+    (name "texlive-munich")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/munich/" "doc/latex/munich/")
+             (base32
+              "1w464hiivzccfk0i4hz60x3q14h38y2yzycldckx144q0z6i4c5r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/munich")
+    (synopsis "Alternative author-date bibliography style")
+    (description
+     "The Munich BibTeX style is produced with @code{custom-bib}, as a German
+(and, more generally, Continental European) alternative to such author-date
+styles as @code{harvard} and @code{oxford}.")
+    (license license:lppl)))
+
+(define-public texlive-musical
+  (package
+    (name "texlive-musical")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/musical/" "tex/latex/musical/")
+             (base32
+              "0qdrd622vs5dkr5w6pvf04hvni1jqcgxfvhf0ak7gjaxjczisb9h")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/musical")
+    (synopsis "Typeset (musical) theatre scripts")
+    (description
+     "This package is designed to simplify the development and distribution of
+scripts for theatrical musicals, especially ones under development.  The
+output is formatted to follow generally accepted script style while also
+maintaining a high level of typographic integrity, and includes commands for
+dialog, lyrics, stage directions, music and dance cues, rehearsal marks, and
+more.  It gracefully handles dialog that crosses page breaks, and can generate
+lists of songs and lists of dances in the show.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-musicography
+  (package
+    (name "texlive-musicography")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/musicography/"
+                   "tex/latex/musicography/")
+             (base32
+              "07z5yg0ganmmp3qx5v55ll82sf45x6mhjl59abc5xckkfrgixpxn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/musicography")
+    (synopsis "Accessing symbols for music writing with pdfLaTeX")
+    (description
+     "This package makes available the most commonly used symbols in writing
+about music in a way that can be used with pdfLaTeX and looks consistent and
+attractive.  It includes accidentals, meters, and notes of different rhythmic
+values.  The package builds on the approach used in the @code{harmony}
+package, where the symbols are taken from the MusiXTeX fonts.  But it provides
+a larger range of symbols and a more flexible, user-friendly interface.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-musikui
+  (package
+    (name "texlive-musikui")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/musikui/" "tex/latex/musikui/")
+             (base32
+              "1r5ygiavq51sj0l2jcn8jzc1jafach05a3pz2xvzxmxsxdjgzf02")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/musikui")
+    (synopsis "Easy creation of ``arithmetical restoration'' puzzles")
+    (description
+     "This package permits to easily typeset arithmetical restorations using
+LaTeX.")
+    (license license:lppl)))
+
+(define-public texlive-musixguit
+  (package
+    (name "texlive-musixguit")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/musixguit/"
+                   "tex/latex/musixguit/")
+             (base32
+              "1ck8li0wdn22x0g4f57c9r57ans4rj7ggrm3rsp7xnqgc78as065")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/musixguit")
+    (synopsis "Easy notation for guitar music, in MusixTeX")
+    (description
+     "The package provides commands for typesetting notes for guitar,
+especially for simplifying guitar notation with MusixTeX.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-musixtex
+  (package
+    (name "texlive-musixtex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/musixtex/"
+                   "doc/man/man1/musixflx.1"
+                   "doc/man/man1/musixflx.man1.pdf"
+                   "doc/man/man1/musixtex.1"
+                   "doc/man/man1/musixtex.man1.pdf"
+                   "dvips/musixtex/"
+                   "scripts/musixtex/"
+                   "source/generic/musixtex/musixcrd/"
+                   "tex/generic/musixtex/"
+                   "tex/latex/musixtex/")
+             (base32
+              "1j46cf3v3jmhww47xvm4grnb495aggf1vnmb2sq3zbk9pfmrvd4x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:build-targets #~(list "strip.tex")
+           #:link-scripts #~(list "musixflx.lua" "musixtex.lua")))
+    (home-page "https://ctan.org/pkg/musixtex")
+    (synopsis "Sophisticated music typesetting")
+    (description
+     "MusiXTeX provides a set of macros, based on the earlier MusicTeX,
+for typesetting music with TeX.  To produce optimal spacing, MusiXTeX
+is a three-pass system: @command{etex}, @command{musixflx}, and
+@command{etex} again.  (Musixflx is a Lua script that is provided in
+the bundle.) The three-pass process, optionally followed by processing
+for printed output, is automated by the @command{musixtex} wrapper
+script.
+
+The package uses its own specialised fonts, which must be available on the
+system for @command{musixtex} to run.  The MusiXTeX macros are universally
+acknowledged to be challenging to use directly: the @command{pmx} preprocessor
+compiles a simpler input language to MusiXTeX macros.")
+    (license license:gpl2+)))
+
+(define-public texlive-musixtex-fonts
+  (package
+    (name "texlive-musixtex-fonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/musixtex-fonts/"
+                   "fonts/map/dvips/musixtex-fonts/"
+                   "fonts/opentype/public/musixtex-fonts/"
+                   "fonts/source/public/musixtex-fonts/"
+                   "fonts/tfm/public/musixtex-fonts/"
+                   "fonts/type1/public/musixtex-fonts/")
+             (base32
+              "0ychs959d1yvxkhwayf73iwvl4qg0a6v5fk7lnw8w3hk8n7zvp86")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/musixtex-fonts")
+    (synopsis "Fonts used by MusixTeX")
+    (description
+     "These are fonts for use with MusixTeX; they are provided both as
+original Metafont source, and as converted Adobe Type 1.  The bundle renders
+the older (Type 1 fonts only) bundle @code{musixtex-t1fonts} obsolete.")
+    (license license:gpl3+)))
+
+(define-public texlive-musixtnt
+  (package
+    (name "texlive-musixtnt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/musixtnt/"
+                   "doc/man/man1/msxlint.1"
+                   "doc/man/man1/msxlint.man1.pdf"
+                   "tex/generic/musixtnt/")
+             (base32
+              "0z1rfscla1hiibd0gs3lgf8x5yx19pmwdsbzvx2vvz0ikwgjglm9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:tests? #true
+      #:modules '((guix build texlive-build-system)
+                  ((guix build gnu-build-system) #:prefix gnu:)
+                  (guix build utils)
+                  (srfi srfi-1))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'unpack-musixtnt-source
+            (lambda _
+              (mkdir-p "build")
+              (with-directory-excursion "build"
+                (invoke "tar" "xvf"
+                        ;; Tarball includes a release date that we ignore.
+                        (first (find-files ".." "^musixtnt-.*\\.tar.gz"))
+                        "--strip-components=1"))))
+          (add-after 'unpack-prerex-source 'build-msxlint
+            (lambda args
+              (with-directory-excursion "build"
+                (for-each (lambda (phase)
+                            (apply (assoc-ref gnu:%standard-phases phase) args))
+                          '(configure
+                            build
+                            check
+                            install
+                            compress-documentation))))))))
+    (propagated-inputs (list texlive-musixtex))
+    (home-page "https://ctan.org/pkg/musixtnt")
+    (synopsis
+     "MusiXTeX extension library enabling transformations of the effect of
+notes commands")
+    (description
+     "This archive contains a MusiXTeX extension library @file{musixtnt.tex}
+and a program, @command{msxlint}.
+
+@file{musixtnt.tex} provides a macro @code{\\TransformNotes} that enables
+transformations of the effect of notes commands such as @code{\\notes}.  In
+general, the effect of @code{\\TransformNotes@{input@}@{output@}} is that
+notes commands in the source will expect their arguments to match the input
+pattern, but the notes will be typeset according to the output pattern.  An
+example is extracting single-instrument parts from a multi-instrument score.
+
+@command{msxlint} detects incorrectly formatted notes lines in a MusiXTeX
+source file.  This should be used before using @code{\\TransformNotes}.")
+    (license license:gpl2)))
+
+(define-public texlive-musuos
+  (package
+    (name "texlive-musuos")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/musuos/" "source/latex/musuos/"
+                   "tex/latex/musuos/")
+             (base32
+              "1a7cyjfgch6fvwdv2wi78sx2fdgmjbpb85gp2clhvgf15nkw0h94")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/musuos")
+    (synopsis "Typeset papers for the department of music, Osnabruck")
+    (description
+     "The package provides a LaTeX class for typesetting term papers at the
+institute of music and musicology of the University of Osnabruck, Germany,
+according to the specifications of Prof.@: Stefan Hahnheide.  A BibLaTeX style
+is provided.")
+    (license license:lppl)))
+
+(define-public texlive-muthesis
+  (package
+    (name "texlive-muthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/muthesis/" "tex/latex/muthesis/")
+             (base32
+              "1yydkhxpa9c5w8bpdx09w3mjggff0q2zsq8gkkbjjg29mg5x559j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/muthesis")
+    (synopsis "Classes for University of Manchester Dept.@: of Computer
+Science")
+    (description
+     "The bundle provides thesis and project report document classes from the
+University of Manchester's Department of Computer Science.")
+    (license license:lppl)))
+
+(define-public texlive-msu-thesis
+  (package
+    (name "texlive-msu-thesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/msu-thesis/"
+                   "tex/latex/msu-thesis/")
+             (base32
+              "0fsnrq8fvy8wgqfj5ccyw582142vd2haqlmgaxilvp7pybg9m100")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/msu-thesis")
+    (synopsis "Class for Michigan State University Master's and PhD theses")
+    (description
+     "This is a class file for producing dissertations and theses according to
+the Michigan State University Graduate School Guidelines for Electronic
+Submission of master's theses and dissertations.  The class should meet all
+current requirements and is updated whenever the university guidelines change.
+The class is based on the @code{memoir} document class, and inherits the
+functionality of that class.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-mwcls
   (package
     (name "texlive-mwcls")
@@ -6782,6 +22661,79 @@ with long items, page styles have variants for normal, opening, closing, and
 blank pages.")
     (license license:lppl1.2+)))
 
+(define-public texlive-mxedruli
+  (package
+    (name "texlive-mxedruli")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/mxedruli/"
+                   "fonts/afm/public/mxedruli/"
+                   "fonts/map/dvips/mxedruli/"
+                   "fonts/source/public/mxedruli/"
+                   "fonts/tfm/public/mxedruli/"
+                   "fonts/type1/public/mxedruli/"
+                   "tex/latex/mxedruli/")
+             (base32
+              "070lfw12mfimcwhkgb1hh092p8npmhpmba28rzzwfl1kmsmk99q5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/mxedruli")
+    (synopsis "Pair of fonts for different Georgian alphabets")
+    (description
+     "This package provides two Georgian fonts, in both Metafont and Type
+1 formats, which cover the Mxedruli and the Xucuri alphabets.")
+    (license license:lppl)))
+
+(define-public texlive-mynsfc
+  (package
+    (name "texlive-mynsfc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/mynsfc/"
+                   "source/xelatex/mynsfc/"
+                   "tex/xelatex/mynsfc/")
+             (base32
+              "15vbgqmqsjqz068gn5ql5ca3wbw7gdq1vnaazpwmc71jdybxxv14")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               ;; "mynsfc.ins" writes files to "./examples".  Create this
+               ;; directory first to prevent an error.
+               (add-before 'build 'prepare-build
+                 (lambda _ (mkdir-p "build/examples"))))))
+    (home-page "https://ctan.org/pkg/mynsfc")
+    (synopsis "XeLaTeX template for writing the main body of NSFC proposals")
+    (description
+     "The package provides a XeLaTeX template for writing the main body of
+@acronym{NSFC, National Natural Science Foundation of China} proposals, which
+are allowed to apply online.  The package defines styles of the outlines and
+uses BibLaTeX and Biber for the management of references.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-na-box
+  (package
+    (name "texlive-na-box")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/na-box/" "tex/xelatex/na-box/")
+             (base32
+              "1j02k0d4m23yackb1vn8pajxwkimkkrx9h512xs3hkxdi6qdwb73")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/na-box")
+    (synopsis "Arabic-aware version of @code{pas-cours} package")
+    (description
+     "This is a modified version of the @code{pas-cours} package made
+compatible with XeLaTeX and Polyglossia to write Arabic documents with fancy
+boxed @code{theorem}-alike environments.")
+    (license license:lppl)))
+
 (define-public texlive-naive-ebnf
   (package
     (name "texlive-naive-ebnf")
@@ -6824,6 +22776,72 @@ Form (EBNF) notation.")
     (description "This style file provides macros for named tensor notation.")
     (license license:expat)))
 
+(define-public texlive-nanicolle
+  (package
+    (name "texlive-nanicolle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/nanicolle/"
+                   "tex/xelatex/nanicolle/")
+             (base32
+              "0lzcsmy4iw0ch3w1g3h5b23hkzspi5q2gs406l4cihfmf30yiadk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nanicolle")
+    (synopsis "Typesetting herbarium specimen labels")
+    (description
+     "This package provides a LaTeX class @file{nanicolle.cls} for typesetting
+collection labels and identification labels in Chinese style or in western
+style for plant herbarium specimens.  So far, documents using this class can
+only be compiled with XeLaTeX.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-nanumtype1
+  (package
+    (name "texlive-nanumtype1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/nanumtype1/"
+                   "fonts/afm/public/nanumtype1/"
+                   "fonts/map/dvips/nanumtype1/"
+                   "fonts/tfm/public/nanumtype1/"
+                   "fonts/type1/public/nanumtype1/"
+                   "fonts/vf/public/nanumtype1/"
+                   "tex/latex/nanumtype1/")
+             (base32
+              "0n7dbhxa186x7f2ql8kjr2bn425vlhswl2m5n2n3iklfam9bmf6k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nanumtype1")
+    (synopsis "Type1 subfonts of Nanum Korean fonts")
+    (description
+     "Nanum is a unicode font designed especially for Korean-language script.
+The font was designed by Sandoll Communication and Fontrix; it includes the
+sans serif (gothic), serif (myeongjo), pen script and brush script typefaces.
+The package provides Type1 subfonts converted from Nanum Myeongjo (Regular and
+@code{ExtraBold)} and Nanum Gothic (Regular and Bold) OTFs.  C70, LUC, T1, and
+TS1 font definition files are also provided.")
+    (license license:silofl1.1)))
+
+(define-public texlive-nar
+  (package
+    (name "texlive-nar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/nar/")
+             (base32
+              "1nwk71qirapkg3h6jwlv53fm6zwb2vq0fvmc4xcanf19sm3331mk")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nar")
+    (synopsis "BibTeX style for @emph{Nucleic Acid Research}")
+    (description
+     "This BibTeX bibliography style is for the journal @emph{Nucleic Acid Research}.
+It was adapted from the standard @file{unsrt.bst} style file.")
+    (license license:knuth)))
+
 (define-public texlive-natded
   (package
     (name "texlive-natded")
@@ -6866,6 +22884,49 @@ adapt their size to the material enclosed, rendering @code{\\left} and
 @code{\\right} almost obsolete.")
     (license license:gpl3+)))
 
+(define-public texlive-nature
+  (package
+    (name "texlive-nature")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/nature/" "doc/latex/nature/"
+                   "tex/latex/nature/")
+             (base32
+              "04jxf6i83qnhy6i3rpqzm4nzqvc7r56ygx37741ii8yckz58xiah")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nature")
+    (synopsis "Prepare papers for the journal @emph{Nature}")
+    (description
+     "@emph{Nature} does not accept papers in LaTeX, but it does accept PDF.
+This class and BibTeX style provide what seems to be necessary to produce
+papers in a format acceptable to the publisher.")
+    (license license:lppl)))
+
+(define-public texlive-navydocs
+  (package
+    (name "texlive-navydocs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/navydocs/"
+                   "source/latex/navydocs/"
+                   "tex/latex/navydocs/")
+             (base32
+              "1qisck3lr1nhjnqs195agvmiw93yld801nahr3bb7yyhzgn2f443")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/navydocs")
+    (synopsis "Support for technical reports by US Navy organizations")
+    (description
+     "The @code{navydocs} package provides an easy means for creating title
+pages and the following supplementary material pages used in technical reports
+by United States Navy organizations.  These pages are generated by specifying
+the page content via a set of commands and then calling a macro to create the
+page at its occurence in the document.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-nchairx
   (package
     (name "texlive-nchairx")
@@ -6886,6 +22947,26 @@ physics at the University of Wurzburg as a collection of macros and predefined
 environments for quickly creating nice mathematical documents.")
     (license license:lppl1.3+)))
 
+(define-public texlive-nddiss
+  (package
+    (name "texlive-nddiss")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/nddiss/" "doc/latex/nddiss/"
+                   "source/latex/nddiss/" "tex/latex/nddiss/")
+             (base32
+              "131gzskjqhh5v677rxf2pap87jvi6jdznimqmql468y3pwc2zja0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nddiss")
+    (synopsis "Notre Dame Dissertation format class")
+    (description
+     "This class file conforms to the requirements of the Graduate School of
+the University of Notre Dame; with it a user can format a thesis or
+dissertation in LaTeX.")
+    (license license:lppl1.2+)))
+
 (define-public texlive-nevelok
   (package
     (name "texlive-nevelok")
@@ -6904,6 +22985,146 @@ environments for quickly creating nice mathematical documents.")
      "This LaTeX package provides automatic definite articles for Hungarian.")
     (license license:lppl1.3+)))
 
+(define-public texlive-newcastle-bst
+  (package
+    (name "texlive-newcastle-bst")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/newcastle-bst/"
+                   "doc/bibtex/newcastle-bst/")
+             (base32
+              "0q5mwwiwf6pvlk6xbvrc6rfm87qrkpp7nba4qgdagjkdrn0hs4jz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/newcastle-bst")
+    (synopsis
+     "BibTeX style following Harvard at Newcastle style recommendations")
+    (description
+     "This package provides a BibTeX style to format reference lists in the
+Harvard at Newcastle style recommended by Newcastle University.  It should be
+used alongside @code{natbib} for citations.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-newcomputermodern
+  (package
+    (name "texlive-newcomputermodern")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/newcomputermodern/"
+                   "fonts/opentype/public/newcomputermodern/"
+                   "tex/latex/newcomputermodern/")
+             (base32
+              "0b2iingsax99r551150w26zwmlr6a8yjwb00amfa2id390r1yjp5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/newcomputermodern")
+    (synopsis "Computer Modern fonts including matching non-Latin alphabets")
+    (description
+     "This is a new assembly of Computer Modern fonts including extensions in
+many directions for both Latin based languages, non-Latin based languages and
+Mathematics, all compatible in style to CM fonts.  In addition to the Regular
+weight of Computer Modern, it provides a Book weight for heavier printing.")
+    (license license:gfl1.0)))
+
+(define-public texlive-newpx
+  (package
+    (name "texlive-newpx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/newpx/"
+                   "fonts/afm/public/newpx/"
+                   "fonts/enc/dvips/newpx/"
+                   "fonts/map/dvips/newpx/"
+                   "fonts/opentype/public/newpx/"
+                   "fonts/tfm/public/newpx/"
+                   "fonts/type1/public/newpx/"
+                   "fonts/vf/public/newpx/"
+                   "tex/latex/newpx/")
+             (base32
+              "1c58073pzqa9sl69rfqy8b4j8i3fy3hil57fh51icvr5ggq5vyfn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/newpx")
+    (synopsis "Alternative uses of the PX fonts, with improved metrics")
+    (description
+     "This package, initially based on @code{pxfonts}, provides many fixes and
+enhancements to that package, and splits it in two parts (@code{newpxtext} and
+@code{newpxmath}) which may be run independently of one another.  It provides
+scaling, improved metrics, and other options.")
+    (license (list license:lppl license:silofl1.1))))
+
+(define-public texlive-newtxsf
+  (package
+    (name "texlive-newtxsf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/newtxsf/"
+                   "fonts/map/dvips/newtxsf/"
+                   "fonts/tfm/public/newtxsf/"
+                   "fonts/type1/public/newtxsf/"
+                   "fonts/vf/public/newtxsf/"
+                   "tex/latex/newtxsf/")
+             (base32
+              "1nmbh566ifkglk4wdgp297q5nab52ykda4xfi9q5w3c5rzw53y0v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/newtxsf")
+    (synopsis "Sans-math fonts for use with @code{newtx}")
+    (description
+     "The package provides a maths support that amounts to modifications of
+the STIX sans serif Roman and Greek letters with most symbols taken from
+@code{newtxmath}.")
+    (license license:silofl1.1)))
+
+(define-public texlive-newtxtt
+  (package
+    (name "texlive-newtxtt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/newtxtt/"
+                   "fonts/enc/dvips/newtxtt/"
+                   "fonts/map/dvips/newtxtt/"
+                   "fonts/tfm/public/newtxtt/"
+                   "fonts/type1/public/newtxtt/"
+                   "tex/latex/newtxtt/")
+             (base32
+              "0x53dqf1mflh00r9v3zj2jqqbabk084zgcbz92x5icvmysrvk92a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/newtxtt")
+    (synopsis "Enhancement of typewriter fonts from @code{newtx}")
+    (description
+     "The package provides enhanced fonts with LaTeX support files providing
+access to the typewriter fonts from @code{newtx}.  Regular and bold weights,
+slanted variants and a choice of four different styles for zero.")
+    (license (list license:gpl3 license:lppl))))
+
+(define-public texlive-niceframe-type1
+  (package
+    (name "texlive-niceframe-type1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/niceframe-type1/"
+                   "fonts/afm/public/niceframe-type1/"
+                   "fonts/map/dvips/niceframe-type1/"
+                   "fonts/type1/public/niceframe-type1/")
+             (base32
+              "0np6m165d5xa4y68hy62q39wp069darx63snzl168flj0j1q6qbl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/niceframe-type1")
+    (synopsis "Type 1 versions of the fonts recommended in @code{niceframe}")
+    (description
+     "The bundle provides Adobe Type 1 versions of the fonts @code{bbding10},
+@code{dingbat}, @code{karta15}, @code{umranda} and @code{umrandb}.")
+    (license license:lppl)))
+
 (define-public texlive-nicematrix
   (package
     (name "texlive-nicematrix")
@@ -6929,6 +23150,210 @@ the columns; tools to color rows and columns with a good PDF result; blocks of
 cells; etc.")
     (license license:lppl1.3+)))
 
+(define-public texlive-nimbus15
+  (package
+    (name "texlive-nimbus15")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/nimbus15/"
+                   "fonts/afm/public/nimbus15/"
+                   "fonts/enc/dvips/nimbus15/"
+                   "fonts/map/dvips/nimbus15/"
+                   "fonts/opentype/public/nimbus15/"
+                   "fonts/tfm/public/nimbus15/"
+                   "fonts/type1/public/nimbus15/"
+                   "fonts/vf/public/nimbus15/"
+                   "tex/latex/nimbus15/")
+             (base32
+              "1x5y8jcwg3ns4jdz3rqzmd1xsfsdjbab70dnlm3n7lgs64ljlzyk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-fontools))
+    (home-page "https://ctan.org/pkg/nimbus15")
+    (synopsis "Support files for Nimbus 2015 Core fonts")
+    (description
+     "The Nimbus 2015 Core fonts added Greek and Cyrillic glyphs.  This
+package may be best suited as an add-on to the comprehensive Times package,
+providing support for Greek and Cyrillic.  A new intermediate weight of
+NimbusMono (AKA Courier) is provided, along with a narrower version which may
+be useful for rendering code.")
+    (license (list license:agpl3 license:lppl1.3+))))
+
+(define-public texlive-nimsticks
+  (package
+    (name "texlive-nimsticks")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/nimsticks/"
+                   "source/latex/nimsticks/"
+                   "tex/latex/nimsticks/")
+             (base32
+              "0y7v01a02lz6mj1fdyrqzgz7kf7y4m3jarkr3sdyid25k0zx9dbj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nimsticks")
+    (synopsis "Draws sticks for games of multi-pile nim")
+    (description
+     "This LaTeX package provides commands @code{\\drawnimstick} to draw
+a single nim stick and @code{\\nimgame} which represents games of multi-pile
+Nim.  Nim sticks are drawn with a little random wobble so they look thrown
+together and not too regular.  The package also provides options to customise
+the size and colour of the sticks, and flexibility to draw heaps of different
+objects.")
+    (license license:expat)))
+
+(define-public texlive-nkarta
+  (package
+    (name "texlive-nkarta")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/nkarta/"
+                   "fonts/source/public/nkarta/"
+                   "fonts/tfm/public/nkarta/"
+                   "metapost/nkarta/" "source/latex/nkarta/")
+             (base32
+              "0x5rdacf3d2jm4rgcvmpz76icga4gis4ykmsmp745xb7kh99npjv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/nkarta")
+    (synopsis "New version of the Karta cartographic fonts")
+    (description
+     "This package provides a development of the Karta font, offering more
+mathematical stability in Metafont.  A version that will produce the glyphs as
+Encapsulated PostScript is also provided.")
+    (license license:public-domain)))
+
+(define-public texlive-nmbib
+  (package
+    (name "texlive-nmbib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/nmbib/" "doc/latex/nmbib/"
+                   "source/latex/nmbib/" "tex/latex/nmbib/")
+             (base32
+              "17snspchv0yafz062h59gs9px4dwjk99pwfyxcraw9243k2gd79g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nmbib")
+    (synopsis "Multiple versions of a bibliography, with different sort orders")
+    (description
+     "This package is a rewrite of the @code{multibibliography} package
+providing multiple bibliographies with different sorting.  The new version
+offers a number of citation commands, streamlines the creation of
+bibliographies, ensures compatibility with the @code{natbib} package, and
+provides other improvements.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-nnext
+  (package
+    (name "texlive-nnext")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/nnext/" "source/latex/nnext/"
+                   "tex/latex/nnext/")
+             (base32
+              "0hh2kn4ghnxv9l0xfkh0c0bkflmq5qwnc24y0jm1djjwrnyg1y2r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nnext")
+    (synopsis "Extension for the @code{gb4e} package")
+    (description
+     "This is an add-on for the @code{gb4e} package used in linguistics.  It
+implements the @code{\\Next}, @code{\\NNext}, @code{\\Last}, and
+@code{\\LLast} commands from the @code{linguex} package or the @code{\\nextx},
+@code{\\anextx}, @code{\\lastx}, @code{\\blastx}, and @code{\\bblastx}
+commands from the @code{expex} package.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-notes2bib
+  (package
+    (name "texlive-notes2bib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/notes2bib/"
+                   "source/latex/notes2bib/"
+                   "tex/latex/notes2bib/")
+             (base32
+              "0d51xy7hlwdl752yl1sfr7f6r77j41nkpj1mf1l7pycn5nlnii79")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/notes2bib")
+    (synopsis "Integrating notes into the bibliography")
+    (description
+     "The package defines a new type of note, @code{bibnote}, which will
+always be added to the bibliography.  The package allows footnotes and
+endnotes to be moved into the bibliography in the same way.  The package can
+be used with @code{natbib} and BibLaTeX as well as plain LaTeX citations.
+Both sorted and unsorted bibliography styles are supported.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-notex-bst
+  (package
+    (name "texlive-notex-bst")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/notex-bst/")
+             (base32
+              "14r3q4z35k5n0rl2igjs4lj5ic4yd14xksg1qam5klb6raaf1jkh")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/notex-bst")
+    (synopsis "BibTeX style that outputs HTML")
+    (description
+     "@file{noTeX.bst} produces a number of beautifully formatted HTML
+@samp{P} elements instead of TeX code.  It can be used to automatically
+generate bibliographies to be served on the web starting from BibTeX files.")
+    (license license:public-domain)))
+
+(define-public texlive-noto-emoji
+  (package
+    (name "texlive-noto-emoji")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/noto-emoji/"
+                   "fonts/truetype/google/noto-emoji/")
+             (base32
+              "117mj4w0gvbndhm7mcxbxzxscd73np5s35467jr2sq2pwbv87i8r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/noto-emoji")
+    (synopsis "Noto Emoji fonts")
+    (description
+     "Noto Color Emoji supports all emoji defined in the latest Unicode
+version.")
+    (license license:silofl1.1)))
+
+(define-public texlive-notomath
+  (package
+    (name "texlive-notomath")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/notomath/"
+                   "fonts/map/dvips/notomath/"
+                   "fonts/tfm/public/notomath/"
+                   "fonts/type1/public/notomath/"
+                   "fonts/vf/public/notomath/"
+                   "tex/latex/notomath/")
+             (base32
+              "1m7b7blmbc6ypv737qhav6np3ri1a7cl14wnhpd5bgs89v9mkafd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/notomath")
+    (synopsis "Math support for Noto fonts")
+    (description
+     "This package provides math support via @code{newtxmath} for NotoSerif
+and NotoSans.  (Regular and Bold weights only.)")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
 (define-public texlive-nuc
   (package
     (name "texlive-nuc")
@@ -6950,6 +23375,218 @@ digits than A require special spacing to appear properly; this spacing is
 supported in the package.")
     (license license:lppl)))
 
+(define-public texlive-njurepo
+  (package
+    (name "texlive-njurepo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/njurepo/" "source/latex/njurepo/"
+                   "tex/latex/njurepo/")
+             (base32
+              "03dli7kk1h8kycbj83h2gy434zl6wvj4xz0lli91b1h8k59i8fv4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/njurepo")
+    (synopsis "Reports for Nanjing University")
+    (description
+     "This LaTeX document class provides a thesis template for Nanjing
+University in order to make it easy to write experiment reports and homework
+for the bachelor's curriculum.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-ndsu-thesis
+  (package
+    (name "texlive-ndsu-thesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ndsu-thesis/"
+                   "tex/latex/ndsu-thesis/")
+             (base32
+              "0nwn17993jqiwgjjfi2jqj6m1qq8b1cbgxvq7shqvk48a0zh6y6h")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ndsu-thesis")
+    (synopsis "North Dakota State University disquisition class")
+    (description
+     "This package provides a class for generating disquisitions, intended to
+be in compliance with North Dakota State University requirements.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ndsu-thesis-2022
+  (package
+    (name "texlive-ndsu-thesis-2022")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ndsu-thesis-2022/"
+                   "tex/latex/ndsu-thesis-2022/")
+             (base32
+              "0dpkqwl7w2rqv0k0a3s72incfp9qg04m1ql3mc1hsjnn8f9dysq2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ndsu-thesis-2022")
+    (synopsis "North Dakota State University disquisition class 2022")
+    (description
+     "This package provides a class for generating disquisitions intended to
+be in compliance with North Dakota State University requirements.
+Updated (2022) North Dakota State University LaTeX thesis class features
+several functionalities, including not limited to, numbered and non-numbered
+versions, overall justification, document point sizes, fonts options, SI
+units, show frames, URL breaking, long tables, subfigures, multi-page figures,
+chapter styles, sub-files, algorithm listing, BibTeX and BibLaTeX support,
+individual chapter and whole document bibliography, @code{natbib} citations,
+and clever references.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-nih
+  (package
+    (name "texlive-nih")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/nih/" "tex/latex/nih/")
+             (base32
+              "1fa4z598i5hvlc4g9zjvqfn34pmmpab37ghi5miklvji5r2a1835")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nih")
+    (synopsis "Class for NIH grant applications")
+    (description
+     "The @code{nih} class offers support for grant applications to @acronym{NIH,
+National Institutes of Health}, a US government agency.")
+    (license license:lppl)))
+
+(define-public texlive-nihbiosketch
+  (package
+    (name "texlive-nihbiosketch")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/nihbiosketch/"
+                   "tex/latex/nihbiosketch/")
+             (base32
+              "15d22va4bxwy6h0dwahpakiqry0pq0j4mpc0rbm10lgm3z7hz25c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nihbiosketch")
+    (synopsis "Class for NIH biosketches based on the 2015 updated format")
+    (description
+     "This LaTeX document class tries to adhere to the Biographical Sketch
+formatting requirements outlined in NIH Notice NOT-OD-15-032..  This new
+format is required for applications submitted for due dates on or after May
+25, 2015.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-njustthesis
+  (package
+    (name "texlive-njustthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/njustthesis/"
+                   "source/latex/njustthesis/"
+                   "tex/latex/njustthesis/")
+             (base32
+              "11xbxz3vvq15v5nr32ww6llq08v7r0x52zmq13dp90nmh0xyj7y6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/njustthesis")
+    (synopsis
+     "Thesis template for the Nanjing University of Science and Technology")
+    (description
+     "This is a thesis template for the Nanjing University of Science and
+Technology.")
+    (license license:gpl3+)))
+
+(define-public texlive-njuthesis
+  (package
+    (name "texlive-njuthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/njuthesis/"
+                   "source/latex/njuthesis/"
+                   "tex/latex/njuthesis/")
+             (base32
+              "0vzm6iwc025vahbng9nirf1iljrdgqd2w0kz30wczaiy70p1lm5q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/njuthesis")
+    (synopsis "LaTeX thesis template for Nanjing University")
+    (description
+     "The @code{njuthesis} class is intended for typesetting Nanjing
+University dissertations with LaTeX, providing support for bachelor, master,
+and doctoral theses as well as postdoctoral reports.  Compilation of this
+class requires either XeLaTeX or LuaLaTeX.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-njuvisual
+  (package
+    (name "texlive-njuvisual")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/njuvisual/"
+                   "source/latex/njuvisual/"
+                   "tex/latex/njuvisual/")
+             (base32
+              "1v5iv44wi0hh77j56jjccgyrh9kyyfvzbl305vqryphq0r73bk36")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/njuvisual")
+    (synopsis "Display logos related to Nanjing University")
+    (description
+     "The njuvisual package collects standard colors and logos related to
+Nanjing University, saves the vector logos as TikZ pictures and provides
+a user-friendly interface to display them in documents and beamers.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-nostarch
+  (package
+    (name "texlive-nostarch")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/nostarch/" "doc/latex/nostarch/"
+                   "makeindex/nostarch/"
+                   "source/latex/nostarch/"
+                   "tex/latex/nostarch/")
+             (base32
+              "06r1nmwg59ai6v2f80ndkwrcz2ssp1g03g3k5mq0wyyzs1rg4m9q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nostarch")
+    (synopsis "LaTeX class for No Starch Press")
+    (description
+     "The package provides the official LaTeX style for No Starch Press.
+Provided are a class, a package for interfacing to @code{hyperref} and an
+index style file.  The style serves both for printed and for electronic
+books.")
+    (license license:lppl)))
+
+(define-public texlive-nrc
+  (package
+    (name "texlive-nrc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/nrc/" "source/latex/nrc/"
+                   "tex/latex/nrc/")
+             (base32
+              "10h5adzwj8558rwgwipjsbq4j5h674v8nrqfp6hvs3wbn8gdd9hj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nrc")
+    (synopsis "Class for the NRC technical journals")
+    (description
+     "This package provides macros, and some documentation, for typesetting
+papers for submission to journals published by the National Research Council
+Research Press.  At present, only @file{nrc2.cls} (for two-column layout)
+should be used.")
+    (license license:lppl)))
+
 (define-public texlive-nucleardata
   (package
     (name "texlive-nucleardata")
@@ -7054,6 +23691,81 @@ terms of recurrence relations.")
 mathematical function values.")
     (license license:lppl1.3c)))
 
+(define-public texlive-nunito
+  (package
+    (name "texlive-nunito")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/nunito/"
+                   "fonts/enc/dvips/nunito/"
+                   "fonts/map/dvips/nunito/"
+                   "fonts/opentype/public/nunito/"
+                   "fonts/tfm/public/nunito/"
+                   "fonts/type1/public/nunito/"
+                   "fonts/vf/public/nunito/"
+                   "tex/latex/nunito/")
+             (base32
+              "0arx54h5hw50rlikw3sdxgqwhn1sr2jss30103cjip9wff606pa7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nunito")
+    (synopsis "The Nunito font face with support for LaTeX and pdfLaTeX")
+    (description
+     "This package provides LaTeX and pdfLaTeX support for the Nunito family
+of fonts, designed by Vernon Adams.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-nwafuthesis
+  (package
+    (name "texlive-nwafuthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/nwafuthesis/"
+                   "source/latex/nwafuthesis/"
+                   "tex/latex/nwafuthesis/")
+             (base32
+              "001axgdkvkcwfhzg9iw5sgahxh54sp6imi2b442li8f6n5c717lx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:tex-format "xetex" #:build-targets #~(list "nwafuthesis.dtx")))
+    (native-inputs (list texlive-xetex))
+    (home-page "https://ctan.org/pkg/nwafuthesis")
+    (synopsis "Thesis template package for Northwest A&F University, China")
+    (description
+     "This template supports doctoral and master dissertations and
+undergraduate theses in Chinese.  It aims to create a simple interface,
+a normative format, as well as a hackable class for the users.  At present, it
+only supports XeTeX and LuaTeX engines.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-nwejm
+  (package
+    (name "texlive-nwejm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/nwejm/" "source/latex/nwejm/"
+                   "tex/latex/nwejm/")
+             (base32
+              "16amdv0zzh9aax6c4adqai7zi2zknh168x4awsi1b8gbbspp2vbl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list  #:build-targets #~(list "nwejm.dtx")))
+    (home-page "https://ctan.org/pkg/nwejm")
+    (synopsis
+     "Support for the journal @emph{North-Western European Journal of
+Mathematics}")
+    (description
+     "The bundle includes LaTeX classes and BibLaTeX styles files dedicated to
+the new journal @emph{North-Western European Journal of Mathematics}:
+@code{nwejm} for the complete issues of the journal, aimed at the NWEJM's
+team, @code{nwejmart}, intended for the authors who wish to publish an article
+in the NWEJM.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-objectz
   (package
     (name "texlive-objectz")
@@ -7072,6 +23784,376 @@ mathematical function values.")
      "The package will typeset both Z and Object-Z specifications.")
     (license license:lppl)))
 
+(define-public texlive-obnov
+  (package
+    (name "texlive-obnov")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/obnov/"
+                   "fonts/source/public/obnov/"
+                   "fonts/tfm/public/obnov/" "tex/latex/obnov/")
+             (base32
+              "0hjc381fw38qr7rkj137d5rp2jjv002g29bx5g3jjaxl9civvplq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/obnov")
+    (synopsis "Obyknovennaya Novaya fonts")
+    (description
+     "The Obyknovennaya Novaya (Ordinary New Face) typeface was widely used in
+the USSR for scientific and technical publications, as well as textbooks.  The
+fonts are encoded to KOI8-R (which is a long-established Russian font
+encoding, rather than a TeX/LaTeX encoding).  To use the fonts, the user needs
+Cyrillic font support.")
+    (license license:lppl)))
+
+(define-public texlive-ocherokee
+  (package
+    (name "texlive-ocherokee")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/omega/ocherokee/"
+                   "fonts/afm/public/ocherokee/"
+                   "fonts/map/dvips/ocherokee/"
+                   "fonts/ofm/public/ocherokee/"
+                   "fonts/ovf/public/ocherokee/"
+                   "fonts/ovp/public/ocherokee/"
+                   "fonts/tfm/public/ocherokee/"
+                   "fonts/type1/public/ocherokee/"
+                   "omega/ocp/ocherokee/"
+                   "omega/otp/ocherokee/"
+                   "tex/lambda/ocherokee/")
+             (base32
+              "1j2giz3rjr8hdzca5hny31zklnl721mhsgxm575fhh82qrpvdx26")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ocherokee")
+    (synopsis "LaTeX Support for the Cherokee language")
+    (description
+     "This package provides macros and Type 1 fonts for Typesetting the
+Cherokee language with the Omega version of LaTeX (known as Lambda).")
+    (license license:lppl)))
+
+(define-public texlive-octave
+  (package
+    (name "texlive-octave")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/octave/" "tex/latex/octave/")
+             (base32
+              "1avikh00n92lxk7p7h0kvsv2dk2z411fv85fagj7bg6azb3fch8g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/octave")
+    (synopsis "Typeset musical pitches with octave designations")
+    (description
+     "This package package typesets musical pitch names with designation for
+the octave in either the Helmholtz system (with octave numbers), or the
+traditional system (with prime symbols).  The system can also be changed
+mid-document.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ocr-b
+  (package
+    (name "texlive-ocr-b")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ocr-b/"
+                   "fonts/source/public/ocr-b/"
+                   "fonts/tfm/public/ocr-b/")
+             (base32
+              "089y4hihxdln1rvn87lmmiamcy8xc0niiv4gqxivahwkdjl8w0zw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/ocr-b")
+    (synopsis "Fonts for OCR-B")
+    (description
+     "This package includes Metafont source for OCR-B at several sizes.")
+    ;; "you may freely use, modify, and/or distribute any of these files or
+    ;; the resulting fonts, without limitation."
+    (license (license:fsf-free "file://doc/fonts/ocr-b-outline/README"))))
+
+(define-public texlive-ocr-b-outline
+  (package
+    (name "texlive-ocr-b-outline")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ocr-b-outline/"
+                   "fonts/map/dvips/ocr-b-outline/"
+                   "fonts/opentype/public/ocr-b-outline/"
+                   "fonts/type1/public/ocr-b-outline/"
+                   "source/fonts/ocr-b-outline/")
+             (base32
+              "1wlgwz91iv3ck8qmwgqda1kmijs3076hccfvbk6v7dkrcy726014")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ocr-b-outline")
+    (synopsis "OCR-B fonts in Type 1 and OpenType")
+    (description
+     "The package contains OCR-B fonts in Type1 and OpenType formats.")
+    ;; "You may freely use, modify, and/or distribute any of these files,
+    ;; without limitation."
+    (license (license:fsf-free "file://doc/fonts/ocr-b-outline/README"))))
+
+(define-public texlive-ogham
+  (package
+    (name "texlive-ogham")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ogham/"
+                   "fonts/source/public/ogham/"
+                   "fonts/tfm/public/ogham/")
+             (base32
+              "0lk419jbg3ahgcrmffl7snbgv521fccjpsx5i0nq55cs9vrsnav1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/ogham")
+    (synopsis "Fonts for typesetting Ogham script")
+    (description
+     "The font provides the Ogham alphabet, which is found on a number of
+Irish and Pictish carvings dating from the 4th century AD.  The font is
+distributed as Metafont source.")
+    (license license:public-domain)))
+
+(define-public texlive-oinuit
+  (package
+    (name "texlive-oinuit")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/oinuit/"
+                   "fonts/map/dvips/oinuit/"
+                   "fonts/ofm/public/oinuit/"
+                   "fonts/ovf/public/oinuit/"
+                   "fonts/tfm/public/oinuit/"
+                   "fonts/type1/public/oinuit/"
+                   "omega/ocp/oinuit/"
+                   "omega/otp/oinuit/"
+                   "source/lambda/oinuit/"
+                   "tex/lambda/oinuit/")
+             (base32
+              "1f5rlqgdz4r93z5prxjq7z7591frqz89gplj3y0dscjnlc98wxy4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/oinuit")
+    (synopsis "LaTeX Support for the Inuktitut Language")
+    (description
+     "The package provides a set of Lambda (Omega LaTeX) typesetting tools for
+the Inuktitut language.  Five different input methods are supported and with
+the necessary fonts are also provided.")
+    (license license:lppl)))
+
+(define-public texlive-old-arrows
+  (package
+    (name "texlive-old-arrows")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/old-arrows/"
+                   "fonts/afm/public/old-arrows/"
+                   "fonts/enc/dvips/old-arrows/"
+                   "fonts/map/dvips/old-arrows/"
+                   "fonts/tfm/public/old-arrows/"
+                   "fonts/type1/public/old-arrows/"
+                   "tex/latex/old-arrows/")
+             (base32
+              "0lrw3r982646pdp5nf9y9s8w85c2zw7cvbq3lqa3d3lsnykvn3y7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/old-arrows")
+    (synopsis "Computer Modern old-style arrows with smaller arrowheads")
+    (description
+     "This package provides Computer Modern old-style arrows with smaller
+arrowheads, associated with the usual LaTeX commands.  It can be used in
+documents that contain other amssymb arrow characters that also have small
+arrowheads.  It is also possible to use the usual new-style Computer Modern
+arrows together with the old-style ones.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-oldlatin
+  (package
+    (name "texlive-oldlatin")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/oldlatin/"
+                   "fonts/source/public/oldlatin/"
+                   "fonts/tfm/public/oldlatin/")
+             (base32
+              "1fvy8myxxa3a5g2s8b5m57a9ijg1qanwcrf701s9lix5yxaqn474")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/oldlatin")
+    (synopsis "Compute Modern-like font with long @emph{s}")
+    (description
+     "This package provides Metafont sources modified from Computer Modern in
+order to generate long @emph{s}, which was used in old text.")
+    (license license:lppl)))
+
+(define-public texlive-oldstandard
+  (package
+    (name "texlive-oldstandard")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/oldstandard/"
+                   "fonts/enc/dvips/oldstandard/"
+                   "fonts/map/dvips/oldstandard/"
+                   "fonts/opentype/public/oldstandard/"
+                   "fonts/tfm/public/oldstandard/"
+                   "fonts/type1/public/oldstandard/"
+                   "fonts/vf/public/oldstandard/"
+                   "tex/latex/oldstandard/")
+             (base32
+              "0rqx0i13q5axcnilggy9zgi28z2c3xl23dfxjdlsjdkyxvpfl44y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/oldstandard")
+    (synopsis "OldStandard fonts with LaTeX support")
+    (description
+     "Old Standard is designed to reproduce the actual printing style of the
+early 20th century, reviving a specific type of Modern (classicist) style of
+serif typefaces, very commonly used in various editions of the late 19th and
+early 20th century.
+
+The font supports typesetting of Old and Middle English, Old Icelandic,
+Cyrillic (with historical characters, extensions for Old Slavonic and
+localised forms), Gothic transliterations, critical editions of Classical
+Greek and Latin, and many more.")
+    (license (list license:silofl1.1 license:lppl license:gpl3+))))
+
+(define-public texlive-omega
+  (package
+    (name "texlive-omega")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/omega/base/"
+                   "dvips/omega/"
+                   "fonts/afm/public/omega/"
+                   "fonts/map/dvips/omega/"
+                   "fonts/ofm/public/omega/"
+                   "fonts/ovf/public/omega/"
+                   "fonts/ovp/public/omega/"
+                   "fonts/tfm/public/omega/"
+                   "fonts/type1/public/omega/"
+                   "omega/ocp/char2uni/"
+                   "omega/ocp/misc/"
+                   "omega/ocp/omega/"
+                   "omega/ocp/uni2char/"
+                   "omega/otp/char2uni/"
+                   "omega/otp/misc/"
+                   "omega/otp/omega/"
+                   "omega/otp/uni2char/"
+                   "tex/generic/encodings/"
+                   "tex/generic/omegahyph/"
+                   "tex/plain/omega/")
+             (base32
+              "1gma5angnq5wdxianz0ml7y9jh04lsq9ksspykan06p0cp1bnmjc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/omega")
+    (synopsis "Wide-character-set extension of TeX")
+    (description
+     "This package provides a development of TeX, which deals in multi-octet
+Unicode characters, to enable native treatment of a wide range of languages
+without changing character-set.  Work on Omega has ceased; its compatible
+successor is Aleph, which is itself also in major maintenance mode only.
+Ongoing projects developing Omega (and Aleph) ideas include Omega-2 and
+LuaTeX.")
+    (license license:gpl3+)))
+
+(define-public texlive-omegaware
+  (package
+    (name "texlive-omegaware")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/odvicopy.1"
+                   "doc/man/man1/odvicopy.man1.pdf"
+                   "doc/man/man1/odvitype.1"
+                   "doc/man/man1/odvitype.man1.pdf"
+                   "doc/man/man1/ofm2opl.1"
+                   "doc/man/man1/ofm2opl.man1.pdf"
+                   "doc/man/man1/opl2ofm.1"
+                   "doc/man/man1/opl2ofm.man1.pdf"
+                   "doc/man/man1/otangle.1"
+                   "doc/man/man1/otangle.man1.pdf"
+                   "doc/man/man1/otp2ocp.1"
+                   "doc/man/man1/otp2ocp.man1.pdf"
+                   "doc/man/man1/outocp.1"
+                   "doc/man/man1/outocp.man1.pdf"
+                   "doc/man/man1/ovf2ovp.1"
+                   "doc/man/man1/ovf2ovp.man1.pdf"
+                   "doc/man/man1/ovp2ovf.1"
+                   "doc/man/man1/ovp2ovf.man1.pdf")
+             (base32
+              "06kzz0342h6vvc32ydrzgpqsdqv5l0jbd5finr43fmzqi5jnswil")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/omega")
+    (synopsis "Documentation for Omega executables")
+    (description
+     "This package provides the documentation for Omega executables.")
+    (license license:gpl3+)))
+
+(define-public texlive-onrannual
+  (package
+    (name "texlive-onrannual")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/onrannual/"
+                   "tex/latex/onrannual/")
+             (base32
+              "1m701gqf0my947jh4lsgwryn3h9m6w4b6rimm8wmzsxlvnag9ag7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/onrannual")
+    (synopsis
+     "Class for Office of Naval Research Ocean Battlespace Sensing annual
+report")
+    (description
+     "This is an unofficial document class for writing @acronym{ONR, Office of
+Naval Research} annual reports using LaTeX; as ONR has had numerous problems
+with LaTeX-generated PDF submissions in the past.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-opensans
+  (package
+    (name "texlive-opensans")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/opensans/"
+                   "fonts/enc/dvips/opensans/"
+                   "fonts/map/dvips/opensans/"
+                   "fonts/tfm/ascender/opensans/"
+                   "fonts/truetype/ascender/opensans/"
+                   "fonts/type1/ascender/opensans/"
+                   "fonts/vf/ascender/opensans/"
+                   "tex/latex/opensans/")
+             (base32
+              "1l81y548cslwsy7m06pckf5w33gq53ly3a35zkd9jzfz6yg6w4bq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/opensans")
+    (synopsis "Open Sans font family, and LaTeX support")
+    (description
+     "Open Sans is a humanist sans serif typeface designed by Steve Matteson.
+The package provides support for this font family in LaTeX. It includes the
+original TrueType fonts, as well as Type 1 versions.")
+    (license (list license:asl2.0 license:lppl1.3c))))
+
 (define-public texlive-oplotsymbl
   (package
     (name "texlive-oplotsymbl")
@@ -7092,6 +24174,27 @@ easily available.  Especially, these symbols are used in scientific plots, but
 the potential user is allowed to use them in other ways.")
     (license license:lppl1.3+)))
 
+(define-public texlive-opteng
+  (package
+    (name "texlive-opteng")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/opteng/" "tex/latex/opteng/")
+             (base32
+              "1svis9n0ssrc6pnvlshwprfjimdfrbisb0jjnlhhys343dv95jqs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/opteng")
+    (synopsis "SPIE Optical Engineering and OE Letters manuscript template")
+    (description
+     "With this template, and associated style and LaTeX packages, it is
+possible to estimate the page length of manuscripts for submission to the SPIE
+journals @emph{Optical Engineering} and @emph{Optical Engineering Letters}.
+With a strict three-page limit, this is particularly important for the latter.
+The template gives simple instructions on how to prepare the manuscript.")
+    (license license:lppl)))
+
 (define-public texlive-ordinalpt
   (package
     (name "texlive-ordinalpt")
@@ -7115,6 +24218,75 @@ so on up to 1999th.  Separate counter commands are provided for different
 letter case variants, and for masculine and feminine gender inflections.")
     (license license:lppl)))
 
+(define-public texlive-orkhun
+  (package
+    (name "texlive-orkhun")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/orkhun/"
+                   "fonts/source/public/orkhun/"
+                   "fonts/tfm/public/orkhun/")
+             (base32
+              "18p78sprnig93iq74y1vb1ai3ixqqj1pssrqczr1fiy0rnxsjdig")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/orkhun")
+    (synopsis "Font for Orkhun script")
+    (description
+     "The Orkhun font covers an old Turkic script.  It is provided as Metafont
+source.")
+    (license license:lppl)))
+
+(define-public texlive-oscola
+  (package
+    (name "texlive-oscola")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/oscola/" "makeindex/oscola/"
+                   "tex/latex/oscola/")
+             (base32
+              "1lx883rqq9p3f0vfv6i5xp35qpi79jf1jxycyi5j86i1fvk0jz08")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/oscola")
+    (synopsis
+     "BibLaTeX style for the Oxford Standard for the Citation of Legal
+Authorities")
+    (description
+     "The package provides a set of style files for use with BibLaTeX and
+Biber to produce citations and bibliographies in accordance with the
+widely-used Oxford Standard for the Citation of Legal Authorities.  It also
+includes facilities for constructing tables of cases and legislation from
+citations (in conjunction with appropriate indexing packages).")
+    (license license:lppl1.3+)))
+
+(define-public texlive-oswald
+  (package
+    (name "texlive-oswald")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/oswald/"
+                   "fonts/enc/dvips/oswald/"
+                   "fonts/map/dvips/oswald/"
+                   "fonts/tfm/public/oswald/"
+                   "fonts/type1/public/oswald/"
+                   "fonts/vf/public/oswald/"
+                   "tex/latex/oswald/")
+             (base32
+              "0ib7k3vgzmsjaxhfb3zcpy3m0yx8p5yyc2hr8x7b8ik7n1ik5sgm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/oswald")
+    (synopsis "Oswald family of fonts with support for LaTeX and pdfLaTeX")
+    (description
+     "This package provides the Oswald family of fonts, designed by Vernon Adams,
+Kalapi Gajjar, Cyreal, with support for LaTeX and pdfLaTeX.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-ot-tableau
   (package
     (name "texlive-ot-tableau")
@@ -7136,6 +24308,79 @@ working with the source code painless (well, less painful).  A variety of
 stylistic variants are available to suit personal taste.")
     (license license:lppl1.3+)))
 
+(define-public texlive-othello
+  (package
+    (name "texlive-othello")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/othello/"
+                   "fonts/source/public/othello/"
+                   "fonts/tfm/public/othello/"
+                   "tex/latex/othello/")
+             (base32
+              "0ijb2giry6bjvx6ll51n9c8fqy1kmwgrwvrg21mxnj9xc4gkdjrh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/othello")
+    (synopsis "Create othello boards")
+    (description
+     "This package can be used to create othello boards.  It includes also
+fonts, as Metafont source.")
+    (license license:gpl3+)))
+
+(define-public texlive-othelloboard
+  (package
+    (name "texlive-othelloboard")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/othelloboard/"
+                   "tex/latex/othelloboard/")
+             (base32
+              "1kaj01bn4828261n8s761qcv7hg6a5aqi577rqglbkjg9grdh1s6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/othelloboard")
+    (synopsis
+     "Typeset othello (Reversi) diagrams of any size, with annotations")
+    (description
+     "The package enables the user to generate high-quality othello (also
+known as Reversi) board diagrams of any size.  The diagrams support
+annotations, including full game transcripts.  Automated board or transcript
+creation, from plain text formats standard to WZebra (and other programs) is
+also supported.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-otibet
+  (package
+    (name "texlive-otibet")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/otibet/"
+                   "fonts/ofm/public/otibet/"
+                   "fonts/ovf/public/otibet/"
+                   "fonts/ovp/public/otibet/"
+                   "fonts/source/public/otibet/"
+                   "fonts/tfm/public/otibet/"
+                   "omega/ocp/otibet/"
+                   "omega/otp/otibet/"
+                   "source/latex/otibet/"
+                   "tex/latex/otibet/")
+             (base32
+              "0cman22brlm8qklb60mzq8f6c9kmdspv3zfg4s5p0lj9sf03bb6c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/otibet")
+    (synopsis "Support for Tibetan using Omega")
+    (description "This package provides support for Tibetan using Omega.")
+    ;; Per "unidoc.tex": "this package is freely distributable under the GPL
+    ;; Version~?.? or any later one."
+    (license license:gpl1+)))
+
 (define-public texlive-oubraces
   (package
     (name "texlive-oubraces")
@@ -7157,6 +24402,29 @@ stylistic variants are available to suit personal taste.")
     ;; condition for use are retained".
     (license (license:fsf-free "file://tex/latex/oubraces/oubraces.sty"))))
 
+(define-public texlive-oup-authoring-template
+  (package
+    (name "texlive-oup-authoring-template")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/oup-authoring-template/"
+                   "tex/latex/oup-authoring-template/")
+             (base32
+              "1fbkrka650pv2k5n0fcdcgmzlfpj2kzlg9d72d145b24zza79qh0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/oup-authoring-template")
+    (synopsis
+     "General template for journals published by Oxford University
+Press (OUP)")
+    (description
+     "This package provides a general LaTeX template for journals published by
+@acronym{OUP, Oxford University Press}.  The template outputs to the three
+official page designs (traditional, contemporary, modern) used by many
+journals published by OUP, with large, medium and small page options.")
+    (license license:lppl1.2+)))
+
 (define-public texlive-overarrows
   (package
     (name "texlive-overarrows")
@@ -7180,6 +24448,199 @@ kerning when a subscript follows.  Some predefined commands are also
 provided.")
     (license license:lppl1.3c)))
 
+(define-public texlive-overlock
+  (package
+    (name "texlive-overlock")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/overlock/"
+                   "fonts/enc/dvips/overlock/"
+                   "fonts/map/dvips/overlock/"
+                   "fonts/opentype/tipo/overlock/"
+                   "fonts/tfm/tipo/overlock/"
+                   "fonts/type1/tipo/overlock/"
+                   "fonts/vf/tipo/overlock/"
+                   "tex/latex/overlock/")
+             (base32
+              "0rpqpd5ja32i44lf8szr2hn0dz5dh2p238iid0dnkpylf006wni2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/overlock")
+    (synopsis "Overlock sans fonts with LaTeX support")
+    (description
+     "The package provides the Overlock and OverlockSC families of fonts,
+designed by Dario Manuel Muhafara, rounded sans-serif fonts in three
+weights (Regular, Bold, Black) with italic variants for each of them.  There
+are also small-caps and old-style figures in the Regular weight.")
+    (license license:silofl1.1)))
+
+(define-public texlive-pacioli
+  (package
+    (name "texlive-pacioli")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/pacioli/"
+                   "fonts/source/public/pacioli/"
+                   "fonts/tfm/public/pacioli/"
+                   "source/fonts/pacioli/" "tex/latex/pacioli/")
+             (base32
+              "100fs89b2nfybnjdg8b4v3z8q982b6x0azn0sc31533pkkkp19i3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/pacioli")
+    (synopsis "Fonts designed by Fra Luca de Pacioli in 1497")
+    (description
+     "Pacioli was a 15th century mathematician, and his font was designed
+according to the divine proportion.  The font consists of uppercase letters
+together with punctuation and some analphabetics; no lowercase or digits.  The
+package provides Metafont source for the font together with LaTeX support.")
+    (license license:lppl)))
+
+(define-public texlive-padauk
+  (package
+    (name "texlive-padauk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/padauk/"
+                   "fonts/truetype/public/padauk/")
+             (base32
+              "0yn5w8bkcf9ihqy4v2zq4yc74d2d3dc1c6dcissaa6pcdj4z9r9l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/padauk")
+    (synopsis
+     "High-quality TrueType font for languages using the Myanmar script")
+    (description
+     "Padauk is a Unicode-based font family with broad support for writing
+systems that use the Myanmar script.")
+    (license license:silofl1.1)))
+
+(define-public texlive-pagella-otf
+  (package
+    (name "texlive-pagella-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/pagella-otf/"
+                   "tex/latex/pagella-otf/")
+             (base32
+              "0yi5d5wffqcrlslk9gxifnx4imhpi1hqya6x7k1qq9znvlf97inl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pagella-otf")
+    (synopsis "Using the OpenType fonts TeX Gyre Pagella")
+    (description
+     "This package can only be used with LuaLaTeX or XeLaTeX.  It does the
+font setting for the OpenType font TeX Gyre Pagella for text and math.  The
+missing typefaces like bold math and slanted text are also defined.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-parallel
+  (package
+    (name "texlive-parallel")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/parallel/"
+                   "source/latex/parallel/"
+                   "tex/latex/parallel/")
+             (base32
+              "14gca28ph90vhsliy5g8jc6fd87igni1wkiy41jrp33qhjiz94qa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/parallel")
+    (synopsis "Typeset parallel texts")
+    (description
+     "This package provides a @code{parallel} environment which allows two
+potentially different texts to be typeset in two columns, while maintaining
+alignment.  The two columns may be on the same page, or on facing pages.  This
+arrangement of text is commonly used when typesetting translations, but it can
+have value when comparing any two texts.")
+    (license license:lppl)))
+
+(define-public texlive-paratype
+  (package
+    (name "texlive-paratype")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/paratype/"
+                   "fonts/afm/paratype/ptmono/"
+                   "fonts/afm/paratype/ptsans/"
+                   "fonts/afm/paratype/ptserif/"
+                   "fonts/enc/dvips/paratype/"
+                   "fonts/map/dvips/paratype/"
+                   "fonts/tfm/paratype/ptmono/"
+                   "fonts/tfm/paratype/ptsans/"
+                   "fonts/tfm/paratype/ptserif/"
+                   "fonts/truetype/paratype/ptmono/"
+                   "fonts/truetype/paratype/ptsans/"
+                   "fonts/truetype/paratype/ptserif/"
+                   "fonts/type1/paratype/ptmono/"
+                   "fonts/type1/paratype/ptsans/"
+                   "fonts/type1/paratype/ptserif/"
+                   "fonts/vf/paratype/ptmono/"
+                   "fonts/vf/paratype/ptsans/"
+                   "fonts/vf/paratype/ptserif/"
+                   "tex/latex/paratype/")
+             (base32
+              "0k93y4xlng9b9cwa9mk7bdxj2zzbyigv02z358lm0vpr7nw8vxig")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/paratype")
+    (synopsis "LaTeX support for ParaType fonts")
+    (description
+     "The package offers LaTeX support for the fonts PT Sans, PT Serif and PT
+Mono developed by ParaType for the project @emph{Public Types of Russian
+Federation}.  The fonts themselves are provided in both the TrueType and Type
+1 formats.  The fonts provide encodings OT1, T1, IL2, TS1, T2* and X2.  The
+package provides a convenient replacement of the two packages @code{ptsans}
+and @code{ptserif}.")
+    (license license:lppl)))
+
+(define-public texlive-parrun
+  (package
+    (name "texlive-parrun")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/parrun/" "source/latex/parrun/"
+                   "tex/latex/parrun/")
+             (base32
+              "1cfqvsda505pxwyjv6k197lg464y4njr2j65sghvzk7qp3i6vq11")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/parrun")
+    (synopsis "Typesets (two) streams of text running parallel")
+    (description
+     "This package can be used for typesetting translated text and the
+original source, parallel on the same page, one above the other.")
+    (license license:lppl)))
+
+(define-public texlive-pas-crosswords
+  (package
+    (name "texlive-pas-crosswords")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pas-crosswords/"
+                   "tex/latex/pas-crosswords/")
+             (base32
+              "1masrs2ywyxa9rfw7vz9j9jw0b1hhkd5fin2rg7rd2x1qb305q5w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pas-crosswords")
+    (synopsis "Creating crossword grids, using TikZ")
+    (description
+     "The package produces crossword grids, using a wide variety of colours
+and decorations of the grids and the text in them.  The package uses TikZ for
+its graphical output.")
+    (license license:lppl)))
+
 (define-public texlive-pascaltriangle
   (package
     (name "texlive-pascaltriangle")
@@ -7220,6 +24681,25 @@ customized by means of different @code{\\pascal} macro options or the
 patterns for wide ranges of languages.")
     (license license:lppl1.3c)))
 
+(define-public texlive-perception
+  (package
+    (name "texlive-perception")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/perception/"
+                   "doc/bibtex/perception/")
+             (base32
+              "0958g65hv8fpyhhbkvkd2ybdbp6aiblnc5izbr5z5w8b0v5n0ixx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/perception")
+    (synopsis "BibTeX style for the journal @emph{Perception}")
+    (description
+     "This package provides a BibTeX style for the journal
+@emph{Perception}.")
+    (license license:lppl)))
+
 (define-public texlive-perfectcut
   (package
     (name "texlive-perfectcut")
@@ -7249,6 +24729,29 @@ will behave in the same way.  The package also offers a robust
 reimplementation of @code{\\big}, @code{\\bigg}, etc.")
     (license license:lppl1.3+)))
 
+(define-public texlive-persian-bib
+  (package
+    (name "texlive-persian-bib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/persian-bib/"
+                   "bibtex/csf/persian-bib/"
+                   "doc/xelatex/persian-bib/")
+             (base32
+              "18x592g8y1i8kw724an65q84jj91cam5qvwp9mgnhqpwh3gjflpw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/persian-bib")
+    (synopsis "Persian translations of classic BibTeX styles")
+    (description
+     "This package provides BibTeX styles modified for Persian documents
+prepared with XePersian (which the present package depends on).  The Persian
+@file{.bst} files can simultaneously handle both Latin and Persian references.
+A file @file{p1256fa.csf} is provided for correct sorting of Persian
+references and three fields LANGUAGE, TRANSLATOR and AUTHORFA are defined.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-pfdicons
   (package
     (name "texlive-pfdicons")
@@ -7271,6 +24774,78 @@ number of units provided should cover--in Turton's estimate--about 90 percent
 of all fluid processing operations.")
     (license license:lppl1.3c)))
 
+(define-public texlive-phaistos
+  (package
+    (name "texlive-phaistos")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/phaistos/"
+                   "fonts/afm/public/phaistos/"
+                   "fonts/map/dvips/phaistos/"
+                   "fonts/opentype/public/phaistos/"
+                   "fonts/tfm/public/phaistos/"
+                   "fonts/type1/public/phaistos/"
+                   "source/fonts/phaistos/"
+                   "tex/latex/phaistos/")
+             (base32
+              "0b5mjfzmhr6dw6i90mjym2hwi4cm2jfwfagl41dm6grnznwcn8bb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/phaistos")
+    (synopsis "Disk of Phaistos font")
+    (description
+     "This package provides a font that contains all the symbols of the famous
+Disc of Phaistos, together with a LaTeX package.  The disc was printed by
+stamping the wet clay with some sort of punches, probably around 1700 BCE.
+The font is available in Adobe Type 1 and OpenType formats (the latter using
+the Unicode positions for the symbols).")
+    (license license:lppl)))
+
+(define-public texlive-philosophersimprint
+  (package
+    (name "texlive-philosophersimprint")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/philosophersimprint/"
+                   "source/latex/philosophersimprint/"
+                   "tex/latex/philosophersimprint/")
+             (base32
+              "12rflr3w8lxk9yg1fx3kpyz52002571lh4g3m6hcp73mb393fq1w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/philosophersimprint")
+    (synopsis "Typesetting articles for @emph{Philosophers' Imprint}")
+    (description
+     "The @emph{Philosophers' Imprint} is a series of original papers in
+philosophy, edited by philosophy faculty at the University of Michigan, and
+published on the World Wide Web by the University of Michigan Digital Library.
+The class helps authors to typeset their own articles in Web-ready format.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-phonetic
+  (package
+    (name "texlive-phonetic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/phonetic/"
+                   "fonts/source/public/phonetic/"
+                   "fonts/tfm/public/phonetic/"
+                   "tex/latex/phonetic/")
+             (base32
+              "0f1z1kzfyxap4hbmpjfhy417n3jcg3rv0m8f5ab1wlil64jn0rgb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/phonetic")
+    (synopsis "Metafont Phonetic fonts, based on Computer Modern")
+    (description
+     "The Phonetic fonts are based on Computer Modern, and specified in
+Metafont.  Macros for the fonts use are provided for LaTeX.")
+    (license license:lppl)))
+
 (define-public texlive-physconst
   (package
     (name "texlive-physconst")
@@ -7298,6 +24873,24 @@ from true constants, e.g. the fine structure constant, have been calculated
 using the accepted values of the fundamental constants.")
     (license license:lppl1.3c)))
 
+(define-public texlive-phonrule
+  (package
+    (name "texlive-phonrule")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/phonrule/" "tex/latex/phonrule/")
+             (base32
+              "09nhlhqgq2af2p6rn5r0q8ccn9a2qq35znn5j4z2kjq744wbzjih")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/phonrule")
+    (synopsis "Typeset linear phonological rules")
+    (description
+     "The package provides macros for typesetting phonological rules like
+those in @emph{Sound Pattern of English} (Chomsky and Halle 1968).")
+    (license license:lppl1.0+)))
+
 (define-public texlive-physics2
   (package
     (name "texlive-physics2")
@@ -7348,6 +24941,51 @@ mode.  All major SI units are included, as well as some @acronym{CGS,
 Centimetre–Gram–Second} units used in astronomy.")
     (license license:lppl1.3c)))
 
+(define-public texlive-piano
+  (package
+    (name "texlive-piano")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/piano/" "tex/latex/piano/")
+             (base32
+              "0nbax18dgg2a9l6bihqhwx0va7829324lk29ibq29wjissmhjqww")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/piano")
+    (synopsis "Typeset a basic 2-octave piano diagram")
+    (description
+     "This package adds the @code{\\keyboard[1][2]..[7]} command to your
+project.  When used, it draws a small 2 octaves piano keyboard on your
+document, with up to 7 keys highlighted.")
+    (license license:lppl)))
+
+(define-public texlive-pigpen
+  (package
+    (name "texlive-pigpen")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pigpen/"
+                   "fonts/map/dvips/pigpen/"
+                   "fonts/source/public/pigpen/"
+                   "fonts/tfm/public/pigpen/"
+                   "fonts/type1/public/pigpen/"
+                   "tex/latex/pigpen/")
+             (base32
+              "0cvccvk3yhjpv9kxdzwaq8a2ql0vramlpzpd4l4my6g44k6cf2yf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/pigpen")
+    (synopsis "Font for the Pigpen (or masonic) cipher")
+    (description
+     "The Pigpen cipher package provides the font and the necessary
+wrappers (style file, etc.) in order to write Pigpen ciphers, a simple
+substitution cipher.  The package provides a font (available both as Metafont
+source, and as an Adobe Type 1 file), and macros for its use.")
+    (license license:lppl)))
+
 (define-public texlive-pinoutikz
   (package
     (name "texlive-pinoutikz")
@@ -7368,6 +25006,208 @@ It is designed as a tool that is easy to use, with a lean syntax, native to
 LaTeX, and directly supporting PDF output format.")
     (license license:lppl1.3c)))
 
+(define-public texlive-pittetd
+  (package
+    (name "texlive-pittetd")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pittetd/" "source/latex/pittetd/"
+                   "tex/latex/pittetd/")
+             (base32
+              "1q8ikj4qqlzw3kimywdmbvkvwyvyjn8q6gr68kc0wpypqd1a91as")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pittetd")
+    (synopsis
+     "Electronic theses and dissertations at the University of Pittsburgh")
+    (description
+     "This package provides a document class for theses and dissertations at
+the University of Pittsburgh.")
+    (license license:lppl)))
+
+(define-public texlive-pkuthss
+  (package
+    (name "texlive-pkuthss")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pkuthss/" "tex/latex/pkuthss/")
+             (base32
+              "046r1m8bgif6mvm2cln95whh3nnwnwwpzs9hd6szaz91xa1dwyd9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pkuthss")
+    (synopsis "LaTeX template for dissertations in Peking University")
+    (description
+     "The package provides a simple, clear and flexible LaTeX template for
+dissertations in Peking University.")
+    (license
+     (list license:lppl1.3+
+           license:bsd-3
+           license:public-domain))))
+
+(define-public texlive-plainyr
+  (package
+    (name "texlive-plainyr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/plainyr/")
+             (base32
+              "09py8psdqqnxmq2nkczxz092668zscvf9hbr6fcvrnj0blvz3wxy")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/plainyr")
+    (synopsis "Plain bibliography style, sorted by year first")
+    (description
+     "This is a version of the standard plain BibTeX style, modified to sort
+chronologically (by year) first, then by author, title, etc.")
+    (license license:knuth)))
+
+(define-public texlive-plari
+  (package
+    (name "texlive-plari")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/plari/" "source/latex/plari/"
+                   "tex/latex/plari/")
+             (base32
+              "07g4rn4nn5wvwqd39s0xnn35ijkamhzxi12icnha8vb0b564jwq8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/plari")
+    (synopsis "Typesetting stageplay scripts")
+    (description
+     "Plari is a @code{report}-alike class, without section headings, and with
+paragraphs vertically separated rather than indented.")
+    (license license:gpl3+)))
+
+(define-public texlive-play
+  (package
+    (name "texlive-play")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/play/" "source/latex/play/"
+                   "tex/latex/play/")
+             (base32
+              "1v1d8hfng6s8x8spzrzhhkgg36zay9jvfna9md1mh4ijlipnzyma")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/play")
+    (synopsis "Typeset drama using LaTeX")
+    (description
+     "This package provides a class and style file that supports the
+typesetting of plays, including options for line numbering.")
+    (license license:lppl)))
+
+(define-public texlive-playfair
+  (package
+    (name "texlive-playfair")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/playfair/"
+                   "fonts/enc/dvips/playfair/"
+                   "fonts/map/dvips/playfair/"
+                   "fonts/opentype/public/playfair/"
+                   "fonts/tfm/public/playfair/"
+                   "fonts/type1/public/playfair/"
+                   "fonts/vf/public/playfair/"
+                   "tex/latex/playfair/")
+             (base32
+              "060l6q6m410nn31mn09v3gy5nvbimplraifqcqlp3h8pzcrc3akf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/playfair")
+    (synopsis "Playfair Display fonts with LaTeX support")
+    (description
+     "This package provides the PlayFairDisplay family of fonts, designed by
+Claus Eggers Sorensen, for use with LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX.
+PlayFairDisplay is well suited for titling and headlines.  It has an extra
+large x-height and short descenders.  It can be set with no leading if space
+is tight, for instance in news headlines, or for stylistic effect in titles.
+Capitals are extra short, and only very slightly heavier than the lowercase
+characters.  This helps achieve a more even typographical colour when
+typesetting proper nouns and initialisms.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-plex
+  (package
+    (name "texlive-plex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/plex/"
+                   "fonts/enc/dvips/plex/"
+                   "fonts/map/dvips/plex/"
+                   "fonts/opentype/ibm/plex/"
+                   "fonts/tfm/ibm/plex/"
+                   "fonts/type1/ibm/plex/"
+                   "fonts/vf/ibm/plex/"
+                   "tex/latex/plex/")
+             (base32
+              "0lvv5p2jmkr7cb0rml4iyzr5pf7bfks0a44sv49v1d2492j57jmv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/plex")
+    (synopsis "Support for IBM Plex fonts")
+    (description
+     "The package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the IBM Plex families of fonts.  Serif, Sans and Mono families are available
+in eight weights: Regular, Light, ExtraLight, Thin, Bold, Text, Medium and
+SemiBold (with corresponding italics).")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-plex-otf
+  (package
+    (name "texlive-plex-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/plex-otf/" "tex/latex/plex-otf/")
+             (base32
+              "0xasayka8lhkn01l1535a2jy7xsp7s01hvw3kn3jk4h569dvp21g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/plex-otf")
+    (synopsis "Support for the OpenType font IBM Plex")
+    (description
+     "This package supports the OTF fonts from the IBM Plex project.  This
+package supports only XeLaTeX or LuaLaTeX; for pdfLaTeX use
+@code{}plex-mono.sty}, @code{}plex-sans.sty}, and @code{plex-serif.sty} from
+the @code{plex} package.  IBM Plex has no math symbols.  You will have to use
+one of the existing math fonts if you need them.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-plimsoll
+  (package
+    (name "texlive-plimsoll")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/plimsoll/"
+                   "fonts/afm/public/plimsoll/"
+                   "fonts/enc/dvips/plimsoll/"
+                   "fonts/map/dvips/plimsoll/"
+                   "fonts/tfm/public/plimsoll/"
+                   "fonts/type1/public/plimsoll/"
+                   "source/fonts/plimsoll/"
+                   "tex/latex/plimsoll/")
+             (base32
+              "1cxvlpb7z83ajyqh5nw1596i7ak582pp2mmqmfjqk2bffv6jqay1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/plimsoll")
+    (synopsis "Fonts with the Plimsoll symbol and LaTeX support")
+    (description
+     "This package provides access to the Plimsoll symbol for use with LaTeX.
+The Plimsoll symbol is sometimes used in chemistry for denoting standard
+states and values.  The LaTeX package provides access to this notation as
+well.")
+    (license license:gpl3+)))
+
 (define-public texlive-pm-isomath
   (package
     (name "texlive-pm-isomath")
@@ -7391,6 +25231,215 @@ only a maximum of such alphabets.  The necessary user macros are defined for
 typsetting common math symbols that require special ISO treatment.")
     (license license:lppl1.3c)))
 
+(define-public texlive-pmhanguljamo
+  (package
+    (name "texlive-pmhanguljamo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pmhanguljamo/"
+                   "tex/latex/pmhanguljamo/")
+             (base32
+              "1k8cvzmrrpb6hkkjczfq4mad71450pappf68jdlf1vmg3qb0f9z3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pmhanguljamo")
+    (synopsis "Poor man's Hangul Jamo input method")
+    (description
+     "This package provides a Hangul transliteration input method that allows
+to typeset Korean letters (Hangul) using the proper fonts. The use of XeLaTeX
+is recommended.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-pmx
+  (package
+    (name "texlive-pmx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pmx/"
+                   "doc/man/man1/pmxab.1"
+                   "doc/man/man1/pmxab.man1.pdf"
+                   "doc/man/man1/scor2prt.1"
+                   "doc/man/man1/scor2prt.man1.pdf"
+                   "tex/generic/pmx/")
+             (base32
+              "1p9js9izv50vg7qqqmyg5jz4am4phhscqdfnn4nszlyfv3zkg7p3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pmx")
+    (synopsis "Preprocessor for MusiXTeX")
+    (description
+     "PMX provides a preprocessor for MusiXTeX.  @command{pmxab} builds a TeX
+input file based on a @file{.pmx} input file in a much simpler language,
+making most of the layout decisions by itself.  It has most of MusiXTeX's
+functionality, but it also permits in-line TeX to give access to virtually all
+of MusiXTeX.  For proof-listening, @command{pmxab} will make a MIDI file of
+your score.  @command{scor2prt} is an auxiliary program that makes parts from
+a score.")
+    (license license:gpl2)))
+
+(define-public texlive-pmxchords
+  (package
+    (name "texlive-pmxchords")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/pmxchords.1"
+                   "doc/man/man1/pmxchords.man1.pdf"
+                   "doc/pmxchords/" "scripts/pmxchords/"
+                   "tex/generic/pmxchords/")
+             (base32
+              "01dlic0b0fdm41982mqj3xpin0wksmsyz4h53vdckkz2ayyagagk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pmxchords.lua")))
+    (home-page "https://ctan.org/pkg/pmxchords")
+    (synopsis "Produce chord information to go with @command{pmx} output")
+    (description
+     "The bundle supplements @command{pmx}, providing the means of typesetting
+chords above the notes of a score.  The bundle contains: macros for typing the
+chords; a Lua script to transpose chord macros to the required key signature;
+and support scripts for common requirements.")
+    (license license:gpl2)))
+
+(define-public texlive-pnas2009
+  (package
+    (name "texlive-pnas2009")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/pnas2009/")
+             (base32
+              "0yl475rlfhlnd9d0pyzm1gj2gixrdzyn6858j1ndvkhr8vc055ns")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pnas2009")
+    (synopsis "BibTeX style for PNAS (newer version)")
+    (description
+     "This style produces bibliographies in the format of @emph{Proceedings of
+the National Academy of Sciences, USA}.  The style was derived from the
+standard @file{unsrt.bst} and adapted to the new (2009) formatting rules.")
+    (license license:knuth)))
+
+(define-public texlive-poemscol
+  (package
+    (name "texlive-poemscol")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/poemscol/"
+                   "source/latex/poemscol/"
+                   "tex/latex/poemscol/")
+             (base32
+              "0hz6zsqcvlzcccxywwzwlpp9gsv41g4hc88481vmj313bys77spd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/poemscol")
+    (synopsis "Typesetting critical editions of poetry")
+    (description
+     "The package offers LaTeX macros for typesetting critical editions of
+poetry.  Its features include automatic linenumbering, generation of separate
+endnotes sections for emendations, textual collations, and explanatory notes,
+special marking for cases in which page breaks occur during stanza breaks,
+running headers of the form @samp{Notes to pp.@: xx-yy} for the notes
+sections, index of titles and first lines, and automatic generation of a table
+of contents.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-poetry
+  (package
+    (name "texlive-poetry")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/poetry/" "source/latex/poetry/"
+                   "tex/latex/poetry/")
+             (base32
+              "1z262am0qh6h1qqf36hxj2lc7d5pr4r65yx8ysrydh0sijccgild")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/poetry")
+    (synopsis "Facilities for typesetting poetry and poetical structure")
+    (description
+     "This package provides some macros and general doodads for typesetting poetry.
+There is, of course, already the excellent @code{verse} package, and the
+@code{poetrytex} package provides some extra functionality on top of it.  But
+@code{poetry} provides much of the same functionality in a bit of a different
+way, and with a few additional abilities, such as facilities for a list of
+poems, an index of first lines, and some structural commands.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-poetrytex
+  (package
+    (name "texlive-poetrytex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/poetrytex/"
+                   "source/latex/poetrytex/"
+                   "tex/latex/poetrytex/")
+             (base32
+              "1y78zd1hd3z1901x6mc6q0mw4rgj3qcqhnjn34zix11r0gn4b2jr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:tex-format "latex"
+           #:phases
+           #~(modify-phases %standard-phases
+               ;; Replace "\code{...}" with "\texttt{...}" (which is the alias
+               ;; chosen in the documentation) in order to prevent a "Command
+               ;; \code already defined" error.
+               (add-after 'unpack 'fix-documentation-source
+                 (lambda _
+                   (substitute* "source/latex/poetrytex/poetrytex.dtx"
+                     (("\\\\newcommand\\*\\\\code\\[1\\].*") "")
+                     (("\\\\code\\{") "\\texttt{")))))))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-etoolbox
+                  texlive-fancyvrb
+                  texlive-framed
+                  texlive-hologo
+                  texlive-hypdoc
+                  texlive-parskip
+                  texlive-tipa
+                  texlive-tocloft))))
+    (home-page "https://ctan.org/pkg/poetrytex")
+    (synopsis "Typeset anthologies of poetry")
+    (description
+     "The package is designed to aid in the management and formatting of
+anthologies of poetry and other writings; it does not concern itself with
+actually typesetting the verse itself.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-poiretone
+  (package
+    (name "texlive-poiretone")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/poiretone/"
+                   "fonts/enc/dvips/poiretone/"
+                   "fonts/map/dvips/poiretone/"
+                   "fonts/tfm/public/poiretone/"
+                   "fonts/truetype/public/poiretone/"
+                   "fonts/type1/public/poiretone/"
+                   "fonts/vf/public/poiretone/"
+                   "tex/latex/poiretone/")
+             (base32
+              "1zdncw8pj0x8nwgk7b5lgqldiifqjnsci57jnkf5vyhzsxx1c8kr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/poiretone")
+    (synopsis "PoiretOne family of fonts with LaTeX support")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the PoiretOne family of fonts, designed by Denis Masharov.  PoiretOne is
+a decorative geometric grotesque with a hint of Art Deco and constructivism.
+There is currently just a regular weight and an artificially emboldened
+bold.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-polexpr
   (package
     (name "texlive-polexpr")
@@ -7414,6 +25463,68 @@ localization of real roots to arbitrary precision as well as the determination
 of all rational roots is implemented via such macros.")
     (license license:lppl1.3c)))
 
+(define-public texlive-powerdot-fuberlin
+  (package
+    (name "texlive-powerdot-fuberlin")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/powerdot-fuberlin/"
+                   "tex/latex/powerdot-fuberlin/")
+             (base32
+              "0q49f7sbywfgdgn24ayg7ybfnqdnaqiwn463hiahib0vznwv1fn6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/powerdot-fuberlin")
+    (synopsis "Powerdot, using the style of FU Berlin")
+    (description
+     "The bundle provides a Powerdot-derived class and a package for use with
+Powerdot to provide the corporate design of the Free University in Berlin.
+Users may use the class itself (FUpowerdot) or use the package in the usual
+way with @code{\\style=BerlinFU} as a class option.")
+    (license license:lppl)))
+
+(define-public texlive-powerdot-tuliplab
+  (package
+    (name "texlive-powerdot-tuliplab")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/powerdot-tuliplab/"
+                   "tex/latex/powerdot-tuliplab/")
+             (base32
+              "0wwml3n7lrfm4m9xw3a14ksa8mcrrp2gbwi9y4m5pgz1r92jmph3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/powerdot-tuliplab")
+    (synopsis "Style package for Powerdot to provide the design of TULIP Lab")
+    (description
+     "@code{powerdot-tuliplab} is the LaTeX package used in TULIP Lab for
+presentation drafting.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-pracjourn
+  (package
+    (name "texlive-pracjourn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pracjourn/"
+                   "source/latex/pracjourn/"
+                   "tex/latex/pracjourn/")
+             (base32
+              "0pavlcxv7jqni6rl2hdqfmmns566151rvsaa1p5xhgfb6qa4l1b1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pracjourn")
+    (synopsis "Typeset articles for PracTeX")
+    (description
+     "The @code{pracjourn} class is used for typesetting articles in the
+@emph{PracTeX Journal}.  It is based on the @code{article} class with
+modifications to allow for more flexible front-matter and revision control,
+among other small changes.")
+    (license license:gpl3+)))
+
 (define-public texlive-prftree
   (package
     (name "texlive-prftree")
@@ -7472,6 +25583,53 @@ includes some short commands for set (blackboard) or
 filtrations (calligraphic).")
     (license license:lppl)))
 
+(define-public texlive-prociagssymp
+  (package
+    (name "texlive-prociagssymp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/prociagssymp/"
+                   "tex/latex/prociagssymp/")
+             (base32
+              "1c8fa2d0rsq5drrrckvm1b9mfdfn3p0b9wwwzr263lw7qdqhnlwj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/prociagssymp")
+    (synopsis "Macros for IAG symposium papers")
+    (description
+     "This package provides (re-)definitions of some LaTeX commands that can
+be useful for the preparation of papers with the style of the proceedings of
+symposia sponsored by the @acronym{IAG, International Association of Geodesy}
+published by Springer-Verlag.")
+    (license license:lppl)))
+
+(define-public texlive-prodint
+  (package
+    (name "texlive-prodint")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/prodint/"
+                   "fonts/afm/public/prodint/"
+                   "fonts/map/dvips/prodint/"
+                   "fonts/tfm/public/prodint/"
+                   "fonts/type1/public/prodint/"
+                   "tex/latex/prodint/")
+             (base32
+              "0k354qidij22mwxafh2zbam7qb4jd5pb8jakw0c660xdxaxrdxx3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/prodint")
+    (synopsis "Font that provides the product integral symbol")
+    (description
+     "Product integrals are to products, as integrals are to sums.  They have
+been around for more than a hundred years, they have not become part of the
+standard mathematician's toolbox, possibly because no-one invented the right
+mathematical symbol for them.  The authors have remedied that situation by
+proposing the symbol and providing this font.")
+    (license license:silofl1.1)))
+
 (define-public texlive-profcollege
   (package
     (name "texlive-profcollege")
@@ -7529,6 +25687,29 @@ drawings (using TikZ) for laboratory stuff.")
 for 15-18 years olds.")
     (license license:lppl1.3c)))
 
+(define-public texlive-projlib
+  (package
+    (name "texlive-projlib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/projlib/" "source/latex/projlib/"
+                   "tex/latex/projlib/")
+             (base32
+              "1yhn0xj4xwnr7ngmv8skdj89gi8i71v710d899g9pnjgfkk7w35d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-create-theorem))
+    (home-page "https://ctan.org/pkg/projlib")
+    (synopsis "Tools to simplify your workflow")
+    (description
+     "ProjLib is a collection of tools to help you write LaTeX documents.
+With the main package ProjLib loaded, you no longer need to set up the
+@code{theorem}-like environments, nor to manually configure the appropriate
+multilingual settings.  In addition, a series of auxiliary functionalities are
+introduced.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-proof-at-the-end
   (package
     (name "texlive-proof-at-the-end")
@@ -7576,6 +25757,61 @@ A cross-referencing system is provided for trees which cite line numbers in
 justifications for proof lines or branch closures.")
     (license license:lppl1.3+)))
 
+(define-public texlive-proposal
+  (package
+    (name "texlive-proposal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/proposal/base/"
+                   "doc/latex/proposal/dfg/"
+                   "doc/latex/proposal/eu/"
+                   "source/latex/proposal/base/"
+                   "source/latex/proposal/bin/"
+                   "source/latex/proposal/dfg/"
+                   "source/latex/proposal/eu/"
+                   "source/latex/proposal/lib/"
+                   "tex/latex/proposal/base/"
+                   "tex/latex/proposal/dfg/"
+                   "tex/latex/proposal/eu/")
+             (base32
+              "0km6i418hdcbl457dfwh1hl3q8qshp1gvqc1frqc84f9a6cr0kzc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/proposal")
+    (synopsis
+     "Set of LaTeX classes preparing proposals for collaborative projects")
+    (description
+     "The process of preparing a collaborative proposal, to a major funding body,
+involves integration of contributions of a many people at many sites.  It is
+therefore an ideal application for a text-based document preparation system
+such as LaTeX, in concert with a distributed version control system such as
+SVN.  The @code{proposal} class itself provides a basis for such an
+enterprise.  The @code{dfgproposal} and @code{dfgproposal} classes provide two
+specialisations of the base class for (respectively) German and European
+research proposals.")
+    (license license:lppl)))
+
+(define-public texlive-prtec
+  (package
+    (name "texlive-prtec")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/prtec/" "doc/latex/prtec/"
+                   "tex/latex/prtec/")
+             (base32
+              "15l75a6blk1dpcj2q841i92cdvlfjxmmaqi5lk01rac8rxa5cghx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/prtec")
+    (synopsis "Template for PRTEC conference papers")
+    (description
+     "This package provides a LaTeX class, a BibTeX style, and a LaTeX
+template to format conference papers for the @acronym{PRTEC, Pacific Rim
+Thermal Engineering Conference}.")
+    (license license:expat)))
+
 (define-public texlive-pseudo
   (package
     (name "texlive-pseudo")
@@ -7616,6 +25852,153 @@ elements such as keywords, identifiers, and comments.")
 algorithms in a natural manner.")
     (license license:lppl)))
 
+(define-public texlive-psgo
+  (package
+    (name "texlive-psgo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/psgo/" "tex/latex/psgo/")
+             (base32
+              "0ki49zbdn0qvzsz7h53vqwpf4rmiiranq52lh344z7wypznddi28")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/psgo")
+    (synopsis "Typeset go diagrams with PSTricks")
+    (description
+     "This packages can be used to typeset go diagrams with PSTricks.")
+    (license license:lppl)))
+
+(define-public texlive-psizzl
+  (package
+    (name "texlive-psizzl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/otherformats/psizzl/base/"
+                   "source/psizzl/base/" "tex/psizzl/base/"
+                   "tex/psizzl/config/")
+             (base32
+              "07h8raq2k80ycvsaaaxaaczwwnhkxdbnvnr52mihr8dyih5s7jns")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/psizzl")
+    (synopsis "TeX format for physics papers")
+    (description
+     "PSIZZL is a TeX format for physics papers written at SLAC and used at
+several other places.  It dates from rather early in the development of TeX82;
+as a result, some of the descriptions of limitations look rather quaint to
+modern eyes.")
+    (license license:lppl)))
+
+(define-public texlive-ptptex
+  (package
+    (name "texlive-ptptex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ptptex/" "tex/latex/ptptex/")
+             (base32
+              "1f040dv31g8bdn0awa40mvhzp095glsfsxcg28cbslckbdds5k6c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ptptex")
+    (synopsis "Macros for @emph{Progress of Theoretical Physics}")
+    (description
+     "The distribution contains the class (which offers an option file for
+preprints), a template, and macros for writing articles in @emph{Progress of
+Theoretical Physics}.")
+    (license license:lppl)))
+
+(define-public texlive-punk
+  (package
+    (name "texlive-punk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/punk/"
+                   "fonts/source/public/punk/"
+                   "fonts/tfm/public/punk/")
+             (base32
+              "0ncarqjmwrsiw65p7mr44gjy0h90q5hw5n4jb5y2fxr1kgbzmz1p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/punk")
+    (synopsis "Donald Knuth's Punk font")
+    (description
+     "This package provides a response to the assertion in a lecture that
+``typography tends to lag behind other stylistic changes by about 10 years''.
+Knuth felt it was (in 1988) time to design a replacement for his designs of
+the 1970s, and came up with the Punk font!  The fonts are distributed as
+Metafont source.  The package also offers LaTeX support for them, although
+@code{punk-latex} is a better choice.")
+    (license license:knuth)))
+
+(define-public texlive-punk-latex
+  (package
+    (name "texlive-punk-latex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/punk-latex/"
+                   "tex/latex/punk-latex/")
+             (base32
+              "1gkbv3fwlfq8f3nn9zibhzwa5xw2scaf3xnkvlbxqcslmi129b2l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/punk-latex")
+    (synopsis "LaTeX support for Punk fonts")
+    (description
+     "The package and @file{.fd} file provide support for Knuth's Punk fonts.
+Although that bundle also offers support within LaTeX; the present package is
+to be preferred.")
+    (license license:gpl3+)))
+
+(define-public texlive-punknova
+  (package
+    (name "texlive-punknova")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/punknova/"
+                   "fonts/opentype/public/punknova/")
+             (base32
+              "07g0j329bgyzn3f3ac8gf9m6jh6zpwirw5l72mzzm8n32sgajym0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/punknova")
+    (synopsis "OpenType version of Knuth's Punk font")
+    (description
+     "Knuth's original Punk fonts generated different shapes at random.
+This isn't actually possible in an OpenType font; rather, the font contains
+several variants of each glyph, and uses the OpenType randomize function to
+select a variant for each invocation.")
+    (license license:knuth)))
+
+(define-public texlive-pxtxalfa
+  (package
+    (name "texlive-pxtxalfa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/pxtxalfa/"
+                   "fonts/tfm/public/pxtxalfa/"
+                   "fonts/vf/public/pxtxalfa/"
+                   "tex/latex/pxtxalfa/")
+             (base32
+              "1zanrgazaffpby6jmfncyq2g4sgi23p27wi2dx18zp0350ai55ia")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pxtxalfa")
+    (synopsis
+     "Virtual maths alphabets based on @code{pxfonts} and @code{txfonts}")
+    (description
+     "The package provides virtual math alphabets based on @code{pxfonts} and
+@code{txfonts}, with LaTeX support files and adjusted metrics.  The
+@code{mathalpha} package offers support for this collection.")
+    (license license:lppl)))
+
 (define-public texlive-pythonhighlight
   (package
     (name "texlive-pythonhighlight")
@@ -7636,6 +26019,45 @@ algorithms in a natural manner.")
 @code{listings} package.")
     (license license:bsd-3)))
 
+(define-public texlive-qobitree
+  (package
+    (name "texlive-qobitree")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/qobitree/" "tex/latex/qobitree/")
+             (base32
+              "1pzy5i8fi37zhkpsrh179qd4gp8ahwk8s2gw6261kjjiqf6p6znc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/qobitree")
+    (synopsis "LaTeX macros for typesetting trees")
+    (description
+     "This package provides commands @code{\\branch} and @code{\\leaf} for
+specifying the elements of the tree; you build up your tree with those
+commands, and then issue the @code{\\tree} command to typeset the whole.")
+    (license license:lppl)))
+
+(define-public texlive-qrbill
+  (package
+    (name "texlive-qrbill")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/qrbill/" "scripts/qrbill/"
+                   "source/latex/qrbill/" "tex/latex/qrbill/")
+             (base32
+              "0q0m2vfpndrdvihskc50imkzx6098syq9rz8mgpnl0h1ickfmx33")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/qrbill")
+    (synopsis "Create QR bills using LaTeX")
+    (description
+     "This LaTeX package provides support for creating QR-bills for the new
+Swiss payment standards.  This implementation is intended to offer an option
+to support these regulations and can be adapted for international use.")
+    (license (list license:lppl1.3c license:bsd-3))))
+
 (define-public texlive-qsharp
   (package
     (name "texlive-qsharp")
@@ -7655,6 +26077,134 @@ algorithms in a natural manner.")
 a domain-specific language for quantum programming.")
     (license license:lppl1.3c)))
 
+(define-public texlive-qtree
+  (package
+    (name "texlive-qtree")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/qtree/" "tex/latex/qtree/")
+             (base32
+              "1gmwkm6400pcrjnq111bih7za0p45nx6gy4lksvgjhdcpnykbbla")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/qtree")
+    (synopsis "Draw tree structures")
+    (description
+     "The package offers support for drawing tree diagrams, and is especially
+suitable for linguistics use.  It allows trees to be specified in a simple
+bracket notation, automatically calculates branch sizes, and supports both
+DVI/PostScript and PDF output by use of @code{pict2e} facilities.  The package
+is a development of the existing @code{qobitree} package, offering a new front
+end.")
+    (license license:lppl)))
+
+(define-public texlive-qualitype
+  (package
+    (name "texlive-qualitype")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/qualitype/"
+                   "fonts/opentype/public/qualitype/")
+             (base32
+              "027n3i9cy4p7wkbj1zrlsvagplxk74gz5cwv7mr4yl8gqzd41058")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/qualitype")
+    (synopsis "QualiType font collection")
+    (description
+     "This is a collection of 45 fonts, created by QualiType.")
+    (license (list license:silofl1.1 license:gpl2+))))
+
+(define-public texlive-quantumarticle
+  (package
+    (name "texlive-quantumarticle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/quantumarticle/"
+                   "doc/latex/quantumarticle/"
+                   "tex/latex/quantumarticle/")
+             (base32
+              "00v04n109mbi7w0xcmfdzs8f1fabwd2qhf53fqps99k3dj4z5f0a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/quantumarticle")
+    (synopsis "Document class for submissions to the @emph{Quantum} journal")
+    (description
+     "This package provides the preferred document class for papers to be
+submitted to @emph{Quantum --- the open journal of quantum science}.  It is
+based on the @code{article} document class.
+
+As a service to authors, the document class comes with a predefined
+bibliography style @file{quantum.bst} that is optimized to be used with the
+@code{quantumarticle} document class.  Additionally, the @code{quantumview}
+document class is provided, which can be used as a proxy to typeset the
+HTML-only editorial pieces in @emph{Quantum Views}.
+
+The @code{quantumarticle} document class also offers an option to remove the
+@emph{Quantum}-related branding.  In that way, users can use it for their
+notes as well.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-quattrocento
+  (package
+    (name "texlive-quattrocento")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/quattrocento/"
+                   "fonts/enc/dvips/quattrocento/"
+                   "fonts/map/dvips/quattrocento/"
+                   "fonts/tfm/impallari/quattrocento/"
+                   "fonts/truetype/impallari/quattrocento/"
+                   "fonts/type1/impallari/quattrocento/"
+                   "fonts/vf/impallari/quattrocento/"
+                   "tex/latex/quattrocento/")
+             (base32
+              "1mgsyl3xc9274mdh3ssd9ifxb0d9rlv0y33nlw9pwnl9y9f9gd9a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/quattrocento")
+    (synopsis "Quattrocento and Quattrocento Sans fonts with LaTeX support")
+    (description
+     "The package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Quattrocento and Quattrocento Sans families of fonts, designed by Pablo
+Impallari; the fonts themselves are also provided, in both TrueType and Type1
+format.  Quattrocento is a classic typeface with wide and open letterforms,
+and great x-height, which makes it very legible for body text at small sizes.
+Tiny details that only show up at bigger sizes make it also great for display
+use.  Quattrocento Sans is the perfect sans-serif companion for
+Quattrocento.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-raleway
+  (package
+    (name "texlive-raleway")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/raleway/"
+                   "fonts/enc/dvips/raleway/"
+                   "fonts/map/dvips/raleway/"
+                   "fonts/opentype/impallari/raleway/"
+                   "fonts/tfm/impallari/raleway/"
+                   "fonts/type1/impallari/raleway/"
+                   "fonts/vf/impallari/raleway/"
+                   "tex/latex/raleway/")
+             (base32
+              "1pp5m31rr4lww0z92q3vsaz1l01nb78ll5mn2l9w469hpghf2gd3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/raleway")
+    (synopsis "Use Raleway with TeX(-alike) systems")
+    (description
+     "The package provides the Raleway family in an easy to use way.  For
+XeLaTeX and LuaLaTeX users the original OpenType fonts are used.  The entire
+font family is included.")
+    (license license:silofl1.1)))
+
 (define-public texlive-rank-2-roots
   (package
     (name "texlive-rank-2-roots")
@@ -7695,6 +26245,26 @@ systems, with Weyl chambers, weight lattices, and parabolic subgroups.")
 for typesetting homework assignments, and formula cheat sheets for exams.")
     (license license:lppl1.3c)))
 
+(define-public texlive-realtranspose
+  (package
+    (name "texlive-realtranspose")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/realtranspose/"
+                   "source/latex/realtranspose/"
+                   "tex/latex/realtranspose/")
+             (base32
+              "0ar1yisx6pq8qjhsvb406l5j06y9jkyxvvgq9s1sg15nk9sjzy1r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/realtranspose")
+    (synopsis "The ``real'' way to transpose a matrix")
+    (description
+     "With @code{realtranspose} you can notate the transposition of a matrix
+by rotating the symbols 90 degrees.")
+    (license license:expat)))
+
 (define-public texlive-rec-thy
   (package
     (name "texlive-rec-thy")
@@ -7716,6 +26286,81 @@ functionals, c.e.@: sets, stagewise computations, forcing and syntactic
 classes.")
     (license license:public-domain)))
 
+(define-public texlive-recorder-fingering
+  (package
+    (name "texlive-recorder-fingering")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/recorder-fingering/"
+                   "tex/latex/recorder-fingering/")
+             (base32
+              "075n6ifhpn15fdnrhp326lzp0dnzs0j287g7kr4xx59cc1m6lqkg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/recorder-fingering")
+    (synopsis "Package to display recorder fingering diagrams")
+    (description
+     "This package provides support for generating and displaying fingering
+diagrams for baroque fingering recorders.  Standard fingerings are provided
+for recorders in both C and F, along with methods to create and display
+alternate fingerings for trills, etc.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-recycle
+  (package
+    (name "texlive-recycle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/recycle/"
+                   "fonts/map/dvips/recycle/"
+                   "fonts/source/public/recycle/"
+                   "fonts/tfm/public/recycle/"
+                   "fonts/type1/public/recycle/"
+                   "tex/latex/recycle/")
+             (base32
+              "16kmi7a75vrv3pfnxydxb21pafvi98q39jrdd10a94vxx6fdlx7s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    ;; FIXME: Font metrics generation fails with "! Inconsistent equation (off
+    ;; by 0.00162)." errors.
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'generate-font-metrics))))
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/recycle")
+    (synopsis "Font providing the ``recyclable'' logo")
+    (description
+     "This single-character font is provided as Metafont source, and in Adobe
+Type 1 format.  It is accompanied by a trivial LaTeX package to use the logo
+at various sizes.")
+    (license license:gpl3+)))
+
+(define-public texlive-reledmac
+  (package
+    (name "texlive-reledmac")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/reledmac/"
+                   "source/latex/reledmac/"
+                   "tex/latex/reledmac/")
+             (base32
+              "16nfibnjdasflskmxd23hxkapz788abfilwxm3vdj6djkznxq4sw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/reledmac")
+    (synopsis "Typeset scholarly editions")
+    (description
+     "This package provides a package for typesetting scholarly critical
+editions, replacing the established @code{ledmac} and @code{eledmac} packages.
+It supports indexing by page and by line numbers, and simple @code{tabular}-
+and @code{array}-style environments.  The package is distributed with the
+related @code{reledpar} package.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-resolsysteme
   (package
     (name "texlive-resolsysteme")
@@ -7746,6 +26391,27 @@ solution of a linear system;
 @end itemize")
     (license license:lppl1.3c)))
 
+(define-public texlive-resphilosophica
+  (package
+    (name "texlive-resphilosophica")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/resphilosophica/"
+                   "doc/latex/resphilosophica/"
+                   "source/latex/resphilosophica/"
+                   "tex/latex/resphilosophica/")
+             (base32
+              "12a0pnksxh3b0w9iwhly9sb8j6jhhmk9r1957mb7m01h435n9yb4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/resphilosophica")
+    (synopsis "Typeset articles for the journal @emph{Res Philosophica}")
+    (description
+     "The bundle provides a class for typesetting articles for the journal
+@emph{Res Philosophica}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-rest-api
   (package
     (name "texlive-rest-api")
@@ -7768,6 +26434,48 @@ method description path parameter request body and content type response body,
 content type and status code.")
     (license license:lppl1.3c)))
 
+(define-public texlive-resumecls
+  (package
+    (name "texlive-resumecls")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/resumecls/"
+                   "source/xelatex/resumecls/"
+                   "tex/xelatex/resumecls/")
+             (base32
+              "14za3bvvksq6xjvbppfm17cj8abspj7h7l7snyd2vciy0dc305yg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/resumecls")
+    (synopsis "Typeset a resume both in English and Chinese")
+    (description
+     "This package provides a LaTeX document class to typeset a resume or CV
+both in English and Chinese with more ease and flexibility.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-reverxii
+  (package
+    (name "texlive-reverxii")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/reverxii/"
+                   "source/generic/reverxii/"
+                   "tex/generic/reverxii/")
+             (base32
+              "1gg8qbc8ll3n6rfp3pjshbbjd30s4n3yk219y6qcmz1nv66fp1qq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (native-inputs (list (texlive-updmap.cfg)))
+    (home-page "https://ctan.org/pkg/reverxii")
+    (synopsis "Playing Reversi in TeX")
+    (description
+     "Following the lead of @file{xii.tex}, this little program plays
+Reversi.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-revquantum
   (package
     (name "texlive-revquantum")
@@ -7793,6 +26501,71 @@ provides fallbacks.  It also warns when users try to load packages which are
 known to be incompatible with @code{revtex4-1}.")
     (license license:lppl1.3+)))
 
+(define-public texlive-revtex4
+  (package
+    (name "texlive-revtex4")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/revtex4/" "doc/latex/revtex4/"
+                   "source/latex/revtex4/" "tex/latex/revtex4/")
+             (base32
+              "0mfjp8ycsvq63vk5348r7yfcskldx6ipcwflxz7pnf60xfla5646")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/revtex4-0")
+    (synopsis "Styles for various physics journals (old version)")
+    (description
+     "This is an old version of @code{revtex}, and is kept as a courtesy to
+users having difficulty with the incompatibility of that latest version.")
+    (license license:lppl)))
+
+(define-public texlive-revtex4-1
+  (package
+    (name "texlive-revtex4-1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/revtex4-1/"
+                   "doc/latex/revtex4-1/"
+                   "source/latex/revtex4-1/"
+                   "tex/latex/revtex4-1/")
+             (base32
+              "023pzbf8hgyk6038zz9g4g95pwqrsqy1ahzy6byxh28b2p8qyk9a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:modules '((ice-9 match)
+                  (ice-9 regex)
+                  (srfi srfi-1)
+                  (guix build texlive-build-system)
+                  (guix build utils))
+      #:build-targets #~(list "revtex4-1.dtx")
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; In order to build revtex4-1, we need files from revtex source.
+          ;; Add them to TEXINPUTS.
+          (add-before 'build 'extend-texinputs
+            (lambda* (#:key inputs native-inputs #:allow-other-keys)
+              (let ((revtex-source
+                     (any (match-lambda
+                            ((_ . dir)
+                             (and (string-match "texlive-revtex-[0-9]+-checkout"
+                                                dir)
+                                  dir)))
+                          (or native-inputs inputs))))
+                (setenv "TEXINPUTS"
+                        (string-append revtex-source
+                                       "/source/latex/revtex/:"))))))))
+    (native-inputs (list (package-source texlive-revtex)))
+    (home-page "https://ctan.org/pkg/revtex4-1")
+    (synopsis "Styles for various physics journals")
+    (description
+     "This is an old version of @code{revtex}, and is kept as a courtesy to
+users having difficulty with the incompatibility of that latest version.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-ribbonproofs
   (package
     (name "texlive-ribbonproofs")
@@ -7837,6 +26610,297 @@ package solves the problem by extending ideas described in M. I. Grinchuk
 mathematical packages.")
     (license license:lppl1.3+)))
 
+(define-public texlive-roboto
+  (package
+    (name "texlive-roboto")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/roboto/"
+                   "fonts/enc/dvips/roboto/"
+                   "fonts/map/dvips/roboto/"
+                   "fonts/opentype/google/roboto/"
+                   "fonts/tfm/google/roboto/"
+                   "fonts/type1/google/roboto/"
+                   "fonts/vf/google/roboto/"
+                   "tex/latex/roboto/")
+             (base32
+              "1gbg9p9y6a2fis88qfcsscksrkkcnqvsrhdkak2jm2dfjnq6v2n8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/roboto")
+    (synopsis "Support for the Roboto family of fonts")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Roboto Sans, Roboto Condensed, Roboto Mono, Roboto Slab and Roboto Serif
+families of fonts, designed by Christian Robertson and Greg Gazdowicz.")
+    (license (list license:asl2.0 license:silofl1.1 license:lppl))))
+
+(define-public texlive-romande
+  (package
+    (name "texlive-romande")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/romande/"
+                   "fonts/afm/arkandis/romande/"
+                   "fonts/enc/dvips/romande/"
+                   "fonts/map/dvips/romande/"
+                   "fonts/tfm/arkandis/romande/"
+                   "fonts/type1/arkandis/romande/"
+                   "fonts/vf/arkandis/romande/"
+                   "source/fonts/romande/"
+                   "tex/latex/romande/")
+             (base32
+              "0xvahacjs8g5bl7yy89wi50m894r2402d5203ai79fk9d7rbc116")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/romandeadf")
+    (synopsis "Romande ADF fonts and LaTeX support")
+    (description
+     "Romande ADF is a serif font family with oldstyle figures, designed as
+a substitute for Times, Tiffany or Caslon.  The family currently includes
+upright, italic and small-caps shapes in each of regular and demi-bold weights
+and an italic script in regular.  The support package renames the fonts
+according to the Karl Berry fontname scheme and defines four families.  Two of
+these primarily provide access to the standard, or default, characters while
+the alternate families support alternate characters, additional ligatures and
+the long @emph{s}.  The included package files provide access to these
+features in LaTeX.")
+    (license license:lppl)))
+
+(define-public texlive-rosario
+  (package
+    (name "texlive-rosario")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/rosario/"
+                   "fonts/enc/dvips/rosario/"
+                   "fonts/map/dvips/rosario/"
+                   "fonts/opentype/public/rosario/"
+                   "fonts/tfm/public/rosario/"
+                   "fonts/type1/public/rosario/"
+                   "fonts/vf/public/rosario/"
+                   "source/fonts/rosario/"
+                   "tex/latex/rosario/")
+             (base32
+              "0bmz2xzx1xi3vn9s4wqij65nq54k9bc0kbxgnzd0p6q030g5yqby")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/rosario")
+    (synopsis "Using the Rosario fonts with LaTeX")
+    (description
+     "The package provides the files required to use the Rosario fonts with
+LaTeX.  Rosario is a set of four fonts provided by Hector Gatti.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-rsfso
+  (package
+    (name "texlive-rsfso")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/rsfso/" "fonts/map/dvips/rsfso/"
+                   "fonts/tfm/public/rsfso/"
+                   "fonts/vf/public/rsfso/" "tex/latex/rsfso/")
+             (base32
+              "1fm65p7k0kfiksap2f2g8lqmgdykmhq80ff5qgma4cnqa4sa3jza")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/rsfso")
+    (synopsis "Mathematical calligraphic font based on @code{rsfs}")
+    (description
+     "The package provides virtual fonts and LaTeX support files for
+mathematical calligraphic fonts based on the @code{rsfs} Adobe Type 1 fonts,
+with the slant substantially reduced.  The output is quite similar to that
+from the Adobe Mathematical Pi script font.")
+    (license license:lppl)))
+
+(define-public texlive-rrgtrees
+  (package
+    (name "texlive-rrgtrees")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/rrgtrees/"
+                   "source/latex/rrgtrees/"
+                   "tex/latex/rrgtrees/")
+             (base32
+              "0h33q32pb1s8zv598aacdzfhpk2psrzxgxnav6am16cxfri60hpi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/rrgtrees")
+    (synopsis
+     "Linguistic tree diagrams for Role and Reference Grammar (RRG) with LaTeX")
+    (description
+     "This package provides a set of LaTeX macros that makes it easy to
+produce linguistic tree diagrams suitable for Role and Reference
+Grammar (RRG).  This package allows the construction of trees with crossing
+lines, as is required by this theory for many languages.")
+    (license license:lppl)))
+
+(define-public texlive-rsc
+  (package
+    (name "texlive-rsc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/rsc/" "doc/latex/rsc/"
+                   "source/latex/rsc/" "tex/latex/rsc/")
+             (base32
+              "1fgc54fyikrgx81gfhv7mab6sqj4xjz6pyrkxk8jnlwwqrsk0yxb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/rsc")
+    (synopsis "BibTeX style for use with RSC journals")
+    (description
+     "The @code{rsc} package provides a BibTeX style in accordance with the
+requirements of the Royal Society of Chemistry.  It was originally based on
+the file @file{pccp.bst}, but also implements a number of styles from the
+@code{achemso} package.  The package is now a stub for the @code{chemstyle}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-rtklage
+  (package
+    (name "texlive-rtklage")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/rtklage/" "tex/latex/rtklage/")
+             (base32
+              "0p9z4dgh572n7j6b8vf8aqag8ybqw3xzsh5kab1czks2774gm7cq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ratex")
+    (synopsis "Package for German lawyers")
+    (description
+     "RATeX is a newly developed bundle of packages and classes provided for
+German lawyers.  Now in the early beginning it only contains @code{rtklage},
+a class to make lawsuits.")
+    (license license:lppl)))
+
+(define-public texlive-rubik
+  (package
+    (name "texlive-rubik")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/rubik/"
+                   "doc/man/man1/rubikrotation.1"
+                   "doc/man/man1/rubikrotation.man1.pdf"
+                   "scripts/rubik/"
+                   "source/latex/rubik/"
+                   "tex/latex/rubik/")
+             (base32
+              "0v7j88d72acgrj24x8g859k7q6qd47pjy3wdqfvrqq3y39x48011")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "rubikrotation.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/rubik")
+    (synopsis "Document Rubik cube configurations and rotation sequences")
+    (description
+     "The bundle provides four packages:
+@itemize
+
+@item @code{rubikcube} provides commands for typesetting Rubik cubes
+and their transformations,
+
+@item @code{rubiktwocube} provides commands for typesetting Rubik
+twocubes and their transformations,
+
+@item @code{rubikrotation} can process a sequence of Rubik rotation
+moves, with the help of a Perl package executed via
+@code{\\write18} (shell escape) commands,
+
+@item @code{rubikpatterns} is a collection of well known patterns and
+their associated rotation sequences.
+
+@end itemize")
+    (license license:lppl1.3+)))
+
+(define-public texlive-rutitlepage
+  (package
+    (name "texlive-rutitlepage")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/rutitlepage/"
+                   "source/latex/rutitlepage/"
+                   "tex/latex/rutitlepage/")
+             (base32
+              "0pcd6cqlm3r7wq9k96ignvars436hg9j5la4aaq35ldm01sqy268")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/rutitlepage")
+    (synopsis "Radboud University titlepage package")
+    (description
+     "This is an unofficial LaTeX package to generate titlepages for the
+Radboud University, Nijmegen.  It uses official vector logos from the
+university.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ryersonsgsthesis
+  (package
+    (name "texlive-ryersonsgsthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ryersonsgsthesis/"
+                   "tex/latex/ryersonsgsthesis/")
+             (base32
+              "170z5xqxwbx999dxlxhwf7mbml6j4pak6a8lgi4vbj8ii4njlygb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ryersonsgsthesis")
+    (synopsis "Ryerson School of Graduate Studies thesis template")
+    (description
+     "This package provides a LaTeX class and template files for Ryerson
+School of Graduate Studies (SGS) theses.")
+    (license license:asl2.0)))
+
+(define-public texlive-ryethesis
+  (package
+    (name "texlive-ryethesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ryethesis/"
+                   "source/latex/ryethesis/"
+                   "tex/latex/ryethesis/")
+             (base32
+              "1xjzl1ng0nbcakiasi6sfbkannfipcfv96crq6y6cb7p7l707wg7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ryethesis")
+    (synopsis "Class for Ryerson Unversity Graduate School requirements")
+    (description
+     "The class offers support for formatting a thesis, dissertation or
+project according to Ryerson University's School of Graduate Studies thesis
+formatting regulations.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-sageep
+  (package
+    (name "texlive-sageep")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/sageep/" "doc/latex/sageep/"
+                   "source/latex/sageep/" "tex/latex/sageep/")
+             (base32
+              "1xmfqqsabc7vv3rh74qlry5jkvp0ddyi8m4yynriv5vzyqigfw5y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sageep")
+    (synopsis "Format papers for the annual meeting of EEGS")
+    (description
+     "The class provides formatting for papers for the annual meeting of the
+@acronym{EEGS, Environmental and Engineering Geophysical Society}: Application
+of Geophysics to Engineering and Environmental Problems, known as SAGEEP.")
+    (license license:lppl)))
+
 (define-public texlive-sankey
   (package
     (name "texlive-sankey")
@@ -7857,6 +26921,50 @@ diagrams, i.e., flow diagrams in which the width of the arrows is proportional
 to the flow rate.")
     (license (list license:lppl1.3+ license:gpl3+))))
 
+(define-public texlive-sansmathaccent
+  (package
+    (name "texlive-sansmathaccent")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/sansmathaccent/"
+                   "fonts/map/dvips/sansmathaccent/"
+                   "fonts/tfm/public/sansmathaccent/"
+                   "fonts/vf/public/sansmathaccent/"
+                   "tex/latex/sansmathaccent/")
+             (base32
+              "03xd3wpmzrggpmjrff4ka56v2zycbznlcdfyvz74xxjnngxz81qm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sansmathaccent")
+    (synopsis "Correct placement of accents in sans-serif maths")
+    (description
+     "Sans serif maths (produced by the @code{beamer} class or the
+@code{sfmath} package) often has accents positioned incorrectly.  This package
+fixes the positioning of such accents when the default font (@code{cmssi}) is
+used for sans serif maths.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-sapthesis
+  (package
+    (name "texlive-sapthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/sapthesis/"
+                   "doc/latex/sapthesis/"
+                   "tex/latex/sapthesis/")
+             (base32
+              "15livlw0xbc6ys408pqqvh3qvzphigar9cr57dd0is4zrh4c2y36")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sapthesis")
+    (synopsis "Typeset theses for Sapienza-University, Rome")
+    (description
+     "The class will typeset PhD, master, and bachelor theses that adhere to
+the publishing guidelines of the Sapienza University of Rome.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-sasnrdisplay
   (package
     (name "texlive-sasnrdisplay")
@@ -7878,6 +26986,196 @@ their calculations or simulations into LaTeX projects.  The package is also
 capable of overloading the Sweave User Manual and SASweave packages.")
     (license license:lppl1.3+)))
 
+(define-public texlive-sauterfonts
+  (package
+    (name "texlive-sauterfonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sauterfonts/"
+                   "source/latex/sauterfonts/"
+                   "tex/latex/sauterfonts/")
+             (base32
+              "0h34vp94i16al0z8zw5xn3igk2hg4nnb507kiv87qxrr3gl11zy4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sauterfonts")
+    (synopsis "Use Sauter's fonts in LaTeX")
+    (description
+     "The package provides font definition files (plus a replacement for the
+package @code{exscale}) to access many of the fonts in Sauter's collection.
+These fonts are available in all point sizes and look nicer for such
+intermediate document sizes as 11pt.  Also included is the package
+@code{sbbm}, an alternative to access the BBM fonts.")
+    (license license:gpl3+)))
+
+(define-public texlive-schola-otf
+  (package
+    (name "texlive-schola-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/schola-otf/"
+                   "tex/latex/schola-otf/")
+             (base32
+              "1ygc9bhdc9qgp20r17am8k7zmc1c1rdra0a56davw5y93zjvyzji")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/schola-otf")
+    (synopsis "Using the OpenType fonts TeX Gyre Schola")
+    (description
+     "This package can only be used with LuaLaTeX or XeLaTeX.  It does the
+font setting for the OpenType font TeX Gyre Schola for text and math.  The
+missing typefaces like bold math and slanted text are also defined.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-scholax
+  (package
+    (name "texlive-scholax")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/scholax/"
+                   "fonts/afm/public/scholax/"
+                   "fonts/enc/dvips/scholax/"
+                   "fonts/map/dvips/scholax/"
+                   "fonts/opentype/public/scholax/"
+                   "fonts/tfm/public/scholax/"
+                   "fonts/type1/public/scholax/"
+                   "fonts/vf/public/scholax/"
+                   "tex/latex/scholax/")
+             (base32
+              "1jw09a75gw9favzpfkp4kmwf6wz9kp4jsk8f838rk1x76q213rrw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/scholax")
+    (synopsis
+     "Extension of TeXGyreSchola (New Century Schoolbook) with math support")
+    (description
+     "This package contains an extension of TeXGyreSchola with extensive
+superiors, inferior figures, upright punctuation glyphs added to the Italic
+face for a theorem font, plus slanted and bold slanted faces.  Math support is
+provided by one of two options to @code{newtxmath}, one of which uses an
+adaptation of the Fourier math Greek letters.")
+    (license license:lppl)))
+
+(define-public texlive-schule
+  (package
+    (name "texlive-schule")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/schule/" "tex/latex/schule/")
+             (base32
+              "0pwc75s9r95rcq9xh2wjzv3hd2xqhkls39pgagg7gvdvax11dbvh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/schule")
+    (synopsis "Support for teachers at German schools")
+    (description
+     "The @code{schule} bundle was built to provide packages and commands that
+could be useful for documents in German schools.  At the moment, its main
+focus lies on documents for informatics as a school subject.  An extension for
+physics is currently in progress.
+
+For the time being, the whole package splits up into individual packages for
+informatics (including syntax diagrams, Nassi-Shneiderman diagrams, sequence
+diagrams, object diagrams, and class diagrams) as well as classes for written
+exams (tests, quizzes, teaching observations, information sheets, worksheets,
+and answer keys).")
+    (license license:lppl1.3+)))
+
+(define-public texlive-schulschriften
+  (package
+    (name "texlive-schulschriften")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/schulschriften/"
+                   "fonts/source/public/schulschriften/"
+                   "fonts/tfm/public/schulschriften/"
+                   "tex/latex/schulschriften/")
+             (base32
+              "14nbgqr213zfm1y50bh0ggs40zpi1lfjmc4yc5mprwf7q174zrbr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/schulschriften")
+    (synopsis "German school scripts from Suetterlin to the present day")
+    (description
+     "This package provides the Metafont sources for the following school
+fonts: Das Paket enthalt im wesentlichen die Metafont-Quellfiles fur die
+folgenden Schulausgangsschriften: Suetterlinschrift, Deutsche Normalschrift,
+Lateinische Ausgangsschrift, Schulausgangsschrift, and Vereinfachte
+Ausgangsschrift.")
+    (license license:lppl)))
+
+(define-public texlive-scientific-thesis-cover
+  (package
+    (name "texlive-scientific-thesis-cover")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/scientific-thesis-cover/"
+                   "source/latex/scientific-thesis-cover/"
+                   "tex/latex/scientific-thesis-cover/")
+             (base32
+              "1ny19pczzrrwb20sin1qn914hy1npwxkx573g3n5gm62kzl1vc4k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/scientific-thesis-cover")
+    (synopsis "Provides cover page and affirmation at the end of a thesis")
+    (description
+     "Institutions require a cover page and an affirmation at the end of
+a thesis.  This package provides both.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-shobhika
+  (package
+    (name "texlive-shobhika")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/shobhika/"
+                   "fonts/opentype/public/shobhika/")
+             (base32
+              "0a9l8gdn9ddz334dwfdn7vjgrq9jz6b41wph9sgchank4yj0sc64")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/shobhika")
+    (synopsis "OpenType Devanagari font designed for scholars")
+    (description
+     "This package provides a Unicode compliant OpenType font with support for
+Devanagari, Latin, and Cyrillic scripts.  It is available in two
+weights--regular and bold.  The font is designed with over 1600 Devanagari
+glyphs, including support for over 1100 conjunct consonants, as well as vedic
+accents.  The Latin component of the font not only supports a wide range of
+characters required for Roman transliteration of Sanskrit, but also provides
+a subset of regularly used mathematical symbols for scholars working with
+scientific and technical documents.")
+    (license license:silofl1.1)))
+
+(define-public texlive-schwalbe-chess
+  (package
+    (name "texlive-schwalbe-chess")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/schwalbe-chess/"
+                   "source/latex/schwalbe-chess/"
+                   "tex/latex/schwalbe-chess/")
+             (base32
+              "1i68bl4hb7cagwwb4lyihvdnwgd0irgqp7344m5kmsdxy7z94fmr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/schwalbe-chess")
+    (synopsis "Typeset the German chess magazine @emph{Die Schwalbe}")
+    (description
+     "The package is used to typeset the German chess magazine @emph{Die
+Schwalbe}.  It is based on @code{chess-problem-diagrams}, which in its turn
+has a dependency on the @code{bartel-chess-fonts}.")
+    (license license:lppl1.2+)))
+
 (define-public texlive-sciposter
   (package
     (name "texlive-sciposter")
@@ -7921,6 +27219,24 @@ effortless pretty-printing of SuperCollider source code in documents typeset
 with LaTeX and friends.")
     (license license:lppl1.3+)))
 
+(define-public texlive-scrabble
+  (package
+    (name "texlive-scrabble")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/scrabble/" "tex/latex/scrabble/")
+             (base32
+              "1wr85x1kh6457sr61cq6mx8z6zrf61c9659a941wakc610sbqlsx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/scrabble")
+    (synopsis "Commands for Scrabble boards")
+    (description
+     "This package provides some commands (in English and in French) to work
+with a Scrabble board.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-scratchx
   (package
     (name "texlive-scratchx")
@@ -7940,6 +27256,209 @@ LaTeX documents.  This may be particularly useful for Math Teachers and IT
 specialists.")
     (license license:lppl1.3c)))
 
+(define-public texlive-screenplay
+  (package
+    (name "texlive-screenplay")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/screenplay/"
+                   "source/latex/screenplay/"
+                   "tex/latex/screenplay/")
+             (base32
+              "16vw7ikxblzlmamz0d95d0zj6vzhdg75w0q645sfh75pj7v6b1v0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/screenplay")
+    (synopsis "Class file to typeset screenplays")
+    (description
+     "The class implements the format recommended by the Academy of Motion
+Picture Arts and Sciences.")
+    (license license:gpl3+)))
+
+(define-public texlive-screenplay-pkg
+  (package
+    (name "texlive-screenplay-pkg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/screenplay-pkg/"
+                   "tex/latex/screenplay-pkg/")
+             (base32
+              "07xl6631yjjx56whl1vl4mzdcn8k63i624lspxiw18ppfrxdh3an")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/screenplay-pkg")
+    (synopsis "Package version of the screenplay document class")
+    (description
+     "This package implements the tools of the @code{screenplay} document
+class in the form of a package so that screenplay fragments can be included
+within another document class.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-scripture
+  (package
+    (name "texlive-scripture")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/scripture/"
+                   "source/latex/scripture/"
+                   "tex/latex/scripture/")
+             (base32
+              "05qw58is7qhs5nfmj1d576wc5wx5cg6aihnm8hm8npvqd4njl2gj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/scripture")
+    (synopsis "LaTeX style for typesetting @emph{Bible} quotations")
+    (description
+     "The @code{scripture} package provides a set of macros for typesetting
+quotations from the @emph{Bible}.  It provides many features commonly seen in
+bibles such as dropped text for chapter numbers, superscripts for verse
+numbers, indented lines for poetry sections, narrow sections and hanging
+paragraphs.  A reference for the quotation can optionally be added.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-scrjrnl
+  (package
+    (name "texlive-scrjrnl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/scrjrnl/" "source/latex/scrjrnl/"
+                   "tex/latex/scrjrnl/")
+             (base32
+              "10smy8cq2papzv63q5lsharxcn1l1ln97fhrd39wm2jf48967lbn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/scrjrnl")
+    (synopsis "Typeset diaries or journals")
+    (description
+     "This package provides a class, based on @code{scrbook}, designed for
+typesetting diaries, journals or devotionals.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-sduthesis
+  (package
+    (name "texlive-sduthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sduthesis/"
+                   "source/latex/sduthesis/"
+                   "tex/latex/sduthesis/")
+             (base32
+              "1c9dmgjbxc0xyphi4hcb9yilmhh6hg0l2r4vkyjds3xgii7kwkn7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sduthesis")
+    (synopsis "Thesis template of Shandong University")
+    (description
+     "This package provides a thesis template of Shandong University.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-se2thesis
+  (package
+    (name "texlive-se2thesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/se2thesis/"
+                   "source/latex/se2thesis/"
+                   "tex/latex/se2thesis/")
+             (base32
+              "0ixdj8klgj9i7hcrmwrxngyc5pgxpfkw3awkn5s0dcppz88rid1n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/se2thesis")
+    (synopsis
+     "Thesis class for the Chair of Software Engineering II at the
+University of Passau, Germany")
+    (description
+     "The @code{se2thesis} bundle provides a document class for writing
+a theses with the Chair of Software Engineering II at the University of
+Passau, Germany.  The class is based on KOMA-Script classes.  While the class
+provides some basic settings, mostly regrading the type area, fonts, and the
+title page, it still provides large degrees of freedom to its users.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-serbian-apostrophe
+  (package
+    (name "texlive-serbian-apostrophe")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/serbian-apostrophe/"
+                   "tex/latex/serbian-apostrophe/")
+             (base32
+              "0hkgm4q74kn172nr5whlwjq88sfqm66cvnsv7nidcqssybnn5891")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/serbian-apostrophe")
+    (synopsis "Commands for Serbian words with apostrophes")
+    (description
+     "The package provides a collection of commands (whose names are Serbian
+words) whose expansion is the Serbian word with appropriate apostrophes.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-serbian-date-lat
+  (package
+    (name "texlive-serbian-date-lat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/serbian-date-lat/"
+                   "tex/latex/serbian-date-lat/")
+             (base32
+              "1m23r2i2dxw4xnxih94iyiwk4a5ggvn7wkqhp8ai5va5grp36kfk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/serbian-date-lat")
+    (synopsis "Updated date typesetting for Serbian")
+    (description
+     "Babel defines dates for Serbian texts, in Latin script.  The style it
+uses does not match current practices.  The present package defines
+a @code{\\date} command that solves the problem.")
+    (license license:gpl2)))
+
+(define-public texlive-serbian-def-cyr
+  (package
+    (name "texlive-serbian-def-cyr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/serbian-def-cyr/"
+                   "tex/latex/serbian-def-cyr/")
+             (base32
+              "116sgzxvny1hbkfc5s8bxirk9zshyv8qdd2fdr8iwqjfd7lhx03i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/serbian-def-cyr")
+    (synopsis "Serbian Cyrillic localization")
+    (description
+     "This package provides abstract, chapter, title, date etc, for Serbian
+language in Cyrillic scripts in T2A encoding and CP1251 code pages.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-serbian-lig
+  (package
+    (name "texlive-serbian-lig")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/serbian-lig/"
+                   "tex/latex/serbian-lig/")
+             (base32
+              "1vq33mr8br7z7y5ayb5wmhy0ralgx6alb9kmhaahdx8a105dl81b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/serbian-lig")
+    (synopsis "Control ligatures in Serbian")
+    (description
+     "The package suppresses @samp{fi} and @samp{fl} (and other ligatures) in
+Serbian text written using Roman script.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-sesamanuel
   (package
     (name "texlive-sesamanuel")
@@ -7962,6 +27481,68 @@ a @code{sesamanuelTIKZ} style to be used for TikZ pictures in the Sesamath
 book.")
     (license license:lppl1.3+)))
 
+(define-public texlive-seu-ml-assign
+  (package
+    (name "texlive-seu-ml-assign")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/seu-ml-assign/"
+                   "tex/latex/seu-ml-assign/")
+             (base32
+              "1w8dhp0kmgi9ywskq772ccj5n0kd7j55y15xwm3ss3jjdh4vzh8m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/seu-ml-assign")
+    (synopsis "Southeast University Machine Learning Assignment template")
+    (description
+     "This is a template for the Southeast University Machine Learning
+Assignment that can be easily adapted to other usages.  This template features
+a colorful theme that makes it look elegant and attractive.")
+    (license license:expat)))
+
+(define-public texlive-seuthesis
+  (package
+    (name "texlive-seuthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/seuthesis/"
+                   "doc/latex/seuthesis/"
+                   "source/latex/seuthesis/")
+             (base32
+              "1gb1bql0llnms1c18xzp4g8j16zffinjjydiv4gsasyvxc0p8c5n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/seuthesis")
+    (synopsis "LaTeX template for theses at Southeastern University")
+    (description
+     "This template is for theses at Southeastern University, Nanjing,
+China.")
+    (license license:gpl3)))
+
+(define-public texlive-seuthesix
+  (package
+    (name "texlive-seuthesix")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/seuthesix/"
+                   "doc/latex/seuthesix/"
+                   "source/latex/seuthesix/"
+                   "tex/latex/seuthesix/")
+             (base32
+              "0k87ib96pbihph399rc3kl1c3ncb4w4ljmwmvw880vvrxvz8mxjs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/seuthesix")
+    (synopsis "LaTeX class for theses at Southeast University, Nanjing, China")
+    (description
+     "This project provides a LaTeX document class as well as a bibliography
+style file for typesetting theses at the Southeast University, Nanjing, China.
+It is based on the @code{seuthesis}.")
+    (license license:gpl3)))
+
 (define-public texlive-sfg
   (package
     (name "texlive-sfg")
@@ -7980,6 +27561,112 @@ book.")
 electrical and electronics engineers and graph theorists.")
     (license license:lppl)))
 
+(define-public texlive-sgame
+  (package
+    (name "texlive-sgame")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sgame/" "tex/latex/sgame/")
+             (base32
+              "0kzrimwmgwa3f61vawc1fq5vvgx4pxa2586wqhd4cf66ywdikn0v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sgame")
+    (synopsis "LaTeX style for typesetting strategic games")
+    (description
+     "This package can be used to format strategic games.  For a 2x2 game,
+for example, the input: @samp{\\begin@{game@}{2}{2} &$L$ &$M$\\\\ $T$ &$2,2$
+&$2,0$\\\\ $B$ &$3,0$ &$0,9$ \\end@{game@}} produces output with (a) boxes
+around the payoffs, (b) payoff columns of equal width, and (c) payoffs
+vertically centered within the boxes.")
+    (license license:lppl)))
+
+(define-public texlive-shortmathj
+  (package
+    (name "texlive-shortmathj")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/shortmathj/"
+                   "tex/latex/shortmathj/")
+             (base32
+              "0rkrskx2fay7h6naa995l46xjj8v3ffdd6kx6fq6fknr091yfp7q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/shortmathj")
+    (synopsis "Automatically shortify titles of mathematical journals")
+    (description
+     "This small dummy package just contains a simple list of full and short
+journal names as written in AMS standard:
+@url{https://mathscinet.ams.org/msnhtml/serials.pdf}.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-showtags
+  (package
+    (name "texlive-showtags")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/showtags/" "tex/latex/showtags/")
+             (base32
+              "0690p94mmlwhg06wzisa73w4445yg3ljy98haqf65acrcb09rl6j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/showtags")
+    (synopsis "Print the tags of bibliography entries")
+    (description
+     "This package prints the tag right-aligned on each line of the
+bibliography.")
+    (license license:public-domain)))
+
+(define-public texlive-shtthesis
+  (package
+    (name "texlive-shtthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/shtthesis/"
+                   "tex/latex/shtthesis/")
+             (base32
+              "1l7vfqvfcgpndp5kmpdx4d9w89b83j5s2kwkr37hih9cp9l3n9vz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-alphalph
+           texlive-biber
+           texlive-biblatex
+           texlive-biblatex-gb7714-2015
+           texlive-booktabs
+           texlive-caption
+           texlive-colortbl
+           texlive-ctex
+           texlive-datetime
+           texlive-enumitem
+           texlive-fancyhdr
+           texlive-fmtcount
+           texlive-lastpage
+           texlive-latexmk
+           texlive-listings
+           texlive-lua-alt-getopt
+           texlive-lualatex-math
+           texlive-mathtools
+           texlive-ntheorem
+           texlive-tex-gyre
+           texlive-tocvsec2
+           texlive-transparent
+           texlive-undolabl
+           texlive-unicode-math
+           texlive-xits
+           texlive-xstring))
+    (home-page "https://ctan.org/pkg/shtthesis")
+    (synopsis "Unofficial LaTeX thesis template for ShanghaiTech University")
+    (description
+     "This package, forked from @code{ucasthesis}, is an unofficial LaTeX
+thesis template for ShanghaiTech University and satisfies all format
+requirements of the school.")
+    (license license:gpl3)))
+
 (define-public texlive-shuffle
   (package
     (name "texlive-shuffle")
@@ -8002,6 +27689,25 @@ electrical and electronics engineers and graph theorists.")
 the shuffle product which is used in some part of mathematics and physics.")
     (license license:public-domain)))
 
+(define-public texlive-sides
+  (package
+    (name "texlive-sides")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sides/" "tex/latex/sides/")
+             (base32
+              "0lffwhb6px6f09f8jk6r9kvfh49dl5n0461b261mk2sr6fgyxrfz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sides")
+    (synopsis "LaTeX class for typesetting stage plays")
+    (description
+     "This is a LaTeX class for typesetting stage plays, based on the
+@code{plari} class.  It has been updated and several formatting changes have
+been made to it.")
+    (license license:gpl3+)))
+
 (define-public texlive-simplebnf
   (package
     (name "texlive-simplebnf")
@@ -8022,6 +27728,31 @@ The included @code{bnfgrammar} environment parses BNF expressions (possibly
 annotated), so users can write readable BNF expressions in their documents.")
     (license license:expat)))
 
+(define-public texlive-simpleicons
+  (package
+    (name "texlive-simpleicons")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/simpleicons/"
+                   "fonts/enc/dvips/simpleicons/"
+                   "fonts/map/dvips/simpleicons/"
+                   "fonts/opentype/public/simpleicons/"
+                   "fonts/tfm/public/simpleicons/"
+                   "fonts/type1/public/simpleicons/"
+                   "tex/latex/simpleicons/")
+             (base32
+              "0ngjx0z1ldpc6a31maw9kbsxf910qkgcndsqibfanc5mb8ygb6zn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/simpleicons")
+    (synopsis "Simple Icons for LaTeX")
+    (description
+     "Similar to FontAwesome icons being provided on LaTeX by the
+@code{fontawesome} package, this package aims to do the same with
+@url{https://simpleicons.org/, Simple Icons}.")
+    (license license:cc0)))
+
 (define-public texlive-simpler-wick
   (package
     (name "texlive-simpler-wick")
@@ -8129,6 +27860,54 @@ International System of Units (SI).  Note that the package is now superseded
 by @code{siunitx}; @code{siunits} has maintenance-only support, now.")
     (license license:lppl1.3+)))
 
+(define-public texlive-skak
+  (package
+    (name "texlive-skak")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/skak/"
+                   "fonts/source/public/skak/"
+                   "fonts/tfm/public/skak/" "tex/latex/skak/")
+             (base32
+              "12fbzvyz40fnb9v5y80wkmv1fmvi7frbyv28k68lagdalm7mwp3b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/skak")
+    (synopsis "Fonts and macros for typesetting chess games")
+    (description
+     "This package provides macros and fonts in Metafont format which can be
+used to typeset chess games using PGN, and to show diagrams of the current
+board in a document.  An Adobe Type 1 implementation of skak's fonts is
+available as package @code{skaknew}; an alternative chess notational scheme is
+available in package @code{texmate}, and a general mechanism for selecting
+chess fonts is provided in @code{chessfss}.")
+    (license license:lppl)))
+
+(define-public texlive-skaknew
+  (package
+    (name "texlive-skaknew")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/skaknew/"
+                   "fonts/afm/public/skaknew/"
+                   "fonts/map/dvips/skaknew/"
+                   "fonts/opentype/public/skaknew/"
+                   "fonts/tfm/public/skaknew/"
+                   "fonts/type1/public/skaknew/")
+             (base32
+              "1jpm36qb65jbsrhq1yqhwajqz3jg35wid0wlav9hk7q4hd58qi4r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/skaknew")
+    (synopsis "The @code{skak} chess fonts redone in Adobe Type 1")
+    (description
+     "This package offers Adobe Type 1 versions of the fonts provided as
+Metafont source by the @code{skak} bundle.")
+    (license license:lppl)))
+
 (define-public texlive-skmath
   (package
     (name "texlive-skmath")
@@ -8148,6 +27927,204 @@ by @code{siunitx}; @code{siunits} has maintenance-only support, now.")
 re-definitions of existing commands.")
     (license license:lppl1.3+)))
 
+(define-public texlive-skull
+  (package
+    (name "texlive-skull")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/source/public/skull/"
+                   "fonts/tfm/public/skull/"
+                   "source/fonts/skull/" "tex/latex/skull/")
+             (base32
+              "0vnqi8c5f1a78naa9pvsl43748bm52i3qhjcv96bwcf59miih730")))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/skull")
+    (synopsis "Font to draw a skull")
+    (description
+     "The font (defined in Metafont) defines a single character, a black solid
+skull.  A package is supplied to make this character available as a symbol in
+maths mode.")
+    (license license:gpl3+)))
+
+(define-public texlive-smflatex
+  (package
+    (name "texlive-smflatex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/smflatex/" "doc/latex/smflatex/"
+                   "source/latex/smflatex/"
+                   "tex/latex/smflatex/")
+             (base32
+              "160bdav5rzx2hzaqxqcmlc841awr7ks1k0bmpj8kq3gzzz1pqnwj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (home-page "https://ctan.org/pkg/smflatex")
+    (synopsis "Classes for @emph{Societe mathematique de France} publications")
+    (description
+     "The @emph{Societe mathematique de France} provides a set of classes,
+packages and BibTeX styles that are used in its publications.  They are based
+on AMS classes.  Besides a quite different design, their main features are:
+
+@itemize
+
+@item new environments for typesetting some information in two languages
+@code{altabstract}, @code{alttitle}, @code{altkeywords});
+
+@item if necessary, use of Babel (option @code{frenchb});
+
+@item deactivation of some features of @code{frenchb}.
+
+@end itemize")
+    (license license:lppl1.3c)))
+
+(define-public texlive-songbook
+  (package
+    (name "texlive-songbook")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/songbook/" "makeindex/songbook/"
+                   "source/latex/songbook/"
+                   "tex/latex/songbook/")
+             (base32
+              "0ab4l130dyzaslqmy7vm71rszwszw11kqzkn0b5fb680kxvsyicf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/songbook")
+    (synopsis "Package for typesetting song lyrics and chord books")
+    (description
+     "The package provides an all purpose songbook style.  Three types of
+output may be created from a single input file: ``words and chords'' books for
+the musicians to play from, ``words only'' songbooks for the congregation to
+sing from, and overhead transparency masters for congregational use.
+
+The package will also print a table of contents, an index sorted by title and
+first line, and an index sorted by key, or by artist/composer.  The package
+attempts to handle songs in multiple keys, as well as songs in multiple
+languages.")
+    (license license:lgpl2.1)))
+
+(define-public texlive-songproj
+  (package
+    (name "texlive-songproj")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/songproj/"
+                   "source/latex/songproj/"
+                   "tex/latex/songproj/")
+             (base32
+              "044b9zbm2l1w8flnb5vx99590m65d1nxgys2dj3w79kkbmnhc7jy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/songproj")
+    (synopsis "Generate Beamer slideshows with song lyrics")
+    (description
+     "This package, together with the Beamer class, is used to generate
+slideshows with song lyrics.  This is typically used in religious services in
+churches equipped with a projector, for which this package has been written,
+but it can be useful for any type of singing assembly.  It provides
+environments to describe a song in a natural way, and formatting it into
+slides with overlays.  The package comes with an additional Python script that
+can be used to convert plain-text song lyrics to the expected LaTeX markup.")
+    (license license:bsd-3)))
+
+(define-public texlive-songs
+  (package
+    (name "texlive-songs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/songs/" "source/latex/songs/"
+                   "tex/latex/songs/")
+             (base32
+              "0mgzkh6cvq3smwjlkvd1gnhb7m151fgiv7f4v3drjqlsjyg2qds6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/songs")
+    (synopsis "Produce song books for church or fellowship")
+    (description
+     "The package provides a means of producing beautiful song books for
+church or fellowship.  It offers:
+@itemize
+@item a very easy chord-entry syntax;
+@item multiple modes (words-only; words+chords; slides; handouts);
+@item measure bars;
+@item guitar tablatures;
+@item automatic transposition;
+@item scripture quotations;
+@item multiple indexes (sorted by title, author, important lyrics, or
+scripture references);
+@item and projector-style output generation, for interactive use.
+@end itemize")
+    (license license:gpl2)))
+
+(define-public texlive-sort-by-letters
+  (package
+    (name "texlive-sort-by-letters")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/sort-by-letters/"
+                   "doc/bibtex/sort-by-letters/")
+             (base32
+              "19zsc6a97q5wjdgxcl7mjlbxzhj5xpfi4zi8ym1962l97dj4a96n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sort-by-letters")
+    (synopsis "Bibliography styles for alphabetic sorting")
+    (description
+     "This bundle contains several bibliography styles for separating
+a document's references by the first letter of the first author/editor in the
+bibliography entry.  The styles are adapted from standard ones or from
+@code{natbib} ones.")
+    (license license:knuth)))
+
+(define-public texlive-soton
+  (package
+    (name "texlive-soton")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/soton/" "tex/latex/soton/")
+             (base32
+              "0ib4i98x14g5bl4l5bd9ciw6aay5n6fihkyzfls52l5y9vpyglix")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/soton")
+    (synopsis "University of Southampton-compliant slides")
+    (description
+     "The bundle contains two packages: @code{soton-palette} which defines
+colour-ways, and @code{soton-beamer}, which uses the colours to produce
+compliant presentations.")
+    (license license:lppl)))
+
+(define-public texlive-soup
+  (package
+    (name "texlive-soup")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/soup/" "source/latex/soup/"
+                   "tex/latex/soup/")
+             (base32
+              "04lpc3nn45i66cwnjn0sycdpfaynzkb19djyfi8ca3ppb1sn79z6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/soup")
+    (synopsis "Generate alphabet soup puzzles")
+    (description
+     "This package generates alphabet soup puzzles (aka word search puzzles),
+and variations using numbers or other symbols.  It provides macros to generate
+an alphabet soup style puzzle (also known as word search puzzles or
+find-the-word puzzles).  It also allows creating number soup and soups with
+custom symbol sets.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-spalign
   (package
     (name "texlive-spalign")
@@ -8195,6 +28172,183 @@ can be adjusted with respect to relative position and format, and can be used
 in text and math mode.")
     (license license:cc-by4.0)))
 
+(define-public texlive-spectral
+  (package
+    (name "texlive-spectral")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/spectral/"
+                   "fonts/enc/dvips/spectral/"
+                   "fonts/map/dvips/spectral/"
+                   "fonts/tfm/production/spectral/"
+                   "fonts/truetype/production/spectral/"
+                   "fonts/type1/production/spectral/"
+                   "fonts/vf/production/spectral/"
+                   "tex/latex/spectral/")
+             (base32
+              "1i5ijzzk18m65ibf8igll22992wgfxrgr4qpxki0dpynfm0wiwjj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/spectral")
+    (synopsis "Spectral fonts with LaTeX support")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the Spectral family of fonts, designed by Jean-Baptiste Levee.  Spectral is
+a new and versatile serif face available in seven weights of roman and italic,
+with small caps.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-sphdthesis
+  (package
+    (name "texlive-sphdthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sphdthesis/"
+                   "tex/latex/sphdthesis/")
+             (base32
+              "05ncll9vd2yh15vp6gqzidrp011d1i2hsmlzfrfz954f9449ydx4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sphdthesis")
+    (synopsis "LaTeX template for writing PhD thesis")
+    (description
+     "The package provides a LaTeX document class for writing a PhD thesis.
+By default, the class adheres to the @acronym{NUS, National University of
+Singapore} Guidelines on Format of Research Thesis Submitted For Examination.
+However, modifying the class for conformation to a different guideline should
+not be difficult.")
+    (license license:public-domain)))
+
+(define-public texlive-spie
+  (package
+    (name "texlive-spie")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bib/spie/" "bibtex/bst/spie/"
+                   "doc/latex/spie/" "tex/latex/spie/")
+             (base32
+              "1z4nbm2w96lvwfcj8ghnzarv5f5klriyr3b6jjnb34wd3kw52xg8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/spie")
+    (synopsis "Support for formatting SPIE Proceedings manuscripts")
+    (description
+     "This package provides support for formatting SPIE Proceedings
+manuscripts.  A class and a BibTeX style are provided.")
+    (license license:lppl)))
+
+(define-public texlive-splitbib
+  (package
+    (name "texlive-splitbib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/splitbib/"
+                   "source/latex/splitbib/"
+                   "tex/latex/splitbib/")
+             (base32
+              "18jhdrj9zfnqr4wyazxsqng6a88fwgkw2ka03qskjps8s9pc2fw7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/splitbib")
+    (synopsis "Split and reorder your bibliography")
+    (description
+     "This package enables you to split a bibliography into several categories
+and subcategories.  It does not depend on BibTeX: any bibliography may be
+split and reordered.")
+    (license license:lppl)))
+
+(define-public texlive-sr-vorl
+  (package
+    (name "texlive-sr-vorl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sr-vorl/" "source/latex/sr-vorl/"
+                   "tex/latex/sr-vorl/")
+             (base32
+              "1izgzwg6a9i93zfxi0qvfrdgza3q8z5b4nhlhgq072glmdqzymf0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sr-vorl")
+    (synopsis "Class for Springer books")
+    (description
+     "This package provides a LaTeX class and templates for books to be
+published at Springer Gabler Research, Springer Vieweg Research, Springer
+Spektrum Research, Springer VS Research, or Springer VS Forschung.  It may be
+used to produce monographs in different formats and several-authors-books
+fitting the conditions of the aforementioned publishers.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-srbtiks
+  (package
+    (name "texlive-srbtiks")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/srbtiks/"
+                   "fonts/enc/dvips/srbtiks/"
+                   "fonts/map/dvips/srbtiks/"
+                   "fonts/tfm/public/srbtiks/"
+                   "fonts/vf/public/srbtiks/"
+                   "tex/latex/srbtiks/")
+             (base32
+              "12b4xigicn259ghi5kc6nyk0bqr81kdiqfg0hql9fpwrldvbj4k6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/srbtiks")
+    (synopsis "Font STIX2 for Serbian and Macedonian")
+    (description
+     "The @code{srbtiks} package is the extension of the @code{stix2-type1}
+package that enables usage of the STIX2 font in LaTeX for the Serbian and
+Macedonian languages.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
+(define-public texlive-srdp-mathematik
+  (package
+    (name "texlive-srdp-mathematik")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/srdp-mathematik/"
+                   "tex/latex/srdp-mathematik/")
+             (base32
+              "0pbsj6gkk5zblvhwgpymz64gwzf84mzciybm2m9jqf7x9va2xqp0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/srdp-mathematik")
+    (synopsis "Typeset Austrian SRDP in mathematics")
+    (description
+     "This package provides basic commands for the defined formats of the
+Austrian @acronym{sRDP, Standardisierte Reife- und Diplomprufung} in
+mathematics.  Furthermore, it includes ways to implement answers in the
+@file{.tex} file which can optionally be displayed in the PDF file, and it
+offers a way to vary the answers in order to create different groups (e.g.,
+for tests) easily.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-stage
+  (package
+    (name "texlive-stage")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/stage/" "source/latex/stage/"
+                   "tex/latex/stage/")
+             (base32
+              "0789mddzsadiw9fiasjzjdma0f9li8gddf8m9wy5jblnsl2asf5p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/stage")
+    (synopsis "LaTeX class for stage plays")
+    (description
+     "@file{stage.cls} is a LaTeX class for creating plays of any length in
+a standard manuscript format for production and submission.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-stanli
   (package
     (name "texlive-stanli")
@@ -8216,6 +28370,52 @@ engineering, those small structures are a key part for teaching.  This package
 permits to create such 2D and 3D structures in a very fast and simple way.")
     (license (list license:gpl3+ license:lppl1.3+))))
 
+(define-public texlive-starfont
+  (package
+    (name "texlive-starfont")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/starfont/"
+                   "fonts/afm/public/starfont/"
+                   "fonts/map/dvips/starfont/"
+                   "fonts/tfm/public/starfont/"
+                   "fonts/type1/public/starfont/"
+                   "tex/latex/starfont/")
+             (base32
+              "1c2vnd5mycr6mnhwxz9gkjvfxwq0l91h2lhvpf49fjlfc3hdnd3l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/starfont")
+    (synopsis "StarFont Sans astrological font")
+    (description
+     "The package contains StarFontSans and StarFontSerif, two astrological
+fonts designed by Anthony I.P. Owen, and the appropriate macros to use them
+with TeX and LaTeX.  The fonts are supplied both in the original TrueType
+Format and in Adobe Type 1 format.")
+    (license license:public-domain)))
+
+(define-public texlive-startex
+  (package
+    (name "texlive-startex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/otherformats/startex/"
+                   "makeindex/startex/"
+                   "source/startex/startex/" "tex/startex/")
+             (base32
+              "06hyz1bwzvabavkl6j9588skjwx8hc5dmiv8z9n7gr1w9aa9zm7x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/startex")
+    (synopsis "XML-inspired format for student use")
+    (description
+     "This package provides a TeX format designed to help students write short
+reports and essays.  It provides the user with a suitable set of commands for
+such a task.  It is also more robust than plain TeX and LaTeX.")
+    (license license:public-domain)))
+
 (define-public texlive-statex
   (package
     (name "texlive-statex")
@@ -8322,6 +28522,30 @@ applied and theoretical papers in statistics which are currently lacking in
 the popular @code{amsmath} package.")
     (license license:lppl1.3+)))
 
+(define-public texlive-staves
+  (package
+    (name "texlive-staves")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/staves/"
+                   "fonts/map/dvips/staves/"
+                   "fonts/tfm/public/staves/"
+                   "fonts/type1/public/staves/"
+                   "source/latex/staves/"
+                   "tex/latex/staves/")
+             (base32
+              "1wa4zx4c439q6ahs1fwa55dcxzrx382ksrj0bv1jnck6j3iw2dlc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/staves")
+    (synopsis "Typeset Icelandic staves and runic letters")
+    (description
+     "This package contains all the necessary tools to typeset the magical
+Icelandic staves plus the runic letters used in Iceland.  Included are a font
+in Adobe Type 1 format and LaTeX support.")
+    (license license:lppl)))
+
 (define-public texlive-steinmetz
   (package
     (name "texlive-steinmetz")
@@ -8342,6 +28566,189 @@ the popular @code{amsmath} package.")
 numbers in the Steinmetz notation used in electrotechnics.")
     (license license:lppl)))
 
+(define-public texlive-stellenbosch
+  (package
+    (name "texlive-stellenbosch")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/stellenbosch/"
+                   "doc/latex/stellenbosch/"
+                   "source/latex/stellenbosch/"
+                   "tex/latex/stellenbosch/")
+             (base32
+              "0yqlwlwlszrwg8bihkfxh77b3rkf8yx978vwb4a3xjmb5yyyx3q6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/stellenbosch")
+    (synopsis "Stellenbosch thesis bundle")
+    (description
+     "The @code{usthesis} class and style files are provided to typeset
+reports, theses and dissertations that conform to the requirements of the
+Engineering Faculty of the University of Stellenbosch.  The class file
+@file{usthesis.cls} is based on the standard LaTeX @code{book} class, while
+@file{usthesis.sty} is a style file to be loaded on top of the very powerful
+@code{memoir} class.
+
+Usthesis is primarily concerned with the formatting of the front matter such
+as the title page, abstract, etc., and a decent page layout on A4 paper.  It
+also works together with the Babel package to provide language options to
+typeset documents in Afrikaans or in English.  Additional packages are
+provided for bibliographic matter, note title pages, lists of symbols, as well
+as various graphic files for logos.")
+    (license license:lppl)))
+
+(define-public texlive-step
+  (package
+    (name "texlive-step")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/step/"
+                   "fonts/enc/dvips/step/"
+                   "fonts/map/dvips/step/"
+                   "fonts/opentype/public/step/"
+                   "fonts/tfm/public/step/"
+                   "fonts/type1/public/step/"
+                   "fonts/vf/public/step/"
+                   "tex/latex/step/")
+             (base32
+              "1p2fzbsxrq98hlykw23j26xi936vnnd95qggjcn5a4jjwfrzbx1g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/step")
+    (synopsis "Times-like font")
+    (description
+     "The STEP fonts are a Times-like (i.e., Times replacement) font family,
+implementing a design first created for The Times of London in 1932.  These
+fonts are meant to be compatible in design with Adobe's digitization of
+Linotype Times, commonly used in publishing.  Type 1 support is provided for
+legacy TeX engines.")
+    (license license:silofl1.1)))
+
+(define-public texlive-stepgreek
+  (package
+    (name "texlive-stepgreek")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/stepgreek/"
+                   "fonts/enc/dvips/stepgreek/"
+                   "fonts/map/dvips/stepgreek/"
+                   "fonts/tfm/public/stepgreek/"
+                   "fonts/type1/public/stepgreek/"
+                   "fonts/vf/public/stepgreek/"
+                   "tex/latex/stepgreek/")
+             (base32
+              "00yh96gdk854yg61hgl7n938lyw11v9kdmwl7klriyq7wjy0zcaw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/stepgreek")
+    (synopsis "Times/Elsevier-style Greek font")
+    (description
+     "This is a beta version of the STEP Greek font.  Only a regular face is
+available at present, though there are plans to add italic, bold and bold
+italic in the future.  The font only supports LGR in TeX and is meant to serve
+as a Greek complement to a Times-like font such as STEP.  The font supports
+polytonic Greek.")
+    (license license:silofl1.1)))
+
+(define-public texlive-stickstoo
+  (package
+    (name "texlive-stickstoo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/stickstoo/"
+                   "fonts/afm/public/stickstoo/"
+                   "fonts/enc/dvips/stickstoo/"
+                   "fonts/map/dvips/stickstoo/"
+                   "fonts/tfm/public/stickstoo/"
+                   "fonts/type1/public/stickstoo/"
+                   "fonts/vf/public/stickstoo/"
+                   "tex/latex/stickstoo/")
+             (base32
+              "15hmplphlg5vc3a966x379bkn74vb39pv73w0py65nd9zbb7z27i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/stickstoo")
+    (synopsis "Reworking of STIX2")
+    (description
+     "SticksToo is a reworking of the STIX2 fonts with support files focussing
+on enhancements of support for LaTeX users wishing to be able to access more
+of its features.  A companion addition to the @code{newtxmath} package
+provides a matching math package using STIX2 letters (Roman and Greek) with
+@code{newtxmath} symbols.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
+(define-public texlive-stix
+  (package
+    (name "texlive-stix")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/stix/"
+                   "fonts/enc/dvips/stix/"
+                   "fonts/map/dvips/stix/"
+                   "fonts/opentype/public/stix/"
+                   "fonts/tfm/public/stix/"
+                   "fonts/type1/public/stix/"
+                   "fonts/vf/public/stix/"
+                   "source/fonts/stix/"
+                   "tex/latex/stix/")
+             (base32
+              "1ixxglx4azdnppiqhlkgyahj9a67zamljzv98n6hycp7y6jbd1x0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:tex-format "latex"
+           ;; FIXME: I cannot build this package from source.
+           #:phases #~(modify-phases %standard-phases (delete 'build))))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-accents
+                  texlive-caption
+                  texlive-enumitem
+                  texlive-fonttable
+                  texlive-hypdoc))))
+    (home-page "https://ctan.org/pkg/stix")
+    (synopsis "OpenType Unicode maths fonts")
+    (description
+     "The STIX fonts are a suite of unicode OpenType fonts containing
+a complete set of mathematical glyphs.  This package is considered obsolete.
+See @code{stix2-otf} and @code{stix2-type1} instead.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
+(define-public texlive-stix2-type1
+  (package
+    (name "texlive-stix2-type1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/stix2-type1/"
+                   "fonts/enc/dvips/stix2-type1/"
+                   "fonts/map/dvips/stix2-type1/"
+                   "fonts/tfm/public/stix2-type1/"
+                   "fonts/type1/public/stix2-type1/"
+                   "source/fonts/stix2-type1/"
+                   "tex/latex/stix2-type1/")
+             (base32
+              "0jsnyxbi5054fw0j5jw9cisj9xm8i8gf1f48m9l77bkybq0qviwp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/stix2-type1")
+    (synopsis "Type1 versions of the STIX Two OpenType fonts")
+    (description
+     "The @code{stix2} package provides minimal support for using the STIX Two
+fonts with versions of TeX that are limited to TFM files, Type 1 PostScript
+fonts, and 8-bit font encodings.
+
+Some glyphs that are traditionally available in TeX math fonts are not yet
+available in the STIX Two OpenType fonts.  In such cases, we have chosen to
+omit them from the @code{stix2} package rather than create incompatibilities
+between the OpenType and Type 1 versions.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
 (define-public texlive-structmech
   (package
     (name "texlive-structmech")
@@ -8446,6 +28853,161 @@ mode by providing an optional argument to @samp{_}.  This is implemented by
 using the @code{\\text@{@}} command from the @code{amstext} package.")
     (license license:gpl3)))
 
+(define-public texlive-sudoku
+  (package
+    (name "texlive-sudoku")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sudoku/" "source/latex/sudoku/"
+                   "tex/latex/sudoku/")
+             (base32
+              "14g1kkxinp9l57yvdpbdx4wclgka71gilcbxl1dc6sdj4cmw7mbz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sudoku")
+    (synopsis "Create sudoku grids")
+    (description
+     "The @code{sudoku} package provides an environment for typesetting sudoku
+grids.")
+    (license license:lppl)))
+
+(define-public texlive-sudokubundle
+  (package
+    (name "texlive-sudokubundle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sudokubundle/"
+                   "source/latex/sudokubundle/"
+                   "tex/latex/sudokubundle/")
+             (base32
+              "1swsx8r0chgxv8h27syj4h5cf7lnj6mxvwhhzixbkjg6scrvd8kw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sudokubundle")
+    (synopsis "A set of sudoku-related packages")
+    (description
+     "The bundle provides three packages: @code{printsudoku}, which provides
+a command @code{\\sudoku} whose argument is the name of a file containing
+a puzzle specification; @code{solvesudoku}, which attempts to find a solution
+to the puzzle in the file named in the argument; and @code{createsudoku},
+which uses the @code{random} package to generate a puzzle according to a bunch
+of parameters that the user sets via macros.
+
+The bundle comes with a set of ready-prepared puzzle files.")
+    (license license:lppl)))
+
+(define-public texlive-suftesi
+  (package
+    (name "texlive-suftesi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/suftesi/" "source/latex/suftesi/"
+                   "tex/latex/suftesi/")
+             (base32
+              "1m1gsnfcnw9ylz2aik20rqs6jk0p647wlkfm813spl0hbjnpzkpc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:tex-format "lualatex"
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'support-greek-input
+                          (lambda _
+                            (substitute* "source/latex/suftesi/suftesi.dtx"
+                              (("\\\\usepackage\\[T1\\]\\{fontenc\\}")
+                               "\\usepackage[LGR, T1]{fontenc}")))))))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-babel-greek
+                  texlive-biblatex
+                  texlive-biblatex-philosophy
+                  texlive-booktabs
+                  texlive-cbfonts
+                  texlive-cbfonts-fd
+                  texlive-cochineal
+                  texlive-csquotes
+                  texlive-etoolbox
+                  texlive-fontaxes
+                  texlive-fontsize
+                  texlive-fontspec
+                  texlive-greek-fontenc
+                  texlive-guitlogo
+                  texlive-hologo
+                  texlive-hypdoc
+                  texlive-inconsolata
+                  texlive-libertine
+                  texlive-listings
+                  texlive-ltxdockit
+                  texlive-manfnt
+                  texlive-mathalpha
+                  texlive-mdframed
+                  texlive-microtype
+                  texlive-multirow
+                  texlive-needspace
+                  texlive-newtx
+                  texlive-parskip
+                  texlive-pgf
+                  texlive-sectsty
+                  texlive-siunitx
+                  texlive-txfonts
+                  texlive-upquote
+                  texlive-xcolor
+                  texlive-xkeyval
+                  texlive-xstring
+                  texlive-zref))))
+    (home-page "https://ctan.org/pkg/suftesi")
+    (synopsis "Document class for typesetting theses, books and articles")
+    (description
+     "The class can be used to typeset any kind of book (originally designed
+for use in the humanities).")
+    (license license:lppl1.3+)))
+
+(define-public texlive-sugconf
+  (package
+    (name "texlive-sugconf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sugconf/" "tex/latex/sugconf/")
+             (base32
+              "1v9fp0dpbk4g9aab8jvwhfzh71w4276awi8lyf2pgk66d5qhfxsb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sugconf")
+    (synopsis "SAS(R) user group conference proceedings document class")
+    (description
+     "The class may be used to typeset articles to be published in the
+proceedings of SAS(R) User group conferences and workshops.  The layout
+produced by the class is based on that published by SAS Institute (2021).")
+    (license license:lppl)))
+
+(define-public texlive-superiors
+  (package
+    (name "texlive-superiors")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/superiors/"
+                   "fonts/enc/dvips/superiors/"
+                   "fonts/map/dvips/superiors/"
+                   "fonts/tfm/public/superiors/"
+                   "fonts/type1/public/superiors/"
+                   "tex/latex/superiors/")
+             (base32
+              "0f50v8dal93vq8mfxs6m5n9d56ciy7f88343s6g1jsv2zf1xb7ng")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/superiors")
+    (synopsis "Attach superior figures to a font family")
+    (description
+     "The package allows the attachment of an arbitrary superior figures font
+to a font family that lacks one. (Superior figures are commonly used as
+footnote markers.)  Two superior figures fonts are provided --- one matching
+Times, the other matching Libertine.")
+    (license license:lppl)))
+
 (define-public texlive-susy
   (package
     (name "texlive-susy")
@@ -8463,6 +29025,32 @@ using the @code{\\text@{@}} command from the @code{amstext} package.")
 abbreviations of longer expressions.")
     (license license:lppl)))
 
+(define-public texlive-svrsymbols
+  (package
+    (name "texlive-svrsymbols")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/svrsymbols/"
+                   "fonts/afm/public/svrsymbols/"
+                   "fonts/map/dvips/svrsymbols/"
+                   "fonts/opentype/public/svrsymbols/"
+                   "fonts/tfm/public/svrsymbols/"
+                   "fonts/type1/public/svrsymbols/"
+                   "source/fonts/svrsymbols/"
+                   "tex/latex/svrsymbols/")
+             (base32
+              "0l1pj97pqlh9mq3m3zswnxm2vws916yjlx0pq1gr3bc23kwvhhl3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/svrsymbols")
+    (synopsis "Font with symbols for use in physics texts")
+    (description
+     "The @code{svrsymbols} package is a LaTeX interface to the SVRsymbols
+font.  The glyphs of this font are ideograms that have been designed for use
+in physics texts.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-syllogism
   (package
     (name "texlive-syllogism")
@@ -8483,6 +29071,24 @@ syllogisms and syllogistic-like arguments, composed of two premises and
 a conclusion.")
     (license license:lppl)))
 
+(define-public texlive-symbats3
+  (package
+    (name "texlive-symbats3")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/symbats3/" "tex/latex/symbats3/")
+             (base32
+              "0xr5m2irkbv376im1m5vms6gcpq3asj03dpfck2x1ccrywn4k3w2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/symbats3")
+    (synopsis "Macros to use the Symbats3 dingbats fonts")
+    (description
+     "This package makes available for LaTeX the glyphs in Feorag's OpenType
+Symbats3 neopagan dingbats fonts.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-sympytexpackage
   (package
     (name "texlive-sympytexpackage")
@@ -8547,6 +29153,34 @@ including emTeX drivers, dviwin, xdvi and dvips, and (using some code from
 ConTeXt) it may also be used with pdfLaTeX.")
     (license license:gpl3+)))
 
+(define-public texlive-t2
+  (package
+    (name "texlive-t2")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/t2/" "fonts/enc/t2/"
+                   "tex/generic/t2/cyrfinst/" "tex/latex/t2/")
+             (base32
+              "058j3bpv03d9nb0nxal1vjpliqqibv6hsjl1qlbgnndm95xd5n1a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/t2")
+    (synopsis "Support for using T2 encoding")
+    (description
+     "The T2 bundle provides a variety of separate support functions for using
+Cyrillic characters in LaTeX:
+@itemize
+@item the @code{mathtext} package, for using Cyrillic letters
+transparently in formulae;
+@item the @code{citehack} package, for using Cyrillic (or indeed any
+non-ASCII) characters in citation keys;
+@item support for Cyrillic in BibTeX;
+@item support for Cyrillic in Makeindex;
+@item and various items of font support.
+@end itemize")
+    (license license:lppl)))
+
 (define-public texlive-tablor
   (package
     (name "texlive-tablor")
@@ -8569,6 +29203,28 @@ configuration of the language to be used in the diagrams.  The @code{tablor}
 package requires that shell escape be enabled.")
     (license license:lppl)))
 
+(define-public texlive-tabriz-thesis
+  (package
+    (name "texlive-tabriz-thesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tabriz-thesis/"
+                   "doc/xelatex/tabriz-thesis/"
+                   "tex/latex/tabriz-thesis/"
+                   "tex/xelatex/tabriz-thesis/")
+             (base32
+              "13k6kmg1x143m1kfc3wcvyy6l60vpzz5ivmdpcqhjbdd3wz7b2ry")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tabriz-thesis")
+    (synopsis "Template for the University of Tabriz")
+    (description
+     "The package offers a document class for typesetting theses and
+dissertations at the University of Tabriz.  The class requires use of
+XeLaTeX.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-tabvar
   (package
     (name "texlive-tabvar")
@@ -8594,6 +29250,50 @@ package requires that shell escape be enabled.")
 variations of functions as they are used in France.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tangramtikz
+  (package
+    (name "texlive-tangramtikz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tangramtikz/"
+                   "tex/latex/tangramtikz/")
+             (base32
+              "18n67k7ggqh3mvp8iqyp44d70gh3s8jfbwbp3ympv2ff5drjjb3l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tangramtikz")
+    (synopsis "Tangram puzzles, with TikZ")
+    (description
+     "This package provides some commands (with English and French keys) to
+work with tangram puzzles: @code{\\begin{EnvTangramTikz}} and
+@code{\\PieceTangram} to position a piece, @code{\\TangramTikz} to display
+a predefined tangram.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-tapir
+  (package
+    (name "texlive-tapir")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/tapir/"
+                   "fonts/source/public/tapir/"
+                   "fonts/type1/public/tapir/")
+             (base32
+              "1b1r2zg8m46zd2cb8l3vglncvixzhcfq75s0s86pyn9f88b17w57")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tapir")
+    (synopsis "Simple geometrical font")
+    (description
+     "Tapir is a simple geometrical font mostly created of line and circular
+segments with constant thickness.  The font is available as Metafont source
+and in Adobe Type 1 format.  The character set contains all ASCII characters
+in the range 0-127 (as in @code{cmr10}), accented characters used in the
+Czech, Slovak and Polish languages.")
+    (license license:gpl3+)))
+
 (define-public texlive-tdsfrmath
   (package
     (name "texlive-tdsfrmath")
@@ -8615,6 +29315,83 @@ in colleges and lycées (and perhaps elsewhere).  It is hoped that the package
 will facilitate the everyday use of LaTeX by mathematics teachers.")
     (license license:lppl)))
 
+(define-public texlive-technion-thesis-template
+  (package
+    (name "texlive-technion-thesis-template")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/technion-thesis-template/"
+                   "tex/xelatex/technion-thesis-template/")
+             (base32
+              "1fnz3d3knflhm9349rn9xw3k698fn6dyxxh2a7zv8rx3z3y7kzwn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/technion-thesis-template")
+    (synopsis "Template for theses on the Technion graduate school")
+    (description
+     "This is a template for writing a thesis according to the Technion
+specifications.")
+    (license license:cc-by4.0)))
+
+(define-public texlive-tempora
+  (package
+    (name "texlive-tempora")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/tempora/"
+                   "fonts/afm/public/tempora/"
+                   "fonts/enc/dvips/tempora/"
+                   "fonts/map/dvips/tempora/"
+                   "fonts/opentype/public/tempora/"
+                   "fonts/tfm/public/tempora/"
+                   "fonts/type1/public/tempora/"
+                   "fonts/vf/public/tempora/"
+                   "tex/latex/tempora/")
+             (base32
+              "0vcg6al4navxhaha78zxigpwaj631hgm47z3ic36335rb80p8b83")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tempora")
+    (synopsis "Greek and Cyrillic to accompany Times")
+    (description
+     "This package, derived from TemporaLGCUni by Alexej Kryukov, is meant as
+a companion to Times text font packages, providing Greek and Cyrillic in
+matching weights and styles.  OpenType and Type1 fonts are provided, with
+LaTeX support files giving essentially complete LGR coverage of monotonic,
+polytonic and ancient Greek, and almost full T2A coverage of Cyrillic.")
+    (license license:gpl2)))
+
+(define-public texlive-tengwarscript
+  (package
+    (name "texlive-tengwarscript")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tengwarscript/"
+                   "fonts/enc/dvips/tengwarscript/"
+                   "fonts/map/dvips/tengwarscript/"
+                   "fonts/tfm/public/tengwarscript/"
+                   "fonts/vf/public/tengwarscript/"
+                   "source/latex/tengwarscript/"
+                   "tex/latex/tengwarscript/")
+             (base32
+              "1k3wgg8cj9n4ijj5qdbm74snwzdyabh1c93zm75p4x9pmawlpaa4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tengwarscript")
+    (synopsis "LaTeX support for using Tengwar fonts")
+    (description
+     "The package provides mid-level access to Tengwar fonts, providing good
+quality output.  Each tengwar sign is represented by a command, which will
+place the sign nicely in relation to previous signs.  A transcription package
+is available from the package's home page: writing all those tengwar commands
+would quickly become untenable.  The package supports the use of a wide
+variety of tengwar fonts that are available from the net; metric and map files
+are provided for all the supported fonts.")
+    (license license:lppl)))
+
 (define-public texlive-tensind
   (package
     (name "texlive-tensind")
@@ -8654,6 +29431,26 @@ with mixed upper and lower indices with spacing, also typeset preposed
 indices.")
     (license license:lppl)))
 
+(define-public texlive-termes-otf
+  (package
+    (name "texlive-termes-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/termes-otf/"
+                   "tex/latex/termes-otf/")
+             (base32
+              "1z8a1d2k4170n14hf8faimwfd26cshsww1ypa8im937lna7c0j39")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/termes-otf")
+    (synopsis "Using the OpenType fonts TeX Gyre Termes")
+    (description
+     "This package provides the OpenType version of the TeX Gyre Termes font,
+including text and math fonts.  The package needs LuaLaTeX or XeLaTeX.  The
+missing typefaces like bold math and slanted text are also defined.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-tex-ewd
   (package
     (name "texlive-tex-ewd")
@@ -8694,6 +29491,110 @@ about TeX and Co.  It contains information for beginners, LaTeX packages,
 descriptions, etc.")
     (license license:fdl1.3+)))
 
+(define-public texlive-texilikechaps
+  (package
+    (name "texlive-texilikechaps")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/latex/texilikechaps/")
+             (base32
+              "1z9nvv2y2nzpkpxyf18p426wcl0g6gbg7qppq70b285kdbczbijd")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/texilikechaps")
+    (synopsis "Format chapters with a Texi-like format")
+    (description
+     "The package enables the user to reduce the size of the rather large
+chapter headings in standard classes into a Texi-like smaller format.")
+    (license license:lppl)))
+
+(define-public texlive-texilikecover
+  (package
+    (name "texlive-texilikecover")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/latex/texilikecover/")
+             (base32
+              "04bljvhvmrxh1a4sfqw57yysaw03c5ldi1bq63mlqqvd9p3hmyck")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/texilikecover")
+    (synopsis "Cover-page package, like TeXinfo")
+    (description
+     "The package creates document cover pages, like those that TeXinfo
+produces.")
+    (license license:lppl)))
+
+(define-public texlive-texsis
+  (package
+    (name "texlive-texsis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/texsis/"
+                   "doc/man/man1/texsis.1"
+                   "doc/man/man1/texsis.man1.pdf"
+                   "doc/otherformats/texsis/base/"
+                   "tex/texsis/base/"
+                   "tex/texsis/config/")
+             (base32
+              "1vdywyg03ab5w50370ml8hwiidim2sy7hhygmz917rnhsnm87lnv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:create-formats #~(list "texsis")))
+    (propagated-inputs
+     (list texlive-cm
+           texlive-hyphen-base
+           texlive-knuth-lib
+           texlive-plain
+           texlive-tex))
+    (home-page "https://ctan.org/pkg/texsis")
+    (synopsis "Plain TeX macros for Physicists")
+    (description
+     "TeXsis is a TeX macro package which provides useful features for
+typesetting research papers and related documents.  For example, it includes
+support specifically for:
+
+@itemize
+@item automatic numbering of equations, figures, tables and references;
+@item simplified control of type sizes, line spacing, footnotes, running
+headlines and footlines, and tables of contents, figures and tables;
+@item specialized document formats for research papers, preprints and
+e-prints, conference proceedings, theses, books, referee reports, letters, and
+memoranda;
+@item simplified means of constructing an index for a book or thesis;
+@item easy to use double column formatting;
+@item specialized environments for lists, theorems and proofs, centered or
+non-justified text, and listing computer code;
+@item specialized macros for easily constructing ruled tables.
+@end itemize
+
+TeXsis was originally developed for physicists, but others may also find it
+useful.  It is completely compatible with Plain TeX.")
+    (license license:lppl)))
+
+(define-public texlive-textglos
+  (package
+    (name "texlive-textglos")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/textglos/"
+                   "source/latex/textglos/"
+                   "tex/latex/textglos/")
+             (base32
+              "1jxx3wrwkmmm6ida3ih0yap57laflvsks8nv0395sv49xn7waxf0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/textglos")
+    (synopsis "Typeset and index linguistic gloss abbreviations")
+    (description
+     "The package provides a set of macros for in-line linguistic examples (as
+opposed to interlinear glossing, set apart from the main text).  It prevents
+hyphenated examples from breaking across lines and consistently formats
+phonemic examples, orthographic examples, and more.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-textgreek
   (package
     (name "texlive-textgreek")
@@ -8734,6 +29635,191 @@ symbols.")
 membrane protein topology plots and helical wheels.")
     (license license:gpl3+)))
 
+(define-public texlive-tfrupee
+  (package
+    (name "texlive-tfrupee")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/tfrupee/"
+                   "fonts/afm/public/tfrupee/"
+                   "fonts/map/dvips/tfrupee/"
+                   "fonts/tfm/public/tfrupee/"
+                   "fonts/type1/public/tfrupee/"
+                   "source/fonts/tfrupee/"
+                   "tex/latex/tfrupee/")
+             (base32
+              "0qhgxn5g4wzhi81xgb30giw542nprlmf0ryyq6jy752jccl07b7j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tfrupee")
+    (synopsis "Font offering the new (Indian) Rupee symbol")
+    (description
+     "The package provides LaTeX support for the (Indian) Rupee symbol font.
+Simple LaTeX support written for its use.")
+    (license license:gpl3)))
+
+(define-public texlive-thaienum
+  (package
+    (name "texlive-thaienum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/thaienum/" "tex/latex/thaienum/")
+             (base32
+              "1g7sf5gjnrmhgq4qmdh3gphc0ixyfx4rpm7kmbwmjra3b8j2i46w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/thaienum")
+    (synopsis "Thai labels in @code{enumerate} environments")
+    (description
+     "This LaTeX package provides a command to use Thai numerals or characters
+as labels in enumerate environments.  Once the package is loaded with
+@samp{\\usepackage@{thaienum@}} you can use labels such as @code{\\thainum*}
+or @code{\\thaimultialph*} in conjunction with the package @code{enumitem}.
+Concrete examples are given in the documentation.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-thaispec
+  (package
+    (name "texlive-thaispec")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/thaispec/"
+                   "source/latex/thaispec/"
+                   "tex/latex/thaispec/")
+             (base32
+              "1d0mj98akv7bfq3msaplm2pffcwfayssn4i5an12zrw0wxicmp96")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/thaispec")
+    (synopsis "Thai language typesetting in XeLaTeX")
+    (description
+     "This package allows you to input Thai characters directly to LaTeX
+documents and choose any (system wide) Thai fonts for typesetting in XeLaTeX.
+It also tries to appropriately justify paragraphs with no more external
+tools.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-thalie
+  (package
+    (name "texlive-thalie")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/thalie/" "tex/latex/thalie/")
+             (base32
+              "08dg91nr469s3x5c8njj0gpki1j89dji7ii9sw5l5ajd3pk8xbwv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/thalie")
+    (synopsis "Typeset drama plays")
+    (description
+     "The package provides tools to typeset drama plays.  It defines commands
+to introduce characters lines, to render stage directions, to divide a play
+into acts and scenes and to build the dramatis personae automatically.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-theanodidot
+  (package
+    (name "texlive-theanodidot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/theanodidot/"
+                   "fonts/enc/dvips/theanodidot/"
+                   "fonts/map/dvips/theanodidot/"
+                   "fonts/tfm/public/theanodidot/"
+                   "fonts/truetype/public/theanodidot/"
+                   "fonts/type1/public/theanodidot/"
+                   "fonts/vf/public/theanodidot/"
+                   "tex/latex/theanodidot/")
+             (base32
+              "00qf03ssh7ncpl6l33zcmqkhbylv77w3d0jdvxv9pcbbsn3rzk7v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/theanodidot")
+    (synopsis "TheanoDidot fonts with LaTeX support")
+    (description
+     "This package provides the TheanoDidot font designed by Alexey Kryukov,
+in both TrueType and Type1 formats, with support for both traditional and
+modern LaTeX processors.  An artificially-emboldened variant has been provided
+but there are no italic variants.")
+    (license (list license:lppl license:silofl1.1))))
+
+(define-public texlive-theanomodern
+  (package
+    (name "texlive-theanomodern")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/theanomodern/"
+                   "fonts/enc/dvips/theanomodern/"
+                   "fonts/map/dvips/theanomodern/"
+                   "fonts/tfm/public/theanomodern/"
+                   "fonts/truetype/public/theanomodern/"
+                   "fonts/type1/public/theanomodern/"
+                   "fonts/vf/public/theanomodern/"
+                   "tex/latex/theanomodern/")
+             (base32
+              "17s04wcliqn5sgg5d6axc5ky3wg7xzh62c83hgrf3fq3pbykwm77")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/theanomodern")
+    (synopsis "Theano Modern fonts with LaTeX support")
+    (description
+     "This package provides the TheanoModern font designed by Alexey Kryukov,
+in both TrueType and Type1 formats, with support for both traditional and
+modern LaTeX processors.  An artificially-emboldened variant has been provided
+but there are no italic variants.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-theanooldstyle
+  (package
+    (name "texlive-theanooldstyle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/theanooldstyle/"
+                   "fonts/enc/dvips/theanooldstyle/"
+                   "fonts/map/dvips/theanooldstyle/"
+                   "fonts/tfm/public/theanooldstyle/"
+                   "fonts/truetype/public/theanooldstyle/"
+                   "fonts/type1/public/theanooldstyle/"
+                   "fonts/vf/public/theanooldstyle/"
+                   "tex/latex/theanooldstyle/")
+             (base32
+              "1jkfdfrpp6v12mw5khw51ib9dsjnc5bz3y6bazyabx8z7lgksig5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/theanooldstyle")
+    (synopsis "Theano OldStyle fonts with LaTeX support")
+    (description
+     "This package provides the Theano OldStyle font designed by Alexey
+Kryukov, in both TrueType and Type1 formats, with support for both traditional
+and modern LaTeX processors.  An artificially-emboldened variant has been
+provided but there are no italic variants.")
+    (license (list license:silofl1.1 license:lppl))))
+
+(define-public texlive-theatre
+  (package
+    (name "texlive-theatre")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/theatre/")
+             (base32
+              "1nhm56spqvryhmhwmzly939mzv5yv3398lh2lyfhf40rr02mzgi5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/theatre")
+    (synopsis "Sophisticated package for typesetting stage plays")
+    (description
+     "This package enables the user to typeset stage plays in a way that
+permits to create highly customized printouts for each actor.")
+    (license license:lppl1.2+)))
+
 (define-public texlive-thermodynamics
   (package
     (name "texlive-thermodynamics")
@@ -8760,6 +29846,91 @@ of one's notes from one textbook to another can be achieved relatively easily
 by changing package options.")
     (license license:lppl1.3+)))
 
+(define-public texlive-thesis-ekf
+  (package
+    (name "texlive-thesis-ekf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/thesis-ekf/"
+                   "source/latex/thesis-ekf/"
+                   "tex/latex/thesis-ekf/")
+             (base32
+              "06jc8h1195h6440yc2xblv7x8cyf6yhfh99x3p6hk97hcvq0ing4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/thesis-ekf")
+    (synopsis "Thesis class for Eszterhazy Karoly Catholic University")
+    (description
+     "This is a class file for theses and dissertations at the Eszterhazy
+Karoly Catholic University (Eger, Hungary).  The documentation is in
+Hungarian.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-thesis-gwu
+  (package
+    (name "texlive-thesis-gwu")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/thesis-gwu/"
+                   "tex/latex/thesis-gwu/")
+             (base32
+              "120w3wfh5b7f6lmsf0l3wy6agxkds4rnpy5pzjnpa6rwk59plk8k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/thesis-gwu")
+    (synopsis
+     "Thesis class for George Washington University School of Engineering and
+Applied Science")
+    (description
+     "This class is an attempt to create a standard format for @acronym{GWU
+SEAS, George Washington University School of Engineering and Applied Science}
+dissertations and theses.")
+    (license license:gpl3)))
+
+(define-public texlive-thesis-qom
+  (package
+    (name "texlive-thesis-qom")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/thesis-qom/"
+                   "tex/xelatex/thesis-qom/")
+             (base32
+              "0cjx3yqnx6ijm664i747sxd19g7pmwpqsw24mh4bvdf0k1wqjj2a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/thesis-qom")
+    (synopsis "Thesis style of the University of Qom, Iran")
+    (description
+     "This package provides a class file for writing theses and dissertations
+according to the University of Qom Graduate Schools's guidelines for the
+electronic submission of master theses and PhD dissertations.  The class
+should meet all the current requirements and is updated whenever the
+university guidelines change.  The class needs XeLaTeX in conjunction with the
+following fonts: XB Niloofar, IranNastaliq, IRlotus, XB Zar, XB Titre, and
+Yas.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-thesis-titlepage-fhac
+  (package
+    (name "texlive-thesis-titlepage-fhac")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/thesis-titlepage-fhac/"
+                   "source/latex/thesis-titlepage-fhac/"
+                   "tex/latex/thesis-titlepage-fhac/")
+             (base32
+              "1zs1k43q4br29vyxk007ld0rmiz8z803i6xhlc6rmhmb1nb594nj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/thesis-titlepage-fhac")
+    (synopsis "Style to create a standard titlepage for diploma thesis")
+    (description "This is yet another thesis titlepage style.")
+    (license license:lppl)))
+
 (define-public texlive-thmbox
   (package
     (name "texlive-thmbox")
@@ -8781,6 +29952,181 @@ aesthetic features.  The standard macro @code{\\newtheorem} may be redefined
 to use the environment.")
     (license license:lppl)))
 
+(define-public texlive-thuaslogos
+  (package
+    (name "texlive-thuaslogos")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/thuaslogos/"
+                   "tex/latex/thuaslogos/")
+             (base32
+              "1ndqqc5rgxsdkanycgxi79czx6ri9fsfghh1lwyrx6ssjz2hfd7p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/thuaslogos")
+    (synopsis
+     "Logos for @acronym{THUAS, The Hague University of Applied Sciences}")
+    (description
+     "This package contains some logos of @acronym{THUAS, The Hague University
+of Applied Sciences}.  These Logos are available in English and in Dutch.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-thubeamer
+  (package
+    (name "texlive-thubeamer")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/thubeamer/"
+                   "doc/latex/thubeamer/"
+                   "source/latex/thubeamer/"
+                   "tex/latex/thubeamer/")
+             (base32
+              "07jha3pfklqas3f2mwpxqfi6h7dm4sl9jm4kl9kg68an4drzp4zj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/thubeamer")
+    (synopsis "Beamer theme for Tsinghua University")
+    (description
+     "This package provides a Beamer theme designed for Tsinghua University.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-thucoursework
+  (package
+    (name "texlive-thucoursework")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/thucoursework/"
+                   "source/latex/thucoursework/"
+                   "tex/latex/thucoursework/")
+             (base32
+              "1cv2kadwzwwrw3q98wy7cjjl3084qqp55ki50v7m2ylrjxinwkv4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:tex-format "xelatex"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'skip-documentation-build
+            ;; Only extract the ".sty" files.
+            (lambda _
+              (substitute* "source/latex/thucoursework/thucoursework.dtx"
+                (("\\\\DocInput\\{\\\\jobname\\.dtx\\}") "")))))))
+    (native-inputs
+     (list texlive-booktabs
+           texlive-carlisle
+           texlive-ctex
+           texlive-enumitem
+           texlive-etoolbox
+           texlive-fancyhdr
+           texlive-hypdoc
+           texlive-kastrup
+           texlive-listings
+           texlive-metalogo
+           texlive-newpx
+           texlive-newtx
+           texlive-oberdiek
+           texlive-realscripts
+           texlive-xcolor
+           texlive-xstring))
+    (home-page "https://ctan.org/pkg/thucoursework")
+    (synopsis "Coursework template for Tsinghua University")
+    (description
+     "This package provides a LaTeX package for students of Tsinghua
+University to write coursework more efficiently.  It can also be used by
+students from other universities.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-thuthesis
+  (package
+    (name "texlive-thuthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/thuthesis/"
+                   "doc/latex/thuthesis/"
+                   "source/latex/thuthesis/"
+                   "tex/latex/thuthesis/")
+             (base32
+              "11l434c6v0sdhk4y776nrswj53sj2hba4i3dwbspgkh61ckxxhyx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/thuthesis")
+    (synopsis "Thesis template for Tsinghua University")
+    (description
+     "This package establishes a simple and easy-to-use LaTeX template for
+Tsinghua dissertations, including general undergraduate research papers,
+masters theses, doctoral dissertations, and postdoctoral reports.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-tidyres
+  (package
+    (name "texlive-tidyres")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tidyres/" "tex/latex/tidyres/")
+             (base32
+              "0ls8qcj8jdv954p4mlhhdqvhp4kq016h41i6mj42fnwg598a3ms1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tidyres")
+    (synopsis "Create formal resumes easily")
+    (description
+     "This LaTeX package aims to provide users with a simple interface to
+create multi-column formal resumes.")
+    (license license:cc-by4.0)))
+
+(define-public texlive-timbreicmc
+  (package
+    (name "texlive-timbreicmc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/timbreicmc/"
+                   "source/latex/timbreicmc/"
+                   "tex/latex/timbreicmc/")
+             (base32
+              "0nd44car7vksfrz53h54r7cz1flgkgmyjri5ai1k7s9g2fn16x2n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/timbreicmc")
+    (synopsis "Typeset documents with ICMC/USP watermarks")
+    (description
+     "With this package you can typeset documents with ICMC/USP Sao Carlos
+watermarks.  ICMC is acronym for @emph{Instituto de Ciencias Matematicas e de
+Computacao} of the @emph{Universidade de Sao Paulo} (USP), in the city of Sao
+Carlos-SP, Brazil.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-tinos
+  (package
+    (name "texlive-tinos")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/tinos/"
+                   "fonts/enc/dvips/tinos/"
+                   "fonts/map/dvips/tinos/"
+                   "fonts/tfm/google/tinos/"
+                   "fonts/truetype/google/tinos/"
+                   "fonts/type1/google/tinos/"
+                   "fonts/vf/google/tinos/"
+                   "tex/latex/tinos/")
+             (base32
+              "06cckhcjxrg1x2jb8w1y3k0sb5bb6nfs3k9qdjc9mywji4a20g18")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tinos")
+    (synopsis "Tinos fonts with LaTeX support")
+    (description
+     "Tinos, designed by Steve Matteson, is an innovative serif design that is
+metrically compatible with Times New Roman.")
+    (license (list license:asl2.0 license:lppl))))
+
 (define-public texlive-tiscreen
   (package
     (name "texlive-tiscreen")
@@ -8799,6 +30145,148 @@ to use the environment.")
 display calculators, specifically the TI-82 STATS.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tlc-article
+  (package
+    (name "texlive-tlc-article")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tlc-article/"
+                   "tex/latex/tlc-article/")
+             (base32
+              "1zxghkxg1yls97zrcfyjn8nk45mg5ygcjiprdwcs0ha1bl3pybxs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tlc-article")
+    (synopsis "LaTeX document class for formal documents")
+    (description
+     "The package provides a LaTeX document class that orchestrates a logical
+arrangement for document header, footer, author, abstract, table of contents,
+and margins.  It standardizes a document layout intended for formal
+documents.")
+    (license license:bsd-3)))
+
+(define-public texlive-tocbibind
+  (package
+    (name "texlive-tocbibind")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tocbibind/"
+                   "source/latex/tocbibind/"
+                   "tex/latex/tocbibind/")
+             (base32
+              "086yi3d11pj5cnf0jfsmyy495y6kcind88569mig2yvq2adjmq3b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tocbibind")
+    (synopsis "Add bibliography/index/contents to table of contents")
+    (description
+     "This package automatically adds the bibliography and/or the index and/or
+the contents, etc., to the table of contents.")
+    (license license:lppl)))
+
+(define-public texlive-topletter
+  (package
+    (name "texlive-topletter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/topletter/"
+                   "source/latex/topletter/"
+                   "tex/latex/topletter/")
+             (base32
+              "0s9yq65wwcw6mg09lk3x756iski1k55skik3n45l9wdbdz81w1p9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/topletter")
+    (synopsis "Letter class for the @emph{Politecnico di Torino}")
+    (description
+     "This package provides a LaTeX class for typesetting letters conforming
+to the official Corporate Image guidelines for the @emph{Politecnico di
+Torino}.  The class can be used for letters written in Italian and in
+English.")
+    (license license:asl2.0)))
+
+(define-public texlive-toptesi
+  (package
+    (name "texlive-toptesi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/toptesi/" "source/latex/toptesi/"
+                   "tex/latex/toptesi/")
+             (base32
+              "0mskk7swjgcy6lw1l81brcnw7n870mrz3la64ln0f3mxps98gik6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/toptesi")
+    (synopsis "Bundle for typesetting multilanguage theses")
+    (description
+     "This bundle contains everything needed for typesetting a bachelor,
+master, or PhD thesis in any language supported by LaTeX.  The infix strings
+may be selected and specified at will by means of a configuration file, so as
+to customize the layout of the front page to the requirements of a specific
+university.  Thanks to its language management, the bundle is suited for
+multi-language theses.  Toptesi is designed to save the PDF version of
+a thesis in PDF/A-1b compliant mode and with all the necessary metadata.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-tpslifonts
+  (package
+    (name "texlive-tpslifonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tpslifonts/"
+                   "source/latex/tpslifonts/"
+                   "tex/latex/tpslifonts/")
+             (base32
+              "1i713qbhbv6yhax667igabfal1p2f8r6w0hgvs4y4pbpv4ffyqf6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tpslifonts")
+    (synopsis "LaTeX package for configuring presentation fonts")
+    (description
+     "This package aims to improve of font readability in presentations,
+especially with maths.  The standard CM maths fonts at large design sizes are
+difficult to read from far away, especially at low resolutions and low
+contrast color choice.  Using this package leads to much better overall
+readability of some font combinations.  The package offers a couple of
+harmonising combinations of text and maths fonts from the (distant) relatives
+of Computer Modern fonts, with a couple of extras for optimising readability.
+Text fonts from Computer Modern roman, Computer Modern sans serif, SliTeX
+Computer Modern sans serif, Computer Modern Bright, or Concrete Roman are
+available, in addition to maths fonts from Computer Modern maths, Computer
+Modern Bright maths, or Euler fonts.")
+    (license license:gpl3+)))
+
+(define-public texlive-trajan
+  (package
+    (name "texlive-trajan")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/trajan/"
+                   "fonts/afm/public/trajan/"
+                   "fonts/map/dvips/trajan/"
+                   "fonts/tfm/public/trajan/"
+                   "fonts/type1/public/trajan/"
+                   "source/latex/trajan/"
+                   "tex/latex/trajan/")
+             (base32
+              "1yjx252c6a3bf1k2646sqf3n3s09x2gxya3ypn1zz9scn5kkh1wa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/trajan")
+    (synopsis "Fonts from the Trajan's Column in Rome")
+    (description
+     "This package provides fonts (both as Metafont source and in Adobe Type
+1 format) based on the capitals carved on the Trajan's Column in Rome in 114
+AD, together with macros to access the fonts.  The font is uppercase letters
+together with some punctuation and analphabetics; no lowercase or digits.")
+    (license license:lppl)))
+
 (define-public texlive-translation-array-fr
   (package
     (name "texlive-translation-array-fr")
@@ -8871,6 +30359,215 @@ display calculators, specifically the TI-82 STATS.")
 the @code{tabbing} package.")
     (license license:lppl1.0+)))
 
+(define-public texlive-tree-dvips
+  (package
+    (name "texlive-tree-dvips")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tree-dvips/" "dvips/tree-dvips/"
+                   "tex/latex/tree-dvips/")
+             (base32
+              "0wk86z29aqfrsg947h5qbp98fngdx55v8xcx6dgniv5fv7d9ffrp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tree-dvips")
+    (synopsis "Trees and other linguists' macros")
+    (description
+     "The package defines a mechanism for specifying connected trees that uses
+a @code{tabular} environment to generate node positions.  The package uses
+PostScript code, loaded by Dvips, so output can only be generated by use of
+Dvips.
+
+The package @code{lingmacros.sty} defines a few macros for linguists:
+@code{\\enumsentence} for enumerating sentence examples, simple
+@code{tabular}-based non-connected tree macros, and gloss macros.")
+    (license license:lppl1.0+)))
+
+(define-public texlive-tuda-ci
+  (package
+    (name "texlive-tuda-ci")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tuda-ci/" "tex/latex/tuda-ci/")
+             (base32
+              "0bga3v6byk8v18xzj3vp7hp10wmapil5snqj1qp721a5lakwx0w9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tuda-ci")
+    (synopsis "LaTeX templates of Technische Universitat Darmstadt")
+    (description
+     "The TUDa-CI-Bundle provides a possibility to use the corporate design
+of TU Darmstadt in LaTeX.  It contains document classes as well as
+some helper packages and config files together with some templates for
+user documentation, which currently are only available in German.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-tudscr
+  (package
+    (name "texlive-tudscr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tudscr/" "source/latex/tudscr/"
+                   "tex/latex/tudscr/")
+             (base32
+              "1whwmablazz41hy1p99ls8l4lk80h202ynzhabpwcmhk7mj60ikn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-cbfonts
+           texlive-environ
+           texlive-etoolbox
+           texlive-geometry
+           texlive-graphics
+           texlive-greek-inputenc
+           texlive-iwona
+           texlive-koma-script
+           texlive-mathastext
+           texlive-mweights
+           texlive-oberdiek
+           texlive-opensans
+           texlive-trimspaces
+           texlive-xcolor
+           texlive-xpatch))
+    (home-page "https://ctan.org/pkg/tudscr")
+    (synopsis "Corporate design of Technische Universitat Dresden")
+    (description
+     "The TUD-Script bundle provides both classes and packages in order to
+create LaTeX documents in the corporate design of the Technische Universitat
+Dresden.  It bases on the KOMA-Script bundle.
+
+The bundle offers:
+
+@itemize
+
+@item the three document classes @code{tudscrartcl}, @code{tudscrreprt}, and
+@code{tudscrbook};
+
+@item the class @code{tudscrposter} for creating posters;
+
+@item the package @code{tudscrsupervisor} providing environments and macros to
+create tasks, evaluations and notices for scientific theses;
+
+@item the package @code{tudscrfonts}, which makes the corporate design fonts
+of the Technische Universitat Dresden available for LaTeX standard classes and
+KOMA-Script classes;
+
+@item the package @code{fix-tudscrfonts}, which provides the same fonts to
+additional corporate design classes not related to TUD-Script;
+
+@item the package @code{tudscrcomp}, which simplifies the switch to TUD-Script
+from external corporate design classes,
+
+@item the package @code{mathswap} for swapping math delimiters within
+numbers (similar to @code{ionumbers}),
+
+@item and the package @code{twocolfix} for fixing the positioning bug of
+headings in @code{twocolumn} layout.
+
+@end itemize")
+    (license license:lppl1.3c)))
+
+(define-public texlive-tugboat
+  (package
+    (name "texlive-tugboat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/tugboat/" "doc/latex/tugboat/"
+                   "source/latex/tugboat/" "tex/latex/tugboat/")
+             (base32
+              "1yf9g7bszxdkzb4calsd03kwnjs4i0y7vh0d7z4fwiv49qrbkzks")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tugboat")
+    (synopsis "LaTeX macros for @emph{TUGboat} articles")
+    (description
+     "This package provides @file{ltugboat.cls} for both regular and
+proceedings issues of the @emph{TUGboat} journal.  It also provides a BibTeX
+style, @file{tugboat.bst}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-tugboat-plain
+  (package
+    (name "texlive-tugboat-plain")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/plain/tugboat-plain/"
+                   "tex/plain/tugboat-plain/")
+             (base32
+              "0bzjkhgzf9zp1p6knkdnpcr2hp9hr5fj6v3781i1y0f13qv63axg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tugboat-plain")
+    (synopsis "Plain TeX macros for @emph{TUGboat}")
+    (description
+     "The macros defined in this package are used in papers written in Plain
+TeX for publication in @emph{TUGboat}.")
+    (license license:knuth)))
+
+(define-public texlive-tui
+  (package
+    (name "texlive-tui")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tui/" "tex/latex/tui/")
+             (base32
+              "14wl2n8wbc2p6nmrallwsxp4s6h73h97qm1w8algyv67bfl5i0hs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tui")
+    (synopsis "Thesis style for the University of the Andes, Colombia")
+    (description
+     "The class is used for doctoral dissertations from the Faculty of
+Engineering at the Universidad de los Andes, Bogota, Colombia.  It is
+implemented as an extension of the @code{memoir} class.")
+    (license license:lppl)))
+
+(define-public texlive-turabian
+  (package
+    (name "texlive-turabian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/turabian/" "tex/latex/turabian/")
+             (base32
+              "1waqdm6r4fpy602jfqjbfhm2x71llpg4wj4a9w61pkbca19xcnki")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/turabian")
+    (synopsis "Create Turabian-formatted material using LaTeX")
+    (description
+     "The bundle provides a class file and a template for creating
+Turabian-formatted projects.  The class file supports citation formatting
+conforming to the Turabian 8th Edition style guide.")
+    (license license:lppl)))
+
+(define-public texlive-turabian-formatting
+  (package
+    (name "texlive-turabian-formatting")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/turabian-formatting/"
+                   "tex/latex/turabian-formatting/")
+             (base32
+              "1h42lrgq59900bhzgw114w1sxi432rbnpb2j5amwz64bsckvd2ry")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/turabian-formatting")
+    (synopsis "Formatting based on @emph{Turabian's Manual}")
+    (description
+     "The @code{turabian-formatting} package provides Chicago-style formatting
+based on Kate L. Turabian's @emph{A Manual for Writers of Research Papers,
+Theses, and Dissertations: Chicago Style for Students and Researchers} (9th
+edition).")
+    (license license:lppl1.3+)))
+
 (define-public texlive-turnstile
   (package
     (name "texlive-turnstile")
@@ -8892,6 +30589,413 @@ is used by logicians for denoting a consequence relation, related to a given
 logic, between a collection of formulas and a derived formula.")
     (license license:lppl)))
 
+(define-public texlive-twemoji-colr
+  (package
+    (name "texlive-twemoji-colr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/twemoji-colr/"
+                   "fonts/truetype/public/twemoji-colr/")
+             (base32
+              "0qadwv7malbji28pxjpz3r53kb94grp435yk8h7i93x143vd8p9n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/twemoji-colr")
+    (synopsis "Twemoji font in COLR/CPAL layered format")
+    (description
+     "This is a COLR/CPAL-based color OpenType font from the Twemoji
+collection of emoji images.")
+    (license (list license:cc-by-sa4.0 license:asl2.0))))
+
+(define-public texlive-txfontsb
+  (package
+    (name "texlive-txfontsb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/txfontsb/"
+                   "fonts/afm/public/txfontsb/"
+                   "fonts/enc/dvips/txfontsb/"
+                   "fonts/map/dvips/txfontsb/"
+                   "fonts/opentype/public/txfontsb/"
+                   "fonts/tfm/public/txfontsb/"
+                   "fonts/type1/public/txfontsb/"
+                   "fonts/vf/public/txfontsb/"
+                   "source/fonts/txfontsb/"
+                   "tex/latex/txfontsb/")
+             (base32
+              "0y7af1n1dymi6723jvn01rcjfwr6p47wr5y4c33wa4cgaa9m39hn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/txfontsb")
+    (synopsis "Extensions to @code{txfonts}, using GNU Freefont")
+    (description
+     "This package provides a set of fonts that extend the @code{txfonts}
+bundle with small caps and old style numbers, together with Greek support.
+The extensions are made with modifications of the GNU Freefont.")
+    (license (list license:gpl3+ license:lppl1.0+))))
+
+(define-public texlive-txuprcal
+  (package
+    (name "texlive-txuprcal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/txuprcal/"
+                   "fonts/map/dvips/txuprcal/"
+                   "fonts/tfm/public/txuprcal/"
+                   "fonts/type1/public/txuprcal/"
+                   "tex/latex/txuprcal/")
+             (base32
+              "033h3rqj7kf0rx0kdy9s1kwhk1hkrc6z70ga6ky7xy79mc3k2vgp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/txuprcal")
+    (synopsis "Upright calligraphic font based on TX calligraphic")
+    (description
+     "This small package provides a means of loading as @code{\\mathcal} an
+uprighted version of the calligraphic fonts from the TX font package.
+A scaled option is provided to allow arbitrary scaling.")
+    (license license:gpl3)))
+
+(define-public texlive-typicons
+  (package
+    (name "texlive-typicons")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/typicons/"
+                   "fonts/truetype/public/typicons/"
+                   "tex/latex/typicons/")
+             (base32
+              "1p82gq8jy0brvps6y6qdw8bldfsck9fw1qy84vrzfjz65435dzvh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/typicons")
+    (synopsis "Font containing a set of web-related icons")
+    (description
+     "This package grants access to 336 web-related icons provided by the
+included Typicons font, designed by Stephen Hutchings.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-uaclasses
+  (package
+    (name "texlive-uaclasses")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uaclasses/"
+                   "source/latex/uaclasses/"
+                   "tex/latex/uaclasses/")
+             (base32
+              "0n0bz3cq9zgl5ppwq02izjgiw6gpza05ymc6x0gsc8v13wfcgvz0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uaclasses")
+    (synopsis "University of Arizona thesis and dissertation format")
+    (description
+     "This package provides a LaTeX2e document class named @code{ua-thesis}
+for typesetting theses and dissertations in the official format required by
+the University of Arizona.  Moreover, there is a fully compatible alternative
+document class @code{my-thesis} for private nice copies of the dissertation,
+and the respective title pages are available as separate packages to work with
+any document class.")
+    (license license:public-domain)))
+
+(define-public texlive-uafthesis
+  (package
+    (name "texlive-uafthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uafthesis/"
+                   "tex/latex/uafthesis/")
+             (base32
+              "0vxd9vk4dzpxcpn4l20r5hm3cz04mwqvd8kw1yg7vvjlnpshi4i6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uafthesis")
+    (synopsis "Document class for theses at University of Alaska Fairbanks")
+    (description
+     "This is document class for theses at University of Alaska Fairbanks.")
+    (license license:lppl)))
+
+(define-public texlive-uantwerpendocs
+  (package
+    (name "texlive-uantwerpendocs")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uantwerpendocs/"
+                   "source/latex/uantwerpendocs/"
+                   "tex/latex/uantwerpendocs/")
+             (base32
+              "0v1fj5bbx6whzp5csljf0hqlxhib6ajdc3diygxjr4pkv5156zxn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uantwerpendocs")
+    (synopsis
+     "Course texts, master theses, and exams in University of Antwerp style")
+    (description
+     "These class files implement the house style of the University of
+Antwerp.  Using these class files will make it easy for you to make and keep
+your documents compliant to this version and future versions of the house
+style of the University of Antwerp.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ucalgmthesis
+  (package
+    (name "texlive-ucalgmthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ucalgmthesis/"
+                   "tex/latex/ucalgmthesis/")
+             (base32
+              "0krqj0vpl5k6v1m1v7qh14yfqf0lbriqsdz5jmwqgswljf8ld954")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ucalgmthesis")
+    (synopsis
+     "LaTeX thesis class for University of Calgary Faculty of Graduate Studies")
+    (description
+     "@file{ucalgmthesis.cls} is a LaTeX class file that produces documents
+according to the thesis guidelines of the University of Calgary Faculty of
+Graduate Studies.  It uses the @code{memoir} class.")
+    (license license:expat)))
+
+(define-public texlive-ucbthesis
+  (package
+    (name "texlive-ucbthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ucbthesis/"
+                   "tex/latex/ucbthesis/")
+             (base32
+              "0kwy84r7vz5nvq8nrar1ykik4ycpvgl1kwiyi0da6wjn4cazxxh9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ucbthesis")
+    (synopsis "Thesis and dissertation class supporting UCB requirements")
+    (description
+     "The class provides the necessary framework for electronic submission
+of masters theses and PhD dissertations at the University of
+California, Berkeley.  It is based on the @code{memoir} class.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ucdavisthesis
+  (package
+    (name "texlive-ucdavisthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ucdavisthesis/"
+                   "source/latex/ucdavisthesis/"
+                   "tex/latex/ucdavisthesis/")
+             (base32
+              "0ymgnb2q77j5gfhcb4w4hvsafvs3vyygvzbq7zl9zgzzb02ml35j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ucdavisthesis")
+    (synopsis
+     "Thesis and dissertation class for University of California at Davis")
+    (description
+     "The @code{ucdavisthesis} class is a LaTeX class that allows you to
+create a dissertation or thesis conforming to UC Davis formatting
+requirements as of April 2016.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-ucsmonograph
+  (package
+    (name "texlive-ucsmonograph")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ucsmonograph/"
+                   "source/latex/ucsmonograph/"
+                   "tex/latex/ucsmonograph/")
+             (base32
+              "13yf91i1c4bin9vbvsjpl5s7fkina5ai5zw868wdk5fiqvmqvgx7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ucsmonograph")
+    (synopsis
+     "Typesetting academic documents from the University of Caxias do Sul")
+    (description
+     "This is a LaTeX class for typesetting academic documents according to
+the @acronym{ABNT, Brazilian Technical Standards Association} standards and
+the @acronym{UCS, University of Caxias do Sul} specifications.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-ucthesis
+  (package
+    (name "texlive-ucthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ucthesis/" "tex/latex/ucthesis/")
+             (base32
+              "19s6s4wxq494shi2pgrdyaz9qx52zma62czd92mrkjp2diim1197")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ucthesis")
+    (synopsis "University of California thesis format")
+    (description
+     "This package provides a modified version of the standard LaTeX report
+style that is accepted for use with University of California PhD dissertations
+and masters theses.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-udes-genie-these
+  (package
+    (name "texlive-udes-genie-these")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/udes-genie-these/"
+                   "source/latex/udes-genie-these/"
+                   "tex/latex/udes-genie-these/")
+             (base32
+              "0hhc8d0cmc6miylkc137cxlkw44z23zi17sz31f68im5rl94a4m6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/udes-genie-these")
+    (synopsis
+     "Thesis class for the @emph{Faculte de genie} at the Universite de
+Sherbrooke")
+    (description
+     "The @code{udes-genie-these} class can be used for PhD theses,
+master's theses and project definitions at the @emph{Faculte de genie} of the
+Universite de Sherbrooke (Quebec, Canada).  The class file is coherent with
+the latest version of the @emph{Protocole de redaction aux etudes superieures}
+which is available on the faculte's intranet.  The class file documentation is
+in French, the language of the typical user at the Universite de Sherbrooke.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-uestcthesis
+  (package
+    (name "texlive-uestcthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/uestcthesis/"
+                   "doc/latex/uestcthesis/"
+                   "tex/latex/uestcthesis/")
+             (base32
+              "1gqa6yyj3nq75vfjxrcn0pxc9gmgdaf7mdhp5sf3hy3br9ix8qgw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uestcthesis")
+    (synopsis "Thesis class for UESTC")
+    (description
+     "The class is for typesetting a thesis at the University of Electronic
+Science and Technology of China.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ufrgscca
+  (package
+    (name "texlive-ufrgscca")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ufrgscca/" "tex/latex/ufrgscca/")
+             (base32
+              "0xrmgs9zjqqa09gasf2b96mjvwqshjqpyaz4icvrlr7yx9hqqs2y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ufrgscca")
+    (synopsis
+     "Bundle for undergraduate students final work or report (TCC) at
+UFRGS/EE")
+    (description
+     "This bundled is aimed at producing undergraduate students final work or
+report at UFRGS/EE (Engineering School at the Federal University of Rio Grande
+do Sul), closely following ABNT rules (Brazilian Association for Technical
+Norms).  It is composed of a main class, @code{ufrgscca}, and a set of
+auxiliary packages, some of which can be used independently.")
+    (license (list license:lppl1.3c license:gpl3+))))
+
+(define-public texlive-uhhassignment
+  (package
+    (name "texlive-uhhassignment")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uhhassignment/"
+                   "source/latex/uhhassignment/"
+                   "tex/latex/uhhassignment/")
+             (base32
+              "15yvq00xsikb8c78gkyyqjdgcz2yw8dnp586mjcrk1p4kvlpwyam")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uhhassignment")
+    (synopsis "Document class for typesetting homework assignments")
+    (description
+     "This document class was created for typesetting solutions to homework
+assignments at the university of Hamburg (Universitat Hamburg).")
+    (license license:lppl1.3c)))
+
+(define-public texlive-uiucredborder
+  (package
+    (name "texlive-uiucredborder")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uiucredborder/"
+                   "source/latex/uiucredborder/"
+                   "tex/latex/uiucredborder/")
+             (base32
+              "0wsf3cfmpfmsv3afm78gc91fsiba415ir4p5fa0ivfny3dh34qnq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uiucredborder")
+    (synopsis "Class for UIUC thesis red-bordered forms")
+    (description
+     "The class offers a means of filling out the ``red-bordered form''
+that gets signed by the department head, your advisor, and --- for
+doctoral dissertations --- your thesis committee members.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-uiucthesis
+  (package
+    (name "texlive-uiucthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uiucthesis/"
+                   "source/latex/uiucthesis/"
+                   "tex/latex/uiucthesis/")
+             (base32
+              "0kzp2p03p1v7qij2kz82xis88vh1g477vs2aa0sqfa24w9y28h5i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uiucthesis")
+    (synopsis "UIUC thesis class")
+    (description
+     "The class produces a document that conforms to the format described in
+the University's Handbook for Graduate Students Preparing to Deposit.")
+    (license license:lppl)))
+
+(define-public texlive-ukbill
+  (package
+    (name "texlive-ukbill")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ukbill/" "tex/latex/ukbill/")
+             (base32
+              "1kdz2dfa9y5gjm61k3l9cyc95fc8ibq8c1vlap3gfzwadl4fggp1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ukbill")
+    (synopsis "Class for typesetting UK legislation")
+    (description
+     "This package provides formatting to easily typeset draft UK legislation.
+The font Palatine Parliamentary is required to use this package.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-ulqda
   (package
     (name "texlive-ulqda")
@@ -8928,6 +31032,377 @@ providing the LaTeX user with macros which are used to markup textual
 information.")
     (license license:lppl)))
 
+(define-public texlive-ulthese
+  (package
+    (name "texlive-ulthese")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ulthese/" "source/latex/ulthese/"
+                   "tex/latex/ulthese/")
+             (base32
+              "1kcw1zsgj0dr00h555qcld9dn58i8iipnka9s10fn9q0x46sq05q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ulthese")
+    (synopsis "Thesis class and templates for Universite Laval")
+    (description
+     "The package provides a class based on @code{memoir} to prepare theses
+and memoirs compliant with the presentation rules set forth by the Faculty of
+Graduate Studies of Universite Laval, Quebec, Canada.  The class also comes
+with an extensive set of templates for the various types of theses and memoirs
+offered at Laval.
+
+Please note that the documentation for the class and the comments in the
+templates are all written in French, the language of the target audience.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-umbclegislation
+  (package
+    (name "texlive-umbclegislation")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/umbclegislation/"
+                   "tex/latex/umbclegislation/")
+             (base32
+              "0znzm0ymvz43f4kgvww79mnr7nl78xcmi7yw2vlwx332kq8hcw2v")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/umbclegislation")
+    (synopsis
+     "LaTeX class for legislation files for UMBC Student Government
+Association Bills")
+    (description
+     "This is a LaTeX class for building legislation files for UMBC Student
+Government Association Bills.")
+    (license license:gpl3)))
+
+(define-public texlive-umich-thesis
+  (package
+    (name "texlive-umich-thesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/umich-thesis/"
+                   "tex/latex/umich-thesis/")
+             (base32
+              "15y25n9j2zh7hmgpq9fir6y0ydjwqhvyy6cx59jm8i0swkgw33vz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/umich-thesis")
+    (synopsis "University of Michigan thesis LaTeX class")
+    (description
+     "This package provides a LaTeX2e class to create a University of
+Michigan dissertation according to the Rackham dissertation handbook.")
+    (license license:lppl)))
+
+(define-public texlive-umthesis
+  (package
+    (name "texlive-umthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/umthesis/" "tex/latex/umthesis/")
+             (base32
+              "1y2ba0k9d2sab9mkfhpsm92v4wx6rhapj887jbvcl7871b4idbps")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/umthesis")
+    (synopsis "Dissertations at the University of Michigan")
+    (description
+     "This is a class for dissertations at the University of Michigan. it
+loads @code{book} class, and makes minimal changes to it.")
+    (license license:lppl)))
+
+(define-public texlive-umtypewriter
+  (package
+    (name "texlive-umtypewriter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/umtypewriter/"
+                   "fonts/opentype/public/umtypewriter/")
+             (base32
+              "19skqmchglac4lrk4qhvb4rabi73qmypdi20sbjxnvb8abw0pf3i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/umtypewriter")
+    (synopsis "Fonts to typeset with the @code{xgreek} package")
+    (description
+     "The UMTypewriter font family is a monospaced font family that was built
+from glyphs from the CB Greek fonts, the CyrTUG Cyrillic alphabet fonts (LH),
+and the standard Computer Modern font family.  It contains four OpenType fonts
+which are required for use of the @code{xgreek} package for XeLaTeX.")
+    (license license:silofl1.1)))
+
+(define-public texlive-unam-thesis
+  (package
+    (name "texlive-unam-thesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/unam-thesis/"
+                   "tex/latex/unam-thesis/")
+             (base32
+              "1cn4qd3rvh9z8sp7g94fh11khij2vykv89inbmy7g52hxgxzkdhh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unam-thesis")
+    (synopsis "Create documents according to the UNAM guidelines")
+    (description
+     "This is a class for creating dissertation documents according to the
+National Autonomous University of Mexico (UNAM) guidelines.")
+    (license license:gpl3+)))
+
+(define-public texlive-unamth-template
+  (package
+    (name "texlive-unamth-template")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/unamth-template/")
+             (base32
+              "018vpcbxfzch8qsrrqakcxxir53nalvj39l2kn45kn26p5nfkfbn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unamth-template")
+    (synopsis "UNAM thesis LaTeX Template")
+    (description
+     "The bundle provides a template for UNAM's College of Engineering
+Theses.")
+    (license license:gpl3)))
+
+(define-public texlive-unamthesis
+  (package
+    (name "texlive-unamthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/unamthesis/"
+                   "doc/latex/unamthesis/"
+                   "tex/latex/unamthesis/")
+             (base32
+              "1jdppibm49491ddgx6ny6hqsfs9qan948614bfcy67f5syjzx2jh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unamthesis")
+    (synopsis "Style for Universidad Nacional Autonoma de Mexico theses")
+    (description
+     "The package provides a customisable format to typeset Theses according
+to the Universidad Nacional Autonoma de Mexico guidelines.  The bundle also
+includes an appropriate bibliographic style which enables the use of
+author-year schemes using the @code{natbib} package.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-unbtex
+  (package
+    (name "texlive-unbtex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/unbtex/" "tex/latex/unbtex/")
+             (base32
+              "0s45np0j9xw4gfga593rpcxzagcn3yhr8m2q44jj4mf6sp9ldlbw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unbtex")
+    (synopsis "Class for theses at @acronym{UnB, University of Brasilia}")
+    (description
+     "This package provides a class based on abnTeX and compatible with
+pdfLaTex and Biber to prepare bachelor, master, and doctoral theses for the
+@acronym{UnB, University of Brasilia}, Brazil.  The class also comes with
+a template for the various types of theses for undergraduate and graduate
+programs at UnB.  The documentation for the class and the comments in the
+templates are all written in Portuguese, the language of the target
+audience.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-unfonts-core
+  (package
+    (name "texlive-unfonts-core")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/unfonts-core/"
+                   "fonts/truetype/public/unfonts-core/")
+             (base32
+              "12q7h1akmgc3vdvyb4i8x51a716451kwi90vh9i57xw76hmg5f4x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unfonts-core")
+    (synopsis "TrueType version of Un-fonts")
+    (description
+     "This is TrueType version of Un-fonts core bundle.  It includes the
+following font families (12 fonts):
+@itemize
+@item UnBatang, UnBatangBold: serif;
+@item UnDotum, UnDotumBold: sans-serif;
+@item UnGraphic, UnGraphicBold: sans-serif style;
+@item UnDinaru, UnDinaruBold, UnDinaruLight;
+@item UnPilgi, UnPilgiBold: script;
+@item UnGungseo: cursive, brush-stroke.
+@end itemize")
+    (license license:gpl2)))
+
+(define-public texlive-unfonts-extra
+  (package
+    (name "texlive-unfonts-extra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/unfonts-extra/"
+                   "fonts/truetype/public/unfonts-extra/")
+             (base32
+              "1krs93dsi50278qxgm24ij9w9r7gdcxqsdfk6ai5klvkmlka8gkf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unfonts-extra")
+    (synopsis "TrueType version of Un-fonts")
+    (description
+     "This is TrueType version of Un-fonts extra bundle.  It includes the
+following Korean font families (11 fonts):
+@itemize
+@item UnPen, UnPenheulim: script;
+@item UnTaza: typewriter style;
+@item UnShinmun;
+@item UnYetgul: old Korean printing style;
+@item UnJamoSora, UnJamoNovel, UnJamoDotum, UnJamoBatang;
+@item UnPilgia;
+@item UnVada.
+@end itemize")
+    (license license:gpl2)))
+
+(define-public texlive-uni-wtal-ger
+  (package
+    (name "texlive-uni-wtal-ger")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uni-wtal-ger/"
+                   "tex/latex/uni-wtal-ger/")
+             (base32
+              "0bxrvl10ccdqarffdf3xzcihnid8h84sv1hcbncjmwq249kf3f96")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uni-wtal-ger")
+    (synopsis
+     "Citation style for literary studies at the University of Wuppertal")
+    (description
+     "The package defines a BibLaTeX citation style based on the author-title
+style of @code{biblatex-dw}.  The citations are optimised for literary studies
+in faculty of humanities at the Bergische Universitat Wuppertal.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-uni-wtal-lin
+  (package
+    (name "texlive-uni-wtal-lin")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uni-wtal-lin/"
+                   "tex/latex/uni-wtal-lin/")
+             (base32
+              "07ndzpby3m8ccw3r4sp9plrzmnnpiksvi8plnqyssklalmm406hj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uni-wtal-lin")
+    (synopsis
+     "Citation style for linguistic studies at the University of Wuppertal")
+    (description
+     "The package defines a BibLaTeX citation style based on the standard
+author-year style.  The citations are optimised for linguistic studies at the
+Institute of Linguistics at the Bergische Universitat Wuppertal.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-unicode-alphabets
+  (package
+    (name "texlive-unicode-alphabets")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/unicode-alphabets/"
+                   "tex/latex/unicode-alphabets/")
+             (base32
+              "0xvzmx0xa8mmi39a8c89byi6c6y7vbl5k3plp63k5mif19ncyq3s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unicode-alphabets")
+    (synopsis "Macros for using characters from Unicode's Private Use Area")
+    (description
+     "While Unicode supports the vast majority of use cases, there are certain
+specialized niches which require characters and glyphs not (yet) represented
+in the standard.  Thus the Private Use Area (PUA) at code points E000-F8FF,
+which enables third parties to define arbitrary character sets.  This package
+allows configuring a number of macros for using various PUA character sets in
+LaTeX (AGL, CYFI, MUFI, SIL, TITUS, UCSUR, UNZ), to enable transcription and
+display of medieval and other documents.")
+    (license license:cc-by-sa4.0)))
+
+(define-public texlive-unifith
+  (package
+    (name "texlive-unifith")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/unifith/" "doc/latex/unifith/"
+                   "tex/latex/unifith/")
+             (base32
+              "06y9hkxv8y9p06pcyy2nv0nqma6bnh0n9i9pwpdadks9zs9sqn8r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unifith")
+    (synopsis "Typeset theses for University of Florence (Italy)")
+    (description
+     "The package provides a class to typeset PhD, master, and bachelor theses
+that adhere to the publishing guidelines of the University of
+Florence (Italy).")
+    (license license:lppl1.3c)))
+
+(define-public texlive-unigrazpub
+  (package
+    (name "texlive-unigrazpub")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/unigrazpub/"
+                   "source/latex/unigrazpub/"
+                   "tex/latex/unigrazpub/")
+             (base32
+              "02xnlp7p1ap0wvkn4skskh6av4rj8fh28gqk27x97yp0c255w3qv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unigrazpub")
+    (synopsis
+     "LaTeX templates for University of Graz Library Publishing Services")
+    (description
+     "This package provides a LaTeX class matching the preparation guidelines
+of the Library Publishing Services of University of Graz.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-unitn-bimrep
+  (package
+    (name "texlive-unitn-bimrep")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/unitn-bimrep/"
+                   "tex/latex/unitn-bimrep/")
+             (base32
+              "0id55sfi9bzj7vp7dm9wxy355ca6k6dmxq488r4dwmndy2z4v8hl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unitn-bimrep")
+    (synopsis
+     "Bimonthly report class for the PhD School of Materials,
+Mechatronics and System Engineering")
+    (description
+     "This package allows to rapidly write the bimonthly report for The PhD
+School in Materials, Mechatronics and System Engineering.  It allows to define
+the research activities, the participation to school and congress, and the
+publication performed by a student.")
+    (license license:expat)))
+
 (define-public texlive-unitsdef
   (package
     (name "texlive-unitsdef")
@@ -8949,6 +31424,603 @@ to define new units and changes the output concerning to the surrounding font
 settings.")
     (license license:lppl)))
 
+(define-public texlive-universa
+  (package
+    (name "texlive-universa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/universa/"
+                   "fonts/source/public/universa/"
+                   "fonts/tfm/public/universa/"
+                   "source/fonts/universa/"
+                   "tex/latex/universa/")
+             (base32
+              "1w1cw2236aj37iggxck1drsfbwsiap8mc3lrkqrimmz2rgixycdp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/universa")
+    (synopsis "Herbert Bayer's Universal font")
+    (description
+     "This package provides an implementation of the Universal by Herbert
+Bayer.  The Metafont sources of the fonts, and their LaTeX support, are
+supplied.")
+    (license license:gpl3+)))
+
+(define-public texlive-universalis
+  (package
+    (name "texlive-universalis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/universalis/"
+                   "fonts/enc/dvips/universalis/"
+                   "fonts/map/dvips/universalis/"
+                   "fonts/opentype/arkandis/universalis/"
+                   "fonts/tfm/arkandis/universalis/"
+                   "fonts/type1/arkandis/universalis/"
+                   "fonts/vf/arkandis/universalis/"
+                   "tex/latex/universalis/")
+             (base32
+              "1hqlpyh3g682vwdxbgyp7jrswvf16ds8i4mqb6yyv00h3rv11cxk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/universalis")
+    (synopsis "Universalis font, with support")
+    (description
+     "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
+the UniversalisADFStd family of fonts, designed by Hirwin Harendal.  The font
+is suitable as an alternative to fonts such as Adrian Frutiger's Univers and
+Frutiger.")
+    (license (list license:gpl2+ license:lppl))))
+
+(define-public texlive-univie-ling
+  (package
+    (name "texlive-univie-ling")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/univie-ling/"
+                   "tex/latex/univie-ling/")
+             (base32
+              "1678hl6bzpvsa9h8hlap84cnl82g5kkpg9kkwpq4r4zrj90fhgda")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/univie-ling")
+    (synopsis
+     "Papers, theses and research proposals in (Applied) Linguistics at Vienna
+University")
+    (description
+     "This bundle provides LaTeX2e classes, BibLaTeX files, and templates
+suitable for student papers, PhD research proposals (Exposes), and theses
+in (Applied) Linguistics at the University of Vienna.  The classes implement
+some standards for these types of text, such as suitable title pages.  They
+are particularly suited for the field of (Applied) Linguistics and pre-load
+some packages that are considered useful in this context.  The classes can
+also be used for General and Historical Linguistics as well as for other
+fields of study at Vienna University.  In this case, however, some settings
+may have to be adjusted.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-unizgklasa
+  (package
+    (name "texlive-unizgklasa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/unizgklasa/"
+                   "tex/latex/unizgklasa/")
+             (base32
+              "1lrw0j34r9p2ydsajkvg2k7n8kirpi6lqj2iwhvfqh0pg230y82q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unizgklasa")
+    (synopsis
+     "LaTeX class for theses at the Faculty Of Graphic Arts in Zagreb")
+    (description
+     "This class is intended for generating graduate and final theses
+according to the instructions of the Faculty of Graphic Arts, University of
+Zagreb.  It does not necessarily correspond to the requirements of each
+component of the University, but is designed as an idea for linking and
+uniformizing the look of all graduate papers.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-unswcover
+  (package
+    (name "texlive-unswcover")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/unswcover/"
+                   "tex/latex/unswcover/")
+             (base32
+              "0vdi90i07s8914sm7axn1pzks9d0w3qrsijynx5hxr7a36byafhp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/unswcover")
+    (synopsis "Typeset a dissertation cover page following UNSW guidelines")
+    (description
+     "The package an UNSW cover sheet following the 2011 GRS guidelines.  It
+may also (optionally) provide other required sheets such as Originality,
+Copyright and Authenticity statements.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-uol-physics-report
+  (package
+    (name "texlive-uol-physics-report")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uol-physics-report/"
+                   "source/latex/uol-physics-report/"
+                   "tex/latex/uol-physics-report/")
+             (base32
+              "00rvqmrc1k67136748vq4j5c90iqa2ry65jkaqarazvlv8x77m4d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uol-physics-report")
+    (synopsis "LaTeX document class for writing lab reports")
+    (description
+     "The package provides physics students at the University of Oldenburg
+with a prepared document class for writing laboratory reports for the
+laboratory courses conducted by the Institute of Physics.  The document class
+consists of predefinded margins and heading formats.  Furthermore, it presets
+the headers of the pages and excludes the titlepage and table of contents from
+the page numbering.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-uothesis
+  (package
+    (name "texlive-uothesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uothesis/"
+                   "source/latex/uothesis/"
+                   "tex/latex/uothesis/")
+             (base32
+              "04md5wkh11hpczvl7gpi2a5k2j5yalssjw5azpbr2g9q8fc99zp3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uothesis")
+    (synopsis "Class for dissertations and theses at the University of Oregon")
+    (description
+     "The class generates documents that are suitable for submission to the
+Graduate School and conform with the style requirements for dissertations and
+theses as laid out in the Fall 2010 UO graduate school student manual.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-uowthesis
+  (package
+    (name "texlive-uowthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uowthesis/"
+                   "tex/latex/uowthesis/")
+             (base32
+              "196w8ics6r9n4x05ydpr0hprpmcwqwfqa92h200kxgflp595xm43")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uowthesis")
+    (synopsis
+     "Document class for dissertations at the University of Wollongong")
+    (description
+     "This package provides a document class for higher degree research theses
+in compliance with the specifications of @acronym{UoW, University of
+Wollongong} theses in the @emph{Guidelines for Preparation and Submission of
+Higher Degree Research Theses} (March 2006), by the Research Student Centre,
+Research & Innovation Division, UoW.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-uowthesistitlepage
+  (package
+    (name "texlive-uowthesistitlepage")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uowthesistitlepage/"
+                   "tex/latex/uowthesistitlepage/")
+             (base32
+              "0mspjj6wvcb9cdbp3qp2cqd3mmmf3kyd77pmk1kji0wspg0jra6y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uowthesistitlepage")
+    (synopsis "Title page for dissertations at the University of Wollongong")
+    (description
+     "The package redefines @code{\\maketitle} to generate a title page for
+a @acronym{UoW, University of Wollongong} thesis, in accordance with the UoW
+branding guidelines.  The package should be used with the @code{book} class to
+typeset a thesis.  The package also defines a @code{\\declaration} command
+that typesets the declaration that this thesis is your own work, etc., which
+is required in the front of each PhD thesis.")
+    (license (list license:lppl1.3c license:cc-by-sa4.0))))
+
+(define-public texlive-uppunctlm
+  (package
+    (name "texlive-uppunctlm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/uppunctlm/"
+                   "fonts/tfm/public/uppunctlm/"
+                   "fonts/vf/public/uppunctlm/"
+                   "tex/latex/uppunctlm/")
+             (base32
+              "0d9x56rlxjavamx361582khj5idhy692hxm5wwwcc5y5i3xsc4pp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uppunctlm")
+    (synopsis
+     "Always keep upright shape for some punctuation marks and Arabic numerals")
+    (description
+     "The package provides a mechanism to keep punctuation always in upright
+shape even if italic was specified.  It is directed to Latin Modern fonts, and
+provides @file{.tfm}, @file{.vf}, @file{.fd}, and @file{.sty} files.  Here
+a list of punctuation characters always presented in upright shapes: comma,
+period, semicolon, colon, parentheses, square brackets, and Arabic numerals.")
+    (license license:gfl1.0)))
+
+(define-public texlive-urlbst
+  (package
+    (name "texlive-urlbst")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/urlbst/" "doc/bibtex/urlbst/"
+                   "scripts/urlbst/" "source/bibtex/urlbst/")
+             (base32
+              "0sfs2ybkfcqy8w0wdni3aakpnmk60zkmnlc55xskyzzh4yc69qi7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "urlbst")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/urlbst")
+    (synopsis "Web support for BibTeX")
+    (description
+     "This package supports a new BibTeX @code{webpage} entry type and @code{url},
+@code{lastchecked}, and @code{eprint} and @code{DOI} fields.  The Perl script
+@command{urlbst} can be used to add this support to an arbitrary @file{.bst}
+file which has a reasonably conventional structure.  The result is meant to be
+robust rather than pretty.")
+    (license (list license:gpl2 license:lppl))))
+
+(define-public texlive-urcls
+  (package
+    (name "texlive-urcls")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/urcls/" "tex/latex/urcls/")
+             (base32
+              "1fkz3jqrfay9kzaq1iyyz95n1m7xg6cw8rar878dlgb1rmkds1fb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/urcls")
+    (synopsis
+     "Beamer and @code{scrlttr2} classes and styles for the University of
+Regensburg")
+    (description
+     "The bundle provides a Beamer-derived class and a theme style file for
+the corporate design of the @acronym{UR, University of Regensburg}.  It also
+contains a @code{scrlttr2}-derived class for letters using the corporate
+design of the UR. Users may use the class itself (URbeamer) or use the theme
+in the usual way with @code{\\usetheme@{UR@}}.")
+    (license license:lppl)))
+
+(define-public texlive-urwchancal
+  (package
+    (name "texlive-urwchancal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/urwchancal/"
+                   "fonts/tfm/urw/urwchancal/"
+                   "fonts/vf/urw/urwchancal/"
+                   "tex/latex/urwchancal/")
+             (base32
+              "05mwicyb46hjlqpq432z4b3f0q566xplzp1fjiw1ijmns5xhvig9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/urwchancal")
+    (synopsis "Use URW's clone of Zapf Chancery as a maths alphabet")
+    (description
+     "The package allows (the URW clone of) Zapf Chancery to function as
+a maths alphabet, the target of @code{\\mathcal} or @code{\\mathscr}, with
+accents appearing where they should, and other spacing parameters set to
+reasonable (not very tight) values.  The font itself may be found in the URW
+basic fonts collection.  This package supersedes the @code{pzccal} package.")
+    (license license:lppl)))
+
+(define-public texlive-usebib
+  (package
+    (name "texlive-usebib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/usebib/" "source/latex/usebib/"
+                   "tex/latex/usebib/")
+             (base32
+              "1qymf8hnp7ilzm030ypbagmw6nicdfy8lhry20viws1v7dibk9l0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/usebib")
+    (synopsis "Simple bibliography processor")
+    (description
+     "The package is described by its author as @emph{a poor person's
+replacement for the more powerful methods provided by BibLaTeX to access data
+from a @file{.bib} file}.  Its principle commands are @code{\\bibinput}, which
+specifies a database to use, and @code{\\usebibdata}, which typesets a single
+field from a specified entry in that database.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-uspatent
+  (package
+    (name "texlive-uspatent")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uspatent/" "tex/latex/uspatent/")
+             (base32
+              "0f2w7zczl6zmxysdwyksbq3zniyw6mfr9zhdz55j5l84fgkwcd3n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uspatent")
+    (synopsis "U.S. Patent Application Tools for LaTeX and LyX")
+    (description
+     "The package provides a class and other tools for developing
+a beautifully formatted, consistent U.S. Patent Application using LaTeX and/or
+LyX.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-ut-thesis
+  (package
+    (name "texlive-ut-thesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ut-thesis/"
+                   "source/latex/ut-thesis/"
+                   "tex/latex/ut-thesis/")
+             (base32
+              "0z1rvgy4d2zdagb7x5ymdid02fwnpv2x4dd4jxxkhg9mgq0lscyn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ut-thesis")
+    (synopsis "University of Toronto thesis style")
+    (description
+     "This LaTeX document class implements the formatting requirements of the
+University of Toronto School of Graduate Studies (SGS), as of Fall 2020.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-utexasthesis
+  (package
+    (name "texlive-utexasthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/utexasthesis/"
+                   "tex/latex/utexasthesis/")
+             (base32
+              "12qgidbdyjj9mdjp6lzidw0ifkdh7hskxdmpmsk5wybjicvf24w4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/utexasthesis")
+    (synopsis "University of Texas at Austin graduate thesis style")
+    (description
+     "This class file complies with the Digital Submission Requirement for
+masters and PhD thesis submissions of the University of Texas at Austin.")
+    (license license:cc0)))
+
+(define-public texlive-uvaletter
+  (package
+    (name "texlive-uvaletter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uvaletter/"
+                   "tex/latex/uvaletter/")
+             (base32
+              "12y57x4np1asfcbm6izn31rzqbxdxmsfc8gibgz6sh7nj2vvhf22")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uvaletter")
+    (synopsis "Unofficial letterhead template for the University of Amsterdam")
+    (description
+     "This is an unofficial LaTeX package that provides a letterhead template
+for the University of Amsterdam.")
+    (license license:expat)))
+
+(define-public texlive-uwa-colours
+  (package
+    (name "texlive-uwa-colours")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uwa-colours/"
+                   "source/latex/uwa-colours/"
+                   "tex/latex/uwa-colours/")
+             (base32
+              "1lryscsnwayp0s74rcdlr36bi2n45fbdq9f2h3av2n1nj57259a9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uwa-colours")
+    (synopsis "Colour palette of the University of Western Australia")
+    (description
+     "This package uses the @code{xcolor} package to define macros for the
+colour palette of the University of Western Australia.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-uwa-letterhead
+  (package
+    (name "texlive-uwa-letterhead")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uwa-letterhead/"
+                   "source/latex/uwa-letterhead/"
+                   "tex/latex/uwa-letterhead/")
+             (base32
+              "06p4c6m8dizq4y3pd95bzf81y296r1gg134jnx5h0qzh4l5ywpyx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uwa-letterhead")
+    (synopsis "Letterhead of the University of Western Australia")
+    (description
+     "This package generates the letterhead of the @acronym{UWA, University of
+Western Australia}.  It requires the UWA logo in PDF format, which is
+available in SVG format at
+@url{https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/img/uwacrest/},
+and uses the Arial and UWA Slab fonts by default.  The package works with
+XeLaTeX and LuaLaTeX.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-uwa-pcf
+  (package
+    (name "texlive-uwa-pcf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uwa-pcf/" "source/latex/uwa-pcf/"
+                   "tex/latex/uwa-pcf/")
+             (base32
+              "0b41nfrrqmcq3abcwb13hb9anhb5c12c5ha60ni1yz2xqvimr1im")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uwa-pcf")
+    (synopsis
+     "@acronym{PCF, Participant Consent Form} for a human research protocol
+at the University of Western Australia")
+    (description
+     "This LaTeX class generates a @acronym{PCF, Participant Consent Form} for
+a human research protocol at the @acronym{UWA, University of Western
+Australia}.  It requires the UWA logo in PDF format, which is available in SVG
+format at
+@url{https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/img/uwacrest/},
+and uses the Arial and UWA Slab fonts by default.  The class works with
+XeLaTeX and LuaLaTeX.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-uwa-pif
+  (package
+    (name "texlive-uwa-pif")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uwa-pif/" "source/latex/uwa-pif/"
+                   "tex/latex/uwa-pif/")
+             (base32
+              "048367w14wnk8h517xc914xvp0g10ysk0kziikk2s4q70qk2jci0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uwa-pif")
+    (synopsis
+     "@acronym{PIF, Participant Information Form} for a human research
+protocol at the University of Western Australia")
+    (description
+     "This package generates a @acronym{PIF, Participant Information Form} for
+a human research protocol at the @acronym{UWA, University of Western
+Australia}.  It requires the UWA logo in PDF format, which is available in SVG
+format at
+@url{https://static-listing.weboffice.uwa.edu.au/visualid/core-rebrand/img/uwacrest/},
+and uses the Calibri fonts by default.  The class works with XeLaTeX and
+LuaLaTeX.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-uwthesis
+  (package
+    (name "texlive-uwthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uwthesis/" "tex/latex/uwthesis/")
+             (base32
+              "0wcxpvr86556gxbcprwcv6ipdq3flyfwbcmjkxhy6x6220sfwp56")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uwthesis")
+    (synopsis "University of Washington thesis class")
+    (description "This is a thesis class for the University of Washington.")
+    (license license:asl2.0)))
+
+(define-public texlive-vak
+  (package
+    (name "texlive-vak")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/vak/" "doc/bibtex/vak/")
+             (base32
+              "1v8bg5yvihskx04m1jjmhlykj2azqb0qv4b2a56vqirrwhldks75")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/vak")
+    (synopsis "BibTeX style for Russian theses, books, etc")
+    (description
+     "The file can be used to format the bibliographies of PhD theses,
+books etc., according to the latest Russian standards: GOST 7.82 -- 2001 and
+GOST 7.1 -- 2003.  It introduces the minimum number of new entries and styles
+to cover all frequently used situations.  The style file provides an easy way
+to perform a semiautomatic, or a completely manual sort of the list of the
+references.  Processing bibliographies produced by the style requires a 8-bit
+BibTeX system.")
+    (license license:lppl)))
+
+(define-public texlive-vancouver
+  (package
+    (name "texlive-vancouver")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/vancouver/"
+                   "doc/bibtex/vancouver/")
+             (base32
+              "1r8x945cx32zn6ky4qqrki4xrj8ipbmkgm2dijmws5m0bkkh276r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/vancouver")
+    (synopsis "Bibliographic style file for Biomedical journals")
+    (description
+     "This BibTeX style file is expected to meet the Uniform Requirements for
+Manuscripts Submitted to Biomedical Journals (also known as the Vancouver
+style).")
+    (license license:lppl1.3+)))
+
+(define-public texlive-velthuis
+  (package
+    (name "texlive-velthuis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/velthuis/"
+                   "doc/man/man1/devnag.1"
+                   "doc/man/man1/devnag.man1.pdf"
+                   "fonts/afm/public/velthuis/"
+                   "fonts/map/dvips/velthuis/"
+                   "fonts/source/public/velthuis/"
+                   "fonts/tfm/public/velthuis/"
+                   "fonts/type1/public/velthuis/"
+                   "tex/generic/velthuis/"
+                   "tex/latex/velthuis/"
+                   "tex/plain/velthuis/"
+                   "tex/xelatex/velthuis/")
+             (base32
+              "0h9maci6b65x7zy13v5j4vlr07lnghiwckh7bn4ix7d1wmh74bij")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (propagated-inputs (list texlive-xetex-devanagari))
+    (home-page "https://ctan.org/pkg/devanagari")
+    (synopsis "Typeset Devanagari")
+    (description
+     "This package provides Frans Velthuis preprocessor for Devanagari text,
+and fonts and macros to use when typesetting the processed text.  The macros
+provide features that support Sanskrit, Hindi, Marathi, Nepali, and other
+languages typically printed in the Devanagari script.  The package provides
+fonts, in both Metafont and Type 1 formats.")
+    (license license:gpl3+)))
+
 (define-public texlive-venn
   (package
     (name "texlive-venn")
@@ -8965,6 +32037,81 @@ settings.")
     (description "This package provides MetaPost macros for Venn diagrams.")
     (license license:lppl)))
 
+(define-public texlive-venturisadf
+  (package
+    (name "texlive-venturisadf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/venturisadf/"
+                   "fonts/afm/arkandis/venturis/"
+                   "fonts/afm/arkandis/venturis2/"
+                   "fonts/afm/arkandis/venturisold/"
+                   "fonts/afm/arkandis/venturissans/"
+                   "fonts/afm/arkandis/venturissans2/"
+                   "fonts/enc/dvips/venturisadf/"
+                   "fonts/map/dvips/venturis/"
+                   "fonts/map/dvips/venturis2/"
+                   "fonts/map/dvips/venturisold/"
+                   "fonts/map/dvips/venturissans/"
+                   "fonts/map/dvips/venturissans2/"
+                   "fonts/tfm/arkandis/venturis/"
+                   "fonts/tfm/arkandis/venturis2/"
+                   "fonts/tfm/arkandis/venturisold/"
+                   "fonts/tfm/arkandis/venturissans/"
+                   "fonts/tfm/arkandis/venturissans2/"
+                   "fonts/type1/arkandis/venturis/"
+                   "fonts/type1/arkandis/venturis2/"
+                   "fonts/type1/arkandis/venturisold/"
+                   "fonts/type1/arkandis/venturissans/"
+                   "fonts/type1/arkandis/venturissans2/"
+                   "fonts/vf/arkandis/venturis/"
+                   "fonts/vf/arkandis/venturis2/"
+                   "fonts/vf/arkandis/venturisold/"
+                   "fonts/vf/arkandis/venturissans/"
+                   "fonts/vf/arkandis/venturissans2/"
+                   "source/fonts/venturisadf/"
+                   "tex/latex/venturis/"
+                   "tex/latex/venturis2/"
+                   "tex/latex/venturisadf/"
+                   "tex/latex/venturisold/"
+                   "tex/latex/venturissans/"
+                   "tex/latex/venturissans2/")
+             (base32
+              "0nvr9g1zzm51zjws52y8cyyi3y1z77q8s7iwgcb6jq4s9n4b4xbc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/venturisadf")
+    (synopsis "Venturis ADF fonts collection")
+    (description
+     "This package provides Venturis ADF fonts collection, serif and sans
+serif complete text font families, in both Adobe Type 1 and OpenType formats
+for publication.  The family is based on Utopia family.  Support for using the
+fonts, in LaTeX, is also provided.")
+    (license (list license:lppl1.3+
+                   (license:fsf-free
+                    "http://mirrors.ctan.org/fonts/utopia/README")))))
+
+(define-public texlive-verse
+  (package
+    (name "texlive-verse")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/verse/" "source/latex/verse/"
+                   "tex/latex/verse/")
+             (base32
+              "0v54xgn9d91xsjcy5dmgs5r50amvqnakyc7hymdzbqkv5cz2dd3r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/verse")
+    (synopsis "Aids for typesetting simple verse")
+    (description
+     "The package provides aids for typesetting simple verses; the package is
+strong on layout, from simple alternate-line indentation to the @code{Mouse's
+tale} from @emph{Alice in Wonderland}.")
+    (license license:lppl)))
+
 (define-public texlive-vlna
   (package
     (name "texlive-vlna")
@@ -8985,6 +32132,130 @@ Czech/Slovak typographical rule forbidding a non-syllabic preposition alone at
 the end of a line.")
     (license license:knuth)))
 
+(define-public texlive-vntex
+  (package
+    (name "texlive-vntex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/vntex/"
+                   "fonts/afm/vntex/chartervn/"
+                   "fonts/afm/vntex/grotesqvn/"
+                   "fonts/afm/vntex/urwvn/"
+                   "fonts/afm/vntex/vntopia/"
+                   "fonts/enc/dvips/vntex/"
+                   "fonts/enc/pdftex/vntex/"
+                   "fonts/map/dvips/vntex/"
+                   "fonts/source/vntex/vnr/"
+                   "fonts/tfm/vntex/arevvn/"
+                   "fonts/tfm/vntex/chartervn/"
+                   "fonts/tfm/vntex/cmbrightvn/"
+                   "fonts/tfm/vntex/concretevn/"
+                   "fonts/tfm/vntex/grotesqvn/"
+                   "fonts/tfm/vntex/txttvn/"
+                   "fonts/tfm/vntex/urwvn/"
+                   "fonts/tfm/vntex/vnr/"
+                   "fonts/tfm/vntex/vntopia/"
+                   "fonts/type1/vntex/arevvn/"
+                   "fonts/type1/vntex/chartervn/"
+                   "fonts/type1/vntex/cmbrightvn/"
+                   "fonts/type1/vntex/concretevn/"
+                   "fonts/type1/vntex/grotesqvn/"
+                   "fonts/type1/vntex/txttvn/"
+                   "fonts/type1/vntex/urwvn/"
+                   "fonts/type1/vntex/vnr/"
+                   "fonts/type1/vntex/vntopia/"
+                   "fonts/vf/vntex/chartervn/"
+                   "fonts/vf/vntex/urwvn/"
+                   "fonts/vf/vntex/vntopia/"
+                   "source/generic/vntex/"
+                   "tex/latex/vntex/"
+                   "tex/plain/vntex/")
+             (base32
+              "0vbpxzqvqpymw2chgrrva7alrvp6lj735hy8wqksal968sch6azx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-ec texlive-metafont))
+    (home-page "https://ctan.org/pkg/vntex")
+    (synopsis "Support for Vietnamese")
+    (description
+     "The vntex bundle provides fonts, Plain TeX, texinfo and LaTeX macros for
+typesetting documents in Vietnamese.  Users of the fonts (in both Metafont and
+Adobe Type 1 format) of this bundle may alternatively use the @code{lm} fonts
+bundle, for which map files are available to provide a Vietnamese version.")
+    ;; Vietnamese glyphs has been added according to the conditions of the
+    ;; Adobe/TUG license agreement.  The package itself is released under
+    ;; LPPL1.3+ terms.
+    (license (list license:lppl1.3+
+                   (license:fsf-free "file://source/generic/vntex/LICENSE-utopia.txt")))))
+
+(define-public texlive-wallpaper
+  (package
+    (name "texlive-wallpaper")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/wallpaper/"
+                   "tex/latex/wallpaper/")
+             (base32
+              "07ynf0b7czqqz0ha70ccvdxmcm3s6px82s1101llwbpxhwpqis5i")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/wallpaper")
+    (synopsis
+     "Add wallpapers (background images) to LaTeX documents, including tiling")
+    (description
+     "This collection contains files to add wallpapers (background images) to
+LaTeX documents.  It provides simple commands to include effects such as
+tiling.")
+    (license license:lppl)))
+
+(define-public texlive-wargame
+  (package
+    (name "texlive-wargame")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/wargame/" "source/latex/wargame/"
+                   "tex/latex/wargame/")
+             (base32
+              "1j56fnq5m298ly650v0k7qla15kiwcwswsd7454wqv9f191gmhhh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/wargame")
+    (synopsis "LaTeX package to prepare hex'n'counter wargames")
+    (description
+     "This package can help make classic Hex'n'Counter wargames using LaTeX.
+The package provide tools for generating Hex maps and boards Counters for
+units, markers, and so on Counter sheets Order of Battle charts Illustrations
+in the rules using the defined maps and counters The result will often be
+a PDF (or set of PDFs) that contain everything one will need for
+a game (rules, charts, boards, counter sheets).  The package uses NATO App6
+symbology for units.  The package uses NATO App6 symbology for units.  The
+package uses TikZ for most things.  The package support exporting the game to
+a VASSAL module.")
+    (license license:cc-by-sa4.0)))
+
+(define-public texlive-windycity
+  (package
+    (name "texlive-windycity")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/windycity/"
+                   "tex/latex/windycity/")
+             (base32
+              "13fw7nnkgnphwm3vjdsn40p7n5j6cfb4c60ga6y16xrcwihzdqpb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/windycity")
+    (synopsis "Chicago style for BibLaTeX")
+    (description
+     "Windy City is a style for BibLaTeX that formats notes, bibliographies,
+parenthetical citations, and reference lists according to the 17th edition of
+@emph{The Chicago Manual of Style}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-witharrows
   (package
     (name "texlive-witharrows")
@@ -9008,6 +32279,333 @@ These arrows are usually used to give explanations concerning the mathematical
 calculus presented.")
     (license license:lppl1.3+)))
 
+(define-public texlive-wnri
+  (package
+    (name "texlive-wnri")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/wnri/"
+                   "fonts/source/public/wnri/"
+                   "fonts/tfm/public/wnri/")
+             (base32
+              "1p2b847a5xa00xvv46b8p0f2fhi1k01w4l7bm2517hs7inwj3brs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/wnri")
+    (synopsis "Ridgeway's fonts")
+    (description
+     "This package provides fonts (as Metafont source) for Old English, Indic
+languages in Roman transliteration and Puget Salish (Lushootseed) and other
+Native American languages.")
+    (license license:gpl3+)))
+
+(define-public texlive-wnri-latex
+  (package
+    (name "texlive-wnri-latex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/wnri-latex/"
+                   "source/latex/wnri-latex/"
+                   "tex/latex/wnri-latex/")
+             (base32
+              "08ld2nys36vb368977dpwav75ffra2p8999dx4dwrs4vg6k2r2l7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/wnri-latex")
+    (synopsis "LaTeX support for @code{wnri} fonts")
+    (description
+     "This package provides LaTeX support for the @code{wnri} fonts.")
+    (license license:gpl2)))
+
+(define-public texlive-wsemclassic
+  (package
+    (name "texlive-wsemclassic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/wsemclassic/"
+                   "source/latex/wsemclassic/"
+                   "tex/latex/wsemclassic/")
+             (base32
+              "1kq871pbf2xq0h0njsp3j0wygz6970y5nkara5v5kpby42kx96rl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/wsemclassic")
+    (synopsis "LaTeX class for Bavarian school w-seminar papers")
+    (description
+     "The class is designed either to conform with the recommendations of the
+Bavarian Kultusministerium for typesetting w-seminar papers (strict mode), or
+to use another style which should look better.  The class is based on the
+LaTeX standard @code{report} class.")
+    (license license:bsd-3)))
+
+(define-public texlive-wsuipa
+  (package
+    (name "texlive-wsuipa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/wsuipa/"
+                   "fonts/source/public/wsuipa/"
+                   "fonts/tfm/public/wsuipa/"
+                   "tex/latex/wsuipa/")
+             (base32
+              "0gj7d68gb82dxmrbz69ibgpw2q2h6sb22k8nl569r27m2sli60jy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    ;; FIXME: Font metrics generation fails with "! Strange path (turning
+    ;; number is zero)" error.
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'generate-font-metrics))))
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/wsuipa")
+    (synopsis "International Phonetic Alphabet fonts")
+    (description
+     "The package provides a 7-bit IPA font, as Metafont source, and macros
+for support under TeXt1 and LaTeX.  The fonts (and macros) are now largely
+superseded by the @code{tipa} fonts.")
+    (license license:knuth)))
+
+(define-public texlive-xcharter-math
+  (package
+    (name "texlive-xcharter-math")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/xcharter-math/"
+                   "fonts/opentype/public/xcharter-math/"
+                   "tex/latex/xcharter-math/")
+             (base32
+              "1p0wqn9877xshwlayba8v62dvx4m0widl9pd42aixll0snc6p67s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xcharter-math")
+    (synopsis "XCharter-based OpenType Math font for LuaTeX and XeTeX")
+    (description
+     "This package provides an Unicode Math font XCharter-Math.otf meant to be
+used together with XCharter Opentype Text fonts (extension of Bitstream
+Charter) in LuaLaTeX or XeLaTeX documents.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
+(define-public texlive-xcite
+  (package
+    (name "texlive-xcite")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xcite/" "source/latex/xcite/"
+                   "tex/latex/xcite/")
+             (base32
+              "1r6f4wk7d3na9a8v20kqp24m46rsqgqx0n8k5hv3ynhqhzizhpll")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xcite")
+    (synopsis "Use citation keys from a different document")
+    (description
+     "The package @code{xcite} is no longer necessary, because its
+functionality has been taken over by @code{xr}, so this final version is just
+a stub that loads @code{xr}.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-xduthesis
+  (package
+    (name "texlive-xduthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xduthesis/"
+                   "source/latex/xduthesis/"
+                   "tex/latex/xduthesis/")
+             (base32
+              "1sdl1m869s4hcxdj3q2205x9xdgx0qy9ri9vjyma9rsv70sa648p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xduthesis")
+    (synopsis "XeLaTeX template for writing Xidian University thesis")
+    (description
+     "This is a XeLaTeX template for writing theses to apply academic degrees
+in Xidian University.  The template is designed according to the official
+requirements on typesetting theses.  The template currently supports all
+levels of degrees from bachelor to doctor, including both academic master and
+professional master.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-xduts
+  (package
+    (name "texlive-xduts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/xduts/" "source/xelatex/xduts/"
+                   "tex/xelatex/xduts/")
+             (base32
+              "17zd5i4vxpg2n7w9449q754i2k280jjm18pfl6d8b6r1adv5hy4c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-ctex))
+    (home-page "https://ctan.org/pkg/xduts")
+    (synopsis "Xidian University TeX suite")
+    (description
+     "XDUTS is designed to help Xidian University students use LaTeX
+typesetting efficiently.  XDUTS contains a font configuration package that
+meets the school's requirements and can be applied to any document class.  In
+addition, there are thesis and thesis proposal templates for both
+undergraduate and postgraduate that meet the school's requirements.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-xecjk
+  (package
+    (name "texlive-xecjk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/xecjk/"
+                   "fonts/misc/xetex/fontmapping/xecjk/"
+                   "source/xelatex/xecjk/" "tex/xelatex/xecjk/")
+             (base32
+              "0mpmfrj0n00gpnh67zh627vxhpp6vim8x755vdpb75h36k8zm6yq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'copy-ctxdocstrip.tex
+            ;; There's a circular dependency between this package (where
+            ;; `ctex' should be a native input) and `ctex' (where this package
+            ;; is a propagated input).  To work around this, install the
+            ;; specific "ctxdocstrip.tex" file from `ctex' in the build
+            ;; directory and set TEXINPUTS variable accordingly so the process
+            ;; can find it.
+            (lambda* (#:key inputs #:allow-other-keys)
+              (install-file (search-input-file inputs
+                                               "tex/generic/ctex/ctxdocstrip.tex")
+                            "build/")
+              (setenv "TEXINPUTS" (string-append (getcwd) "/build:")))))))
+    (native-inputs
+     (list (texlive-origin
+            "ctxdocstrip.tex" (number->string %texlive-revision)
+            (list "tex/generic/ctex/ctxdocstrip.tex")
+            (base32
+             "154v2d6wfzhfg654nlh2apy9zr78d09rkimymyjqpxymkpbk8lli"))))
+    (home-page "https://ctan.org/pkg/xecjk")
+    (synopsis "Support for CJK documents in XeLaTeX")
+    (description
+     "This package provides a LaTeX package for typesetting CJK documents in
+the way users have become used to, in the CJK package.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-xecyrmongolian
+  (package
+    (name "texlive-xecyrmongolian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xecyrmongolian/"
+                   "source/latex/xecyrmongolian/"
+                   "tex/latex/xecyrmongolian/")
+             (base32
+              "0097l8vx76sqpimljwxw194yg6drxzagjxflq3y99n0a0yisax05")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xecyrmongolian")
+    (synopsis
+     "Basic support for Cyrillic Mongolian documents using (Xe|Lua)LaTeX")
+    (description
+     "The @code{xecyrmongolian} package can be used to produce documents in
+Cyrillic Mongolian using either XeLaTeX or LuaLaTeX.  The command
+@code{\\setlanguage} can be used to load alternative hyphenation patterns so
+to be able to create multilingual documents.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-xmuthesis
+  (package
+    (name "texlive-xmuthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xmuthesis/"
+                   "source/latex/xmuthesis/"
+                   "tex/latex/xmuthesis/")
+             (base32
+              "1qnsh0q61zv4jrh92zkhgdk1lzk3fksa2iiv2c2hkyk55sjza6ac")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-ctex))
+    (home-page "https://ctan.org/pkg/xmuthesis")
+    (synopsis "XMU thesis style")
+    (description "This class is designed for XMU thesis's writing.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-xq
+  (package
+    (name "texlive-xq")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/xq/" "fonts/source/public/xq/"
+                   "fonts/tfm/public/xq/" "tex/latex/xq/")
+             (base32
+              "1g9j4vdlcnidv247bmagqd7q357h6fkg3b5cx1765n38k1bx8ikx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/xq")
+    (synopsis "Support for writing about xiangqi")
+    (description
+     "The package is for writing about xiangqi or chinese chess.  You can
+write games or parts of games and show diagrams with special positions.")
+    (license license:lppl)))
+
+(define-public texlive-xskak
+  (package
+    (name "texlive-xskak")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xskak/" "source/latex/xskak/"
+                   "tex/latex/xskak/")
+             (base32
+              "0b17y5i24adpb7f8jxf3lc5zwb1q4yf3w2vx9ql73xpi39xg6mcj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xskak")
+    (synopsis "Extension to the @code{skak} package for chess typesetting")
+    (description
+     "Xskak, as its prime function, saves information about a chess game for
+later use (e.g., to loop through a game to make an animated board).  The
+package also extends the input that the parsing commands can handle and offers
+an interface to define and switch between indefinite levels of styles.")
+    (license license:lppl)))
+
+(define-public texlive-xyling
+  (package
+    (name "texlive-xyling")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xyling/" "tex/latex/xyling/")
+             (base32
+              "1c4bgkbd42japidvrfg3ibj4h1l8v6zlivy7bqyiyj8alzdjhq4g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xyling")
+    (synopsis
+     "Draw syntactic trees, etc., for linguistics literature, using XY-Pic")
+    (description
+     "The macros in this package model the construction of linguistic tree
+structures as a genuinely graphical problem: they contain two types of
+objects, ``branches'' and ``node labels'', and these are positioned relative
+to a ``grid''.  It is essential that each of these three elements is
+constructed independent of the other two, and hence they can be modified
+without unwanted side effects.  The macros are based on the XY-Pic package.")
+    (license license:lppl)))
+
 (define-public texlive-xymtex
   (package
     (name "texlive-xymtex")
@@ -9029,6 +32627,220 @@ structural formulas in a way that reflects their structure.  The package
 provides three output modes: LaTeX, PostScript and PDF.")
     (license license:lppl1.3+)))
 
+(define-public texlive-yathesis
+  (package
+    (name "texlive-yathesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/yathesis/"
+                   "source/latex/yathesis/"
+                   "tex/latex/yathesis/")
+             (base32
+              "1qp1a0y8hkv0wfkbh2rbgkm2il08a320gl0kqppam4rb8y6wn77z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:build-targets #~(list "yathesis.dtx")
+           #:tex-format "lualatex"))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-accsupp
+                  texlive-alphalph
+                  texlive-attachfile2
+                  texlive-babel-french
+                  texlive-biblatex
+                  texlive-booktabs
+                  texlive-caption
+                  texlive-cleveref
+                  texlive-comment
+                  texlive-csquotes
+                  texlive-datetime2
+                  texlive-denisbdoc
+                  texlive-enumitem
+                  texlive-environ
+                  texlive-fancyvrb
+                  texlive-fixfoot
+                  texlive-fontawesome
+                  texlive-fontspec
+                  texlive-footmisc
+                  texlive-glossaries
+                  texlive-glossaries-extra
+                  texlive-gofonts
+                  texlive-hologo
+                  texlive-hypdoc
+                  texlive-ifmtarg
+                  texlive-imakeidx
+                  texlive-libertine
+                  texlive-listings
+                  texlive-marginnote
+                  texlive-morewrites
+                  texlive-mparhack
+                  texlive-multirow
+                  texlive-newunicodechar
+                  texlive-path
+                  texlive-parskip
+                  texlive-pdfcol
+                  texlive-pdflscape
+                  texlive-pgf
+                  texlive-refcount
+                  texlive-siunitx
+                  texlive-tcolorbox
+                  texlive-textcase
+                  texlive-tikzfill
+                  texlive-tocbibind
+                  texlive-tocvsec2
+                  texlive-translator
+                  texlive-underscore
+                  texlive-xifthen
+                  texlive-xpatch
+                  texlive-zref))))
+    (home-page "https://ctan.org/pkg/yathesis")
+    (synopsis "LaTeX class for writing a thesis following French rules")
+    (description
+     "The purpose of @code{yathesis} is to facilitate the typesetting of
+theses prepared in France, whatever the disciplines and institutes.  It
+implements most notably recommendations from the Ministry of Higher Education
+and Research, and this transparently to the user.  It has also been designed
+to (optionally) take advantage of powerful tools available in LaTeX, including
+packages: BibLaTeX for the bibliography; @code{glossaries} for the glossary,
+list of acronyms and symbols list.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-yazd-thesis
+  (package
+    (name "texlive-yazd-thesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/yazd-thesis/"
+                   "tex/xelatex/yazd-thesis/")
+             (base32
+              "0zwzzzf8z0p0cl6l3wjqnfj80pym4wx5halb3rl1i6bmvyypgafz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/yazd-thesis")
+    (synopsis "Template for the Yazd University")
+    (description
+     "This package offers a document class for typesetting theses and
+dissertations at the Yazd University.  The class requires use of XeLaTeX.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-yb-book
+  (package
+    (name "texlive-yb-book")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/yb-book/" "source/latex/yb-book/"
+                   "tex/latex/yb-book/")
+             (base32
+              "1brgy4y92888z7mc6yryasbv7xhcj560zsy5wz6ahcwny8f67mgg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-anyfontsize
+           texlive-biblatex
+           texlive-bigfoot
+           texlive-changepage
+           texlive-chngcntr
+           texlive-csquotes
+           texlive-enumitem
+           texlive-fancyhdr
+           texlive-float
+           texlive-footmisc
+           texlive-geometry
+           texlive-ifmtarg
+           texlive-imakeidx
+           texlive-lastpage
+           texlive-libertine
+           texlive-mdframed
+           texlive-microtype
+           texlive-needspace
+           texlive-paralist
+           texlive-pgf
+           texlive-qrcode
+           texlive-setspace
+           texlive-soul
+           texlive-titlesec
+           texlive-ulem
+           texlive-wrapfig
+           texlive-xcolor
+           texlive-xifthen
+           texlive-xkeyval
+           texlive-zref))
+    (home-page "https://ctan.org/pkg/yb-book")
+    (synopsis "Template for YB branded books")
+    (description
+     "This template helps the author design books published on Amazon under
+the ``Y.B.'' brand.")
+    (license license:expat)))
+
+(define-public texlive-yfonts
+  (package
+    (name "texlive-yfonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/yfonts/" "source/latex/yfonts/"
+                   "tex/latex/yfonts/")
+             (base32
+              "021sb52516ksxs1pb8nb1gchaagb0hblx55yyxzpywrryfkjd3rx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/yfonts")
+    (synopsis "Support for old German fonts")
+    (description
+     "This package provides a LaTeX interface to the old German Gothic,
+Schwabacher, Fraktur and the baroque initials.")
+    (license license:lppl)))
+
+(define-public texlive-yfonts-otf
+  (package
+    (name "texlive-yfonts-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/yfonts-otf/"
+                   "fonts/opentype/public/yfonts-otf/"
+                   "tex/latex/yfonts-otf/")
+             (base32
+              "0dnif4hiwqri67cx6bjzs0rvz3ayrkn6fs99qn4q9qggs6s25l0j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/yfonts-otf")
+    (synopsis "OpenType version of the Old German fonts")
+    (description
+     "This is an OpenType version of the Old German fonts @code{yfrak},
+@code{ygoth}, @code{yswab} designed by Yannis Haralambous in Metafont.  The
+OpenType features make it easier to deal with the long/round @samp{s} and with
+older forms of umlauts (small @samp{e} over the letter).  A style file
+@file{yfonts-otf.sty} is provided as a replacement, for LuaLaTeX and XeLaTeX,
+of @file{yfonts.sty} or @file{oldgerm.sty}.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
+(define-public texlive-yfonts-t1
+  (package
+    (name "texlive-yfonts-t1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/yfonts-t1/" "dvips/yfonts-t1/"
+                   "fonts/afm/public/yfonts-t1/"
+                   "fonts/map/dvips/yfonts-t1/"
+                   "fonts/type1/public/yfonts-t1/")
+             (base32
+              "1w92sgkarqx7z2ai6z059bml0kbh05fjyy9fl12x3nb0f5agjs7n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/yfonts-t1")
+    (synopsis "Old German-style fonts, in Adobe type 1 format")
+    (description
+     "This package comprises type 1 versions of the Gothic, Schwabacher and
+Fraktur fonts of Yannis Haralambous set of old German fonts.")
+    ;; "Freely available for general use."
+    (license (license:fsf-free "file://doc/fonts/yfonts-otf/README.md"))))
+
 (define-public texlive-yhmath
   (package
     (name "texlive-yhmath")
@@ -9055,6 +32867,47 @@ provides three output modes: LaTeX, PostScript and PDF.")
 and a LaTeX package for using them.")
     (license license:lppl1.3c)))
 
+(define-public texlive-yinit-otf
+  (package
+    (name "texlive-yinit-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/yinit-otf/"
+                   "fonts/opentype/public/yinit-otf/")
+             (base32
+              "0p3a56kg63smsgwr0vlfzjxrdw11j3777y09gdbdd1cc50r9p3zx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/yinit-otf")
+    (synopsis
+     "OTF conversion of Yannis Haralambous' Old German decorative initials")
+    (description
+     "This package is a conversion of the @code{yinit} font into OTF.
+Original Metafont files for @code{yinit} are in the @code{yinit} package.")
+    (license license:public-domain)))
+
+(define-public texlive-york-thesis
+  (package
+    (name "texlive-york-thesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/york-thesis/"
+                   "source/latex/york-thesis/"
+                   "tex/latex/york-thesis/")
+             (base32
+              "0wcl1zqmif2chramah8zmbgp5axbhlnjiygl7kgqnwqw5ajxkw4y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/york-thesis")
+    (synopsis "Thesis class file for York University, Toronto")
+    (description
+     "York Graduate Studies has again changed the requirements for theses and
+dissertations.  The established @code{york-thesis} class file now implements
+the changes made in Spring 2005.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-youngtab
   (package
     (name "texlive-youngtab")
@@ -9122,6 +32975,62 @@ providing lots more features.  Skew and coloured tableaux are easy, and
 pgfkeys-enabled options are provided both at package load and configurably.")
     (license license:lppl1.2+)))
 
+(define-public texlive-zitie
+  (package
+    (name "texlive-zitie")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/zitie/" "tex/xelatex/zitie/")
+             (base32
+              "0la4fg42c20isdip5gnynzhkj0hn295lf48hbyjjfvadx7zx408s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/zitie")
+    (synopsis "Create CJK character calligraphy practicing sheets")
+    (description
+     "This is a LaTeX package for creating CJK character calligraphy
+practicing sheets (copybooks).  Currently, only XeTeX is supported.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-zlmtt
+  (package
+    (name "texlive-zlmtt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/zlmtt/" "tex/latex/zlmtt/")
+             (base32
+              "014zchb0s9fj33d6h8r851v7v4cvpqzd97xaq4nv2l1lnxlii536")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/zlmtt")
+    (synopsis "Use Latin Modern Typewriter fonts")
+    (description
+     "The package allows selection of Latin Modern Typewriter fonts with
+scaling and access to all its features.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-zootaxa-bst
+  (package
+    (name "texlive-zootaxa-bst")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/zootaxa-bst/"
+                   "doc/bibtex/zootaxa-bst/")
+             (base32
+              "178daki12ky2hxjsdgz6nnc84741hdj0mn30lglp2sazqwjxrbw0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/zootaxa-bst")
+    (synopsis "BibTeX style for the journal @emph{Zootaxa}")
+    (description
+     "This package provides a @file{.bst} reference style file for the journal
+@emph{Zootaxa} that publishes contributions in zoology and classification.
+This is a fork of @file{apa.bst}.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-zx-calculus
   (package
     (name "texlive-zx-calculus")
@@ -9143,6 +33052,56 @@ multiple flavours for putting labels inside or outside nodes), and a debugging
 mode to avoid getting lost in big diagrams.")
     (license license:expat)))
 
+(define-public texlive-zxjafont
+  (package
+    (name "texlive-zxjafont")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/zxjafont/" "tex/latex/zxjafont/")
+             (base32
+              "1n8sky4aprs7r12pvyj6q1lman57k94s7mkynnzfw1z4xnam459j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/zxjafont")
+    (synopsis "Set up Japanese font families for XeLaTeX")
+    (description "This package sets up Japanese font families for XeLaTeX.")
+    (license license:expat)))
+
+(define-public texlive-zxjatype
+  (package
+    (name "texlive-zxjatype")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/zxjatype/" "tex/latex/zxjatype/")
+             (base32
+              "0llm0414kdwqsajb1nl92xa8kqwvbm446pwijag2735gk8rxqz8j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/zxjatype")
+    (synopsis "Standard conforming typesetting of Japanese, for XeLaTeX")
+    (description "This package eases standard conforming typesetting of
+Japanese, for XeLaTeX.")
+    (license license:expat)))
+
+(define-public texlive-zxjafbfont
+  (package
+    (name "texlive-zxjafbfont")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/zxjafbfont/"
+                   "tex/latex/zxjafbfont/")
+             (base32
+              "1vwbr2nwxp5f8c7q1gwm9z3karjkxjxr1j4lg5p12ljqlwm7p3lw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/zxjafbfont")
+    (synopsis "Fallback CJK font support for xeCJK")
+    (description "This package provides fallback CJK font support for xeCJK.")
+    (license license:expat)))
+
 (define-public texlive-biblatex-cheatsheet
   (package
     (name "texlive-biblatex-cheatsheet")
@@ -9527,6 +33486,109 @@ release process for LaTeX package authors.  Note by the CTAN
 team (2015-02-05): It seems that this script is currently not working.")
     (license license:gpl3)))
 
+(define-public texlive-ctex
+  (package
+    (name "texlive-ctex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ctex/" "source/latex/ctex/"
+                   "tex/generic/ctex/" "tex/latex/ctex/"
+                   "tex/luatex/ctex/")
+             (base32
+              "17zyr0cyxvp91832q35ha3qabdzh4njh96yvp4gfkkfkkszqp3jh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     ;; FIXME: I couldn't find how to build this package from source.
+     (list #:phases #~(modify-phases %standard-phases (delete 'build))))
+    (propagated-inputs
+     (list texlive-adobemapping
+           texlive-atbegshi
+           texlive-beamer
+           texlive-cjk
+           texlive-cjkpunct
+           texlive-ec
+           texlive-epstopdf-pkg
+           texlive-etoolbox
+           texlive-everyhook
+           texlive-fandol
+           texlive-fontspec
+           texlive-iftex
+           texlive-infwarerr
+           texlive-kvoptions
+           texlive-kvsetkeys
+           texlive-latex-bin
+           texlive-ltxcmds
+           texlive-luatexja
+           texlive-mptopdf
+           texlive-ms
+           texlive-pdftexcmds
+           texlive-platex-tools
+           texlive-svn-prov
+           texlive-tipa
+           texlive-tools
+           texlive-ttfutils
+           texlive-ulem
+           texlive-uplatex
+           texlive-xcjk2uni
+           texlive-xecjk
+           texlive-xetex
+           texlive-xkeyval
+           texlive-xpinyin
+           texlive-xunicode
+           texlive-zhmetrics
+           texlive-zhmetrics-uptex
+           texlive-zhnumber))
+    (home-page "https://ctan.org/pkg/ctex")
+    (synopsis "LaTeX classes and packages for Chinese typesetting")
+    (description
+     "CTeX is a collection of macro packages and document classes for LaTeX
+Chinese typesetting.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-ctex-faq
+  (package
+    (name "texlive-ctex-faq")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ctex-faq/")
+             (base32
+              "15c0g0x8w7vm3hyn6lk60jf66akyfcq6x8jc2lnbjx8ydwgb26br")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ctex-faq")
+    (synopsis "LaTeX FAQ by the Chinese TeX Society (ctex.org)")
+    (description
+     "This is the LaTeX FAQ by the Chinese TeX Society.  Most questions were
+collected on the @url{bbs.ctex.org} forum, and were answered in detail by the
+author.")
+    (license license:fdl1.3+)))
+
+(define-public texlive-ctib
+  (package
+    (name "texlive-ctib")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ctib/"
+                   "fonts/source/public/ctib/"
+                   "fonts/tfm/public/ctib/"
+                   "source/latex/ctib/" "tex/latex/ctib/")
+             (base32
+              "0qvh0icrijcsyi3kvzkp890qjx7j9axv9yzzfa1paivyfp33aijn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/ctib4tex")
+    (synopsis "Tibetan for TeX and LaTeX2e")
+    (description
+     "This LaTeX package uses a modified version of Sirlin's Tibetan font.  An
+advantage of this Tibetan implementation is that all consonant clusters are
+formed by TeX and Metafont.  No external preprocessor is needed.")
+    (license license:gpl3+)))
+
 (define-public texlive-ctie
   (package
     (name "texlive-ctie")
@@ -9979,6 +34041,28 @@ optionally be replaced with graphics paths so that applications that do not
 support SVG fonts are enabled to render the graphics properly.")
     (license license:gpl3+)))
 
+(define-public texlive-ebong
+  (package
+    (name "texlive-ebong")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ebong/" "scripts/ebong/")
+             (base32
+              "0ivzr6d83ws7q00k71zdz1v25y88fhja1safc4jfvd45i58fccy7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "ebong.py")))
+    (inputs (list python))
+    (home-page "https://ctan.org/pkg/ebong")
+    (synopsis "Utility for writing Bengali in Rapid Roman Format")
+    (description
+     "This package provides a tool (preprocessor) for writing your
+@code{pRaa-ne-r} ka-thaa in the Bengali langauage.  It allows one to write the
+text in Rapid Roman Bangla and convert it to the BangTeX format by a Python
+program.  All LaTeX markups are preserved in the target file.")
+    (license license:public-domain)))
+
 (define-public texlive-eijkhout
   (package
     (name "texlive-eijkhout")
@@ -10059,6 +34143,56 @@ an @file{.eps} file has anything except the origin for the lower-left of its
 bounding box.")
     (license license:public-domain)))
 
+(define-public texlive-ethiop
+  (package
+    (name "texlive-ethiop")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ethiop/"
+                   "fonts/ofm/public/ethiop/"
+                   "fonts/ovf/public/ethiop/"
+                   "fonts/ovp/public/ethiop/"
+                   "fonts/source/public/ethiop/"
+                   "fonts/tfm/public/ethiop/"
+                   "omega/ocp/ethiop/"
+                   "omega/otp/ethiop/"
+                   "source/latex/ethiop/"
+                   "tex/latex/ethiop/")
+             (base32
+              "1852g96rjyrsky7mpfwlxgip11qmk800xcmqccs8cv51f5342qlq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/ethiop")
+    (synopsis "LaTeX macros and fonts for typesetting Amharic")
+    (description
+     "This package provides Ethiopian language support for the Babel package,
+including a collection of fonts and TeX macros for typesetting the characters
+of the languages of Ethiopia, with Metafont fonts based on EthTeX's.  The
+macros use the Babel framework.")
+    (license license:gpl3+)))
+
+(define-public texlive-ethiop-t1
+  (package
+    (name "texlive-ethiop-t1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ethiop-t1/"
+                   "fonts/map/dvips/ethiop-t1/"
+                   "fonts/type1/public/ethiop-t1/")
+             (base32
+              "19n6i61db88nhhkq9gg3gfr3sgpaf1ylr41l0xdhpfkn71y7par1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ethiop-t1")
+    (synopsis "Type 1 versions of Amharic fonts")
+    (description
+     "These fonts provided in this package are drop-in Adobe type
+1 replacements for the fonts of the @code{ethiop} package.")
+    (license license:gpl3+)))
+
 (define-public texlive-expex-acro
   (package
     (name "texlive-expex-acro")
@@ -10121,6 +34255,33 @@ a comfortable and straightforward way.
 allow a somewhat natural formulation.")
     (license license:lppl1.3c)))
 
+(define-public texlive-fc
+  (package
+    (name "texlive-fc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fc/" "fonts/source/jknappen/fc/"
+                   "fonts/tfm/jknappen/fc/" "tex/latex/fc/")
+             (base32
+              "0v0r8jcr1lv31mx613h76h13psj73g49p2a6dnd0nfbfharww3gr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               ;; FIXME: Font metrics cannot be generated due to "bad pos"
+               ;; errors with "fcitt" fonts.
+               (delete 'generate-font-metrics))))
+    (native-inputs (list texlive-metafont texlive-sauter))
+    (home-page "https://ctan.org/pkg/fc")
+    (synopsis "Fonts for African languages")
+    (description
+     "This package includes fonts for African languages.  The fonts are
+provided as Metafont source, in the familiar arrangement of lots of preamble
+files and a modest set of glyph specifications.")
+    (license license:gpl2)))
+
 (define-public texlive-fenixpar
   (package
     (name "texlive-fenixpar")
@@ -10419,6 +34580,35 @@ otc) into individual fonts.
 @end itemize")
     (license license:gpl2)))
 
+(define-public texlive-fonts-tlwg
+  (package
+    (name "texlive-fonts-tlwg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fonts-tlwg/"
+                   "fonts/afm/public/fonts-tlwg/"
+                   "fonts/enc/dvips/fonts-tlwg/"
+                   "fonts/map/dvips/fonts-tlwg/"
+                   "fonts/opentype/public/fonts-tlwg/"
+                   "fonts/tfm/public/fonts-tlwg/"
+                   "fonts/type1/public/fonts-tlwg/"
+                   "fonts/vf/public/fonts-tlwg/"
+                   "source/fonts/fonts-tlwg/"
+                   "tex/latex/fonts-tlwg/")
+             (base32
+              "19g1ksxsidf6cpcxm3knbbfpjw6jsfq2acy99cgmsy7jn33k253b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fonts-tlwg")
+    (synopsis "Thai fonts for LaTeX from TLWG")
+    (description
+     "This package provides a collection of Thai fonts, supplied as FontForge
+sources, and with LaTeX @file{.fd} files.")
+    (license (list license:gpl2+
+                   license:lppl1.3+
+                   (license:x11-style "file://source/fonts/fonts-tlwg/COPYING")))))
+
 (define-public texlive-fontware
   (package
     (name "texlive-fontware")
@@ -10548,6 +34738,61 @@ invented by Gottlob Frege in 1879 for his books @emph{Begriffsschrift} and
 books are supported.")
     (license license:gpl3)))
 
+(define-public texlive-gfsbaskerville
+  (package
+    (name "texlive-gfsbaskerville")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gfsbaskerville/"
+                   "fonts/afm/public/gfsbaskerville/"
+                   "fonts/enc/dvips/gfsbaskerville/"
+                   "fonts/map/dvips/gfsbaskerville/"
+                   "fonts/opentype/public/gfsbaskerville/"
+                   "fonts/tfm/public/gfsbaskerville/"
+                   "fonts/type1/public/gfsbaskerville/"
+                   "fonts/vf/public/gfsbaskerville/"
+                   "tex/latex/gfsbaskerville/")
+             (base32
+              "0hf2nr0y1l9wzxvk0s2ajy3g80fcc02avr2fqrnss23c1a0jhr8q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gfsbaskerville")
+    (synopsis "Greek font, from one such by Baskerville")
+    (description
+     "The font is a digital implementation of Baskerville's classic Greek font,
+provided by the Greek Font Society.  The font covers Greek only, and LaTeX
+support provides for the use of LGR encoding.")
+    (license (list license:lppl1.0+ license:silofl1.1))))
+
+(define-public texlive-gfsporson
+  (package
+    (name "texlive-gfsporson")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/gfsporson/"
+                   "fonts/afm/public/gfsporson/"
+                   "fonts/enc/dvips/gfsporson/"
+                   "fonts/map/dvips/gfsporson/"
+                   "fonts/opentype/public/gfsporson/"
+                   "fonts/tfm/public/gfsporson/"
+                   "fonts/type1/public/gfsporson/"
+                   "fonts/vf/public/gfsporson/"
+                   "tex/latex/gfsporson/")
+             (base32
+              "11m9f3vh41w8gbla62219vf2djc5kl9i4kpg6i1iiixwrhi56smc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gfsporson")
+    (synopsis "Greek font, originally from Porson")
+    (description
+     "Porson is an elegant Greek font, originally cut at the turn of the 19th
+Century in England.  The present version has been provided by the Greek Font
+Society.  The font supports the Greek alphabet only.  LaTeX support is
+provided, using the LGR encoding.")
+    (license (list license:lppl1.0+ license:silofl1.1))))
+
 (define-public texlive-gobble
   (package
     (name "texlive-gobble")
@@ -10600,6 +34845,95 @@ those packages provided by @code{miniltx}.  The bundle also contains a file
 provides the LaTeX picture mode to Plain TeX users.")
     (license license:lppl1.0+)))
 
+(define-public texlive-greek-inputenc
+  (package
+    (name "texlive-greek-inputenc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/greek-inputenc/"
+                   "tex/latex/greek-inputenc/")
+             (base32
+              "1vifrgxwx92c44vmic9x7y65fl6lcmlavqq63dakl922ijlssrb1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/greek-inputenc")
+    (synopsis "Greek encoding support for @code{inputenc}")
+    (description
+     "The bundle provides UTF-8, Macintosh Greek encoding and ISO 8859-7
+definition files for use with @code{inputenc}.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-greekdates
+  (package
+    (name "texlive-greekdates")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/greekdates/"
+                   "source/latex/greekdates/"
+                   "tex/latex/greekdates/")
+             (base32
+              "1hwjskdllwxa14l12d0fn850sll3i9yihxlpjp2fk62v3iwkrq4r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/greekdates")
+    (synopsis "Provides ancient Greek day and month names, dates, etc")
+    (description
+     "The package provides easy access to ancient Greek names of days and
+months of various regions of Greece.  In case the historical information about
+a region is not complete, we use the Athenian name of the month.  Moreover
+commands and options are provided, in order to completely switch to the
+ancient way, such as @code{\\today}.")
+    (license license:lppl)))
+
+(define-public texlive-greektex
+  (package
+    (name "texlive-greektex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/greektex/" "tex/latex/greektex/")
+             (base32
+              "0zs3kakr7k261j876r1xpynvnmjjdn5rky0acfbcjxp7mmsqpmzn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/greektex")
+    (synopsis "Fonts for typesetting Greek/English documents")
+    (description
+     "The fonts are based on Silvio Levy's classical Greek fonts; macros and
+Greek hyphenation patterns for the fonts encoding are also provided.")
+    (license license:public-domain)))
+
+(define-public texlive-greektonoi
+  (package
+    (name "texlive-greektonoi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/greektonoi/"
+                   "fonts/map/dvips/greektonoi/"
+                   "tex/latex/greektonoi/")
+             (base32
+              "14phabwakq87qgh3jxs95gk1w2q3aw29vhy441538y4fxvskqhrw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/greektonoi")
+    (synopsis "Facilitates writing/editing of multiaccented Greek")
+    (description
+     "The @code{greektonoi} mapping extends the @code{betababel} package or
+the Babel @samp{polutonikogreek} option to provide a simple way to insert
+ancient Greek texts with diacritical characters into your document using
+a similar method to the commonly used Beta Code transliteration, but with much
+more freedom.  It is designed especially for the XeTeX engine and it could
+also be used for fast and easy modification of monotonic Greek texts to
+polytonic.  The output text is natively encoded in Unicode, so it can be
+reused in any possible way.  The @code{greektonoi} package provides, in
+addition to inserting Greek accents and breathings, many other symbols used in
+Greek numbers and arithmetic or in the Greek archaic period.  It could be used
+with @code{greektonoi} mapping or indepedently.")
+    (license license:lgpl3)))
+
 (define-public texlive-gtl
   (package
     (name "texlive-gtl")
@@ -10621,6 +34955,25 @@ which are not necessarily balanced.  It is in particular used a lot in the
 to work with entire braced groups at a time.")
     (license license:lppl1.3c)))
 
+(define-public texlive-hindawi-latex-template
+  (package
+    (name "texlive-hindawi-latex-template")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/hindawi-latex-template/")
+             (base32
+              "0q35drybrlcfcrhrd5691m66nd17b0m6hkcsqazpb1ck227zih61")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/hindawi-latex-template")
+    (synopsis "LaTeX template for authors of the Hindawi journals")
+    (description
+     "This package contains a LaTeX template for authors of the Hindawi journals.
+Authors can use this template for formatting their research articles for
+submissions.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-hlist
   (package
     (name "texlive-hlist")
@@ -10658,6 +35011,58 @@ languages and/or dialects, and to select them or switch between them while
 typesetting.")
     (license license:public-domain)))
 
+(define-public texlive-ibycus-babel
+  (package
+    (name "texlive-ibycus-babel")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ibycus-babel/"
+                   "source/latex/ibycus-babel/"
+                   "tex/latex/ibycus-babel/")
+             (base32
+              "1lwf28h6lzlblg7s7bx2dhqprxvjj78a8rlljhk9kw5pf065c7aj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ibycus-babel")
+    (synopsis "Use the Ibycus 4 Greek font with Babel")
+    (description
+     "The package allows you to use the Ibycus 4 font for ancient Greek with
+Babel.  It uses a Perl script to generate hyphenation patterns for Ibycus from
+those for the ordinary Babel encoding, @samp{cbgreek}.  It sets up
+@code{ibycus} as a pseudo-language you can specify in the normal Babel
+manner.")
+    (license license:lppl)))
+
+(define-public texlive-ibygrk
+  (package
+    (name "texlive-ibygrk")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ibygrk/"
+                   "fonts/afm/public/ibygrk/"
+                   "fonts/enc/dvips/ibygrk/"
+                   "fonts/map/dvips/ibygrk/"
+                   "fonts/source/public/ibygrk/"
+                   "fonts/tfm/public/ibygrk/"
+                   "fonts/type1/public/ibygrk/"
+                   "tex/generic/ibygrk/")
+             (base32
+              "14a1hqqwz3pfpz5rz9k8finxnlan4a3l8a0brgs98p6mdp9xl3q1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-levy texlive-metafont))
+    (home-page "https://ctan.org/pkg/ibygrk")
+    (synopsis "Fonts and macros to typeset ancient Greek")
+    (description
+     "Ibycus is a Greek typeface, based on Silvio Levy's realisation of
+a classic Didot cut of Greek type from around 1800.  The fonts are available
+both as Metafont source and in Adobe Type 1 format.  This distribution of
+@code{ibycus} is accompanied by a set of macro packages to use it with Plain
+TeX or LaTeX, but for use with Babel, see the @code{ibycus-babel} package.")
+    (license license:gpl3+)))
+
 (define-public texlive-inputnormalization
   (package
     (name "texlive-inputnormalization")
@@ -10715,6 +35120,57 @@ for short verbatim; @file{xfig.tex}, for including xfig/transfig output in
 a TeX document; and @file{cassette.tex} for setting cassette labels.")
     (license license:public-domain)))
 
+(define-public texlive-jsclasses
+  (package
+    (name "texlive-jsclasses")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/platex/jsclasses/"
+                   "source/platex/jsclasses/"
+                   "tex/platex/jsclasses/")
+             (base32
+              "024bgaim5rkamlwj4xa6w4yp8i37f8j6vn4jyrh8avwm9anc22pg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jsclasses")
+    (synopsis "Classes tailored for use with Japanese")
+    (description
+     "This package provides classes @code{jsarticle} and @code{jsbook},
+together with packages @code{okumacro} and @code{okuverb}.  These classes are
+designed to work under ASCII Corporation's Japanese TeX system pTeX.")
+    (license license:bsd-2)))
+
+(define-public texlive-kerkis
+  (package
+    (name "texlive-kerkis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/kerkis/"
+                   "fonts/afm/public/kerkis/"
+                   "fonts/enc/dvips/kerkis/"
+                   "fonts/map/dvips/kerkis/"
+                   "fonts/opentype/public/kerkis/"
+                   "fonts/tfm/public/kerkis/"
+                   "fonts/type1/public/kerkis/"
+                   "fonts/vf/public/kerkis/"
+                   "tex/latex/kerkis/")
+             (base32
+              "1mkrnydgc05k2n6mrz6i3ichigf0bmy465s2vg514m7ma399khi9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/kerkis")
+    (synopsis "Kerkis (Greek) font family")
+    (description
+     "This package provides sans-serif Greek fonts to match the URW Bookman
+set (which are distributed with Kerkis).  The Kerkis font set has some support
+for mathematics as well as other glyphs missing from the base URW Bookman
+fonts.  Macros are provided to use the fonts in OT1, T1 (only NG/ng glyphs
+missing) and LGR encodings, as well as in mathematics; small caps and
+old-style number glyphs are also available.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-lambda-lists
   (package
     (name "texlive-lambda-lists")
@@ -10816,6 +35272,67 @@ to make the text fit the box.  Note that letterspacing is not ordinarily
 considered acceptable in modern typesetting of English.")
     (license license:knuth)))
 
+(define-public texlive-levy
+  (package
+    (name "texlive-levy")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/levy/"
+                   "fonts/source/public/levy/"
+                   "fonts/tfm/public/levy/" "tex/generic/levy/")
+             (base32
+              "1nkfsq5k2rysgsplv6rhvx8fimd7999dylzd2khvw7flryig32nv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/levy-font")
+    (synopsis "Fonts for typesetting classical Greek")
+    (description
+     "These fonts are derivatives of Kunth's CM fonts.  Macros for use with
+Plain TeX are included in the package; for use with LaTeX, see @code{lgreek}
+(with English documentation) or @code{levy} (with German documentation).")
+    (license license:gpl2)))
+
+(define-public texlive-lgreek
+  (package
+    (name "texlive-lgreek")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lgreek/" "tex/latex/lgreek/")
+             (base32
+              "1wa8d5mlk6jkx3m1rfddasw169sc6l6p8n4axh6i0np1imgsxx2b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lgreek")
+    (synopsis "LaTeX macros for using Silvio Levy's Greek fonts")
+    (description
+     "This package provides a conversion of Silvio Levy's Plain TeX macros for
+use with LaTeX.")
+    (license license:gpl2)))
+
+(define-public texlive-lgrmath
+  (package
+    (name "texlive-lgrmath")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lgrmath/" "source/latex/lgrmath/"
+                   "tex/latex/lgrmath/")
+             (base32
+              "0lj4jdzwykqz1hkv2s6y2ghf1zlalx27gd6kfpbnignxmh63cpkb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lgrmath")
+    (synopsis "Use LGR-encoded fonts in math mode")
+    (description
+     "The @code{lgrmath} package is a LaTeX package which sets the Greek
+letters in math mode to use glyphs from the LGR-encoded font of one's choice.
+The documentation includes a rather extensive list of the available font
+family names on typical LaTeX installations.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-localloc
   (package
     (name "texlive-localloc")
@@ -10889,6 +35406,29 @@ of TeX and one of Metafont are needed.")
     ;; when modified.
     (license (license:fsf-free "file://tex/generic/midnight/border.tex"))))
 
+(define-public texlive-mkgrkindex
+  (package
+    (name "texlive-mkgrkindex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/mkgrkindex/"
+                   "makeindex/mkgrkindex/"
+                   "scripts/mkgrkindex/")
+             (base32
+              "0bj35wdxn0xllpqzf8lrd00b5rmyy9fws84avz3ijk4k8rvfz8gk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "mkgrkindex")))
+    (home-page "https://ctan.org/pkg/greek-makeindex")
+    (synopsis "MakeIndex working with Greek")
+    (description
+     "MakeIndex is resolutely stuck with Latin-based alphabets, so will not
+deal with Greek indexes, unaided.  This package provides a Perl script that
+will transmute the index of a Greek document in such a way that MakeIndex will
+sort the entries according to the rules of the Greek alphabet.")
+    (license license:lppl)))
+
 (define-public texlive-modulus
   (package
     (name "texlive-modulus")
@@ -10912,6 +35452,63 @@ a division operation without destroying the values of the counters containing
 the dividend and divisor.")
     (license license:lppl1.3c)))
 
+(define-public texlive-mongolian-babel
+  (package
+    (name "texlive-mongolian-babel")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/mongolian-babel/"
+                   "source/latex/mongolian-babel/"
+                   "tex/latex/mongolian-babel/")
+             (base32
+              "12kzips0jmjahrrfaripglg203dvvr408v5qxjvnrnxqzb8d1i2w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mongolian-babel")
+    (synopsis "Language definition file for Mongolian in Babel")
+    (description
+     "This package provides support for Mongolian in a Cyrillic
+alphabet.  (The work derives from the earlier Russian work for Babel.)")
+    (license license:lppl)))
+
+(define-public texlive-montex
+  (package
+    (name "texlive-montex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/montex/"
+                   "fonts/map/dvips/montex/"
+                   "fonts/source/public/montex/"
+                   "fonts/tfm/public/montex/"
+                   "fonts/type1/public/montex/"
+                   "tex/latex/montex/")
+             (base32
+              "01rbzw0kbiy3wig2mrdclygx7a71dckq9rhqj8jpdnbjyhm9jw35")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (propagated-inputs (list texlive-cbfonts))
+    (home-page "https://ctan.org/pkg/montex")
+    (synopsis "Mongolian LaTeX")
+    (description
+     "MonTeX provides Mongolian and Manju support for the TeX and LaTeX community.
+It provides all necessary characters for writing standard Mongolian in
+Cyrillic and Classical (aka Traditional or Uighur) writing, and Manju as well
+as transliterated Tibetan texts, for which purpose a number of additional
+characters was created.
+
+In MonTeX, both Mongolian and Manju are entered in romanized form.  The
+retransliteration (from Latin input to Mongolian and Manju output) is
+completely realized in TeX and Metafont so that no external preprocessor is
+required.  Please note that most of the enhanced functions of MonTeX require
+a working e-LaTeX environment.  This is especially true when compiling
+documents with Mongolian or Manju as the main document language.  It is
+recommended to choose pdfLaTeX as the resulting PDF files are truly portable.
+Vertical text generated by MonTeX is not supported in DVI.")
+    (license license:gpl3+)))
+
 (define-public texlive-moreverb
   (package
     (name "texlive-moreverb")
@@ -10936,6 +35533,73 @@ advised to consider using the @code{fancyvrb} package in place of
 @code{moreverb}.")
     (license license:lppl)))
 
+(define-public texlive-morewrites
+  (package
+    (name "texlive-morewrites")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/morewrites/"
+                   "source/latex/morewrites/"
+                   "tex/latex/morewrites/")
+             (base32
+              "0vdpyzfzhb58q9fj8c4n23hb0day7gxm90ml5dsnizfn44g9nr2q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/morewrites")
+    (synopsis "Always room for a new write stream")
+    (description
+     "The package aims to solve the error @emph{No room for a new \\write},
+which occurs when the user, or when the user's packages have allocated too
+many streams using @code{\\newwrite} (TeX has a fixed maximum number ---
+16 --- of such streams built-in to its code).  The package hooks into TeX
+primitive commands associated with writing to files; it should be loaded near
+the beginning of the sequence of loading packages for a document.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-morisawa
+  (package
+    (name "texlive-morisawa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/morisawa/"
+                   "fonts/map/dvipdfmx/morisawa/"
+                   "fonts/tfm/public/morisawa/"
+                   "fonts/vf/public/morisawa/"
+                   "source/fonts/morisawa/"
+                   "tex/latex/morisawa/")
+             (base32
+              "1wqyiq049y0mv6d1r3d0mrjzhh5pq2vi50sr0jhd58k4wdg8zqkb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/morisawa")
+    (synopsis
+     "Selection of 5 standard Japanese fonts for pLaTeX and dvips")
+    (description
+     "The package enables selection of 5 standard Japanese fonts for pLaTeX
+and dvips.")
+    (license license:bsd-2)))
+
+(define-public texlive-mpman-ru
+  (package
+    (name "texlive-mpman-ru")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/metapost/mpman-ru/")
+             (base32
+              "1x3drpi21zcmkhkscvl4l7805wskqa4zskydb33i0asss5p62396")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/mpman-ru")
+    (synopsis "Russian translation of the MetaPost manual")
+    (description
+     "This package provides a translation of the MetaPost user manual, as
+distributed with MetaPost itself.")
+    ;; Explicitly use the same license as MetaPost.
+    (license license:lppl)))
+
 (define-public texlive-namedef
   (package
     (name "texlive-namedef")
@@ -11001,6 +35665,25 @@ and use raw PDF objects.")
     ;; explicitly instead of simply renaming the file.
     (license (license:fsf-free "file://doc/plain/newsletr/read.me"))))
 
+(define-public texlive-numnameru
+  (package
+    (name "texlive-numnameru")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/numnameru/"
+                   "tex/latex/numnameru/")
+             (base32
+              "1il8qn9wkdk554r4a8h5vmdmwcvgwygcx58zwnqxflz6hqsxdjmx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/numnameru")
+    (synopsis "Converts a number to the Russian spelled out name")
+    (description
+     "This package converts a numerical number to the Russian spelled out name
+of the number.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-ofs
   (package
     (name "texlive-ofs")
@@ -11234,6 +35917,125 @@ functionality, and handling of arbitrary (multiple) private letters (analagous
 LaTeX packages use of @samp{@@@@}) in nested package files.")
     (license license:lppl1.3+)))
 
+(define-public texlive-platex
+  (package
+    (name "texlive-platex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/platex.1"
+                   "doc/man/man1/platex.man1.pdf"
+                   "doc/platex/base/"
+                   "source/platex/base/"
+                   "tex/platex/base/"
+                   "tex/platex/config/")
+             (base32
+              "0a843xnp3iikjxw1klxb3j2bssm6ylhcw32s046xxm2bs527hxi8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:create-formats #~(list "platex" "platex-dev")
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'fix-build
+                 ;; This phase is necessary because the build phase is
+                 ;; reluctant to generate "kinsoku.tex" since there is another
+                 ;; one among the inputs (texlive-ptex) already.
+                 (lambda _
+                   (substitute* "source/platex/base/plfmt.ins"
+                     (("\\\\keepsilent\n" all)
+                      (string-append all "\\askforoverwritefalse\n"))))))))
+    (propagated-inputs
+     (list texlive-atbegshi
+           texlive-atveryend
+           texlive-babel
+           texlive-cm
+           texlive-everyshi
+           texlive-firstaid
+           texlive-hyphen-base
+           texlive-l3backend
+           texlive-l3kernel
+           texlive-l3packages
+           texlive-latex
+           texlive-latex-fonts
+           texlive-ptex
+           texlive-ptex-fonts
+           texlive-tex-ini-files
+           texlive-unicode-data
+           texlive-uptex))
+    (home-page "https://ctan.org/pkg/platex")
+    (synopsis "pLaTeX2e and miscellaneous macros for pTeX")
+    (description
+     "The bundle provides pLaTeX2e and miscellaneous macros for pTeX and
+e-pTeX.")
+    (license license:bsd-3)))
+
+(define-public texlive-platex-tools
+  (package
+    (name "texlive-platex-tools")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/platex-tools/"
+                   "tex/latex/platex-tools/")
+             (base32
+              "1wdxcmag1kk6zs7dv10jdcs9ih0bs08xr14iw5bqqyppia4pa1lv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/platex-tools")
+    (synopsis "pLaTeX standard tools bundle")
+    (description
+     "This bundle is an extended version of the @code{latex-tools} bundle
+developed by the LaTeX team, mainly intended to support pLaTeX2e and
+upLaTeX2e.  Currently patches for the @code{latex-tools} bundle and Martin
+Schroder's @code{ms} bundle are included.")
+    (license license:bsd-3)))
+
+(define-public texlive-platexcheat
+  (package
+    (name "texlive-platexcheat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/platexcheat/")
+             (base32
+              "04hvm19x4z7vq2md3p3r2wwa7iqkgkxnvvj1xx3s9145m6fjib5a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/platexcheat")
+    (synopsis "LaTeX cheat sheet, in Japanese")
+    (description
+     "This is a translation to Japanese of Winston Chang's LaTeX cheat
+sheet (a reference sheet for writing scientific papers).  It has been adapted
+to Japanese standards using pLaTeX, and also attached additional information
+of standard LaTeX (especially about Math mode).")
+    (license license:expat)))
+
+(define-public texlive-plautopatch
+  (package
+    (name "texlive-plautopatch")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/plautopatch/"
+                   "tex/latex/plautopatch/")
+             (base32
+              "1fhphmjhq0mbsarkfmfj0580b97lxxbcwanr4zpwjj5f6krqq742")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/plautopatch")
+    (synopsis "Automated patches for pLaTeX/upLaTeX")
+    (description
+     "Japanese pLaTeX and upLaTeX formats and packages often conflict with
+other LaTeX packages which are unaware of pLaTeX and upLaTeX.  In the worst
+case, such packages throw a fatal error or end up with a wrong output.  The
+goal of this package is that there should be no need to worry about such
+incompatibilities, because specific patches are loaded automatically whenever
+necessary.  This helps not only to simplify source files, but also to make the
+appearance of working pLaTeX or upLaTeX sources similar to those of ordinary
+LaTeX ones.")
+    (license license:bsd-3)))
+
 (define-public texlive-plipsum
   (package
     (name "texlive-plipsum")
@@ -11338,6 +36140,360 @@ not overly complex, so that users should find it easy to adapt the macros to
 their specific needs.")
     (license license:lppl)))
 
+(define-public texlive-ptex
+  (package
+    (name "texlive-ptex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/eptex.1"
+                   "doc/man/man1/eptex.man1.pdf"
+                   "doc/man/man1/makejvf.1"
+                   "doc/man/man1/makejvf.man1.pdf"
+                   "doc/man/man1/mendex.1"
+                   "doc/man/man1/mendex.man1.pdf"
+                   "doc/man/man1/pbibtex.1"
+                   "doc/man/man1/pbibtex.man1.pdf"
+                   "doc/man/man1/ppltotf.1"
+                   "doc/man/man1/ppltotf.man1.pdf"
+                   "doc/man/man1/ptex.1"
+                   "doc/man/man1/ptex.man1.pdf"
+                   "doc/man/man1/ptftopl.1"
+                   "doc/man/man1/ptftopl.man1.pdf")
+             (base32
+              "1dk8rvadr1q00bjizj567lzjp5l47pr7miyk0ghkajbiiwbqi0kn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:create-formats #~(list "eptex" "ptex")))
+    (propagated-inputs
+     (list texlive-cm
+           texlive-etex
+           texlive-hyphen-base
+           texlive-knuth-lib
+           texlive-plain
+           texlive-ptex-base
+           texlive-ptex-fonts))
+    (home-page "https://ctan.org/pkg/ptex")
+    (synopsis "TeX system for publishing in Japanese")
+    (description
+     "pTeX adds features related to vertical writing, and deals with other
+problems in typesetting Japanese.  A manual (in both Japanese and English) is
+distributed as package @code{pTeX-manual}.")
+    (license license:bsd-3)))
+
+(define-public texlive-ptex-base
+  (package
+    (name "texlive-ptex-base")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/ptex/ptex-base/" "tex/ptex/ptex-base/")
+             (base32
+              "0hfccpsfpj56v97056k77lyb09az7m24m8klf1n2v0a7kqdc1fv6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ptex-base")
+    (synopsis "Plain TeX format for pTeX and e-pTeX")
+    (description
+     "The bundle contains the plain TeX format for pTeX and e-pTeX.")
+    (license license:bsd-3)))
+
+(define-public texlive-ptex-fontmaps
+  (package
+    (name "texlive-ptex-fontmaps")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ptex-fontmaps/"
+                   "fonts/cmap/ptex-fontmaps/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/adobe/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/apple/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/arphic/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/baekmuk/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/bizud/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/canon/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/cjkunifonts-ttf/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/cjkunifonts/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/dynacomware/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/fandol/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/founder/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/hiragino-pron/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/hiragino/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/ipa/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/ipaex/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/kozuka-pr6n/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/kozuka/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo-ex/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/moga-mobo/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/morisawa-pr6n/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/morisawa/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/ms-win10/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/ms/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/noEmbed/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/noto-otc/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/noto/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/solaris/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/sourcehan-otc/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/sourcehan/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/ume/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/unfonts/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/yu-osx/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/yu-win/"
+                   "fonts/map/dvipdfmx/ptex-fontmaps/yu-win10/"
+                   "fonts/misc/ptex-fontmaps/"
+                   "scripts/ptex-fontmaps/"
+                   "source/ptex-fontmaps/jis04cmap_exp/"
+                   "source/ptex-fontmaps/script/")
+             (base32
+              "07qm41d33z9vjvchsxfrqxim7zb15cg77x4aw5a06mgn3w7kz6ha")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:link-scripts #~(list "kanji-config-updmap-sys.sh"
+                                  "kanji-config-updmap-user.sh"
+                                  "kanji-config-updmap.pl"
+                                  "kanji-fontmap-creator.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/ptex-fontmaps")
+    (synopsis
+     "Font maps and tools for Japanese/Chinese/Korean fonts with (u)pTeX")
+    (description
+     "This package provides font maps and setup tools for Japanese, Korean,
+Traditional Chinese, and Simplified Chinese.  It is the successor of the
+@code{jfontmaps} package.  The files in this package contain font maps for
+dvipdfmx to make various Japanese, Chinese, and Korean fonts available
+for (u)ptex and related programs and formats.")
+    (license (list license:public-domain license:gpl3))))
+
+(define-public texlive-ptex-manual
+  (package
+    (name "texlive-ptex-manual")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/ptex/ptex-manual/")
+             (base32
+              "1pz8jyd86s2fjj0d63q9h04x0sxcyx1ffp48lf3n8awj0zrij861")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ptex-manual")
+    (synopsis "Japanese pTeX manual")
+    (description "This package contains the Japanese pTeX manual.")
+    (license license:bsd-3)))
+
+(define-public texlive-ptex-fonts
+  (package
+    (name "texlive-ptex-fonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/ptex-fonts/"
+                   "fonts/source/ptex-fonts/jis/"
+                   "fonts/source/ptex-fonts/nmin-ngoth/"
+                   "fonts/source/ptex-fonts/standard/"
+                   "fonts/tfm/ptex-fonts/dvips/"
+                   "fonts/tfm/ptex-fonts/jis/"
+                   "fonts/tfm/ptex-fonts/nmin-ngoth/"
+                   "fonts/tfm/ptex-fonts/standard/"
+                   "fonts/vf/ptex-fonts/jis/"
+                   "fonts/vf/ptex-fonts/nmin-ngoth/"
+                   "fonts/vf/ptex-fonts/standard/")
+             (base32
+              "0f33y28zmrc6gw01qj956vrwj3mh5gn6kph2i13yg1yi2hdl7wwa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ptex-fonts")
+    (synopsis "Fonts for use with pTeX")
+    (description
+     "The bundle contains fonts for use with pTeX and the documents for the
+@command{makejvf} program.")
+    (license license:bsd-3)))
+
+(define-public texlive-ptex2pdf
+  (package
+    (name "texlive-ptex2pdf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ptex2pdf/" "scripts/ptex2pdf/")
+             (base32
+              "0vc4clig35s9cir2gmls7zvj8k1qal4np0akvlgsz2zch44b0imr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "ptex2pdf.lua")))
+    (home-page "https://ctan.org/pkg/ptex2pdf")
+    (synopsis "Convert Japanese TeX documents to PDF")
+    (description
+     "The Lua script provides system-independent support of Japanese
+typesetting engines in TeXworks.  As TeXworks typesetting setup does not allow
+for multistep processing, this script runs one of the pTeX-based programs
+followed by dvipdfmx.")
+    (license license:gpl2)))
+
+(define-public texlive-pxbase
+  (package
+    (name "texlive-pxbase")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/platex/pxbase/" "tex/platex/pxbase/")
+             (base32
+              "0dq9d4ixddffjnzb73d2qacgzm27665hvq2gsfjqzikzaa70dahw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pxbase")
+    (synopsis "Tools for use with (u)pLaTeX")
+    (description
+     "The main purpose of this package is to provide auxiliary functions which
+are utilized by other packages created by the same author.  It also provides
+a few user commands to assist in creating Japanese documents using
+@code{(u)pLaTeX.}")
+    (license license:expat)))
+
+(define-public texlive-pxchfon
+  (package
+    (name "texlive-pxchfon")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/platex/pxchfon/" "fonts/sfd/pxchfon/"
+                   "fonts/tfm/public/pxchfon/"
+                   "fonts/vf/public/pxchfon/"
+                   "tex/platex/pxchfon/")
+             (base32
+              "0pvhgcv6rxp2lnscsh9k3z907114p09ja3frcy5276is21d6sdrj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pxchfon")
+    (synopsis "Japanese font setup for pLaTeX and upLaTeX")
+    (description
+     "This package enables users to declare in their document which physical
+fonts should be used for the standard Japanese (logical) fonts of pLaTeX and
+upLaTeX.  Font setup is realized by changing the font mapping of dvipdfmx, and
+thus users can use any (monospaced) physical fonts they like, once they
+properly install this package, without creating helper files for each new
+font.  This package also supports setup for the fonts used in the
+@code{japanese-otf} package.")
+    (license license:expat)))
+
+(define-public texlive-pxcjkcat
+  (package
+    (name "texlive-pxcjkcat")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pxcjkcat/" "tex/latex/pxcjkcat/")
+             (base32
+              "10lbwry55rdldfhj2v893rpp1jdzv00vxhg4hf4gsgsmv1nnp25f")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pxcjkcat")
+    (synopsis "LaTeX interface for the CJK category codes of upTeX")
+    (description
+     "The package provides management of the CJK category code table of the
+upTeX extended TeX engine.  Package options are available for tailored use in
+the cases of documents that are principally written in Japanese, or
+principally written in English or other Western languages.")
+    (license license:expat)))
+
+(define-public texlive-pxjahyper
+  (package
+    (name "texlive-pxjahyper")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/platex/pxjahyper/"
+                   "tex/platex/pxjahyper/")
+             (base32
+              "0128yslhwbrdhshjhxk6ayfl42ds0x0sfyvp91aspwbkfjnr34p9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pxjahyper")
+    (synopsis "Hyperref support for pLaTeX")
+    (description
+     "This package adjusts the behavior of @code{hyperref} on (u)pLaTeX so
+that authors can properly create PDF documents that contain document
+information in Japanese.")
+    (license license:expat)))
+
+(define-public texlive-pxjodel
+  (package
+    (name "texlive-pxjodel")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pxjodel/"
+                   "fonts/tfm/public/pxjodel/"
+                   "fonts/vf/public/pxjodel/"
+                   "tex/latex/pxjodel/")
+             (base32
+              "1g5sd60zd34ark50qy2dgqrdcd5pwy5hxmi6g5jxqlj3j1n6r1ny")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pxjodel")
+    (synopsis "Help change metrics of fonts from japanese-otf")
+    (description
+     "This package changes the setup of the @code{japanese-otf} package so
+that the TFMs for direct input are all replaced by new ones with prefixed
+names.  This function will assist users who want to use the
+@code{japanese-otf} package together with tailored TFMs of Japanese fonts.")
+    (license license:expat)))
+
+(define-public texlive-pxrubrica
+  (package
+    (name "texlive-pxrubrica")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/platex/pxrubrica/"
+                   "source/platex/pxrubrica/"
+                   "tex/platex/pxrubrica/")
+             (base32
+              "0n8jc65szkq114qg197hc9amrpifqvha8wifxplhvbmb09kzm5mm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pxrubrica")
+    (synopsis "Ruby annotations according to JIS X 4051")
+    (description
+     "This package provides a function to add ruby annotations (furigana) that
+follow the style conventional in Japanese typography as described in the W3C
+technical note @emph{Requirements for Japanese Text Layout} and the JIS
+specification JIS X 4051.")
+    (license license:expat)))
+
+(define-public texlive-pxufont
+  (package
+    (name "texlive-pxufont")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pxufont/"
+                   "fonts/tfm/public/pxufont/"
+                   "fonts/vf/public/pxufont/"
+                   "tex/latex/pxufont/")
+             (base32
+              "167hmw73lxgsv27gkzanr1plalsqfxphknl8q3rbamy2zp6n0al0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pxufont")
+    (synopsis "Emulate non-Unicode Japanese fonts using Unicode fonts")
+    (description
+     "The set of the Japanese logical fonts (JFMs) that are used as standard
+fonts in pTeX and upTeX contains both Unicode JFMs and non-Unicode JFMs.  This
+bundle provides an alternative set of non-Unicode JFMs that are tied to the
+virtual fonts (VFs) that refer to the glyphs in the Unicode JFMs.  Moreover it
+provides a LaTeX package that redefines the NFSS settings of the Japanese
+fonts of @code{(u)pLaTeX} so that the new set of non-Unicode JFMs will be
+employed.  As a whole, this bundle allows users to dispense with the mapping
+setup on non-Unicode JFMs.  Such a setup is useful in particular when users
+want to use OpenType fonts (such as Source Han Serif) that have a glyph
+encoding different from Adobe-Japan1, because mapping setups from non-Unicode
+JFMs to such physical fonts are difficult to prepare.")
+    (license license:expat)))
+
 (define-public texlive-pwebmac
   (package
     (name "texlive-pwebmac")
@@ -11574,6 +36730,27 @@ required.")
 position is already further along, @code{\\tabto} starts a new line.")
     (license license:public-domain)))
 
+(define-public texlive-talos
+  (package
+    (name "texlive-talos")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/talos/"
+                   "fonts/opentype/public/talos/")
+             (base32
+              "1m656d4lkc9ikp7gb91yna4323lip3xcr6n3kqh1j4sqvp4rkm61")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/talos")
+    (synopsis "Greek cult font from the eighties")
+    (description
+     "This package provides a cult Greek font from the eighties, used at the
+University of Crete, Greece.  It belonged to the first TeX installation in
+a Greek University and most probably the first TeX installation that supported
+the Greek language.")
+    (license license:gfl1.0)))
+
 (define-public texlive-termmenu
   (package
     (name "texlive-termmenu")
@@ -11596,6 +36773,27 @@ these options for the program to process.  @code{termmenu} provides this
 mechanism for TeX.")
     (license license:lppl1.3+)))
 
+(define-public texlive-teubner
+  (package
+    (name "texlive-teubner")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/teubner/" "source/latex/teubner/"
+                   "tex/latex/teubner/")
+             (base32
+              "1wlp2hv1xsn7z1d42y01mwp4yq06w1j9p3fgk2vvi4ca20rgg7pk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/teubner")
+    (synopsis "Philological typesetting of classical Greek")
+    (description
+     "This package provides an extension to Babel @samp{greek} option for
+typesetting classical Greek with a philological approach.  The package works
+with the author's greek fonts using the Lispiakos font shape derived from that
+of the fonts used in printers shops in Lispia.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-tex
   (package
     (name "texlive-tex")
@@ -11799,6 +36997,160 @@ analytical expansion of sin and cos.")
 barcodes.")
     (license license:lppl)))
 
+(define-public texlive-uplatex
+  (package
+    (name "texlive-uplatex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/uplatex.1"
+                   "doc/man/man1/uplatex.man1.pdf"
+                   "doc/uplatex/base/"
+                   "source/uplatex/base/"
+                   "tex/uplatex/base/"
+                   "tex/uplatex/config/")
+             (base32
+              "0bzkyira30b9xdsdfxjmwzgqffl9pvckz5avm6c3r0bq6asiml9l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:create-formats #~(list "uplatex" "uplatex-dev")
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'fix-build
+                 ;; This phase is necessary because the build phase is
+                 ;; reluctant to generate "ukinsoku.tex" since there is
+                 ;; another one among the inputs (texlive-uptex) already.
+                 (lambda _
+                   (substitute* "source/uplatex/base/uplfmt.ins"
+                     (("\\\\keepsilent\n" all)
+                      (string-append all "\\askforoverwritefalse\n"))))))))
+    (propagated-inputs
+     (list texlive-atbegshi
+           texlive-atveryend
+           texlive-babel
+           texlive-cm
+           texlive-everyshi
+           texlive-firstaid
+           texlive-hyphen-base
+           texlive-l3backend
+           texlive-l3kernel
+           texlive-l3packages
+           texlive-latex
+           texlive-latex-fonts
+           texlive-platex
+           texlive-tex-ini-files
+           texlive-unicode-data
+           texlive-uptex
+           texlive-uptex-fonts))
+    (home-page "https://ctan.org/pkg/uplatex")
+    (synopsis "pLaTeX2e and miscellaneous macros for upTeX")
+    (description
+     "The bundle provides pLaTeX2e macros for upTeX by Takuji Tanaka.")
+    (license license:bsd-3)))
+
+(define-public texlive-uptex-base
+  (package
+    (name "texlive-uptex-base")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/uptex/uptex-base/"
+                   "tex/uptex/uptex-base/")
+             (base32
+              "1xd55rv5ivlmmfmvvz611by6dbi0cw4lwpprcvd9yvgmqjafc1pj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uptex-base")
+    (synopsis "Plain TeX formats and documents for upTeX")
+    (description
+     "The bundle contains plain TeX format files and documents for upTeX and
+and e-upTeX.")
+    (license license:bsd-3)))
+
+(define-public texlive-uptex
+  (package
+    (name "texlive-uptex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/euptex.1"
+                   "doc/man/man1/euptex.man1.pdf"
+                   "doc/man/man1/upbibtex.1"
+                   "doc/man/man1/upbibtex.man1.pdf"
+                   "doc/man/man1/uppltotf.1"
+                   "doc/man/man1/uppltotf.man1.pdf"
+                   "doc/man/man1/uptex.1"
+                   "doc/man/man1/uptex.man1.pdf"
+                   "doc/man/man1/uptftopl.1"
+                   "doc/man/man1/uptftopl.man1.pdf")
+             (base32
+              "14hn2n6jbibbqbdr72j74z5bz003jnlabi3kja0f0waxhas680gd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:create-formats #~(list "euptex" "uptex")))
+    (propagated-inputs
+     (list texlive-cm
+           texlive-etex
+           texlive-hyphen-base
+           texlive-knuth-lib
+           texlive-plain
+           texlive-ptex-base
+           texlive-uptex-base
+           texlive-uptex-fonts))
+    (home-page "https://ctan.org/pkg/uptex")
+    (synopsis "Unicode version of pTeX")
+    (description
+     "upTeX is an extension of pTeX, using UTF-8 input and producing UTF-8 output.
+It was originally designed to improve support for Japanese, but is also useful
+for documents in Chinese and Korean.  It can process Chinese simplified,
+Chinese traditional, Japanese, and Korean simultaneously, and can also process
+original LaTeX with @code{\\inputenc@{utf8@}} and Babel
+(Latin/Cyrillic/Greek etc.) by switching its @code{\\kcatcode} tables.")
+    (license license:bsd-3)))
+
+(define-public texlive-uptex-fonts
+  (package
+    (name "texlive-uptex-fonts")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/uptex-fonts/"
+                   "fonts/cmap/uptex-fonts/"
+                   "fonts/source/uptex-fonts/"
+                   "fonts/tfm/uptex-fonts/jis/"
+                   "fonts/tfm/uptex-fonts/min/"
+                   "fonts/vf/uptex-fonts/jis/"
+                   "fonts/vf/uptex-fonts/min/")
+             (base32
+              "13cvdmfr97ad77q0djffl28grm1brqcsb1ccwkfdnkznp7ihiz82")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uptex-fonts")
+    (synopsis "Fonts for use with upTeX")
+    (description "The bundle contains fonts (TFM and VF) for use with upTeX.")
+    (license license:bsd-3)))
+
+(define-public texlive-upzhkinsoku
+  (package
+    (name "texlive-upzhkinsoku")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/upzhkinsoku/"
+                   "tex/generic/upzhkinsoku/")
+             (base32
+              "0c95fy9raykpjgnkz5h0wyjxyg2h0ksx2kb14lx2rsv65xsi909y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/upzhkinsoku")
+    (synopsis "Supplementary Chinese kinsoku for Unicode *pTeX")
+    (description
+     "This package provides supplementary Chinese kinsoku (line breaking rules
+etc.)@: settings for Unicode (e-)upTeX (when using Unicode as its internal
+encoding), and ApTeX.  Both LaTeX and plain TeX are supported.")
+    (license license:knuth)))
+
 (define-public texlive-variations
   (package
     (name "texlive-variations")
@@ -11838,6 +37190,32 @@ a size-change macro.  Note that @file{10point.tex} is by convention called by
 one of the other files, so that there's always a way back.")
     (license license:public-domain)))
 
+(define-public texlive-xgreek
+  (package
+    (name "texlive-xgreek")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xgreek/" "source/latex/xgreek/"
+                   "tex/latex/xgreek/")
+             (base32
+              "0hmy7s53bi9szvp13zcg6hk23s8mr2ssbnmq9cw5sb8ggz8icywa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xgreek")
+    (synopsis "Greek language support for XeLaTeX and LuaLaTeX")
+    (description
+     "This package has been designed so to allow people to typeset Greek
+language documents using XeLaTeX or LuaLaTeX.  Practically, it provides all
+the capabilities of the @samp{greek} option of the Babel package.
+
+The package can be invoked with any of the following options:
+@samp{monotonic} (for typesetting modern monotonic Greek),
+@samp{polytonic} (for typesetting modern polytonic Greek), and
+@samp{ancient} (for typesetting ancient texts).  The default option is
+@samp{monotonic}.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-xii
   (package
     (name "texlive-xii")
@@ -11920,6 +37298,91 @@ features allow to deal with numbers (tests, display, some high level
 operations, etc.)")
     (license license:lppl1.3+)))
 
+(define-public texlive-xtuthesis
+  (package
+    (name "texlive-xtuthesis")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xtuthesis/"
+                   "tex/latex/xtuthesis/")
+             (base32
+              "1fdk9dkikqlkjwrg8qjm2phvsyyvddshf78bjy6liyz5hqakk6r8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xtuthesis")
+    (synopsis "XTU thesis template")
+    (description
+     "The package provides a thesis template for the Xiangtan University.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-yannisgr
+  (package
+    (name "texlive-yannisgr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/yannisgr/"
+                   "fonts/source/public/yannisgr/"
+                   "fonts/tfm/public/yannisgr/")
+             (base32
+              "0s5cfid1r6jn34kzvmxwxyxpvyb0rayn80x3n7k515p1plqmmrnq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-levy texlive-metafont))
+    (home-page "https://ctan.org/pkg/yannisgr")
+    (synopsis "Greek fonts by Yannis Haralambous")
+    (description
+     "This package provides a family of 7-bit fonts with a code table designed
+for setting modern polytonic Greek.  The fonts are provided as Metafont
+source; macros to produce a Greek variant of Plain TeX (including
+a hyphenation table adapted to the fonts code table) are provided.")
+    (license license:gpl2)))
+
+(define-public texlive-zhlineskip
+  (package
+    (name "texlive-zhlineskip")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/zhlineskip/"
+                   "tex/latex/zhlineskip/")
+             (base32
+              "070vi0pra74in55r0pq2k35s3x3xk6gjwvnsif7bnx4k7wn39mal")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/zhlineskip")
+    (synopsis "Line spacing for CJK documents")
+    (description
+     "This package supports typesetting CJK documents.  It allows users to
+specify the two ratios between the leading and the font size of the body text
+and the footnote text.  For CJK typesetting, these ratios usually range from
+1.5 to 1.67.  This package is also capable of restoring the math leading to
+that of the Latin text (usually 1.2 times the font size).")
+    (license license:lppl1.3c)))
+
+(define-public texlive-zhlipsum
+  (package
+    (name "texlive-zhlipsum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/zhlipsum/"
+                   "source/latex/zhlipsum/"
+                   "tex/latex/zhlipsum/")
+             (base32
+              "1lhc3a8l5sizyw0v1cfsrwwwymmyab1yvx99iqhdh7avrzmi2gda")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-ctex))
+    (home-page "https://ctan.org/pkg/zhlipsum")
+    (synopsis "Chinese dummy text")
+    (description
+     "This package provides an interface to dummy text in Chinese language,
+which will be useful for testing Chinese documents.  UTF-8, GBK and Big5
+encodings are supported.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-zztex
   (package
     (name "texlive-zztex")
@@ -12066,6 +37529,48 @@ test file that is intended to be sent to the LaTeX bug database as part of
 a bug report.")
     (license license:lppl1.3c)))
 
+(define-public texlive-lcyw
+  (package
+    (name "texlive-lcyw")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/lcyw/" "source/latex/lcyw/"
+                   "tex/latex/lcyw/")
+             (base32
+              "1yijk9l2ls6sq45ifx6m9d7xxk0ysrnn1y3fjz8wxwgwxp88x9fh")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lcyw")
+    (synopsis "Make classic Cyrillic CM fonts accessible in LaTeX")
+    (description
+     "The package makes the classic CM Cyrillic fonts accessible for use with
+LaTeX.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-lhcyr
+  (package
+    (name "texlive-lhcyr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "source/latex/lhcyr/" "tex/latex/lhcyr/")
+             (base32
+              "09cg2hs5g20axbfpv2k6df5pi3xm0aywcswhnknllykr6z0ip2zw")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/lhcyr")
+    (synopsis "Non-standard Cyrillic input scheme")
+    (description
+     "This package provides a collection of three LaTeX2e styles intended for
+typesetting Russian and bilingual English-Russian documents, using the
+@code{lh} fonts and without the benefit of Babel's language-switching
+mechanisms.  The packages (@code{hcyralt} and @code{hcyrwin} for use under
+emTeX, and @code{hcyrkoi} for use under teTeX} provide mappings between the
+input encoding and the font encoding, which is described as OT1.  The way this
+is done does not match the way @code{inputenc} would do the job, for output
+via fontenc to one of the T2 series of font encodings.")
+    (license license:knuth)))
+
 (define-public texlive-luafindfont
   (package
     (name "texlive-luafindfont")
@@ -13149,6 +38654,71 @@ process.  It also provides a library which can be used to create customized
 conversion tools.")
     (license license:lppl1.3+)))
 
+(define-public texlive-makecell
+  (package
+    (name "texlive-makecell")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/makecell/"
+                   "source/latex/makecell/"
+                   "tex/latex/makecell/")
+             (base32
+              "1n122230s49jizldn8ps1pfa5dsg8wmh5x8wla4y6rsgjcccqn4s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:tex-format "latex"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'replace-obsolete-package
+            ;; "slashbox" is no longer provided in TeX Live.  It is superseded
+            ;; by `diagbox', which is backward compatible.
+            (lambda _
+              (substitute* "source/latex/makecell/makecell.dtx"
+                (("\\\\usepackage\\{slashbox\\}")
+                 "\\usepackage{diagbox}"))))
+          (add-after 'replace-obsolete-package 'load-float
+            ;; Loading `float' package prevents the "Unknown float option `H'"
+            ;; error.
+            (lambda _
+              (substitute* "source/latex/makecell/makecell.dtx"
+                (("usepackage\\{diagbox\\}.*" line)
+                 (string-append line "\\usepackage{float}\n")))))
+          (add-after 'load-float 'remove-hsize-reference
+            ;; Replace "\hsize" primitive with a dummy value to prevent
+            ;; a "missing number treated as zero" error.
+            (lambda _
+              (substitute* "source/latex/makecell/makecell.dtx"
+                (("\\\\ttabbox\\[\\\\hsize\\]") "\\ttabbox[10cm]")))))))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-diagbox
+                  texlive-float
+                  texlive-hypdoc
+                  texlive-multirow
+                  texlive-pict2e))))
+    (home-page "https://ctan.org/pkg/makecell")
+    (synopsis "Tabular column heads and multilined cells")
+    (description
+     "This package supports common layouts for tabular column heads in whole
+documents, based on one-column tabular environment.  In addition, it can
+create multi-lined tabular cells.
+
+The package also offers:
+@itemize
+@item a macro which changes the vertical space around all the cells in a @code{tabular}
+environment,
+@item macros for multirow cells, which use the facilities
+of the @code{multirow} package,
+@item macros to number rows in tables, or to skip cells;
+@item diagonally divided cells;
+@item horizontal lines in @code{tabular} environments with defined thickness.
+@end itemize")
+    (license license:lppl)))
+
+
 (define-public texlive-optexcount
   (package
     (name "texlive-optexcount")
@@ -14058,6 +39628,59 @@ mathematical fonts in a range of styles, based on Monotype Modern 8A.")
 
 (define-deprecated-package texlive-fonts-cm texlive-cm)
 
+(define-public texlive-cmbright
+  (package
+    (name "texlive-cmbright")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cmbright/"
+                   "doc/latex/cmbright/"
+                   "fonts/source/public/cmbright/"
+                   "fonts/tfm/public/cmbright/"
+                   "source/latex/cmbright/"
+                   "tex/latex/cmbright/")
+             (base32
+              "0sj6g877p6ak045x7737g3lg4kab8hgc2s2g6i23dw9d35csqf8d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-amsfonts texlive-ec texlive-metafont))
+    (home-page "https://ctan.org/pkg/cmbright")
+    (synopsis "Computer Modern Bright fonts")
+    (description
+     "This package provides a family of sans serif fonts for TeX and LaTeX,
+based on Donald Knuth's CM fonts.  It comprises OT1, T1 and TS1 encoded text
+fonts of various shapes as well as all the fonts necessary for mathematical
+typesetting, including AMS symbols.  This collection provides all the
+necessary files for using the fonts with LaTeX.")
+    (license license:lppl)))
+
+(define-public texlive-cmcyr
+  (package
+    (name "texlive-cmcyr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cmcyr/"
+                   "fonts/map/dvips/cmcyr/"
+                   "fonts/source/public/cmcyr/"
+                   "fonts/tfm/public/cmcyr/"
+                   "fonts/type1/public/cmcyr/"
+                   "fonts/vf/public/cmcyr/")
+             (base32
+              "0mmlb3ky6cakwg8nsgkdkpc52ni2jf2w7nz5bfiyxhvy6mx1c64b")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/cmcyr")
+    (synopsis "Computer Modern fonts with Cyrillic extensions")
+    (description
+     "These are the Computer Modern fonts extended with Russian letters, in
+Metafont sources and ATM Compatible Type 1 format.  The fonts are provided in
+KOI-7, but virtual fonts are available to recode them to three other Russian
+8-bit encodings.")
+    (license license:public-domain)))
+
 (define-public texlive-cmextra
   (package
     (name "texlive-cmextra")
@@ -14164,6 +39787,41 @@ National Bank (WP CNB).  The package was developed for CNB but it is also
 intended for authors from outside CNB.")
     (license license:lppl)))
 
+(define-public texlive-cns
+  (package
+    (name "texlive-cns")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/cns/cns40-1/"
+                   "doc/fonts/cns/cns40-2/"
+                   "doc/fonts/cns/cns40-3/"
+                   "doc/fonts/cns/cns40-4/"
+                   "doc/fonts/cns/cns40-5/"
+                   "doc/fonts/cns/cns40-6/"
+                   "doc/fonts/cns/cns40-7/"
+                   "doc/fonts/cns/cns40-b5/"
+                   "fonts/misc/cns/"
+                   "fonts/tfm/cns/c0so12/"
+                   "fonts/tfm/cns/c1so12/"
+                   "fonts/tfm/cns/c2so12/"
+                   "fonts/tfm/cns/c3so12/"
+                   "fonts/tfm/cns/c4so12/"
+                   "fonts/tfm/cns/c5so12/"
+                   "fonts/tfm/cns/c6so12/"
+                   "fonts/tfm/cns/c7so12/")
+             (base32
+              "00v6sf0a0fm09z54d3zhvdwc2gi712knbxnx3mlj2ri5x2jisyqa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/cjk-fonts")
+    (synopsis "Chinese/Japanese/Korean bitmap fonts")
+    (description
+     "This bundle provides fonts to go with the @code{cjk} macro package for Chinese,
+Japanese and Korean with LaTeX2e.  The package aims to supersede HLaTeX fonts
+bundle.")
+    (license license:public-domain)))
+
 (define-public texlive-courier
   (package
     (name "texlive-courier")
@@ -14315,6 +39973,32 @@ for German, French (partially), and Italian program documentation on any
 machine.")
     (license license:knuth)))
 
+(define-public texlive-cyrplain
+  (package
+    (name "texlive-cyrplain")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/plain/cyrplain/")
+             (base32
+              "1wdcibxs0g53warxs6vz39s3chldzh05p7v1ksskppghg5qzgh8z")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/t2")
+    (synopsis "Support for using T2 encoding")
+    (description
+     "The T2 bundle provides a variety of separate support functions for using
+Cyrillic characters in LaTeX:
+@itemize
+@item the @code{mathtext} package, for using Cyrillic letters transparently in
+formulae;
+@item the @code{citehack} package, for using Cyrillic (or indeed any
+non-ASCII) characters in citation keys;
+@item support for Cyrillic in BibTeX;
+@item support for Cyrillic in Makeindex;
+@item various items of font support.
+@end itemize")
+    (license license:lppl)))
+
 (define-public texlive-tex-gyre
   (package
     (name "texlive-tex-gyre")
@@ -14643,6 +40327,59 @@ can interact with LaTeX.mk so that the latter automatically invokes
 @end itemize")
     (license license:gpl3+)))
 
+(define-public texlive-latex-mr
+  (package
+    (name "texlive-latex-mr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/latex-mr/")
+             (base32
+              "1zd948d9y63js7980g2bvxpf67hshh2xa3n2ihbzwhpw6l9cbh1w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/latex-mr")
+    (synopsis
+     "Practical guide to LaTeX and Polyglossia for Marathi and other Indian
+languages")
+    (description
+     "This document aims to introduce LaTeX and Polyglossia for Indian languages.
+Though the document often discusses the language Marathi, the discussion
+applies to other India languages also.  We assume that the user of this
+document knows basic (La)TeX or has, at least, tried her hand on it.  This
+document is not very suitable for first time users.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-latexbangla
+  (package
+    (name "texlive-latexbangla")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/latexbangla/"
+                   "tex/latex/latexbangla/")
+             (base32
+              "19h1axbfp1xclbhffdiczzqpr4lk2jw8kkz4qqh8f2rnhjxd94vw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/latexbangla")
+    (synopsis "Enhanced LaTeX integration for Bangla")
+    (description
+     "This package simplifies the process of writing Bangla in LaTeX and
+addresses most of the associated typesetting issues.  Its notable features
+are:
+
+@itemize
+@item automated transition from Bangla to English and vice versa;
+@item patch for the unproportionate whitespace issue in popular Bangla fonts;
+@item full support for all the common commands and environments;
+@item Bangla numbering for page, section, chapter, footnotes, extending
+Polyglossia's support.
+@item new @code{theorem}, @code{problems}, @code{example}, @code{solution} and
+other environments, all of which are in Bangla.
+@end itemize")
+    (license license:lppl1.3+)))
+
 (define-public texlive-liftarm
   (package
     (name "texlive-liftarm")
@@ -15137,6 +40874,45 @@ LaTeX user to easily create complex commutative diagrams, by placing formula
 nodes on a conceptual grid and attaching arrows to them.")
     (license license:gpl2+)))
 
+(define-public texlive-pbibtex-base
+  (package
+    (name "texlive-pbibtex-base")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/ptex/pbibtex/" "pbibtex/bib/"
+                   "pbibtex/bst/")
+             (base32
+              "06glwwv1rw4n5cpg6cs70yzgyix65nhfsakyq72sn82yss1gvf8z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pbibtex-base")
+    (synopsis "Bibliography styles and miscellaneous files for pBibTeX")
+    (description
+     "These are miscellaneous files, including bibliography
+styles (@file{.bst}), for pBibTeX, which is a Japanese extended version of
+BibTeX contained in TeX Live.")
+    (license license:bsd-3)))
+
+(define-public texlive-pbibtex-manual
+  (package
+    (name "texlive-pbibtex-manual")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pbibtex-manual/")
+             (base32
+              "030rhhb4xcijvjc0x1ylyk6xz5mn90wrlp5ss4yr6qlpzmq21b50")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pbibtex-manual")
+    (synopsis "Documentation files for (u)pBibTeX")
+    (description
+     "The bundle contains documentation files for Japanese pBibTeX and
+upBibTeX.  For historical reasons, this also contains old documentation files
+for JBibTeX.")
+    (license license:bsd-3)))
+
 (define-public texlive-penrose
   (package
     (name "texlive-penrose")
@@ -15455,6 +41231,27 @@ same way that @code{kvoptions} adds the same facility to the LaTeX standard
 PGF/TikZ.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pgfornament-han
+  (package
+    (name "texlive-pgfornament-han")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgfornament-han/"
+                   "tex/latex/pgfornament-han/")
+             (base32
+              "17h71dbzj7a381gv3zn1pr1g2376mwwg8l9mk3y97wiv9m9afhxn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pgfornament-han")
+    (synopsis "Library for Chinese traditional motifs and patterns")
+    (description
+     "This package provides a @code{pgfornament} library for Chinese
+traditional motifs and patterns.  The command @code{\\pgfornamenthan} takes
+the same options as @code{\\pgfornament} from the @code{pgfornament} package,
+but renders Chinese traditional motifs instead.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-pgfplots
   (package
     (name "texlive-pgfplots")
@@ -15949,6 +41746,26 @@ duck) showcasing the use of characters from the Mario video games by Nintendo
 in LaTeX.")
     (license license:lppl1.3c)))
 
+(define-public texlive-pxtatescale
+  (package
+    (name "texlive-pxtatescale")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pxtatescale/"
+                   "tex/latex/pxtatescale/")
+             (base32
+              "1f9xm6nc9h6r2n5rsz6iw4m1x8r13anisv08j5hkidcyvj6n2s6n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pxtatescale")
+    (synopsis
+     "Patch to graphics driver for scaling in vertical direction of pTeX")
+    (description
+     "This package patches graphics driver @code{dvipdfmx} to support correct
+scaling in vertical direction of Japanese pTeX and upTeX.")
+    (license license:expat)))
+
 (define-public texlive-qcircuit
   (package
     (name "texlive-qcircuit")
@@ -15986,6 +41803,46 @@ designed to help users generate circuits.")
 drawing quantum circuit diagrams.")
     (license license:cc-by4.0)))
 
+(define-public texlive-quran
+  (package
+    (name "texlive-quran")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/quran/" "tex/latex/quran/")
+             (base32
+              "0y5znkwaw5qy2541p10pqqvbblzn0v088c7v8p5lc2za6lh83fj2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/quran")
+    (synopsis "Easy way to typeset any part of the @emph{Holy Quran}")
+    (description
+     "This package offers the user an easy way to typeset the @emph{Holy
+Quran}.  It provides several macros for typesetting the whole or any part of
+the Quran based on its popular division, including @emph{Surah}, @emph{Ayah},
+@emph{Juz}, @emph{Hizb}, @emph{Quarter}, and @emph{Page}.  Besides the Arabic
+original, translations to English, German, French, and Persian are provided,
+as well as an English transliteration.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-quran-bn
+  (package
+    (name "texlive-quran-bn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/quran-bn/" "tex/latex/quran-bn/")
+             (base32
+              "1zlm02drh9qfasxf0bwhvrmp521ixzys2aqq896339grkzay0g6q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/quran-bn")
+    (synopsis "Bengali translations to the @code{quran} package")
+    (description
+     "The package is prepared for typesetting some Bengali translations of the
+Holy Quran.  It adds two Bengali translations to the @code{quran} package.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-quran-de
   (package
     (name "texlive-quran-de")
@@ -16006,6 +41863,45 @@ Holy Quran.  It adds three more German translations to the @code{quran}
 package.")
     (license license:lppl1.3c)))
 
+(define-public texlive-quran-ur
+  (package
+    (name "texlive-quran-ur")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/quran-ur/" "tex/latex/quran-ur/")
+             (base32
+              "0lsp4ldbi1cl044ah5x2br1krglw6qn92rx8h7hkfdr85byzyk25")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/quran-ur")
+    (synopsis "Urdu translations to the @code{quran} package")
+    (description
+     "The package is prepared for typesetting some Urdu translations of the
+Holy Quran.  It adds eight Urdu translations to the @code{quran} package.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-qyxf-book
+  (package
+    (name "texlive-qyxf-book")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/qyxf-book/"
+                   "tex/latex/qyxf-book/")
+             (base32
+              "0sgjdfpmwjqh40sbanj772bwimbf3az7wah65hxaz5198xd67m1y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/qyxf-book")
+    (synopsis "Book Template for Qian Yuan Xue Fu")
+    (description
+     "@code{qyxf-book} is a LaTeX document class (template) developed by Qian
+Yuan Xue Fu (QYXF), a student club of Xi'an Jiaotong University (XJTU).  It
+creates a minimalistic document style, and several color schemes are offered.
+Currently the template is only designed for Chinese typesetting.")
+    (license license:expat)))
+
 (define-public texlive-r-und-s
   (package
     (name "texlive-r-und-s")
@@ -16346,6 +42242,24 @@ display many variants of snowman")
     (description "The package will typeset cards for use in a game of Set.")
     (license license:gpl3)))
 
+(define-public texlive-sexam
+  (package
+    (name "texlive-sexam")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/sexam/" "tex/xelatex/sexam/")
+             (base32
+              "0bwzxm8xj7p930rgxh6j6rzb7r26i0w61ixy74wkqwmvb3951rf6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sexam")
+    (synopsis "Typeset Arabic exam scripts")
+    (description
+     "The package provides a modified version of the @code{exam} package made
+compatible with XeLaTeX and Polyglossia to typeset Arabic exams.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-signchart
   (package
     (name "texlive-signchart")
@@ -16409,6 +42323,25 @@ popular Java script Bootstrap.")
 mirrors for use in optical diagrams.")
     (license license:lppl1.3c)))
 
+(define-public texlive-simurgh
+  (package
+    (name "texlive-simurgh")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/simurgh/"
+                   "tex/lualatex/simurgh/")
+             (base32
+              "11256ssaq6hw6c93ldfgyp0gagv69hl54yg1c8wl5wkc0mrh42rb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/simurgh")
+    (synopsis "Typeset Parsi in LuaLaTeX")
+    (description
+     "The package provides an automatic and unified interface for Parsi
+typesetting in LaTeX, using the LuaTeX engine.")
+    (license license:gpl2)))
+
 (define-public texlive-smartdiagram
   (package
     (name "texlive-smartdiagram")
@@ -17087,6 +43020,28 @@ no file is specified), filters out less relevant messages, and displays
 a summary report.")
     (license license:gpl3+)))
 
+(define-public texlive-texnegar
+  (package
+    (name "texlive-texnegar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/texnegar/"
+                   "source/latex/texnegar/"
+                   "tex/latex/texnegar/")
+             (base32
+              "0rza5bmn7cm85aznnffpmfv6b8776jxkpfwhs0y04f83sdjapw63")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/texnegar")
+    (synopsis "Kashida justification in XeLaTeX and LuaLaTeX")
+    (description
+     "In some cursive scripts such as Persian or Arabic, kashida is used to
+create justification.  In this type of justification characters are elongated
+rather than expanding spaces between words.  This package extends the kashida
+justification to be used with the LuaTeX engine.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-texosquery
   (package
     (name "texlive-texosquery")
@@ -17161,6 +43116,38 @@ application is powerful enough to generate any text-based structure, given
 that a corresponding template exists.")
     (license license:bsd-3)))
 
+(define-public texlive-texproposal
+  (package
+    (name "texlive-texproposal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/texproposal/")
+             (base32
+              "1yxb3yagljsdp4s07fzd6498889i7cscch68fb77jbfc2z4srvsy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/texproposal")
+    (synopsis "Proposal prototype for LaTeX promotion in Chinese universities")
+    (description
+     "This package contains the original source code and necessary attachment
+of the document @emph{Proposal for Offering TeX Courses and Relevant Resources
+in Chongqing University}.  This proposal could be helpful if one is
+considering to suggest their (Chinese) university or company to use TeX (or
+LaTeX, or XeLaTeX} as a typesetting system.
+
+The present proposal mainly explains the importance and necessity of
+introducing TeX, a typesetting system often used in academic writing, to
+students and teachers.  This proposal starts from a brief introduction of TeX,
+then steps further into its fascinating application to academic writing and
+dissertation formatting.  Finally, a set of possible implementation strategies
+with regard to the proper introduction of TeX and relevant resources to our
+university, is proposed.")
+    ;; The content of the project itself is released under CC-BY 4.0 terms,
+    ;; but the underlying code used to format and display that content is
+    ;; licensed under the Expat license.
+    (license (list license:cc-by4.0 license:expat))))
+
 (define-public texlive-texware
   (package
     (name "texlive-texware")
@@ -18670,6 +44657,27 @@ cobordisms between circles, such as those used in TQFT and other mathematical
 diagrams.")
     (license license:lppl1.3+)))
 
+(define-public texlive-tram
+  (package
+    (name "texlive-tram")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tram/"
+                   "fonts/source/public/tram/"
+                   "tex/latex/tram/")
+             (base32
+              "1b26615dd1qs12vl9d82xcxlc718s5jgirzygss9g7m908w2hqch")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tram")
+    (synopsis "Typeset tram boxes in LaTeX")
+    (description
+     "Tram boxes are highlighted with patterns of dots; the package defines an
+environment @code{tram} that typesets its content into a tram box.  The
+pattern used may be selected in an optional argument to the environment.")
+    (license license:lppl)))
+
 (define-public texlive-tsemlines
   (package
     (name "texlive-tsemlines")
@@ -19020,6 +45028,48 @@ ordinary text, and as a picture element within a TikZ-picture.  The appearance
 of a flag (size, frame etc.)  can be adapted using optional parameters.")
     (license license:lppl1.3+)))
 
+(define-public texlive-xepersian
+  (package
+    (name "texlive-xepersian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/xepersian/"
+                   "fonts/misc/xetex/fontmapping/xepersian/"
+                   "source/xelatex/xepersian/"
+                   "tex/xelatex/xepersian/")
+             (base32
+              "1h6nicajnvrrr72yixcdzcwdck82qa3zv2k2k6q5xprsf9sz8yly")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xepersian")
+    (synopsis "Persian for LaTeX, using XeTeX")
+    (description
+     "This package provides a convenient interface for typesetting Persian and
+English texts in LaTeX, using the XeTeX engine.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-xepersian-hm
+  (package
+    (name "texlive-xepersian-hm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/xepersian-hm/"
+                   "source/xelatex/xepersian-hm/"
+                   "tex/xelatex/xepersian-hm/")
+             (base32
+              "0lq5bam9vx2phwphy2ig9hygsz4vvz4bx2c6f87my84kp8n3w25n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xepersian-hm")
+    (synopsis "Fixes kashida feature in XePersian package")
+    (description
+     "The kashida feature in XePersian has problems with some fonts such as
+the HM Series fonts and the XB Series fonts.  This package fixes these
+problems.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-xindex
   (package
     (name "texlive-xindex")
@@ -19437,6 +45487,48 @@ and so on) while being, at the same time, seamlessly integrated within the
 rest of the mathematics produced by (AmS-)LaTeX.")
     (license license:lppl1.3+)))
 
+(define-public texlive-haranoaji
+  (package
+    (name "texlive-haranoaji")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/haranoaji/"
+                   "fonts/opentype/public/haranoaji/")
+             (base32
+              "06lkgiylh0vjxqm8i4dvygna0zb112dw5xxlh8r5hr5kf2805m99")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/haranoaji")
+    (synopsis "Harano Aji fonts")
+    (description
+     "Harano Aji fonts (Harano Aji Mincho and Harano Aji Gothic) are fonts
+obtained by replacing Adobe-Identity-0 (AI0) CIDs of Source Han fonts (Source
+Han Serif and Source Han Sans) with Adobe-Japan1 (AJ1) CIDs.  There are 14
+fonts, 7 weights each for Mincho and Gothic.")
+    (license license:silofl1.1)))
+
+(define-public texlive-haranoaji-extra
+  (package
+    (name "texlive-haranoaji-extra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/haranoaji-extra/"
+                   "fonts/opentype/public/haranoaji-extra/")
+             (base32
+              "1zy3bv836rmpqimky7b2xgsmdh6xkkbnjiljraci2vnfgwl1q3pb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/haranoaji-extra")
+    (synopsis "Extra weights for Harano Aji fonts")
+    (description
+     "Harano Aji fonts (Harano Aji Mincho and Harano Aji Gothic) are fonts
+obtained by replacing Adobe-Identity-0 (AI0) CIDs of Source Han fonts (Source
+Han Serif and Source Han Sans) with Adobe-Japan1 (AJ1) CIDs.  This package
+provides extra weights for these fonts.")
+    (license license:silofl1.1)))
+
 (define-public texlive-hardwrap
   (package
     (name "texlive-hardwrap")
@@ -19508,6 +45600,28 @@ Adobe's basic set.")
     ;; No license version specified.
     (license license:gpl3+)))
 
+(define-public texlive-ieejtran
+  (package
+    (name "texlive-ieejtran")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/ieejtran/"
+                   "doc/bibtex/ieejtran/")
+             (base32
+              "01bcw45v6mbyb1gzykzk5ccwz70s6591994xrj84z9ljgzp06lyg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ieejtran")
+    (synopsis
+     "Unofficial bibliography style file for the Institute of Electrical
+Engineers of Japan")
+    (description
+     "This package provides an unofficial BibTeX style for authors of the
+Institute of Electrical Engineers of Japan (IEEJ) transactions journals and
+conferences.")
+    (license license:expat)))
+
 (define-public texlive-inputenx
   (package
     (name "texlive-inputenx")
@@ -19642,6 +45756,32 @@ mathematics both upright and slanted shapes for Greek letters, as well as
 default and narrow versions of multiple integrals.")
     (license license:gpl3+)))
 
+(define-public texlive-kpfonts-otf
+  (package
+    (name "texlive-kpfonts-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/kpfonts-otf/"
+                   "fonts/opentype/public/kpfonts-otf/"
+                   "tex/latex/kpfonts-otf/")
+             (base32
+              "1byad0cjpp7np6xsqs71hkxn7aali5r77qv1n280p8b5w3z788iy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/kpfonts-otf")
+    (synopsis "OTF version of the Kp-fonts")
+    (description
+     "This bundle provides OpenType versions of the Type1 Kp-fonts designed by
+Christophe Caignaert.  It is usable with LuaTeX or XeTeX engines only.  It
+consists of sixteen Text fonts (eight Serif, four Sans-Serif, four Monotype)
+and six Math fonts.  Serif and Sans-Serif families have small caps available
+in two sizes (SmallCaps and PetitesCaps), upper and lowercase digits, real
+superscripts and subscripts; ancient ligatures (@samp{ct} and @samp{st}),
+ancient long-@samp{s} and a long-tailed capital @samp{Q} are available via
+font features.  Math fonts cover all usual symbols including AMS'.")
+    (license (list license:silofl1.1 license:lppl1.3+))))
+
 (define-public texlive-latexconfig
   (package
     (name "texlive-latexconfig")
@@ -20049,6 +46189,26 @@ verbatim source).")
 
 (define-deprecated-package texlive-latex-fancyvrb texlive-fancyvrb)
 
+(define-public texlive-fandol
+  (package
+    (name "texlive-fandol")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fandol/"
+                   "fonts/opentype/public/fandol/")
+             (base32
+              "1lk91ypsvj2wkqsw8lklkqfsqimjyn0vzbwgqgs5h6kf61m6qsk5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fandol")
+    (synopsis "Four basic fonts for Chinese typesetting")
+    (description
+     "This package provides Fandol fonts designed for Chinese typesetting.
+The current version contains four styles: Song, Hei, Kai, Fang.  All fonts are
+in OpenType format.")
+    (license license:gpl3+)))
+
 (define-public texlive-gentium-tug
   (package
     (name "texlive-gentium-tug")
@@ -20273,6 +46433,51 @@ for the user.")
 
 (define-deprecated-package texlive-latex-hycolor texlive-hycolor)
 
+(define-public texlive-xcjk2uni
+  (package
+    (name "texlive-xcjk2uni")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xcjk2uni/"
+                   "source/latex/xcjk2uni/"
+                   "tex/latex/xcjk2uni/")
+             (base32
+              "1vjp47ngrirrvbnk4vnm5lbysj3qlbwxbfc1szc22gaikm52ggaq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'copy-ctxdocstrip.tex
+            ;; There's a circular dependency between this package (where
+            ;; `ctex' should be a native input) and `ctex' (where this package
+            ;; is a propagated input).  To work around this, install the
+            ;; specific "ctxdocstrip.tex" file from `ctex' in the build
+            ;; directory and set TEXINPUTS variable accordingly so the process
+            ;; can find it.
+            (lambda* (#:key inputs #:allow-other-keys)
+              (install-file (search-input-file inputs
+                                               "tex/generic/ctex/ctxdocstrip.tex")
+                            "build/")
+              (setenv "TEXINPUTS" (string-append (getcwd) "/build:")))))))
+    (native-inputs
+     (list (texlive-origin
+            "ctxdocstrip.tex" (number->string %texlive-revision)
+            (list "tex/generic/ctex/ctxdocstrip.tex")
+            (base32
+             "154v2d6wfzhfg654nlh2apy9zr78d09rkimymyjqpxymkpbk8lli"))))
+    (home-page "https://ctan.org/pkg/xcjk2uni")
+    (synopsis "Convert CJK characters to Unicode, in pdfTeX")
+    (description
+     "The package provides commands to convert CJK characters to Unicode in
+non-UTF-8 encoding; it provides hooks to support hyperref in producing correct
+bookmarks.  The bundle also provides @code{/ToUnicode} mapping file(s) for
+a CJK subfont; these can be used with the cmap package, allowing searches of,
+and cut-and-paste operations on a PDF file generated by pdfTeX.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-xcolor
   (package
     (name "texlive-xcolor")
@@ -20326,6 +46531,25 @@ correctly; and define two extra commands: @code{\\vfrac} and
 @code{\\namedglyph}.")
     (license license:lppl1.3c)))
 
+(define-public texlive-xml2pmx
+  (package
+    (name "texlive-xml2pmx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/xml2pmx.1"
+                   "doc/man/man1/xml2pmx.man1.pdf")
+             (base32
+              "1d3ralqh0b71scd59b4hmm707yfrz1rj28ni2lzkhbb1ql73bvah")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xml2pmx")
+    (synopsis "Convert MusicXML to PMX and MusiXTeX")
+    (description
+     "This program translates MusicXML files to input suitable for PMX and
+MusiXTeX processing.")
+    (license license:gpl3+)))
+
 (define-public texlive-xmltexconfig
   (package
     (name "texlive-xmltexconfig")
@@ -20394,6 +46618,104 @@ names, as well as character data, may use any characters allowed in XML, using
 UTF-8 or a suitable 8-bit encoding.")
     (license license:lppl1.0+)))        ;per xmltex/base/readme.txt
 
+(define-public texlive-xpiano
+  (package
+    (name "texlive-xpiano")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xpiano/" "source/latex/xpiano/"
+                   "tex/latex/xpiano/")
+             (base32
+              "1nk8v0d641cr4mg4l2k0fv7pl9b26nyi30k4px5wajwm976f042p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xpiano")
+    (synopsis "Extension of the @code{piano} package")
+    (description
+     "This package provides macros for typesetting virtual keyboards limited
+to two octaves for showing notes represented by a colored circle.  Optionally,
+the number used for pitch analysis can be shown.  It is an extension of
+@file{piano.sty}.  It features extended syntax and several options, like
+setting the color, adding numbers for pitch analysis, one or two octaves, and
+others.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-xpinyin
+  (package
+    (name "texlive-xpinyin")
+    ;; XXX: Whenever updating this package, please check if "Unihan.zip"
+    ;; native input needs to be updated, too.
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/xpinyin/" "source/latex/xpinyin/"
+                   "tex/latex/xpinyin/")
+             (base32
+              "1fxsnvmkm66rfq08j03sch24maw0wgb8dhl73r2rf6gwxzf4imc5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list
+      #:tex-format "luatex"
+      #:modules '((ice-9 match)
+                  (srfi srfi-1)
+                  (guix build texlive-build-system)
+                  (guix build utils))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'copy-unihan.zip
+            ;; Copy the "Unihan.zip" file where the Lua script expects to find
+            ;; it.
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((unihan.zip
+                     (any (match-lambda
+                            ((_ . dir)
+                             (and (string-suffix? "Unihan.zip" dir) dir)))
+                          inputs)))
+                (with-directory-excursion "source/latex/xpinyin"
+                  (install-file unihan.zip ".")
+                  (rename-file (basename unihan.zip) "Unihan.zip")))))
+          (add-before 'build 'copy-ctxdocstrip.tex
+            ;; Set TEXINPUTS so that the process can find extracted
+            ;; "ctxdocstrip.tex".
+            (lambda* (#:key inputs #:allow-other-keys)
+              (install-file (search-input-file inputs
+                                               "tex/generic/ctex/ctxdocstrip.tex")
+                            "build/")
+              (setenv "TEXINPUTS" (string-append (getcwd) "/build:"))))
+          (add-after 'build 'fix-reproducibility
+            ;; Remove a time-stamp so the generated database is reproducible.
+            (lambda _
+              (substitute* "tex/latex/xpinyin/xpinyin-database.def"
+                (("%% +by \"texlua xpinyin.lua\" .*") "")))))))
+    (native-inputs
+     (list
+      ;; XXX: The Unihan database may need to be updated whenever this package
+      ;; is.  Appropriate Unicode version can be found in the
+      ;; "tex/latex/xpinyin/xpinyin-database.def" file.
+      (origin
+        (method url-fetch)
+        (uri "https://www.unicode.org/Public/14.0.0/ucd/Unihan.zip")
+        (sha256
+         (base32
+          "0bc5277lpc5j0gg7fjfsah7krhqjzdxya5ww6walvkc25fdm3r1a")))
+      ;; There's a circular dependency between this package (where `ctex'
+      ;; should be a native input) and `ctex' (where this package is
+      ;; a propagated input).  To work around this, grab the required
+      ;; "ctxdocstrip.tex" file from `ctex'.
+      (texlive-origin
+       "ctxdocstrip.tex" (number->string %texlive-revision)
+       (list "tex/generic/ctex/ctxdocstrip.tex")
+       (base32
+        "154v2d6wfzhfg654nlh2apy9zr78d09rkimymyjqpxymkpbk8lli"))))
+    (home-page "https://ctan.org/pkg/xpinyin")
+    (synopsis "Automatically add pinyin to Chinese characters")
+    (description
+     "The package is written to simplify the input of Hanyu Pinyin.  Macros are
+provided that automatically add pinyin to Chinese characters.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-hyperref
   (package
     (name "texlive-hyperref")
@@ -21122,6 +47444,25 @@ a means of defining generic functions using a key-value syntax, and
 
 (define-deprecated-package texlive-latex-l3packages texlive-l3packages)
 
+(define-public texlive-fonts-churchslavonic
+  (package
+    (name "texlive-fonts-churchslavonic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/fonts-churchslavonic/"
+                   "fonts/opentype/public/fonts-churchslavonic/")
+             (base32
+              "0yv3n8m6wcd6jk68fwlaiszv96lbax5rcv1j0wgam4dgpqqmacm4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/fonts-churchslavonic")
+    (synopsis "Fonts for typesetting in Church Slavonic language")
+    (description
+     "The package provides Unicode-encoded OpenType fonts for Church Slavonic
+which are intended for Unicode TeX engines only.")
+    (license license:silofl1.1)))
+
 (define-public texlive-fontspec
   (package
     (name "texlive-fontspec")
@@ -21174,6 +47515,50 @@ base LaTeX code now supports multiple dots and spaces, and this package by
 default is a stub that just loads @code{graphicx}.")
     (license license:lppl1.3c+)))
 
+(define-public texlive-sanskrit
+  (package
+    (name "texlive-sanskrit")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/sanskrit/"
+                   "fonts/source/public/sanskrit/"
+                   "fonts/tfm/public/sanskrit/"
+                   "source/latex/sanskrit/"
+                   "tex/latex/sanskrit/")
+             (base32
+              "0qc0mylgdcc4rnid29was51s6mzil0smrs7kgnnrv8kvlb6mzydl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/sanskrit")
+    (synopsis "Sanskrit support")
+    (description
+     "This package provides a font and pre-processor suitable for the
+production of documents written in Sanskrit.  Type 1 versions of the fonts are
+available.")
+    (license license:lppl)))
+
+(define-public texlive-sanskrit-t1
+  (package
+    (name "texlive-sanskrit-t1")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/sanskrit-t1/"
+                   "fonts/map/dvips/sanskrit-t1/"
+                   "fonts/type1/public/sanskrit-t1/")
+             (base32
+              "0mv9ph7999y9shnq25k0w4sgcbvlf2gav5d1fpycjxan3h6rc7vi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sanskrit-t1")
+    (synopsis "Type 1 version of @code{skt} fonts for Sanskrit")
+    (description
+     "The sanskrit-t1 font package provides Type 1 version of Charles Wikner's
+@code{skt} font series for the Sanskrit language.")
+    (license license:lppl)))
+
 (define-public texlive-sansmath
   (package
     (name "texlive-sansmath")
@@ -21535,6 +47920,27 @@ upgrade smoothly to the new support structure.")
      "The package provides emulation of pdfTeX primitives for LuaTeX v0.85+.")
     (license license:lppl1.3+)))
 
+(define-public texlive-luatexja
+  (package
+    (name "texlive-luatexja")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/luatex/luatexja/"
+                   "source/luatex/luatexja/"
+                   "tex/luatex/luatexja/")
+             (base32
+              "1j4dvzxgjyx5aa7akg5wg2w694vds6ra70zk9crrlm83aryqkda7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-luatexbase))
+    (home-page "https://ctan.org/pkg/luatexja")
+    (synopsis "Typeset Japanese with Lua(La)TeX")
+    (description
+     "The package offers support for typesetting Japanese documents with LuaTeX.
+Either of the Plain and LaTeX2e formats may be used with the package.")
+    (license license:bsd-3)))
+
 (define-public texlive-luahbtex
   (package
     (name "texlive-luahbtex")
@@ -21879,6 +48285,86 @@ needed.")
 sorts with MetaPost.")
     (license license:public-domain)))
 
+(define-public texlive-bbm
+  (package
+    (name "texlive-bbm")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/bbm/" "fonts/source/public/bbm/"
+                   "fonts/tfm/public/bbm/")
+             (base32
+              "0fyzr8zfcv3i1ymzvpifbkmfxqvrva029vh4v0siia63sl36lvq3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               ;; FIXME: Font metrics cannot be generated due to "bad pos"
+               ;; errors with "bbmitt" fonts.
+               (delete 'generate-font-metrics))))
+    (native-inputs (list texlive-metafont))
+    (home-page "https://ctan.org/pkg/bbm")
+    (synopsis "Blackboard-style CM fonts")
+    (description
+     "This package provides blackboard variants of Computer Modern fonts.  The
+fonts are distributed as Metafont source (only); LaTeX support is available
+with the @code{bbm-macros} package.  A sample of these fonts appears in the
+blackboard bold sampler.")
+    ;; The package states "You may freely use, modify and/or distribute this
+    ;; file." everywhere, notably in the file below.
+    (license (license:fsf-free "file://doc/fonts/bbm/README"))))
+
+(define-public texlive-bbm-macros
+  (package
+    (name "texlive-bbm-macros")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bbm-macros/"
+                   "source/latex/bbm-macros/"
+                   "tex/latex/bbm-macros/")
+             (base32
+              "11klh7hwi06yr2wx5bpk230hn7rpfspk6sd55j6rmw8kz2wa3lr7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/bbm-macros")
+    (synopsis "LaTeX support for blackboard-style CM fonts")
+    (description
+     "This package provides LaTeX support for Blackboard variants of Computer
+Modern fonts.  It declares a font family @code{bbm} so you can in principle
+write running text in blackboard bold, and lots of math alphabets for using
+the fonts within maths.")
+    (license license:lppl)))
+
+(define-public texlive-bbold
+  (package
+    (name "texlive-bbold")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/bbold/"
+                   "fonts/source/public/bbold/"
+                   "fonts/tfm/public/bbold/"
+                   "source/latex/bbold/" "tex/latex/bbold/")
+             (base32
+              "0x3fhz582xcv33s9yiwka82j8bz3nxribgmni3j8j03r6dih8d8r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments
+     (list #:build-targets #~(list "bbold.dtx")
+           #:tex-format "latex"))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-hypdoc texlive-metafont))))
+    (home-page "https://ctan.org/pkg/bbold")
+    (synopsis "Sans serif blackboard bold")
+    (description
+     "This package provides a geometric sans serif blackboard bold font, for
+use in mathematics; Metafont sources are provided, as well as macros for use
+with LaTeX.")
+    (license license:bsd-3)))
+
 (define-public texlive-blockdraw-mp
   (package
     (name "texlive-blockdraw-mp")
@@ -22058,14 +48544,7 @@ with the XeTeX engine.")
              (base32
               "0nzzcg1yvbslhqm5lsfcpqh6sbzkmnmmgyakg9l8855qpa8g9bf3")))
     (build-system texlive-build-system)
-    (arguments
-     (list
-      #:phases
-      ;; FIXME: The phase fails for multiple font files with error: "cannot
-      ;; find cmb12".
-      #~(modify-phases %standard-phases
-          (delete 'generate-font-metrics))))
-    (native-inputs (list texlive-cm texlive-metafont))
+    (native-inputs (list texlive-metafont texlive-sauter))
     (propagated-inputs (list texlive-cmexb))
     (home-page "https://ctan.org/pkg/csfonts")
     (synopsis "Czech/Slovak-tuned Computer Modern fonts")
@@ -22158,6 +48637,29 @@ right-aligned table and (multiple-)figure floats, with footnotes.")
 Babel system).")
     (license license:lppl1.3+)))
 
+(define-public texlive-babel-azerbaijani
+  (package
+    (name "texlive-babel-azerbaijani")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-azerbaijani/"
+                   "source/generic/babel-azerbaijani/"
+                   "tex/generic/babel-azerbaijani/")
+             (base32
+              "0vpgx76316gfhxp9maiqnd3z1hjavzlnjibxi4yhalbby0dnswi1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-azerbaijani")
+    (synopsis "Support for Azerbaijani within Babel")
+    (description
+     "This is the Babel style for Azerbaijani.  This language poses special
+challenges because no traditional font encoding contains the full character
+set, and therefore a mixture must be used (e.g., T2A and T1).  This package is
+compatible with Unicode engines LuaTeX and XeTeX, which are very likely the
+most convenient way to write Azerbaijani documents.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-basque
   (package
     (name "texlive-babel-basque")
@@ -22176,6 +48678,26 @@ Babel system).")
     (description "The package establishes Basque conventions in a document.")
     (license license:lppl1.3+)))
 
+(define-public texlive-babel-belarusian
+  (package
+    (name "texlive-babel-belarusian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-belarusian/"
+                   "source/generic/babel-belarusian/"
+                   "tex/generic/babel-belarusian/")
+             (base32
+              "1055gyy9hab9whnr5c2p4i4yczkn5pwm0n54ylnnsl8wg8q58w1z")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-belarusian")
+    (synopsis "Babel support for Belarusian")
+    (description
+     "The package provides support for use of Babel in documents written in
+Belarusian.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-bosnian
   (package
     (name "texlive-babel-bosnian")
@@ -22217,6 +48739,26 @@ rules of its own; this package provides an appropriate selection of French and
 British typographic rules.")
     (license license:lppl1.3+)))
 
+(define-public texlive-babel-bulgarian
+  (package
+    (name "texlive-babel-bulgarian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-bulgarian/"
+                   "source/generic/babel-bulgarian/"
+                   "tex/generic/babel-bulgarian/")
+             (base32
+              "065j31rl7r4x8krkwxhq0lwdkmbq90jr8666if4br36kw0g3kzv3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-bulgarian")
+    (synopsis "Babel contributed support for Bulgarian")
+    (description
+     "The package provides support for documents in Bulgarian (or simply
+containing some Bulgarian text).")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-catalan
   (package
     (name "texlive-babel-catalan")
@@ -22281,6 +48823,27 @@ Canadian and USA text.")
 
 (define-deprecated-package texlive-generic-babel-english texlive-babel-english)
 
+(define-public texlive-babel-esperanto
+  (package
+    (name "texlive-babel-esperanto")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-esperanto/"
+                   "source/generic/babel-esperanto/"
+                   "tex/generic/babel-esperanto/")
+             (base32
+              "1av9x9d5rff6hsssssbn1jnyrqnj1c2n5fa4kgxlla95xn7zs65m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-esperanto")
+    (synopsis "Babel support for Esperanto")
+    (description
+     "The package provides the language definition file for support of
+Esperanto in Babel.  Some shortcuts are defined, as well as translations to
+Esperanto of standard LaTeX names.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-estonian
   (package
     (name "texlive-babel-estonian")
@@ -22364,6 +48927,26 @@ Friulan either with Babel or with Polyglossia.")
 Galician either with Babel or with Polyglossia.")
     (license license:lppl1.3+)))
 
+(define-public texlive-babel-georgian
+  (package
+    (name "texlive-babel-georgian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-georgian/"
+                   "tex/generic/babel-georgian/")
+             (base32
+              "1qjpaxzgm0qh88j6x1zvnjb1n994prxqnzchrp05pgsbyjcf410p")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-georgian")
+    (synopsis "Babel support for Georgian")
+    (description
+     "The package provides support for use of Babel in documents written in
+Georgian.  The package is adapted for use both under traditional TeX engines,
+and under XeTeX and LuaTeX.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-german
   (package
     (name "texlive-babel-german")
@@ -22389,6 +48972,49 @@ German.")
 
 (define-deprecated-package texlive-generic-babel-german texlive-babel-german)
 
+(define-public texlive-babel-greek
+  (package
+    (name "texlive-babel-greek")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-greek/"
+                   "source/generic/babel-greek/"
+                   "tex/generic/babel-greek/")
+             (base32
+              "116nifgjwx588f63fwkyny36i8p7i9prsz785m81hwnhylii2fhj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-greek")
+    (synopsis "Babel support for documents written in Greek")
+    (description
+     "The file provides modes for monotonic (single-diacritic) and polytonic
+(multiple-diacritic) modes of writing.  Provision is made for Greek function
+names in mathematics, and for classical-era symbols.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-babel-hebrew
+  (package
+    (name "texlive-babel-hebrew")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-hebrew/"
+                   "source/generic/babel-hebrew/"
+                   "tex/generic/babel-hebrew/")
+             (base32
+              "1h4ksd9nvicdgi88fxv8jfh9r5gabg0w75jpqgnngszfnfw486k2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-hebrew")
+    (synopsis "Babel support for Hebrew")
+    (description
+     "The package provides the language definition file for support of Hebrew
+in babel.  Macros to control the use of text direction control of TeX--XeT and
+e-TeX are provided (and may be used elsewhere).  Some shortcuts are defined,
+as well as translations to Hebrew of standard LaTeX names.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-hungarian
   (package
     (name "texlive-babel-hungarian")
@@ -22429,6 +49055,47 @@ Icelandic in Babel.  Some shortcuts are defined, as well as translations to
 Icelandic of standard LaTeX names.")
     (license license:lppl1.3+)))
 
+(define-public texlive-babel-indonesian
+  (package
+    (name "texlive-babel-indonesian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-indonesian/"
+                   "source/generic/babel-indonesian/"
+                   "tex/generic/babel-indonesian/")
+             (base32
+              "1ilkl7s5dh8cs6z211p4imyzg3d2axfa5vkmrxn4d3lbx1g3chs1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-indonesian")
+    (synopsis "Support for Indonesian within Babel")
+    (description "This is the Babel style for Indonesian.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-babel-interlingua
+  (package
+    (name "texlive-babel-interlingua")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-interlingua/"
+                   "source/generic/babel-interlingua/"
+                   "tex/generic/babel-interlingua/")
+             (base32
+              "0mxyfa6rsaxwazliblg9p4cbr0vip12c00mkvnz4dak2adnhzvbg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-interlingua")
+    (synopsis "Babel support for Interlingua")
+    (description
+     "The package provides the language definition file for support of
+Interlingua in Babel.  This includes translations to Interlingua of standard
+LaTeX names (no shortcuts are provided).  Interlingua itself is an auxiliary
+language, built from the common vocabulary of Spanish/Portuguese, English,
+Italian and French, with some normalisation of spelling.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-irish
   (package
     (name "texlive-babel-irish")
@@ -22469,6 +49136,27 @@ LaTeX names.")
 Babel.")
     (license license:lppl1.3c)))
 
+(define-public texlive-babel-japanese
+  (package
+    (name "texlive-babel-japanese")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-japanese/"
+                   "source/generic/babel-japanese/"
+                   "tex/generic/babel-japanese/")
+             (base32
+              "0jn2pl080c0dd6ryj6y5b87h6ijg3lcd2hw7g5kyw7p9r7a6b8i0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-japanese")
+    (synopsis "Babel support for Japanese")
+    (description
+     "This package provides a japanese option for the Babel package.  It
+defines all the language definition macros in Japanese.  Currently this
+package works with pLaTeX, upLaTeX, XeLaTeX and LuaLaTeX.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-kurmanji
   (package
     (name "texlive-babel-kurmanji")
@@ -22576,6 +49264,24 @@ match Babel support for other languages.")
 Cyrillic, in Babel.")
     (license license:lppl1.3+)))
 
+(define-public texlive-babel-malay
+  (package
+    (name "texlive-babel-malay")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-malay/"
+                   "source/generic/babel-malay/"
+                   "tex/generic/babel-malay/")
+             (base32
+              "1gbjrsf4drmrplhwl0avpzv5yfyb30znhza4pxk704i1khabnwzk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-malay")
+    (synopsis "Support for Malay within Babel")
+    (description "This is the Babel style for Malay.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-occitan
   (package
     (name "texlive-babel-occitan")
@@ -22680,6 +49386,27 @@ provided.")
 Romansh either with Babel or with Polyglossia.")
     (license license:lppl1.3+)))
 
+(define-public texlive-babel-russian
+  (package
+    (name "texlive-babel-russian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-russian/"
+                   "source/generic/babel-russian/"
+                   "tex/generic/babel-russian/")
+             (base32
+              "0sy3b7qx5l6smpixa9896zqqrh6ymrz31pd4026f815jy78k3cfb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-russian")
+    (synopsis "Russian language module for Babel")
+    (description
+     "The package provides support for use of Babel in documents written in
+Russian (in both traditional and modern forms).  The support is adapted for
+use both under traditional TeX engines, and under XeTeX and LuaTeX.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-babel-samin
   (package
     (name "texlive-babel-samin")
@@ -22725,6 +49452,46 @@ names.")
 translations of standard LaTeX names.")
     (license license:lppl1.3+)))
 
+(define-public texlive-babel-serbian
+  (package
+    (name "texlive-babel-serbian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-serbian/"
+                   "source/generic/babel-serbian/"
+                   "tex/generic/babel-serbian/")
+             (base32
+              "089w8phd1pyzh8dmn4v2bspnmx4hqi63mby1yn7xk596qxi3nqrz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-serbian")
+    (synopsis "Babel and Polyglossia support for Serbian")
+    (description
+     "The package provides support for Serbian documents written in Latin, in
+Babel.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-babel-serbianc
+  (package
+    (name "texlive-babel-serbianc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-serbianc/"
+                   "source/generic/babel-serbianc/"
+                   "tex/generic/babel-serbianc/")
+             (base32
+              "1ji77vlb10vxdka5bsnqkrlf34c4qhpl162xizrzxf11z6099wng")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-serbianc")
+    (synopsis "Babel module to support Serbian Cyrillic")
+    (description
+     "The package provides support for Serbian documents written in Cyrillic,
+in Babel.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-slovak
   (package
     (name "texlive-babel-slovak")
@@ -22767,6 +49534,27 @@ Slovenian in Babel.  Several shortcuts are defined, as well as translations to
 Slovenian of standard LaTeX names.")
     (license license:lppl1.3+)))
 
+(define-public texlive-babel-sorbian
+  (package
+    (name "texlive-babel-sorbian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-sorbian/"
+                   "source/generic/babel-sorbian/"
+                   "tex/generic/babel-sorbian/")
+             (base32
+              "1b6qqk0qik294z8sirvf58cf5v8mhsz4hj91gw7zg8b4j362lp8y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-sorbian")
+    (synopsis "Babel support for Upper and Lower Sorbian")
+    (description
+     "The package provides language definitions file for support of both Upper
+and Lower Sorbian, in Babel.  Some shortcuts are defined, as well as
+translations to the relevant language of standard LaTeX names.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-spanish
   (package
     (name "texlive-babel-spanish")
@@ -22807,6 +49595,26 @@ provided for those who wish to typeset Spanish as written in Mexico.")
      "The package provides the language definition file for Swedish.")
     (license license:lppl1.3+)))
 
+(define-public texlive-babel-thai
+  (package
+    (name "texlive-babel-thai")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-thai/"
+                   "source/generic/babel-thai/"
+                   "tex/generic/babel-thai/")
+             (base32
+              "1wgprys500a1fn56bnsmq8fhmb9y8cfwsqn5hginfb36d3gym4p6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-thai")
+    (synopsis "Support for Thai within babel")
+    (description
+     "The package provides support for typesetting Thai text within the Babel
+system.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-turkish
   (package
     (name "texlive-babel-turkish")
@@ -22826,6 +49634,47 @@ provided for those who wish to typeset Spanish as written in Mexico.")
      "The package provides support, within Babel, of the Turkish language.")
     (license license:lppl1.3+)))
 
+(define-public texlive-babel-ukrainian
+  (package
+    (name "texlive-babel-ukrainian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-ukrainian/"
+                   "source/generic/babel-ukrainian/"
+                   "tex/generic/babel-ukrainian/")
+             (base32
+              "1nz8yzpc5khyv6wgm5ndwfdxx591wqlg311crzxk08ardg8zwvgs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-ukrainian")
+    (synopsis "Babel support for Ukrainian")
+    (description
+     "The package provides support for use of babel in documents written in
+Ukrainian.  The support is adapted for use under legacy TeX engines as well as
+XeTeX and LuaTeX.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-babel-vietnamese
+  (package
+    (name "texlive-babel-vietnamese")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/babel-vietnamese/"
+                   "source/generic/babel-vietnamese/"
+                   "tex/generic/babel-vietnamese/")
+             (base32
+              "12nnrdk0k2xfab33249s3gzs1815p7j197bv4zisndxvrmiv6hdf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/babel-vietnamese")
+    (synopsis "Babel support for typesetting Vietnamese")
+    (description
+     "The package provides the language definition file for support of
+Vietnamese in Babel.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-babel-welsh
   (package
     (name "texlive-babel-welsh")
@@ -23054,6 +49903,25 @@ between various classes of Unix systems.")
 
 (define-deprecated-package texlive-latex-ifplatform texlive-ifplatform)
 
+(define-public texlive-ifptex
+  (package
+    (name "texlive-ifptex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/ifptex/" "tex/generic/ifptex/")
+             (base32
+              "0l5mclz9cwj756ah0nqbiai0b5m9368dz4ykb0ih5irm6cmswdfm")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ifptex")
+    (synopsis "Check if the engine is pTeX or one of its derivatives")
+    (description
+     "The @code{ifptex} package is a counterpart of @code{ifxetex},
+@code{ifluatex}, etc.@: for the pTeX engine.  The @code{ifuptex} package is an
+alias to @code{ifptex} provided for backward compatibility.")
+    (license license:expat)))
+
 (define-public texlive-iftex
   (package
     (name "texlive-iftex")
@@ -23079,6 +49947,26 @@ the engine in use.")
 (define-deprecated-package texlive-generic-iftex texlive-iftex)
 (define-deprecated-package texlive-generic-ifxetex texlive-iftex)
 
+(define-public texlive-ifxptex
+  (package
+    (name "texlive-ifxptex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/ifxptex/"
+                   "tex/generic/ifxptex/")
+             (base32
+              "0r77j010a9fcn47kjy6vwv72i8fynb8jsilas6hs9c9lgk5bal1g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ifxptex")
+    (synopsis "Detect pTeX and its derivatives")
+    (description
+     "The package provides commands for detecting pTeX and its derivatives
+(e-pTeX, upTeX, e-upTeX, and ApTeX).  Both LaTeX and plain TeX are
+supported.")
+    (license license:knuth)))
+
 (define-public texlive-tipa
   (package
     (name "texlive-tipa")
@@ -23769,6 +50657,26 @@ Unicode blocks, for automatic font tagging of multilingual text.")
 Easter nomogram.")
     (license license:lppl)))
 
+(define-public texlive-garuda-c90
+  (package
+    (name "texlive-garuda-c90")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/garuda-c90/"
+                   "fonts/map/dvips/garuda-c90/"
+                   "fonts/tfm/public/garuda-c90/"
+                   "source/fonts/garuda-c90/")
+             (base32
+              "1f6rlfxq3ccv9wdf7pzfgs1081yflxd3fzhkzi23mpyl777l7q9y")))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-fonts-tlwg))
+    (home-page "https://ctan.org/pkg/garuda-c90")
+    (synopsis "TeX support (from CJK) for the Garuda font")
+    (description
+     "This package provides TeX support (from CJK) for the Garuda font.")
+    (license license:gpl2+)))
+
 (define-public texlive-hanging
   (package
     (name "texlive-hanging")
@@ -23957,6 +50865,26 @@ is much more flexible, since it can be used as direct replacement for
 provided by @code{tex.mp}.")
     (license license:public-domain)))
 
+(define-public texlive-marathi
+  (package
+    (name "texlive-marathi")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/marathi/" "source/latex/marathi/"
+                   "tex/latex/marathi/")
+             (base32
+              "0xlyvdb6dadg4x2xixcxr1ixqsz69ssifpbh5p46lzsz080pwd58")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/marathi")
+    (synopsis "Typeset Marathi language using XeLaTeX or LuaLaTeX")
+    (description
+     "This package is used to typeset Marathi language with LuaLaTeX and XeLaTeX.
+It will provide localizations needed for the Marathi language.  Currently the
+package localizes package @code{blindtext} and package @code{expex}.")
+    (license (list license:gpl3+ license:fdl1.3+))))
+
 (define-public texlive-markdown
   (package
     (name "texlive-markdown")
@@ -24479,6 +51407,45 @@ of node lists.  It uses a similar visual representation for node lists as the
 UNIX @command{tree} command for a folder structure.")
     (license license:lppl1.3+)))
 
+(define-public texlive-nomencl
+  (package
+    (name "texlive-nomencl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/nomencl/" "makeindex/nomencl/"
+                   "source/latex/nomencl/" "tex/latex/nomencl/")
+             (base32
+              "176lqab9ypsym7x7mk9d0pbqf3fl9iwi539zjqv3l6nbmxj9ga88")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/nomencl")
+    (synopsis "Produce lists of symbols as in nomenclature")
+    (description
+     "This package produces lists of symbols using the capabilities of the
+MakeIndex program.")
+    (license license:lppl)))
+
+(define-public texlive-norasi-c90
+  (package
+    (name "texlive-norasi-c90")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "dvips/norasi-c90/"
+                   "fonts/map/dvips/norasi-c90/"
+                   "fonts/tfm/public/norasi-c90/"
+                   "source/fonts/norasi-c90/")
+             (base32
+              "19ynw46dbk71sbzx6rna359gdddjmwl57gw3kfz3f9ywvhq01m1k")))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-fonts-tlwg))
+    (home-page "https://ctan.org/pkg/norasi-c90")
+    (synopsis  "TeX support (from CJK) for the Norasi font")
+    (description
+     "This package provides TeX support (from CJK) for the Norasi font.")
+    (license license:gpl2+)))
+
 (define-public texlive-noto
   (package
     (name "texlive-noto")
@@ -24904,6 +51871,26 @@ may itself contain text).")
 @end itemize")
     (license license:lppl)))
 
+(define-public texlive-sauter
+  (package
+    (name "texlive-sauter")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "fonts/source/public/sauter/")
+             (base32
+              "037skfr46198y0vczwcy6dzq9ry8w5imj1ih9nfy9mrb0hmj8caq")))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/sauter")
+    (synopsis "Wide range of design sizes for CM fonts")
+    (description
+     "This package includes extensions, originally to the CM fonts, providing
+a parameterization scheme to build Metafont fonts at true design sizes, for
+a large range of sizes.  The scheme has now been extended to a range of other
+fonts, including the AMS fonts, @code{bbm}, @code{bbold}, @code{rsfs} and
+@code{wasy} fonts.")
+    (license license:gpl3+)))
+
 (define-public texlive-selinput
   (package
     (name "texlive-selinput")
@@ -25328,6 +52315,49 @@ create new @samp{List of ...}.  The ToC @code{\\parskip} may be changed.")
 
 (define-deprecated-package texlive-latex-tocloft texlive-tocloft)
 
+(define-public texlive-tocvsec2
+  (package
+    (name "texlive-tocvsec2")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/tocvsec2/"
+                   "source/latex/tocvsec2/"
+                   "tex/latex/tocvsec2/")
+             (base32
+              "0ybw8dra074pbl9l0ilp13naz73mgb57agy79bvmrb7v2r8a6zm7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tocvsec2")
+    (synopsis "Section numbering and table of contents control")
+    (description
+     "This package provides control over section numbering (without recourse
+to starred sectional commands) and the entries in the table of contents on
+a section by section basis.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-transparent
+  (package
+    (name "texlive-transparent")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/transparent/"
+                   "source/latex/transparent/"
+                   "tex/latex/transparent/")
+             (base32
+              "161lfx6yv8qgk76lz0j375swrk6012djay3sjxggrsx7l92qjvhd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/transparent")
+    (synopsis "Using a color stack for transparency with pdfTeX")
+    (description
+     "This package shows how a separate color stack can be used for
+transparency, a property besides color that works across page breaks.  If the
+PDF management is used it can also be used with other engines, but without
+support for page breaks.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-trimspaces
   (package
     (name "texlive-trimspaces")
@@ -25430,6 +52460,26 @@ a document with no explicit font selection, but a series of rules of the form
 ``when entering block ..., switch font to use ...''.")
     (license license:public-domain)))
 
+(define-public texlive-undolabl
+  (package
+    (name "texlive-undolabl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/undolabl/"
+                   "source/latex/undolabl/"
+                   "tex/latex/undolabl/")
+             (base32
+              "1pa1m610j46623wm59inxmaqpjhd9cfmbwmyh02pbmpqid47p9l1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/undolabl")
+    (synopsis "Override existing labels")
+    (description
+     "The package allows the user to override existing labels (for example,
+those generated automatically).")
+    (license license:lppl1.3+)))
+
 (define-public texlive-unicode-bidi
   (package
     (name "texlive-unicode-bidi")
@@ -25632,6 +52682,26 @@ The package is a reimplementation of the @code{spotcolor} package for use with
 XeLaTeX.  As such, it has the same user interface and the same capabilities.")
     (license license:lppl1.3c)))
 
+(define-public texlive-xetex-devanagari
+  (package
+    (name "texlive-xetex-devanagari")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xetex/xetex-devanagari/"
+                   "fonts/misc/xetex/fontmapping/xetex-devanagari/")
+             (base32
+              "17br9aq1af36wadq2cmndbb0z2jdhr1mn7jdb3cq642wwngcfi13")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xetex-devanagari")
+    (synopsis "XeTeX input map for Unicode Devanagari")
+    (description
+     "The package provides a map for use with Jonathan Kew's TECkit, to
+translate Devanagari (encoded according to the Harvard/Kyoto convention) to
+Unicode (range 0900-097F).")
+    (license license:lppl)))
+
 (define-public texlive-xetex-itrans
   (package
     (name "texlive-xetex-itrans")
@@ -26086,6 +53156,55 @@ BibLaTeX, and is considered experimental.")
 
 (define-deprecated-package texlive-latex-gcite texlive-gcite)
 
+(define-public texlive-gckanbun
+  (package
+    (name "texlive-gckanbun")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gckanbun/" "tex/latex/gckanbun/")
+             (base32
+              "1hjp7nw2b34pkfxh6n2722zc83hjpn492q77gb063jzi79pgbprx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gckanbun")
+    (synopsis "Kanbun typesetting for (u)pLaTeX and LuaLaTeX")
+    (description
+     "This package provides a Kanbun (Han Wen, ``Chinese writing'')
+typesetting for @code{(u)pLaTeX} and LuaLaTeX.")
+    (license license:expat)))
+
+(define-public texlive-gentombow
+  (package
+    (name "texlive-gentombow")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/gentombow/"
+                   "tex/latex/gentombow/")
+             (base32
+              "1pc1cxsxlnj9d2qnvm31r3cw15mf7fwr5dadd10473mww8bp8irf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/gentombow")
+    (synopsis "Generate Japanese-style crop marks")
+    (description
+     "This bundle provides a LaTeX package for generating Japanese-style crop
+marks (called tombow in Japanese) for practical use in self-publishing.
+
+The bundle contains the following packages:
+@itemize
+@item @file{gentombow.sty}: Generate crop marks (called tombow in
+Japanese) for practical use in self-publishing.  It provides the core
+tombow feature if not available.
+@item @file{pxgentombow.sty}: Superseded by @file{gentombow.sty}; kept
+for compatibility only.
+@item @file{bounddvi.sty}: Set papersize special to DVI file.  Can be
+used on LaTeX, pLaTeX, upLaTeX (with DVI output mode) with dvips or
+dvipdfmx drivers.
+@end itemize")
+    (license license:bsd-3)))
+
 (define-public texlive-geometry
   (package
     (name "texlive-geometry")
@@ -27127,6 +54246,27 @@ into Python''.  The package is modelled on @code{lipsum}, and may be used for
 similar purposes.")
     (license license:lppl1.3c)))
 
+(define-public texlive-kurdishlipsum
+  (package
+    (name "texlive-kurdishlipsum")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/kurdishlipsum/"
+                   "tex/xelatex/kurdishlipsum/")
+             (base32
+              "0lpdjqbif0pqsb6pmg8jc8igdf06dzwn3yfxh19mnjfzslcxkcmk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/kurdishlipsum")
+    (synopsis "Lipsum package for the Kurdish language")
+    (description
+     "This package provides lipsum-like facilities for the Kurdish language.
+The package gives you easy access to the Kurdish poetry and balladry texts of
+the Diwany Vafaiy, Ahmedy Xani, Naly, Mahwy,....  The package needs to be run
+under XeLaTeX.")
+    (license license:lppl)))
+
 (define-public texlive-kurier
   (package
     (name "texlive-kurier")
@@ -27706,6 +54846,89 @@ what your review will look like on zbMATH Open and you can test whether your
 LaTeX-Code will compile on our system.")
     (license (list license:gpl3 license:cc-by-sa4.0))))
 
+(define-public texlive-zhmetrics
+  (package
+    (name "texlive-zhmetrics")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/zhmetrics/"
+                   "fonts/tfm/zhmetrics/cyberb/"
+                   "fonts/tfm/zhmetrics/gbk/"
+                   "fonts/tfm/zhmetrics/gbkfs/"
+                   "fonts/tfm/zhmetrics/gbkhei/"
+                   "fonts/tfm/zhmetrics/gbkkai/"
+                   "fonts/tfm/zhmetrics/gbkli/"
+                   "fonts/tfm/zhmetrics/gbksong/"
+                   "fonts/tfm/zhmetrics/gbkyou/"
+                   "fonts/tfm/zhmetrics/unifs/"
+                   "fonts/tfm/zhmetrics/unihei/"
+                   "fonts/tfm/zhmetrics/unikai/"
+                   "fonts/tfm/zhmetrics/unili/"
+                   "fonts/tfm/zhmetrics/unisong/"
+                   "fonts/tfm/zhmetrics/uniyou/"
+                   "source/fonts/zhmetrics/"
+                   "tex/generic/zhmetrics/"
+                   "tex/latex/zhmetrics/")
+             (base32
+              "0953rxs3k3vil9aq9v8hacwbnchz73ql8xp0dp0ynpw6v8iabxyg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/zhmetrics")
+    (synopsis "TFM subfont files for using Chinese fonts in 8-bit TeX")
+    (description
+     "These are metrics to use existing Chinese TrueType fonts in workflows
+that use LaTeX and @command{dvipdfmx}, or pdfLaTeX.  The fonts themselves are
+not included in the package.  Six font families are supported: Kai, Song,
+Lishu, Fangsong, Youyuan and Hei.  Two encodings (GBK and UTF-8) are
+supported.")
+    (license license:lppl)))
+
+(define-public texlive-zhmetrics-uptex
+  (package
+    (name "texlive-zhmetrics-uptex")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/zhmetrics-uptex/"
+                   "fonts/tfm/public/zhmetrics-uptex/"
+                   "fonts/vf/public/zhmetrics-uptex/")
+             (base32
+              "1598l2k32g8nvxqzbgc6mzsib4v0pmsn9h221r4m1d95vm3n0pvd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/zhmetrics-uptex")
+    (synopsis "Chinese font metrics for upTeX")
+    (description
+     "The package contains some Chinese font metrics (JFM, VF, etc) for upTeX
+engine, together with a simple DVIPDFMx font mapping of Fandol fonts for
+DVIPDFMx.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-zhnumber
+  (package
+    (name "texlive-zhnumber")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/zhnumber/"
+                   "source/latex/zhnumber/"
+                   "tex/latex/zhnumber/")
+             (base32
+              "170lwb97ji9zgmmayzxmpawjkzk50g7rwqmwr11w72zfqkc2v9g2")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    ;; FIXME: I couldn't find how to build this package from source.
+    (arguments
+     (list #:phases #~(modify-phases %standard-phases (delete 'build))))
+    (home-page "https://ctan.org/pkg/zhnumber")
+    (synopsis "Typeset Chinese representations of numbers")
+    (description
+     "The package provides commands to typeset Chinese representations of
+numbers.  The main difference between this package and CJKnumb is that the
+commands provided are expandable in the proper way.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-zhspacing
   (package
     (name "texlive-zhspacing")
@@ -27802,6 +55025,45 @@ via one of the packages @code{calrsfs} and @code{mathrsfs}.")
 readable copies of the FAQ from the Spanish TeX users group.")
     (license license:lppl)))
 
+(define-public texlive-eskd
+  (package
+    (name "texlive-eskd")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/eskd/" "source/latex/eskd/"
+                   "tex/latex/eskd/")
+             (base32
+              "1q83pvycckrmyaiwwg3mcl77jy5wrcy8jy7kz004x7asq2p0a2ls")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/eskd")
+    (synopsis "Modern Russian typesetting")
+    (description
+     "The class offers modern Russian text formatting, in accordance with
+accepted design standards.  Fonts not (apparently) available on CTAN are
+required for use of the class.")
+    (license license:lppl)))
+
+(define-public texlive-eskdx
+  (package
+    (name "texlive-eskdx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/eskdx/" "tex/latex/eskdx/")
+             (base32
+              "07c9gbvgr4455s5sfsdjxbbdllx2lhmb5d1c2sdk7rpkvjh64lv8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/eskdx")
+    (synopsis "Modern Russian typesetting")
+    (description
+     "Eskdx is a collection of LaTeX classes and packages to typeset textual
+and graphical documents in accordance with Russian (and probably post USSR)
+standards for designers.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-eso-pic
   (package
     (name "texlive-eso-pic")
@@ -27888,6 +55150,26 @@ provides means for easy customization of the list of notes.")
 document.")
     (license license:lppl1.2+)))
 
+(define-public texlive-endnotesj
+  (package
+    (name "texlive-endnotesj")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/endnotesj/"
+                   "tex/latex/endnotesj/")
+             (base32
+              "1yv8jzvps79svd4013f6cpm41mh3mx2m64jx7bv01ryqdgjzq2g9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/endnotesj")
+    (synopsis "Japanese-style endnotes")
+    (description
+     "This package provides customized styles for endnotes to be used with
+Japanese documents.  It can be used on pLaTeX, upLaTeX, and LuaLaTeX
+(LuaTeX-ja).")
+    (license license:bsd-3)))
+
 (define-public texlive-enumitem
   (package
     (name "texlive-enumitem")
@@ -28498,6 +55780,25 @@ LaTeX Companion} book, together with necessary supporting files.")
 necessary supporting files.")
     (license license:lppl1.3c)))
 
+(define-public texlive-tlmgr-intro-zh-cn
+  (package
+    (name "texlive-tlmgr-intro-zh-cn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/tlmgr-intro-zh-cn/")
+             (base32
+              "127fad3aq66rnn4jkccyw7qc8pdcwapyjb6lj9kn49nqcy3jm6nk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/tlmgr-intro-zh-cn")
+    (synopsis "Short tutorial on using @command{tlmgr} in Chinese")
+    (description
+     "This is a Chinese translation of the @command{tlmgr} documentation.  It
+introduces some of the common usage of the TeX Live Manager.  The original can
+be found in the @code{tlmgrbasics} package.")
+    (license license:gpl3+)))
+
 (define-public texlive-tlmgrbasics
   (package
     (name "texlive-tlmgrbasics")
@@ -28705,6 +56006,176 @@ command).")
     ;; The license text is found at the header of the jadetex.dtx file.
     (license license:expat)))
 
+(define-public texlive-japanese-mathformulas
+  (package
+    (name "texlive-japanese-mathformulas")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/japanese-mathformulas/"
+                   "tex/lualatex/japanese-mathformulas/")
+             (base32
+              "0a5kqgkl89m5yc9zgkhlz44dvvi52jfaja3lwcf7g7q039k2h6fg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/japanese-mathformulas")
+    (synopsis "Compiling basic math formulas in Japanese using LuaLaTeX")
+    (description
+     "This is a style file for compiling basic maths formulas in Japanese
+using LuaLaTeX.  @code{\\NewDocumentCommand} allows you to specify whether the
+formula should be used within a sentence or on a new line.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-japanese-otf
+  (package
+    (name "texlive-japanese-otf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/japanese-otf/"
+                   "fonts/ofm/public/japanese-otf/"
+                   "fonts/tfm/public/japanese-otf/"
+                   "fonts/vf/public/japanese-otf/"
+                   "source/fonts/japanese-otf/"
+                   "tex/platex/japanese-otf/")
+             (base32
+              "125z1fi13dnksngsc442n6fcmicv7hhrxrq8anzxax4ic3dqfvha")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/japanese-otf")
+    (synopsis "Advanced font selection for platex and its friends")
+    (description
+     "The package contains pLaTeX support files and virtual fonts for
+supporting a wide variety of fonts in LaTeX using the pTeX engine.")
+    (license license:bsd-3)))
+
+(define-public texlive-jieeetran
+  (package
+    (name "texlive-jieeetran")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "bibtex/bst/jieeetran/"
+                   "doc/bibtex/jieeetran/")
+             (base32
+              "122g618j9wli9amx9c82whjp81i5cpjz1mj4pnmyfa8x5mfdh6dp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jieeetran")
+    (synopsis
+     "UnofficiaL BibTeX style for citing Japanese articles in IEEE format")
+    (description
+     "This package provides an unofficial BibTeX style for authors trying to
+cite Japanese articles in the Institute of Electrical and Electronics
+Engineers (IEEE) format.")
+    (license license:expat)))
+
+(define-public texlive-jlreq
+  (package
+    (name "texlive-jlreq")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jlreq/"
+                   "fonts/tfm/public/jlreq/"
+                   "fonts/vf/public/jlreq/"
+                   "source/latex/jlreq/"
+                   "tex/latex/jlreq/"
+                   "tex/luatex/jlreq/")
+             (base32
+              "11jyj5mcyd9yxhb7mnm7naaaj26cgdk5iqkwna20109pcc2qy0wz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jlreq")
+    (synopsis
+     "Japanese document class based on requirements for Japanese text layout")
+    (description
+     "This package provides a Japanese document class based on requirements
+for Japanese text layout.  The class file and the JFM (Japanese font metric)
+files for LuaTeX-ja, pLaTeX, or upLaTeX are provided.")
+    (license license:bsd-2)))
+
+(define-public texlive-jlreq-deluxe
+  (package
+    (name "texlive-jlreq-deluxe")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/platex/jlreq-deluxe/"
+                   "fonts/tfm/public/jlreq-deluxe/"
+                   "fonts/vf/public/jlreq-deluxe/"
+                   "tex/platex/jlreq-deluxe/")
+             (base32
+              "0l80iqgsnhvqisrkhgflwpxs5fqyz2ddv6vp3b17vnxvymyzzvg4")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jlreq-deluxe")
+    (synopsis "Multi-weight Japanese font support for the @code{jlreq} class")
+    (description
+     "This package provides multi-weight Japanese font support for the
+@code{jlreq} class.")
+    (license license:expat)))
+
+(define-public texlive-jpneduenumerate
+  (package
+    (name "texlive-jpneduenumerate")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jpneduenumerate/"
+                   "tex/latex/jpneduenumerate/")
+             (base32
+              "0ndg4ig5bg9ns2pxcf070c7jyh7d7r3r7c7xg5d99k3qlg4vkd9n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jpneduenumerate")
+    (synopsis "Enumerative expressions in Japanese education")
+    (description
+     "Mathematical equation representation in Japanese education differs
+somewhat from the standard LaTeX writing style.  This package introduces
+enumerative expressions in Japanese education.")
+    (license license:expat)))
+
+(define-public texlive-jpnedumathsymbols
+  (package
+    (name "texlive-jpnedumathsymbols")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/jpnedumathsymbols/"
+                   "tex/latex/jpnedumathsymbols/")
+             (base32
+              "0ap370bp831xxrq45zllyrbhhxs0yv3qb1l5pkpvgsildfk5rk7m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/jpnedumathsymbols")
+    (synopsis "Mathematical equation representation in Japanese education")
+    (description
+     "Mathematical equation representation in Japanese education differs
+somewhat from the standard LaTeX writing style.  This package introduces
+mathematical equation representation in Japanese education.")
+    (license license:expat)))
+
+(define-public texlive-kanbun
+  (package
+    (name "texlive-kanbun")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/kanbun/" "tex/latex/kanbun/")
+             (base32
+              "1a922jly8f791r4jbz4097h8js5z29435zphm5i52pvkl6p245wy")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/kanbun")
+    (synopsis "Typeset kanbun-kundoku with support for kanbun annotation")
+    (description
+     "This package allows users to manually input macros for elements in
+a kanbun-kundoku (Han Wen Xun Du) paragraph.  More importantly, it accepts
+plain text input in the kanbun annotation form when used with LuaLaTeX, which
+allows typesetting kanbun-kundoku paragraphs efficiently.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-libertine
   (package
     (name "texlive-libertine")
@@ -29257,267 +56728,6 @@ documents as well as DVI output.")
 
 (define-deprecated-package texlive-generic-pdftex texlive-pdftex)
 
-(define texlive-bin-full
-  (package/inherit texlive-bin
-    (name "texlive-bin-full")
-    (arguments
-     (substitute-keyword-arguments (package-arguments texlive-bin)
-       ((#:configure-flags _)
-        #~(let ((kpathsea #$(this-package-input "texlive-libkpathsea")))
-            (list "--with-banner-add=/GNU Guix"
-                  "--enable-shared"
-                  "--disable-native-texlive-build"
-                  "--disable-static"
-                  "--disable-kpathsea"
-                  "--with-system-cairo"
-                  "--with-system-freetype2"
-                  "--with-system-gd"
-                  "--with-system-gmp"
-                  "--with-system-graphite2"
-                  "--with-system-harfbuzz"
-                  "--with-system-icu"
-                  "--with-system-libgs"
-                  "--with-system-libpaper"
-                  "--with-system-libpng"
-                  "--with-system-mpfr"
-                  "--with-system-pixman"
-                  "--with-system-potrace"
-                  "--with-system-teckit"
-                  "--with-system-zlib"
-                  "--with-system-zziplib"
-                  ;; Help locating external kpathsea.  For some reason
-                  ;; PKG-CONFIG is unable to find it.
-                  "--with-system-kpathsea"
-                  (format #f "--with-kpathsea-includes=~a/include" kpathsea)
-                  (format #f "--with-kpathsea-lib=~a/lib" kpathsea)
-                  ;; LuaJIT is not ported to some architectures yet.
-                  #$@(if (or (target-ppc64le?)
-                             (target-riscv64?))
-                         '("--disable-luajittex"
-                           "--disable-luajithbtex"
-                           "--disable-mfluajit")
-                         '()))))
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (add-after 'install 'symlink-kpathsea-binaries
-              (lambda _
-                (let ((bin (string-append
-                            #$(this-package-input "texlive-libkpathsea")
-                            "/bin"))
-                      (files
-                       '("kpseaccess" "kpsereadlink" "kpsestat" "kpsewhich")))
-                  (with-directory-excursion (string-append #$output "/bin")
-                    (for-each (lambda (b) (symlink (string-append bin "/" b) b))
-                              files)))))
-            (add-after 'install 'merge-core-scripts
-              (lambda* (#:key inputs native-inputs #:allow-other-keys)
-                (let ((texlive-scripts
-                       (dirname
-                        (dirname
-                         (search-input-file (or native-inputs inputs)
-                                            "tlpkg/texlive.tlpdb"))))
-                      (tlpkg (string-append #$output "/share/tlpkg")))
-                  ;; "tlpkg" directory is neither provided by texlive-bin nor
-                  ;; by texlive-texmf.
-                  (mkdir-p tlpkg)
-                  (copy-recursively (string-append texlive-scripts "/tlpkg")
-                                    tlpkg)
-                  ;; texlive-bin source doesn't provide this Perl script.
-                  ;; Yet, it is referenced in "fmtutil.pl" so we need to move
-                  ;; it here too.
-                  (install-file
-                   (string-append texlive-scripts
-                                  "/texmf-dist/scripts/texlive/mktexlsr.pl")
-                   (string-append #$output
-                                  "/share/texmf-dist/scripts/texlive")))))
-            (add-after 'merge-core-scripts 'patch-core-scripts
-              (lambda _
-                (with-directory-excursion
-                    (string-append #$output "/share/texmf-dist/scripts/texlive")
-                  ;; Make sure that fmtutil can find its Perl modules.
-                  (substitute* "fmtutil.pl"
-                    (("\\$TEXMFROOT/")
-                     (string-append #$output "/share/")))
-                  ;; Likewise for updmap.pl.
-                  (substitute* "updmap.pl"
-                    (("\\$TEXMFROOT/tlpkg")
-                     (string-append #$output "/share/tlpkg")))
-                  ;; Likewise for the tlmgr.
-                  (substitute* "tlmgr.pl"
-                    ((".*\\$::installerdir = \\$Master.*" all)
-                     (format #f "  $Master = ~s;~%~a"
-                             (string-append #$output "/share")
-                             all))))))
-            (add-after 'patch-core-scripts 'patch-shell-scripts
-              (lambda _
-                (with-directory-excursion
-                    (string-append #$output "/share/texmf-dist/scripts")
-                  ;; First patch shell scripts with ".sh" extension.
-                  (let* ((scripts (find-files "." "\\.sh$"))
-                         (commands '("awk" "basename" "cat" "grep" "mkdir" "rm"
-                                     "sed" "sort" "uname"))
-                         (command-regexp
-                          (format #f "\\b(~a)\\b" (string-join commands "|")))
-                         (iso-8859-1-encoded-scripts
-                          '("./texlive-extra/rubibtex.sh"
-                            "./texlive-extra/rumakeindex.sh")))
-                    (define (substitute-commands scripts)
-                      (substitute* scripts
-                        ((command-regexp dummy command)
-                         (which command))))
-                    (substitute-commands
-                     (lset-difference string= scripts iso-8859-1-encoded-scripts))
-                    (with-fluids ((%default-port-encoding "ISO-8859-1"))
-                      (substitute-commands iso-8859-1-encoded-scripts)))
-                  ;; Then patch scripts without such extension.
-                  (let ((dirs (map (compose dirname which)
-                                   (list "awk" "cat" "grep" "sed"))))
-                    (substitute* (find-files "texlive" "^mktex(mf|pk|tfm)$")
-                      (("^version=" m)
-                       (format #false "PATH=\"~{~a:~}$PATH\"; export PATH~%~a"
-                               dirs m)))))))))))
-    (native-inputs
-     (modify-inputs (package-native-inputs texlive-bin)
-       (append (package-source texlive-scripts))))
-    (inputs
-     (modify-inputs (package-inputs texlive-bin)
-       (append texlive-libkpathsea)))
-    (propagated-inputs '())))
-
-(define texlive-texmf
-  (package
-    (name "texlive-texmf")
-    (version (package-version texlive-bin))
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "ftp://tug.org/historic/systems/texlive/"
-                                  (string-take version 4)
-                                  "/texlive-" version "-texmf.tar.xz"))
-              (sha256
-               (base32
-                "0lqjm11pr9vasvivaci3k9xcmdyd08ldnh31zf8avjjs09xcfkac"))))
-    (build-system copy-build-system)
-    (arguments
-     (list
-      #:modules '((guix build copy-build-system)
-                  (guix build utils)
-                  (srfi srfi-1)
-                  (srfi srfi-26))
-      ;; This package takes 4 GiB, which we can't afford to distribute from
-      ;; our servers.
-      #:substitutable? #f
-      #:install-plan #~'(("texmf-dist/" "share/texmf-dist"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'texmf-config
-            (lambda* (#:key inputs native-inputs  #:allow-other-keys)
-              (let* ((share (string-append #$output "/share"))
-                     (texmf-dist (string-append share "/texmf-dist"))
-                     (web2c (string-append texmf-dist "/web2c"))
-                     (fmtutil.cnf (string-append web2c "/fmtutil.cnf"))
-                     (texlive-bin
-                      #$(this-package-native-input "texlive-bin-full")))
-                ;; LuaJIT is not ported to powerpc64* yet.
-                (if #$(target-ppc64le?)
-                    (substitute* fmtutil.cnf
-                      (("^(luajittex|luajithbtex|mfluajit)" m)
-                       (string-append "#! " m))))
-                ;; Register paths in texmfcnf.lua, needed for context.
-                (substitute* (string-append web2c "/texmfcnf.lua")
-                  (("selfautodir:") #$output)
-                  (("selfautoparent:") (string-append share "/")))
-                ;; Set path to TeXLive Perl modules
-                (setenv "PERL5LIB"
-                        (string-append (getenv "PERL5LIB") ":"
-                                       (string-append texlive-bin
-                                                      "/share/tlpkg")))
-                ;; Configure the texmf-dist tree.
-                (setenv "GUIX_TEXMF" texmf-dist)
-                (setenv "PATH"
-                        (string-append (getenv "PATH") ":" texlive-bin "/bin:"))
-                (let ((updmap.cfg (string-append web2c "/updmap.cfg")))
-                  (invoke (string-append texlive-bin "/bin/updmap-sys")
-                          "--nohash" "--syncwithtrees"
-                          (string-append "--cnffile=" updmap.cfg)))
-                (invoke (string-append texlive-bin "/bin/fmtutil-sys")
-                        "--cnffile" fmtutil.cnf
-                        "--all"
-                        "--fmtdir" web2c)))))))
-    (native-inputs (list texlive-bin-full))
-    (inputs (list lua perl python-wrapper ruby tcsh))
-    (properties `((max-silent-time . 9600))) ; don't time out while grafting
-    (synopsis "TeX Live, a package of the TeX typesetting system")
-    (description
-     "TeX Live provides a comprehensive TeX document production system.
-It includes all the major TeX-related programs, macro packages, and fonts
-that are free software, including support for many languages around the
-world.
-
-This package contains the complete tree of texmf-dist data.")
-    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))
-    (home-page "https://www.tug.org/texlive/")))
-
-(define-public texlive
-  (package
-    (name "texlive")
-    (version (package-version texlive-bin))
-    (source #f)
-    (build-system trivial-build-system)
-    (arguments
-     (list
-      #:modules '((guix build utils))
-      #:builder
-      ;; Build the union of texlive-bin-full and texlive-texmf, but take the
-      ;; conflicting subdirectory share/texmf-dist from texlive-texmf.
-      #~(begin
-          (use-modules (guix build utils))
-          (let ((bin #$(this-package-input "texlive-bin-full"))
-                (texmf #$(this-package-input "texlive-texmf")))
-            (mkdir #$output)
-            (with-directory-excursion #$output
-              ;; "include/" and "lib/" directories.
-              (for-each
-               (lambda (name)
-                 (symlink (string-append bin "/" name) name))
-               '("include" "lib"))
-              ;; "bin/" directory.
-              (mkdir "bin")
-              (with-directory-excursion "bin"
-                (for-each
-                 (lambda (name) (symlink name (basename name)))
-                 (find-files (string-append bin "/bin/") "")))
-              ;; "share/info", "share/man", share/texmf-dist/" and
-              ;; "share/tlpkg/" directories.
-              (mkdir "share")
-              (with-directory-excursion "share"
-                (for-each
-                 (lambda (name)
-                   (symlink (string-append bin "/share/" name) name))
-                 '("info" "man" "tlpkg"))
-                (symlink (string-append texmf "/share/texmf-dist")
-                         "texmf-dist"))
-              ;; Now everything is in place, generate ls-R file.
-              (setenv "PATH"
-                      (string-append
-                       (getenv "PATH") ":"
-                       #$(this-package-input "texlive-bin-full") "/bin"))
-              (invoke (string-append bin "/bin/mktexlsr")))))))
-    (inputs (list texlive-bin-full texlive-texmf))
-    (propagated-inputs (list texlive-libkpathsea))
-    (native-search-paths
-     (list (search-path-specification
-            (variable "TEXMFLOCAL")
-            (files '("share/texmf-local")))))
-    (synopsis "TeX Live, a package of the TeX typesetting system")
-    (description
-     "TeX Live provides a comprehensive TeX document production system.
-It includes all the major TeX-related programs, macro packages, and fonts that
-are free software, including support for many languages around the world.
-
-This package contains the complete TeX Live distribution.")
-    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))
-    (home-page "https://www.tug.org/texlive/")))
-
 (define-public texlive-biber
   (package
     (name "texlive-biber")
@@ -30944,6 +58154,26 @@ school teachers, as the style is probably more in line with Italian high
 school tests.")
     (license license:lppl1.3+)))
 
+(define-public texlive-exam-zh
+  (package
+    (name "texlive-exam-zh")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/xelatex/exam-zh/" "tex/latex/exam-zh/")
+             (base32
+              "1p0zy0y2c75mq84n3bqbd39hw1phiyfl22q0fzid58v5ngcf0ip1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/exam-zh")
+    (synopsis "LaTeX template for Chinese exams")
+    (description
+     "This package provides a class @file{exam-zh.cls} suitable for Chinese
+exams of all types.  It also includes several module packages like
+@file{exam-zh-question.sty} and @file{exam-zh-choices.sty}, which can be used
+individually.")
+    (license license:lppl1.3c)))
+
 (define-public texlive-examplep
   (package
     (name "texlive-examplep")
@@ -31071,6 +58301,32 @@ be specified in the document itself (one often needs a LaTeX citation-style
 package, such as @command{natbib} as well).")
     (license license:knuth)))
 
+(define-public texlive-charissil
+  (package
+    (name "texlive-charissil")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/charissil/"
+                   "fonts/enc/dvips/charissil/"
+                   "fonts/map/dvips/charissil/"
+                   "fonts/tfm/SIL/charissil/"
+                   "fonts/truetype/SIL/charissil/"
+                   "fonts/type1/SIL/charissil/"
+                   "fonts/vf/SIL/charissil/"
+                   "tex/latex/charissil/")
+             (base32
+              "0hdwxbck39xjkyq981fm3zxxkjw753mnr05jb7h7824k9x9wpfsl")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/charissil")
+    (synopsis "CharisSIL fonts with support for all LaTeX engines")
+    (description
+     "This package provides the CharisSIL family of fonts adapted by SIL
+International from Bitstream Charter in TrueType format, with support for
+LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX.")
+    (license (list license:silofl1.1 license:lppl))))
+
 (define-public texlive-charter
   (package
     (name "texlive-charter")
@@ -32239,6 +59495,1905 @@ and with colour support.  There are macros for colouring or shading the cells
 of tables.")
     (license license:lppl1.3+)))
 
+(define-public texlive-pst-2dplot
+  (package
+    (name "texlive-pst-2dplot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-2dplot/"
+                   "tex/latex/pst-2dplot/")
+             (base32
+              "1lq39hdlqf4af16lx7qrs6x2hj10rsashgd3yl8659346a2mq75a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-2dplot")
+    (synopsis "PSTricks package for drawing 2D curves")
+    (description
+     "Pst-2dplot is a PSTricks package that offers an intuitive tool for
+plotting 2-d curves.  It defines an environment with commands similar to
+MATLAB for plotting.")
+    (license license:lppl)))
+
+(define-public texlive-pst-3d
+  (package
+    (name "texlive-pst-3d")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-3d/" "dvips/pst-3d/"
+                   "source/generic/pst-3d/"
+                   "tex/generic/pst-3d/" "tex/latex/pst-3d/")
+             (base32
+              "12gpsg14glcjavlwsb7g0dkxcax89z2adkx7p29cpzvssnimdj50")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-3d")
+    (synopsis "PSTricks package for tilting and other pseudo-3D tricks")
+    (description
+     "The package provides basic macros that use PSTricks for shadows, tilting
+and three dimensional representations of text or graphical objects.")
+    (license license:lppl)))
+
+(define-public texlive-pst-3dplot
+  (package
+    (name "texlive-pst-3dplot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-3dplot/"
+                   "dvips/pst-3dplot/"
+                   "tex/generic/pst-3dplot/"
+                   "tex/latex/pst-3dplot/")
+             (base32
+              "0k49c4kc126zacv2p2crdv00l50cg6kfpdnsa9m223naigifzf22")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-3dplot")
+    (synopsis "Draw 3D objects in parallel projection, using PSTricks")
+    (description
+     "This package provides a package using PSTricks to draw a large variety
+of graphs and plots, including 3D maths functions.  Data can be read from
+external data files, making this package a generic tool for graphing within
+TeX or LaTeX, without the need for external tools.")
+    (license license:lppl)))
+
+(define-public texlive-pst-abspos
+  (package
+    (name "texlive-pst-abspos")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-abspos/"
+                   "source/generic/pst-abspos/"
+                   "tex/generic/pst-abspos/"
+                   "tex/latex/pst-abspos/")
+             (base32
+              "12k786hfhp8vrq4a6a6caf6fi1p16hd79r3lf19d5vcyykppdcm8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-abspos")
+    (synopsis "Put objects at an absolute position")
+    (description
+     "This PSTricks package provides a command @code{\\pstPutAbs(x,y)} to put
+an object at an arbitrary absolute (or even a relative) position on the
+page.")
+    (license license:lppl)))
+
+(define-public texlive-pst-am
+  (package
+    (name "texlive-pst-am")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-am/"
+                   "source/generic/pst-am/" "tex/latex/pst-am/")
+             (base32
+              "1dyhjycy6ccamxcp65761gbszxpvxdsiirqbpljkywsbynwfcn6q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-am")
+    (synopsis "Simulation of modulation and demodulation")
+    (description
+     "The package allows the simulation of the modulated and demodulated
+amplitude of radio waves.  The user may plot curves of modulated signals, wave
+carrier, signal modulation, signal recovery and signal demodulation.")
+    (license license:lppl)))
+
+(define-public texlive-pst-antiprism
+  (package
+    (name "texlive-pst-antiprism")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-antiprism/"
+                   "dvips/pst-antiprism/"
+                   "tex/generic/pst-antiprism/"
+                   "tex/latex/pst-antiprism/")
+             (base32
+              "158691m8i8zd0w7d7vsbmkjm4y1ixfvj4j7bxszcw67cz2q2cmyi")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-antiprism")
+    (synopsis "PSTricks related package which draws an antiprism")
+    (description
+     "@code{pst-antiprism} is a PSTricks related package which draws an antiprism,
+which is a semiregular polyhedron constructed with 2-gons and triangles.")
+    (license license:lppl)))
+
+(define-public texlive-pst-arrow
+  (package
+    (name "texlive-pst-arrow")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-arrow/"
+                   "tex/generic/pst-arrow/"
+                   "tex/latex/pst-arrow/")
+             (base32
+              "1z216b5189f390mdzxxcc240i0iav13nicqjqwcn31f4j4wclpzj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-arrow")
+    (synopsis "Special arrows for PSTricks")
+    (description
+     "This package has all the code from the package @code{pstricks-add},
+which was related to arrows, like multiple arrows and so on.")
+    (license license:lppl)))
+
+(define-public texlive-pst-asr
+  (package
+    (name "texlive-pst-asr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-asr/"
+                   "tex/generic/pst-asr/" "tex/latex/pst-asr/")
+             (base32
+              "0hxp905d2r4j2z8hfbl9v45xid20lm41k8xy52fdj5grpshhg2z1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-asr")
+    (synopsis "Typeset autosegmental representations for linguists")
+    (description
+     "The package allows the user to typeset autosegmental representations.")
+    (license license:lppl)))
+
+(define-public texlive-pst-bar
+  (package
+    (name "texlive-pst-bar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-bar/" "dvips/pst-bar/"
+                   "tex/generic/pst-bar/" "tex/latex/pst-bar/")
+             (base32
+              "19x8a3r09m28g6mpa98rz94274yahajznkkqarzwh1n8v54bb7hd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-bar")
+    (synopsis "Produces bar charts using PSTricks")
+    (description
+     "The package uses PSTricks to draw bar charts from data stored in
+a comma-delimited file.  Several types of bar charts may be drawn, and the
+drawing parameters are highly customizable.")
+    (license license:lppl)))
+
+(define-public texlive-pst-barcode
+  (package
+    (name "texlive-pst-barcode")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-barcode/"
+                   "dvips/pst-barcode/"
+                   "tex/generic/pst-barcode/"
+                   "tex/latex/pst-barcode/")
+             (base32
+              "10990hhhj961rizfffplx8v3rhnv7knm8nz2zd1aqp686fr3fkgv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-barcode")
+    (synopsis "Print barcodes using PostScript")
+    (description
+     "The @code{pst-barcode} package allows printing of barcodes, in a huge
+variety of formats, including quick-response (QR) codes.  As a PSTricks
+package, the package requires pstricks.  The package uses @code{PostScript}
+for calculating the bars.  For PDF output use a multi-pass mechansism such as
+@code{pst-pdf}.")
+    (license license:lppl)))
+
+(define-public texlive-pst-bezier
+  (package
+    (name "texlive-pst-bezier")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-bezier/"
+                   "dvips/pst-bezier/"
+                   "tex/generic/pst-bezier/"
+                   "tex/latex/pst-bezier/")
+             (base32
+              "181232snaqfjdc5mzazsdgjvmjn27pcfx45mydkk0cpp61kdr9yk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-bezier")
+    (synopsis "Draw Bezier curves")
+    (description
+     "The package provides a macro @code{\\psbcurve} for drawing a Bezier curve.
+Provision is made for full control of over all the control points of the
+curve.")
+    (license license:lppl)))
+
+(define-public texlive-pst-blur
+  (package
+    (name "texlive-pst-blur")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-blur/" "dvips/pst-blur/"
+                   "source/generic/pst-blur/"
+                   "tex/generic/pst-blur/"
+                   "tex/latex/pst-blur/")
+             (base32
+              "1zz5ixznkl3i59zlv9lxz7f1cfqwbar3qjy5x4323gmzjw2k9f8m")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-blur")
+    (synopsis "PSTricks package for blurred shadows")
+    (description
+     "Pst-blur is a package built for use with PSTricks.  It provides macros
+that apply blurring to the normal shadow function of PSTricks.")
+    (license license:lppl)))
+
+(define-public texlive-pst-bspline
+  (package
+    (name "texlive-pst-bspline")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-bspline/"
+                   "dvips/pst-bspline/"
+                   "tex/generic/pst-bspline/"
+                   "tex/latex/pst-bspline/")
+             (base32
+              "0djf1izf9779lgmbw5zhcz7k5hf8ay96nlgdgpsm1zj4ncwkpibg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-bspline")
+    (synopsis "Draw cubic Bspline curves and interpolations")
+    (description
+     "The package draws uniform, cubic B-spline curves, open and closed, based
+on a sequence of B-spline control points.  There is also code which permits
+drawing the open or closed cubic Bspline curve interpolating a sequence of
+points.  Graphical output is created using PStricks.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-pst-calculate
+  (package
+    (name "texlive-pst-calculate")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-calculate/"
+                   "tex/latex/pst-calculate/")
+             (base32
+              "19yi0n8p4gj2p16nsk8f3i02a9adlqssyv57r67dc0qh6a0ipa9k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-calculate")
+    (synopsis "Support for floating point operations at LaTeX level")
+    (description
+     "This package provides an interface to the LaTeX3 floating point unit,
+mainly used for PSTricks related packages to allow math expressions at LaTeX
+level.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-pst-calendar
+  (package
+    (name "texlive-pst-calendar")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pst-calendar/"
+                   "tex/latex/pst-calendar/")
+             (base32
+              "07vc1jxrr0n0iwjx6qjww53xji1pv42dvlc2ghi1r14nypgm8j5n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-calendar")
+    (synopsis "Plot calendars in fancy ways")
+    (description
+     "The package draws tabular calendars, or calendars on dodecahedra with
+a month to each face.  The package works for years 2000--2099, and has options
+for calendars in French German and English, but the documentation is not
+available in English.")
+    (license license:lppl)))
+
+(define-public texlive-pst-cie
+  (package
+    (name "texlive-pst-cie")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-cie/" "dvips/pst-cie/"
+                   "tex/generic/pst-cie/" "tex/latex/pst-cie/")
+             (base32
+              "0g5yry8m935idznwn486gn75vjyhbdzs2w99l0szh95026kd4f0a")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-cie")
+    (synopsis "CIE color space")
+    (description
+     "pst-cie is a PSTricks related package to show the different CIE color
+spaces: Adobe, CIE, ColorMatch, NTSC, Pal-Secam, ProPhoto, SMPTE, and sRGB.")
+    (license license:lppl)))
+
+(define-public texlive-pst-circ
+  (package
+    (name "texlive-pst-circ")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-circ/" "dvips/pst-circ/"
+                   "tex/generic/pst-circ/"
+                   "tex/latex/pst-circ/")
+             (base32
+              "0255xcjhm0jcgw352cmdn8d8062g2mihfzhii20zh4j0zznmk7hj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-circ")
+    (synopsis "PSTricks package for drawing electric circuits")
+    (description
+     "The package can easily draw current 2-terminal devices and some 3- and
+4-terminal devices used in electronic or electric theory.  The package's
+macros are designed with a view to logical representation of circuits, as far
+as possible, so as to relieve the user of purely graphical considerations when
+expressing a circuit.")
+    (license license:lppl)))
+
+(define-public texlive-pst-coil
+  (package
+    (name "texlive-pst-coil")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-coil/" "dvips/pst-coil/"
+                   "tex/generic/pst-coil/"
+                   "tex/latex/pst-coil/")
+             (base32
+              "0d3wqrv19zc9qwp3gbr32siad408z4g23k5861p0hqy2hw8f908q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-coil")
+    (synopsis "PSTricks package for coils, etc")
+    (description
+     "Pst-coil is a PSTricks based package for coils and zigzags and for coil
+and zigzag node connections.")
+    (license license:lppl)))
+
+(define-public texlive-pst-contourplot
+  (package
+    (name "texlive-pst-contourplot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-contourplot/"
+                   "tex/generic/pst-contourplot/"
+                   "tex/latex/pst-contourplot/")
+             (base32
+              "00nqg59x1x3nh30cclqjdyyyjzinyl9czjfywznh68dzari1fvqk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-contourplot")
+    (synopsis
+     "Draw implicit functions using the marching squares algorithm")
+    (description
+     "This package allows to draw implicit functions @samp{f(x,y) = 0} with
+options for coloring the inside of the surfaces, for marking the points and
+arrowing the curve at points chosen by the user.  The package uses the
+marching squares algorithm.")
+    (license license:lppl)))
+
+(define-public texlive-pst-cox
+  (package
+    (name "texlive-pst-cox")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-cox/" "dvips/pst-cox/"
+                   "tex/generic/pst-cox/" "tex/latex/pst-cox/")
+             (base32
+              "1bw2qmsc735q3ji4h7l166s37wcpd6s4fvi98ggagndm29mcbia3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-cox")
+    (synopsis "Drawing regular complex polytopes with PSTricks")
+    (description
+     "Pst-cox is a PSTricks package for drawing 2-dimensional projections of
+complex regular polytopes (after the work of Coxeter).  The package consists
+of a macro library for drawing the projections.  The complex polytopes appear
+in the study of the root systems and play a crucial role in many domains
+related to mathematics and physics.  These polytopes have been completely
+described by Coxeter in his book @emph{Regular Complex Polytopes}.  There
+exist only a finite numbers of exceptional regular complex polytopes (for
+example the icosahedron) and some infinite series (for example, one can
+construct a multi-dimensional analogue of the hypercube in any finite
+dimension).
+
+The library contains two packages.  The first, @code{pst-coxcoor}, is devoted
+to the exceptional complex regular polytopes whose coordinates have been
+pre-computed.  The second, @code{pst-coxeterp}, is devoted to the infinite
+series.")
+    (license license:lgpl3+)))
+
+(define-public texlive-pst-dart
+  (package
+    (name "texlive-pst-dart")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-dart/"
+                   "tex/generic/pst-dart/"
+                   "tex/latex/pst-dart/")
+             (base32
+              "1834hxlg4hfqmrl6k5i2c1jimzd0lcdi6x82b8lfj8dhnddlbgzr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-dart")
+    (synopsis "Plotting dart boards")
+    (description
+     "@code{pst-dart} is a PSTricks related package and draws dart boards.
+Optional arguments are the unit and the fontsize.")
+    (license license:lppl)))
+
+(define-public texlive-pst-dbicons
+  (package
+    (name "texlive-pst-dbicons")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-dbicons/"
+                   "source/generic/pst-dbicons/"
+                   "tex/latex/pst-dbicons/")
+             (base32
+              "0pzfahir5vvxw28095myqppfpyik7agzncm9vm42gvldw45byr4q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-dbicons")
+    (synopsis "Support for drawing ER diagrams")
+    (description
+     "The package provides some useful macros in the database area.  The
+package focusses on typesetting ER-Diagrams in a declarative style, i.e., by
+positioning some nodes and defining the position of all other nodes relative
+to them by using the standard database terminology.")
+    (license license:lppl)))
+
+(define-public texlive-pst-diffraction
+  (package
+    (name "texlive-pst-diffraction")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-diffraction/"
+                   "source/generic/pst-diffraction/"
+                   "tex/generic/pst-diffraction/"
+                   "tex/latex/pst-diffraction/")
+             (base32
+              "1wi67md3046nj0arqi1wmbgdhdrsnfqgmmb0ayk2iswfhvx32myr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-diffraction")
+    (synopsis "Print diffraction patterns from various apertures")
+    (description
+     "The package enables the user to draw (using PSTricks) the diffraction
+patterns for different geometric forms of apertures for monochromatic light.
+The aperture stops can have rectangular, circular or triangular openings.  The
+view of the diffraction may be planar, or three-dimensional.  Options
+available are the dimensions of the aperture under consideration and of the
+particular optical setting, e.g., the radius in case of an circular opening.
+Moreover one can choose the wavelength of the light (the associated color will
+be calculated by the package).")
+    (license license:lppl)))
+
+(define-public texlive-pst-electricfield
+  (package
+    (name "texlive-pst-electricfield")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-electricfield/"
+                   "dvips/pst-electricfield/"
+                   "source/generic/pst-electricfield/"
+                   "tex/generic/pst-electricfield/"
+                   "tex/latex/pst-electricfield/")
+             (base32
+              "1awc5nqp7giqmczx1xd1y78j5vgsw7y8m767mbhgs5j12j3yl4yd")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-electricfield")
+    (synopsis "Draw electric field and equipotential lines with PSTricks")
+    (description
+     "The package provides macros to plot electric field and equipotential
+lines using PStricks.  There may be any number of charges which can be placed
+in a cartesian coordinate system.")
+    (license license:lppl)))
+
+(define-public texlive-pst-eps
+  (package
+    (name "texlive-pst-eps")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-eps/"
+                   "source/generic/pst-eps/"
+                   "tex/generic/pst-eps/" "tex/latex/pst-eps/")
+             (base32
+              "1lf106rw3w6gicn6021jpj4bgbpgjyixp64l9aqqxn6ip6vm4yh3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-eps")
+    (synopsis "Create EPS files from PSTricks figures")
+    (description
+     "Pst-eps is a PSTricks-based package for exporting PSTricks images on the
+fly to encapsulated PostScript (EPS) image files, which can then be read into
+a document in the usual way.")
+    (license license:lppl)))
+
+(define-public texlive-pst-eucl
+  (package
+    (name "texlive-pst-eucl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-eucl/" "dvips/pst-eucl/"
+                   "tex/generic/pst-eucl/"
+                   "tex/latex/pst-eucl/")
+             (base32
+              "070f7chfvj65mhhdnghblhlq0ywvy76bw17dcb8519ixra6p4f4d")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-eucl")
+    (synopsis "Euclidian geometry with PSTricks")
+    (description
+     "The package allows the drawing of Euclidean geometric figures using TeX
+PSTricks macros for specifying mathematical constraints.  It is thus possible
+to build point using common transformations or intersections.  The use of
+coordinates is limited to points which controlled the figure.")
+    (license license:lppl)))
+
+(define-public texlive-pst-eucl-translation-bg
+  (package
+    (name "texlive-pst-eucl-translation-bg")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pst-eucl-translation-bg/")
+             (base32
+              "06c9ajnfl01sl81z5r8a5lzmaygq9rdmgym2v40y7xp7z033gwwv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-eucl-translation-bg")
+    (synopsis "Bulgarian translation of the @code{pst-eucl} documentation")
+    (description
+     "The package provides the @code{pst-eucl} package documentation in
+Bulgarian language.")
+    (license license:lppl)))
+
+(define-public texlive-pst-exa
+  (package
+    (name "texlive-pst-exa")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pst-exa/" "tex/latex/pst-exa/")
+             (base32
+              "1jbkk5nircdv0mas1vbydqhca1r5vcmrxyyi5xwzi1qhfbw3xa8g")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-exa")
+    (synopsis "Typeset PSTricks examples, with code")
+    (description
+     "The (PSTricks-related) package provides an environment @code{PSTexample}
+to put code and output side by side or one above the other.")
+    (license license:lppl)))
+
+(define-public texlive-pst-feyn
+  (package
+    (name "texlive-pst-feyn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-feyn/" "dvips/pst-feyn/"
+                   "tex/generic/pst-feyn/"
+                   "tex/latex/pst-feyn/")
+             (base32
+              "08m8pwl5kk2rs835pnksap8ld6ir0chlbswchgpvks229i6gkrj0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-feyn")
+    (synopsis "Draw graphical elements for Feynman diagrams")
+    (description
+     "@code{pst-feyn} is a set of drawing graphical elements which are used
+for Feynman diagrams.")
+    (license license:lppl)))
+
+(define-public texlive-pst-fill
+  (package
+    (name "texlive-pst-fill")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-fill/"
+                   "tex/generic/pst-fill/"
+                   "tex/latex/pst-fill/")
+             (base32
+              "0anzq671nsprckhy92ybp2y93g5f2z1s0qja9wx2mrjpb4xq8ng0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-fill")
+    (synopsis "Fill or tile areas with PSTricks")
+    (description
+     "Pst-fill is a PSTricks-based package for filling and tiling areas or
+characters.")
+    (license license:lppl)))
+
+(define-public texlive-pst-fit
+  (package
+    (name "texlive-pst-fit")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-fit/"
+                   "tex/generic/pst-fit/" "tex/latex/pst-fit/")
+             (base32
+              "0w2vnd6zb9vdrqbk256ynr7lg7p9ps53rrdq9l999bw8f8vip1as")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-fit")
+    (synopsis "Macros for curve fitting")
+    (description
+     "The package uses PSTricks to fit curves to: linear functions; power
+functions; exp function; logarithm functions; Recip; Kings Law data; Gaussian;
+and fourth order polynomials.")
+    (license license:lppl)))
+
+(define-public texlive-pst-flags
+  (package
+    (name "texlive-pst-flags")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pst-flags/"
+                   "tex/latex/pst-flags/")
+             (base32
+              "13078q4mg1r8hg5zvywfasfz26phcr9dvsw4s05spc116b8fz9gn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-flags")
+    (synopsis "Draw flags of countries using PSTricks")
+    (description
+     "This package provides a number of macros for rendering flags of
+countries and their associated artefacts using PSTricks.  Formatting of the
+resulting drawings is entirely controlled by TeX macros.  A good working
+knowledge of LaTeX should be sufficient to design flags of sovereign countries
+and adapt them to create new designs.  Features such as color or shape
+customisation and dynamic modifications are possible by cleverly adjusting the
+options supplied to the TeX macros.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-pst-fr3d
+  (package
+    (name "texlive-pst-fr3d")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-fr3d/"
+                   "source/generic/pst-fr3d/"
+                   "tex/generic/pst-fr3d/"
+                   "tex/latex/pst-fr3d/")
+             (base32
+              "0y8xsq6wklpygzf0lfdy683vkdrglw5jl00qyfwk6rl08wb4l17y")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-fr3d")
+    (synopsis "Draw 3-dimensional framed boxes using PSTricks")
+    (description
+     "This package provides a package using PSTricks to draw three dimensional
+framed boxes using a macro @code{\\PstFrameBoxThreeD}.  The macro is
+especially useful for drawing 3D-seeming buttons.")
+    (license license:lppl)))
+
+(define-public texlive-pst-fractal
+  (package
+    (name "texlive-pst-fractal")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-fractal/"
+                   "dvips/pst-fractal/"
+                   "tex/generic/pst-fractal/"
+                   "tex/latex/pst-fractal/")
+             (base32
+              "0jc9zwjp23l6njr7y63jh0xv4a6qy2610bb88fdiwdsqnh70gs72")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-fractal")
+    (synopsis "Draw fractal sets using PSTricks")
+    (description
+     "The package uses PSTricks to draw the Julia and Mandelbrot sets, the
+Sierpinski triangle, Koch flake, and Apollonius Circle as well as fractal
+trees (which need not be balanced) with a variety of different
+parameters (including varying numbers of iterations).")
+    (license license:lppl)))
+
+(define-public texlive-pst-fun
+  (package
+    (name "texlive-pst-fun")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-fun/" "dvips/pst-fun/"
+                   "source/generic/pst-fun/"
+                   "tex/generic/pst-fun/" "tex/latex/pst-fun/")
+             (base32
+              "070nv0yv0rcfvx36xmya953pk89whrr26irvy0ccb41k66fvw5j1")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-fun")
+    (synopsis "Draw funny objects with PSTricks")
+    (description
+     "This is a PSTricks related package for drawing funny objects, like ant, bird,
+fish, kangaroo, etc.  Such objects may be useful for testing other PSTricks
+macros and/or packages. (Or they can be used for fun...)")
+    (license license:lppl)))
+
+(define-public texlive-pst-func
+  (package
+    (name "texlive-pst-func")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-func/" "dvips/pst-func/"
+                   "tex/generic/pst-func/"
+                   "tex/latex/pst-func/")
+             (base32
+              "01ibjcyb71l5wqm0x2vq3i4by7q0hp6jmghyw9gkrapmdlwqig5q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-func")
+    (synopsis "PSTricks package for plotting mathematical functions")
+    (description
+     "The package is built for use with PSTricks.  It provides macros for
+plotting and manipulating various mathematical functions:
+
+@itemize
+@item polynomials and their derivatives,
+@item Fourier sums,
+@item the Bessel function defined by its order;
+@item the Gauss function defined by sigma and mu,
+@item Bezier curves from order 1 (two control points) to order 9 (10 control
+points),
+@item the superellipse function (the Lame curve),
+@item Chebyshev polynomials of the first and second kind,
+@item the Thomae (or popcorn) function,
+@item the Weierstrass function,
+@item various integration-derived functions: normal, binomial, poisson, gamma,
+chi-squared, student's t, F, beta, Cauchy and Weibull distribution functions
+and the Lorenz curve,
+@item the zeroes of a function, or the intermediate point of two functions,
+@item the Vasicek function for describing the evolution of interest rates,
+@item implicit functions.
+@end itemize
+
+The plots may be generated as volumes of rotation about the X-axis, as well.")
+    (license license:lppl)))
+
+(define-public texlive-pst-gantt
+  (package
+    (name "texlive-pst-gantt")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-gantt/"
+                   "tex/generic/pst-gantt/"
+                   "tex/latex/pst-gantt/")
+             (base32
+              "1ziahdc0r8pkxxn6p6ijrx1diihkbbrmwbbc1pzi1sddqg05l5sc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-gantt")
+    (synopsis "Draw GANTT charts with PSTricks")
+    (description
+     "The package uses PSTricks to draw GANTT charts, which are a kind of bar
+chart that displays a project schedule.")
+    (license license:lppl)))
+
+(define-public texlive-pst-geo
+  (package
+    (name "texlive-pst-geo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-geo/" "dvips/pst-geo/"
+                   "tex/generic/pst-geo/" "tex/latex/pst-geo/")
+             (base32
+              "1zqmjjg9zmmzjqmhx2jwcc761f1rrxcchsnrd5s686f9p6z4w7c6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-geo")
+    (synopsis "Geographical projections")
+    (description
+     "The package offers a set of PSTricks related packages for various
+cartographic projections of the terrestrial sphere.  The package
+@code{pst-map2d} provides conventional projections such as Mercator, Lambert,
+cylindrical, etc.  The package @code{pst-map3d} treats representation in three
+dimensions of the terrestrial sphere.  Packages @code{pst-map2dII} and
+@code{pst-map3dII} allow use of the CIA World DataBank II. Various parameters
+of the packages allow for choice of the level of the detail and the layouts
+possible (cities, borders, rivers etc).  Substantial data files are provided,
+in an (internally) compressed format.  Decompression happens on-the-fly as
+a document using the data is displayed, printed or converted to PDF format.
+A Perl script is provided for the user to do the decompression, if the need
+should arise.")
+    (license license:lppl)))
+
+(define-public texlive-pst-geometrictools
+  (package
+    (name "texlive-pst-geometrictools")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-geometrictools/"
+                   "tex/generic/pst-geometrictools/"
+                   "tex/latex/pst-geometrictools/")
+             (base32
+              "14mhyjq8w3llkyjij274n5sdwbp3ak2xi6q6ggqdakgn032a7yhn")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-geometrictools")
+    (synopsis "PSTricks package to draw geometric tools")
+    (description
+     "This PSTricks package facilitates the drawing of protractors, rulers,
+compasses and pencils.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-pst-gr3d
+  (package
+    (name "texlive-pst-gr3d")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-gr3d/"
+                   "source/latex/pst-gr3d/"
+                   "tex/generic/pst-gr3d/"
+                   "tex/latex/pst-gr3d/")
+             (base32
+              "0pppd4l4yrdgy0vss8l2kndd0cg9nxip7d7vcyrfr0cz9kw0z45n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-gr3d")
+    (synopsis "Three dimensional grids with PSTricks")
+    (description
+     "This PSTricks package provides a command @code{\\PstGridThreeD} that
+will draw a three dimensional grid, offering a number of options for its
+appearance.")
+    (license license:lppl)))
+
+(define-public texlive-pst-grad
+  (package
+    (name "texlive-pst-grad")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-grad/" "dvips/pst-grad/"
+                   "tex/generic/pst-grad/"
+                   "tex/latex/pst-grad/")
+             (base32
+              "10b8b7mb6c1kkwvwrq31zwmn184qprd69ckypp0gs5s1nz9klc4l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-grad")
+    (synopsis "Filling with colour gradients, using PSTricks")
+    (description
+     "The package fills with colour gradients, using PSTricks.  The RGB, CMYK
+and HSB models are supported.  Other colour gradient mechanisms are to be
+found in package @code{pst-slpe}.")
+    (license license:lppl)))
+
+(define-public texlive-pst-graphicx
+  (package
+    (name "texlive-pst-graphicx")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-graphicx/"
+                   "tex/generic/pst-graphicx/")
+             (base32
+              "0x1053a92hi1msbmw7s0222k0vfg28172qrinz3hdv94igaxi38q")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-graphicx")
+    (synopsis "PSTricks-compatible @code{graphicx} for use with Plain TeX")
+    (description
+     "The package provides a version of @code{graphicx} that avoids loading
+the graphics bundle's (original) @code{keyval} package, which clashes with
+PSTricks use of @code{xkeyval}.")
+    (license license:lppl)))
+
+(define-public texlive-pst-hsb
+  (package
+    (name "texlive-pst-hsb")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-hsb/"
+                   "tex/generic/pst-hsb/" "tex/latex/pst-hsb/")
+             (base32
+              "0cv81bbkg2yhszjs2y7b5vs241y272by5mcb7adg347jzyrs8s74")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-hsb")
+    (synopsis "Curves with continuous colours")
+    (description
+     "This is a PSTricks-related package.  It can plot lines and/or curves
+with continuous colours.  Only colours defined in the HSB model are
+supported.")
+    (license license:lppl)))
+
+(define-public texlive-pst-infixplot
+  (package
+    (name "texlive-pst-infixplot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-infixplot/"
+                   "tex/generic/pst-infixplot/"
+                   "tex/latex/pst-infixplot/")
+             (base32
+              "07yqjzznayk3pjbsaxjz5b63hiabmkdywv2h6kshpjqmh2q1zi6w")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-infixplot")
+    (synopsis "Use PSTricks plotting capacities with infix expressions")
+    (description
+     "Plotting functions with pst-plot is very powerful but sometimes
+difficult to learn since the syntax of @code{\\psplot} and
+@code{\\parametricplot} requires some PostScript knowledge.  The infix-RPN and
+@code{pst-infixplot} styles simplify the usage of @code{pst-plot} for the
+beginner, providing macro commands that convert natural mathematical
+expressions to PostScript syntax.")
+    (license license:lppl)))
+
+(define-public texlive-pst-intersect
+  (package
+    (name "texlive-pst-intersect")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pst-intersect/"
+                   "dvips/pst-intersect/"
+                   "source/latex/pst-intersect/"
+                   "tex/generic/pst-intersect/"
+                   "tex/latex/pst-intersect/")
+             (base32
+              "157yqj923kikm8abiv3giyf9rrr6cw0jwqj37ri5ya5iyxlfvmmv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-intersect")
+    (synopsis "Compute intersections of arbitrary curves")
+    (description
+     "The package computes the intersections between arbitrary PostScript
+paths or Bezier curves, using the Bezier clipping algorithm.")
+    (license license:lppl)))
+
+(define-public texlive-pst-jtree
+  (package
+    (name "texlive-pst-jtree")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-jtree/"
+                   "tex/generic/pst-jtree/"
+                   "tex/latex/pst-jtree/")
+             (base32
+              "07vzx418syv1v04z1552k9iwjz4b4kmw7g2m1i4nqdfg2lvina8s")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-jtree")
+    (synopsis "Typeset complex trees for linguists")
+    (description
+     "jTree uses PSTricks to enable linguists to typeset complex trees.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-pst-knot
+  (package
+    (name "texlive-pst-knot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-knot/" "dvips/pst-knot/"
+                   "tex/generic/pst-knot/"
+                   "tex/latex/pst-knot/")
+             (base32
+              "1b69m4qwd37vd3x734r4hp4wzsirsp6k5m87yqmxlhlkrf0wmrwc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-knot")
+    (synopsis "PSTricks package for displaying knots")
+    (description
+     "The package can produce a fair range of knot shapes, with all the
+standard graphics controls one expects.")
+    (license license:lppl)))
+
+(define-public texlive-pst-labo
+  (package
+    (name "texlive-pst-labo")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-labo/"
+                   "tex/generic/pst-labo/"
+                   "tex/latex/pst-labo/")
+             (base32
+              "10c2qv2fpijb49yn7p00b116icimhiva5kq0bfgj2975y90fncjb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-labo")
+    (synopsis "Draw objects for Chemistry laboratories")
+    (description
+     "Pst-labo is a PSTricks related package for drawing basic and complex
+chemical objects.  The documentation of the package is illuminated with plenty
+of illustrations together with their source code, making it an easy read.")
+    (license license:lppl)))
+
+(define-public texlive-pst-layout
+  (package
+    (name "texlive-pst-layout")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pst-layout/"
+                   "tex/latex/pst-layout/")
+             (base32
+              "1f07j551kiajqyrfjlsj7xk40zv18ik2b3fih5iyzkf4zk4f650r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-layout")
+    (synopsis "Page layout macros based on PSTricks packages")
+    (description
+     "The package provides a means of creating elaborate (``pseudo-tabular'')
+layouts of material, typically to be overlaid on an included graphic.")
+    (license license:lppl)))
+
+(define-public texlive-pst-lens
+  (package
+    (name "texlive-pst-lens")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-lens/"
+                   "source/generic/pst-lens/"
+                   "tex/generic/pst-lens/"
+                   "tex/latex/pst-lens/")
+             (base32
+              "0h2930i4izgfjk96445yiwsk6x8cg5cl4zlqrg5rsv7nr2k8njy3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-lens")
+    (synopsis "Lenses with PSTricks")
+    (description
+     "This PSTricks package provides a really rather simple command
+@code{\\PstLens} that will draw a lens.  Command parameters provide
+a remarkable range of effects.")
+    (license license:lppl)))
+
+(define-public texlive-pst-light3d
+  (package
+    (name "texlive-pst-light3d")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-light3d/"
+                   "dvips/pst-light3d/"
+                   "source/generic/pst-light3d/"
+                   "tex/generic/pst-light3d/"
+                   "tex/latex/pst-light3d/")
+             (base32
+              "0kwdbf64m2kmplk4r7ifxckajh3d5sgjini70fmababnrp1g8nzf")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-light3d")
+    (synopsis "Three dimensional lighting effects (PSTricks)")
+    (description
+     "This package provides a PSTricks package for three dimensional lighting
+effects on characters and PSTricks graphics, like lines, curves, plots, ...")
+    (license license:lppl)))
+
+(define-public texlive-pst-lsystem
+  (package
+    (name "texlive-pst-lsystem")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-lsystem/"
+                   "dvips/pst-lsystem/"
+                   "tex/generic/pst-lsystem/"
+                   "tex/latex/pst-lsystem/")
+             (base32
+              "1k3krdcfqa5cyzaq0jp8dzil6arfvs5ah2mp87460pl2wvfza0lr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-lsystem")
+    (synopsis "Create images based on a L-system")
+    (description
+     "@code{pst-lsystem} is a PSTricks based package for creating images based
+on a L-system.  A L-system (Lindenmayer system) is a set of rules which can be
+used to model the morphology of a variety of organisms or fractals like the
+Kochflake or Hilbert curve.")
+    (license license:lppl)))
+
+(define-public texlive-pst-magneticfield
+  (package
+    (name "texlive-pst-magneticfield")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-magneticfield/"
+                   "dvips/pst-magneticfield/"
+                   "tex/generic/pst-magneticfield/"
+                   "tex/latex/pst-magneticfield/")
+             (base32
+              "0gxz7yfj16b23lwn5pq68r8yb6klm7xhmq5m0addmrq1dvb3id5n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-magneticfield")
+    (synopsis "Plotting a magnetic field with PSTricks")
+    (description
+     "@code{pst-magneticfield} is a PSTricks related package to draw the
+magnetic field lines of Helmholtz coils in a two or three dimensional view.
+There are several parameters to create a different output.")
+    (license license:lppl)))
+
+(define-public texlive-pst-marble
+  (package
+    (name "texlive-pst-marble")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-marble/"
+                   "dvips/pst-marble/"
+                   "tex/generic/pst-marble/"
+                   "tex/latex/pst-marble/")
+             (base32
+              "1j5jags1m4wwwfkd25n57q49ggdwc7b9qjp8da4q255yf0i54w91")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-marble")
+    (synopsis "PSTricks package to draw marble-like patterns")
+    (description "This is a PSTricks package to draw marble-like patterns.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-pst-math
+  (package
+    (name "texlive-pst-math")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-math/" "dvips/pst-math/"
+                   "tex/generic/pst-math/"
+                   "tex/latex/pst-math/")
+             (base32
+              "1h9fg3wz7k28kgmlanli8jzz8kqif11lf0y50w5wxrnaasdmh1ib")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-math")
+    (synopsis "Enhancement of PostScript math operators to use with PSTricks")
+    (description
+     "PostScript lacks a lot of basic operators such as tan, acos, asin, cosh,
+sinh, tanh, acosh, asinh, atanh, exp (with e base).  Also (oddly) cos and sin
+use arguments in degrees.  Pst-math provides all those operators in a header
+file @file{pst-math.pro} with wrappers @file{pst-math.sty} and
+@file{pst-math.tex}.  In addition, sinc, gauss, gammaln and bessel are
+implemented (only partially for the latter).  The package is designed
+essentially to work with @code{pst-plot} but can be used in whatever PS code.
+The package also provides a routine SIMPSON for numerical integration and
+a solver of linear equation systems.")
+    (license license:lppl)))
+
+(define-public texlive-pst-mirror
+  (package
+    (name "texlive-pst-mirror")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-mirror/"
+                   "dvips/pst-mirror/"
+                   "tex/generic/pst-mirror/"
+                   "tex/latex/pst-mirror/")
+             (base32
+              "0b2q1islf9mwphzcs6g04vq69hlmyisx4rb5fb77yiw3na5xlnq0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-mirror")
+    (synopsis "Images on a spherical mirror")
+    (description
+     "The package provides commands and supporting PostScript material for
+drawing images as if reflected by a spherical mirror.")
+    (license license:lppl)))
+
+(define-public texlive-pst-moire
+  (package
+    (name "texlive-pst-moire")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-moire/" "dvips/pst-moire/"
+                   "tex/generic/pst-moire/"
+                   "tex/latex/pst-moire/")
+             (base32
+              "0i2p5b2cfhnbmszcs5ydlk4nfxhwgl84kq148kpg6cx07gg8rr6l")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-moire")
+    (synopsis "PSTricks package to draw moiré patterns")
+    (description "This is a PSTricks package to draw moiré patterns.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-pst-node
+  (package
+    (name "texlive-pst-node")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-node/" "dvips/pst-node/"
+                   "tex/generic/pst-node/"
+                   "tex/latex/pst-node/")
+             (base32
+              "0w9j1l5hlid98sp6hm7ny0z3nh6jcccvxglprq0wr08w89zb7dmz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-node")
+    (synopsis "Nodes and node connections in PSTricks")
+    (description
+     "The package enables the user to connect information, and to place labels,
+without knowing (in advance) the actual positions of the items to be
+connected, or where the connecting line should go.  The macros are useful for
+making graphs and trees, mathematical diagrams, linguistic syntax diagrams,
+and so on.")
+    (license license:lppl)))
+
+(define-public texlive-pst-ob3d
+  (package
+    (name "texlive-pst-ob3d")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-ob3d/"
+                   "source/generic/pst-ob3d/"
+                   "tex/generic/pst-ob3d/"
+                   "tex/latex/pst-ob3d/")
+             (base32
+              "1j6y3v4x5gkshzxnmklwl2hqbz7nr904v1qa1dr9l4m814p2jhcc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-ob3d")
+    (synopsis "Three dimensional objects using PSTricks")
+    (description
+     "The package uses PSTricks to provide basic three-dimensional objects.
+As yet, only cubes (which can be deformed to rectangular parallelipipeds) and
+dies (which are only a special kind of cubes) are defined.")
+    (license license:lppl)))
+
+(define-public texlive-pst-ode
+  (package
+    (name "texlive-pst-ode")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-ode/" "dvips/pst-ode/"
+                   "tex/generic/pst-ode/" "tex/latex/pst-ode/")
+             (base32
+              "0mx6wsdl4m0nr6848qpyfi6rn7x1nsqljnflsp0yk010r0vsmid5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-ode")
+    (synopsis
+     "Solve initial value problems for sets of Ordinary Differential
+Equations")
+    (description
+     "The package defines @code{\\pstODEsolve} for solving initial value
+problems for sets of Ordinary Differential Equations (ODE) using the
+Runge-Kutta-Fehlberg (RKF45) method with automatic step size adjustment.  The
+result is stored as a PostScript object and may be plotted later using macros
+from other PSTricks packages, such as @code{\\listplot} (from @code{pst-plot})
+and @code{\\listplotThreeD} (from @code{pst-3dplot}), or may be further
+processed by user-defined PostScript procedures.  Optionally, the computed
+state vectors can be written as a table to a text file.")
+    (license license:lppl)))
+
+(define-public texlive-pst-optexp
+  (package
+    (name "texlive-pst-optexp")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pst-optexp/" "dvips/pst-optexp/"
+                   "makeindex/pst-optexp/"
+                   "source/latex/pst-optexp/"
+                   "tex/latex/pst-optexp/")
+             (base32
+              "0m835c700a6bxd8r8m84injzz862j1xdxbbh8waxh97yrfwmhp45")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-optexp")
+    (synopsis "Drawing optical experimental setups")
+    (description
+     "The package is a collection of optical components that facilitate easy
+sketching of optical experimental setups.  The package uses PSTricks for its
+output.  A wide range of free-ray and fibre components is provided, the
+alignment, positioning and labelling of which can be achieved in very simple
+and flexible ways.  The components may be connected with fibers or beams, and
+realistic raytraced beam paths are also possible.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-pst-optic
+  (package
+    (name "texlive-pst-optic")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-optic/"
+                   "tex/generic/pst-optic/"
+                   "tex/latex/pst-optic/")
+             (base32
+              "1qgxqygcfv3v6wkf6igkyp5aimp9f9nvfyizcwlxlxr32mjvvbly")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-optic")
+    (synopsis "Drawing optics diagrams")
+    (description
+     "This package provides a package for drawing both reflective and
+refractive optics diagrams.")
+    (license license:lppl)))
+
+(define-public texlive-pst-osci
+  (package
+    (name "texlive-pst-osci")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-osci/"
+                   "tex/generic/pst-osci/"
+                   "tex/latex/pst-osci/")
+             (base32
+              "0h7wnpm26z8v904yj0wvadrjsh3j5fsn73ihilxhb4zd88zqib99")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-osci")
+    (synopsis "Oscgons with PSTricks")
+    (description
+     "This PSTricks package enables you to produce oscilloscope screen shots.
+Three channels can be used to represent the most common signals (damped or
+not): namely sinusoidal, rectangular, triangular, dog's tooth (left and right
+oriented).  The third channel allows you to add, to subtract or to multiply
+the two other signals.  Lissajous diagrams (XY-mode) can also be obtained.")
+    (license license:lppl)))
+
+(define-public texlive-pst-ovl
+  (package
+    (name "texlive-pst-ovl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-ovl/" "dvips/pst-ovl/"
+                   "tex/generic/pst-ovl/" "tex/latex/pst-ovl/")
+             (base32
+              "0v9f4k475cm922y7i2x6w6p1w3nnbaw69rniznwap9bhliv0ynfg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-ovl")
+    (synopsis "Create and manage graphical overlays")
+    (description
+     "The package is useful when building an image from assorted material, as
+in the slides of a projected presentation.")
+    (license license:lppl)))
+
+(define-public texlive-pst-pad
+  (package
+    (name "texlive-pst-pad")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-pad/"
+                   "source/generic/pst-pad/"
+                   "tex/generic/pst-pad/" "tex/latex/pst-pad/")
+             (base32
+              "1vvgjf2g9dynjg1y6dm1d47v40sga4a34ngyy3h5lfmy58860jri")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-pad")
+    (synopsis "Draw simple attachment systems with PSTricks")
+    (description
+     "The package collects a set of graphical elements based on PStricks that
+can be used to facilitate display of attachment systems such as two
+differently shaped surfaces with or without a fluid wedged in between.  These
+macros ease the display of wet adhesion models and common friction systems
+such as boundary lubrication, elastohydrodynamic lubrication and hydrodynamic
+lubrication.")
+    (license license:lppl)))
+
+(define-public texlive-pst-pdf
+  (package
+    (name "texlive-pst-pdf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pst-pdf/" "scripts/pst-pdf/"
+                   "source/latex/pst-pdf/" "tex/latex/pst-pdf/")
+             (base32
+              "1as5q9p6z9y3ps3hm8v8par18xmxmhrcxmknpl6rhjq0wbyjlj26")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "ps4pdf")))
+    (home-page "https://ctan.org/pkg/pst-pdf")
+    (synopsis "Make PDF versions of graphics by processing between runs")
+    (description
+     "The package @code{pst-pdf} simplifies the use of graphics from PSTricks
+and other PostScript code in PDF documents.  As in building a bibliography
+with BibTeX, additional external programmes are invoked.  In this case they
+are used to create a PDF file that will contain all the graphics material.  In
+the final document these contents will be inserted instead of the original
+PostScript code.")
+    (license license:lppl1.2+)))
+
+(define-public texlive-pst-pdgr
+  (package
+    (name "texlive-pst-pdgr")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-pdgr/"
+                   "source/generic/pst-pdgr/"
+                   "tex/generic/pst-pdgr/"
+                   "tex/latex/pst-pdgr/")
+             (base32
+              "08v28601j7ygp7d8xliwhfbrl2gh93ikf6kbl4p86wfxsbxlhg0c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-pdgr")
+    (synopsis "Draw medical pedigrees using PSTricks")
+    (description
+     "The package provides a set of macros based on PSTricks to draw medical
+pedigrees according to the recommendations for standardized human pedigree
+nomenclature.  The drawing commands place the symbols on a @code{pspicture}
+canvas.  An interface for making trees is also provided.  The package may be
+used both with LaTeX and PlainTeX.  A separate Perl program for generating TeX
+files from spreadsheets is available.")
+    (license license:lppl)))
+
+(define-public texlive-pst-perspective
+  (package
+    (name "texlive-pst-perspective")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-perspective/"
+                   "tex/generic/pst-perspective/"
+                   "tex/latex/pst-perspective/")
+             (base32
+              "0dm7qqar0kjnc68xwhp7vn4m8bcsmzcs6qzh61ainbls7gni5aq8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-perspective")
+    (synopsis "Draw perspective views using PSTricks")
+    (description
+     "The package provides the means to draw an orthogonal parallel projection
+with an arbitrarily chosen angle and a variable shortening factor.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-pst-platon
+  (package
+    (name "texlive-pst-platon")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-platon/"
+                   "source/generic/pst-platon/"
+                   "tex/latex/pst-platon/")
+             (base32
+              "0a4w47varc1i22h5iwd49c0clwb2k8hdlva5l6nfmc889wgwp0d7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-platon")
+    (synopsis "Platonic solids in PSTricks")
+    (description
+     "The package adds to PSTricks the ability to draw 3-dimensional views of
+the five Platonic solids.")
+    (license license:lppl)))
+
+(define-public texlive-pst-plot
+  (package
+    (name "texlive-pst-plot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-plot/"
+                   "tex/generic/pst-plot/"
+                   "tex/latex/pst-plot/")
+             (base32
+              "12jrn04nxfhw07y86pjkr6bbvdvwcnhfxr6aj9ni13383dxcwl7j")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-plot")
+    (synopsis "Plot data using PSTricks")
+    (description
+     "The package provides plotting of data (typically from external files),
+using PSTricks.  Plots may be configured using a wide variety of parameters.")
+    (license license:lppl)))
+
+(define-public texlive-pst-poker
+  (package
+    (name "texlive-pst-poker")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pst-poker/"
+                   "tex/latex/pst-poker/")
+             (base32
+              "0c1v75rxw717hvjgzb4i0ahk7acmqpgl9czaihvw36r9yaicsm5n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-poker")
+    (synopsis "Drawing poker cards")
+    (description
+     "This PSTricks related package can create poker cards in various
+manners.")
+    (license license:lgpl3)))
+
+(define-public texlive-pst-poly
+  (package
+    (name "texlive-pst-poly")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-poly/"
+                   "tex/generic/pst-poly/"
+                   "tex/latex/pst-poly/")
+             (base32
+              "1fasd2y6vv28id1w858kq4rc3qd46rkds9z7vi8k102aqvv9as8n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-poly")
+    (synopsis "Polygons with PSTricks")
+    (description
+     "This PSTricks package provides a really rather simple command
+@code{\\PstPolygon} that will draw various regular and non-regular
+polygons (according to command parameters); various shortcuts to commonly-used
+polygons are provided, as well as a command @code{\\pspolygonbox} that frames
+text with a polygon.")
+    (license license:lppl)))
+
+(define-public texlive-pst-pulley
+  (package
+    (name "texlive-pst-pulley")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-pulley/"
+                   "tex/generic/pst-pulley/"
+                   "tex/latex/pst-pulley/")
+             (base32
+              "1n1kv743vxjw8b6nqrlivb3m3pg3z9kw56bzxij438p5him3sdaa")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-pulley")
+    (synopsis "Plot pulleys, using PSTricks")
+    (description
+     "The package enables the user to draw pulley systems with up to 6 pulleys.
+The pulley diagrams are labelled with the physical properties of the system.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-pst-qtree
+  (package
+    (name "texlive-pst-qtree")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-qtree/"
+                   "tex/generic/pst-qtree/"
+                   "tex/latex/pst-qtree/")
+             (base32
+              "1hdmv4lar1hdg9bh049kmsjqd14rdv2066qrcaacwmd39nh816z5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-qtree")
+    (synopsis "Simple syntax for trees")
+    (description "The package provides a Qtree-like front end for PSTricks.")
+    (license license:gpl3+)))
+
+(define-public texlive-pst-rputover
+  (package
+    (name "texlive-pst-rputover")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-rputover/"
+                   "tex/generic/pst-rputover/"
+                   "tex/latex/pst-rputover/")
+             (base32
+              "1d25sdhvira5vlibgv3r51dk64jplqbpf4fdimh2l1flq5h0d9dw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-rputover")
+    (synopsis "Place text over objects without obscuring background colors")
+    (description
+     "This is a PSTricks package which allows to place text over objects
+without obscuring background colors.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-pst-rubans
+  (package
+    (name "texlive-pst-rubans")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-rubans/"
+                   "source/generic/pst-rubans/"
+                   "tex/generic/pst-rubans/"
+                   "tex/latex/pst-rubans/")
+             (base32
+              "1izpw60jm4w8xgd5aiqc7qxhjd0js1g9k9anwbpni9sn1qma66zs")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-rubans")
+    (synopsis "Draw three-dimensional ribbons")
+    (description
+     "The package uses PStricks and @code{pst-solides3d} to draw three
+dimensional ribbons on a cylinder, torus, sphere, cone or paraboloid.  The
+width of the ribbon, the number of turns, the colour of the outer and the
+inner surface of the ribbon may be set.  In the case of circular and conical
+helices, one may also choose the number of ribbons.")
+    (license license:lppl)))
+
+(define-public texlive-pst-shell
+  (package
+    (name "texlive-pst-shell")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-shell/" "dvips/pst-shell/"
+                   "source/generic/pst-shell/"
+                   "tex/generic/pst-shell/"
+                   "tex/latex/pst-shell/")
+             (base32
+              "18w5csarnjv3ws554vjw2zlmpc5mcd03fc8fircv0pbxxl53l11r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-shell")
+    (synopsis "Plotting sea shells")
+    (description
+     "@code{pst-shell} is a PSTricks related package to draw seashells in 3D
+view: Argonauta, Epiteonium, Lyria, Turritella, Tonna, Achatina, Oxystele,
+Conus, Ammonite, Codakia, Escalaria, Helcion, Natalina, Planorbis, and
+Nautilus, all with different parameters.")
+    (license license:lppl)))
+
+(define-public texlive-pst-sigsys
+  (package
+    (name "texlive-pst-sigsys")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-sigsys/"
+                   "tex/generic/pst-sigsys/"
+                   "tex/latex/pst-sigsys/")
+             (base32
+              "18g1s1afh3lnkb3993k1ypkzbb4a88jw5paclwgyn59yqjq8x737")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-sigsys")
+    (synopsis "Support of signal processing-related disciplines")
+    (description
+     "The package offers a collection of useful macros for disciplines related
+to signal processing.  It defines macros for plotting a sequence of numbers,
+drawing the pole-zero diagram of a system, shading the region of convergence,
+creating an adder or a multiplier node, placing a framed node at a given
+coordinate, creating an up-sampler or a down-sampler node, drawing the block
+diagram of a system, drawing adaptive systems, sequentially connecting a list
+of nodes, and connecting a list of nodes using any node-connecting macro.")
+    (license license:lppl)))
+
+(define-public texlive-pst-slpe
+  (package
+    (name "texlive-pst-slpe")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-slpe/" "dvips/pst-slpe/"
+                   "source/generic/pst-slpe/"
+                   "tex/generic/pst-slpe/"
+                   "tex/latex/pst-slpe/")
+             (base32
+              "12m6iss3hqsngq2dk7n3d1zz6z2rq4j2w1di9l26hpzly2mdp26n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-slpe")
+    (synopsis "Sophisticated colour gradients")
+    (description
+     "This PStricks package covers all the colour gradient functionality of
+@code{pst-grad} (part of the base PSTricks distribution), and provides the
+following facilities:
+
+@itemize
+@item it permits the user to specify an arbitrary number of colours, along
+with the points at which they are to be reached;
+@item it converts between RGB and HSV behind the scenes;
+@item it provides concentric and radial gradients;
+@item it provides a command @code{\\psBall} that generates bullets with
+a three-dimensional appearance.
+@end itemize")
+    (license license:lppl)))
+
+(define-public texlive-pst-solarsystem
+  (package
+    (name "texlive-pst-solarsystem")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-solarsystem/"
+                   "dvips/pst-solarsystem/"
+                   "tex/generic/pst-solarsystem/"
+                   "tex/latex/pst-solarsystem/")
+             (base32
+              "147mbrir52fl1ra3qqwlmmgk7789nrpr9hh015kc07mx10zfmc5x")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-solarsystem")
+    (synopsis "Plot the solar system for a specific date")
+    (description
+     "The package uses PSTricks to produce diagrams of the visible planets,
+projected on the plane of the ecliptic.  It is not possible to represent all
+the planets in their real proportions, so only Mercury, Venus, Earth and Mars
+have their orbits in correct proportions and their relative sizes are
+observed.  Saturn and Jupiter are in the right direction, but not in the
+correct size.")
+    (license license:lppl)))
+
+(define-public texlive-pst-solides3d
+  (package
+    (name "texlive-pst-solides3d")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-solides3d/"
+                   "dvips/pst-solides3d/"
+                   "tex/generic/pst-solides3d/"
+                   "tex/latex/pst-solides3d/")
+             (base32
+              "1w6qpaw5k6x5c90k15q3r397f3ai7fd443yzwif2fhkqb2wjv3k8")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-solides3d")
+    (synopsis "Draw perspective views of 3D solids")
+    (description
+     "The package is designed to draw solids in 3d perspective.  Its features
+include:
+@itemize
+@item create primitive solids;
+@item create solids by including a list of its vertices and faces;
+@item faces of solids and surfaces can be colored by choosing from a very
+large palette of colors;
+@item draw parametric surfaces in algebraic and reverse polish notation;
+@item create explicit and parameterized algebraic functions drawn in 2 or
+3 dimensions;
+@item project text onto a plane or onto the faces of a solid;
+@item support for including external database files.
+@end itemize")
+    (license license:lppl1.3+)))
+
+(define-public texlive-pst-soroban
+  (package
+    (name "texlive-pst-soroban")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-soroban/"
+                   "source/generic/pst-soroban/"
+                   "tex/latex/pst-soroban/")
+             (base32
+              "1cpmqgaj1h2dh3acypm9xkjinmlw9wd40n1s2vdab5ascvprbr6n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-soroban")
+    (synopsis "Draw a soroban using PSTricks")
+    (description
+     "The package uses PSTricks to draw a Japanese abacus, or soroban.  The
+soroban is still used in Japan today.")
+    (license license:lppl)))
+
+(define-public texlive-pst-spectra
+  (package
+    (name "texlive-pst-spectra")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-spectra/"
+                   "dvips/pst-spectra/"
+                   "tex/generic/pst-spectra/"
+                   "tex/latex/pst-spectra/")
+             (base32
+              "0l88wag5i1jy6pd1lx3s9cijiymzdgwvl52hkarc84d8qpn53wcw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-spectra")
+    (synopsis "Draw continuum, emission and absorption spectra with PSTricks")
+    (description
+     "The package is a PSTricks extension, based on a NASA lines database.  It
+allows you to draw continuum, emission and absorption spectra.  A Total of 16
+880 visible lines from 99 elements can be displayed.")
+    (license license:lppl)))
+
+(define-public texlive-pst-spinner
+  (package
+    (name "texlive-pst-spinner")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-spinner/"
+                   "dvips/pst-spinner/"
+                   "tex/generic/pst-spinner/"
+                   "tex/latex/pst-spinner/")
+             (base32
+              "0fm70v1kgjs32pvyvcnh2j47clqgdr4hll4j7fr935584d604g49")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-spinner")
+    (synopsis "Drawing a fidget spinner")
+    (description
+     "This package aims to propose a model of the fidget spinner gadget.  It
+exists under different forms with 2, 3 poles and even more.  We chose the most
+popular model: the triple fidget spinner.")
+    (license license:lppl)))
+
+(define-public texlive-pst-stru
+  (package
+    (name "texlive-pst-stru")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-stru/"
+                   "tex/generic/pst-stru/"
+                   "tex/latex/pst-stru/")
+             (base32
+              "1zxf0bj43picgd86bwgc38d8valpx0fn0pr3pgfv2kn42r2pampj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-stru")
+    (synopsis "Civil engineering diagrams, using PSTricks")
+    (description
+     "This PSTricks-based package provides facilities to draw structural
+schemes in civil engineering analysis, for beams, portals, arches and piles.")
+    (license license:lppl)))
+
+(define-public texlive-pst-support
+  (package
+    (name "texlive-pst-support")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-support/")
+             (base32
+              "1470n03zanpw35dnfzyjqm7d5lgddrimypz28x0zsk9nqpamnqnv")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-support")
+    (synopsis "Assorted support files for use with PSTricks")
+    (description
+     "This package provides an appropriate set of job options, together with
+process scripts for use with TeXnicCenter.")
+    (license license:lppl)))
+
 (define-public texlive-pst-text
   (package
     (name "texlive-pst-text")
@@ -32260,6 +61415,280 @@ a different path and manipulating characters.  It includes the functionality
 of the old package @code{pst-char}.")
     (license license:lppl)))
 
+(define-public texlive-pst-thick
+  (package
+    (name "texlive-pst-thick")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-thick/"
+                   "source/generic/pst-thick/"
+                   "tex/generic/pst-thick/"
+                   "tex/latex/pst-thick/")
+             (base32
+              "1clg9ahhg3zg91phlp2ni1j5m6pb68bdk74glh398r8y2gj2b5fb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-thick")
+    (synopsis "Drawing very thick lines and curves")
+    (description
+     "The package supports drawing of very thick lines and curves in PSTricks,
+with various fillings for the body of the lines.")
+    (license license:lppl)))
+
+(define-public texlive-pst-tools
+  (package
+    (name "texlive-pst-tools")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-tools/" "dvips/pst-tools/"
+                   "tex/generic/pst-tools/"
+                   "tex/latex/pst-tools/")
+             (base32
+              "1ws149np6121mc7msw32wkc6pn528ldsd5g95w4n4vcm6r54pmgq")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-tools")
+    (synopsis "PSTricks support functions")
+    (description
+     "The package provides helper functions for other PSTricks related
+packages.")
+    (license license:lppl)))
+
+(define-public texlive-pst-tree
+  (package
+    (name "texlive-pst-tree")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-tree/"
+                   "tex/generic/pst-tree/"
+                   "tex/latex/pst-tree/")
+             (base32
+              "1vznc4qyjpnni3smdxlpqi7h3qxd13kv5pigvlly0zq676n6gw8n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-tree")
+    (synopsis "Trees, using PSTricks")
+    (description
+     "@code{pst-tree} defines a macro \\pstree that offers a structured way of
+joining nodes created using @code{pst-node} in order to draw trees.")
+    (license license:lppl)))
+
+(define-public texlive-pst-turtle
+  (package
+    (name "texlive-pst-turtle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-turtle/"
+                   "dvips/pst-turtle/"
+                   "tex/generic/pst-turtle/"
+                   "tex/latex/pst-turtle/")
+             (base32
+              "0mgpjs9jkgfx0hbd9l5jw60rf0vpdkv933ksjlwcjlh98y9gay4c")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-turtle")
+    (synopsis "Commands for Turtle operations")
+    (description
+     "This is a PSTricks related package for creating Turtle graphics.")
+    (license license:lppl)))
+
+(define-public texlive-pst-tvz
+  (package
+    (name "texlive-pst-tvz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-tvz/"
+                   "source/generic/pst-tvz/"
+                   "tex/generic/pst-tvz/" "tex/latex/pst-tvz/")
+             (base32
+              "1xpzvfgngv5r5cdnvip87wr1i0pmrc6ibwi5gzmibfzl64w7vkqr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-tvz")
+    (synopsis "Draw trees with more than one root node, using PSTricks")
+    (description
+     "The package uses PSTricks to draw trees with more than one root node.
+It is similar to @code{pst-tree}, though it uses a different placement
+algorithm.")
+    (license license:lppl1.3+)))
+
+(define-public texlive-pst-uml
+  (package
+    (name "texlive-pst-uml")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-uml/"
+                   "source/generic/pst-uml/"
+                   "tex/latex/pst-uml/")
+             (base32
+              "0sgsyg9gk4wxgz7r44h6a7f5f7gl5b522f864n0kv35cgmwnzyr7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs (list texlive-multido))
+    (home-page "https://ctan.org/pkg/pst-uml")
+    (synopsis "UML diagrams with PSTricks")
+    (description
+     "This a PSTricks package that provides support for drawing moderately
+complex UML (Universal Modelling Language) diagrams.  (The PDF documentation
+is written in French.)")
+    (license license:lppl)))
+
+(define-public texlive-pst-vectorian
+  (package
+    (name "texlive-pst-vectorian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pst-vectorian/"
+                   "dvips/pst-vectorian/"
+                   "tex/latex/pst-vectorian/")
+             (base32
+              "0knvzl4gqz79jzvb4w7a9ka1iiz5f3pjivnwvwmd1kmibykqwb67")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-vectorian")
+    (synopsis "Printing ornaments")
+    (description
+     "The package uses PSTricks to draw ornaments (a substantial repertoire of
+ornaments is provided).")
+    (license license:lppl)))
+
+(define-public texlive-pst-vehicle
+  (package
+    (name "texlive-pst-vehicle")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-vehicle/"
+                   "tex/generic/pst-vehicle/"
+                   "tex/latex/pst-vehicle/")
+             (base32
+              "1b0s5fy4w4k2q486sdwlrh649n99k9s5hy5m2v01lh7qnjl1z4c3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-vehicle")
+    (synopsis "Rolling vehicles on graphs of mathematical functions")
+    (description
+     "This package permits to represent vehicles rolling without slipping on
+mathematical curves.  Different types of vehicles are proposed, the shape of
+the curve is to be defined by its equation in algebraic notation.")
+    (license license:lppl1.3c)))
+
+(define-public texlive-pst-venn
+  (package
+    (name "texlive-pst-venn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pst-venn/"
+                   "tex/latex/pst-venn/")
+             (base32
+              "0gz7sxwycqd71yy8jln7h3v064mrzhh1852fc7b785v55x8kna2n")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-venn")
+    (synopsis "PSTricks package for drawing Venn sets")
+    (description
+     "This is a PSTricks related package for drawing Venn diagrams with three
+circles.")
+    (license license:lppl)))
+
+(define-public texlive-pst-vowel
+  (package
+    (name "texlive-pst-vowel")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pst-vowel/"
+                   "tex/latex/pst-vowel/")
+             (base32
+              "0p0qnfbmd1lh21nk6xq246xr6y50q0y55rdcq3i9vkg4j7kkkfy6")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pst-vowel")
+    (synopsis "Enable arrows showing diphthongs on vowel charts")
+    (description
+     "The package extends the @code{vowel} package (distributed as part of the
+@code{tipa} bundle) by allowing the user to draw arrows between vowels to show
+relationships such as diphthong membership.")
+    (license license:lppl)))
+
+(define-public texlive-pst2pdf
+  (package
+    (name "texlive-pst2pdf")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/pst2pdf/" "scripts/pst2pdf/")
+             (base32
+              "0yihyrnwwpad5hf8yrjqljpwsnj6kcbb6y6cfnxwxbi1c5pf1jk9")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pst2pdf.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/pst2pdf")
+    (synopsis "Script to compile PSTricks documents via pdfTeX")
+    (description
+     "The script extracts the preamble of the document and runs all
+@code{\\begin@{postscript@}...\\end@{postscript@}},
+@code{\\begin@{pspicture@}...\\end@{pspicture@}} and
+@code{\\pspicture...\\endpspicture} separately through LaTeX with the same
+preamble as the original document; thus it creates EPS, PNG and PDF files of
+these snippets.  In a final pdfLaTeX run the script replaces the environments
+with @code{\\includegraphics} to include the processed snippets.")
+    (license license:gpl2)))
+
+(define-public texlive-pstricks-add
+  (package
+    (name "texlive-pstricks-add")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/pstricks-add/"
+                   "dvips/pstricks-add/"
+                   "tex/generic/pstricks-add/"
+                   "tex/latex/pstricks-add/")
+             (base32
+              "18khs28v3dg5z7215k0yv7hxna9x5nh09hlrw2fc4nhmzymy2kjg")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pstricks-add")
+    (synopsis "Collection of add-ons and bugfixes for PSTricks")
+    (description
+     "This package collects together examples that have been posted to the
+PSTricks mailing list, together with many additional features for the basic
+@code{pstricks}, @code{pst-plot} and @code{pst-node}, including: bugfixes; new
+options for the pspicture environment; arrows; braces as node
+connection/linestyle; extended axes for plots (e.g., logarithm axes); polar
+plots; plotting tangent lines of curves or functions; solving and printing
+differential equations; box plots; matrix plots; and pie charts.")
+    (license license:lppl)))
+
+(define-public texlive-pstricks-calcnotes
+  (package
+    (name "texlive-pstricks-calcnotes")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pstricks_calcnotes/")
+             (base32
+              "00vgcdf73p4143dfjcvs4b5v4phvisv76ink3iiijl6s6f9zbmy3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pstricks-calcnotes")
+    (synopsis "Use of PSTricks in calculus lecture notes")
+    (description
+     "The bundle shows the construction of PSTricks macros to draw Riemann
+sums of an integral and to draw the vector field of an ordinary differential
+equation.  The results are illustrated in a fragment of lecture notes.")
+    (license license:lppl)))
+
 (define-public texlive-marginnote
   (package
     (name "texlive-marginnote")
@@ -32302,6 +61731,71 @@ sort of tabular, and an environment @code{longtabu} which provides the
 facilities of @code{tabu} in a modified @code{longtable} environment.")
     (license license:lppl1.3+)))
 
+(define-public texlive-uml
+  (package
+    (name "texlive-uml")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/uml/" "source/latex/uml/"
+                   "tex/latex/uml/")
+             (base32
+              "039kg3xk03cm4xfsaj33kx1j5hjqy9330zxamqyzs1jnp8xgcfdz")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uml")
+    (synopsis "UML diagrams in LaTeX")
+    (description
+     "This package provides a PSTricks related package for writing
+UML (Unified Modelling Language) diagrams in LaTeX.  Currently, it implements
+a subset of class diagrams, and some extra constructs as well.  The package
+cannot be used together with @code{pst-uml}.")
+    (license license:lppl)))
+
+(define-public texlive-vaucanson-g
+  (package
+    (name "texlive-vaucanson-g")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/generic/vaucanson-g/"
+                   "tex/generic/vaucanson-g/")
+             (base32
+              "18ig6kszjr2jfr3hvq18clq8ccxbv2zw280pw20mphfjh6rjwbrj")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/vaucanson-g")
+    (synopsis "PSTricks macros for drawing automata")
+    (description
+     "VauCanSon-G is a package that enables the user to draw automata within
+texts written using LaTeX.  The package macros make use of commands of
+PSTricks.")
+    (license license:lppl)))
+
+(define-public texlive-vocaltract
+  (package
+    (name "texlive-vocaltract")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/vocaltract/"
+                   "tex/latex/vocaltract/")
+             (base32
+              "072b712bhfxq429jh4r9d786nwpdyl8rlbm6ds4nf9asxg2lg9wr")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/vocaltract")
+    (synopsis "Visualise the vocal tract using LaTeX and PSTricks")
+    (description
+     "The package enables the user to visualise the vocal tract.  The vocal
+tract (in the package) is manipulated by a vector of articulation parameters
+according to the S. Maeda model.  Animation may be achieved by providing
+a sequence of vectors over time (e.g., from Matlab).  A sequence of vectors
+for certain German phonemes is embedded in the package, which allows for
+animation when no other vector is available.  The package's graphics are
+produced using PSTricks.")
+    (license license:lppl)))
+
 (define-public texlive-xkeyval
   (package
     (name "texlive-xkeyval")
@@ -34039,6 +63533,185 @@ macros, Computer Modern fonts, and configuration for common drivers; no
 LaTeX.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-bibtexextra
+  (package
+    (name "texlive-collection-bibtexextra")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-aaai-named
+           texlive-aichej
+           texlive-ajl
+           texlive-amsrefs
+           texlive-annotate
+           texlive-apacite
+           texlive-apalike-ejor
+           texlive-apalike2
+           texlive-archaeologie
+           texlive-authordate
+           texlive-beebe
+           texlive-besjournals
+           texlive-bestpapers
+           texlive-bib2gls
+           texlive-bibarts
+           texlive-bibcop
+           texlive-biber
+           texlive-biber-ms
+           texlive-bibexport
+           texlive-bibhtml
+           texlive-biblatex
+           texlive-biblatex-abnt
+           texlive-biblatex-ajc2020unofficial
+           texlive-biblatex-anonymous
+           texlive-biblatex-apa
+           texlive-biblatex-apa6
+           texlive-biblatex-archaeology
+           texlive-biblatex-arthistory-bonn
+           texlive-biblatex-bath
+           texlive-biblatex-bookinarticle
+           texlive-biblatex-bookinother
+           texlive-biblatex-bwl
+           texlive-biblatex-caspervector
+           texlive-biblatex-chem
+           texlive-biblatex-chicago
+           texlive-biblatex-claves
+           texlive-biblatex-cv
+           texlive-biblatex-dw
+           texlive-biblatex-enc
+           texlive-biblatex-ext
+           texlive-biblatex-fiwi
+           texlive-biblatex-gb7714-2015
+           texlive-biblatex-german-legal
+           texlive-biblatex-gost
+           texlive-biblatex-historian
+           texlive-biblatex-ieee
+           texlive-biblatex-ijsra
+           texlive-biblatex-iso690
+           texlive-biblatex-jura2
+           texlive-biblatex-juradiss
+           texlive-biblatex-license
+           texlive-biblatex-lncs
+           texlive-biblatex-lni
+           texlive-biblatex-luh-ipw
+           texlive-biblatex-manuscripts-philology
+           texlive-biblatex-mla
+           texlive-biblatex-morenames
+           texlive-biblatex-ms
+           texlive-biblatex-multiple-dm
+           texlive-biblatex-musuos
+           texlive-biblatex-nature
+           texlive-biblatex-nejm
+           texlive-biblatex-nottsclassic
+           texlive-biblatex-opcit-booktitle
+           texlive-biblatex-oxref
+           texlive-biblatex-philosophy
+           texlive-biblatex-phys
+           texlive-biblatex-publist
+           texlive-biblatex-readbbl
+           texlive-biblatex-realauthor
+           texlive-biblatex-sbl
+           texlive-biblatex-science
+           texlive-biblatex-shortfields
+           texlive-biblatex-socialscienceshuberlin
+           texlive-biblatex-software
+           texlive-biblatex-source-division
+           texlive-biblatex-spbasic
+           texlive-biblatex-subseries
+           texlive-biblatex-swiss-legal
+           texlive-biblatex-trad
+           texlive-biblatex-true-citepages-omit
+           texlive-biblatex-unified
+           texlive-biblatex-vancouver
+           texlive-biblatex2bibitem
+           texlive-biblist
+           texlive-bibtexperllibs
+           texlive-bibtopic
+           texlive-bibtopicprefix
+           texlive-bibunits
+           texlive-biolett-bst
+           texlive-bookdb
+           texlive-breakcites
+           texlive-cell
+           texlive-chbibref
+           texlive-chembst
+           texlive-chicago
+           texlive-chicago-annote
+           texlive-chicagoa
+           texlive-chscite
+           texlive-citation-style-language
+           texlive-citeall
+           texlive-citeref
+           texlive-collection-latex
+           texlive-collref
+           texlive-compactbib
+           texlive-crossrefware
+           texlive-custom-bib
+           texlive-din1505
+           texlive-dk-bib
+           texlive-doipubmed
+           texlive-ecobiblatex
+           texlive-econ-bst
+           texlive-economic
+           texlive-fbs
+           texlive-figbib
+           texlive-footbib
+           texlive-francais-bst
+           texlive-gbt7714
+           texlive-geschichtsfrkl
+           texlive-harvard
+           texlive-harvmac
+           texlive-hep-bibliography
+           texlive-historische-zeitschrift
+           texlive-icite
+           texlive-ietfbibs
+           texlive-ijqc
+           texlive-inlinebib
+           texlive-iopart-num
+           texlive-is-bst
+           texlive-jbact
+           texlive-jmb
+           texlive-jneurosci
+           texlive-jurabib
+           texlive-ksfh-nat
+           texlive-listbib
+           texlive-logreq
+           texlive-ltb2bib
+           texlive-luabibentry
+           texlive-margbib
+           texlive-multibib
+           texlive-multibibliography
+           texlive-munich
+           texlive-nar
+           texlive-newcastle-bst
+           texlive-nmbib
+           texlive-notes2bib
+           texlive-notex-bst
+           texlive-oscola
+           texlive-perception
+           texlive-plainyr
+           texlive-pnas2009
+           texlive-rsc
+           texlive-showtags
+           texlive-sort-by-letters
+           texlive-splitbib
+           texlive-turabian-formatting
+           texlive-uni-wtal-ger
+           texlive-uni-wtal-lin
+           texlive-urlbst
+           texlive-usebib
+           texlive-vak
+           texlive-windycity
+           texlive-xcite
+           texlive-zootaxa-bst))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "BibTeX additional styles")
+    (description
+     "This collection provides additional BibTeX styles and bibliography
+data(bases), notably including BibLaTeX.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-collection-binextra
   (package
     (name "texlive-collection-binextra")
@@ -34210,6 +63883,368 @@ programming, patgen, and plenty more.")
 third-party ConTeXt packages.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-fontsextra
+  (package
+    (name "texlive-collection-fontsextra")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-aboensis
+           texlive-academicons
+           texlive-accanthis
+           texlive-adforn
+           texlive-adfsymbols
+           texlive-aesupp
+           texlive-alegreya
+           texlive-alfaslabone
+           texlive-algolrevived
+           texlive-allrunes
+           texlive-almendra
+           texlive-almfixed
+           texlive-andika
+           texlive-anonymouspro
+           texlive-antiqua
+           texlive-antt
+           texlive-archaic
+           texlive-archivo
+           texlive-arev
+           texlive-arimo
+           texlive-arvo
+           texlive-asana-math
+           texlive-asapsym
+           texlive-ascii-font
+           texlive-aspectratio
+           texlive-astro
+           texlive-atkinson
+           texlive-augie
+           texlive-auncial-new
+           texlive-aurical
+           texlive-b1encoding
+           texlive-barcodes
+           texlive-baskervald
+           texlive-baskervaldx
+           texlive-baskervillef
+           texlive-bbding
+           texlive-bbm
+           texlive-bbm-macros
+           texlive-bbold
+           texlive-bbold-type1
+           texlive-bboldx
+           texlive-belleek
+           texlive-bera
+           texlive-berenisadf
+           texlive-beuron
+           texlive-bguq
+           texlive-bitter
+           texlive-blacklettert1
+           texlive-boisik
+           texlive-bookhands
+           texlive-boondox
+           texlive-braille
+           texlive-brushscr
+           texlive-cabin
+           texlive-caladea
+           texlive-calligra
+           texlive-calligra-type1
+           texlive-cantarell
+           texlive-carlito
+           texlive-carolmin-ps
+           texlive-cascadia-code
+           texlive-ccicons
+           texlive-cfr-initials
+           texlive-cfr-lm
+           texlive-charissil
+           texlive-cherokee
+           texlive-chivo
+           texlive-cinzel
+           texlive-clara
+           texlive-clearsans
+           texlive-cm-lgc
+           texlive-cm-mf-extra-bold
+           texlive-cm-unicode
+           texlive-cmathbb
+           texlive-cmbright
+           texlive-cmexb
+           texlive-cmll
+           texlive-cmpica
+           texlive-cmsrb
+           texlive-cmtiup
+           texlive-cmupint
+           texlive-cochineal
+           texlive-coelacanth
+           texlive-collection-basic
+           texlive-comfortaa
+           texlive-comicneue
+           texlive-concmath-fonts
+           texlive-concmath-otf
+           texlive-cookingsymbols
+           texlive-cooperhewitt
+           texlive-cormorantgaramond
+           texlive-countriesofeurope
+           texlive-courier-scaled
+           texlive-courierten
+           texlive-crimson
+           texlive-crimsonpro
+           texlive-cryst
+           texlive-cuprum
+           texlive-cyklop
+           texlive-dancers
+           texlive-dantelogo
+           texlive-dejavu
+           texlive-dejavu-otf
+           texlive-dice
+           texlive-dictsym
+           texlive-dingbat
+           texlive-domitian
+           texlive-doublestroke
+           texlive-doulossil
+           texlive-dozenal
+           texlive-drm
+           texlive-droid
+           texlive-dsserif
+           texlive-duerer
+           texlive-duerer-latex
+           texlive-dutchcal
+           texlive-ean
+           texlive-ebgaramond
+           texlive-ebgaramond-maths
+           texlive-ecc
+           texlive-eco
+           texlive-eczar
+           texlive-eiad
+           texlive-eiad-ltx
+           texlive-ektype-tanka
+           texlive-electrum
+           texlive-elvish
+           texlive-epigrafica
+           texlive-epsdice
+           texlive-erewhon
+           texlive-erewhon-math
+           texlive-esrelation
+           texlive-esstix
+           texlive-esvect
+           texlive-etbb
+           texlive-euler-math
+           texlive-eulervm
+           texlive-euxm
+           texlive-fbb
+           texlive-fdsymbol
+           texlive-fetamont
+           texlive-feyn
+           texlive-fge
+           texlive-fira
+           texlive-firamath
+           texlive-firamath-otf
+           texlive-foekfont
+           texlive-fonetika
+           texlive-fontawesome
+           texlive-fontawesome5
+           texlive-fontmfizz
+           texlive-fonts-churchslavonic
+           texlive-forum
+           texlive-fourier
+           texlive-fouriernc
+           texlive-frcursive
+           texlive-frederika2016
+           texlive-frimurer
+           texlive-garamond-libre
+           texlive-garamond-math
+           texlive-genealogy
+           texlive-gentium-tug
+           texlive-gfsartemisia
+           texlive-gfsbodoni
+           texlive-gfscomplutum
+           texlive-gfsdidot
+           texlive-gfsdidotclassic
+           texlive-gfsneohellenic
+           texlive-gfsneohellenicmath
+           texlive-gfssolomos
+           texlive-gillcm
+           texlive-gillius
+           texlive-gnu-freefont
+           texlive-gofonts
+           texlive-gothic
+           texlive-greenpoint
+           texlive-grotesq
+           texlive-gudea
+           texlive-hacm
+           texlive-hamnosys
+           texlive-hands
+           texlive-hep-font
+           texlive-hep-math-font
+           texlive-heros-otf
+           texlive-heuristica
+           texlive-hfbright
+           texlive-hfoldsty
+           texlive-hindmadurai
+           texlive-ibarra
+           texlive-ifsym
+           texlive-imfellenglish
+           texlive-inconsolata
+           texlive-initials
+           texlive-inriafonts
+           texlive-inter
+           texlive-ipaex-type1
+           texlive-iwona
+           texlive-jablantile
+           texlive-jamtimes
+           texlive-josefin
+           texlive-junicode
+           texlive-kixfont
+           texlive-kpfonts
+           texlive-kpfonts-otf
+           texlive-kurier
+           texlive-lato
+           texlive-lexend
+           texlive-lfb
+           texlive-libertine
+           texlive-libertinegc
+           texlive-libertinus
+           texlive-libertinus-fonts
+           texlive-libertinus-otf
+           texlive-libertinus-type1
+           texlive-libertinust1math
+           texlive-librebaskerville
+           texlive-librebodoni
+           texlive-librecaslon
+           texlive-librefranklin
+           texlive-libris
+           texlive-lineara
+           texlive-linguisticspro
+           texlive-lobster2
+           texlive-logix
+           texlive-lxfonts
+           texlive-ly1
+           texlive-magra
+           texlive-marcellus
+           texlive-mathabx
+           texlive-mathabx-type1
+           texlive-mathdesign
+           texlive-mdputu
+           texlive-mdsymbol
+           texlive-merriweather
+           texlive-miama
+           texlive-mintspirit
+           texlive-missaali
+           texlive-mlmodern
+           texlive-mnsymbol
+           texlive-montserrat
+           texlive-mpfonts
+           texlive-mweights
+           texlive-newcomputermodern
+           texlive-newpx
+           texlive-newtx
+           texlive-newtxsf
+           texlive-newtxtt
+           texlive-niceframe-type1
+           texlive-nimbus15
+           texlive-nkarta
+           texlive-noto
+           texlive-noto-emoji
+           texlive-notomath
+           texlive-nunito
+           texlive-obnov
+           texlive-ocherokee
+           texlive-ocr-b
+           texlive-ocr-b-outline
+           texlive-ogham
+           texlive-oinuit
+           texlive-old-arrows
+           texlive-oldlatin
+           texlive-oldstandard
+           texlive-opensans
+           texlive-orkhun
+           texlive-oswald
+           texlive-overlock
+           texlive-pacioli
+           texlive-pagella-otf
+           texlive-paratype
+           texlive-phaistos
+           texlive-phonetic
+           texlive-pigpen
+           texlive-playfair
+           texlive-plex
+           texlive-plex-otf
+           texlive-plimsoll
+           texlive-poiretone
+           texlive-poltawski
+           texlive-prodint
+           texlive-punk
+           texlive-punk-latex
+           texlive-punknova
+           texlive-pxtxalfa
+           texlive-qualitype
+           texlive-quattrocento
+           texlive-raleway
+           texlive-recycle
+           texlive-roboto
+           texlive-romande
+           texlive-rosario
+           texlive-rsfso
+           texlive-sansmathaccent
+           texlive-sansmathfonts
+           texlive-sauter
+           texlive-sauterfonts
+           texlive-schola-otf
+           texlive-scholax
+           texlive-schulschriften
+           texlive-semaphor
+           texlive-shobhika
+           texlive-simpleicons
+           texlive-skull
+           texlive-sourcecodepro
+           texlive-sourcesanspro
+           texlive-sourceserifpro
+           texlive-spectral
+           texlive-srbtiks
+           texlive-starfont
+           texlive-staves
+           texlive-step
+           texlive-stepgreek
+           texlive-stickstoo
+           texlive-stix
+           texlive-stix2-otf
+           texlive-stix2-type1
+           texlive-superiors
+           texlive-svrsymbols
+           texlive-symbats3
+           texlive-tapir
+           texlive-tempora
+           texlive-tengwarscript
+           texlive-termes-otf
+           texlive-tfrupee
+           texlive-theanodidot
+           texlive-theanomodern
+           texlive-theanooldstyle
+           texlive-tinos
+           texlive-tpslifonts
+           texlive-trajan
+           texlive-twemoji-colr
+           texlive-txfontsb
+           texlive-txuprcal
+           texlive-typicons
+           texlive-umtypewriter
+           texlive-universa
+           texlive-universalis
+           texlive-uppunctlm
+           texlive-urwchancal
+           texlive-venturisadf
+           texlive-wsuipa
+           texlive-xcharter
+           texlive-xcharter-math
+           texlive-xits
+           texlive-yfonts
+           texlive-yfonts-otf
+           texlive-yfonts-t1
+           texlive-yinit-otf
+           texlive-zlmtt))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Additional fonts")
+    (description "This collection provides additional fonts.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-collection-fontsrecommended
   (package
     (name "texlive-collection-fontsrecommended")
@@ -34296,6 +64331,354 @@ manipulation, mft, fontinst, etc.  Manipulating OpenType, TrueType, Type 1,and
 for manipulation of PostScript and other image formats.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-formatsextra
+  (package
+    (name "texlive-collection-formatsextra")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-aleph
+           texlive-antomega
+           texlive-collection-basic
+           texlive-collection-latex
+           texlive-edmac
+           texlive-eplain
+           texlive-hitex
+           texlive-jadetex
+           texlive-lambda
+           texlive-lollipop
+           texlive-mltex
+           texlive-mxedruli
+           texlive-omega
+           texlive-omegaware
+           texlive-otibet
+           texlive-passivetex
+           texlive-psizzl
+           texlive-startex
+           texlive-texsis
+           texlive-xmltex
+           texlive-xmltexconfig))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Additional TeX formats")
+    (description
+     "This is a collection of TeX formats, i.e., large-scale macro packages
+designed to be dumped into @file{.fmt} files --- excluding the most common
+ones, such as LaTeX and ConTeXt, which have their own package(s).  It also
+includes the Aleph engine and related Omega formats and packages, and the
+HiTeX engine and related.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-public texlive-collection-games
+  (package
+    (name "texlive-collection-games")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-bartel-chess-fonts
+           texlive-chess
+           texlive-chess-problem-diagrams
+           texlive-chessboard
+           texlive-chessfss
+           texlive-chinesechess
+           texlive-collection-latex
+           texlive-crossword
+           texlive-crosswrd
+           texlive-customdice
+           texlive-egameps
+           texlive-gamebook
+           texlive-gamebooklib
+           texlive-go
+           texlive-hanoi
+           texlive-havannah
+           texlive-hexboard
+           texlive-hexgame
+           texlive-hmtrump
+           texlive-horoscop
+           texlive-jeuxcartes
+           texlive-jigsaw
+           texlive-labyrinth
+           texlive-logicpuzzle
+           texlive-mahjong
+           texlive-maze
+           texlive-musikui
+           texlive-nimsticks
+           texlive-onedown
+           texlive-othello
+           texlive-othelloboard
+           texlive-pas-crosswords
+           texlive-psgo
+           texlive-realtranspose
+           texlive-reverxii
+           texlive-rubik
+           texlive-schwalbe-chess
+           texlive-scrabble
+           texlive-sgame
+           texlive-skak
+           texlive-skaknew
+           texlive-soup
+           texlive-sudoku
+           texlive-sudokubundle
+           texlive-tangramtikz
+           texlive-wargame
+           texlive-xq
+           texlive-xskak))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Games typesetting")
+    (description
+     "This collection includes setups for typesetting various games,
+including chess.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-public texlive-collection-humanities
+  (package
+    (name "texlive-collection-humanities")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-adtrees
+           texlive-bibleref
+           texlive-bibleref-lds
+           texlive-bibleref-mouth
+           texlive-bibleref-parse
+           texlive-collection-latex
+           texlive-covington
+           texlive-diadia
+           texlive-dramatist
+           texlive-dvgloss
+           texlive-ecltree
+           texlive-edfnotes
+           texlive-eledform
+           texlive-eledmac
+           texlive-expex
+           texlive-gb4e
+           texlive-gmverse
+           texlive-jura
+           texlive-juraabbrev
+           texlive-juramisc
+           texlive-jurarsp
+           texlive-langnames
+           texlive-ledmac
+           texlive-lexikon
+           texlive-lexref
+           texlive-ling-macros
+           texlive-linguex
+           texlive-liturg
+           texlive-metrix
+           texlive-nnext
+           texlive-parallel
+           texlive-parrun
+           texlive-phonrule
+           texlive-plari
+           texlive-play
+           texlive-poemscol
+           texlive-poetry
+           texlive-poetrytex
+           texlive-qobitree
+           texlive-qtree
+           texlive-reledmac
+           texlive-rrgtrees
+           texlive-rtklage
+           texlive-screenplay
+           texlive-screenplay-pkg
+           texlive-sides
+           texlive-stage
+           texlive-textglos
+           texlive-thalie
+           texlive-theatre
+           texlive-tree-dvips
+           texlive-verse
+           texlive-xyling))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Humanities packages")
+    (description
+     "This collection contains packages for law, linguistics, social sciences,
+humanities, etc.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-public texlive-collection-langarabic
+  (package
+    (name "texlive-collection-langarabic")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-alkalami
+           texlive-alpha-persian
+           texlive-amiri
+           texlive-arabi
+           texlive-arabi-add
+           texlive-arabic-book
+           texlive-arabluatex
+           texlive-arabtex
+           texlive-bidi
+           texlive-bidihl
+           texlive-collection-basic
+           texlive-dad
+           texlive-ghab
+           texlive-hvarabic
+           texlive-hyphen-complete
+           texlive-imsproc
+           texlive-kurdishlipsum
+           texlive-lshort-persian
+           texlive-luabidi
+           texlive-na-box
+           texlive-persian-bib
+           texlive-quran
+           texlive-sexam
+           texlive-simurgh
+           texlive-texnegar
+           texlive-tram
+           texlive-xepersian
+           texlive-xepersian-hm
+           texlive-xindy-persian))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Support for Arabic and Persian")
+    (description "This collection provides support for Arabic and Persian.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-public texlive-collection-langchinese
+  (package
+    (name "texlive-collection-langchinese")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-arphic
+           texlive-arphic-ttf
+           texlive-asymptote-by-example-zh-cn
+           texlive-asymptote-faq-zh-cn
+           texlive-asymptote-manual-zh-cn
+           texlive-cns
+           texlive-collection-langcjk
+           texlive-ctex
+           texlive-ctex-faq
+           texlive-exam-zh
+           texlive-fandol
+           texlive-fduthesis
+           texlive-hanzibox
+           texlive-hyphen-complete
+           texlive-impatient-cn
+           texlive-install-latex-guide-zh-cn
+           texlive-latex-notes-zh-cn
+           texlive-lshort-chinese
+           texlive-nanicolle
+           texlive-njurepo
+           texlive-pgfornament-han
+           texlive-qyxf-book
+           texlive-texproposal
+           texlive-tlmgr-intro-zh-cn
+           texlive-upzhkinsoku
+           texlive-xpinyin
+           texlive-xtuthesis
+           texlive-zhlineskip
+           texlive-zhlipsum
+           texlive-zhmetrics
+           texlive-zhmetrics-uptex
+           texlive-zhnumber
+           texlive-zhspacing))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Support for Chinese")
+    (description
+     "This collection provides support for Chinese, with additional packages
+from @code{collection-langcjk}.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-public texlive-collection-langcjk
+  (package
+    (name "texlive-collection-langcjk")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-adobemapping
+           texlive-c90
+           texlive-cjk
+           texlive-cjk-gs-integrate
+           texlive-cjkpunct
+           texlive-cjkutils
+           texlive-collection-basic
+           texlive-dnp
+           texlive-evangelion-jfm
+           texlive-fixjfm
+           texlive-garuda-c90
+           texlive-jfmutil
+           texlive-norasi-c90
+           texlive-pxtatescale
+           texlive-xcjk2uni
+           texlive-xecjk
+           texlive-zitie
+           texlive-zxjafont))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Chinese/Japanese/Korean support (base)")
+    (description
+     "This is a collection of packages supporting a combination of Chinese,
+Japanese, Korean, including macros, fonts, documentation.  Also Thai in the
+c90 encoding, since there is some overlap in those fonts; standard Thai
+support is in @code{collection-langother}.  Additional packages for CJK are in
+their individual language collections.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-public texlive-collection-langcyrillic
+  (package
+    (name "texlive-collection-langcyrillic")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-babel-belarusian
+           texlive-babel-bulgarian
+           texlive-babel-russian
+           texlive-babel-serbian
+           texlive-babel-serbianc
+           texlive-babel-ukrainian
+           texlive-churchslavonic
+           texlive-cmcyr
+           texlive-collection-basic
+           texlive-collection-latex
+           texlive-cyrillic
+           texlive-cyrillic-bin
+           texlive-cyrplain
+           texlive-disser
+           texlive-eskd
+           texlive-eskdx
+           texlive-gost
+           texlive-hyphen-complete
+           texlive-lcyw
+           texlive-lh
+           texlive-lhcyr
+           texlive-lshort-bulgarian
+           texlive-lshort-mongol
+           texlive-lshort-russian
+           texlive-lshort-ukr
+           texlive-mongolian-babel
+           texlive-montex
+           texlive-mpman-ru
+           texlive-numnameru
+           texlive-pst-eucl-translation-bg
+           texlive-russ
+           texlive-serbian-apostrophe
+           texlive-serbian-date-lat
+           texlive-serbian-def-cyr
+           texlive-serbian-lig
+           texlive-t2
+           texlive-xecyrmongolian))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Support for Cyrillic scripts")
+    (description
+     "This collection provides packages supporting Cyrillic scripts (Bulgarian,
+Russian, Serbian, Ukrainian), even if Latin alphabets may also be used.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-collection-langczechslovak
   (package
     (name "texlive-collection-langczechslovak")
@@ -34583,6 +64966,44 @@ simply on the size of the support.")
     (description "This collection provides support packages for German.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-langgreek
+  (package
+    (name "texlive-collection-langgreek")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-babel-greek
+           texlive-begingreek
+           texlive-betababel
+           texlive-cbfonts
+           texlive-cbfonts-fd
+           texlive-collection-basic
+           texlive-gfsbaskerville
+           texlive-gfsporson
+           texlive-greek-fontenc
+           texlive-greek-inputenc
+           texlive-greekdates
+           texlive-greektex
+           texlive-greektonoi
+           texlive-hyphen-complete
+           texlive-ibycus-babel
+           texlive-ibygrk
+           texlive-kerkis
+           texlive-levy
+           texlive-lgreek
+           texlive-lgrmath
+           texlive-mkgrkindex
+           texlive-talos
+           texlive-teubner
+           texlive-xgreek
+           texlive-yannisgr))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Support for Greek")
+    (description "This collection provides support for Greek.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-collection-langitalian
   (package
     (name "texlive-collection-langitalian")
@@ -34614,6 +65035,179 @@ simply on the size of the support.")
     (description "This collection provides support packages for Italian.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-langjapanese
+  (package
+    (name "texlive-collection-langjapanese")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-ascmac
+           texlive-asternote
+           texlive-babel-japanese
+           texlive-bxbase
+           texlive-bxcjkjatype
+           texlive-bxghost
+           texlive-bxjaholiday
+           texlive-bxjalipsum
+           texlive-bxjaprnind
+           texlive-bxjatoucs
+           texlive-bxjscls
+           texlive-bxorigcapt
+           texlive-bxwareki
+           texlive-collection-langcjk
+           texlive-convbkmk
+           texlive-endnotesj
+           texlive-gckanbun
+           texlive-gentombow
+           texlive-haranoaji
+           texlive-haranoaji-extra
+           texlive-ieejtran
+           texlive-ifptex
+           texlive-ifxptex
+           texlive-ipaex
+           texlive-japanese-mathformulas
+           texlive-japanese-otf
+           texlive-jieeetran
+           texlive-jlreq
+           texlive-jlreq-deluxe
+           texlive-jpneduenumerate
+           texlive-jpnedumathsymbols
+           texlive-jsclasses
+           texlive-kanbun
+           texlive-lshort-japanese
+           texlive-luatexja
+           texlive-mendex-doc
+           texlive-morisawa
+           texlive-pbibtex-base
+           texlive-pbibtex-manual
+           texlive-platex
+           texlive-platex-tools
+           texlive-platexcheat
+           texlive-plautopatch
+           texlive-ptex
+           texlive-ptex-base
+           texlive-ptex-fontmaps
+           texlive-ptex-fonts
+           texlive-ptex-manual
+           texlive-ptex2pdf
+           texlive-pxbase
+           texlive-pxchfon
+           texlive-pxcjkcat
+           texlive-pxjahyper
+           texlive-pxjodel
+           texlive-pxrubrica
+           texlive-pxufont
+           texlive-uplatex
+           texlive-uptex
+           texlive-uptex-base
+           texlive-uptex-fonts
+           texlive-wadalab
+           texlive-zxjafbfont
+           texlive-zxjatype))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Support for Japanese")
+    (description
+     "This collection provides support for Japanese, with additional packages
+from @code{collection-langcjk}.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-public texlive-collection-langkorean
+  (package
+    (name "texlive-collection-langkorean")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-baekmuk
+           texlive-cjk-ko
+           texlive-collection-langcjk
+           texlive-kotex-oblivoir
+           texlive-kotex-plain
+           texlive-kotex-utf
+           texlive-kotex-utils
+           texlive-lshort-korean
+           texlive-nanumtype1
+           texlive-pmhanguljamo
+           texlive-uhc
+           texlive-unfonts-core
+           texlive-unfonts-extra))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Support for Korean")
+    (description
+     "This collection provides support for Korean, with additional packages
+from @code{collection-langcjk}.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-public texlive-collection-langother
+  (package
+    (name "texlive-collection-langother")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-aalok
+           texlive-akshar
+           texlive-amsldoc-vn
+           texlive-aramaic-serto
+           texlive-babel-azerbaijani
+           texlive-babel-esperanto
+           texlive-babel-georgian
+           texlive-babel-hebrew
+           texlive-babel-indonesian
+           texlive-babel-interlingua
+           texlive-babel-malay
+           texlive-babel-sorbian
+           texlive-babel-thai
+           texlive-babel-vietnamese
+           texlive-bangla
+           texlive-bangtex
+           texlive-bengali
+           texlive-burmese
+           texlive-chhaya
+           texlive-cjhebrew
+           texlive-collection-basic
+           texlive-ctib
+           texlive-ebong
+           texlive-ethiop
+           texlive-ethiop-t1
+           texlive-fc
+           texlive-fonts-tlwg
+           texlive-hindawi-latex-template
+           texlive-hyphen-complete
+           texlive-latex-mr
+           texlive-latexbangla
+           texlive-latino-sine-flexione
+           texlive-lshort-thai
+           texlive-lshort-vietnamese
+           texlive-marathi
+           texlive-ntheorem-vn
+           texlive-padauk
+           texlive-quran-bn
+           texlive-quran-ur
+           texlive-sanskrit
+           texlive-sanskrit-t1
+           texlive-thaienum
+           texlive-thaispec
+           texlive-unicode-alphabets
+           texlive-velthuis
+           texlive-vntex
+           texlive-wnri
+           texlive-wnri-latex
+           texlive-xetex-devanagari))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Support other languages")
+    (description
+     "This collection provides support for languages not otherwise listed,
+including Indic, Thai, Vietnamese, Hebrew, Indonesian, African languages, and
+plenty more.  The split is made simply on the basis of the size of the
+support, to keep both collection sizes and the number of collections
+reasonable.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-collection-langpolish
   (package
     (name "texlive-collection-langpolish")
@@ -35292,6 +65886,55 @@ science packages.")
 with packages in @code{collection-basic}.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-music
+  (package
+    (name "texlive-collection-music")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-abc
+           texlive-autosp
+           texlive-bagpipe
+           texlive-chordbars
+           texlive-chordbox
+           texlive-collection-latex
+           texlive-ddphonism
+           texlive-figbas
+           texlive-gchords
+           texlive-gregoriotex
+           texlive-gtrcrd
+           texlive-guitar
+           texlive-guitarchordschemes
+           texlive-guitartabs
+           texlive-harmony
+           texlive-latex4musicians
+           texlive-leadsheets
+           texlive-lilyglyphs
+           texlive-lyluatex
+           texlive-m-tx
+           texlive-musical
+           texlive-musicography
+           texlive-musixguit
+           texlive-musixtex
+           texlive-musixtex-fonts
+           texlive-musixtnt
+           texlive-octave
+           texlive-piano
+           texlive-pmx
+           texlive-pmxchords
+           texlive-recorder-fingering
+           texlive-songbook
+           texlive-songproj
+           texlive-songs
+           texlive-xml2pmx
+           texlive-xpiano))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Music packages")
+    (description "This collection includes music-related fonts and packages.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-collection-pictures
   (package
     (name "texlive-collection-pictures")
@@ -35671,6 +66314,424 @@ PStricks are separate.")
 often LaTeX, and occasionally other formats.")
     (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
 
+(define-public texlive-collection-pstricks
+  (package
+    (name "texlive-collection-pstricks")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-auto-pst-pdf
+           texlive-bclogo
+           texlive-collection-basic
+           texlive-collection-plaingeneric
+           texlive-dsptricks
+           texlive-luapstricks
+           texlive-makeplot
+           texlive-pdftricks
+           texlive-pdftricks2
+           texlive-pedigree-perl
+           texlive-psbao
+           texlive-pst-2dplot
+           texlive-pst-3d
+           texlive-pst-3dplot
+           texlive-pst-abspos
+           texlive-pst-am
+           texlive-pst-antiprism
+           texlive-pst-arrow
+           texlive-pst-asr
+           texlive-pst-bar
+           texlive-pst-barcode
+           texlive-pst-bezier
+           texlive-pst-blur
+           texlive-pst-bspline
+           texlive-pst-calculate
+           texlive-pst-calendar
+           texlive-pst-cie
+           texlive-pst-circ
+           texlive-pst-coil
+           texlive-pst-contourplot
+           texlive-pst-cox
+           texlive-pst-dart
+           texlive-pst-dbicons
+           texlive-pst-diffraction
+           texlive-pst-electricfield
+           texlive-pst-eps
+           texlive-pst-eucl
+           texlive-pst-exa
+           texlive-pst-feyn
+           texlive-pst-fill
+           texlive-pst-fit
+           texlive-pst-flags
+           texlive-pst-fr3d
+           texlive-pst-fractal
+           texlive-pst-fun
+           texlive-pst-func
+           texlive-pst-gantt
+           texlive-pst-geo
+           texlive-pst-geometrictools
+           texlive-pst-gr3d
+           texlive-pst-grad
+           texlive-pst-graphicx
+           texlive-pst-hsb
+           texlive-pst-infixplot
+           texlive-pst-intersect
+           texlive-pst-jtree
+           texlive-pst-knot
+           texlive-pst-labo
+           texlive-pst-layout
+           texlive-pst-lens
+           texlive-pst-light3d
+           texlive-pst-lsystem
+           texlive-pst-magneticfield
+           texlive-pst-marble
+           texlive-pst-math
+           texlive-pst-mirror
+           texlive-pst-moire
+           texlive-pst-node
+           texlive-pst-ob3d
+           texlive-pst-ode
+           texlive-pst-optexp
+           texlive-pst-optic
+           texlive-pst-osci
+           texlive-pst-ovl
+           texlive-pst-pad
+           texlive-pst-pdf
+           texlive-pst-pdgr
+           texlive-pst-perspective
+           texlive-pst-platon
+           texlive-pst-plot
+           texlive-pst-poker
+           texlive-pst-poly
+           texlive-pst-pulley
+           texlive-pst-qtree
+           texlive-pst-rputover
+           texlive-pst-rubans
+           texlive-pst-shell
+           texlive-pst-sigsys
+           texlive-pst-slpe
+           texlive-pst-solarsystem
+           texlive-pst-solides3d
+           texlive-pst-soroban
+           texlive-pst-spectra
+           texlive-pst-spinner
+           texlive-pst-stru
+           texlive-pst-support
+           texlive-pst-text
+           texlive-pst-thick
+           texlive-pst-tools
+           texlive-pst-tree
+           texlive-pst-turtle
+           texlive-pst-tvz
+           texlive-pst-uml
+           texlive-pst-vectorian
+           texlive-pst-vehicle
+           texlive-pst-venn
+           texlive-pst-vowel
+           texlive-pst2pdf
+           texlive-pstricks
+           texlive-pstricks-add
+           texlive-pstricks-calcnotes
+           texlive-uml
+           texlive-vaucanson-g
+           texlive-vocaltract))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "PSTricks core and add-ons")
+    (description
+     "This collection provides PSTricks core and all add-on packages.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
+(define-public texlive-collection-publishers
+  (package
+    (name "texlive-collection-publishers")
+    (version (number->string %texlive-revision))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments (list #:builder #~(mkdir #$output)))
+    (propagated-inputs
+     (list texlive-aastex
+           texlive-abnt
+           texlive-abntex2
+           texlive-abntexto
+           texlive-acmart
+           texlive-acmconf
+           texlive-active-conf
+           texlive-adfathesis
+           texlive-afparticle
+           texlive-afthesis
+           texlive-aguplus
+           texlive-aiaa
+           texlive-anonymous-acm
+           texlive-anufinalexam
+           texlive-aomart
+           texlive-apa
+           texlive-apa6
+           texlive-apa6e
+           texlive-apa7
+           texlive-arsclassica
+           texlive-articleingud
+           texlive-asaetr
+           texlive-ascelike
+           texlive-asmeconf
+           texlive-asmejour
+           texlive-aucklandthesis
+           texlive-bangorcsthesis
+           texlive-bangorexam
+           texlive-bath-bst
+           texlive-beamer-fuberlin
+           texlive-beamer-verona
+           texlive-beilstein
+           texlive-bfh-ci
+           texlive-bgteubner
+           texlive-bjfuthesis
+           texlive-bmstu
+           texlive-bmstu-iu8
+           texlive-br-lex
+           texlive-brandeis-dissertation
+           texlive-brandeis-problemset
+           texlive-brandeis-thesis
+           texlive-buctthesis
+           texlive-cascadilla
+           texlive-cesenaexam
+           texlive-chem-journal
+           texlive-chifoot
+           texlive-chs-physics-report
+           texlive-cje
+           texlive-classicthesis
+           texlive-cleanthesis
+           texlive-cmpj
+           texlive-collection-latex
+           texlive-confproc
+           texlive-cquthesis
+           texlive-dccpaper
+           texlive-dithesis
+           texlive-ebook
+           texlive-ebsthesis
+           texlive-ecothesis
+           texlive-ejpecp
+           texlive-ekaia
+           texlive-elbioimp
+           texlive-els-cas-templates
+           texlive-elsarticle
+           texlive-elteikthesis
+           texlive-emisa
+           texlive-erdc
+           texlive-estcpmm
+           texlive-etsvthor
+           texlive-facture-belge-simple-sans-tva
+           texlive-fbithesis
+           texlive-fcavtex
+           texlive-fcltxdoc
+           texlive-fei
+           texlive-ftc-notebook
+           texlive-gaceta
+           texlive-gammas
+           texlive-geradwp
+           texlive-gfdl
+           texlive-gradstudentresume
+           texlive-grant
+           texlive-gsemthesis
+           texlive-gzt
+           texlive-h2020proposal
+           texlive-hagenberg-thesis
+           texlive-har2nat
+           texlive-hecthese
+           texlive-hep-paper
+           texlive-hfutexam
+           texlive-hfutthesis
+           texlive-hithesis
+           texlive-hitszbeamer
+           texlive-hitszthesis
+           texlive-hobete
+           texlive-hu-berlin-bundle
+           texlive-hustthesis
+           texlive-icsv
+           texlive-ieeeconf
+           texlive-ieeepes
+           texlive-ieeetran
+           texlive-ijmart
+           texlive-ijsra
+           texlive-imac
+           texlive-imtekda
+           texlive-inkpaper
+           texlive-iodhbwm
+           texlive-iscram
+           texlive-jacow
+           texlive-jmlr
+           texlive-jnuexam
+           texlive-jourcl
+           texlive-jpsj
+           texlive-jwjournal
+           texlive-kdgdocs
+           texlive-kdpcover
+           texlive-kfupm-math-exam
+           texlive-kluwer
+           texlive-ksp-thesis
+           texlive-ku-template
+           texlive-langsci
+           texlive-langsci-avm
+           texlive-limecv
+           texlive-lion-msc
+           texlive-llncs
+           texlive-llncsconf
+           texlive-lni
+           texlive-lps
+           texlive-matc3
+           texlive-matc3mem
+           texlive-mcmthesis
+           texlive-mentis
+           texlive-mlacls
+           texlive-mluexercise
+           texlive-mnras
+           texlive-modeles-factures-belges-assocs
+           texlive-msu-thesis
+           texlive-mucproc
+           texlive-mugsthesis
+           texlive-muling
+           texlive-musuos
+           texlive-muthesis
+           texlive-mynsfc
+           texlive-nature
+           texlive-navydocs
+           texlive-nddiss
+           texlive-ndsu-thesis
+           texlive-ndsu-thesis-2022
+           texlive-nih
+           texlive-nihbiosketch
+           texlive-njustthesis
+           texlive-njuthesis
+           texlive-njuvisual
+           texlive-nostarch
+           texlive-novel
+           texlive-nrc
+           texlive-nwafuthesis
+           texlive-nwejm
+           texlive-onrannual
+           texlive-opteng
+           texlive-oup-authoring-template
+           texlive-philosophersimprint
+           texlive-pittetd
+           texlive-pkuthss
+           texlive-powerdot-fuberlin
+           texlive-powerdot-tuliplab
+           texlive-pracjourn
+           texlive-prociagssymp
+           texlive-proposal
+           texlive-prtec
+           texlive-ptptex
+           texlive-qrbill
+           texlive-quantumarticle
+           texlive-resphilosophica
+           texlive-resumecls
+           texlive-revtex
+           texlive-revtex4
+           texlive-revtex4-1
+           texlive-rutitlepage
+           texlive-ryersonsgsthesis
+           texlive-ryethesis
+           texlive-sageep
+           texlive-sapthesis
+           texlive-schule
+           texlive-scientific-thesis-cover
+           texlive-scripture
+           texlive-scrjrnl
+           texlive-sduthesis
+           texlive-se2thesis
+           texlive-seu-ml-assign
+           texlive-seuthesis
+           texlive-seuthesix
+           texlive-shortmathj
+           texlive-shtthesis
+           texlive-smflatex
+           texlive-soton
+           texlive-sphdthesis
+           texlive-spie
+           texlive-sr-vorl
+           texlive-srdp-mathematik
+           texlive-stellenbosch
+           texlive-suftesi
+           texlive-sugconf
+           texlive-tabriz-thesis
+           texlive-technion-thesis-template
+           texlive-texilikechaps
+           texlive-texilikecover
+           texlive-thesis-ekf
+           texlive-thesis-gwu
+           texlive-thesis-qom
+           texlive-thesis-titlepage-fhac
+           texlive-thuaslogos
+           texlive-thubeamer
+           texlive-thucoursework
+           texlive-thuthesis
+           texlive-tidyres
+           texlive-timbreicmc
+           texlive-tlc-article
+           texlive-topletter
+           texlive-toptesi
+           texlive-tuda-ci
+           texlive-tudscr
+           texlive-tugboat
+           texlive-tugboat-plain
+           texlive-tui
+           texlive-turabian
+           texlive-uaclasses
+           texlive-uafthesis
+           texlive-uantwerpendocs
+           texlive-ucalgmthesis
+           texlive-ucbthesis
+           texlive-ucdavisthesis
+           texlive-ucsmonograph
+           texlive-ucthesis
+           texlive-udes-genie-these
+           texlive-uestcthesis
+           texlive-ufrgscca
+           texlive-uhhassignment
+           texlive-uiucredborder
+           texlive-uiucthesis
+           texlive-ukbill
+           texlive-ulthese
+           texlive-umbclegislation
+           texlive-umich-thesis
+           texlive-umthesis
+           texlive-unam-thesis
+           texlive-unamth-template
+           texlive-unamthesis
+           texlive-unbtex
+           texlive-unifith
+           texlive-unigrazpub
+           texlive-unitn-bimrep
+           texlive-univie-ling
+           texlive-unizgklasa
+           texlive-unswcover
+           texlive-uol-physics-report
+           texlive-uothesis
+           texlive-uowthesis
+           texlive-uowthesistitlepage
+           texlive-urcls
+           texlive-uspatent
+           texlive-ut-thesis
+           texlive-utexasthesis
+           texlive-uvaletter
+           texlive-uwa-colours
+           texlive-uwa-letterhead
+           texlive-uwa-pcf
+           texlive-uwa-pif
+           texlive-uwthesis
+           texlive-vancouver
+           texlive-wsemclassic
+           texlive-xduthesis
+           texlive-xduts
+           texlive-xmuthesis
+           texlive-yathesis
+           texlive-yazd-thesis
+           texlive-yb-book
+           texlive-york-thesis))
+    (home-page "https://www.tug.org/texlive/")
+    (synopsis "Publisher styles, theses, etc.")
+    (description "This collection includes publisher styles, theses, etc.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))))
+
 (define-public texlive-collection-xetex
   (package
     (name "texlive-collection-xetex")
@@ -36644,6 +67705,24 @@ in your document (DOT and Neato are both part of @code{graphviz}; DOT creates
 directed graphs, Neato undirected graphs).")
     (license license:gpl3+)))
 
+(define-public texlive-doulossil
+  (package
+    (name "texlive-doulossil")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/doulossil/"
+                   "fonts/truetype/public/doulossil/")
+             (base32
+              "0frhwpm7xzhhz83wpmlrwgz3c3bpvhm8pa0b6vkdgm8qj799irrb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/doulossil")
+    (synopsis "Font for typesetting the International Phonetic Alphabet (IPA)")
+    (description
+     "This package provides the IPA font Doulos SIL in TrueType format.")
+    (license license:silofl1.1)))
+
 (define-public texlive-dpcircling
   (package
     (name "texlive-dpcircling")
@@ -38032,6 +69111,33 @@ a template for such theses.)  The class is designed for use with pdfLaTeX;
 input in UTF-8 encoding is assumed.")
     (license license:lppl1.3+)))
 
+(define-public texlive-uhc
+  (package
+    (name "texlive-uhc")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/uhc/umj/"
+                   "dvips/uhc/"
+                   "fonts/afm/uhc/umj/"
+                   "fonts/map/dvips/uhc/"
+                   "fonts/tfm/uhc/umj/"
+                   "fonts/tfm/uhc/uwmj/"
+                   "fonts/tfm/uhc/wmj/"
+                   "fonts/type1/uhc/umj/"
+                   "fonts/vf/uhc/uwmj/"
+                   "fonts/vf/uhc/wmj/")
+             (base32
+              "1hpqdzmz4xrcgk443lysif8yk52rbra8rh6cjjfr4kibyfpy77p3")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/uhc")
+    (synopsis "Fonts for the Korean language")
+    (description
+     "This package provides support for Korean documents written in Korean
+standard KSC codes for LaTeX2e.")
+    (license license:lppl)))
+
 (define-public texlive-uhrzeit
   (package
     (name "texlive-uhrzeit")
@@ -38209,6 +69315,23 @@ SGML-based languages.  Xindy is highly configurable, both in markup terms and
 in terms of the collating order of the text being processed.")
     (license license:gpl2+)))
 
+(define-public texlive-xindy-persian
+  (package
+    (name "texlive-xindy-persian")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/support/xindy-persian/")
+             (base32
+              "04w3h65215slnakk5w19m94xmj9cjx01izbk9xijifv5l6dqh447")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/xindy-persian")
+    (synopsis "Support for the Persian language in Xindy")
+    (description
+     "The package offers Persian language support for indexing using Xindy.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-xits
   (package
     (name "texlive-xits")
@@ -38297,6 +69420,24 @@ support for @code{amsmath} displayed-equation environments); and support for
 making a list of theorems, analagous to @code{\\listoffigures}.")
     (license license:lppl)))
 
+(define-public texlive-ntheorem-vn
+  (package
+    (name "texlive-ntheorem-vn")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/ntheorem-vn/")
+             (base32
+              "13lkgb4qjiblbfm4jcxgkxsf08zk90lqz02bxrmim1n8gvyihwcc")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/ntheorem-vn")
+    (synopsis "Vietnamese translation of documentation of @code{ntheorem}")
+    (description
+     "This is a translation of the documentation provided with
+@code{ntheorem}.")
+    (license license:lppl)))
+
 (define-public texlive-fmtcount
   (package
     (name "texlive-fmtcount")
@@ -38510,6 +69651,54 @@ the end of the document, optionally leaving markers in the text near to where
 the figure (or table) would normally have occurred.")
     (license license:gpl3+)))
 
+(define-public texlive-wadalab
+  (package
+    (name "texlive-wadalab")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/fonts/wadalab/"
+                   "fonts/afm/wadalab/dgj/"
+                   "fonts/afm/wadalab/dmj/"
+                   "fonts/afm/wadalab/mc2j/"
+                   "fonts/afm/wadalab/mcj/"
+                   "fonts/afm/wadalab/mr2j/"
+                   "fonts/afm/wadalab/mrj/"
+                   "fonts/map/dvips/wadalab/"
+                   "fonts/tfm/wadalab/dgj/"
+                   "fonts/tfm/wadalab/dmj/"
+                   "fonts/tfm/wadalab/mc2j/"
+                   "fonts/tfm/wadalab/mcj/"
+                   "fonts/tfm/wadalab/mr2j/"
+                   "fonts/tfm/wadalab/mrj/"
+                   "fonts/tfm/wadalab/udgj/"
+                   "fonts/tfm/wadalab/udmj/"
+                   "fonts/tfm/wadalab/umcj/"
+                   "fonts/tfm/wadalab/umrj/"
+                   "fonts/type1/wadalab/dgj/"
+                   "fonts/type1/wadalab/dmj/"
+                   "fonts/type1/wadalab/mc2j/"
+                   "fonts/type1/wadalab/mcj/"
+                   "fonts/type1/wadalab/mr2j/"
+                   "fonts/type1/wadalab/mrj/"
+                   "fonts/vf/wadalab/udgj/"
+                   "fonts/vf/wadalab/udmj/"
+                   "fonts/vf/wadalab/umcj/"
+                   "fonts/vf/wadalab/umrj/")
+             (base32
+              "1i72xbn28wh2rl4j1yzl1rvb5nd8bxmci9q9qjzynwq845zgjvnk")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/wadalab")
+    (synopsis "Wadalab (Japanese) font packages")
+    (description
+     "These are font bundles for the Japanese Wadalab fonts which work with
+the CJK package.  All subfonts now have glyph names compliant to the Adobe
+Glyph List, making ToUnicode CMaps in PDF documents (created automatically by
+@code{dvipdfmx}) work correctly.  All font bundles now contain virtual Unicode
+subfonts.")
+    (license (license:fsf-free "https://fedoraproject.org/wiki/Licensing:Wadalab"))))
+
 (define-public texlive-was
   (package
     (name "texlive-was")
@@ -39290,6 +70479,29 @@ to load external Lua modules, including modules installed via LuaRocks.")
 cells using LaTeX macros.")
     (license license:expat)))
 
+(define-public texlive-luapstricks
+  (package
+    (name "texlive-luapstricks")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/lualatex/luapstricks/"
+                   "fonts/opentype/public/luapstricks/"
+                   "tex/lualatex/luapstricks/")
+             (base32
+              "160y66x93rcm0zpjscxyqbfkhbl0yypv0gyixm6vjwcm50vi2w5k")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/luapstricks")
+    (synopsis "PSTricks backend for LuaLaTeX")
+    (description
+     "This package enables the use of PSTricks directly in LuaLaTeX documents,
+without invoking external programmes, by implementing a PostScript interpreter
+in Lua.  Therefore it does not require shell escape to be enabled or special
+environments, and instead allows PSTricks to be used exactly like in Dvips
+based documents.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-luaquotes
   (package
     (name "texlive-luaquotes")
@@ -39484,6 +70696,26 @@ makecell with an easy to use syntax.  It also adds some enhanced rules for the
 @code{booktabs} package.")
     (license license:expat)))
 
+(define-public texlive-makeplot
+  (package
+    (name "texlive-makeplot")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/makeplot/"
+                   "source/latex/makeplot/"
+                   "tex/latex/makeplot/")
+             (base32
+              "1w34508lvb6rjhp41k78ph2p609mk03n8sp4mfgmhdpay0qxyjz5")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/makeplot")
+    (synopsis "Easy plots from Matlab in LaTeX")
+    (description
+     "Makeplot is a LaTeX package that uses the PSTricks @code{pst-plot}
+functions to plot data that it takes from Matlab output files.")
+    (license license:lppl)))
+
 (define-public texlive-minim
   (package
     (name "texlive-minim")
@@ -39870,6 +71102,94 @@ integrated into the LaTeX kernel (or in parts into permanent support
 packages), and the current testphase bundle will be removed.")
     (license license:lppl1.3c)))
 
+(define-public texlive-pdftricks
+  (package
+    (name "texlive-pdftricks")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pdftricks/"
+                   "tex/latex/pdftricks/")
+             (base32
+              "07vr97rgn0n73zb2b3sb3wkwxl0p6nbnjk0cgxd05drf1k8shxnp")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pdftricks")
+    (synopsis "Support for PSTricks in pdfTeX")
+    (description
+     "The PSTricks macros cannot be used (directly) with pdfTeX, since
+PSTricks uses PostScript arithmetic, which isn't part of PDF.  This package
+circumvents this limitation so that the extensive facilities offered by the
+powerful PSTricks package can be made use of in a pdfTeX document.  This is
+done using the shell escape function available in current TeX implementations.
+The package may also be used in support of other PostScript-output-only
+packages, such as PSfrag.")
+    (license license:gpl3+)))
+
+(define-public texlive-pdftricks2
+  (package
+    (name "texlive-pdftricks2")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pdftricks2/"
+                   "tex/latex/pdftricks2/")
+             (base32
+              "0znq52nzknv0x16cqbpfi90gz89frzk74ww3sg7ibjacmbpfl3j0")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/pdftricks2")
+    (synopsis "Use PSTricks in pdfTeX")
+    (description
+     "The package provides the means of processing documents that contain
+PSTricks graphics specifications.  The package is inspired by
+@code{pdftricks}.")
+    (license license:gpl2)))
+
+(define-public texlive-pedigree-perl
+  (package
+    (name "texlive-pedigree-perl")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/man/man1/pedigree.1"
+                   "doc/man/man1/pedigree.man1.pdf"
+                   "doc/support/pedigree-perl/"
+                   "scripts/pedigree-perl/"
+                   "source/latex/pedigree-perl/")
+             (base32
+              "0s2186j4hx5v12g5r8admif2ysi6nnm8d0xxpwq26brfcjrbbh7r")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:link-scripts #~(list "pedigree.pl")))
+    (inputs (list perl))
+    (home-page "https://ctan.org/pkg/pedigree-perl")
+    (synopsis "Generate TeX pedigree files from CSV files")
+    (description
+     "This program generates TeX commands to typeset pedigrees --- either TeX
+fragments or full LaTeX files, to be processed by the @code{pst-pdgr} package.
+The program has support for multilanguage pedigrees (at the present moment the
+English and Russian languages are supported).")
+    (license license:gpl2)))
+
+(define-public texlive-psbao
+  (package
+    (name "texlive-psbao")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/psbao/" "tex/latex/psbao/")
+             (base32
+              "11gfnjvhrgic18s45pj6hn8slj9kmrmsrh4kqn83sfdxy2mr2y32")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/psbao")
+    (synopsis "Draw Bao diagrams")
+    (description
+     "The package draws Bao diagrams in LaTeX.  The package is a development
+of @code{psgo}, and uses PSTricks to draw the diagrams.")
+    (license license:lppl)))
+
 (define-public texlive-pslatex
   (package
     (name "texlive-pslatex")
@@ -39924,6 +71244,30 @@ uses PostScript @code{\\special} commands.  The package is now largely
 superseded by @code{pict2e}.")
     (license license:lppl)))
 
+(define-public texlive-datetime
+  (package
+    (name "texlive-datetime")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/datetime/"
+                   "source/latex/datetime/"
+                   "tex/latex/datetime/")
+             (base32
+              "07rx0bcr8b73669xmvl1q3qy96jfqlfs2yv2khjcaf2yfid3c2vw")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/datetime")
+    (synopsis "Change format of \\today with commands for current time")
+    (description
+     "This package provides various different formats for the text created by
+the command @code{\\today}, and also provides commands for displaying the
+current time (or any given time), in 12-hour, 24-hour or text format.  It
+overrides Babel's date format, having its own library of date formats in
+different languages.  This package is now obsolete and has been replaced by
+@code{datetime2}.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-datetime2
   (package
     (name "texlive-datetime2")
@@ -40090,6 +71434,67 @@ a number of @code{\\magsteps} to change size; from this are defined commands
 @code{\\larger}, @code{\\smaller}, @code{\\textlarger}, etc.")
     (license license:public-domain)))
 
+(define-public texlive-russ
+  (package
+    (name "texlive-russ")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/russ/" "tex/latex/russ/")
+             (base32
+              "0ixvdjvgrqn5z8glvbr1i9k4yw00n260d11n034x6j67srxph3rb")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (home-page "https://ctan.org/pkg/russ")
+    (synopsis "LaTeX in Russian, without Babel")
+    (description
+     "The package aims to facilitate Russian typesetting (based on input using
+MicroSoft Code Page 1251).  Russian hyphenation is selected, and various
+mathematical commands are set up in Russian style.  Furthermore all Cyrillic
+letters catcodes are set to @samp{letter}, so that commands with Cyrillic
+letters in their names may be defined.")
+    (license license:lppl)))
+
+(define-public texlive-everyhook
+  (package
+    (name "texlive-everyhook")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/everyhook/"
+                   "source/latex/everyhook/"
+                   "tex/latex/everyhook/")
+             (base32
+              "0rcw2d5ncq8avk33nxika34q3da1v4kcmr6jqdxdg49bq4h8ljs7")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (arguments (list #:tex-format "latex"))
+    (native-inputs
+     (list (texlive-updmap.cfg
+            (list texlive-bera
+                  texlive-enumitem
+                  texlive-etoolbox
+                  texlive-hypdoc
+                  texlive-inconsolata
+                  texlive-lipsum
+                  texlive-listings
+                  texlive-mathpazo
+                  texlive-microtype
+                  texlive-palatino
+                  texlive-svn-prov
+                  texlive-upquote
+                  texlive-xkeyval))))
+    (home-page "https://ctan.org/pkg/everyhook")
+    (synopsis "Hooks for standard TeX token lists")
+    (description
+     "The package takes control of the six TeX token registers @code{\\everypar},
+@code{\\everymath}, @code{\\everydisplay}, @code{\\everyhbox},
+@code{\\everyvbox} and @code{\\everycr}.  Real hooks for each of the registers
+may be installed using a stack like interface.  For backwards compatibility,
+each of the @code{\\everyX} token lists can be set without interfering with
+the hooks.")
+    (license license:lppl1.3+)))
+
 (define-public texlive-everypage
   (package
     (name "texlive-everypage")
diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm
new file mode 100644
index 0000000000..1a50eb454f
--- /dev/null
+++ b/gnu/packages/texlive.scm
@@ -0,0 +1,417 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
+;;; Copyright © 2016, 2018-2021, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
+;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2017, 2020, 2021 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org>
+;;; Copyright © 2018, 2020 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
+;;; Copyright © 2020, 2021 Paul Garlick <pgarlick@tourbillion-technology.com>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
+;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
+;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
+;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages texlive)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system trivial)
+  #:use-module (guix utils)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages gd)
+  #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages icu4c)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages lua)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages ruby)
+  #:use-module (gnu packages shells)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages xorg))
+
+(define %texlive-date "20230313")
+(define %texlive-year (string-take %texlive-date 4))
+
+(define texlive-extra-src
+  (origin
+    (method url-fetch)
+    (uri (string-append "ftp://tug.org/historic/systems/texlive/"
+                        %texlive-year "/texlive-"
+                        %texlive-date "-extra.tar.xz"))
+    (sha256 (base32
+             "1hiqvdg679yadygf23f37b3dz5ick258k1qcam9nhkhprkx7d9l0"))))
+
+(define texlive-texmf-src
+  (origin
+    (method url-fetch)
+    (uri (string-append "ftp://tug.org/historic/systems/texlive/"
+                        %texlive-year "/texlive-"
+                        %texlive-date "-texmf.tar.xz"))
+    (sha256 (base32
+             "0lqjm11pr9vasvivaci3k9xcmdyd08ldnh31zf8avjjs09xcfkac"))))
+
+(define texlivebin
+  (package
+    (name "texlivebin")
+    (version %texlive-date)
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "ftp://tug.org/historic/systems/texlive/"
+                           %texlive-year "/texlive-"
+                           %texlive-date "-source.tar.xz"))
+       (sha256
+        (base32
+         "1fbrkv7g9j6ipmwjx27l8l9l974rmply8bhf7c2iqc6h3q7aly1q"))
+       (modules '((guix build utils)
+                  (ice-9 ftw)))
+       (snippet
+        ;; TODO: Unbundle stuff in texk/dvisvgm/dvisvgm-src/libs too.
+        '(with-directory-excursion "libs"
+           (let ((preserved-directories
+                 '("." ".." "lua53" "luajit" "pplib" "xpdf")))
+             ;; Delete bundled software, except Lua which cannot easily be
+             ;; used as an external dependency, pplib and xpdf which aren't
+             ;; supported as system libraries (see m4/kpse-xpdf-flags.m4).
+             (for-each
+               delete-file-recursively
+               (scandir "."
+                 (lambda (file)
+                   (and (not (member file preserved-directories))
+                        (eq? 'directory (stat:type (stat file))))))))))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("texlive-extra-src" ,texlive-extra-src)
+       ("config" ,config)
+       ("cairo" ,cairo)
+       ("fontconfig" ,fontconfig)
+       ("fontforge" ,fontforge)
+       ("freetype" ,freetype)
+       ("gd" ,gd)
+       ("gmp" ,gmp)
+       ("ghostscript" ,ghostscript)
+       ("graphite2" ,graphite2)
+       ("harfbuzz" ,harfbuzz)
+       ("icu4c" ,icu4c)
+       ("libpaper" ,libpaper)
+       ("libpng" ,libpng)
+       ("libxaw" ,libxaw)
+       ("libxt" ,libxt)
+       ("mpfr" ,mpfr)
+       ("perl" ,perl)
+       ("pixman" ,pixman)
+       ("potrace" ,potrace)
+       ("python" ,python)
+       ("ruby" ,ruby-2.7)
+       ("tcsh" ,tcsh)
+       ("teckit" ,teckit)
+       ("zlib" ,zlib)
+       ("zziplib" ,zziplib)))
+    (native-inputs
+     (list pkg-config))
+    (arguments
+     `(#:modules ((guix build gnu-build-system)
+                  (guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-1)
+                  (srfi srfi-26))
+       #:out-of-source? #t
+       #:configure-flags
+       '("--disable-static"
+         "--disable-native-texlive-build"
+         "--enable-shared"
+         "--with-banner-add=/GNU Guix"
+         "--with-system-cairo"
+         "--with-system-freetype2"
+         "--with-system-gd"
+         "--with-system-gmp"
+         "--with-system-graphite2"
+         "--with-system-harfbuzz"
+         "--with-system-icu"
+         "--with-system-libpaper"
+         "--with-system-libpng"
+         "--with-system-mpfr"
+         "--with-system-pixman"
+         "--with-system-potrace"
+         "--with-system-teckit"
+         "--with-system-zlib"
+         "--with-system-zziplib"
+         ;; LuaJIT is not ported to some architectures yet.
+         ,@(if (or (target-ppc64le?)
+                   (target-riscv64?))
+             '("--disable-luajittex"
+               "--disable-luajithbtex"
+               "--disable-mfluajit")
+             '()))
+
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-psutils-test
+           (lambda _
+             ;; This test fails due to a rounding difference with libpaper 1.2:
+             ;;   https://github.com/rrthomas/libpaper/issues/23
+             ;; Adjust the expected outcome to account for the minute difference.
+             (substitute* "texk/psutils/tests/playres.ps"
+               (("844\\.647799")
+                "844.647797"))))
+         (add-after 'unpack 'configure-ghostscript-executable
+           ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows,
+           ;; and the "gs" ghostscript executable on Unix. It detects Unix by
+           ;; checking for the existence of the /usr/bin directory. Since
+           ;; Guix System does not have /usr/bin, it is also detected as Windows.
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl"
+               (("gswin32c") "gs"))
+             (substitute* "texk/texlive/linked_scripts/epstopdf/epstopdf.pl"
+               (("\"gs\"")
+                (string-append "\"" (assoc-ref inputs "ghostscript") "/bin/gs\"")))))
+         (add-after 'unpack 'unpack-texlive-extra
+           (lambda* (#:key inputs #:allow-other-keys)
+             (mkdir "texlive-extra")
+             (with-directory-excursion "texlive-extra"
+               (apply (assoc-ref %standard-phases 'unpack)
+                      (list #:source (assoc-ref inputs "texlive-extra-src"))))))
+         (add-after 'install 'post-install
+           (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
+             (let* ((out (assoc-ref outputs "out"))
+                    (patch-source-shebangs (assoc-ref %standard-phases
+                                                      'patch-source-shebangs))
+                    (share (string-append out "/share"))
+                    (source (string-append
+                             "../" (first (scandir ".." (cut string-suffix?
+                                                             "source" <>)))))
+                    (tl-extra-root (string-append source "/texlive-extra"))
+                    (tl-extra-dir (first
+                                   (scandir tl-extra-root
+                                            (negate
+                                             (cut member <> '("." ".."))))))
+                    (tlpkg-src (string-append tl-extra-root "/" tl-extra-dir
+                                              "/tlpkg"))
+                    (config.guess (search-input-file inputs
+                                                     "/bin/config.guess")))
+
+               ;; Create symbolic links for the latex variants and their man
+               ;; pages.  We link lualatex to luahbtex; see issue #51252 for
+               ;; details.
+               (with-directory-excursion (string-append out "/bin/")
+                 (for-each symlink
+                           '("pdftex" "pdftex"   "xetex"   "luahbtex")
+                           '("latex"  "pdflatex" "xelatex" "lualatex")))
+               (with-directory-excursion (string-append share "/man/man1/")
+                 (symlink "luatex.1" "lualatex.1"))
+
+               ;; Install tlpkg.
+               (copy-recursively tlpkg-src (string-append share "/tlpkg"))
+               (with-directory-excursion share
+                 ;; Make sure tlmgr finds its Perl modules.
+                 ;; tlmgr is a script in bin/ that runs tlmgr.pl in
+                 ;; texmf-dist/; so although texmf-dist/ will be discarded in
+                 ;; the texlive package in favour of the one from texlivetexmf,
+                 ;; through the absolute path our modifications will be used
+                 ;; by the script.
+                 (substitute* "texmf-dist/scripts/texlive/tlmgr.pl"
+                   ((".*\\$::installerdir = \\$Master.*" all)
+                    (format #f "  $Master = ~s;~%~a" share all)))
+                 ;; Install the config.guess script, required by tlmgr.
+                 (mkdir-p "tlpkg/installer/")
+                 (symlink config.guess "tlpkg/installer/config.guess"))
+
+               ;; texlua shebangs are not patched by the patch-source-shebangs
+               ;; phase because the texlua executable does not exist at that
+               ;; time.
+               (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))
+               (with-directory-excursion out
+                 (patch-source-shebangs))))))))
+
+    (synopsis "TeX Live, a package of the TeX typesetting system")
+    (description
+     "TeX Live provides a comprehensive TeX document production system.
+It includes all the major TeX-related programs, macro packages, and fonts
+that are free software, including support for many languages around the
+world.
+
+This package contains the binaries.")
+    (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))
+    (home-page "https://www.tug.org/texlive/")))
+
+
+(define texlivetexmf
+  (package
+   (name "texlivetexmf")
+   (version %texlive-date)
+   (source texlive-texmf-src)
+   (build-system gnu-build-system)
+   (inputs
+    `(("texlive-bin" ,texlivebin)
+      ("lua" ,lua)
+      ("perl" ,perl)
+      ("python" ,python)
+      ("ruby" ,ruby)
+      ("tcsh" ,tcsh)))
+   (arguments
+    `(#:modules ((guix build gnu-build-system)
+                 (guix build utils)
+                 (srfi srfi-26))
+
+      ;; This package takes 4 GiB, which we can't afford to distribute from
+      ;; our servers.
+      #:substitutable? #f
+
+      #:phases
+        (modify-phases (map (cut assq <> %standard-phases)
+                            '(set-paths unpack patch-source-shebangs))
+          (add-after 'unpack 'unset-environment-variables
+            (lambda _
+              (unsetenv "TEXMF")
+              (unsetenv "TEXMFCNF")
+              #t))
+          (add-after 'patch-source-shebangs 'install
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((share (string-append (assoc-ref outputs "out") "/share")))
+                (mkdir-p share)
+                (invoke "mv" "texmf-dist" share))))
+          (add-after 'install 'texmf-config
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (share (string-append out "/share"))
+                     (texmfroot (string-append share "/texmf-dist/web2c"))
+                     (texmfcnf (string-append texmfroot "/texmf.cnf"))
+                     (fmtutilcnf (string-append texmfroot "/fmtutil.cnf"))
+                     (texlive-bin (assoc-ref inputs "texlive-bin"))
+                     (texbin (string-append texlive-bin "/bin"))
+                     (tlpkg (string-append texlive-bin "/share/tlpkg")))
+                ;; LuaJIT is not ported to some systems yet.
+                (if ,(or (target-ppc64le?)
+                         (target-riscv64?))
+                    (substitute* fmtutilcnf
+                      (("^(luajittex|luajithbtex|mfluajit)" m)
+                       (string-append "#! " m))))
+                ;; Register SHARE as TEXMFROOT in texmf.cnf.
+                (substitute* texmfcnf
+                  (("TEXMFROOT = \\$SELFAUTOPARENT")
+                   (string-append "TEXMFROOT = " share))
+                  (("TEXMFLOCAL = \\$SELFAUTOGRANDPARENT/texmf-local")
+                   "TEXMFLOCAL = $SELFAUTODIR/share/texmf-local")
+                  (("!!\\$TEXMFLOCAL") "$TEXMFLOCAL"))
+                ;; Register paths in texmfcnf.lua, needed for context.
+                (substitute* (string-append texmfroot "/texmfcnf.lua")
+                  (("selfautodir:") out)
+                  (("selfautoparent:") (string-append share "/")))
+                ;; Set path to TeXLive Perl modules
+                (setenv "PERL5LIB"
+                        (string-append (getenv "PERL5LIB") ":" tlpkg))
+                ;; Configure the texmf-dist tree; inspired from
+                ;; http://slackbuilds.org/repository/13.37/office/texlive/
+                (setenv "PATH" (string-append (getenv "PATH") ":" texbin))
+                (setenv "TEXMFCNF" texmfroot)
+                (invoke "updmap-sys" "--nohash" "--syncwithtrees")
+                (invoke "mktexlsr")
+                (invoke "fmtutil-sys" "--all")))))))
+   (properties `((max-silent-time . 9600))) ; don't time out while grafting
+   (synopsis "TeX Live, a package of the TeX typesetting system")
+   (description
+    "TeX Live provides a comprehensive TeX document production system.
+It includes all the major TeX-related programs, macro packages, and fonts
+that are free software, including support for many languages around the
+world.
+
+This package contains the complete tree of texmf-dist data.")
+   (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))
+   (home-page "https://www.tug.org/texlive/")))
+
+(define-public texlive
+  (package
+   (name "texlive")
+   (version %texlive-date)
+   (source #f)
+   (build-system trivial-build-system)
+   (inputs `(("bash" ,bash-minimal)     ;for wrap-program
+             ("texlive-bin" ,texlivebin)
+             ("texlive-texmf" ,texlivetexmf)))
+   (native-search-paths
+    (list (search-path-specification
+           (variable "TEXMFLOCAL")
+           (files '("share/texmf-local")))))
+   (arguments
+    `(#:modules ((guix build utils))
+      #:builder
+        ;; Build the union of texlive-bin and texlive-texmf, but take the
+        ;; conflicting subdirectory share/texmf-dist from texlive-texmf.
+        (begin
+          (use-modules (guix build utils))
+          (let ((out (assoc-ref %outputs "out"))
+                (bin (assoc-ref %build-inputs "texlive-bin"))
+                (texmf (assoc-ref %build-inputs "texlive-texmf"))
+                (bash (assoc-ref %build-inputs "bash")))
+               (mkdir out)
+               (with-directory-excursion out
+                 (for-each
+                   (lambda (name)
+                     (symlink (string-append bin "/" name) name))
+                   '("include" "lib"))
+                 (mkdir "bin")
+                 (with-directory-excursion "bin"
+                   (setenv "PATH" (string-append bash "/bin"))
+                   (for-each
+                     (lambda (name)
+                       (symlink name (basename name))
+                       (wrap-program
+                         (basename name)
+                         `("TEXMFCNF" =
+                           (,(string-append texmf "/share/texmf-dist/web2c")))))
+                     (find-files (string-append bin "/bin/") "")))
+                 (mkdir "share")
+                 (with-directory-excursion "share"
+                   (for-each
+                     (lambda (name)
+                       (symlink (string-append bin "/share/" name) name))
+                     '("info" "man" "tlpkg"))
+                   (for-each
+                     (lambda (name)
+                       (symlink (string-append texmf "/share/" name) name))
+                     '("texmf-dist" "texmf-var"))))
+               #t))))
+   (synopsis "TeX Live, a package of the TeX typesetting system")
+   (description
+    "TeX Live provides a comprehensive TeX document production system.
+It includes all the major TeX-related programs, macro packages, and fonts
+that are free software, including support for many languages around the
+world.
+
+This package contains the complete TeX Live distribution.")
+   (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))
+   (home-page "https://www.tug.org/texlive/")))
+
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index f51c47db04..b669ac2e8d 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -659,14 +659,14 @@ kilobytes of RAM.")
 (define-public libressl
   (package
     (name "libressl")
-    (version "3.6.1")
+    (version "3.7.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://openbsd/LibreSSL/"
                                   "libressl-" version ".tar.gz"))
               (sha256
                (base32
-                "0x37037rb0zx34zp0kbbqj2xwd57gh1m6bfn52f92fz92q9wdymc"))))
+                "1csx6gfgiqr43dw23qj2mr5jbkcd99kqavwb4vbmp0hcm5bchj3r"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 8ae2118188..7fec88656f 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -63,14 +63,14 @@
 (define-public tor
   (package
     (name "tor")
-    (version "0.4.7.13")
+    (version "0.4.7.14")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://dist.torproject.org/tor-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "17ga25dq2lcph390ljqmyd8sggp97h42d3h423qmci83rqn1fy90"))))
+               "1y2xwrji1rvk6h0k15705yra5s74h72h2g84x02zr0338vv6gb55"))))
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 117c2acb0c..4b191d4978 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
 ;;; Copyright © 2023 Andrew Tropin <andrew@trop.in>
 ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -390,6 +391,13 @@ will be used in description and synopsis."
    "054fmpf47cwh59gbg00sc0nl237ba4rnxi73miz39yqzcs87055r"
    "0.19.1"))
 
+(define-public tree-sitter-dockerfile
+  (tree-sitter-grammar
+   "dockerfile" "Dockerfile"
+   "0kf4c4xs5naj8lpcmr3pbdvwj526wl9p6zphxxpimbll7qv6qfnd"
+   "0.1.2"
+   #:repository-url "https://github.com/camdencheek/tree-sitter-dockerfile"))
+
 (define-public tree-sitter-elm
   (tree-sitter-grammar
    "elm" "Elm"
@@ -528,6 +536,18 @@ will be used in description and synopsis."
    "0.7.1"
    #:repository-url "https://github.com/ikatyang/tree-sitter-markdown"))
 
+(define-public tree-sitter-meson
+  ;; tag 1.2 is Aug 24,2022  this commit is Feb 28,2023
+  (let ((commit "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1")
+        (revision "0"))
+    (tree-sitter-grammar
+     "meson" "Meson"
+     "1rn7r76h65d41354czyccm59d1j9nzybcrjvjh934lpr59qrw61m"
+     (git-version "1.2" revision commit)
+     #:repository-url "https://github.com/Decodetalkers/tree-sitter-meson"
+     #:commit commit
+     #:license license:expat)))
+
 (define-public tree-sitter-org
   ;; There are a lot of additions, the last tag was placed a while ago
   (let ((commit "081179c52b3e8175af62b9b91dc099d010c38770")
diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 0b367675ae..f5d193cc6f 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -129,7 +129,7 @@ and security.")
      `(("glib-compile-schemas" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)))
     (propagated-inputs
-     (list librsvg
+     (list (librsvg-for-system)
            gsettings-desktop-schemas
            gtk+
            python-dateutil
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 42a9552ac8..699a091642 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3097,7 +3097,7 @@ will reconstruct the object along its delta-base chain and return it.")
 (define-public git-lfs
   (package
     (name "git-lfs")
-    (version "3.3.0")
+    (version "3.4.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -3106,7 +3106,7 @@ will reconstruct the object along its delta-base chain and return it.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1g268pplld04b9myhlrwc4fd8r1hvfyya5ja8wr558rar3pgsp5g"))))
+                "0ljjs8kyznp2ifkqdcd9q3550sknyx5qxx247icwkd9djjq7x74m"))))
     (build-system go-build-system)
     (arguments
      (list
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 7df68e8f53..ff52b9b38d 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1701,6 +1701,11 @@ operate properly.")
       ;;   --enable-libzvbi         enable teletext support via libzvbi [no]
       ;;   --enable-opencl          enable OpenCL code
       #~(list
+         #$@(if (target-powerpc?)
+                ;; These tests fail on powerpc64-le (see:
+                ;; https://trac.ffmpeg.org/ticket/9604).
+                '("--ignore-tests=checkasm-sw_scale,filter-scale2ref_keep_aspect")
+                '())
          "--enable-gpl"                 ;enable optional gpl licensed parts
          "--enable-shared"
          "--enable-frei0r"
@@ -2158,7 +2163,7 @@ streaming protocols.")
     (inputs
      (list alsa-lib
            cdparanoia
-           ffmpeg-4
+           ffmpeg-5
            fontconfig
            freetype
            giflib
@@ -4583,7 +4588,7 @@ tools for styling them, including a built-in real-time video preview.")
            python-pygobject))
     ;; Propagate librsvg so that is is registered in GDK_PIXBUF_MODULE_FILE,
     ;; otherwise pitivi fails to launch.
-    (propagated-inputs (list librsvg))
+    (propagated-inputs (list (librsvg-for-system)))
     (arguments
      `(#:glib-or-gtk? #t
        #:phases
diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm
index fda4c38dfe..72b6682385 100644
--- a/gnu/packages/vnc.scm
+++ b/gnu/packages/vnc.scm
@@ -130,7 +130,7 @@
            ffmpeg
            freerdp                      ; for rdp plugin
            libgcrypt
-           librsvg
+           (librsvg-for-system)
            glib
            gnome-keyring
            gsettings-desktop-schemas
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index c7143e38e1..ac46cffb19 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -586,7 +586,7 @@ driven and does not detract you from your daily work.")
 (define-public nyxt
   (package
     (name "nyxt")
-    (version "3.5.0")
+    (version "3.6.0")
     (source
      (origin
        (method git-fetch)
@@ -595,7 +595,7 @@ driven and does not detract you from your daily work.")
              (commit version)))
        (sha256
         (base32
-         "13ldi191ccxyxr3hjxyhnjl2vw365v0fhb1pqia7rg1gl3id47gz"))
+         "1difs5hw4avzfn2f33gi0w8nz9ja9fvwsl5m9f8izr8zsqlw98qd"))
        (file-name (git-file-name "nyxt" version))
        (modules '((guix build utils)))
        (snippet
@@ -656,6 +656,7 @@ driven and does not detract you from your daily work.")
                   sbcl-cl-ppcre
                   sbcl-cl-prevalence
                   sbcl-cl-qrencode
+                  sbcl-cl-sqlite
                   sbcl-cl-str
                   sbcl-cl-tld
                   sbcl-closer-mop
@@ -723,7 +724,7 @@ is fully configurable and extensible in Common Lisp.")
 (define-public lagrange
   (package
     (name "lagrange")
-    (version "1.16.6")
+    (version "1.16.7")
     (source
      (origin
        (method url-fetch)
@@ -731,7 +732,7 @@ is fully configurable and extensible in Common Lisp.")
         (string-append "https://git.skyjake.fi/skyjake/lagrange/releases/"
                        "download/v" version "/lagrange-" version ".tar.gz"))
        (sha256
-        (base32 "05wqg78l6jwbsmy8rsz14cp2wl1wss02vwrzfzpyx8qhjxcw7v32"))
+        (base32 "0ig7xdsihq7wc8h7n1af275z3kjxq5iiy0x4dwjahgligrdmj7vm"))
        (modules '((guix build utils)))
        (snippet
         '(begin
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index ae571965e6..febd45314b 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015 xd1le <elisp.vim@gmail.com>
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
-;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2019, 2020, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
 ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
 ;;; Copyright © 2016 2019, 2021-2022 Ludovic Courtès <ludo@gnu.org>
@@ -1073,7 +1073,8 @@ drags, snap-to-border support, and virtual desktops.")
                (base32
                 "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w"))
               (patches
-               (search-patches "fluxbox-1.3.7-no-dynamic-cursor.patch"))))
+               (search-patches "fluxbox-1.3.7-no-dynamic-cursor.patch"
+                               "fluxbox-1.3.7-gcc.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags '("CPPFLAGS=-U__TIME__") ;ugly, but for reproducibility
@@ -3045,7 +3046,7 @@ capabilities.  It is heavily inspired by the Calm Window manager(cwm).")
      (list cairo
            libjpeg-turbo
            libpng
-           librsvg
+           (librsvg-for-system)
            libxext
            libxinerama
            libxmu
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 032e2577ab..1c1ca32e7e 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -60,6 +60,7 @@
 ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
 ;;; Copyright © 2023 Jake Leporte <jakeleporte@outlook.com>
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
+;;; Copyright © 2022 Mehmet Tekman <mtekman89@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -103,6 +104,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages datastructures)
+  #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
@@ -273,7 +275,7 @@ program.")
 (define-public autorandr
   (package
     (name "autorandr")
-    (version "1.10.1")
+    (version "1.14")
     (home-page "https://github.com/phillipberndt/autorandr")
     (source
      (origin
@@ -283,7 +285,7 @@ program.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0msw9b1hdy3gbq9w5d04mfizhyirz1c648x84mlcbzl8salm7vpg"))))
+        (base32 "0yb0rnv37xymjhg54mk7zw3h9501f45ykc1754mxy1q3bm0fgva6"))))
     (build-system python-build-system)
     (native-inputs
      (list pkg-config))
@@ -1115,7 +1117,7 @@ shows it again when the mouse cursor moves or a mouse button is pressed.")
 (define-public xlockmore
   (package
     (name "xlockmore")
-    (version "5.68")
+    (version "5.72")
     (source (origin
               (method url-fetch)
               (uri (list (string-append "http://sillycycle.com/xlock/"
@@ -1126,7 +1128,7 @@ shows it again when the mouse cursor moves or a mouse button is pressed.")
                                         "xlockmore-" version ".tar.xz")))
               (sha256
                (base32
-                "0vndfwccnvkaaraprjam8pmx0aj55va0ag64q6snxw83nbf1ywrh"))))
+                "0wn77ri29rhk1w3wik2hpqb8lks1pyqzdk6d583mawxfcxcrf4fm"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -1145,6 +1147,57 @@ X Window System.")
     (license (license:non-copyleft #f "See xlock.c.")
              ))) ; + GPLv2 in modes/glx/biof.c.
 
+(define-public xtrlock
+  (package
+    (name "xtrlock")
+    (version "2.15")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://debian/pool/main/x/xtrlock/xtrlock_" version
+                    ".tar.xz"))
+              (sha256
+               (base32
+                "0mgpysbvipd5h6x6zz4hng6b13gp3qjnpgny3azyj8k8dv85bppw"))))
+    (build-system gnu-build-system)
+    (arguments
+     ;; LDLIBS are required for the package to build.
+     ;; CFLAGS are required for it to use the shadow file, and to
+     ;; be compatible with multi-touch devices.
+     (list #:make-flags
+           #~'("CFLAGS=-O2 -g -Wall -DSHADOW_PWD -DMULTITOUCH"
+               "LDLIBS=-lX11 -lcrypt -lXi")
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure)
+               (delete 'check)
+               (add-after 'unpack 'rename-makefile
+                 (lambda _
+                   (rename-file "Makefile.noimake" "Makefile")
+                   (rename-file "xtrlock.man" "xtrlock.1")))
+               (replace 'install
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let* ((out (assoc-ref outputs "out")))
+                     (install-file "xtrlock"
+                                   (string-append out "/bin/"))
+                     (install-file "xtrlock.1"
+                                   (string-append out
+                                                  "/share/man/man1/"))))))))
+    (inputs (list libx11 libxi libxfixes))
+    (home-page "https://packages.debian.org/sid/xtrlock")
+    (synopsis "Minimal X display lock program")
+    (description
+     "xtrlock locks the X server till the user enters their password at the
+keyboard.  While xtrlock is running, the mouse and keyboard are grabbed and
+the mouse cursor becomes a padlock.  Output displayed by X programs, and
+windows put up by new X clients, continue to be visible, and any new output is
+displayed normally.  The mouse and keyboard are returned when the user types
+their password, followed by Enter or Newline.  If an incorrect password is
+entered the bell is sounded.  Pressing Backspace or Delete erases one
+character of a password partially typed; pressing Escape or Clear clears
+anything that has been entered.")
+    (license license:gpl2+)))
+
 (define-public xosd
   (package
     (name "xosd")
@@ -1892,7 +1945,16 @@ Extensions, Shortcuts, File browser mode and Custom Color Themes.")
                                   version "/rofi-" version ".tar.xz"))
               (sha256
                (base32
-                "138c4bl60p7namsb2pk8q5cdlxbdkli7zny192vk5jv5s5kczzya"))))
+                "138c4bl60p7namsb2pk8q5cdlxbdkli7zny192vk5jv5s5kczzya"))
+              (snippet
+               #~(begin
+                   ;; Delete pre-generated files.
+                   (for-each delete-file
+                             (list "lexer/theme-lexer.c"
+                                   "lexer/theme-parser.c"
+                                   "lexer/theme-parser.h"
+                                   "resources/resources.c"
+                                   "resources/resources.h"))))))
     (build-system gnu-build-system)
     (native-inputs
      (list bison
@@ -1904,7 +1966,7 @@ Extensions, Shortcuts, File browser mode and Custom Color Themes.")
      (list cairo
            glib
            libjpeg-turbo
-           librsvg
+           (librsvg-for-system)
            libxcb
            libxkbcommon
            pango
@@ -2023,7 +2085,7 @@ natural language input and provide results.")
     (inputs
      (list gtk+
            imlib2
-           librsvg
+           (librsvg-for-system)
            libxcomposite
            libxdamage
            libxft
@@ -2044,6 +2106,46 @@ border, and background.  It also supports multihead setups, customized mouse
 actions, a built-in clock, a battery monitor and a system tray.")
     (license license:gpl2)))
 
+(define-public stalonetray
+  (package
+    (name "stalonetray")
+    (version "0.8.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://github.com/kolbusa/stalonetray")
+         (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "074wy1xppfycillbxq6fwrq87ik9glc95083df5vgm20mhzni7pz"))))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-docbook-root
+            (lambda _
+              (substitute* "configure.ac"
+                (("AC_SUBST\\(DOCBOOK_ROOT\\)" all)
+                 (string-append "DOCBOOK_ROOT="
+                                #$(this-package-native-input "docbook-xsl")
+                                "/xml/xsl/docbook-xsl-"
+                                #$(package-version (this-package-native-input "docbook-xsl"))
+                                "; " all))))))))
+    (inputs (list libx11 libxpm))
+    (native-inputs (list autoconf automake docbook-xsl libxslt))
+    (build-system gnu-build-system)
+    (home-page "https://kolbusa.github.io/stalonetray")
+    (synopsis "Standalone freedesktop.org and KDE systray implementation")
+    (description
+     "Stalonetray is a stand-alone freedesktop.org and KDE system
+tray (notification area) for X Window System/X11 (e.g. X.Org or XFree86).  It
+has full XEMBED support and minimal dependencies: an X11 lib only.  Stalonetray
+works with virtually any EWMH-compliant window manager.")
+    (license license:gpl2+)))
+
 (define-public tofi
   (package
     (name "tofi")
@@ -2559,14 +2661,14 @@ temperature of the screen.")
 (define-public xsecurelock
   (package
     (name "xsecurelock")
-    (version "1.7.0")
+    (version "1.8.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "https://github.com/google/xsecurelock/releases"
                     "/download/v" version "/xsecurelock-" version ".tar.gz"))
               (sha256
-               (base32 "0s2q69g1xhvs18q2jhcval5vpa9j0kkrdv02r176vvxvdms7hhc7"))))
+               (base32 "1i7vhzysirr5kra15vd501b79k0jgs11lkb9ck3hx6vicxm204d3"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags
@@ -3162,7 +3264,7 @@ using @command{dmenu}.")
                   fontconfig
                   libpng
                   libxkbcommon
-                  librsvg ;if librsvg is not used, bundled nanosvg is used
+                  (librsvg-for-system) ;if librsvg is not used, bundled nanosvg is used
                   pixman
                   wayland
                   wayland-protocols))
@@ -3216,7 +3318,7 @@ such as sway, similar to @command{rofi}.")
                 "0hq2qiqxvrw3g515ywcb676ljc8mdw3pyslgxr3vahizfljah1pv"))))
     (build-system meson-build-system)
     (native-inputs (list nlohmann-json pkg-config))
-    (inputs (list gtk-layer-shell gtkmm-3 librsvg))
+    (inputs (list gtk-layer-shell gtkmm-3 (librsvg-for-system)))
     (home-page "https://github.com/nwg-piotr/nwg-launchers")
     (synopsis "Application launchers for wlroots")
     (description
@@ -3450,7 +3552,7 @@ light filter or night light.")
 (define-public ydotool
   (package
     (name "ydotool")
-    (version "1.0.1")
+    (version "1.0.4")
     (source
      (origin
        (method git-fetch)
@@ -3459,7 +3561,7 @@ light filter or night light.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1h19dh7kai0iikssr7sq0wfkh0sb18dylyfg7c3dkwc158cdg9cr"))))
+        (base32 "0y2n1r6hx0ar1yn636a7j4ywm17qqji84ryhdina3kriwx3sgmij"))))
     (build-system cmake-build-system)
     (arguments '(#:tests? #f))          ; no tests
     (native-inputs (list scdoc))
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 705fbecfeb..fed7360aa8 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -891,6 +891,34 @@ GIT integration to Thunar, it adds Subversion and GIT actions to the context
 menu.")
     (license gpl2+)))
 
+(define-public thunarx-python
+  (package
+    (name "thunarx-python")
+    (version "0.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://archive.xfce.org/src/bindings/"
+                           name "/" (version-major+minor version)
+                           "/" name "-" version ".tar.bz2"))
+       (sha256
+        (base32 "08lz9pvx006a2fypg2q38p61jbhy0yswz8cizlxpiwfcqsvhpnln"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     (list pkg-config which))
+    (inputs
+     (list exo
+           thunar
+           python
+           python-pygobject
+           libxfce4ui
+           gtk+))
+    (home-page "https://gitlab.xfce.org/bindings/thunarx-python")
+    (synopsis "Python Bindings for Thunar")
+    (description
+     "These bindings allow one to create python plugins for Thunar.")
+    (license gpl2+)))
+
 (define-public xfwm4
   (package
     (name "xfwm4")
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 8d34ec3fe5..01e48fda57 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -88,7 +88,7 @@
 (define-public libxmlb
   (package
     (name "libxmlb")
-    (version "0.3.10")
+    (version "0.3.12")
     (source
      (origin
        (method git-fetch)
@@ -98,7 +98,7 @@
          (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1q7kizfgbvs02fdnvz09yjyy3v1dpbxl7xf1gx056mbnlib6faxs"))))
+        (base32 "0v9s2k5saxrs0ssjyg1zxaibybikvaw7fip6sy0b8ixzax9r5y0c"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t))
@@ -106,6 +106,8 @@
      (list gobject-introspection gtk-doc/stable pkg-config))
     (inputs
      (list appstream-glib glib))
+    (propagated-inputs
+     (list `(,zstd "lib")))             ; in Requires.private of xmlb.pc
     (synopsis "Library to help create and query binary XML blobs")
     (description "Libxmlb library takes XML source, and converts it to a
 structured binary representation with a deduplicated string table; where the
diff --git a/gnu/services.scm b/gnu/services.scm
index 109e050a23..eb9258977e 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015-2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
@@ -86,6 +86,10 @@
             instantiate-missing-services
             fold-services
 
+            remove-service-extensions
+            for-home
+            for-home?
+
             service-error?
             missing-value-service-error?
             missing-value-service-error-type
@@ -1225,4 +1229,23 @@ TARGET-TYPE; return the root service adjusted accordingly."
                            (G_ "more than one target service of type '~a'")
                            (service-type-name target-type)))))))))
 
+(define (remove-service-extensions type lst)
+  "Return TYPE, a service type, without any of the service extensions
+targeting one of the types in LST."
+  (service-type
+   (inherit type)
+   (extensions (remove (lambda (extension)
+                         (memq (service-extension-target extension) lst))
+                       (service-type-extensions type)))))
+
+(define-syntax-parameter for-home?
+  ;; Whether the configuration being defined is for a Home service.
+  (identifier-syntax #f))
+
+(define-syntax-rule (for-home exp ...)
+  "Mark EXP, which typically defines a service configuration, as targeting a
+Home service rather than a System service."
+  (syntax-parameterize ((for-home? (identifier-syntax #t)))
+    exp ...))
+
 ;;; services.scm ends here.
diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm
index edd8ce59da..5cf74c6e4d 100644
--- a/gnu/services/admin.scm
+++ b/gnu/services/admin.scm
@@ -22,7 +22,7 @@
 (define-module (gnu services admin)
   #:use-module (gnu packages admin)
   #:use-module ((gnu packages base)
-                #:select (canonical-package findutils))
+                #:select (canonical-package findutils coreutils sed))
   #:use-module (gnu packages certs)
   #:use-module (gnu packages package-management)
   #:use-module (gnu services)
@@ -290,7 +290,7 @@ Old log files are removed or compressed according to the configuration.")
   "10 23 * * 0")
 
 (define %default-file-database-excluded-directories
-  ;; Directories excluded from the 'locate' database.
+  ;; Regexps of directories excluded from the 'locate' database.
   (list (%store-prefix)
         "/tmp" "/var/tmp" "/var/cache" ".*/\\.cache"
         "/run/udev"))
@@ -319,10 +319,10 @@ is taken.")
 @command{updatedb} job (@pxref{Guile Syntax,,, mcron, GNU@tie{}mcron}).")
   (excluded-directories
    (string-list %default-file-database-excluded-directories)
-   "List of directories to ignore when building the file database.  By
-default, this includes @file{/tmp} and @file{/gnu/store}, which should instead
-be indexed by @command{guix locate} (@pxref{Invoking guix locate}).  This list
-is passed to the @option{--prunepaths} option of
+   "List of regular expressions of directories to ignore when building the
+file database.  By default, this includes @file{/tmp} and @file{/gnu/store};
+the latter should instead be indexed by @command{guix locate} (@pxref{Invoking
+guix locate}).  This list is passed to the @option{--prunepaths} option of
 @command{updatedb} (@pxref{Invoking updatedb,,, find, GNU@tie{}Findutils})."))
 
 (define (file-database-mcron-jobs configuration)
@@ -330,11 +330,20 @@ is passed to the @option{--prunepaths} option of
     (package schedule excluded-directories)
     (let ((updatedb (program-file
                      "updatedb"
-                     #~(execl #$(file-append package "/bin/updatedb")
-                              "updatedb"
-                              #$(string-append "--prunepaths="
-                                               (string-join
-                                                excluded-directories))))))
+                     #~(begin
+                         ;; 'updatedb' is a shell script that expects various
+                         ;; commands in $PATH.
+                         (setenv "PATH"
+                                 (string-append #$package "/bin:"
+                                                #$(canonical-package coreutils)
+                                                "/bin:"
+                                                #$(canonical-package sed)
+                                                "/bin"))
+                         (execl #$(file-append package "/bin/updatedb")
+                                "updatedb"
+                                #$(string-append "--prunepaths="
+                                                 (string-join
+                                                  excluded-directories)))))))
       (list #~(job #$schedule #$updatedb)))))
 
 (define file-database-service-type
diff --git a/gnu/services/authentication.scm b/gnu/services/authentication.scm
index f1ad1b1afe..fbfef2d3d0 100644
--- a/gnu/services/authentication.scm
+++ b/gnu/services/authentication.scm
@@ -504,7 +504,7 @@ password.")
 (define (pam-ldap-pam-service config)
   "Return a PAM service for LDAP authentication."
   (define pam-ldap-module
-    #~(string-append #$(nslcd-configuration-nss-pam-ldapd config)
+    (file-append (nslcd-configuration-nss-pam-ldapd config)
                      "/lib/security/pam_ldap.so"))
   (pam-extension
     (transformer
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 492cf8a693..b3f2d2e8b8 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1603,38 +1603,36 @@ information on the configuration file syntax."
 
 (define pam-limits-service-type
   (let ((pam-extension
-         (pam-extension
-          (transformer
-           (lambda (pam)
-             (let ((pam-limits (pam-entry
-                                (control "required")
-                                (module "pam_limits.so")
-                                (arguments
-                                 '("conf=/etc/security/limits.conf")))))
-               (if (member (pam-service-name pam)
-                           '("login" "greetd" "su" "slim" "gdm-password"
-                             "sddm" "sudo" "sshd" "lightdm"))
-                   (pam-service
-                    (inherit pam)
-                    (session (cons pam-limits
-                                   (pam-service-session pam))))
-                   pam))))))
-
-        ;; XXX: Using file-like objects is deprecated, use lists instead.
-        ;;      This is to be reduced into the list? case when the deprecated
-        ;;      code gets removed.
-        ;; Create /etc/security containing the provided "limits.conf" file.
-        (security-limits
+         (lambda (limits-file)
+           (pam-extension
+            (transformer
+             (lambda (pam)
+               (let ((pam-limits (pam-entry
+                                  (control "required")
+                                  (module "pam_limits.so")
+                                  (arguments
+                                   (list #~(string-append "conf=" #$limits-file))))))
+                 (if (member (pam-service-name pam)
+                             '("login" "greetd" "su" "slim" "gdm-password"
+                               "sddm" "lightdm" "sudo" "sshd"))
+                     (pam-service
+                      (inherit pam)
+                      (session (cons pam-limits
+                                     (pam-service-session pam))))
+                     pam)))))))
+        (make-limits-file
          (match-lambda
+           ;; XXX: Using file-like objects is deprecated, use lists instead.
+           ;;      This is to be reduced into the list? case when the deprecated
+           ;;      code gets removed.
            ((? file-like? obj)
             (warning (G_ "Using file-like value for \
 'pam-limits-service-type' is deprecated~%"))
-            `(("security/limits.conf" ,obj)))
+            obj)
            ((? list? lst)
-            `(("security/limits.conf"
-               ,(plain-file "limits.conf"
-                            (string-join (map pam-limits-entry->string lst)
-                                         "\n" 'suffix)))))
+            (plain-file "limits.conf"
+                        (string-join (map pam-limits-entry->string lst)
+                                     "\n" 'suffix)))
            (_ (raise
                (formatted-message
                 (G_ "invalid input for 'pam-limits-service-type'~%")))))))
@@ -1642,13 +1640,12 @@ information on the configuration file syntax."
     (service-type
      (name 'limits)
      (extensions
-      (list (service-extension etc-service-type security-limits)
-            (service-extension pam-root-service-type
-                               (lambda _ (list pam-extension)))))
+      (list (service-extension pam-root-service-type
+                               (lambda (config)
+                                 (list (pam-extension (make-limits-file config)))))))
      (description
-      "Install the specified resource usage limits by populating
-@file{/etc/security/limits.conf} and using the @code{pam_limits}
-authentication module.")
+      "Use the @code{pam_limits} authentication module to set the specified
+resource usage limits.")
      (default-value '()))))
 
 (define-deprecated (pam-limits-service #:optional (limits '()))
@@ -3266,7 +3263,7 @@ to handle."
   (define optional-pam-mount
     (pam-entry
      (control "optional")
-     (module #~(string-append #$greetd-pam-mount "/lib/security/pam_mount.so"))
+     (module (file-append greetd-pam-mount "/lib/security/pam_mount.so"))
      (arguments '("disable_interactive"))))
 
   (list
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index 7148971c1d..d3fee2a8ef 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -180,17 +180,30 @@ host	all	all	::1/128 	md5"))
   (data-directory     postgresql-configuration-data-directory
                       (default "/var/lib/postgresql/data"))
   (extension-packages postgresql-configuration-extension-packages
-                      (default '())))
-
-(define %postgresql-accounts
-  (list (user-group (name "postgres") (system? #t))
-        (user-account
-         (name "postgres")
-         (group "postgres")
-         (system? #t)
-         (comment "PostgreSQL server user")
-         (home-directory "/var/empty")
-         (shell (file-append shadow "/sbin/nologin")))))
+                      (default '()))
+  (create-account?    postgresql-configuration-create-account?
+                      (default #t))
+  (uid                postgresql-configuration-uid
+                      (default #f))
+  (gid                postgresql-configuration-gid
+                      (default #f)))
+
+(define (create-postgresql-account config)
+  (match-record config <postgresql-configuration>
+    (create-account? uid gid)
+    (if (not create-account?) '()
+        (list (user-group
+               (name "postgres")
+               (id gid)
+               (system? #t))
+              (user-account
+               (name "postgres")
+               (group "postgres")
+               (system? #t)
+               (uid uid)
+               (comment "PostgreSQL server user")
+               (home-directory "/var/empty")
+               (shell (file-append shadow "/sbin/nologin")))))))
 
 (define (final-postgresql postgresql extension-packages)
   (if (null? extension-packages)
@@ -327,7 +340,7 @@ host	all	all	::1/128 	md5"))
           (service-extension activation-service-type
                              postgresql-activation)
           (service-extension account-service-type
-                             (const %postgresql-accounts))
+                             create-postgresql-account)
           (service-extension
            profile-service-type
            (compose list postgresql-configuration-postgresql))))
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 01aec64bee..5b79fbcda1 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2017, 2020, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2017 Nikita <nikita@n0.is>
+;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2018, 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018, 2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017, 2019 Christopher Baines <mail@cbaines.net>
@@ -15,6 +16,7 @@
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2021, 2022 muradm <mail@muradm.net>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -55,6 +57,9 @@
   #:use-module (gnu packages cups)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages kde)
+  #:use-module (gnu packages kde-frameworks)
+  #:use-module (gnu packages kde-plasma)
   #:use-module (gnu packages xfce)
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages xdisorg)
@@ -150,6 +155,10 @@
             sugar-desktop-configuration?
             sugar-desktop-service-type
 
+            plasma-desktop-configuration
+            plasma-desktop-configuration?
+            plasma-desktop-service-type
+
             xfce-desktop-configuration
             xfce-desktop-configuration?
             xfce-desktop-service
@@ -1165,6 +1174,10 @@ started~%")
                             (string-append #$output service-directory))
           (symlink (string-append #$elogind "/etc") ;for etc/dbus-1
                    (string-append #$output "/etc"))
+          ;; Also expose the D-Bus policy configurations (.conf) files, now
+          ;; installed under '/share' instead of the legacy '/etc' prefix.
+          (symlink (string-append #$elogind "/share/dbus-1/system.d")
+                   (string-append #$output "/share/dbus-1/system.d"))
 
           ;; Replace the "Exec=" line of the 'org.freedesktop.login1.service'
           ;; file with one that refers to WRAPPER instead of elogind.
@@ -1625,6 +1638,50 @@ profile, and extends dbus with the ability for @code{efl} to generate
 thumbnails and makes setuid the programs which enlightenment needs to function
 as expected.")))
 
+;;;
+;;; KDE Plasma desktop service.
+;;;
+
+(define-record-type* <plasma-desktop-configuration> plasma-desktop-configuration
+  make-plasma-desktop-configuration
+  plasma-desktop-configuration?
+  (plasma-package plasma-package (default plasma)))
+
+(define (plasma-polkit-settings config)
+  "Return the list of KDE Plasma dependencies that provide polkit actions and
+rules."
+  (let ((plasma-plasma (plasma-package config)))
+    (map (lambda (name)
+           ((package-direct-input-selector name) plasma-plasma))
+         '("plasma-desktop"
+           "plasma-workspace"
+           "plasma-disks"
+           "kinfocenter"
+           "libksysguard"
+           "ktexteditor"
+           "powerdevil"
+           "plasma-firewall"))))
+
+;; see https://bugs.kde.org/show_bug.cgi?id=456210
+;; if `kde' no exits, fallback to `other', and then unlock lockscreen not work,
+;; so add it.
+(define (plasma-pam-services config)
+  (list (unix-pam-service "kde")))
+
+(define plasma-desktop-service-type
+  (service-type
+   (name 'plasma-desktop)
+   (description "Run the KDE Plasma desktop environment.")
+   (default-value (plasma-desktop-configuration))
+   (extensions
+    (list (service-extension polkit-service-type
+                             plasma-polkit-settings)
+          (service-extension pam-root-service-type
+                             plasma-pam-services)
+          (service-extension profile-service-type
+                             (compose list
+                                      plasma-package))))))
+
 
 ;;;
 ;;; inputattach-service-type
diff --git a/gnu/services/dict.scm b/gnu/services/dict.scm
index 23e1d36364..a4e25f5302 100644
--- a/gnu/services/dict.scm
+++ b/gnu/services/dict.scm
@@ -56,7 +56,9 @@
   (handlers    dicod-configuration-handlers       ;list of <dicod-handler>
                (default '()))
   (databases   dicod-configuration-databases      ;list of <dicod-database>
-               (default (list %dicod-database:gcide))))
+               (default (list %dicod-database:gcide)))
+  (home-service? dicod-configuration-home-service? ;boolean
+                 (default for-home?) (innate)))
 
 (define-record-type* <dicod-handler>
   dicod-handler make-dicod-handler
@@ -73,12 +75,24 @@
   (complex?    dicod-database-complex?       (default #f))
   (options     dicod-database-options        (default '())))
 
+(define %dicod-gcide-index
+  ;; The GCIDE pre-built index.  The Dico 'gcide' module can build it lazily;
+  ;; do it upfront so there's no need for a writable directory at run-time.
+  (computed-file "dicod-gcide-index"
+                 (with-imported-modules '((guix build utils))
+                   #~(begin
+                       (use-modules (guix build utils))
+                       (mkdir #$output)
+                       (invoke #+(file-append dico "/libexec/idxgcide")
+                               #+(file-append gcide "/share/gcide")
+                               #$output)))))
+
 (define %dicod-database:gcide
   (dicod-database
    (name "gcide")
    (handler "gcide")
    (options (list #~(string-append "dbdir=" #$gcide "/share/gcide")
-                  "idxdir=/var/run/dicod"))))
+                  #~(string-append "idxdir=" #$%dicod-gcide-index)))))
 
 (define %dicod-accounts
   (list (user-group
@@ -137,55 +151,43 @@ database {
 
   (apply mixed-text-file "dicod.conf" (configuration->text config)))
 
-(define %dicod-activation
-  #~(begin
-      (use-modules (guix build utils))
-      (let ((user   (getpwnam "dicod"))
-            (rundir "/var/run/dicod"))
-        (mkdir-p rundir)
-        (chown rundir (passwd:uid user) (passwd:gid user)))))
-
 (define (dicod-shepherd-service config)
   (let* ((dicod.conf (dicod-configuration-file config))
          (interfaces (dicod-configuration-interfaces config))
+         (home-service? (dicod-configuration-home-service? config))
+         (mappings  `(,@(if home-service?
+                            '()
+                            (list (file-system-mapping
+                                   (source "/dev/log")
+                                   (target source))))
+                      ,(file-system-mapping
+                        (source dicod.conf)
+                        (target source))))
          (dicod      (least-authority-wrapper
                       (file-append (dicod-configuration-dico config)
                                    "/bin/dicod")
                       #:name "dicod"
-                      #:mappings (list (file-system-mapping
-                                        (source "/var/run/dicod")
-                                        (target source)
-                                        (writable? #t))
-                                       (file-system-mapping
-                                        (source "/dev/log")
-                                        (target source))
-                                       (file-system-mapping
-                                        (source dicod.conf)
-                                        (target source)))
+                      #:mappings mappings
                       #:namespaces (delq 'net %namespaces))))
     (list (shepherd-service
            (provision '(dicod))
-           (requirement '(user-processes))
+           (requirement (if home-service?
+                            '()
+                            '(user-processes)))
            (documentation "Run the dicod daemon.")
-           (start #~(if (defined? 'make-inetd-constructor)
-                        (make-inetd-constructor
-                         (list #$dicod "--inetd" "--foreground"
-                               (string-append "--config=" #$dicod.conf))
-                         (map (lambda (interface)
-                                (endpoint
-                                 (addrinfo:addr
-                                  (car (getaddrinfo interface "dict")))))
-                              '#$interfaces)
-                         #:requirements '#$requirement
-                         #:user "dicod" #:group "dicod"
-                         #:service-name-stem "dicod")
-                        (make-forkexec-constructor
-                         (list #$dicod "--foreground"
-                               (string-append "--config=" #$dicod.conf))
-                         #:user "dicod" #:group "dicod")))
-           (stop #~(if (defined? 'make-inetd-destructor)
-                       (make-inetd-destructor)
-                       (make-kill-destructor)))
+           (start #~(make-inetd-constructor
+                     (list #$dicod "--inetd" "--foreground"
+                           (string-append "--config=" #$dicod.conf))
+                     (map (lambda (interface)
+                            (endpoint
+                             (addrinfo:addr
+                              (car (getaddrinfo interface "dict")))))
+                          '#$interfaces)
+                     #:requirements '#$requirement
+                     #:user #$(and (not home-service?) "dicod")
+                     #:group #$(and (not home-service?) "dicod")
+                     #:service-name-stem "dicod"))
+           (stop #~(make-inetd-destructor))
            (actions (list (shepherd-configuration-action dicod.conf)))))))
 
 (define dicod-service-type
@@ -194,8 +196,6 @@ database {
    (extensions
     (list (service-extension account-service-type
                              (const %dicod-accounts))
-          (service-extension activation-service-type
-                             (const %dicod-activation))
           (service-extension shepherd-root-service-type
                              dicod-shepherd-service)))
    (default-value (dicod-configuration))
diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm
index f45fc99c69..6608046909 100644
--- a/gnu/services/dns.scm
+++ b/gnu/services/dns.scm
@@ -1,6 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
-;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022 Remco van 't Veer <remco@remworks.net>
@@ -53,10 +52,7 @@
             knot-resolver-configuration
 
             dnsmasq-service-type
-            dnsmasq-configuration
-
-            ddclient-service-type
-            ddclient-configuration))
+            dnsmasq-configuration))
 
 ;;;
 ;;; Knot DNS.
@@ -901,165 +897,3 @@ cache.size = 100 * MB
                              dnsmasq-activation)))
    (default-value (dnsmasq-configuration))
    (description "Run the dnsmasq DNS server.")))
-
-
-;;;
-;;; ddclient
-;;;
-
-(define (uglify-field-name field-name)
-  (string-delete #\? (symbol->string field-name)))
-
-(define (serialize-field field-name val)
-  (when (not (member field-name '(group secret-file user)))
-    (format #t "~a=~a\n" (uglify-field-name field-name) val)))
-
-(define (serialize-boolean field-name val)
-  (serialize-field field-name (if val "yes" "no")))
-
-(define (serialize-integer field-name val)
-  (serialize-field field-name (number->string val)))
-
-(define (serialize-string field-name val)
-  (if (and (string? val) (string=? val ""))
-      ""
-      (serialize-field field-name val)))
-
-(define (serialize-list field-name val)
-  (if (null? val) "" (serialize-field field-name (string-join val))))
-
-(define (serialize-extra-options extra-options)
-  (string-join extra-options "\n" 'suffix))
-
-(define-configuration ddclient-configuration
-  (ddclient
-   (file-like ddclient)
-   "The ddclient package.")
-  (daemon
-   (integer 300)
-   "The period after which ddclient will retry to check IP and domain name.")
-  (syslog
-   (boolean #t)
-   "Use syslog for the output.")
-  (mail
-   (string "root")
-   "Mail to user.")
-  (mail-failure
-   (string "root")
-   "Mail failed update to user.")
-  (pid
-   (string "/var/run/ddclient/ddclient.pid")
-   "The ddclient PID file.")
-  (ssl
-   (boolean #t)
-   "Enable SSL support.")
-  (user
-   (string "ddclient")
-   "Specifies the user name or ID that is used when running ddclient
-program.")
-  (group
-   (string "ddclient")
-   "Group of the user who will run the ddclient program.")
-  (secret-file
-   (string "/etc/ddclient/secrets.conf")
-   "Secret file which will be appended to @file{ddclient.conf} file.  This
-file contains credentials for use by ddclient.  You are expected to create it
-manually.")
-  (extra-options
-   (list '())
-   "Extra options will be appended to @file{ddclient.conf} file."))
-
-(define (ddclient-account config)
-  "Return the user accounts and user groups for CONFIG."
-  (let ((ddclient-user (ddclient-configuration-user config))
-        (ddclient-group (ddclient-configuration-group config)))
-    (list (user-group
-           (name ddclient-group)
-           (system? #t))
-          (user-account
-           (name ddclient-user)
-           (system? #t)
-           (group ddclient-group)
-           (comment "ddclientd privilege separation user")
-           (home-directory (string-append "/var/run/" ddclient-user))))))
-
-(define (ddclient-activation config)
-  "Return the activation GEXP for CONFIG."
-  (with-imported-modules '((guix build utils))
-    #~(begin
-        (use-modules (guix build utils)
-                     (ice-9 rdelim))
-        (let ((ddclient-user
-               (passwd:uid (getpw #$(ddclient-configuration-user config))))
-              (ddclient-group
-               (passwd:gid (getpw #$(ddclient-configuration-group config))))
-              (ddclient-secret-file
-               #$(ddclient-configuration-secret-file config)))
-          ;; 'ddclient' complains about ddclient.conf file permissions, which
-          ;; rules out /gnu/store.  Thus we copy the ddclient.conf to /etc.
-          (for-each (lambda (dir)
-                      (mkdir-p dir)
-                      (chmod dir #o700)
-                      (chown dir ddclient-user ddclient-group))
-                    '("/var/cache/ddclient" "/var/run/ddclient"
-                      "/etc/ddclient"))
-          (with-output-to-file "/etc/ddclient/ddclient.conf"
-            (lambda ()
-              (display
-               (string-append
-                "# Generated by 'ddclient-service'.\n\n"
-                #$(with-output-to-string
-                    (lambda ()
-                      (serialize-configuration config
-                                               ddclient-configuration-fields)))
-                (if (string-null? ddclient-secret-file)
-                    ""
-                    (format #f "\n\n# Appended from '~a'.\n\n~a"
-                            ddclient-secret-file
-                            (with-input-from-file ddclient-secret-file
-                              read-string)))))))
-          (chmod "/etc/ddclient/ddclient.conf" #o600)
-          (chown "/etc/ddclient/ddclient.conf"
-                 ddclient-user ddclient-group)))))
-
-(define (ddclient-shepherd-service config)
-  "Return a <shepherd-service> for ddclient with CONFIG."
-  (let ((ddclient (ddclient-configuration-ddclient config))
-        (ddclient-pid (ddclient-configuration-pid config))
-        (ddclient-user (ddclient-configuration-user config))
-        (ddclient-group (ddclient-configuration-group config)))
-    (list (shepherd-service
-           (provision '(ddclient))
-           (documentation "Run ddclient daemon.")
-           (start #~(make-forkexec-constructor
-                     (list #$(file-append ddclient "/bin/ddclient")
-                           "-foreground"
-                           "-file" "/etc/ddclient/ddclient.conf")
-                     #:pid-file #$ddclient-pid
-                     #:environment-variables
-                     (list "SSL_CERT_DIR=/run/current-system/profile\
-/etc/ssl/certs"
-                           "SSL_CERT_FILE=/run/current-system/profile\
-/etc/ssl/certs/ca-certificates.crt")
-                     #:user #$ddclient-user
-                     #:group #$ddclient-group))
-           (stop #~(make-kill-destructor))))))
-
-(define ddclient-service-type
-  (service-type
-   (name 'ddclient)
-   (extensions
-    (list (service-extension account-service-type
-                             ddclient-account)
-          (service-extension shepherd-root-service-type
-                             ddclient-shepherd-service)
-          (service-extension activation-service-type
-                             ddclient-activation)))
-   (default-value (ddclient-configuration))
-   (description "Configure address updating utility for dynamic DNS services,
-ddclient.")))
-
-(define (generate-ddclient-documentation)
-  (generate-documentation
-   `((ddclient-configuration ,ddclient-configuration-fields))
-   'ddclient-configuration))
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
index 1450eedf37..81bfe45e4e 100644
--- a/gnu/services/guix.scm
+++ b/gnu/services/guix.scm
@@ -440,7 +440,7 @@
      (shepherd-service
       (documentation "Guix Build Coordinator Agent")
       (provision '(guix-build-coordinator-agent))
-      (requirement '(networking))
+      (requirement '(networking user-processes))
       (start
        #~(lambda _
            (parameterize ((%current-logfile-date-format ""))
diff --git a/gnu/services/kerberos.scm b/gnu/services/kerberos.scm
index 1a1b37f890..a6f540a9b6 100644
--- a/gnu/services/kerberos.scm
+++ b/gnu/services/kerberos.scm
@@ -432,8 +432,8 @@ generates such a file.  It does not cause any daemon to be started.")))
    (transformer
     (lambda (pam)
       (define pam-krb5-module
-        #~(string-append #$(pam-krb5-configuration-pam-krb5 config)
-                         "/lib/security/pam_krb5.so"))
+        (file-append (pam-krb5-configuration-pam-krb5 config)
+                     "/lib/security/pam_krb5.so"))
 
       (let ((pam-krb5-sufficient
              (pam-entry
diff --git a/gnu/services/linux.scm b/gnu/services/linux.scm
index d105c42850..1f01b39a21 100644
--- a/gnu/services/linux.scm
+++ b/gnu/services/linux.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2021 B. Wilson <elaexuotee@wilsonb.com>
 ;;; Copyright © 2022 Josselin Poiret <dev@jpoiret.xyz>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
+;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -67,6 +68,28 @@
 
             kernel-module-loader-service-type
 
+            cachefilesd-configuration
+            cachefilesd-configuration?
+            cachefilesd-configuration-cachefilesd
+            cachefilesd-configuration-debug-output?
+            cachefilesd-configuration-use-syslog?
+            cachefilesd-configuration-scan?
+            cachefilesd-configuration-cache-directory
+            cachefilesd-configuration-cache-name
+            cachefilesd-configuration-security-context
+            cachefilesd-configuration-pause-culling-for-block-percentage
+            cachefilesd-configuration-pause-culling-for-file-percentage
+            cachefilesd-configuration-resume-culling-for-block-percentage
+            cachefilesd-configuration-resume-culling-for-file-percentage
+            cachefilesd-configuration-pause-caching-for-block-percentage
+            cachefilesd-configuration-pause-caching-for-file-percentage
+            cachefilesd-configuration-log2-table-size
+            cachefilesd-configuration-cull?
+            cachefilesd-configuration-trace-function-entry-in-kernel-module
+            cachefilesd-configuration-trace-function-exit-in-kernel-module
+            cachefilesd-configuration-trace-internal-checkpoints-in-kernel-module
+            cachefilesd-service-type
+
             rasdaemon-configuration
             rasdaemon-configuration?
             rasdaemon-configuration-record?
@@ -151,6 +174,7 @@ representation."
   (shepherd-service
    (documentation "Run the Early OOM daemon.")
    (provision '(earlyoom))
+   (requirement '(user-processes))
    (start #~(make-forkexec-constructor
              '#$(earlyoom-configuration->command-line-args config)
              #:log-file "/var/log/earlyoom.log"))
@@ -169,7 +193,8 @@ representation."
                              (compose list earlyoom-shepherd-service))
           (service-extension rottlog-service-type
                              (const %earlyoom-log-rotation))))
-   (description "Run @command{earlyoom}, the Early OOM daemon.")))
+   (description "Run @command{earlyoom}, a daemon that quickly responds to
+@acronym{OOM, out-of-memory} conditions by terminating relevant processes.")))
 
 
 ;;;
@@ -308,6 +333,180 @@ more information)."
 
 
 ;;;
+;;; Cachefilesd, an FS-Cache daemon
+;;;
+
+(define (serialize-string variable-symbol value)
+  #~(format #f "~a ~a~%" #$(symbol->string variable-symbol) #$value))
+
+(define-maybe string)
+
+(define (non-negative-integer? val)
+  (and (exact-integer? val) (not (negative? val))))
+
+(define (serialize-non-negative-integer variable-symbol value)
+  #~(format #f "~a ~d~%" #$(symbol->string variable-symbol) #$value))
+
+(define-maybe non-negative-integer)
+
+(define (make-option-serializer option-symbol)
+  (lambda (variable-symbol text)
+    (if (maybe-value-set? text)
+        #~(format #f "~a ~a~%" #$(symbol->string option-symbol) #$text)
+        "")))
+
+(define (make-percentage-threshold-serializer threshold-symbol)
+  (lambda (variable-symbol percentage)
+    (if (maybe-value-set? percentage)
+        #~(format #f "~a ~a%~%" #$(symbol->string threshold-symbol) #$percentage)
+        "")))
+
+(define-configuration cachefilesd-configuration
+  (cachefilesd
+   (file-like cachefilesd)
+   "The cachefilesd package to use."
+   (serializer empty-serializer))
+
+  ;; command-line options
+  (debug-output?
+   (boolean #f)
+   "Print debugging output to stderr."
+   (serializer empty-serializer))
+
+  (use-syslog?
+   (boolean #t)
+   "Log to syslog facility instead of stdout."
+   (serializer empty-serializer))
+
+  ;; culling is part of the configuration file
+  ;; despite the name of the command-line option
+  (scan?
+   (boolean #t)
+   "Scan for cachable objects."
+   (serializer empty-serializer))
+
+  ;; sole required field in the configuration file
+  (cache-directory
+   maybe-string
+   "Location of the cache directory."
+   (serializer (make-option-serializer 'dir)))
+
+  (cache-name
+   (maybe-string "CacheFiles")
+   "Name of cache (keep unique)."
+   (serializer (make-option-serializer 'tag)))
+
+  (security-context
+   maybe-string
+   "SELinux security context."
+   (serializer (make-option-serializer 'secctx)))
+
+  ;; percentage thresholds in the configuration file
+  (pause-culling-for-block-percentage
+   (maybe-non-negative-integer 7)
+   "Pause culling when available blocks exceed this percentage."
+   (serializer (make-percentage-threshold-serializer 'brun)))
+
+  (pause-culling-for-file-percentage
+   (maybe-non-negative-integer 7)
+   "Pause culling when available files exceed this percentage."
+   (serializer (make-percentage-threshold-serializer 'frun)))
+
+  (resume-culling-for-block-percentage
+   (maybe-non-negative-integer 5)
+   "Start culling when available blocks drop below this percentage."
+   (serializer (make-percentage-threshold-serializer 'bcull)))
+
+  (resume-culling-for-file-percentage
+   (maybe-non-negative-integer 5)
+   "Start culling when available files drop below this percentage."
+   (serializer (make-percentage-threshold-serializer 'fcull)))
+
+  (pause-caching-for-block-percentage
+   (maybe-non-negative-integer 1)
+   "Pause further allocations when available blocks drop below this percentage."
+   (serializer (make-percentage-threshold-serializer 'bstop)))
+
+  (pause-caching-for-file-percentage
+   (maybe-non-negative-integer 1)
+   "Pause further allocations when available files drop below this percentage."
+   (serializer (make-percentage-threshold-serializer 'fstop)))
+
+  ;; run time optimizations in the configuration file
+  (log2-table-size
+   (maybe-non-negative-integer 12)
+   "Size of tables holding cullable objects in logarithm of base 2."
+   (serializer (make-option-serializer 'culltable)))
+
+  (cull?
+   (boolean #t)
+   "Create free space by culling (consumes system load)."
+   (serializer
+    (lambda (variable-symbol value)
+      (if value "" "nocull\n"))))
+
+  ;; kernel module debugging in the configuration file
+  (trace-function-entry-in-kernel-module?
+   (boolean #f)
+   "Trace function entry in the kernel module (for debugging)."
+   (serializer empty-serializer))
+
+  (trace-function-exit-in-kernel-module?
+   (boolean #f)
+   "Trace function exit in the kernel module (for debugging)."
+   (serializer empty-serializer))
+
+  (trace-internal-checkpoints-in-kernel-module?
+   (boolean #f)
+   "Trace internal checkpoints in the kernel module (for debugging)."
+   (serializer empty-serializer)))
+
+(define (serialize-cachefilesd-configuration configuration)
+  (mixed-text-file
+   "cachefilesd.conf"
+   (serialize-configuration configuration cachefilesd-configuration-fields)))
+
+(define (cachefilesd-shepherd-service config)
+  "Return a list of <shepherd-service> for cachefilesd for CONFIG."
+  (match-record
+      config <cachefilesd-configuration> (cachefilesd
+                                          debug-output?
+                                          use-syslog?
+                                          scan?
+                                          cache-directory)
+      (let ((configuration-file (serialize-cachefilesd-configuration config)))
+        (shepherd-service
+         (documentation "Run the cachefilesd daemon for FS-Cache.")
+         (provision '(cachefilesd))
+         (requirement (append '(file-systems)
+                              (if use-syslog? '(syslogd) '())))
+         (start #~(begin
+                    (and=> #$(maybe-value cache-directory) mkdir-p)
+                    (make-forkexec-constructor
+                     `(#$(file-append cachefilesd "/sbin/cachefilesd")
+                       ;; do not detach
+                       "-n"
+                       #$@(if debug-output? '("-d") '())
+                       #$@(if use-syslog? '() '("-s"))
+                       #$@(if scan? '() '("-N"))
+                       "-f" #$configuration-file))))
+         (stop #~(make-kill-destructor))))))
+
+(define cachefilesd-service-type
+  (service-type
+   (name 'cachefilesd)
+   (description
+    "Run the file system cache daemon @command{cachefilesd}, which relies on
+the Linux @code{cachefiles} module.")
+   (extensions
+    (list (service-extension kernel-module-loader-service-type
+                             (const '("cachefiles")))
+          (service-extension shepherd-root-service-type
+                             (compose list cachefilesd-shepherd-service))))
+   (default-value (cachefilesd-configuration))))
+
+
+;;;
 ;;; Reliability, Availability, and Serviceability (RAS) daemon
 ;;;
 
@@ -351,7 +550,7 @@ more information)."
 
 
 ;;;
-;;; Kernel module loader.
+;;; Zram device
 ;;;
 
 (define-record-type* <zram-device-configuration>
diff --git a/gnu/services/mcron.scm b/gnu/services/mcron.scm
index 2ef5980e09..cea68beef8 100644
--- a/gnu/services/mcron.scm
+++ b/gnu/services/mcron.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016-2020, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;;
@@ -20,10 +20,8 @@
 
 (define-module (gnu services mcron)
   #:use-module (gnu services)
-  #:use-module (gnu services configuration)
   #:use-module (gnu services shepherd)
   #:use-module (gnu packages guile-xyz)
-  #:use-module (guix deprecation)
   #:use-module (guix records)
   #:use-module (guix gexp)
   #:use-module (srfi srfi-1)
@@ -37,6 +35,7 @@
             mcron-configuration-log-file
             mcron-configuration-log-format
             mcron-configuration-date-format
+            mcron-configuration-home-service?
 
             mcron-service-type))
 
@@ -55,40 +54,34 @@
 ;;;
 ;;; Code:
 
-(define list-of-gexps?
-  (list-of gexp?))
-
-(define-maybe/no-serialization string)
-
-(define-configuration/no-serialization mcron-configuration
-  (mcron
-   (file-like mcron)
-   "The mcron package to use.")
-
-  (jobs
-   (list-of-gexps '())
-   "This is a list of gexps (@pxref{G-Expressions}), where each gexp
-corresponds to an mcron job specification (@pxref{Syntax, mcron job
-specifications,, mcron, GNU@tie{}mcron}).")
-
-  (log?
-   (boolean #t)
-   "Log messages to standard output.")
-
-  (log-file
-   (string "/var/log/mcron.log")
-   "Log file location.")
-
-  (log-format
-   (string "~1@*~a ~a: ~a~%")
-   "@code{(ice-9 format)} format string for log messages.  The default value
-produces messages like @samp{@var{pid} @var{name}: @var{message}}
-(@pxref{Invoking mcron, Invoking,, mcron, GNU@tie{}mcron}).
-Each message is also prefixed by a timestamp by GNU Shepherd.")
-
-  (date-format
-   maybe-string
-   "@code{(srfi srfi-19)} format string for date."))
+;; Configuration of mcron.
+;; XXX: 'define-configuration' cannot be used here due to the need for
+;; 'thunked' and 'innate' fields as well as 'this-mcron-configuration'.
+(define-record-type* <mcron-configuration> mcron-configuration
+  make-mcron-configuration
+  mcron-configuration?
+  this-mcron-configuration
+
+  (mcron       mcron-configuration-mcron          ;file-like
+               (default mcron))
+  (jobs        mcron-configuration-jobs           ;list of gexps
+               (default '()))
+  (log?        mcron-configuration-log?           ;Boolean
+               (default #t))
+  (log-file    mcron-configuration-log-file       ;string | gexp
+               (thunked)
+               (default
+                 (if (mcron-configuration-home-service?
+                      this-mcron-configuration)
+                     #~(string-append %user-log-dir "/mcron.log")
+                     "/var/log/mcron.log")))
+  (log-format  mcron-configuration-log-format     ;string
+               (default "~1@*~a ~a: ~a~%"))
+  (date-format mcron-configuration-date-format    ;string | #f
+               (default #f))
+
+  (home-service? mcron-configuration-home-service?
+                 (default for-home?) (innate)))
 
 (define (job-files mcron jobs)
   "Return a list of file-like object for JOBS, a list of gexps."
@@ -158,24 +151,27 @@ files."
 
 (define (mcron-shepherd-services config)
   (match-record config <mcron-configuration>
-    (mcron jobs log? log-file log-format date-format)
+    (mcron jobs log? log-file log-format date-format home-service?)
     (if (eq? jobs '())
         '()                             ;nothing to do
         (let ((files (job-files mcron jobs)))
           (list (shepherd-service
                  (provision '(mcron))
-                 (requirement '(user-processes))
+                 (requirement (if home-service?
+                                  '()
+                                  '(user-processes)))
                  (modules `((srfi srfi-1)
                             (srfi srfi-26)
                             (ice-9 popen) ;for the 'schedule' action
                             (ice-9 rdelim)
                             (ice-9 match)
+                            ((shepherd support) #:select (%user-log-dir))
                             ,@%default-modules))
                  (start #~(make-forkexec-constructor
                            (list #$(file-append mcron "/bin/mcron")
                                  #$@(if log?
                                         `("--log" "--log-format" ,log-format
-                                          ,@(if (maybe-value-set? date-format)
+                                          ,@(if date-format
                                                 (list "--date-format"
                                                       date-format)
                                                 '()))
@@ -209,15 +205,10 @@ files."
                 (extend (lambda (config jobs)
                           (mcron-configuration
                            (inherit config)
+                           (home-service?
+                            (mcron-configuration-home-service? config))
                            (jobs (append (mcron-configuration-jobs config)
                                          jobs)))))
                 (default-value (mcron-configuration)))) ;empty job list
 
-
-;;;
-;;; Generate documentation.
-;;;
-(define (generate-doc)
-  (configuration->documentation 'mcron-configuration))
-
 ;;; mcron.scm ends here
diff --git a/gnu/services/pam-mount.scm b/gnu/services/pam-mount.scm
index dbb9d0285f..b3a02e82e9 100644
--- a/gnu/services/pam-mount.scm
+++ b/gnu/services/pam-mount.scm
@@ -94,7 +94,7 @@
   (define optional-pam-mount
     (pam-entry
      (control "optional")
-     (module #~(string-append #$pam-mount "/lib/security/pam_mount.so"))))
+     (module (file-append pam-mount "/lib/security/pam_mount.so"))))
   (list
    (pam-extension
     (transformer
diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm
index c9a7ba96f4..69c737829b 100644
--- a/gnu/services/sddm.scm
+++ b/gnu/services/sddm.scm
@@ -171,7 +171,16 @@ Relogin="              (if (sddm-configuration-relogin? config)
          (documentation "SDDM display manager.")
          (requirement '(user-processes elogind pam))
          (provision '(xorg-server display-manager))
-         (start #~(make-forkexec-constructor #$sddm-command))
+         (start #~(make-forkexec-constructor
+                   #$sddm-command
+                   ;; some theme need icon,qml,data so add path to env.
+                   #:environment-variables
+                   (cons*
+                    "XDG_DATA_DIRS=/run/current-system/profile/share"
+                    "XDG_CONFIG_DIRS=/run/current-system/profile/etc/xdg"
+                    "QT_PLUGIN_PATH=/run/current-system/profile/lib/qt5/plugins"
+                    "QML2_IMPORT_PATH=/run/current-system/profile/lib/qt5/qml"
+                    (default-environment-variables))))
          (stop #~(make-kill-destructor)))))
 
 (define (sddm-etc-service config)
diff --git a/gnu/services/syncthing.scm b/gnu/services/syncthing.scm
index c1a0cdd81f..2f7c822827 100644
--- a/gnu/services/syncthing.scm
+++ b/gnu/services/syncthing.scm
@@ -49,35 +49,41 @@
   (group     syncthing-configuration-group     ;string
              (default "users"))
   (home      syncthing-configuration-home      ;string
-             (default #f)))
+             (default #f))
+  (home-service? syncthing-configuration-home-service?
+                 (default for-home?) (innate)))
 
 (define syncthing-shepherd-service
-  (match-lambda
-    (($ <syncthing-configuration> syncthing arguments logflags user group home)
-     (list
-      (shepherd-service
-       (provision (list (string->symbol (string-append "syncthing-" user))))
-       (documentation "Run syncthing.")
-       (requirement '(loopback))
-       (start #~(make-forkexec-constructor
-                 (append (list (string-append #$syncthing "/bin/syncthing")
-                               "--no-browser"
-                               "--no-restart"
-                               (string-append "--logflags=" (number->string #$logflags)))
-                         '#$arguments)
-                 #:user #$user
-                 #:group #$group
-                 #:environment-variables
-                 (append (list (string-append "HOME=" (or #$home (passwd:dir (getpw #$user))))
-                               "SSL_CERT_DIR=/etc/ssl/certs"
-                               "SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt")
-                         (remove (lambda (str)
+  (match-record-lambda <syncthing-configuration>
+      (syncthing arguments logflags user group home home-service?)
+    (list
+     (shepherd-service
+      (provision (if home-service?
+                     '(syncthing)
+                     (list (string->symbol
+                            (string-append "syncthing-" user)))))
+      (documentation "Run syncthing.")
+      (requirement (if home-service? '() '(loopback)))
+      (start #~(make-forkexec-constructor
+                (append (list (string-append #$syncthing "/bin/syncthing")
+                              "--no-browser"
+                              "--no-restart"
+                              (string-append "--logflags=" (number->string #$logflags)))
+                        '#$arguments)
+                #:user #$(and (not home-service?) user)
+                #:group #$(and (not home-service?) group)
+                #:environment-variables
+                (append (list (string-append "HOME=" (or #$home (passwd:dir (getpw #$user))))
+                              "SSL_CERT_DIR=/etc/ssl/certs"
+                              "SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt")
+                        (filter (negate       ;XXX: 'remove' is not in (guile)
+                                 (lambda (str)
                                    (or (string-prefix? "HOME=" str)
                                        (string-prefix? "SSL_CERT_DIR=" str)
-                                       (string-prefix? "SSL_CERT_FILE=" str)))
-                                 (environ)))))
-       (respawn? #f)
-       (stop #~(make-kill-destructor)))))))
+                                       (string-prefix? "SSL_CERT_FILE=" str))))
+                                (environ)))))
+      (respawn? #f)
+      (stop #~(make-kill-destructor))))))
 
 (define syncthing-service-type
   (service-type (name 'syncthing)
diff --git a/gnu/system/accounts.scm b/gnu/system/accounts.scm
index e37b733c6d..15b2afe266 100644
--- a/gnu/system/accounts.scm
+++ b/gnu/system/accounts.scm
@@ -29,6 +29,7 @@
             user-account-supplementary-groups
             user-account-comment
             user-account-home-directory
+            user-account-home-directory-permissions
             user-account-create-home-directory?
             user-account-shell
             user-account-system?
@@ -70,6 +71,8 @@
   (comment        user-account-comment (default ""))
   (home-directory user-account-home-directory (thunked)
                   (default (default-home-directory this-record)))
+  (home-directory-permissions user-account-home-directory-permissions
+                              (default #o700))
   (create-home-directory? user-account-create-home-directory? ;Boolean
                           (default #t))
   (shell          user-account-shell              ; gexp
diff --git a/gnu/system/examples/plasma.tmpl b/gnu/system/examples/plasma.tmpl
new file mode 100644
index 0000000000..6395991125
--- /dev/null
+++ b/gnu/system/examples/plasma.tmpl
@@ -0,0 +1,72 @@
+;; This is an operating system configuration template
+;; for a "desktop" setup with Plasma.
+
+(use-modules (gnu) (gnu system nss) (srfi srfi-1))
+(use-service-modules desktop sddm xorg ssh)
+(use-package-modules certs gnome ssh admin fonts)
+(use-package-modules qt xorg tmux linux)
+
+(operating-system
+  (host-name "plasma")
+  (timezone "Asia/Shanghai")
+  (locale "en_US.utf8")
+
+  ;; Assuming /dev/sdX is the target hard disk, and "my-root"
+  ;; is the label of the target root file system.
+  (bootloader (bootloader-configuration
+               (bootloader grub-bootloader)
+               (targets (list "/dev/sdX"))))
+
+  (file-systems (cons (file-system
+                        (device "my-root")
+                        (mount-point "/")
+                        (type "ext4"))
+                      %base-file-systems))
+
+  (users (cons (user-account
+                (name "plasma")
+                (password (crypt "plasma" "$6$abc"))
+                (group "users")
+                (supplementary-groups '("wheel" "netdev"
+                                        "audio" "video")))
+               %base-user-accounts))
+
+  ;; This is where we specify system-wide packages.
+  (packages (cons* nss-certs         ;for HTTPS access
+                   neofetch
+                   htop
+                   tmux
+                   xprop
+                   strace
+                   %base-packages))
+
+  (services (cons*
+             ;; for debug
+             ;; (simple-service
+             ;;  'add-qt-debug-env
+             ;;  session-environment-service-type
+             ;;  '(("QT_MESSAGE_PATTERN"
+             ;;     . "[[%{time process} %{type}] %{appname}: %{category} %{function} - %{message}]")
+             ;;    ("QT_DEBUG_PLUGINS" . "1")
+             ;;    ("QML_IMPORT_TRACE" . "1")))
+             (service openssh-service-type
+                      (openssh-configuration
+                       (openssh openssh-sans-x)
+                       (port-number 2222)))
+             (service plasma-desktop-service-type)
+             (service sddm-service-type
+                      (sddm-configuration
+                       (theme "breeze")))
+
+             ;; Remove GDM if it's among %DESKTOP-SERVICES; on other
+             ;; architectures, %DESKTOP-SERVICES contains SDDM instead.
+             (remove (lambda (service)
+                       (memq (service-kind service)
+                             (list gdm-service-type sddm-service-type)))
+                     %desktop-services)))
+  ;; Allow resolution of '.local' host names with mDNS.
+  (name-service-switch %mdns-host-lookup-nss))
+
+;; Local Variables:
+;; mode: scheme
+;; End:
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 841e7e0c7e..5b8da2f896 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -76,6 +76,7 @@
             esp32-partition
             root-partition
 
+            mbr-disk-image
             efi-disk-image
             iso9660-image
             docker-image
@@ -84,6 +85,7 @@
             raw-with-offset-disk-image
 
             image-with-os
+            mbr-raw-image-type
             efi-raw-image-type
             efi32-raw-image-type
             qcow2-image-type
@@ -145,6 +147,15 @@ parent image record."
    (flags '(boot))
    (initializer (gexp initialize-root-partition))))
 
+(define mbr-disk-image
+  (image-without-os
+   (format 'disk-image)
+   (partition-table-type 'mbr)
+   (partitions
+    (list (partition
+           (inherit root-partition)
+           (offset root-offset))))))
+
 (define efi-disk-image
   (image-without-os
    (format 'disk-image)
@@ -201,6 +212,11 @@ set to the given OS."
    (inherit base-image)
    (operating-system os)))
 
+(define mbr-raw-image-type
+  (image-type
+   (name 'mbr-raw)
+   (constructor (cut image-with-os mbr-disk-image <>))))
+
 (define efi-raw-image-type
   (image-type
    (name 'efi-raw)
@@ -216,8 +232,7 @@ set to the given OS."
    (name 'qcow2)
    (constructor (cut image-with-os
                  (image
-                  (inherit efi-disk-image)
-                  (partition-table-type 'mbr)
+                  (inherit mbr-disk-image)
                   (name 'image.qcow2)
                   (format 'compressed-qcow2))
                  <>))))
diff --git a/gnu/tests/cachefilesd.scm b/gnu/tests/cachefilesd.scm
new file mode 100644
index 0000000000..7f5d513067
--- /dev/null
+++ b/gnu/tests/cachefilesd.scm
@@ -0,0 +1,71 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
+;;; Copyright © 2022 Bruno Victal <mirai@makinata.eu>
+;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu tests cachefilesd)
+  #:use-module (gnu tests)
+  #:use-module (gnu system)
+  #:use-module (gnu system vm)
+  #:use-module (gnu services)
+  #:use-module (gnu services linux)
+  #:use-module (guix gexp)
+  #:export (%test-cachefilesd))
+
+(define %cachefilesd-os
+  (simple-operating-system
+   (service cachefilesd-service-type
+            (cachefilesd-configuration
+             (cache-directory "/var/cache/fscache")))))
+
+(define (run-cachefilesd-test)
+  "Run tests in %cachefilesd-os, which has cachefilesd running."
+  (define os
+    (marionette-operating-system
+     %cachefilesd-os
+     #:imported-modules '((gnu services herd))))
+
+  (define vm
+    (virtual-machine os))
+
+  (define test
+    (with-imported-modules '((gnu build marionette))
+      #~(begin
+          (use-modules (srfi srfi-64)
+                       (gnu build marionette))
+          (define marionette
+            (make-marionette (list #$vm)))
+
+          (test-runner-current (system-test-runner #$output))
+          (test-begin "cachefilesd")
+
+          (test-assert "service is running"
+            (marionette-eval
+             '(begin
+                (use-modules (gnu services herd))
+                (start-service 'cachefilesd))
+             marionette))
+
+          (test-end))))
+  (gexp->derivation "cachefilesd-test" test))
+
+(define %test-cachefilesd
+  (system-test
+   (name "cachefilesd")
+   (description "Test that the cachefilesd runs when started.")
+   (value (run-cachefilesd-test))))
diff --git a/gnu/tests/desktop.scm b/gnu/tests/desktop.scm
index 137260ea93..ef30442886 100644
--- a/gnu/tests/desktop.scm
+++ b/gnu/tests/desktop.scm
@@ -55,7 +55,7 @@
           (test-equal "login on tty1"
             '(("c1" "0" "root" "seat0" "tty1")      ;session
               ("seat0")                             ;seat
-              ("0" "root"))                         ;user
+              ("0" "root" "no"))                    ;user
 
             (begin
               ;; Wait for tty1.
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 0f4204d1a6..daa4647299 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -229,7 +229,7 @@ reboot\n")
                                                 (gnu installer tests)
                                                 (guix combinators))))
                       (uefi-support? #f)
-                      (installation-image-type 'efi-raw)
+                      (installation-image-type 'mbr-raw)
                       (install-size 'guess)
                       (target-size (* 2200 MiB))
                       (number-of-disks 1))
@@ -291,7 +291,7 @@ such as for RAID systems."
                        '("-bios" #$uefi-firmware)
                        '())
                  #$@(cond
-                     ((eq? 'efi-raw installation-image-type)
+                     ((eq? 'mbr-raw installation-image-type)
                       #~("-drive"
                          ,(string-append "file=" #$image
                                          ",if=virtio,readonly")))
diff --git a/gnu/tests/pam.scm b/gnu/tests/pam.scm
index 1654396e42..fa480e69ff 100644
--- a/gnu/tests/pam.scm
+++ b/gnu/tests/pam.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
+;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -25,8 +26,7 @@
   #:use-module (gnu system vm)
   #:use-module (guix gexp)
   #:use-module (ice-9 format)
-  #:export (%test-pam-limits
-            %test-pam-limits-deprecated))
+  #:export (%test-pam-limits))
 
 
 ;;;
@@ -35,26 +35,29 @@
 
 (define pam-limit-entries
   (list
-   (pam-limits-entry "@realtime" 'both 'rtprio 99)
-   (pam-limits-entry "@realtime" 'both 'memlock 'unlimited)))
+   ;; make sure the limits apply to root (uid 0)
+   (pam-limits-entry ":0" 'both 'rtprio 99)               ;default is 0
+   (pam-limits-entry ":0" 'both 'memlock 'unlimited)))    ;default is 8192 kbytes
 
 (define (run-test-pam-limits config)
   "Run tests in a os with pam-limits-service-type configured."
   (define os
     (marionette-operating-system
      (simple-operating-system
-      (service pam-limits-service-type config))))
+      (service pam-limits-service-type config))
+     #:imported-modules '((gnu services herd))))
 
   (define vm
     (virtual-machine os))
 
-  (define name (format #f "pam-limit-service~:[~;-deprecated~]"
-                       (file-like? config)))
+  (define name "pam-limits-service")
 
   (define test
-    (with-imported-modules '((gnu build marionette))
+    (with-imported-modules '((gnu build marionette)
+                             (guix build syscalls))
       #~(begin
           (use-modules (gnu build marionette)
+                       (guix build syscalls)
                        (srfi srfi-64))
 
           (let ((marionette (make-marionette (list #$vm))))
@@ -63,18 +66,32 @@
 
             (test-begin #$name)
 
-            (test-assert "/etc/security/limits.conf ready"
-              (wait-for-file "/etc/security/limits.conf" marionette))
-
-            (test-equal "/etc/security/limits.conf content matches"
-              #$(string-join (map pam-limits-entry->string pam-limit-entries)
-                             "\n" 'suffix)
-              (marionette-eval
-               '(begin
-                  (use-modules (rnrs io ports))
-                  (call-with-input-file "/etc/security/limits.conf"
-                    get-string-all))
-               marionette))
+            (test-equal "log in on tty1 and read limits"
+              '(("99")                  ;real-time priority
+                ("unlimited"))          ;max locked memory
+
+              (begin
+                ;; Wait for tty1.
+                (marionette-eval '(begin
+                                    (use-modules (gnu services herd))
+                                    (start-service 'term-tty1))
+                                 marionette)
+
+                (marionette-control "sendkey ctrl-alt-f1" marionette)
+
+                ;; Now we can type.
+                (marionette-type "root\n" marionette)
+                (marionette-type "ulimit -r > real-time-priority\n" marionette)
+                (marionette-type "ulimit -l > max-locked-memory\n" marionette)
+
+                ;; Read the two files.
+                (marionette-eval '(use-modules (rnrs io ports)) marionette)
+                (let ((guest-file (lambda (file)
+                                    (string-tokenize
+                                     (wait-for-file file marionette
+                                                    #:read 'get-string-all)))))
+                  (list (guest-file "/root/real-time-priority")
+                        (guest-file "/root/max-locked-memory")))))
 
             (test-end)))))
 
@@ -83,17 +100,6 @@
 (define %test-pam-limits
   (system-test
    (name "pam-limits-service")
-   (description "Test that pam-limits-service can serialize its config
-(as a list) to @file{limits.conf}.")
+   (description "Test that pam-limits-service actually sets the limits as
+configured.")
    (value (run-test-pam-limits pam-limit-entries))))
-
-(define %test-pam-limits-deprecated
-  (system-test
-   (name "pam-limits-service-deprecated")
-   (description "Test that pam-limits-service can serialize its config
-(as a file-like object) to @file{limits.conf}.")
-   (value (run-test-pam-limits
-           (plain-file "limits.conf"
-                       (string-join (map pam-limits-entry->string
-                                         pam-limit-entries)
-                                    "\n" 'suffix))))))
diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
index f52e3f7af5..7d1b0e0e23 100644
--- a/guix/build/qt-utils.scm
+++ b/guix/build/qt-utils.scm
@@ -90,7 +90,7 @@
     '("XDG_CONFIG_DIRS" suffix directory "/etc/xdg")
     `("QT_PLUGIN_PATH" prefix directory
       ,(format #f "/lib/qt~a/plugins" qt-major-version))
-    `("QML2_IMPORT_PATH" = directory
+    `("QML2_IMPORT_PATH" prefix directory
       ,(format #f "/lib/qt~a/qml" qt-major-version))
     ;; QTWEBENGINEPROCESS_PATH accepts a single value, which makes 'exact the
     ;; most suitable environment variable type for it.
diff --git a/guix/download.scm b/guix/download.scm
index 30d7c5a86e..ce6ebd0df8 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -358,7 +358,15 @@
        "https://mirror.esc7.net/pub/OpenBSD/")
       (mate
        "https://pub.mate-desktop.org/releases/"
-       "http://pub.mate-desktop.org/releases/"))))
+       "http://pub.mate-desktop.org/releases/")
+      (qt
+       "https://mirrors.ocf.berkeley.edu/qt/official_releases/"
+       "https://ftp.jaist.ac.jp/pub/qtproject/official_releases/"
+       "https://ftp.nluug.nl/languages/qt/official_releases/"
+       "https://mirrors.cloud.tencent.com/qt/official_releases/"
+       "https://mirrors.sjtug.sjtu.edu.cn/qt/official_releases/"
+       "https://qtproject.mirror.liquidtelecom.com/official_releases/"
+       "https://download.qt.io/official_releases/")))) ;slow
 
 (define %mirror-file
   ;; Copy of the list of mirrors to a file.  This allows us to keep a single
diff --git a/guix/git.scm b/guix/git.scm
index be20cde019..dbc3b7caa7 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -439,7 +439,7 @@ could not be fetched from Software Heritage~%")
                                    #:recursive? recursive?)))
   "Update the cached checkout of URL to REF in CACHE-DIRECTORY.  Return three
 values: the cache directory name, and the SHA1 commit (a string) corresponding
-to REF, and the relation of the new commit relative to STARTING-COMMIT (if
+to REF, and the relation of STARTING-COMMIT relative to the new commit (if
 provided) as returned by 'commit-relation'.
 
 REF is pair whose key is [branch | commit | tag | tag-or-commit ] and value
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 32712f7218..5c16a7617d 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -846,7 +846,11 @@ Optionally include a VERSION string to fetch a specific version."
                           (let ((scheme (uri-scheme uri))
                                 (host   (uri-host uri)))
                             (and (memq scheme '(http https))
-                                 (not (member host hosting-sites)))))))))
+                                 ;; HOST may contain prefixes,
+                                 ;; e.g. "profanity-im.github.io", hence the
+                                 ;; suffix-based test below.
+                                 (not (any (cut string-suffix? <> host)
+                                           hosting-sites)))))))))
 
     (lambda (package)
       (or (assoc-ref (package-properties package) 'release-monitoring-url)
diff --git a/guix/graph.scm b/guix/graph.scm
index aee0021d6c..9f1111a0ae 100644
--- a/guix/graph.scm
+++ b/guix/graph.scm
@@ -29,6 +29,7 @@
   #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-34)
   #:use-module (ice-9 match)
+  #:use-module (ice-9 string-fun)
   #:use-module (ice-9 vlist)
   #:export (node-type
             node-type?
@@ -49,6 +50,7 @@
             %graph-backends
             %d3js-backend
             %graphviz-backend
+            %graphml-backend
             lookup-backend
 
             graph-backend?
@@ -328,6 +330,37 @@ nodeArray.push(nodes[\"~a\"]);~%"
                  emit-cypher-prologue emit-cypher-epilogue
                  emit-cypher-node emit-cypher-edge))
 
+
+;;;
+;;; GraphML export.
+;;;
+
+(define (emit-graphml-prologue name port)
+  (format port "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<graphml xmlns=\"http://graphml.graphdrawing.org/xmlns\"
+    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
+    xsi:schemaLocation=\"http://graphml.graphdrawing.org/xmlns
+     http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd\">
+  <graph id=\"G\" edgedefault=\"directed\">~%"))
+
+(define (emit-graphml-epilogue port)
+  (format port "  </graph>
+</graphml>"))
+
+(define (emit-graphml-node id label port)
+  (format port "    <node id=\"~a\"/>~%"
+          (string-replace-substring (object->string id) "\"" "\\\"")))
+
+(define (emit-graphml-edge id1 id2 port)
+  (format port "    <edge source=\"~a\" target=\"~a\"/>~%"
+          (string-replace-substring (object->string id1) "\"" "\\\"")
+          (string-replace-substring (object->string id2) "\"" "\\\"")))
+
+(define %graphml-backend
+  (graph-backend "graphml"
+                 "Generate GraphML."
+                 emit-graphml-prologue emit-graphml-epilogue
+                 emit-graphml-node emit-graphml-edge))
 
 
 ;;;
@@ -337,7 +370,8 @@ nodeArray.push(nodes[\"~a\"]);~%"
 (define %graph-backends
   (list %graphviz-backend
         %d3js-backend
-        %cypher-backend))
+        %cypher-backend
+        %graphml-backend))
 
 (define (lookup-backend name)
   "Return the graph backend called NAME.  Raise an error if it is not found."
diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index b5a812b34e..7e79c77884 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -101,6 +101,7 @@
     ("cc-by-sa-3" 'cc-by-sa3.0)
     ("cc-by-sa-4" 'cc-by-sa4.0)
     ("mit" 'expat)
+    ("x11" 'x11)
     ("fdl" 'fdl1.3+)
     ;; The GUST Font Nosource License, which is legally equivalent to
     ;; lppl1.3c+, is no longer in use (per
@@ -298,7 +299,7 @@ When TEXLIVE-ONLY is true, only TeX Live packages are returned."
 (define (linked-scripts name package-database)
   "Return a list of script names to symlink from \"bin/\" directory for
 package NAME according to PACKAGE-DATABASE.  Consider as scripts files with
-\".lua\", \".pl\", \".py\", \".sh\", \".tcl\", \".texlua\", \".tlu\"
+\".lua\", \".pl\", \".py\", \".rb\", \".sh\", \".tcl\", \".texlua\", \".tlu\"
 extensions, and files without extension."
   (and-let* ((data (assoc-ref package-database name))
              ;; Check if binaries are associated to the package.
@@ -317,7 +318,8 @@ extensions, and files without extension."
     (filter-map (lambda (script)
                   (and (any (lambda (ext)
                               (member (basename script ext) binaries))
-                            '(".lua" ".pl" ".py" ".sh" ".tcl" ".texlua" ".tlu"))
+                            '(".lua" ".pl" ".py" ".rb" ".sh" ".tcl" ".texlua"
+                              ".tlu"))
                        (basename script)))
                 ;; Get the right (alphabetic) order.
                 (reverse scripts))))
@@ -476,6 +478,7 @@ of those files are returned that are unexpectedly installed."
           ,@(match (append-map (lambda (s)
                                  (cond ((string-suffix? ".pl" s) '(perl))
                                        ((string-suffix? ".py" s) '(python))
+                                       ((string-suffix? ".rb" s) '(ruby))
                                        ((string-suffix? ".tcl" s) '(tcl tk))
                                        (else '())))
                                (or scripts '()))
@@ -499,7 +502,7 @@ of those files are returned that are unexpectedly installed."
           (license
            ,(cond
              (meta-package?
-              '(license:fsf-free "https://www.tug.org/texlive/copying.html"))
+              '(fsf-free "https://www.tug.org/texlive/copying.html"))
              ((assoc-ref data 'catalogue-license) => string->license)
              (else #f))))
        (translate-depends depends #t)))))
diff --git a/guix/inferior.scm b/guix/inferior.scm
index 5dfd30a6c8..fca6fb4b22 100644
--- a/guix/inferior.scm
+++ b/guix/inferior.scm
@@ -871,11 +871,15 @@ prefix, resolve it; and if 'commit' is unset, fetch CHANNEL's branch tip."
                                   #:key
                                   (authenticate? #t)
                                   (cache-directory (%inferior-cache-directory))
-                                  (ttl (* 3600 24 30)))
+                                  (ttl (* 3600 24 30))
+                                  validate-channels)
   "Return a directory containing a guix filetree defined by CHANNELS, a list of channels.
-The directory is a subdirectory of CACHE-DIRECTORY, where entries can be reclaimed after TTL seconds.
-This procedure opens a new connection to the build daemon.  AUTHENTICATE?
-determines whether CHANNELS are authenticated."
+The directory is a subdirectory of CACHE-DIRECTORY, where entries can be
+reclaimed after TTL seconds.  This procedure opens a new connection to the
+build daemon.  AUTHENTICATE? determines whether CHANNELS are authenticated.
+VALIDATE-CHANNELS, if specified, must be a one argument procedure accepting a
+list of channels that can be used to validate the channels; it should raise an
+exception in case of problems."
   (define commits
     ;; Since computing the instances of CHANNELS is I/O-intensive, use a
     ;; cheaper way to get the commit list of CHANNELS.  This limits overhead
@@ -923,27 +927,30 @@ determines whether CHANNELS are authenticated."
 
   (if (file-exists? cached)
       cached
-      (run-with-store store
-        (mlet* %store-monad ((instances
-                              -> (latest-channel-instances store channels
-                                                           #:authenticate?
-                                                           authenticate?))
-                             (profile
-                              (channel-instances->derivation instances)))
-          (mbegin %store-monad
-            ;; It's up to the caller to install a build handler to report
-            ;; what's going to be built.
-            (built-derivations (list profile))
-
-            ;; Cache if and only if AUTHENTICATE? is true.
-            (if authenticate?
-                (mbegin %store-monad
-                  (symlink* (derivation->output-path profile) cached)
-                  (add-indirect-root* cached)
-                  (return cached))
-                (mbegin %store-monad
-                  (add-temp-root* (derivation->output-path profile))
-                  (return (derivation->output-path profile)))))))))
+      (begin
+        (when (procedure? validate-channels)
+          (validate-channels channels))
+        (run-with-store store
+          (mlet* %store-monad ((instances
+                                -> (latest-channel-instances store channels
+                                                             #:authenticate?
+                                                             authenticate?))
+                               (profile
+                                (channel-instances->derivation instances)))
+            (mbegin %store-monad
+              ;; It's up to the caller to install a build handler to report
+              ;; what's going to be built.
+              (built-derivations (list profile))
+
+              ;; Cache if and only if AUTHENTICATE? is true.
+              (if authenticate?
+                  (mbegin %store-monad
+                    (symlink* (derivation->output-path profile) cached)
+                    (add-indirect-root* cached)
+                    (return cached))
+                  (mbegin %store-monad
+                    (add-temp-root* (derivation->output-path profile))
+                    (return (derivation->output-path profile))))))))))
 
 (define* (inferior-for-channels channels
                                 #:key
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 2bd6477cf8..fea766879d 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1786,7 +1786,7 @@ MANIFEST."
        (if (string-prefix? "texlive-" name)
            (cons (gexp-input thing output)
                  (append-map entry->texlive-input deps))
-           '()))))
+           (append-map entry->texlive-input deps)))))
   (define texlive-scripts-entry?
     (match-lambda
       (($ <manifest-entry> name version output thing deps)
diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm
index fbd5689be8..e0800bc062 100644
--- a/guix/scripts/home.scm
+++ b/guix/scripts/home.scm
@@ -330,6 +330,10 @@ immediately.  Return the exit status of the process in the container."
                  (display "127.0.0.1 localhost\n" port)
                  (chmod port #o444))))
 
+           ;; Create /tmp; bits of code expect it, such as
+           ;; 'least-authority-wrapper'.
+           (mkdir-p "/tmp")
+
            ;; Set PATH for things that the activation script might expect, such
            ;; as "env".
            (load-profile #$system-profile)
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index ecd264d3fa..759c3a94a3 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -85,6 +85,9 @@ Download and deploy the latest version of Guix.\n"))
   (display (G_ "
   -C, --channels=FILE    deploy the channels defined in FILE"))
   (display (G_ "
+  -q, --no-channel-files
+                         inhibit loading of user and system 'channels.scm'"))
+  (display (G_ "
       --url=URL          download \"guix\" channel from the Git repository at URL"))
   (display (G_ "
       --commit=COMMIT    download the specified \"guix\" channel COMMIT"))
@@ -133,6 +136,9 @@ Download and deploy the latest version of Guix.\n"))
   (cons* (option '(#\C "channels") #t #f
                  (lambda (opt name arg result)
                    (alist-cons 'channel-file arg result)))
+         (option '(#\q "no-channel-files") #f #f
+                 (lambda (opt name arg result)
+                   (alist-cons 'ignore-channel-files? #t result)))
          (option '(#\l "list-generations") #f #t
                  (lambda (opt name arg result)
                    (cons `(query list-generations ,arg)
@@ -166,7 +172,7 @@ Download and deploy the latest version of Guix.\n"))
                                (alist-delete 'repository-url result))))
          (option '("commit") #t #f
                  (lambda (opt name arg result)
-                   (alist-cons 'ref `(commit . ,arg) result)))
+                   (alist-cons 'ref `(tag-or-commit . ,arg) result)))
          (option '("branch") #t #f
                  (lambda (opt name arg result)
                    (alist-cons 'ref `(branch . ,arg) result)))
@@ -735,6 +741,9 @@ transformations specified in OPTS (resulting from '--url', '--commit', or
   (define file
     (assoc-ref opts 'channel-file))
 
+  (define ignore-channel-files?
+    (assoc-ref opts 'ignore-channel-files?))
+
   (define default-file
     (string-append (config-directory) "/channels.scm"))
 
@@ -750,9 +759,11 @@ transformations specified in OPTS (resulting from '--url', '--commit', or
   (define channels
     (cond (file
            (load-channels file))
-          ((file-exists? default-file)
+          ((and (not ignore-channel-files?)
+                (file-exists? default-file))
            (load-channels default-file))
-          ((file-exists? global-file)
+          ((and (not ignore-channel-files?)
+                (file-exists? global-file))
            (load-channels global-file))
           (else
            %default-channels)))
@@ -774,7 +785,8 @@ Use '~/.config/guix/channels.scm' instead."))
                (if (guix-channel? c)
                    (let ((url (or url (channel-url c))))
                      (match ref
-                       (('commit . commit)
+                       ((or ('commit . commit)
+                            ('tag-or-commit . commit))
                         (channel (inherit c)
                                  (url url) (commit commit) (branch #f)))
                        (('branch . branch)
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index a9241aa20d..f39dc743b1 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2023 Maxim Cournoyer maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -106,6 +107,9 @@
         (option '(#\m "manifest") #t #f
                 (lambda (opt name arg result)
                   (alist-cons 'manifest arg result)))
+        (option '("target-version") #t #f
+                (lambda (opt name arg result)
+                  (alist-cons 'target-version arg result)))
         (option '(#\e "expression") #t #f
                 (lambda (opt name arg result)
                   (alist-cons 'expression arg result)))
@@ -165,6 +169,9 @@ specified with `--select'.\n"))
   (display (G_ "
   -m, --manifest=FILE    select all the packages from the manifest in FILE"))
   (display (G_ "
+      --target-version=VERSION
+                         update the package or packages to VERSION"))
+  (display (G_ "
   -t, --type=UPDATER,... restrict to updates from the specified updaters
                          (e.g., 'gnu')"))
   (display (G_ "
@@ -213,17 +220,20 @@ specified with `--select'.\n"))
 (define* (update-spec package #:optional version)
   (%update-spec package version))
 
-(define (update-specification->update-spec spec)
+(define (update-specification->update-spec spec fallback-version)
   "Given SPEC, a package name like \"guile@2.0=2.0.8\", return a <update>
-record with two fields: the package to upgrade, and the target version."
+record with two fields: the package to upgrade, and the target version.  When
+SPEC lacks a version, use FALLBACK-VERSION."
   (match (string-rindex spec #\=)
-    (#f  (update-spec (specification->package spec) #f))
+    (#f  (update-spec (specification->package spec) fallback-version))
     (idx (update-spec (specification->package (substring spec 0 idx))
                       (substring spec (1+ idx))))))
 
 (define (options->update-specs opts)
   "Return the list of <update-spec> records requested by OPTS, honoring
 options like '--recursive'."
+  (define target-version (assoc-ref opts 'target-version))
+
   (define core-package?
     (let* ((input->package (match-lambda
                              ((name (? package? package) _ ...) package)
@@ -263,13 +273,18 @@ update would trigger a complete rebuild."
     ;; Update specs explicitly passed as command-line arguments.
     (match (append-map (match-lambda
                          (('argument . spec)
-                          ;; Take either the specified version or the
-                          ;; latest one.
-                          (list (update-specification->update-spec spec)))
+                          ;; Take either the specified version or the latest
+                          ;; one.  The version specified as part of a spec
+                          ;; takes precedence, with the command-line specified
+                          ;; --target-version used as a fallback.
+                          (list (update-specification->update-spec
+                                 spec target-version)))
                          (('expression . exp)
-                          (list (update-spec (read/eval-package-expression exp))))
+                          (list (update-spec (read/eval-package-expression exp)
+                                             target-version)))
                          (('manifest . manifest)
-                          (map update-spec (packages-from-manifest manifest)))
+                          (map (cut update-spec <> target-version)
+                               (packages-from-manifest manifest)))
                          (_
                           '()))
                        opts)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index acbe3dab2c..ec331809ef 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -1169,7 +1169,7 @@ Some ACTIONS support additional ARGS.\n"))
     (debug . 0)
     (verbosity . #f)                              ;default
     (validate-reconfigure . ,ensure-forward-reconfigure)
-    (image-type . efi-raw)
+    (image-type . mbr-raw)
     (image-size . guess)
     (install-bootloader? . #t)
     (label . #f)
diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm
index d7c71ef705..87000d82ec 100644
--- a/guix/scripts/time-machine.scm
+++ b/guix/scripts/time-machine.scm
@@ -1,7 +1,8 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Konrad Hinsen <konrad.hinsen@fastmail.net>
-;;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019, 2020, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,13 +20,15 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (guix scripts time-machine)
+  #:use-module (guix channels)
+  #:use-module (guix diagnostics)
   #:use-module (guix ui)
   #:use-module (guix scripts)
   #:use-module (guix inferior)
   #:use-module (guix store)
   #:use-module (guix status)
   #:use-module ((guix git)
-                #:select (with-git-error-handling))
+                #:select (update-cached-checkout with-git-error-handling))
   #:use-module ((guix utils)
                 #:select (%current-system))
   #:use-module ((guix scripts pull)
@@ -38,9 +41,17 @@
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-26)
+  #:use-module (srfi srfi-34)
   #:use-module (srfi srfi-37)
+  #:use-module (srfi srfi-71)
   #:export (guix-time-machine))
 
+;;; The required inferiors mechanism relied on by 'guix time-machine' was
+;;; firmed up in v1.0.0; it is the oldest, safest commit that can be travelled
+;;; to.
+(define %oldest-possible-commit
+  "6298c3ffd9654d3231a6f25390b056483e8f407c") ;v1.0.0
+
 
 ;;;
 ;;; Command-line options.
@@ -52,6 +63,9 @@ Execute COMMAND ARGS... in an older version of Guix.\n"))
   (display (G_ "
   -C, --channels=FILE    deploy the channels defined in FILE"))
   (display (G_ "
+  -q, --no-channel-files
+                         inhibit loading of user and system 'channels.scm'"))
+  (display (G_ "
       --url=URL          use the Git repository at URL"))
   (display (G_ "
       --commit=COMMIT    use the specified COMMIT"))
@@ -75,13 +89,16 @@ Execute COMMAND ARGS... in an older version of Guix.\n"))
   (cons* (option '(#\C "channels") #t #f
                  (lambda (opt name arg result)
                    (alist-cons 'channel-file arg result)))
+         (option '(#\q "no-channel-files") #f #f
+                 (lambda (opt name arg result)
+                   (alist-cons 'ignore-channel-files? #t result)))
          (option '("url") #t #f
                  (lambda (opt name arg result)
                    (alist-cons 'repository-url arg
                                (alist-delete 'repository-url result))))
          (option '("commit") #t #f
                  (lambda (opt name arg result)
-                   (alist-cons 'ref `(commit . ,arg) result)))
+                   (alist-cons 'ref `(tag-or-commit . ,arg) result)))
          (option '("branch") #t #f
                  (lambda (opt name arg result)
                    (alist-cons 'ref `(branch . ,arg) result)))
@@ -140,8 +157,27 @@ Execute COMMAND ARGS... in an older version of Guix.\n"))
      (let* ((opts         (parse-args args))
             (channels     (channel-list opts))
             (command-line (assoc-ref opts 'exec))
+            (ref          (assoc-ref opts 'ref))
             (substitutes?  (assoc-ref opts 'substitutes?))
             (authenticate? (assoc-ref opts 'authenticate-channels?)))
+
+       (define (validate-guix-channel channels)
+         "Finds the Guix channel among CHANNELS, and validates that REF as
+captured from the closure, a git reference specification such as a commit hash
+or tag associated to CHANNEL, is valid and new enough to satisfy the 'guix
+time-machine' requirements.  A `formatted-message' condition is raised
+otherwise."
+         (let* ((guix-channel (find guix-channel? channels))
+                (checkout commit relation (update-cached-checkout
+                                           (channel-url guix-channel)
+                                           #:ref (or ref '())
+                                           #:starting-commit
+                                           %oldest-possible-commit)))
+           (unless (memq relation '(ancestor self))
+             (raise (formatted-message
+                     (G_ "cannot travel past commit `~a' from May 1st, 2019")
+                     (string-take %oldest-possible-commit 12))))))
+
        (when command-line
          (let* ((directory
                  (with-store store
@@ -153,6 +189,8 @@ Execute COMMAND ARGS... in an older version of Guix.\n"))
                                                          #:dry-run? #f)
                        (set-build-options-from-command-line store opts)
                        (cached-channel-instance store channels
-                                                #:authenticate? authenticate?)))))
+                                                #:authenticate? authenticate?
+                                                #:validate-channels
+                                                validate-guix-channel)))))
                 (executable (string-append directory "/bin/guix")))
            (apply execl (cons* executable executable command-line))))))))
diff --git a/guix/ssh.scm b/guix/ssh.scm
index b7b9807ebf..c4617d2c74 100644
--- a/guix/ssh.scm
+++ b/guix/ssh.scm
@@ -175,8 +175,9 @@ to SSH server at '~a'")
              (disconnect! session)
              (raise (condition
                      (&message
-                      (message (format #f (G_ "SSH authentication failed for '~a': ~a~%")
-                                       host (get-error session)))))))))))
+                      (message (format #f (G_ "SSH authentication failed for '~a@~a': ~a~%")
+                                       (session-get session 'user) host
+                                       (get-error session)))))))))))
       (x
        ;; Connection failed or timeout expired.
        (raise (formatted-message (G_ "SSH connection to '~a' failed: ~a~%")
diff --git a/guix/ui.scm b/guix/ui.scm
index 47a118364a..6f2d4fe245 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -200,6 +200,20 @@ information, or #f if it could not be found."
   (parameterize (((@ (system base compile) default-optimization-level) 1))
     exp))
 
+(define (try-canonicalize-path file)
+  "Like 'canonicalize-path', but return FILE as-is if 'canonicalize-path'
+throws.
+
+This is necessary for corner cases where 'canonicalize-path' fails.  One
+example is on Linux when a /dev/fd/N file denotes a pipe, represented as a
+symlink to a non-existent file like 'pipe:[1234]', as in this example:
+
+  sh -c 'stat $(readlink -f /dev/fd/1)' | cat"
+  (catch 'system-error
+    (lambda ()
+      (canonicalize-path file))
+    (const file)))
+
 (define* (load* file user-module
                 #:key (on-error 'nothing-special))
   "Load the user provided Scheme source code FILE."
@@ -230,7 +244,7 @@ information, or #f if it could not be found."
                ;; 'primitive-load', so that FILE is compiled, which then allows
                ;; us to provide better error reporting with source line numbers.
                (without-compiler-optimizations
-                (load (canonicalize-path file))))
+                (load (try-canonicalize-path file))))
              (const #f))))))
     (lambda _
       ;; XXX: Errors are reported from the pre-unwind handler below, but
diff --git a/tests/graph.scm b/tests/graph.scm
index a6186ff7e8..c8189366a1 100644
--- a/tests/graph.scm
+++ b/tests/graph.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015-2023 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -377,7 +377,8 @@ edges."
                               (((labels packages _ ...) ...)
                                packages)))))))))
 
-(test-assert "node-transitive-edges + node-back-edges"
+(test-equal "node-transitive-edges + node-back-edges"
+  '()
   (run-with-store %store
     (let ((packages   (fold-packages cons '()))
           (bootstrap? (lambda (package)
@@ -386,17 +387,22 @@ edges."
                          "bootstrap.scm")))
           (trivial?   (lambda (package)
                         (eq? (package-build-system package)
-                             trivial-build-system))))
+                             trivial-build-system)))
+          (system-specific? (lambda (package)
+                              (memq #:system (package-arguments package)))))
       (mlet %store-monad ((edges (node-back-edges %bag-node-type packages)))
         (let* ((glibc      (canonical-package glibc))
                (dependents (node-transitive-edges (list glibc) edges))
                (diff       (lset-difference eq? packages dependents)))
-          ;; All the packages depend on libc, except bootstrap packages and
-          ;; some that use TRIVIAL-BUILD-SYSTEM.
-          (return (null? (remove (lambda (package)
-                                   (or (trivial? package)
-                                       (bootstrap? package)))
-                                 diff))))))))
+          ;; All the packages depend on libc, except bootstrap packages, some
+          ;; packages that use TRIVIAL-BUILD-SYSTEM, and some that target a
+          ;; specific system and thus may depend on a different libc package
+          ;; object.
+          (return (remove (lambda (package)
+                            (or (trivial? package)
+                                (bootstrap? package)
+                                (system-specific? package)))
+                          diff)))))))
 
 (test-assert "node-transitive-edges, no duplicates"
   (run-with-store %store
diff --git a/tests/guix-build.sh b/tests/guix-build.sh
index 317c58ac42..4eab0e38b6 100644
--- a/tests/guix-build.sh
+++ b/tests/guix-build.sh
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012-2014, 2016-2022 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012-2014, 2016-2023 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
 # Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
 #
@@ -397,6 +397,13 @@ guix build -d -m "$module_dir/manifest.scm" \
 
 rm "$module_dir"/*.scm
 
+if [ -n "$BASH_VERSION" ]
+then
+    # Check whether we can load from a /dev/fd/N denoting a pipe, using this
+    # handy Bash-specific construct.
+    guix build -m <(echo '(specifications->manifest (list "guile"))') -n
+fi
+
 # Using 'GUIX_BUILD_OPTIONS'.
 GUIX_BUILD_OPTIONS="--dry-run --no-grafts"
 export GUIX_BUILD_OPTIONS
diff --git a/tests/guix-home.sh b/tests/guix-home.sh
index e6d16d7fab..649d811a0c 100644
--- a/tests/guix-home.sh
+++ b/tests/guix-home.sh
@@ -224,5 +224,5 @@ EOF
     #
 
     guix home search mcron | grep "^name: home-mcron"
-    guix home search job manager | grep "^name: home-mcron"
+    guix home search scheduling daemon | grep "^name: home-mcron"
 )
diff --git a/tests/guix-refresh.sh b/tests/guix-refresh.sh
index 51d34c4b51..2ce3c592ab 100644
--- a/tests/guix-refresh.sh
+++ b/tests/guix-refresh.sh
@@ -109,6 +109,13 @@ case "$(guix refresh -t test guile=2.0.0 2>&1)" in
     *"failed to find"*"2.0.0"*) true;;
     *) false;;
 esac
+
+guix refresh -t test guile --target-version=2.0.0 # XXX: should return non-zero?
+case "$(guix refresh -t test guile --target-version=2.0.0 2>&1)" in
+    *"failed to find"*"2.0.0"*) true;;
+    *) false;;
+esac
+
 for spec in "guile=1.6.4" "guile@3=1.6.4"
 do
     guix refresh -t test "$spec"
diff --git a/tests/guix-shell.sh b/tests/guix-shell.sh
index ed368515eb..2f5fd86809 100644
--- a/tests/guix-shell.sh
+++ b/tests/guix-shell.sh
@@ -48,7 +48,7 @@ guix shell -s armhf-linux intelmetool -n && false
 # opens a couple of extra FDs.
 initial_fd_list="$(echo /proc/$$/fd/*)"
 fd_list="$(guix shell --bootstrap guile-bootstrap -- \
-		 "$SHELL" -c 'echo /proc/$$/fd/*')"
+		 bash -c 'echo /proc/$$/fd/*')"
 test "$(echo $fd_list | wc -w)" -le "$(echo $initial_fd_list | wc -w)"
 
 # Ignoring unauthorized files.
diff --git a/tests/guix-time-machine.sh b/tests/guix-time-machine.sh
new file mode 100644
index 0000000000..8b62ef75ea
--- /dev/null
+++ b/tests/guix-time-machine.sh
@@ -0,0 +1,28 @@
+# GNU Guix --- Functional package management for GNU
+# Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+#
+# This file is part of GNU Guix.
+#
+# GNU Guix is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GNU Guix is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Test the 'guix time-machine' command-line utility.
+#
+
+guix time-machine --version
+
+# Visiting a commit older than v1.0.0 fails.
+! guix time-machine --commit=v0.15.0
+
+exit 0
diff --git a/tests/packages.scm b/tests/packages.scm
index 2b7ab01f7d..2b4f9f8e90 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -1277,8 +1277,9 @@
 ;;                               #:guile guile))))
 
 (test-equal "package->bag"
-  `("foo86-hurd" #f (,(package-source gnu-make))
-    (,(canonical-package glibc)) (,(canonical-package coreutils)))
+  (parameterize ((%current-system "foo86-hurd"))
+    `("foo86-hurd" #f (,(package-source gnu-make))
+      (,(canonical-package glibc)) (,(canonical-package coreutils))))
   (let ((bag (package->bag gnu-make "foo86-hurd")))
     (list (bag-system bag) (bag-target bag)
           (assoc-ref (bag-build-inputs bag) "source")
diff --git a/tests/store-roots.scm b/tests/store-roots.scm
index 9877987a65..bf30b1dff6 100644
--- a/tests/store-roots.scm
+++ b/tests/store-roots.scm
@@ -30,13 +30,6 @@
 
 (test-begin "store-roots")
 
-(test-equal "gc-roots, initial"
-  (list (string-append %state-directory "/profiles"))
-  (begin
-    ;; 'gc-roots' should gracefully handle lack of that directory.
-    (delete-file-recursively (string-append %state-directory "/profiles"))
-    (gc-roots)))
-
 ;; The 'open-connection' call below gets guix-daemon to create
 ;; %STATE-DIRECTORY/profiles.
 (set! %store (open-connection))
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 98461f7e51..fac9faf714 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -542,12 +542,12 @@ completely compatible with Plain TeX.")
                ('arguments
                 ('list '#:builder ('gexp ('mkdir ('ungexp 'output)))))
                ('propagated-inputs
-                ('list 'texlive-collection-basic 'texlive-texworks))
+                ('list 'texlive-collection-basic))
                ('home-page "https://www.tug.org/texlive/")
                ('synopsis (? string?))
                ('description (? string?))
                ('license
-                ('license:fsf-free "https://www.tug.org/texlive/copying.html")))
+                ('fsf-free "https://www.tug.org/texlive/copying.html")))
              #true)
             (_
              (begin